diff options
| author | dannye <corrnondacqb@yahoo.com> | 2016-06-11 15:45:24 -0500 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2016-06-11 15:45:24 -0500 |
| commit | 269f2c3ba72776e975f5b00d9a1361cadbda42a7 (patch) | |
| tree | 459220542fcbfbd48b9725b48597b5740ee1ec0f /scripts/rockethideout4.asm | |
| parent | Clean up main.asm (diff) | |
| download | pokeyellow-269f2c3ba72776e975f5b00d9a1361cadbda42a7.tar.gz pokeyellow-269f2c3ba72776e975f5b00d9a1361cadbda42a7.tar.xz pokeyellow-269f2c3ba72776e975f5b00d9a1361cadbda42a7.zip | |
Sync with pokered
from August 29, 2015 to April 6, 2016
Diffstat (limited to 'scripts/rockethideout4.asm')
| -rwxr-xr-x | scripts/rockethideout4.asm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/scripts/rockethideout4.asm b/scripts/rockethideout4.asm index 30ed3f24..c6d48852 100755 --- a/scripts/rockethideout4.asm +++ b/scripts/rockethideout4.asm @@ -2,9 +2,9 @@ RocketHideout4Script: ; 4545d (11:545d) 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: ; 45510 (11:54a3) @@ -13,8 +13,8 @@ RocketHideout4Script_45510: ; 45510 (11:54a3) 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: ; 454b6 (11:54b6) 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: @@ -364,8 +364,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 |