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 /engine | |
| parent | 7a13251d0333d4914034ac8b370ddad2a6190d1d (diff) | |
| parent | 546c17ad37b1e0cfd91ea630e0bbc044c28b3e6a (diff) | |
Merge commit '546c17ad' into merge-mrwint
Conflicts:
engine/scripting.asm
main.asm
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/scripting.asm | 6 | ||||
| -rw-r--r-- | engine/title.asm | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/engine/scripting.asm b/engine/scripting.asm index 951d55383..0cde8921e 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -578,7 +578,7 @@ Script_specialsound: ; 0x96fe4 jr z, .play ld de, SFX_ITEM .play - call StartSFX + call PlaySFX call WaitSFX ret ; 0x96ffe @@ -926,7 +926,7 @@ Script_playsound: ; 0x971b7 ld e, a call GetScriptByte ld d, a - call StartSFX + call PlaySFX ret ; 0x971c3 @@ -941,7 +941,7 @@ Script_warpsound: ; 0x971c7 ; script command 0x87 callba Function14a07 - call StartSFX + call PlaySFX ret ; 0x971d1 diff --git a/engine/title.asm b/engine/title.asm index 3772b052f..97428430c 100644 --- a/engine/title.asm +++ b/engine/title.asm @@ -225,7 +225,7 @@ _TitleScreen: ; 10ed67 ; Play starting sound effect call SFXChannelsOff ld de, SFX_TITLE_SCREEN_ENTRANCE - call StartSFX + call PlaySFX ret ; 10eea7 |