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

4 files changed, 54 insertions, 10 deletions

diff --git a/include/Debug/DebugHierarchy.hpp b/include/Debug/DebugHierarchy.hpp
index 2a03fed3..70e4de9c 100644
--- a/include/Debug/DebugHierarchy.hpp
+++ b/include/Debug/DebugHierarchy.hpp
@@ -10,14 +10,6 @@ public:
     /* 00 (base) */
     /* 08 */
 
-    /* 00 */ virtual void vfunc_00();
-    /* 04 */ virtual void vfunc_04();
-    /* 08 */ virtual void vfunc_08();
-    /* 0c */ virtual void vfunc_0c();
-    /* 10 */ virtual void vfunc_10();
-    /* 14 */ virtual void vfunc_14();
-    /* 18 */ virtual void vfunc_18();
-    /* 1c */ virtual void vfunc_1c();
-    /* 20 */ virtual void vfunc_20(unk32 param1, const char *param2, unk32 param3, unk32 param4, unk32 param5, unk32 param6);
-    /* 24 */
+    /* 00 */ virtual ~DebugHierarchy() override;
+    /* 40 */
 };
diff --git a/include/Debug/DebugHierarchyBase.hpp b/include/Debug/DebugHierarchyBase.hpp
index 718ce1eb..37c0242f 100644
--- a/include/Debug/DebugHierarchyBase.hpp
+++ b/include/Debug/DebugHierarchyBase.hpp
@@ -3,10 +3,32 @@
 #include "global.h"
 #include "types.h"
 
+#include "Debug/DebugHierarchyNode.hpp"
 #include "System/SysNew.hpp"
 
 class DebugHierarchyBase : public SysObject {
+public:
     /* 00 (vtable) */
     /* 04 */ void *mNodes;
     /* 08 */
+
+    /* 00 */ virtual ~DebugHierarchyBase();
+    /* 08 */ virtual void vfunc_08();
+    /* 0c */ virtual void vfunc_0c();
+    /* 10 */ virtual void vfunc_10();
+    /* 14 */ virtual void vfunc_14();
+    /* 18 */ virtual void vfunc_18();
+    /* 1c */ virtual void vfunc_1c();
+    /* 20 */ virtual void vfunc_20(unk32 param1, const char *param2, unk32 param3, unk32 param4, unk32 param5, unk32 param6);
+    /* 24 */ virtual void vfunc_24();
+    /* 28 */ virtual void vfunc_28();
+    /* 2c */ virtual void vfunc_2c();
+    /* 30 */ virtual void vfunc_30();
+    /* 34 */ virtual bool GetChildNode(unk32 param1, const char *description, u32 parent, s32 *param4);
+    /* 38 */ virtual void vfunc_38();
+    /* 3c */ virtual void vfunc_3c();
+    /* 40 */
+
+    DebugHierarchyBase();
+    DebugHierarchyNode *FindNode(u32 id);
 };
diff --git a/include/Debug/DebugHierarchyChild.hpp b/include/Debug/DebugHierarchyChild.hpp
new file mode 100644
index 00000000..c095fae2
--- /dev/null
+++ b/include/Debug/DebugHierarchyChild.hpp
@@ -0,0 +1,11 @@
+#pragma once
+
+#include "global.h"
+#include "types.h"
+
+class DebugHierarchyChild {
+public:
+    /* 00 */ char mUnk_00[0xc];
+    /* 0c */ s32 mUnk_0c;
+    /* 10 */
+};
diff --git a/include/Debug/DebugHierarchyNode.hpp b/include/Debug/DebugHierarchyNode.hpp
new file mode 100644
index 00000000..057d1946
--- /dev/null
+++ b/include/Debug/DebugHierarchyNode.hpp
@@ -0,0 +1,19 @@
+#pragma once
+
+#include "global.h"
+#include "types.h"
+
+#include "Debug/DebugHierarchyChild.hpp"
+
+class DebugHierarchyNode {
+public:
+    /* 00 */ u32 mNodeId;
+    /* 04 */ u32 mUnk_04;
+    /* 08 */ u32 mUnk_08;
+    /* 0c */ unk8 mUnk_0c[0x4];
+    /* 10 */ u32 mId;
+    /* 14 */ s32 mUnk_14;
+    /* 18 */ unk8 mUnk_18[0x8];
+    /* 20 */ DebugHierarchyChild mChildren;
+    /* 30 */
+};