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

fix business scrub clearing liftable sprite bug

Browse Source
This commit is contained in:
scawful
2024-08-17 18:04:43 -04:00
parent 8b6785c7cc
commit 4935eb301d
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Sprites/Enemies/business_scrub.asm
View File

@@ -161,12 +161,6 @@ Sprite_DekuScrubEnemy_Main:
JSL Sprite_PlayerCantPassThrough 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 ; Play the spinning animation for a bit before proceeding
LDA SprTimerA, X : BNE .not_done LDA SprTimerA, X : BNE .not_done
LDA #$40 : STA.w SprTimerA, X LDA #$40 : STA.w SprTimerA, X
@@ -276,6 +270,7 @@ CheckForPeaShotRedirect:
PLX PLX
JSL CheckIfHitBoxesOverlap : BCC .no_dano JSL CheckIfHitBoxesOverlap : BCC .no_dano
JSR KillPeaShot
%GotoAction(3) %GotoAction(3)
RTS RTS
.no_dano .no_dano
@@ -286,12 +281,23 @@ CheckForPeaShotRedirect:
JSL Sprite_SetupHitBox JSL Sprite_SetupHitBox
PLX PLX
JSL CheckIfHitBoxesOverlap : BCC .not_done2 JSL CheckIfHitBoxesOverlap : BCC .not_done2
JSR KillPeaShot
%GotoAction(3) %GotoAction(3)
RTS RTS
.not_done2 .not_done2
RTS RTS
} }
KillPeaShot:
{
; Kill the pea shot
PHX
LDA Offspring1_Id : TAX
STZ.w $0DD0, X
PLX
RTS
}
SpawnPeaShot: SpawnPeaShot:
{ {
LDA.b #$14 LDA.b #$14

6
Sprites/Enemies/eon_scrub.asm
View File

@@ -155,12 +155,6 @@ Sprite_EonScrub_Main:
JSL Sprite_PlayerCantPassThrough 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 ; Play the spinning animation for a bit before proceeding
LDA SprTimerA, X : BNE .not_done LDA SprTimerA, X : BNE .not_done
LDA #$40 : STA.w SprTimerA, X LDA #$40 : STA.w SprTimerA, X