diff --git a/data/uking_functions.csv b/data/uking_functions.csv index cf0d688b..fc2078bf 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -56340,7 +56340,7 @@ 0x00000071009704bc,PauseMenuDataMgr::removeOneFromInventory,1352, 0x0000007100970a04,PauseMenuDataMgr::removeFromInventory_,896, 0x0000007100970d84,sub_7100970D84,512,_ZN5uking2ui16PauseMenuDataMgr11removeArrowERKN4sead14SafeStringBaseIcEEi -0x0000007100970f84,PauseMenuDataMgr::getItemNum,1204,_ZNK5uking2ui16PauseMenuDataMgr12getItemCountERKN4sead14SafeStringBaseIcEEb| +0x0000007100970f84,PauseMenuDataMgr::getItemNum,1204, 0x0000007100971438,PauseMenuDataMgr::setPorchValue1,204,_ZN5uking2ui16PauseMenuDataMgr18setWeaponItemValueEiNS0_13PouchItemTypeE 0x0000007100971504,PauseMenuDataMgr::fromSaveDataMaybe,716, 0x00000071009717d0,sub_71009717D0,40,_ZNK5uking2ui16PauseMenuDataMgr19getDefaultEquipmentEj diff --git a/src/Game/UI/uiPauseMenuDataMgr.cpp b/src/Game/UI/uiPauseMenuDataMgr.cpp index 23aae822..a7be9a98 100644 --- a/src/Game/UI/uiPauseMenuDataMgr.cpp +++ b/src/Game/UI/uiPauseMenuDataMgr.cpp @@ -268,52 +268,6 @@ void PauseMenuDataMgr::removeArrow(const sead::SafeString& arrow_name, int count ksys::gdt::setFlag_PorchItem_Value1(num, idx); } -int PauseMenuDataMgr::getItemCount(const sead::SafeString& name, bool x) const { - const auto type = getType(name); - if (isPouchItemInvalid(type)) - return 0; - - sead::SafeString same_group_actor_name; - ksys::act::getSameGroupActorName(&same_group_actor_name, name); - - PouchItem* head; - switch (type) { - case PouchItemType::Weapon: - head = getItemHead(PouchCategory::Weapon); - break; - case PouchItemType::Bow: - head = getItemHead(PouchCategory::Bow); - break; - case PouchItemType::Arrow: - head = getItemHead(PouchCategory::Bow); - break; - case PouchItemType::Shield: - head = getItemHead(PouchCategory::Shield); - break; - case PouchItemType::Food: - head = getItemHead(PouchCategory::Food); - break; - case PouchItemType::KeyItem: - head = getItemHead(PouchCategory::KeyItem); - break; - default: - if (type >= PouchItemType::Material) - head = getItemHead(PouchCategory::Material); - else - head = getItemHead(PouchCategory::Armor); - break; - } - - for (auto* item = head; item; item = nextItem(item)) { - if (item->getType() > PouchItemType::Arrow) - break; - - // FIXME: WIP - } - - return 0; -} - void PauseMenuDataMgr::setWeaponItemValue(s32 value, PouchItemType type) { if (isPouchItemNotWeapon(type)) return;