fix warnings

7 files changed, 145 insertions, 118 deletions

diff --git a/arm9/lib/include/NNS_SND_arc.h b/arm9/lib/include/NNS_SND_arc.h
index 1d283816..5298d805 100644
--- a/arm9/lib/include/NNS_SND_arc.h
+++ b/arm9/lib/include/NNS_SND_arc.h
@@ -2,6 +2,7 @@
 #define GUARD_NNS_SND_ARC_H
 
 #include "SND_main.h"
+#include "FS_file.h"
 
 typedef struct NNSSndArcHeader
 {
diff --git a/arm9/src/sound.c b/arm9/src/sound.c
index cf151a0d..ec65dd06 100644
--- a/arm9/src/sound.c
+++ b/arm9/src/sound.c
@@ -254,7 +254,7 @@ u32 * GetSoundPlayer(int playerNo)
     return &sdat->players[playerNo];
 }
 
-u32 FUN_02004018(u32 a0)
+int FUN_02004018(u32 a0)
 {
     switch (a0)
     {
diff --git a/arm9/src/unk_020040F4.c b/arm9/src/unk_020040F4.c
index e6ec0127..5713ddf0 100644
--- a/arm9/src/unk_020040F4.c
+++ b/arm9/src/unk_020040F4.c
@@ -15,7 +15,7 @@ extern void FUN_0200541C();
 extern void FUN_0200521C(int);
 extern void FUN_0200538C(u32, u16, u32);
 extern void NNS_SndPlayerPause(u32 *, u8);
-extern void NNS_SndPlayerMoveVolume(u32 *, u32, u32);
+extern void NNS_SndPlayerMoveVolume(u32 *, s32, s32);
 extern void NNS_SndPlayerSetInitialVolume(u32 *, s32);
 extern void *NNS_SndArcGetSeqParam(u32);
 extern void NNS_SndArcPlayerStartSeqEx(u32 *, u32, s32, s32, u32);
@@ -27,7 +27,7 @@ extern u32 MIC_StopAutoSampling();
 extern u32 MIC_DoSamplingAsync(u32 param0, u32 param1, u32 param2, u32 param3);
 extern u32 NNS_SndWaveOutAllocChannel(u32);
 extern void NNS_SndWaveOutFreeChannel(u32);
-extern u32 NNS_SndWaveOutStart(u32, u32, void *, u32, u32, u32, u32, s32, u32, u32);
+extern u32 NNS_SndWaveOutStart(u32, u32, void *, u32, u32, u32, u32, s32, u32, s32);
 extern void NNS_SndWaveOutStop(u32);
 extern BOOL NNS_SndWaveOutIsPlaying(u32);
 extern void NNS_SndWaveOutSetPan(u32, u32);
@@ -42,8 +42,8 @@ extern void NNS_SndCaptureStopReverb(u32);
 extern void NNS_SndCaptureSetReverbVolume(u32, u32);
 extern u32 NNS_SndCaptureStartEffect(void *, u32, u32, u32, u32, void (*)(), void *);
 extern void NNS_SndCaptureStopEffect();
-extern void NNS_SndPlayerSetTrackPitch(u32 *, u32, u32);
-extern void NNS_SndPlayerSetTrackPan(u32 *, u32, u32);
+extern void NNS_SndPlayerSetTrackPitch(u32 *, u32, s32);
+extern void NNS_SndPlayerSetTrackPan(u32 *, u32, s32);
 extern void NNS_SndSetMonoFlag(u32 param0);
 extern void FUN_020053CC(u32, u32);
 extern u32 NNS_SndArcGetFileAddress(u32);
@@ -552,7 +552,7 @@ THUMB_FUNC void FUN_02004810()
     *ptr2 = 0;
 }
 
-THUMB_FUNC void GF_SndPlayerMoveVolume(int playerNo, u32 param1, u32 param2)
+THUMB_FUNC void GF_SndPlayerMoveVolume(int playerNo, s32 param1, s32 param2)
 {
     NNS_SndPlayerMoveVolume(GetSoundPlayer(playerNo), param1, param2);
 }
@@ -598,7 +598,7 @@ THUMB_FUNC void FUN_02004858(u32 param0, int playerNo)
 
 THUMB_FUNC void FUN_0200488C(u16 param0, u16 param1)
 {
-    GF_SndPlayerSetInitialVolume((int)FUN_02004018(FUN_020048D0(param0)), param1);
+    GF_SndPlayerSetInitialVolume(FUN_02004018(FUN_020048D0(param0)), param1);
 }
 
 THUMB_FUNC void GF_SndArcPlayerStartSeqEx(int playerNo, u32 param1, u32 param2)
@@ -639,7 +639,7 @@ THUMB_FUNC u32 FUN_020048F4(u16 param0)
     return NNS_SndArcGetBankInfo(FUN_02004900(param0));
 }
 
