Move struct and function definitions to header files

10 files changed, 98 insertions, 94 deletions

diff --git a/.vscode/settings.json b/.vscode/settings.json
deleted file mode 100644
index 39c2b1c7..00000000
--- a/.vscode/settings.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "files.associations": {
-        "ratio": "c",
-        "array": "c",
-        "*.tcc": "c",
-        "bitset": "c",
-        "string": "c",
-        "vector": "c",
-        "string_view": "c",
-        "functional": "c",
-        "iomanip": "c",
-        "istream": "c",
-        "limits": "c",
-        "ostream": "c",
-        "sstream": "c",
-        "streambuf": "c",
-        "regex": "c"
-    }
-}
\ No newline at end of file
diff --git a/arm9/src/unk_0201CBEC.c b/arm9/src/unk_0201CBEC.c
index 0e75c3ff..7ec46f83 100644
--- a/arm9/src/unk_0201CBEC.c
+++ b/arm9/src/unk_0201CBEC.c
@@ -1,7 +1,6 @@
 #include "global.h"
 #include "fx.h"
-
-int FUN_0201CBEC(int a0, int a1, int a2, int a3);
+#include "unk_0201CBEC.h"
 
 THUMB_FUNC int FUN_0201CBEC(int a0, int a1, int a2, int a3) {
 
@@ -9,4 +8,4 @@ THUMB_FUNC int FUN_0201CBEC(int a0, int a1, int a2, int a3) {
     int r2 = a1 - a3;
 
     return FX_Sqrt((r0 * r0 + r2 * r2) << 0xc) >> 0xc;
-}
\ No newline at end of file
+}
diff --git a/arm9/src/unk_0202A8F4.c b/arm9/src/unk_0202A8F4.c
index 66a0244b..48931dab 100644
--- a/arm9/src/unk_0202A8F4.c
+++ b/arm9/src/unk_0202A8F4.c
@@ -1,27 +1,6 @@
 #include "global.h"
 #include "save_block_2.h"
-
-struct Unk0202A8F4
-{
-    u8 u_0;
-    u8 u_1;
-    u8 u_2;
-    u8 u_3;
-    u8 u_4;
-    u8 u_5;
-    u8 u_6;
-    u8 u_7;
-    u8 u_8;
-    u8 u_9;
-    u8 u_A;
-    u8 u_B;
-    u8 u_C;
-    u8 u_D;
-};
-
-u32 FUN_0202A8F4();
-void FUN_0202A8F8(struct Unk0202A8F4 *unk);
-void *FUN_0202A918(void *arg0);
+#include "unk_0202A8F4.h"
 
 THUMB_FUNC u32 FUN_0202A8F4()
 {
@@ -46,7 +25,7 @@ THUMB_FUNC void FUN_0202A8F8(struct Unk0202A8F4 *unk)
     unk->u_D = 0;    
 }
 
-THUMB_FUNC void *FUN_0202A918(void *arg0)
+THUMB_FUNC void *FUN_0202A918(struct SaveBlock2* sav2)
 {
-    return SavArray_get(arg0, 24);
+    return SavArray_get(sav2, 24);
 }
diff --git a/arm9/src/unk_0202ABBC.c b/arm9/src/unk_0202ABBC.c
index 2a15b9fd..7bc9d3fc 100644
--- a/arm9/src/unk_0202ABBC.c
+++ b/arm9/src/unk_0202ABBC.c
@@ -1,41 +1,31 @@
 #include "global.h"
 #include "save_block_2.h"
 #include "MI_memory.h"
+#include "unk_0202ABBC.h"
 
-void *FUN_0202ABBC(struct SaveBlock2* sav);
-u32 FUN_0202ABC8();
-void FUN_0202ABCC(void *destp);
-u16 FUN_0202ABDC(void *unkSavStruct);
-void FUN_0202ABE4(void *unkSavStruct, u16 data);
-void FUN_0202ABEC(void *srcp, void *destp);
-void FUN_0202ABF8(void *destp, void *srcp);
-u32 FUN_0202AC08(void *unkStruct);
-void FUN_0202AC10(void *unkStruct, u32 data);
-u16 FUN_0202AC18(void *unkStruct);
-
-THUMB_FUNC void *FUN_0202ABBC(struct SaveBlock2* sav)
+THUMB_FUNC void *FUN_0202ABBC(struct SaveBlock2* sav2)
 {
-    return SavArray_get(sav, 26);
+    return SavArray_get(sav2, 26);
 }
 
 THUMB_FUNC u32 FUN_0202ABC8()
 {
-    return 0xf4; // 244
+    return sizeof(struct Unk0202ABBC); // 0xF4
 }
 
