From 2acee4abb93f9be922dce2e537d80689c3aec0d1 Mon Sep 17 00:00:00 2001
From: aerinon <randall.rupper@gmail.com>
Date: Wed, 7 Sep 2022 15:09:04 -0600
Subject: [PATCH] Flute activated pickup sfx

---
 hooks.asm     |  5 +++++
 inventory.asm | 18 ++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/hooks.asm b/hooks.asm
index e9f0016..30981a1 100755
--- a/hooks.asm
+++ b/hooks.asm
@@ -1036,6 +1036,11 @@ NOP
 org $07B57D ; 3B57D - Bank07.asm:8527 (LDA Link_ReceiveItemAlternates, Y : STA $03)
 JSL.l Link_ReceiveItemAlternatesExpanded_loadAlternate
 NOP
+
+org $08C563
+JML ItemGetAlternateSFX : NOP
+org $0988A5
+JSL ItemGetOverworldAlternateSFX : NOP #5
 ;--------------------------------------------------------------------------------
 org $09892E ; 4892E - ancilla_init.asm:1307 (LDA BottleList, X)
 LDA.w BottleListExpanded, X
diff --git a/inventory.asm b/inventory.asm
index 1b6b953..a0fdd29 100644
--- a/inventory.asm
+++ b/inventory.asm
@@ -1183,3 +1183,21 @@ RTL
 
 }
 ;--------------------------------------------------------------------------------
+; A = item id being collected
+ItemGetAlternateSFX:
+PEA.w $C567 ; SNES to RTS to in bank 08
+LDA.w $0C5E,X : CMP.b #$4A : BNE +
+	; collecting pre-activated flute
+	LDA.b #$13 : JML $088007
++ ; normal itemget sfx
+LDA.b #$0F : JML $08800E ; what we wrote over
+
+; A = item id being collected
+ItemGetOverworldAlternateSFX:
+CMP.b #$4A : BNE +
+	JSL Sound_SetSfxPanWithPlayerCoords : ORA.b #$13 : STA.w $012E
+	RTL
++ ; normal itemget sfx
+JSL Sound_SetSfxPanWithPlayerCoords : ORA.b #$0F : STA.w $012F ; what we wrote over
+RTL
+;--------------------------------------------------------------------------------
\ No newline at end of file