summaryrefslogtreecommitdiff
path: root/scripts/silphco11.asm
diff options
context:
space:
mode:
authordannye <corrnondacqb@yahoo.com>2015-08-30 21:38:41 -0500
committerdannye <corrnondacqb@yahoo.com>2015-08-30 21:38:41 -0500
commit38065a744de1065cc021a4cafe22476f8425448d (patch)
treea37a103d7c22f3cc5f62689e5062877961493caa /scripts/silphco11.asm
parent1ee9fb408c47c3a15a38b1bb407d86ed1a5d2fcc (diff)
No more W_
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 4c83c20d..79a2c328 100755
--- a/scripts/silphco11.asm
+++ b/scripts/silphco11.asm
@@ -3,9 +3,9 @@ SilphCo11Script: ; 620fa (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_62110: ; 62110 (18:6110)
@@ -150,8 +150,8 @@ SilphCo11Script_621c4: ; 621c4 (18:61c4)
ld [wJoyIgnore], a
SilphCo11Script_621c8: ; 621c8 (18:61c8)
- ld [W_SILPHCO11CURSCRIPT], a
- ld [W_CURMAPSCRIPT], a
+ ld [wSilphCo11CurScript], a
+ ld [wCurMapScript], a
ret
SilphCo11ScriptPointers: ; 621cf (18:61cf)
@@ -205,7 +205,7 @@ SilphCo11Script_6221a: ; 6221a (18:621a)
jp SetSpriteFacingDirectionAndDelay
SilphCo11Script5: ; 62227 (18:6227)
- ld a, [W_ISINBATTLE]
+ ld a, [wIsInBattle]
cp $ff
jp z, SilphCo11Script_621c4
ld a, [wcf0d]