-THUMB_FUNC void FUN_0202ABCC(void *destp)
+THUMB_FUNC void FUN_0202ABCC(struct Unk0202ABBC* unk)
 {
-    MIi_CpuClearFast(0, destp, 0xf4);
+    MIi_CpuClearFast(0, unk, 0xf4);
 }
 
-THUMB_FUNC u16 FUN_0202ABDC(void *unkSavStruct)
+THUMB_FUNC u16 FUN_0202ABDC(struct Unk0202ABBC* unk)
 {
-    return *(u16 *)(unkSavStruct + 0xec);
+    return unk->unk_EC;
 }
 
-THUMB_FUNC void FUN_0202ABE4(void *unkSavStruct, u16 data)
+THUMB_FUNC void FUN_0202ABE4(struct Unk0202ABBC* unk, u16 data)
 {
-    *(u16 *)(unkSavStruct + 0xec) = data;
+    unk->unk_EC = data;
 }
 
 THUMB_FUNC void FUN_0202ABEC(void *srcp, void *destp)
@@ -48,17 +38,17 @@ THUMB_FUNC void FUN_0202ABF8(void *destp, void *srcp)
     MIi_CpuCopyFast(srcp, destp, 0xec);
 }
 
-THUMB_FUNC u32 FUN_0202AC08(void *unkStruct)
+THUMB_FUNC u32 FUN_0202AC08(struct Unk0202ABBC* unk)
 {
-    return *(u32 *)(unkStruct + 0xf0);
+    return unk->unk_F0;
 }
 
-THUMB_FUNC void FUN_0202AC10(void *unkStruct, u32 data)
+THUMB_FUNC void FUN_0202AC10(struct Unk0202ABBC* unk, u32 data)
 {
-    *(u32 *)(unkStruct + 0xf0) = data;
+    unk->unk_F0 = data;
 }
 
-THUMB_FUNC u16 FUN_0202AC18(void *unkStruct)
+THUMB_FUNC u16 FUN_0202AC18(struct Unk0202ABBC* unk)
 {
-    return *(u16 *)(unkStruct + 0xee);
-}
\ No newline at end of file
+    return unk->unk_EE;
+}
diff --git a/arm9/src/unk_0202C0E0.c b/arm9/src/unk_0202C0E0.c
index b39570fe..bf24908a 100644
--- a/arm9/src/unk_0202C0E0.c
+++ b/arm9/src/unk_0202C0E0.c
@@ -1,24 +1,12 @@
 #include "global.h"
 #include "save_block_2.h"
-
-
-struct UnkSaveStruct0202C0E4
-{
-    u16 data[5][4];
-};
-
-u32 FUN_0202C0E0();
-void FUN_0202C0E4(struct UnkSaveStruct0202C0E4 *unkStruct);
-void FUN_0202C108(struct SaveBlock2 *save, u32 a1, u32 a2);
-u16 FUN_0202C12C(struct SaveBlock2 *save, u32 a1, u32 a2);
-
+#include "unk_0202C0E0.h"
 
 THUMB_FUNC u32 FUN_0202C0E0()
 {
-    return sizeof(struct UnkSaveStruct0202C0E4); // 40
+    return sizeof(struct UnkSaveStruct0202C0E4); // 0x28
 }
 
-
 THUMB_FUNC void FUN_0202C0E4(struct UnkSaveStruct0202C0E4 *unkStruct)
 {
 
@@ -34,17 +22,17 @@ THUMB_FUNC void FUN_0202C0E4(struct UnkSaveStruct0202C0E4 *unkStruct)
     } while (i < 5);
 }
 
-THUMB_FUNC void FUN_0202C108(struct SaveBlock2 *save, u32 a1, u32 a2)
+THUMB_FUNC void FUN_0202C108(struct SaveBlock2 *sav2, u32 a1, u32 a2)
 {
-    struct UnkSaveStruct0202C0E4 *unkSavStruct = SavArray_get(save, 0x21);
+    struct UnkSaveStruct0202C0E4 *unkSavStruct = SavArray_get(sav2, 33);
     if (unkSavStruct->data[a1][a2] < 9999)
     {
         unkSavStruct->data[a1][a2]++;
     }
 }
 
