diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-12-10 20:43:27 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-10 20:43:27 -0500 |
| commit | 47b0d8a5970a75862279bde9d19a06c3d7f96eee (patch) | |
| tree | 462ebc6e6bce61be28d862cd89c8bec08ebfa61e /data/maps/BattleFrontier_BattlePikeRoomFinal/scripts.inc | |
| parent | 77bf40d32b7bbab40db36030399586430ae57010 (diff) | |
| parent | 49f1a90534180445d293761e2bdac165b49319a2 (diff) | |
Merge branch 'master' into doc-matchcall
Diffstat (limited to 'data/maps/BattleFrontier_BattlePikeRoomFinal/scripts.inc')
| -rw-r--r-- | data/maps/BattleFrontier_BattlePikeRoomFinal/scripts.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/data/maps/BattleFrontier_BattlePikeRoomFinal/scripts.inc b/data/maps/BattleFrontier_BattlePikeRoomFinal/scripts.inc index 2eaaa20b4..d547a200f 100644 --- a/data/maps/BattleFrontier_BattlePikeRoomFinal/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeRoomFinal/scripts.inc @@ -4,12 +4,12 @@ BattleFrontier_BattlePikeRoomFinal_MapScripts:: @ 825E392 .byte 0 BattleFrontier_BattlePikeRoomFinal_OnFrame: @ 825E39D - map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeRoomFinal_EventScript_25E3A7 + map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeRoomFinal_EventScript_EnterRoom .2byte 0 -BattleFrontier_BattlePikeRoomFinal_EventScript_25E3A7:: @ 825E3A7 +BattleFrontier_BattlePikeRoomFinal_EventScript_EnterRoom:: @ 825E3A7 delay 16 - applymovement 1, BattleFrontier_BattlePikeRoomFinal_Movement_25E3DB + applymovement 1, BattleFrontier_BattlePikeRoomFinal_Movement_AttendantApproachPlayer waitmovement 0 frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON lockall @@ -20,7 +20,7 @@ BattleFrontier_BattlePikeRoomFinal_EventScript_25E3A7:: @ 825E3A7 waitstate end -BattleFrontier_BattlePikeRoomFinal_Movement_25E3DB: @ 825E3DB +BattleFrontier_BattlePikeRoomFinal_Movement_AttendantApproachPlayer: @ 825E3DB walk_down walk_down step_end |