From bad0d9743475bb6b534defd9e1a135e34a1be1e6 Mon Sep 17 00:00:00 2001 From: Aetias Date: Wed, 1 May 2024 10:07:03 +0200 Subject: [PATCH] Update `ItemManager` fields --- include/Item/ItemManager.hpp | 6 +++--- src/00_Core/Item/ItemManager.cpp | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/Item/ItemManager.hpp b/include/Item/ItemManager.hpp index 1edd9a48..e50fb673 100644 --- a/include/Item/ItemManager.hpp +++ b/include/Item/ItemManager.hpp @@ -216,16 +216,16 @@ private: /* 100 */ ItemModel *mDungeonItemModels[DungeonItemModelId_COUNT]; // non-null in dungeons/caves /* 114 */ ModelRender *mUnk_114; /* 118 */ ItemId mFanfareItem; - /* 11c */ unk32 mUnk_11c; + /* 11c */ SfxId mFanfareSfx; /* 120 */ void *mFanfareItemModel; /* 124 */ void *mUnk_124; /* 128 */ ItemFlags mItemFlags; /* 138 */ u32 mSalvagedTreasureFlags; /* 13c */ ShipPartPricesShown mShipPartPricesShown; /* 148 */ u32 mTreasurePriceShownFlags[CEIL_DIV(Treasure_COUNT, 32)]; - /* 14c */ bool mUnk_14c; + /* 14c */ bool mMuteNextFanfare; /* 14d */ u8 mUnk_14d; - /* 14e */ unk8 mUnk_14e[0x2]; + /* 14e */ unk8 mUnk_14e[0x2]; // padding? /* 150 */ public: diff --git a/src/00_Core/Item/ItemManager.cpp b/src/00_Core/Item/ItemManager.cpp index 418555ac..041bc48f 100644 --- a/src/00_Core/Item/ItemManager.cpp +++ b/src/00_Core/Item/ItemManager.cpp @@ -918,8 +918,8 @@ THUMB void ItemManager::LoadDungeonItemModels() { extern unk32 data_ov00_020eec68; extern "C" void PlaySoundEffect(void *param1, SfxId sfx); THUMB void ItemManager::PlayItemFanfareSfx(ItemId item) { - if (gItemManager->mUnk_14c == true) { - gItemManager->mUnk_14c = false; + if (gItemManager->mMuteNextFanfare == true) { + gItemManager->mMuteNextFanfare = false; return; } SfxId sfx; @@ -959,9 +959,9 @@ THUMB void ItemManager::PlayItemFanfareSfx(ItemId item) { sfx = SfxId_FanfareDefault; } break; } - if (gItemManager->mUnk_11c != 0) { - sfx = gItemManager->mUnk_11c; - gItemManager->mUnk_11c = 0; + if (gItemManager->mFanfareSfx != SfxId_None) { + sfx = gItemManager->mFanfareSfx; + gItemManager->mFanfareSfx = SfxId_None; } PlaySoundEffect(&data_ov00_020eec68, sfx); }