diff options
| author | yenatch <yenatch@gmail.com> | 2013-10-25 16:23:16 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2013-10-25 16:23:16 -0400 |
| commit | da22ada91ca6212b65cf4d8037d03ae1ebd97323 (patch) | |
| tree | 862fd3458c155a5adf792ae2ef671d0d9dd333c9 /home/text.asm | |
| parent | 7a13251d0333d4914034ac8b370ddad2a6190d1d (diff) | |
| parent | 546c17ad37b1e0cfd91ea630e0bbc044c28b3e6a (diff) | |
Merge commit '546c17ad' into merge-mrwint
Conflicts:
engine/scripting.asm
main.asm
Diffstat (limited to 'home/text.asm')
| -rw-r--r-- | home/text.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/home/text.asm b/home/text.asm index 6833f3ddc..c4ff6aa05 100644 --- a/home/text.asm +++ b/home/text.asm @@ -1087,7 +1087,7 @@ Text_PlaySound:: ; 1500 ld e, [hl] inc hl ld d, [hl] - call StartSFX + call PlaySFX call WaitSFX pop de |