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/rockethideout1.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/rockethideout1.asm')
| -rwxr-xr-x | scripts/rockethideout1.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/rockethideout1.asm b/scripts/rockethideout1.asm index 82561577..d821434d 100755 --- a/scripts/rockethideout1.asm +++ b/scripts/rockethideout1.asm @@ -3,13 +3,13 @@ RocketHideout1Script: ; 44bca (11:4bca) call EnableAutoTextBoxDrawing ld hl, RocketHideout1TrainerHeaders ld de, RocketHideout1ScriptPointers - ld a, [W_ROCKETHIDEOUT1CURSCRIPT] + ld a, [wRocketHideout1CurScript] call ExecuteCurMapScriptInTable - ld [W_ROCKETHIDEOUT1CURSCRIPT], a + ld [wRocketHideout1CurScript], a ret RocketHideout1Script_44be0: ; 44be0 (11:4be0) - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z |