-THUMB_FUNC u16 FUN_0202C12C(struct SaveBlock2 *save, u32 a1, u32 a2)
+THUMB_FUNC u16 FUN_0202C12C(struct SaveBlock2 *sav2, u32 a1, u32 a2)
 {
-    struct UnkSaveStruct0202C0E4 *unkSavStruct = SavArray_get(save, 0x21);
+    struct UnkSaveStruct0202C0E4 *unkSavStruct = SavArray_get(sav2, 33);
     return unkSavStruct->data[a1][a2];
-}
\ No newline at end of file
+}
diff --git a/include/unk_0201CBEC.h b/include/unk_0201CBEC.h
new file mode 100644
index 00000000..a8c617d9
--- /dev/null
+++ b/include/unk_0201CBEC.h
@@ -0,0 +1,6 @@
+#ifndef POKEDIAMOND_UNK_0201CBEC_H
+#define POKEDIAMOND_UNK_0201CBEC_H
+
+int FUN_0201CBEC(int a0, int a1, int a2, int a3);
+
+#endif //POKEDIAMOND_UNK_0201CBEC_H
diff --git a/include/unk_02029FB0.h b/include/unk_02029FB0.h
index 1cea6b45..0185bff4 100644
--- a/include/unk_02029FB0.h
+++ b/include/unk_02029FB0.h
@@ -1,8 +1,6 @@
 #ifndef POKEDIAMOND_UNK_02029FB0_H
 #define POKEDIAMOND_UNK_02029FB0_H
 
-#include "save_block_2.h"
-#include "pokedex.h"
 struct UnkStruct_02029FB0
 {
     u8 unk[0x14C];
diff --git a/include/unk_0202A8F4.h b/include/unk_0202A8F4.h
new file mode 100644
index 00000000..aaca6e56
--- /dev/null
+++ b/include/unk_0202A8F4.h
@@ -0,0 +1,26 @@
+#ifndef POKEDIAMOND_UNK_0202A8F4_H
+#define POKEDIAMOND_UNK_0202A8F4_H
+
+struct Unk0202A8F4
+{
+    u8 u_0;
+    u8 u_1;
+    u8 u_2;
+    u8 u_3;
+    u8 u_4;
+    u8 u_5;
+    u8 u_6;
+    u8 u_7;
+    u8 u_8;
+    u8 u_9;
+    u8 u_A;
+    u8 u_B;
+    u8 u_C;
+    u8 u_D;
+};
+
+u32 FUN_0202A8F4();
+void FUN_0202A8F8(struct Unk0202A8F4 *unk);
+void *FUN_0202A918(struct SaveBlock2 *sav2);
+
+#endif //POKEDIAMOND_UNK_0202A8F4_H
diff --git a/include/unk_0202ABBC.h b/include/unk_0202ABBC.h
new file mode 100644
index 00000000..bf793fbb
--- /dev/null
+++ b/include/unk_0202ABBC.h
@@ -0,0 +1,23 @@
+#ifndef POKEDIAMOND_UNK_0202ABBC_H
+#define POKEDIAMOND_UNK_0202ABBC_H
+
+struct Unk0202ABBC
+{
+    /* 0x000 */ u32 filler[59]; 
+    /* 0x0ec */ u16 unk_EC;
+    /* 0x0ee */ u16 unk_EE;
+    /* 0x0f0 */ u32 unk_F0;
+}; // size: 0xF4
+
+void *FUN_0202ABBC(struct SaveBlock2* sav2);
+u32 FUN_0202ABC8();
+void FUN_0202ABCC(struct Unk0202ABBC* unk);
+u16 FUN_0202ABDC(struct Unk0202ABBC* unk);
+void FUN_0202ABE4(struct Unk0202ABBC* unk, u16 data);
+void FUN_0202ABEC(void *srcp, void *destp);
+void FUN_0202ABF8(void *destp, void *srcp);
+u32 FUN_0202AC08(struct Unk0202ABBC* unk);
+void FUN_0202AC10(struct Unk0202ABBC* unk, u32 data);
+u16 FUN_0202AC18(struct Unk0202ABBC* unk);
+
+#endif //POKEDIAMOND_UNK_0202ABBC_H
diff --git a/include/unk_0202C0E0.h b/include/unk_0202C0E0.h
new file mode 100644
index 00000000..eb972ed3
--- /dev/null
+++ b/include/unk_0202C0E0.h
@@ -0,0 +1,14 @@
+#ifndef POKEDIAMOND_UNK_0202C0E0_H
+#define POKEDIAMOND_UNK_0202C0E0_H
+
+struct UnkSaveStruct0202C0E4
+{
+    u16 data[5][4];
+};
+
+u32 FUN_0202C0E0();
+void FUN_0202C0E4(struct UnkSaveStruct0202C0E4 *unkStruct);
+void FUN_0202C108(struct SaveBlock2 *sav2, u32 a1, u32 a2);
+u16 FUN_0202C12C(struct SaveBlock2 *sav2, u32 a1, u32 a2);
+
+#endif //POKEDIAMOND_UNK_0202C0E0_H