cleanup

2 files changed, 27 insertions, 34 deletions

diff --git a/arm9/src/unk_020040F4.c b/arm9/src/unk_020040F4.c
index 57e36fea..d8624329 100644
--- a/arm9/src/unk_020040F4.c
+++ b/arm9/src/unk_020040F4.c
@@ -77,7 +77,6 @@ THUMB_FUNC void FUN_02004110(u16 param0)
 
 THUMB_FUNC u16 FUN_02004124()
 {
-    #pragma unused(param0)
     u16 *ptr = FUN_02003D38(9);
 
     return *ptr;
@@ -314,7 +313,7 @@ THUMB_FUNC void FUN_020044A8(s32 param0)
 
 THUMB_FUNC void FUN_020044D4(int param0, u32 param1)
 {
-    #pragma unused(param1)
+#pragma unused(param1)
 
     u8 *ptr = FUN_02003D38(11);
 
@@ -355,7 +354,7 @@ THUMB_FUNC void FUN_020044D4(int param0, u32 param1)
 
 THUMB_FUNC void FUN_02004568(int seqNo, u16 param1)
 {
-    #pragma unused(param1)
+#pragma unused(param1)
 
     u16 *ptr = FUN_02003D38(31);
 
@@ -409,7 +408,7 @@ THUMB_FUNC void FUN_020045C4(int param0, u32 param1)
 
 THUMB_FUNC void FUN_02004648(int param0, u32 param1)
 {
-    #pragma unused(param1)
+#pragma unused(param1)
     FUN_02003D38(23);
     FUN_020051AC();
 
@@ -422,7 +421,7 @@ THUMB_FUNC void FUN_02004648(int param0, u32 param1)
 
 THUMB_FUNC void FUN_02004680(int param0, u32 param1)
 {
-    #pragma unused(param1)
+#pragma unused(param1)
     FUN_02003D38(23);
     FUN_0200541C();
     FUN_02004810();
@@ -432,7 +431,7 @@ THUMB_FUNC void FUN_02004680(int param0, u32 param1)
 
 THUMB_FUNC void FUN_020046A0(int param0, u32 param1)
 {
-    #pragma unused(param1)
+#pragma unused(param1)
     FUN_02003D38(23);
     FUN_0200541C();
     FUN_020044A8(6);
@@ -442,7 +441,7 @@ THUMB_FUNC void FUN_020046A0(int param0, u32 param1)
 
 THUMB_FUNC void FUN_020046C4(int param0, u32 param1)
 {
-    #pragma unused(param1)
+#pragma unused(param1)
     FUN_02003D38(23);
     FUN_0200541C();
     FUN_020044A8(7);
@@ -459,7 +458,7 @@ THUMB_FUNC void FUN_020046E8(s32 param0)
 
 THUMB_FUNC void FUN_02004704(s32 param0, int param1, u32 param2)
 {
-    #pragma unused(param2)
+#pragma unused(param2)
     FUN_02003D38(23);
     FUN_0200541C();
     FUN_020044A8(param0);
@@ -659,7 +658,7 @@ THUMB_FUNC u32 FUN_02004914(u32 param0)
 
 THUMB_FUNC u32 FUN_0200491C(u32 param0)
 {
-    #pragma unused(param0)
+#pragma unused(param0)
     GetSoundDataPointer();
     return MIC_StopAutoSampling();
 }
@@ -770,7 +769,7 @@ THUMB_FUNC void FUN_02004A04(u32 param0)
     }
 }
 
-THUMB_FUNC u32 FUN_02004A6C(struct UnkStruct1 *param0, u32 param1)
+THUMB_FUNC u32 FUN_02004A6C(struct UnkStruct_020040F4_1 *param0, u32 param1)
 {
     u32 res = NNS_SndWaveOutStart(*(u32 *)param0->unk00,
         param0->unk04,
@@ -826,8 +825,6 @@ 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)
 {
     GetSoundDataPointer();
@@ -871,7 +868,7 @@ THUMB_FUNC u32 FUN_02004B30(u32 param0, s32 param1, u32 param2, u32 param3, u32
 
     void *res = FUN_02004930(param3);
 
-    struct UnkStruct1 st8;
+    struct UnkStruct_020040F4_1 st8;
     st8.unk04 = 0;
     st8.unk00 = res;
     st8.unk08 = *r4;
@@ -1052,8 +1049,8 @@ THUMB_FUNC u32 FUN_02004E08(
 
 THUMB_FUNC void FUN_02004E44(u32 param0, u16 param1, u32 param2, u32 param3, u8 param4, u32 param5)
 {
-    #pragma unused(param0)
-    #pragma unused(param5)
+#pragma unused(param0)
+#pragma unused(param5)
     u32 *ptr = FUN_02003D38(2);
 
     FUN_020053CC(0, param2);
@@ -1129,9 +1126,9 @@ THUMB_FUNC u32 FUN_02004ED0(s32 param0)
     return *ptr;
 }
 
-THUMB_FUNC u32 FUN_02004F28(u32 param0, struct UnkStruct2 *param1, s32 param2)
+THUMB_FUNC u32 FUN_02004F28(u32 param0, struct UnkStruct_020040F4_2 *param1, s32 param2)
 {
-    #pragma unused(param0)
+#pragma unused(param0)
     u32 r4 = FUN_02004F64(1);
     u32 r5 = param1->unk08;
 
@@ -1164,11 +1161,8 @@ THUMB_FUNC u32 FUN_02004F64(int param0)
     return NNS_SndPlayerGetTick(FUN_02003FF4(param0));
 }
 
-
-
-
-
-THUMB_FUNC void FUN_02004F70(struct UnkStruct2 *param0, u8 *param1, int param2, s32 param3)
+THUMB_FUNC void FUN_02004F70(
+    struct UnkStruct_020040F4_2 *param0, u8 *param1, int param2, s32 param3)
 {
     int r0;
     s32 r1;
diff --git a/include/unk_020040F4.h b/include/unk_020040F4.h
index 9bcc5cc4..4169aca5 100644
--- a/include/unk_020040F4.h
+++ b/include/unk_020040F4.h
@@ -1,12 +1,12 @@
 #include "global.h"
 
-
 struct WaveArcInfo
 {
     u32 unk00 : 24;
 };
 
-struct UnkStruct1 {
+struct UnkStruct_020040F4_1
+{
     void *unk00;
     u32 unk04;
     void *unk08;
@@ -19,15 +19,14 @@ struct UnkStruct1 {
     u32 unk24;
 };
 
-
-struct UnkStruct2 {
-     u32 unk00;
-     u32 unk04;
-     u32 unk08;
-     u8 unk0c[9];
+struct UnkStruct_020040F4_2
+{
+    u32 unk00;
+    u32 unk04;
+    u32 unk08;
+    u8 unk0c[9];
 };
 
-
 void FUN_020040F4(u8 param0);
 u8 FUN_02004104();
 void FUN_02004110(u16 param0);
@@ -69,7 +68,7 @@ u32 FUN_02004928(u32 param0, u32 param1, u32 param2, u32 param3);
 void *FUN_02004930(u32 param0);
 u32 FUN_02004984(u32 param0);
 void FUN_02004A04(u32 param0);
-u32 FUN_02004A6C(struct UnkStruct1 *param0, u32 param1);
+u32 FUN_02004A6C(struct UnkStruct_020040F4_1 *param0, u32 param1);
 void FUN_02004AAC(u32 param0);
 void FUN_02004ABC(u32 param0);
 void FUN_02004ACC(u32 param0, u32 param1);
@@ -102,9 +101,9 @@ u32 FUN_02004E80(u32 param0);
 u32 FUN_02004E8C(u32 *param0);
 u32 FUN_02004E98(s32 param0);
 u32 FUN_02004ED0(s32 param0);
-u32 FUN_02004F28(u32 param0, struct UnkStruct2 *param1, s32 param2);
+u32 FUN_02004F28(u32 param0, struct UnkStruct_020040F4_2 *param1, s32 param2);
 u32 FUN_02004F64(int param0);
-void FUN_02004F70(struct UnkStruct2 *param0, u8 *param1, int param2, s32 param3);
+void FUN_02004F70(struct UnkStruct_020040F4_2 *param0, u8 *param1, int param2, s32 param3);
 void FUN_02005068(s16 *param0, s16 *param1, u32 param2, u32 param3, void *param4);
 void FUN_02005160(u32 param0);
 void FUN_0200516C(u32 param0);