diff options
| author | dannye <33dannye@gmail.com> | 2020-01-06 22:07:33 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2020-01-06 22:07:33 -0600 |
| commit | e7be25948dfeef257697a7aa30706339f6ba014b (patch) | |
| tree | 973d0ad95361a1dfd1c371be59a300be19532e47 /home/trainers.asm | |
| parent | 99d16d616d5f70754dd6aa567e478e587a733d8c (diff) | |
| parent | 94ebdab6d350fd6ebfd43c5a84710ed14dade8ca (diff) | |
Merge branch 'master' into audio-macros
Diffstat (limited to 'home/trainers.asm')
| -rw-r--r-- | home/trainers.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/home/trainers.asm b/home/trainers.asm index 9d012f719..e9971be3f 100644 --- a/home/trainers.asm +++ b/home/trainers.asm @@ -15,7 +15,7 @@ _CheckTrainerBattle:: ; Skip the player object. ld a, 1 - ld de, wMapObjects + OBJECT_LENGTH + ld de, wMapObjects + MAPOBJECT_LENGTH .loop @@ -78,7 +78,7 @@ _CheckTrainerBattle:: .next pop de - ld hl, OBJECT_LENGTH + ld hl, MAPOBJECT_LENGTH add hl, de ld d, h ld e, l |