diff options
| author | YamaArashi <shadow962@live.com> | 2016-06-12 00:54:14 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-12 00:54:14 -0700 |
| commit | 2b2c6fefd311101c87845c8c498746dc74bd725f (patch) | |
| tree | 3f917e1bf896e380cfea6d2d876ff68a4db87a57 /engine/battle/get_trainer_name.asm | |
| parent | Remove the last address comments (diff) | |
| parent | more syncing with pokeyellow (diff) | |
| download | pokeyellow-2b2c6fefd311101c87845c8c498746dc74bd725f.tar.gz pokeyellow-2b2c6fefd311101c87845c8c498746dc74bd725f.tar.xz pokeyellow-2b2c6fefd311101c87845c8c498746dc74bd725f.zip | |
Merge pull request #134 from YamaArashi/master
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 |