diff options
Diffstat (limited to 'data/maps/RocketHideout_Elevator/scripts.inc')
| -rw-r--r-- | data/maps/RocketHideout_Elevator/scripts.inc | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/data/maps/RocketHideout_Elevator/scripts.inc b/data/maps/RocketHideout_Elevator/scripts.inc index 884335234..c83bc7fd9 100644 --- a/data/maps/RocketHideout_Elevator/scripts.inc +++ b/data/maps/RocketHideout_Elevator/scripts.inc @@ -3,12 +3,12 @@ RocketHideout_Elevator_MapScripts:: @ 81614D8 RocketHideout_Elevator_EventScript_1614D9:: @ 81614D9 lockall - checkflag FLAG_0x2A5 - goto_if 0, EventScript_16161B + checkflag FLAG_CAN_USE_ROCKET_HIDEOUT_LIFT + goto_if FALSE, EventScript_16161B setvar VAR_0x8004, 2 - checkflag FLAG_0x002 - call_if 0, EventScript_1A7AB9 - copyvar VAR_0x8005, VAR_0x403A + checkflag FLAG_TEMP_2 + call_if FALSE, EventScript_1A7AB9 + copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR special sub_80CB580 message Text_1A535C waitmessage @@ -53,10 +53,10 @@ EventScript_161554:: @ 8161554 EventScript_161591:: @ 8161591 setvar VAR_0x8006, 3 setdynamicwarp MAP_ROCKET_HIDEOUT_B1F, 255, 24, 25 - compare_var_to_value VAR_0x403A, 3 - goto_if_eq EventScript_161609 + compare_var_to_value VAR_ELEVATOR_FLOOR, 3 + goto_if eq, EventScript_161609 call EventScript_16160E - setvar VAR_0x403A, 3 + setvar VAR_ELEVATOR_FLOOR, 3 goto EventScript_161609 EventScript_1615B8:: @ 81615B8 @@ -65,10 +65,10 @@ EventScript_1615B8:: @ 81615B8 EventScript_1615B9:: @ 81615B9 setvar VAR_0x8006, 2 setdynamicwarp MAP_ROCKET_HIDEOUT_B2F, 255, 28, 16 - compare_var_to_value VAR_0x403A, 2 - goto_if_eq EventScript_161609 + compare_var_to_value VAR_ELEVATOR_FLOOR, 2 + goto_if eq, EventScript_161609 call EventScript_16160E - setvar VAR_0x403A, 2 + setvar VAR_ELEVATOR_FLOOR, 2 goto EventScript_161609 EventScript_1615E0:: @ 81615E0 @@ -77,10 +77,10 @@ EventScript_1615E0:: @ 81615E0 EventScript_1615E1:: @ 81615E1 setvar VAR_0x8006, 0 setdynamicwarp MAP_ROCKET_HIDEOUT_B4F, 255, 20, 23 - compare_var_to_value VAR_0x403A, 0 - goto_if_eq EventScript_161609 + compare_var_to_value VAR_ELEVATOR_FLOOR, 0 + goto_if eq, EventScript_161609 call EventScript_16160E - setvar VAR_0x403A, 0 + setvar VAR_ELEVATOR_FLOOR, 0 goto EventScript_161609 EventScript_161608:: @ 8161608 @@ -97,7 +97,7 @@ EventScript_16160E:: @ 816160E waitse special sub_80CB498 waitstate - setflag FLAG_0x002 + setflag FLAG_TEMP_2 return EventScript_16161B:: @ 816161B |