diff --git a/include/sfx.h b/include/sfx.h
index 45d0005a6..5d32a62ba 100644
--- a/include/sfx.h
+++ b/include/sfx.h
@@ -193,24 +193,6 @@ enum SfxModes {
 #define JP_VO_SH_SONO_TEIDO 0x530 // Shaft: Sono teido no chikara de tatakai...
 #endif
 
-#define NA_SE_PL_MAX_HP_MP_INCREASED 0x687
-#define SFX_UNK_689 0x689
-#define NA_SE_BREAK_GLASS 0x68B
-#define NA_SE_EN_GAIBON_FLAP_WINGS 0x68D
-#define NA_SE_EN_SLOGRA_SPEAR_PROJECTILE 0x690
-#define NA_SE_EN_GAIBON_FLAME 0x691
-#define NA_SE_EN_EXPLOSIVE_DEATH 0x693
-#define NA_SE_EN_SLOGRA_DEATH_EXPLOSION 0x697
-#define SFX_UNK_69A 0x69A
-#define SFX_UNK_69D 0x69D
-#define SFX_UNK_6A0 0x6A0
-#define SFX_UNK_6A3 0x6A3
-#define NA_SE_EV_CLOCK_TICK 0x6A1
-#define REBOUND_STONE_BOUNCE 0x6A4
-#define SFX_UNK_6AD 0x6AD
-#define SFX_UNK_6B0 0x6B0 // Used for Shaman Shield, could be same as petal
-#define SFX_UNK_6B1 0x6B1
-#define SFX_UNK_6BA 0x6BA
 #define NA_SE_EN_SLOGRA_SPEAR_SLASH 0x6C6
 #define NA_SE_EN_SLOGRA_BEAK_ATTACK 0x6C8
 #define NA_SE_EN_SKELETON_THROW_BONE 0x6C8
@@ -266,9 +248,7 @@ enum SfxModes {
 #define BIBLE_SUBWPN_SWOOSH 0x8C3
 
 // STAGE DRE
-#define NA_VO_SU_CRYSTAL_2 0x6AF
 #define NA_SE_SU_FLAPPING_WINGS 0x6C6
-#define NA_SE_SU_PETAL_ATTACK 0x6B0
 #define NA_SE_SU_CREATE_CLONES 0x6D5
 #define NA_SE_SU_CHARGE_PINKBALLS 0x6E2
 #define NA_VO_SU_LAUGH 0x86E
@@ -296,32 +276,13 @@ enum SfxModes {
 // These are sounds that are shared across multiple BIN files
 #define SE_BOSS_DEFEATED 0x7D2
 
-// UI SOUNDS
-#define SE_UI_ERROR 0x686
-#define SE_UI_DEBUG_SELECT 0x688
-#define SE_UI_OVERWRITE_SELECT 0x6A4
-#define SE_UI_OVERWRITE_MSG 0x6AD
-
 // DRA
-#define SFX_UNK_683 0x683
-#define SE_HEALTH_REGAINED 0x68E
-#define SFX_UNK_6B2 0x6B2
 #define SFX_UNK_6F7 0x6F7
 
 // WEAPON SOUNDS
-#define SE_WPN_ALUCARD_SWORD_SWING 0x6A8
 #define SE_WPN_PENTAGRAM 0x6E4
 
-#define SFX_KARMA_COIN 0x682
-#define SFX_KARMA_COIN_HEADS 0x6B1
-
 // UNUSED SOUNDS
-
-#define SE_UNK_TE1_692 0x692
-#define SE_UNK_TE1_6B3 0x6B3
-#define SE_UNK_TE2_6B4 0x6B4
-#define SE_UNK_TE2_6B6 0x6B6
-#define SE_UNK_TE3_6B8 0x6B8
 #define NA_VO_MAR_AIM_HEAD 0x87F
 
 // The VAB IDs appear in large chunks so all sounds proceeding
@@ -473,8 +434,65 @@ enum Sfx {
     SFX_UI_MP_FULL,
     SFX_CANDLE_HIT_WHOOSH_A,
     SFX_CANDLE_HIT_WHOOSH_B,
-    SFX_QUICK_STUTTER_EXPLODE, // 0x680
-    SFX_GOLD_PICKUP = 0x6A9,
+    SFX_QUICK_STUTTER_EXPLODE_A, // 0x680
+    SFX_RARE_FM_IMPACT,          // RARE overlay only
+    SFX_KARMA_COIN_JINGLE,
+    SFX_QUICK_STUTTER_EXPLODE_B,
+    SFX_FM_THUNDER_EXPLODE,
+    SFX_GUNSHOT_HIGH,
+    SFX_UI_ERROR,
+    SFX_LEVEL_UP,
+    SFX_DEBUG_SELECT, // Low Heartbeat sfx used for Debug menu
+    SFX_WEAPON_SCRAPE_ECHO,
+    SFX_GLASS_BREAK_WHOOSH,
+    SFX_DRA_GLASS_BREAK, // "What is a man?!" wine glass shatter
+    SFX_WING_FLAP_A,
+    SFX_WING_FLAP_B,
+    SFX_HEALTH_PICKUP,
+    SFX_STUTTER_FIREBALL,
+    SFX_FM_EXPLODE_SWISHES, // 0x690
+    SFX_SMALL_FLAME_IGNITE,
+    SFX_UNK_TRANSFORM,
+    SFX_STUTTER_EXPLODE_LOW,
+    SFX_FM_STUTTER_EXPLODE,
+    SFX_FAST_STUTTER_EXPLODE,
+    SFX_FM_MULTI_EXPLODE,
+    SFX_STUTTER_EXPLODE_A,
+    SFX_STUTTER_EXPLODE_B,
+    SFX_STUTTER_EXPLODE_C,
+    SFX_FM_EXPLODE_GLASS_ECHO,
+    SFX_BAT_WING_SWISHES,
+    SFX_BAT_SCREECH_SWISH, // Bat Death
+    SFX_MAGIC_SWITCH,
+    SFX_THROW_WEAPON_SWISHES,
+    SFX_THROW_WEAPON_MAGIC,
+    SFX_TRANSFORM_LOW, // 0x6A0 (Alucard Bat/Mist Transform)
+    SFX_CLOCK_TICK,
+    SFX_DEATH_SWISH,
+    SFX_WATER_DAMAGE_SWISHES,
+    SFX_UI_TINK, // Also Rebound Stone Bounce
+    SFX_SKULL_KNOCK_A,
+    SFX_SKULL_KNOCK_B,
+    SFX_SKULL_KNOCK_C,
+    SFX_ALUCARD_SWORD_SWISH,
+    SFX_GOLD_PICKUP,
+    SFX_MARIONETTE_RATTLE,
+    SFX_SEED_SPIT,
+    SFX_CANNON_EXPLODE,
+    SFX_UI_ALERT_TINK,
+    SFX_FROZEN_SHARD_APPEAR,
+    SFX_GUARD_TINK,
+    SFX_GLASS_SHARDS, // 0x6B0 (Succubus, Frozen Shade, Shamen Shield)
+    SFX_TRANSFORM_3X, // Karma Coin and shields
+    SFX_BIBLE_SCRAPE,
+    SFX_UNK_TICK,
+    SFX_UNK_RATTLE,
+    SFX_RIC_FLAME_WHIP,
+    SFX_UNK_FIRE_BURST,
+    SFX_LOW_CLOCK_TICK,
+    SFX_UNK_LOW_CLOCK_TICK,
+    SFX_UNK_METAL_TING,
+    SFX_FAST_SWORD_SWISHES, // Sword of Dawn
 };
 
 #endif
diff --git a/src/dra/627C4.c b/src/dra/627C4.c
index 57a5d0d5b..fd0885133 100644
--- a/src/dra/627C4.c
+++ b/src/dra/627C4.c
@@ -392,7 +392,7 @@ s32 HandleSaveMenu(s32 arg0) {
             if (D_80137E4C == 6) {
                 PlaySfx(SFX_START_SLAM_B);
             } else {
-                PlaySfx(SE_UI_OVERWRITE_MSG);
+                PlaySfx(SFX_UI_ALERT_TINK);
             }
             if (D_80137E4C == 6) {
 #if defined(VERSION_US)
@@ -526,7 +526,7 @@ s32 HandleSaveMenu(s32 arg0) {
         return 0;
     } else if (arg0 == 1) {
         if (temp_t0 == 0) {
-            PlaySfx(SE_UI_OVERWRITE_MSG);
+            PlaySfx(SFX_UI_ALERT_TINK);
             prim2->p1 += 2;
 #if defined(VERSION_US)
             func_800F9D88("  Select the slot．", 0, 1);
@@ -568,13 +568,13 @@ s32 HandleSaveMenu(s32 arg0) {
         } else {
             if (g_pads[0].tapped & PAD_LEFT) {
                 if (D_80097924 != 0) {
-                    PlaySfx(SE_UI_OVERWRITE_SELECT);
+                    PlaySfx(SFX_UI_TINK);
                 }
                 D_80097924 = 0;
             }
             if (g_pads[0].tapped & PAD_RIGHT) {
                 if (D_80097924 == 0) {
-                    PlaySfx(SE_UI_OVERWRITE_SELECT);
+                    PlaySfx(SFX_UI_TINK);
                 }
                 D_80097924 = 1;
             }
@@ -603,7 +603,7 @@ s32 HandleSaveMenu(s32 arg0) {
         }
     } else {
         if (temp_t0 == 0) {
-            PlaySfx(SE_UI_OVERWRITE_MSG);
+            PlaySfx(SFX_UI_ALERT_TINK);
             prim2->p1 += 2;
             if (arg0 == 2) {
 #if defined(VERSION_US)
@@ -669,13 +669,13 @@ s32 HandleSaveMenu(s32 arg0) {
         } else {
             if (g_pads[0].tapped & PAD_LEFT) {
                 if (D_80137E6C != 0) {
-                    PlaySfx(SE_UI_OVERWRITE_SELECT);
+                    PlaySfx(SFX_UI_TINK);
                 }
                 D_80137E6C = 0;
             }
             if (g_pads[0].tapped & PAD_RIGHT) {
                 if (D_80137E6C == 0) {
-                    PlaySfx(SE_UI_OVERWRITE_SELECT);
+                    PlaySfx(SFX_UI_TINK);
                 }
                 D_80137E6C = 1;
             }
diff --git a/src/dra/692E8.c b/src/dra/692E8.c
index f49ea4ada..3d44133d3 100644
--- a/src/dra/692E8.c
+++ b/src/dra/692E8.c
@@ -579,7 +579,7 @@ void EntityAlucard(void) {
                 func_800FE8F0();
                 func_80118C84(g_Player.unk58, 1);
                 if (g_Player.unk56 == 1) {
-                    PlaySfx(SE_HEALTH_REGAINED);
+                    PlaySfx(SFX_HEALTH_PICKUP);
                     if (!(g_Player.unk0C & 0x80)) {
                         CreateEntFactoryFromEntity(
                             g_CurrentEntity, FACTORY(0x2C, 0x48), 0);
@@ -846,7 +846,7 @@ void EntityAlucard(void) {
                                 }
                                 D_800ACDFC = 0x20;
                                 if (damage.damageTaken != 0) {
-                                    PlaySfx(SFX_UNK_6A3);
+                                    PlaySfx(SFX_WATER_DAMAGE_SWISHES);
                                 }
                                 break;
                             }
@@ -874,7 +874,7 @@ void EntityAlucard(void) {
                                   (PLAYER.step_s != 8)))) {
                                 func_80109328();
                                 SetPlayerStep(Player_MorphMist);
-                                PlaySfx(SFX_UNK_6A0);
+                                PlaySfx(SFX_TRANSFORM_LOW);
                                 goto block_159;
                             }
                             if ((g_Player.padTapped & PAD_R1) &&
@@ -896,7 +896,7 @@ void EntityAlucard(void) {
                                     }
                                     func_80109328();
                                     SetPlayerStep(Player_MorphBat);
-                                    PlaySfx(SFX_UNK_6A0);
+                                    PlaySfx(SFX_TRANSFORM_LOW);
                                     goto block_160;
                                 }
                             }
diff --git a/src/dra/72BB0.c b/src/dra/72BB0.c
index 923191ea6..5b15930d0 100644
--- a/src/dra/72BB0.c
+++ b/src/dra/72BB0.c
@@ -808,7 +808,7 @@ void AlucardHandleDamage(DamageParam* damage, s16 arg1, s16 arg2) {
             CreateEntFactoryFromEntity(g_CurrentEntity, FACTORY(47, 1), 0);
             PlaySfx(NA_SE_VO_AL_WHAT);
         } else if (damage->effects & 0x8000) {
-            PlaySfx(NA_SE_EN_SLOGRA_SPEAR_PROJECTILE);
+            PlaySfx(SFX_FM_EXPLODE_SWISHES);
             CreateEntFactoryFromEntity(g_CurrentEntity, FACTORY(44, 0x45), 0);
             g_Player.unk40 = 0x8160;
             if (damage->effects & 0x10000) {
diff --git a/src/dra/78D0C.c b/src/dra/78D0C.c
index 77e27d765..1074d44ad 100644
--- a/src/dra/78D0C.c
+++ b/src/dra/78D0C.c
@@ -424,7 +424,7 @@ void EntityGuardText(Entity* self) {
             self->ext.guardText.str_x = self->ext.guardText.unk98;
             self->ext.guardText.timer = 0x60;
             self->ext.guardText.angle = 0;
-            PlaySfx(0x6AF);
+            PlaySfx(SFX_GUARD_TINK);
             self->step++;
         }
         break;
diff --git a/src/dra/7E4BC.c b/src/dra/7E4BC.c
index 74bbc6ce4..34b020e78 100644
--- a/src/dra/7E4BC.c
+++ b/src/dra/7E4BC.c
@@ -674,7 +674,7 @@ void EntityHitByLightning(Entity* self) {
             self->ext.hitbylightning.unk92 = 1;
         }
         self->ext.hitbylightning.unk94 = 0x10;
-        PlaySfx(SFX_UNK_69D);
+        PlaySfx(SFX_MAGIC_SWITCH);
         PlaySfx(SFX_THUNDER_B);
         self->step++;
         break;
@@ -829,7 +829,7 @@ void EntityHitByIce(Entity* self) {
                 self->rotZ = 0x80;
             }
         }
-        PlaySfx(SFX_UNK_69D);
+        PlaySfx(SFX_MAGIC_SWITCH);
         self->step++;
         break;
     case 1:
@@ -1503,7 +1503,7 @@ void EntityLevelUpAnimation(Entity* self) {
         if (self->primIndex == -1) {
             return;
         }
-        PlaySfx(NA_SE_PL_MAX_HP_MP_INCREASED);
+        PlaySfx(SFX_LEVEL_UP); // Max HP & MP
         self->flags = FLAG_KEEP_ALIVE_OFFCAMERA | FLAG_HAS_PRIMS |
                       FLAG_UNK_20000 | FLAG_UNK_10000;
         CreateEntFactoryFromEntity(self, FACTORY(0x2C, 0x4A), 0);
diff --git a/src/dra/843B0.c b/src/dra/843B0.c
index 6e4ad3a9e..954c2af04 100644
--- a/src/dra/843B0.c
+++ b/src/dra/843B0.c
@@ -355,7 +355,7 @@ void EntitySubwpnThrownDagger(Entity* self) {
                 self->posX.i.hi += var_s5;
                 CreateEntFactoryFromEntity(self, 10, 0);
                 self->posX.i.hi -= var_s5;
-                PlaySfx(REBOUND_STONE_BOUNCE);
+                PlaySfx(SFX_UI_TINK);
                 self->step++;
                 return;
             }
@@ -800,7 +800,7 @@ void EntityHolyWater(Entity* entity) {
 
         temp2 = temp & 1;
         if (temp2 != 0) {
-            PlaySfx(SFX_UNK_69A);
+            PlaySfx(SFX_FM_EXPLODE_GLASS_ECHO);
             CreateEntFactoryFromEntity(entity, 59, 0);
             entity->ext.generic.unk7C.s = 0x10;
             entity->animSet = ANIMSET_DRA(0);
@@ -1455,7 +1455,7 @@ void EntityBatFireball(Entity* self) {
 
     switch (self->step) {
     case 0:
-        PlaySfx(SFX_QUICK_STUTTER_EXPLODE);
+        PlaySfx(SFX_QUICK_STUTTER_EXPLODE_A);
         self->flags = FLAG_POS_CAMERA_LOCKED | FLAG_UNK_100000;
         self->animSet = 9;
         self->anim = D_800B0798;
@@ -1505,7 +1505,7 @@ void EntityHellfireBigFireball(Entity* entity) {
     switch (entity->step) {
     case 0:
         if (entity->params != 0) {
-            PlaySfx(SFX_UNK_683);
+            PlaySfx(SFX_QUICK_STUTTER_EXPLODE_B);
         }
 
         entity->flags = FLAG_UNK_100000 | FLAG_POS_CAMERA_LOCKED;
@@ -1929,7 +1929,7 @@ void EntitySubwpnReboundStone(Entity* self) {
         if (self->ext.reboundStone.unk82 != 0) {
         block_93:
             CreateEntFactoryFromEntity(self, 10, 0);
-            PlaySfx(REBOUND_STONE_BOUNCE);
+            PlaySfx(SFX_UI_TINK);
         }
         if (self->posX.i.hi < -0x40 || self->posX.i.hi > 0x140 ||
             self->posY.i.hi < -0x40 || self->posY.i.hi > 0x140 ||
diff --git a/src/dra/8A0A4.c b/src/dra/8A0A4.c
index 0399744a7..9d4ed4b33 100644
--- a/src/dra/8A0A4.c
+++ b/src/dra/8A0A4.c
@@ -135,7 +135,7 @@ void EntityStopWatch(Entity* self) {
         prim->drawMode = DRAW_UNK_200 | DRAW_UNK_100 | DRAW_HIDE | DRAW_UNK02;
 
         CreateEntFactoryFromEntity(self, 0x4B, 0);
-        PlaySfx(SFX_UNK_6AD);
+        PlaySfx(SFX_UI_ALERT_TINK);
         g_unkGraphicsStruct.D_800973FC = 1;
         goto label;
     case 1:
@@ -151,14 +151,14 @@ void EntityStopWatch(Entity* self) {
         self->ext.stopwatch.unk84.val += FIX(-1);
         if (self->ext.stopwatch.unk84.val <= FIX(16)) {
             self->ext.stopwatch.t = 5;
-            PlaySfx(NA_SE_EV_CLOCK_TICK);
+            PlaySfx(SFX_CLOCK_TICK);
             self->step++;
         }
         break;
     case 3:
         self->ext.stopwatch.unk7E += 1;
         if (self->ext.stopwatch.unk7E > 80) {
-            PlaySfx(NA_SE_EV_CLOCK_TICK);
+            PlaySfx(SFX_CLOCK_TICK);
             self->ext.stopwatch.unk7E = 0;
             self->ext.stopwatch.unk8C = 1;
             self->ext.stopwatch.t -= 1;
@@ -217,7 +217,7 @@ void EntityStopWatch(Entity* self) {
             prim->g0 = prim->g1 = prim->g2 = prim->g3 = 0x40;
             prim->b0 = prim->b1 = prim->b2 = prim->b3 = 0x60;
 
-            PlaySfx(REBOUND_STONE_BOUNCE);
+            PlaySfx(SFX_UI_TINK);
             self->step++;
         }
         break;
@@ -546,7 +546,7 @@ void EntitySubwpnBible(Entity* self) {
             self->flags &= ~FLAG_KEEP_ALIVE_OFFCAMERA;
             self->velocityX = self->facingLeft ? FIX(-12) : FIX(12);
             self->velocityY = FIX(-12);
-            PlaySfx(SFX_UNK_6B2);
+            PlaySfx(SFX_BIBLE_SCRAPE);
             self->ext.et_BibleSubwpn.unk86++;
             self->step++;
         }
diff --git a/src/dra/loading.c b/src/dra/loading.c
index fed10ddd5..d87020845 100644
--- a/src/dra/loading.c
+++ b/src/dra/loading.c
@@ -180,19 +180,19 @@ void HandleNowLoading(void) {
         break;
     case 1:
         if (g_pads[0].repeat & PAD_RIGHT) {
-            PlaySfx(SE_UI_DEBUG_SELECT);
+            PlaySfx(SFX_DEBUG_SELECT);
             D_800987B4 += 1;
         }
         if (g_pads[0].repeat & PAD_DOWN) {
-            PlaySfx(SE_UI_DEBUG_SELECT);
+            PlaySfx(SFX_DEBUG_SELECT);
             D_800987B4 += 8;
         }
         if (g_pads[0].repeat & PAD_LEFT) {
-            PlaySfx(SE_UI_DEBUG_SELECT);
+            PlaySfx(SFX_DEBUG_SELECT);
             D_800987B4 -= 1;
         }
         if (g_pads[0].repeat & PAD_UP) {
-            PlaySfx(SE_UI_DEBUG_SELECT);
+            PlaySfx(SFX_DEBUG_SELECT);
             D_800987B4 -= 8;
         }
         if (D_800987B4 >= 0x3F) {
diff --git a/src/dra/menu.c b/src/dra/menu.c
index 3210cdc05..40e930b05 100644
--- a/src/dra/menu.c
+++ b/src/dra/menu.c
@@ -3164,10 +3164,10 @@ s32 func_800FB23C(MenuNavigation* nav, u8* order, u8* count, u32* selected) {
                 g_IsSelectingEquipment++;
                 PlaySfx(SFX_UI_CONFIRM);
             } else {
-                PlaySfx(SE_UI_ERROR);
+                PlaySfx(SFX_UI_ERROR);
             }
         } else if (func_800FB1EC(itemId) != false) {
-            PlaySfx(SE_UI_ERROR);
+            PlaySfx(SFX_UI_ERROR);
         } else {
             goto block_36;
         }
@@ -3182,11 +3182,11 @@ s32 func_800FB23C(MenuNavigation* nav, u8* order, u8* count, u32* selected) {
                     g_IsSelectingEquipment = 0;
                     PlaySfx(SFX_UI_CONFIRM);
                 } else {
-                    PlaySfx(SE_UI_ERROR);
+                    PlaySfx(SFX_UI_ERROR);
                 }
             } while (0);
         } else if (var_s6 != 0) {
-            PlaySfx(SE_UI_ERROR);
+            PlaySfx(SFX_UI_ERROR);
         } else {
             PlaySfx(SFX_UI_CONFIRM);
             if (count[itemId] > 0) {
@@ -3614,7 +3614,7 @@ block_4:
                 break;
             }
             if (g_MenuStep == MENU_STEP_OPENED) {
-                PlaySfx(SE_UI_ERROR);
+                PlaySfx(SFX_UI_ERROR);
                 break;
             }
             MenuHide(MENU_DG_MAIN);
@@ -3697,7 +3697,7 @@ block_4:
                 break;
             }
             if (g_MenuStep == MENU_STEP_SYSTEM) {
-                PlaySfx(SE_UI_ERROR);
+                PlaySfx(SFX_UI_ERROR);
             } else {
                 PlaySfx(SFX_UI_CONFIRM);
             }
@@ -3720,7 +3720,7 @@ block_4:
 #elif defined(VERSION_HD)
                 ShowText("すべてのボタンを割り当ててください。", 2);
 #endif
-                PlaySfx(SE_UI_ERROR);
+                PlaySfx(SFX_UI_ERROR);
             }
         }
         break;
diff --git a/src/ric/21250.c b/src/ric/21250.c
index 7dd54d5b1..0b4677e16 100644
--- a/src/ric/21250.c
+++ b/src/ric/21250.c
@@ -80,7 +80,7 @@ bool RicDoAttack(void) {
     if (RicCreateEntFactoryFromEntity(
             g_CurrentEntity, FACTORY(BP_WHIP, poisoned), 0)) {
         if (poisoned) {
-            g_api.PlaySfx(0x6B5);
+            g_api.PlaySfx(SFX_RIC_FLAME_WHIP);
         } else {
             g_api.PlaySfx(0x706);
         }
diff --git a/src/ric/24788.c b/src/ric/24788.c
index 95825f06d..73776328e 100644
--- a/src/ric/24788.c
+++ b/src/ric/24788.c
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 #include "ric.h"
+#include "sfx.h"
 
 Entity* RicGetFreeEntity(s16 start, s16 end);
 Entity* RicGetFreeEntityReverse(s16 start, s16 end);
@@ -1080,7 +1081,7 @@ void RicEntityMariaPowers(Entity* self) {
         self->rotX = self->rotY = self->ext.et_80162870.unk82 * 0x10;
         if (--self->ext.et_80162870.unk82 == 0) {
             self->animCurFrame = 0;
-            g_api.PlaySfx(0x69D);
+            g_api.PlaySfx(SFX_MAGIC_SWITCH);
             self->velocityY = FIX(-9);
             self->step++;
         }
diff --git a/src/ric/2C4C4.c b/src/ric/2C4C4.c
index edb02d020..aec3580bd 100644
--- a/src/ric/2C4C4.c
+++ b/src/ric/2C4C4.c
@@ -64,7 +64,7 @@ void RicEntitySubwpnHolyWater(Entity* self) {
         }
         if ((collision_result & 1) || (self->hitFlags != 0)) {
             g_api.CreateEntFactoryFromEntity(self, 0x28U, 0);
-            g_api.PlaySfx(0x68A);
+            g_api.PlaySfx(SFX_GLASS_BREAK_WHOOSH);
             self->ext.holywater.timer = 0x50;
             self->animSet = 0;
             self->hitboxState = 0;
@@ -545,7 +545,7 @@ void RicEntitySubwpnCross(Entity* self) {
         RicSetSubweaponParams(self);
         self->hitboxHeight = self->hitboxWidth = 8;
         self->posY.i.hi -= 8;
-        g_api.PlaySfx(0x69F);
+        g_api.PlaySfx(SFX_THROW_WEAPON_MAGIC);
         self->step++;
         break;
     case 1:
@@ -1394,7 +1394,7 @@ void RicEntitySubwpnDagger(Entity* self) {
                 self->posX.i.hi += var_s1;
                 RicCreateEntFactoryFromEntity(self, FACTORY(BP_42, 2), 0);
                 self->posX.i.hi -= var_s1;
-                g_api.PlaySfx(REBOUND_STONE_BOUNCE);
+                g_api.PlaySfx(SFX_UI_TINK);
                 self->step++;
                 return;
             }
@@ -1747,7 +1747,7 @@ void RicEntitySubwpnReboundStone(Entity* self) {
         if (self->ext.reboundStone.unk82 != 0) {
         block_93:
             g_api.CreateEntFactoryFromEntity(self, FACTORY(BP_42, 2), 0);
-            g_api.PlaySfx(REBOUND_STONE_BOUNCE);
+            g_api.PlaySfx(SFX_UI_TINK);
         }
         if (self->posX.i.hi < -0x40 || self->posX.i.hi > 0x140 ||
             self->posY.i.hi < -0x40 || self->posY.i.hi > 0x140 ||
diff --git a/src/ric/319C4.c b/src/ric/319C4.c
index db4989e84..6492c09d3 100644
--- a/src/ric/319C4.c
+++ b/src/ric/319C4.c
@@ -1612,7 +1612,7 @@ void RicEntitySubwpnStopwatch(Entity* self) {
         }
         self->ext.et_801719A4.subweaponId = PL_W_STOPWATCH;
         RicSetSubweaponParams(self);
-        g_api.PlaySfx(0x6AD);
+        g_api.PlaySfx(SFX_UI_ALERT_TINK);
         if (self->ext.et_801719A4.unk94 < 2) {
             g_unkGraphicsStruct.D_800973FC = 1;
         }
@@ -1630,13 +1630,13 @@ void RicEntitySubwpnStopwatch(Entity* self) {
         self->ext.et_801719A4.unk84.val += 0xFFFF0000;
         if (self->ext.et_801719A4.unk84.val <= 0x100000) {
             self->ext.et_801719A4.unk7C = 5;
-            g_api.PlaySfx(0x6A1);
+            g_api.PlaySfx(SFX_CLOCK_TICK);
             self->step++;
         }
         break;
     case 3:
         if (++self->ext.et_801719A4.unk7E >= 0x51) {
-            g_api.PlaySfx(0x6A1);
+            g_api.PlaySfx(SFX_CLOCK_TICK);
             self->ext.et_801719A4.unk7E = 0;
             self->ext.et_801719A4.unk90 = 1;
             if (--self->ext.et_801719A4.unk7C < 0) {
@@ -1699,7 +1699,7 @@ void RicEntitySubwpnStopwatch(Entity* self) {
                 prim->r2 = prim->r3 = 0x40;
             prim->b0 = prim->b1 = prim->b2 = prim->b3 = 0x60;
             prim->drawMode |= DRAW_COLORS;
-            g_api.PlaySfx(0x6A4);
+            g_api.PlaySfx(SFX_UI_TINK);
             self->step++;
         }
         break;
@@ -2068,7 +2068,7 @@ void RicEntitySubwpnBible(Entity* self) {
             self->flags &= ~FLAG_KEEP_ALIVE_OFFCAMERA;
             self->velocityX = self->facingLeft ? FIX(-12) : FIX(12);
             self->velocityY = FIX(-12);
-            g_api.PlaySfx(0x6B2);
+            g_api.PlaySfx(SFX_BIBLE_SCRAPE);
             self->ext.et_BibleSubwpn.unk86++;
             self->step++;
         }
diff --git a/src/servant/tt_000/10E8.c b/src/servant/tt_000/10E8.c
index 979f68791..8f437566f 100644
--- a/src/servant/tt_000/10E8.c
+++ b/src/servant/tt_000/10E8.c
@@ -3,8 +3,6 @@
 #include <sfx.h>
 #include <psxsdk/libc.h>
 
-#define SFX_BAT_NOTIFY SE_UI_OVERWRITE_MSG
-
 #ifndef VERSION_PSP
 s32 D_801748D8[0x80];
 Collider D_80174AD8;
@@ -695,7 +693,7 @@ void func_80172120(Entity* self) {
     case 2:
         self->ext.bat.unk8C++;
         if (self->ext.bat.unk8C == 1) {
-            g_api.PlaySfx(SFX_BAT_NOTIFY);
+            g_api.PlaySfx(SFX_UI_ALERT_TINK);
             func_8017170C(self, 1);
         } else if (self->ext.bat.unk8C > 30) {
             self->ext.bat.unk8C = 0;
diff --git a/src/st/dre/succubus.c b/src/st/dre/succubus.c
index ac5d241ad..51a41947c 100644
--- a/src/st/dre/succubus.c
+++ b/src/st/dre/succubus.c
@@ -516,7 +516,7 @@ void EntitySuccubus(Entity* self) {
                 }
             }
             if ((self->ext.succubus.timer % 64) == 0) {
-                PlaySfxPositional(NA_SE_SU_PETAL_ATTACK);
+                PlaySfxPositional(SFX_GLASS_SHARDS);
             }
             if (--self->ext.succubus.timer == 0) {
                 SetStep(SUCCUBUS_FLY);
@@ -841,7 +841,7 @@ void EntitySuccubus(Entity* self) {
         case SUCCUBUS_SPIKE_ATTACK_1:
             if (AnimateEntity(D_80180748, self) == 0) {
                 self->ext.succubus.unk85 = true;
-                PlaySfxPositional(NA_VO_SU_CRYSTAL_2);
+                PlaySfxPositional(SFX_GUARD_TINK);
                 PlaySfxPositional(NA_VO_SU_GRUNT_3);
                 self->ext.succubus.timer = 64;
                 SetSubStep(2);
diff --git a/src/st/no3/3E134.c b/src/st/no3/3E134.c
index 4272a7f53..2a44701de 100644
--- a/src/st/no3/3E134.c
+++ b/src/st/no3/3E134.c
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 #include "no3.h"
+#include "sfx.h"
 
 // intro owl and leaves
 void EntityFlyingOwlAndLeaves(Entity* entity) {
@@ -97,7 +98,7 @@ void EntityFlyingOwlAndLeaves(Entity* entity) {
     }
 
     if (!animFlag) {
-        PlaySfxPositional(SE_OWL_WING_FLAP);
+        PlaySfxPositional(SFX_WING_FLAP_A);
     }
 }
 
diff --git a/src/st/no3/3FF00.c b/src/st/no3/3FF00.c
index 57d87ec0e..c7a66cfb4 100644
--- a/src/st/no3/3FF00.c
+++ b/src/st/no3/3FF00.c
@@ -42,7 +42,7 @@ void EntityRoomTransition2(Entity* self) {
     case 2:
         if (g_CutsceneFlags & 0x20) {
             g_api.InitStatsAndGear(1);
-            g_api.PlaySfx(SE_DEATH_SWIPES);
+            g_api.PlaySfx(SFX_DEATH_SWISH);
             for (localVar = 0; localVar < 6; localVar++) {
                 newEntity = AllocEntity(&g_Entities[224], &g_Entities[256]);
                 if (newEntity == NULL) {
diff --git a/src/st/no3/48A84.c b/src/st/no3/48A84.c
index b3e431f4f..2297c2df6 100644
--- a/src/st/no3/48A84.c
+++ b/src/st/no3/48A84.c
@@ -43,6 +43,8 @@
 
 #include "../entity_enemy_blood.h"
 
+#include "sfx.h"
+
 void EntityRoomForeground(Entity* entity) {
     ObjInit* objInit = &D_80182764[entity->params];
 
@@ -272,7 +274,7 @@ void EntityUnkId31(Entity* self) {
     animCurFrame = entity->animCurFrame;
     if (self->flags & FLAG_DEAD) {
         hitboxPtr = D_80182F9C;
-        PlaySfxPositional(0x684);
+        PlaySfxPositional(SFX_FM_THUNDER_EXPLODE);
 
         for (i = 0; i < 3; i++) {
             entity = AllocEntity(&g_Entities[224], &g_Entities[256]);
diff --git a/src/st/no3/56264.c b/src/st/no3/56264.c
index 3e9a2a758..9d96871ad 100644
--- a/src/st/no3/56264.c
+++ b/src/st/no3/56264.c
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 #include "no3.h"
+#include "sfx.h"
 
 void EntityBat(Entity* entity) {
     Entity* newEntity;
@@ -12,7 +13,7 @@ void EntityBat(Entity* entity) {
             CreateEntityFromEntity(2, entity, newEntity);
             newEntity->params = 1;
         }
-        PlaySfxPositional(SE_BAT_DEATH);
+        PlaySfxPositional(SFX_BAT_SCREECH_SWISH);
         DestroyEntity(entity);
         return;
     }
diff --git a/src/st/no3/no3.h b/src/st/no3/no3.h
index b3b78b611..95d964fc7 100644
--- a/src/st/no3/no3.h
+++ b/src/st/no3/no3.h
@@ -6,11 +6,6 @@
 #define CASTLE_FLAG_BANK 0x34
 
 // NO3 Sound IDs
-#define SE_OWL_WING_FLAP 0x68C
-#define SE_WARG_DEATH_EXPLODE 0x697
-#define SE_BAT_DEATH 0x69C
-#define SE_DEATH_SWIPES 0x6A2
-// #define 0x6C7
 #define SE_NO3_ALUCARD_JUMP 0x6EF
 #define SE_MERMAN_DEATH 0x71D
 #define SE_WARG_DEATH_HOWL 0x780
diff --git a/src/st/np3/4997C.c b/src/st/np3/4997C.c
index db3043a10..6165b0af4 100644
--- a/src/st/np3/4997C.c
+++ b/src/st/np3/4997C.c
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 #include "np3.h"
+#include "sfx.h"
 
 void EntityBat(Entity* entity) {
     Entity* newEntity;
@@ -12,7 +13,7 @@ void EntityBat(Entity* entity) {
             CreateEntityFromEntity(E_EXPLOSION, entity, newEntity);
             newEntity->params = 1;
         }
-        PlaySfxPositional(0x69C);
+        PlaySfxPositional(SFX_BAT_SCREECH_SWISH);
         DestroyEntity(entity);
         return;
     }
diff --git a/src/st/np3/49F98.c b/src/st/np3/49F98.c
index 8aa2d92a2..3b0beb9dc 100644
--- a/src/st/np3/49F98.c
+++ b/src/st/np3/49F98.c
@@ -408,7 +408,7 @@ void EntityBloodyZombie(Entity* self) {
             }
             self->ext.generic.unk80.modeS16.unk0 = 64;
             self->animCurFrame = 0;
-            PlaySfxPositional(NA_SE_EN_EXPLOSIVE_DEATH);
+            PlaySfxPositional(SFX_STUTTER_EXPLODE_LOW);
             self->step++;
         }
         break;
diff --git a/src/st/np3/4B018.c b/src/st/np3/4B018.c
index 02aee9a18..f8c373530 100644
--- a/src/st/np3/4B018.c
+++ b/src/st/np3/4B018.c
@@ -15,7 +15,7 @@ void EntityOwl(Entity* self) {
     s16 angle;
 
     if (1 < self->step && self->step < 9 && !(g_Timer & 0xF)) {
-        PlaySfxPositional(0x68C);
+        PlaySfxPositional(SFX_WING_FLAP_A);
     }
     if (self->ext.owl.unk80 & 0x20) {
         if (!(self->flags & FLAG_DEAD)) {
@@ -382,7 +382,7 @@ void EntityOwl(Entity* self) {
         break;
     case 10:
         if (!(--self->ext.owl.unk82) || (KNIGHT->entityId == 0)) {
-            PlaySfxPositional(0x683);
+            PlaySfxPositional(SFX_QUICK_STUTTER_EXPLODE_B);
             otherEnt = AllocEntity(&g_Entities[224], &g_Entities[256]);
             if (otherEnt != NULL) {
                 CreateEntityFromEntity(E_EXPLOSION, self, otherEnt);
diff --git a/src/st/np3/gaibon.c b/src/st/np3/gaibon.c
index a114fdae5..09dcf90cc 100644
--- a/src/st/np3/gaibon.c
+++ b/src/st/np3/gaibon.c
@@ -180,7 +180,7 @@ void EntityGaibon(Entity* self) {
     case GAIBON_IDLE:
         AnimateEntity(D_801814C4, self);
         if (self->animFrameDuration == 0 && self->animFrameIdx == 1) {
-            PlaySfxPositional(NA_SE_EN_GAIBON_FLAP_WINGS);
+            PlaySfxPositional(SFX_WING_FLAP_B);
         }
         if ((GetDistanceToPlayerX() < 0x60) &&
             (GetDistanceToPlayerY() < 0x60)) {
@@ -220,7 +220,7 @@ void EntityGaibon(Entity* self) {
             MoveEntity();
             AnimateEntity(D_801814C4, self);
             if (!self->animFrameDuration && self->animFrameIdx == 1) {
-                PlaySfxPositional(NA_SE_EN_GAIBON_FLAP_WINGS);
+                PlaySfxPositional(SFX_WING_FLAP_B);
             }
             self->facingLeft = (GetSideToPlayer() & 1) ^ 1;
             if (!(--self->ext.GS_Props.timer)) {
@@ -235,7 +235,7 @@ void EntityGaibon(Entity* self) {
                 SetStep(GAIBON_FLY_SHOOT_FIREBALLS);
             }
             if (!self->animFrameDuration && self->animFrameIdx == 1) {
-                PlaySfxPositional(NA_SE_EN_GAIBON_FLAP_WINGS);
+                PlaySfxPositional(SFX_WING_FLAP_B);
             }
             break;
         }
@@ -277,7 +277,7 @@ void EntityGaibon(Entity* self) {
             MoveEntity();
             AnimateEntity(D_8018150C, self);
             if (!self->animFrameDuration && self->animFrameIdx == 1) {
-                PlaySfxPositional(NA_SE_EN_GAIBON_FLAP_WINGS);
+                PlaySfxPositional(SFX_WING_FLAP_B);
             }
             // Reuse of speedLimit variable, unrelated to speed
             speedLimit = 0xF;
@@ -321,7 +321,7 @@ void EntityGaibon(Entity* self) {
                 }
             }
             if (!self->animFrameDuration && self->animFrameIdx == 1) {
-                PlaySfxPositional(NA_SE_EN_GAIBON_FLAP_WINGS);
+                PlaySfxPositional(SFX_WING_FLAP_B);
             }
             break;
         }
@@ -500,7 +500,7 @@ void EntityGaibon(Entity* self) {
         case GAIBON_PICKUP_SLOGRA_ASCENDING:
             AnimateEntity(D_80181520, self);
             if (!self->animFrameDuration && self->animFrameIdx == 1) {
-                PlaySfxPositional(NA_SE_EN_GAIBON_FLAP_WINGS);
+                PlaySfxPositional(SFX_WING_FLAP_B);
             }
             MoveEntity();
             self->velocityY -= FIX(5.0 / 128);
@@ -521,7 +521,7 @@ void EntityGaibon(Entity* self) {
         case GAIBON_PICKUP_SLOGRA_AIMING:
             AnimateEntity(D_80181520, self);
             if (!self->animFrameDuration && self->animFrameIdx == 1) {
-                PlaySfxPositional(NA_SE_EN_GAIBON_FLAP_WINGS);
+                PlaySfxPositional(SFX_WING_FLAP_B);
             }
             if (GetSideToPlayer() & 1) {
                 self->velocityX -= FIX(5.0 / 128);
diff --git a/src/st/np3/slogra.c b/src/st/np3/slogra.c
index a767e6737..4fd3a4df4 100644
--- a/src/st/np3/slogra.c
+++ b/src/st/np3/slogra.c
@@ -186,7 +186,7 @@ void EntitySlogra(Entity* self) {
 
         case SLOGRA_FIRE_PROJECTILE:
             if (AnimateEntity(D_80181300, self) == 0) {
-                PlaySfxPositional(NA_SE_EN_SLOGRA_SPEAR_PROJECTILE);
+                PlaySfxPositional(SFX_FM_EXPLODE_SWISHES);
                 newEntity = AllocEntity(g_Entities + 160, g_Entities + 192);
                 if (newEntity != NULL) {
                     CreateEntityFromEntity(
@@ -353,7 +353,7 @@ void EntitySlogra(Entity* self) {
                 self->ext.GS_Props.nearDeath = 1;
             }
             self->ext.GS_Props.timer = 64;
-            PlaySfxPositional(NA_SE_EN_SLOGRA_DEATH_EXPLOSION);
+            PlaySfxPositional(SFX_STUTTER_EXPLODE_A);
             g_CastleFlags[SG_RETR_ENTR] |= 1;
             self->step_s++;
 
diff --git a/src/st/nz0/311C0.c b/src/st/nz0/311C0.c
index 056e980d1..e60a3b71c 100644
--- a/src/st/nz0/311C0.c
+++ b/src/st/nz0/311C0.c
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 #include "nz0.h"
+#include "sfx.h"
 
 // bust with red eyes that can have a candle on it
 void EntityRedEyeBust(Entity* self) {
@@ -448,7 +449,7 @@ void BoxPuzzleSpikes(Entity* self, s16 primIndex) {
 
         if (self->ext.nz0311c0.unk88 != var_v1) {
             self->ext.nz0311c0.unk88 = var_v1;
-            PlaySfxPositional(0x69D);
+            PlaySfxPositional(SFX_MAGIC_SWITCH);
         }
     }
 
@@ -672,7 +673,7 @@ void EntityCannon(Entity* self) {
     case 1:
         if (D_80180ED0[0] != 0) {
             g_api.func_80102CD8(1);
-            g_api.PlaySfx(0x6AC);
+            g_api.PlaySfx(SFX_CANNON_EXPLODE);
             self->velocityX = FIX(8);
             newEntity = AllocEntity(&g_Entities[224], &g_Entities[256]);
             if (newEntity != 0) {
@@ -1080,7 +1081,7 @@ void EntityFloorSpikes(Entity* self) {
         }
     }
     if (self->ext.nz0311c0.unk88 != 0) {
-        PlaySfxPositional(0x69D);
+        PlaySfxPositional(SFX_MAGIC_SWITCH);
         self->ext.nz0311c0.unk88 = 0;
     }
     prim = self->ext.prim;
diff --git a/src/st/nz0/e_bloody_zombie.c b/src/st/nz0/e_bloody_zombie.c
index bbeb49b40..6a6e5f34e 100644
--- a/src/st/nz0/e_bloody_zombie.c
+++ b/src/st/nz0/e_bloody_zombie.c
@@ -436,7 +436,7 @@ void EntityBloodyZombie(Entity* self) {
             }
             self->ext.generic.unk80.modeS16.unk0 = 64;
             self->animCurFrame = 0;
-            PlaySfxPositional(NA_SE_EN_EXPLOSIVE_DEATH);
+            PlaySfxPositional(SFX_STUTTER_EXPLODE_LOW);
             self->step++;
         }
         break;
diff --git a/src/st/nz0/gaibon.c b/src/st/nz0/gaibon.c
index dc04438e7..a6203a738 100644
--- a/src/st/nz0/gaibon.c
+++ b/src/st/nz0/gaibon.c
@@ -108,7 +108,7 @@ void EntityGaibon(Entity* self) {
     case GAIBON_IDLE:
         AnimateEntity(D_80181250, self);
         if (!self->animFrameDuration && self->animFrameIdx == 1) {
-            PlaySfxPositional(NA_SE_EN_GAIBON_FLAP_WINGS);
+            PlaySfxPositional(SFX_WING_FLAP_B);
         }
         if (self->hitFlags) {
             g_BossFlag |= BOSS_FLAG_FIGHT_BEGIN;
@@ -150,7 +150,7 @@ void EntityGaibon(Entity* self) {
             MoveEntity();
             AnimateEntity(D_80181250, self);
             if (!self->animFrameDuration && self->animFrameIdx == 1) {
-                PlaySfxPositional(NA_SE_EN_GAIBON_FLAP_WINGS);
+                PlaySfxPositional(SFX_WING_FLAP_B);
             }
             self->facingLeft = (GetSideToPlayer() & 1) ^ 1;
             if (!(--self->ext.GS_Props.timer)) {
@@ -165,7 +165,7 @@ void EntityGaibon(Entity* self) {
                 SetStep(4);
             }
             if (!self->animFrameDuration && self->animFrameIdx == 1) {
-                PlaySfxPositional(NA_SE_EN_GAIBON_FLAP_WINGS);
+                PlaySfxPositional(SFX_WING_FLAP_B);
             }
             break;
         }
@@ -207,7 +207,7 @@ void EntityGaibon(Entity* self) {
             MoveEntity();
             AnimateEntity(D_80181298, self);
             if (!self->animFrameDuration && self->animFrameIdx == 1) {
-                PlaySfxPositional(NA_SE_EN_GAIBON_FLAP_WINGS);
+                PlaySfxPositional(SFX_WING_FLAP_B);
             }
             // Reuse of speedLimit variable, unrelated to speed
             speedLimit = 0xF;
@@ -246,7 +246,7 @@ void EntityGaibon(Entity* self) {
                 }
             }
             if (!self->animFrameDuration && self->animFrameIdx == 1) {
-                PlaySfxPositional(NA_SE_EN_GAIBON_FLAP_WINGS);
+                PlaySfxPositional(SFX_WING_FLAP_B);
             }
             break;
         }
@@ -421,7 +421,7 @@ void EntityGaibon(Entity* self) {
         case GAIBON_PICKUP_SLOGRA_ASCENDING:
             AnimateEntity(D_801812AC, self);
             if (!self->animFrameDuration && self->animFrameIdx == 1) {
-                PlaySfxPositional(NA_SE_EN_GAIBON_FLAP_WINGS);
+                PlaySfxPositional(SFX_WING_FLAP_B);
             }
             MoveEntity();
             self->velocityY -= FIX(5.0 / 128);
@@ -442,7 +442,7 @@ void EntityGaibon(Entity* self) {
         case GAIBON_PICKUP_SLOGRA_AIMING:
             AnimateEntity(D_801812AC, self);
             if (!self->animFrameDuration && self->animFrameIdx == 1) {
-                PlaySfxPositional(NA_SE_EN_GAIBON_FLAP_WINGS);
+                PlaySfxPositional(SFX_WING_FLAP_B);
             }
             if (GetSideToPlayer() & 1) {
                 self->velocityX -= FIX(5.0 / 128);
@@ -525,7 +525,7 @@ void EntityGaibon(Entity* self) {
             break;
         case GAIBON_DYING_TURN_INTO_BONES:
             if (!(self->ext.GS_Props.timer & 7)) {
-                PlaySfxPositional(NA_SE_EN_GAIBON_FLAME);
+                PlaySfxPositional(SFX_SMALL_FLAME_IGNITE);
                 other = AllocEntity(&g_Entities[224], &g_Entities[256]);
                 if (other != NULL) {
                     CreateEntityFromEntity(E_WARG_EXP_OPAQUE, self, other);
diff --git a/src/st/nz0/slogra.c b/src/st/nz0/slogra.c
index dae4c7226..923a12197 100644
--- a/src/st/nz0/slogra.c
+++ b/src/st/nz0/slogra.c
@@ -217,7 +217,7 @@ void EntitySlogra(Entity* self) {
 
         case SLOGRA_FIRE_PROJECTILE:
             if (AnimateEntity(D_8018108C, self) == 0) {
-                PlaySfxPositional(NA_SE_EN_SLOGRA_SPEAR_PROJECTILE);
+                PlaySfxPositional(SFX_FM_EXPLODE_SWISHES);
                 newEntity = AllocEntity(g_Entities + 160, g_Entities + 192);
                 if (newEntity != NULL) {
                     CreateEntityFromEntity(
@@ -400,7 +400,7 @@ void EntitySlogra(Entity* self) {
                 self->ext.GS_Props.nearDeath = 1;
             }
             self->ext.GS_Props.timer = 64;
-            PlaySfxPositional(NA_SE_EN_SLOGRA_DEATH_EXPLOSION);
+            PlaySfxPositional(SFX_STUTTER_EXPLODE_A);
             self->step_s++;
 
         case SLOGRA_DYING_EXPLODING:
diff --git a/src/st/sel/2C048.c b/src/st/sel/2C048.c
index fd9928ac7..0ed86c53c 100644
--- a/src/st/sel/2C048.c
+++ b/src/st/sel/2C048.c
@@ -1326,7 +1326,7 @@ void SEL_Update(void) {
                 g_GameEngineStep = Upd_Eng_FileDelete;
                 break;
             default:
-                g_api.PlaySfx(SE_UI_ERROR);
+                g_api.PlaySfx(SFX_UI_ERROR);
                 break;
             }
         }
@@ -1514,7 +1514,7 @@ void SEL_Update(void) {
                 g_api.PlaySfx(SFX_UI_CONFIRM);
                 g_GameEngineStep = Upd_Eng_0x10;
             } else {
-                g_api.PlaySfx(0x686);
+                g_api.PlaySfx(SFX_UI_ERROR);
             }
         }
         break;
@@ -1589,7 +1589,7 @@ void SEL_Update(void) {
                     g_api.PlaySfx(SFX_UI_CONFIRM);
                     g_GameEngineStep++;
                 } else {
-                    g_api.PlaySfx(0x686);
+                    g_api.PlaySfx(SFX_UI_ERROR);
                 }
             }
         }
@@ -1754,7 +1754,7 @@ void SEL_Update(void) {
                     g_api.PlaySfx(SFX_UI_CONFIRM);
                     g_GameEngineStep++;
                 } else {
-                    g_api.PlaySfx(0x686);
+                    g_api.PlaySfx(SFX_UI_ERROR);
                 }
             }
         }
@@ -1788,7 +1788,7 @@ void SEL_Update(void) {
                         g_GameEngineStep++;
                     }
                 } else {
-                    g_api.PlaySfx(0x686);
+                    g_api.PlaySfx(SFX_UI_ERROR);
                 }
             }
         }
@@ -1940,7 +1940,7 @@ void SEL_Update(void) {
                     g_api.PlaySfx(SFX_UI_CONFIRM);
                     g_GameEngineStep++;
                 } else {
-                    g_api.PlaySfx(0x686);
+                    g_api.PlaySfx(SFX_UI_ERROR);
                 }
             }
         }
diff --git a/src/st/sel/3410C.c b/src/st/sel/3410C.c
index 62d13dcb8..d16fec45f 100644
--- a/src/st/sel/3410C.c
+++ b/src/st/sel/3410C.c
@@ -228,13 +228,13 @@ void HandleTitleScreen(void) {
         return;
     case 4:
         if (g_pads[0].tapped & (PAD_RIGHT | PAD_DOWN)) {
-            g_api.PlaySfx(0x688);
+            g_api.PlaySfx(SFX_DEBUG_SELECT);
             if (++D_800987B4 >= 2) {
                 D_800987B4 = 0;
             }
         }
         if (g_pads[0].tapped & (PAD_UP | PAD_LEFT)) {
-            g_api.PlaySfx(0x688);
+            g_api.PlaySfx(SFX_DEBUG_SELECT);
             if (--D_800987B4 < 0) {
                 D_800987B4 = 1;
             }
diff --git a/src/st/st0/27D64.c b/src/st/st0/27D64.c
index ea7039830..849b404c6 100644
--- a/src/st/st0/27D64.c
+++ b/src/st/st0/27D64.c
@@ -245,7 +245,7 @@ void func_801A8328(Entity* self) {
         g_api.CheckCollision(
             self->posX.i.hi, (s16)(self->posY.i.hi + 8), &collider, 0);
         if (collider.effects & EFFECT_SOLID) {
-            g_api.PlaySfx(0x691);
+            g_api.PlaySfx(SFX_SMALL_FLAME_IGNITE);
             newEntity = AllocEntity(&g_Entities[224], &g_Entities[256]);
             if (newEntity != NULL) {
                 CreateEntityFromCurrentEntity(E_EXPLOSION, newEntity);
diff --git a/src/st/st0/2C564.c b/src/st/st0/2C564.c
index 7ee07ff91..da30ef483 100644
--- a/src/st/st0/2C564.c
+++ b/src/st/st0/2C564.c
@@ -663,7 +663,7 @@ void EntityDraculaGlass(Entity* entity) {
         entity->rotZ += 0x20;
         entity->velocityY += FIX(0.125);
         if (entity->posY.i.hi >= 205) {
-            g_api.PlaySfx(NA_SE_BREAK_GLASS);
+            g_api.PlaySfx(SFX_DRA_GLASS_BREAK); // "What is a man?!"
             entity->posY.i.hi = 204;
             SetStep(2);
         }
diff --git a/src/weapon/w_000.c b/src/weapon/w_000.c
index da22344ad..8b885ea0e 100644
--- a/src/weapon/w_000.c
+++ b/src/weapon/w_000.c
@@ -183,7 +183,7 @@ static WeaponAnimation g_SoundEvents[] = {
     {g_Anim1, g_Hitboxes, 0, SFX_WEAPON_SWISH_B, 0x41, 4},
     {g_Anim0, g_Hitboxes, 0, SFX_WEAPON_SWISH_B, 0x41, 4},
     {g_Anim0, g_Hitboxes, 0, SFX_WEAPON_SWISH_C, 0x41, 4},
-    {g_Anim0, g_Hitboxes, 0, 0x6A8, 0x41, 4},
+    {g_Anim0, g_Hitboxes, 0, SFX_ALUCARD_SWORD_SWISH, 0x41, 4},
     {g_Anim0, g_Hitboxes, 0, SFX_WEAPON_SWISH_C, 0x41, 4},
 };
 
diff --git a/src/weapon/w_002.c b/src/weapon/w_002.c
index a3aa5f5b1..a50c407a8 100644
--- a/src/weapon/w_002.c
+++ b/src/weapon/w_002.c
@@ -7,6 +7,7 @@
 #include "w_002_2.h"
 #define g_Animset w_002_1
 #define g_Animset2 w_002_2
+#include "sfx.h"
 
 static u16 clut0[] = {
     0x0000, 0x1484, 0x8000, 0x0449, 0x2570, 0x3A33, 0x148F, 0x30D3, 0x217A,
@@ -80,7 +81,7 @@ static u8* anim0[] = {
     D_12000_8017AAA4, D_12000_8017AAA4, D_12000_8017AAC0, D_12000_8017AADC,
     D_12000_8017AAF8, D_12000_8017AB10, D_12000_8017AB28};
 static WeaponAnimation D_12000_8017ABC4[] = {
-    anim0, hitboxes, 0, SFX_UNK_689, 0x48, 0x03, 0};
+    anim0, hitboxes, 0, SFX_WEAPON_SCRAPE_ECHO, 0x48, 0x03, 0};
 static u16* g_WeaponCluts[] = {clut0};
 static s32 g_HandId = HAND_ID;
 
diff --git a/src/weapon/w_007.c b/src/weapon/w_007.c
index 2b875ae76..1a7150a40 100644
--- a/src/weapon/w_007.c
+++ b/src/weapon/w_007.c
@@ -7,6 +7,7 @@
 #include "w_007_2.h"
 #define g_Animset w_007_1
 #define g_Animset2 w_007_2
+#include "sfx.h"
 
 static u16 D_35000_8017A884[] = {
     COLOR16(0, 0, 0, 0),    COLOR16(4, 4, 5, 0),    COLOR16(0, 0, 0, 1),
@@ -162,10 +163,10 @@ static u16* D_35000_8017AC0C[] = {
 };
 
 static WeaponAnimation D_35000_8017AC28[] = {
-    {D_35000_8017AC0C, D_35000_8017AB58, 0x000F, SFX_UNK_689, 0x48, 0x03,
-     0x0000},
-    {D_35000_8017AC0C, D_35000_8017AB58, 0x000F, SFX_UNK_689, 0x48, 0x03,
-     0x0000}};
+    {D_35000_8017AC0C, D_35000_8017AB58, 0x000F, SFX_WEAPON_SCRAPE_ECHO, 0x48,
+     0x03, 0x0000},
+    {D_35000_8017AC0C, D_35000_8017AB58, 0x000F, SFX_WEAPON_SCRAPE_ECHO, 0x48,
+     0x03, 0x0000}};
 
 static u16 D_35000_8017AC48[] = {
     0x0028, 0xFFF2, 0x0028, 0xFFF2, 0x0028, 0x0004, 0x0024,
@@ -283,7 +284,7 @@ static void func_ptr_80170004(Entity* self) {
             self->hitEffect = 1;
             self->entityRoomIndex = 0;
             g_api.func_80118894(self);
-            g_api.PlaySfx(SFX_UNK_6AD);
+            g_api.PlaySfx(SFX_UI_ALERT_TINK);
             self->step++;
             return;
         }
diff --git a/src/weapon/w_008.c b/src/weapon/w_008.c
index a2cb8c9e9..844d14546 100644
--- a/src/weapon/w_008.c
+++ b/src/weapon/w_008.c
@@ -10,6 +10,7 @@ extern s32 g_HandId;
 #include "w_008_2.h"
 #define g_Animset w_008_1
 #define g_Animset2 w_008_2
+#include "sfx.h"
 
 extern SpriteParts D_3C000_8017A040[];
 extern s8 D_3C000_8017A9F8;
@@ -306,7 +307,7 @@ static s32 EntityWeaponShieldSpell(Entity* self) {
                 prim = prim->next;
             }
             self->ext.shield.unk80 = 0x20;
-            g_api.PlaySfx(SFX_UNK_6B1);
+            g_api.PlaySfx(SFX_TRANSFORM_3X);
             self->step++;
         }
         break;
diff --git a/src/weapon/w_009.c b/src/weapon/w_009.c
index b444bbef3..a029ab854 100644
--- a/src/weapon/w_009.c
+++ b/src/weapon/w_009.c
@@ -307,7 +307,7 @@ void EntityWeaponShieldSpell(Entity* self) {
                 prim = prim->next;
             }
             self->ext.shield.unk80 = 0x20;
-            g_api.PlaySfx(SFX_UNK_6B1);
+            g_api.PlaySfx(SFX_TRANSFORM_3X);
             self->step++;
         }
         break;
diff --git a/src/weapon/w_010.c b/src/weapon/w_010.c
index f20c7eea3..f6099f20b 100644
--- a/src/weapon/w_010.c
+++ b/src/weapon/w_010.c
@@ -580,7 +580,7 @@ void func_ptr_80170024(Entity* self) {
         self->hitboxWidth = 0x10;
         self->hitboxHeight = 0x10;
         self->ext.shield.unkA0 = 0x20;
-        g_api.PlaySfx(SFX_UNK_69D);
+        g_api.PlaySfx(SFX_MAGIC_SWITCH);
         self->step += 1;
         break;
     case 1:
@@ -604,7 +604,7 @@ void func_ptr_80170024(Entity* self) {
             self->ext.shield.unk9C += self->ext.shield.unk9E;
             if (((xShift ^ self->ext.shield.unk9C) & 0x1000) &&
                 (self->params & 0x100)) {
-                g_api.PlaySfx(SFX_UNK_689);
+                g_api.PlaySfx(SFX_WEAPON_SCRAPE_ECHO);
             }
 
             fakePrim = (FakePrim*)&g_PrimBuf[self->primIndex];
diff --git a/src/weapon/w_015.c b/src/weapon/w_015.c
index 10ae09ade..0ec9062a6 100644
--- a/src/weapon/w_015.c
+++ b/src/weapon/w_015.c
@@ -9,6 +9,7 @@ extern s32 g_HandId;
 #include "w_015_2.h"
 #define g_Animset w_015_1
 #define g_Animset2 w_015_2
+#include "sfx.h"
 
 extern SpriteParts D_6D000_8017A2B0[];
 extern s16 D_6D000_8017A6B8[];
@@ -242,7 +243,7 @@ void func_ptr_8017000C(Entity* self) {
 
     case 1:
         if (!(g_GameTimer & 7)) {
-            g_api.PlaySfx(SFX_UNK_6A3);
+            g_api.PlaySfx(SFX_WATER_DAMAGE_SWISHES);
         }
         self->animCurFrame = 13;
         self->posX.val += self->velocityX;
diff --git a/src/weapon/w_016.c b/src/weapon/w_016.c
index 4da10b8a4..e335119cd 100644
--- a/src/weapon/w_016.c
+++ b/src/weapon/w_016.c
@@ -71,7 +71,7 @@ static void EntityWeaponAttack(Entity* self) {
         SetWeaponProperties(self, 0);
         DestroyEntityWeapon(1);
         self->hitboxHeight = self->hitboxWidth = 4;
-        g_api.PlaySfx(0x69E);
+        g_api.PlaySfx(SFX_THROW_WEAPON_SWISHES);
         g_Player.timers[10] = 4;
         self->step++;
         break;
@@ -176,7 +176,7 @@ void func_ptr_80170008(Entity* self) {
         DestroyEntityWeapon(true);
         self->hitboxHeight = 0xC;
         self->hitboxWidth = 0xC;
-        g_api.PlaySfx(0x69E);
+        g_api.PlaySfx(SFX_THROW_WEAPON_SWISHES);
         if (flag != 0) {
             g_api.PlaySfx(0x65B);
         }
diff --git a/src/weapon/w_018.c b/src/weapon/w_018.c
index 883d5b38e..00c14f1d7 100644
--- a/src/weapon/w_018.c
+++ b/src/weapon/w_018.c
@@ -163,7 +163,7 @@ s32 func_ptr_80170004(Entity* self) {
         self->posX.val += scale * self->velocityX;
         self->posY.val += (scale + 2) * self->velocityY;
 
-        g_api.PlaySfx(SFX_UNK_69D);
+        g_api.PlaySfx(SFX_MAGIC_SWITCH);
         self->ext.weapon.lifetime = 6;
         self->step++;
         break;
diff --git a/src/weapon/w_020.c b/src/weapon/w_020.c
index 75e1f2034..6684b4cd4 100644
--- a/src/weapon/w_020.c
+++ b/src/weapon/w_020.c
@@ -154,9 +154,9 @@ static void EntityWeaponAttack(Entity* self) {
         if ((self->animFrameIdx == 1) && (self->animFrameDuration == 0x38)) {
             // Useless if-statement
             if (self->anim == D_90000_8017A8C8) {
-                g_api.PlaySfx(SFX_KARMA_COIN);
+                g_api.PlaySfx(SFX_KARMA_COIN_JINGLE);
             } else {
-                g_api.PlaySfx(SFX_KARMA_COIN);
+                g_api.PlaySfx(SFX_KARMA_COIN_JINGLE);
             }
         }
         if (self->animFrameDuration < 0) {
@@ -186,7 +186,7 @@ static void EntityWeaponAttack(Entity* self) {
                 self->ext.karmacoin.timer = 0xE0;
                 self->unk6C = 0x80;
                 g_api.func_80118C28(8);
-                g_api.PlaySfx(SFX_KARMA_COIN_HEADS);
+                g_api.PlaySfx(SFX_TRANSFORM_3X);
                 prim = &g_PrimBuf[self->primIndex];
                 prim->r0 = prim->g0 = prim->b0 = 0x5F;
                 prim->r1 = prim->g1 = prim->b1 = 0x5F;
diff --git a/src/weapon/w_023.c b/src/weapon/w_023.c
index c3698549f..5d4bcaa32 100644
--- a/src/weapon/w_023.c
+++ b/src/weapon/w_023.c
@@ -324,7 +324,7 @@ static void EntityWeaponShieldSpell(Entity* self) {
                 prim = prim->next;
             }
             self->ext.shield.unk80 = 0;
-            g_api.PlaySfx(SFX_UNK_6B1);
+            g_api.PlaySfx(SFX_TRANSFORM_3X);
             self->step++;
         }
         break;
diff --git a/src/weapon/w_025.c b/src/weapon/w_025.c
index b1ecfa1a8..6f9e66f6a 100644
--- a/src/weapon/w_025.c
+++ b/src/weapon/w_025.c
@@ -322,7 +322,7 @@ static void EntityWeaponShieldSpell(Entity* self) {
                 prim = prim->next;
             }
             self->ext.shield.unk80 = 0;
-            g_api.PlaySfx(SFX_KARMA_COIN_HEADS);
+            g_api.PlaySfx(SFX_TRANSFORM_3X);
             self->step++;
         }
         if (self->ext.shield.unk80 % 10 == 0) {
diff --git a/src/weapon/w_026.c b/src/weapon/w_026.c
index 3679713e4..5c04d8b87 100644
--- a/src/weapon/w_026.c
+++ b/src/weapon/w_026.c
@@ -342,14 +342,14 @@ static void EntityWeaponShieldSpell(Entity* self) {
             unusedEnt = g_api.CreateEntFactoryFromEntity(
                 self, ((g_HandId + 1) << 0xE) + 92, 0);
             self->ext.shield.unk80 = 0;
-            g_api.PlaySfx(SFX_UNK_6B0);
+            g_api.PlaySfx(SFX_GLASS_SHARDS);
             D_BA000_8017CC3C = 0;
             self->step++;
         }
         break;
     case 4:
         if (D_BA000_8017CC3C % 22 == 0) {
-            g_api.PlaySfx(SFX_UNK_6B0);
+            g_api.PlaySfx(SFX_GLASS_SHARDS);
         }
         D_BA000_8017CC3C++;
         self->ext.shield.unk82 += 8;
@@ -378,7 +378,7 @@ static void EntityWeaponShieldSpell(Entity* self) {
         break;
     case 5:
         if (D_BA000_8017CC3C % 22 == 0) {
-            g_api.PlaySfx(SFX_UNK_6B0);
+            g_api.PlaySfx(SFX_GLASS_SHARDS);
         }
         D_BA000_8017CC3C++;
         self->ext.shield.unk90 -= 10;
@@ -390,7 +390,7 @@ static void EntityWeaponShieldSpell(Entity* self) {
         break;
     case 6:
         if (D_BA000_8017CC3C % 22 == 0) {
-            g_api.PlaySfx(SFX_UNK_6B0);
+            g_api.PlaySfx(SFX_GLASS_SHARDS);
         }
         D_BA000_8017CC3C++;
         if (++self->ext.shield.unk80 == 0x30) {
@@ -399,7 +399,7 @@ static void EntityWeaponShieldSpell(Entity* self) {
         break;
     case 7:
         if (D_BA000_8017CC3C % 22 == 0) {
-            g_api.PlaySfx(SFX_UNK_6B0);
+            g_api.PlaySfx(SFX_GLASS_SHARDS);
         }
         D_BA000_8017CC3C++;
         self->ext.shield.unk90 += 4;
diff --git a/src/weapon/w_027.c b/src/weapon/w_027.c
index e701b4d9f..15b4ca8b9 100644
--- a/src/weapon/w_027.c
+++ b/src/weapon/w_027.c
@@ -409,7 +409,7 @@ static void func_ptr_80170024(Entity* self) {
         }
         self->ext.medshieldlaser.unkA0 = 0x300;
         self->ext.medshieldlaser.unk80 = 0;
-        g_api.PlaySfx(0x6B2);
+        g_api.PlaySfx(SFX_BIBLE_SCRAPE);
         self->step++;
         break;
     case 1:
@@ -417,7 +417,7 @@ static void func_ptr_80170024(Entity* self) {
             !(self->ext.medshieldlaser.unkA4 & 0x800) &&
             (-0x120 <= self->posX.i.hi && self->posX.i.hi <= 0x120) &&
             (0 <= self->posY.i.hi && self->posY.i.hi <= 0x100)) {
-            g_api.PlaySfx(0x6B2);
+            g_api.PlaySfx(SFX_BIBLE_SCRAPE);
         }
         self->ext.medshieldlaser.unkA4 = self->ext.medshieldlaser.unk9C;
         temp_v0_8 = g_api.func_80118B18(
diff --git a/src/weapon/w_030.c b/src/weapon/w_030.c
index 193e69666..d189eb518 100644
--- a/src/weapon/w_030.c
+++ b/src/weapon/w_030.c
@@ -9,6 +9,7 @@ extern s32 g_HandId;
 #include "w_030_2.h"
 #define g_Animset w_030_1
 #define g_Animset2 w_030_2
+#include "sfx.h"
 
 extern AnimationFrame D_D6000_8017A514[];
 extern AnimationFrame D_D6000_8017A548[];
@@ -107,7 +108,7 @@ void func_ptr_8017000C(Entity* self) {
             self->facingLeft = 0;
             self->drawFlags = DRAW_COLORS;
             self->step = 2;
-            g_api.PlaySfx(SFX_UNK_6BA);
+            g_api.PlaySfx(SFX_FAST_SWORD_SWISHES);
             self->ext.weapon.unk80 = rand();
             self->ext.weapon.lifetime = ((u8)self->params * 4) + 0x30;
             D_D6000_8017CC44++;
diff --git a/src/weapon/w_041.c b/src/weapon/w_041.c
index 1e886e9aa..dacbc5730 100644
--- a/src/weapon/w_041.c
+++ b/src/weapon/w_041.c
@@ -356,7 +356,7 @@ s32 func_ptr_80170004(Entity* self) {
             }
             self->ext.weapon.some_ent =
                 func_123000_8017A994(self, self->ext.weapon.unk80, 0x280);
-            g_api.PlaySfx(0x69B);
+            g_api.PlaySfx(SFX_BAT_WING_SWISHES);
             g_api.PlaySfx(SFX_BAT_SCREECH);
             self->ext.weapon.lifetime = 0x16;
             self->ext.weapon.unk82 = 0x80;
diff --git a/src/weapon/w_043.c b/src/weapon/w_043.c
index f1f207680..f21071bd4 100644
--- a/src/weapon/w_043.c
+++ b/src/weapon/w_043.c
@@ -9,6 +9,7 @@ extern s32 g_HandId;
 #include "w_043_2.h"
 #define g_Animset w_043_1
 #define g_Animset2 w_043_2
+#include "sfx.h"
 
 extern AnimationFrame D_131000_8017AF40[];
 extern SpriteParts D_131000_8017A040[];
@@ -231,7 +232,7 @@ static void func_ptr_80170008(Entity* self) {
         self->step++;
     } else {
         if ((self->animFrameIdx == 1) || (self->animFrameIdx == 0xB)) {
-            g_api.PlaySfx(SE_WPN_ALUCARD_SWORD_SWING);
+            g_api.PlaySfx(SFX_ALUCARD_SWORD_SWISH);
         }
         if ((u16)self->animCurFrame - 0x24U < 6) {
             self->hitboxHeight = 8;
diff --git a/src/weapon/w_044.c b/src/weapon/w_044.c
index 34e16869c..0432706ab 100644
--- a/src/weapon/w_044.c
+++ b/src/weapon/w_044.c
@@ -6,6 +6,7 @@
 #include "w_044_2.h"
 #define g_Animset w_044_1
 #define g_Animset2 w_044_2
+#include "sfx.h"
 
 static u16 D_138000_8017A040[] = {
     COLOR16(0, 0, 0, 0),    COLOR16(31, 0, 0, 1),   COLOR16(24, 16, 4, 1),
@@ -187,7 +188,7 @@ void EntityWeaponAttack(Entity* self) {
         self->ext.weapon_044.unk90 = 0;
         self->ext.weapon_044.unk82 = 0x40;
         self->posY.i.hi = 64;
-        g_api.PlaySfx(SFX_UNK_6B1);
+        g_api.PlaySfx(SFX_TRANSFORM_3X);
         g_unkGraphicsStruct.unk20 = 2;
         self->step++;
         break;
diff --git a/src/weapon/w_047.c b/src/weapon/w_047.c
index 68c058d6f..2f2ef5fa9 100644
--- a/src/weapon/w_047.c
+++ b/src/weapon/w_047.c
@@ -9,6 +9,7 @@ extern s32 g_HandId;
 #include "w_047_2.h"
 #define g_Animset w_047_1
 #define g_Animset2 w_047_2
+#include "sfx.h"
 
 extern AnimationFrame D_14D000_8017A528[];
 extern s16 D_14D000_8017A468[0x20];
@@ -209,7 +210,7 @@ void EntityWeaponAttack(Entity* self) {
             yVar = self->posY.i.hi;
             if (self->flags & FLAG_HAS_PRIMS) {
                 if (!(g_GameTimer & 7)) {
-                    g_api.PlaySfx(SFX_UNK_6A3);
+                    g_api.PlaySfx(SFX_WATER_DAMAGE_SWISHES);
                 }
 
                 prim = &g_PrimBuf[self->primIndex];
diff --git a/src/weapon/w_050.c b/src/weapon/w_050.c
index 298b6a7d8..b5d9c65b1 100644
--- a/src/weapon/w_050.c
+++ b/src/weapon/w_050.c
@@ -70,7 +70,7 @@ void EntityWeaponAttack(Entity* self) {
         if (animIndex == PLAYER.animFrameIdx) {
             g_api.CreateEntFactoryFromEntity(self, WFACTORY(0x44, 0), 0);
             g_api.PlaySfx(SFX_FM_EXPLODE_B);
-            g_api.PlaySfx(SFX_UNK_69D);
+            g_api.PlaySfx(SFX_MAGIC_SWITCH);
         }
         hand = (g_HandId + 1) << 0xC;
         temp = FACTORY(0x61, animIndex);
diff --git a/src/weapon/w_055.c b/src/weapon/w_055.c
index fd20cea55..7d22ac02c 100644
--- a/src/weapon/w_055.c
+++ b/src/weapon/w_055.c
@@ -9,6 +9,7 @@ extern s32 g_HandId;
 #include "w_055_2.h"
 #define g_Animset w_055_1
 #define g_Animset2 w_055_2
+#include "sfx.h"
 
 extern WeaponAnimation D_185000_8017B0AC[];
 extern u8 D_185000_8017B0B8[];
@@ -44,7 +45,7 @@ void EntityWeaponAttack(Entity* self) {
         self->zPriority = PLAYER.zPriority - 2;
         self->drawMode = DRAW_TPAGE2 | DRAW_TPAGE;
         if (animIndex == 1) {
-            g_api.PlaySfx(SFX_UNK_69D);
+            g_api.PlaySfx(SFX_MAGIC_SWITCH);
             g_api.CreateEntFactoryFromEntity(self, WFACTORY(0x38, 0), 0);
         }
         SetWeaponProperties(self, 0);