Update sprite macros for draw code, add new macros

This commit is contained in:
scawful
2024-12-19 09:44:08 -05:00
parent 548379f95a
commit 2a996a69e5
7 changed files with 179 additions and 310 deletions

View File

@@ -47,7 +47,6 @@ Sprite_ThunderGhost_Long:
RTL
}
Sprite_ThunderGhost_Prep:
{
PHB : PHK : PLB
@@ -66,14 +65,11 @@ Sprite_ThunderGhost_Prep:
Sprite_ThunderGhost_Main:
{
LDA.w SprAction, X
JSL UseImplicitRegIndexedLocalJumpTable
dw ThunderGhostFaceForward
dw ThunderGhostLeft
dw ThunderGhostRight
dw CastThunderLeft
dw CastThunderRight
%SpriteJumpTable(ThunderGhostFaceForward,
ThunderGhostLeft,
ThunderGhostRight,
CastThunderLeft,
CastThunderRight)
ThunderGhostFaceForward:
{
@@ -124,7 +120,6 @@ Sprite_ThunderGhost_Main:
}
}
Sprite_ThunderGhost_Move:
{
JSL Sprite_Move
@@ -215,63 +210,8 @@ SpawnLightningAttack:
Sprite_ThunderGhost_Draw:
{
JSL Sprite_PrepOamCoord
JSL Sprite_OAM_AllocateDeferToPlayer
%DrawSprite()
LDA $0DC0, X : CLC : ADC $0D90, X : TAY;Animation Frame
LDA .start_index, Y : STA $06
LDA.w SprFlash, X : STA $08
PHX
LDX .nbr_of_tiles, Y ;amount of tiles -1
LDY.b #$00
.nextTile
PHX ; Save current Tile Index?
TXA : CLC : ADC $06 ; Add Animation Index Offset
PHA ; Keep the value with animation index offset?
ASL A : TAX
REP #$20
LDA $00 : CLC : ADC .x_offsets, X : STA ($90), Y
AND.w #$0100 : STA $0E
INY
LDA $02 : CLC : ADC .y_offsets, X : STA ($90), Y
CLC : ADC #$0010 : CMP.w #$0100
SEP #$20
BCC .on_screen_y
LDA.b #$F0 : STA ($90), Y ;Put the sprite out of the way
STA $0E
.on_screen_y
PLX ; Pullback Animation Index Offset (without the *2 not 16bit anymore)
INY
LDA .chr, X : STA ($90), Y
INY
LDA .properties, X : ORA $08 : STA ($90), Y
PHY
TYA : LSR #2 : TAY
LDA .sizes, X : ORA $0F : STA ($92), Y ; store size in oam buffer
PLY : INY
PLX : DEX : BPL .nextTile
PLX
RTS
; =======================================================
.start_index
db $00, $03, $06, $09, $0C, $0F, $12, $15
.nbr_of_tiles