-THUMB_FUNC u16 FUN_02004900(int param0)
+THUMB_FUNC u16 FUN_02004900(u32 param0)
 {
     u16 *ptr = NNS_SndArcGetSeqParam(param0);
     if (ptr == NULL)
@@ -824,7 +824,7 @@ THUMB_FUNC void FUN_02004AF8(u32 param0, s32 param1)
     NNS_SndWaveOutSetVolume(*(u32 *)FUN_02004930(param0), param1);
 }
 
-THUMB_FUNC u32 FUN_02004B30(u32 param0, s32 param1, u32 param2, u32 param3, u32 param4)
+THUMB_FUNC u32 FUN_02004B30(u32 param0, s32 param1, s32 param2, u32 param3, u32 param4)
 {
     GetSoundDataPointer();
 
@@ -969,17 +969,17 @@ THUMB_FUNC void FUN_02004D04(s32 param0)
     *ptr = (u8)param0;
 }
 
-THUMB_FUNC void GF_SndPlayerSetTrackPitch(int playerNo, u32 param1, u32 param2)
+THUMB_FUNC void GF_SndPlayerSetTrackPitch(int playerNo, u32 param1, s32 param2)
 {
     NNS_SndPlayerSetTrackPitch(GetSoundPlayer(playerNo), param1, param2);
 }
 
-THUMB_FUNC void FUN_02004D34(u16 param0, u32 param1, u32 param2)
+THUMB_FUNC void FUN_02004D34(u16 param0, u32 param1, s32 param2)
 {
-    GF_SndPlayerSetTrackPitch((int)FUN_02004018(FUN_020048D0(param0)), param1, param2);
+    GF_SndPlayerSetTrackPitch(FUN_02004018(FUN_020048D0(param0)), param1, param2);
 }
 
-THUMB_FUNC void GF_SndPlayerSetTrackPan(int playerNo, u32 param1, u32 param2)
+THUMB_FUNC void GF_SndPlayerSetTrackPan(int playerNo, u32 param1, s32 param2)
 {
     NNS_SndPlayerSetTrackPan(GetSoundPlayer(playerNo), param1, param2);
 }
@@ -990,9 +990,9 @@ THUMB_FUNC void GF_SndSetMonoFlag(u32 param0)
     UNK_021C3DD8[0] = param0;
 }
 
-THUMB_FUNC void FUN_02004D74(u32 param0)
+THUMB_FUNC void FUN_02004D74(s32 param0)
 {
-    *(u32 *)FUN_02003D38(6) = param0;
+    *(s32 *)FUN_02003D38(6) = param0;
 }
 
 THUMB_FUNC void FUN_02004D84(u32 param0)
diff --git a/arm9/src/unk_020051F4.c b/arm9/src/unk_020051F4.c
index 49f74eee..1d3679c8 100644
--- a/arm9/src/unk_020051F4.c
+++ b/arm9/src/unk_020051F4.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "FS_file.h"
+#include "unk_020051F4.h"
 #include "NNS_SND_arc.h"
 #include "constants/species.h"
 #include "heap.h"
