diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-10-30 17:32:09 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-10-30 17:41:03 -0400 |
| commit | 4a323cf591f27c928acc295f0044ff1608ebada1 (patch) | |
| tree | 70b4822c8e3e3429271c4c98a706fc83300b37fc /engine/battle_anims | |
| parent | 9b0002161be17ff7369a987a3de3c8776992d3a7 (diff) | |
UnusedSpriteAnimGFX was to sprite anims as AnimObjGFX is to battle anims
Diffstat (limited to 'engine/battle_anims')
| -rw-r--r-- | engine/battle_anims/core.asm | 2 | ||||
| -rw-r--r-- | engine/battle_anims/helpers.asm | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/engine/battle_anims/core.asm b/engine/battle_anims/core.asm index ef5aee3f5..51916ef42 100644 --- a/engine/battle_anims/core.asm +++ b/engine/battle_anims/core.asm @@ -313,3 +313,5 @@ _ExecuteBGEffects: _QueueBGEffect: callfar QueueBGEffect ret + +INCLUDE "data/battle_anims/objects.asm" diff --git a/engine/battle_anims/helpers.asm b/engine/battle_anims/helpers.asm index 208ab6140..b533988ef 100644 --- a/engine/battle_anims/helpers.asm +++ b/engine/battle_anims/helpers.asm @@ -67,6 +67,7 @@ GetBattleAnimFrame: ld hl, BATTLEANIMSTRUCT_DURATION add hl, bc ld [hl], a + dec a ld hl, BATTLEANIMSTRUCT_FRAME add hl, bc @@ -87,7 +88,7 @@ GetBattleAnimFrame: ld hl, BATTLEANIMSTRUCT_FRAME add hl, bc ld l, [hl] - ld h, $0 + ld h, 0 add hl, hl add hl, de ret @@ -121,3 +122,9 @@ LoadBattleAnimGFX: call DecompressRequest2bpp pop bc ret + +INCLUDE "data/battle_anims/framesets.asm" + +INCLUDE "data/battle_anims/oam.asm" + +INCLUDE "data/battle_anims/object_gfx.asm" |