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

add more explicit length suffices

Browse Source
This commit is contained in:
scawful
2024-09-18 18:43:47 -04:00
parent 25085330d1
commit 2b452cc04c
31 changed files with 250 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Sprites/Enemies/business_scrub.asm
View File

@@ -55,7 +55,7 @@ Sprite_DekuScrubEnemy_Prep:
{
PHB : PHK : PLB
LDA SprSubtype, X : CMP.b #$01 : BEQ .pea_shot
LDA.w SprSubtype, X : CMP.b #$01 : BEQ .pea_shot
CMP.b #$02 : BEQ .cutscene_scrub
JMP +
.pea_shot
@@ -109,8 +109,8 @@ Sprite_DekuScrubEnemy_Main:
; Check if the player is too close
LDA $22 : STA $02
LDA $20 : STA $03
LDA SprX, X : STA $04
LDA SprY, X : STA $05
LDA.w SprX, X : STA $04
LDA.w SprY, X : STA $05
JSL GetDistance8bit_Long : CMP.b #$24 : BCC .too_close
; The player is below the scrub, so it should pop up
LDA #$20 : STA.w SprTimerA, X
@@ -129,16 +129,16 @@ Sprite_DekuScrubEnemy_Main:
JSL Sprite_PlayerCantPassThrough
JSR CheckForPeaShotRedirect
LDA SprTimerA, X : BNE .not_done
LDA.w SprTimerA, X : BNE .not_done
JSR SpawnPeaShot
LDA #$F0 : STA.w SprTimerA, X
INC.w SprAction, X
.not_done
LDA POSX : STA $02
LDA POSY : STA $03
LDA SprX, X : STA $04
LDA SprY, X : STA $05
LDA.w POSX : STA $02
LDA.w POSY : STA $03
LDA.w SprX, X : STA $04
LDA.w SprY, X : STA $05
JSL GetDistance8bit_Long : CMP #$18 : BCS .not_too_close
%GotoAction(0)
.not_too_close
@@ -170,7 +170,7 @@ Sprite_DekuScrubEnemy_Main:
JSL Sprite_PlayerCantPassThrough
; Play the spinning animation for a bit before proceeding
LDA SprTimerA, X : BNE .not_done
LDA.w SprTimerA, X : BNE .not_done
LDA #$40 : STA.w SprTimerA, X
INC.w SprAction, X
.not_done
@@ -186,7 +186,7 @@ Sprite_DekuScrubEnemy_Main:
JSL Sprite_PlayerCantPassThrough
LDA SprTimerA, X : BNE .not_done
LDA.w SprTimerA, X : BNE .not_done
%SetHarmless(1)
INC.w SprAction, X
.not_done
@@ -306,7 +306,7 @@ KillPeaShot:
{
; Kill the pea shot
PHX
LDA Offspring1_Id : TAX
LDA.w Offspring1_Id : TAX
STZ.w $0DD0, X
PLX
RTS