diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-07-07 17:36:28 -0400 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-07-07 17:36:28 -0400 |
| commit | 4274e105f6739a92788f9b1fdba55526d7614f8a (patch) | |
| tree | 0f0bda1c77a384b4255e724122ac3f6bf0af7202 /engine/battle | |
| parent | Complete documentation of bank3d (diff) | |
| download | pokeyellow-4274e105f6739a92788f9b1fdba55526d7614f8a.tar.gz pokeyellow-4274e105f6739a92788f9b1fdba55526d7614f8a.tar.xz pokeyellow-4274e105f6739a92788f9b1fdba55526d7614f8a.zip | |
Bank3d addresses and fixes.
Also documentation of new super rod code and slight more documentation
of multiply_divide.asm
Diffstat (limited to 'engine/battle')
| -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 961f25cf..d32b80b9 100644 --- a/engine/battle/get_trainer_name.asm +++ b/engine/battle/get_trainer_name.asm @@ -1,16 +1,16 @@ -GetTrainerName_: ; 13a58 (4:7a58) +GetTrainerName_: ; f67a5 (3d:67a5) ld hl, W_GRASSRATE ld a, [wLinkState] and a - jr nz, .rival + jr nz, .foundName ld hl, W_RIVALNAME ld a, [W_TRAINERCLASS] 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 |