From f4e26837e21c091e68136e9f20dc8f18ab2162d5 Mon Sep 17 00:00:00 2001 From: Aetias Date: Mon, 25 Mar 2024 19:44:59 +0100 Subject: [PATCH] Fix updated name `ActorNavi` --- include/Item/ItemManager.hpp | 4 ++-- src/00_Core/Item/ItemManager.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/Item/ItemManager.hpp b/include/Item/ItemManager.hpp index c763c488..b1ff2db0 100644 --- a/include/Item/ItemManager.hpp +++ b/include/Item/ItemManager.hpp @@ -181,7 +181,7 @@ private: /* 008 */ ItemFlag mForcedItem; // game crashes when any item besides this one is equipped /* 00c */ u32 mHourglassSandFrames; /* 010 */ FairyId mEquippedFairy; - /* 014 */ Navi *mFairies[FairyId_COUNT]; + /* 014 */ ActorNavi *mFairies[FairyId_COUNT]; /* 020 */ u16 mEquipLoadTimer; /* 022 */ u16 mNumRupees; /* 024 */ u8 mNumGems[Gem_COUNT]; @@ -228,7 +228,7 @@ public: // Fairy FairyId GetEquippedFairy() const; - Navi* GetFairy(FairyId id) const; + ActorNavi* GetFairy(FairyId id) const; u32 GetActiveFairyLevel(FairyId id) const; u32 GetFairyLevel(FairyId id) const; diff --git a/src/00_Core/Item/ItemManager.cpp b/src/00_Core/Item/ItemManager.cpp index 946ba93d..614f9a50 100644 --- a/src/00_Core/Item/ItemManager.cpp +++ b/src/00_Core/Item/ItemManager.cpp @@ -119,7 +119,7 @@ ARM FairyId ItemManager::GetEquippedFairy() const { return fairy; } -ARM Navi* ItemManager::GetFairy(FairyId id) const { +ARM ActorNavi* ItemManager::GetFairy(FairyId id) const { return mFairies[id]; }