naming and moving stuff

147 files changed, 441 insertions, 290 deletions

diff --git a/asm/macros/scripts.inc b/asm/macros/scripts.inc
index f9206713..97148a4a 100644
--- a/asm/macros/scripts.inc
+++ b/asm/macros/scripts.inc
@@ -651,17 +651,17 @@
 	.2byte \action
 .endm
 
-.macro SoundReq s:req
+.macro PlaySound s:req
 	.2byte 0x087b
 	.2byte \s
 .endm
 
-.macro SoundReq2 s:req
+.macro PlayBgm s:req
 	.2byte 0x087c
 	.2byte \s
 .endm
 
-.macro SoundReq3 w:req
+.macro SoundReq w:req
 	.2byte 0x0c7d
 	.4byte \w
 .endm
diff --git a/data/scripts/script_08008B5C.inc b/data/scripts/script_08008B5C.inc
index 4ba55575..2609b993 100644
--- a/data/scripts/script_08008B5C.inc
+++ b/data/scripts/script_08008B5C.inc
@@ -59,7 +59,7 @@ script_08008BD2:
 	WaitForSomething 0x00000001
 	WaitForSomething 0x00000004
 	Wait 0x000f
-	SoundReq 0x0072
+	PlaySound 0x0072
 	_0807E930 0x0004
 	Call sub_0807F2D4
 	TextboxNoOverlap 0x4913
@@ -80,7 +80,7 @@ script_08008C5C:
 	_0807EB44 0x0004
 	_0807E930 0x0004
 	SetEntitySpeed 0x0300
-	SoundReq 0x0121
+	PlaySound 0x0121
 	EndBlock 
 	WaitForSomething 0x00000002
 	TextboxNoOverlap 0x490d
@@ -97,19 +97,19 @@ script_08008C5C:
 	Call sub_08064D10
 	Wait 0x000f
 	_0807EB44 0x0004
-	SoundReq 0x007f
+	PlaySound 0x007f
 	Wait 0x000f
 	_0807EB44 0x0002
 	_0807EDD4 0x00ac, 0x0078
 	Wait 0x000f
 	_0807EB44 0x0004
-	SoundReq 0x007f
+	PlaySound 0x007f
 	Wait 0x000f
 	_0807EB44 0x0002
 	_0807EDD4 0x00c0, 0x0078
 	Wait 0x000f
 	_0807EB44 0x0004
-	SoundReq 0x007f
+	PlaySound 0x007f
 	Wait 0x000f
 	_0807EB44 0x0006
 	Wait 0x001e
@@ -122,7 +122,7 @@ script_08008C5C:
 	Call sub_08064D08
 	_0807EDD4 0x0068, 0x0018
 	Call sub_08064D10
-	SoundReq 0x0121
+	PlaySound 0x0121
 	_0807E5F8 0x00000001
 	DoPostScriptAction 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_08008FC0.inc b/data/scripts/script_08008FC0.inc
index dd2791f8..17e9c90c 100644
--- a/data/scripts/script_08008FC0.inc
+++ b/data/scripts/script_08008FC0.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_08008FC0
 	_0807F078 0x0001, 0x0001
 	CallWithArg sub_0807F918, 0x00000001
-	SoundReq 0x0109
+	PlaySound 0x0109
 	CallWithArg sub_0807F238, 0x0000045f
 	Call sub_0807F304
 	TextboxNoOverlapFollowPos 0x0501, 0x000e
diff --git a/data/scripts/script_08008FFC.inc b/data/scripts/script_08008FFC.inc
index 318ebf1f..3234f7ed 100644
--- a/data/scripts/script_08008FFC.inc
+++ b/data/scripts/script_08008FFC.inc
@@ -4,10 +4,10 @@ SCRIPT_START script_08008FFC
 	_0807E930 0x0000
 	EndBlock 
 	WaitForSomething 0x00000010
-	SoundReq 0x011c
+	PlaySound 0x011c
 	_0807E930 0x0001
 	Wait 0x0010
-	SoundReq 0x011c
+	PlaySound 0x011c
 	_0807EB44 0x0004
 	_0807E930 0x0006
 	Wait 0x0010
diff --git a/data/scripts/script_0800903C.inc b/data/scripts/script_0800903C.inc
index ba813a3f..e2724f67 100644
--- a/data/scripts/script_0800903C.inc
+++ b/data/scripts/script_0800903C.inc
@@ -4,7 +4,7 @@ SCRIPT_START script_0800903C
 	DoPostScriptAction 0x0000
 	EndBlock 
 	WaitForSomething2 0x00000004
-	SoundReq 0x007c
+	PlaySound 0x007c
 	_0807EF3C 0x0180, 0x0030
 	_0807EB44 0x0002
 	_0807E5F8 0x00000008
diff --git a/data/scripts/script_080095F2.inc b/data/scripts/script_080095F2.inc
index c16c4201..01726742 100644
--- a/data/scripts/script_080095F2.inc
+++ b/data/scripts/script_080095F2.inc
@@ -7,7 +7,7 @@ SCRIPT_START script_080095F2
 	Call sub_0806BE84
 	_0807EA94 
 	JumpIfNot script_08009622
-	SoundReq 0x0109
+	PlaySound 0x0109
 	_0807F088 0x003c
 	TextboxNoOverlapFollow 0x053c
 	WaitPlayerAction8 
@@ -43,8 +43,8 @@ script_08009660:
 	Call sub_0806BEC8
 	_0807EA94 
 	JumpIfNot script_0800968E
-	SoundReq 0x0111
-	SoundReq 0x0072
+	PlaySound 0x0111
+	PlaySound 0x0072
 	_0807F078 0x003c, 0x0002
 	Call sub_0806BEFC
 script_0800968E:
@@ -65,11 +65,11 @@ script_080096AC:
 	Call sub_0807DF28
 	StartPlayerScript script_08009704
 	WaitForSomething2 0x00000001
-	SoundReq 0x0111
+	PlaySound 0x0111
 	DoPostScriptAction 0x0008
 	LoadRoomEntityList gUnk_080D9048
 	Wait 0x000f
-	SoundReq 0x0111
+	PlaySound 0x0111
 	DoPostScriptAction 0x0007
 script_080096EC:
 	CheckGlobalFlag 0x0020
diff --git a/data/scripts/script_08009740.inc b/data/scripts/script_08009740.inc
index 707cc5e4..b55af466 100644
--- a/data/scripts/script_08009740.inc
+++ b/data/scripts/script_08009740.inc
@@ -20,7 +20,7 @@ script_0800975A:
 	_0807E864 
 	Call sub_0807F9A4
 	Call sub_0807DF28
-	SoundReq 0x01f3
+	PlaySound 0x01f3
 	Call sub_0807F40C
 	_0807E8E4_1 
 	Wait 0x000a
diff --git a/data/scripts/script_080097F0.inc b/data/scripts/script_080097F0.inc
index 85d253ee..ecaa18a9 100644
--- a/data/scripts/script_080097F0.inc
+++ b/data/scripts/script_080097F0.inc
@@ -6,7 +6,7 @@ SCRIPT_START script_080097F0
 	Call sub_0807F348
 	EndBlock 
 	WaitForSomething2 0x00000002
-	SoundReq 0x0123
+	PlaySound 0x0123
 	Call sub_0807F1A0
 script_08009816:
 	EndBlock 
@@ -16,6 +16,6 @@ script_08009816:
 	EndBlock 
 	_0807E5F8 0x00000004
 	Call sub_0807FBD4
-	SoundReq 0x01f3
+	PlaySound 0x01f3
 	DoPostScriptAction 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_08009838.inc b/data/scripts/script_08009838.inc
index 144383f8..d36abc7a 100644
--- a/data/scripts/script_08009838.inc
+++ b/data/scripts/script_08009838.inc
@@ -8,9 +8,9 @@ SCRIPT_START script_08009838
 	WaitForSomething2 0x00000008
 	Call sub_0809E0A0
 	Call sub_0809E0D4
-	SoundReq 0x01f3
+	PlaySound 0x01f3
 	Call sub_0807FBD4
-	SoundReq 0x01f3
+	PlaySound 0x01f3
 	_0807E5F8 0x00000010
 	DoPostScriptAction 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_0800987C.inc b/data/scripts/script_0800987C.inc
index d0cc3325..dd18c70f 100644
--- a/data/scripts/script_0800987C.inc
+++ b/data/scripts/script_0800987C.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_0800987C
-	SoundReq 0x007a
+	PlaySound 0x007a
 	_0807EB44 0x0004
-	SoundReq 0x0086
+	PlaySound 0x0086
 	Call sub_0807F36C
 	SetEntitySpeed 0x0400
 	_0807ECF4 0x0004
@@ -9,7 +9,7 @@ SCRIPT_START script_0800987C
 	Wait 0x001e
 	_0807E5F8 0x00000040
 	WaitForSomething2 0x00000020
-	SoundReq 0x007c
+	PlaySound 0x007c
 	_0807EB44 0x0004
 	Call sub_0807F210
 	_0807EF3C 0x0200, 0x0020
diff --git a/data/scripts/script_08009A34.inc b/data/scripts/script_08009A34.inc
index d70c103a..056b6ed5 100644
--- a/data/scripts/script_08009A34.inc
+++ b/data/scripts/script_08009A34.inc
@@ -10,7 +10,7 @@ script_08009A38:
 	CameraTargetEntity 
 	SetEntitySpeed 0x0080
 	Wait 0x0078
-	SoundReq2 0x0036
+	PlayBgm 0x0036
 	_0807E778 0x0002
 	DoFade4 
 	WaitFor_2 
diff --git a/data/scripts/script_08009AF8.inc b/data/scripts/script_08009AF8.inc
index 8e1ae84a..38ea17ff 100644
--- a/data/scripts/script_08009AF8.inc
+++ b/data/scripts/script_08009AF8.inc
@@ -2,10 +2,10 @@ SCRIPT_START script_08009AF8
 	BeginBlock 
 	EndBlock 
 	WaitForSomething2 0x00000010
-	SoundReq 0x00f0
+	PlaySound 0x00f0
 	DoPostScriptAction 0x0008
 	Wait 0x001e
-	SoundReq 0x00f1
+	PlaySound 0x00f1
 	DoPostScriptAction 0x0007
 	Wait 0x005a
 	_0807E778 0x0004
diff --git a/data/scripts/script_08009CFC.inc b/data/scripts/script_08009CFC.inc
index aa448258..48971084 100644
--- a/data/scripts/script_08009CFC.inc
+++ b/data/scripts/script_08009CFC.inc
@@ -12,7 +12,7 @@ SCRIPT_START script_08009CFC
 	DoPostScriptAction 0x0000
 	_0807E8E4_0 
 	Wait 0x000f
-	SoundReq 0x0094
+	PlaySound 0x0094
 	DoPostScriptAction 0x0000
 	Wait 0x001e
 	_0807E5F8 0x00000008
diff --git a/data/scripts/script_08009F14.inc b/data/scripts/script_08009F14.inc
index 828f4cf9..8f84597a 100644
--- a/data/scripts/script_08009F14.inc
+++ b/data/scripts/script_08009F14.inc
@@ -47,7 +47,7 @@ script_08009F86:
 	Jump script_08009F86
 script_08009FB6:
 	Wait 0x0008
-	SoundReq 0x0103
+	PlaySound 0x0103
 	CallWithArg sub_0806030C, 0x00000063
 	Wait 0x0008
 	_0807E878 
diff --git a/data/scripts/script_0800A0B4.inc b/data/scripts/script_0800A0B4.inc
index 5585c44b..79115473 100644
--- a/data/scripts/script_0800A0B4.inc
+++ b/data/scripts/script_0800A0B4.inc
@@ -5,7 +5,7 @@ SCRIPT_START script_0800A0B4
 	Call sub_0807DF28
 	EndBlock 
 	Wait 0x0078
-	SoundReq2 0x0018
+	PlayBgm 0x0018
 	Call sub_080A0464
 script_0800A0D2:
 	_0807EE30 
diff --git a/data/scripts/script_0800A0FC.inc b/data/scripts/script_0800A0FC.inc
index c7e7f59c..8362b30b 100644
--- a/data/scripts/script_0800A0FC.inc
+++ b/data/scripts/script_0800A0FC.inc
@@ -13,7 +13,7 @@ script_0800A0FE:
 	_0807E8E4_3 
 	CallWithArg sub_0807F75C, 0x00d00060
 	CallWithArg sub_08094AE8, script_0800A160
-	SoundReq 0x00f7
+	PlaySound 0x00f7
 	_0807E778 0x0002
 	DoFade6 
 	EndBlock 
diff --git a/data/scripts/script_0800A160.inc b/data/scripts/script_0800A160.inc
index 52e561c8..e71a310d 100644
--- a/data/scripts/script_0800A160.inc
+++ b/data/scripts/script_0800A160.inc
@@ -8,9 +8,9 @@ SCRIPT_START script_0800A160
 	CallWithArg sub_0807F98C, 0xff800000
 	CallWithArg sub_080960C4, script_0800A1B4
 	EndBlock 
-	SoundReq 0x0142
+	PlaySound 0x0142
 	_0807EF3C 0xff80, 0x0000
-	SoundReq 0x0143
+	PlaySound 0x0143
 	_0807E930 0x0004
 	_0807E5F8 0x00000002
 	Wait 0x003c
diff --git a/data/scripts/script_0800A1D8.inc b/data/scripts/script_0800A1D8.inc
index 96faa56d..96fe6d9b 100644
--- a/data/scripts/script_0800A1D8.inc
+++ b/data/scripts/script_0800A1D8.inc
@@ -56,8 +56,8 @@ SCRIPT_START script_0800A1D8
 	WaitForSomething2 0x00000080
 	_0807E5F8 0x00000008
 	WaitForSomething2 0x00000100
-	SoundReq2 0x0008
-	SoundReq 0x00f7
+	PlayBgm 0x0008
+	PlaySound 0x00f7
 	CallWithArg sub_0806DA1C, 0x00000007
 	DoPostScriptAction 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_0800A3D8.inc b/data/scripts/script_0800A3D8.inc
index 114943d5..371eda59 100644
--- a/data/scripts/script_0800A3D8.inc
+++ b/data/scripts/script_0800A3D8.inc
@@ -27,32 +27,32 @@ SCRIPT_START script_0800A3D8
 	WaitForSomething2 0x00000004
 	_0807EB44 0x0004
 	DoPostScriptAction 0x0000
-	SoundReq 0x0142
+	PlaySound 0x0142
 	CallWithArg sub_080960C4, script_0800A638
 	_0807E5F8 0x00000080
 	WaitForSomething2 0x00000004
-	SoundReq 0x0143
+	PlaySound 0x0143
 	_0807E5F8 0x00001000
 	_0807E5F8 0x00000080
 	WaitForSomething2 0x00000004
 	Call sub_08066E68
 	_0807E5F8 0x00000080
 	WaitForSomething2 0x00000004
-	SoundReq 0x0142
+	PlaySound 0x0142
 	CallWithArg sub_080960C4, script_0800A680
 	Wait 0x0078
-	SoundReq 0x0153
+	PlaySound 0x0153
 	CallWithArg sub_0807FADC, 0x00000003
 	Wait 0x000f
-	SoundReq 0x0153
+	PlaySound 0x0153
 	CallWithArg sub_0807FADC, 0x00000003
 	Wait 0x000f
