diff options
Diffstat (limited to 'data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc')
| -rw-r--r-- | data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc index 6f104041e..c4d07baff 100644 --- a/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc @@ -4,9 +4,9 @@ CeladonCity_DepartmentStore_Elevator_MapScripts:: @ 816C152 CeladonCity_DepartmentStore_Elevator_EventScript_16C153:: @ 816C153 lockall setvar VAR_0x8004, 3 - 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 @@ -61,50 +61,50 @@ EventScript_16C1F3:: @ 816C1F3 EventScript_16C246:: @ 816C246 setvar VAR_0x8006, 4 setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_1F, 255, 6, 1 - compare_var_to_value VAR_0x403A, 4 - goto_if_eq EventScript_16C30E + compare_var_to_value VAR_ELEVATOR_FLOOR, 4 + goto_if eq, EventScript_16C30E call EventScript_16C313 - setvar VAR_0x403A, 4 + setvar VAR_ELEVATOR_FLOOR, 4 goto EventScript_16C30E end EventScript_16C26E:: @ 816C26E setvar VAR_0x8006, 5 setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_2F, 255, 6, 1 - compare_var_to_value VAR_0x403A, 5 - goto_if_eq EventScript_16C30E + compare_var_to_value VAR_ELEVATOR_FLOOR, 5 + goto_if eq, EventScript_16C30E call EventScript_16C313 - setvar VAR_0x403A, 5 + setvar VAR_ELEVATOR_FLOOR, 5 goto EventScript_16C30E end EventScript_16C296:: @ 816C296 setvar VAR_0x8006, 6 setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_3F, 255, 6, 1 - compare_var_to_value VAR_0x403A, 6 - goto_if_eq EventScript_16C30E + compare_var_to_value VAR_ELEVATOR_FLOOR, 6 + goto_if eq, EventScript_16C30E call EventScript_16C313 - setvar VAR_0x403A, 6 + setvar VAR_ELEVATOR_FLOOR, 6 goto EventScript_16C30E end EventScript_16C2BE:: @ 816C2BE setvar VAR_0x8006, 7 setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_4F, 255, 6, 1 - compare_var_to_value VAR_0x403A, 7 - goto_if_eq EventScript_16C30E + compare_var_to_value VAR_ELEVATOR_FLOOR, 7 + goto_if eq, EventScript_16C30E call EventScript_16C313 - setvar VAR_0x403A, 7 + setvar VAR_ELEVATOR_FLOOR, 7 goto EventScript_16C30E end EventScript_16C2E6:: @ 816C2E6 setvar VAR_0x8006, 8 setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_5F, 255, 6, 1 - compare_var_to_value VAR_0x403A, 8 - goto_if_eq EventScript_16C30E + compare_var_to_value VAR_ELEVATOR_FLOOR, 8 + goto_if eq, EventScript_16C30E call EventScript_16C313 - setvar VAR_0x403A, 8 + setvar VAR_ELEVATOR_FLOOR, 8 goto EventScript_16C30E end @@ -119,5 +119,5 @@ EventScript_16C313:: @ 816C313 waitse special sub_80CB498 waitstate - setflag FLAG_0x002 + setflag FLAG_TEMP_2 return |