summaryrefslogtreecommitdiff
path: root/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc')
-rw-r--r--data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc25
1 files changed, 10 insertions, 15 deletions
diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc
index b6ad2e4e6..d7d152408 100644
--- a/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc
+++ b/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc
@@ -59,9 +59,8 @@ LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloor::
LilycoveCity_DepartmentStoreElevator_EventScript_1stFloor::
setvar VAR_0x8006, DEPT_STORE_FLOORNUM_1F
- setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F, 255, 2, 1
- compare VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_1F
- goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect
+ setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F, 2, 1
+ goto_if_eq VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_1F, LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect
call LilycoveCity_DepartmentStoreElevator_EventScript_MoveElevator
setvar VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_1F
goto LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect
@@ -69,9 +68,8 @@ LilycoveCity_DepartmentStoreElevator_EventScript_1stFloor::
LilycoveCity_DepartmentStoreElevator_EventScript_2ndFloor::
setvar VAR_0x8006, DEPT_STORE_FLOORNUM_2F
- setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F, 255, 2, 1
- compare VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_2F
- goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect
+ setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F, 2, 1
+ goto_if_eq VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_2F, LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect
call LilycoveCity_DepartmentStoreElevator_EventScript_MoveElevator
setvar VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_2F
goto LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect
@@ -79,9 +77,8 @@ LilycoveCity_DepartmentStoreElevator_EventScript_2ndFloor::
LilycoveCity_DepartmentStoreElevator_EventScript_3rdFloor::
setvar VAR_0x8006, DEPT_STORE_FLOORNUM_3F
- setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F, 255, 2, 1
- compare VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_3F
- goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect
+ setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F, 2, 1
+ goto_if_eq VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_3F, LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect
call LilycoveCity_DepartmentStoreElevator_EventScript_MoveElevator
setvar VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_3F
goto LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect
@@ -89,9 +86,8 @@ LilycoveCity_DepartmentStoreElevator_EventScript_3rdFloor::
LilycoveCity_DepartmentStoreElevator_EventScript_4thFloor::
setvar VAR_0x8006, DEPT_STORE_FLOORNUM_4F
- setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F, 255, 2, 1
- compare VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_4F
- goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect
+ setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F, 2, 1
+ goto_if_eq VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_4F, LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect
call LilycoveCity_DepartmentStoreElevator_EventScript_MoveElevator
setvar VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_4F
goto LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect
@@ -99,9 +95,8 @@ LilycoveCity_DepartmentStoreElevator_EventScript_4thFloor::
LilycoveCity_DepartmentStoreElevator_EventScript_5thFloor::
setvar VAR_0x8006, DEPT_STORE_FLOORNUM_5F
- setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F, 255, 2, 1
- compare VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_5F
- goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect
+ setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F, 2, 1
+ goto_if_eq VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_5F, LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect
call LilycoveCity_DepartmentStoreElevator_EventScript_MoveElevator
setvar VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_5F
goto LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect