Merge branch 'main' into decomp/MapManager

6 files changed, 151 insertions, 84 deletions

diff --git a/include/Debug/DebugHierarchyBase.hpp b/include/Debug/DebugHierarchyBase.hpp
index 5b4a175a..0e57c9a7 100644
--- a/include/Debug/DebugHierarchyBase.hpp
+++ b/include/Debug/DebugHierarchyBase.hpp
@@ -24,9 +24,10 @@ public:
     /* 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);
+    /* 34 */ virtual bool GetChildNode(unk32 param1, const char *description, u32 parent, s32 *param4, unk32 param5,
+                                       unk32 param6, unk32 param7, unk32 param8);
     /* 38 */ virtual void vfunc_38();
-    /* 3c */ virtual void vfunc_3c();
+    /* 3c */ virtual void vfunc_3c(unk32 param1, void *param2);
     /* 40 */
 
     DebugHierarchyBase();
diff --git a/include/Item/ItemModelLoader.hpp b/include/Item/ItemModelLoader.hpp
index 6b06893a..3eb3e157 100644
--- a/include/Item/ItemModelLoader.hpp
+++ b/include/Item/ItemModelLoader.hpp
@@ -27,3 +27,5 @@ public:
     static void Create();
     static void Destroy();
 };
+
+extern ItemModelLoader *gItemModelLoader;
diff --git a/include/Player/LinkStateMove.hpp b/include/Player/LinkStateMove.hpp
index 9b369e9c..0b197a27 100644
--- a/include/Player/LinkStateMove.hpp
+++ b/include/Player/LinkStateMove.hpp
@@ -12,8 +12,9 @@ public:
     /* 10 */ unk16 mUnk_10;
     /* 12 */ unk16 mUnk_12;
     /* 14 */ bool mUnk_14;
-    /* 14 */ bool mUnk_15;
-    /* 16 */ unk8 mUnk_16[2];
+    /* 15 */ bool mUnk_15;
+    /* 16 */ bool mUnk_16;
+    /* 17 */ bool mUnk_17;
     /* 18 */
 
     /* 00 */ virtual void vfunc_00() override;
diff --git a/include/Player/PlayerBase.hpp b/include/Player/PlayerBase.hpp
index ba4b3deb..d2ffea38 100644
--- a/include/Player/PlayerBase.hpp
+++ b/include/Player/PlayerBase.hpp
@@ -48,8 +48,8 @@ public:
 
     void SetUpdatePos(bool updatePos);
     void SetVisible(bool visible);
-    EquipSword *GetEquipSword();
-    EquipShield *GetEquipShield();
+    static EquipSword *GetEquipSword();
+    static EquipShield *GetEquipShield();
     void LookAt(Vec3p *target);
     bool func_ov00_020a7c00(s32 param1);
     bool CollidesWith(Cylinder *cylinder);
diff --git a/include/Save/AdventureFlags.hpp b/include/Save/AdventureFlags.hpp
index b076cd73..0484fba8 100644
--- a/include/Save/AdventureFlags.hpp
+++ b/include/Save/AdventureFlags.hpp
@@ -104,19 +104,19 @@ public:
     bool func_ov00_02097bcc();
     bool func_ov00_02097bcc(s32 param2);
     s32 func_ov00_02097c08();
-    bool Get_FlagsUnk_30_Flag(int index);
-    unk8 Get_FlagsUnk_49(int index);
-    unk8 Get_FlagsUnk_48(int index);
-    unk8 Get_FlagsUnk_4a(int index);
-    unk16 Get_FlagsUnk_42(int index);
-    unk16 Get_FlagsUnk_40(int index);
-    unk32 Get_FlagsUnk_38(int index);
-    unk32 Get_FlagsUnk_34(int index);
-    unk32 Get_FlagsUnk_44(int index);
-    static unk32 Get_FlagsUnk_30(int index);
-    static bool Get_FlagsUnk_00(int index, FlagsUnk2 *result);
-    bool Get_FlagsUnk_18(int index, FlagsUnk2 *result);
-    FlagsUnk *Get_FlagsUnk(int index);
+    bool Get_FlagsUnk_30_Flag(s32 index);
+    u8 Get_FlagsUnk_49(s32 index);
+    u8 Get_FlagsUnk_48(s32 index);
+    u8 Get_FlagsUnk_4a(s32 index);
+    u16 Get_FlagsUnk_42(s32 index);
+    u16 Get_FlagsUnk_40(s32 index);
+    unk32 Get_FlagsUnk_38(s32 index);
+    unk32 Get_FlagsUnk_34(s32 index);
+    unk32 Get_FlagsUnk_44(s32 index);
+    static unk32 Get_FlagsUnk_30(s32 index);
+    static bool Get_FlagsUnk_00(s32 index, FlagsUnk2 *result);
+    bool Get_FlagsUnk_18(s32 index, FlagsUnk2 *result);
+    FlagsUnk *Get_FlagsUnk(s32 index);
     bool func_ov00_02097e6c();
     bool func_ov00_02097e7c();
     bool func_ov00_02097ea4();
