Merge branch 'OWMain' of github.com:codemann8/z3randomizer into overworld_kara

2022-02-11 13:36:00 -08:00
parent 8dfdd3ee87 e01e8569d7
commit 7da5e6257a
14 changed files with 928 additions and 1034 deletions
--- a/inventory.asm
+++ b/inventory.asm
@@ -1238,3 +1238,21 @@ RTL

 }
 ;--------------------------------------------------------------------------------
+; A = item id being collected
+ItemGetAlternateSFX:
+PEA $C567 ; PC to RTS to in bank 08
+CMP #$4A : BNE +
+	; collecting pre-activated flute
+	LDA #$13 : JML $088007
+ ; normal itemget sfx
+LDA #$0F : JML $08800E ; what we wrote over
+
+; A = item id being collected
+ItemGetOverworldAlternateSFX:
+CMP.b #$4A : BNE +
+	LDA.b #$13 : STA.w $012E
+	RTL
+ ; normal itemget sfx
+JSL Sound_SetSfxPanWithPlayerCoords : ORA.b #$0F : STA.w $012F ; what we wrote over
+RTL
+;--------------------------------------------------------------------------------