-	SoundReq 0x0153
+	PlaySound 0x0153
 	CallWithArg sub_0807FADC, 0x00000003
 	Wait 0x003c
-	SoundReq 0x0153
+	PlaySound 0x0153
 	CallWithArg sub_0807FADC, 0x00000001
-	SoundReq 0x0143
+	PlaySound 0x0143
 	_0807E5F8 0x00000080
 	WaitForSomething2 0x00000004
 	DoPostScriptAction 0x0006
diff --git a/data/scripts/script_0800A500.inc b/data/scripts/script_0800A500.inc
index d9f29737..63101624 100644
--- a/data/scripts/script_0800A500.inc
+++ b/data/scripts/script_0800A500.inc
@@ -7,7 +7,7 @@ SCRIPT_START script_0800A500
 	Call sub_0807F348
 	EndBlock 
 	WaitForSomething2 0x00000008
-	SoundReq 0x0142
+	PlaySound 0x0142
 	_0807E610 0x00000800
 	CallWithArg sub_080960C4, script_0800A65C
 	_0807E930 0x0002
@@ -19,12 +19,12 @@ SCRIPT_START script_0800A500
 	Call sub_08094B3C
 	_0807E930 0x0004
 	_0807E5F8 0x00000800
-	SoundReq 0x0143
+	PlaySound 0x0143
 	_0807E5F8 0x00000100
 	WaitForSomething2 0x00000008
 	DoPostScriptAction 0x0008
 	Call sub_080961B0
-	SoundReq 0x00fa
+	PlaySound 0x00fa
 	Wait 0x003c
 	_0807E5F8 0x00000100
 SCRIPT_END
diff --git a/data/scripts/script_0800A590.inc b/data/scripts/script_0800A590.inc
index 4a6dd099..3a213619 100644
--- a/data/scripts/script_0800A590.inc
+++ b/data/scripts/script_0800A590.inc
@@ -12,14 +12,14 @@ SCRIPT_START script_0800A590
 	WaitForSomething2 0x00000010
 	CallWithArg sub_0807F6E8, 0x00000008
 	DoPostScriptAction 0x0007
-	SoundReq 0x0142
+	PlaySound 0x0142
 	_0807E610 0x00000800
 	CallWithArg sub_080960C4, script_0800A65C
 	Wait 0x003c
 	_0807EDD4 0x0088, 0x0068
 	Wait 0x0078
 	_0807E5F8 0x00000800
-	SoundReq 0x0143
+	PlaySound 0x0143
 	_0807EF3C 0x0000, 0x0020
 	_0807E930 0x001f
 	_0807E5F8 0x00000200
diff --git a/data/scripts/script_0800A6A4.inc b/data/scripts/script_0800A6A4.inc
index b59a7fdf..a12e17ad 100644
--- a/data/scripts/script_0800A6A4.inc
+++ b/data/scripts/script_0800A6A4.inc
@@ -6,7 +6,7 @@ SCRIPT_START script_0800A6A4
 	Call sub_0807F844
 	EndBlock 
 	Wait 0x003c
-	SoundReq 0x00f6
+	PlaySound 0x00f6
 	CallWithArg sub_0806DA1C, 0x00000008
 	DoPostScriptAction 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_0800A6D4.inc b/data/scripts/script_0800A6D4.inc
index 0c4d8409..41e98187 100644
--- a/data/scripts/script_0800A6D4.inc
+++ b/data/scripts/script_0800A6D4.inc
@@ -4,7 +4,7 @@ SCRIPT_START script_0800A6D4
 	Call sub_0807DF28
 	SetEntityPositionRelative 0x0088, 0x0070
 	Call sub_0807F844
-	SoundReq 0x00f7
+	PlaySound 0x00f7
 	EndBlock 
 	Wait 0x003c
 	CallWithArg sub_0806DA1C, 0x00000009
diff --git a/data/scripts/script_0800A704.inc b/data/scripts/script_0800A704.inc
index ad6120c2..ab116b33 100644
--- a/data/scripts/script_0800A704.inc
+++ b/data/scripts/script_0800A704.inc
@@ -6,7 +6,7 @@ SCRIPT_START script_0800A704
 	Call sub_0807F844
 	EndBlock 
 	Wait 0x003c
-	SoundReq 0x00f6
+	PlaySound 0x00f6
 	CallWithArg sub_0806DA1C, 0x0000000a
 	DoPostScriptAction 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_0800A734.inc b/data/scripts/script_0800A734.inc
index 1bbc5b98..a2c1b883 100644
--- a/data/scripts/script_0800A734.inc
+++ b/data/scripts/script_0800A734.inc
@@ -4,7 +4,7 @@ SCRIPT_START script_0800A734
 	Call sub_0807DF28
 	SetEntityPositionRelative 0x00d8, 0x01c8
 	Call sub_0807F844
-	SoundReq 0x00f7
+	PlaySound 0x00f7
 	EndBlock 
 	Wait 0x003c
 	CallWithArg sub_0806DA1C, 0x0000000b
diff --git a/data/scripts/script_0800A764.inc b/data/scripts/script_0800A764.inc
index e89ebe2c..63d178d7 100644
--- a/data/scripts/script_0800A764.inc
+++ b/data/scripts/script_0800A764.inc
@@ -6,12 +6,12 @@ SCRIPT_START script_0800A764
 	Call sub_0807F844
 	EndBlock 
 	Wait 0x003c
-	SoundReq 0x00f6
+	PlaySound 0x00f6
 	_0807E778 0x0004
 	DoFade7 
 	WaitFor_2 
 	_0807E5F8 0x00000001
-	SoundReq 0x00f7
+	PlaySound 0x00f7
 	_0807E778 0x0002
 	DoFade6 
 	WaitFor_2 
diff --git a/data/scripts/script_0800AAD8.inc b/data/scripts/script_0800AAD8.inc
index 869e2aec..8dab4ef3 100644
--- a/data/scripts/script_0800AAD8.inc
+++ b/data/scripts/script_0800AAD8.inc
@@ -6,7 +6,7 @@ SCRIPT_START script_0800AAD8
 	Call sub_0807F844
 	EndBlock 
 	Wait 0x003c
-	SoundReq 0x00f6
+	PlaySound 0x00f6
 	CallWithArg sub_0806DA1C, 0x0000000f
 	DoPostScriptAction 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_0800AB08.inc b/data/scripts/script_0800AB08.inc
index 2c38aa99..2179e708 100644
--- a/data/scripts/script_0800AB08.inc
+++ b/data/scripts/script_0800AB08.inc
@@ -7,7 +7,7 @@ SCRIPT_START script_0800AB08
 	_0807E8E4_3 
 	CallWithArg sub_0807F6E8, 0x00000008
 	CallWithArg sub_0807F75C, 0x00a80088
-	SoundReq 0x00f7
+	PlaySound 0x00f7
 	EndBlock 
 	Wait 0x0078
 	_0807F0B4 0x0001
diff --git a/data/scripts/script_0800ACE0.inc b/data/scripts/script_0800ACE0.inc
index 7f22b9cf..270040b2 100644
--- a/data/scripts/script_0800ACE0.inc
+++ b/data/scripts/script_0800ACE0.inc
@@ -2,7 +2,7 @@ SCRIPT_START script_0800ACE0
 	BeginBlock 
 	Call sub_08094BE0
 	CallWithArg sub_0807F238, 0x0000045b
-	SoundReq 0x0109
+	PlaySound 0x0109
 	EndBlock 
 	Call sub_0807F304
 	Wait 0x005a
diff --git a/data/scripts/script_0800AF18.inc b/data/scripts/script_0800AF18.inc
index 71358dea..1002de83 100644
--- a/data/scripts/script_0800AF18.inc
+++ b/data/scripts/script_0800AF18.inc
@@ -3,10 +3,10 @@ SCRIPT_START script_0800AF18
 	DoPostScriptAction 0x0007
 	DoPostScriptAction 0x000b
 	CallWithArg sub_0807F994, 0x0000fff8
-	SoundReq 0x0142
+	PlaySound 0x0142
 	EndBlock 
 	WaitForSomething 0x00000020
-	SoundReq 0x0143
+	PlaySound 0x0143
 	DoPostScriptAction 0x0006
 SCRIPT_END
 	.2byte 0x0000
diff --git a/data/scripts/script_0800B0D0.inc b/data/scripts/script_0800B0D0.inc
index c4687bdc..0599f05b 100644
--- a/data/scripts/script_0800B0D0.inc
+++ b/data/scripts/script_0800B0D0.inc
@@ -48,7 +48,7 @@ script_0800B160:
 	WaitForSomething2 0x00000001
 	SetRoomFlag 0x0000
 	Wait 0x0010
-	SoundReq2 0x002d
+	PlayBgm 0x002d
 	_0807EB28 0x2701
 	_0807E878 
 	Call sub_0807DF50
diff --git a/data/scripts/script_0800B308.inc b/data/scripts/script_0800B308.inc
index 4163885a..e1a2f28c 100644
--- a/data/scripts/script_0800B308.inc
+++ b/data/scripts/script_0800B308.inc
@@ -22,7 +22,7 @@ script_0800B348:
 script_0800B350:
 	EndBlock 
 	WaitForSomething2 0x00000002
-	SoundReq 0x00fd
+	PlaySound 0x00fd
 	Call sub_080676D8
 	Call sub_0806757C
 	Call sub_080675D4
@@ -37,7 +37,7 @@ script_0800B350:
 	JumpIfNot script_0800B350
 	EndBlock 
 	SetLocalFlag 0x001d
-	SoundReq 0x0072
+	PlaySound 0x0072
 script_0800B39C:
 	DoPostScriptAction 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_0800B41C.inc b/data/scripts/script_0800B41C.inc
index 6af14ec8..08002481 100644
--- a/data/scripts/script_0800B41C.inc
+++ b/data/scripts/script_0800B41C.inc
@@ -15,7 +15,7 @@ SCRIPT_START script_0800B41C
 	WaitForSomething2 0x00000004
 	_0807EB74 
 	Wait 0x003c
-	SoundReq 0x00cd
+	PlaySound 0x00cd
 	_0807F088 0x0037
 	WaitPlayerAction8 
 	_0807EB8C 
diff --git a/data/scripts/script_0800B574.inc b/data/scripts/script_0800B574.inc
index c42e9417..ce1f110a 100644
--- a/data/scripts/script_0800B574.inc
+++ b/data/scripts/script_0800B574.inc
@@ -6,16 +6,16 @@ SCRIPT_START script_0800B574
 	EndBlock 
 	WaitForSomething2 0x00000010
 	DoPostScriptAction 0x0008
-	SoundReq 0x0111
+	PlaySound 0x0111
 	WaitForSomething2 0x00000010
 	DoPostScriptAction 0x0007
-	SoundReq 0x0111
+	PlaySound 0x0111
 	WaitForSomething2 0x00000010
 	DoPostScriptAction 0x0008
-	SoundReq 0x0111
+	PlaySound 0x0111
 	WaitForSomething2 0x00000010
 	DoPostScriptAction 0x0007
-	SoundReq 0x0111
+	PlaySound 0x0111
 script_0800B5BC:
 	Call sub_0808692C
 SCRIPT_END
diff --git a/data/scripts/script_0800B5C4.inc b/data/scripts/script_0800B5C4.inc
index 45c39e1e..970550d3 100644
--- a/data/scripts/script_0800B5C4.inc
+++ b/data/scripts/script_0800B5C4.inc
@@ -4,7 +4,7 @@ SCRIPT_START script_0800B5C4
 	_0807EB44 0x0004
 	EndBlock 
 	Wait 0x001e
-	SoundReq 0x00d1
+	PlaySound 0x00d1
 	_0807EDD4 0x008a, 0x005a
 	Wait 0x000a
 	Call sub_08069EE8
diff --git a/data/scripts/script_0800B9B4.inc b/data/scripts/script_0800B9B4.inc
index 1a1519f2..49910e74 100644
--- a/data/scripts/script_0800B9B4.inc
+++ b/data/scripts/script_0800B9B4.inc
@@ -53,7 +53,7 @@ script_0800BA46:
 	JumpIfNot script_0800BA6C
 	SoundReq0x80100000 
 	Call sub_0806E964
-	SoundReq2 0xffff
+	PlayBgm 0xffff
 script_0800BA6C:
 	Call sub_0807DF50
 	_0807E878 
diff --git a/data/scripts/script_0800BC50.inc b/data/scripts/script_0800BC50.inc
index 2cc1a6d6..eb5ac6ce 100644
--- a/data/scripts/script_0800BC50.inc
+++ b/data/scripts/script_0800BC50.inc
@@ -30,7 +30,7 @@ script_0800BC62:
 	Call sub_0807F158
 	CallWithArg sub_0807F4F8, 0x0000035c
 	Wait 0x001e
-	SoundReq 0x0188
+	PlaySound 0x0188
 	DoPostScriptAction 0x0008
 	Wait 0x0078
 	Call sub_08054968
diff --git a/data/scripts/script_0800C3CC.inc b/data/scripts/script_0800C3CC.inc
index 54d6aa9b..ce535284 100644
--- a/data/scripts/script_0800C3CC.inc
+++ b/data/scripts/script_0800C3CC.inc
@@ -10,5 +10,5 @@ SCRIPT_START script_0800C3CC
 	CallWithArg sub_0807F4F8, 0x00000068
 	Call sub_0806D67C
 	_0807F0C8 0x001e, 0x0000
-	SoundReq 0x010b
+	PlaySound 0x010b
 SCRIPT_END
diff --git a/data/scripts/script_0800C410.inc b/data/scripts/script_0800C410.inc
index 4e3767b4..0664e98d 100644
--- a/data/scripts/script_0800C410.inc
+++ b/data/scripts/script_0800C410.inc
@@ -10,7 +10,7 @@ SCRIPT_START script_0800C410
 	CallWithArg sub_0807F4F8, 0x00000068
 	Call sub_0806D67C
 	_0807F0C8 0x001e, 0x0000
-	SoundReq 0x010b
+	PlaySound 0x010b
 	_0807E5F8 0x00000001
 SCRIPT_END
 	.2byte 0x0000
diff --git a/data/scripts/script_0800C45C.inc b/data/scripts/script_0800C45C.inc
index 5c8767cc..fe998e08 100644
--- a/data/scripts/script_0800C45C.inc
+++ b/data/scripts/script_0800C45C.inc
@@ -6,7 +6,7 @@ SCRIPT_START script_0800C45C
 	EndBlock 
 	Wait 0x000a
 	DoPostScriptAction 0x0007
-	SoundReq 0x0136
+	PlaySound 0x0136
 script_0800C47A:
 	_0807EE30 
 	JumpIfNot script_0800C47A
diff --git a/data/scripts/script_0800C494.inc b/data/scripts/script_0800C494.inc
index f35af231..e30437fb 100644
--- a/data/scripts/script_0800C494.inc
+++ b/data/scripts/script_0800C494.inc
@@ -5,7 +5,7 @@ SCRIPT_START script_0800C494
 	EndBlock 
 	Wait 0x000a
 	DoPostScriptAction 0x0007
-	SoundReq 0x0136
+	PlaySound 0x0136
 	_0807EEF4 0x0000, 0xff90
 	Wait 0x001e
 	_0807EEF4 0x0000, 0xffb0
