sick kid item trigger by song of healing

This commit is contained in:
scawful
2024-04-27 13:28:09 -04:00
parent 3f5e194708
commit 9a430f9fc0
2 changed files with 33 additions and 13 deletions

View File

@@ -1,3 +1,19 @@
; Sick Kid - Bug Net Kid
; Gives the Boots if the player plays the Song of Healing
SickKid_CheckForSongOfHealing:
{
LDA $FE : CMP.b #$01 : BNE .no_song
INC $0D80, X
INC $02E4
STZ $FE
.no_song
RTL
}
pushpc pushpc
org $07F4D0 org $07F4D0
@@ -6,6 +22,16 @@ Sprite_CheckIfPlayerPreoccupied:
org $06F154 org $06F154
Sprite_CheckDamageToPlayer_same_layer: Sprite_CheckDamageToPlayer_same_layer:
org $068D7F
SpritePrep_SickKid:
{
LDA.l $7EF355 : BEQ .no_boots
LDA.b #$03 : STA $0D80, X
.no_boots
INC.w $0BA0, X
RTS
}
org $06B962 org $06B962
BugNetKid_Resting: BugNetKid_Resting:
{ {
@@ -13,26 +39,18 @@ BugNetKid_Resting:
JSR Sprite_CheckDamageToPlayer_same_layer : BCC .dont_awaken JSR Sprite_CheckDamageToPlayer_same_layer : BCC .dont_awaken
LDA.l $7EF34C JSL SickKid_CheckForSongOfHealing
LDA.l $7EF355
CMP.b #$01 : BCC .no_ocarina CMP.b #$01 : BCC .no_boots
INC $0D80, X
INC $02E4
.dont_awaken .dont_awaken
RTS RTS
.no_ocarina .no_boots
; "... Do you have a bottle to keep a bug in? ... I see. You don't..."
LDA.b #$04 LDA.b #$04
LDY.b #$01 LDY.b #$01
JSL Sprite_ShowSolicitedMessageIfPlayerFacing JSL Sprite_ShowSolicitedMessageIfPlayerFacing
RTS RTS
} }

View File

@@ -99,6 +99,8 @@ print "End of deku_scrub_enemy.asm ", pc
incsrc "Sprites/NPCs/ranch_girl.asm" incsrc "Sprites/NPCs/ranch_girl.asm"
print "End of Ranch Girl.asm ", pc print "End of Ranch Girl.asm ", pc
incsrc "Sprites/NPCs/bug_net_kid.asm"
incsrc "Sprites/Bosses/arrghus.asm" incsrc "Sprites/Bosses/arrghus.asm"
print "End of arrghus.asm ", pc print "End of arrghus.asm ", pc
@@ -114,6 +116,6 @@ print "End of Lanmola_Expanded.asm ", pc
; incsrc "Sprites/Bosses/octoboss.asm" ; incsrc "Sprites/Bosses/octoboss.asm"
; print "End of octoboss.asm ", pc ; print "End of octoboss.asm ", pc
incsrc "Sprites/NPCs/bug_net_kid.asm"
warnpc $328000 warnpc $328000