diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-03-23 21:05:39 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-23 21:05:39 -0400 |
| commit | 63798d56d05cf87ada77bd26727ea7725630b0b2 (patch) | |
| tree | c90b2bebe86dffe78e6597d220f70196d3e69e25 /engine/battle_anims/anim_commands.asm | |
| parent | 624864307e4e7a5055c01d7f06145feec35527a7 (diff) | |
| parent | 0345e4fb0e3f39a038e9eced72380a5a1ab6694f (diff) | |
Merge pull request #699 from Rangi42/master
Resolve some miscellaneous issues
Diffstat (limited to 'engine/battle_anims/anim_commands.asm')
| -rw-r--r-- | engine/battle_anims/anim_commands.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/battle_anims/anim_commands.asm b/engine/battle_anims/anim_commands.asm index 113e9df37..bbfc1240e 100644 --- a/engine/battle_anims/anim_commands.asm +++ b/engine/battle_anims/anim_commands.asm @@ -237,14 +237,14 @@ BattleAnim_ClearOAM: bit BATTLEANIM_KEEPSPRITES_F, a jr z, .delete - ; Instead of deleting the sprites, make them all use palette 0 (monochrome) + ; Instead of deleting the sprites, make them all use PAL_BATTLE_OB_ENEMY ld hl, wVirtualOAMSprite00Attributes ld c, NUM_SPRITE_OAM_STRUCTS .loop ld a, [hl] - and $ff ^ (PALETTE_MASK | VRAM_BANK_1) + and $ff ^ (PALETTE_MASK | VRAM_BANK_1) ; PAL_BATTLE_OB_ENEMY (0) ld [hli], a -rept SPRITEOAMSTRUCT_LENGTH + -1 +rept SPRITEOAMSTRUCT_LENGTH - 1 inc hl endr dec c |