Update ItemManager fields

This commit is contained in:
Aetias
2024-05-01 10:07:03 +02:00
parent 2a833b5923
commit bad0d97434
2 changed files with 8 additions and 8 deletions
+3 -3
View File
@@ -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:
+5 -5
View File
@@ -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);
}