diff options
| author | SammygoodTunes <56520787+SammygoodTunes@users.noreply.github.com> | 2025-04-01 21:25:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-01 21:25:38 +0200 |
| commit | 3376d55c856262c43c731272a499bf41ba50feea (patch) | |
| tree | a113b273f81cac78a5a11bceaa87b4921d36f6cb /src/00_Core/Item/ItemManager.cpp | |
| parent | 7608f9c8086f3978dde9bf285f4fff592f67f085 (diff) | |
| parent | abc53b54ecb15e06a54634ea67be9369b858e9ec (diff) | |
Merge branch 'main' into decomp/MapManager
Diffstat (limited to 'src/00_Core/Item/ItemManager.cpp')
| -rw-r--r-- | src/00_Core/Item/ItemManager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/00_Core/Item/ItemManager.cpp b/src/00_Core/Item/ItemManager.cpp index 06122703..05e88182 100644 --- a/src/00_Core/Item/ItemManager.cpp +++ b/src/00_Core/Item/ItemManager.cpp @@ -126,7 +126,7 @@ ARM FairyId ItemManager::GetEquippedFairy() const { return fairy;
}
-ARM ActorNavi *ItemManager::GetFairy(FairyId id) const {
+ARM ActorNaviBase *ItemManager::GetFairy(FairyId id) const {
return mFairies[id];
}
|