diff --git a/asm/non_matching/playerItem3/sub_0801B4C8.inc b/asm/non_matching/playerItem3/sub_0801B4C8.inc
index 3752815f..3e0c5ca0 100644
--- a/asm/non_matching/playerItem3/sub_0801B4C8.inc
+++ b/asm/non_matching/playerItem3/sub_0801B4C8.inc
@@ -200,4 +200,4 @@ _0801B56C:
 	bl sub_0801B584
 	pop {r4, r5, pc}
 	.syntax divided
-.endif
\ No newline at end of file
+.endif
diff --git a/src/collision.c b/src/collision.c
index b312d6ea..e25d04ca 100644
--- a/src/collision.c
+++ b/src/collision.c
@@ -231,7 +231,7 @@ s32 sub_08017874(Entity* a, Entity* b) {
         if (newDmg <= 0)
             newDmg = 1;
         v5 = ModHealth(-newDmg);
-        SoundReqClipped(a, 122);
+        SoundReqClipped(a, SFX_PLY_VO6);
     } else {
         v6 = b->damage;
         if (b->kind == 8) {
@@ -247,9 +247,9 @@ s32 sub_08017874(Entity* a, Entity* b) {
         v5 = a->health - v6;
         if (a->kind == 3) {
             if ((a->field_0x6c.HALF.HI & 1) != 0)
-                SoundReqClipped(a, 295);
+                SoundReqClipped(a, SFX_BOSS_HIT);
             else
-                SoundReqClipped(a, 254);
+                SoundReqClipped(a, SFX_HIT);
         }
     }
     if (v5 <= 0) {
@@ -749,7 +749,7 @@ s32 sub_08018308(Entity* org, Entity* tgt, u32 direction, ColSettings* settings)
             }
         } else if (org->id == 3) {
             if (settings->_9) {
-                SoundReqClipped(tgt, 254);
+                SoundReqClipped(tgt, SFX_HIT);
             }
         } else if (org->id == 5) {
             gPlayerEntity.iframes = 0x80;
diff --git a/src/enemy/acroBandits.c b/src/enemy/acroBandits.c
index 40338ad7..1df406b1 100644
--- a/src/enemy/acroBandits.c
+++ b/src/enemy/acroBandits.c
@@ -330,7 +330,7 @@ void sub_08031EE8(Entity* this) {
     if (this->z.HALF.HI < 1) {
         draw = this->spriteSettings.draw;
         if (!draw)
-            EnqueueSFX(299);
+            EnqueueSFX(SFX_12B);
 
         this->spriteSettings.draw = 1;
     }
diff --git a/src/enemy/beetle.c b/src/enemy/beetle.c
index e01f69d1..6b5ddbb6 100644
--- a/src/enemy/beetle.c
+++ b/src/enemy/beetle.c
@@ -137,7 +137,7 @@ void sub_08021984(Entity* this) {
         this->z.HALF.HI = -0x80;
         this->spriteRendering.b3 = 1;
         this->spriteOrientation.flipY = 1;
-        EnqueueSFX(0x12d);
+        EnqueueSFX(SFX_12D);
     }
 
     if (GravityUpdate(this, 0x1800) == 0) {
@@ -204,7 +204,7 @@ void sub_08021AD8(Entity* this) {
                 return;
             }
             this->direction = (u8)tmp;
-            EnqueueSFX(0x7c);
+            EnqueueSFX(SFX_PLY_JUMP);
         }
         sub_080AEFE0(this);
         if (!GravityUpdate(this, 0x1800))
diff --git a/src/enemy/bladeTrap.c b/src/enemy/bladeTrap.c
index 815b0dcd..3af99a33 100644
--- a/src/enemy/bladeTrap.c
+++ b/src/enemy/bladeTrap.c
@@ -24,7 +24,7 @@ void BladeTrap(Entity* this) {
 
     if (!(--this->field_0x74.HWORD)) {
         if (!(this->direction & 0x80)) {
-            EnqueueSFX(0x74);
+            EnqueueSFX(SFX_METAL_CLINK);
         }
         sub_080A2CC0(this, &this->child, &this->field_0x74.HWORD);
     }
diff --git a/src/enemy/bobomb.c b/src/enemy/bobomb.c
index ef6c9dcf..116febb2 100644
--- a/src/enemy/bobomb.c
+++ b/src/enemy/bobomb.c
@@ -55,7 +55,7 @@ void sub_0802C688(Entity* this) {
         switch (this->field_0x82.HALF.LO) {
             case 1:
                 sub_0802CB68(this);
-                EnqueueSFX(0x14d);
+                EnqueueSFX(SFX_14D);
                 break;
             case 2:
                 this->action = 3;
@@ -245,7 +245,7 @@ void sub_0802CAF8(Entity* this) {
         sub_0802CBC4(this);
     } else {
         if (this->field_0x80.HALF.HI && sub_080044EC(this, 0x2800) == 1) {
-            EnqueueSFX(0x104);
+            EnqueueSFX(SFX_104);
         }
         sub_0802CC18(this);
         sub_08078930(this);
@@ -300,7 +300,7 @@ void sub_0802CBC4(Entity* this) {
 void sub_0802CC18(Entity* this) {
     if (--this->field_0x80.HALF.LO == 0) {
         this->field_0x80.HALF.LO = 28;
-        EnqueueSFX(0x14d);
+        EnqueueSFX(SFX_14D);
     }
 }
 
diff --git a/src/enemy/businessScrub.c b/src/enemy/businessScrub.c
index 5a4bb18a..59868dd7 100644
--- a/src/enemy/businessScrub.c
+++ b/src/enemy/businessScrub.c
@@ -65,7 +65,7 @@ void sub_08028934(Entity* this) {
         if (pEVar1 != NULL) {
             pEVar1->z.HALF.HI -= 8;
         }
-        EnqueueSFX(0x1bb);
+        EnqueueSFX(SFX_EM_DEKUSCRUB_HIT);
     }
 }
 
diff --git a/src/enemy/chuchu.c b/src/enemy/chuchu.c
index c8e7640e..8a5f90fb 100644
--- a/src/enemy/chuchu.c
+++ b/src/enemy/chuchu.c
@@ -220,7 +220,7 @@ void sub_0801F1B0(Entity* this) {
         if (this->frame & 1) {
             this->frame ^= 1;
             this->hitType = 90;
-            EnqueueSFX(299);
+            EnqueueSFX(SFX_12B);
         }
         sub_080AEFE0(this);
         if (GravityUpdate(this, 0x4000) == 0)
@@ -416,7 +416,7 @@ void sub_0801F584(Entity* this) {
         if (this->frame & 0x1) {
             this->frame ^= 1;
             this->hitType = 91;
-            EnqueueSFX(299);
+            EnqueueSFX(SFX_12B);
         }
         sub_080AEFE0(this);
         if (GravityUpdate(this, 0x4000) == 0)
@@ -564,7 +564,7 @@ void sub_0801F884(Entity* this) {
             ent->type2 = 64;
             this->action = 4;
             this->hitType = 165;
-            EnqueueSFX(0x193);
+            EnqueueSFX(SFX_193);
         }
     }
 }
@@ -593,7 +593,7 @@ void sub_0801F940(Entity* this) {
     if (this->frame & 0x10) {
         if (this->frame & 1) {
             this->frame ^= 1;
-            EnqueueSFX(299);
+            EnqueueSFX(SFX_12B);
         }
         sub_080AEFE0(this);
         if (GravityUpdate(this, 0x4000) == 0)
diff --git a/src/enemy/cuccoChickAggr.c b/src/enemy/cuccoChickAggr.c
index 94326739..5acaf9d3 100644
--- a/src/enemy/cuccoChickAggr.c
+++ b/src/enemy/cuccoChickAggr.c
@@ -53,7 +53,7 @@ void sub_08022988(Entity* this) {
 
             this->frameIndex = 1;
             this->zVelocity = Q_16_16(1.0);
-            EnqueueSFX(0xd6);
+            EnqueueSFX(SFX_VO_CHEEP);
         }
 
         ProcessMovement(this);
@@ -79,7 +79,7 @@ void sub_080229F8(Entity* this) {
             sub_08022B44(this);
         } else {
             this->zVelocity = Q_16_16(1.0);
-            EnqueueSFX(0xd6);
+            EnqueueSFX(SFX_VO_CHEEP);
         }
     }
 }
@@ -147,7 +147,7 @@ void sub_08022B44(Entity* this) {
     if (this->direction & 0xf)
         this->spriteSettings.flipX = (this->direction >> 4) ^ 1;
 
-    EnqueueSFX(0xd6);
+    EnqueueSFX(SFX_VO_CHEEP);
 }
 
 // clang-format off
diff --git a/src/enemy/darkNut.c b/src/enemy/darkNut.c
index 7084ae0c..ad692d3b 100644
--- a/src/enemy/darkNut.c
+++ b/src/enemy/darkNut.c
@@ -97,7 +97,7 @@ void sub_08020BB8(Entity* this) {
             }
             this->action = 10;
             sub_08021218(this, 0xb, this->animationState);
-            EnqueueSFX(0x15d);
+            EnqueueSFX(SFX_15D);
             sub_08021588(this);
             break;
         case 0x4c:
@@ -280,7 +280,7 @@ void sub_08021038(Entity* this) {
             pEVar2->parent = this;
             this->child = pEVar2;
         }
-        EnqueueSFX(270);
+        EnqueueSFX(SFX_10E);
     }
 
     if (this->frame & 0x80) {
@@ -302,7 +302,7 @@ void sub_080210A8(Entity* this) {
     if (this->frame & 1) {
         this->frame = 0;
         sub_08021588(this);
-        EnqueueSFX(349);
+        EnqueueSFX(SFX_15D);
     } else if (this->frame & 0x80) {
         sub_08021390(this);
     }
@@ -320,7 +320,7 @@ void sub_080210E4(Entity* this) {
             this->child = ent;
         }
 
-        EnqueueSFX(270);
+        EnqueueSFX(SFX_10E);
     }
 
     sub_08021644(this);
@@ -578,13 +578,13 @@ void sub_0802159C(Entity* this) {
             ent->parent = this;
             this->child = ent;
         }
-        EnqueueSFX(0x116);
+        EnqueueSFX(SFX_116);
     } else if (this->frame == 2) {
         this->frame = 0;
         sub_08021588(this);
     } else if (this->frame & 0x20) {
         this->frame &= ~0x20;
-        EnqueueSFX(0x115);
+        EnqueueSFX(SFX_115);
     }
 }
 
@@ -599,7 +599,7 @@ void sub_08021600(Entity* this) {
             ent->parent = this;
             this->child = ent;
         }
-        EnqueueSFX(0x10e);
+        EnqueueSFX(SFX_10E);
     } else if (this->frame == 2) {
         this->frame = 0;
         sub_08021588(this);
@@ -609,7 +609,7 @@ void sub_08021600(Entity* this) {
 void sub_08021644(Entity* this) {
     if (this->frame & 0x20) {
         this->frame &= ~0x20;
-        EnqueueSFX(0x7d);
+        EnqueueSFX(SFX_PLY_LAND);
     }
 }
 
diff --git a/src/enemy/doorMimic.c b/src/enemy/doorMimic.c
index f1187330..a5b63e9d 100644
--- a/src/enemy/doorMimic.c
+++ b/src/enemy/doorMimic.c
@@ -91,7 +91,7 @@ void sub_080220F0(Entity* this) {
                 fx->y.HALF.HI += off->v;
             }
         }
-        EnqueueSFX(260);
+        EnqueueSFX(SFX_104);
     } else if (this->frame & 1) {
         this->damage = 4;
     }
diff --git a/src/enemy/fallingBoulder.c b/src/enemy/fallingBoulder.c
index aa54cb6e..1bb932af 100644
--- a/src/enemy/fallingBoulder.c
+++ b/src/enemy/fallingBoulder.c
@@ -80,7 +80,7 @@ NONMATCH("asm/non_matching/fallingBoulder/sub_0802C334.inc", void sub_0802C334(E
     GetNextFrame(this);
     this->field_0x7c.HALF.HI = COORD_TO_TILE(this);
     if (sub_080044EC(this, *(u32*)&this->cutsceneBeh) == 1) {
-        EnqueueSFX(0x14c);
+        EnqueueSFX(SFX_14C);
         COLLISION_ON(this);
         this->field_0x7a.HWORD = 0xc;
         sub_0802C4B0(this);
diff --git a/src/enemy/gyorgFemaleEye.c b/src/enemy/gyorgFemaleEye.c
index af10a307..18490900 100644
--- a/src/enemy/gyorgFemaleEye.c
+++ b/src/enemy/gyorgFemaleEye.c
@@ -150,7 +150,7 @@ void sub_08048BB0(GyorgFemaleEyeEntity* this) {
                 super->iframes = 0xF4;
                 super->hitType = 0x89;
                 InitializeAnimation(super, (parent->base.animationState >> 6) + 0x14);
-                SoundReq(0x119);
+                SoundReq(SFX_ITEM_GLOVES_KNOCKBACK);
             }
             GetNextFrame(super);
             if (super->frame & 0x80) {
diff --git a/src/enemy/lakitu.c b/src/enemy/lakitu.c
index b7861656..00f9d08f 100644
--- a/src/enemy/lakitu.c
+++ b/src/enemy/lakitu.c
@@ -318,7 +318,7 @@ void Lakitu_SpawnLightning(Entity* this) {
 
     PositionRelative(this, lightning, Q_16_16(offset->x), Q_16_16(offset->y));
 
-    EnqueueSFX(0x193);
+    EnqueueSFX(SFX_193);
 }
 
 void sub_0803CBAC(Entity* this) {
diff --git a/src/enemy/lakituCloud.c b/src/enemy/lakituCloud.c
index 3caf7608..3cf330c2 100644
--- a/src/enemy/lakituCloud.c
+++ b/src/enemy/lakituCloud.c
@@ -64,7 +64,7 @@ void sub_0803CD40(Entity* this) {
 
     ModHealth(-2);
 
-    SoundReqClipped(&gPlayerEntity, 122);
+    SoundReqClipped(&gPlayerEntity, SFX_PLY_VO6);
     sub_08079D84();
 
     sub_0803CE3C(this);
diff --git a/src/enemy/likeLike.c b/src/enemy/likeLike.c
index d65a4c8a..210d2134 100644
--- a/src/enemy/likeLike.c
+++ b/src/enemy/likeLike.c
@@ -205,7 +205,7 @@ void sub_0802805C(Entity* this) {
         }
 
         if ((this->actionDelay & 3) == 0) {
-            EnqueueSFX(0x104);
+            EnqueueSFX(SFX_104);
         }
     }
 }
diff --git a/src/enemy/madderpillar.c b/src/enemy/madderpillar.c
index a804035b..e58d39bc 100644
--- a/src/enemy/madderpillar.c
+++ b/src/enemy/madderpillar.c
@@ -61,7 +61,7 @@ void sub_080298A4(Entity* this) {
                 this->hitType = 0x6b;
                 this->field_0x76.HALF.HI = 0;
                 ChangeObjPalette(this, 0x7f);
-                EnqueueSFX(0xfe);
+                EnqueueSFX(SFX_HIT);
                 this->child->action = 2;
                 break;
         }
@@ -145,7 +145,7 @@ void sub_08029AA4(Entity* this) {
         this->field_0x7a.HWORD = 0x168;
         this->field_0x74.HALF.HI = 4;
         sub_08029EEC(this);
-        EnqueueSFX(0x19d);
+        EnqueueSFX(SFX_19D);
     }
 }
 
@@ -159,7 +159,7 @@ void sub_08029AE0(Entity* this) {
         this->field_0x74.HALF.HI = 0;
         sub_08029EEC(this);
         ChangeObjPalette(this, 0x77);
-        EnqueueSFX(0x182);
+        EnqueueSFX(SFX_182);
     }
 }
 
@@ -221,7 +221,7 @@ void sub_08029C2C(Entity* this) {
     if (--this->actionDelay == 0) {
         this->action = 4;
         ChangeObjPalette(this, 0x7f);
-        EnqueueSFX(0x6c);
+        EnqueueSFX(SFX_MENU_CANCEL);
     }
 }
 
@@ -275,7 +275,7 @@ void sub_08029D14(Entity* this) {
         if (--this->actionDelay == 0) {
             InitializeAnimation(this, this->animationState + 0xc);
             ChangeObjPalette(this, 0x7f);
-            EnqueueSFX(0x6c);
+            EnqueueSFX(SFX_MENU_CANCEL);
         }
     } else {
         GetNextFrame(this);
@@ -284,7 +284,7 @@ void sub_08029D14(Entity* this) {
             this->actionDelay = 0x78;
             this->hitType = 0x6c;
             this->hitbox = &gUnk_080FD298;
-            EnqueueSFX(0x6b);
+            EnqueueSFX(SFX_6B);
         }
     }
 }
@@ -454,7 +454,7 @@ void sub_0802A098(Entity* this) {
     if (sub_08029F48(this)) {
         sub_08029E0C(this);
         sub_08029EEC(this);
-        EnqueueSFX(0x104);
+        EnqueueSFX(SFX_104);
     }
 
     sub_08029FB4(this, this->x.HALF.HI - uVar1, this->y.HALF.HI - uVar2);
@@ -505,7 +505,7 @@ void sub_0802A18C(Entity* this) {
             case 0x1e:
                 break;
             default:
-                EnqueueSFX(0x12e);
+                EnqueueSFX(SFX_12E);
                 break;
         }
     }
diff --git a/src/enemy/mazaalBracelet.c b/src/enemy/mazaalBracelet.c
index 55d40deb..3fb6f9bd 100644
--- a/src/enemy/mazaalBracelet.c
+++ b/src/enemy/mazaalBracelet.c
@@ -1244,7 +1244,7 @@ void sub_0803B798(void) {
 void sub_0803B804(Entity* this) {
     gPlayerEntity.iframes = 30;
     ModHealth(-4);
-    SoundReqClipped(&gPlayerEntity, 0x7a);
+    SoundReqClipped(&gPlayerEntity, SFX_PLY_VO6);
 }
 
 void sub_0803B824(Entity* this) {
diff --git a/src/enemy/moldworm.c b/src/enemy/moldworm.c
index 80d1a055..66715f40 100644
--- a/src/enemy/moldworm.c
+++ b/src/enemy/moldworm.c
@@ -411,7 +411,7 @@ void sub_08023894(Entity* this) {
             gPlayerEntity.animationState = gPlayerEntity.direction >> 2;
             gPlayerEntity.iframes = 12;
             ModHealth(-0x10);
-            SoundReqClipped(&gPlayerEntity, 0x7a);
+            SoundReqClipped(&gPlayerEntity, SFX_PLY_VO6);
         }
     }
 }
diff --git a/src/enemy/octorok.c b/src/enemy/octorok.c
index 658d94a0..f94b4743 100644
--- a/src/enemy/octorok.c
+++ b/src/enemy/octorok.c
@@ -137,7 +137,7 @@ void Octorok_ShootNut(Entity* this) {
             ent->y.HALF.HI += off[1];
             ent->z.HALF.HI = -3;
             this->frame &= 0xfe;
-            EnqueueSFX(0x18d);
+            EnqueueSFX(SFX_18D);
         }
     }
 
diff --git a/src/enemy/pesto.c b/src/enemy/pesto.c
index b52a69fc..0a10070d 100644
--- a/src/enemy/pesto.c
+++ b/src/enemy/pesto.c
@@ -819,7 +819,7 @@ void sub_08024E4C(Entity* this) {
                 this->field_0x86.HALF.HI++;
                 player->iframes = 8;
                 ModHealth(-2);
-                SoundReqClipped(player, 0x7a);
+                SoundReqClipped(player, SFX_PLY_VO6);
             }
         }
     }
diff --git a/src/enemy/puffstool.c b/src/enemy/puffstool.c
index e4763610..f444b65a 100644
--- a/src/enemy/puffstool.c
+++ b/src/enemy/puffstool.c
@@ -89,7 +89,7 @@ void sub_08025020(Entity* this) {
                     ent->spritePriority.b0 = 3;
                     CopyPosition(this, ent);
                 }
-                EnqueueSFX(0x186);
+                EnqueueSFX(SFX_186);
             }
             break;
     }
