post-update cleanup: step 1

1 files changed, 12 insertions, 82 deletions

diff --git a/include/Message/MessageManager.hpp b/include/Message/MessageManager.hpp
index f8098ca0..c5739430 100644
--- a/include/Message/MessageManager.hpp
+++ b/include/Message/MessageManager.hpp
@@ -6,78 +6,8 @@
 #include "System/SysNew.hpp"
 #include "Message/BMG.hpp"
 #include "Message/MsgProc.hpp"
-#include "lib/math.h"
-
-// astruct_14, UnkStruct_02037750
-class UnkStruct_027E0C68_UnkSubClass2_Base1 : public SysObject {
-public:
-    /* 0x00 (vtable) */
-    /* 0x04 */ unk32 unk_04[4];
-    /* 0x14 */ unk32 unk_14;
-    /* 0x18 */ u32 unk_18;
-    /* 0x1C */ unk8 unk_1C;
-    /* 0x1D */ u8 unk_1D;
-    /* 0x1E */ unk16 unk_1E;
-    /* 0x20 */
-
-    UnkStruct_027E0C68_UnkSubClass2_Base1(unk32 param_2, unk32 param_3);
-
-    /* 0x00 */ virtual ~UnkStruct_027E0C68_UnkSubClass2_Base1();
-    /* 0x08 */ virtual void vfunc_08(u32 param_1);
-    /* 0x0C */ virtual void vfunc_0C(MsgProc_Type1* param_2);
-    /* 0x10 */ virtual void vfunc_10(void);
-    /* 0x14 */ virtual UNK_TYPE vfunc_14(void);
-    /* 0x18 */ virtual UNK_TYPE vfunc_18(void);
-    /* 0x1C */ virtual UNK_TYPE vfunc_1C(void);
-    /* 0x20 */ virtual UNK_TYPE vfunc_20(void);
-    /* 0x24 */ virtual UNK_TYPE vfunc_24(void);
-    /* 0x28 */ virtual UNK_TYPE vfunc_28(void);
-    /* 0x2C */ virtual UNK_TYPE vfunc_2C(void);
-    /* 0x30 */ virtual UNK_TYPE vfunc_30(void);
-    /* 0x34 */
-};
-
-class UnkStruct_027E0C68_UnkSubClass2_unk_24 {
-public:
-    /* 0x00 */ unk32 unk_00;
-    /* 0x04 */
-
-    void func_020376c0(Vec3p param_2);
-};
-
-// astruct_15, UnkStruct_020386d88
-class UnkStruct_027E0C68_UnkSubClass2 : public UnkStruct_027E0C68_UnkSubClass2_Base1 {
-public:
-    /* 0x20 */ unk8 unk_20;
-    /* 0x21 */ unk8 unk_21;
-    /* 0x22 */ unk8 unk_22;
-    /* 0x23 */ unk8 unk_23;
-    /* 0x24 */ UnkStruct_027E0C68_UnkSubClass2_unk_24 unk_24;
-    /* 0x28 */ unk32 unk_28;
-    /* 0x2C */ unk32 unk_2C;
-    /* 0x30 */ unk32 unk_30;
-    /* 0x34 */ unk16 unk_34;
-    /* 0x36 */ unk16 unk_36;
-    /* 0x38 */ u8 unk_38;
-    /* 0x39 */ u8 unk_39;
-    /* 0x3A */ unk16 unk_3A;
-    /* 0x3C */
-
-    UnkStruct_027E0C68_UnkSubClass2();
-    /* 0x00 */ virtual ~UnkStruct_027E0C68_UnkSubClass2() override;
-    /* 0x08 */ virtual void vfunc_08(u32 param_1) override;
-    /* 0x0C */ virtual void vfunc_0C(MsgProc_Type1* param_2) override;
-    /* 0x10 */ virtual void vfunc_10(void) override;
-    /* 0x14 */ virtual UNK_TYPE vfunc_14(void) override;
-    /* 0x18 */ virtual UNK_TYPE vfunc_18(void) override;
-    /* 0x1C */ virtual UNK_TYPE vfunc_1C(void) override;
-    /* 0x20 */ virtual UNK_TYPE vfunc_20(void) override;
-    /* 0x24 */ virtual UNK_TYPE vfunc_24(void) override;
-    /* 0x28 */ virtual UNK_TYPE vfunc_28(void) override;
-    /* 0x2C */ virtual UNK_TYPE vfunc_2C(void) override;
-    /* 0x30 */ virtual UNK_TYPE vfunc_30(void) override;
-    /* 0x34 */
-};
+#include "libs/nds/include/nds/math.h"
+#include "Unknown/UnkStruct_02037750.hpp"
 
 class UnkStruct_027E0C68 : public SysObject {
 public:
@@ -94,8 +24,8 @@ public:
     /* 0x10 */ unk16 unk_10;
     /* 0x10 */ unk16 unk_12;
     /* 0x14 */ BMGGroups* pGroups;
-    /* 0x18 */ UnkStruct_027E0C68_UnkSubClass2* unk_18[2];
-    /* 0x20 */ UnkStruct_027E0C68_UnkSubClass2_Base1* unk_20[2];
+    /* 0x18 */ UnkStruct_020386d8* unk_18[2];
+    /* 0x20 */ UnkStruct_02037750* unk_20[2];
     /* 0x28 */ MsgProc_Main* unk_28[6];
     /* 0x40 */ MsgProc_Type1* unk_40[2]; // is array size 6?
     /* 0x48 */
@@ -107,7 +37,7 @@ public:
     ~UnkStruct_027E0C68();
     MsgProc_Type1* func_020366c4(void);
     MsgProc_Type1* func_02036700(void);
-    UnkStruct_027E0C68_UnkSubClass2* func_0203673c(void);
+    UnkStruct_020386d8* func_0203673c(void);
     bool func_02036770(u32 param_2);
     unk32 func_02036798(void);
     bool func_020367dc(int param_2);
@@ -115,21 +45,21 @@ public:
     bool func_02036808(void);
     bool func_02036824(void);
     bool func_02036850(void);
-    void func_02036888(UnkStruct_027E0C68_UnkSubClass2* param_2);
-    bool func_020368f4(UnkStruct_027E0C68_UnkSubClass2_Base1* param_2);
+    void func_02036888(UnkStruct_020386d8* param_2);
+    bool func_020368f4(UnkStruct_02037750* param_2);
     void func_0203690c(unk32 param_2, unk32 param_3, unk32 param_4);
     void func_02036bbc(void);
     void func_02036c50(unk32 param_2);
     void func_02036ca4(unk32 param_2);
-    bool func_02036ce4(UnkStruct_027E0C68_UnkSubClass2* param_2, unk32 param_3);
-    bool func_02036d30(UnkStruct_027E0C68_UnkSubClass2_Base1* param_2);
-    bool func_02036d4c(UnkStruct_027E0C68_UnkSubClass2_Base1* param_2);
+    bool func_02036ce4(UnkStruct_020386d8* param_2, unk32 param_3);
+    bool func_02036d30(UnkStruct_02037750* param_2);
+    bool func_02036d4c(UnkStruct_02037750* param_2);
     void func_02036d6c(void);
     MsgProc_Main* func_02036da8(u32 param_2, s16* param_3);
     void func_02036edc(u32 param_2, u8 param_3);
     MsgProc_Type1* func_02036f68(u32 param_2, u8* param_3);
-    UnkStruct_027E0C68_UnkSubClass2* func_020370d0(unk32 param_2, unk32 param_3);
-    UnkStruct_027E0C68_UnkSubClass2* func_020370e8(unk32 param_2, unk16 param_3, unk16 param_4, unk32 param_5);
+    UnkStruct_020386d8* func_020370d0(unk32 param_2, unk32 param_3);
+    UnkStruct_020386d8* func_020370e8(unk32 param_2, unk16 param_3, unk16 param_4, unk32 param_5);
     void func_02037158(UnkSubClass1_02256FF8* param_2);
     MsgProc_Main* func_02037178(UnkSubClass1_02256FF8* param_2);
 };