more progress

1 files changed, 64 insertions, 19 deletions

diff --git a/src/Main/Unknown/UnkStruct_0203dae0.cpp b/src/Main/Unknown/UnkStruct_0203dae0.cpp
index 8e39ed05..59221042 100644
--- a/src/Main/Unknown/UnkStruct_0203dae0.cpp
+++ b/src/Main/Unknown/UnkStruct_0203dae0.cpp
@@ -2,8 +2,8 @@
 #include "System/SysNew.hpp"
 
 extern u32 *data_027e0ce0[];
-extern "C" void func_02007938(unk32, unk16*, unk32, unk32, unk32);
-extern "C" void func_0203fc78(unk32*, unk32*);
+extern "C" void Fill256(unk32, unk16*, unk32, unk32);
+extern "C" void func_0203fc78(u8, unk32*, unk32*);
 
 // non-matching
 THUMB UnkStruct_0203dae0::UnkStruct_0203dae0(u8 param1) {
@@ -16,10 +16,10 @@ THUMB UnkStruct_0203dae0::UnkStruct_0203dae0(u8 param1) {
     this->mUnk_121 = param1;
     this->mUnk_122 = 0;
 
-    // func_02007938(0, &this->mUnk_54, 0xC0, 1, param_4);
+    Fill256(0, &this->mUnk_54, 0xC0, 1);
 
     if (this->mUnk_121 == 0) {
-        this->mUnk_114 = new(data_027e0ce0[0], 4) UnkStruct_0203dae0_114();
+        this->mUnk_114 = new(data_027e0ce0[1], 4) UnkStruct_0203dae0_114();
     } else {
         this->mUnk_114 = new(data_027e0ce0[1], 4) UnkStruct_0203dae0_114();
     }
@@ -32,46 +32,91 @@ THUMB UnkStruct_0203dae0::~UnkStruct_0203dae0() {
     }
 }
 
-ARM void UnkStruct_0203dae0::func_0203dc10(s32 param1) {}
-ARM bool UnkStruct_0203dae0::func_0203dc74(s32 param1, s32 param2) {}
+// non-matching (regalloc)
+ARM void UnkStruct_0203dae0::func_0203dc10(s32 param1) {
+    if (param1 != 0) {
+        if (this->mUnk_11c == 0x0) {
+            return;
+        }
+
+        if (this->mUnk_114->vfunc_08(this) != 0) {
+            this->mUnk_10 = this->mUnk_114->func_0203d1b4();
+        }
+    } else {
+        this->mUnk_114->vfunc_0c();
+    }
+
+    this->mUnk_122 = param1;
+}
+
+ARM bool UnkStruct_0203dae0::func_0203dc74(s32 param1, s32 param2) {
+    this->func_0203ddfc();
+    this->vfunc_14(param1, param2);
+    this->mUnk_11c = 0;
+    return true;
+}
 
-// non-matching
 ARM bool UnkStruct_0203dae0::vfunc_14(s32 param1, s32 param2) {
-    unk32 uVar1;
     unk32 local_c;
     unk32 local_10;
 
     local_c = param1;
     local_10 = param2;
 
-    this->func_02032fa4();
-    func_0203fc78(&local_c, &local_10);
-    this->func_02032fcc(local_c, local_10);
+    func_0203fc78(this->func_02032fa4(), &local_c, &local_10);
+    this->UnkStruct_02032f0c::vfunc_14(local_c, local_10);
     this->mUnk_10 = 0;
     return true;
 }
 
-ARM void UnkStruct_0203dae0::func_0203dcfc(u8 param1, unk32 param2, unk32 param3, s32 param4) {}
-ARM void UnkStruct_0203dae0::func_0203ddec() {}
+extern "C" u16 func_0203d318(unk32, unk32);
+extern "C" void func_020298b8(unk32*, unk32, unk32, unk32, unk32);
+extern "C" void func_02029830(unk32*, unk32, unk32, unk32, unk32);
+extern "C" unk32 func_0203d400(u8);
+
+ARM void UnkStruct_0203dae0::func_0203dcfc(u8 param1, unk32 param2, unk32 param3, s32 param4) {
+    unk32 uVar5;
+    
+    this->mUnk_50 = param1;
+    this->vfunc_14(this->mUnk_4a, this->mUnk_4c);
+    this->mUnk_11c = func_0203d318(this->mUnk_10[0x1], this->mUnk_10[0x2]);
+    this->func_0203dc10(1);
+
+    if (func_0203d400(this->UnkStruct_02032f0c::func_02032fa4()) != 0x0) {
+        uVar5 = this->func_0203ddec();
+        func_020298b8(this->mUnk_10, uVar5, this->mUnk_10[0x1], this->mUnk_10[0x2], 0x4);
+    } else {
+        uVar5 = this->func_0203ddec();
+        func_02029830(this->mUnk_10, uVar5, this->mUnk_10[0x1], this->mUnk_10[0x2], 0x4);
+    }
+
+    this->mUnk_28 = this->mUnk_10;
+    this->mUnk_2c = this->mUnk_2c;
+    this->mUnk_30 = param4;
+    this->mUnk_34 = 3;
+    this->vfunc_10(param3, 0);
+
+    this->func_0203de58(param2);
+}
+
+ARM unk32 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) {}
 
-// non-matching
 ARM void UnkStruct_0203dae0::vfunc_10(u32 param1, unk32 param2) {
-    // this->func_0203dc10(1, param2);
+    this->func_0203dc10(1, param2);
     this->mUnk_11e = param1;
     this->mUnk_118 = -1;
-    // this->func_020331c4(param1, -1);
+    this->UnkStruct_02032f0c::vfunc_10(param1, -1);
 }
 
 ARM void UnkStruct_0203dae0::vfunc_30() {}
 
-// non-matching?
 ARM bool UnkStruct_0203dae0::vfunc_28() {
     if (this->mUnk_122 != 0) {
-        this->func_0203e0f8(0, 0);
+        this->func_0203e0f8();
         this->func_0203dc10(0);
         return true;
     }
@@ -79,7 +124,7 @@ ARM bool UnkStruct_0203dae0::vfunc_28() {
     return false;
 }
 
-ARM bool UnkStruct_0203dae0::func_0203e0f8(unk32 param1, s32 param2) {}
+ARM bool UnkStruct_0203dae0::func_0203e0f8() {}
 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) {}