post-update cleanup: step 2

3 files changed, 46 insertions, 46 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);
 };