diff --git a/data/scripts/script_0800C4D0.inc b/data/scripts/script_0800C4D0.inc
index 6365aa7e..a5f2ca10 100644
--- a/data/scripts/script_0800C4D0.inc
+++ b/data/scripts/script_0800C4D0.inc
@@ -5,7 +5,7 @@ SCRIPT_START script_0800C4D0
 	EndBlock 
 	Wait 0x000a
 	DoPostScriptAction 0x0007
-	SoundReq 0x0136
+	PlaySound 0x0136
 	_0807EEF4 0x00c0, 0x0000
 	Wait 0x001e
 	_0807EEF4 0x0070, 0x0000
diff --git a/data/scripts/script_0800C50C.inc b/data/scripts/script_0800C50C.inc
index 0c8bc2b1..aea992fc 100644
--- a/data/scripts/script_0800C50C.inc
+++ b/data/scripts/script_0800C50C.inc
@@ -7,7 +7,7 @@ SCRIPT_START script_0800C50C
 	WaitForSomething2 0x00000001
 	Wait 0x000a
 	DoPostScriptAction 0x0007
-	SoundReq 0x0136
+	PlaySound 0x0136
 	_0807EEF4 0x0000, 0x0060
 	Wait 0x003c
 	_0807EEF4 0x0000, 0x0060
diff --git a/data/scripts/script_0800C550.inc b/data/scripts/script_0800C550.inc
index bcd1f208..d94569e3 100644
--- a/data/scripts/script_0800C550.inc
+++ b/data/scripts/script_0800C550.inc
@@ -139,7 +139,7 @@ script_0800C6DC:
 	_0807EC94 0x0020
 	_0807EB44 0x0004
 	Wait 0x000f
-	SoundReq 0x0072
+	PlaySound 0x0072
 	SetLocalFlag 0x0082
 script_0800C712:
 	DoPostScriptAction 0x0002
@@ -232,7 +232,7 @@ script_0800C824:
 	Wait 0x000f
 	SetLocalFlag 0x0083
 	Wait 0x003c
-	SoundReq 0x0072
+	PlaySound 0x0072
 	Wait 0x003c
 	_0807EB74 
 	_0807EB8C 
diff --git a/data/scripts/script_0800CABC.inc b/data/scripts/script_0800CABC.inc
index 0387d84e..d715bc6d 100644
--- a/data/scripts/script_0800CABC.inc
+++ b/data/scripts/script_0800CABC.inc
@@ -13,9 +13,9 @@ SCRIPT_START script_0800CABC
 	DoPostScriptAction 0x0000
 	_0807E5F8 0x00000400
 	WaitForSomething2 0x00000200
-	SoundReq 0x007c
+	PlaySound 0x007c
 	_0807EF3C 0x0180, 0x0030
-	SoundReq 0x007c
+	PlaySound 0x007c
 	_0807EF3C 0x0180, 0x0030
 	_0807E5F8 0x00000400
 	WaitForSomething2 0x00000200
diff --git a/data/scripts/script_0800CBD4.inc b/data/scripts/script_0800CBD4.inc
index 1ba664af..99356a4f 100644
--- a/data/scripts/script_0800CBD4.inc
+++ b/data/scripts/script_0800CBD4.inc
@@ -19,9 +19,9 @@ SCRIPT_START script_0800CBD4
 	DoPostScriptAction 0x0000
 	_0807E5F8 0x00004000
 	WaitForSomething2 0x00002000
-	SoundReq 0x007c
+	PlaySound 0x007c
 	_0807EF3C 0x0180, 0x0030
-	SoundReq 0x007c
+	PlaySound 0x007c
 	_0807EF3C 0x0180, 0x0030
 	_0807E5F8 0x00004000
 	WaitForSomething2 0x00002000
diff --git a/data/scripts/script_0800CC6C.inc b/data/scripts/script_0800CC6C.inc
index 81dde4c6..24fcbf29 100644
--- a/data/scripts/script_0800CC6C.inc
+++ b/data/scripts/script_0800CC6C.inc
@@ -19,9 +19,9 @@ SCRIPT_START script_0800CC6C
 	DoPostScriptAction 0x0000
 	_0807E5F8 0x00010000
 	WaitForSomething2 0x00008000
-	SoundReq 0x007c
+	PlaySound 0x007c
 	_0807EF3C 0x0180, 0x0030
-	SoundReq 0x007c
+	PlaySound 0x007c
 	_0807EF3C 0x0180, 0x0030
 	_0807E5F8 0x00010000
 	WaitForSomething2 0x00008000
diff --git a/data/scripts/script_0800CD7C.inc b/data/scripts/script_0800CD7C.inc
index bac529fa..73395a5e 100644
--- a/data/scripts/script_0800CD7C.inc
+++ b/data/scripts/script_0800CD7C.inc
@@ -41,7 +41,7 @@ script_0800CDEC:
 	_0807EA94 
 	_0807E3E8 
 	JumpIfNot script_0800CF40
-	SoundReq 0x00cd
+	PlaySound 0x00cd
 	_0807F088 0x0023
 	WaitPlayerAction8 
 	Jump script_0800CE32
@@ -52,7 +52,7 @@ script_0800CE14:
 	_0807EA94 
 	_0807E3E8 
 	JumpIfNot script_0800CF40
-	SoundReq 0x00cd
+	PlaySound 0x00cd
 	_0807F088 0x0022
 	WaitPlayerAction8 
 script_0800CE32:
@@ -81,7 +81,7 @@ script_0800CE6E:
 	_0807EA94 
 	_0807E3E8 
 	JumpIfNot script_0800CF40
-	SoundReq 0x00cd
+	PlaySound 0x00cd
 	_0807F088 0x0027
 	WaitPlayerAction8 
 	_0807EB8C 
@@ -109,7 +109,7 @@ script_0800CECE:
 	_0807EA94 
 	_0807E3E8 
 	JumpIfNot script_0800CF40
-	SoundReq 0x00cd
+	PlaySound 0x00cd
 	_0807F088 0x0024
 	WaitPlayerAction8 
 	_0807EB8C 
@@ -257,12 +257,12 @@ script_0800D0A8:
 	_0807EB44 0x0002
 	SetIntVariable 0x00000000
 	Call sub_0806C028
-	SoundReq 0x00cd
+	PlaySound 0x00cd
 	Call sub_08068964
 script_0800D108:
 	ComparePlayerAction 0x0008
 	JumpIf script_0800D108
-	SoundReq 0x00f8
+	PlaySound 0x00f8
 	_0807E5F8 0x00000010
 	SetLocalFlag 0x007e
 	TextboxNoOverlapFollowPos 0x123e, 0x0002
diff --git a/data/scripts/script_0800D1E0.inc b/data/scripts/script_0800D1E0.inc
index 2ff93e40..14036de0 100644
--- a/data/scripts/script_0800D1E0.inc
+++ b/data/scripts/script_0800D1E0.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_0800D1E0
 	_0807F078 0x0002, 0x0001
 	CallWithArg sub_0807F918, 0x00000002
-	SoundReq 0x0109
+	PlaySound 0x0109
 	CallWithArg sub_0807F238, 0x000001e2
 	Call sub_0807F304
 	TextboxNoOverlap 0x0502
diff --git a/data/scripts/script_0800D278.inc b/data/scripts/script_0800D278.inc
index 16ef4204..544c0f04 100644
--- a/data/scripts/script_0800D278.inc
+++ b/data/scripts/script_0800D278.inc
@@ -101,7 +101,7 @@ script_0800D3B2:
 	_0807E930 0x0003
 	SetIntVariable 0x00000004
 	Call sub_080681D8
-	SoundReq 0x00cd
+	PlaySound 0x00cd
 	Wait 0x001e
 	DoPostScriptAction 0x000a
 	SetLocalFlag 0x007f
diff --git a/data/scripts/script_0800D76C.inc b/data/scripts/script_0800D76C.inc
index e81cc3d9..a188e68d 100644
--- a/data/scripts/script_0800D76C.inc
+++ b/data/scripts/script_0800D76C.inc
@@ -9,15 +9,15 @@ SCRIPT_START script_0800D76C
 	WaitForSomething2 0x00000008
 	DoPostScriptAction 0x0004
 	Wait 0x003c
-	SoundReq 0x0123
+	PlaySound 0x0123
 	CallWithArg sub_0807F464, 0x000001e0
 	_0807EDD4 0x01e0, 0x01d8
 	_0807EB44 0x0002
 	DoPostScriptAction 0x0000
 	_0807E5F8 0x00000010
-	SoundReq 0x007c
+	PlaySound 0x007c
 	_0807EF3C 0x0180, 0x0030
-	SoundReq 0x007c
+	PlaySound 0x007c
 	_0807EF3C 0x0180, 0x0030
 	_0807EB44 0x0002
 	DoPostScriptAction 0x0001
@@ -39,7 +39,7 @@ script_0800D80C:
 	DoPostScriptAction 0x000e
 	Call sub_0806CA5C
 	SetEntity0x20 0x00040000
-	SoundReq 0x00f5
+	PlaySound 0x00f5
 script_0800D82A:
 	CallWithArg sub_0807F8D0, 0xffffe000
 	Call sub_0807F8BC
diff --git a/data/scripts/script_0800D874.inc b/data/scripts/script_0800D874.inc
index f16e938f..769fffbf 100644
--- a/data/scripts/script_0800D874.inc
+++ b/data/scripts/script_0800D874.inc
@@ -44,7 +44,7 @@ script_0800D8F4:
 	WaitPlayerAction8 
 	_0807EB28 0x1325
 	_0807EA94 
-	SoundReq 0x0113
+	PlaySound 0x0113
 	SetIntVariable 0x00000000
 	Call sub_0806DA1C
 	_0807E878 
diff --git a/data/scripts/script_0800D954.inc b/data/scripts/script_0800D954.inc
index b745268a..e0a357dc 100644
--- a/data/scripts/script_0800D954.inc
+++ b/data/scripts/script_0800D954.inc
@@ -15,7 +15,7 @@ script_0800D962:
 	_0807EB44 0x0004
 	DoPostScriptAction 0x0000
 	DoPostScriptAction 0x0007
-	SoundReq 0x01ce
+	PlaySound 0x01ce
 	SetEntity0x20 0xffff8000
 	TextboxNoOverlap 0x1701
 	_0807EA94 
@@ -32,7 +32,7 @@ script_0800D962:
 	_0807EA94 
 	Wait 0x003c
 	SetLocalFlag 0x0032
-	SoundReq 0x0113
+	PlaySound 0x0113
 	SetIntVariable 0x00000001
 	Call sub_0806DA1C
 	Call sub_0807DF50
diff --git a/data/scripts/script_0800DC4C.inc b/data/scripts/script_0800DC4C.inc
index 305493d4..f9b2057e 100644
--- a/data/scripts/script_0800DC4C.inc
+++ b/data/scripts/script_0800DC4C.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_0800DC4C
 	Wait 0x003c
-	SoundReq2 0x0031
+	PlayBgm 0x0031
 	StartPlayerScript script_0800DE50
 	WaitForSomething2 0x00000006
 	_0807EB28 0x1646
diff --git a/data/scripts/script_0800DCAC.inc b/data/scripts/script_0800DCAC.inc
index c3bef3db..370daf39 100644
--- a/data/scripts/script_0800DCAC.inc
+++ b/data/scripts/script_0800DCAC.inc
@@ -16,12 +16,12 @@ script_0800DCD0:
 	WaitForSomething2 0x00000001
 	SoundReq0x80100000 
 	Call sub_08066E50
-	SoundReq 0x01c9
+	PlaySound 0x01c9
 	Call sub_0807F2D4
-	SoundReq 0x01ca
+	PlaySound 0x01ca
 	Wait 0x003c
 	DoPostScriptAction 0x0004
-	SoundReq2 0x000b
+	PlayBgm 0x000b
 	Wait 0x0078
 	_0807EB44 0x0002
 	DoPostScriptAction 0x0000
diff --git a/data/scripts/script_0800DF24.inc b/data/scripts/script_0800DF24.inc
index 1bbcf592..5047813c 100644
--- a/data/scripts/script_0800DF24.inc
+++ b/data/scripts/script_0800DF24.inc
@@ -21,9 +21,9 @@ SCRIPT_START script_0800DF24
 	DoPostScriptAction 0x0007
 	TextboxNoOverlapFollowPos 0x162f, 0x0002
 	_0807EA94 
-	SoundReq2 0x002f
+	PlayBgm 0x002f
 	DoPostScriptAction 0x0019
-	SoundReq 0x0198
+	PlaySound 0x0198
 	Call sub_0807F2D4
 	SetRoomFlag 0x0000
 	DoPostScriptAction 0x0008
diff --git a/data/scripts/script_0800DFB4.inc b/data/scripts/script_0800DFB4.inc
index 1a66bdab..16df6635 100644
--- a/data/scripts/script_0800DFB4.inc
+++ b/data/scripts/script_0800DFB4.inc
@@ -6,7 +6,7 @@ script_0800DFB6:
 	SoundReq0x80100000 
 	_0807E864 
 	Call sub_0807DF28
-	SoundReq 0x00f6
+	PlaySound 0x00f6
 	CallWithArg sub_0806DA1C, 0x00000004
 	Call sub_0807DF50
 	_0807E878 
diff --git a/data/scripts/script_0800DFE4.inc b/data/scripts/script_0800DFE4.inc
index d1de2e0b..38fb1be5 100644
--- a/data/scripts/script_0800DFE4.inc
+++ b/data/scripts/script_0800DFE4.inc
@@ -10,7 +10,7 @@ SCRIPT_START script_0800DFE4
 script_0800DFFE:
 	CheckRoomFlag 0x0000
 	JumpIfNot script_0800DFFE
-	SoundReq2 0x0030
+	PlayBgm 0x0030
 	Call sub_0807DF50
 	_0807E878 
 script_0800E012:
@@ -22,7 +22,7 @@ script_0800E012:
 	TextboxNoOverlapFollowPos 0x1639, 0x000c
 	_0807EA94 
 	Wait 0x0096
-	SoundReq 0x00f6
+	PlaySound 0x00f6
 	CallWithArg sub_0806DA1C, 0x00000005
 	Call sub_0807DF50
 	_0807E878 
diff --git a/data/scripts/script_0800E0BC.inc b/data/scripts/script_0800E0BC.inc
index 8ca8ff20..07068484 100644
--- a/data/scripts/script_0800E0BC.inc
+++ b/data/scripts/script_0800E0BC.inc
@@ -13,13 +13,13 @@ script_0800E0DE:
 	_0807E864 
 	Wait 0x001e
 	DoPostScriptAction 0x0010
-	SoundReq 0x01c9
+	PlaySound 0x01c9
 	_0807E930 0x0009
 	Wait 0x003c
-	SoundReq 0x01ca
+	PlaySound 0x01ca
 	DoPostScriptAction 0x0010
 	Wait 0x001e
-	SoundReq 0x0072
+	PlaySound 0x0072
 	Wait 0x0078
 	DoPostScriptAction 0x0004
 	Wait 0x001e
@@ -59,13 +59,13 @@ script_0800E176:
 	_0807E864 
 	Wait 0x001e
 	DoPostScriptAction 0x0010
-	SoundReq 0x01c9
+	PlaySound 0x01c9
 	_0807E930 0x0015
 	Wait 0x003c
