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/mansion3.asm | |
| parent | ccf4fe54a8e444aaf966fac7b38bc9452c494222 (diff) | |
| parent | 8a5a7d8e68538b727e0c166488265f395603366e (diff) | |
Merge branch 'master' of https://github.com/pret/pokered into rgbgfxrgbgfx
Diffstat (limited to 'scripts/mansion3.asm')
| -rwxr-xr-x | scripts/mansion3.asm | 6 |
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 |