From 269f2c3ba72776e975f5b00d9a1361cadbda42a7 Mon Sep 17 00:00:00 2001 From: dannye Date: Sat, 11 Jun 2016 15:45:24 -0500 Subject: Sync with pokered from August 29, 2015 to April 6, 2016 --- scripts/silphco6.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'scripts/silphco6.asm') 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 -- cgit v1.3.1-sl0p