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

Cleanup bug_net_kid.asm

Browse Source
This commit is contained in:
scawful
2024-10-03 19:22:47 -04:00
parent 6fd5e047df
commit 9872d9d0ba
1 changed files with 27 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
Sprites/NPCs/bug_net_kid.asm
View File

@@ -4,50 +4,40 @@
SickKid_CheckForSongOfHealing: SickKid_CheckForSongOfHealing:
{ {
LDA $FE : CMP.b #$01 : BNE .no_song LDA $FE : CMP.b #$01 : BNE .no_song
INC $0D80, X
INC $0D80, X INC $02E4
INC $02E4 STZ $FE
STZ $FE .no_song
.no_song
RTL RTL
} }
pushpc pushpc
org $07F4D0 Sprite_CheckIfPlayerPreoccupied = $07F4D0
Sprite_CheckIfPlayerPreoccupied: Sprite_CheckDamageToPlayer_same_layer = $06F154
org $06F154
Sprite_CheckDamageToPlayer_same_layer:
org $068D7F org $068D7F
SpritePrep_SickKid: SpritePrep_SickKid:
{ {
LDA.l $7EF355 : BEQ .no_boots LDA.l $7EF355 : BEQ .no_boots
LDA.b #$03 : STA $0D80, X LDA.b #$03 : STA $0D80, X
.no_boots .no_boots
INC.w $0BA0, X INC.w $0BA0, X
RTS RTS
} }
org $06B962 org $06B962
BugNetKid_Resting: BugNetKid_Resting:
{ {
JSL Sprite_CheckIfPlayerPreoccupied : BCS .dont_awaken JSL Sprite_CheckIfPlayerPreoccupied : BCS .dont_awaken
JSR Sprite_CheckDamageToPlayer_same_layer : BCC .dont_awaken JSR Sprite_CheckDamageToPlayer_same_layer : BCC .dont_awaken
JSL SickKid_CheckForSongOfHealing
JSL SickKid_CheckForSongOfHealing LDA.l $7EF355
LDA.l $7EF355 CMP.b #$01 : BCC .no_boots
CMP.b #$01 : BCC .no_boots .dont_awaken
RTS
.dont_awaken
RTS .no_boots
.no_boots
LDA.b #$04 LDA.b #$04
LDY.b #$01 LDY.b #$01
JSL Sprite_ShowSolicitedMessageIfPlayerFacing JSL Sprite_ShowSolicitedMessageIfPlayerFacing
@@ -57,22 +47,16 @@ BugNetKid_Resting:
org $06B9C6 org $06B9C6
BugNetKid_GrantBugNet: BugNetKid_GrantBugNet:
{ {
; Give Link the Boots ; Give Link the Boots
LDY.b #$4B LDY.b #$4B
STZ $02E9
STZ $02E9 PHX
JSL Link_ReceiveItem
PHX PLX
INC $0D80, X
JSL Link_ReceiveItem STZ $02E4
RTS
PLX
INC $0D80, X
STZ $02E4
RTS
} }
pullpc pullpc