ref: 4fcabdc07b5f75b81cb4728c9b9097a625485133
parent: bd49428c4a4e98f9a7bbbcdd79d75d461c0c12b1
parent: 91b822ceb81f08944d6289f726b8ef2086722982
author: yenatch <[email protected]>
date: Fri Oct 25 12:51:24 EDT 2013
Merge commit '91b822c' into merge-mrwint
--- a/audio/engine.asm
+++ b/audio/engine.asm
@@ -636,7 +636,7 @@
ld a, [MusicFadeIDHi]
ld d, a
; load new song
- call LoadMusic
+ call _PlayMusic
.quit
; cleanup
pop bc
@@ -658,7 +658,7 @@
ld a, [MusicFadeIDHi]
ld d, a
; load new song
- call LoadMusic
+ call _PlayMusic
pop bc
; fade in
ld hl, MusicFade
@@ -2081,7 +2081,7 @@
call GetMusicByte
ld d, a
push bc
- call LoadMusic
+ call _PlayMusic
pop bc
ret
; e8a3e
@@ -2308,7 +2308,7 @@
ret
; e8b30
-LoadMusic: ; e8b30
+_PlayMusic: ; e8b30
; load music
call MusicOff
ld hl, MusicID
--- a/main.asm
+++ b/main.asm
@@ -3055,7 +3055,7 @@
ld a, [hROMBank]
push af
- ld a, BANK(LoadMusic) ; and BANK(SoundRestart)
+ ld a, BANK(_PlayMusic) ; and BANK(SoundRestart)
ld [hROMBank], a
ld [MBC3RomBank], a
@@ -3063,7 +3063,7 @@
and a
jr z, .nomusic
- call LoadMusic
+ call _PlayMusic
jr .end
.nomusic
@@ -3091,16 +3091,16 @@
ld a, [hROMBank]
push af
- ld a, BANK(LoadMusic)
+ ld a, BANK(_PlayMusic)
ld [hROMBank], a
ld [MBC3RomBank], a
push de
ld de, MUSIC_NONE
- call LoadMusic
+ call _PlayMusic
call DelayFrame
pop de
- call LoadMusic
+ call _PlayMusic
pop af
ld [hROMBank], a