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/silphco6.asm | |
parent | 2bb64d11e6015e39e934e7359697c08636645994 (diff) |
Sync with pokered
from August 29, 2015 to April 6, 2016
Diffstat (limited to 'scripts/silphco6.asm')
-rwxr-xr-x | scripts/silphco6.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/silphco6.asm b/scripts/silphco6.asm index fa199069..406bc373 100755 --- a/scripts/silphco6.asm +++ b/scripts/silphco6.asm @@ -3,13 +3,13 @@ SilphCo6Script: ; 1a1a9 (6:61a9) call EnableAutoTextBoxDrawing ld hl, SilphCo6TrainerHeaders ld de, SilphCo6ScriptPointers - ld a, [W_SILPHCO6CURSCRIPT] + ld a, [wSilphCo6CurScript] call ExecuteCurMapScriptInTable - ld [W_SILPHCO6CURSCRIPT], a + ld [wSilphCo6CurScript], a ret SilphCo6Script_1a1bf: ; 1a1bf (6:61bf) - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z |