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/silphco11.asm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'scripts/silphco11.asm') diff --git a/scripts/silphco11.asm b/scripts/silphco11.asm index 42e8d574..fb341105 100755 --- a/scripts/silphco11.asm +++ b/scripts/silphco11.asm @@ -3,13 +3,13 @@ SilphCo11Script: ; 62111 (18:60fa) call EnableAutoTextBoxDrawing ld hl, SilphCo11TrainerHeaders ld de, SilphCo11ScriptPointers - ld a, [W_SILPHCO11CURSCRIPT] + ld a, [wSilphCo11CurScript] call ExecuteCurMapScriptInTable - ld [W_SILPHCO11CURSCRIPT], a + ld [wSilphCo11CurScript], a ret SilphCo11Script_62127: ; 62127 (18:6110) - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z @@ -75,8 +75,8 @@ SilphCo11Script_62185: ; 62185 (18:61c4) xor a ld [wJoyIgnore], a SilphCo11Script_62189: ; 62189 (18:61c8) - ld [W_SILPHCO11CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wSilphCo11CurScript], a + ld [wCurMapScript], a ret SilphCo11ScriptPointers: ; 62190 (18:6190) -- cgit v1.3.1-sl0p