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/BattleFrontier_BattlePikeLobby | |
| parent | 2749948eebe65aa8b55738d820e4a0252dd45c1a (diff) | |
| parent | 25f45ffa8441b0f0a999355c9755782ccb4809dc (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into doc-contest
Diffstat (limited to 'data/maps/BattleFrontier_BattlePikeLobby')
| -rw-r--r-- | data/maps/BattleFrontier_BattlePikeLobby/scripts.inc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc index d2cf3fe32..c1d3fc974 100644 --- a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc @@ -1,3 +1,5 @@ +.set LOCALID_ATTENDANT, 1 + BattleFrontier_BattlePikeLobby_MapScripts:: @ 825B6C6 map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeLobby_OnFrame map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeLobby_OnWarp @@ -200,7 +202,7 @@ BattleFrontier_BattlePikeLobby_EventScript_ShowResults:: @ 825BA80 end BattleFrontier_BattlePikeLobby_EventScript_WalkToCorridor:: @ 825BA94 - applymovement 1, BattleFrontier_BattlePikeLobby_Movement_AttendantWalkToCorridor + applymovement LOCALID_ATTENDANT, BattleFrontier_BattlePikeLobby_Movement_AttendantWalkToCorridor applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeLobby_Movement_PlayerWalkToCorridor waitmovement 0 return |