diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-11-05 23:50:03 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-05 23:50:03 -0500 |
| commit | d3f13528754b985e892385dbd88c3c9a95681f1b (patch) | |
| tree | 4a18885606996ff59bb714afb5db9a548e2f94a7 /engine/battle/read_trainer_party.asm | |
| parent | Port some formatting from pokeyellow (diff) | |
| parent | Sync more with pokeyellow (diff) | |
| download | pokeyellow-d3f13528754b985e892385dbd88c3c9a95681f1b.tar.gz pokeyellow-d3f13528754b985e892385dbd88c3c9a95681f1b.tar.xz pokeyellow-d3f13528754b985e892385dbd88c3c9a95681f1b.zip | |
Merge pull request #301 from Rangi42/master
Sync home and macro code with pokeyellow
Diffstat (limited to 'engine/battle/read_trainer_party.asm')
| -rwxr-xr-x | engine/battle/read_trainer_party.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/battle/read_trainer_party.asm b/engine/battle/read_trainer_party.asm index 7e5c1249..a0132a4f 100755 --- a/engine/battle/read_trainer_party.asm +++ b/engine/battle/read_trainer_party.asm @@ -16,7 +16,7 @@ ReadTrainer: ; get the pointer to trainer data for this class ld a, [wCurOpponent] - sub $C9 ; convert value from pokemon to trainer + sub OPP_ID_OFFSET + 1 ; convert value from pokemon to trainer add a ld hl, TrainerDataPointers ld c, a @@ -79,7 +79,7 @@ ReadTrainer: pop hl jr .SpecialTrainer .AddLoneMove -; does the trainer have a single monster with a different move +; does the trainer have a single monster with a different move? ld a, [wLoneAttackNo] ; Brock is 01, Misty is 02, Erika is 04, etc and a jr z, .AddTeamMove |