falso
/
botw
mirror of https://github.com/zeldaret/botw.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add PauseMenuDataMgr::x_28 (#87)

This commit is contained in:
savage13 2022-02-26 10:29:50 -05:00 committed by GitHub
parent 9d35c385f9
commit 17750b5225
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/uking_functions.csv
View File

@ -56406,7 +56406,7 @@ Address,Quality,Size,Name
0x00000071009793c8,O,000588,_ZNK5uking2ui16PauseMenuDataMgr12getItemValueERKN4sead14SafeStringBaseIcEE 0x00000071009793c8,O,000588,_ZNK5uking2ui16PauseMenuDataMgr12getItemValueERKN4sead14SafeStringBaseIcEE
0x0000007100979614,O,000496,_ZN5uking2ui16PauseMenuDataMgr11getFromShopERKN4sead14SafeStringBaseIcEEiPKNS_3act18WeaponModifierInfoE 0x0000007100979614,O,000496,_ZN5uking2ui16PauseMenuDataMgr11getFromShopERKN4sead14SafeStringBaseIcEEiPKNS_3act18WeaponModifierInfoE
0x0000007100979804,U,000316,PauseMenuDataMgr::shopStuff 0x0000007100979804,U,000316,PauseMenuDataMgr::shopStuff
0x0000007100979940,U,000120,PauseMenuDataMgr::x_28 0x0000007100979940,O,000120,_ZN5uking2ui16PauseMenuDataMgr24useItemFromRecipeAndSaveEPviPNS0_9PouchItemE
0x00000071009799b8,U,002688,PauseMenuDataMgr::pouchUseFromRecipe 0x00000071009799b8,U,002688,PauseMenuDataMgr::pouchUseFromRecipe
0x000000710097a438,O,000196,_ZNK5uking2ui16PauseMenuDataMgr13countArmorDyeEv 0x000000710097a438,O,000196,_ZNK5uking2ui16PauseMenuDataMgr13countArmorDyeEv
0x000000710097a4fc,O,000204,_ZNK5uking2ui16PauseMenuDataMgr21countAlreadyDyedArmorEv 0x000000710097a4fc,O,000204,_ZNK5uking2ui16PauseMenuDataMgr21countAlreadyDyedArmorEv

Can't render this file because it is too large.

9
src/Game/UI/uiPauseMenuDataMgr.cpp
View File

@ -2773,4 +2773,13 @@ void PauseMenuDataMgr::unequip(PouchItem* item) {
item->mEquipped = false; item->mEquipped = false;
saveToGameData(mItemLists.list1); saveToGameData(mItemLists.list1);
} }
// FIXME: types
bool PauseMenuDataMgr::useItemFromRecipeAndSave(void* unk, int multiplier, PouchItem* item) {
auto lock = sead::makeScopedLock(mCritSection);
useItemFromRecipe(&mItemLists, unk, multiplier, item);
saveToGameData(mItemLists.list1);
return true;
}
} // namespace uking::ui } // namespace uking::ui

7
src/Game/UI/uiPauseMenuDataMgr.h
View File

@ -1,6 +1,7 @@
#pragma once #pragma once
#include <basis/seadTypes.h> #include <basis/seadTypes.h>
#include <container/seadBuffer.h>
#include <container/seadListImpl.h> #include <container/seadListImpl.h>
#include <container/seadObjArray.h> #include <container/seadObjArray.h>
#include <container/seadOffsetList.h> #include <container/seadOffsetList.h>
@ -366,6 +367,9 @@ public:
void equipWeapon(PouchItem* weapon); void equipWeapon(PouchItem* weapon);
void unequip(PouchItem* item); void unequip(PouchItem* item);
// FIXME: types
bool useItemFromRecipeAndSave(void* unk, int multiplier, PouchItem* item);
private: private:
// TODO: rename // TODO: rename
struct GrabbedItemInfo { struct GrabbedItemInfo {
@ -400,6 +404,9 @@ private:
sead::OffsetList<PouchItem>& getItems() { return mItemLists.list1; } sead::OffsetList<PouchItem>& getItems() { return mItemLists.list1; }
const sead::OffsetList<PouchItem>& getItems() const { return mItemLists.list1; } const sead::OffsetList<PouchItem>& getItems() const { return mItemLists.list1; }
// FIXME: types
bool useItemFromRecipe(Lists* lists, void* unk, int multiplier, PouchItem* item);
PouchItem* getItemHead(PouchCategory category) const { PouchItem* getItemHead(PouchCategory category) const {
auto* p_head = mListHeads[u32(category)]; auto* p_head = mListHeads[u32(category)];
if (!p_head) if (!p_head)