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

1 files changed, 58 insertions, 56 deletions

diff --git a/src/Main/Unknown/UnkStruct_02038aa0.cpp b/src/Main/Unknown/UnkStruct_02038aa0.cpp
index 227a4370..899d77f3 100644
--- a/src/Main/Unknown/UnkStruct_02038aa0.cpp
+++ b/src/Main/Unknown/UnkStruct_02038aa0.cpp
@@ -1,11 +1,13 @@
 #include "Unknown/UnkStruct_02038aa0.hpp"
+#include "DTCM/UnkStruct_027e103c.hpp"
+#include "Message/MessageManager.hpp"
 
 ARM UnkStruct_0203881c::UnkStruct_0203881c() {
-    this->unk_14 = 0x1000;
-    this->unk_18 = 0;
-    this->unk_1C = 0;
-    this->unk_20 = 0;
-    this->unk_24 = 0;
+    this->mUnk_14 = 0x1000;
+    this->mUnk_18 = 0;
+    this->mUnk_1c = 0;
+    this->mUnk_20 = 0;
+    this->mUnk_24 = 0;
 }
 
 ARM void UnkStruct_0203881c::func_02038858(unk32 param1) {}
@@ -16,33 +18,33 @@ ARM UnkStruct_0203881c::~UnkStruct_0203881c() {}
 
 THUMB UnkStruct_02038aa0::UnkStruct_02038aa0(u8 param1, u8 param2) :
     UnkStruct_0203dae0(param1), mUnk_124(0) {
-    this->func_020387e0(this->unk_150);
+    this->func_020387e0(this->mUnk_150);
     this->pInfoEntry = 0;
-    this->unk_158.y = 0;
-    this->unk_15C = 0;
-    this->unk_15E = 0xFF;
-    this->unk_15F = 0xFF;
-    this->unk_160 = 1;
-    this->unk_11E = param2;
+    this->mUnk_158.y = 0;
+    this->mUnk_15c = 0;
+    this->mUnk_15e = 0xFF;
+    this->mUnk_15f = 0xFF;
+    this->mUnk_160 = 1;
+    this->mUnk_11e = param2;
 }
 
 THUMB UnkStruct_02038aa0::~UnkStruct_02038aa0() {
 }
 
 THUMB void UnkStruct_02038aa0::func_02038b28(void) {
-    this->unk_114->unk_04 = NULL;
+    this->mUnk_114->mUnk_04 = NULL;
 }
 
 ARM void UnkStruct_02038aa0::func_02038b34(u32 param1, unk32 param2) {
-    MsgProc_Type1::func_0203e060(this, param1, param2);
+    UnkStruct_020397f8::func_0203e060(this, param1, param2);
 }
 
 ARM void UnkStruct_02038aa0::vfunc_4c() {}
 ARM void UnkStruct_02038aa0::vfunc_10(unk32 param1) {}
 
 ARM void UnkStruct_02038aa0::func_02038b40() {
-    this->unk_15C = -1;
-    this->unk_128.unk_00 = NULL;
+    this->mUnk_15c = -1;
+    this->mUnk_128.mUnk_04 = NULL;
     this->func_0203dc10(0);
     this->vfunc_48();
 }