diff --git a/src/enemy/rollobite.c b/src/enemy/rollobite.c
index c80786d3..4b8e07b0 100644
--- a/src/enemy/rollobite.c
+++ b/src/enemy/rollobite.c
@@ -190,7 +190,7 @@ void Rollobite_RolledUp(Entity* this) {
         sub_08078930(this);
     } else {
         if (unk == 1)
-            EnqueueSFX(260);
+            EnqueueSFX(SFX_104);
 
         if ((this->direction & 0x80) == 0)
             sub_080AEFE0(this);
diff --git a/src/enemy/rope.c b/src/enemy/rope.c
index d2ca5b18..05e1c85e 100644
--- a/src/enemy/rope.c
+++ b/src/enemy/rope.c
@@ -95,7 +95,7 @@ void sub_08031480(Entity* this) {
             this->field_0xf = 0xf;
             this->spriteSettings.draw = 1;
             UpdateSpriteForCollisionLayer(this);
-            EnqueueSFX(0x84);
+            EnqueueSFX(SFX_WATER_SPLASH);
         }
     }
 }
diff --git a/src/enemy/rupeeLike.c b/src/enemy/rupeeLike.c
index bb8e176f..42513e71 100644
--- a/src/enemy/rupeeLike.c
+++ b/src/enemy/rupeeLike.c
@@ -71,7 +71,7 @@ void sub_08029318(Entity* this) {
             this->field_0x82.HALF.HI = 0x41;
             this->flags2 &= 0xfc;
             this->field_0x80.HALF.LO = gPlayerEntity.spritePriority.b1;
-            EnqueueSFX(0x104);
+            EnqueueSFX(SFX_104);
         } else {
             if (this->field_0x43 != 0) {
                 sub_0804A9FC(this, 0x1c);
diff --git a/src/enemy/sensorBladeTrap.c b/src/enemy/sensorBladeTrap.c
index 0db62349..77af113a 100644
--- a/src/enemy/sensorBladeTrap.c
+++ b/src/enemy/sensorBladeTrap.c
@@ -95,7 +95,7 @@ void sub_0802BB10(Entity* this) {
     this->action = 3;
     this->speed = 0xc0;
     this->direction = this->direction ^ 0x10;
-    EnqueueSFX(0x74);
+    EnqueueSFX(SFX_METAL_CLINK);
 }
 
 bool32 sub_0802BB2C(Entity* this, u32 param_2) {
diff --git a/src/enemy/sluggula.c b/src/enemy/sluggula.c
index 720b3a50..7d6b68e9 100644
--- a/src/enemy/sluggula.c
+++ b/src/enemy/sluggula.c
@@ -121,13 +121,13 @@ void sub_08023CE0(Entity* this) {
         case 2:
             if (this->actionDelay != 0) {
                 if (--this->actionDelay == 0) {
-                    EnqueueSFX(0x12d);
+                    EnqueueSFX(SFX_12D);
                     InitializeAnimation(this, 4);
                 }
             } else if (!GravityUpdate(this, Q_8_8(24))) {
                 this->action = 3;
                 this->spriteSettings.draw = 1;
-                EnqueueSFX(0x84);
+                EnqueueSFX(SFX_WATER_SPLASH);
                 UpdateSpriteForCollisionLayer(this);
             }
             break;
diff --git a/src/enemy/spearMoblin.c b/src/enemy/spearMoblin.c
index 6cd8f4ca..8490f9d6 100644
--- a/src/enemy/spearMoblin.c
+++ b/src/enemy/spearMoblin.c
@@ -168,7 +168,7 @@ void sub_08028488(Entity* this) {
                 this->action = 4;
                 this->speed = 0x180;
                 this->direction = sub_08049F84(this, 1);
-                EnqueueSFX(0x11e);
+                EnqueueSFX(SFX_EM_MOBLIN_SPEAR);
                 break;
             case 2:
                 this->action = 2;
@@ -225,7 +225,7 @@ void sub_08028528(Entity* this) {
             }
 
             if ((this->actionDelay & 7) == 0) {
-                EnqueueSFX(0xf0);
+                EnqueueSFX(SFX_F0);
                 CreateFx(this, FX_DEATH, 0x40);
             }
 
diff --git a/src/enemy/spikedBeetle.c b/src/enemy/spikedBeetle.c
index f4f6792e..fa3d70b4 100644
--- a/src/enemy/spikedBeetle.c
+++ b/src/enemy/spikedBeetle.c
@@ -159,7 +159,7 @@ void sub_0802B8B0(Entity* this) {
             this->actionDelay = 0x96;
             /* fallthrough */
         case 1:
-            EnqueueSFX(299);
+            EnqueueSFX(SFX_12B);
             break;
     }
 }
@@ -175,7 +175,7 @@ void sub_0802B8E0(Entity* this) {
         this->speed = 0x60;
         this->hitType = 99;
         InitializeAnimation(this, this->animationState);
-        EnqueueSFX(299);
+        EnqueueSFX(SFX_12B);
     }
 }
 
diff --git a/src/enemy/spinyChuchu.c b/src/enemy/spinyChuchu.c
index c6db356b..68df4b69 100644
--- a/src/enemy/spinyChuchu.c
+++ b/src/enemy/spinyChuchu.c
@@ -75,7 +75,7 @@ void sub_0802244C(Entity* this) {
             if (this->action == 3) {
                 this->action = 4;
                 InitializeAnimation(this, 3);
-                EnqueueSFX(0x194);
+                EnqueueSFX(SFX_194);
             }
         }
     } else {
@@ -138,7 +138,7 @@ void sub_08022654(Entity* this) {
             this->subAction = 2;
             this->spriteSettings.draw = 1;
             InitializeAnimation(this, 5);
-            EnqueueSFX(0x7d);
+            EnqueueSFX(SFX_PLY_LAND);
             UpdateSpriteForCollisionLayer(this);
             /* fallthrough */
         case 2:
@@ -186,7 +186,7 @@ void sub_08022780(Entity* this) {
     if (this->frame & 0x80) {
         this->action = 4;
         InitializeAnimation(this, 3);
-        EnqueueSFX(0x194);
+        EnqueueSFX(SFX_194);
     }
 }
 
@@ -229,7 +229,7 @@ void sub_08022854(Entity* this) {
             this->action = 7;
             this->hitType = 0x5c;
             InitializeAnimation(this, 5);
-            EnqueueSFX(0x7d);
+            EnqueueSFX(SFX_PLY_LAND);
         }
     }
 }
diff --git a/src/enemy/wallMaster.c b/src/enemy/wallMaster.c
index a9648193..9c91c691 100644
--- a/src/enemy/wallMaster.c
+++ b/src/enemy/wallMaster.c
@@ -92,7 +92,7 @@ void sub_0802A5B8(Entity* this) {
     sub_0802A7D0(this);
     if (this->actionDelay) {
         if (--this->actionDelay == 0) {
-            EnqueueSFX(0x12d);
+            EnqueueSFX(SFX_12D);
             InitializeAnimation(this, 0);
         }
     } else {
diff --git a/src/enemy/waterDrop.c b/src/enemy/waterDrop.c
index d964ab45..39c329a2 100644
--- a/src/enemy/waterDrop.c
+++ b/src/enemy/waterDrop.c
@@ -43,7 +43,7 @@ void sub_0802A2B4(Entity* this) {
     if (!GravityUpdate(this, 0x2800)) {
         this->action = 2;
         this->spritePriority.b0 = 7;
-        EnqueueSFX(0x84);
+        EnqueueSFX(SFX_WATER_SPLASH);
     } else {
         LinearMoveUpdate(this);
     }
diff --git a/src/manager/managerF.c b/src/manager/managerF.c
index b4e7e442..dc29c4f2 100644
--- a/src/manager/managerF.c
+++ b/src/manager/managerF.c
@@ -379,7 +379,7 @@ void sub_08059424(ManagerF* this) {
     tmp->collisionLayer = 2;
     tmp->x.HALF.HI = this->unk_38 + gRoomControls.origin_x;
     tmp->y.HALF.HI = this->unk_3a + gRoomControls.origin_y;
-    EnqueueSFX(0x1B0);
+    EnqueueSFX(SFX_1B0);
     DeleteThisEntity();
 }
 
diff --git a/src/npc/carlov.c b/src/npc/carlov.c
index 6fc9ad81..8f830b11 100644
--- a/src/npc/carlov.c
+++ b/src/npc/carlov.c
@@ -12,11 +12,11 @@ void Carlov(Entity* this) {
     }
     if ((this->frame & 0x10) != 0) {
         this->frame = this->frame & 0xef;
-        EnqueueSFX(0x104);
+        EnqueueSFX(SFX_104);
         InitScreenShake(0x10, 0);
     }
     if ((this->frame & 0x20) != 0) {
         this->frame = this->frame & 0xdf;
-        EnqueueSFX(0x7c);
+        EnqueueSFX(SFX_PLY_JUMP);
     }
 }
diff --git a/src/npc/castorWildsStatue.c b/src/npc/castorWildsStatue.c
index 2c388a08..04a1adbb 100644
--- a/src/npc/castorWildsStatue.c
+++ b/src/npc/castorWildsStatue.c
@@ -103,7 +103,7 @@ void sub_08067534(Entity* this) {
             entity->y.HALF.HI += 0x1c;
         }
     }
-    EnqueueSFX(0x14c);
+    EnqueueSFX(SFX_14C);
     InitScreenShake(0x28, 4);
 }
 
diff --git a/src/object/bakerOven.c b/src/object/bakerOven.c
index be636d81..cdc65c3a 100644
--- a/src/object/bakerOven.c
+++ b/src/object/bakerOven.c
@@ -61,7 +61,7 @@ void sub_0809CD0C(Entity* this) {
             sub_0806FC80(this, &gPlayerEntity, 4)) {
             this->field_0xf++;
             ModHealth(-2);
-            SoundReqClipped(&gPlayerEntity, 0x7a);
+            SoundReqClipped(&gPlayerEntity, SFX_PLY_VO6);
             gPlayerEntity.iframes = 16;
             gPlayerEntity.knockbackDirection = 16;
             gPlayerEntity.knockbackDuration = 12;
diff --git a/src/object/book.c b/src/object/book.c
index 790c5839..c0003115 100644
--- a/src/object/book.c
+++ b/src/object/book.c
@@ -98,7 +98,7 @@ void sub_0809B4A8(Entity* this) {
         gPlayerEntity.x.HALF.LO = 0;
         gPlayerEntity.y.HALF.LO = 0;
         gPlayerEntity.direction = gPlayerEntity.animationState << 2;
-        EnqueueSFX(0x10f);
+        EnqueueSFX(SFX_10F);
     } else {
         this->actionDelay = 0x16;
     }
diff --git a/src/object/lightableSwitch.c b/src/object/lightableSwitch.c
index 639ffa17..a8d9dffd 100644
--- a/src/object/lightableSwitch.c
+++ b/src/object/lightableSwitch.c
@@ -48,7 +48,7 @@ void sub_0809EA80(Entity* this) {
         } else {
             SetFlag(this->field_0x86.HWORD);
         }
-        EnqueueSFX(0x110);
+        EnqueueSFX(SFX_110);
     }
     sub_0809EABC(this);
 }
@@ -121,7 +121,7 @@ void sub_0809EBD8(Entity* this) {
         this->actionDelay = 0x10;
         this->frameIndex = 2;
         SetFlag(this->field_0x86.HWORD);
-        EnqueueSFX(0x110);
+        EnqueueSFX(SFX_110);
     }
 }
 
