Merge commit '91b822c' into merge-mrwint

audio/engine.asm

@@ -636,7 +636,7 @@ FadeMusic: ; e8358
 	ld a, [MusicFadeIDHi]
 	ld d, a
 	; load new song
-	call LoadMusic
+	call _PlayMusic
 .quit
 	; cleanup
 	pop bc
@@ -658,7 +658,7 @@ FadeMusic: ; e8358
 	ld a, [MusicFadeIDHi]
 	ld d, a
 	; load new song
-	call LoadMusic
+	call _PlayMusic
 	pop bc
 	; fade in
 	ld hl, MusicFade
@@ -2081,7 +2081,7 @@ MusicEB: ; e8a30
 	call GetMusicByte
 	ld d, a
 	push bc
-	call LoadMusic
+	call _PlayMusic
 	pop bc
 	ret
 ; e8a3e
@@ -2308,7 +2308,7 @@ SetLRTracks: ; e8b1b
 	ret
 ; e8b30
 
-LoadMusic: ; e8b30
+_PlayMusic: ; e8b30
 ; load music
 	call MusicOff
 	ld hl, MusicID

main.asm

@@ -3055,7 +3055,7 @@ PlayMusic: ; 3b97
 
 	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 @@ PlayMusic: ; 3b97
 	and a
 	jr z, .nomusic
 
-	call LoadMusic
+	call _PlayMusic
 	jr .end
 
 .nomusic
@@ -3091,16 +3091,16 @@ PlayMusic2: ; 3bbc
 
 	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