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

1 files changed, 37 insertions, 36 deletions

diff --git a/src/Main/Unknown/UnkStruct_02032f0c.cpp b/src/Main/Unknown/UnkStruct_02032f0c.cpp
index 7537c3c5..dc4dda7f 100644
--- a/src/Main/Unknown/UnkStruct_02032f0c.cpp
+++ b/src/Main/Unknown/UnkStruct_02032f0c.cpp
@@ -1,44 +1,45 @@
 #include "Unknown/UnkStruct_02032f0c.hpp"
+#include "Unknown/UnkStruct_02035064.hpp"
 
 extern "C" void func_020078f4(unk32, void*, unk32);
 extern "C" void func_020078c0(unk32, void*, unk32);
 extern "C" void func_020296e0(unk32**, UnkStruct_MsgProc_Base_unk_2C*, u8, u8, unk32, u8);
-
+extern THUMB unk32 func_0202ab48(void);
 
 ARM UnkStruct_02032e7c::UnkStruct_02032e7c() {
-    this->unk_00 = NULL;
-    this->unk_08 = 0;
-    this->unk_0A = 0;
-    this->unk_0C = 0;
-    this->unk_0E = 0;
+    this->mUnk_04 = NULL;
+    this->mUnk_08 = 0;
+    this->mUnk_0a = 0;
+    this->mUnk_0c = 0;
+    this->mUnk_0e = 0;
 
     if (func_0202ab48() == 0) {
-        this->unk_10 = 2;
+        this->mUnk_10 = 2;
     } else {
-        this->unk_10 = 3;
+        this->mUnk_10 = 3;
     }
 }
 
 THUMB UnkStruct_02032f0c::UnkStruct_02032f0c() {
-    this->unk_04 = 0;
-    this->unk_08 = 0;
-    this->unk_0C = NULL;
-    this->unk_38 = 0;
-    this->unk_3C = 0;
-    this->unk_4A = 0;
-    this->unk_4C = 0;
-    this->unk_4D = 0;
-    this->unk_4E = 0;
-    this->unk_4F = 0;
-    this->unk_50 = 0;
-    this->unk_51 = 0;
-    func_020078f4(0, &this->unk_10, 0x18);
-    func_020078f4(0, &this->unk_28, 0x10);
-    func_020078c0(0, &this->unk_3E, 0xC);
-    this->unk_10 = NULL;
-    this->unk_2C = NULL;
-    this->unk_30 = 2;
-    this->unk_34 = 3;
+    this->mUnk_04 = 0;
+    this->mUnk_08 = 0;
+    this->mUnk_0c = NULL;
+    this->mUnk_38 = 0;
+    this->mUnk_3c = 0;
+    this->mUnk_4a = 0;
+    this->mUnk_4c = 0;
+    this->mUnk_4d = 0;
+    this->mUnk_4e = 0;
+    this->mUnk_4f = 0;
+    this->mUnk_50 = 0;
+    this->mUnk_51 = 0;
+    func_020078f4(0, &this->mUnk_10, 0x18);
+    func_020078f4(0, &this->mUnk_28, 0x10);
+    func_020078c0(0, &this->mUnk_3e, 0xC);
+    this->mUnk_10 = NULL;
+    this->mUnk_2c = NULL;
+    this->mUnk_30 = 2;
+    this->mUnk_34 = 3;
 }
 
 THUMB UnkStruct_02032f0c::~UnkStruct_02032f0c() {
@@ -47,16 +48,16 @@ THUMB UnkStruct_02032f0c::~UnkStruct_02032f0c() {
 ARM void UnkStruct_02032f0c::func_02032f94() {}
 
 ARM u16 **UnkStruct_02032f0c::SetUnk_0c(u16 *value) {
-    this->unk_0C = value;
+    this->mUnk_0c = value;
     return &this->mUnk_0c;
 }
 
 ARM u8 UnkStruct_02032f0c::func_02032fa4() {
-    return UnkStruct_02035064::func_02035428(this->unk_50);
+    return UnkStruct_02035064::func_02035428(this->mUnk_50);
 }
 
 ARM s32 UnkStruct_02032f0c::func_02032fb4() {
-    return this->unk_2C[0]->unk_01 + this->mUnk_34;
+    return this->mUnk_2c[0]->mUnk_01 + this->mUnk_34;
 }
 
 // non-matching
@@ -66,10 +67,10 @@ ARM bool UnkStruct_02032f0c::vfunc_14(s32 param1, s32 param2) {
     
     iVar1 = ((param1 + 0x7 + ((param1 + 0x7) >> 0x1D)) ) * 0x8;
     iVar2 = ((param2 + 0x7 + ((param2 + 0x7) >> 0x1D)) ) * 0x8;
-    this->unk_4A = param1;
-    this->unk_4C = param2;
-    this->unk_14 = (iVar1 + (iVar1 >> 0x1D)) * 0x2000 >> 0x10;
-    this->unk_18 = (iVar2 + (iVar2 >> 0x1D)) * 0x2000 >> 0x10;
+    this->mUnk_4a = param1;
+    this->mUnk_4c = param2;
+    this->mUnk_14 = (iVar1 + (iVar1 >> 0x1D)) * 0x2000 >> 0x10;
+    this->mUnk_18 = (iVar2 + (iVar2 >> 0x1D)) * 0x2000 >> 0x10;
 
     return true;
 }
@@ -77,7 +78,7 @@ ARM bool UnkStruct_02032f0c::vfunc_14(s32 param1, s32 param2) {
 ARM void UnkStruct_02032f0c::vfunc_08(s32 param1, unk32 param2, s16 *param3, unk32 param4) {}
 
 ARM void UnkStruct_02032f0c::vfunc_0c(unk32 param1, unk32 param2, unk32 param3, unk32 param4) {
-    func_020296e0(&this->unk_10, this->unk_2C, param1, param2, param4, param3);
+    func_020296e0(&this->mUnk_10, *this->mUnk_2c, param1, param2, param4, param3);
 }
 
 ARM void UnkStruct_02032f0c::vfunc_10(u32 param1, unk32 param2) {}
@@ -91,7 +92,7 @@ ARM u32 UnkStruct_02032f0c::func_0203369c(u16 *param1, s32 param2) {}
 ARM void UnkStruct_02032f0c::func_02033780(s32 param1) {}
 
 ARM s32 UnkStruct_02032f0c::func_020337d8(s32 param1) {
-    return this->unk_2C[0]->unk_08[1] * param1 + (param1 - 1) * this->mUnk_34;
+    return this->mUnk_2c[0]->mUnk_08[1] * param1 + (param1 - 1) * this->mUnk_34;
 }
 
 ARM s32 UnkStruct_02032f0c::func_020337fc(s16 *param1, s32 param2) {}