Merge commit '546c17ad' into merge-mrwint

Conflicts:
	engine/scripting.asm
	main.asm

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
 

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

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
 

home/menu.asm

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

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