-	SoundReq 0x01ca
+	PlaySound 0x01ca
 	DoPostScriptAction 0x0010
 	Wait 0x001e
-	SoundReq 0x0072
+	PlaySound 0x0072
 	Wait 0x0078
 	DoPostScriptAction 0x0004
 	Wait 0x001e
@@ -116,13 +116,13 @@ script_0800E24A:
 	_0807E864 
 	Wait 0x001e
 	DoPostScriptAction 0x0010
-	SoundReq 0x01c9
+	PlaySound 0x01c9
 	_0807E930 0x0015
 	Wait 0x003c
-	SoundReq 0x01ca
+	PlaySound 0x01ca
 	DoPostScriptAction 0x0010
 	Wait 0x001e
-	SoundReq 0x0072
+	PlaySound 0x0072
 	Wait 0x0078
 	DoPostScriptAction 0x0004
 	Wait 0x001e
@@ -197,13 +197,13 @@ script_0800E37A:
 	_0807E864 
 	Wait 0x001e
 	DoPostScriptAction 0x0010
-	SoundReq 0x01c9
+	PlaySound 0x01c9
 	_0807E930 0x000d
 	Wait 0x003c
-	SoundReq 0x01ca
+	PlaySound 0x01ca
 	DoPostScriptAction 0x0010
 	Wait 0x001e
-	SoundReq 0x0072
+	PlaySound 0x0072
 	Wait 0x0078
 	DoPostScriptAction 0x0004
 	Wait 0x001e
@@ -311,7 +311,7 @@ script_0800E4B6:
 	Wait 0x003c
 	_0807EA94 
 	BeginBlock 
-	SoundReq2 0x0033
+	PlayBgm 0x0033
 	SetLocalFlag 0x007c
 script_0800E4FA:
 	_0807E878 
diff --git a/data/scripts/script_0800E504.inc b/data/scripts/script_0800E504.inc
index aa6d96c5..4473c3c3 100644
--- a/data/scripts/script_0800E504.inc
+++ b/data/scripts/script_0800E504.inc
@@ -10,7 +10,7 @@ script_0800E510:
 	Wait 0x001e
 	Call sub_0807F3F8
 	Wait 0x003c
-	SoundReq 0x0105
+	PlaySound 0x0105
 	Wait 0x001e
 	_0807EB28 0x1617
 	SetLocalFlag 0x007d
diff --git a/data/scripts/script_0800E544.inc b/data/scripts/script_0800E544.inc
index 7b085256..54ff37d6 100644
--- a/data/scripts/script_0800E544.inc
+++ b/data/scripts/script_0800E544.inc
@@ -10,7 +10,7 @@ script_0800E550:
 	Wait 0x001e
 	Call sub_0807F3F8
 	Wait 0x003c
-	SoundReq 0x0105
+	PlaySound 0x0105
 	Wait 0x001e
 	_0807EB28 0x1622
 	Call sub_08053494
diff --git a/data/scripts/script_0800E58C.inc b/data/scripts/script_0800E58C.inc
index 54971859..833471b5 100644
--- a/data/scripts/script_0800E58C.inc
+++ b/data/scripts/script_0800E58C.inc
@@ -5,9 +5,9 @@ SCRIPT_START script_0800E58C
 	DoPostScriptAction 0x0014
 	EndBlock 
 	Wait 0x003c
-	SoundReq 0x0105
+	PlaySound 0x0105
 	Wait 0x003c
-	SoundReq 0x009b
+	PlaySound 0x009b
 	Wait 0x001e
 	TextboxNoOverlap 0x1625
 	_0807EA94 
diff --git a/data/scripts/script_0800E908.inc b/data/scripts/script_0800E908.inc
index 84d61ce1..d088735b 100644
--- a/data/scripts/script_0800E908.inc
+++ b/data/scripts/script_0800E908.inc
@@ -58,7 +58,7 @@ script_0800E974:
 	StartPlayerScript script_0800EA1C
 	WaitForSomething2 0x00000001
 	SetLocalFlag 0x0074
-	SoundReq 0x0072
+	PlaySound 0x0072
 	Wait 0x00f0
 	TextboxNoOverlapFollow 0x4a26
 	_0807EA94 
diff --git a/data/scripts/script_0800F724.inc b/data/scripts/script_0800F724.inc
index 6a89a421..a676b8c0 100644
--- a/data/scripts/script_0800F724.inc
+++ b/data/scripts/script_0800F724.inc
@@ -79,7 +79,7 @@ script_0800F72C:
 	_0807E864 
 	Call sub_0807DF28
 	Call sub_08063C5C
-	SoundReq 0x00e2
+	PlaySound 0x00e2
 	Wait 0x001e
 	_0807E8E4_0 
 	Call sub_0807F3F8
@@ -134,7 +134,7 @@ script_0800F72C:
 	_0807EA94 
 	Call sub_08063C14
 	Call sub_08094D70
-	SoundReq 0x0103
+	PlaySound 0x0103
 	_0807E5F8 0x00000002
 	WaitForSomething2 0x00000004
 	Call sub_08063C14
diff --git a/data/scripts/script_0800FF74.inc b/data/scripts/script_0800FF74.inc
index c74dadee..cc72a088 100644
--- a/data/scripts/script_0800FF74.inc
+++ b/data/scripts/script_0800FF74.inc
@@ -51,7 +51,7 @@ script_08010014:
 	_0807E864 
 	_0807EB74 
 	CallWithArg sub_0807F3D8, 0x00000008
-	SoundReq 0x00cd
+	PlaySound 0x00cd
 	TextboxNoOverlap 0x340a
 	_0807EA94 
 	_0807EB44 0x0004
diff --git a/data/scripts/script_080100C8.inc b/data/scripts/script_080100C8.inc
index fd50b2f9..0237ea4c 100644
--- a/data/scripts/script_080100C8.inc
+++ b/data/scripts/script_080100C8.inc
@@ -61,7 +61,7 @@ script_0801015A:
 	_0807E878 
 	CallWithArg sub_080A1550, script_080101AC
 	JumpIfNot script_0801015A
-	SoundReq2 0x0015
+	PlayBgm 0x0015
 	SetRoomFlag 0x0001
 	Jump script_0801015A
 script_0801019E:
@@ -99,7 +99,7 @@ script_080101AC:
 	_0807E778 0x0004
 	DoFade4 
 	WaitFor_2 
-	SoundReq2 0xffff
+	PlayBgm 0xffff
 	Call sub_080A13B4
 	_0807EA94 
 	JumpIfNot script_08010240
diff --git a/data/scripts/script_08010BB4.inc b/data/scripts/script_08010BB4.inc
index 34745b7b..c11563eb 100644
--- a/data/scripts/script_08010BB4.inc
+++ b/data/scripts/script_08010BB4.inc
@@ -70,7 +70,7 @@ script_08010BCA:
 	WaitForSomething2 0x00000008
 	TextboxNoOverlapFollowPos 0x1039, 0x000c
 	_0807EA94 
-	SoundReq2 0x0001
+	PlayBgm 0x0001
 	_0807E8E4_2 
 	_0807E5F8 0x00000004
 	WaitForSomething2 0x00000008
@@ -96,18 +96,18 @@ script_08010BCA:
 	WaitForSomething2 0x00000200
 	_0807E5F8 0x00280000
 	SoundReq0x80100000 
-	SoundReq 0x009b
+	PlaySound 0x009b
 	_0807E5F8 0x00000100
 	WaitForSomething2 0x00000200
 	TextboxNoOverlapFollowPos 0x1043, 0x0000
 	_0807EA94 
-	SoundReq2 0x000d
+	PlayBgm 0x000d
 	_0807E5F8 0x00000100
 	WaitForSomething2 0x00000200
 	_0807E5F8 0x0002a800
 	WaitForSomething2 0x00055000
-	SoundReq 0x01c7
-	SoundReq 0x00e5
+	PlaySound 0x01c7
+	PlaySound 0x00e5
 	_0807E5F8 0x00000100
 	_0807E5F8 0x00002800
 	CallWithArg sub_0807FB28, 0x00000003
@@ -120,16 +120,16 @@ script_08010BCA:
 	SetEntityPositionRelative 0x01f8, 0x0098
 	SoundReq0x80100000 
 	Wait 0x003c
-	SoundReq2 0x002f
+	PlayBgm 0x002f
 	_0807E5F8 0x00028000
 	_0807E5F8 0x00000100
 	WaitForSomething2 0x00000200
 	WaitForSomething2 0x00050000
 	CallWithArg sub_0807FB28, 0x00000003
-	SoundReq 0x00e5
+	PlaySound 0x00e5
 	_0807E5F8 0x00028000
 	WaitForSomething2 0x00050000
-	SoundReq 0x0125
+	PlaySound 0x0125
 	CallWithArg sub_0807FB28, 0x00000003
 	_0807E5F8 0x08000000
 	_0807E5F8 0x00800000
diff --git a/data/scripts/script_08010E5A.inc b/data/scripts/script_08010E5A.inc
index 7c9cb0f8..0c27a592 100644
--- a/data/scripts/script_08010E5A.inc
+++ b/data/scripts/script_08010E5A.inc
@@ -1,23 +1,23 @@
 SCRIPT_START script_08010E5A
 	Wait 0x001e
-	SoundReq 0x0125
+	PlaySound 0x0125
 	CallWithArg sub_0807FB28, 0x00000003
 	Wait 0x003c
-	SoundReq 0x0125
+	PlaySound 0x0125
 	CallWithArg sub_0807FB28, 0x00000003
 	Wait 0x0004
-	SoundReq 0x0125
+	PlaySound 0x0125
 	CallWithArg sub_0807FB28, 0x00000003
 	Wait 0x001e
-	SoundReq 0x012c
+	PlaySound 0x012c
 	_0807E5F8 0x00800000
 	WaitForSomething2 0x01000000
 	_0807E778 0x0004
 	DoFade7 
 	WaitFor_2 
 	Wait 0x003c
-	SoundReq 0x00ab
-	SoundReq 0x01c2
+	PlaySound 0x00ab
+	PlaySound 0x01c2
 	LoadRoomEntityList gUnk_080F0770
 	_0807E5F8 0x00000010
 	WaitForSomething2 0x00000020
@@ -37,7 +37,7 @@ SCRIPT_START script_08010E5A
 	_0807E5F8 0x00000040
 	WaitForSomething2 0x00000008
 	WaitForSomething2 0x00000080
-	SoundReq 0x01c3
+	PlaySound 0x01c3
 	_0807E5F8 0x20000000
 	Wait 0x0078
 	CallWithArg sub_0807F29C, 0x00000000
diff --git a/data/scripts/script_08010F84.inc b/data/scripts/script_08010F84.inc
index ef33d17d..5579bc5e 100644
--- a/data/scripts/script_08010F84.inc
+++ b/data/scripts/script_08010F84.inc
@@ -17,10 +17,10 @@ SCRIPT_START script_08010F84
 	Call sub_0806DC58
 	Wait 0x003c
 	_0807E5F8 0x08000000
-	SoundReq 0x0125
+	PlaySound 0x0125
 	CallWithArg sub_0807FB28, 0x00000003
 	Wait 0x000f
-	SoundReq 0x0125
+	PlaySound 0x0125
 	CallWithArg sub_0807FB28, 0x00000003
 	CallWithArg sub_0805DE18, 0x00000002
 	_0807F0C8 0x0000, 0x0000
diff --git a/data/scripts/script_080110E8.inc b/data/scripts/script_080110E8.inc
index 03f283c4..04da4d6d 100644
--- a/data/scripts/script_080110E8.inc
+++ b/data/scripts/script_080110E8.inc
@@ -1,8 +1,8 @@
 SCRIPT_START script_080110E8
-	SoundReq 0x007a
+	PlaySound 0x007a
 	_0807EB44 0x0004
 	DoPostScriptAction 0x000d
-	SoundReq 0x0086
+	PlaySound 0x0086
 	Call sub_0807F36C
 	SetEntitySpeed 0x0400
 	_0807ECF4 0x0008
diff --git a/data/scripts/script_080111CC.inc b/data/scripts/script_080111CC.inc
index 8756d389..0caaf4b9 100644
--- a/data/scripts/script_080111CC.inc
+++ b/data/scripts/script_080111CC.inc
@@ -41,14 +41,14 @@ script_08011206:
 	DoPostScriptAction 0x0000
 	_0807E5F8 0x00000020
 	WaitForSomething2 0x00000010
-	SoundReq 0x01c9
+	PlaySound 0x01c9
 	DoPostScriptAction 0x0010
 	Wait 0x0014
 	Call sub_08066E20
 	Wait 0x0014
 	DoPostScriptAction 0x0010
 	Call sub_0807F2D4
-	SoundReq 0x01ca
+	PlaySound 0x01ca
 	_0807E5F8 0x00000020
 	WaitForSomething2 0x00000010
 	DoPostScriptAction 0x0006
diff --git a/data/scripts/script_080112C4.inc b/data/scripts/script_080112C4.inc
index 2fa640e4..f0bc8fad 100644
--- a/data/scripts/script_080112C4.inc
+++ b/data/scripts/script_080112C4.inc
@@ -30,7 +30,7 @@ script_08011312:
 	DoPostScriptAction 0x0004
 	Wait 0x003c
 	_0807E930 0x0012
-	SoundReq 0x011e
+	PlaySound 0x011e
 	Wait 0x003c
 	_0807E930 0x0014
 	SetEntitySpeed 0x0100
diff --git a/data/scripts/script_080113AA.inc b/data/scripts/script_080113AA.inc
index 847d0cf9..3bad72ce 100644
--- a/data/scripts/script_080113AA.inc
+++ b/data/scripts/script_080113AA.inc
@@ -12,7 +12,7 @@ SCRIPT_START script_080113AA
 	DoPostScriptAction 0x0004
 	Wait 0x003c
 	_0807E930 0x0012
-	SoundReq 0x011e
+	PlaySound 0x011e
 	Wait 0x003c
 	_0807E930 0x0014
 	SetEntitySpeed 0x0100
diff --git a/data/scripts/script_08011442.inc b/data/scripts/script_08011442.inc
index f2eb4214..d6168abe 100644
--- a/data/scripts/script_08011442.inc
+++ b/data/scripts/script_08011442.inc
@@ -14,7 +14,7 @@ SCRIPT_START script_08011442
 	DoPostScriptAction 0x0004
 	Wait 0x003c
 	_0807E930 0x0012
-	SoundReq 0x011e
+	PlaySound 0x011e
 	_0807E5F8 0x00010000
 	WaitForSomething2 0x00008000
 	_0807E930 0x0014
diff --git a/data/scripts/script_08011508.inc b/data/scripts/script_08011508.inc
index bc282731..5524d5de 100644
--- a/data/scripts/script_08011508.inc
+++ b/data/scripts/script_08011508.inc
@@ -14,7 +14,7 @@ SCRIPT_START script_08011508
 	DoPostScriptAction 0x0004
 	Wait 0x003c
 	_0807E930 0x0012
-	SoundReq 0x011e
+	PlaySound 0x011e
 	_0807E5F8 0x00040000
 	WaitForSomething2 0x00020000
 	_0807E930 0x0014
