summaryrefslogtreecommitdiff
path: root/src/00_Core/Item/ItemManager.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/00_Core/Item/ItemManager.cpp')
-rw-r--r--src/00_Core/Item/ItemManager.cpp110
1 files changed, 55 insertions, 55 deletions
diff --git a/src/00_Core/Item/ItemManager.cpp b/src/00_Core/Item/ItemManager.cpp
index e95326ab..d378ebe0 100644
--- a/src/00_Core/Item/ItemManager.cpp
+++ b/src/00_Core/Item/ItemManager.cpp
@@ -28,85 +28,85 @@ THUMB void ItemManager::ClearPrevEquippedItem() {
}
THUMB void ItemManager::Save(SaveItemManager *save) {
- save->itemFlags = mItemFlags;
- save->numRupees = mNumRupees;
+ save->inventory.itemFlags = mItemFlags;
+ save->inventory.numRupees = mNumRupees;
for (s32 i = 0; i < MAX_POTIONS; ++i) {
- save->potions[i] = mPotions[i];
+ save->inventory.potions[i] = mPotions[i];
}
- save->numBombs = (u8) (*mAmmo)[ItemFlag_BombBag];
- save->numBombchus = (u8) (*mAmmo)[ItemFlag_BombchuBag];
- save->numArrows = (u8) (*mAmmo)[ItemFlag_Bow];
- save->equippedItem = (u8) mEquippedItem;
- save->salvagedTreasureFlags = mSalvagedTreasureFlags;
- save->hourglassSeconds = SoftDivide(mHourglassSandFrames, 60);
+ save->inventory.numBombs = (u8) (*mAmmo)[ItemFlag_BombBag];
+ save->inventory.numBombchus = (u8) (*mAmmo)[ItemFlag_BombchuBag];
+ save->inventory.numArrows = (u8) (*mAmmo)[ItemFlag_Bow];
+ save->inventory.equippedItem = (u8) mEquippedItem;
+ save->inventory.salvagedTreasureFlags = mSalvagedTreasureFlags;
+ save->inventory.hourglassSeconds = SoftDivide(mHourglassSandFrames, 60);
for (s32 i = 0; i < Gem_COUNT; ++i) {
- save->numGems[i] = mNumGems[i];
+ save->inventory.numGems[i] = mNumGems[i];
}
for (s32 i = 0; i < ShipPart_COUNT; ++i) {
- save->equippedShipParts[i] = mEquippedShipParts[i];
+ save->inventory.equippedShipParts[i] = mEquippedShipParts[i];
for (s32 j = 0; j < ShipType_COUNT; ++j) {
- save->shipParts[i][j] = mShipParts[i][j];
+ save->inventory.shipParts[i][j] = mShipParts[i][j];
}
}
- save->shipPartPricesShown = mShipPartPricesShown;
+ save->inventory.shipPartPricesShown = mShipPartPricesShown;
for (s32 i = 0; i < Treasure_COUNT; ++i) {
- save->treasure[i] = mTreasure[i];
+ save->inventory.treasure[i] = mTreasure[i];
}
- save->treasurePriceShownFlags[0] = mTreasurePriceShownFlags[0];
+ save->inventory.treasurePriceShownFlags[0] = mTreasurePriceShownFlags[0];
for (s32 i = 0; i < 6; ++i) {
- save->unk_9f[i] = mUnk_098[i];
- save->unk_82[i] = mUnk_09e[i];
+ save->inventory.fishCount[i] = mFishCount[i];
+ save->inventory.fishSize[i] = mFishSize[i];
}
- save->quiverSize = mQuiverSize;
- save->bombBagSize = mBombBagSize;
- save->bombchuBagSize = mBombchuBagSize;
+ save->inventory.quiverSize = mQuiverSize;
+ save->inventory.bombBagSize = mBombBagSize;
+ save->inventory.bombchuBagSize = mBombchuBagSize;
if (mEquippedFairy == FairyId_None) {
- save->equippedFairy = 3;
+ save->inventory.equippedFairy = 3;
return;
}
- save->equippedFairy = (u8) mEquippedFairy;
+ save->inventory.equippedFairy = (u8) mEquippedFairy;
}
THUMB void ItemManager::Load(const SaveItemManager *save) {
- mItemFlags = save->itemFlags;
- mNumRupees = save->numRupees;
- mHourglassSandFrames =
- save->hourglassSeconds <= MAX_HOURGLASS_SECONDS ? save->hourglassSeconds * 60 : MAX_HOURGLASS_SECONDS * 60;
+ mItemFlags = save->inventory.itemFlags;
+ mNumRupees = save->inventory.numRupees;
+ mHourglassSandFrames = save->inventory.hourglassSeconds <= MAX_HOURGLASS_SECONDS ? save->inventory.hourglassSeconds * 60
+ : MAX_HOURGLASS_SECONDS * 60;
for (s32 i = ItemFlag_EQUIP_START; i < ItemFlag_EQUIP_END; ++i) {
if (GET_FLAG(mItemFlags.flags, (u32) i)) {
(*mAmmo)[i] = 1;
}
}
- (*mAmmo)[ItemFlag_BombBag] = save->numBombs;
- (*mAmmo)[ItemFlag_BombchuBag] = save->numBombchus;
- (*mAmmo)[ItemFlag_Bow] = save->numArrows;
+ (*mAmmo)[ItemFlag_BombBag] = save->inventory.numBombs;
+ (*mAmmo)[ItemFlag_BombchuBag] = save->inventory.numBombchus;
+ (*mAmmo)[ItemFlag_Bow] = save->inventory.numArrows;
for (s32 i = 0; i < MAX_POTIONS; ++i) {
- mPotions[i] = save->potions[i];
+ mPotions[i] = save->inventory.potions[i];
}
- mEquippedItem = save->equippedItem;
- mSalvagedTreasureFlags = save->salvagedTreasureFlags;
+ mEquippedItem = save->inventory.equippedItem;
+ mSalvagedTreasureFlags = save->inventory.salvagedTreasureFlags;
for (s32 i = 0; i < Gem_COUNT; ++i) {
- mNumGems[i] = save->numGems[i];
+ mNumGems[i] = save->inventory.numGems[i];
}
for (s32 i = 0; i < ShipPart_COUNT; ++i) {
- mEquippedShipParts[i] = save->equippedShipParts[i];
+ mEquippedShipParts[i] = save->inventory.equippedShipParts[i];
for (s32 j = 0; j < ShipType_COUNT; ++j) {
- mShipParts[i][j] = save->shipParts[i][j];
+ mShipParts[i][j] = save->inventory.shipParts[i][j];
}
}
- mShipPartPricesShown = save->shipPartPricesShown;
+ mShipPartPricesShown = save->inventory.shipPartPricesShown;
for (s32 i = 0; i < Treasure_COUNT; ++i) {
- mTreasure[i] = save->treasure[i];
+ mTreasure[i] = save->inventory.treasure[i];
}
- mTreasurePriceShownFlags[0] = save->treasurePriceShownFlags[0];
+ mTreasurePriceShownFlags[0] = save->inventory.treasurePriceShownFlags[0];
for (s32 i = 0; i < 6; ++i) {
- mUnk_098[i] = save->unk_9f[i];
- mUnk_09e[i] = save->unk_82[i];
+ mFishCount[i] = save->inventory.fishCount[i];
+ mFishSize[i] = save->inventory.fishSize[i];
}
- mQuiverSize = save->quiverSize;
- mBombBagSize = save->bombBagSize;
- mBombchuBagSize = save->bombchuBagSize;
- mEquippedFairy = save->equippedFairy;
+ mQuiverSize = save->inventory.quiverSize;
+ mBombBagSize = save->inventory.bombBagSize;
+ mBombchuBagSize = save->inventory.bombchuBagSize;
+ mEquippedFairy = save->inventory.equippedFairy;
if (mEquippedFairy >= FairyId_COUNT) {
mEquippedFairy = FairyId_None;
}
@@ -289,28 +289,28 @@ THUMB void ItemManager::SetTreasureCount(Treasure treasure, s8 count) {
mTreasure[treasure] = count;
}
-THUMB u8 ItemManager::GetUnk_098(u32 index) const {
- return mUnk_098[index];
+THUMB u8 ItemManager::GetCollectedFishCount(u32 index) const {
+ return mFishCount[index];
}
-THUMB u16 ItemManager::GetUnk_09e(u32 index) const {
- return mUnk_09e[index];
+THUMB u16 ItemManager::GetFishSize(u32 index) const {
+ return mFishSize[index];
}
-THUMB s32 ItemManager::GetUnk_09e_Divided(u32 index) const {
- q20 quotient = CoDivide64By32(INT_TO_Q20(mUnk_09e[index]), FLOAT_TO_Q20(2.54));
+THUMB s32 ItemManager::GetFishSize_Divided(u32 index) const {
+ q20 quotient = CoDivide64By32(INT_TO_Q20(mFishSize[index]), FLOAT_TO_Q20(2.54));
s32 result = ROUND_Q20(quotient);
if (result < 1) result = 1;
return result;
}
-THUMB void ItemManager::SetUnk_09e(u32 index, u16 value) {
- u8 count = mUnk_098[index] + 1;
+THUMB void ItemManager::SetFishSize(u32 index, u16 value) {
+ u8 count = mFishCount[index] + 1;
if (count > 99) count = 99;
- mUnk_098[index] = count;
- if (value > mUnk_09e[index]) {
+ mFishCount[index] = count;
+ if (value > mFishSize[index]) {
if (value > 9999) value = 9999;
- mUnk_09e[index] = value;
+ mFishSize[index] = value;
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-03 04:22:01 +0000