diff options
| author | ElectroDeoxys <ElectroDeoxys@gmail.com> | 2021-02-03 00:01:13 +0000 |
|---|---|---|
| committer | ElectroDeoxys <ElectroDeoxys@gmail.com> | 2021-02-03 00:04:40 +0000 |
| commit | 68b8291b1920bcae99750f4bb97b7c01b73f786c (patch) | |
| tree | 134e5ee49f29c266789de1d00ce679b78153e891 /src/engine/bank04.asm | |
| parent | dc57997f0e3268e6c9a621429f01c55a96e21bc8 (diff) | |
| parent | ab9b857e68af66e8bc37628bd76dbba337971a15 (diff) | |
Merge branch 'anims' of https://github.com/ElectroDeoxys/poketcg
Diffstat (limited to 'src/engine/bank04.asm')
| -rw-r--r-- | src/engine/bank04.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/engine/bank04.asm b/src/engine/bank04.asm index 65bf179..b8a40a6 100644 --- a/src/engine/bank04.asm +++ b/src/engine/bank04.asm @@ -1466,7 +1466,7 @@ Func_129fd: ; 129fd (4:69fd) ret ; 0x12a13 -Func_12a13: ; 12a13 (4:6a13) +GetSpriteAnimCounter: ; 12a13 (4:6a13) ld a, [wWhichSprite] push hl push bc @@ -1683,11 +1683,11 @@ HandleAnimationFrame: ; 12b13 (4:6b13) adc 0 ld [hl], a - ld de, wd23e + ld de, wLoadedPalData ld bc, SPRITE_FRAME_OFFSET_SIZE call CopyBankedDataToDE pop hl ; beginning of current sprite_anim_buffer - ld de, wd23e + ld de, wLoadedPalData ld a, [de] call GetAnimFramePointerFromOffset inc de |