post-update cleanup: step 3 (1/2)

4 files changed, 168 insertions, 167 deletions

diff --git a/src/Main/Message/BMG.cpp b/src/Main/Message/BMG.cpp
index 1d8c2f06..edf2f9f5 100644
--- a/src/Main/Message/BMG.cpp
+++ b/src/Main/Message/BMG.cpp
@@ -54,8 +54,8 @@ THUMB void func_020371b4(BMGFileInfo* pFileInfo) {
     pFileInfo->pFLW1 = NULL;
     pFileInfo->pFLI1 = NULL;
     pFileInfo->pDAT1 = NULL;
-    pFileInfo->unk_14 = NULL;
-    pFileInfo->unk_18 = 0;
+    pFileInfo->mUnk_14 = NULL;
+    pFileInfo->mUnk_18 = 0;
 }
 
 THUMB u16 func_020371c8(BMGFileInfo* pFileInfo, u32* pFile, s16 unk_18) {
@@ -64,9 +64,9 @@ THUMB u16 func_020371c8(BMGFileInfo* pFileInfo, u32* pFile, s16 unk_18) {
     u32 i;
 
     groupId = -1;
-    pFileInfo->unk_14 = (BMGHeader*)pFile;
+    pFileInfo->mUnk_14 = (BMGHeader*)pFile;
     pFileInfo->pHeader = (BMGHeader*)pFile;
-    pFileInfo->unk_18 = mUnk_18;
+    pFileInfo->mUnk_18 = unk_18;
     pSection = (SectionBase*)((u8*)pFile + sizeof(BMGHeader));
 
     for (i = 0; i < pFileInfo->pHeader->numSections; i++) {
@@ -173,8 +173,8 @@ THUMB void BMGGroups::func_020373b4(s16 unk_18) {
     s32 i;
 
     for (i = 0; i < this->numEntries; i++) {
-        if (this->entries[i].unk_18 == unk_18) {
-            func_0202d590(this->entries[i].unk_14);
+        if (this->entries[i].mUnk_18 == unk_18) {
+            func_0202d590(this->entries[i].mUnk_14);
             func_020371b4(&this->entries[i]);
         }
     }
diff --git a/src/Main/Message/MessageManager.cpp b/src/Main/Message/MessageManager.cpp
index 70caaf7b..e78a9e64 100644
--- a/src/Main/Message/MessageManager.cpp
+++ b/src/Main/Message/MessageManager.cpp
@@ -1,10 +1,11 @@
 #include "Message/MessageManager.hpp"
 #include "Actor/ActorManager.hpp"
 #include "Player/TouchControl.hpp"
+#include "System/SysNew.hpp"
 
 extern ARM unk32 func_ov000_020d7f18(u32*, unk32);
 extern ARM unk32 func_02037628(u8*);
-extern ARM void func_0203dc74(MsgProc_Main*, unk32, unk32);
+extern ARM void func_0203dc74(UnkStruct_02038aa0*, unk32, unk32);
 
 extern u32** data_027e0ce0[];
 extern u32 data_02056924[];
@@ -25,8 +26,8 @@ ARM void UnkStruct_027E0C68::func_0203643c(int *param_1, UnkStruct_027E0C68* par
 THUMB void UnkStruct_027E0C68::func_02036490(unk32 param_2, unk32 param_3, unk32 param_4) {
     s32 i;
 
-    this->unk_03 = 0;
-    this->unk_0C = 0;
+    this->mUnk_03 = 0;
+    this->mUnk_0c = 0;
 
     this->pGroups->func_020372f0(BMG_FILE_INDEX_SYSTEM, 2);
 
@@ -50,79 +51,79 @@ THUMB void UnkStruct_027E0C68::func_02036490(unk32 param_2, unk32 param_3, unk32
             break;
     }
 
-    for (i = 0; i < ARRAY_LEN(this->unk_18); i++) {
-        if (this->unk_18[i] != NULL) {
-            this->unk_18[i] = NULL;
+    for (i = 0; i < ARRAY_LEN(this->mUnk_18); i++) {
+        if (this->mUnk_18[i] != NULL) {
+            this->mUnk_18[i] = NULL;
         }
     }
 
-    for (i = 0; i < ARRAY_LEN(this->unk_28); i++) {
-        if (this->unk_28[i] != NULL) {
-            this->unk_28[i] = NULL;
+    for (i = 0; i < ARRAY_LEN(this->mUnk_28); i++) {
+        if (this->mUnk_28[i] != NULL) {
+            this->mUnk_28[i] = NULL;
         }
     }
 
-    for (i = 0; i < ARRAY_LEN(this->unk_18); i++) {
-        this->unk_18[i] = new(*data_027e0ce0[0], 4) UnkStruct_020386d8();
+    for (i = 0; i < ARRAY_LEN(this->mUnk_18); i++) {
+        this->mUnk_18[i] = new(*data_027e0ce0[0], 4) UnkStruct_020386d8();
     }
 
-    this->unk_18[0]->unk_39 = 0;
-    this->unk_18[1]->unk_39 = 1;
+    this->mUnk_18[0]->mUnk_39 = 0;
+    this->mUnk_18[1]->mUnk_39 = 1;
 
     // switch?
     if (*data_027e0618 == 2 || *data_027e0618 == 3 || *data_027e0618 == 6) {
-        for (i = 0; i < ARRAY_LEN(this->unk_28); i++) {
+        for (i = 0; i < ARRAY_LEN(this->mUnk_28); i++) {
             switch (data_02056924[i + 1]) {
                 case 0:
                     if (*data_027e0618 != 2) {
-                        this->unk_28[i] = new(*data_027e0ce0[0], 4) MsgProc_Type1();
-                        func_0203dc74(this->unk_28[i], 0xE0, 0x40);
-                        this->unk_28[i]->unk_2C = data_02068e6c;
-                        this->unk_28[i]->unk_50 = i != 0;
+                        this->mUnk_28[i] = new(*data_027e0ce0[0], 4) UnkStruct_020397f8();
+                        func_0203dc74(this->mUnk_28[i], 0xE0, 0x40);
+                        this->mUnk_28[i]->mUnk_2c = &data_02068e6c;
+                        this->mUnk_28[i]->mUnk_50 = i != 0;
                     }
                     break;
                 case 1:
-                    this->unk_28[i] = new(*data_027e0ce0[0], 4) MsgProc_Type3();
-                    func_0203dc74(this->unk_28[i], 0x50, 0x60);
-                    this->unk_28[i]->unk_2C = data_02068e6c;
+                    this->mUnk_28[i] = new(*data_027e0ce0[0], 4) MsgProc_Type3();
+                    func_0203dc74(this->mUnk_28[i], 0x50, 0x60);
+                    this->mUnk_28[i]->mUnk_2c = &data_02068e6c;
                     break;
                 case 2:
-                    this->unk_28[i] = NULL;
+                    this->mUnk_28[i] = NULL;
                     break;
                 case 3:
                     if (func_0202ab48() == 0) {
-                        this->unk_28[i] = new(*data_027e0ce0[0], 4) MsgProc_Type2();
-                        func_0203dc74(this->unk_28[i], 0xC0, 0x20);
-                        this->unk_28[i]->unk_2C = data_02068e8c;
+                        this->mUnk_28[i] = new(*data_027e0ce0[0], 4) MsgProc_Type2();
+                        func_0203dc74(this->mUnk_28[i], 0xC0, 0x20);
+                        this->mUnk_28[i]->mUnk_2c = &data_02068e8c;
                     } else {
-                        this->unk_28[i] = NULL;
+                        this->mUnk_28[i] = NULL;
                     }
                     break;
                 default:
                     break;
             }
 
-            if (this->unk_28[i] != NULL) {
-                this->unk_28[i]->vfunc_4C();
+            if (this->mUnk_28[i] != NULL) {
+                this->mUnk_28[i]->vfunc_4C();
             }
         }
     }
 }
 
 THUMB void UnkStruct_027E0C68::func_0203665c(void) {
-    for (s32 i = 0; i < ARRAY_LEN(this->unk_28); i++) {
-        if (this->unk_28[i] != NULL) {
-            delete this->unk_28[i];
+    for (s32 i = 0; i < ARRAY_LEN(this->mUnk_28); i++) {
+        if (this->mUnk_28[i] != NULL) {
+            delete this->mUnk_28[i];
 
-            this->unk_28[i] = NULL;
+            this->mUnk_28[i] = NULL;
         }
     }
 
-    for (s32 i = 0; i < ARRAY_LEN(this->unk_18); i++) {
-        if (this->unk_18[i] != NULL) {
-            delete this->unk_18[i];
+    for (s32 i = 0; i < ARRAY_LEN(this->mUnk_18); i++) {
+        if (this->mUnk_18[i] != NULL) {
+            delete this->mUnk_18[i];
 
-            this->unk_18[i] = NULL;
+            this->mUnk_18[i] = NULL;
         }
     }
 
@@ -130,21 +131,21 @@ THUMB void UnkStruct_027E0C68::func_0203665c(void) {
 }
 
 // non-matching
-ARM MsgProc_Type1* UnkStruct_027E0C68::func_020366c4(void) {
+ARM UnkStruct_020397f8* UnkStruct_027E0C68::func_020366c4(void) {
     if ((data_02056be4[data_027e077c.mUnk_0] & 1) && !(data_02056be4[data_027e077c.mUnk_0] & 2)) {
-        return (MsgProc_Type1*)this->unk_28[2];
+        return (UnkStruct_020397f8*)this->mUnk_28[2];
     }
 
-    return (MsgProc_Type1*)this->unk_28[0];
+    return (UnkStruct_020397f8*)this->mUnk_28[0];
 }
 
 // non-matching
-ARM MsgProc_Type1* UnkStruct_027E0C68::func_02036700(void) {
+ARM UnkStruct_020397f8* UnkStruct_027E0C68::func_02036700(void) {
     if ((data_02056be4[data_027e077c.mUnk_0] & 1) && !(data_02056be4[data_027e077c.mUnk_0] & 2)) {
-        return (MsgProc_Type1*)this->unk_28[0];
+        return (UnkStruct_020397f8*)this->mUnk_28[0];
     }
 
-    return (MsgProc_Type1*)this->unk_28[2];
+    return (UnkStruct_020397f8*)this->mUnk_28[2];
 }
 
 ARM UnkStruct_020386d8* UnkStruct_027E0C68::func_0203673c(void) {
@@ -152,27 +153,27 @@ ARM UnkStruct_020386d8* UnkStruct_027E0C68::func_0203673c(void) {
     bool iVar2 = this->func_02036850();
 
     if (iVar1) {
-        return this->unk_18[0];
+        return this->mUnk_18[0];
     } 
 
     if (iVar2) {
-        return this->unk_18[1];
+        return this->mUnk_18[1];
     }
 
     return NULL;
 }
 
 ARM bool UnkStruct_027E0C68::func_02036770(u32 param_2) {
-    return (this->unk_18[param_2]->unk_18 & ~0xFFFF) == (0x100 << 0x10);
+    return (this->mUnk_18[param_2]->mUnk_18 & ~0xFFFF) == (0x100 << 0x10);
 }
 
 ARM unk32 UnkStruct_027E0C68::func_02036798(void) {
     unk32 uVar2 = 1;
 
-    if (this->unk_04 == 0) {
+    if (this->mUnk_04 == 0) {
         bool bVar1 = false;
 
-        if (this->unk_18[1] != NULL && (this->unk_18[1]->unk_18 & 0xFFFF0000) != 0x1000000) {
+        if (this->mUnk_18[1] != NULL && (this->mUnk_18[1]->mUnk_18 & 0xFFFF0000) != 0x1000000) {
             bVar1 = true;
         }
 
@@ -189,11 +190,11 @@ ARM bool UnkStruct_027E0C68::func_020367dc(int param_2) {
 }
 
 ARM bool UnkStruct_027E0C68::func_020367ec(void) {
-    return ((MsgProc_Type1*)this->unk_28[0])->unk_15C > 0;
+    return ((UnkStruct_020397f8*)this->mUnk_28[0])->mUnk_15c > 0;
 }
 
 ARM bool UnkStruct_027E0C68::func_02036808(void) {
-    return ((MsgProc_Type1*)this->unk_28[2])->unk_15C > 0;
+    return ((UnkStruct_020397f8*)this->mUnk_28[2])->mUnk_15c > 0;
 }
 
 ARM bool UnkStruct_027E0C68::func_02036824(void) {
@@ -215,31 +216,31 @@ ARM bool UnkStruct_027E0C68::func_02036850(void) {
 }
 
 ARM void UnkStruct_027E0C68::func_02036888(UnkStruct_020386d8* param_2) {    
-    if ((param_2->unk_18 & ~0xFFFF) != (0x100 << 0x10)) {
-        MsgProc_Type1* iVar1 = this->func_020366c4();
+    if ((param_2->mUnk_18 & ~0xFFFF) != (0x100 << 0x10)) {
+        UnkStruct_020397f8* iVar1 = this->func_020366c4();
 
-        if (iVar1->unk_15C <= 0) {
+        if (iVar1->mUnk_15c <= 0) {
             param_2->vfunc_10();
         } else {
-            param_2->vfunc_0C(this->func_020366c4());
+            param_2->vfunc_0c(this->func_020366c4());
         }
     }
 }
 
 ARM bool UnkStruct_027E0C68::func_020368f4(UnkStruct_02037750* param_2) {
-    if (this->unk_20[1] != NULL) {
+    if (this->mUnk_20[1] != NULL) {
         return false;
     }
 
-    this->unk_20[1] = param_2;
+    this->mUnk_20[1] = param_2;
     return true;
 }
 
 // non-matching
 ARM void UnkStruct_027E0C68::func_0203690c(unk32 param_2, unk32 param_3, unk32 param_4) {
-    MsgProc_Type1* unk_28_0;
-    MsgProc_Type1* unk_28_2;
-    MsgProc_Main *pSVar4;
+    UnkStruct_020397f8* unk_28_0;
+    UnkStruct_020397f8* unk_28_2;
+    UnkStruct_02038aa0 *pSVar4;
     ActorRef actorRef;
     Actor* pActor;
     bool iVar1;
@@ -250,104 +251,104 @@ ARM void UnkStruct_027E0C68::func_0203690c(unk32 param_2, unk32 param_3, unk32 p
         return;
     }
 
-    this->unk_40[1] = this->unk_40[0];
+    this->mUnk_40[1] = this->mUnk_40[0];
 
-    unk_28_0 = (MsgProc_Type1*)this->unk_28[0];
+    unk_28_0 = (UnkStruct_020397f8*)this->mUnk_28[0];
 
-    if (unk_28_0 != NULL && unk_28_0->unk_15C > 0) {
-        unk_28_2 = (MsgProc_Type1*)this->unk_28[2];
+    if (unk_28_0 != NULL && unk_28_0->mUnk_15c > 0) {
+        unk_28_2 = (UnkStruct_020397f8*)this->mUnk_28[2];
 
-        if (unk_28_2 != NULL && unk_28_2->unk_15C > 0) {
-            this->unk_40[0] = this->func_020366c4();
+        if (unk_28_2 != NULL && unk_28_2->mUnk_15c > 0) {
+            this->mUnk_40[0] = this->func_020366c4();
         } else {
-            this->unk_40[0] = unk_28_2;
+            this->mUnk_40[0] = unk_28_2;
         }
     } else {
-        unk_28_2 = (MsgProc_Type1*)this->unk_28[2];
+        unk_28_2 = (UnkStruct_020397f8*)this->mUnk_28[2];
 
-        if (unk_28_2 != NULL && unk_28_2->unk_15C > 0) {
-            this->unk_40[0] = unk_28_0;
+        if (unk_28_2 != NULL && unk_28_2->mUnk_15c > 0) {
+            this->mUnk_40[0] = unk_28_0;
         } else {
-            this->unk_40[0] = NULL;
+            this->mUnk_40[0] = NULL;
         }
     }
 
     iVar1 = this->func_02036824();
     iVar2 = this->func_02036850();
 
-    if (this->unk_20[1] != NULL && ((this->unk_20[1]->unk_18 & ~0xFFFF) != (0x100 << 0x10))) {
-        this->unk_20[1]->vfunc_10();
-        this->unk_20[1] = NULL;
+    if (this->mUnk_20[1] != NULL && ((this->mUnk_20[1]->mUnk_18 & ~0xFFFF) != (0x100 << 0x10))) {
+        this->mUnk_20[1]->vfunc_10();
+        this->mUnk_20[1] = NULL;
     }
 
     if (iVar1) {
-        this->func_02036888(this->unk_18[0]);
+        this->func_02036888(this->mUnk_18[0]);
     } else if (iVar2) {
-        this->func_02036888(this->unk_18[1]);
+        this->func_02036888(this->mUnk_18[1]);
     }
 
-    for (i = 0; i < ARRAY_LEN(this->unk_28); i++) {
-        if (this->unk_28[i] != NULL) {
-            this->unk_28[i]->vfunc_2C();
+    for (i = 0; i < ARRAY_LEN(this->mUnk_28); i++) {
+        if (this->mUnk_28[i] != NULL) {
+            this->mUnk_28[i]->vfunc_2C();
         }
     }
 
-    this->unk_04 = 0;
+    this->mUnk_04 = 0;
 
-    if (this->unk_20[0] != NULL) {
-        if ((this->unk_20[0]->unk_18 & ~0xFFFF) == (0x100 << 0x10)) {
-            this->unk_20[0] = NULL;
+    if (this->mUnk_20[0] != NULL) {
+        if ((this->mUnk_20[0]->mUnk_18 & ~0xFFFF) == (0x100 << 0x10)) {
+            this->mUnk_20[0] = NULL;
         } else {
-            this->unk_04 = 1;
+            this->mUnk_04 = 1;
         }
     }
 
-    if ((this->unk_18[0] != NULL) && ((this->unk_18[0]->unk_18 & ~0xFFFF) != (0x100 << 0x10))) {
-        this->unk_04 = 1;
+    if ((this->mUnk_18[0] != NULL) && ((this->mUnk_18[0]->mUnk_18 & ~0xFFFF) != (0x100 << 0x10))) {
+        this->mUnk_04 = 1;
 
         //! TODO: fake?
-        pSVar4 = this->func_02037178((UnkSubClass1_02256FF8*)this->unk_18[0]);
+        pSVar4 = this->func_02037178((UnkSubClass1_02256FF8*)this->mUnk_18[0]);
 
-        if (data_027e0c54 != 0 && pSVar4 != NULL && pSVar4->unk_50 != ((data_02056be4[data_027e077c.mUnk_0] & 1) != 0)) {
-            this->unk_04 = 0;
+        if (data_027e0c54 != 0 && pSVar4 != NULL && pSVar4->mUnk_50 != ((data_02056be4[data_027e077c.mUnk_0] & 1) != 0)) {
+            this->mUnk_04 = 0;
         }
     }
 
-    if (this->unk_08 != NULL && this->unk_08->unk_15C > 0) {
-        this->unk_04 = 1;
+    if (this->mUnk_08 != NULL && this->mUnk_08->mUnk_15c > 0) {
+        this->mUnk_04 = 1;
     } else {
-        this->unk_08 = NULL;
+        this->mUnk_08 = NULL;
     }
 
     this->func_02036bbc();
 
-    if (this->unk_10 != 0) {
-        ActorManager::FindActorByType(&actorRef, gActorManager, data_0205691c[this->unk_10]);
+    if (this->mUnk_10 != 0) {
+        ActorManager::FindActorByType(&actorRef, gActorManager, data_0205691c[this->mUnk_10]);
         pActor = gActorManager->GetActor(&actorRef);
 
         if (pActor != NULL) {
-            func_ov000_020cec60(data_027e0ffc, data_02056918[this->unk_10], &pActor->mPos, pActor, 0);
+            func_ov000_020cec60(data_027e0ffc, data_02056918[this->mUnk_10], &pActor->mPos, pActor, 0);
         }
     }
 }
 
 ARM void UnkStruct_027E0C68::func_02036bbc(void) {
-    MsgProc_Main* pSVar3;
+    UnkStruct_02038aa0* pSVar3;
     bool bVar2;
     bool bVar4;
     s32 i;
 
-    if (data_027e0d04.unk_00 > 0) {
+    if (data_027e0d04.mUnk_00 > 0) {
         return;
     }
 
     bVar2 = this->func_02036824();
     bVar4 = this->func_02036850();
 
-    for (i = 0; i < ARRAY_LEN(this->unk_28); i++) {
-        pSVar3 = this->unk_28[i];
+    for (i = 0; i < ARRAY_LEN(this->mUnk_28); i++) {
+        pSVar3 = this->mUnk_28[i];
 
-        if (pSVar3 != NULL && ((bVar2 && pSVar3->unk_50 == 0) || (bVar4 && pSVar3->unk_50 != 0))) {
+        if (pSVar3 != NULL && ((bVar2 && pSVar3->mUnk_50 == 0) || (bVar4 && pSVar3->mUnk_50 != 0))) {
             pSVar3->vfunc_44(data_027e0d78.mTouchLastX, data_027e0d78.mTouchLastY);
         }
     }
@@ -356,9 +357,9 @@ ARM void UnkStruct_027E0C68::func_02036bbc(void) {
 ARM void UnkStruct_027E0C68::func_02036c50(unk32 param_2) {
     s32 i;
 
-    for (i = 0; i < ARRAY_LEN(this->unk_28); i++) {
-        if (this->unk_28[i] != NULL && this->unk_28[i]->func_0203de14(param_2) != 0) {
-            this->unk_28[i]->vfunc_28();
+    for (i = 0; i < ARRAY_LEN(this->mUnk_28); i++) {
+        if (this->mUnk_28[i] != NULL && this->mUnk_28[i]->func_0203de14(param_2) != 0) {
+            this->mUnk_28[i]->vfunc_28();
         }
     }
 }
@@ -366,8 +367,8 @@ ARM void UnkStruct_027E0C68::func_02036c50(unk32 param_2) {
 ARM void UnkStruct_027E0C68::func_02036ca4(unk32 param_2) {
     s32 i;
 
-    for (i = 0; i < ARRAY_LEN(this->unk_28); i++) {
-        MsgProc_Main* pSVar1 = this->unk_28[i];
+    for (i = 0; i < ARRAY_LEN(this->mUnk_28); i++) {
+        UnkStruct_02038aa0* pSVar1 = this->mUnk_28[i];
 
         if (pSVar1 != NULL) {
             pSVar1->vfunc_3C(param_2);
@@ -393,17 +394,17 @@ ARM bool UnkStruct_027E0C68::func_02036ce4(UnkStruct_020386d8* param_2, unk32 pa
 }
 
 ARM bool UnkStruct_027E0C68::func_02036d30(UnkStruct_02037750* param_2) {
-    if (this->unk_20[0] != NULL && this->unk_20[0] != param_2) {
+    if (this->mUnk_20[0] != NULL && this->mUnk_20[0] != param_2) {
         return false;
     }
 
-    this->unk_20[0] = param_2;
+    this->mUnk_20[0] = param_2;
     return true;
 }
 
 ARM bool UnkStruct_027E0C68::func_02036d4c(UnkStruct_02037750* param_2) {
-    if (this->unk_20[0] == param_2) {
-        this->unk_20[0] = NULL;
+    if (this->mUnk_20[0] == param_2) {
+        this->mUnk_20[0] = NULL;
         return true;
     }
 
@@ -413,18 +414,18 @@ ARM bool UnkStruct_027E0C68::func_02036d4c(UnkStruct_02037750* param_2) {
 ARM void UnkStruct_027E0C68::func_02036d6c(void) {
     s32 i;
 
-    for (i = 0; i < ARRAY_LEN(this->unk_28); i++) {
+    for (i = 0; i < ARRAY_LEN(this->mUnk_28); i++) {
         if (func_0202ab48() == 0 || i != 5) {
-            this->unk_28[i]->func_02038b40();
+            this->mUnk_28[i]->func_02038b40();
         }
     }
 }
 
 // non-matching
-ARM MsgProc_Main* UnkStruct_027E0C68::func_02036da8(u32 param_2, s16* param_3) {
+ARM UnkStruct_02038aa0* UnkStruct_027E0C68::func_02036da8(u32 param_2, s16* param_3) {
     EntryINF1 *pEVar1;
     EntryINF1 *pEVar2;
-    MsgProc_Main *pSVar4;
+    UnkStruct_02038aa0 *pSVar4;
     BMGGroups *pBVar5;
     bool bVar6;
     s16 iStack_38;
@@ -438,7 +439,7 @@ ARM MsgProc_Main* UnkStruct_027E0C68::func_02036da8(u32 param_2, s16* param_3) {
     }
 
     if ((data_02056be4[data_027e077c.mUnk_0] & 1) == 0) {
-        pSVar4 = this->unk_28[4];
+        pSVar4 = this->mUnk_28[4];
         func_02037628((u8*)&iStack_38);
 
         // ???
@@ -470,7 +471,7 @@ ARM MsgProc_Main* UnkStruct_027E0C68::func_02036da8(u32 param_2, s16* param_3) {
 
 // non-matching
 ARM void UnkStruct_027E0C68::func_02036edc(u32 param_2, u8 param_3) {
-    MsgProc_Type1 *pSVar1;
+    UnkStruct_020397f8 *pSVar1;
     u8 auStack_28[24];
     u8 local_13;
 
@@ -486,19 +487,19 @@ ARM void UnkStruct_027E0C68::func_02036edc(u32 param_2, u8 param_3) {
     pSVar1 = this->func_02036f68(param_2, auStack_28);
 
     if (pSVar1 != NULL) {
-        if (this->unk_04 == 0) {
-            this->unk_08 = pSVar1;
+        if (this->mUnk_04 == 0) {
+            this->mUnk_08 = pSVar1;
         }
     }
 }
 
 // non-matching
-ARM MsgProc_Type1* UnkStruct_027E0C68::func_02036f68(u32 param_2, u8* param_3) {
+ARM UnkStruct_020397f8* UnkStruct_027E0C68::func_02036f68(u32 param_2, u8* param_3) {
     EntryINF1 *pEVar1;
-    MsgProc_Main *pSVar2;
+    UnkStruct_02038aa0 *pSVar2;
     EntryINF1 *pEVar3;
     int iVar4;
-    MsgProc_Type1 *pSVar5;
+    UnkStruct_020397f8 *pSVar5;
     
     pEVar1 = func_02037258(&this->pGroups->entries[param_2 >> 0x10], param_2 & 0xffff);
 
@@ -507,18 +508,18 @@ ARM MsgProc_Type1* UnkStruct_027E0C68::func_02036f68(u32 param_2, u8* param_3) {
     }
 
     if (param_3[21] != 0) {
-        pSVar5 = (MsgProc_Type1*)this->unk_28[2];
-        pSVar2 = this->unk_28[3];
+        pSVar5 = (UnkStruct_020397f8*)this->mUnk_28[2];
+        pSVar2 = this->mUnk_28[3];
     } else {
-        pSVar5 = (MsgProc_Type1*)this->unk_28[0];
-        pSVar2 = this->unk_28[1];
+        pSVar5 = (UnkStruct_020397f8*)this->mUnk_28[0];
+        pSVar2 = this->mUnk_28[1];
     }
 
     //! TODO: fake?
-    pSVar5->unk_164 = (MsgProc_Type1*)pSVar2;
-    pSVar5->unk_418 = this->unk_28[5];
+    pSVar5->mUnk_164 = (UnkStruct_020397f8*)pSVar2;
+    pSVar5->mUnk_418 = this->mUnk_28[5];
 
-    pSVar5->vfunc_50(pEVar1, BMG_GET_MSG_ADDR(this->pGroups, param_2), (s16*)param_3, 0);
+    pSVar5->vfunc_50(pEVar1, BMG_GET_MSG_ADDR(this->pGroups, param_2), (s32)param_3, 0);
 
     if (data_ov000_020eec9c.func_ov000_020d7f18(0x19) == 0 && data_ov000_020eec9c.func_ov000_020d7f18(0x18) == 0 &&
         data_ov000_020eec9c.func_ov000_020d7f18(0x34) == 0 && data_ov000_020eec9c.func_ov000_020d7f18(0x35) == 0 &&
@@ -538,18 +539,18 @@ ARM UnkStruct_020386d8* UnkStruct_027E0C68::func_020370e8(unk32 param_2, unk16 p
     UnkStruct_020386d8* puVar2;
 
     if (this->func_02036824()) {
-        puVar2 = this->unk_18[0];
+        puVar2 = this->mUnk_18[0];
     } else {
         if (this->func_02036850()) {
-            puVar2 = this->unk_18[1];
+            puVar2 = this->mUnk_18[1];
         } else {
             return NULL;
         }
     }
 
-    puVar2->unk_30 = param_5;
-    puVar2->unk_34 = param_3;
-    puVar2->unk_36 = param_4;
+    puVar2->mUnk_30 = param_5;
+    puVar2->mUnk_34 = param_3;
+    puVar2->mUnk_36 = param_4;
 
     if (this->func_02036ce4(puVar2, param_2)) {
         return puVar2;
@@ -559,7 +560,7 @@ ARM UnkStruct_020386d8* UnkStruct_027E0C68::func_020370e8(unk32 param_2, unk16 p
 }
 
 ARM void UnkStruct_027E0C68::func_02037158(UnkSubClass1_02256FF8* param_2) {
-    MsgProc_Main* pSVar1;
+    UnkStruct_02038aa0* pSVar1;
 
     pSVar1 = this->func_02037178(param_2);
 
@@ -568,12 +569,12 @@ ARM void UnkStruct_027E0C68::func_02037158(UnkSubClass1_02256FF8* param_2) {
     }
 }
 
-ARM MsgProc_Main* UnkStruct_027E0C68::func_02037178(UnkSubClass1_02256FF8* param_2) {
+ARM UnkStruct_02038aa0* UnkStruct_027E0C68::func_02037178(UnkSubClass1_02256FF8* param_2) {
     s32 i;
 
-    for (i = 0; i < ARRAY_LEN(this->unk_28); i++) {
-        if (this->unk_28[i] != NULL && this->unk_28[i]->unk_08 == param_2) {
-            return this->unk_28[i];
+    for (i = 0; i < ARRAY_LEN(this->mUnk_28); i++) {
+        if (this->mUnk_28[i] != NULL && this->mUnk_28[i]->mUnk_08 == param_2) {
+            return this->mUnk_28[i];
         }
     }
 
diff --git a/src/Main/Message/func_0203c358.cpp b/src/Main/Message/func_0203c358.cpp
index da640dee..b7dce41b 100644
--- a/src/Main/Message/func_0203c358.cpp
+++ b/src/Main/Message/func_0203c358.cpp
@@ -10,13 +10,13 @@
 THUMB MsgProc_Type2::MsgProc_Type2(unk32 param_2, unk16 param_3, unk32 param_4) :
     UnkStruct_02038aa0(0, 0)    
 {
-    this->unk_162 = 4;
-    this->unk_164 = 1;
-    this->unk_166 = 0;
-    this->unk_168 = -1;
-    this->unk_16A = 0;
-    this->unk_16C = 1;
-    this->unk_16E = 0;
+    this->mUnk_162 = 4;
+    this->mUnk_164 = 1;
+    this->mUnk_166 = 0;
+    this->mUnk_168 = -1;
+    this->mUnk_16a = 0;
+    this->mUnk_16c = 1;
+    this->mUnk_16e = 0;
 }
 
 // non-matching
@@ -47,13 +47,13 @@ THUMB void MsgProc_Type2::func_0203c39c(unk32 param_2, unk32 param_3) {
         }
     }
 
-    if (this->unk_114->vfunc_08(this, uVar3) != 0) {
-        this->unk_10 = this->unk_114->func_0203d1b4();
+    if (this->mUnk_114->vfunc_08(this, uVar3) != 0) {
+        this->mUnk_10 = this->mUnk_114->func_0203d1b4();
     }
 }
 
 ARM void MsgProc_Type2::vfunc_3C(unk32 param_2) {
-    if (this->unk_15C > 0 && this->unk_122 != 1) {
+    if (this->mUnk_15c > 0 && this->mUnk_122 != 1) {
         if (this->func_0203de14(param_2) != 0) {
             this->vfunc_40(0, 0);
         }
@@ -64,7 +64,7 @@ ARM void MsgProc_Type2::vfunc_40(unk32 param_2, unk32 param_3) {
     param_2 += this->mUnk_166;
     param_3 += this->mUnk_168;
 
-    this->func_0203c4ac(param_2 + this->unk_16A, param_3 + this->unk_16C);
+    this->func_0203c4ac(param_2 + this->mUnk_16a, param_3 + this->mUnk_16c);
     this->func_02038ef4(param_2, param_3);
 }
 
@@ -72,7 +72,7 @@ ARM void MsgProc_Type2::vfunc_40(unk32 param_2, unk32 param_3) {
 extern "C" bool func_0203dcb4(unk32);
 // non-matching
 ARM bool MsgProc_Type2::vfunc_14(unk32 param_2, unk32 param_3) {
-    return func_0203dcb4(param_2 + this->unk_162);
+    return func_0203dcb4(param_2 + this->mUnk_162);
 }
 
 ARM MsgProc_Type2::~MsgProc_Type2() {
diff --git a/src/Main/Message/func_0203c72c.cpp b/src/Main/Message/func_0203c72c.cpp
index ba2a2188..9c5282f1 100644
--- a/src/Main/Message/func_0203c72c.cpp
+++ b/src/Main/Message/func_0203c72c.cpp
@@ -13,22 +13,22 @@ extern "C" void func_0204f614(UnkClass_func_ov000_020d0644*, unk32, unk32, void*
 ARM MsgProc_Type3::MsgProc_Type3(unk32 param_2, unk16 param_3, unk32 param_4) :
     UnkStruct_02038aa0(1, 0)
 {
-    this->unk_162 = 1;
-    this->unk_164 = 0x1A;
-    this->unk_166 = 0xA6;
-    this->unk_168 = 0x1D;
-    this->unk_16A = 0;
-    this->unk_16C = 1;
-    this->unk_170 = -1;
-    this->unk_172 = -1;
-    this->unk_174 = -1;
+    this->mUnk_162 = 1;
+    this->mUnk_164 = 0x1A;
+    this->mUnk_166 = 0xA6;
+    this->mUnk_168 = 0x1D;
+    this->mUnk_16a = 0;
+    this->mUnk_16c = 1;
+    this->mUnk_170 = -1;
+    this->mUnk_172 = -1;
+    this->mUnk_174 = -1;
 
-    func_0204f614(this->unk_180, ARRAY_LEN(this->unk_180), sizeof(UnkClass_func_ov000_020d0644), UnkClass_func_ov000_020d0644::func_020d060c, this->func_0203c83c);
+    func_0204f614(this->mUnk_180, ARRAY_LEN(this->mUnk_180), sizeof(UnkClass_func_ov000_020d0644), UnkClass_func_ov000_020d0644::func_020d060c, this->func_0203c83c);
 
-    this->unk_180[0].func_ov000_020d0644(0x1E, 0, 0x8A, 0, 0);
-    this->unk_180[1].func_ov000_020d0644(0x1E, 1, 0x8B, 0, 0);
-    this->unk_180[2].func_ov000_020d0644(0x1E, 2, 0x8C, 0, 0);
-    this->unk_180[3].func_ov000_020d0644(0x1E, 3, 0x8D, 0, 0);
+    this->mUnk_180[0].func_ov000_020d0644(0x1E, 0, 0x8A, 0, 0);
+    this->mUnk_180[1].func_ov000_020d0644(0x1E, 1, 0x8B, 0, 0);
+    this->mUnk_180[2].func_ov000_020d0644(0x1E, 2, 0x8C, 0, 0);
+    this->mUnk_180[3].func_ov000_020d0644(0x1E, 3, 0x8D, 0, 0);
 }
 
 ARM void MsgProc_Type3::func_0203c83c(void) {