diff options
| author | Aetias <aetias@outlook.com> | 2024-05-03 15:35:43 +0200 |
|---|---|---|
| committer | Aetias <aetias@outlook.com> | 2024-05-03 15:35:43 +0200 |
| commit | cdf3bb7553cccec867256d6713ca77c8cf3cbd26 (patch) | |
| tree | 1367270fbeee50d6405588af8b15cb5e732f8b7c /src/00_Core/Item/ItemManager.cpp | |
| parent | 6bce0e739d89da2f75149e4cab11393866b7427e (diff) | |
| parent | 5c08baf1c24e50891ea12e8dcd0038c935875631 (diff) | |
Merge branch 'main' into fix-build
Diffstat (limited to 'src/00_Core/Item/ItemManager.cpp')
| -rw-r--r-- | src/00_Core/Item/ItemManager.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/00_Core/Item/ItemManager.cpp b/src/00_Core/Item/ItemManager.cpp index 614f9a50..a9c5ae5d 100644 --- a/src/00_Core/Item/ItemManager.cpp +++ b/src/00_Core/Item/ItemManager.cpp @@ -235,8 +235,7 @@ extern "C" unk32 func_ov00_02078b40(UnkStruct_027e0d38 *param1); extern void *data_027e10a4;
extern "C" bool func_ov15_02136670(void *param1);
extern unk8 data_ov29_0217a4ac[];
-extern void *data_027e0e60;
-extern "C" bool func_ov00_020849f8(void *param1);
+extern "C" bool _ZN10MapManager18func_ov00_020849f8Ei(void *param1);
extern unk32 data_027e0fc8;
extern "C" bool func_ov00_020bbd80(unk32 param1, unk32 param2);
extern "C" bool _ZNK11ItemManager7HasItemEi();
@@ -254,7 +253,7 @@ ARM bool NONMATCH(ItemManager::func_ov00_020ad790)(unk32 param1) { }
ItemFlag equipId = mForcedItem;
- bool unk2 = !func_ov00_020849f8(data_027e0e60);
+ bool unk2 = !gMapManager->func_ov00_020849f8();
if (
mEquippedItem != ItemFlag_None &&
(unk2 || (u32) mEquippedItem - 9 <= 1) &&
|