post-update cleanup: step 2

1 files changed, 85 insertions, 23 deletions

diff --git a/src/Main/Unknown/UnkStruct_0203dae0.cpp b/src/Main/Unknown/UnkStruct_0203dae0.cpp
index 5d19b0b3..40192b2a 100644
--- a/src/Main/Unknown/UnkStruct_0203dae0.cpp
+++ b/src/Main/Unknown/UnkStruct_0203dae0.cpp
@@ -1,25 +1,87 @@
 #include "Unknown/UnkStruct_0203dae0.hpp"
+#include "System/SysNew.hpp"
 
-UnkStruct_0203dae0::UnkStruct_0203dae0(u8 param1) {}
-UnkStruct_0203dae0::~UnkStruct_0203dae0() {}
-void UnkStruct_0203dae0::func_0203dc10(s32 param1) {}
-bool UnkStruct_0203dae0::func_0203dc74(s32 param1, s32 param2) {}
-bool UnkStruct_0203dae0::vfunc_14(s32 param1, s32 param2) {}
-void UnkStruct_0203dae0::func_0203dcfc(u8 param1, unk32 param2, unk32 param3, s32 param4) {}
-void UnkStruct_0203dae0::func_0203ddec() {}
-void UnkStruct_0203dae0::func_0203ddfc() {}
-void UnkStruct_0203dae0::func_0203de14() {}
-s32 UnkStruct_0203dae0::func_0203de24() {}
-bool UnkStruct_0203dae0::func_0203de58(s32 param1) {}
-void UnkStruct_0203dae0::vfunc_10(u32 param1, unk32 param2) {}
-void UnkStruct_0203dae0::vfunc_30() {}
-bool UnkStruct_0203dae0::vfunc_28() {}
-bool UnkStruct_0203dae0::func_0203e0f8(unk32 param1, s32 param2) {}
-void UnkStruct_0203dae0::vfunc_2c() {}
-bool UnkStruct_0203dae0::func_0203e1b0(unk32 param1, unk32 param2, s32 param3) {}
-unk32 UnkStruct_0203dae0::vfunc_18(s32 param1) {}
-void UnkStruct_0203dae0::vfunc_08(s32 param1, unk32 param2, s16 *param3, unk32 param4) {}
-void UnkStruct_0203dae0::func_0203e2e8(s32 param1, s32 param2, unk32 param3, u32 param4) {}
-void UnkStruct_0203dae0::func_0203e510(s32 *param1, s32 param2, s32 param3) {}
-void UnkStruct_0203dae0::func_0203e62c(s32 *param1, s32 param2) {}
-bool UnkStruct_0203dae0::func_0203e6e4(u32 param1, u32 param2, s32 param3) {}
+extern u32 *data_027e0ce0[];
+extern "C" void func_02007938(unk32, unk16*, unk32, 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;
+
+    func_02007938(0, &this->unk_54, 0xC0, 1, param_4);
+
+    if (this->unk_121 == 0) {
+        this->unk_114 = new(data_027e0ce0[0], 4) MsgProc_Base2_unk_114();
+    } else {
+        this->unk_114 = new(data_027e0ce0[1], 4) MsgProc_Base2_unk_114();
+    }
+}
+
+THUMB UnkStruct_0203dae0::~UnkStruct_0203dae0() {
+    if (this->unk_114 != NULL) {
+        delete this->mUnk_114;
+        this->unk_114 = NULL;
+    }
+}
+
+ARM void UnkStruct_0203dae0::func_0203dc10(s32 param1) {}
+ARM bool UnkStruct_0203dae0::func_0203dc74(s32 param1, s32 param2) {}
+
+// non-matching
+ARM bool UnkStruct_0203dae0::vfunc_14(s32 param1, s32 param2) {
+    unk32 uVar1;
+    unk32 local_c;
+    unk32 local_10;
+
+    local_c = param_2;
+    local_10 = param_3;
+
+    this->func_02032fa4();
+    this->func_0203fc78(&local_c, &local_10);
+    this->func_02032fcc(local_c, local_10);
+    this->unk_10 = 0;
+    return true;
+}
+
+ARM void UnkStruct_0203dae0::func_0203dcfc(u8 param1, unk32 param2, unk32 param3, s32 param4) {}
+ARM void UnkStruct_0203dae0::func_0203ddec() {}
+ARM void UnkStruct_0203dae0::func_0203ddfc() {}
+ARM void UnkStruct_0203dae0::func_0203de14() {}
+ARM s32 UnkStruct_0203dae0::func_0203de24() {}
+ARM bool UnkStruct_0203dae0::func_0203de58(s32 param1) {}
+
+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);
+}
+
+ARM void UnkStruct_0203dae0::vfunc_30() {}
+
+ARM bool UnkStruct_0203dae0::vfunc_28() {
+    if (this->unk_122 != 0) {
+        this->func_0203e0f8();
+        this->func_0203dc10(0);
+        return true;
+    }
+
+    return false;
+}
+
+ARM bool UnkStruct_0203dae0::func_0203e0f8(unk32 param1, s32 param2) {}
+ARM void UnkStruct_0203dae0::vfunc_2c() {}
+ARM bool UnkStruct_0203dae0::func_0203e1b0(unk32 param1, unk32 param2, s32 param3) {}
+ARM unk32 UnkStruct_0203dae0::vfunc_18(s32 param1) {}
+ARM void UnkStruct_0203dae0::vfunc_08(s32 param1, unk32 param2, s16 *param3, unk32 param4) {}
+ARM void UnkStruct_0203dae0::func_0203e2e8(s32 param1, s32 param2, unk32 param3, u32 param4) {}
+ARM void UnkStruct_0203dae0::func_0203e510(s32 *param1, s32 param2, s32 param3) {}
+ARM void UnkStruct_0203dae0::func_0203e62c(s32 *param1, s32 param2) {}
+ARM bool UnkStruct_0203dae0::func_0203e6e4(u32 param1, u32 param2, s32 param3) {}