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

2
home/joypad.asm
View File

@@ -394,7 +394,7 @@ Functionaaf: ; aaf
call Functionac6
push de
ld de, SFX_READ_TEXT_2
call StartSFX
call PlaySFX
pop de
ret

2
home/menu.asm
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

2
home/text.asm
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