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/joypad.asm | |
| parent | 7a13251d0333d4914034ac8b370ddad2a6190d1d (diff) | |
| parent | 546c17ad37b1e0cfd91ea630e0bbc044c28b3e6a (diff) | |
Merge commit '546c17ad' into merge-mrwint
Conflicts:
engine/scripting.asm
main.asm
Diffstat (limited to 'home/joypad.asm')
| -rw-r--r-- | home/joypad.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/home/joypad.asm b/home/joypad.asm index 198e1c47b..efe70e809 100644 --- a/home/joypad.asm +++ b/home/joypad.asm @@ -394,7 +394,7 @@ Functionaaf: ; aaf call Functionac6 push de ld de, SFX_READ_TEXT_2 - call StartSFX + call PlaySFX pop de ret |