summaryrefslogtreecommitdiff
path: root/data/scripts/maps/SeafloorCavern_Room9.inc
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2017-12-24 10:11:43 -0600
committerMarcus Huderle <huderlem@gmail.com>2017-12-24 10:14:54 -0600
commit1c8b05e7b059a98d4259f4129896d0cc1eaa3847 (patch)
treeba882643b40c20d5a15b2d330f091b1ef0e0c751 /data/scripts/maps/SeafloorCavern_Room9.inc
parent51247c3eb9dc1f8ecf4298ada62ed7c2f768b50e (diff)
Name and use constants for special vars
Diffstat (limited to 'data/scripts/maps/SeafloorCavern_Room9.inc')
-rw-r--r--data/scripts/maps/SeafloorCavern_Room9.inc60
1 files changed, 30 insertions, 30 deletions
diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc
index f9bf888e2..fb332fbff 100644
--- a/data/scripts/maps/SeafloorCavern_Room9.inc
+++ b/data/scripts/maps/SeafloorCavern_Room9.inc
@@ -14,10 +14,10 @@ SeafloorCavern_Room9_MapScript1_15DAEC:: @ 815DAEC
SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA
lockall
- setvar 0x8004, 2
- setvar 0x8005, 3
- setvar 0x8006, 4
- setvar 0x8007, 5
+ setvar SPECIALVAR_4, 2
+ setvar SPECIALVAR_5, 3
+ setvar SPECIALVAR_6, 4
+ setvar SPECIALVAR_7, 5
applymovement 255, SeafloorCavern_Room9_Movement_1A0841
waitmovement 0
applymovement 255, SeafloorCavern_Room9_Movement_15DD68
@@ -28,24 +28,24 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA
msgbox SeafloorCavern_Room9_Text_1B4850, 4
.endif
closemessage
- addobject 0x8004
+ addobject SPECIALVAR_4
applymovement 255, SeafloorCavern_Room9_Movement_1A083F
waitmovement 0
- applymovement 0x8004, SeafloorCavern_Room9_Movement_15DD36
+ applymovement SPECIALVAR_4, SeafloorCavern_Room9_Movement_15DD36
waitmovement 0
.ifdef SAPPHIRE
msgbox UnknownString_81B41D5, 4
.else
msgbox SeafloorCavern_Room9_Text_1B486C, 4
.endif
- applymovement 0x8004, SeafloorCavern_Room9_Movement_1A0841
+ applymovement SPECIALVAR_4, SeafloorCavern_Room9_Movement_1A0841
waitmovement 0
.ifdef SAPPHIRE
msgbox UnknownString_81B4201, 4
.else
msgbox SeafloorCavern_Room9_Text_1B4897, 4
.endif
- applymovement 0x8004, SeafloorCavern_Room9_Movement_1A0839
+ applymovement SPECIALVAR_4, SeafloorCavern_Room9_Movement_1A0839
waitmovement 0
.ifdef SAPPHIRE
msgbox UnknownString_81B4289, 4
@@ -92,7 +92,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA
playfanfare 388
playse 107
special sub_80818A4
- applymovement 0x8004, SeafloorCavern_Room9_Movement_1A0841
+ applymovement SPECIALVAR_4, SeafloorCavern_Room9_Movement_1A0841
applymovement 255, SeafloorCavern_Room9_Movement_1A0841
waitmovement 0
delay 150
@@ -104,23 +104,23 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA
waitmovement 0
special sub_80818FC
waitstate
- setvar 0x8004, 1
- setvar 0x8005, 1
+ setvar SPECIALVAR_4, 1
+ setvar SPECIALVAR_5, 1
special sub_810F758
waitstate
applymovement 1, SeafloorCavern_Room9_Movement_15DD57
waitmovement 0
removeobject 1
delay 4
- setvar 0x8004, 2
- setvar 0x8005, 2
+ setvar SPECIALVAR_4, 2
+ setvar SPECIALVAR_5, 2
special sub_810F758
waitstate
delay 30
- setvar 0x8004, 2
- setvar 0x8005, 3
- setvar 0x8006, 4
- setvar 0x8007, 5
+ setvar SPECIALVAR_4, 2
+ setvar SPECIALVAR_5, 3
+ setvar SPECIALVAR_6, 4
+ setvar SPECIALVAR_7, 5
.ifdef SAPPHIRE
msgbox UnknownString_81B43F2, 4
.else
@@ -135,7 +135,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA
msgbox SeafloorCavern_Room9_Text_1B4ADB, 4
.endif
closemessage
- applymovement 0x8004, SeafloorCavern_Room9_Movement_15DD41
+ applymovement SPECIALVAR_4, SeafloorCavern_Room9_Movement_15DD41
waitmovement 0
.ifdef SAPPHIRE
msgbox UnknownString_81B447A, 4
@@ -145,7 +145,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA
closemessage
playse 3
delay 20
- applymovement 0x8004, SeafloorCavern_Room9_Movement_1A0845
+ applymovement SPECIALVAR_4, SeafloorCavern_Room9_Movement_1A0845
waitmovement 0
.ifdef SAPPHIRE
msgbox UnknownString_81B45C6, 4
@@ -153,14 +153,14 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA
msgbox SeafloorCavern_Room9_Text_1B4C79, 4
.endif
closemessage
- addobject 0x8005
- addobject 0x8006
- addobject 0x8007
- applymovement 0x8007, SeafloorCavern_Room9_Movement_15DD63
- applymovement 0x8006, SeafloorCavern_Room9_Movement_15DD63
- applymovement 0x8005, SeafloorCavern_Room9_Movement_15DD5A
+ addobject SPECIALVAR_5
+ addobject SPECIALVAR_6
+ addobject SPECIALVAR_7
+ applymovement SPECIALVAR_7, SeafloorCavern_Room9_Movement_15DD63
+ applymovement SPECIALVAR_6, SeafloorCavern_Room9_Movement_15DD63
+ applymovement SPECIALVAR_5, SeafloorCavern_Room9_Movement_15DD5A
waitmovement 0
- applymovement 0x8004, SeafloorCavern_Room9_Movement_1A083F
+ applymovement SPECIALVAR_4, SeafloorCavern_Room9_Movement_1A083F
waitmovement 0
.ifdef SAPPHIRE
msgbox UnknownString_81B464D, 4
@@ -168,9 +168,9 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA
msgbox SeafloorCavern_Room9_Text_1B4D02, 4
.endif
playse 21
- applymovement 0x8004, SeafloorCavern_Room9_Movement_1A0833
+ applymovement SPECIALVAR_4, SeafloorCavern_Room9_Movement_1A0833
waitmovement 0
- applymovement 0x8004, SeafloorCavern_Room9_Movement_1A0835
+ applymovement SPECIALVAR_4, SeafloorCavern_Room9_Movement_1A0835
waitmovement 0
.ifdef SAPPHIRE
msgbox UnknownString_81B4723, 4
@@ -183,8 +183,8 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA
msgbox SeafloorCavern_Room9_Text_1B4E37, 4
.endif
closemessage
- applymovement 0x8005, SeafloorCavern_Room9_Movement_15DD60
- applymovement 0x8004, SeafloorCavern_Room9_Movement_15DD46
+ applymovement SPECIALVAR_5, SeafloorCavern_Room9_Movement_15DD60
+ applymovement SPECIALVAR_4, SeafloorCavern_Room9_Movement_15DD46
waitmovement 0
.ifdef SAPPHIRE
msgbox UnknownString_81B4818, 4