summaryrefslogtreecommitdiff
path: root/engine/battle/common_text.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 /engine/battle/common_text.asm
parent1ee9fb408c47c3a15a38b1bb407d86ed1a5d2fcc (diff)
No more W_
Diffstat (limited to 'engine/battle/common_text.asm')
-rw-r--r--engine/battle/common_text.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/battle/common_text.asm b/engine/battle/common_text.asm
index a1afcb75..476284f0 100644
--- a/engine/battle/common_text.asm
+++ b/engine/battle/common_text.asm
@@ -1,8 +1,8 @@
PrintBeginningBattleText: ; 58d99 (16:4d99)
- ld a, [W_ISINBATTLE]
+ ld a, [wIsInBattle]
dec a
jr nz, .trainerBattle
- ld a, [W_CURMAP]
+ ld a, [wCurMap]
cp POKEMONTOWER_3
jr c, .notPokemonTower
cp LAVENDER_HOUSE_1
@@ -11,7 +11,7 @@ PrintBeginningBattleText: ; 58d99 (16:4d99)
ld a, [wEnemyMonSpecies2]
call PlayCry
ld hl, WildMonAppearedText
- ld a, [W_MOVEMISSED]
+ ld a, [wMoveMissed]
and a
jr z, .notFishing
ld hl, HookedMonAttackedText