diff options
| author | yenatch <yenatch@gmail.com> | 2013-10-25 16:51:24 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2013-10-25 16:51:24 -0400 |
| commit | 4fcabdc07b5f75b81cb4728c9b9097a625485133 (patch) | |
| tree | 24c0eed551779a0e571c3027702fd77b025d94cb /audio/engine.asm | |
| parent | bd49428c4a4e98f9a7bbbcdd79d75d461c0c12b1 (diff) | |
| parent | 91b822ceb81f08944d6289f726b8ef2086722982 (diff) | |
Merge commit '91b822c' into merge-mrwint
Diffstat (limited to 'audio/engine.asm')
| -rw-r--r-- | audio/engine.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/audio/engine.asm b/audio/engine.asm index b1d4cd169..2017fa642 100644 --- a/audio/engine.asm +++ b/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 |