diff --git a/data/scripts/script_080115D0.inc b/data/scripts/script_080115D0.inc
index ee570b92..55b6551a 100644
--- a/data/scripts/script_080115D0.inc
+++ b/data/scripts/script_080115D0.inc
@@ -6,7 +6,7 @@ SCRIPT_START script_080115D0
 	EndBlock 
 	WaitForSomething2 0x00080000
 	_0807E930 0x0005
-	SoundReq 0x011c
+	PlaySound 0x011c
 	_0807ECF4 0x0010
 	_0807E930 0x0001
 	_0807E5F8 0x00100000
diff --git a/data/scripts/script_08011608.inc b/data/scripts/script_08011608.inc
index 957a381c..7fb153b5 100644
--- a/data/scripts/script_08011608.inc
+++ b/data/scripts/script_08011608.inc
@@ -6,7 +6,7 @@ SCRIPT_START script_08011608
 	EndBlock 
 	WaitForSomething2 0x00200000
 	_0807E930 0x0007
-	SoundReq 0x011c
+	PlaySound 0x011c
 	_0807EC94 0x0010
 	_0807E930 0x0003
 	_0807E5F8 0x00400000
diff --git a/data/scripts/script_080116A8.inc b/data/scripts/script_080116A8.inc
index f931651a..432ed3c9 100644
--- a/data/scripts/script_080116A8.inc
+++ b/data/scripts/script_080116A8.inc
@@ -32,11 +32,11 @@ SCRIPT_START script_080116A8
 	WaitForSomething2 0x00000100
 	_0807EB44 0x0000
 	DoPostScriptAction 0x0014
-	SoundReq 0x0120
+	PlaySound 0x0120
 	CallWithArg sub_08095420, script_08011890
 	Wait 0x00f0
 	DoPostScriptAction 0x0016
-	SoundReq 0x01cb
+	PlaySound 0x01cb
 	WaitForSomething2 0x10000000
 	DoPostScriptAction 0x0000
 	_0807E5F8 0x00000200
@@ -49,13 +49,13 @@ SCRIPT_START script_080116A8
 	_0807E5F8 0x00000200
 	WaitForSomething2 0x00000100
 	DoPostScriptAction 0x0014
-	SoundReq 0x01c4
+	PlaySound 0x01c4
 	CallWithArg sub_0809545C, script_080118D4
 	_0807E5F8 0x00000200
 	WaitForSomething2 0x00000100
 	Wait 0x003c
 	DoPostScriptAction 0x0016
-	SoundReq 0x01c5
+	PlaySound 0x01c5
 	_0807E5F8 0x08000000
 	WaitForSomething2 0x10000000
 	DoPostScriptAction 0x0000
diff --git a/data/scripts/script_0801183C.inc b/data/scripts/script_0801183C.inc
index 09d8d177..59222923 100644
--- a/data/scripts/script_0801183C.inc
+++ b/data/scripts/script_0801183C.inc
@@ -7,7 +7,7 @@ SCRIPT_START script_0801183C
 	_0807E5F8 0x01000000
 	WaitForSomething2 0x00800000
 	Call sub_08095364
-	SoundReq 0x0122
+	PlaySound 0x0122
 	Wait 0x003c
 	_0807E5F8 0x01000000
 	WaitForSomething2 0x00800000
diff --git a/data/scripts/script_08011890.inc b/data/scripts/script_08011890.inc
index 3c6c2c90..d80a31ba 100644
--- a/data/scripts/script_08011890.inc
+++ b/data/scripts/script_08011890.inc
@@ -9,7 +9,7 @@ SCRIPT_START script_08011890
 	Call sub_08094B6C
 	_0807EDD4 0x01f8, 0x0088
 	Call sub_08094B80
-	SoundReq 0x01cc
+	PlaySound 0x01cc
 	_0807E5F8 0x10000000
 	WaitForSomething2 0x08000000
 	DoPostScriptAction 0x0006
diff --git a/data/scripts/script_080118D4.inc b/data/scripts/script_080118D4.inc
index 5c14c403..7dac16c3 100644
--- a/data/scripts/script_080118D4.inc
+++ b/data/scripts/script_080118D4.inc
@@ -11,11 +11,11 @@ SCRIPT_START script_080118D4
 	StartPlayerScript script_080110E8
 	_0807EDD4 0x01d8, 0x0058
 	Call sub_08094B80
-	SoundReq 0x009a
-	SoundReq 0x01c6
+	PlaySound 0x009a
+	PlaySound 0x01c6
 	_0807E5F8 0x10000000
 	WaitForSomething2 0x08000000
-	SoundReq 0x011d
+	PlaySound 0x011d
 	DoPostScriptAction 0x0006
 SCRIPT_END
 	.2byte 0x0000
diff --git a/data/scripts/script_08011B40.inc b/data/scripts/script_08011B40.inc
index 435cfc37..350e368c 100644
--- a/data/scripts/script_08011B40.inc
+++ b/data/scripts/script_08011B40.inc
@@ -56,7 +56,7 @@ script_08011BBC:
 	Wait 0x003c
 	_0807E878 
 	SetRoomFlag 0x0000
-	SoundReq2 0x0033
+	PlayBgm 0x0033
 script_08011C04:
 	CheckRoomFlag 0x0064
 	JumpIfNot script_08011C04
diff --git a/data/scripts/script_08011C7C.inc b/data/scripts/script_08011C7C.inc
index bd6a73f6..e84cba1a 100644
--- a/data/scripts/script_08011C7C.inc
+++ b/data/scripts/script_08011C7C.inc
@@ -566,7 +566,7 @@ script_080122EC:
 	LoadRoomEntityList gUnk_080F2758
 	DoPostScriptAction 0x0008
 	Wait 0x003c
-	SoundReq 0x0072
+	PlaySound 0x0072
 	SetLocalFlag 0x0043
 	Wait 0x001e
 	_0807E878 
diff --git a/data/scripts/script_0801232C.inc b/data/scripts/script_0801232C.inc
index 08b3dd09..844f7dcb 100644
--- a/data/scripts/script_0801232C.inc
+++ b/data/scripts/script_0801232C.inc
@@ -35,13 +35,13 @@ script_08012368:
 	_0807E858 0x0080
 	EndBlock 
 	WaitFor_2 
-	SoundReq2 0x002c
+	PlayBgm 0x002c
 	_0807EB28 0x1401
 	_0807EA94 
 	_0807EB44 0x0004
 	DoPostScriptAction 0x0000
 	DoPostScriptAction 0x0007
-	SoundReq 0x01ce
+	PlaySound 0x01ce
 	SetEntity0x20 0xffff8000
 	Wait 0x003c
 	_0807E8E4_0 
@@ -59,7 +59,7 @@ script_08012368:
 	_0807E858 0x0080
 	EndBlock 
 	WaitFor_2 
-	SoundReq2 0xffff
+	PlayBgm 0xffff
 	_0807EB28 0x1403
 	_0807EA94 
 	SetIntVariable 0x00000203
diff --git a/data/scripts/script_08012430.inc b/data/scripts/script_08012430.inc
index 4827856a..bddfee6d 100644
--- a/data/scripts/script_08012430.inc
+++ b/data/scripts/script_08012430.inc
@@ -50,7 +50,7 @@ script_0801248A:
 	_0807E778 0x0004
 	_0807E800 0x00000000
 	WaitFor_2 
-	SoundReq2 0x000e
+	PlayBgm 0x000e
 	_0807E5F8 0x00000010
 	WaitForSomething2 0x00000020
 	WaitForSomething2 0x00000100
@@ -74,7 +74,7 @@ script_0801248A:
 	WaitFor_2 
 	Call sub_0807DF50
 	_0807E878 
-	SoundReq2 0xffff
+	PlayBgm 0xffff
 script_08012566:
 	CheckPlayerInRegion 0x03a0, 0x01a0, 0x1020
 	JumpIfNot script_08012566
@@ -91,7 +91,7 @@ script_08012566:
 	Wait 0x005a
 	_0807E5F8 0x00000004
 	WaitForSomething2 0x00000008
-	SoundReq2 0x000e
+	PlayBgm 0x000e
 	_0807E5F8 0x00000004
 	WaitForSomething2 0x00000008
 	_0807E5F8 0x00000040
@@ -105,7 +105,7 @@ script_08012566:
 	_0807E5F8 0x00000004
 	WaitForSomething2 0x00000008
 	SoundReq0x80100000 
-	SoundReq2 0x0033
+	PlayBgm 0x0033
 	Call sub_0807DF50
 	_0807E878 
 	_0807E5F8 0x00000050
@@ -114,14 +114,14 @@ script_08012566:
 	_0807E864 
 	Call sub_0807FA40
 	Call sub_0807DF28
-	SoundReq 0x0072
+	PlaySound 0x0072
 	SoundReq0x80100000 
 	_0807E5F8 0x00000004
 	WaitForSomething2 0x00000008
 	StartPlayerScript script_08012AF0
 	WaitForSomething2 0x00000001
 	_0807E8E4_0 
-	SoundReq2 0x000e
+	PlayBgm 0x000e
 	Wait 0x001e
 	_0807E5F8 0x00000004
 	WaitForSomething2 0x00000008
@@ -135,7 +135,7 @@ script_08012566:
 	WaitForSomething2 0x00000008
 	SoundReq0x80100000 
 	Wait 0x003c
-	SoundReq2 0xffff
+	PlayBgm 0xffff
 	Call sub_0806DCA0
 	_0807F0B4 0x0004
 	CameraTargetPlayer 
@@ -149,7 +149,7 @@ script_08012566:
 	WaitForSomething2 0x00000008
 	SoundReq0x80100000 
 	Wait 0x003c
-	SoundReq2 0xffff
+	PlayBgm 0xffff
 	Call sub_08054570
 	SetGlobalFlag 0x0014
 	CallWithArg sub_0807F6F8, 0x00000008
diff --git a/data/scripts/script_080126FC.inc b/data/scripts/script_080126FC.inc
index 90957ad6..f9759dd7 100644
--- a/data/scripts/script_080126FC.inc
+++ b/data/scripts/script_080126FC.inc
@@ -232,7 +232,7 @@ script_08012A74:
 	Call sub_0806D9A4
 	DoPostScriptAction 0x0008
 	Wait 0x0078
-	SoundReq2 0x000e
+	PlayBgm 0x000e
 	BeginBlock 
 	_0807E8E4_2 
 	_0807EB28 0x1112
diff --git a/data/scripts/script_08012F86.inc b/data/scripts/script_08012F86.inc
index 2a5ea045..be1a4f4f 100644
--- a/data/scripts/script_08012F86.inc
+++ b/data/scripts/script_08012F86.inc
@@ -37,7 +37,7 @@ script_08013006:
 	_0807E864 
 	Call sub_0807DF28
 	EndBlock 
-	SoundReq 0x00cd
+	PlaySound 0x00cd
 	_0807F088 0x0038
 	WaitPlayerAction8 
 	Wait 0x001e
diff --git a/data/scripts/script_0801319A.inc b/data/scripts/script_0801319A.inc
index 5d272cf2..895f5f85 100644
--- a/data/scripts/script_0801319A.inc
+++ b/data/scripts/script_0801319A.inc
@@ -37,7 +37,7 @@ script_080131AC:
 	WaitForSomething2 0x00000010
 	_0807E5F8 0x00000020
 	WaitForSomething2 0x00000040
-	SoundReq2 0x000d
+	PlayBgm 0x000d
 	StartPlayerScript script_0801334C
 	WaitForSomething2 0x00000002
 	_0807E5F8 0x00000020
@@ -69,7 +69,7 @@ script_080131AC:
 	_0807EB28 0x1605
 	_0807EA94 
 	SetLocalFlag 0x0078
-	SoundReq2 0x0031
+	PlayBgm 0x0031
 	SetGlobalFlag 0x005d
 	Call sub_0807DF50
 	_0807E878 
diff --git a/data/scripts/script_08013378.inc b/data/scripts/script_08013378.inc
index e6a8ec58..4a29a3a7 100644
--- a/data/scripts/script_08013378.inc
+++ b/data/scripts/script_08013378.inc
@@ -5,7 +5,7 @@ SCRIPT_START script_08013378
 	Call sub_0807F2D4
 	_0807E5F8 0x00000002
 	WaitForSomething2 0x00000004
-	SoundReq 0x007c
+	PlaySound 0x007c
 	_0807EB44 0x0004
 	Call sub_0807F210
 	_0807EF3C 0x0200, 0x0020
diff --git a/data/scripts/script_080133F8.inc b/data/scripts/script_080133F8.inc
index 1e720d3b..9f9a31ce 100644
--- a/data/scripts/script_080133F8.inc
+++ b/data/scripts/script_080133F8.inc
@@ -14,7 +14,7 @@ SCRIPT_START script_080133F8
 	WaitForSomething2 0x00000020
 	Wait 0x003c
 	DoPostScriptAction 0x0014
-	SoundReq 0x0120
+	PlaySound 0x0120
 	CallWithArg sub_08095420, script_08013494
 	Wait 0x005a
 	DoPostScriptAction 0x0016
diff --git a/data/scripts/script_08013494.inc b/data/scripts/script_08013494.inc
index d0722887..9fcf6ed0 100644
--- a/data/scripts/script_08013494.inc
+++ b/data/scripts/script_08013494.inc
@@ -10,7 +10,7 @@ SCRIPT_START script_08013494
 	_0807EDD4 0x0098, 0x0080
 	BeginBlock 
 	Call sub_08094B80
-	SoundReq 0x01cc
+	PlaySound 0x01cc
 	Call sub_0807F36C
 	_0807E5F8 0x00000080
 	EndBlock 
diff --git a/data/scripts/script_080134DC.inc b/data/scripts/script_080134DC.inc
index 702550f2..81398307 100644
--- a/data/scripts/script_080134DC.inc
+++ b/data/scripts/script_080134DC.inc
@@ -14,22 +14,22 @@ script_080134F8:
 	StartPlayerScript script_080136D8
 	WaitForSomething2 0x00000001
 	CallWithArg sub_08095A1C, script_08013F04
-	SoundReq 0x01cd
+	PlaySound 0x01cd
 	Wait 0x005a
 	BeginBlock 
-	SoundReq 0x01ce
+	PlaySound 0x01ce
 	CallWithArg sub_08095D54, script_08013E04
 	CallWithArg sub_08095D54, script_08013E28
 	EndBlock 
 	WaitForSomething2 0x18000000
 	BeginBlock 
-	SoundReq 0x01cf
+	PlaySound 0x01cf
 	CallWithArg sub_08095D8C, script_08014054
 	CallWithArg sub_08095D8C, script_08014074
 	EndBlock 
 	Wait 0x001e
 	BeginBlock 
-	SoundReq 0x01d0
+	PlaySound 0x01d0
 	CallWithArg sub_08095D8C, script_080140DC
 	CallWithArg sub_08095D8C, script_08014118
 	EndBlock 
@@ -37,7 +37,7 @@ script_080134F8:
 	CallWithArg sub_0805DDEC, 0x00000000
 	_0807E5F8 0x00000200
 	WaitForSomething2 0x00002000
-	SoundReq 0x01d2
+	PlaySound 0x01d2
 	CallWithArg sub_08095D8C, script_080141DC
 	CallWithArg sub_08095D8C, script_08014210
 	_0807E5F8 0x00000400
@@ -58,14 +58,14 @@ script_080134F8:
 	Wait 0x003c
 	_0807E778 0x0004
 	DoFade7 
