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/mansion1.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/mansion1.asm')
| -rwxr-xr-x | scripts/mansion1.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/mansion1.asm b/scripts/mansion1.asm index bbfb0a0b..d342c295 100755 --- a/scripts/mansion1.asm +++ b/scripts/mansion1.asm @@ -3,13 +3,13 @@ Mansion1Script: ; 442af (11:42af) call EnableAutoTextBoxDrawing ld hl, Mansion1TrainerHeaders ld de, Mansion1ScriptPointers - ld a, [W_MANSION1CURSCRIPT] + ld a, [wMansion1CurScript] call ExecuteCurMapScriptInTable - ld [W_MANSION1CURSCRIPT], a + ld [wMansion1CurScript], a ret Mansion1Subscript1: ; 442c5 (11:42c5) - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z @@ -106,7 +106,7 @@ Mansion1Text4: ; 4435a (11:435a) jr nz, .asm_4438c ld a, $1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld hl, wd126 + ld hl, wCurrentMapScriptFlags set 5, [hl] ld hl, MansionSwitchPressedText call PrintText |