diff options
Diffstat (limited to 'engine/battle/get_trainer_name.asm')
| -rw-r--r-- | engine/battle/get_trainer_name.asm | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/engine/battle/get_trainer_name.asm b/engine/battle/get_trainer_name.asm index 961f25cf..36ca019e 100644 --- a/engine/battle/get_trainer_name.asm +++ b/engine/battle/get_trainer_name.asm @@ -1,16 +1,16 @@ -GetTrainerName_: ; 13a58 (4:7a58) - ld hl, W_GRASSRATE +GetTrainerName_: + ld hl, wGrassRate ld a, [wLinkState] and a - jr nz, .rival - ld hl, W_RIVALNAME - ld a, [W_TRAINERCLASS] + 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,7 +18,7 @@ GetTrainerName_: ; 13a58 (4:7a58) ld [wPredefBank], a call GetName ld hl, wcd6d -.rival - ld de, W_TRAINERNAME +.foundName + ld de, wTrainerName ld bc, $d jp CopyData |