-	SoundReq 0x00f6
+	PlaySound 0x00f6
 	WaitFor_2 
 	Wait 0x003c
 	_0807E5F8 0x00000010
 	_0807E778 0x0002
 	DoFade6 
 	WaitFor_2 
-	SoundReq 0x0109
+	PlaySound 0x0109
 	TextboxNoOverlapFollowPos 0x0503, 0x000c
 	_0807EA94 
 	_0807E5F8 0x00040000
diff --git a/data/scripts/script_08013720.inc b/data/scripts/script_08013720.inc
index e3ef357e..844b1113 100644
--- a/data/scripts/script_08013720.inc
+++ b/data/scripts/script_08013720.inc
@@ -14,22 +14,22 @@ script_0801373C:
 	StartPlayerScript script_080136D8
 	WaitForSomething2 0x00000001
 	CallWithArg sub_08095A1C, script_08013F34
-	SoundReq 0x01cd
+	PlaySound 0x01cd
 	Wait 0x005a
 	BeginBlock 
-	SoundReq 0x01ce
+	PlaySound 0x01ce
 	CallWithArg sub_08095D54, script_08013E4C
 	EndBlock 
 	WaitForSomething2 0x20000000
 	BeginBlock 
-	SoundReq 0x01cf
+	PlaySound 0x01cf
 	CallWithArg sub_08095D8C, script_08014054
 	CallWithArg sub_08095D8C, script_08014074
 	CallWithArg sub_08095D8C, script_08014094
 	EndBlock 
 	Wait 0x001e
 	BeginBlock 
-	SoundReq 0x01d0
+	PlaySound 0x01d0
 	CallWithArg sub_08095D8C, script_080140DC
 	CallWithArg sub_08095D8C, script_08014118
 	CallWithArg sub_08095D8C, script_08014154
@@ -38,7 +38,7 @@ script_0801373C:
 	CallWithArg sub_0805DDEC, 0x00000000
 	_0807E5F8 0x00000200
 	WaitForSomething2 0x00002000
-	SoundReq 0x01d2
+	PlaySound 0x01d2
 	CallWithArg sub_08095D8C, script_080141DC
 	CallWithArg sub_08095D8C, script_08014210
 	_0807E5F8 0x00000400
@@ -61,14 +61,14 @@ script_0801373C:
 	Wait 0x003c
 	_0807E778 0x0004
 	DoFade7 
-	SoundReq 0x00f6
+	PlaySound 0x00f6
 	WaitFor_2 
 	Wait 0x003c
 	_0807E5F8 0x00000010
 	_0807E778 0x0002
 	DoFade6 
 	WaitFor_2 
-	SoundReq 0x0109
+	PlaySound 0x0109
 	TextboxNoOverlapFollowPos 0x0504, 0x000c
 	_0807EA94 
 	_0807E5F8 0x00040000
diff --git a/data/scripts/script_080138B4.inc b/data/scripts/script_080138B4.inc
index 0d496673..6c5dcbb5 100644
--- a/data/scripts/script_080138B4.inc
+++ b/data/scripts/script_080138B4.inc
@@ -14,15 +14,15 @@ script_080138D0:
 	StartPlayerScript script_080136D8
 	WaitForSomething2 0x00000001
 	CallWithArg sub_08095A1C, script_08013F64
-	SoundReq 0x01cd
+	PlaySound 0x01cd
 	Wait 0x005a
 	BeginBlock 
-	SoundReq 0x01ce
+	PlaySound 0x01ce
 	CallWithArg sub_08095D54, script_08013E70
 	EndBlock 
 	WaitForSomething2 0x40000000
 	BeginBlock 
-	SoundReq 0x01cf
+	PlaySound 0x01cf
 	CallWithArg sub_08095D8C, script_08014054
 	CallWithArg sub_08095D8C, script_08014074
 	CallWithArg sub_08095D8C, script_08014094
@@ -30,7 +30,7 @@ script_080138D0:
 	EndBlock 
 	Wait 0x001e
 	BeginBlock 
-	SoundReq 0x01d0
+	PlaySound 0x01d0
 	CallWithArg sub_08095D8C, script_080140DC
 	CallWithArg sub_08095D8C, script_08014118
 	CallWithArg sub_08095D8C, script_08014154
@@ -40,7 +40,7 @@ script_080138D0:
 	CallWithArg sub_0805DDEC, 0x00000000
 	_0807E5F8 0x00000200
 	WaitForSomething2 0x00002000
-	SoundReq 0x01d2
+	PlaySound 0x01d2
 	CallWithArg sub_08095D8C, script_080141DC
 	CallWithArg sub_08095D8C, script_08014210
 	_0807E5F8 0x00000400
@@ -66,14 +66,14 @@ script_080138D0:
 	Wait 0x003c
 	_0807E778 0x0004
 	DoFade7 
-	SoundReq 0x00f6
+	PlaySound 0x00f6
 	WaitFor_2 
 	Wait 0x003c
 	_0807E5F8 0x00000010
 	_0807E778 0x0002
 	DoFade6 
 	WaitFor_2 
-	SoundReq 0x0109
+	PlaySound 0x0109
 	TextboxNoOverlapFollowPos 0x0505, 0x000c
 	_0807EA94 
 	_0807E5F8 0x00040000
diff --git a/data/scripts/script_08013B70.inc b/data/scripts/script_08013B70.inc
index 76310119..3b1c528c 100644
--- a/data/scripts/script_08013B70.inc
+++ b/data/scripts/script_08013B70.inc
@@ -1,5 +1,5 @@
 SCRIPT_START script_08013B70
-	SoundReq 0x01d3
+	PlaySound 0x01d3
 	CallWithArg sub_0807F238, 0x000008bf
 	Call sub_08096028
 	Wait 0x003c
diff --git a/data/scripts/script_08013BA8.inc b/data/scripts/script_08013BA8.inc
index d171c4fb..d947aff7 100644
--- a/data/scripts/script_08013BA8.inc
+++ b/data/scripts/script_08013BA8.inc
@@ -1,6 +1,6 @@
 SCRIPT_START script_08013BA8
 	CallWithArg sub_08095E7C, script_08014248
-	SoundReq 0x01d3
+	PlaySound 0x01d3
 	CallWithArg sub_0807F238, 0x000008e3
 	Call sub_08096028
 	Wait 0x0078
diff --git a/data/scripts/script_08013BE8.inc b/data/scripts/script_08013BE8.inc
index a49ba76f..e5cb4b51 100644
--- a/data/scripts/script_08013BE8.inc
+++ b/data/scripts/script_08013BE8.inc
@@ -14,7 +14,7 @@ SCRIPT_START script_08013BE8
 	DoPostScriptAction 0x0008
 	WaitForSomething2 0x00000004
 	_0807E908 0x0002
-	SoundReq 0x0134
+	PlaySound 0x0134
 	Jump script_08013C32
 script_08013C2A:
 	CheckLocalFlag 0x007c
diff --git a/data/scripts/script_08013D04.inc b/data/scripts/script_08013D04.inc
index 025d0eb7..c7280fc6 100644
--- a/data/scripts/script_08013D04.inc
+++ b/data/scripts/script_08013D04.inc
@@ -8,7 +8,7 @@ script_08013D1C:
 	CheckEntityInteractType 
 	JumpIfNot script_08013D1C
 	CallWithArg sub_08095D54, 0x00000000
-	SoundReq 0x01cd
+	PlaySound 0x01cd
 	_0807E5F8 0x08000000
 	Call sub_080791BC
 	DoPostScriptAction 0x0006
diff --git a/data/scripts/script_08013D44.inc b/data/scripts/script_08013D44.inc
index 0dfb9d8c..e5512a68 100644
--- a/data/scripts/script_08013D44.inc
+++ b/data/scripts/script_08013D44.inc
@@ -8,7 +8,7 @@ script_08013D5C:
 	CheckEntityInteractType 
 	JumpIfNot script_08013D5C
 	CallWithArg sub_08095D54, 0x00000001
-	SoundReq 0x01cd
+	PlaySound 0x01cd
 	_0807E5F8 0x10000000
 	Call sub_080791BC
 	DoPostScriptAction 0x0006
diff --git a/data/scripts/script_08013D84.inc b/data/scripts/script_08013D84.inc
index b61269d4..9654f590 100644
--- a/data/scripts/script_08013D84.inc
+++ b/data/scripts/script_08013D84.inc
@@ -8,7 +8,7 @@ script_08013D9C:
 	CheckEntityInteractType 
 	JumpIfNot script_08013D9C
 	CallWithArg sub_08095D54, 0x00000002
-	SoundReq 0x01cd
+	PlaySound 0x01cd
 	_0807E5F8 0x20000000
 	Call sub_080791BC
 	DoPostScriptAction 0x0006
diff --git a/data/scripts/script_08013DC4.inc b/data/scripts/script_08013DC4.inc
index fa1c2572..f72b0847 100644
--- a/data/scripts/script_08013DC4.inc
+++ b/data/scripts/script_08013DC4.inc
@@ -8,7 +8,7 @@ script_08013DDC:
 	CheckEntityInteractType 
 	JumpIfNot script_08013DDC
 	CallWithArg sub_08095D54, 0x00000003
-	SoundReq 0x01cd
+	PlaySound 0x01cd
 	_0807E5F8 0x40000000
 	Call sub_080791BC
 	DoPostScriptAction 0x0006
diff --git a/data/scripts/script_08014450.inc b/data/scripts/script_08014450.inc
index ad470edd..671d02ee 100644
--- a/data/scripts/script_08014450.inc
+++ b/data/scripts/script_08014450.inc
@@ -39,7 +39,7 @@ script_080144C0:
 script_080144C8:
 	ModRupees 0xfff6
 	TextboxNoOverlapFollow 0x420c
-	SoundReq 0x010c
+	PlaySound 0x010c
 	Wait 0x0018
 	SetRoomFlag 0x0000
 	SetLocalFlag 0x0092
diff --git a/data/scripts/script_080149CC.inc b/data/scripts/script_080149CC.inc
index 46812d26..d0651382 100644
--- a/data/scripts/script_080149CC.inc
+++ b/data/scripts/script_080149CC.inc
@@ -19,7 +19,7 @@ script_080149DE:
 	DoPostScriptAction 0x000b
 	DoPostScriptAction 0x0001
 	_0807EDD4 0x0068, 0x00f8
-	SoundReq 0x0072
+	PlaySound 0x0072
 	_0807EB74 
 	DoPostScriptAction 0x0000
 	DoPostScriptAction 0x000a
diff --git a/data/scripts/script_08014B34.inc b/data/scripts/script_08014B34.inc
index 03c382c6..44c96658 100644
--- a/data/scripts/script_08014B34.inc
+++ b/data/scripts/script_08014B34.inc
@@ -41,7 +41,7 @@ script_08014B70:
 	Call sub_0806CD3C
 	Wait 0x0014
 	Call sub_0806CD4C
-	SoundReq 0x0072
+	PlaySound 0x0072
 	_0807E5F8 0x00000001
 	WaitForSomething2 0x00000002
 	Call sub_0807DF50
diff --git a/data/scripts/script_08014E14.inc b/data/scripts/script_08014E14.inc
index f6497d3c..b1c52814 100644
--- a/data/scripts/script_08014E14.inc
+++ b/data/scripts/script_08014E14.inc
@@ -151,7 +151,7 @@ script_08014FCC:
 	WaitForSomething2 0x00000004
 	_0807E5F8 0x00000002
 	WaitForSomething2 0x00000004
-	SoundReq2 0x000d
+	PlayBgm 0x000d
 	_0807EB28 0x1302
 	_0807EA94 
 	TextboxNoOverlapFollowPos 0x1303, 0x0002
@@ -173,31 +173,31 @@ script_08014FCC:
 	Call sub_0804F6A8
 	Wait 0x0004
 	Call sub_0804F808
-	SoundReq 0x010b
+	PlaySound 0x010b
 	StartPlayerScript script_08015304
 	Call sub_0804F6C8
 	Wait 0x0004
 	Call sub_0804F830
-	SoundReq 0x010b
+	PlaySound 0x010b
 	Call sub_0804F6E8
 	Wait 0x0004
 	Call sub_0804F854
-	SoundReq 0x010b
+	PlaySound 0x010b
 	Call sub_0804F724
 	Wait 0x0004
 	Call sub_0804F89C
-	SoundReq 0x010b
+	PlaySound 0x010b
 	Call sub_0804F760
 	Wait 0x0004
 	Call sub_0804F8E0
-	SoundReq 0x010b
+	PlaySound 0x010b
 	Wait 0x003c
 	WaitForSomething2 0x00000001
-	SoundReq 0x01b0
+	PlaySound 0x01b0
 	Call sub_0804F79C
 	Wait 0x000a
 	LoadRoomEntityList gUnk_080F7FC0
-	SoundReq2 0x002d
+	PlayBgm 0x002d
 	Call sub_0807DF50
 	_0807E878 
 script_08015104:
@@ -213,25 +213,25 @@ script_08015104:
 	Call sub_0804F6A8
 	Wait 0x0004
 	Call sub_0804F928
-	SoundReq 0x010b
+	PlaySound 0x010b
 	Call sub_0804F6C8
 	Wait 0x0004
 	Call sub_0804F944
-	SoundReq 0x010b
+	PlaySound 0x010b
 	Call sub_0804F6E8
 	Wait 0x0004
 	Call sub_0804F960
-	SoundReq 0x010b
+	PlaySound 0x010b
 	Call sub_0804F724
 	Wait 0x0004
 	Call sub_0804F994
-	SoundReq 0x010b
+	PlaySound 0x010b
 	Call sub_0804F760
 	Wait 0x0004
 	Call sub_0804F9C8
-	SoundReq 0x010b
+	PlaySound 0x010b
 	Wait 0x003c
-	SoundReq 0x0072
+	PlaySound 0x0072
 	_0807F0B4 0x0004
 	CameraTargetPlayer 
 	SetLocalFlag 0x008c
@@ -268,7 +268,7 @@ script_08015104:
 	_0807F0B4 0x0004
 	CameraTargetPlayer 
 	Call sub_08054570
-	SoundReq2 0xffff
+	PlayBgm 0xffff
 	Call sub_0807DF50
 	_0807E878 
 	DoPostScriptAction 0x0006
diff --git a/data/scripts/script_08015234.inc b/data/scripts/script_08015234.inc
index 600e376d..a07588d6 100644
--- a/data/scripts/script_08015234.inc
+++ b/data/scripts/script_08015234.inc
@@ -19,7 +19,7 @@ SCRIPT_START script_08015234
 	DoPostScriptAction 0x0000
 	_0807E5F8 0x00000004
 	WaitForSomething2 0x00000002
-	SoundReq 0x00f5
+	PlaySound 0x00f5
 	DoPostScriptAction 0x001f
 	SetEntitySpeed 0x0200
 	DoPostScriptAction 0x000d
diff --git a/data/scripts/script_080153EC.inc b/data/scripts/script_080153EC.inc
index 4d1bc1ee..5b5db01e 100644
--- a/data/scripts/script_080153EC.inc
+++ b/data/scripts/script_080153EC.inc
@@ -4,7 +4,7 @@ SCRIPT_START script_080153EC
 	SetEntityPositionRelative 0x0078, 0x0068
 	CameraTargetEntity 
 	EndBlock 
