aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/mansion3.asm
diff options
context:
space:
mode:
authordannye <corrnondacqb@yahoo.com>2016-06-11 15:45:24 -0500
committerdannye <corrnondacqb@yahoo.com>2016-06-11 15:45:24 -0500
commit269f2c3ba72776e975f5b00d9a1361cadbda42a7 (patch)
tree459220542fcbfbd48b9725b48597b5740ee1ec0f /scripts/mansion3.asm
parentClean up main.asm (diff)
downloadpokeyellow-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/mansion3.asm')
-rwxr-xr-xscripts/mansion3.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/mansion3.asm b/scripts/mansion3.asm
index e49667ef..049bfeef 100755
--- a/scripts/mansion3.asm
+++ b/scripts/mansion3.asm
@@ -3,13 +3,13 @@ Mansion3Script: ; 521ee (14:61ee)
call EnableAutoTextBoxDrawing
ld hl, Mansion3TrainerHeader0
ld de, Mansion3ScriptPointers
- ld a, [W_MANSION3CURSCRIPT]
+ ld a, [wMansion3CurScript]
call ExecuteCurMapScriptInTable
- ld [W_MANSION3CURSCRIPT], a
+ ld [wMansion3CurScript], a
ret
Mansion3Script_52204: ; 52204 (14:6204)
- ld hl, wd126
+ ld hl, wCurrentMapScriptFlags
bit 5, [hl]
res 5, [hl]
ret z