@@ -135,7 +135,7 @@ void sub_0809EC08(Entity* this) {
             this->action = 1;
             this->frameIndex = 3;
             ClearFlag(this->field_0x86.HWORD);
-            EnqueueSFX(0x110);
+            EnqueueSFX(SFX_110);
         }
     }
 }
diff --git a/src/object/lockedDoor.c b/src/object/lockedDoor.c
index ddd18056..74cb0e55 100644
--- a/src/object/lockedDoor.c
+++ b/src/object/lockedDoor.c
@@ -148,7 +148,7 @@ void sub_080834B4(Entity* this) {
         this->action = 2;
         this->actionDelay = 7;
         SetTile(this->field_0x74.HWORD, this->field_0x76.HWORD, this->collisionLayer);
-        EnqueueSFX(0x10b);
+        EnqueueSFX(SFX_10B);
     }
 }
 
@@ -184,7 +184,7 @@ void sub_08083540(Entity* this) {
             }
         }
         sub_08083814(this, this->field_0x7c.BYTES.byte2);
-        EnqueueSFX(0x10b);
+        EnqueueSFX(SFX_10B);
     }
 }
 
diff --git a/src/object/mask.c b/src/object/mask.c
index 5d94288f..596cb3a7 100644
--- a/src/object/mask.c
+++ b/src/object/mask.c
@@ -97,7 +97,7 @@ void sub_08092B0C(Entity* this) {
         this->actionDelay = 0;
         switch (this->type2 & 0xC0) {
             case 0x80:
-                EnqueueSFX(0x72);
+                EnqueueSFX(SFX_SECRET);
             case 0x40:
                 SetFlag(this->field_0x86.HWORD);
                 break;
diff --git a/src/object/metalDoor.c b/src/object/metalDoor.c
index b3998104..2146a801 100644
--- a/src/object/metalDoor.c
+++ b/src/object/metalDoor.c
@@ -67,7 +67,7 @@ void sub_080A074C(Entity* this) {
             ent->x.HALF.HI -= 0xc;
             ent->y.HALF.HI -= 0xc;
         }
-        EnqueueSFX(0x10b);
+        EnqueueSFX(SFX_10B);
     }
 }
 