diff --git a/include/System/OverlayManager.hpp b/include/System/OverlayManager.hpp
index 4c83bbe4..42118b57 100644
--- a/include/System/OverlayManager.hpp
+++ b/include/System/OverlayManager.hpp
@@ -2,74 +2,137 @@
 
 #include "types.h"
 
+#include <nds/overlay.h>
+
 #include "Item/Item.hpp"
 
+EXTERN_OVERLAY_ID(0);
+EXTERN_OVERLAY_ID(1);
+EXTERN_OVERLAY_ID(2);
+EXTERN_OVERLAY_ID(3);
+EXTERN_OVERLAY_ID(4);
+EXTERN_OVERLAY_ID(5);
+EXTERN_OVERLAY_ID(6);
+EXTERN_OVERLAY_ID(7);
+EXTERN_OVERLAY_ID(8);
+EXTERN_OVERLAY_ID(9);
+EXTERN_OVERLAY_ID(10);
+EXTERN_OVERLAY_ID(11);
+EXTERN_OVERLAY_ID(12);
+EXTERN_OVERLAY_ID(13);
+EXTERN_OVERLAY_ID(14);
+EXTERN_OVERLAY_ID(15);
+EXTERN_OVERLAY_ID(16);
+EXTERN_OVERLAY_ID(17);
+EXTERN_OVERLAY_ID(18);
+EXTERN_OVERLAY_ID(19);
+EXTERN_OVERLAY_ID(20);
+EXTERN_OVERLAY_ID(21);
+EXTERN_OVERLAY_ID(22);
+EXTERN_OVERLAY_ID(23);
+EXTERN_OVERLAY_ID(24);
+EXTERN_OVERLAY_ID(25);
+EXTERN_OVERLAY_ID(26);
+EXTERN_OVERLAY_ID(27);
+EXTERN_OVERLAY_ID(28);
+EXTERN_OVERLAY_ID(29);
+EXTERN_OVERLAY_ID(30);
+EXTERN_OVERLAY_ID(31);
+EXTERN_OVERLAY_ID(32);
+EXTERN_OVERLAY_ID(33);
+EXTERN_OVERLAY_ID(34);
+EXTERN_OVERLAY_ID(35);
+EXTERN_OVERLAY_ID(36);
+EXTERN_OVERLAY_ID(37);
+EXTERN_OVERLAY_ID(38);
+EXTERN_OVERLAY_ID(39);
+EXTERN_OVERLAY_ID(40);
+EXTERN_OVERLAY_ID(41);
+EXTERN_OVERLAY_ID(42);
+EXTERN_OVERLAY_ID(43);
+EXTERN_OVERLAY_ID(44);
+EXTERN_OVERLAY_ID(45);
+EXTERN_OVERLAY_ID(46);
+EXTERN_OVERLAY_ID(47);
+EXTERN_OVERLAY_ID(48);
+EXTERN_OVERLAY_ID(49);
+EXTERN_OVERLAY_ID(50);
+EXTERN_OVERLAY_ID(51);
+EXTERN_OVERLAY_ID(52);
+EXTERN_OVERLAY_ID(53);
+EXTERN_OVERLAY_ID(54);
+EXTERN_OVERLAY_ID(55);
+EXTERN_OVERLAY_ID(56);
+EXTERN_OVERLAY_ID(57);
+EXTERN_OVERLAY_ID(58);
+EXTERN_OVERLAY_ID(59);
+EXTERN_OVERLAY_ID(60);
+EXTERN_OVERLAY_ID(61);
+
 typedef u32 OverlayId;
