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

make deku scrub enemy liftable and harmless after defeated

Browse Source
This commit is contained in:
scawful
2024-06-28 14:29:17 -04:00
parent 7f818d7734
commit 9456aca329
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Sprites/Enemies/deku_scrub_enemy.asm
View File

@@ -82,6 +82,7 @@ Sprite_DekuScrubEnemy_Main:
dw DekuScrubEnemy_Subdued dw DekuScrubEnemy_Subdued
dw DekuScrubEnemy_PeaShot dw DekuScrubEnemy_PeaShot
dw DekuScrubEnemy_HidingDefeated
; 0x00 ; 0x00
DekuScrubEnemy_Hiding: DekuScrubEnemy_Hiding:
@@ -181,6 +182,7 @@ Sprite_DekuScrubEnemy_Main:
JSL Sprite_PlayerCantPassThrough JSL Sprite_PlayerCantPassThrough
LDA SprTimerA, X : BNE .not_done LDA SprTimerA, X : BNE .not_done
%SetHarmless(1)
INC.w SprAction, X INC.w SprAction, X
.not_done .not_done
@@ -192,14 +194,13 @@ Sprite_DekuScrubEnemy_Main:
{ {
%StartOnFrame(7) %StartOnFrame(7)
%PlayAnimation(7,7,1) %PlayAnimation(7,7,1)
%SetHarmless(1)
JSL Sprite_PlayerCantPassThrough
LDA.w SprMiscD, X : BNE .no_talk LDA.w SprMiscD, X : BNE .no_talk
%ShowSolicitedMessage($12D) : BCC .no_talk JSL Sprite_PlayerCantPassThrough
JSR DekuScrub_GiveRandomPrize %ShowSolicitedMessage($12D) : BCC .no_talk
LDA.b #$01 : STA.w SprMiscD, X JSR DekuScrub_GiveRandomPrize
LDA.b #$01 : STA.w SprMiscD, X
%GotoAction(7)
.no_talk .no_talk
RTS RTS
@@ -225,6 +226,17 @@ Sprite_DekuScrubEnemy_Main:
.no_damage .no_damage
RTS RTS
} }
DekuScrubEnemy_HidingDefeated:
{
%StartOnFrame(13)
%PlayAnimation(13,13,1)
JSL Sprite_CheckIfLifted
JSL ThrownSprite_TileAndSpriteInteraction_long
RTS
}
} }
; ========================================================= ; =========================================================