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

Portal Sprite cleanup

Browse Source
This commit is contained in:
scawful
2025-01-06 17:54:23 -05:00
parent 02df9c4856
commit 8eff895633
1 changed files with 24 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
Sprites/Objects/portal_sprite.asm
View File

@@ -31,10 +31,6 @@
!Boss = 00 ; 00 = normal sprite, 01 = sprite is a boss !Boss = 00 ; 00 = normal sprite, 01 = sprite is a boss
%Set_Sprite_Properties(Sprite_Portal_Prep, Sprite_Portal_Long) %Set_Sprite_Properties(Sprite_Portal_Prep, Sprite_Portal_Long)
; =========================================================
; Long Sprite Code
; =========================================================
Sprite_Portal_Long: Sprite_Portal_Long:
{ {
PHB : PHK : PLB PHB : PHK : PLB
@@ -44,12 +40,8 @@ Sprite_Portal_Long:
.SpriteIsNotActive .SpriteIsNotActive
PLB PLB
RTL RTL
} }
; =========================================================
; Sprite Initialization code
; =========================================================
Sprite_Portal_Prep: Sprite_Portal_Prep:
{ {
PHB : PHK : PLB PHB : PHK : PLB
@@ -78,10 +70,6 @@ OrangeActive = $7E06FD
OrangeSpriteIndex = $7E0633 OrangeSpriteIndex = $7E0633
BlueSpriteIndex = $7E0632 BlueSpriteIndex = $7E0632
; =========================================================
; Main Sprite Code
; =========================================================
Sprite_Portal_Main: Sprite_Portal_Main:
{ {
LDA.w SprAction, X LDA.w SprAction, X
@@ -322,19 +310,14 @@ RejectOnTileCollision:
RTS RTS
} }
;==========================================================
Sprite_Portal_Draw: Sprite_Portal_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
@@ -382,31 +365,28 @@ Sprite_Portal_Draw:
RTS RTS
.start_index
; Draw Data db $00, $01, $02, $03
.nbr_of_tiles
.start_index db 0, 0, 0, 0
db $00, $01, $02, $03 .x_offsets
.nbr_of_tiles dw 0
db 0, 0, 0, 0 dw 0
.x_offsets dw 0
dw 0 dw 0
dw 0 .y_offsets
dw 0 dw 0
dw 0 dw 0
.y_offsets dw 0
dw 0 dw 0
dw 0 .chr
dw 0 db $EE
dw 0 db $EE
.chr db $EE
db $EE db $EE
db $EE .properties
db $EE db $24
db $EE db $64
.properties db $22
db $24 db $62
db $64
db $22
db $62
} }