Merge remote-tracking branch 'codemann/OWMain' into overworld_kara

This commit is contained in:
2023-01-30 19:47:34 -06:00
19 changed files with 313 additions and 377 deletions

View File

@@ -1205,12 +1205,12 @@ RTL
;--------------------------------------------------------------------------------
; A = item id being collected
ItemGetAlternateSFX:
PEA $C567 ; SNES to RTS to in bank 08
LDA.w $0C5E,X : CMP #$4A : BNE +
PEA.w $C567 ; SNES to RTS to in bank 08
LDA.w $0C5E,X : CMP.b #$4A : BNE +
; collecting pre-activated flute
LDA #$13 : JML $088007
LDA.b #$13 : JML $088007
+ ; normal itemget sfx
LDA #$0F : JML $08800E ; what we wrote over
LDA.b #$0F : JML $08800E ; what we wrote over
; A = item id being collected
ItemGetOverworldAlternateSFX: