From 44ba14e823fd9d67fd92166f5370683fad56f428 Mon Sep 17 00:00:00 2001
From: Aetias <aetias@outlook.com>
Date: Sat, 8 Mar 2025 11:46:49 +0100
Subject: Decomp `ActorForceNavi` and `ActorWisdomNavi` 100%

---
 include/Item/ItemManager.hpp | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

(limited to 'include/Item')

diff --git a/include/Item/ItemManager.hpp b/include/Item/ItemManager.hpp
index c0a84aa7..9e473fc2 100644
--- a/include/Item/ItemManager.hpp
+++ b/include/Item/ItemManager.hpp
@@ -8,7 +8,7 @@ extern "C" {
 #include "nds/math.h"
 #include "types.h"
 
-#include "Actor/Navi/ActorNavi.hpp"
+#include "Actor/Navi/ActorNaviBase.hpp"
 #include "Item/Item.hpp"
 #include "Player/EquipItem.hpp"
 #include "Render/ModelRender.hpp"
@@ -20,15 +20,6 @@ extern "C" {
 #define MAX_AMMO_UPGRADE 2
 #define MAX_UNK_0BA 9
 
-typedef s32 FairyId;
-enum FairyId_ {
-    FairyId_None    = -1,
-    FairyId_Courage = 0,
-    FairyId_Power   = 1,
-    FairyId_Wisdom  = 2,
-    FairyId_COUNT   = 3,
-};
-
 typedef u32 ItemModelId;
 enum ItemModelId_ {
     ItemModelId_OshusSword,   // swA
@@ -66,7 +57,7 @@ private:
     /* 008 */ ItemFlag mForcedItem; // game crashes when any item besides this one is equipped
     /* 00c */ u32 mHourglassSandFrames;
     /* 010 */ FairyId mEquippedFairy;
-    /* 014 */ ActorNavi *mFairies[FairyId_COUNT];
+    /* 014 */ ActorNaviBase *mFairies[FairyId_COUNT];
     /* 020 */ u16 mEquipLoadTimer;
     /* 022 */ u16 mNumRupees;
     /* 024 */ u8 mNumGems[Gem_COUNT];
@@ -114,7 +105,7 @@ public:
 
     // Fairy
     FairyId GetEquippedFairy() const;
-    ActorNavi *GetFairy(FairyId id) const;
+    ActorNaviBase *GetFairy(FairyId id) const;
     u32 GetActiveFairyLevel(FairyId id) const;
     u32 GetFairyLevel(FairyId id) const;
     void SpawnFairies();
-- 
cgit v1.2.3


From 5ffac795ab8e3cd6b1162e4e24b535af2bd5c52e Mon Sep 17 00:00:00 2001
From: Aetias <aetias@outlook.com>
Date: Sat, 26 Apr 2025 08:42:04 +0200
Subject: Clean up ItemManager

---
 include/Item/ItemModelLoader.hpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'include/Item')

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;
-- 
cgit v1.2.3