diff options
| author | YamaArashi <shadow962@live.com> | 2016-06-11 21:30:05 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2016-06-12 00:52:13 -0700 |
| commit | fd2235e678c58cebd6255b5e658e704ee5138591 (patch) | |
| tree | 6b7a3e2ae3030f4078ac4cbf9b59cd9529055fa2 /engine/battle/get_trainer_name.asm | |
| parent | a51037eeeedb03e29d8675626018cf02750882fa (diff) | |
sync engine code with pokeyellow
Diffstat (limited to 'engine/battle/get_trainer_name.asm')
| -rw-r--r-- | engine/battle/get_trainer_name.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/battle/get_trainer_name.asm b/engine/battle/get_trainer_name.asm index deed8e95..36ca019e 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,7 +18,7 @@ GetTrainerName_: ld [wPredefBank], a call GetName ld hl, wcd6d -.rival +.foundName ld de, wTrainerName ld bc, $d jp CopyData |