diff options
| author | dannye <corrnondacqb@yahoo.com> | 2016-01-12 18:45:02 -0600 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2016-01-12 18:45:02 -0600 |
| commit | 5914540ba780d7936fd6624d6fde2d67a9f7a773 (patch) | |
| tree | a1ce27018f39d98f49d89468df426d0291e18560 /scripts/mansion2.asm | |
| parent | ccf4fe54a8e444aaf966fac7b38bc9452c494222 (diff) | |
| parent | 8a5a7d8e68538b727e0c166488265f395603366e (diff) | |
Merge branch 'master' of https://github.com/pret/pokered into rgbgfxrgbgfx
Diffstat (limited to 'scripts/mansion2.asm')
| -rwxr-xr-x | scripts/mansion2.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/mansion2.asm b/scripts/mansion2.asm index 22bc2b12..7fe09e4b 100755 --- a/scripts/mansion2.asm +++ b/scripts/mansion2.asm @@ -3,13 +3,13 @@ Mansion2Script: ; 51fd8 (14:5fd8) call EnableAutoTextBoxDrawing ld hl, Mansion2TrainerHeaders ld de, Mansion2ScriptPointers - ld a, [W_MANSION2CURSCRIPT] + ld a, [wMansion2CurScript] call ExecuteCurMapScriptInTable - ld [W_MANSION2CURSCRIPT], a + ld [wMansion2CurScript], a ret Mansion2Script_51fee: ; 51fee (14:5fee) - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z @@ -112,7 +112,7 @@ Mansion2Text5: ; 52087 (14:6087) jr nz, .asm_520b9 ld a, $1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld hl, wd126 + ld hl, wCurrentMapScriptFlags set 5, [hl] ld hl, Mansion2Text_520c7 call PrintText |