summaryrefslogtreecommitdiff
path: root/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc')
-rw-r--r--data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc42
1 files changed, 21 insertions, 21 deletions
diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc
index 74b746633..9d04d2e33 100644
--- a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc
+++ b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc
@@ -5,11 +5,11 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A39C:: @ 815A39C
lock
faceplayer
checkflag 2
- callif 0, LilycoveCity_DepartmentStoreElevator_EventScript_15A4CF
+ call_if 0, LilycoveCity_DepartmentStoreElevator_EventScript_15A4CF
copyvar 0x8005, 0x4043
special sub_810E944
message LilycoveCity_DepartmentStoreElevator_Text_1A0EF6
- waittext
+ waitmessage
multichoice 0, 0, 57, 0
switch RESULT
case 0, LilycoveCity_DepartmentStoreElevator_EventScript_15A402
@@ -21,59 +21,59 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A39C:: @ 815A39C
end
LilycoveCity_DepartmentStoreElevator_EventScript_15A402:: @ 815A402
- warpplace LilycoveCity_DepartmentStore_1F, 255, 2, 1
+ setdynamicwarp LilycoveCity_DepartmentStore_1F, 255, 2, 1
compare 0x4043, 0
- jumpeq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1
+ goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1
call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8
setvar 0x4043, 0
- jump LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1
+ goto LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1
end
LilycoveCity_DepartmentStoreElevator_EventScript_15A425:: @ 815A425
- warpplace LilycoveCity_DepartmentStore_2F, 255, 2, 1
+ setdynamicwarp LilycoveCity_DepartmentStore_2F, 255, 2, 1
compare 0x4043, 1
- jumpeq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1
+ goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1
call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8
setvar 0x4043, 1
- jump LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1
+ goto LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1
end
LilycoveCity_DepartmentStoreElevator_EventScript_15A448:: @ 815A448
- warpplace LilycoveCity_DepartmentStore_3F, 255, 2, 1
+ setdynamicwarp LilycoveCity_DepartmentStore_3F, 255, 2, 1
compare 0x4043, 2
- jumpeq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1
+ goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1
call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8
setvar 0x4043, 2
- jump LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1
+ goto LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1
end
LilycoveCity_DepartmentStoreElevator_EventScript_15A46B:: @ 815A46B
- warpplace LilycoveCity_DepartmentStore_4F, 255, 2, 1
+ setdynamicwarp LilycoveCity_DepartmentStore_4F, 255, 2, 1
compare 0x4043, 3
- jumpeq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1
+ goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1
call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8
setvar 0x4043, 3
- jump LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1
+ goto LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1
end
LilycoveCity_DepartmentStoreElevator_EventScript_15A48E:: @ 815A48E
- warpplace LilycoveCity_DepartmentStore_5F, 255, 2, 1
+ setdynamicwarp LilycoveCity_DepartmentStore_5F, 255, 2, 1
compare 0x4043, 4
- jumpeq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1
+ goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1
call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8
setvar 0x4043, 4
- jump LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1
+ goto LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1
end
LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1:: @ 815A4B1
- hidebox 0, 0, 29, 19
+ erasebox 0, 0, 29, 19
release
end
LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8:: @ 815A4B8
- hidebox 0, 0, 29, 19
- move LAST_TALKED, LilycoveCity_DepartmentStoreElevator_Movement_1A0845
- waitmove 0
+ erasebox 0, 0, 29, 19
+ applymovement LAST_TALKED, LilycoveCity_DepartmentStoreElevator_Movement_1A0845
+ waitmovement 0
special sub_810EBEC
waitstate
setflag 2