ref: 2a08b8b7ce7d0f49cfdae97ee68d0ed4a3651afe
parent: da22ada91ca6212b65cf4d8037d03ae1ebd97323
parent: 963fe4808bc36cb72984dbfc7a8582059165d8d7
author: yenatch <[email protected]>
date: Fri Oct 25 12:41:19 EDT 2013
Merge commit '963fe48' into merge-mrwint
--- a/audio/engine.asm
+++ b/audio/engine.asm
@@ -2465,7 +2465,7 @@
ret
; e8c04
-LoadSFX: ; e8c04
+_PlaySFX: ; e8c04
; clear channels if they aren't already
call MusicOff
ld hl, $c1cc ; Channel5Flags
@@ -2574,7 +2574,7 @@
; standard procedure if stereo's off
ld a, [Options]
bit 5, a
- jp z, LoadSFX
+ jp z, _PlaySFX
; else, let's go ahead with this
ld hl, MusicID
--- a/main.asm
+++ b/main.asm
@@ -3193,13 +3193,13 @@
.play
ld a, [hROMBank]
push af
- ld a, BANK(LoadSFX)
+ ld a, BANK(_PlaySFX)
ld [hROMBank], a
ld [MBC3RomBank], a ; bankswitch
ld a, e
ld [CurSFX], a
- call LoadSFX
+ call _PlaySFX
pop af
ld [hROMBank], a