Merge remote-tracking branch 'upstream/main' into displaytext

8 files changed, 143 insertions, 6 deletions

diff --git a/include/DTCM/UnkStruct_027e05f8.hpp b/include/DTCM/UnkStruct_027e05f8.hpp
index 40d8d731..a5bc24d6 100644
--- a/include/DTCM/UnkStruct_027e05f8.hpp
+++ b/include/DTCM/UnkStruct_027e05f8.hpp
@@ -4,9 +4,10 @@
 #include "types.h"
 
 struct UnkStruct_027e05f8 {
-    // TODO: Add fields
-    unk16 mUnk_00;
-    u16 mUnk_02;
+    /* 0 */ u16 mUnk_0;
+    /* 2 */ u16 mUnk_2;
+    /* 4 */ unk16 mUnk_4;
+    /* 6 */
 
     void func_0202adf4(unk32 param1, s32 param2);
     ~UnkStruct_027e05f8();
diff --git a/include/DTCM/UnkStruct_027e077c.hpp b/include/DTCM/UnkStruct_027e077c.hpp
index 3adda2bc..57ef477d 100644
--- a/include/DTCM/UnkStruct_027e077c.hpp
+++ b/include/DTCM/UnkStruct_027e077c.hpp
@@ -4,8 +4,26 @@
 #include "types.h"
 
 struct UnkStruct_027e077c {
-    // TODO: Add fields
+private:
+    /* 0 */ unk32 mUnk_0;
+    /* 4 */ unk32 mUnk_4;
+
+public:
+    /* 8 */ unk16 mUnk_8;
+    /* a */ unk8 mUnk_a;
+    /* b */
 
     UnkStruct_027e077c(unk32 param1);
     bool func_0202e740(unk32 param1);
+
+    inline volatile unk32 GetUnk0() const {
+        return mUnk_0;
+    }
+
+    inline unk32 GetUnk4() const {
+        return mUnk_4;
+    }
 };
+
+extern UnkStruct_027e077c data_027e077c;
+extern volatile u8 data_02056be4[];
diff --git a/include/DTCM/UnkStruct_027e0c68.hpp b/include/DTCM/UnkStruct_027e0c68.hpp
new file mode 100644
index 00000000..e172e51e
--- /dev/null
+++ b/include/DTCM/UnkStruct_027e0c68.hpp
@@ -0,0 +1,27 @@
+#pragma once
+
+#include "global.h"
+#include "types.h"
+
+#include "Debug/DebugHierarchyBase.hpp"
+
+struct UnkStruct_027e0c68 {
+    /* 00 */ unk8 mUnk_00[4];
+    /* 04 */ u8 mUnk_04;
+    /* 05 */ unk8 mUnk_05[3];
+    /* 08 */ unk32 mUnk_08;
+    /* 0c */ unk8 mUnk_0c[4];
+    /* 10 */ unk16 mUnk_10;
+    /* 12 */ unk8 mUnk_12[2];
+    /* 14 */ unk32 mUnk_14;
+    /* 18 */ s32 mUnk_18;
+    /* 1c */ s32 mUnk_1c;
+    /* 20 */ s32 *mUnk_20;
+    /* 24 */ unk32 mUnk_24;
+    /* 28 */ s32 *mUnk_28;
+    /* 2c */ unk8 mUnk_2c[0x1c];
+    /* 48 */ DebugHierarchyBase *mDebug;
+    /* 4c */
+};
+
+extern UnkStruct_027e0c68 data_027e0c68;
diff --git a/include/DTCM/UnkStruct_027e0d38.hpp b/include/DTCM/UnkStruct_027e0d38.hpp
index a36af0fe..b2e50a89 100644
--- a/include/DTCM/UnkStruct_027e0d38.hpp
+++ b/include/DTCM/UnkStruct_027e0d38.hpp
@@ -3,6 +3,12 @@
 #include "global.h"
 #include "types.h"
 
+struct UnkStruct_027e0d38_Unk28 {
+    /* 00 */ unk8 mUnk_00[0x34];
+    /* 34 */ bool mUnk_34;
+    /* 35 */
+};
+
 struct UnkStruct_027e0d38 {
     /* 00 */ unk8 mUnk_00;
     /* 01 */ unk8 mUnk_01[3]; // padding?
@@ -19,10 +25,10 @@ struct UnkStruct_027e0d38 {
     /* 21 */ unk8 mUnk_21;
     /* 22 */ unk8 mUnk_22[2]; // padding?
     /* 24 */ void *mUnk_24;
-    /* 28 */ void *mUnk_28;
+    /* 28 */ UnkStruct_027e0d38_Unk28 *mUnk_28;
     /* 2c */
 
-    unk32 func_ov000_02078b40();
+    s32 func_ov000_02078b40();
     unk8 func_ov000_02078b64();
     bool func_ov000_02078b88();
 };
diff --git a/include/DTCM/UnkStruct_027e0e2c.hpp b/include/DTCM/UnkStruct_027e0e2c.hpp
new file mode 100644
index 00000000..b8923bde
--- /dev/null
+++ b/include/DTCM/UnkStruct_027e0e2c.hpp
@@ -0,0 +1,22 @@
+#pragma once
+
+#include "global.h"
+#include "types.h"
+
+struct UnkStruct_027e0e2c {
+    /* 00 */ unk32 mUnk_00;
+    /* 04 */ unk32 mUnk_04;
+    /* 08 */ unk32 mUnk_08;
+    /* 0c */ unk32 mUnk_0c;
+    /* 10 */ unk32 mUnk_10;
+    /* 14 */ unk16 mUnk_14;
+    /* 16 */ unk16 mUnk_16;
+    /* 18 */ unk32 mUnk_18;
+    /* 1c */ unk32 mUnk_1c;
+    /* 20 */ unk32 mUnk_20;
+    /* 24 */ unk32 mUnk_24;
+    /* 28 */ unk32 mUnk_28;
+    /* 2c */
+};
+
+extern UnkStruct_027e0e2c data_027e0e2c;
diff --git a/include/DTCM/UnkStruct_027e0f64.hpp b/include/DTCM/UnkStruct_027e0f64.hpp
new file mode 100644
index 00000000..33728a7e
--- /dev/null
+++ b/include/DTCM/UnkStruct_027e0f64.hpp
@@ -0,0 +1,15 @@
+#pragma once
+
+#include "global.h"
+#include "types.h"
+
+struct UnkStruct_027e0f64 {
+    /* 0 */ DebugHierarchyBase *mUnk_0;
+    /* 4 */ void *mUnk_4;
+    /* 8 */ void *mUnk_8;
+    /* c */
+
+    unk32 func_ov000_0208b180();
+};
+
+extern UnkStruct_027e0f64 *data_027e0f64;
diff --git a/include/DTCM/UnkStruct_027e0ffc.hpp b/include/DTCM/UnkStruct_027e0ffc.hpp
new file mode 100644
index 00000000..463d9ec8
--- /dev/null
+++ b/include/DTCM/UnkStruct_027e0ffc.hpp
@@ -0,0 +1,27 @@
+#pragma once
+
+#include "global.h"
+#include "types.h"
+
+struct UnkStruct_027e0ffc {
+    /* 00 */ unk32 mUnk_00;
+    /* 04 */ unk32 mUnk_04[0x4];
+    /* 14 */ unk32 mUnk_14;
+    /* 18 */ unk32 mUnk_18;
+    /* 1c */ unk32 mUnk_1c;
+    /* 20 */ unk32 mUnk_20;
+    /* 24 */ unk8 mUnk_24;
+    /* 25 */ unk8 mUnk_25[0x3];
+    /* 28 */ unk32 mUnk_28;
+    /* 2c */ unk32 mUnk_2c;
+    /* 30 */ unk32 mUnk_30;
+    /* 34 */ unk32 mUnk_34;
+    /* 38 */ unk8 mUnk_38;
+    /* 39 */
+
+    void func_ov000_020cebcc(u32 param1, unk16 param2, unk32 param3);
+    void func_ov000_020ced64(Cylinder *param1, u32 param2, u32 param3);
+    void func_ov000_020ced7c(Vec3p *param1, s32 param2, s32 param3, unk32 param4);
+};
+
+extern UnkStruct_027e0ffc data_027e0ffc;
diff --git a/include/DTCM/UnkStruct_027e1098.hpp b/include/DTCM/UnkStruct_027e1098.hpp
new file mode 100644
index 00000000..043e108a
--- /dev/null
+++ b/include/DTCM/UnkStruct_027e1098.hpp
@@ -0,0 +1,21 @@
+#pragma once
+
+#include "types.h"
+
+struct UnkStruct_027e1098 {
+    /* 00 */ unk8 mUnk_00[0x38];
+    /* 38 */ unk32 mUnk_38;
+    /* 3c */ unk32 mUnk_3c;
+    /* 40 */ unk32 mUnk_40;
+    /* 44 */ unk32 mUnk_44;
+    /* 48 */ unk8 mUnk_48;
+    /* 49 */ unk8 mUnk_49;
+    /* 4a */ unk8 mUnk_4a;
+    /* 4b */ unk8 mUnk_4b;
+    /* 4c */ unk32 mUnk_4c;
+    /* 50 */
+
+    void func_ov014_0211fd04();
+};
+
+extern UnkStruct_027e1098 *data_027e1098;