-	SoundReq2 0x002a
+	PlayBgm 0x002a
 	_0807E778 0x0004
 	DoFade4 
 	WaitFor_2 
diff --git a/data/scripts/script_0801548E.inc b/data/scripts/script_0801548E.inc
index 5b27435f..f662f244 100644
--- a/data/scripts/script_0801548E.inc
+++ b/data/scripts/script_0801548E.inc
@@ -1,7 +1,7 @@
 SCRIPT_START script_0801548E
 	_0807E5F8 0x00000800
 	WaitForSomething2 0x00001000
-	SoundReq 0x0125
+	PlaySound 0x0125
 	CallWithArg sub_0807FB28, 0x00000003
 	_0807E5F8 0x00048000
 	WaitForSomething2 0x00090000
diff --git a/data/scripts/script_0801550C.inc b/data/scripts/script_0801550C.inc
index 60940bdc..7492d1ad 100644
--- a/data/scripts/script_0801550C.inc
+++ b/data/scripts/script_0801550C.inc
@@ -23,10 +23,10 @@ SCRIPT_START script_0801550C
 	CallWithArg sub_0806AF60, 0x00000000
 	DoPostScriptAction 0x0010
 	Wait 0x0028
-	SoundReq 0x0125
+	PlaySound 0x0125
 	CallWithArg sub_0807FB28, 0x00000003
 	Wait 0x000a
-	SoundReq 0x0125
+	PlaySound 0x0125
 	CallWithArg sub_0807FB28, 0x00000003
 	Wait 0x000a
 	DoPostScriptAction 0x0010
diff --git a/data/scripts/script_08015684.inc b/data/scripts/script_08015684.inc
index 8c4ca549..d3a1fbe0 100644
--- a/data/scripts/script_08015684.inc
+++ b/data/scripts/script_08015684.inc
@@ -30,7 +30,7 @@ SCRIPT_START script_08015684
 	_0807EB44 0x0004
 	DoPostScriptAction 0x0014
 	CallWithArg sub_0809545C, script_08015754
-	SoundReq 0x01c4
+	PlaySound 0x01c4
 	Wait 0x0078
 	DoPostScriptAction 0x0016
 	WaitForSomething2 0x00020000
diff --git a/data/scripts/script_08015754.inc b/data/scripts/script_08015754.inc
index 4dbe2747..01f7a112 100644
--- a/data/scripts/script_08015754.inc
+++ b/data/scripts/script_08015754.inc
@@ -5,10 +5,10 @@ SCRIPT_START script_08015754
 	Call sub_08094B80
 	EndBlock 
 	Wait 0x0078
-	SoundReq 0x01c5
+	PlaySound 0x01c5
 	Call sub_08094B6C
 	_0807EDD4 0x0078, 0x00b8
-	SoundReq 0x01c6
+	PlaySound 0x01c6
 	Call sub_08094B80
 	_0807E5F8 0x00020000
 	SetEntitySpeed 0x0080
diff --git a/data/scripts/script_08015958.inc b/data/scripts/script_08015958.inc
index 362d76c9..acf934c4 100644
--- a/data/scripts/script_08015958.inc
+++ b/data/scripts/script_08015958.inc
@@ -28,7 +28,7 @@ SCRIPT_START script_08015958
 	_0807E5F8 0x00000002
 	WaitForSomething2 0x00000001
 	Call sub_0807F3C8
-	SoundReq 0x0096
+	PlaySound 0x0096
 	SetEntitySpeed 0x0200
 	_0807ECC4 0x0008
 	_0807E930 0x0040
diff --git a/data/scripts/script_08015AC4.inc b/data/scripts/script_08015AC4.inc
index f2de00b5..059a801f 100644
--- a/data/scripts/script_08015AC4.inc
+++ b/data/scripts/script_08015AC4.inc
@@ -14,7 +14,7 @@ SCRIPT_START script_08015AC4
 	DoPostScriptAction 0x0000
 	WaitForSomething2 0x00000008
 	Wait 0x003c
-	SoundReq 0x0072
+	PlaySound 0x0072
 	Call sub_08046078
 	DoPostScriptAction 0x0006
 SCRIPT_END
diff --git a/data/scripts/script_08015BE8.inc b/data/scripts/script_08015BE8.inc
index afbdefbc..447f45a1 100644
--- a/data/scripts/script_08015BE8.inc
+++ b/data/scripts/script_08015BE8.inc
@@ -28,7 +28,7 @@ script_08015BF0:
 	_0807E778 0x0004
 	_0807E800 0x00000000
 	WaitFor_2 
-	SoundReq2 0xffff
+	PlayBgm 0xffff
 	_0807EB28 0x131f
 	_0807EA94 
 	SetLocalFlag 0x009c
diff --git a/data/scripts/script_08015CD4.inc b/data/scripts/script_08015CD4.inc
index 118b74bc..b290f8d8 100644
--- a/data/scripts/script_08015CD4.inc
+++ b/data/scripts/script_08015CD4.inc
@@ -12,7 +12,7 @@ SCRIPT_START script_08015CD4
 	SetEntityPositionRelative 0x0088, 0x00e0
 	CameraTargetEntity 
 	Wait 0x003c
-	SoundReq2 0x000d
+	PlayBgm 0x000d
 	_0807E5F8 0x00000010
 	WaitForSomething2 0x00000020
 	_0807F0B4 0x0004
@@ -47,7 +47,7 @@ SCRIPT_START script_08015CD4
 	_0807E778 0x0004
 	DoFade4 
 	WaitFor_2 
-	SoundReq2 0x0034
+	PlayBgm 0x0034
 	_0807E5F8 0x00000040
 	WaitForSomething2 0x00000080
 	_0807E5F8 0x00000001
diff --git a/data/scripts/script_08016004.inc b/data/scripts/script_08016004.inc
index 7bcdb876..4216e062 100644
--- a/data/scripts/script_08016004.inc
+++ b/data/scripts/script_08016004.inc
@@ -2,7 +2,7 @@ SCRIPT_START script_08016004
 	_0807E5F8 0x00000003
 	WaitForSomething2 0x0000000c
 	_0807F0C8 0x0000, 0x0000
-	SoundReq 0x0072
+	PlaySound 0x0072
 	_0807EB28 0x0b1f
 	_0807EA94 
 	Call sub_0807DF50
diff --git a/data/scripts/script_080160A8.inc b/data/scripts/script_080160A8.inc
index bcd54937..fdab17d2 100644
--- a/data/scripts/script_080160A8.inc
+++ b/data/scripts/script_080160A8.inc
@@ -180,9 +180,9 @@ script_080162F6:
 	Call sub_0807DF28
 	_0807E864 
 	SoundReq0x80100000 
-	SoundReq 0x00cd
+	PlaySound 0x00cd
 	Wait 0x003c
-	SoundReq2 0x005e
+	PlayBgm 0x005e
 	Call sub_08068F3C
 script_0801631C:
 	Call sub_08068E30
diff --git a/data/scripts/script_08016482.inc b/data/scripts/script_08016482.inc
index b55e1150..246145b0 100644
--- a/data/scripts/script_08016482.inc
+++ b/data/scripts/script_08016482.inc
@@ -60,9 +60,9 @@ SCRIPT_START script_08016482
 	_0807EEF4 0xfff0, 0x0014
 	DoPostScriptAction 0x0000
 	DoPostScriptAction2 0x0001
-	SoundReq 0x0074
-	SoundReq2 0x001d
-	SoundReq3 0x00000074
+	PlaySound 0x0074
+	PlayBgm 0x001d
+	SoundReq 0x00000074
 	SoundReq0x80100000 
 	ModRupees 0xff38
 	ModHealth 0x0010
diff --git a/include/audio.h b/include/audio.h
index ad600283..06d80d67 100644
--- a/include/audio.h
+++ b/include/audio.h
@@ -1,6 +1,10 @@
 #ifndef AUDIO_H
 #define AUDIO_H
 
