post-update cleanup: step 4 (builds properly)

include/Item/ItemManager.hpp

@@ -15,6 +15,7 @@ extern "C" {
 #include "Save/SaveItemManager.hpp"
 #include "Sound/Sfx.hpp"
 #include "System/SysNew.hpp"
+#include "DTCM/UnkStruct_027e0d38.hpp"
 
 #define MAX_HOURGLASS_SECONDS 1500 // 25 minutes
 #define MAX_AMMO_UPGRADE 2

include/Message/MessageManager.hpp

@@ -7,6 +7,13 @@
 #include "Message/BMG.hpp"
 #include "Message/MsgProc.hpp"
 #include "nds/math.h"
+
+#include "Unknown/UnkStruct_0202e1a0.hpp"
+#include "Unknown/UnkStruct_0203dae0.hpp"
+#include "Unknown/UnkStruct_02032f0c.hpp"
+#include "Unknown/UnkStruct_02038aa0.hpp"
+#include "Unknown/UnkStruct_020397f8.hpp"
+#include "Unknown/UnkStruct_02035064.hpp"
 #include "Unknown/UnkStruct_02037750.hpp"
 
 class UnkStruct_027E0C68 : public SysObject {

include/Message/MsgProc.hpp

@@ -3,13 +3,6 @@
 #include "System/SysNew.hpp"
 #include "Message/BMG.hpp"
 #include "Unknown/func_ov000_020d0644.hpp"
-#include "Unknown/UnkStruct_0202e1a0.hpp"
-#include "Unknown/UnkStruct_0203dae0.hpp"
-#include "Unknown/UnkStruct_02032f0c.hpp"
-#include "Unknown/UnkStruct_02038aa0.hpp"
-#include "Unknown/UnkStruct_020397f8.hpp"
-#include "Unknown/UnkStruct_02035064.hpp"
-#include "Unknown/UnkStruct_02037750.hpp"
 #include "nds/math.h"
 
 // temp

include/Unknown/UnkStruct_02038aa0.hpp

@@ -5,6 +5,8 @@
 
 #include "Unknown/UnkStruct_0203dae0.hpp"
 #include "System/SysNew.hpp"
+#include "nds/math.h"
+#include "Message/MsgProc.hpp"
 
 class UnkStruct_02038aa0;
 typedef bool (*UnknownCallback)(class UnkStruct_020397f8*);
@@ -50,6 +52,9 @@ public:
     void func_0203f020(s16*, unk32);
 };
 
+struct UnkStruct_0203b264;
+struct func_02038f44_param4;
+
 // astruct_6, MsgProc_Main
 class UnkStruct_02038aa0 : public UnkStruct_0203dae0 {
 public:
@@ -84,7 +89,7 @@ public:
     /* 50 */ virtual void vfunc_50(EntryINF1* param1, u32 param2, s16* param3, UnkSubClass1_02256FF8* param4);
     /* 54 */ virtual void vfunc_54();
     /* 58 */ virtual void vfunc_58();
-    /* 5c */ virtual void vfunc_5c(u16* param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5);
+    /* 5c */ virtual void vfunc_5c(u16* param_2, struct UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5);
     /* 60 */ virtual void vfunc_60();
     /* 64 */ virtual void vfunc_64();
     /* 68 */ virtual s32 vfunc_68(unk32 param1);
@@ -126,7 +131,7 @@ public:
     void func_02038b28(void);
     void func_02038b74(void); // is this a dtor?
     void func_02038f40(void);
-    void func_02038f44(EntryINF1* param_2, u32 param_3, func_02038f44_param4* param_4, UnkSubClass1_02256FF8* param_5, unk32 param_6);
+    void func_02038f44(EntryINF1* param_2, u32 param_3, struct func_02038f44_param4* param_4, UnkSubClass1_02256FF8* param_5, unk32 param_6);
     void func_02039058(void);
     unk32 func_0203905c(u16* param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5);
     void func_02038d20(void);

include/Unknown/UnkStruct_020397f8.hpp

@@ -6,6 +6,7 @@
 #include "Unknown/UnkStruct_02035064.hpp"
 #include "Unknown/UnkStruct_02038aa0.hpp"
 #include "System/SysNew.hpp"
+#include "Message/MsgProc.hpp"
 
 // does it host both choices?
 struct UnknownMsgChoiceStruct {
@@ -91,7 +92,7 @@ public:
     void func_02039ca8();
     /* 3c */ virtual void vfunc_3c(unk32 param1);
     /* 40 */ virtual void vfunc_40(s32 param1, s32 param2);
-    void func_0203a188(s32 param1, s32 param2);
+    void func_0203a188(s32 param1, s32 param2); // void func_0203a188(unk32 param_2, unk32 param_3, unk32 param_4);
     bool func_0203a2c0();
     unk32 func_0203a30c();
     /* 48 */ virtual void vfunc_48();
@@ -111,7 +112,7 @@ public:
     /* 64 */ virtual void vfunc_64(s16* param1);
     void func_0203b764();
     /* 20 */ virtual unk32 vfunc_20(s32 param1, s32 *param2);
-    void func_0203bd8c(s32 param1);
+    void func_0203bd8c(s32 param1); // void func_0203bd8c(u16 param_2);
     /* 6c */ virtual void vfunc_6c(s32 *param1, s32 *param2);
     void func_0203be08();
     void func_0203be64();
@@ -127,20 +128,6 @@ public:
     static void func_0203e060(UnkStruct_02038aa0* param_1, u8 param_2, u8 param_3);
     void func_02039a3c(void);
     unk32 func_02039250(void);
-    void func_02039ca8(void);
-    void func_0203a188(unk32 param_2, unk32 param_3, unk32 param_4);
-    bool func_0203a2c0(void);
-    unk32 func_0203a30c(void);
-    void func_0203a35c(void);
-    bool func_0203a3e0(void);
-    bool func_0203a6d0(unk32 param_2, unk32 param_3);
-    bool func_0203b0bc(void);
-    unk32 func_0203b0ec(unk32 param_2);
-    void func_0203b764(void);
-    void func_0203bd8c(u16 param_2);
-    void func_0203be08(void);
-    void func_0203be64(void);
-    bool func_0203c13c(void);
 };
 
 class MsgProc_Type3 : public UnkStruct_02038aa0 {

include/Unknown/UnkStruct_0203dae0.hpp

@@ -6,6 +6,8 @@
 #include "Unknown/UnkStruct_02032f0c.hpp"
 #include "Message/MsgProc.hpp"
 
+class UnkStruct_0203dae0_114;
+
 // astruct_7, MsgProc_Base2
 class UnkStruct_0203dae0 : public UnkStruct_02032f0c {
 public:

include/Unknown/UnkStruct_ov000_020e2f04.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <nds/math.H>
+#include <nds/math.h>
 
 #include "Physics/AABB.hpp"
 #include "global.h"