diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-10 13:47:57 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-10 13:47:57 -0500 |
| commit | 417937cffc2a7c3cfac49f3b00caf1a856d0a925 (patch) | |
| tree | 74e731a22fad12bbf7d122be1c2849b8682cef06 /engine/routines | |
| parent | cc95d1208d4a6b8291a5430a8d652a9337074788 (diff) | |
Resolve #461
Diffstat (limited to 'engine/routines')
| -rw-r--r-- | engine/routines/loadpushoam.asm | 2 | ||||
| -rw-r--r-- | engine/routines/switchpartymons.asm | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/engine/routines/loadpushoam.asm b/engine/routines/loadpushoam.asm index 6af0ddf6d..c07c06d0f 100644 --- a/engine/routines/loadpushoam.asm +++ b/engine/routines/loadpushoam.asm @@ -13,7 +13,7 @@ LoadPushOAM:: ; 4031 .PushOAM: ; 403f ld a, HIGH(Sprites) ld [rDMA], a - ld a, (SpritesEnd - Sprites) / 4 ; 40 + ld a, NUM_SPRITE_OAM_STRUCTS .pushoam_loop dec a jr nz, .pushoam_loop diff --git a/engine/routines/switchpartymons.asm b/engine/routines/switchpartymons.asm index cde9c82b2..1379dff9c 100644 --- a/engine/routines/switchpartymons.asm +++ b/engine/routines/switchpartymons.asm @@ -25,13 +25,13 @@ _SwitchPartyMons: ld a, " " call ByteFill pop af - ld hl, Sprites - ld bc, $10 + ld hl, Sprite01 + ld bc, 4 * SPRITEOAMSTRUCT_LENGTH call AddNTimes - ld de, $4 - ld c, $4 + ld de, SPRITEOAMSTRUCT_LENGTH + ld c, 4 .gfx_loop - ld [hl], $a0 + ld [hl], SCREEN_WIDTH_PX ; y (off-screen) add hl, de dec c jr nz, .gfx_loop |