@@ -8,35 +8,40 @@
 #include "unk_0200CA44.h"
 
 extern u32 NNS_SndArcPlayerStartSeq(u32 *, u32);
-extern void FUN_0200526C(u16, u32);
+extern u32 NNS_SndArcPlayerStartSeqEx(u32 *, s32, s32, s32, u32);
+extern void NNS_SndPlayerStopSeqBySeqNo(u32, u32);
+extern void NNS_SndPlayerStopSeqAll(u32);
+extern void NNS_SndPlayerStopSeq(u32 *, u32);
+extern void NNS_SndPlayerSetTrackPan(u32 *, u32, u32);
+extern u32 FUN_02005D48(u32, u32, u32, u32);
+extern void FUN_02005E80(u32);
+extern void FUN_02005DFC();
+extern void *FUN_0201B6C8(u32 *);
 
 THUMB_FUNC u32 FUN_020051F4(u16 param0)
 {
-    u32 r4 = FUN_02004018(FUN_020048D0(param0));
+    int playerNo = FUN_02004018(FUN_020048D0(param0));
 
-    u32 ret = NNS_SndArcPlayerStartSeq(GetSoundPlayer(r4), param0);
+    u32 ret = NNS_SndArcPlayerStartSeq(GetSoundPlayer(playerNo), param0);
 
-    FUN_0200526C(param0, r4);
+    FUN_0200526C(param0, playerNo);
 
     return ret;
 }
 
-extern u32 FUN_02005288(u16, u32, u32);
-extern u32 FUN_020052B8(u16, u32, u32);
-
 THUMB_FUNC u32 FUN_0200521C(u16 param0)
 {
     u8 r4 = FUN_020048D0(param0);
-    u32 r6 = FUN_02004018(r4);
+    int playerNo = FUN_02004018(r4);
 
     u32 ret;
     if (r4 == 7)
     {
-        ret = FUN_02005288(param0, r4, r6);
+        ret = FUN_02005288(param0, r4, playerNo);
     }
     else if (r4 == 1)
     {
-        ret = FUN_020052B8(param0, r4, r6);
+        ret = FUN_020052B8(param0, r4, playerNo);
     }
     else
     {
@@ -45,37 +50,37 @@ THUMB_FUNC u32 FUN_0200521C(u16 param0)
     }
 
     FUN_02004DBC(0);
-    FUN_0200526C(param0, r6);
+    FUN_0200526C(param0, playerNo);
 
     return ret;
 }
 
-THUMB_FUNC void FUN_0200526C(u16 param0, u32 param1)
+THUMB_FUNC void FUN_0200526C(u16 param0, int playerNo)
 {
     FUN_02004110(param0);
-    FUN_02004858(param0, param1);
+    FUN_02004858(param0, playerNo);
 
     FUN_02003CE8(1);
 }
 
-THUMB_FUNC u32 FUN_02005288(u16 param0, u32 param1, u32 param2)
+THUMB_FUNC u32 FUN_02005288(u16 param0, u32 param1, int playerNo)
 {
+#pragma unused(param1)
     GF_Snd_RestoreState(FUN_02004748(3));
     GF_Snd_LoadSeq(param0);
     GF_Snd_SaveState(FUN_02003D38(26));
-    return NNS_SndArcPlayerStartSeq(GetSoundPlayer(param2), param0);
+    return NNS_SndArcPlayerStartSeq(GetSoundPlayer(playerNo), param0);
 }
 
