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

update deku scrub enemy hitbox detection and state management

Browse Source
This commit is contained in:
scawful
2024-05-12 19:43:00 -04:00
parent 5d0a79191a
commit e01ed60dce
1 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Sprites/Enemies/deku_scrub_enemy.asm
View File

@@ -107,7 +107,7 @@ Sprite_DekuScrubEnemy_Main:
LDA SprTimerA, X : BNE .not_done LDA SprTimerA, X : BNE .not_done
JSR SpawnPeaShot JSR SpawnPeaShot
LDA #$40 : STA SprTimerA, X LDA #$80 : STA SprTimerA, X
INC.w SprAction, X INC.w SprAction, X
.not_done .not_done
@@ -136,9 +136,11 @@ Sprite_DekuScrubEnemy_Main:
LDA.w $0D00,X : STA.b $01 LDA.w $0D00,X : STA.b $01
LDA.w $0D20,X : STA.b $09 LDA.w $0D20,X : STA.b $09
LDA Offspring1_Id : TAY PHX
LDA Offspring1_Id : TAX
JSR Sprite_SetupHitBox JSR Sprite_SetupHitBox
PLX
JSL CheckIfHitBoxesOverlap : BCC .no_dano JSL CheckIfHitBoxesOverlap : BCC .no_dano
INC.w SprAction, X INC.w SprAction, X
.no_dano .no_dano
@@ -147,6 +149,14 @@ Sprite_DekuScrubEnemy_Main:
LDA SprTimerA, X : BNE .not_done LDA SprTimerA, X : BNE .not_done
; If the pea shot and deku scrub hitboxes intersect ; If the pea shot and deku scrub hitboxes intersect
; We will go to recoil ; We will go to recoil
PHX
LDA Offspring1_Id : TAX
JSR Sprite_SetupHitBox
PLX
JSL CheckIfHitBoxesOverlap : BCC .not_done2
%GotoAction(4)
RTS
.not_done2
; However, he may also dodge it and try to attack ; However, he may also dodge it and try to attack
; So if he gets too close, we go back to hiding ; So if he gets too close, we go back to hiding
@@ -161,9 +171,15 @@ Sprite_DekuScrubEnemy_Main:
%StartOnFrame(3) %StartOnFrame(3)
%PlayAnimation(3,6,6) %PlayAnimation(3,6,6)
; 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 #$20 : STA SprTimerA, X LDA #$40 : STA SprTimerA, X
INC.w SprAction, X INC.w SprAction, X
.not_done .not_done
@@ -177,7 +193,7 @@ Sprite_DekuScrubEnemy_Main:
%PlayAnimation(8,9,11) %PlayAnimation(8,9,11)
LDA SprTimerA, X : BNE .not_done LDA SprTimerA, X : BNE .not_done
%GotoAction(0) INC.w SprAction, X
.not_done .not_done
RTS RTS