@@ -55,7 +57,7 @@ ARM void UnkStruct_02038aa0::func_02038b74(void) {
 // non-matching
 ARM bool UnkStruct_02038aa0::func_02038b78() {
     if (data_027e0c54 == 0) {
-        if ((this->unk_50 != 0 && data_027e0c68.func_02036850() != 0) || (this->unk_50 == 0 && data_027e0c68.func_02036824() != 0)) {
+        if ((this->mUnk_50 != 0 && data_027e0c68.func_02036850() != 0) || (this->mUnk_50 == 0 && data_027e0c68.func_02036824() != 0)) {
             return true;
         }
 
@@ -63,8 +65,8 @@ ARM bool UnkStruct_02038aa0::func_02038b78() {
     } else {
         bool ret = CHECK_UNK_FLAGS(1);
 
-        if ((this->unk_50 == 0 || ret)) {
-            return (this->unk_50 != 0 && ret);
+        if ((this->mUnk_50 == 0 || ret)) {
+            return (this->mUnk_50 != 0 && ret);
         }
 
         return false;
@@ -79,7 +81,7 @@ ARM unk32 UnkStruct_02038aa0::vfunc_34(s32 param1) {
 
     iVar2 = this->func_02038cf4();
     iVar3 = this->func_02038d10();
-    iVar1 = ((this->unk_158.y - (this->unk_18 << 3) / 2));
+    iVar1 = ((this->mUnk_158.y - (this->mUnk_18 << 3) / 2));
 
     if ((param1 < iVar2 + iVar1) || (iVar2 + iVar3 + iVar1 <= param1)) {
         return -1;
@@ -93,7 +95,7 @@ ARM unk32 UnkStruct_02038aa0::vfunc_34(s32 param1) {
 }
 
 ARM s32 UnkStruct_02038aa0::func_02038cb8(s32 param1) {
-    u8 bVar1 = this->unk_2C[0]->unk_08[1];
+    u8 bVar1 = this->mUnk_2c[0]->mUnk_08[1];
     unk32 iVar2 = this->func_02038cf4();
     unk32 iVar1 = this->func_020337d8(param1 + 1);
     return iVar2 + iVar1 - bVar1;
@@ -109,16 +111,16 @@ ARM s32 UnkStruct_02038aa0::func_02038cf4() {
 }
 
 ARM s32 UnkStruct_02038aa0::func_02038d10() {
-    return this->func_020337d8(this->unk_150[0]);
+    return this->func_020337d8(this->mUnk_150[0]);
 }
 
 ARM void UnkStruct_02038aa0::vfunc_2c() {}
 
 ARM void UnkStruct_02038aa0::vfunc_30() {
-    if (this->unk_15C > 0) {
+    if (this->mUnk_15c > 0) {
         this->func_0203e090();
     } else {
-        this->unk_118 = -1;
+        this->mUnk_118 = -1;
     }
 }
 
@@ -133,22 +135,24 @@ ARM bool UnkStruct_02038aa0::func_02038ef4(s32 param1, s32 param2) {
 ARM void UnkStruct_02038aa0::func_02038f40(void) {
 }
 
+ARM void UnkStruct_02038aa0::vfunc_44(s32 touchLastX, s32 touchLastY) {}
+
 // non-matching
-ARM void UnkStruct_02038aa0::vfunc_44() {
+ARM void UnkStruct_02038aa0::vfunc_50(EntryINF1* param1, u32 param2, s16* param3, UnkSubClass1_02256FF8* param4) {
     int iVar1;
     
-    this->pInfoEntry = param_2;
-    this->unk_08 = param_5;
-    this->unk_15F = -1;
-    this->unk_15C = 0x78;
-    this->unk_15E = param_4->mUnk_0c;
-    this->func_0203dcfc(param_6, 0, this->unk_11E, 2);
-    this->unk_128.func_02038858(param_3);
-    this->unk_30 = this->unk_150[4] + 5;
+    this->pInfoEntry = param1;
+    this->mUnk_08 = param4;
+    this->mUnk_15f = -1;
+    this->mUnk_15c = 0x78;
+    this->mUnk_15e = param4->mUnk_0c;
+    this->func_0203dcfc(0, 0, this->mUnk_11e, 2);
+    this->mUnk_128.func_02038858(param2);
+    this->mUnk_30 = this->mUnk_150[4] + 5;
 
     this->vfunc_54();
-    // this->vfunc_60(0, 0, (unk32)param_4);
-    // this->vfunc_64(param_4);
+    // this->vfunc_60(0, 0, (unk32)param3);
+    // this->vfunc_64(param3);
 
     if (*(unk32*)data_027e0618 == 2) {
         if (this->func_02032fa4() == 0) {
@@ -161,26 +165,24 @@ ARM void UnkStruct_02038aa0::vfunc_44() {
     this->vfunc_5C();
 }
 
-ARM void UnkStruct_02038aa0::vfunc_50(unk32 param1, unk32 param2, s32 param3, unk32 param4) {
-}
-
 // non-matching
-ARM void UnkStruct_02038aa0::vfunc_5c() {
+ARM void UnkStruct_02038aa0::vfunc_5c(u16* param_2, UnkStruct_0203b264* param_3, unk8 param_4, unk32 param_5) {
     u16 sVar1;
     bool bVar5;
     
     sVar1 = param_2[0];
     bVar5 = (sVar1 == 0xA || sVar1 == 0x20) || sVar1 == 0x3000;
 
-    if (bVar5 && this->unk_150[2] != 0) {
-        this->unk_150[2] = 1;
+    if (bVar5 && this->mUnk_150[2] != 0) {
+        this->mUnk_150[2] = 1;
     } else {
-        this->unk_150[2] = 0;
+        this->mUnk_150[2] = 0;
     }
 
-    // this->unk_150[2] = bVar5;
+    // this->mUnk_150[2] = bVar5;
 
-    return this->func_02033360();
+    // return?
+    this->func_02033360();
 }
 
 ARM unk32 UnkStruct_02038aa0::vfunc_1c(s32 param1, unk32 *param2, unk32 param3, unk32 param4) {}
@@ -188,9 +190,9 @@ ARM unk32 UnkStruct_02038aa0::vfunc_20(s32 param1, s32 *param2) {}
 ARM void UnkStruct_02038aa0::func_02039208(unk16 param1) {}
 
 // non-matching
-ARM void UnkStruct_02038aa0::vfunc_08(s32 param1, unk32 param2, s16 *param3, unk32 param4) {
-    this->unk_15C = 10;
-    this->unk_150[2] = 1;
+ARM void UnkStruct_02038aa0::vfunc_08(s32 param1, unk32* param2, s16 *param3, unk32 param4) {
+    this->mUnk_15c = 10;
+    this->mUnk_150[2] = 1;
     this->func_0203e2ac(param2);
 }
 
@@ -201,26 +203,26 @@ ARM void UnkStruct_02038aa0::vfunc_60() {}
 ARM void UnkStruct_02038aa0::vfunc_64() {}
 
 ARM s32 UnkStruct_02038aa0::vfunc_68(unk32 param1) {
-    switch (param_2) {
+    switch (param1) {
         case 0:
             break;
         case 1:
-            this->unk_34 = 4;
+            this->mUnk_34 = 4;
             break;
         case 2:
-            this->unk_34 = 6;
+            this->mUnk_34 = 6;
             break;
         case 3:
-            this->unk_34 = 1;
+            this->mUnk_34 = 1;
             break;
         case 4:
-            this->unk_34 = 0;
+            this->mUnk_34 = 0;
             break;
         default:
             break;
     }
 
-    return ((this->unk_18 << 3) - this->func_020337d8(param1)) / 2;
+    return ((this->mUnk_18 << 3) - this->func_020337d8(param1)) / 2;
 }
 
 ARM void UnkStruct_02038aa0::func_02039440(unk32 param1, unk32 param2) {}
@@ -228,12 +230,12 @@ ARM void UnkStruct_02038aa0::vfunc_6c(s32 *param1, s32 *param2) {}
 
 ARM void UnkStruct_02038aa0::vfunc_70(s32 *param1, s32 *param2) {
     this->vfunc_6C(param1, param2);
-    *param1 += this->unk_158.x;
-    *param2 += this->unk_158.y;
+    *param1 += this->mUnk_158.x;
+    *param2 += this->mUnk_158.y;
 }
 
 ARM bool UnkStruct_02038aa0::func_0203951c() {}
-ARM unk32 UnkStruct_02038aa0::vfunc_38() {}
+ARM bool UnkStruct_02038aa0::vfunc_38() {}
 
 ARM void UnkStruct_02038aa0::vfunc_0c(u8 param_2, u8 param_3, u8 param_4, unk32 param_5) {
     this->func_0203dc10(1, param_3);