-extern u32 NNS_SndArcPlayerStartSeqEx(u32 *, s32, s32, s32, u32);
-
-THUMB_FUNC u32 FUN_020052B8(u16 param0, u32 param1, u32 param2)
+THUMB_FUNC u32 FUN_020052B8(u16 param0, u32 param1, int playerNo)
 {
+#pragma unused(param1)
     FUN_02003D38(18);
     u16 *r4 = FUN_02003D38(31);
 
     FUN_020045C4(param0, FUN_02004900(GF_SndPlayerGetSeqNo(GetSoundPlayer(0))));
 
-    return NNS_SndArcPlayerStartSeqEx(GetSoundPlayer(param2), -1, FUN_02004900(*r4), -1, param0);
+    return NNS_SndArcPlayerStartSeqEx(GetSoundPlayer(playerNo), -1, FUN_02004900(*r4), -1, param0);
 }
 
 THUMB_FUNC u32 FUN_02005308(u32 param0, u16 param1)
@@ -101,9 +106,6 @@ THUMB_FUNC u32 FUN_02005308(u32 param0, u16 param1)
     return r4;
 }
 
-extern void NNS_SndPlayerStopSeqBySeqNo(u32, u32);
-extern void FUN_02005374();
-
 THUMB_FUNC void FUN_02005350(u16 param0, u32 param1)
 {
     NNS_SndPlayerStopSeqBySeqNo(param0, param1);
@@ -124,7 +126,7 @@ THUMB_FUNC void FUN_02005374()
     FUN_02003CE8(0);
 }
 
-THUMB_FUNC void FUN_0200538C(u32 param0, u16 param1, u32 param2)
+THUMB_FUNC void FUN_0200538C(s32 param0, u16 param1, u32 param2)
 {
     u8 r0 = FUN_020048D0(FUN_02004124());
     if (r0 == 0xff)
@@ -132,20 +134,18 @@ THUMB_FUNC void FUN_0200538C(u32 param0, u16 param1, u32 param2)
         return;
     }
 
-    u32 r7 = FUN_02004018(r0);
+    int playerNo = FUN_02004018(r0);
     if (param2 == 0)
     {
-        GF_SndPlayerMoveVolume(r7, 0, 0);
+        GF_SndPlayerMoveVolume(playerNo, 0, 0);
     }
 
-    GF_SndPlayerMoveVolume(r7, param0, param1);
+    GF_SndPlayerMoveVolume(playerNo, param0, param1);
     FUN_02004D74(param1);
     FUN_02003CE8(3);
 }
 
-extern u16 FUN_02005404(void);
-
-THUMB_FUNC void FUN_020053CC(u32 param0, u32 param1)
+THUMB_FUNC void FUN_020053CC(s32 param0, s32 param1)
 {
     u8 r6 = FUN_020048D0(FUN_02004124());
     if (r6 == 0xff)
@@ -172,8 +172,6 @@ THUMB_FUNC u16 FUN_02005410(u16 param0)
     return GF_SndPlayerCountPlayingSeqByPlayerNo(FUN_020048D0(param0));
 }
 
-extern void NNS_SndPlayerStopSeqAll(u32);
-
 THUMB_FUNC void FUN_0200541C()
 {
     u8 *r5 = FUN_02003D38(15);
@@ -193,10 +191,6 @@ THUMB_FUNC void FUN_0200541C()
     FUN_02003CE8(0);
 }
 
-extern void NNS_SndPlayerStopSeq(u32 *, u32);
-extern void FUN_020054F8(s32, u32);
-extern void FUN_02005614(u32);
-
 THUMB_FUNC void FUN_02005454()
 {
     u8 *r5 = FUN_02003D38(15);
@@ -223,9 +217,6 @@ THUMB_FUNC void FUN_02005454()
     }
 }
 