diff --git a/src/object/object2A.c b/src/object/object2A.c
index 5ef7ba3e..e3718d5f 100644
--- a/src/object/object2A.c
+++ b/src/object/object2A.c
@@ -36,5 +36,5 @@ void sub_08089B18(Entity* this) {
                 return;
             }
     }
-    EnqueueSFX(0x124);
+    EnqueueSFX(SFX_124);
 }
diff --git a/src/object/object6A.c b/src/object/object6A.c
index 29dcb2ef..f228280e 100644
--- a/src/object/object6A.c
+++ b/src/object/object6A.c
@@ -344,7 +344,7 @@ void sub_08094E30(Object6AEntity* this) {
                     super->z.WORD = 0;
                     super->zVelocity = 0;
                     InitializeAnimation(super, 1);
-                    EnqueueSFX(382);
+                    EnqueueSFX(SFX_LAVA_TILE_FLIP);
                 }
                 break;
             case 2:
@@ -871,7 +871,7 @@ void sub_08095954(Object6AEntity* this) {
         PositionRelative(super, e, x, y);
         e->z.HALF.HI = -3;
         ((Object6AEntity*)e)->ctx = StartCutscene(e, &script_08012C48);
-        EnqueueSFX(292);
+        EnqueueSFX(SFX_124);
         super->frame &= ~1;
     } else {
         gActiveScriptInfo.syncFlags |= 0x100;
diff --git a/src/object/pot.c b/src/object/pot.c
index 67b77328..4e47144f 100644
--- a/src/object/pot.c
+++ b/src/object/pot.c
@@ -89,7 +89,7 @@ void sub_08082310(Entity* this) {
                             this->actionDelay = 64;
                         }
                         SetTile((u16)this->field_0x70.HALF.LO, COORD_TO_TILE(this), this->collisionLayer);
-                        EnqueueSFX(0x10F);
+                        EnqueueSFX(SFX_10F);
                         break;
                     case 0x4067:
                         SetTile((u16)this->field_0x70.HALF.LO, COORD_TO_TILE(this), this->collisionLayer);
diff --git a/src/object/railtrack.c b/src/object/railtrack.c
index d92a9546..303d279d 100644
--- a/src/object/railtrack.c
+++ b/src/object/railtrack.c
@@ -55,7 +55,7 @@ void sub_08085264(Entity* this) {
         this->animationState = (this->animationState + *(u8*)&this->field_0x7c) & 3;
         InitializeAnimation(this, this->animationState);
         sub_0808543C(this);
-        EnqueueSFX(0x151);
+        EnqueueSFX(SFX_151);
     }
 }
 
