diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-07-17 18:18:47 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-17 18:18:47 -0400 |
| commit | 96fd719a1906346db062daf13e1107b3c4b220ed (patch) | |
| tree | 5df2369f01325a40ca65a4f744545460e348a198 /data/maps/FallarborTown_MoveRelearnersHouse | |
| parent | 50e48898d2ab25b792b563825dca79d327bcb542 (diff) | |
| parent | 89bcf3cbd9ad9d3c3631159c5ba20d3660819066 (diff) | |
Merge pull request #1081 from GriffinRichards/add-localids
Add local object event ids for referenced objects
Diffstat (limited to 'data/maps/FallarborTown_MoveRelearnersHouse')
| -rw-r--r-- | data/maps/FallarborTown_MoveRelearnersHouse/scripts.inc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/data/maps/FallarborTown_MoveRelearnersHouse/scripts.inc b/data/maps/FallarborTown_MoveRelearnersHouse/scripts.inc index ac0f42f20..780901c42 100644 --- a/data/maps/FallarborTown_MoveRelearnersHouse/scripts.inc +++ b/data/maps/FallarborTown_MoveRelearnersHouse/scripts.inc @@ -1,9 +1,11 @@ +.set LOCALID_MOVE_RELEARNER, 1 + FallarborTown_MoveRelearnersHouse_MapScripts:: @ 8201382 .byte 0 FallarborTown_MoveRelearnersHouse_EventScript_MoveRelearner:: @ 8201383 lockall - applymovement 1, Common_Movement_FacePlayer + applymovement LOCALID_MOVE_RELEARNER, Common_Movement_FacePlayer waitmovement 0 goto_if_set FLAG_TEMP_1, FallarborTown_MoveRelearnersHouse_EventScript_AskTeachMove msgbox FallarborTown_MoveRelearnersHouse_Text_ImTheMoveTutor, MSGBOX_DEFAULT @@ -13,7 +15,7 @@ FallarborTown_MoveRelearnersHouse_EventScript_MoveRelearner:: @ 8201383 FallarborTown_MoveRelearnersHouse_EventScript_AskTeachMove:: @ 82013A8 checkitem ITEM_HEART_SCALE, 1 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq FallarborTown_MoveRelearnersHouse_EventScript_ComeBackWithHeartScale msgbox FallarborTown_MoveRelearnersHouse_Text_ThatsAHeartScaleWantMeToTeachMove, MSGBOX_YESNO switch VAR_RESULT |