diff options
| author | yenatch <yenatch@gmail.com> | 2013-10-25 16:41:19 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2013-10-25 16:41:19 -0400 |
| commit | 2a08b8b7ce7d0f49cfdae97ee68d0ed4a3651afe (patch) | |
| tree | c1dde5d5bcf0e8ad68ed331a6be598004158bc45 | |
| parent | da22ada91ca6212b65cf4d8037d03ae1ebd97323 (diff) | |
| parent | 963fe4808bc36cb72984dbfc7a8582059165d8d7 (diff) | |
Merge commit '963fe48' into merge-mrwint
| -rw-r--r-- | audio/engine.asm | 4 | ||||
| -rw-r--r-- | main.asm | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/audio/engine.asm b/audio/engine.asm index 46bc29c11..b1d4cd169 100644 --- a/audio/engine.asm +++ b/audio/engine.asm @@ -2465,7 +2465,7 @@ PlayCry: ; e8b79 ret ; e8c04 -LoadSFX: ; e8c04 +_PlaySFX: ; e8c04 ; clear channels if they aren't already call MusicOff ld hl, $c1cc ; Channel5Flags @@ -2574,7 +2574,7 @@ PlayStereoSFX: ; e8ca6 ; 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 @@ -3193,13 +3193,13 @@ PlaySFX: ; 3c23 .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 |