@@ -67,7 +67,7 @@ void sub_080852B4(Entity* this) {
         this->animationState = (this->animationState + *(u8*)&this->field_0x7c) & 3;
         InitializeAnimation(this, this->animationState);
         sub_08085394(this);
-        EnqueueSFX(0x151);
+        EnqueueSFX(SFX_151);
     }
 }
 
@@ -97,7 +97,7 @@ void sub_08085308(Entity* this) {
             this->animationState = (this->animationState + *(u8*)&this->field_0x7c) & 3;
             InitializeAnimation(this, this->animationState);
             sub_0808543C(this);
-            EnqueueSFX(0x151);
+            EnqueueSFX(SFX_151);
         }
     }
 }
diff --git a/src/object/warpPoint.c b/src/object/warpPoint.c
index 02b73a9a..5b74eabc 100644
--- a/src/object/warpPoint.c
+++ b/src/object/warpPoint.c
@@ -56,7 +56,7 @@ void sub_0808B474(Entity* this) {
     gPlayerEntity.x.HALF.HI = this->x.HALF.HI;
     gPlayerEntity.y.HALF.HI = this->y.HALF.HI;
     gPlayerEntity.animationState = 4;
-    EnqueueSFX(0x112);
+    EnqueueSFX(SFX_112);
     RequestPriorityDuration(this, this->field_0xf + 0x10);
 }
 
