diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-08-16 05:59:10 -0400 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-08-16 05:59:10 -0400 |
| commit | 65bd2faf9460d4e5986c30e54b283d7674d77c55 (patch) | |
| tree | 250c345d17b8d8f910d327d98f577afddfb3a64a /data/maps/FallarborTown_MoveRelearnersHouse | |
| parent | 2749948eebe65aa8b55738d820e4a0252dd45c1a (diff) | |
| parent | 25f45ffa8441b0f0a999355c9755782ccb4809dc (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into doc-contest
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 |