more progress

4 files changed, 5 insertions, 32 deletions

diff --git a/include/Message/MessageManager.hpp b/include/Message/MessageManager.hpp
index ddb1df59..76a6bc87 100644
--- a/include/Message/MessageManager.hpp
+++ b/include/Message/MessageManager.hpp
@@ -33,11 +33,11 @@ public:
     /* 0x14 */ BMGGroups* pGroups;
     /* 0x18 */ UnkStruct_020386d8* mUnk_18[2];
     /* 0x20 */ UnkStruct_02037750* mUnk_20[2];
-    /* 0x28 */ UnkStruct_02038aa0* mUnk_28[6];
+    /* 0x28 */ UnkStruct_02038aa0* mUnk_28[6]; //! TODO: is it the right type?
     /* 0x40 */ UnkStruct_020397f8* mUnk_40[2]; // is array size 6?
     /* 0x48 */
 
-    static void func_0203643c(int *param_1, UnkStruct_027E0C68* param_2, u32 param_3);
+    static void func_0203643c(u32 *param_1, UnkStruct_027E0C68* param_2, u32 param_3);
     void func_02036490(unk32 param_2, unk32 param_3, unk32 param_4);
     void func_0203665c(void);
     UnkStruct_027E0C68();
diff --git a/include/Message/MsgProc.hpp b/include/Message/MsgProc.hpp
index fecdd18c..efe42b56 100644
--- a/include/Message/MsgProc.hpp
+++ b/include/Message/MsgProc.hpp
@@ -73,7 +73,6 @@ struct func_02038f44_param4 {
 
 extern "C" u32 func_01ff9b4c(unk32, unk32);
 extern "C" unk32 func_0203c084(void);
-extern "C" void func_ov018_02169634(UnkStruct_020397f8*);
 extern "C" unk32 func_ov000_02079e04(void);
 extern "C" unk32 func_02016fcc(unk32);
 extern "C" void func_02032304(unk32*, char*, unk32, unk32,  unk32);
@@ -100,7 +99,6 @@ struct UnkStruct2 {
 };
 extern UnkStruct2 data_027e077c;
 extern u8 data_02056be4[];
-extern u8 data_027e0618[];
 
 class UnkClass_027e0cbc {
 public:
@@ -117,7 +115,7 @@ extern "C" void func_020347b0(unk32, unk16, unk32*, unk32*, unk32, unk32);
 extern THUMB unk32 func_0202ab48(void);
 extern "C" void func_02034984(unk32, u8, unk32, unk32);
 extern "C" void func_02034698(unk32, unk32, unk32*, unk32*);
-extern struct TouchControl data_027e0d78;
+extern struct TouchControl gTouchControl;
 
 class UnkClass_027e0e28 {
 public:
diff --git a/include/Unknown/UnkStruct_02038aa0.hpp b/include/Unknown/UnkStruct_02038aa0.hpp
index f9904674..6b53dde3 100644
--- a/include/Unknown/UnkStruct_02038aa0.hpp
+++ b/include/Unknown/UnkStruct_02038aa0.hpp
@@ -74,11 +74,11 @@ public:
     /* 00 */ virtual ~UnkStruct_02038aa0();
     /* 08 */ virtual void vfunc_08(s32 param1, unk32* param2, s16 *param3, unk32 param4);
     /* 0c */ virtual void vfunc_0c(u8 param_2, u8 param_3, u8 param_4, unk32 param_5);
-    /* 10 */ virtual void vfunc_10(unk32 param1);
+    /* 10 */ virtual void vfunc_10();
     /* 1c */ virtual unk32 vfunc_1c(s32 param1, unk32 *param2, unk32 param3, unk32 param4);
     /* 20 */ virtual unk32 vfunc_20(s32 param1, s32 *param2);
     /* 2c */ virtual void vfunc_2c();
-    /* 30 */ virtual void vfunc_30();
+    /* 30 */ virtual void vfunc_30(unk32 param_2, unk32 param_3);
     /* 34 */ virtual unk32 vfunc_34(s32 param1);
     /* 38 */ virtual bool vfunc_38();
     /* 3c */ virtual void vfunc_3c();
diff --git a/include/Unknown/UnkStruct_020397f8.hpp b/include/Unknown/UnkStruct_020397f8.hpp
index ca626fec..ee969e08 100644
--- a/include/Unknown/UnkStruct_020397f8.hpp
+++ b/include/Unknown/UnkStruct_020397f8.hpp
@@ -199,36 +199,11 @@ public:
 
     MsgProc_Type2();
     MsgProc_Type2(unk32 param_2, unk16 param_3, unk32 param_4);
-    //! TODO: remove the function declarations that are not overridden
     /* 00 */ virtual ~MsgProc_Type2();
-    /* 08 */ /* func_02039228 */ virtual void vfunc_08(unk32* param_2, unk32* param_3) override;
-    /* 0c */ /* func_02039578 */ virtual void vfunc_0C(u8 param_2, u8 param_3, u8 param_4, unk32 param_5) override;
-    /* 10 */ /* func_0203e060 */ virtual void vfunc_10(u8 param_2, u8 param_3) override; // func_0203e060?
     /* 14 */ /* func_0203c5c4 */ virtual bool vfunc_14(unk32 param_2, unk32 param_3) override;
-    /* 18 */ /* func_0203e284 */ virtual unk32 vfunc_18(UnkStruct_0203b264* param_2, unk32 param_3, unk32 param_4) override;
-    /* 1c */ /* func_0203905c */ virtual unk32 vfunc_1C(u16* param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5) override;
-    /* 20 */ /* func_020390a4 */ virtual void vfunc_20(void) override;
-    /* 24 */ /* astruct_8::vfunc_24 */ virtual void vfunc_24(void) override;
-    /* 28 */ /* func_0203e0c8 */ virtual bool vfunc_28(void) override;
-    /* 2c */ /* func_02038d20 */ virtual void vfunc_2C(void) override;
-    /* 30 */ /* func_02038ed0 */ virtual void vfunc_30(void) override;
-    /* 34 */ /* func_02038c34 */ virtual unk32 vfunc_34(unk32 param_2) override;
-    /* 38 */ /* func_02039570 */ virtual bool vfunc_38(void) override;
     /* 3c */ /* func_0203c414 */ virtual void vfunc_3C(unk32 param_2) override;
     /* 40 */ /* func_0203c460 */ virtual void vfunc_40(unk32 param_2, unk32 param_3) override;
-    /* 44 */ /* func_02038f40 */ virtual void vfunc_44(s32 touchLastX, s32 touchLastY) override;
-    /* 48 */ /* func_02038b74 */ virtual void vfunc_48(void) override;
     /* 4c */ /* func_0203c39c */ virtual void vfunc_4C(void) override; // func_02039a3c?
-    /* 50 */ /* func_02038f44 */ virtual void vfunc_50(EntryINF1* param_2, u32 param_3, s16* param_4, UnkSubClass1_02256FF8* param_5) override;
-    /* 54 */ /* func_020392b4 */ virtual void vfunc_54(void) override;
-    /* 58 */ /* func_02039398 */ virtual void vfunc_58(void) override;
-    /* 5c */ /* func_02039058 */ virtual void vfunc_5C(void) override;
-    /* 60 */ /* func_020393a4 */ virtual void vfunc_60(func_0203b410_param1* param_2, unk32 param_3, unk32 param_4) override;
-    /* 64 */ /* func_020393a8 */ virtual void vfunc_64(s16* param_2) override;
-    /* 68 */ /* func_020393d0 */ virtual unk32 vfunc_68(unk32 param_2) override;
-    /* 6c */ /* func_0203947c */ virtual void vfunc_6C(unk32* param_2, unk32* param_3) override;
-    /* 70 */ /* func_020394d8 */ virtual void vfunc_70(unk32* param_2, unk32* param_3) override;
-    /* 74 */
 
     //! TODO: vfunc_4C?
     void func_0203c39c(unk32 param_2, unk32 param_3);