cleanup portal sprite

This commit is contained in:
scawful
2024-07-04 12:10:05 -04:00
parent 3642c9bc03
commit fa7d25663d

View File

@@ -85,8 +85,6 @@ OrangeActive = $7E06FD
OrangeSpriteIndex = $7E0633
BlueSpriteIndex = $7E0632
; =========================================================
; Main Sprite Code
; =========================================================
@@ -95,6 +93,7 @@ Sprite_Portal_Main:
{
LDA.w SprAction, X
JSL UseImplicitRegIndexedLocalJumpTable
dw StateHandler
dw BluePortal
dw OrangePortal
@@ -105,7 +104,6 @@ Sprite_Portal_Main:
dw BluePortal_WarpOverworld
dw OrangePortal_WarpOverworld
StateHandler:
{
JSR CheckForDismissPortal
@@ -136,15 +134,12 @@ Sprite_Portal_Main:
%StartOnFrame(0)
%PlayAnimation(0,1,8)
LDA $11 : CMP.b #$2A : BNE .not_warped_yet
STZ $11
.not_warped_yet
CLC
LDA SprTimerD, X : BNE .NoOverlap
JSL Link_SetupHitBox
JSL $0683EA ; Sprite_SetupHitbox_long
@@ -158,11 +153,7 @@ Sprite_Portal_Main:
RTS
.outdoors
%GotoAction(5) ; BluePortal_WarpOverworld
RTS
}
@@ -175,7 +166,6 @@ Sprite_Portal_Main:
.not_warped_yet
CLC
LDA SprTimerD, X : BNE .NoOverlap
JSL Link_SetupHitBox
JSL $0683EA ; Sprite_SetupHitbox_long
@@ -305,16 +295,12 @@ CheckForDismissPortal:
{
LDA $06FE : CMP.b #$02 : BCC .return
LDA $7E0FA6 : BEQ .DespawnOrange ; Check what portal is spawning next
PHX
LDA BlueSpriteIndex : TAX
STZ.w $0DD0, X
DEC.w $06FE
PLX
.DespawnOrange
.DespawnOrange
PHX
LDA OrangeSpriteIndex : TAX
STZ.w $0DD0, X
@@ -322,7 +308,7 @@ CheckForDismissPortal:
PLX
RTS
.return
.return
INC $06FE ; This ticker needs to be reset when transitioning rooms and maps.
RTS
}
@@ -400,7 +386,7 @@ Sprite_Portal_Draw:
TYA : LSR #2 : TAY
LDA .sizes, X : ORA $0F : STA ($92), Y ; store size in oam buffer
LDA.b #$02 : ORA $0F : STA ($92), Y ; store size in oam buffer
PLY : INY
@@ -437,10 +423,5 @@ Sprite_Portal_Draw:
db $74
db $32
db $72
.sizes
db $02
db $02
db $02
db $02
}