-enum OverlayId_ {
-    OverlayId_None = -1,
-    OverlayId_Core,
-    OverlayId_01,
-    OverlayId_02,
-    OverlayId_03,
-    OverlayId_Memory,
-    OverlayId_05,
-    OverlayId_06,
-    OverlayId_07,
-    OverlayId_08,
-    OverlayId_09,
-    OverlayId_10,
-    OverlayId_11,
-    OverlayId_12,
-    OverlayId_13,
-    OverlayId_Land,
-    OverlayId_15,
-    OverlayId_16,
-    OverlayId_17,
-    OverlayId_18,
-    OverlayId_19,
-    OverlayId_20,
-    OverlayId_21,
-    OverlayId_22,
-    OverlayId_23,
-    OverlayId_24,
-    OverlayId_25,
-    OverlayId_26,
-    OverlayId_27,
-    OverlayId_28,
-    OverlayId_29,
-    OverlayId_30,
-    OverlayId_31,
-    OverlayId_32,
-    OverlayId_33,
-    OverlayId_34,
-    OverlayId_35,
-    OverlayId_36,
-    OverlayId_37,
-    OverlayId_38,
-    OverlayId_39,
-    OverlayId_40,
-    OverlayId_41,
-    OverlayId_42,
-    OverlayId_43,
-    OverlayId_44,
-    OverlayId_45,
-    OverlayId_46,
-    OverlayId_47,
-    OverlayId_48,
-    OverlayId_49,
-    OverlayId_50,
-    OverlayId_51,
-    OverlayId_52,
-    OverlayId_PlayerBoomerang,
-    OverlayId_PlayerScoop,
-    OverlayId_PlayerBomb,
-    OverlayId_PlayerBow,
-    OverlayId_PlayerRope,
-    OverlayId_PlayerBombchu,
-    OverlayId_PlayerHammer,
-    OverlayId_60,
-    OverlayId_61,
-};
+#define OverlayId_None -1
+#define OverlayId_Core OVERLAY_ID(0)
+#define OverlayId_01 OVERLAY_ID(1)
+#define OverlayId_02 OVERLAY_ID(2)
+#define OverlayId_03 OVERLAY_ID(3)
+#define OverlayId_Memory OVERLAY_ID(4)
+#define OverlayId_05 OVERLAY_ID(5)
+#define OverlayId_06 OVERLAY_ID(6)
+#define OverlayId_07 OVERLAY_ID(7)
+#define OverlayId_08 OVERLAY_ID(8)
+#define OverlayId_09 OVERLAY_ID(9)
+#define OverlayId_10 OVERLAY_ID(10)
+#define OverlayId_11 OVERLAY_ID(11)
+#define OverlayId_12 OVERLAY_ID(12)
+#define OverlayId_13 OVERLAY_ID(13)
+#define OverlayId_Land OVERLAY_ID(14)
+#define OverlayId_15 OVERLAY_ID(15)
+#define OverlayId_16 OVERLAY_ID(16)
+#define OverlayId_17 OVERLAY_ID(17)
+#define OverlayId_18 OVERLAY_ID(18)
+#define OverlayId_19 OVERLAY_ID(19)
+#define OverlayId_20 OVERLAY_ID(20)
+#define OverlayId_21 OVERLAY_ID(21)
+#define OverlayId_22 OVERLAY_ID(22)
+#define OverlayId_23 OVERLAY_ID(23)
+#define OverlayId_24 OVERLAY_ID(24)
+#define OverlayId_25 OVERLAY_ID(25)
+#define OverlayId_26 OVERLAY_ID(26)
+#define OverlayId_27 OVERLAY_ID(27)
+#define OverlayId_28 OVERLAY_ID(28)
+#define OverlayId_29 OVERLAY_ID(29)
+#define OverlayId_30 OVERLAY_ID(30)
+#define OverlayId_31 OVERLAY_ID(31)
+#define OverlayId_32 OVERLAY_ID(32)
+#define OverlayId_33 OVERLAY_ID(33)
+#define OverlayId_34 OVERLAY_ID(34)
+#define OverlayId_35 OVERLAY_ID(35)
+#define OverlayId_36 OVERLAY_ID(36)
+#define OverlayId_37 OVERLAY_ID(37)
+#define OverlayId_38 OVERLAY_ID(38)
+#define OverlayId_39 OVERLAY_ID(39)
+#define OverlayId_40 OVERLAY_ID(40)
+#define OverlayId_41 OVERLAY_ID(41)
+#define OverlayId_42 OVERLAY_ID(42)
+#define OverlayId_43 OVERLAY_ID(43)
+#define OverlayId_44 OVERLAY_ID(44)
+#define OverlayId_45 OVERLAY_ID(45)
+#define OverlayId_46 OVERLAY_ID(46)
+#define OverlayId_47 OVERLAY_ID(47)
+#define OverlayId_48 OVERLAY_ID(48)
+#define OverlayId_49 OVERLAY_ID(49)
+#define OverlayId_50 OVERLAY_ID(50)
+#define OverlayId_51 OVERLAY_ID(51)
+#define OverlayId_52 OVERLAY_ID(52)
+#define OverlayId_PlayerBoomerang OVERLAY_ID(53)
+#define OverlayId_PlayerScoop OVERLAY_ID(54)
+#define OverlayId_PlayerBomb OVERLAY_ID(55)
+#define OverlayId_PlayerBow OVERLAY_ID(56)
+#define OverlayId_PlayerRope OVERLAY_ID(57)
+#define OverlayId_PlayerBombchu OVERLAY_ID(58)
+#define OverlayId_PlayerHammer OVERLAY_ID(59)
+#define OverlayId_60 OVERLAY_ID(60)
+#define OverlayId_61 OVERLAY_ID(61)
 
 typedef u32 OverlayIndex;
 enum OverlayIndex_ {