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/scripts/apprentice.inc | |
| parent | 2749948eebe65aa8b55738d820e4a0252dd45c1a (diff) | |
| parent | 25f45ffa8441b0f0a999355c9755782ccb4809dc (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into doc-contest
Diffstat (limited to 'data/scripts/apprentice.inc')
| -rw-r--r-- | data/scripts/apprentice.inc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/data/scripts/apprentice.inc b/data/scripts/apprentice.inc index b3ae904a0..f5fa3aeeb 100644 --- a/data/scripts/apprentice.inc +++ b/data/scripts/apprentice.inc @@ -1,3 +1,5 @@ +.set LOCALID_APPRENTICE, 6 + BattleFrontier_BattleTowerLobby_EventScript_Apprentice:: @ 82B688D lock faceplayer @@ -225,7 +227,7 @@ Apprentice_EventScript_LeaveNorth: @ 82B6E54 apprentice_shouldleave compare VAR_0x8004, FALSE @ Always TRUE here goto_if_eq Apprentice_EventScript_DontMove - applymovement 6, Apprentice_Movement_LeaveNorth + applymovement LOCALID_APPRENTICE, Apprentice_Movement_LeaveNorth waitmovement 0 end @@ -233,7 +235,7 @@ Apprentice_EventScript_Leave: @ 82B6E72 apprentice_shouldleave compare VAR_0x8004, FALSE @ Always TRUE here goto_if_eq Apprentice_EventScript_DontMove - applymovement 6, Apprentice_Movement_Leave + applymovement LOCALID_APPRENTICE, Apprentice_Movement_Leave waitmovement 0 end |