-extern u32 PlaySE(u16);
-extern void FUN_02005530(u16, u32, u32);
-
 THUMB_FUNC u32 FUN_020054A8(u16 param0, u32 param1)
 {
     u32 r6 = PlaySE(param0);
@@ -236,10 +227,10 @@ THUMB_FUNC u32 FUN_020054A8(u16 param0, u32 param1)
 
 THUMB_FUNC u32 PlaySE(u16 param0)
 {
-    u32 r4 = FUN_02004018(FUN_020048D0(param0));
+    int playerNo = FUN_02004018(FUN_020048D0(param0));
 
-    u32 r6 = NNS_SndArcPlayerStartSeq(GetSoundPlayer(r4), param0);
-    FUN_02004858(param0, r4);
+    u32 r6 = NNS_SndArcPlayerStartSeq(GetSoundPlayer(playerNo), param0);
+    FUN_02004858(param0, playerNo);
 
     return r6;
 }
@@ -272,8 +263,6 @@ THUMB_FUNC BOOL FUN_02005514()
     return FALSE;
 }
 
-extern void NNS_SndPlayerSetTrackPan(u32 *, u32, u32);
-
 THUMB_FUNC void FUN_02005530(u16 param0, u32 param1, u32 param2)
 {
     NNS_SndPlayerSetTrackPan(GetSoundPlayer(FUN_02004018(FUN_020048D0(param0))), param1, param2);
@@ -281,17 +270,14 @@ THUMB_FUNC void FUN_02005530(u16 param0, u32 param1, u32 param2)
 
 THUMB_FUNC void FUN_0200554C(u32 param0)
 {
-    u32 r4 = FUN_02004018(3);
+    int playerNo = FUN_02004018(3);
 
-    for (s32 i = 0; i < 4; i++)
+    for (int i = 0; i < 4; i++)
     {
-        NNS_SndPlayerSetTrackPan(GetSoundPlayer(r4 + i), 0xFFFF, param0);
+        NNS_SndPlayerSetTrackPan(GetSoundPlayer(playerNo + i), 0xFFFF, param0);
     }
 }
 
-extern u32 FUN_02005D48(u32, u32, u32, u32);
-extern void FUN_02005E80(u32);
-
 THUMB_FUNC u32 FUN_02005578(u16 species)
 {
     u8 *r4 = FUN_02003D38(17);
@@ -333,8 +319,6 @@ THUMB_FUNC u32 FUN_02005578(u16 species)
     return res;
 }
 
-extern void FUN_02005DFC();
-
 THUMB_FUNC void FUN_02005614(u32 param0)
 {
     u8 *r6 = FUN_02003D38(15);
@@ -378,11 +362,6 @@ THUMB_FUNC BOOL FUN_02005670()
     return GF_SndPlayerCountPlayingSeqByPlayerNo(0);
 }
 
-extern void FUN_02005AC8(u32, u32, u32);
-extern void FUN_02005AE0(u32, u32);
-extern u32 FUN_02005BC8(u16, u32);
-extern void FUN_02005BF8(u32 param0, s32 param1, u32 param2, u32 param3, u32 param4);
-
 THUMB_FUNC u32 FUN_020056AC(u32 param0, u16 param1, s32 param2, s32 param3, u32 param4)
 {
     s32 st1c, st18;
@@ -563,15 +542,12 @@ THUMB_FUNC u32 FUN_020056AC(u32 param0, u16 param1, s32 param2, s32 param3, u32
     return 1;
 }
 
-THUMB_FUNC void FUN_02005AC8(u32 param0, u32 param1, u32 param2)
+THUMB_FUNC void FUN_02005AC8(u32 param0, int playerNo, s32 param2)
 {
-    GF_SndPlayerSetInitialVolume(param1, param2);
-    FUN_02004858(param0, param1);
+    GF_SndPlayerSetInitialVolume(playerNo, param2);
+    FUN_02004858(param0, playerNo);
 }
 
-extern void FUN_02005BA0();
-extern void FUN_02005B2C();
-
 THUMB_FUNC void FUN_02005AE0(u32 param0, u32 param1)
 {
     u32 *r6 = FUN_02003D38(34);
@@ -594,13 +570,15 @@ THUMB_FUNC void FUN_02005AE0(u32 param0, u32 param1)
     ((u8 *)ptr)[7] = 0;
 
     ptr[0] = param0;
-    u32 r0 = FUN_0200CA44(FUN_02005B2C, (struct TextPrinter *)ptr, 0);
+    u32 r0 = (u32)FUN_0200CA44(
+        (void (*)(u32, struct TextPrinter *))FUN_02005B2C, (struct TextPrinter *)ptr, 0);
     ptr[1] = r0;
     *r6 = r0;
 }
 
 THUMB_FUNC void FUN_02005B2C(u32 param0, s32 *param1)
 {
+#pragma unused(param0)
     u8 *r6 = FUN_02003D38(15);
     u8 *r4 = FUN_02003D38(16);
 
@@ -635,23 +613,21 @@ THUMB_FUNC void FUN_02005B2C(u32 param0, s32 *param1)
     }
 }
 
-
-extern void *FUN_0201B6C8(u32 *);
-
-
-THUMB_FUNC void FUN_02005BA0() {
+THUMB_FUNC void FUN_02005BA0()
+{
     u32 **r4 = FUN_02003D38(34);
-    if (*r4 != NULL) {
+    if (*r4 != NULL)
+    {
         void *r5 = FUN_0201B6C8(*r4);
-        FUN_0200CAB4(*r4);
+        FUN_0200CAB4((s32)(*r4));
         FreeToHeap(r5);
     }
 
     *r4 = 0;
 }
 
-
-THUMB_FUNC u32 FUN_02005BC8(u16 param0, u32 param1) {
+THUMB_FUNC u32 FUN_02005BC8(u16 param0, s32 param1)
+{
     *(u8 *)FUN_02003D38(17) = 1;
 
     FUN_02005E80(1);
@@ -662,26 +638,27 @@ THUMB_FUNC u32 FUN_02005BC8(u16 param0, u32 param1) {
     return res;
 }
 
-
-THUMB_FUNC void FUN_02005BF8(u32 param0, s32 param1, u32 param2, u32 param3, u32 param4) {
+THUMB_FUNC void FUN_02005BF8(u32 param0, s32 param1, s32 param2, s32 param3, u32 param4)
+{
+#pragma unused(param1)
     *(u8 *)FUN_02003D38(17) = 1;
 
     FUN_02004984(15);
     FUN_02004B30(param0, param2, param3, 15, param4);
 }
 
-extern void FUN_02005CEC(u16);
-
-THUMB_FUNC u32 PlaySound(u16 param0) {
+THUMB_FUNC u32 PlaySound(u16 param0)
+{
     FUN_020048F4(param0);
     FUN_02005CEC(param0);
 
     u8 r0 = FUN_020048D0(FUN_02004124());
-    if (r0 != 0xff) {
+    if (r0 != 0xff)
+    {
         FUN_020047C8(r0, 1);
     }
 
-    GF_Snd_SaveState((int*)FUN_02003D38(28));
+    GF_Snd_SaveState((int *)FUN_02003D38(28));
     GF_Snd_LoadSeqEx(param0, 3);
     u32 res = NNS_SndArcPlayerStartSeq(GetSoundPlayer(2), param0);
     FUN_02004858(param0, 2);
@@ -689,16 +666,17 @@ THUMB_FUNC u32 PlaySound(u16 param0) {
     return res;
 }
 
-
-THUMB_FUNC BOOL FUN_02005C74() {
+THUMB_FUNC BOOL FUN_02005C74()
+{
     u16 *r4 = FUN_02003D38(13);
 
-
-    if (GF_SndPlayerCountPlayingSeqByPlayerNo(2) != 0) {
+    if (GF_SndPlayerCountPlayingSeqByPlayerNo(2) != 0)
+    {
         return TRUE;
     }
 
-    if (*r4 != 0) {
+    if (*r4 != 0)
+    {
         (*r4)--;
         return TRUE;
     }
@@ -706,31 +684,34 @@ THUMB_FUNC BOOL FUN_02005C74() {
     return FALSE;
 }
 
-
-THUMB_FUNC void FUN_02005CA0(u32 param0) {
+THUMB_FUNC void FUN_02005CA0(u32 param0)
+{
     NNS_SndPlayerStopSeq(GetSoundPlayer(2), param0);
     GF_Snd_RestoreState(FUN_02004748(6));
 }
 
-
-THUMB_FUNC BOOL FUN_02005CBC() {
+THUMB_FUNC BOOL FUN_02005CBC()
+{
     FUN_02003D38(13);
 
-    if (FUN_02005C74() == TRUE) {
+    if (FUN_02005C74() == TRUE)
+    {
         return TRUE;
     }
 
     FUN_02005CA0(0);
     u8 r0 = FUN_020048D0(FUN_02004124());
 
-    if (r0 != 0xff) {
+    if (r0 != 0xff)
+    {
         FUN_020047C8(r0, 0);
     }
 
     return FALSE;
 }
 
-
-THUMB_FUNC void FUN_02005CEC(u16 param0) {
-    *(u16*)FUN_02003D38(13) = 15;
+THUMB_FUNC void FUN_02005CEC(u16 param0)
+{
+#pragma unused(param0)
+    *(u16 *)FUN_02003D38(13) = 15;
 }
diff --git a/include/sound.h b/include/sound.h
index e4485c58..11053cd6 100644
--- a/include/sound.h
+++ b/include/sound.h
@@ -63,7 +63,7 @@ BOOL GF_Snd_LoadSeqEx(int seqNo, u32 loadFlag);
 BOOL GF_Snd_LoadWaveArc(int waveArcNo);
 BOOL GF_Snd_LoadBank(int bankNo);
 u32 * GetSoundPlayer(int playerNo);
-u32 FUN_02004018(u32 a0);
+int FUN_02004018(u32 a0);
 void DoSoundUpdateFrame(void);
 void FUN_02003CE8(int);
 
diff --git a/include/unk_020040F4.h b/include/unk_020040F4.h
index 6ea51b6c..413e853f 100644
--- a/include/unk_020040F4.h
+++ b/include/unk_020040F4.h
@@ -19,7 +19,7 @@ struct UnkStruct_020040F4_1
     u32 unk18;
     s32 unk1c;
     u32 unk20;
-    u32 unk24;
+    s32 unk24;
 };
 
 struct UnkStruct_020040F4_2
@@ -55,7 +55,7 @@ void FUN_02004738();
 int FUN_02004748(s32 param0);
 void FUN_020047C8(u8 param0, u8 param1);
 void FUN_02004810();
-void GF_SndPlayerMoveVolume(int playerNo, u32 param1, u32 param2);
+void GF_SndPlayerMoveVolume(int playerNo, s32 param1, s32 param2);
 void GF_SndPlayerSetInitialVolume(int playerNo, s32 param1);
 void FUN_02004858(u32 param0, int playerNo);
 void FUN_0200488C(u16 param0, u16 param1);
@@ -64,7 +64,7 @@ u16 GF_SndPlayerCountPlayingSeqByPlayerNo(int playerNo);
 u8 FUN_020048D0(u16 param0);
 u32 GF_SndPlayerGetSeqNo(u32 *param0);
 u32 FUN_020048F4(u16 param0);
-u16 FUN_02004900(int param0);
+u16 FUN_02004900(u32 param0);
 u32 GF_MIC_StartAutoSampling(u32 param0);
 u32 GF_MIC_StopAutoSampling(u32 param0);
 u32 GF_MIC_DoSamplingAsync(u32 param0, u32 param1, u32 param2, u32 param3);
@@ -77,7 +77,7 @@ BOOL FUN_02004ABC(u32 param0);
 void FUN_02004ACC(u32 param0, u32 param1);
 void FUN_02004AE4(u32 param0, u32 param1);
 void FUN_02004AF8(u32 param0, s32 param1);
-u32 FUN_02004B30(u32 param0, s32 param1, u32 param2, u32 param3, u32 param4);
+u32 FUN_02004B30(u32 param0, s32 param1, s32 param2, u32 param3, u32 param4);
 void FUN_02004C1C(u8 *param0, u32 param1);
 void FUN_02004C3C(u32 param0);
 BOOL GF_SndCaptureIsActive();
@@ -87,11 +87,11 @@ void GF_SndCaptureSetReverbVolume(u32 param0, u32 param1);
 void FUN_02004CB4();
 void GF_SndCaptureStopEffect();
 void FUN_02004D04(s32 param0);
-void GF_SndPlayerSetTrackPitch(int playerNo, u32 param1, u32 param2);
-void FUN_02004D34(u16 param0, u32 param1, u32 param2);
-void GF_SndPlayerSetTrackPan(int playerNo, u32 param1, u32 param2);
+void GF_SndPlayerSetTrackPitch(int playerNo, u32 param1, s32 param2);
+void FUN_02004D34(u16 param0, u32 param1, s32 param2);
+void GF_SndPlayerSetTrackPan(int playerNo, u32 param1, s32 param2);
 void GF_SndSetMonoFlag(u32 param0);
-void FUN_02004D74(u32 param0);
+void FUN_02004D74(s32 param0);
 void FUN_02004D84(u32 param0);
 u16 FUN_02004D94();
 u8 *FUN_02004DB4();
diff --git a/include/unk_020051F4.h b/include/unk_020051F4.h
new file mode 100644
index 00000000..05be8db7
--- /dev/null
+++ b/include/unk_020051F4.h
@@ -0,0 +1,45 @@
+#ifndef POKEDIAMOND_UNK_020051F4_H
+#define POKEDIAMOND_UNK_020051F4_H
+
+#include "global.h"
+
+
+u32 FUN_020051F4(u16 param0);
+u32 FUN_0200521C(u16 param0);
+void FUN_0200526C(u16 param0, int playerNo);
+u32 FUN_02005288(u16 param0, u32 param1, int playerNo);
+u32 FUN_020052B8(u16 param0, u32 param1, int playerNo);
+u32 FUN_02005308(u32 param0, u16 param1);
+void FUN_02005350(u16 param0, u32 param1);
+void FUN_02005374();
+void FUN_0200538C(s32 param0, u16 param1, u32 param2);
+void FUN_020053CC(s32 param0, s32 param1);
+u16 FUN_02005404();
+u16 FUN_02005410(u16 param0);
+void FUN_0200541C();
+void FUN_02005454();
+u32 FUN_020054A8(u16 param0, u32 param1);
+u32 PlaySE(u16 param0);
+void FUN_020054F0(u32 param0, u32 param1);
+void FUN_020054F8(s32 param0, u32 param1);
+u16 FUN_02005508(u16 param0);
+BOOL FUN_02005514();
+void FUN_02005530(u16 param0, u32 param1, u32 param2);
+void FUN_0200554C(u32 param0);
+u32 FUN_02005578(u16 species);
+void FUN_02005614(u32 param0);
+BOOL FUN_02005670();
+u32 FUN_020056AC(u32 param0, u16 param1, s32 param2, s32 param3, u32 param4);
+void FUN_02005AC8(u32 param0, int playerNo, s32 param2);
+void FUN_02005AE0(u32 param0, u32 param1);
+void FUN_02005B2C(u32 param0, s32 *param1);
+void FUN_02005BA0();
+u32 FUN_02005BC8(u16 param0, s32 param1);
+void FUN_02005BF8(u32 param0, s32 param1, s32 param2, s32 param3, u32 param4);
+u32 PlaySound(u16 param0);
+BOOL FUN_02005C74();
+void FUN_02005CA0(u32 param0);
+BOOL FUN_02005CBC();
+void FUN_02005CEC(u16 param0);
+
+#endif //POKEDIAMOND_UNK_020051F4_H