alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added flute SFX to itemget if collecting a pre-activated flute

Browse Source
This commit is contained in:
codemann8
2022-01-15 04:07:27 -06:00
parent f2a03f0bda
commit 3e9f598fe1
2 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
hooks.asm
View File

@@ -1021,6 +1021,11 @@ NOP
org $07B57D ; 3B57D - Bank07.asm:8527 (LDA Link_ReceiveItemAlternates, Y : STA $03) org $07B57D ; 3B57D - Bank07.asm:8527 (LDA Link_ReceiveItemAlternates, Y : STA $03)
JSL.l Link_ReceiveItemAlternatesExpanded_loadAlternate JSL.l Link_ReceiveItemAlternatesExpanded_loadAlternate
NOP NOP
org $08C563
JML ItemGetAlternateSFX : NOP
org $0988A5
JSL ItemGetOverworldAlternateSFX : NOP #5
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
org $09892E ; 4892E - ancilla_init.asm:1307 (LDA BottleList, X) org $09892E ; 4892E - ancilla_init.asm:1307 (LDA BottleList, X)
LDA.w BottleListExpanded, X LDA.w BottleListExpanded, X

18
inventory.asm
View File

@@ -1216,3 +1216,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 #$3E : 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 #$3E : STA.w $012E
RTL
+ ; normal itemget sfx
JSL Sound_SetSfxPanWithPlayerCoords : ORA.b #$0F : STA.w $012F ; what we wrote over
RTL
;--------------------------------------------------------------------------------