aboutsummaryrefslogtreecommitdiffstats
path: root/engine/battle
diff options
context:
space:
mode:
authorluckytyphlosion <alan.rj.huang@gmail.com>2015-11-01 15:42:29 -0500
committerluckytyphlosion <alan.rj.huang@gmail.com>2015-11-01 15:42:29 -0500
commit335bf36311e24f9b652a3970ab07413a03bba056 (patch)
tree658c8bde184a9fdeb4e23d56c71880ed20a8bc1c /engine/battle
parentNaming screen functions. (diff)
downloadpokeyellow-335bf36311e24f9b652a3970ab07413a03bba056.tar.gz
pokeyellow-335bf36311e24f9b652a3970ab07413a03bba056.tar.xz
pokeyellow-335bf36311e24f9b652a3970ab07413a03bba056.zip
oak_speech2.asm
Also replace W_RIVALNAME with wRivalName
Diffstat (limited to 'engine/battle')
-rw-r--r--engine/battle/get_trainer_name.asm2
1 files changed, 1 insertions, 1 deletions
diff --git a/engine/battle/get_trainer_name.asm b/engine/battle/get_trainer_name.asm
index cf09ac66..16a94ec5 100644
--- a/engine/battle/get_trainer_name.asm
+++ b/engine/battle/get_trainer_name.asm
@@ -3,7 +3,7 @@ GetTrainerName_: ; f67a5 (3d:67a5)
ld a, [wLinkState]
and a
jr nz, .foundName
- ld hl, W_RIVALNAME
+ ld hl, wRivalName
ld a, [W_TRAINERCLASS]
cp SONY1
jr z, .foundName