Merge commit '697a742e0937780d3e6d1193876c8096ef1e2200' into HEAD

This commit is contained in:
2022-04-01 18:28:29 -07:00
4 changed files with 45 additions and 20 deletions

View File

@@ -1240,8 +1240,8 @@ RTL
;--------------------------------------------------------------------------------
; A = item id being collected
ItemGetAlternateSFX:
PEA $C567 ; PC to RTS to in bank 08
CMP #$4A : BNE +
PEA $C567 ; SNES to RTS to in bank 08
LDA.w $0C5E,X : CMP #$4A : BNE +
; collecting pre-activated flute
LDA #$13 : JML $088007
+ ; normal itemget sfx
@@ -1250,7 +1250,7 @@ LDA #$0F : JML $08800E ; what we wrote over
; A = item id being collected
ItemGetOverworldAlternateSFX:
CMP.b #$4A : BNE +
LDA.b #$13 : STA.w $012E
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