Decomp `ItemManager::PlayItemFanfareSfx`

3 files changed, 19 insertions, 3 deletions

diff --git a/include/Item/Item.hpp b/include/Item/Item.hpp
index 7a6a0416..9535d9d2 100644
--- a/include/Item/Item.hpp
+++ b/include/Item/Item.hpp
@@ -89,7 +89,7 @@ enum ItemFlag_ {
 
 typedef s32 ItemId;
 enum ItemId_ {
-    /* 0x00 */ ItemId_Unk_0 = 0,
+    /* 0x00 */ ItemId_None = 0,
     /* 0x01 */ ItemId_SmallKey = 1,
     /* 0x02 */ ItemId_GreenRupee = 2,
     /* 0x03 */ ItemId_OshusSword = 3,
diff --git a/include/Item/ItemManager.hpp b/include/Item/ItemManager.hpp
index 46c2d70b..1edd9a48 100644
--- a/include/Item/ItemManager.hpp
+++ b/include/Item/ItemManager.hpp
@@ -15,6 +15,7 @@ extern "C" {
 #include "Map/MapManager.hpp"

 #include "Player/EquipItem.hpp"

 #include "Player/HealthManager.hpp"

+#include "Sound/Sfx.hpp"

 #include "System/SysNew.hpp"

 #include "System/OverlayManager.hpp"

 #include "Render/ModelRender.hpp"

@@ -222,7 +223,7 @@ private:
     /* 138 */ u32 mSalvagedTreasureFlags;

     /* 13c */ ShipPartPricesShown mShipPartPricesShown;

     /* 148 */ u32 mTreasurePriceShownFlags[CEIL_DIV(Treasure_COUNT, 32)];

-    /* 14c */ unk8 mUnk_14c;

+    /* 14c */ bool mUnk_14c;

     /* 14d */ u8 mUnk_14d;

     /* 14e */ unk8 mUnk_14e[0x2];

     /* 150 */

@@ -278,6 +279,7 @@ public:
     void LoadFanfareItem(ItemId id);

     bool GetFanfareItemScale(Vec3p *pScale) const;

     void LoadDungeonItemModels();

+    static void PlayItemFanfareSfx(ItemId item);

 

     // Ship

     ShipType GetEquippedShipPart(ShipPart part) const;

@@ -327,7 +329,6 @@ public:
 

     // Unknown

     void func_ov00_020ae4dc(s32 param1);

-    void func_ov00_020ae648(unk32 param1, unk32 param2, unk32 param3);

 };

 

 extern ItemManager *gItemManager;

diff --git a/include/Sound/Sfx.hpp b/include/Sound/Sfx.hpp
new file mode 100644
index 00000000..b87eb8c6
--- /dev/null
+++ b/include/Sound/Sfx.hpp
@@ -0,0 +1,15 @@
+#pragma once
+
+#include "global.h"
+#include "types.h"
+
+typedef u32 SfxId;
+enum SfxId_ {
+    SfxId_FanfareDefault = 0x28,
+    SfxId_FanfareRupee = 0x29,
+    SfxId_FanfareGoldRupee = 0x2a,
+    SfxId_FanfareRupoor = 0x2b,
+    SfxId_FanfareNothing = 0x2c,
+    SfxId_FanfareHeartContainer = 0x2d,
+    SfxId_FanfareGem = 0x2e,
+};