More sfxIDs (Xeeynamo#2733)

I noticed that some files have SFXs but don't have the include for
sfx.h. Is that still needed?

Author: synamaxmusic

include/sfx.h

@@ -323,7 +323,6 @@ enum {
 // BOSS RBO3 - Medusa
 #define SFX_RBO3_UNK_7C5 0x7C5
 #define SFX_RBO3_UNK_7C8 0x7C8
-#define SFX_RBO3_UNK_7D1 0x7D1
 #define SFX_RBO3_UNK_7FB 0x7FB
 #define SFX_RBO3_UNK_7FD 0x7FD
 #define SFX_RBO3_UNK_7FE 0x7FE
@@ -332,10 +331,6 @@ enum {
 #define SFX_RBO3_UNK_802 0x802
 #define SFX_RBO3_UNK_804 0x804
 
-// SHARED SOUNDS
-// These are sounds that are shared across multiple BIN files
-#define SE_BOSS_DEFEATED 0x7D2
-
 // UNUSED SOUNDS
 #define NA_VO_MAR_AIM_HEAD 0x87F
 
@@ -409,7 +404,7 @@ enum Sfx {
     /* 0x62D */ SFX_WEAPON_STAB_A,
     /* 0x62E */ SFX_WEAPON_STAB_B,  // Common stab sfx
     /* 0x62F */ SFX_WEAPON_APPEAR,  // Item Crash, Neutron Bomb
-    /* 0x630 */ SFX_UNK_BETA_630,   // 0x630 (MAD, TE1, TE2, TE3, TE4, TE5)
+    /* 0x630 */ SFX_UNK_BETA_630,   // (MAD, TE1, TE2, TE3, TE4, TE5)
     /* 0x631 */ SFX_DEATH_AMBIENCE, // BGM ambience during first Death cutscene
     /* 0x632 */ SFX_MAGIC_GLASS_BREAK, // Subweapon Container
     /* 0x633 */ SFX_UI_CONFIRM,
@@ -648,23 +643,28 @@ enum Sfx {
     SFX_SALEM_WITCH_ATTACK = 0x736,
     SFX_SALEM_WITCH_HURT,
     SFX_SALEM_WITCH_DEATH,
+    SFX_GHOST_ENEMY_HOWL = 0x739,
     SFX_BLOODY_ZOMBIE_HIT_GRUNT = 0x746,
     SFX_BLOODY_ZOMBIE_DEATH,
     SFX_BLOODY_ZOMBIE_HIT,
     SFX_BLOODY_ZOMBIE_SPLATTER,
+    SFX_CTULHU_LAUGH = 0x758,
+    SFX_CTULHU_ROAR,
+    SFX_UNK_761 = 0x761,
     SFX_SPEAR_GUARD_DEATH = 0x771,
     SFX_WARG_DEATH_HOWL = 0x780, // also used for Scylla Worm (phase 2)
     SFX_WARG_PAIN,
     SFX_WARG_ATTACK,
     SFX_WARG_GROWL,
-    SFX_GHOST_ENEMY_HOWL = 1849,
-    SFX_CTULHU_LAUGH = 1880,
-    SFX_UNK_797 = 1943,
-    SFX_CLOCK_BELL = 1958,
-    SFX_CLOCK_ROOM_TICK = 1961,
+    SFX_UNK_797 = 0x797,
+    SFX_CLOCK_BELL = 0x7A6,
+    SFX_CLOCK_ROOM_TICK = 0x7A9,
+    SFX_TELESCOPE_SHUTTER_CLICK = 0x7AC,
+    SFX_ALU_ZZZ_SNORE,
     SFX_UNK_7AF = 0x7Af,
     SFX_UNK_7BE = 0x7BE,
-    SFX_UNK_761 = 0x761,
+    SFX_SCIFI_BLAST = 0x7D1,
+    SFX_BOSS_DEFEATED,
 
     // Exclusive to Maria PSP
     /* 0x8E6 */ SFX_VO_MAR_8E6 = 0x8E6,

src/boss/rbo3/rbo3.c

@@ -284,7 +284,7 @@ void EntityMedusa(Entity* self) {
             SetStep(3);
         }
         if (self->pose == 3 && self->poseTimer == 0) {
-            PlaySfxPositional(SFX_RBO3_UNK_7D1);
+            PlaySfxPositional(SFX_SCIFI_BLAST);
             for (i = 0; i < 2; i++) {
                 entity = AllocEntity(&g_Entities[0xA0], &g_Entities[0xC0]);
                 if (entity != NULL) {

src/dra/71830.c

@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 #include "dra.h"
 #include "dra_bss.h"
+#include "sfx.h"
 
 // Forward declaration. EntityAlucard needs to not know these args are s16.
 // But 80113D7C (in this file, but before PlayerStepKill) needs to know
@@ -339,7 +340,7 @@ void PlayerStepStand(void) {
     case Player_Stand_ChairSit:
         if (PLAYER.ext.player.anim == 0xF2 && --g_AlucardChairSleepTimer == 0) {
             if (g_StageId == STAGE_NO1) {
-                PlaySfx(0x7AD);
+                PlaySfx(SFX_ALU_ZZZ_SNORE);
             }
             CreateEntFactoryFromEntity(
                 g_CurrentEntity, FACTORY(BP_SLEEP_ZZZ, 0), 0);

src/st/e_life_up.h

@@ -96,7 +96,7 @@ void EntityLifeUpSpawn(Entity* self) {
                 }
             }
         }
-        g_api.PlaySfx(SE_BOSS_DEFEATED);
+        g_api.PlaySfx(SFX_BOSS_DEFEATED);
         break;
     case 1:
         if (!self->ext.lifeUpSpawn.unk86) {

src/st/lib/e_lesser_demon.c

@@ -1356,7 +1356,7 @@ void EntityLesserDemon(Entity* self) {
             break;
         }
         if (self->pose == 3 && self->poseTimer == 0) {
-            PlaySfxPositional(0x7D1);
+            PlaySfxPositional(SFX_SCIFI_BLAST);
             self->ext.lesserDemon.unk84 = 2;
             tempEntity = AllocEntity(&g_Entities[160], &g_Entities[192]);
             if (tempEntity != NULL) {

src/st/no0/e_ctulhu.c

@@ -356,7 +356,7 @@ void EntityCtulhu(Entity* self) {
             break;
         case 2:
             if (!(g_Timer & 0xF)) {
-                PlaySfxPositional(0x759);
+                PlaySfxPositional(SFX_CTULHU_ROAR);
             }
             AnimateEntity(anim_laugh_static, self);
             // If player is revived, return back to standard action

src/st/no1/unk_381E8.c

@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 #include "no1.h"
+#include "sfx.h"
 
 // Likely copied out of DRA. This code
 // appears to go unused.
@@ -1312,7 +1313,7 @@ void func_us_801BA290(Entity* self) {
                 LOW(prim->r2) = LOW(prim->r0);
                 LOW(prim->r3) = LOW(prim->r0);
                 if (prim->r0 == 0x30) {
-                    g_api.PlaySfx(0x7AC);
+                    g_api.PlaySfx(SFX_TELESCOPE_SHUTTER_CLICK);
                     self->step_s = 2;
                 }
                 prim = prim->next;
@@ -1365,7 +1366,7 @@ void func_us_801BA290(Entity* self) {
 
         case 4:
             if (!--self->ext.et_801BA290.unk82) {
-                g_api.PlaySfx(0x7AC);
+                g_api.PlaySfx(SFX_TELESCOPE_SHUTTER_CLICK);
                 self->step_s = 0;
                 self->step++;
             }