summaryrefslogtreecommitdiff
path: root/scripts/silphco11.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/silphco11.asm
parent2bb64d11e6015e39e934e7359697c08636645994 (diff)
Sync with pokered
from August 29, 2015 to April 6, 2016
Diffstat (limited to 'scripts/silphco11.asm')
-rwxr-xr-xscripts/silphco11.asm10
1 files changed, 5 insertions, 5 deletions
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)