ref: cf69876ae575fa15acc6f0c36c382e413e29aef7
parent: 98e670f3637b5f845a91423ee2d624d2f1e331a6
author: IIMarckus <iimarckus@gmail.com>
date: Thu Aug 16 04:05:21 EDT 2018
Better labels/constants for Move Tutor.
--- a/maps/GoldenrodCity.asm
+++ b/maps/GoldenrodCity.asm
@@ -13,7 +13,7 @@
const GOLDENRODCITY_ROCKET4
const GOLDENRODCITY_ROCKET5
const GOLDENRODCITY_ROCKET6
- const GOLDENRODCITY_POKEFAN_M2
+ const GOLDENRODCITY_MOVETUTOR
GoldenrodCity_MapScripts:
db 0 ; scene scripts
@@ -40,13 +40,13 @@
ifequal WEDNESDAY, .MoveTutorAppear
ifequal SATURDAY, .MoveTutorAppear
.MoveTutorDisappear:
- disappear GOLDENRODCITY_POKEFAN_M2
+ disappear GOLDENRODCITY_MOVETUTOR
return
.MoveTutorAppear:
checkflag ENGINE_DAILY_MOVE_TUTOR
iftrue .MoveTutorDone
- appear GOLDENRODCITY_POKEFAN_M2
+ appear GOLDENRODCITY_MOVETUTOR
.MoveTutorDone:
return
@@ -130,14 +130,14 @@
closetext
checkcode VAR_FACING
ifequal LEFT, .WalkAroundPlayer
- applymovement GOLDENRODCITY_POKEFAN_M2, MovementData_0x198a5f
+ applymovement GOLDENRODCITY_MOVETUTOR, MovementData_0x198a5f
jump .GoInside
.WalkAroundPlayer:
- applymovement GOLDENRODCITY_POKEFAN_M2, MovementData_0x198a63
+ applymovement GOLDENRODCITY_MOVETUTOR, MovementData_0x198a63
.GoInside:
playsound SFX_ENTER_DOOR
- disappear GOLDENRODCITY_POKEFAN_M2
+ disappear GOLDENRODCITY_MOVETUTOR
clearevent EVENT_GOLDENROD_GAME_CORNER_MOVE_TUTOR
setflag ENGINE_DAILY_MOVE_TUTOR
waitsfx
--- a/maps/GoldenrodGameCorner.asm
+++ b/maps/GoldenrodGameCorner.asm
@@ -10,15 +10,15 @@
const GOLDENRODGAMECORNER_COOLTRAINER_F
const GOLDENRODGAMECORNER_GENTLEMAN
const GOLDENRODGAMECORNER_POKEFAN_M2
- const GOLDENRODGAMECORNER_POKEFAN_M3
+ const GOLDENRODGAMECORNER_MOVETUTOR
GoldenrodGameCorner_MapScripts:
db 0 ; scene scripts
db 1 ; callbacks
- callback MAPCALLBACK_OBJECTS, .Callback
+ callback MAPCALLBACK_OBJECTS, .MoveTutor
-.Callback:
+.MoveTutor:
checkevent EVENT_BEAT_ELITE_FOUR
iffalse .finish
checkitem COIN_CASE
@@ -27,23 +27,23 @@
ifequal WEDNESDAY, .move_tutor_outside
ifequal SATURDAY, .move_tutor_outside
.move_tutor_inside
- appear GOLDENRODGAMECORNER_POKEFAN_M3
+ appear GOLDENRODGAMECORNER_MOVETUTOR
return
.move_tutor_outside
checkflag ENGINE_DAILY_MOVE_TUTOR
iftrue .finish
- disappear GOLDENRODGAMECORNER_POKEFAN_M3
+ disappear GOLDENRODGAMECORNER_MOVETUTOR
.finish
return
-GoldenrodGameCornerPokefanM3Script:
+MoveTutorInsideScript:
faceplayer
opentext
- writetext GoldenrodGameCornerPokefanM3Text
+ writetext MoveTutorInsideText
waitbutton
closetext
- turnobject GOLDENRODGAMECORNER_POKEFAN_M3, RIGHT
+ turnobject GOLDENRODGAMECORNER_MOVETUTOR, RIGHT
end
GoldenrodGameCornerCoinVendorScript:
@@ -422,7 +422,7 @@
line "UNDERGROUND."
done
-GoldenrodGameCornerPokefanM3Text:
+MoveTutorInsideText:
text "Wahahah! The coins"
line "keep rolling in!"
done
@@ -488,4 +488,4 @@
object_event 10, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerCooltrainerFScript, -1
object_event 5, 10, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerGentlemanScript, -1
object_event 2, 9, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanM2Script, -1
- object_event 17, 10, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPokefanM3Script, EVENT_GOLDENROD_GAME_CORNER_MOVE_TUTOR
+ object_event 17, 10, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MoveTutorInsideScript, EVENT_GOLDENROD_GAME_CORNER_MOVE_TUTOR