diff options
| author | Thomas Winwood <twwinwood@gmail.com> | 2018-07-21 02:06:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-21 02:06:31 +0100 |
| commit | 23ef2f50a7b94c23b50e9e690a7482ac349c9ef3 (patch) | |
| tree | 63c20c67efbdf8334c6e273f78065b83135e3886 /engine/battle/read_trainer_attributes.asm | |
| parent | 17a4d0540acc00e3f5ad260009115eb36e72b7d2 (diff) | |
| parent | 2d73d040d16a7836f935a7a6cb2a311aed2ca5a2 (diff) | |
Merge branch 'master' into the-diffening
Diffstat (limited to 'engine/battle/read_trainer_attributes.asm')
| -rw-r--r-- | engine/battle/read_trainer_attributes.asm | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/engine/battle/read_trainer_attributes.asm b/engine/battle/read_trainer_attributes.asm index 0b9507e0d..6db8f4204 100644 --- a/engine/battle/read_trainer_attributes.asm +++ b/engine/battle/read_trainer_attributes.asm @@ -1,4 +1,4 @@ -GetTrainerClassName: ; 3952d +GetTrainerClassName: ld hl, wRivalName ld a, c cp RIVAL1 @@ -19,7 +19,7 @@ GetTrainerClassName: ; 3952d pop de ret -GetOTName: ; 39550 +GetOTName: ld hl, wOTPlayerName ld a, [wLinkMode] and a @@ -44,7 +44,7 @@ GetOTName: ; 39550 pop de ret -GetTrainerAttributes: ; 3957b +GetTrainerAttributes: ld a, [wTrainerClass] ld c, a call GetOTName @@ -62,3 +62,5 @@ GetTrainerAttributes: ; 3957b ld a, [hl] ld [wEnemyTrainerBaseReward], a ret + +INCLUDE "data/trainers/attributes.asm" |