summaryrefslogtreecommitdiff
path: root/scripts/rockethideout4.asm
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/rockethideout4.asm')
-rwxr-xr-xscripts/rockethideout4.asm18
1 files changed, 9 insertions, 9 deletions
diff --git a/scripts/rockethideout4.asm b/scripts/rockethideout4.asm
index 9c2c4d82..2b3e0e89 100755
--- a/scripts/rockethideout4.asm
+++ b/scripts/rockethideout4.asm
@@ -2,9 +2,9 @@ RocketHideout4Script:
call EnableAutoTextBoxDrawing
ld hl, RocketHideout4TrainerHeader0
ld de, RocketHideout4ScriptPointers
- ld a, [W_ROCKETHIDEOUT4CURSCRIPT]
+ ld a, [wRocketHideout4CurScript]
call ExecuteCurMapScriptInTable
- ld [W_ROCKETHIDEOUT4CURSCRIPT], a
+ ld [wRocketHideout4CurScript], a
ret
RocketHideout4Script_45510:
@@ -13,8 +13,8 @@ RocketHideout4Script_45510:
xor a
ld [wJoyIgnore], a
RocketHideout4Script_4551e:
- ld [W_ROCKETHIDEOUT4CURSCRIPT], a
- ld [W_CURMAPSCRIPT], a
+ ld [wRocketHideout4CurScript], a
+ ld [wCurMapScript], a
ret
RocketHideout4Script_45525:
@@ -61,11 +61,11 @@ RocketHideout4Script3:
call GBFadeInFromBlack
xor a
ld [wJoyIgnore], a
- ld hl, wd126
+ ld hl, wCurrentMapScriptFlags
set 5, [hl]
ld a, $0
- ld [W_ROCKETHIDEOUT4CURSCRIPT], a
- ld [W_CURMAPSCRIPT], a
+ ld [wRocketHideout4CurScript], a
+ ld [wCurMapScript], a
ret
RocketHideout4Script0:
@@ -363,8 +363,8 @@ RocketHideout4Text0:
xor a
ld [hJoyHeld], a
ld a, $3
- ld [W_ROCKETHIDEOUT4CURSCRIPT], a
- ld [W_CURMAPSCRIPT], a
+ ld [wRocketHideout4CurScript], a
+ ld [wCurMapScript], a
jr .asm_45801
.asm_457fb