move and use enums

include/d/snd/d_snd_source.h

@@ -66,7 +66,7 @@ public:
     // the vtable, so the order is not certain. May have to reorder for weak
     // function order.
     virtual s32 getCategory() const override {
-        return field_0x0FC;
+        return mSourceCategory;
     }
     virtual const nw4r::math::VEC3 &getListenerPosition() const override;
 
@@ -90,7 +90,7 @@ private:
     /* 0x0F0 */ const char *mpName;
     /* 0x0F4 */ UNKWORD field_0x0F4;
     /* 0x0F8 */ dAcBase_c *mpPlayer;
-    /* 0x0FC */ u8 field_0x0FC;
+    /* 0x0FC */ u8 mSourceCategory;
     /* 0x0FD */ u8 mSourceType;
     /* 0x0FE */ u8 field_0x0FE;
     /* 0x0FF */ u8 field_0x0FF;

include/d/snd/d_snd_source_enums.h

@@ -0,0 +1,74 @@
+#ifndef D_SND_SOURCE_ENUMS_H
+#define D_SND_SOURCE_ENUMS_H
+
+// TODO: Expand when we figure out what the other entries have in common
+enum SoundSourceType_e {
+    // 0-1: Player (0)
+    SND_SOURCE_PLAYER = 0,
+    SND_SOURCE_PLAYER_HEAD = 1,
+
+    // 2-9: Equipment (1)
+    SND_SOURCE_NET = 2,
+    SND_SOURCE_BLADE = 3,
+    SND_SOURCE_SHIELD = 4,
+    SND_SOURCE_WHIP = 5,
+    SND_SOURCE_BOOMERANG = 6,
+    SND_SOURCE_ARROW = 7,
+    SND_SOURCE_BOMB = 8,
+    SND_SOURCE_HOOKSHOT = 9,
+
+    // 10-31: Enemy? (2)
+    SND_SOURCE_ENEMY_10 = 10,
+    SND_SOURCE_BIGBOSS = 20,
+    SND_SOURCE_GIRAHUMU_3 = 24,
+    SND_SOURCE_BULLET = 29,
+    SND_SOURCE_ENEMY_31 = 31,
+
+    // 32-42: Object? (3)
+    SND_SOURCE_OBJECT = 32,
+    SND_SOURCE_BAMBOO = 34,
+    SND_SOURCE_ITEM = 35,
+    SND_SOURCE_TERRY_SHOP = 36,
+    SND_SOURCE_TIME_STONE = 37,
+    SND_SOURCE_CLEF = 38,
+    SND_SOURCE_SHUTTER = 39,
+    SND_SOURCE_OBJECT_42 = 42,
+
+    // 43-52: Npc (4)
+    SND_SOURCE_NPC_43 = 43,
+    SND_SOURCE_KENSEI = 44,
+    SND_SOURCE_PLAYER_BIRD = 45,
+    SND_SOURCE_NPC_48 = 48,
+    SND_SOURCE_INSECT = 49,
+    SND_SOURCE_NPC_NRM = 51,
+    SND_SOURCE_NPC_DRAGON = 52,
+
+    // 53: TagSound (5)
+    SND_SOURCE_TG_SOUND = 53,
+
+    // 54-57: Harp Related (6)
+    SND_SOURCE_54 = 54,
+    SND_SOURCE_OBJECT_WARP = 55,
+    SND_SOURCE_SW_HARP = 56,
+    SND_SOURCE_57 = 57,
+
+    // 58: ? (7)
+    SND_SOURCE_58 = 58,
+
+    // 59: ? (9)
+    SND_SOURCE_59 = 59,
+};
+
+enum SoundSourceCategory_e {
+    SND_SOURCE_CATEGORY_PLAYER = 0,
+    SND_SOURCE_CATEGORY_EQUIPMENT = 1,
+    SND_SOURCE_CATEGORY_ENEMY = 2,
+    SND_SOURCE_CATEGORY_OBJECT = 3,
+    SND_SOURCE_CATEGORY_NPC = 4,
+    SND_SOURCE_CATEGORY_TG_SOUND = 5,
+    SND_SOURCE_CATEGORY_6 = 6,
+    SND_SOURCE_CATEGORY_7 = 7,
+    SND_SOURCE_CATEGORY_9 = 9,
+};
+
+#endif

include/d/snd/d_snd_source_mgr.h

@@ -33,6 +33,7 @@ public:
     void unregisterSource(dSoundSource_c *source);
 
     void playFlowSound(u32 id);
+    static s32 getSourceCategoryForSourceType(s32 sourceType, const char *name);
 
 private:
     static bool isCertainEnemyType(dSoundSource_c *source);

include/toBeSorted/actor_info.h

@@ -3,55 +3,6 @@
 
 #include "common.h"
 
-// TODO: Expand when we figure out what the other entries have in common
-enum SoundSourceType_e {
-    // 0-1: Player (0)
-    SND_SOURCE_PLAYER = 0,
-    SND_SOURCE_PLAYER_HEAD = 1,
-
-    // 2-9: Equipment (1)
-    SND_SOURCE_NET = 2,
-    SND_SOURCE_BLADE = 3,
-    SND_SOURCE_SHIELD = 4,
-    SND_SOURCE_WHIP = 5,
-    SND_SOURCE_BOOMERANG = 6,
-    SND_SOURCE_ARROW = 7,
-    SND_SOURCE_BOMB = 8,
-    SND_SOURCE_HOOKSHOT = 9,
-
-    // 10-31: Enemy? (2)
-    SND_SOURCE_BIGBOSS = 20,
-    SND_SOURCE_GIRAHUMU_3 = 24,
-    SND_SOURCE_BULLET = 29,
-
-    // 32-42: Object? (3)
-    SND_SOURCE_OBJECT = 32,
-    SND_SOURCE_BAMBOO = 34,
-    SND_SOURCE_ITEM = 35,
-    SND_SOURCE_TERRY_SHOP = 36,
-    SND_SOURCE_TIME_STONE = 37,
-    SND_SOURCE_CLEF = 38,
-    SND_SOURCE_SHUTTER = 39,
-
-    // 43-52: Npc (4)
-    SND_SOURCE_KENSEI = 44,
-    SND_SOURCE_PLAYER_BIRD = 45,
-    SND_SOURCE_INSECT = 49,
-    SND_SOURCE_NPC_NRM = 51,
-    SND_SOURCE_NPC_DRAGON = 52,
-
-    // 53: TagSound (5)
-    SND_SOURCE_TG_SOUND = 53,
-
-    // 54-57: Harp Related (6)
-    SND_SOURCE_OBJECT_WARP = 55,
-    SND_SOURCE_SW_HARP = 56,
-
-    // 58: ? (7)
-
-    // 59: ? (9)
-};
-
 /**
  * profileId and profileId2 are always the same.
  */