diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-11-27 12:51:10 -0500 |
|---|---|---|
| committer | GriffinR <griffin.richards@comcast.net> | 2019-11-27 12:51:10 -0500 |
| commit | cb90f22c5e632cf8161ae2c3246d8d1f205ce39f (patch) | |
| tree | 5b507a61b43ecfe02bf4b474b0857ac92e0992a8 /data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc | |
| parent | f559fa3fe26910056e84315370cb13ec8501af18 (diff) | |
| parent | 70d1f54ab96235b0e0d07d40526f16449e7cb1e7 (diff) | |
Merge master into ObjEvent rename
Diffstat (limited to 'data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc')
| -rw-r--r-- | data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc b/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc index 28d128715..f75f53893 100644 --- a/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc @@ -1,30 +1,30 @@ BattleFrontier_BattleArenaCorridor_MapScripts:: @ 82573B9 - map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleArenaCorridor_MapScript2_2573BF + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleArenaCorridor_OnFrame .byte 0 -BattleFrontier_BattleArenaCorridor_MapScript2_2573BF: @ 82573BF - map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleArenaCorridor_EventScript_2573C9 +BattleFrontier_BattleArenaCorridor_OnFrame: @ 82573BF + map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleArenaCorridor_EventScript_WalkToBattleRoom .2byte 0 -BattleFrontier_BattleArenaCorridor_EventScript_2573C9:: @ 82573C9 +BattleFrontier_BattleArenaCorridor_EventScript_WalkToBattleRoom:: @ 82573C9 delay 16 setvar VAR_TEMP_0, 1 - applymovement 1, BattleFrontier_BattleArenaCorridor_Movement_25742F - applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleArenaCorridor_Movement_257417 + applymovement 1, BattleFrontier_BattleArenaCorridor_Movement_AttendantWalkToDoor + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleArenaCorridor_Movement_PlayerWalkToDoor waitmovement 0 - applymovement 1, BattleFrontier_BattleArenaCorridor_Movement_257444 + applymovement 1, BattleFrontier_BattleArenaCorridor_Movement_AttendantFacePlayer waitmovement 0 - msgbox BattleFrontier_BattleArenaCorridor_Text_257449, MSGBOX_SIGN - applymovement 1, BattleFrontier_BattleArenaCorridor_Movement_257446 + msgbox BattleFrontier_BattleArenaCorridor_Text_PleaseStepIn, MSGBOX_SIGN + applymovement 1, BattleFrontier_BattleArenaCorridor_Movement_AttendantMoveOutOfWay waitmovement 0 - applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleArenaCorridor_Movement_25742C + applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleArenaCorridor_Movement_PlayerEnterDoor waitmovement 0 setvar VAR_0x8006, 0 warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM, 255, 7, 5 waitstate end -BattleFrontier_BattleArenaCorridor_Movement_257417: @ 8257417 +BattleFrontier_BattleArenaCorridor_Movement_PlayerWalkToDoor: @ 8257417 walk_up walk_left walk_left @@ -47,12 +47,12 @@ BattleFrontier_BattleArenaCorridor_Movement_257417: @ 8257417 walk_right step_end -BattleFrontier_BattleArenaCorridor_Movement_25742C: @ 825742C +BattleFrontier_BattleArenaCorridor_Movement_PlayerEnterDoor: @ 825742C walk_right set_invisible step_end -BattleFrontier_BattleArenaCorridor_Movement_25742F: @ 825742F +BattleFrontier_BattleArenaCorridor_Movement_AttendantWalkToDoor: @ 825742F walk_left walk_left walk_left @@ -75,16 +75,16 @@ BattleFrontier_BattleArenaCorridor_Movement_25742F: @ 825742F walk_right step_end -BattleFrontier_BattleArenaCorridor_Movement_257444: @ 8257444 +BattleFrontier_BattleArenaCorridor_Movement_AttendantFacePlayer: @ 8257444 walk_in_place_fastest_left step_end -BattleFrontier_BattleArenaCorridor_Movement_257446: @ 8257446 +BattleFrontier_BattleArenaCorridor_Movement_AttendantMoveOutOfWay: @ 8257446 walk_up walk_in_place_fastest_down step_end -BattleFrontier_BattleArenaCorridor_Text_257449: @ 8257449 +BattleFrontier_BattleArenaCorridor_Text_PleaseStepIn: @ 8257449 .string "Your battles shall be waged in\n" .string "the next room. Please step in!$" |