1 files changed, 27 insertions, 24 deletions

diff --git a/src/Main/Unknown/UnkStruct_0203dae0.cpp b/src/Main/Unknown/UnkStruct_0203dae0.cpp
index 40192b2a..8e39ed05 100644
--- a/src/Main/Unknown/UnkStruct_0203dae0.cpp
+++ b/src/Main/Unknown/UnkStruct_0203dae0.cpp
@@ -3,31 +3,32 @@
 
 extern u32 *data_027e0ce0[];
 extern "C" void func_02007938(unk32, unk16*, unk32, unk32, unk32);
+extern "C" void func_0203fc78(unk32*, unk32*);
 
 // non-matching
 THUMB UnkStruct_0203dae0::UnkStruct_0203dae0(u8 param1) {
-    this->unk_114 = NULL;
-    this->unk_118 = -1;
-    this->unk_11C = 0;
-    this->unk_11E = 0;
-    this->unk_11F = 0;
-    this->unk_120 = 1;
-    this->unk_121 = param_2;
-    this->unk_122 = 0;
+    this->mUnk_114 = NULL;
+    this->mUnk_118 = -1;
+    this->mUnk_11c = 0;
+    this->mUnk_11e = 0;
+    this->mUnk_11f = 0;
+    this->mUnk_120 = 1;
+    this->mUnk_121 = param1;
+    this->mUnk_122 = 0;
 
-    func_02007938(0, &this->unk_54, 0xC0, 1, param_4);
+    // func_02007938(0, &this->mUnk_54, 0xC0, 1, param_4);
 
-    if (this->unk_121 == 0) {
-        this->unk_114 = new(data_027e0ce0[0], 4) MsgProc_Base2_unk_114();
+    if (this->mUnk_121 == 0) {
+        this->mUnk_114 = new(data_027e0ce0[0], 4) UnkStruct_0203dae0_114();
     } else {
-        this->unk_114 = new(data_027e0ce0[1], 4) MsgProc_Base2_unk_114();
+        this->mUnk_114 = new(data_027e0ce0[1], 4) UnkStruct_0203dae0_114();
     }
 }
 
 THUMB UnkStruct_0203dae0::~UnkStruct_0203dae0() {
-    if (this->unk_114 != NULL) {
+    if (this->mUnk_114 != NULL) {
         delete this->mUnk_114;
-        this->unk_114 = NULL;
+        this->mUnk_114 = NULL;
     }
 }
 
@@ -40,13 +41,13 @@ ARM bool UnkStruct_0203dae0::vfunc_14(s32 param1, s32 param2) {
     unk32 local_c;
     unk32 local_10;
 
-    local_c = param_2;
-    local_10 = param_3;
+    local_c = param1;
+    local_10 = param2;
 
     this->func_02032fa4();
-    this->func_0203fc78(&local_c, &local_10);
+    func_0203fc78(&local_c, &local_10);
     this->func_02032fcc(local_c, local_10);
-    this->unk_10 = 0;
+    this->mUnk_10 = 0;
     return true;
 }
 
@@ -57,18 +58,20 @@ ARM void UnkStruct_0203dae0::func_0203de14() {}
 ARM s32 UnkStruct_0203dae0::func_0203de24() {}
 ARM bool UnkStruct_0203dae0::func_0203de58(s32 param1) {}
 
+// non-matching
 ARM void UnkStruct_0203dae0::vfunc_10(u32 param1, unk32 param2) {
-    param_1->func_0203dc10(1, param_3);
-    param_1->unk_11E = param_2;
-    param_1->unk_118 = -1;
-    param_1->func_020331c4(param_2, -1);
+    // this->func_0203dc10(1, param2);
+    this->mUnk_11e = param1;
+    this->mUnk_118 = -1;
+    // this->func_020331c4(param1, -1);
 }
 
 ARM void UnkStruct_0203dae0::vfunc_30() {}
 
+// non-matching?
 ARM bool UnkStruct_0203dae0::vfunc_28() {
-    if (this->unk_122 != 0) {
-        this->func_0203e0f8();
+    if (this->mUnk_122 != 0) {
+        this->func_0203e0f8(0, 0);
         this->func_0203dc10(0);
         return true;
     }