fix business scrub clearing liftable sprite bug
This commit is contained in:
@@ -161,12 +161,6 @@ Sprite_DekuScrubEnemy_Main:
|
||||
|
||||
JSL Sprite_PlayerCantPassThrough
|
||||
|
||||
; Kill the pea shot
|
||||
PHX
|
||||
LDA Offspring1_Id : TAX
|
||||
STZ.w $0DD0, X
|
||||
PLX
|
||||
|
||||
; Play the spinning animation for a bit before proceeding
|
||||
LDA SprTimerA, X : BNE .not_done
|
||||
LDA #$40 : STA.w SprTimerA, X
|
||||
@@ -276,6 +270,7 @@ CheckForPeaShotRedirect:
|
||||
PLX
|
||||
|
||||
JSL CheckIfHitBoxesOverlap : BCC .no_dano
|
||||
JSR KillPeaShot
|
||||
%GotoAction(3)
|
||||
RTS
|
||||
.no_dano
|
||||
@@ -286,12 +281,23 @@ CheckForPeaShotRedirect:
|
||||
JSL Sprite_SetupHitBox
|
||||
PLX
|
||||
JSL CheckIfHitBoxesOverlap : BCC .not_done2
|
||||
JSR KillPeaShot
|
||||
%GotoAction(3)
|
||||
RTS
|
||||
.not_done2
|
||||
RTS
|
||||
}
|
||||
|
||||
KillPeaShot:
|
||||
{
|
||||
; Kill the pea shot
|
||||
PHX
|
||||
LDA Offspring1_Id : TAX
|
||||
STZ.w $0DD0, X
|
||||
PLX
|
||||
RTS
|
||||
}
|
||||
|
||||
SpawnPeaShot:
|
||||
{
|
||||
LDA.b #$14
|
||||
|
||||
@@ -155,12 +155,6 @@ Sprite_EonScrub_Main:
|
||||
|
||||
JSL Sprite_PlayerCantPassThrough
|
||||
|
||||
; Kill the pea shot
|
||||
PHX
|
||||
LDA Offspring1_Id : TAX
|
||||
STZ.w $0DD0, X
|
||||
PLX
|
||||
|
||||
; Play the spinning animation for a bit before proceeding
|
||||
LDA SprTimerA, X : BNE .not_done
|
||||
LDA #$40 : STA.w SprTimerA, X
|
||||
|
||||
Reference in New Issue
Block a user