scawful/oracle-of-secrets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup Leever

Browse Source
This commit is contained in:
scawful
2024-12-01 10:14:40 -05:00
parent f0aa7f19ab
commit f9683a2280
1 changed files with 64 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

138
Sprites/Enemies/leever.asm
View File

@@ -36,14 +36,6 @@ Sprite_Leever_Long:
RTL RTL
} }
Sprite_Leever_Prep:
{
PHB : PHK : PLB
LDA.b #$40 : STA.w SprTimerA, X
PLB
RTL
}
Sprite_Leever_Move: Sprite_Leever_Move:
{ {
JSL Sprite_ApplySpeedTowardsPlayer JSL Sprite_ApplySpeedTowardsPlayer
@@ -117,93 +109,91 @@ Sprite_Leever_Main:
JSR Sprite_Leever_Move JSR Sprite_Leever_Move
RTS RTS
} }
} }
Sprite_Leever_Draw: Sprite_Leever_Draw:
{ {
JSL Sprite_PrepOamCoord JSL Sprite_PrepOamCoord
JSL Sprite_OAM_AllocateDeferToPlayer JSL Sprite_OAM_AllocateDeferToPlayer
LDA $0DC0, X : CLC : ADC $0D90, X : TAY;Animation Frame LDA $0DC0, X : CLC : ADC $0D90, X : TAY;Animation Frame
LDA .start_index, Y : STA $06 LDA .start_index, Y : STA $06
PHX PHX
LDX .nbr_of_tiles, Y ;amount of tiles -1 LDX .nbr_of_tiles, Y ;amount of tiles -1
LDY.b #$00 LDY.b #$00
.nextTile .nextTile
PHX ; Save current Tile Index? PHX ; Save current Tile Index?
TXA : CLC : ADC $06 ; Add Animation Index Offset TXA : CLC : ADC $06 ; Add Animation Index Offset
PHA ; Keep the value with animation index offset? PHA ; Keep the value with animation index offset?
ASL A : TAX ASL A : TAX
REP #$20 REP #$20
LDA $00 : CLC : ADC .x_offsets, X : STA ($90), Y LDA $00 : CLC : ADC .x_offsets, X : STA ($90), Y
AND.w #$0100 : STA $0E AND.w #$0100 : STA $0E
INY INY
LDA $02 : CLC : ADC .y_offsets, X : STA ($90), Y LDA $02 : CLC : ADC .y_offsets, X : STA ($90), Y
CLC : ADC #$0010 : CMP.w #$0100 CLC : ADC #$0010 : CMP.w #$0100
SEP #$20 SEP #$20
BCC .on_screen_y BCC .on_screen_y
LDA.b #$F0 : STA ($90), Y ;Put the sprite out of the way LDA.b #$F0 : STA ($90), Y ;Put the sprite out of the way
STA $0E STA $0E
.on_screen_y .on_screen_y
PLX ; Pullback Animation Index Offset (without the *2 not 16bit anymore) PLX ; Pullback Animation Index Offset (without the *2 not 16bit anymore)
INY INY
LDA .chr, X : STA ($90), Y LDA .chr, X : STA ($90), Y
INY INY
LDA .properties, X : STA ($90), Y LDA .properties, X : STA ($90), Y
PHY PHY
TYA : LSR #2 : TAY TYA : LSR #2 : TAY
LDA .sizes, X : ORA $0F : STA ($92), Y ; store size in oam buffer LDA .sizes, X : ORA $0F : STA ($92), Y ; store size in oam buffer
PLY : INY PLY : INY
PLX : DEX : BPL .nextTile PLX : DEX : BPL .nextTile
PLX PLX
RTS RTS
.start_index .start_index
db $00, $01, $02, $03 db $00, $01, $02, $03
.nbr_of_tiles .nbr_of_tiles
db 0, 0, 0, 0 db 0, 0, 0, 0
.x_offsets .x_offsets
dw 0 dw 0
dw 0 dw 0
dw 0 dw 0
dw 0 dw 0
.y_offsets .y_offsets
dw 0 dw 0
dw 0 dw 0
dw 0 dw 0
dw 0 dw 0
.chr .chr
db $E0 db $E0
db $E2 db $E2
db $C2 db $C2
db $C0 db $C0
.properties .properties
db $33 db $33
db $33 db $33
db $33 db $33
db $33 db $33
.sizes .sizes
db $02 db $02
db $02 db $02
db $02 db $02
db $02 db $02
} }