pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '963fe48' into merge-mrwint

Browse Source
This commit is contained in:
yenatch
2013-10-25 16:41:19 -04:00
parent da22ada91c 963fe4808b
commit 2a08b8b7ce
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
audio/engine.asm
View File

@@ -2465,7 +2465,7 @@ PlayCry: ; e8b79
ret ret
; e8c04 ; e8c04
LoadSFX: ; e8c04 _PlaySFX: ; e8c04
; clear channels if they aren't already ; clear channels if they aren't already
call MusicOff call MusicOff
ld hl, $c1cc ; Channel5Flags ld hl, $c1cc ; Channel5Flags
@@ -2574,7 +2574,7 @@ PlayStereoSFX: ; e8ca6
; standard procedure if stereo's off ; standard procedure if stereo's off
ld a, [Options] ld a, [Options]
bit 5, a bit 5, a
jp z, LoadSFX jp z, _PlaySFX
; else, let's go ahead with this ; else, let's go ahead with this
ld hl, MusicID ld hl, MusicID

4
main.asm
View File

@@ -3193,13 +3193,13 @@ PlaySFX: ; 3c23
.play .play
ld a, [hROMBank] ld a, [hROMBank]
push af push af
ld a, BANK(LoadSFX) ld a, BANK(_PlaySFX)
ld [hROMBank], a ld [hROMBank], a
ld [MBC3RomBank], a ; bankswitch ld [MBC3RomBank], a ; bankswitch
ld a, e ld a, e
ld [CurSFX], a ld [CurSFX], a
call LoadSFX call _PlaySFX
pop af pop af
ld [hROMBank], a ld [hROMBank], a