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 '546c17ad' into merge-mrwint

Browse Source 
Conflicts:
	engine/scripting.asm
	main.asm
This commit is contained in:
yenatch
2013-10-25 16:23:16 -04:00
parent 7a13251d03 546c17ad37
commit da22ada91c
6 changed files with 114 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
engine/scripting.asm
View File

@ -578,7 +578,7 @@ Script_specialsound: ; 0x96fe4
jr z, .play
ld de, SFX_ITEM
.play
call StartSFX
call PlaySFX
call WaitSFX
ret
; 0x96ffe
@ -926,7 +926,7 @@ Script_playsound: ; 0x971b7
ld e, a
call GetScriptByte
ld d, a
call StartSFX
call PlaySFX
ret
; 0x971c3
@ -941,7 +941,7 @@ Script_warpsound: ; 0x971c7
; script command 0x87
callba Function14a07
call StartSFX
call PlaySFX
ret
; 0x971d1