Merge remote-tracking branch 'zeldaret/main' into decomp/MapManager

7 files changed, 123 insertions, 0 deletions

diff --git a/include/DTCM/UnkStruct_027e02a0.hpp b/include/DTCM/UnkStruct_027e02a0.hpp
new file mode 100644
index 00000000..2cfcf4f7
--- /dev/null
+++ b/include/DTCM/UnkStruct_027e02a0.hpp
@@ -0,0 +1,10 @@
+#pragma once
+
+#include "types.h"
+
+struct UnkStruct_027e02a0 {
+    unk8 mUnk_00[0x94];
+    unk32 mUnk_94[23];
+};
+
+extern UnkStruct_027e02a0 *data_027e02a0;
diff --git a/include/DTCM/UnkStruct_027e0618.hpp b/include/DTCM/UnkStruct_027e0618.hpp
new file mode 100644
index 00000000..7489cee5
--- /dev/null
+++ b/include/DTCM/UnkStruct_027e0618.hpp
@@ -0,0 +1,9 @@
+#pragma once
+
+#include "types.h"
+
+struct UnkStruct_027e0618 {
+    void func_0202cf34(void);
+};
+
+extern UnkStruct_027e0618 data_027e0618;
diff --git a/include/DTCM/UnkStruct_027e08f8.hpp b/include/DTCM/UnkStruct_027e08f8.hpp
new file mode 100644
index 00000000..c4f91b86
--- /dev/null
+++ b/include/DTCM/UnkStruct_027e08f8.hpp
@@ -0,0 +1,9 @@
+#pragma once
+
+#include "types.h"
+
+struct UnkStruct_027e08f8 {
+    void func_0202f9a0(unk32);
+};
+
+extern UnkStruct_027e08f8 data_027e08f8;
diff --git a/include/Unknown/UnkStruct_02063220.hpp b/include/Unknown/UnkStruct_02063220.hpp
new file mode 100644
index 00000000..5a07303b
--- /dev/null
+++ b/include/Unknown/UnkStruct_02063220.hpp
@@ -0,0 +1,48 @@
+#pragma once
+
+#include "global.h"
+#include "types.h"
+
+struct Registers {
+    /* 00 */ unk32 mUnk_00; // CPSR
+    /* 04 */ unk32 mUnk_04[12];
+    /* 08 */ unk32 mUnk_08;
+    /* 0C */ unk32 mUnk_0C; // SP
+    /* 10 */ unk32 mUnk_10; // LR
+    /* 14 */ unk32 mUnk_14; // PC
+    /* 18 */ unk32 mUnk_18;
+    /* 1C */ unk32 mUnk_1C;
+    /* 20 */ unk32 mUnk_20;
+    /* 24 */ unk32 mUnk_24;
+    /* 28 */ unk32 mUnk_28;
+    /* 2C */ unk32 mUnk_2C;
+    /* 30 */ unk32 mUnk_30;
+    /* 34 */ unk32 mUnk_34;
+    /* 38 */ unk32 mUnk_38; // CP15
+    /* 3C */ unk32 mUnk_3C; // SPSR
+};
+
+struct UnkStruct_02063220_08 {
+    unk32 mUnk_00;
+
+    void func_0202fd9c(unk32);
+};
+
+class UnkStruct_02063220 {
+public:
+    /* 00 */ char *path;
+    /* 04 */ u8 mUnk_04;
+    /* 05 */ u8 mUnk_05;
+    /* 06 */ unk16 mUnk_06;
+    /* 08 */ UnkStruct_02063220_08 mUnk_08;
+
+    void DisplayAssertError(char *file, u16 line, char *msg, ...);
+    void DisplayException(Registers *param1);
+    static bool func_0202f3f0(unk32 param1);
+    static unk32 func_0202f400(unk32 param1);
+    void func_0202f4b4(void);
+    void func_0202f500(void);
+    void func_0202f754(unk32);
+};
+
+extern UnkStruct_02063220 data_02063220;
diff --git a/include/Unknown/UnkStruct_0206322c.hpp b/include/Unknown/UnkStruct_0206322c.hpp
new file mode 100644
index 00000000..534fc26b
--- /dev/null
+++ b/include/Unknown/UnkStruct_0206322c.hpp
@@ -0,0 +1,39 @@
+#pragma once
+
+#include "types.h"
+
+#define SCREEN_WIDTH 32
+#define SCREEN_HEIGHT 24
+
+struct Screen {
+    /* 000 */ unk16 mUnk_00;
+    /* 002 */ unk16 mUnk_02;
+    /* 004 */ unk16 mUnk_04;
+    /* 004 */ unk16 mUnk_06;
+    /* 008 */ unk32 mUnk_08;
+    /* 00c */ u16 data[SCREEN_WIDTH * SCREEN_HEIGHT];
+    /* 60c */
+};
+
+class UnkStruct_0206322c {
+public:
+    /* 000 */ UNK_PTR mUnk_00; // tile
+    /* 004 */ UNK_PTR mUnk_04; // palette
+    /* 008 */ Screen topScreen;
+    /* 614 */ Screen bottomScreen;
+    /* c20 */
+
+    // loads the debug font (palette and tile files)
+    void func_02030354(bool doTopScreen, bool doBottomScreen);
+
+    // ctor?
+    void *func_02030408(void);
+
+    // copy the screen data to VRAM
+    void func_02030464(bool doTopScreen, bool doBottomScreen);
+
+    // reset screen data
+    void func_020304a8(bool doTopScreen, bool doBottomScreen);
+};
+
+extern UnkStruct_0206322c data_0206322c;
diff --git a/include/Unknown/UnkStruct_020ee734.hpp b/include/Unknown/UnkStruct_020ee734.hpp
new file mode 100644
index 00000000..18e24d39
--- /dev/null
+++ b/include/Unknown/UnkStruct_020ee734.hpp
@@ -0,0 +1,7 @@
+#pragma once
+
+struct UnkStruct_020ee734 {
+    void func_ov000_020d6620(void);
+};
+
+extern UnkStruct_020ee734 data_ov000_020ee734;
diff --git a/include/types.h b/include/types.h
index 03e8352f..5d42ab41 100644
--- a/include/types.h
+++ b/include/types.h
@@ -22,5 +22,6 @@ typedef s32 bool;
 #endif

 

 #define CEIL_DIV(a, b) (((a) + (b) - 1) / (b))

+#define UNK_PTR unk32 *

 

 #endif