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/mansion4.asm | |
parent | 2bb64d11e6015e39e934e7359697c08636645994 (diff) |
Sync with pokered
from August 29, 2015 to April 6, 2016
Diffstat (limited to 'scripts/mansion4.asm')
-rwxr-xr-x | scripts/mansion4.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/mansion4.asm b/scripts/mansion4.asm index 59ee3704..c506a407 100755 --- a/scripts/mansion4.asm +++ b/scripts/mansion4.asm @@ -3,13 +3,13 @@ Mansion4Script: ; 523b9 (14:63b9) call EnableAutoTextBoxDrawing ld hl, Mansion4TrainerHeader0 ld de, Mansion4ScriptPointers - ld a, [W_MANSION4CURSCRIPT] + ld a, [wMansion4CurScript] call ExecuteCurMapScriptInTable - ld [W_MANSION4CURSCRIPT], a + ld [wMansion4CurScript], a ret Mansion4Script_523cf: ; 523cf (14:63cf) - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z |