Merge commit '546c17ad' into merge-mrwint

Conflicts:
	engine/scripting.asm
	main.asm
This commit is contained in:
yenatch
2013-10-25 16:23:16 -04:00
6 changed files with 114 additions and 114 deletions

View File

@@ -1087,7 +1087,7 @@ Text_PlaySound:: ; 1500
ld e, [hl]
inc hl
ld d, [hl]
call StartSFX
call PlaySFX
call WaitSFX
pop de