diff options
Diffstat (limited to 'data/maps/BattleTower_Elevator/scripts.inc')
| -rw-r--r-- | data/maps/BattleTower_Elevator/scripts.inc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/data/maps/BattleTower_Elevator/scripts.inc b/data/maps/BattleTower_Elevator/scripts.inc index f3373ee6e..4e5d8b8c1 100644 --- a/data/maps/BattleTower_Elevator/scripts.inc +++ b/data/maps/BattleTower_Elevator/scripts.inc @@ -1,6 +1,6 @@ BattleTower_Elevator_MapScripts:: @ 81607CF - map_script 2, BattleTower_Elevator_MapScript2_1607DA - map_script 4, BattleTower_Elevator_MapScript2_160821 + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleTower_Elevator_MapScript2_1607DA + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleTower_Elevator_MapScript2_160821 .byte 0 BattleTower_Elevator_MapScript2_1607DA:: @ 81607DA @@ -10,13 +10,13 @@ BattleTower_Elevator_MapScript2_1607DA:: @ 81607DA BattleTower_Elevator_EventScript_1607E4:: @ 81607E4 setvar VAR_TEMP_0, 1 applymovement 1, BattleTower_Elevator_Movement_160835 - applymovement 255, BattleTower_Elevator_Movement_160839 + applymovement OBJ_EVENT_ID_PLAYER, BattleTower_Elevator_Movement_160839 waitmovement 0 special ShakeScreenInElevator waitstate delay 64 applymovement 1, BattleTower_Elevator_Movement_16083D - applymovement 255, BattleTower_Elevator_Movement_160841 + applymovement OBJ_EVENT_ID_PLAYER, BattleTower_Elevator_Movement_160841 waitmovement 0 setvar VAR_TEMP_0, 0 warp MAP_BATTLE_TOWER_CORRIDOR, 255, 8, 1 @@ -29,29 +29,29 @@ BattleTower_Elevator_MapScript2_160821:: @ 8160821 BattleTower_Elevator_EventScript_16082B:: @ 816082B setvar VAR_TEMP_1, 1 - turnobject 255, 2 + turnobject OBJ_EVENT_ID_PLAYER, 2 end BattleTower_Elevator_Movement_160835:: @ 8160835 walk_up walk_right face_down - end_movement + step_end BattleTower_Elevator_Movement_160839:: @ 8160839 walk_up walk_up face_down - end_movement + step_end BattleTower_Elevator_Movement_16083D:: @ 816083D walk_down walk_down set_invisible - end_movement + step_end BattleTower_Elevator_Movement_160841:: @ 8160841 walk_right walk_down walk_down - end_movement + step_end |