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 '789469c' into merge-mrwint

Browse Source 
Conflicts:
	main.asm
This commit is contained in:
yenatch
2013-10-25 16:48:29 -04:00
parent 2a08b8b7ce 789469c465
commit bd49428c4a
4 changed files with 60 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
engine/credits.asm
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

4
engine/scripting.asm
View File

@@ -889,7 +889,7 @@ Script_playmusic: ; 0x97189
; music_pointer (MultiByteParam)
ld de, $0000
call StartMusic
call PlayMusic
xor a
ld [$c2a7], a
call MaxVolume
@@ -897,7 +897,7 @@ Script_playmusic: ; 0x97189
ld e, a
call GetScriptByte
ld d, a
call StartMusic
call PlayMusic
ret
; 0x971a2