summaryrefslogtreecommitdiff
path: root/engine/battle/get_trainer_name.asm
diff options
context:
space:
mode:
Diffstat (limited to 'engine/battle/get_trainer_name.asm')
-rw-r--r--engine/battle/get_trainer_name.asm9
1 files changed, 5 insertions, 4 deletions
diff --git a/engine/battle/get_trainer_name.asm b/engine/battle/get_trainer_name.asm
index deed8e95..e051a02a 100644
--- a/engine/battle/get_trainer_name.asm
+++ b/engine/battle/get_trainer_name.asm
@@ -2,15 +2,15 @@ GetTrainerName_:
ld hl, wGrassRate
ld a, [wLinkState]
and a
- jr nz, .rival
+ jr nz, .foundName
ld hl, wRivalName
ld a, [wTrainerClass]
cp SONY1
- jr z, .rival
+ jr z, .foundName
cp SONY2
- jr z, .rival
+ jr z, .foundName
cp SONY3
- jr z, .rival
+ jr z, .foundName
ld [wd0b5], a
ld a, TRAINER_NAME
ld [wNameListType], a
@@ -18,6 +18,7 @@ GetTrainerName_:
ld [wPredefBank], a
call GetName
ld hl, wcd6d
+.foundName
.rival
ld de, wTrainerName
ld bc, $d