Merge commit '789469c' into merge-mrwint

Conflicts:
	main.asm
This commit is contained in:
yenatch
2013-10-25 16:48:29 -04:00
4 changed files with 60 additions and 60 deletions

View File

@@ -223,10 +223,10 @@ ParseCredits: ; 1099aa
ld de, MUSIC_CREDITS
push de
ld de, MUSIC_NONE
call StartMusic
call PlayMusic
call DelayFrame
pop de
call StartMusic
call PlayMusic
jp .loop
.wait2