PlayerControl: Decomp 5%

1 files changed, 2 insertions, 6 deletions

diff --git a/src/00_Core/Item/ItemManager.cpp b/src/00_Core/Item/ItemManager.cpp
index 9b4a71fb..1e92b51b 100644
--- a/src/00_Core/Item/ItemManager.cpp
+++ b/src/00_Core/Item/ItemManager.cpp
@@ -1,4 +1,5 @@
 #include "Item/ItemManager.hpp"

+#include "DTCM/UnkStruct_027e0d38.hpp"

 #include "Player/PlayerLinkBase.hpp"

 

 static const char *sShipPartTypes[] = {"anc", "bow", "hul", "can", "dco", "pdl", "fnl", "brg"};

@@ -124,7 +125,6 @@ ARM ActorNavi *ItemManager::GetFairy(FairyId id) const {
     return mFairies[id];

 }

 

-extern UnkStruct_027e0d38 *data_027e0d38;

 extern unk32 gPlayerAnimHandler;

 extern "C" void LoadEquipItemModel(unk32 param1, ItemFlag param2);

 extern "C" void _ZNK11ItemManager15GetEquippedItemEv();

@@ -232,15 +232,11 @@ ARM void ItemManager::GiveAmmo(ItemFlag equipId, u16 amount) {
     (*mAmmo)[equipId] = this->GetMaxAmmo(equipId);

 }

 

-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 "C" bool _ZN14PlayerLinkBase18func_ov00_020bbd80Ei(unk32 param1, unk32 param2);

-extern "C" bool _ZNK11ItemManager7HasItemEi();

-extern "C" void _ZN11ItemManager12GetEquipItemEi();

 ARM bool ItemManager::func_ov00_020ad790(unk32 param1) {

-    unk32 unk1 = func_ov00_02078b40(data_027e0d38);

+    unk32 unk1 = data_027e0d38->func_ov00_02078b40();

     if (unk1 == 2) return func_ov15_02136670(data_027e10a4);

     if (data_027e0d38->mUnk_14 == 1) return false;

     // NONMATCH: OverlayId_29 should be in constant pool