post-update cleanup: step 2

10 files changed, 330 insertions, 331 deletions

diff --git a/include/Message/BMG.hpp b/include/Message/BMG.hpp
index ca855f52..0b13b47f 100644
--- a/include/Message/BMG.hpp
+++ b/include/Message/BMG.hpp
@@ -80,10 +80,10 @@ typedef struct BMGHeader {
 
 typedef struct EntryINF1 {
     /* 0x00 */ u32 offset; // relative to the end of the DAT1 header
-    /* 0x04 */ u8 unk_04; // flags/attributes? (+0x04 to +0x06)
-    /* 0x05 */ u8 unk_05;
-    /* 0x06 */ u8 unk_06;
-    /* 0x07 */ u8 unk_07;
+    /* 0x04 */ u8 mUnk_04; // flags/attributes? (+0x04 to +0x06)
+    /* 0x05 */ u8 mUnk_05;
+    /* 0x06 */ u8 mUnk_06;
+    /* 0x07 */ u8 mUnk_07;
 } EntryINF1; // size = 0x8
 
 typedef struct SectionINF1 {
@@ -110,7 +110,7 @@ typedef struct InstrShowMsg {
 } InstrShowMsg; // size = 0x8
 
 typedef struct InstrBranch {
-    /* 0x01 */ u8 unk_01;
+    /* 0x01 */ u8 mUnk_01;
     /* 0x02 */ u16 funcIndex; // index of the query function to run
     /* 0x04 */ u16 funcArg; // the argument to use in the function
     /* 0x06 */ u16 flwEntry; // the index of the second section table to be used next in the conversation.
@@ -135,7 +135,7 @@ typedef struct SectionFLW1 {
     /* 0x00 */ SectionBase base;
     /* 0x04 */ u16 numInstructions;
     /* 0x08 */ u16 numLabels;
-    /* 0x0C */ u32 unk_0C; // always zero?
+    /* 0x0C */ u32 mUnk_0c; // always zero?
     /* 0x10 */ FLW1Instr* instructions;
     /* 0x14 */ s16* flwEntries;
     /* 0x18 */ s8* bmgFileIndices;
@@ -150,7 +150,7 @@ typedef struct SectionFLI1 {
     /* 0x00 */ SectionBase base;
     /* 0x04 */ u16 numEntries;
     /* 0x08 */ u16 entrySize;
-    /* 0x0C */ u32 unk_0C; // always zero?
+    /* 0x0C */ u32 mUnk_0c; // always zero?
     /* 0x10 */ EntryFLI1* entries;
 } SectionFLI1;
 
@@ -169,8 +169,8 @@ typedef struct BMGFileInfo {
     /* 0x08 */ SectionFLW1* pFLW1; // pointer to the message flow data (FLW -> flow)
     /* 0x0C */ SectionFLI1* pFLI1; // pointer to the message flow index table (FLI -> flow index table)
     /* 0x10 */ SectionDAT1* pDAT1; // pointer to the data (DAT -> data)
-    /* 0x14 */ BMGHeader* unk_14; // same as unk_00 (?)
-    /* 0x18 */ s16 unk_18; // stores `func_020372f0`->param_3 value (currently undetermined purpose)
+    /* 0x14 */ BMGHeader* mUnk_14; // same as unk_00 (?)
+    /* 0x18 */ s16 mUnk_18; // stores `func_020372f0`->param_3 value (currently undetermined purpose)
     /* 0x1A */ s16 groupId; // stores the group id
 } BMGFileInfo; // size = 0x1C
 
diff --git a/include/Message/MessageManager.hpp b/include/Message/MessageManager.hpp
index c5739430..c408caf7 100644
--- a/include/Message/MessageManager.hpp
+++ b/include/Message/MessageManager.hpp
@@ -6,27 +6,27 @@
 #include "System/SysNew.hpp"
 #include "Message/BMG.hpp"
 #include "Message/MsgProc.hpp"
-#include "libs/nds/include/nds/math.h"
+#include "nds/math.h"
 #include "Unknown/UnkStruct_02037750.hpp"
 
 class UnkStruct_027E0C68 : public SysObject {
 public:
     /* 0x00 */ u8 unk_00[2];
-    /* 0x02 */ u8 unk_02;
-    /* 0x03 */ u8 unk_03;
-    /* 0x04 */ u8 unk_04;
-    /* 0x05 */ u8 unk_05;
-    /* 0x06 */ unk16 unk_06;
-    /* 0x08 */ MsgProc_Type1* unk_08;
-    /* 0x0C */ u8 unk_0C;
-    /* 0x0C */ u8 unk_0D;
-    /* 0x0C */ unk16 unk_0E;
-    /* 0x10 */ unk16 unk_10;
-    /* 0x10 */ unk16 unk_12;
+    /* 0x02 */ u8 mUnk_02;
+    /* 0x03 */ u8 mUnk_03;
+    /* 0x04 */ u8 mUnk_04;
+    /* 0x05 */ u8 mUnk_05;
+    /* 0x06 */ unk16 mUnk_06;
+    /* 0x08 */ MsgProc_Type1* mUnk_08;
+    /* 0x0C */ u8 mUnk_0c;
+    /* 0x0C */ u8 mUnk_0d;
+    /* 0x0C */ unk16 mUnk_0e;
+    /* 0x10 */ unk16 mUnk_10;
+    /* 0x10 */ unk16 mUnk_12;
     /* 0x14 */ BMGGroups* pGroups;
     /* 0x18 */ UnkStruct_020386d8* unk_18[2];
     /* 0x20 */ UnkStruct_02037750* unk_20[2];
-    /* 0x28 */ MsgProc_Main* unk_28[6];
+    /* 0x28 */ UnkStruct_02038aa0* unk_28[6];
     /* 0x40 */ MsgProc_Type1* unk_40[2]; // is array size 6?
     /* 0x48 */
 
@@ -55,13 +55,13 @@ public:
     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);
+    UnkStruct_02038aa0* 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_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);
+    UnkStruct_02038aa0* func_02037178(UnkSubClass1_02256FF8* param_2);
 };
 
 extern UnkStruct_027E0C68 data_027e0c68;
diff --git a/include/Message/MsgProc.hpp b/include/Message/MsgProc.hpp
index 50dcbc60..204f26c0 100644
--- a/include/Message/MsgProc.hpp
+++ b/include/Message/MsgProc.hpp
@@ -10,7 +10,7 @@
 #include "Unknown/UnkStruct_020397f8.hpp"
 #include "Unknown/UnkStruct_02035064.hpp"
 #include "Unknown/UnkStruct_02037750.hpp"
-#include "libs/nds/include/nds/math.h"
+#include "nds/math.h"
 
 // temp
 #define UNK_TYPE void
@@ -26,7 +26,7 @@ typedef struct UnkStruct_0203b264 {
 
 class UnkSubClass1_unk_410 {
 public:
-    /* 0x00 */ struct MsgProc_Type1* unk_00;
+    /* 0x00 */ struct MsgProc_Type1* mUnk_00;
     /* 0x04 */
 
     void func_0203ec34(void);
@@ -38,7 +38,7 @@ public:
 // same as UnkSubClass1_unk_410?
 class UnkSubClass1_unk_424 {
 public:
-    /* 0x00 */ struct MsgProc_Type1* unk_00;
+    /* 0x00 */ struct MsgProc_Type1* mUnk_00;
     /* 0x04 */
 
     void func_0203ee80(unk32);
@@ -51,7 +51,7 @@ public:
 class MsgProc_Base2_unk_114 : public SysObject {
 public:
     /* 0x00 (vtable) */
-    /* 0x04 */ unk32* unk_04;
+    /* 0x04 */ unk32* mUnk_04;
     /* 0x08 */
 
     MsgProc_Base2_unk_114();
@@ -64,16 +64,16 @@ public:
 };
 
 struct func_02038f44_param4 {
-    u8 unk_00;
-    u8 unk_01;
-    u8 unk_02;
-    u8 unk_03;
-    unk32 unk_04;
-    unk32 unk_08;
-    unk32 unk_0C;
-    unk32 unk_10;
-    unk8 unk_14;
-    u8 unk_15;
+    u8 mUnk_00;
+    u8 mUnk_01;
+    u8 mUnk_02;
+    u8 mUnk_03;
+    unk32 mUnk_04;
+    unk32 mUnk_08;
+    unk32 mUnk_0c;
+    unk32 mUnk_10;
+    unk8 mUnk_14;
+    u8 mUnk_15;
 };
 
 // TEMPORARY
@@ -94,8 +94,8 @@ extern char* data_02057eec; // "Menu/UI_main/opening.bin"
 extern char* data_02057ed8; // "MSP:opening.nclr"
 
 struct Struct_027e0db0 {
-    /* 0x00 */ unk32 unk_00;
-    /* 0x04 */ unk32 unk_04;
+    /* 0x00 */ unk32 mUnk_00;
+    /* 0x04 */ unk32 mUnk_04;
 };
 extern Struct_027e0db0 data_027e0db0;
 
@@ -157,16 +157,16 @@ extern "C" void func_01ffbe34(UnkStruct_01ffbe34 *param1);
 
 struct UnkClass_027e1054_unk_00_unk00 {
     /* 0x00 */ u8 unk_00[0x95];
-    /* 0x95 */ u8 unk_95;
+    /* 0x95 */ u8 mUnk_95;
 };
 struct UnkClass_027e1054_unk_00 {
-    /* 0x00 */ unk32 unk_04;
-    /* 0x00 */ UnkClass_027e1054_unk_00_unk00* unk_00;
+    /* 0x00 */ unk32 mUnk_04;
+    /* 0x00 */ UnkClass_027e1054_unk_00_unk00* mUnk_00;
 };
 class UnkClass_027e1054 {
 public:
-    UnkClass_027e1054_unk_00* unk_00;
-    unk32 unk_04;
+    UnkClass_027e1054_unk_00* mUnk_00;
+    unk32 mUnk_04;
 
     void func_ov003_020f4874(void);
     void func_ov003_020f4760(u8, unk32);
@@ -182,7 +182,7 @@ extern UnkClass_ov000_020eec9c data_ov000_020eec9c;
 
 class UnkClass_ov000_027e0d04 {
 public:
-    /* 0x00 */ unk16 unk_00;
+    /* 0x00 */ unk16 mUnk_00;
 
     void func_0203fe60(unk32);
 };
diff --git a/include/Unknown/UnkStruct_02032f0c.hpp b/include/Unknown/UnkStruct_02032f0c.hpp
index 60e807ab..2868a897 100644
--- a/include/Unknown/UnkStruct_02032f0c.hpp
+++ b/include/Unknown/UnkStruct_02032f0c.hpp
@@ -23,51 +23,52 @@ public:
 
 class UnkSubClass1_02256FF8 {
 public:
-    /* 0x00 (vtable) */
-    /* 0x04 */ unk32 unk_04;
-    /* 0x08 */ unk32 unk_08;
-    /* 0x0C */ unk32 unk_0C;
-    /* 0x10 */ unk32 unk_10;
-    /* 0x14 */ unk32 unk_14;
-    /* 0x18 */ unk32 unk_18;
-    /* 0x1C */ u8 unk_1C;
-    /* 0x20 */
+    /* 00 (vtable) */
+    /* 04 */ unk32 mUnk_04;
+    /* 08 */ unk32 mUnk_08;
+    /* 0c */ unk32 mUnk_0c;
+    /* 10 */ unk32 mUnk_10;
+    /* 14 */ unk32 mUnk_14;
+    /* 18 */ unk32 mUnk_18;
+    /* 1c */ u8 mUnk_1c;
+    /* 20 */
 
     UnkSubClass1_02256FF8();
-    /* 0x00 */ virtual ~UnkSubClass1_02256FF8() override;
-    /* 0x08 */ virtual void vfunc_08(void) override;
-    /* 0x0C */ virtual void vfunc_0c(void) override;
-    /* 0x10 */ virtual void vfunc_10(void) override;
-    /* 0x14 */ virtual void vfunc_14(void) override;
-    /* 0x18 */ virtual void vfunc_18(void) override;
-    /* 0x1C */ virtual void vfunc_1c(void) override;
-    /* 0x20 */ virtual void vfunc_20(void) override;
-    /* 0x24 */ virtual void vfunc_24(void) override;
-    /* 0x28 */ virtual void vfunc_28(void) override;
-    /* 0x2C */ virtual void vfunc_2c(void) override;
-    /* 0x30 */ virtual void vfunc_30(void) override;
-    /* 0x34 */ virtual void vfunc_34(void) override;
-    /* 0x38 */ virtual void vfunc_38(void) override;
-    /* 0x3C */
+    /* 00 */ virtual ~UnkSubClass1_02256FF8() override;
+    /* 08 */ virtual void vfunc_08(void) override;
+    /* 0c */ virtual void vfunc_0c(void) override;
+    /* 10 */ virtual void vfunc_10(void) override;
+    /* 14 */ virtual void vfunc_14(void) override;
+    /* 18 */ virtual void vfunc_18(void) override;
+    /* 1c */ virtual void vfunc_1c(void) override;
+    /* 20 */ virtual void vfunc_20(void) override;
+    /* 24 */ virtual void vfunc_24(void) override;
+    /* 28 */ virtual void vfunc_28(void) override;
+    /* 2c */ virtual void vfunc_2c(void) override;
+    /* 30 */ virtual void vfunc_30(void) override;
+    /* 34 */ virtual void vfunc_34(void) override;
+    /* 38 */ virtual void vfunc_38(void) override;
+    /* 3c */
 };
 
 struct UnkStruct_MsgProc_Base_unk_2C {
-    /* 0x00 */ s8 unk_00;
-    /* 0x00 */ s8 unk_01;
-    /* 0x00 */ s8 unk_02;
-    /* 0x00 */ s8 unk_03;
-    /* 0x04 */ unk32 unk_04;
-    /* 0x00 */ u8* unk_08;
-    /* 0x04 */
+    /* 00 */ s8 mUnk_00;
+    /* 01 */ s8 mUnk_01;
+    /* 02 */ s8 mUnk_02;
+    /* 03 */ s8 mUnk_03;
+    /* 04 */ unk32 mUnk_04;
+    /* 08 */ u8* mUnk_08;
+    /* 0c */
 };
 
 struct func_0203b410_param_2 {
-    unk32 unk_00;
-    unk32 unk_04;
-    unk32 unk_08;
-    unk32 unk_0C;
-    unk16 unk_10;
-    unk16 unk_12;
+    /* 00 */ unk32 mUnk_00;
+    /* 04 */ unk32 mUnk_04;
+    /* 08 */ unk32 mUnk_08;
+    /* 0c */ unk32 mUnk_0c;
+    /* 10 */ unk16 mUnk_10;
+    /* 12 */ unk16 mUnk_12;
+    /* 14 */
 };
 
 // astruct_8, MsgProc_Base
@@ -77,23 +78,23 @@ public:
     /* 04 */ unk32* mUnk_04;
     /* 08 */ UnkSubClass1_02256FF8* mUnk_08;
     /* 0c */ u16 *mUnk_0c;
-    /* 0x010 */ unk32* unk_10;
-    /* 0x014 */ s32 unk_14;
-    /* 0x018 */ s32 unk_18;
-    /* 0x01C */ unk32 unk_1C;
-    /* 0x020 */ unk32 unk_20;
-    /* 0x024 */ unk32* unk_24;
+    /* 10 */ unk32* mUnk_10;
+    /* 14 */ s32 mUnk_14;
+    /* 18 */ s32 mUnk_18;
+    /* 1c */ unk32 mUnk_1c;
+    /* 20 */ unk32 mUnk_20;
+    /* 24 */ unk32* mUnk_24;
     /* 28 */ unk32* mUnk_28;
     /* 2c */ UnkStruct_MsgProc_Base_unk_2C **mUnk_2c;
     /* 30 */ s32 mUnk_30;
     /* 34 */ s32 mUnk_34;
     /* 38 */ unk32 mUnk_38;
     /* 3c */ unk16 mUnk_3c;
-    /* 0x03E */ unk16 unk_3E;
-    /* 0x040 */ unk32 unk_40;
-    /* 0x044 */ unk32 unk_44;
-    /* 0x048 */ u8 unk_48;
-    /* 0x049 */ u8 unk_49;
+    /* 3e */ unk16 mUnk_3e;
+    /* 40 */ unk32 mUnk_40;
+    /* 44 */ unk32 mUnk_44;
+    /* 48 */ u8 mUnk_48;
+    /* 49 */ u8 mUnk_49;
     /* 4a */ u16 mUnk_4a;
     /* 4c */ u8 mUnk_4c;
     /* 4d */ bool mUnk_4d;
@@ -124,26 +125,26 @@ public:
     // /* 0x24 */ /* func_02033af4 */ virtual UNK_TYPE vfunc_24(UNK_TYPE);
 
     //! TODO: fake?
-    /* 0x28 */ virtual bool vfunc_28(void);
-    /* 0x2C */ virtual void vfunc_2C(void);
-    /* 0x30 */ virtual void vfunc_30(void);
-    /* 0x34 */ virtual unk32 vfunc_34(unk32 param_2);
-    /* 0x38 */ virtual bool vfunc_38(void);
-    /* 0x3C */ virtual void vfunc_3C(unk32 param_2);
-    /* 0x40 */ virtual void vfunc_40(unk32 param_2, unk32 param_3);
-    /* 0x44 */ virtual void vfunc_44(s32 touchLastX, s32 touchLastY);
-    /* 0x48 */ virtual void vfunc_48(void);
-    /* 0x4C */ virtual void vfunc_4C(void);
-    /* 0x50 */ virtual void vfunc_50(EntryINF1* param_2, u32 param_3, s16* param_4, UnkSubClass1_02256FF8* param_5);
-    /* 0x54 */ virtual void vfunc_54(void);
-    /* 0x58 */ virtual void vfunc_58(void);
-    /* 0x5C */ virtual void vfunc_5C(void);
-    /* 0x60 */ virtual void vfunc_60(func_0203b410_param_2* param_2, unk32 param_3, unk32 param_4);
-    /* 0x64 */ virtual void vfunc_64(s16* param_2);
-    /* 0x68 */ virtual unk32 vfunc_68(unk32 param_2);
-    /* 0x6C */ virtual void vfunc_6C(unk32* param_2, unk32* param_3);
-    /* 0x70 */ virtual void vfunc_70(unk32* param_2, unk32* param_3);
-    /* 0x74 */
+    /* 28 */ virtual bool vfunc_28(void);
+    /* 2c */ virtual void vfunc_2C(void);
+    /* 30 */ virtual void vfunc_30(void);
+    /* 34 */ virtual unk32 vfunc_34(unk32 param_2);
+    /* 38 */ virtual bool vfunc_38(void);
+    /* 3c */ virtual void vfunc_3C(unk32 param_2);
+    /* 40 */ virtual void vfunc_40(unk32 param_2, unk32 param_3);
+    /* 44 */ virtual void vfunc_44(s32 touchLastX, s32 touchLastY);
+    /* 48 */ virtual void vfunc_48(void);
+    /* 4c */ virtual void vfunc_4C(void);
+    /* 50 */ virtual void vfunc_50(EntryINF1* param_2, u32 param_3, s16* param_4, UnkSubClass1_02256FF8* param_5);
+    /* 54 */ virtual void vfunc_54(void);
+    /* 58 */ virtual void vfunc_58(void);
+    /* 5c */ virtual void vfunc_5C(void);
+    /* 60 */ virtual void vfunc_60(func_0203b410_param_2* param_2, unk32 param_3, unk32 param_4);
+    /* 64 */ virtual void vfunc_64(s16* param_2);
+    /* 68 */ virtual unk32 vfunc_68(unk32 param_2);
+    /* 6c */ virtual void vfunc_6C(unk32* param_2, unk32* param_3);
+    /* 70 */ virtual void vfunc_70(unk32* param_2, unk32* param_3);
+    /* 74 */
 
     UnkStruct_02032f0c();
     void func_02032f94();
diff --git a/include/Unknown/UnkStruct_02035064.hpp b/include/Unknown/UnkStruct_02035064.hpp
index b48f7768..122c617d 100644
--- a/include/Unknown/UnkStruct_02035064.hpp
+++ b/include/Unknown/UnkStruct_02035064.hpp
@@ -9,28 +9,28 @@ class UnkStruct_02035064 {
 public:
     /* 00 (vtable) */
     /* 04 */ unk32 mUnk_04;
-    /* 0x08 */ u32* unk_08;
-    /* 0x0C */ unk32 unk_0C;
-    /* 0x10 */ unk32 unk_10;
+    /* 08 */ u32* mUnk_08;
+    /* 0c */ unk32 mUnk_0c;
+    /* 10 */ unk32 mUnk_10;
     /* 14 */ u32 mUnk_14;
-    /* 18 */ unk32 unk_18;
+    /* 18 */ unk32 mUnk_18;
     /* 1c */ unk32 mUnk_1c;
     /* 20 */ u32* mUnk_20;
-    /* 0x24 */ unk32 unk_24;
-    /* 0x28 */ unk32 unk_28;
-    /* 0x2C */ unk32 unk_2C;
-    /* 0x30 */ unk32 unk_30;
-    /* 0x34 */ u32* unk_34;
-    /* 0x38 */ u32* unk_38;
-    /* 0x3C */ unk32 unk_3C;
-    /* 0x40 */ unk32 unk_40;
-    /* 0x44 */ unk32 unk_44;
-    /* 0x48 */ unk32 unk_48;
+    /* 24 */ unk32 mUnk_24;
+    /* 28 */ unk32 mUnk_28;
+    /* 2c */ unk32 mUnk_2c;
+    /* 30 */ unk32 mUnk_30;
+    /* 34 */ u32* mUnk_34;
+    /* 38 */ u32* mUnk_38;
+    /* 3c */ unk32 mUnk_3c;
+    /* 40 */ unk32 mUnk_40;
+    /* 44 */ unk32 mUnk_44;
+    /* 48 */ unk32 mUnk_48;
     /* 4c */ s16 mUnk_4c;
     /* 4e */ s16 mUnk_4e;
-    /* 50 */ unk32 unk_50;
-    /* 0x54 */ unk32 unk_54;
-    /* 0x58 */ unk32 unk_58;
+    /* 50 */ unk32 mUnk_50;
+    /* 54 */ unk32 mUnk_54;
+    /* 58 */ unk32 mUnk_58;
     /* 5c */ UnkStruct_0202e1a0 mUnk_5c;
     /* 74 */ u16 *mUnk_74;
     /* 78 */ s32* mUnk_78;
diff --git a/include/Unknown/UnkStruct_02037750.hpp b/include/Unknown/UnkStruct_02037750.hpp
index 138ae201..57343813 100644
--- a/include/Unknown/UnkStruct_02037750.hpp
+++ b/include/Unknown/UnkStruct_02037750.hpp
@@ -41,8 +41,8 @@ public:
 
 class UnkStruct_020386d8_24 {
 public:
-    /* 0x00 */ unk32 mUnk_00;
-    /* 0x04 */
+    /* 00 */ unk32 mUnk_00;
+    /* 04 */
 
     void func_020376c0(Vec3p param_2);
 };
diff --git a/include/Unknown/UnkStruct_02038aa0.hpp b/include/Unknown/UnkStruct_02038aa0.hpp
index 0f00c585..bec535d6 100644
--- a/include/Unknown/UnkStruct_02038aa0.hpp
+++ b/include/Unknown/UnkStruct_02038aa0.hpp
@@ -30,21 +30,21 @@ public:
 
 class UnkSubClass1_unk_124 {
 public:
-    /* 0x00 */ void* unk_00; // pointer to MsgProc_Main (well, the first members of the base class)
-    /* 0x04 */ unk32 unk_04;
-    /* 0x08 */ unk32 unk_08;
-    /* 0x0C */ unk32 unk_0C;
-    /* 0x10 */ unk32 unk_10;
-    /* 0x14 */ unk32 unk_14;
-    /* 0x18 */ unk32 unk_18;
-    /* 0x1C */ unk32 unk_1C;
-    /* 0x20 */ unk32 unk_20;
-    /* 0x24 */ unk32 unk_24;
-    /* 0x28 */ unk8 unk_28;
-    /* 0x29 */ unk8 unk_29;
-    /* 0x2A */ unk8 unk_2A;
-    /* 0x2B */ unk8 unk_2B;
-    /* 0x2C */
+    /* 00 */ void* mUnk_00; // pointer to MsgProc_Main (well, the first members of the base class)
+    /* 04 */ unk32 mUnk_04;
+    /* 08 */ unk32 mUnk_08;
+    /* 0c */ unk32 mUnk_0c;
+    /* 10 */ unk32 mUnk_10;
+    /* 14 */ unk32 mUnk_14;
+    /* 18 */ unk32 mUnk_18;
+    /* 1c */ unk32 mUnk_1c;
+    /* 20 */ unk32 mUnk_20;
+    /* 24 */ unk32 mUnk_24;
+    /* 28 */ unk8 mUnk_28;
+    /* 29 */ unk8 mUnk_29;
+    /* 2a */ unk8 mUnk_2a;
+    /* 2b */ unk8 mUnk_2b;
+    /* 2c */
 
     void func_0203f020(s16*, unk32);
 };
@@ -58,7 +58,7 @@ public:
     /* 128 */ UnkStruct_0203881c mUnk_128;
     /* 150 */ u8 unk_150[4];
     /* 154 */ EntryINF1* pInfoEntry;
-    /* 158 */ Vec2s unk_158; // textbox position?
+    /* 158 */ Vec2s mUnk_158; // textbox position?
     /* 15c */ s16 mUnk_15c;
     /* 15e */ s8 mUnk_15e;
     /* 15f */ s8 mUnk_15f;
@@ -73,7 +73,7 @@ public:
     /* 2c */ virtual void vfunc_2c();
     /* 30 */ virtual void vfunc_30();
     /* 34 */ virtual unk32 vfunc_34(s32 param1);
-    /* 38 */ virtual unk32 vfunc_38();
+    /* 38 */ virtual bool vfunc_38();
     /* 3c */ virtual void vfunc_3c() = 0;
     /* 40 */ virtual void vfunc_40() = 0;
     /* 44 */ virtual void vfunc_44();
diff --git a/include/Unknown/UnkStruct_020397f8.hpp b/include/Unknown/UnkStruct_020397f8.hpp
index 6d1b6fdc..e046c518 100644
--- a/include/Unknown/UnkStruct_020397f8.hpp
+++ b/include/Unknown/UnkStruct_020397f8.hpp
@@ -8,9 +8,9 @@
 
 // does it host both choices?
 struct UnknownMsgChoiceStruct {
-    /* 0x00 */ UnkStruct_0203b264* unk_00;
-    /* 0x04 */ unk32 unk_04;
-    /* 0x08 */
+    /* 00 */ UnkStruct_0203b264* mUnk_00;
+    /* 04 */ unk32 mUnk_04;
+    /* 08 */
 };
 
 // astruct_2, MsgProc_Type1
@@ -30,31 +30,31 @@ public:
     /* 41c */ unk16 mUnk_41c;
     /* 41e */ unk16 mUnk_41e;
     /* 420 */ unk16 mUnk_420;
-    /* 422 */ unk16 unk_422;
+    /* 422 */ unk16 mUnk_422;
     /* 424 */ unk32 *mUnk_424; // UnkSubClass1_unk_424?
     /* 428 */ UnknownMsgChoiceStruct unk_428[0x20];
-    /* 0x528 */ unk16 unk_528[4]; // number of choices?
-    /* 0x55C */ unk32 unk_530;
-    /* 0x55C */ unk16 unk_534;
-    /* 0x55C */ unk16 unk_536;
-    /* 0x55C */ unk16 unk_538;
-    /* 0x55C */ unk16 unk_53A;
-    /* 0x55C */ unk32 unk_53C;
-    /* 0x55C */ unk32 unk_540;
-    /* 0x55C */ unk8 unk_544;
-    /* 0x55C */ unk8 unk_545;
-    /* 0x55C */ unk8 unk_546;
-    /* 0x55C */ unk8 unk_547;
-    /* 0x55C */ unk16 unk_548;
-    /* 0x55C */ unk16 unk_54A;
-    /* 0x55C */ unk16 unk_54C;
-    /* 0x55C */ unk16 unk_54E;
+    /* 528 */ unk16 unk_528[4]; // number of choices?
+    /* 530 */ unk32 mUnk_530;
+    /* 534 */ unk16 mUnk_534;
+    /* 536 */ unk16 mUnk_536;
+    /* 538 */ unk16 mUnk_538;
+    /* 53a */ unk16 mUnk_53a;
+    /* 53c */ unk32 mUnk_53c;
+    /* 540 */ unk32 mUnk_540;
+    /* 544 */ unk8 mUnk_544;
+    /* 545 */ unk8 mUnk_545;
+    /* 546 */ unk8 mUnk_546;
+    /* 547 */ unk8 mUnk_547;
+    /* 548 */ unk16 mUnk_548;
+    /* 54a */ unk16 mUnk_54a;
+    /* 54c */ unk16 mUnk_54c;
+    /* 54e */ unk16 mUnk_54e;
     /* 550 */ unk32 mUnk_550;
     /* 554 */ unk32 mUnk_554;
-    /* 558 */ unk8 unk_558;
-    /* 0x55C */ unk8 unk_559;
-    /* 0x55C */ unk8 unk_55A;
-    /* 0x55C */ unk8 unk_55B;
+    /* 558 */ unk8 mUnk_558;
+    /* 559 */ unk8 mUnk_559;
+    /* 55a */ unk8 mUnk_55a;
+    /* 55b */ unk8 mUnk_55b;
     /* 55c */ unk32 mUnk_55c;
     /* 560 */ unk32 mUnk_560;
     /* 564 */ u16 unk_564[4];
@@ -117,12 +117,12 @@ public:
     bool func_0203c1a0();
     bool func_0203c25c();
     /* 00 */ virtual ~UnkStruct_020397f8();
-    /* 38 */ virtual unk32 vfunc_38();
+    /* 38 */ virtual bool vfunc_38();
     /* 74 */
 
     //! TODO: check if this is really here
     static bool func_0203c25c(class MsgProc_Type1* param_1);
-    static void func_0203e060(MsgProc_Main* param_1, u8 param_2, u8 param_3);
+    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);
@@ -138,105 +138,103 @@ public:
     void func_0203bd8c(u16 param_2);
     void func_0203be08(void);
     void func_0203be64(void);
-    unk32 func_0203c084(void);
     bool func_0203c13c(void);
-    unk32 func_0203c1a0(void);
 };
 
 class MsgProc_Type3 : public UnkStruct_02038aa0 {
 public:
-    /* 0x164 */ unk16 unk_164;
-    /* 0x166 */ unk16 unk_166;
-    /* 0x168 */ unk16 unk_168;
-    /* 0x16A */ unk16 unk_16A;
-    /* 0x16C */ unk16 unk_16C;
-    /* 0x16E */ unk16 unk_16E;
-    /* 0x170 */ unk16 unk_170;
-    /* 0x172 */ unk16 unk_172;
-    /* 0x174 */ unk16 unk_174;
-    /* 0x178 */ unk32 unk_178;
-    /* 0x17C */ unk32 unk_17C;
-    /* 0x180 */ UnkClass_func_ov000_020d0644 unk_180[4];
-    /* 0x1C0 */
+    /* 164 */ unk16 mUnk_164;
+    /* 166 */ unk16 mUnk_166;
+    /* 168 */ unk16 mUnk_168;
+    /* 16a */ unk16 mUnk_16a;
+    /* 16c */ unk16 mUnk_16c;
+    /* 16e */ unk16 mUnk_16e;
+    /* 170 */ unk16 mUnk_170;
+    /* 172 */ unk16 mUnk_172;
+    /* 174 */ unk16 mUnk_174;
+    /* 178 */ unk32 mUnk_178;
+    /* 17c */ unk32 mUnk_17c;
+    /* 180 */ UnkClass_func_ov000_020d0644 unk_180[4];
+    /* 1c0 */
 
     MsgProc_Type3();
     MsgProc_Type3(unk32 param_2, unk16 param_3, unk32 param_4);
     //! TODO: remove the function declarations that are not overridden
-    /* 0x00 */ virtual ~MsgProc_Type3();
-    /* 0x08 */ virtual void vfunc_08(unk32* param_2, unk32* param_3) override;
-    /* 0x0C */ virtual void vfunc_0C(u8 param_2, u8 param_3, u8 param_4, unk32 param_5) override;
-    /* 0x10 */ virtual void vfunc_10(u8 param_2, u8 param_3) override; // func_0203e060?
-    /* 0x14 */ virtual bool vfunc_14(unk32 param_2, unk32 param_3) override;
-    /* 0x18 */ virtual unk32 vfunc_18(UnkStruct_0203b264* param_2, unk32 param_3, unk32 param_4) override;
-    /* 0x1C */ virtual unk32 vfunc_1C(u16* param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5) override;
-    /* 0x20 */ virtual void vfunc_20(void) override;
-    /* 0x24 */ virtual void vfunc_24(void) override;
-    /* 0x28 */ virtual bool vfunc_28(void) override;
-    /* 0x2C */ virtual void vfunc_2C(void) override;
-    /* 0x30 */ virtual void vfunc_30(void) override;
-    /* 0x34 */ virtual unk32 vfunc_34(unk32 param_2) override;
-    /* 0x38 */ virtual bool vfunc_38(void) override;
-    /* 0x3C */ virtual void vfunc_3C(unk32 param_2) override;
-    /* 0x40 */ virtual void vfunc_40(unk32 param_2, unk32 param_3) override;
-    /* 0x44 */ virtual void vfunc_44(s32 touchLastX, s32 touchLastY) override;
-    /* 0x48 */ virtual void vfunc_48(void) override;
-    /* 0x4C */ virtual void vfunc_4C(void) override; // func_02039a3c?
-    /* 0x50 */ virtual void vfunc_50(EntryINF1* param_2, u32 param_3, s16* param_4, UnkSubClass1_02256FF8* param_5) override;
-    /* 0x54 */ virtual void vfunc_54(void) override;
-    /* 0x58 */ virtual void vfunc_58(void) override;
-    /* 0x5C */ virtual void vfunc_5C(void) override;
-    /* 0x60 */ virtual void vfunc_60(func_0203b410_param_2* param_2, unk32 param_3, unk32 param_4) override;
-    /* 0x64 */ virtual void vfunc_64(s16* param_2) override;
-    /* 0x68 */ virtual unk32 vfunc_68(unk32 param_2) override;
-    /* 0x6C */ virtual void vfunc_6C(unk32* param_2, unk32* param_3) override;
-    /* 0x70 */ virtual void vfunc_70(unk32* param_2, unk32* param_3) override;
-    /* 0x74 */
+    /* 00 */ virtual ~MsgProc_Type3();
+    /* 08 */ virtual void vfunc_08(unk32* param_2, unk32* param_3) override;
+    /* 0c */ virtual void vfunc_0C(u8 param_2, u8 param_3, u8 param_4, unk32 param_5) override;
+    /* 10 */ virtual void vfunc_10(u8 param_2, u8 param_3) override; // func_0203e060?
+    /* 14 */ virtual bool vfunc_14(unk32 param_2, unk32 param_3) override;
+    /* 18 */ virtual unk32 vfunc_18(UnkStruct_0203b264* param_2, unk32 param_3, unk32 param_4) override;
+    /* 1c */ virtual unk32 vfunc_1C(u16* param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5) override;
+    /* 20 */ virtual void vfunc_20(void) override;
+    /* 24 */ virtual void vfunc_24(void) override;
+    /* 28 */ virtual bool vfunc_28(void) override;
+    /* 2c */ virtual void vfunc_2C(void) override;
+    /* 30 */ virtual void vfunc_30(void) override;
+    /* 34 */ virtual unk32 vfunc_34(unk32 param_2) override;
+    /* 38 */ virtual bool vfunc_38(void) override;
+    /* 3c */ virtual void vfunc_3C(unk32 param_2) override;
+    /* 40 */ virtual void vfunc_40(unk32 param_2, unk32 param_3) override;
+    /* 44 */ virtual void vfunc_44(s32 touchLastX, s32 touchLastY) override;
+    /* 48 */ virtual void vfunc_48(void) override;
+    /* 4c */ virtual void vfunc_4C(void) override; // func_02039a3c?
+    /* 50 */ virtual void vfunc_50(EntryINF1* param_2, u32 param_3, s16* param_4, UnkSubClass1_02256FF8* param_5) override;
+    /* 54 */ virtual void vfunc_54(void) override;
+    /* 58 */ virtual void vfunc_58(void) override;
+    /* 5c */ virtual void vfunc_5C(void) override;
+    /* 60 */ virtual void vfunc_60(func_0203b410_param_2* param_2, unk32 param_3, unk32 param_4) override;
+    /* 64 */ virtual void vfunc_64(s16* param_2) override;
+    /* 68 */ virtual unk32 vfunc_68(unk32 param_2) override;
+    /* 6c */ virtual void vfunc_6C(unk32* param_2, unk32* param_3) override;
+    /* 70 */ virtual void vfunc_70(unk32* param_2, unk32* param_3) override;
+    /* 74 */
 
     static void func_0203c83c(void);
 };
 
 class MsgProc_Type2 : public UnkStruct_02038aa0 {
 public:
-    /* 0x164 */ unk16 unk_164;
-    /* 0x164 */ unk16 unk_166;
-    /* 0x164 */ unk16 unk_168;
-    /* 0x164 */ unk16 unk_16A;
-    /* 0x164 */ unk16 unk_16C;
-    /* 0x164 */ unk16 unk_16E;
-    /* 0x170 */
+    /* 164 */ unk16 mUnk_164;
+    /* 166 */ unk16 mUnk_166;
+    /* 168 */ unk16 mUnk_168;
+    /* 16a */ unk16 mUnk_16a;
+    /* 16c */ unk16 mUnk_16c;
+    /* 16e */ unk16 mUnk_16e;
+    /* 170 */
 
     MsgProc_Type2();
     MsgProc_Type2(unk32 param_2, unk16 param_3, unk32 param_4);
     //! TODO: remove the function declarations that are not overridden
-    /* 0x00 */ virtual ~MsgProc_Type2();
-    /* 0x08 */ /* func_02039228 */ virtual void vfunc_08(unk32* param_2, unk32* param_3) override;
-    /* 0x0C */ /* func_02039578 */ virtual void vfunc_0C(u8 param_2, u8 param_3, u8 param_4, unk32 param_5) override;
-    /* 0x10 */ /* func_0203e060 */ virtual void vfunc_10(u8 param_2, u8 param_3) override; // func_0203e060?
-    /* 0x14 */ /* func_0203c5c4 */ virtual bool vfunc_14(unk32 param_2, unk32 param_3) override;
-    /* 0x18 */ /* func_0203e284 */ virtual unk32 vfunc_18(UnkStruct_0203b264* param_2, unk32 param_3, unk32 param_4) override;
-    /* 0x1C */ /* func_0203905c */ virtual unk32 vfunc_1C(u16* param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5) override;
-    /* 0x20 */ /* func_020390a4 */ virtual void vfunc_20(void) override;
-    /* 0x24 */ /* astruct_8::vfunc_24 */ virtual void vfunc_24(void) override;
-    /* 0x28 */ /* func_0203e0c8 */ virtual bool vfunc_28(void) override;
-    /* 0x2C */ /* func_02038d20 */ virtual void vfunc_2C(void) override;
-    /* 0x30 */ /* func_02038ed0 */ virtual void vfunc_30(void) override;
-    /* 0x34 */ /* func_02038c34 */ virtual unk32 vfunc_34(unk32 param_2) override;
-    /* 0x38 */ /* func_02039570 */ virtual bool vfunc_38(void) override;
-    /* 0x3C */ /* func_0203c414 */ virtual void vfunc_3C(unk32 param_2) override;
-    /* 0x40 */ /* func_0203c460 */ virtual void vfunc_40(unk32 param_2, unk32 param_3) override;
-    /* 0x44 */ /* func_02038f40 */ virtual void vfunc_44(s32 touchLastX, s32 touchLastY) override;
-    /* 0x48 */ /* func_02038b74 */ virtual void vfunc_48(void) override;
-    /* 0x4C */ /* func_0203c39c */ virtual void vfunc_4C(void) override; // func_02039a3c?
-    /* 0x50 */ /* func_02038f44 */ virtual void vfunc_50(EntryINF1* param_2, u32 param_3, s16* param_4, UnkSubClass1_02256FF8* param_5) override;
-    /* 0x54 */ /* func_020392b4 */ virtual void vfunc_54(void) override;
-    /* 0x58 */ /* func_02039398 */ virtual void vfunc_58(void) override;
-    /* 0x5C */ /* func_02039058 */ virtual void vfunc_5C(void) override;
-    /* 0x60 */ /* func_020393a4 */ virtual void vfunc_60(func_0203b410_param_2* param_2, unk32 param_3, unk32 param_4) override;
-    /* 0x64 */ /* func_020393a8 */ virtual void vfunc_64(s16* param_2) override;
-    /* 0x68 */ /* func_020393d0 */ virtual unk32 vfunc_68(unk32 param_2) override;
-    /* 0x6C */ /* func_0203947c */ virtual void vfunc_6C(unk32* param_2, unk32* param_3) override;
-    /* 0x70 */ /* func_020394d8 */ virtual void vfunc_70(unk32* param_2, unk32* param_3) override;
-    /* 0x74 */
+    /* 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_param_2* 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);
diff --git a/include/Unknown/UnkStruct_0203dae0.hpp b/include/Unknown/UnkStruct_0203dae0.hpp
index 7870c0f9..af1ba915 100644
--- a/include/Unknown/UnkStruct_0203dae0.hpp
+++ b/include/Unknown/UnkStruct_0203dae0.hpp
@@ -9,60 +9,60 @@
 class UnkStruct_0203dae0 : public UnkStruct_02032f0c {
 public:
     /* 000 (base) */
-    /* 0x052 */ unk16 unk_52;
-    /* 0x054 */ unk16 unk_54;
-    /* 0x054 */ unk16 unk_56;
-    /* 0x058 */ unk32 unk_58;
-    /* 0x05C */ s16 unk_5C;
-    /* 0x05E */ s16 unk_5E;
-    /* 0x060 */ unk32 unk_60;
-    /* 0x064 */ unk32 unk_64;
-    /* 0x068 */ unk32 unk_68;
-    /* 0x06C */ unk32 unk_6C;
-    /* 0x070 */ unk32 unk_70;
-    /* 0x074 */ unk32 unk_74;
-    /* 0x078 */ unk32 unk_78;
-    /* 0x07C */ unk32 unk_7C;
-    /* 0x080 */ unk32 unk_80;
-    /* 0x084 */ unk32 unk_84;
-    /* 0x088 */ unk32 unk_88;
-    /* 0x08C */ unk32 unk_8C;
-    /* 0x090 */ unk32 unk_90;
-    /* 0x094 */ unk32 unk_94;
-    /* 0x098 */ unk32 unk_98;
-    /* 0x09C */ unk32 unk_9C;
-    /* 0x0A0 */ unk32 unk_A0;
-    /* 0x0A4 */ unk32 unk_A4;
-    /* 0x0A8 */ unk32 unk_A8;
-    /* 0x0AC */ unk32 unk_AC;
-    /* 0x0B0 */ unk32 unk_B0;
-    /* 0x0B4 */ unk32 unk_B4;
-    /* 0x0B8 */ unk32 unk_B8;
-    /* 0x0BC */ unk32 unk_BC;
-    /* 0x0C0 */ unk32 unk_C0;
-    /* 0x0C4 */ unk32 unk_C4;
-    /* 0x0C8 */ unk32 unk_C8;
-    /* 0x0CC */ unk32 unk_CC;
-    /* 0x0D0 */ unk32 unk_D0;
-    /* 0x0D4 */ unk32 unk_D4;
-    /* 0x0D8 */ unk32 unk_D8;
-    /* 0x0DC */ unk32 unk_DC;
-    /* 0x0E0 */ unk32 unk_E0;
-    /* 0x0E4 */ unk32 unk_E4;
-    /* 0x0E8 */ unk32 unk_E8;
-    /* 0x0EC */ unk32 unk_EC;
-    /* 0x0F0 */ unk32 unk_F0;
-    /* 0x0F4 */ unk32 unk_F4;
-    /* 0x0F8 */ unk32 unk_F8;
-    /* 0x0FC */ unk32 unk_FC;
-    /* 0x100 */ unk32 unk_100;
-    /* 0x104 */ unk32 unk_104;
-    /* 0x108 */ unk8 unk_108;
-    /* 0x108 */ unk8 unk_109;
-    /* 0x108 */ unk8 unk_10A;
-    /* 0x108 */ unk8 unk_10B;
-    /* 0x10C */ unk32 unk_10C;
-    /* 0x110 */ unk32 unk_110;
+    /* 052 */ unk16 mUnk_52;
+    /* 054 */ unk16 mUnk_54;
+    /* 054 */ unk16 mUnk_56;
+    /* 058 */ unk32 mUnk_58;
+    /* 05c */ s16 mUnk_5c;
+    /* 05e */ s16 mUnk_5e;
+    /* 060 */ unk32 mUnk_60;
+    /* 064 */ unk32 mUnk_64;
+    /* 068 */ unk32 mUnk_68;
+    /* 06c */ unk32 mUnk_6c;
+    /* 070 */ unk32 mUnk_70;
+    /* 074 */ unk32 mUnk_74;
+    /* 078 */ unk32 mUnk_78;
+    /* 07c */ unk32 mUnk_7c;
+    /* 080 */ unk32 mUnk_80;
+    /* 084 */ unk32 mUnk_84;
+    /* 088 */ unk32 mUnk_88;
+    /* 08c */ unk32 mUnk_8c;
+    /* 090 */ unk32 mUnk_90;
+    /* 094 */ unk32 mUnk_94;
+    /* 098 */ unk32 mUnk_98;
+    /* 09c */ unk32 mUnk_9c;
+    /* 0a0 */ unk32 mUnk_a0;
+    /* 0a4 */ unk32 mUnk_a4;
+    /* 0a8 */ unk32 mUnk_a8;
+    /* 0ac */ unk32 mUnk_ac;
+    /* 0b0 */ unk32 mUnk_b0;
+    /* 0b4 */ unk32 mUnk_b4;
+    /* 0b8 */ unk32 mUnk_b8;
+    /* 0bc */ unk32 mUnk_bc;
+    /* 0c0 */ unk32 mUnk_c0;
+    /* 0c4 */ unk32 mUnk_c4;
+    /* 0c8 */ unk32 mUnk_c8;
+    /* 0cc */ unk32 mUnk_cc;
+    /* 0d0 */ unk32 mUnk_d0;
+    /* 0d4 */ unk32 mUnk_d4;
+    /* 0d8 */ unk32 mUnk_d8;
+    /* 0dc */ unk32 mUnk_dc;
+    /* 0e0 */ unk32 mUnk_e0;
+    /* 0e4 */ unk32 mUnk_e4;
+    /* 0e8 */ unk32 mUnk_e8;
+    /* 0ec */ unk32 mUnk_ec;
+    /* 0f0 */ unk32 mUnk_f0;
+    /* 0f4 */ unk32 mUnk_f4;
+    /* 0f8 */ unk32 mUnk_f8;
+    /* 0fc */ unk32 mUnk_fc;
+    /* 100 */ unk32 mUnk_100;
+    /* 104 */ unk32 mUnk_104;
+    /* 108 */ unk8 mUnk_108;
+    /* 108 */ unk8 mUnk_109;
+    /* 108 */ unk8 mUnk_10a;
+    /* 108 */ unk8 mUnk_10b;
+    /* 10c */ unk32 mUnk_10c;
+    /* 110 */ unk32 mUnk_110;
     /* 114 */ void *mUnk_114; // MsgProc_Base2_unk_114?
     /* 118 */ s32 mUnk_118;
     /* 11c */ unk16 mUnk_11c;
@@ -96,23 +96,23 @@ public:
     // /* 0x30 */ /* func_0203e090 */ virtual void vfunc_30(void) override;
 
     //! TODO: fake?
-    /* 0x34 */ virtual unk32 vfunc_34(unk32 param_2) override;
-    /* 0x38 */ virtual bool vfunc_38(void) override;
-    /* 0x3C */ virtual void vfunc_3C(unk32 param_2) override;
-    /* 0x40 */ virtual void vfunc_40(unk32 param_2, unk32 param_3) override;
-    /* 0x44 */ virtual void vfunc_44(s32 touchLastX, s32 touchLastY) override;
-    /* 0x48 */ virtual void vfunc_48(void) override;
-    /* 0x4C */ virtual void vfunc_4C(void) override; // func_02039a3c?
-    /* 0x50 */ virtual void vfunc_50(EntryINF1* param_2, u32 param_3, s16* param_4, UnkSubClass1_02256FF8* param_5) override;
-    /* 0x54 */ virtual void vfunc_54(void) override;
-    /* 0x58 */ virtual void vfunc_58(void) override;
-    /* 0x5C */ virtual void vfunc_5C(void) override;
-    /* 0x60 */ virtual void vfunc_60(func_0203b410_param_2* param_2, unk32 param_3, unk32 param_4) override;
-    /* 0x64 */ virtual void vfunc_64(s16* param_2) override;
-    /* 0x68 */ virtual unk32 vfunc_68(unk32 param_2) override;
-    /* 0x6C */ virtual void vfunc_6C(unk32* param_2, unk32* param_3) override;
-    /* 0x70 */ virtual void vfunc_70(unk32* param_2, unk32* param_3) override;
-    /* 0x74 */
+    /* 34 */ virtual unk32 vfunc_34(unk32 param_2) override;
+    /* 38 */ virtual bool vfunc_38(void) override;
+    /* 3c */ virtual void vfunc_3C(unk32 param_2) override;
+    /* 40 */ virtual void vfunc_40(unk32 param_2, unk32 param_3) override;
+    /* 44 */ virtual void vfunc_44(s32 touchLastX, s32 touchLastY) override;
+    /* 48 */ virtual void vfunc_48(void) override;
+    /* 4c */ virtual void vfunc_4C(void) override; // func_02039a3c?
+    /* 50 */ virtual void vfunc_50(EntryINF1* param_2, u32 param_3, s16* param_4, UnkSubClass1_02256FF8* param_5) override;
+    /* 54 */ virtual void vfunc_54(void) override;
+    /* 58 */ virtual void vfunc_58(void) override;
+    /* 5c */ virtual void vfunc_5C(void) override;
+    /* 60 */ virtual void vfunc_60(func_0203b410_param_2* param_2, unk32 param_3, unk32 param_4) override;
+    /* 64 */ virtual void vfunc_64(s16* param_2) override;
+    /* 68 */ virtual unk32 vfunc_68(unk32 param_2) override;
+    /* 6c */ virtual void vfunc_6C(unk32* param_2, unk32* param_3) override;
+    /* 70 */ virtual void vfunc_70(unk32* param_2, unk32* param_3) override;
+    /* 74 */
 
     UnkStruct_0203dae0(u8 param1);
     void func_0203dc10(s32 param1);
diff --git a/include/Unknown/func_ov000_020d0644.hpp b/include/Unknown/func_ov000_020d0644.hpp
index ff03d603..677169a4 100644
--- a/include/Unknown/func_ov000_020d0644.hpp
+++ b/include/Unknown/func_ov000_020d0644.hpp
@@ -5,10 +5,10 @@
 
 class UnkClass_func_ov000_020d0644 {
 public:
-    /* 0x00 */ unk32 unk_00;
-    /* 0x04 */ unk32 unk_04;
-    /* 0x08 */ unk32 unk_08;
-    // /* 0x0C */ unk32 unk_0C;
+    /* 00 */ unk32 mUnk_00;
+    /* 04 */ unk32 mUnk_04;
+    /* 08 */ unk32 mUnk_08;
+    // /* 0c */ unk32 mUnk_0c;
     /* 0x10 */
 
     static void func_020d060c(void);