@@ -68,7 +68,7 @@ void sub_0808B530(Entity* this) {
         }
         this->action = 2;
         this->field_0xf = 60;
-        EnqueueSFX(0x112);
+        EnqueueSFX(SFX_112);
     }
 }
 
diff --git a/src/playerItem/playerItem3.c b/src/playerItem/playerItem3.c
index e8b76de0..4e668d64 100644
--- a/src/playerItem/playerItem3.c
+++ b/src/playerItem/playerItem3.c
@@ -23,7 +23,7 @@ void PlayerItem3(Entity* this) {
 
     this->field_0xf--;
     if ((this->field_0xf & 0xf) == 0) {
-        EnqueueSFX(0xfb);
+        EnqueueSFX(SFX_FB);
     }
 }
 
diff --git a/src/projectile/arrowProjectile.c b/src/projectile/arrowProjectile.c
index bdb0a214..7f6079f7 100644
--- a/src/projectile/arrowProjectile.c
+++ b/src/projectile/arrowProjectile.c
@@ -73,7 +73,7 @@ void ArrowProjectile_Action2(Entity* this) {
         COLLISION_OFF(this);
         this->actionDelay = 0x20;
         InitializeAnimation(this, this->animIndex + 2);
-        EnqueueSFX(0x18a);
+        EnqueueSFX(SFX_18A);
         LinearMoveUpdate(this);
     } else if (--this->actionDelay == 0) {
         DeleteThisEntity();
diff --git a/src/projectile/dirtBallProjectile.c b/src/projectile/dirtBallProjectile.c
index df383b15..03769bb0 100644
--- a/src/projectile/dirtBallProjectile.c
+++ b/src/projectile/dirtBallProjectile.c
@@ -145,7 +145,7 @@ void DirtBallProjectile_Action2(Entity* this) {
     switch (this->type) {
         case 0:
             InitializeAnimation(this, 1);
-            EnqueueSFX(0x84);
+            EnqueueSFX(SFX_WATER_SPLASH);
             this->action = 3;
             return;
         case 2:
diff --git a/src/projectile/lakituCloudProjectile.c b/src/projectile/lakituCloudProjectile.c
index 0175653f..f66dd20e 100644
--- a/src/projectile/lakituCloudProjectile.c
+++ b/src/projectile/lakituCloudProjectile.c
@@ -42,7 +42,7 @@ void LakituCloudProjectile_SubAction2(Entity* this) {
     if (sub_0806F3E4(this) != 0) {
         if (this->hitType == 0xa6) {
             ModHealth(-2);
-            SoundReqClipped(&gPlayerEntity, 0x7a);
+            SoundReqClipped(&gPlayerEntity, SFX_PLY_VO6);
             sub_08079D84();
         }
         CreateFx(this, FX_DEATH, 0);
diff --git a/src/projectile/mandiblesProjectile.c b/src/projectile/mandiblesProjectile.c
index f7fe2924..26e2fe24 100644
--- a/src/projectile/mandiblesProjectile.c
+++ b/src/projectile/mandiblesProjectile.c
@@ -171,7 +171,7 @@ void MandiblesProjectile_Action4(Entity* this) {
                 if (entity->health == 0) {
                     DeleteThisEntity();
                 }
-                EnqueueSFX(0xf2);
+                EnqueueSFX(SFX_F2);
                 this->action = 1;
                 this->animationState = 0xff;
                 this->field_0x82.HALF.LO = 0;
diff --git a/src/projectile/spiderWeb.c b/src/projectile/spiderWeb.c
index 3f683296..c6176fa7 100644
--- a/src/projectile/spiderWeb.c
+++ b/src/projectile/spiderWeb.c
@@ -149,7 +149,7 @@ void SpiderWeb_SubAction0(Entity* this) {
         if ((this->frame & 1) != 0) {
             entity->x.HALF.HI = gUnk_0812A06C[entity->animationState] + entity->x.HALF.HI;
             entity->y.HALF.HI = gUnk_0812A06C[entity->animationState + 1] + entity->y.HALF.HI;
-            EnqueueSFX(0x100);
+            EnqueueSFX(SFX_100);
         }
     }
 }
diff --git a/src/projectile/v1DarkMagicProjectile.c b/src/projectile/v1DarkMagicProjectile.c
index dbc770a1..c8320212 100644
--- a/src/projectile/v1DarkMagicProjectile.c
+++ b/src/projectile/v1DarkMagicProjectile.c
@@ -203,7 +203,7 @@ void sub_080AAF74(Entity* this) {
         this->actionDelay = 0x1e;
         gPlayerEntity.iframes = 8;
         ModHealth(-4);
-        SoundReqClipped(&gPlayerEntity, 0x7a);
+        SoundReqClipped(&gPlayerEntity, SFX_PLY_VO6);
         if (gPlayerEntity.health == 0) {
             this->health = 0;
         }
diff --git a/src/projectile/v2Projectile.c b/src/projectile/v2Projectile.c
index fc7f09d2..fc863d53 100644
--- a/src/projectile/v2Projectile.c
+++ b/src/projectile/v2Projectile.c
@@ -84,7 +84,7 @@ void nullsub_542(Entity* this) {
 void sub_080ABC90(Entity* this) {
     if (sub_0806F3E4(this) != 0) {
         ModHealth(-2);
-        SoundReqClipped(&gPlayerEntity, 0x7a);
+        SoundReqClipped(&gPlayerEntity, SFX_PLY_VO6);
         sub_08079D84();
         CreateFx(this, FX_DEATH, 0);
         DeleteThisEntity();