+#include "global.h"
+
+#define NUM_BGM 99
+
 typedef enum {
     SFX_NONE,
     BGM_CASTLE_TOURNAMENT,
@@ -258,4 +262,7 @@ typedef enum {
     SONG_RESET_UNK = 0x80100000,
 } Sound;
 
+#define SOUND_REQ_ALL_STOP 0x80010000
+void SoundReq(u32 arg);
+
 #endif // AUDIO_H
diff --git a/include/functions.h b/include/functions.h
index 5c62cced..74c0471e 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -11,7 +11,6 @@
 #include "structures.h"
 
 // Identified - to be sorted into header files
-extern void SoundReq(u32);
 extern void ShowNPCDialogue(Entity*, Dialog*);
 extern void DoFade(u32, u32);
 extern u32 CheckKinstoneFused(u32);
diff --git a/include/gba/m4a.h b/include/gba/m4a.h
index d27cafdd..745bc801 100644
--- a/include/gba/m4a.h
+++ b/include/gba/m4a.h
@@ -60,4 +60,12 @@ typedef struct MusicPlayer {
 extern const MusicPlayer gMPlayTable[];
 extern const Song gSongTable[];
 
+void m4aSongNumStart(u16 n);
+void m4aSongNumStartOrContinue(u16 n);
+void m4aSongNumStop(u16 n);
+void m4aMPlayAllStop(void);
+void m4aMPlayTempoControl(MusicPlayerInfo* mplayInfo, u16 tempo);
+void m4aSoundVSyncOn(void);
+void m4aSoundVSyncOff(void);
+
 #endif // GUARD_M4A_INTERNAL_H
diff --git a/include/structures.h b/include/structures.h
index d47ee7a1..f35da59f 100644
--- a/include/structures.h
+++ b/include/structures.h
@@ -182,6 +182,23 @@ typedef struct {
 
 extern EntityHandler gUnk_03003DC0;
 
+typedef struct struct_02021EE0 {
+    u16 unk_00;
+    u8 unk_02;
+    u8 unk_03;
+    u16 unk_04;
+    s16 unk_06;
+    s16 unk_08;
+    s16 unk_0a;
+    u16 unk_0c;
+    u16 unk_0e;
+    u16 unk_10;
+    u16 unk_12;
+    u16 currentBgm;
+} struct_02021EE0;
+
+extern struct_02021EE0 gUnk_02021EE0;
+
 extern u8 gUnk_02022740[];
 extern u8 gUnk_02034490[];
 
diff --git a/linker.ld b/linker.ld
index 99012e2d..0976e69c 100644
--- a/linker.ld
+++ b/linker.ld
@@ -882,7 +882,7 @@ SECTIONS {
         asm/sub_080A285C.o(.text);
         src/createObject.o(.text);
         asm/code_080A29BC.o(.text);
-        asm/soundReq.o(.text);
+        src/audio.o(.text);
         asm/code_080A3480.o(.text);
         src/sub_080A3B84.o(.text);
         asm/code_080A3BD0.o(.text);
@@ -1033,7 +1033,7 @@ SECTIONS {
         data/sprite_table.o(.rodata);
         src/gba/m4a.o(.rodata);
         data/data_089FC6C4.o(.rodata);
-        src/sound.o(.rodata);
+        src/audio.o(.rodata);
         data/data_08A127A1.o(.rodata);
         data/songs.o(.rodata);
         src/eeprom.o(.rodata);
diff --git a/src/sound.c b/src/audio.c
index fe061a80..6d512858 100644
--- a/src/sound.c
+++ b/src/audio.c
@@ -1,4 +1,115 @@
+#include "global.h"
+#include "main.h"
 #include "gba/m4a.h"
+#include "audio.h"
+#include "structures.h"
+
+extern void sub_080A35A0(u32);
+extern void sub_080A35C8(void);
+extern void sub_080A353C(u32);
+extern void sub_080A3234(u32);
+extern void sub_080A35B4(u32);
+
+#define IS_BGM(song) (song) - 1 <= NUM_BGM - 1
+#define IS_SFX(song) (song) - 1 > NUM_BGM - 1
+
+void SoundReq(u32 arg) {
+    u32 song;
+    struct_02021EE0* ptr;
+    if (gMain.field_0x7)
+        return;
+    ptr = &gUnk_02021EE0;
+    song = arg & 0xffff;
+    switch (arg & 0xffff0000) {
+        case SOUND_REQ_ALL_STOP:
+            ptr->currentBgm = 0;
+            m4aMPlayAllStop();
+            return;
+        case 0x80020000:
+            sub_080A3234(0);
+            return;
+        case 0x80030000:
+            sub_080A35C8();
+            ptr->unk_12 = 0x100;
+            sub_080A353C(ptr->currentBgm);
+            return;
+        case 0x80080000:
+            sub_080A35B4(ptr->currentBgm);
+            return;
+        case 0x80090000:
+            if (song == 0)
+                song = ptr->currentBgm;
+            if (IS_SFX(song))
+                return;
+            ptr->currentBgm = song;
+            m4aSongNumStart(song);
+            sub_080A35A0(song);
+            return;
+        case 0x800a0000:
+            if (IS_SFX(song))
+                return;
+            ptr->currentBgm = song;
+            m4aSongNumStartOrContinue(song);
+            sub_080A35A0(song);
+            return;
+        case 0x800c0000:
+            m4aMPlayTempoControl(gMPlayTable[gSongTable[ptr->currentBgm].ms].info, song);
+            return;
+        case 0x80040000:
+            m4aMPlayAllStop();
+            m4aSoundVSyncOff();
+            return;
+        case 0x80050000:
+            if (ptr->currentBgm == 0)
+                return;
+            m4aSongNumStop(ptr->currentBgm);
+            return;
+        case 0x80060000:
+            m4aSoundVSyncOn();
+        case 0x80070000:
+            if (ptr->currentBgm == 0)
+                return;
+            m4aSongNumStartOrContinue(ptr->currentBgm);
+            sub_080A353C(ptr->currentBgm);
+            return;
+        case 0x800b0000:
+            if (IS_SFX(song))
+                return;
+            ptr->currentBgm = song;
+            m4aSongNumStartOrContinue(song);
+            sub_080A35C8();
+            sub_080A353C(song);
+            return;
+        case 0x800d0000:
+            ptr->unk_10 = 0;
+            return;
+        case 0x80100000:
+            ptr->unk_10 = 0;
+            ptr->unk_02 = 1;
+            return;
+        case 0x800e0000:
+            ptr->unk_10 = 0x100;
+            return;
+        case 0x800f0000:
+            sub_080A35C8();
+            return;
+        case 0x80110000:
+            ptr->currentBgm = 0;
+            return;
+        default:
+            if (song != 0) {
+                if (IS_BGM(song)) {
+                    ptr->currentBgm = song;
+                    m4aSongNumStart(song);
+                    sub_080A35C8();
+                } else {
+                    m4aSongNumStart(song);
+                }
+                sub_080A353C(song);
+            }
+            return;
+    }
+}
 
 extern const SongHeader song_08DCC48C;
 extern const SongHeader song_08DCC6CC;
diff --git a/src/enemy/rope.c b/src/enemy/rope.c
index 0859bae6..5033ae4c 100644
--- a/src/enemy/rope.c
+++ b/src/enemy/rope.c
@@ -2,6 +2,7 @@
 #include "entity.h"
 #include "enemy.h"
 #include "random.h"
+#include "audio.h"
 #include "functions.h"
 
 extern void (*const gRope[6])(Entity*);
diff --git a/src/enemy/spinyChuchu.c b/src/enemy/spinyChuchu.c
index 21396115..71ffc191 100644
--- a/src/enemy/spinyChuchu.c
+++ b/src/enemy/spinyChuchu.c
@@ -1,6 +1,7 @@
 #include "enemy.h"
 #include "entity.h"
 #include "random.h"
+#include "audio.h"
 #include "functions.h"
 
 extern void sub_08001318(Entity*);
diff --git a/src/enemy/vaatiBall.c b/src/enemy/vaatiBall.c
index 3907e270..0c74ffb0 100644
--- a/src/enemy/vaatiBall.c
+++ b/src/enemy/vaatiBall.c
@@ -2,6 +2,7 @@
 #include "player.h"
 #include "screen.h"
 #include "createObject.h"
+#include "audio.h"
 #include "functions.h"
 
 typedef struct {
diff --git a/src/ezloNag.c b/src/ezloNag.c
index 0ad98db7..5d3ec162 100644
--- a/src/ezloNag.c
+++ b/src/ezloNag.c
@@ -1,6 +1,5 @@
-#include "audio.h"
 #include "global.h"
-#include "functions.h"
+#include "audio.h"
 #include "textbox.h"
 #include "structures.h"
 
diff --git a/src/gba/m4a.c b/src/gba/m4a.c
index 1123ac51..79b7dc35 100644
--- a/src/gba/m4a.c
+++ b/src/gba/m4a.c
@@ -286,10 +286,7 @@ u32 MidiKeyToCgbFreq(u8, u8, u8);
 void nullsub_141(void);
 void MPlayJumpTableCopy(void** mplayJumpTable);
 void SampleFreqSet(u32 freq);
-void m4aSoundVSyncOn(void);
-void m4aSoundVSyncOff(void);
 
-void m4aMPlayTempoControl(MusicPlayerInfo* mplayInfo, u16 tempo);
 void m4aMPlayVolumeControl(MusicPlayerInfo* mplayInfo, u16 trackBits, u16 volume);
 void m4aMPlayPitchControl(MusicPlayerInfo* mplayInfo, u16 trackBits, s16 pitch);
 void m4aMPlayPanpotControl(MusicPlayerInfo* mplayInfo, u16 trackBits, s8 pan);
@@ -1152,27 +1149,26 @@ void CgbOscOff(u8 chanNum) {
     }
 }
 
-// CgbModVol does not match because of this
 static inline int CgbPan(CgbChannel* chan) {
     u32 rightVolume = chan->rightVolume;
     u32 leftVolume = chan->leftVolume;
-    // regalloc
-    if ((rightVolume = (u8)rightVolume) >= (leftVolume = (u8)leftVolume)) {
-        if (rightVolume / 2 >= leftVolume) {
+    u8 rightVolume2 = rightVolume;
+    u8 leftVolume2 = leftVolume;
+    if (rightVolume2 >= leftVolume2) {
+        if (rightVolume2 / 2 >= leftVolume2) {
             chan->pan = 0x0F;
             return 1;
         }
     } else {
-        if (leftVolume / 2 >= rightVolume) {
+        if (leftVolume2 / 2 >= rightVolume2) {
             chan->pan = 0xF0;
             return 1;
         }
     }
-
     return 0;
 }
 
-NONMATCH("asm/non_matching/m4a/CgbModVol.inc", void CgbModVol(CgbChannel* chan)) {
+void CgbModVol(CgbChannel* chan) {
     SoundInfo* soundInfo = SOUND_INFO_PTR;
 
     if (!CgbPan(chan)) {
@@ -1194,7 +1190,6 @@ NONMATCH("asm/non_matching/m4a/CgbModVol.inc", void CgbModVol(CgbChannel* chan))
     chan->sustainGoal = (chan->envelopeGoal * chan->sustain + 15) >> 4;
     chan->pan &= chan->panMask;
 }
-END_NONMATCH
 
 NONMATCH("asm/non_matching/m4a/CgbSound.inc", void CgbSound(void)) {
     s32 ch;
diff --git a/src/item.c b/src/item.c
index fa23bd31..46ae7cc9 100644
--- a/src/item.c
+++ b/src/item.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "entity.h"
 #include "item.h"
-#include "functions.h"
+#include "audio.h"
 
 // TODO - How does this relate to PlayerItemFunctions? Is this just a lookup table?
 void (*const gItemFunctions[])(ItemBehavior*, u32) = {
diff --git a/src/manager/manager3.c b/src/manager/manager3.c
index acd83825..bd15e45c 100644
--- a/src/manager/manager3.c
+++ b/src/manager/manager3.c
@@ -5,7 +5,7 @@
 #include "room.h"
 #include "player.h"
 #include "random.h"
-#include "functions.h"
+#include "audio.h"
 
 // Facilitates the usage of minish portals.
 
diff --git a/src/manager/managerB.c b/src/manager/managerB.c
index ca298178..ae0ea131 100644
--- a/src/manager/managerB.c
+++ b/src/manager/managerB.c
@@ -5,6 +5,7 @@
 #include "room.h"
 #include "area.h"
 #include "utils.h"
+#include "audio.h"
 #include "functions.h"
 
 /*
diff --git a/src/manager/managerE.c b/src/manager/managerE.c
index 44bfb5a7..200a52d5 100644
--- a/src/manager/managerE.c
+++ b/src/manager/managerE.c
@@ -3,6 +3,7 @@
 #include "manager.h"
 #include "flags.h"
 #include "room.h"
+#include "audio.h"
 #include "functions.h"
 
 void sub_08058E60(ManagerE* this) {
diff --git a/src/npc/bigGoron.c b/src/npc/bigGoron.c
index 3123b036..c3032d54 100644
--- a/src/npc/bigGoron.c
+++ b/src/npc/bigGoron.c
@@ -4,6 +4,7 @@
 #include "structures.h"
 #include "script.h"
 #include "random.h"
+#include "audio.h"
 #include "functions.h"
 
 extern void (*gUnk_081140D4[])(Entity*);
diff --git a/src/npc/bladeBrothers.c b/src/npc/bladeBrothers.c
index 49a86dfc..223000f2 100644
--- a/src/npc/bladeBrothers.c
+++ b/src/npc/bladeBrothers.c
@@ -7,6 +7,7 @@
 #include "save.h"
 #include "script.h"
 #include "npc.h"
+#include "audio.h"
 #include "functions.h"
 
 extern void (*gUnk_081115C0[])(Entity*);
diff --git a/src/npc/ezloCap.c b/src/npc/ezloCap.c
index a7b5593e..6f483b66 100644
--- a/src/npc/ezloCap.c
+++ b/src/npc/ezloCap.c
@@ -1,9 +1,10 @@
 #include "global.h"
 #include "entity.h"
-#include "functions.h"
 #include "flags.h"
 #include "save.h"
 #include "script.h"
+#include "audio.h"
+#include "functions.h"
 
 extern Hitbox gUnk_080FD170;
 extern void script_08016030; // Cutscene data type?
diff --git a/src/npc/melari.c b/src/npc/melari.c
index a62b837b..1e911439 100644
--- a/src/npc/melari.c
+++ b/src/npc/melari.c
@@ -4,6 +4,7 @@
 #include "textbox.h"
 #include "script.h"
 #include "random.h"
+#include "audio.h"
 #include "functions.h"
 
 extern void sub_08068780(Entity*);
diff --git a/src/npc/rem.c b/src/npc/rem.c
index a6059865..0498c6db 100644
--- a/src/npc/rem.c
+++ b/src/npc/rem.c
@@ -1,7 +1,8 @@
 #include "global.h"
-#include "functions.h"
 #include "entity.h"
 #include "script.h"
+#include "audio.h"
+#include "functions.h"
 
 extern void sub_0806A8C8(Entity*);
 
diff --git a/src/npc/smith.c b/src/npc/smith.c
index 6b55c1f7..c15b1219 100644
--- a/src/npc/smith.c
+++ b/src/npc/smith.c
@@ -5,6 +5,7 @@
 #include "script.h"
 #include "random.h"
 #include "npc.h"
+#include "audio.h"
 #include "functions.h"
 
 extern void sub_08078850(Entity*, u32, u32, u32*);
diff --git a/src/object/button.c b/src/object/button.c
index e545953c..ca180856 100644
--- a/src/object/button.c
+++ b/src/object/button.c
@@ -2,6 +2,7 @@
 #include "entity.h"
 #include "flags.h"
 #include "room.h"
+#include "audio.h"
 #include "functions.h"
 
 extern void (*const gUnk_0811EE38[])(Entity*);
diff --git a/src/object/houseDoorExterior.c b/src/object/houseDoorExterior.c
index 2b6edaae..9e8ffba2 100644
--- a/src/object/houseDoorExterior.c
+++ b/src/object/houseDoorExterior.c
@@ -1,9 +1,10 @@
 #include "global.h"
 #include "entity.h"
 #include "flags.h"
-#include "functions.h"
 #include "room.h"
 #include "script.h"
+#include "audio.h"
+#include "functions.h"
 
 typedef struct {
     /*0x00*/ u16 unk0;
diff --git a/src/object/jailBars.c b/src/object/jailBars.c
index 505ca8e2..74fcfeae 100644
--- a/src/object/jailBars.c
+++ b/src/object/jailBars.c
@@ -2,7 +2,7 @@
 #include "entity.h"
 #include "flags.h"
 #include "room.h"
-#include "functions.h"
+#include "audio.h"
 
 extern void sub_080A0960(Entity*, u32);
 extern void sub_0801AF18(u8*, u32, u32);
diff --git a/src/object/metalDoor.c b/src/object/metalDoor.c
index a2a18bff..c56d0014 100644
--- a/src/object/metalDoor.c
+++ b/src/object/metalDoor.c
@@ -2,6 +2,7 @@
 #include "entity.h"
 #include "room.h"
 #include "flags.h"
+#include "audio.h"
 #include "functions.h"
 
 extern u32 sub_08083734(Entity*, u32);
diff --git a/src/object/objectA2.c b/src/object/objectA2.c
index 0c3307d3..87c75e4e 100644
--- a/src/object/objectA2.c
+++ b/src/object/objectA2.c
@@ -2,6 +2,7 @@
 #include "object.h"
 #include "menu.h"
 #include "random.h"
+#include "audio.h"
 #include "structures.h"
 #include "functions.h"
 
diff --git a/src/object/thoughtBubble.c b/src/object/thoughtBubble.c
index 5e77d9e1..70ad3c73 100644
--- a/src/object/thoughtBubble.c
+++ b/src/object/thoughtBubble.c
@@ -1,5 +1,6 @@
 #include "global.h"
 #include "entity.h"
+#include "audio.h"
 #include "functions.h"
 
 extern void (*const ThoughtBubble_Behaviors[])(Entity*);
diff --git a/src/save.c b/src/save.c
index 7cbf89aa..be070f98 100644
--- a/src/save.c
+++ b/src/save.c
@@ -58,8 +58,6 @@ const SaveFileEEPROMAddresses gSaveFileEEPROMAddresses[] = { { 0x500, 0x30, 0x10
                                                              { 0x20, 0x60, 0x1060, 0xf80, 0x1f80 },
                                                              { 0x8, 0xfa0, 0x1fa0, 0xfa0, 0x1fa0 } };
 
-extern s16 gUnk_02021EE0[6];
-
 void sub_0807CD9C() {
     sub_080530C8();
 }
@@ -69,8 +67,8 @@ SaveResult HandleSave(u32 arg0) {
 }
 
 SaveResult HandleSaveInit(u32 arg0) {
-    gUnk_02021EE0[5] -= 8;
-    if (gUnk_02021EE0[4] <= 0) {
+    gUnk_02021EE0.unk_0a -= 8;
+    if (gUnk_02021EE0.unk_08 <= 0) {
         gMenu.field_0xa = 8;
         gMenu.storyPanelIndex = SAVE_IN_PROGRESS;
     }
@@ -107,9 +105,9 @@ SaveResult HandleSaveDone(u32 arg0) {
     SaveResult result;
 
     result = SAVE_BUSY;
-    gUnk_02021EE0[5] += 8;
-    if (gUnk_02021EE0[3] <= gUnk_02021EE0[5]) {
-        gUnk_02021EE0[5] = gUnk_02021EE0[3];
+    gUnk_02021EE0.unk_0a += 8;
+    if (gUnk_02021EE0.unk_06 <= gUnk_02021EE0.unk_0a) {
+        gUnk_02021EE0.unk_0a = gUnk_02021EE0.unk_06;
         sub_08050384();
         gMenu.storyPanelIndex = SAVE_INIT;
         if (gMenu.field_0xa == 1) {
diff --git a/src/script.c b/src/script.c
index 0710080c..ea063d28 100644
--- a/src/script.c
+++ b/src/script.c
@@ -9,6 +9,7 @@
 #include "utils.h"
 #include "save.h"
 #include "random.h"
+#include "audio.h"
 #include "functions.h"
 
 void InitScriptForEntity(Entity*, ScriptExecutionContext*, u16*);
@@ -137,9 +138,9 @@ void ScriptCommand_0807EEF4(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_0807EF3C(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_DoPostScriptAction(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_DoPostScriptAction2(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_PlaySound(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_PlayBgm(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_SoundReq(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_SoundReq2(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_SoundReq3(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_SoundReq0x80100000(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_ModRupees(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_ModHealth(Entity* entity, ScriptExecutionContext* context);
@@ -283,9 +284,9 @@ const ScriptCommand gScriptCommands[] = { ScriptCommandNop,
                                           ScriptCommand_0807EF3C,
                                           ScriptCommand_DoPostScriptAction,
                                           ScriptCommand_DoPostScriptAction2,
+                                          ScriptCommand_PlaySound,
+                                          ScriptCommand_PlayBgm,
                                           ScriptCommand_SoundReq,
-                                          ScriptCommand_SoundReq2,
-                                          ScriptCommand_SoundReq3,
                                           ScriptCommand_SoundReq0x80100000,
                                           ScriptCommand_ModRupees,
                                           ScriptCommand_ModHealth,
@@ -1450,11 +1451,11 @@ void ScriptCommand_DoPostScriptAction2(Entity* entity, ScriptExecutionContext* c
     context->postScriptActions |= 1 << context->scriptInstructionPointer[1];
 }
 
-void ScriptCommand_SoundReq(Entity* entity, ScriptExecutionContext* context) {
+void ScriptCommand_PlaySound(Entity* entity, ScriptExecutionContext* context) {
     SoundReq(context->scriptInstructionPointer[1]);
 }
 
-void ScriptCommand_SoundReq2(Entity* entity, ScriptExecutionContext* context) {
+void ScriptCommand_PlayBgm(Entity* entity, ScriptExecutionContext* context) {
     if (context->scriptInstructionPointer[1] >= 100) {
         SoundReq(gArea.musicIndex);
     } else {
@@ -1462,7 +1463,7 @@ void ScriptCommand_SoundReq2(Entity* entity, ScriptExecutionContext* context) {
     }
 }
 
-void ScriptCommand_SoundReq3(Entity* entity, ScriptExecutionContext* context) {
+void ScriptCommand_SoundReq(Entity* entity, ScriptExecutionContext* context) {
     SoundReq(GetNextScriptCommandWordAfterCommandMetadata(context->scriptInstructionPointer));
 }