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

Cleanup ranch_girl.asm

Browse Source
This commit is contained in:
scawful
2024-10-03 19:23:01 -04:00
parent 9872d9d0ba
commit 79b9f76ab0
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Sprites/NPCs/ranch_girl.asm
View File

@@ -2,7 +2,7 @@
; Ranch Girl (Chicken Easter Egg Sprite) ; Ranch Girl (Chicken Easter Egg Sprite)
; Gives Link the Ocarina ; Gives Link the Ocarina
pushpc pushpc
org $05FA8E org $05FA8E
Sprite_ShowMessageMinimal: Sprite_ShowMessageMinimal:
@@ -25,22 +25,22 @@ RanchGirl_Message:
RTL RTL
} }
RanchGirl_TeachSong: RanchGirl_TeachSong:
{ {
LDA.w SprMiscD, X : CMP.b #$01 : BNE .not_started LDA.w SprMiscD, X : CMP.b #$01 : BNE .not_started
LDA $10 : CMP.b #$0E : BEQ .running_dialog LDA $10 : CMP.b #$0E : BEQ .running_dialog
LDA $7EF34C : CMP.b #$01 : BCS .has_song LDA $7EF34C : CMP.b #$01 : BCS .has_song
; Play the song of storms ; Play the song of storms
LDA.b #$2F LDA.b #$2F
STA.w $0CF8 STA.w $0CF8
JSL $0DBB67 ; Link_CalculateSFXPan JSL $0DBB67 ; Link_CalculateSFXPan
ORA.w $0CF8 ORA.w $0CF8
STA $012E ; Play the song learned sound STA $012E ; Play the song learned sound
; Give Link the Ocarina ; Give Link the Ocarina
LDY #$14 LDY #$14
; Clear the item receipt ID ; Clear the item receipt ID
STZ $02E9 STZ $02E9
PHX PHX
JSL Link_ReceiveItem JSL Link_ReceiveItem
@@ -93,4 +93,4 @@ ChickenLady:
} }
assert pc() <= $01AFEFF assert pc() <= $01AFEFF
pullpc pullpc