summaryrefslogtreecommitdiff
path: root/data/scripts/maps/AquaHideout_B2F.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/AquaHideout_B2F.inc
parent51247c3eb9dc1f8ecf4298ada62ed7c2f768b50e (diff)
Name and use constants for special vars
Diffstat (limited to 'data/scripts/maps/AquaHideout_B2F.inc')
-rw-r--r--data/scripts/maps/AquaHideout_B2F.inc32
1 files changed, 16 insertions, 16 deletions
diff --git a/data/scripts/maps/AquaHideout_B2F.inc b/data/scripts/maps/AquaHideout_B2F.inc
index 0535af6f3..534e91341 100644
--- a/data/scripts/maps/AquaHideout_B2F.inc
+++ b/data/scripts/maps/AquaHideout_B2F.inc
@@ -9,14 +9,14 @@ AquaHideout_B2F_MapScript1_15D8B7:: @ 815D8B7
AquaHideout_B2F_EventScript_15D8BD:: @ 815D8BD
MagmaHideout_B2F_EventScript_15D8BD:: @ 815D8BD
lockall
- setvar 0x8008, 1
+ setvar SPECIALVAR_8, 1
playse 21
- applymovement 0x8008, AquaHideout_B2F_Movement_1A0833
+ applymovement SPECIALVAR_8, AquaHideout_B2F_Movement_1A0833
waitmovement 0
.ifdef SAPPHIRE
- applymovement 0x8008, AquaHideout_B2F_Movement_1A0839
+ applymovement SPECIALVAR_8, AquaHideout_B2F_Movement_1A0839
.else
- applymovement 0x8008, AquaHideout_B2F_Movement_1A0841
+ applymovement SPECIALVAR_8, AquaHideout_B2F_Movement_1A0841
.endif
waitmovement 0
setvar VAR_TEMP_1, 1
@@ -31,37 +31,37 @@ MagmaHideout_B2F_EventScript_15D8E1:: @ 815D8E1
end
AquaHideout_B2F_EventScript_15D8FD:: @ 815D8FD
- setvar 0x8008, 1
+ setvar SPECIALVAR_8, 1
.ifdef SAPPHIRE
- setvar 0x8009, 4
+ setvar SPECIALVAR_9, 4
.else
- setvar 0x8009, 3
+ setvar SPECIALVAR_9, 3
.endif
.ifdef SAPPHIRE
- applymovement 0x8008, Movement_1A083F
+ applymovement SPECIALVAR_8, Movement_1A083F
.else
- applymovement 0x8008, AquaHideout_B2F_Movement_1A0843
+ applymovement SPECIALVAR_8, AquaHideout_B2F_Movement_1A0843
.endif
waitmovement 0
delay 20
- applymovement 0x8008, AquaHideout_B2F_Movement_1A0839
+ applymovement SPECIALVAR_8, AquaHideout_B2F_Movement_1A0839
waitmovement 0
msgbox AquaHideout_B2F_Text_197162, 4
closemessage
.ifdef SAPPHIRE
- applymovement 0x8008, Movement_1A083F
+ applymovement SPECIALVAR_8, Movement_1A083F
.else
- applymovement 0x8008, AquaHideout_B2F_Movement_1A0843
+ applymovement SPECIALVAR_8, AquaHideout_B2F_Movement_1A0843
.endif
.ifdef SAPPHIRE
- applymovement 0x8009, AquaHideout_B2F_Movement_15D958
+ applymovement SPECIALVAR_9, AquaHideout_B2F_Movement_15D958
.else
- applymovement 0x8009, AquaHideout_B2F_Movement_15D95D
+ applymovement SPECIALVAR_9, AquaHideout_B2F_Movement_15D95D
.endif
waitmovement 0
- removeobject 0x8009
+ removeobject SPECIALVAR_9
delay 20
- applymovement 0x8008, AquaHideout_B2F_Movement_1A0839
+ applymovement SPECIALVAR_8, AquaHideout_B2F_Movement_1A0839
waitmovement 0
msgbox AquaHideout_B2F_Text_1971AE, 4
setflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE