From 269f2c3ba72776e975f5b00d9a1361cadbda42a7 Mon Sep 17 00:00:00 2001 From: dannye Date: Sat, 11 Jun 2016 15:45:24 -0500 Subject: Sync with pokered from August 29, 2015 to April 6, 2016 --- scripts/rockethideout2.asm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'scripts/rockethideout2.asm') diff --git a/scripts/rockethideout2.asm b/scripts/rockethideout2.asm index 621e19e6..58e45d53 100755 --- a/scripts/rockethideout2.asm +++ b/scripts/rockethideout2.asm @@ -2,9 +2,9 @@ RocketHideout2Script: ; 44e27 (11:4e27) call EnableAutoTextBoxDrawing ld hl, RocketHideout2TrainerHeaders ld de, RocketHideout2ScriptPointers - ld a, [W_ROCKETHIDEOUT2CURSCRIPT] + ld a, [wRocketHideout2CurScript] call ExecuteCurMapScriptInTable - ld [W_ROCKETHIDEOUT2CURSCRIPT], a + ld [wRocketHideout2CurScript], a ret RocketHideout2ScriptPointers: ; 44e3a (11:4e3a) @@ -30,7 +30,7 @@ RocketHideout2Script0: ; 44e42 (11:4e42) ld a, $ff ld [wJoyIgnore], a ld a, $3 - ld [W_CURMAPSCRIPT], a + ld [wCurMapScript], a ret ;format: @@ -310,7 +310,7 @@ RocketHideout2Script3: ; 44fc2 (11:4fc2) ld hl, wd736 res 7, [hl] ld a, $0 - ld [W_CURMAPSCRIPT], a + ld [wCurMapScript], a ret LoadSpinnerArrowTiles: ; 45077 (11:5077) -- cgit v1.3.1-sl0p