pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-01-23 09:16:20 -08:00
Code Issues Packages Projects Releases Wiki Activity

Battle animation data is like sprite animation data

Browse Source
This commit is contained in:
Remy Oukaour 2017-12-26 19:27:56 -05:00
parent 35a3a19fda
commit 9bc680bd6d
6 changed files with 1197 additions and 1202 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

974
data/battle_anims/framesets.asm
View File

File diff suppressed because it is too large Load Diff

1396
data/battle_anims/oam.asm
View File

File diff suppressed because it is too large Load Diff

8
engine/battle_anims/engine.asm
View File

@ -88,7 +88,7 @@ BattleAnimOAMUpdate: ; cca09
jp z, .delete jp z, .delete
push af push af
ld hl, wBattleAnimTempOAMFlags ld hl, wBattleAnimTempOAMFlags
ld a, [wBattleAnimTemp7] ld a, [wBattleAnimTempAddSubFlags]
xor [hl] xor [hl]
and $e0 and $e0
ld [hl], a ld [hl], a
@ -200,7 +200,7 @@ InitBattleAnimBuffer: ; ccaaa
and %10000000 and %10000000
ld [wBattleAnimTempOAMFlags], a ld [wBattleAnimTempOAMFlags], a
xor a xor a
ld [wBattleAnimTemp7], a ld [wBattleAnimTempAddSubFlags], a
ld hl, BATTLEANIMSTRUCT_PALETTE ld hl, BATTLEANIMSTRUCT_PALETTE
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]
@ -208,7 +208,7 @@ InitBattleAnimBuffer: ; ccaaa
ld hl, BATTLEANIMSTRUCT_02 ld hl, BATTLEANIMSTRUCT_02
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]
ld [wBattleAnimTemp1], a ld [wBattleAnimTempField02], a
ld hl, BATTLEANIMSTRUCT_TILEID ld hl, BATTLEANIMSTRUCT_TILEID
add hl, bc add hl, bc
ld a, [hli] ld a, [hli]
@ -239,7 +239,7 @@ InitBattleAnimBuffer: ; ccaaa
ld [wBattleAnimTempXCoord], a ld [wBattleAnimTempXCoord], a
ld a, [hli] ld a, [hli]
ld d, a ld d, a
ld a, [wBattleAnimTemp1] ld a, [wBattleAnimTempField02]
cp $ff cp $ff
jr nz, .check_kinesis_softboiled_milkdrink jr nz, .check_kinesis_softboiled_milkdrink
ld a, 5 * 8 ld a, 5 * 8

8
engine/battle_anims/helpers.asm
View File

@ -29,10 +29,11 @@ GetBattleAnimFrame: ; ce7d1
inc [hl] inc [hl]
call .GetPointer call .GetPointer
ld a, [hli] ld a, [hli]
cp -2 cp dorestart_command
jr z, .restart jr z, .restart
cp -1 cp endanim_command
jr z, .repeat_last jr z, .repeat_last
push af push af
ld a, [hl] ld a, [hl]
push hl push hl
@ -41,12 +42,11 @@ GetBattleAnimFrame: ; ce7d1
add hl, bc add hl, bc
ld [hl], a ld [hl], a
pop hl pop hl
.okay .okay
ld a, [hl] ld a, [hl]
and $c0 and $c0
srl a srl a
ld [wBattleAnimTemp7], a ld [wBattleAnimTempAddSubFlags], a
pop af pop af
ret ret

4
engine/sprites.asm
View File

@ -444,9 +444,9 @@ GetSpriteAnimFrame: ; 8d132
inc [hl] inc [hl]
call .GetPointer ; load pointer from SpriteAnimFrameData call .GetPointer ; load pointer from SpriteAnimFrameData
ld a, [hli] ld a, [hli]
cp -2 cp dorestart_command
jr z, .restart jr z, .restart
cp -1 cp endanim_command
jr z, .repeat_last jr z, .repeat_last
push af push af

9
wram.asm
View File

@ -2941,21 +2941,16 @@ wBattleAnimTemp0:: db
wBattleAnimTemp1:: db wBattleAnimTemp1:: db
wBattleAnimTemp2:: db wBattleAnimTemp2:: db
wBattleAnimTemp3:: db wBattleAnimTemp3:: db
wBattleAnimTemp4:: db
wBattleAnimTemp5:: db
wBattleAnimTemp6:: db
wBattleAnimTemp7:: db
wBattleAnimTemp8:: db
NEXTU ; d419 NEXTU ; d419
wBattleAnimTempOAMFlags:: db wBattleAnimTempOAMFlags:: db
ds 1 wBattleAnimTempField02:: db
wBattleAnimTempTileID:: db wBattleAnimTempTileID:: db
wBattleAnimTempXCoord:: db wBattleAnimTempXCoord:: db
wBattleAnimTempYCoord:: db wBattleAnimTempYCoord:: db
wBattleAnimTempXOffset:: db wBattleAnimTempXOffset:: db
wBattleAnimTempYOffset:: db wBattleAnimTempYOffset:: db
ds 1 wBattleAnimTempAddSubFlags:: db
wBattleAnimTempPalette:: db wBattleAnimTempPalette:: db
ENDU ; d422 ENDU ; d422