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

@@ -532,7 +532,7 @@ Function1ff8: ; 1ff8
PlayClickSFX: ; 2009
push de
ld de, SFX_READ_TEXT_2
call StartSFX
call PlaySFX
pop de
ret
; 0x2012