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

include/Item/Item.hpp

@@ -50,7 +50,7 @@ enum ItemFlag_ {
 
     /* 0x2d */ ItemFlag_SwordsmansScroll = 45,
     /* 0x2e */ ItemFlag_CycloneSlate     = 46,
-    /* 0x2f */ ItemFlag_Unk_47           = 47,
+    /* 0x2f */ ItemFlag_BigCatchLure     = 47,
 
     /* 0x60 */ ItemFlag_TreasureChart1  = 96,
     /* 0x61 */ ItemFlag_TreasureChart2  = 97,
@@ -224,7 +224,7 @@ enum ItemId_ {
     /* 0x7d */ ItemId_Unk_125      = 125,
     /* 0x7e */ ItemId_Unk_126      = 126,
     /* 0x7f */ ItemId_CycloneSlate = 127,
-    /* 0x80 */ ItemId_Unk_128      = 128,
+    /* 0x80 */ ItemId_BigCatchLure = 128,
     /* 0x81 */ ItemId_Rupoor10     = 129,
     /* 0x82 */ ItemId_Rupoor50     = 130,
     /* 0x83 */ ItemId_Unk_131      = 131,

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
@@ -60,13 +51,13 @@ enum DungeonItemModelId_ {
 };
 
 class ItemManager : public SysObject {
-private:
+public:
     /* 000 */ ItemFlag mEquippedItem;
     /* 004 */ ItemFlag mPrevEquippedItem;
     /* 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];
@@ -101,7 +92,6 @@ private:
     /* 14e */ unk8 mUnk_14e[0x2]; // padding?
     /* 150 */
 
-public:
     static ItemManager *Create();
     static void Destroy();
     ItemManager();
@@ -119,7 +109,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();
@@ -149,7 +139,7 @@ public:
 
     // Ammo
     u16 GetAmmo(ItemFlag equipId) const;
-    void GiveAmmo(ItemFlag equipId, u16 amount);
+    void GiveAmmo(ItemFlag equipId, u32 amount);
     u16 GetMaxAmmo(ItemFlag equipId) const;
     void UpgradeQuiver();
     void UpgradeBombBag();

include/Item/ItemModelLoader.hpp

@@ -27,3 +27,5 @@ public:
     static void Create();
     static void Destroy();
 };
+
+extern ItemModelLoader *gItemModelLoader;