Give songs meaningful english names

84 files changed, 737 insertions, 737 deletions

diff --git a/src/battle/anim/cube.c b/src/battle/anim/cube.c
index e807002b4..d45d6cd16 100644
--- a/src/battle/anim/cube.c
+++ b/src/battle/anim/cube.c
@@ -72,7 +72,7 @@ static void sub_80CE000(struct Sprite* sprite)
         {
             sprite->data[4]++;
             if (!(sprite->data[4] & 1))
-                PlaySE12WithPanning(SE_W207B, sprite->data[5]);
+                PlaySE12WithPanning(SE_M_SWAGGER2, sprite->data[5]);
         }
 
         sprite->data[0] = 0;
diff --git a/src/battle/anim/current.c b/src/battle/anim/current.c
index 165bded09..12da95fa8 100644
--- a/src/battle/anim/current.c
+++ b/src/battle/anim/current.c
@@ -1045,7 +1045,7 @@ static bool8 sub_80D7470(struct Task *task, u8 taskId)
     if (task->data[4] == 0 && task->data[5] > 0)
     {
         task->data[14] += task->data[15];
-        PlaySE12WithPanning(SE_W085, task->data[14]);
+        PlaySE12WithPanning(SE_M_THUNDERBOLT, task->data[14]);
     }
 
     if ((task->data[5] < 0 && task->data[7] <= task->data[8])
diff --git a/src/battle/anim/ghost.c b/src/battle/anim/ghost.c
index 4dea1ed1d..eddf4aac0 100644
--- a/src/battle/anim/ghost.c
+++ b/src/battle/anim/ghost.c
@@ -257,7 +257,7 @@ static void sub_80DDBD8(struct Sprite *sprite)
         return;
     if (r0 <= 0)
         return;
-    PlaySE12WithPanning(SE_W109, gUnknown_0202F7D2);
+    PlaySE12WithPanning(SE_M_CONFUSE_RAY, gUnknown_0202F7D2);
 }
 
 static void sub_80DDC4C(struct Sprite *sprite)
@@ -276,7 +276,7 @@ static void sub_80DDC4C(struct Sprite *sprite)
     if (r2 == 0 || r2 > 196)
     {
         if (r0 > 0)
-            PlaySE(SE_W109);
+            PlaySE(SE_M_CONFUSE_RAY);
     }
     
     if (sprite->data[6] == 0)
diff --git a/src/battle/anim/normal.c b/src/battle/anim/normal.c
index ef7f50f00..40aaba4b8 100644
--- a/src/battle/anim/normal.c
+++ b/src/battle/anim/normal.c
@@ -1426,9 +1426,9 @@ static void sub_80E3338(u8 taskId)
     gTasks[taskId].func = sub_80E3704;
 
     if (taskData[0] == 0)
-        PlaySE12WithPanning(SE_W287, BattleAnimAdjustPanning2(SOUND_PAN_ATTACKER_NEG));
+        PlaySE12WithPanning(SE_M_STAT_INCREASE, BattleAnimAdjustPanning2(SOUND_PAN_ATTACKER_NEG));
     else
-        PlaySE12WithPanning(SE_W287B, BattleAnimAdjustPanning2(SOUND_PAN_ATTACKER_NEG));
+        PlaySE12WithPanning(SE_M_STAT_DECREASE, BattleAnimAdjustPanning2(SOUND_PAN_ATTACKER_NEG));
 }
 
 static void sub_80E3704(u8 taskId)
diff --git a/src/battle/anim/psychic.c b/src/battle/anim/psychic.c
index c76e522f4..714f93030 100644
--- a/src/battle/anim/psychic.c
+++ b/src/battle/anim/psychic.c
@@ -1129,7 +1129,7 @@ void sub_80DC700(struct Sprite *sprite)
     case 1:
         if (sprite->affineAnimEnded)
         {
-            PlaySE12WithPanning(SE_W100, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER_NEG));
+            PlaySE12WithPanning(SE_M_TELEPORT, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER_NEG));
             ChangeSpriteAffineAnim(sprite, 1);
             sprite->data[0]++;
         }
diff --git a/src/battle/anim/rock.c b/src/battle/anim/rock.c
index d97076e89..6f0ed4616 100644
--- a/src/battle/anim/rock.c
+++ b/src/battle/anim/rock.c
@@ -653,7 +653,7 @@ static void sub_80DD604(u8 taskId)
             task->data[0]++;
         }
 
-        PlaySE12WithPanning(SE_W029, task->data[13]);
+        PlaySE12WithPanning(SE_M_HEADBUTT, task->data[13]);
         break;
     case 1:
         if (--task->data[11] == 0)
@@ -683,7 +683,7 @@ static void sub_80DD604(u8 taskId)
             task->data[9] = 0;
             sub_80DD774(task);
             task->data[13] += task->data[14];
-            PlaySE12WithPanning(SE_W091, task->data[13]);
+            PlaySE12WithPanning(SE_M_DIG, task->data[13]);
         }
 
         if (--task->data[8] == 0)
diff --git a/src/battle/anim/wisp_orb.c b/src/battle/anim/wisp_orb.c
index d1f25c09d..1c430d923 100644
--- a/src/battle/anim/wisp_orb.c
+++ b/src/battle/anim/wisp_orb.c
@@ -142,7 +142,7 @@ static void sub_80D5C5C(struct Sprite *sprite)
 
         if ((initialData5 == 0 || initialData5 > 196) && newData5 > 0 && sprite->data[7] == 0)
         {
-            PlaySE12WithPanning(SE_W172, gUnknown_0202F7D2);
+            PlaySE12WithPanning(SE_M_FLAME_WHEEL, gUnknown_0202F7D2);
         }
     }
     else
diff --git a/src/battle_anim_effects_3.c b/src/battle_anim_effects_3.c
index 56e348f20..d4589beb5 100644
--- a/src/battle_anim_effects_3.c
+++ b/src/battle_anim_effects_3.c
@@ -2421,7 +2421,7 @@ void sub_812DB84(u8 taskId)
         gTasks[taskId].data[11] = gBattle_BG1_Y;
 
         gTasks[taskId].data[0]++;
-        PlaySE12WithPanning(SE_W234, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER_NEG));
+        PlaySE12WithPanning(SE_M_MORNING_SUN, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER_NEG));
         break;
     case 1:
         if (gTasks[taskId].data[4]++ > 0)
@@ -2456,7 +2456,7 @@ void sub_812DB84(u8 taskId)
         {
             gTasks[taskId].data[3] = 0;
             gTasks[taskId].data[0] = 1;
-            PlaySE12WithPanning(SE_W234, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER_NEG));
+            PlaySE12WithPanning(SE_M_MORNING_SUN, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER_NEG));
         }
         break;
     case 4:
@@ -4710,7 +4710,7 @@ static void sub_8131408(u8 taskId)
 
         if (gSprites[spriteId].pos2.y == 0)
         {
-            PlaySE12WithPanning(SE_W145B, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER_NEG));
+            PlaySE12WithPanning(SE_M_BUBBLE2, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER_NEG));
             gTasks[taskId].data[10] -= 0x800;
             gTasks[taskId].data[0]++;
         }
@@ -4732,7 +4732,7 @@ static void sub_8131408(u8 taskId)
 
         if (gSprites[spriteId].pos2.y == 0)
         {
-            PlaySE12WithPanning(SE_W145B, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER_NEG));
+            PlaySE12WithPanning(SE_M_BUBBLE2, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER_NEG));
             DestroyAnimVisualTask(taskId);
         }
         break;
@@ -4767,7 +4767,7 @@ static void sub_81315C8(struct Sprite *sprite)
         sprite->pos2.y += 10;
         if (sprite->pos2.y >= 0)
         {
-            PlaySE12WithPanning(SE_W166, BattleAnimAdjustPanning(SOUND_PAN_TARGET));
+            PlaySE12WithPanning(SE_M_SKETCH, BattleAnimAdjustPanning(SOUND_PAN_TARGET));
             sprite->pos2.y = 0;
             sprite->data[0]++;
         }
@@ -4777,7 +4777,7 @@ static void sub_81315C8(struct Sprite *sprite)
         sprite->pos2.y = -(gSineTable[sprite->data[1]] >> 3);
         if (sprite->data[1] > 127)
         {
-            PlaySE12WithPanning(SE_W166, BattleAnimAdjustPanning(SOUND_PAN_TARGET));
+            PlaySE12WithPanning(SE_M_SKETCH, BattleAnimAdjustPanning(SOUND_PAN_TARGET));
             sprite->data[1] = 0;
             sprite->pos2.y = 0;
             sprite->data[0]++;
@@ -4796,7 +4796,7 @@ static void sub_81315C8(struct Sprite *sprite)
     case 3:
         if (++sprite->data[1] > 8)
         {
-            PlaySE12WithPanning(SE_W043, BattleAnimAdjustPanning(SOUND_PAN_TARGET));
+            PlaySE12WithPanning(SE_M_LEER, BattleAnimAdjustPanning(SOUND_PAN_TARGET));
             sprite->data[1] = 0;
             sprite->data[0]++;
         }
@@ -5744,7 +5744,7 @@ void sub_8131EB8(struct Sprite *sprite)
     case 0:
         if (gBattleAnimArgs[7] == -1)
         {
-            PlaySE12WithPanning(SE_W233, BattleAnimAdjustPanning(63));
+            PlaySE12WithPanning(SE_M_VITAL_THROW, BattleAnimAdjustPanning(63));
             sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y) + 16;
             sprite->data[0] = -32;
             sprite->data[7]++;
diff --git a/src/battle_anim_special.c b/src/battle_anim_special.c
index 3c2a60077..d9cc2a477 100755
--- a/src/battle_anim_special.c
+++ b/src/battle_anim_special.c
@@ -736,7 +736,7 @@ static void sub_813FCBC(u8 taskId)
 {
     if (gSprites[gBattlerSpriteIds[GetBattlerAtPosition(B_POSITION_PLAYER_LEFT)]].animCmdIndex == 1)
     {
-        PlaySE12WithPanning(SE_NAGERU, 0);
+        PlaySE12WithPanning(SE_BALL_THROW, 0);
         gSprites[gTasks[taskId].data[0]].callback = sub_813FD90;
         CreateTask(sub_813FD34, 10);
         gTasks[taskId].func = sub_813FB7C;
@@ -824,7 +824,7 @@ static void sub_813FEC8(struct Sprite *sprite)
     taskId = sprite->data[5];
 
     if (++gTasks[taskId].data[1] == 11)
-        PlaySE(SE_SUIKOMU);
+        PlaySE(SE_BALL_TRADE);
 
     switch (gTasks[taskId].data[0])
     {
@@ -903,16 +903,16 @@ static void sub_8140058(struct Sprite *sprite)
             switch (bounceCount)
             {
             case 1:
-                PlaySE(SE_KON);
+                PlaySE(SE_BALL_BOUNCE_1);
                 break;
             case 2:
-                PlaySE(SE_KON2);
+                PlaySE(SE_BALL_BOUNCE_2);
                 break;
             case 3:
-                PlaySE(SE_KON3);
+                PlaySE(SE_BALL_BOUNCE_3);
                 break;
             default:
-                PlaySE(SE_KON4);
+                PlaySE(SE_BALL_BOUNCE_4);
                 break;
             }
         }
@@ -956,7 +956,7 @@ static void sub_8140158(struct Sprite *sprite)
         StartSpriteAffineAnim(sprite, 1);
         ewram17840.unkC = 0;
         sprite->callback = sub_81401A0;
-        PlaySE(SE_BOWA);
+        PlaySE(SE_BALL);
     }
 }
 
@@ -1098,7 +1098,7 @@ static void sub_81401A0(struct Sprite *sprite)
             else
                 StartSpriteAffineAnim(sprite, 1);
 
-            PlaySE(SE_BOWA);
+            PlaySE(SE_BALL);
         }
         break;
     }
@@ -1135,7 +1135,7 @@ static void sub_8140454(struct Sprite *sprite)
         gDoingBattleAnim = 0;
         UpdateOamPriorityInAllHealthboxes(1);
         m4aMPlayAllStop();
-        PlaySE(MUS_FANFA5);
+        PlaySE(MUS_EVOLVED);
     }
     else if (sprite->data[4] == 315)
     {
@@ -1307,7 +1307,7 @@ u8 AnimateBallOpenParticles(u8 x, u8 y, u8 priority, u8 subpriority, u8 ballInde
     gTasks[taskId].data[3] = priority;
     gTasks[taskId].data[4] = subpriority;
     gTasks[taskId].data[15] = ballIndex;
-    PlaySE(SE_BOWA2);
+    PlaySE(SE_BALL_OPEN);
     if (gMain.inBattle)
         ewram17840.unkA++;
 
@@ -1950,7 +1950,7 @@ static void sub_814191C(u8 taskId)
             else
                 pan = 63;
 
-            PlaySE12WithPanning(SE_REAPOKE, pan);
+            PlaySE12WithPanning(SE_SHINY, pan);
         }
     }
 
diff --git a/src/battle_bg.c b/src/battle_bg.c
index 29369958c..6aa22edf6 100644
--- a/src/battle_bg.c
+++ b/src/battle_bg.c
@@ -618,7 +618,7 @@ void sub_800DE30(u8 taskId)
             if (gTasks[taskId].data[5]) {
                 PrintLinkBattleWinLossTie();
             }
-            PlaySE(SE_W231);
+            PlaySE(SE_M_HARDEN);
             DestroyTask(taskId);
             gSprites[gBattleStruct->unk1608A].invisible = FALSE;
             gSprites[gBattleStruct->unk1608B].invisible = FALSE;
diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c
index 445c6eac5..d781599e9 100644
--- a/src/battle_controller_link_opponent.c
+++ b/src/battle_controller_link_opponent.c
@@ -506,7 +506,7 @@ void sub_8037EF0(void)
 {
     if (gReceivedRemoteLinkPlayers == 0)
     {
-        m4aSongNumStop(SE_HINSI);
+        m4aSongNumStop(SE_LOW_HEALTH);
         gMain.inBattle = FALSE;
         gMain.callback1 = gPreBattleCallback1;
         SetMainCallback2(c2_8011A1C);
@@ -524,7 +524,7 @@ void sub_8037F34(void)
         }
         else
         {
-            m4aSongNumStop(SE_HINSI);
+            m4aSongNumStop(SE_LOW_HEALTH);
             gMain.inBattle = FALSE;
             gMain.callback1 = gPreBattleCallback1;
             SetMainCallback2(gMain.savedCallback);
@@ -1290,7 +1290,7 @@ void LinkOpponentHandlecmd10(void)
     else if (!ewram17810[gActiveBattler].unk0_6)
     {
         ewram17810[gActiveBattler].unk4 = 0;
-        PlaySE12WithPanning(SE_POKE_DEAD, 63);
+        PlaySE12WithPanning(SE_FAINT, 63);
         gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_8010384;
         gBattlerControllerFuncs[gActiveBattler] = sub_8037B78;
     }
diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c
index acc35e2d2..67c46c59d 100644
--- a/src/battle_controller_link_partner.c
+++ b/src/battle_controller_link_partner.c
@@ -1227,7 +1227,7 @@ void LinkPartnerHandlecmd10(void)
     {
         ewram17810[gActiveBattler].unk4 = 0;
         HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler);
-        PlaySE12WithPanning(SE_POKE_DEAD, -64);
+        PlaySE12WithPanning(SE_FAINT, -64);
         gSprites[gBattlerSpriteIds[gActiveBattler]].data[1] = 0;
         gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = 5;
         gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_80105EC;
diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c
index 9fe69811e..b3685806d 100644
--- a/src/battle_controller_opponent.c
+++ b/src/battle_controller_opponent.c
@@ -1294,7 +1294,7 @@ void OpponentHandlecmd10(void)
     else if (!ewram17810[gActiveBattler].unk0_6)
     {
         ewram17810[gActiveBattler].unk4 = 0;
-        PlaySE12WithPanning(SE_POKE_DEAD, 63);
+        PlaySE12WithPanning(SE_FAINT, 63);
         gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_8010384;
         gBattlerControllerFuncs[gActiveBattler] = sub_803311C;
     }
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c
index cf816f392..772728295 100644
--- a/src/battle_controller_player.c
+++ b/src/battle_controller_player.c
@@ -962,7 +962,7 @@ void sub_802D148(void)
 {
     if (gReceivedRemoteLinkPlayers == 0)
     {
-        m4aSongNumStop(SE_HINSI);
+        m4aSongNumStop(SE_LOW_HEALTH);
         gMain.inBattle = FALSE;
         gMain.callback1 = gPreBattleCallback1;
         SetMainCallback2(c2_8011A1C);
@@ -980,7 +980,7 @@ void sub_802D18C(void)
         }
         else
         {
-            m4aSongNumStop(SE_HINSI);
+            m4aSongNumStop(SE_LOW_HEALTH);
             gMain.inBattle = FALSE;
             gMain.callback1 = gPreBattleCallback1;
             SetMainCallback2(gMain.savedCallback);
@@ -2470,7 +2470,7 @@ void PlayerHandlecmd10(void)
         {
             ewram17810[gActiveBattler].unk4 = 0;
             HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler);
-            PlaySE12WithPanning(SE_POKE_DEAD, -64);
+            PlaySE12WithPanning(SE_FAINT, -64);
             gSprites[gBattlerSpriteIds[gActiveBattler]].data[1] = 0;
             gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = 5;
             gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_80105EC;
diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c
index a2a48dd38..104a0eecf 100644
--- a/src/battle_gfx_sfx_util.c
+++ b/src/battle_gfx_sfx_util.c
@@ -795,7 +795,7 @@ void HandleLowHpMusicChange(struct Pokemon *pkmn, u8 b)
         if (!ewram17800[b].unk0_1)
         {
             if (!ewram17800[b ^ 2].unk0_1)
-                PlaySE(SE_HINSI);
+                PlaySE(SE_LOW_HEALTH);
             ewram17800[b].unk0_1 = 1;
         }
     }
@@ -804,12 +804,12 @@ void HandleLowHpMusicChange(struct Pokemon *pkmn, u8 b)
         ewram17800[b].unk0_1 = 0;
         if (!IsDoubleBattle())
         {
-            m4aSongNumStop(SE_HINSI);
+            m4aSongNumStop(SE_LOW_HEALTH);
             return;
         }
         if (IsDoubleBattle() && !ewram17800[b ^ 2].unk0_1)
         {
-            m4aSongNumStop(SE_HINSI);
+            m4aSongNumStop(SE_LOW_HEALTH);
             return;
         }
     }
@@ -822,7 +822,7 @@ void BattleStopLowHpSound(void)
     ewram17800[r4].unk0_1 = 0;
     if (IsDoubleBattle())
         ewram17800[r4 ^ 2].unk0_1 = 0;
-    m4aSongNumStop(SE_HINSI);
+    m4aSongNumStop(SE_LOW_HEALTH);
 }
 
 u8 unref_sub_8032604(struct Pokemon *pkmn)
diff --git a/src/battle_interface.c b/src/battle_interface.c
index 149e409cb..29775112a 100644
--- a/src/battle_interface.c
+++ b/src/battle_interface.c
@@ -1688,7 +1688,7 @@ u8 sub_8044804(u8 a, const struct BattleInterfaceStruct2 *b, u8 c, u8 d)
     for (i = 0; i < 6; i++)
         gTasks[taskId].data[3 + i] = sp[i];
     gTasks[taskId].data[10] = d;
-    PlaySE12WithPanning(SE_TB_START, 0);
+    PlaySE12WithPanning(SE_BALL_TRAY_ENTER, 0);
     return taskId;
 }
 #else
@@ -2455,9 +2455,9 @@ static void sub_804507C(struct Sprite *sprite)
         if (r3 != 0)
             pan = -64;
         if (sprite->data[7] != 0)
-            PlaySE2WithPanning(SE_TB_KARA, pan);
+            PlaySE2WithPanning(SE_BALL_TRAY_EXIT, pan);
         else
-            PlaySE1WithPanning(SE_TB_KON, pan);
+            PlaySE1WithPanning(SE_BALL_TRAY_BALL, pan);
         sprite->callback = SpriteCallbackDummy;
     }
 }
diff --git a/src/battle_main.c b/src/battle_main.c
index 061d1f102..80e6167c3 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -1189,7 +1189,7 @@ void sub_800FE20(struct Sprite *sprite)
 {
     StartSpriteAffineAnim(sprite, 1);
     sprite->callback = sub_800FDB0;
-    PlaySE(SE_BT_START);
+    PlaySE(SE_MUGSHOT);
 }
 
 void sub_800FE40(u8 taskId)
@@ -4948,7 +4948,7 @@ void HandleEndTurn_BattleWon(void)
         {
         case TRAINER_CLASS_ELITE_FOUR:
         case TRAINER_CLASS_CHAMPION:
-            PlayBGM(MUS_KACHI5);
+            PlayBGM(MUS_VICTORY_LEAGUE);
             break;
         case TRAINER_CLASS_TEAM_AQUA:
         case TRAINER_CLASS_TEAM_MAGMA:
@@ -4956,13 +4956,13 @@ void HandleEndTurn_BattleWon(void)
         case TRAINER_CLASS_AQUA_LEADER:
         case TRAINER_CLASS_MAGMA_ADMIN:
         case TRAINER_CLASS_MAGMA_LEADER:
-            PlayBGM(MUS_KACHI4);
+            PlayBGM(MUS_VICTORY_AQUA_MAGMA);
             break;
         case TRAINER_CLASS_LEADER:
-            PlayBGM(MUS_KACHI3);
+            PlayBGM(MUS_VICTORY_GYM_LEADER);
             break;
         default:
-            PlayBGM(MUS_KACHI1);
+            PlayBGM(MUS_VICTORY_TRAINER);
             break;
         }
     }
@@ -5625,7 +5625,7 @@ void HandleAction_GoNear(void)
 void HandleAction_SafriZoneRun(void)
 {
     gBattlerAttacker = gBattlerByTurnOrder[gCurrentTurnActionNumber];
-    PlaySE(SE_NIGERU);
+    PlaySE(SE_FLEE);
     gCurrentTurnActionNumber = gBattlersCount;
     gBattleOutcome = B_OUTCOME_RAN;
 }
diff --git a/src/battle_party_menu.c b/src/battle_party_menu.c
index e758b7957..e0e455811 100644
--- a/src/battle_party_menu.c
+++ b/src/battle_party_menu.c
@@ -476,7 +476,7 @@ void HandleBattlePartyMenu(u8 taskId)
             if (gUnknown_02038473 == 3)
             {
                 if (GetMonData(&gPlayerParty[sub_806CA38(taskId)], MON_DATA_IS_EGG))
-                    PlaySE(SE_HAZURE);
+                    PlaySE(SE_FAILURE);
                 else
                 {
                     sub_806D5A4();
@@ -493,7 +493,7 @@ void HandleBattlePartyMenu(u8 taskId)
             break;
         case B_BUTTON:
             if (gUnknown_02038473 == 1)
-                PlaySE(SE_HAZURE);
+                PlaySE(SE_FAILURE);
             else
             {
                 PlaySE(SE_SELECT);
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index db2e1af12..0cdcfe8f9 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -2091,11 +2091,11 @@ static void atk0E_effectivenesssound(void)
         switch (gMoveResultFlags & (u8)(~(MOVE_RESULT_MISSED)))
         {
         case MOVE_RESULT_SUPER_EFFECTIVE:
-            BtlController_EmitPlaySE(0, SE_KOUKA_H);
+            BtlController_EmitPlaySE(0, SE_SUPER_EFFECTIVE);
             MarkBattlerForControllerExec(gActiveBattler);
             break;
         case MOVE_RESULT_NOT_VERY_EFFECTIVE:
-            BtlController_EmitPlaySE(0, SE_KOUKA_L);
+            BtlController_EmitPlaySE(0, SE_NOT_EFFECTIVE);
             MarkBattlerForControllerExec(gActiveBattler);
             break;
         case MOVE_RESULT_DOESNT_AFFECT_FOE:
@@ -2108,17 +2108,17 @@ static void atk0E_effectivenesssound(void)
         default:
             if (gMoveResultFlags & MOVE_RESULT_SUPER_EFFECTIVE)
             {
-                BtlController_EmitPlaySE(0, SE_KOUKA_H);
+                BtlController_EmitPlaySE(0, SE_SUPER_EFFECTIVE);
                 MarkBattlerForControllerExec(gActiveBattler);
             }
             else if (gMoveResultFlags & MOVE_RESULT_NOT_VERY_EFFECTIVE)
             {
-                BtlController_EmitPlaySE(0, SE_KOUKA_L);
+                BtlController_EmitPlaySE(0, SE_NOT_EFFECTIVE);
                 MarkBattlerForControllerExec(gActiveBattler);
             }
             else if (!(gMoveResultFlags & (MOVE_RESULT_DOESNT_AFFECT_FOE | MOVE_RESULT_FAILED)))
             {
-                BtlController_EmitPlaySE(0, SE_KOUKA_M);
+                BtlController_EmitPlaySE(0, SE_EFFECTIVE);
                 MarkBattlerForControllerExec(gActiveBattler);
             }
             break;
@@ -5413,7 +5413,7 @@ static void atk23_getexp(void)
                 if (!(gBattleTypeFlags & BATTLE_TYPE_TRAINER) && gBattleMons[0].hp && !gBattleStruct->wildVictorySong)
                 {
                     BattleStopLowHpSound();
-                    PlayBGM(MUS_KACHI2);
+                    PlayBGM(MUS_VICTORY_WILD);
                     gBattleStruct->wildVictorySong++;
                 }
 
diff --git a/src/battle_setup.c b/src/battle_setup.c
index cb07c5049..d8319e620 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -590,7 +590,7 @@ void ScrSpecial_StartRayquazaBattle(void)
     ScriptContext2_Enable();
     gMain.savedCallback = CB2_EndScriptedWildBattle;
     gBattleTypeFlags = BATTLE_TYPE_LEGENDARY;
-    CreateBattleStartTask(B_TRANSITION_BLUR, MUS_BATTLE34);
+    CreateBattleStartTask(B_TRANSITION_BLUR, MUS_VS_KYOGRE_GROUDON);
     IncrementGameStat(GAME_STAT_TOTAL_BATTLES);
     IncrementGameStat(GAME_STAT_WILD_BATTLES);
 }
@@ -601,9 +601,9 @@ void ScrSpecial_StartGroudonKyogreBattle(void)
     gMain.savedCallback = CB2_EndScriptedWildBattle;
     gBattleTypeFlags = BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_KYOGRE_GROUDON;
     if (gGameVersion == VERSION_RUBY)
-        CreateBattleStartTask(B_TRANSITION_SHARDS, MUS_BATTLE34); // GROUDON
+        CreateBattleStartTask(B_TRANSITION_SHARDS, MUS_VS_KYOGRE_GROUDON); // GROUDON
     else
-        CreateBattleStartTask(B_TRANSITION_RIPPLE, MUS_BATTLE34); // KYOGRE
+        CreateBattleStartTask(B_TRANSITION_RIPPLE, MUS_VS_KYOGRE_GROUDON); // KYOGRE
     IncrementGameStat(GAME_STAT_TOTAL_BATTLES);
     IncrementGameStat(GAME_STAT_WILD_BATTLES);
 }
@@ -613,7 +613,7 @@ void ScrSpecial_StartRegiBattle(void)
     ScriptContext2_Enable();
     gMain.savedCallback = CB2_EndScriptedWildBattle;
     gBattleTypeFlags = BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_REGI;
-    CreateBattleStartTask(B_TRANSITION_GRID_SQUARES, MUS_BATTLE36);
+    CreateBattleStartTask(B_TRANSITION_GRID_SQUARES, MUS_VS_REGI);
     IncrementGameStat(GAME_STAT_TOTAL_BATTLES);
     IncrementGameStat(GAME_STAT_WILD_BATTLES);
 }
@@ -1186,46 +1186,46 @@ void PlayTrainerEncounterMusic(void)
         switch (sub_803FC58(gTrainerBattleOpponent))
         {
         case TRAINER_ENCOUNTER_MUSIC_MALE:
-            music = MUS_BOYEYE;
+            music = MUS_ENCOUNTER_MALE;
             break;
         case TRAINER_ENCOUNTER_MUSIC_FEMALE:
-            music = MUS_GIRLEYE;
+            music = MUS_ENCOUNTER_FEMALE;
             break;
         case TRAINER_ENCOUNTER_MUSIC_GIRL:
-            music = MUS_SYOUJOEYE;
+            music = MUS_ENCOUNTER_GIRL;
             break;
         case TRAINER_ENCOUNTER_MUSIC_INTENSE:
-            music = MUS_HAGESHII;
+            music = MUS_ENCOUNTER_INTENSE;
             break;
         case TRAINER_ENCOUNTER_MUSIC_COOL:
-            music = MUS_KAKKOII;
+            music = MUS_ENCOUNTER_COOL;
             break;
         case TRAINER_ENCOUNTER_MUSIC_AQUA:
-            music = MUS_AQA_0;
+            music = MUS_ENCOUNTER_AQUA;
             break;
         case TRAINER_ENCOUNTER_MUSIC_MAGMA:
-            music = MUS_MGM0;
+            music = MUS_ENCOUNTER_MAGMA;
             break;
         case TRAINER_ENCOUNTER_MUSIC_SWIMMER:
-            music = MUS_SWIMEYE;
+            music = MUS_ENCOUNTER_SWIMMER;
             break;
         case TRAINER_ENCOUNTER_MUSIC_TWINS:
-            music = MUS_HUTAGO;
+            music = MUS_ENCOUNTER_TWINS;
             break;
         case TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR:
-            music = MUS_SITENNOU;
+            music = MUS_ENCOUNTER_ELITE_FOUR;
             break;
         case TRAINER_ENCOUNTER_MUSIC_HIKER:
-            music = MUS_YAMA_EYE;
+            music = MUS_ENCOUNTER_HIKER;
             break;
         case TRAINER_ENCOUNTER_MUSIC_INTERVIEWER:
-            music = MUS_INTER_V;
+            music = MUS_ENCOUNTER_INTERVIEWER;
             break;
         case TRAINER_ENCOUNTER_MUSIC_RICH:
-            music = MUS_TEST;
+            music = MUS_ENCOUNTER_RICH;
             break;
         default:
-            music = MUS_AYASII;
+            music = MUS_ENCOUNTER_SUSPICIOUS;
         }
         PlayNewMapMusic(music);
     }
diff --git a/src/battle_transition.c b/src/battle_transition.c
index a0c94f713..b7aac2c65 100644
--- a/src/battle_transition.c
+++ b/src/battle_transition.c
@@ -1580,7 +1580,7 @@ static bool8 Phase2_Mugshot_Func4(struct Task* task)
     sub_811CA10(task->tMugshotPlayerID, 1);
     sub_811CA28(task->tMugshotOpponentID);
 
-    PlaySE(SE_BT_START);
+    PlaySE(SE_MUGSHOT);
 
     TRANSITION_STRUCT.VBlank_DMA++;
     return FALSE;
diff --git a/src/berry_blender.c b/src/berry_blender.c
index c86b707b3..7955c1458 100644
--- a/src/berry_blender.c
+++ b/src/berry_blender.c
@@ -970,7 +970,7 @@ void sub_804E738(struct Sprite* sprite)
         if (++sprite->data[5] > 3)
             DestroySprite(sprite);
         else
-            PlaySE(SE_TB_KARA);
+            PlaySE(SE_BALL_TRAY_EXIT);
     }
     sprite->pos1.x = sprite->data[1];
     sprite->pos1.y = sprite->data[2];
@@ -1451,7 +1451,7 @@ static void sub_804F378(void)
     case 13:
         gBerryBlenderData->field_0++;
         sub_804F238();
-        PlaySE(SE_RU_HYUU);
+        PlaySE(SE_FALL);
         sub_8051414(&gBerryBlenderData->field_168);
         break;
     case 14:
@@ -1465,7 +1465,7 @@ static void sub_804F378(void)
             gBerryBlenderData->arrowPos = gUnknown_082162F8[gUnknown_08216300[gBerryBlenderData->playersNo - 2]];
             REG_BG2CNT = 0x4882;
             gBerryBlenderData->framesToWait = 0;
-            PlaySE(SE_TRACK_DOOR);;
+            PlaySE(SE_TRUCK_DOOR);;
             sub_804F2A8();
         }
         sub_8051414(&gBerryBlenderData->field_168);
@@ -1508,7 +1508,7 @@ static void sub_804F378(void)
             gBerryBlenderData->field_178 = GetCurrentMapMusic();
         }
         PlayBGM(MUS_CYCLING);
-        PlaySE(SE_MOTER);
+        PlaySE(SE_BERRY_BLENDER);
         Blender_ControlHitPitch();
         break;
     }
@@ -1699,17 +1699,17 @@ static void sub_804FC48(u16 a0, u8 a1)
     {
         StartSpriteAnim(&gSprites[spriteID], 2);
         gSprites[spriteID].callback = sub_8051684;
-        PlaySE(SE_RU_GASHIN);
+        PlaySE(SE_ICE_STAIRS);
     }
     else if (a0 == 0x5432)
     {
         StartSpriteAnim(&gSprites[spriteID], 0);
-        PlaySE(SE_SEIKAI);
+        PlaySE(SE_SUCCESS);
     }
     else if (a0 == 0x2345)
     {
         StartSpriteAnim(&gSprites[spriteID], 1);
-        PlaySE(SE_HAZURE);
+        PlaySE(SE_FAILURE);
     }
     sub_805156C();
 }
@@ -2770,7 +2770,7 @@ static void sub_805181C(struct Sprite* sprite)
         {
             sprite->data[1] = 88;
             sprite->data[0]++;
-            PlaySE(SE_KON);
+            PlaySE(SE_BALL_BOUNCE_1);
         }
         break;
     case 1:
@@ -3537,7 +3537,7 @@ static void sub_8052BD0(u8 taskID)
 {
     if (gTasks[taskID].data[0] == 0)
     {
-        PlayFanfare(MUS_FANFA1);
+        PlayFanfare(MUS_LEVEL_UP);
         gTasks[taskID].data[0]++;
     }
     if (IsFanfareTaskInactive())
diff --git a/src/bike.c b/src/bike.c
index c03926168..75a5d2d41 100644
--- a/src/bike.c
+++ b/src/bike.c
@@ -678,7 +678,7 @@ static void AcroBikeTransition_SideJump(u8 direction)
         }
     }
     playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
-    PlaySE(SE_JITE_PYOKO);
+    PlaySE(SE_BIKE_HOP);
     playerObjEvent->facingDirectionLocked = 1;
     PlayerSetAnimId(GetJumpMovementAction(direction), 2);
 }
diff --git a/src/braille_puzzles.c b/src/braille_puzzles.c
index 428d114c7..d00a86cd5 100644
--- a/src/braille_puzzles.c
+++ b/src/braille_puzzles.c
@@ -50,7 +50,7 @@ void DoBrailleDigEffect(void)
     MapGridSetMetatileIdAt(17, 9, METATILE_ID(Cave, SealedChamberEntrance_BottomMid));
     MapGridSetMetatileIdAt(18, 9, METATILE_ID(Cave, SealedChamberEntrance_BottomRight) | (COLLISION_DIR_ALL << METATILE_COLLISION_SHIFT));
     DrawWholeMapView();
-    PlaySE(SE_BAN);
+    PlaySE(SE_BANG);
     FlagSet(FLAG_SYS_BRAILLE_DIG);
     ScriptContext2_Disable();
 }
@@ -93,7 +93,7 @@ void DoBrailleStrengthEffect(void)
     MapGridSetMetatileIdAt(15, 27, METATILE_ID(Cave, SealedChamberEntrance_BottomMid));
     MapGridSetMetatileIdAt(16, 27, METATILE_ID(Cave, SealedChamberEntrance_BottomRight) | (COLLISION_DIR_ALL << METATILE_COLLISION_SHIFT));
     DrawWholeMapView();
-    PlaySE(SE_BAN);
+    PlaySE(SE_BANG);
     FlagSet(FLAG_SYS_BRAILLE_STRENGTH);
     ScriptContext2_Disable();
 }
@@ -139,7 +139,7 @@ void UseFlyAncientTomb_Finish(void)
     MapGridSetMetatileIdAt(15, 27, METATILE_ID(Cave, SealedChamberEntrance_BottomMid));
     MapGridSetMetatileIdAt(16, 27, METATILE_ID(Cave, SealedChamberEntrance_BottomRight) | (COLLISION_DIR_ALL << METATILE_COLLISION_SHIFT));
     DrawWholeMapView();
-    PlaySE(SE_BAN);
+    PlaySE(SE_BANG);
     FlagSet(FLAG_SYS_BRAILLE_FLY);
     ScriptContext2_Disable();
 }
diff --git a/src/cable_car.c b/src/cable_car.c
index 45e0a9cbc..3a661be34 100644
--- a/src/cable_car.c
+++ b/src/cable_car.c
@@ -386,7 +386,7 @@ static void CableCarMainCallback_Setup(void)
             break;
         case 7:
             BeginNormalPaletteFade(0xFFFFFFFF, 3, 16, 0, RGB(0, 0, 0));
-            FadeInNewBGM(MUS_ROPEWAY, 1);
+            FadeInNewBGM(MUS_CABLE_CAR, 1);
             sub_8123FBC(1);
             gMain.state++;
             break;
diff --git a/src/cable_club.c b/src/cable_club.c
index 78e227cef..115f02d81 100644
--- a/src/cable_club.c
+++ b/src/cable_club.c
@@ -766,9 +766,9 @@ static void sub_808382C(u8 taskId)
         break;
     case 5:
         if (gLinkPlayers[0].trainerId & 1)
-            current_map_music_set__default_for_battle(MUS_BATTLE32);
+            current_map_music_set__default_for_battle(MUS_VS_GYM_LEADER);
         else
-            current_map_music_set__default_for_battle(MUS_BATTLE20);
+            current_map_music_set__default_for_battle(MUS_VS_TRAINER);
 
         switch (gSpecialVar_0x8004)
         {
diff --git a/src/choose_party.c b/src/choose_party.c
index 305f9cd63..f1252f965 100644
--- a/src/choose_party.c
+++ b/src/choose_party.c
@@ -390,7 +390,7 @@ static void sub_81224A8(u8 taskId)
         }
         else
         {
-            PlaySE(SE_HAZURE);
+            PlaySE(SE_FAILURE);
             PrintPartyMenuPromptText(14, 0);
             gTasks[taskId].func = sub_8122480;
         }
@@ -460,7 +460,7 @@ static void BattleTowerEntryMenuCallback_Enter(u8 taskId)
             return;
         }
     }
-    PlaySE(SE_HAZURE);
+    PlaySE(SE_FAILURE);
     Menu_EraseWindowRect(20, 10, 29, 19);
     Menu_DestroyCursor();
     sub_806D5A4();
@@ -658,7 +658,7 @@ static void sub_8122AB8(u8 taskId)
     {
         gTasks[taskId].func = sub_8122B10;
         ewram1B000.unk261 = 2;
-        PlaySE(SE_W231);
+        PlaySE(SE_M_HARDEN);
     }
 }
 
diff --git a/src/contest.c b/src/contest.c
index 1a1c62023..58566e28d 100644
--- a/src/contest.c
+++ b/src/contest.c
@@ -566,7 +566,7 @@ void sub_80AB9A0(u8 taskId)
         if (gTasks[taskId].data[1]++ <= 60)
             break;
         gTasks[taskId].data[1] = 0;
-        PlaySE12WithPanning(SE_C_MAKU_U, 0);
+        PlaySE12WithPanning(SE_CONTEST_CURTAIN_RISE, 0);
         gTasks[taskId].data[0]++;
         break;
     case 1:
@@ -1301,7 +1301,7 @@ void sub_80AC2CC(u8 taskId)
         return;
     case 50:
         if (sub_80AF038(r7))
-            PlaySE(SE_C_PASI);
+            PlaySE(SE_CONTEST_ICON_CHANGE);
         gTasks[taskId].data[0] = 25;
         return;
     case 25:
@@ -1387,9 +1387,9 @@ void sub_80AC2CC(u8 taskId)
                 break;
         }
         if (sub_80AF038(i))
-            PlaySE(SE_C_PASI);
+            PlaySE(SE_CONTEST_ICON_CHANGE);
         else
-            PlaySE(SE_C_SYU);
+            PlaySE(SE_CONTEST_ICON_CLEAR);
         if (sContestantStatus[i].judgesAttentionWasRemoved)
         {
             sub_80B03A8(i);
@@ -1570,7 +1570,7 @@ void sub_80AC2CC(u8 taskId)
         {
         case 0:
             sub_80B1EA8(-1, 1);
-            PlayFanfare(MUS_ME_ZANNEN);
+            PlayFanfare(MUS_TOO_BAD);
             gTasks[taskId].data[10]++;
             break;
         case 1:
@@ -1615,7 +1615,7 @@ void sub_80AC2CC(u8 taskId)
             if (!sContest.unk1920B_0)
             {
                 sub_80B1DDC();
-                PlaySE(SE_W227B);
+                PlaySE(SE_M_ENCORE2);
                 sub_80B1CBC(1);
                 gTasks[taskId].data[10]++;
             }
@@ -1999,7 +1999,7 @@ void sub_80ADE54(u8 taskId)
         sub_80B2184();
         gBattle_BG1_X = 0;
         gBattle_BG1_Y = 160;
-        PlaySE12WithPanning(SE_C_MAKU_D, 0);
+        PlaySE12WithPanning(SE_CONTEST_CURTAIN_FALL, 0);
         gTasks[taskId].data[0] = 0;
         gTasks[taskId].func = sub_80ADEAC;
     }
@@ -2673,7 +2673,7 @@ bool8 sub_80AEE54(u8 a, u8 b)
         }
         if (b != 0)
         {
-            PlaySE(SE_EXPMAX);
+            PlaySE(SE_EXP_MAX);
             sContestantStatus[a].conditionMod = 0;
         }
     }
@@ -2688,7 +2688,7 @@ bool8 sub_80AEE54(u8 a, u8 b)
         }
         if (b != 0)
         {
-            PlaySE(SE_FU_ZAKU2);
+            PlaySE(SE_CONTEST_CONDITION_LOSE);
             sContestantStatus[a].conditionMod = 0;
         }
     }
@@ -3365,7 +3365,7 @@ void sub_80AFC74(u8 taskId)
         CpuFill16(r6, (void *)(VRAM + 0xC000 + (0x56 + r5 + gUnknown_02038696[r7] * 160) * 2), 2);
         if (r1 > 0)
         {
-            PlaySE(SE_C_GAJI);
+            PlaySE(SE_CONTEST_HEART);
             m4aMPlayImmInit(&gMPlayInfo_SE1);
             m4aMPlayPitchControl(&gMPlayInfo_SE1, 0xFFFF, r10 * 256);
         }
@@ -3578,7 +3578,7 @@ void sub_80B02A8(struct Sprite *sprite)
     StartSpriteAnim(sprite, sContestantStatus[sprite->data[0]].unkB_0);
     StartSpriteAffineAnim(sprite, 2);
     sprite->callback = sub_80B02F4;
-    PlaySE(SE_JYUNI);
+    PlaySE(SE_CONTEST_PLACE);
 }
 
 void sub_80B02F4(struct Sprite *sprite)
@@ -4265,9 +4265,9 @@ void sub_80B0BC4(u8 a, bool8 b)
     gSprites[a].callback = sub_80B0C5C;
     gSprites[r5].callback = SpriteCallbackDummy;
     if (b == FALSE)
-        PlaySE(SE_C_PIKON);
+        PlaySE(SE_CONTEST_MONS_TURN);
     else
-        PlaySE(SE_PC_LOGON);
+        PlaySE(SE_PC_LOGIN);
 }
 
 void sub_80B0C5C(struct Sprite *sprite)
@@ -4732,36 +4732,36 @@ void sub_80B1710(u8 a)
     case 0:
     case 1:
         gSprites[spriteId].oam.tileNum = gSprites[spriteId].data[0];
-        PlaySE(SE_HAZURE);
+        PlaySE(SE_FAILURE);
         break;
     case 2:
         gSprites[spriteId].oam.tileNum = gSprites[spriteId].data[0] + 4;
-        PlaySE(SE_SEIKAI);
+        PlaySE(SE_SUCCESS);
         break;
     case 3:
         gSprites[spriteId].oam.tileNum = gSprites[spriteId].data[0] + 8;
-        PlaySE(SE_SEIKAI);
+        PlaySE(SE_SUCCESS);
         break;
     case 4:
         gSprites[spriteId].oam.tileNum = gSprites[spriteId].data[0] + 12;
-        PlaySE(SE_TK_WARPIN);
+        PlaySE(SE_WARP_IN);
         break;
     case 5:  // exactly the same as case 4
         gSprites[spriteId].oam.tileNum = gSprites[spriteId].data[0] + 12;
-        PlaySE(SE_TK_WARPIN);
+        PlaySE(SE_WARP_IN);
         break;
     case 6:
         gSprites[spriteId].oam.tileNum = gSprites[spriteId].data[0] + 16;
-        PlaySE(SE_TK_WARPIN);
+        PlaySE(SE_WARP_IN);
         break;
     case 8:
         gSprites[spriteId].oam.tileNum = gSprites[spriteId].data[0] + 24;
-        PlaySE(SE_W215);
+        PlaySE(SE_M_HEAL_BELL);
         break;
     case 7:
     default:
         gSprites[spriteId].oam.tileNum = gSprites[spriteId].data[0] + 20;
-        PlaySE(SE_TK_WARPIN);
+        PlaySE(SE_WARP_IN);
         break;
     }
     gSprites[spriteId].data[1] = 0;
@@ -5089,7 +5089,7 @@ void sub_80B20C4(void)
             *(u16 *)(VRAM + 0xC000 + r4 * 64 + 0x2A) = r0 + 1;
             *(u16 *)(VRAM + 0xC000 + (r4 + 1) * 64 + 0x28) = r0 + 16;
             *(u16 *)(VRAM + 0xC000 + (r4 + 1) * 64 + 0x2A) = r0 + 17;
-            PlaySE(SE_C_PASI);
+            PlaySE(SE_CONTEST_ICON_CHANGE);
         }
     }
 }
@@ -5157,7 +5157,7 @@ void sub_80B237C(u8 taskId)
 {
     gBattle_BG1_X = 0;
     gBattle_BG1_Y = DISPLAY_HEIGHT;
-    PlaySE12WithPanning(SE_C_MAKU_D, 0);
+    PlaySE12WithPanning(SE_CONTEST_CURTAIN_FALL, 0);
     gTasks[taskId].func = sub_80B23BC;
 }
 
@@ -5269,7 +5269,7 @@ void sub_80B25A4(u8 taskId)
     else
     {
         gTasks[taskId].data[2] = 0;
-        PlaySE12WithPanning(SE_C_MAKU_U, 0);
+        PlaySE12WithPanning(SE_CONTEST_CURTAIN_RISE, 0);
         gTasks[taskId].func = sub_80B2508;
     }
 }
diff --git a/src/contest_link_80C2020.c b/src/contest_link_80C2020.c
index f4203dd42..356c806f8 100644
--- a/src/contest_link_80C2020.c
+++ b/src/contest_link_80C2020.c
@@ -329,7 +329,7 @@ void sub_80C2358(void)
     gBattle_WIN1V = 0x80a0;
     CreateTask(sub_80C2F28, 20);
     sub_80C3F00();
-    PlayBGM(MUS_CON_K);
+    PlayBGM(MUS_CONTEST_RESULTS);
     SetVBlankCallback(sub_80C2448);
 }
 
@@ -1854,7 +1854,7 @@ void sub_80C3A5C(u8 taskId)
             *(vu16 *)((VRAM + 0xE184) + gTasks[taskId].data[1] * 192) = firstTileNum + 0x11;
             eContestLink80C2020Struct2018000.unk_05++;
             DestroyTask(taskId);
-            PlaySE(SE_JYUNI);
+            PlaySE(SE_CONTEST_PLACE);
         }
     }
 }
diff --git a/src/credits.c b/src/credits.c
index daf6d2b5c..1ab6ed859 100644
--- a/src/credits.c
+++ b/src/credits.c
@@ -497,7 +497,7 @@ void sub_81439D0(void)
 
 
     SetVBlankCallback(vblank_8143948);
-    m4aSongNumStart(MUS_THANKFOR);
+    m4aSongNumStart(MUS_CREDITS);
     SetMainCallback2(sub_814395C);
     gUnknown_02039325 = 0;
 
diff --git a/src/data/battle_strings_en.h b/src/data/battle_strings_en.h
index 951807252..4534516c1 100644
--- a/src/data/battle_strings_en.h
+++ b/src/data/battle_strings_en.h
@@ -613,23 +613,23 @@ const u8 BattleText_StatNoHigher[] = _("{ATTACKING_MON}'s stats won't\ngo any hi
 const u8 BattleText_StatNoLower[] = _("{DEFENDING_MON}'s stats won't\ngo any lower!");
 const u8 BattleText_Critical[] = _("A critical hit!");
 const u8 BattleText_GrandSlam[] = _("It's a one-hit KO!");
-const u8 BattleText_MoveForget123[] = _("{PAUSE 32}1, {PAUSE 15}2 and...{PAUSE 15} ...{PAUSE 15} ...{PAUSE 15}\n{PAUSE 15}{PLAY_SE SE_KON}Poof!\p");
+const u8 BattleText_MoveForget123[] = _("{PAUSE 32}1, {PAUSE 15}2 and...{PAUSE 15} ...{PAUSE 15} ...{PAUSE 15}\n{PAUSE 15}{PLAY_SE SE_BALL_BOUNCE_1}Poof!\p");
 const u8 BattleText_MoveForgetAnd[] = _("And...\p");
 const u8 BattleText_CantForgetHM[] = _("HM moves can't be\nforgotten now.\p");
 const u8 BattleText_NotEffective[] = _("It's not very effective...");
 const u8 BattleText_SuperEffective[] = _("It's super effective!");
-const u8 BattleText_GotAwaySafely[] = _("{PLAY_SE SE_NIGERU}Got away safely!\p");
-const u8 BattleText_FledUsingItem[] = _("{PLAY_SE SE_NIGERU}{ATTACKING_MON} fled\nusing its {STRING 19}!\p");
-const u8 BattleText_FledUsingOther[] = _("{PLAY_SE SE_NIGERU}{ATTACKING_MON} fled\nusing {STRING 21}!\p");
-const u8 BattleText_FledWild[] = _("{PLAY_SE SE_NIGERU}Wild {STRING 0} fled!");
+const u8 BattleText_GotAwaySafely[] = _("{PLAY_SE SE_FLEE}Got away safely!\p");
+const u8 BattleText_FledUsingItem[] = _("{PLAY_SE SE_FLEE}{ATTACKING_MON} fled\nusing its {STRING 19}!\p");
+const u8 BattleText_FledUsingOther[] = _("{PLAY_SE SE_FLEE}{ATTACKING_MON} fled\nusing {STRING 21}!\p");
+const u8 BattleText_FledWild[] = _("{PLAY_SE SE_FLEE}Wild {STRING 0} fled!");
 const u8 BattleText_PlayerDefeatedTrainer[] = _("Player defeated\n{STRING 29}!");
 const u8 BattleText_PlayerDefeatedTrainers[] = _("Player beat {STRING 30}\nand {STRING 29}!");
 const u8 BattleText_PlayerLostTrainer[] = _("Player lost against\n{STRING 29}!");
 const u8 BattleText_PlayerLostTrainers[] = _("Player lost to {STRING 30}\nand {STRING 29}!");
 const u8 BattleText_PlayerTiedTrainer[] = _("Player tied against\n{STRING 29}!");
 const u8 BattleText_PlayerTiedTrainers[] = _("Player tied against {STRING 30}\nand {STRING 29}!");
-const u8 BattleText_FledSingle[] = _("{PLAY_SE SE_NIGERU}{STRING 29} fled!");
-const u8 BattleText_FledDouble[] = _("{PLAY_SE SE_NIGERU}{STRING 29} and\n{STRING 30} fled!");
+const u8 BattleText_FledSingle[] = _("{PLAY_SE SE_FLEE}{STRING 29} fled!");
+const u8 BattleText_FledDouble[] = _("{PLAY_SE SE_FLEE}{STRING 29} and\n{STRING 30} fled!");
 const u8 BattleText_NoRunning[] = _("No! There's no running\nfrom a TRAINER battle!\p");
 const u8 BattleText_CantEscape2[] = _("Can't escape!\p");
 const u8 BattleText_BirchDontLeaveMe[] = _("PROF. BIRCH: D-don't leave\nme here like this!\p");
@@ -679,7 +679,7 @@ const u8 BattleText_CuriousAbout[] = _("{STRING 3} is curious about\nthe {STRING
 const u8 BattleText_EnthralledBy[] = _("{STRING 3} is enthralled by\nthe {STRING 0}!");
 const u8 BattleText_IgnoredThing[] = _("{STRING 3} completely ignored\nthe {STRING 0}!");
 const u8 BattleText_ThrewBlock[] = _("{STRING 32} threw a {POKEBLOCK}\nat the {STRING 3}!");
-const u8 BattleText_SafariOver[] = _("{PLAY_SE SE_PINPON}ANNOUNCER: You're out of\nSAFARI BALLS! Game over!\p");
+const u8 BattleText_SafariOver[] = _("{PLAY_SE SE_DING_DONG}ANNOUNCER: You're out of\nSAFARI BALLS! Game over!\p");
 const u8 BattleText_WildAppeared1[] = _("Wild {STRING 3} appeared!\p");
 const u8 BattleText_WildAppeared2[] = _("Wild {STRING 3} appeared!\p");
 const u8 BattleText_WildAppeared3[] = _("Wild {STRING 3} appeared!{PAUSE 127}");
@@ -747,8 +747,8 @@ const u8 BattleText_BallBrokeOhNo[] = _("Oh, no!\nThe POKéMON broke free!");
 const u8 BattleText_BallBrokeAppeared[] = _("Aww!\nIt appeared to be caught!");
 const u8 BattleText_BallBrokeAlmost[] = _("Aargh!\nAlmost had it!");
 const u8 BattleText_BallBrokeSoClose[] = _("Shoot!\nIt was so close, too!");
-const u8 BattleText_BallCaught1[] = _("Gotcha!\n{STRING 3} was caught!{UNKNOWN_A}{PLAY_BGM MUS_KACHI22}\p");
-const u8 BattleText_BallCaught2[] = _("Gotcha!\n{STRING 3} was caught!{UNKNOWN_A}{PLAY_BGM MUS_KACHI22}{PAUSE 127}");
+const u8 BattleText_BallCaught1[] = _("Gotcha!\n{STRING 3} was caught!{UNKNOWN_A}{PLAY_BGM MUS_CAUGHT}\p");
+const u8 BattleText_BallCaught2[] = _("Gotcha!\n{STRING 3} was caught!{UNKNOWN_A}{PLAY_BGM MUS_CAUGHT}{PAUSE 127}");
 const u8 BattleText_GiveNickname[] = _("Give a nickname to the\ncaptured {STRING 3}?");
 const u8 BattleText_SentToPC[] = _("{STRING 3} was sent to\n{STRING 35} PC.");
 const u8 BattleText_Someone[] = _("someone's");
diff --git a/src/debug/sound_check_menu.c b/src/debug/sound_check_menu.c
index dec9b4371..5b7a26f97 100644
--- a/src/debug/sound_check_menu.c
+++ b/src/debug/sound_check_menu.c
@@ -814,373 +814,373 @@ void sub_80BB1D4(void)
 
 #define SOUND_LIST_BGM \
 	X(MUS_STOP, "STOP") \
-	X(MUS_TETSUJI, "TETSUJI") \
-	X(MUS_FIELD13, "FIELD13") \
-	X(MUS_KACHI22, "KACHI22") \
-	X(MUS_KACHI2, "KACHI2") \
-	X(MUS_KACHI3, "KACHI3") \
-	X(MUS_KACHI5, "KACHI5") \
-	X(MUS_PCC, "PCC") \
-	X(MUS_NIBI, "NIBI") \
-	X(MUS_SUIKUN, "SUIKUN") \
-	X(MUS_DOORO1, "DOORO1") \
-	X(MUS_DOORO_X1, "DOORO-X1") \
-	X(MUS_DOORO_X3, "DOORO-X3") \
-	X(MUS_MACHI_S2, "MACHI-S2") \
-	X(MUS_MACHI_S4, "MACHI-S4") \
-	X(MUS_GIM, "GIM") \
-	X(MUS_NAMINORI, "NAMINORI") \
-	X(MUS_DAN01, "DAN01") \
-	X(MUS_FANFA1, "FANFA1") \
-	X(MUS_ME_ASA, "ME-ASA") \
-	X(MUS_ME_BACHI, "ME-BACHI") \
-	X(MUS_FANFA4, "FANFA4") \
-	X(MUS_FANFA5, "FANFA5") \
-	X(MUS_ME_WAZA, "ME-WAZA") \
-	X(MUS_BIJYUTU, "BIJYUTU") \
-	X(MUS_DOORO_X4, "DOORO-X4") \
-	X(MUS_FUNE_KAN, "FUNE-KAN") \
-	X(MUS_ME_SHINKA, "ME-SHINKA") \
-	X(MUS_SHINKA, "SHINKA") \
-	X(MUS_ME_WASURE, "ME-WASURE") \
-	X(MUS_SYOUJOEYE, "SYOUJOEYE") \
-	X(MUS_BOYEYE, "BOYEYE") \
-	X(MUS_DAN02, "DAN02") \
-	X(MUS_MACHI_S3, "MACHI-S3") \
-	X(MUS_ODAMAKI, "ODAMAKI") \
+	X(MUS_LITTLEROOT_TEST, "TETSUJI") \
+	X(MUS_GSC_ROUTE38, "FIELD13") \
+	X(MUS_CAUGHT, "KACHI22") \
+	X(MUS_VICTORY_WILD, "KACHI2") \
+	X(MUS_VICTORY_GYM_LEADER, "KACHI3") \
+	X(MUS_VICTORY_LEAGUE, "KACHI5") \
+	X(MUS_C_COMM_CENTER, "PCC") \
+	X(MUS_GSC_PEWTER, "NIBI") \
+	X(MUS_C_VS_LEGEND_BEAST, "SUIKUN") \
+	X(MUS_ROUTE101, "DOORO1") \
+	X(MUS_ROUTE110, "DOORO-X1") \
+	X(MUS_ROUTE120, "DOORO-X3") \
+	X(MUS_PETALBURG, "MACHI-S2") \
+	X(MUS_OLDALE, "MACHI-S4") \
+	X(MUS_GYM, "GIM") \
+	X(MUS_SURF, "NAMINORI") \
+	X(MUS_PETALBURG_WOODS, "DAN01") \
+	X(MUS_LEVEL_UP, "FANFA1") \
+	X(MUS_HEAL, "ME-ASA") \
+	X(MUS_OBTAIN_BADGE, "ME-BACHI") \
+	X(MUS_OBTAIN_ITEM, "FANFA4") \
+	X(MUS_EVOLVED, "FANFA5") \
+	X(MUS_OBTAIN_TMHM, "ME-WAZA") \
+	X(MUS_LILYCOVE_MUSEUM, "BIJYUTU") \
+	X(MUS_ROUTE122, "DOORO-X4") \
+	X(MUS_OCEANIC_MUSEUM, "FUNE-KAN") \
+	X(MUS_EVOLUTION_INTRO, "ME-SHINKA") \
+	X(MUS_EVOLUTION, "SHINKA") \
+	X(MUS_MOVE_DELETED, "ME-WASURE") \
+	X(MUS_ENCOUNTER_GIRL, "SYOUJOEYE") \
+	X(MUS_ENCOUNTER_MALE, "BOYEYE") \
+	X(MUS_ABANDONED_SHIP, "DAN02") \
+	X(MUS_FORTREE, "MACHI-S3") \
+	X(MUS_BIRCH_LAB, "ODAMAKI") \
 	X(MUS_B_TOWER, "B-TOWER") \
-	X(MUS_SWIMEYE, "SWIMEYE") \
-	X(MUS_DAN03, "DAN03") \
-	X(MUS_ME_KINOMI, "ME-KINOMI") \
-	X(MUS_ME_TAMA, "ME-TAMA") \
-	X(MUS_ME_B_BIG, "ME-B-BIG") \
-	X(MUS_ME_B_SMALL, "ME-B-SMALL") \
-	X(MUS_ME_ZANNEN, "ME-ZANNEN") \
-	X(MUS_BD_TIME, "BD-TIME") \
-	X(MUS_TEST1, "TEST1") \
-	X(MUS_TEST2, "TEST2") \
-	X(MUS_TEST3, "TEST3") \
-	X(MUS_TEST4, "TEST4") \
-	X(MUS_TEST, "TEST") \
-	X(MUS_GOMACHI0, "GOMACHI0") \
-	X(MUS_GOTOWN, "GOTOWN") \
-	X(MUS_POKECEN, "POKECEN") \
-	X(MUS_NEXTROAD, "NEXTROAD") \
-	X(MUS_GRANROAD, "GRANROAD") \
+	X(MUS_ENCOUNTER_SWIMMER, "SWIMEYE") \
+	X(MUS_CAVE_OF_ORIGIN, "DAN03") \
+	X(MUS_OBTAIN_BERRY, "ME-KINOMI") \
+	X(MUS_AWAKEN_LEGEND, "ME-TAMA") \
+	X(MUS_SLOTS_JACKPOT, "ME-B-BIG") \
+	X(MUS_SLOTS_WIN, "ME-B-SMALL") \
+	X(MUS_TOO_BAD, "ME-ZANNEN") \
+	X(MUS_ROULETTE, "BD-TIME") \
+	X(MUS_LINK_CONTEST_P1, "TEST1") \
+	X(MUS_LINK_CONTEST_P2, "TEST2") \
+	X(MUS_LINK_CONTEST_P3, "TEST3") \
+	X(MUS_LINK_CONTEST_P4, "TEST4") \
+	X(MUS_ENCOUNTER_RICH, "TEST") \
+	X(MUS_VERDANTURF, "GOMACHI0") \
+	X(MUS_RUSTBORO, "GOTOWN") \
+	X(MUS_POKE_CENTER, "POKECEN") \
+	X(MUS_ROUTE104, "NEXTROAD") \
+	X(MUS_ROUTE119, "GRANROAD") \
 	X(MUS_CYCLING, "CYCLING") \
-	X(MUS_FRIENDLY, "FRIENDLY") \
-	X(MUS_MISHIRO, "MISHIRO") \
-	X(MUS_TOZAN, "TOZAN") \
-	X(MUS_GIRLEYE, "GIRLEYE") \
-	X(MUS_MINAMO, "MINAMO") \
-	X(MUS_ASHROAD, "ASHROAD") \
-	X(MUS_EVENT0, "EVENT0") \
-	X(MUS_DEEPDEEP, "DEEPDEEP") \
-	X(MUS_KACHI1, "KACHI1") \
-	X(MUS_TITLE3, "TITLE3") \
-	X(MUS_DEMO1, "DEMO1") \
-	X(MUS_GIRL_SUP, "GIRL-SUP") \
-	X(MUS_HAGESHII, "HAGESHII") \
-	X(MUS_KAKKOII, "KAKKOII") \
-	X(MUS_KAZANBAI, "KAZANBAI") \
-	X(MUS_AQA_0, "AQA-0") \
-	X(MUS_TSURETEK, "TSURETEK") \
-	X(MUS_BOY_SUP, "BOY-SUP") \
-	X(MUS_RAINBOW, "RAINBOW") \
-	X(MUS_AYASII, "AYASII") \
-	X(MUS_KACHI4, "KACHI4") \
-	X(MUS_ROPEWAY, "ROPEWAY") \
-	X(MUS_CASINO, "CASINO") \
-	X(MUS_HIGHTOWN, "HIGHTOWN") \
-	X(MUS_SAFARI, "SAFARI") \
-	X(MUS_C_ROAD, "C-ROAD") \
-	X(MUS_AJITO, "AJITO") \
-	X(MUS_M_BOAT, "M-BOAT") \
-	X(MUS_M_DUNGON, "M-DUNGON") \
-	X(MUS_FINECITY, "FINECITY") \
-	X(MUS_MACHUPI, "MACHUPI") \
-	X(MUS_P_SCHOOL, "P-SCHOOL") \
-	X(MUS_DENDOU, "DENDOU") \
-	X(MUS_TONEKUSA, "TONEKUSA") \
-	X(MUS_MABOROSI, "MABOROSI") \
-	X(MUS_CON_FAN, "CON-FAN") \
-	X(MUS_CONTEST0, "CONTEST0") \
-	X(MUS_MGM0, "MGM0") \
-	X(MUS_T_BATTLE, "T-BATTLE") \
-	X(MUS_OOAME, "OOAME") \
-	X(MUS_HIDERI, "HIDERI") \
-	X(MUS_RUNECITY, "RUNECITY") \
-	X(MUS_CON_K, "CON-K") \
-	X(MUS_EIKOU_R, "EIKOU-R") \
-	X(MUS_KARAKURI, "KARAKURI") \
-	X(MUS_HUTAGO, "HUTAGO") \
-	X(MUS_SITENNOU, "SITENNOU") \
-	X(MUS_YAMA_EYE, "YAMA-EYE") \
-	X(MUS_CONLOBBY, "CONLOBBY") \
-	X(MUS_INTER_V, "INTER-V") \
-	X(MUS_DAIGO, "DAIGO") \
-	X(MUS_THANKFOR, "THANKFOR") \
+	X(MUS_POKE_MART, "FRIENDLY") \
+	X(MUS_LITTLEROOT, "MISHIRO") \
+	X(MUS_MT_CHIMNEY, "TOZAN") \
+	X(MUS_ENCOUNTER_FEMALE, "GIRLEYE") \
+	X(MUS_LILYCOVE, "MINAMO") \
+	X(MUS_ROUTE111, "ASHROAD") \
+	X(MUS_HELP, "EVENT0") \
+	X(MUS_UNDERWATER, "DEEPDEEP") \
+	X(MUS_VICTORY_TRAINER, "KACHI1") \
+	X(MUS_TITLE, "TITLE3") \
+	X(MUS_INTRO, "DEMO1") \
+	X(MUS_ENCOUNTER_MAY, "GIRL-SUP") \
+	X(MUS_ENCOUNTER_INTENSE, "HAGESHII") \
+	X(MUS_ENCOUNTER_COOL, "KAKKOII") \
+	X(MUS_ROUTE113, "KAZANBAI") \
+	X(MUS_ENCOUNTER_AQUA, "AQA-0") \
+	X(MUS_FOLLOW_ME, "TSURETEK") \
+	X(MUS_ENCOUNTER_BRENDAN, "BOY-SUP") \
+	X(MUS_EVER_GRANDE, "RAINBOW") \
+	X(MUS_ENCOUNTER_SUSPICIOUS, "AYASII") \
+	X(MUS_VICTORY_AQUA_MAGMA, "KACHI4") \
+	X(MUS_CABLE_CAR, "ROPEWAY") \
+	X(MUS_GAME_CORNER, "CASINO") \
+	X(MUS_DEWFORD, "HIGHTOWN") \
+	X(MUS_SAFARI_ZONE, "SAFARI") \
+	X(MUS_VICTORY_ROAD, "C-ROAD") \
+	X(MUS_AQUA_MAGMA_HIDEOUT, "AJITO") \
+	X(MUS_SAILING, "M-BOAT") \
+	X(MUS_MT_PYRE, "M-DUNGON") \
+	X(MUS_SLATEPORT, "FINECITY") \
+	X(MUS_MT_PYRE_EXTERIOR, "MACHUPI") \
+	X(MUS_SCHOOL, "P-SCHOOL") \
+	X(MUS_HALL_OF_FAME, "DENDOU") \
+	X(MUS_FALLARBOR, "TONEKUSA") \
+	X(MUS_SEALED_CHAMBER, "MABOROSI") \
+	X(MUS_CONTEST_WINNER, "CON-FAN") \
+	X(MUS_CONTEST, "CONTEST0") \
+	X(MUS_ENCOUNTER_MAGMA, "MGM0") \
+	X(MUS_INTRO_BATTLE, "T-BATTLE") \
+	X(MUS_WEATHER_KYOGRE, "OOAME") \
+	X(MUS_WEATHER_GROUDON, "HIDERI") \
+	X(MUS_SOOTOPOLIS, "RUNECITY") \
+	X(MUS_CONTEST_RESULTS, "CON-K") \
+	X(MUS_HALL_OF_FAME_ROOM, "EIKOU-R") \
+	X(MUS_TRICK_HOUSE, "KARAKURI") \
+	X(MUS_ENCOUNTER_TWINS, "HUTAGO") \
+	X(MUS_ENCOUNTER_ELITE_FOUR, "SITENNOU") \
+	X(MUS_ENCOUNTER_HIKER, "YAMA-EYE") \
+	X(MUS_CONTEST_LOBBY, "CONLOBBY") \
+	X(MUS_ENCOUNTER_INTERVIEWER, "INTER-V") \
+	X(MUS_ENCOUNTER_CHAMPION, "DAIGO") \
+	X(MUS_CREDITS, "THANKFOR") \
 	X(MUS_END, "END") \
-	X(MUS_BATTLE27, "BATTLE27") \
-	X(MUS_BATTLE31, "BATTLE31") \
-	X(MUS_BATTLE20, "BATTLE20") \
-	X(MUS_BATTLE32, "BATTLE32") \
-	X(MUS_BATTLE33, "BATTLE33") \
-	X(MUS_BATTLE36, "BATTLE36") \
-	X(MUS_BATTLE34, "BATTLE34") \
-	X(MUS_BATTLE35, "BATTLE35") \
-	X(MUS_BATTLE38, "BATTLE38") \
-	X(MUS_BATTLE30, "BATTLE30")
+	X(MUS_VS_WILD, "BATTLE27") \
+	X(MUS_VS_AQUA_MAGMA, "BATTLE31") \
+	X(MUS_VS_TRAINER, "BATTLE20") \
+	X(MUS_VS_GYM_LEADER, "BATTLE32") \
+	X(MUS_VS_CHAMPION, "BATTLE33") \
+	X(MUS_VS_REGI, "BATTLE36") \
+	X(MUS_VS_KYOGRE_GROUDON, "BATTLE34") \
+	X(MUS_VS_RIVAL, "BATTLE35") \
+	X(MUS_VS_ELITE_FOUR, "BATTLE38") \
+	X(MUS_VS_AQUA_MAGMA_LEADER, "BATTLE30")
 
 #define SOUND_LIST_SE \
-	X(SE_STOP, "STOP") \
-	X(SE_KAIFUKU, "KAIFUKU") \
-	X(SE_PC_LOGON, "PC-LOGON") \
+	X(MUS_DUMMY, "STOP") \
+	X(SE_USE_ITEM, "KAIFUKU") \
+	X(SE_PC_LOGIN, "PC-LOGON") \
 	X(SE_PC_OFF, "PC-OFF") \
 	X(SE_PC_ON, "PC-ON") \
 	X(SE_SELECT, "SELECT") \
 	X(SE_WIN_OPEN, "WIN-OPEN") \
 	X(SE_WALL_HIT, "WALL-HIT") \
 	X(SE_DOOR, "DOOR") \
-	X(SE_KAIDAN, "KAIDAN") \
-	X(SE_DANSA, "DANSA") \
-	X(SE_JITENSYA, "JITENSYA") \
-	X(SE_KOUKA_L, "KOUKA-L") \
-	X(SE_KOUKA_M, "KOUKA-M") \
-	X(SE_KOUKA_H, "KOUKA-H") \
-	X(SE_BOWA2, "BOWA2") \
-	X(SE_POKE_DEAD, "POKE-DEAD") \
-	X(SE_NIGERU, "NIGERU") \
-	X(SE_JIDO_DOA, "JIDO-DOA") \
-	X(SE_NAMINORI, "NAMINORI") \
-	X(SE_BAN, "BAN") \
+	X(SE_EXIT, "KAIDAN") \
+	X(SE_LEDGE, "DANSA") \
+	X(SE_BIKE_BELL, "JITENSYA") \
+	X(SE_NOT_EFFECTIVE, "KOUKA-L") \
+	X(SE_EFFECTIVE, "KOUKA-M") \
+	X(SE_SUPER_EFFECTIVE, "KOUKA-H") \
+	X(SE_BALL_OPEN, "BOWA2") \
+	X(SE_FAINT, "POKE-DEAD") \
+	X(SE_FLEE, "NIGERU") \
+	X(SE_SLIDING_DOOR, "JIDO-DOA") \
+	X(SE_SHIP, "NAMINORI") \
+	X(SE_BANG, "BAN") \
 	X(SE_PIN, "PIN") \
 	X(SE_BOO, "BOO") \
-	X(SE_BOWA, "BOWA") \
-	X(SE_JYUNI, "JYUNI") \
+	X(SE_BALL, "BOWA") \
+	X(SE_CONTEST_PLACE, "JYUNI") \
 	X(SE_A, "A") \
 	X(SE_I, "I") \
 	X(SE_U, "U") \
 	X(SE_E, "E") \
 	X(SE_O, "O") \
 	X(SE_N, "N") \
-	X(SE_SEIKAI, "SEIKAI") \
-	X(SE_HAZURE, "HAZURE") \
+	X(SE_SUCCESS, "SEIKAI") \
+	X(SE_FAILURE, "HAZURE") \
 	X(SE_EXP, "EXP") \
-	X(SE_JITE_PYOKO, "JITE-PYOKO") \
-	X(SE_MU_PACHI, "MU-PACHI") \
-	X(SE_TK_KASYA, "TK-KASYA") \
+	X(SE_BIKE_HOP, "JITE-PYOKO") \
+	X(SE_SWITCH, "MU-PACHI") \
+	X(SE_CLICK, "TK-KASYA") \
 	X(SE_FU_ZAKU, "FU-ZAKU") \
-	X(SE_FU_ZAKU2, "FU-ZAKU2") \
-	X(SE_FU_ZUZUZU, "FU-ZUZUZU") \
-	X(SE_RU_GASHIN, "RU-GASHIN") \
-	X(SE_RU_GASYAN, "RU-GASYAN") \
-	X(SE_RU_BARI, "RU-BARI") \
-	X(SE_RU_HYUU, "RU-HYUU") \
-	X(SE_KI_GASYAN, "KI-GASYAN") \
-	X(SE_TK_WARPIN, "TK-WARPIN") \
-	X(SE_TK_WARPOUT, "TK-WARPOUT") \
-	X(SE_TU_SAA, "TU-SAA") \
-	X(SE_HI_TURUN, "HI-TURUN") \
-	X(SE_TRACK_MOVE, "TRACK-MOVE") \
-	X(SE_TRACK_STOP, "TRACK-STOP") \
-	X(SE_TRACK_HAIK, "TRACK-HAIK") \
-	X(SE_TRACK_DOOR, "TRACK-DOOR") \
-	X(SE_MOTER, "MOTER") \
+	X(SE_CONTEST_CONDITION_LOSE, "FU-ZAKU2") \
+	X(SE_LAVARIDGE_FALL_WARP, "FU-ZUZUZU") \
+	X(SE_ICE_STAIRS, "RU-GASHIN") \
+	X(SE_ICE_BREAK, "RU-GASYAN") \
+	X(SE_ICE_CRACK, "RU-BARI") \
+	X(SE_FALL, "RU-HYUU") \
+	X(SE_UNLOCK, "KI-GASYAN") \
+	X(SE_WARP_IN, "TK-WARPIN") \
+	X(SE_WARP_OUT, "TK-WARPOUT") \
+	X(SE_REPEL, "TU-SAA") \
+	X(SE_ROTATING_GATE, "HI-TURUN") \
+	X(SE_TRUCK_MOVE, "TRACK-MOVE") \
+	X(SE_TRUCK_STOP, "TRACK-STOP") \
+	X(SE_TRUCK_UNLOAD, "TRACK-HAIK") \
+	X(SE_TRUCK_DOOR, "TRACK-DOOR") \
+	X(SE_BERRY_BLENDER, "MOTER") \
 	X(SE_CARD, "CARD") \
 	X(SE_SAVE, "SAVE") \
-	X(SE_KON, "KON") \
-	X(SE_KON2, "KON2") \
-	X(SE_KON3, "KON3") \
-	X(SE_KON4, "KON4") \
-	X(SE_SUIKOMU, "SUIKOMU") \
-	X(SE_NAGERU, "NAGERU") \
-	X(SE_TOY_C, "TOY-C") \
-	X(SE_TOY_D, "TOY-D") \
-	X(SE_TOY_E, "TOY-E") \
-	X(SE_TOY_F, "TOY-F") \
-	X(SE_TOY_G, "TOY-G") \
-	X(SE_TOY_A, "TOY-A") \
-	X(SE_TOY_B, "TOY-B") \
-	X(SE_TOY_C1, "TOY-C1") \
-	X(SE_MIZU, "MIZU") \
-	X(SE_HASHI, "HASHI") \
-	X(SE_DAUGI, "DAUGI") \
-	X(SE_PINPON, "PINPON") \
-	X(SE_FUUSEN1, "FUUSEN1") \
-	X(SE_FUUSEN2, "FUUSEN2") \
-	X(SE_FUUSEN3, "FUUSEN3") \
-	X(SE_TOY_KABE, "TOY-KABE") \
-	X(SE_TOY_DANGO, "TOY-DANGO") \
-	X(SE_DOKU, "DOKU") \
-	X(SE_ESUKA, "ESUKA") \
-	X(SE_T_AME, "T-AME") \
-	X(SE_T_AME_E, "T-AME-E") \
-	X(SE_T_OOAME, "T-OOAME") \
-	X(SE_T_OOAME_E, "T-OOAME-E") \
-	X(SE_T_KOAME, "T-KOAME") \
-	X(SE_T_KOAME_E, "T-KOAME-E") \
-	X(SE_T_KAMI, "T-KAMI") \
-	X(SE_T_KAMI2, "T-KAMI2") \
-	X(SE_ELEBETA, "ELEBETA") \
-	X(SE_HINSI, "HINSI") \
-	X(SE_EXPMAX, "EXPMAX") \
-	X(SE_TAMAKORO, "TAMAKORO") \
-	X(SE_TAMAKORO_E, "TAMAKORO-E") \
-	X(SE_BASABASA, "BASABASA") \
-	X(SE_REGI, "REGI") \
-	X(SE_C_GAJI, "C-GAJI") \
-	X(SE_C_MAKU_U, "C-MAKU-U") \
-	X(SE_C_MAKU_D, "C-MAKU-D") \
-	X(SE_C_PASI, "C-PASI") \
-	X(SE_C_SYU, "C-SYU") \
-	X(SE_C_PIKON, "C-PIKON") \
-	X(SE_REAPOKE, "REAPOKE") \
-	X(SE_OP_BASYU, "OP-BASYU") \
-	X(SE_BT_START, "BT-START") \
-	X(SE_DENDOU, "DENDOU") \
-	X(SE_JIHANKI, "JIHANKI") \
-	X(SE_TAMA, "TAMA") \
-	X(SE_Z_SCROLL, "Z-SCROLL") \
-	X(SE_Z_PAGE, "Z-PAGE") \
-	X(SE_PN_ON, "PN-ON") \
-	X(SE_PN_OFF, "PN-OFF") \
-	X(SE_Z_SEARCH, "Z-SEARCH") \
-	X(SE_TAMAGO, "TAMAGO") \
-	X(SE_TB_START, "TB-START") \
-	X(SE_TB_KON, "TB-KON") \
-	X(SE_TB_KARA, "TB-KARA") \
-	X(SE_BIDORO, "BIDORO") \
-	X(SE_W085, "W085") \
-	X(SE_W085B, "W085B") \
-	X(SE_W231, "W231") \
-	X(SE_W171, "W171") \
-	X(SE_W233, "W233") \
-	X(SE_W233B, "W233B") \
-	X(SE_W145, "W145") \
-	X(SE_W145B, "W145B") \
-	X(SE_W145C, "W145C") \
-	X(SE_W240, "W240") \
-	X(SE_W015, "W015") \
-	X(SE_W081, "W081") \
-	X(SE_W081B, "W081B") \
-	X(SE_W088, "W088") \
-	X(SE_W016, "W016") \
-	X(SE_W016B, "W016B") \
-	X(SE_W003, "W003") \
-	X(SE_W104, "W104") \
-	X(SE_W013, "W013") \
-	X(SE_W196, "W196") \
-	X(SE_W086, "W086") \
-	X(SE_W004, "W004") \
-	X(SE_W025, "W025") \
-	X(SE_W025B, "W025B") \
-	X(SE_W152, "W152") \
-	X(SE_W026, "W026") \
-	X(SE_W172, "W172") \
-	X(SE_W172B, "W172B") \
-	X(SE_W053, "W053") \
-	X(SE_W007, "W007") \
-	X(SE_W092, "W092") \
-	X(SE_W221, "W221") \
-	X(SE_W221B, "W221B") \
-	X(SE_W052, "W052") \
-	X(SE_W036, "W036") \
-	X(SE_W059, "W059") \
-	X(SE_W059B, "W059B") \
-	X(SE_W010, "W010") \
-	X(SE_W011, "W011") \
-	X(SE_W017, "W017") \
-	X(SE_W019, "W019") \
-	X(SE_W028, "W028") \
-	X(SE_W013B, "W013B") \
-	X(SE_W044, "W044") \
-	X(SE_W029, "W029") \
-	X(SE_W057, "W057") \
-	X(SE_W056, "W056") \
-	X(SE_W250, "W250") \
-	X(SE_W030, "W030") \
-	X(SE_W039, "W039") \
-	X(SE_W054, "W054") \
-	X(SE_W077, "W077") \
-	X(SE_W020, "W020") \
-	X(SE_W082, "W082") \
-	X(SE_W047, "W047") \
-	X(SE_W195, "W195") \
-	X(SE_W006, "W006") \
-	X(SE_W091, "W091") \
-	X(SE_W146, "W146") \
-	X(SE_W120, "W120") \
-	X(SE_W153, "W153") \
-	X(SE_W071B, "W071B") \
-	X(SE_W071, "W071") \
-	X(SE_W103, "W103") \
-	X(SE_W062, "W062") \
-	X(SE_W062B, "W062B") \
-	X(SE_W048, "W048") \
-	X(SE_W187, "W187") \
-	X(SE_W118, "W118") \
-	X(SE_W155, "W155") \
-	X(SE_W122, "W122") \
-	X(SE_W060, "W060") \
-	X(SE_W185, "W185") \
-	X(SE_W014, "W014") \
-	X(SE_W043, "W043") \
-	X(SE_W207, "W207") \
-	X(SE_W207B, "W207B") \
-	X(SE_W215, "W215") \
-	X(SE_W109, "W109") \
-	X(SE_W173, "W173") \
-	X(SE_W280, "W280") \
-	X(SE_W202, "W202") \
-	X(SE_W060B, "W060B") \
-	X(SE_W076, "W076") \
-	X(SE_W080, "W080") \
-	X(SE_W100, "W100") \
-	X(SE_W107, "W107") \
-	X(SE_W166, "W166") \
-	X(SE_W129, "W129") \
-	X(SE_W115, "W115") \
-	X(SE_W112, "W112") \
-	X(SE_W197, "W197") \
-	X(SE_W199, "W199") \
-	X(SE_W236, "W236") \
-	X(SE_W204, "W204") \
-	X(SE_W268, "W268") \
-	X(SE_W070, "W070") \
-	X(SE_W063, "W063") \
-	X(SE_W127, "W127") \
-	X(SE_W179, "W179") \
-	X(SE_W151, "W151") \
-	X(SE_W201, "W201") \
-	X(SE_W161, "W161") \
-	X(SE_W161B, "W161B") \
-	X(SE_W227, "W227") \
-	X(SE_W227B, "W227B") \
-	X(SE_W226, "W226") \
-	X(SE_W208, "W208") \
-	X(SE_W213, "W213") \
-	X(SE_W213B, "W213B") \
-	X(SE_W234, "W234") \
-	X(SE_W260, "W260") \
-	X(SE_W328, "W328") \
-	X(SE_W320, "W320") \
-	X(SE_W255, "W255") \
-	X(SE_W291, "W291") \
-	X(SE_W089, "W089") \
-	X(SE_W239, "W239") \
-	X(SE_W230, "W230") \
-	X(SE_W281, "W281") \
-	X(SE_W327, "W327") \
-	X(SE_W287, "W287") \
-	X(SE_W257, "W257") \
-	X(SE_W253, "W253") \
-	X(SE_W258, "W258") \
-	X(SE_W322, "W322") \
-	X(SE_W298, "W298") \
-	X(SE_W287B, "W287B") \
-	X(SE_W114, "W114") \
-	X(SE_W063B, "W063B")
+	X(SE_BALL_BOUNCE_1, "KON") \
+	X(SE_BALL_BOUNCE_2, "KON2") \
+	X(SE_BALL_BOUNCE_3, "KON3") \
+	X(SE_BALL_BOUNCE_4, "KON4") \
+	X(SE_BALL_TRADE, "SUIKOMU") \
+	X(SE_BALL_THROW, "NAGERU") \
+	X(SE_NOTE_C, "TOY-C") \
+	X(SE_NOTE_D, "TOY-D") \
+	X(SE_NOTE_E, "TOY-E") \
+	X(SE_NOTE_F, "TOY-F") \
+	X(SE_NOTE_G, "TOY-G") \
+	X(SE_NOTE_A, "TOY-A") \
+	X(SE_NOTE_B, "TOY-B") \
+	X(SE_NOTE_C_HIGH, "TOY-C1") \
+	X(SE_PUDDLE, "MIZU") \
+	X(SE_BRIDGE_WALK, "HASHI") \
+	X(SE_ITEMFINDER, "DAUGI") \
+	X(SE_DING_DONG, "PINPON") \
+	X(SE_BALLOON_RED, "FUUSEN1") \
+	X(SE_BALLOON_BLUE, "FUUSEN2") \
+	X(SE_BALLOON_YELLOW, "FUUSEN3") \
+	X(SE_BREAKABLE_DOOR, "TOY-KABE") \
+	X(SE_MUD_BALL, "TOY-DANGO") \
+	X(SE_FIELD_POISON, "DOKU") \
+	X(SE_ESCALATOR, "ESUKA") \
+	X(SE_THUNDERSTORM, "T-AME") \
+	X(SE_THUNDERSTORM_STOP, "T-AME-E") \
+	X(SE_DOWNPOUR, "T-OOAME") \
+	X(SE_DOWNPOUR_STOP, "T-OOAME-E") \
+	X(SE_RAIN, "T-KOAME") \
+	X(SE_RAIN_STOP, "T-KOAME-E") \
+	X(SE_THUNDER, "T-KAMI") \
+	X(SE_THUNDER2, "T-KAMI2") \
+	X(SE_ELEVATOR, "ELEBETA") \
+	X(SE_LOW_HEALTH, "HINSI") \
+	X(SE_EXP_MAX, "EXPMAX") \
+	X(SE_ROULETTE_BALL, "TAMAKORO") \
+	X(SE_ROULETTE_BALL2, "TAMAKORO-E") \
+	X(SE_TAILLOW_WING_FLAP, "BASABASA") \
+	X(SE_SHOP, "REGI") \
+	X(SE_CONTEST_HEART, "C-GAJI") \
+	X(SE_CONTEST_CURTAIN_RISE, "C-MAKU-U") \
+	X(SE_CONTEST_CURTAIN_FALL, "C-MAKU-D") \
+	X(SE_CONTEST_ICON_CHANGE, "C-PASI") \
+	X(SE_CONTEST_ICON_CLEAR, "C-SYU") \
+	X(SE_CONTEST_MONS_TURN, "C-PIKON") \
+	X(SE_SHINY, "REAPOKE") \
+	X(SE_INTRO_BLAST, "OP-BASYU") \
+	X(SE_MUGSHOT, "BT-START") \
+	X(SE_APPLAUSE, "DENDOU") \
+	X(SE_VEND, "JIHANKI") \
+	X(SE_ORB, "TAMA") \
+	X(SE_DEX_SCROLL, "Z-SCROLL") \
+	X(SE_DEX_PAGE, "Z-PAGE") \
+	X(SE_POKENAV_ON, "PN-ON") \
+	X(SE_POKENAV_OFF, "PN-OFF") \
+	X(SE_DEX_SEARCH, "Z-SEARCH") \
+	X(SE_EGG_HATCH, "TAMAGO") \
+	X(SE_BALL_TRAY_ENTER, "TB-START") \
+	X(SE_BALL_TRAY_BALL, "TB-KON") \
+	X(SE_BALL_TRAY_EXIT, "TB-KARA") \
+	X(SE_GLASS_FLUTE, "BIDORO") \
+	X(SE_M_THUNDERBOLT, "W085") \
+	X(SE_M_THUNDERBOLT2, "W085B") \
+	X(SE_M_HARDEN, "W231") \
+	X(SE_M_NIGHTMARE, "W171") \
+	X(SE_M_VITAL_THROW, "W233") \
+	X(SE_M_VITAL_THROW2, "W233B") \
+	X(SE_M_BUBBLE, "W145") \
+	X(SE_M_BUBBLE2, "W145B") \
+	X(SE_M_BUBBLE3, "W145C") \
+	X(SE_M_RAIN_DANCE, "W240") \
+	X(SE_M_CUT, "W015") \
+	X(SE_M_STRING_SHOT, "W081") \
+	X(SE_M_STRING_SHOT2, "W081B") \
+	X(SE_M_ROCK_THROW, "W088") \
+	X(SE_M_GUST, "W016") \
+	X(SE_M_GUST2, "W016B") \
+	X(SE_M_DOUBLE_SLAP, "W003") \
+	X(SE_M_DOUBLE_TEAM, "W104") \
+	X(SE_M_RAZOR_WIND, "W013") \
+	X(SE_M_ICY_WIND, "W196") \
+	X(SE_M_THUNDER_WAVE, "W086") \
+	X(SE_M_COMET_PUNCH, "W004") \
+	X(SE_M_MEGA_KICK, "W025") \
+	X(SE_M_MEGA_KICK2, "W025B") \
+	X(SE_M_CRABHAMMER, "W152") \
+	X(SE_M_JUMP_KICK, "W026") \
+	X(SE_M_FLAME_WHEEL, "W172") \
+	X(SE_M_FLAME_WHEEL2, "W172B") \
+	X(SE_M_FLAMETHROWER, "W053") \
+	X(SE_M_FIRE_PUNCH, "W007") \
+	X(SE_M_TOXIC, "W092") \
+	X(SE_M_SACRED_FIRE, "W221") \
+	X(SE_M_SACRED_FIRE2, "W221B") \
+	X(SE_M_EMBER, "W052") \
+	X(SE_M_TAKE_DOWN, "W036") \
+	X(SE_M_BLIZZARD, "W059") \
+	X(SE_M_BLIZZARD2, "W059B") \
+	X(SE_M_SCRATCH, "W010") \
+	X(SE_M_VICEGRIP, "W011") \
+	X(SE_M_WING_ATTACK, "W017") \
+	X(SE_M_FLY, "W019") \
+	X(SE_M_SAND_ATTACK, "W028") \
+	X(SE_M_RAZOR_WIND2, "W013B") \
+	X(SE_M_BITE, "W044") \
+	X(SE_M_HEADBUTT, "W029") \
+	X(SE_M_SURF, "W057") \
+	X(SE_M_HYDRO_PUMP, "W056") \
+	X(SE_M_WHIRLPOOL, "W250") \
+	X(SE_M_HORN_ATTACK, "W030") \
+	X(SE_M_TAIL_WHIP, "W039") \
+	X(SE_M_MIST, "W054") \
+	X(SE_M_POISON_POWDER, "W077") \
+	X(SE_M_BIND, "W020") \
+	X(SE_M_DRAGON_RAGE, "W082") \
+	X(SE_M_SING, "W047") \
+	X(SE_M_PERISH_SONG, "W195") \
+	X(SE_M_PAY_DAY, "W006") \
+	X(SE_M_DIG, "W091") \
+	X(SE_M_DIZZY_PUNCH, "W146") \
+	X(SE_M_SELF_DESTRUCT, "W120") \
+	X(SE_M_EXPLOSION, "W153") \
+	X(SE_M_ABSORB_2, "W071B") \
+	X(SE_M_ABSORB, "W071") \
+	X(SE_M_SCREECH, "W103") \
+	X(SE_M_BUBBLE_BEAM, "W062") \
+	X(SE_M_BUBBLE_BEAM2, "W062B") \
+	X(SE_M_SUPERSONIC, "W048") \
+	X(SE_M_BELLY_DRUM, "W187") \
+	X(SE_M_METRONOME, "W118") \
+	X(SE_M_BONEMERANG, "W155") \
+	X(SE_M_LICK, "W122") \
+	X(SE_M_PSYBEAM, "W060") \
+	X(SE_M_FAINT_ATTACK, "W185") \
+	X(SE_M_SWORDS_DANCE, "W014") \
+	X(SE_M_LEER, "W043") \
+	X(SE_M_SWAGGER, "W207") \
+	X(SE_M_SWAGGER2, "W207B") \
+	X(SE_M_HEAL_BELL, "W215") \
+	X(SE_M_CONFUSE_RAY, "W109") \
+	X(SE_M_SNORE, "W173") \
+	X(SE_M_BRICK_BREAK, "W280") \
+	X(SE_M_GIGA_DRAIN, "W202") \
+	X(SE_M_PSYBEAM2, "W060B") \
+	X(SE_M_SOLAR_BEAM, "W076") \
+	X(SE_M_PETAL_DANCE, "W080") \
+	X(SE_M_TELEPORT, "W100") \
+	X(SE_M_MINIMIZE, "W107") \
+	X(SE_M_SKETCH, "W166") \
+	X(SE_M_SWIFT, "W129") \
+	X(SE_M_REFLECT, "W115") \
+	X(SE_M_BARRIER, "W112") \
+	X(SE_M_DETECT, "W197") \
+	X(SE_M_LOCK_ON, "W199") \
+	X(SE_M_MOONLIGHT, "W236") \
+	X(SE_M_CHARM, "W204") \
+	X(SE_M_CHARGE, "W268") \
+	X(SE_M_STRENGTH, "W070") \
+	X(SE_M_HYPER_BEAM, "W063") \
+	X(SE_M_WATERFALL, "W127") \
+	X(SE_M_REVERSAL, "W179") \
+	X(SE_M_ACID_ARMOR, "W151") \
+	X(SE_M_SANDSTORM, "W201") \
+	X(SE_M_TRI_ATTACK, "W161") \
+	X(SE_M_TRI_ATTACK2, "W161B") \
+	X(SE_M_ENCORE, "W227") \
+	X(SE_M_ENCORE2, "W227B") \
+	X(SE_M_BATON_PASS, "W226") \
+	X(SE_M_MILK_DRINK, "W208") \
+	X(SE_M_ATTRACT, "W213") \
+	X(SE_M_ATTRACT2, "W213B") \
+	X(SE_M_MORNING_SUN, "W234") \
+	X(SE_M_FLATTER, "W260") \
+	X(SE_M_SAND_TOMB, "W328") \
+	X(SE_M_GRASSWHISTLE, "W320") \
+	X(SE_M_SPIT_UP, "W255") \
+	X(SE_M_DIVE, "W291") \
+	X(SE_M_EARTHQUAKE, "W089") \
+	X(SE_M_TWISTER, "W239") \
+	X(SE_M_SWEET_SCENT, "W230") \
+	X(SE_M_YAWN, "W281") \
+	X(SE_M_SKY_UPPERCUT, "W327") \
+	X(SE_M_STAT_INCREASE, "W287") \
+	X(SE_M_HEAT_WAVE, "W257") \
+	X(SE_M_UPROAR, "W253") \
+	X(SE_M_HAIL, "W258") \
+	X(SE_M_COSMIC_POWER, "W322") \
+	X(SE_M_TEETER_DANCE, "W298") \
+	X(SE_M_STAT_DECREASE, "W287B") \
+	X(SE_M_HAZE, "W114") \
+	X(SE_M_HYPER_BEAM2, "W063B")
 
 // Create BGM list
 #define X(songId, name) static const u8 sBGMName_##songId[] = _(name);
diff --git a/src/debug/start_menu_debug.c b/src/debug/start_menu_debug.c
index ef83fc3f0..2f100069d 100644
--- a/src/debug/start_menu_debug.c
+++ b/src/debug/start_menu_debug.c
@@ -610,7 +610,7 @@ void DebugMenu_8076E30(u8 taskId)
                 Menu_DisplayDialogueFrame();
                 sub_813B79C();
                 Menu_PrintText(Str_839BD7D, 2, 15);
-                PlaySE(SE_PINPON);
+                PlaySE(SE_DING_DONG);
                 data[0]++;
             }
             else if (gMain.newKeys & B_BUTTON)
@@ -1836,7 +1836,7 @@ void DebugMenu_8078310(u8 taskId)
         case 1:
             if (gMain.newKeys & A_BUTTON)
             {
-                PlaySE(SE_PINPON);
+                PlaySE(SE_DING_DONG);
                 *GetVarPointer(VAR_MIRAGE_RND_H) = data[1];
                 Menu_EraseScreen();
                 DestroyTask(taskId);
@@ -2324,7 +2324,7 @@ void DebugMenu_8078AA4(u8 taskId)
     else if (gMain.newKeys & A_BUTTON)
     {
         gSaveBlock2.battleTower.curStreakChallengesNum[data[0]] = data[1];
-        PlaySE(SE_PINPON);
+        PlaySE(SE_DING_DONG);
         gTasks[taskId].func = DebugMenu_8078B38;
     }
     else if (gMain.newKeys & B_BUTTON)
@@ -2424,7 +2424,7 @@ void DebugMenu_8078BD4(u8 taskId)
         case 1:
             if (gMain.newKeys & A_BUTTON)
             {
-                PlaySE(SE_PINPON);
+                PlaySE(SE_DING_DONG);
                 Menu_EraseScreen();
                 DestroyTask(taskId);
                 ScriptContext2_Disable();
@@ -2631,7 +2631,7 @@ void DebugMenu_8078F68(u8 taskId)
         gSaveBlock2.playTimeHours = data[1];
         gSaveBlock2.playTimeMinutes = data[2];
         gSaveBlock2.playTimeSeconds = data[3];
-        PlaySE(SE_PINPON);
+        PlaySE(SE_DING_DONG);
         gTasks[taskId].func = DebugMenu_8079020;
     }
     else if (gMain.newKeys & B_BUTTON)
diff --git a/src/decoration.c b/src/decoration.c
index 1c6c4e18d..f999f4edd 100644
--- a/src/decoration.c
+++ b/src/decoration.c
@@ -2542,7 +2542,7 @@ void sub_8100038(u8 taskId)
         DisplayItemMessageOnField(taskId, gSecretBaseText_PlaceItHere, sub_81000A0, 0);
     } else
     {
-        PlaySE(SE_HAZURE);
+        PlaySE(SE_FAILURE);
         DisplayItemMessageOnField(taskId, gSecretBaseText_CantBePlacedHere, sub_81006A8, 0);
     }
 }
diff --git a/src/egg_hatch.c b/src/egg_hatch.c
index 0c115ddfe..5071d1a75 100644
--- a/src/egg_hatch.c
+++ b/src/egg_hatch.c
@@ -595,7 +595,7 @@ static void SpriteCB_Egg_0(struct Sprite* sprite)
         sprite->pos2.x = Sin(sprite->data[1], 1);
         if (sprite->data[0] == 15)
         {
-            PlaySE(SE_BOWA);
+            PlaySE(SE_BALL);
             StartSpriteAnim(sprite, 1);
             CreateRandomEggShardSprite();
         }
@@ -618,7 +618,7 @@ static void SpriteCB_Egg_1(struct Sprite* sprite)
             sprite->pos2.x = Sin(sprite->data[1], 2);
             if (sprite->data[0] == 15)
             {
-                PlaySE(SE_BOWA);
+                PlaySE(SE_BALL);
                 StartSpriteAnim(sprite, 2);
             }
         }
@@ -645,13 +645,13 @@ static void SpriteCB_Egg_2(struct Sprite* sprite)
             sprite->pos2.x = Sin(sprite->data[1], 2);
             if (sprite->data[0] == 15)
             {
-                PlaySE(SE_BOWA);
+                PlaySE(SE_BALL);
                 StartSpriteAnim(sprite, 2);
                 CreateRandomEggShardSprite();
                 CreateRandomEggShardSprite();
             }
             if (sprite->data[0] == 30)
-                PlaySE(SE_BOWA);
+                PlaySE(SE_BALL);
         }
     }
 }
@@ -678,7 +678,7 @@ static void SpriteCB_Egg_4(struct Sprite* sprite)
     sprite->data[0]++;
     if (!gPaletteFade.active)
     {
-        PlaySE(SE_TAMAGO);
+        PlaySE(SE_EGG_HATCH);
         sprite->invisible = 1;
         sprite->callback = SpriteCB_Egg_5;
         sprite->data[0] = 0;
diff --git a/src/evolution_graphics.c b/src/evolution_graphics.c
index f585b2bee..3f197f74c 100644
--- a/src/evolution_graphics.c
+++ b/src/evolution_graphics.c
@@ -273,7 +273,7 @@ static void EvoTask_BeginPreSet1_FadeAndPlaySE(u8 taskID)
     gTasks[taskID].tFrameCounter = 0;
     BeginNormalPaletteFade(3 << gTasks[taskID].data[1], 10, 0, 16, RGB(31, 31, 31));
     gTasks[taskID].func = EvoTask_CreatePreEvoSparkleSet1;
-    PlaySE(SE_W025);
+    PlaySE(SE_M_MEGA_KICK);
 }
 
 static void EvoTask_CreatePreEvoSparkleSet1(u8 taskID)
@@ -313,7 +313,7 @@ static void EvoTask_BeginPreSparklesSet2(u8 taskID)
     SetEvoSparklesMatrices();
     gTasks[taskID].tFrameCounter = 0;
     gTasks[taskID].func = EvoTask_CreatePreEvoSparklesSet2;
-    PlaySE(SE_W062B);
+    PlaySE(SE_M_BUBBLE_BEAM2);
 }
 
 static void EvoTask_CreatePreEvoSparklesSet2(u8 taskID)
@@ -347,7 +347,7 @@ static void EvoTask_BeginPostSparklesSet1(u8 taskID)
     SetEvoSparklesMatrices();
     gTasks[taskID].tFrameCounter = 0;
     gTasks[taskID].func = EvoTask_CreatePostEvoSparklesSet1;
-    PlaySE(SE_REAPOKE);
+    PlaySE(SE_SHINY);
 }
 
 static void EvoTask_CreatePostEvoSparklesSet1(u8 taskID)
@@ -391,7 +391,7 @@ static void EvoTask_BeginPostSparklesSet2_AndFlash(u8 taskID)
     CpuSet(&gPlttBufferFaded[0x20], &gPlttBufferUnfaded[0x20], 0x30);
     BeginNormalPaletteFade(0xFFF9001C, 0, 0, 16, RGB(31, 31, 31));
     gTasks[taskID].func = EvoTask_CreatePostEvoSparklesSet2_AndFlash;
-    PlaySE(SE_W080);
+    PlaySE(SE_M_PETAL_DANCE);
 }
 
 static void EvoTask_CreatePostEvoSparklesSet2_AndFlash(u8 taskID)
@@ -439,7 +439,7 @@ static void EvoTask_BeginPostSparklesSet2_AndFlash_Trade(u8 taskID)
     CpuSet(&gPlttBufferFaded[0x20], &gPlttBufferUnfaded[0x20], 0x30);
     BeginNormalPaletteFade(0xFFF90001, 0, 0, 16, RGB(31, 31, 31));
     gTasks[taskID].func = EvoTask_CreatePostEvoSparklesSet2_AndFlash_Trade;
-    PlaySE(SE_W080);
+    PlaySE(SE_M_PETAL_DANCE);
 }
 
 static void EvoTask_CreatePostEvoSparklesSet2_AndFlash_Trade(u8 taskID)
diff --git a/src/evolution_scene.c b/src/evolution_scene.c
index ba136d1cc..60568ee87 100644
--- a/src/evolution_scene.c
+++ b/src/evolution_scene.c
@@ -563,14 +563,14 @@ static void Task_EvolutionScene(u8 taskID)
     case 3: // wait for cry, play tu du SE
         if (IsCryFinished())
         {
-            PlaySE(MUS_ME_SHINKA);
+            PlaySE(MUS_EVOLUTION_INTRO);
             gTasks[taskID].tState++;
         }
         break;
     case 4: // play evolution music and fade screen black
         if (!IsSEPlaying())
         {
-            PlayNewMapMusic(MUS_SHINKA);
+            PlayNewMapMusic(MUS_EVOLUTION);
             gTasks[taskID].tState++;
             BeginNormalPaletteFade(0x1C, 4, 0, 16, RGB(0, 0, 0));
         }
@@ -638,7 +638,7 @@ static void Task_EvolutionScene(u8 taskID)
         {
             StringExpandPlaceholders(gStringVar4, BattleText_FinishEvo);
             Text_InitWindow8002EB0(&gUnknown_03004210, gStringVar4, 144, 2, 15);
-            PlayBGM(MUS_FANFA5);
+            PlayBGM(MUS_EVOLVED);
             gTasks[taskID].tState++;
             SetMonData(mon, MON_DATA_SPECIES, (void*)(&gTasks[taskID].tPostEvoSpecies));
             CalculateMonStats(mon);
@@ -715,7 +715,7 @@ static void Task_EvolutionScene(u8 taskID)
         if (gUnknown_03004210.state == 0 && !IsSEPlaying())
         {
             sub_8024CEC();
-            PlayFanfare(MUS_FANFA1);
+            PlayFanfare(MUS_LEVEL_UP);
             BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[3]);
             Text_InitWindow8002EB0(&gUnknown_03004210, gDisplayedStringBattle, 144, 2, 15);
             gTasks[taskID].tLearnsFirstMove = 0x40; // re-used as a counter
@@ -904,15 +904,15 @@ static void Task_TradeEvolutionScene(u8 taskID)
     case 2:
         if (IsCryFinished())
         {
-            m4aSongNumStop(MUS_SHINKA);
-            PlaySE(MUS_ME_SHINKA);
+            m4aSongNumStop(MUS_EVOLUTION);
+            PlaySE(MUS_EVOLUTION_INTRO);
             gTasks[taskID].tState++;
         }
         break;
     case 3:
         if (!IsSEPlaying())
         {
-            PlayBGM(MUS_SHINKA);
+            PlayBGM(MUS_EVOLUTION);
             gTasks[taskID].tState++;
             BeginNormalPaletteFade(0x1C, 4, 0, 16, RGB(0, 0, 0));
         }
@@ -980,7 +980,7 @@ static void Task_TradeEvolutionScene(u8 taskID)
         {
             StringExpandPlaceholders(gStringVar4, BattleText_FinishEvo);
             Text_InitWindow8002EB0(&gUnknown_03004828->window, gStringVar4, gUnknown_03004828->textWindowBaseTileNum, 2, 15);
-            PlayFanfare(MUS_FANFA5);
+            PlayFanfare(MUS_EVOLVED);
             gTasks[taskID].tState++;
             SetMonData(mon, MON_DATA_SPECIES, (void*)(&gTasks[taskID].tPostEvoSpecies));
             CalculateMonStats(mon);
@@ -1012,7 +1012,7 @@ static void Task_TradeEvolutionScene(u8 taskID)
             }
             else
             {
-                PlayBGM(MUS_SHINKA);
+                PlayBGM(MUS_EVOLUTION);
                 Text_InitWindow8002EB0(&gUnknown_03004828->window, gOtherText_LinkStandby2, gUnknown_03004828->textWindowBaseTileNum, 2, 15);
                 gTasks[taskID].tState++;
             }
@@ -1029,7 +1029,7 @@ static void Task_TradeEvolutionScene(u8 taskID)
         if (gUnknown_03004828->window.state == 0 && !IsSEPlaying())
         {
             sub_8024CEC();
-            PlayFanfare(MUS_FANFA1);
+            PlayFanfare(MUS_LEVEL_UP);
             BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[3]);
             Text_InitWindow8002EB0(&gUnknown_03004828->window, gDisplayedStringBattle, gUnknown_03004828->textWindowBaseTileNum, 2, 15);
             gTasks[taskID].tLearnsFirstMove = 0x40; // re-used as a counter
diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c
index 619c5ce9f..d33292e87 100644
--- a/src/field_control_avatar.c
+++ b/src/field_control_avatar.c
@@ -895,7 +895,7 @@ bool8 dive_warp(struct MapPosition *position, u16 metatileBehavior)
         {
             StoreInitialPlayerAvatarState();
             sp13E_warp_to_last_warp();
-            PlaySE(SE_W291);
+            PlaySE(SE_M_DIVE);
             return TRUE;
         }
     }
@@ -905,7 +905,7 @@ bool8 dive_warp(struct MapPosition *position, u16 metatileBehavior)
         {
             StoreInitialPlayerAvatarState();
             sp13E_warp_to_last_warp();
-            PlaySE(SE_W291);
+            PlaySE(SE_M_DIVE);
             return TRUE;
         }
     }
diff --git a/src/field_door.c b/src/field_door.c
index db840e663..e7d68f546 100644
--- a/src/field_door.c
+++ b/src/field_door.c
@@ -599,5 +599,5 @@ u32 GetDoorSoundEffect(u32 x, u32 y)
     if (cur_mapdata_get_door_x2_at(gDoorAnimGraphicsTable, x, y) == 0)
         return SE_DOOR;
     else
-        return SE_JIDO_DOA;
+        return SE_SLIDING_DOOR;
 }
diff --git a/src/field_effect.c b/src/field_effect.c
index 7daa00bf1..9f53606c4 100644
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -772,7 +772,7 @@ void PokeballGlowEffect_0(struct Sprite *sprite)
         gSprites[endSpriteId].data[0] = sprite->data[7];
         sprite->data[2]++;
         sprite->data[6]--;
-        PlaySE(SE_BOWA);
+        PlaySE(SE_BALL);
     }
     if (sprite->data[6] == 0)
     {
@@ -791,7 +791,7 @@ void PokeballGlowEffect_1(struct Sprite *sprite)
         sprite->data[3] = 0;
         if (sprite->data[5])
         {
-            PlayFanfare(MUS_ME_ASA);
+            PlayFanfare(MUS_HEAL);
         }
     }
 }
@@ -1081,7 +1081,7 @@ bool8 sub_8086870(struct Task *task) // gUnknown_0839F2CC[2]
     task->data[1] = 1;
     task->data[2] = 0;
     gObjectEvents[gPlayerAvatar.objectEventId].invisible = 0;
-    PlaySE(SE_RU_HYUU);
+    PlaySE(SE_FALL);
     task->data[0]++;
     return FALSE;
 }
@@ -1111,7 +1111,7 @@ bool8 sub_80868E4(struct Task *task)
     }
     if (sprite->pos2.y >= 0)
     {
-        PlaySE(SE_W070);
+        PlaySE(SE_M_STRENGTH);
         objectEvent->triggerGroundEffectsOnStop = 1;
         objectEvent->landingJump = 1;
         sprite->pos2.y = 0;
@@ -1210,7 +1210,7 @@ bool8 sub_8086AC0(struct Task *task)
         {
             task->data[0] = 4;
         }
-        PlaySE(SE_ESUKA);
+        PlaySE(SE_ESCALATOR);
     }
     return FALSE;
 }
@@ -1588,7 +1588,7 @@ bool8 sub_8087298(struct Task *task, struct ObjectEvent *objectEvent, struct Spr
     gFieldEffectArguments[2] = sprite->subpriority - 1;
     gFieldEffectArguments[3] = sprite->oam.priority;
     FieldEffectStart(FLDEFF_LAVARIDGE_GYM_WARP);
-    PlaySE(SE_W153);
+    PlaySE(SE_M_EXPLOSION);
     task->data[0]++;
     return TRUE;
 }
@@ -1704,7 +1704,7 @@ bool8 sub_8087548(struct Task *task, struct ObjectEvent *objectEvent, struct Spr
         task->data[0]++;
         objectEvent->invisible = 0;
         CameraObjectReset1();
-        PlaySE(SE_W091);
+        PlaySE(SE_M_DIG);
         ObjectEventSetHeldMovement(objectEvent, GetJumpMovementAction(DIR_EAST));
     }
     return FALSE;
@@ -1781,7 +1781,7 @@ bool8 sub_80876F8(struct Task *task, struct ObjectEvent *objectEvent, struct Spr
         {
             task->data[1]++;
             ObjectEventSetHeldMovement(objectEvent, GetWalkInPlaceFastestMovementAction(objectEvent->facingDirection));
-            PlaySE(SE_FU_ZUZUZU);
+            PlaySE(SE_LAVARIDGE_FALL_WARP);
         }
     }
     return FALSE;
@@ -2009,7 +2009,7 @@ static void TeleportFieldEffectTask2(struct Task *task)
         task->data[1] = 4;
         task->data[2] = 8;
         task->data[3] = 1;
-        PlaySE(SE_TK_WARPIN);
+        PlaySE(SE_WARP_IN);
     }
 }
 
@@ -2093,7 +2093,7 @@ void sub_8087E4C(struct Task *task)
         task->data[2] = 1;
         task->data[14] = sprite->subspriteMode;
         task->data[15] = GetPlayerFacingDirection();
-        PlaySE(SE_TK_WARPIN);
+        PlaySE(SE_WARP_IN);
     }
 }
 
@@ -2581,7 +2581,7 @@ u8 FldEff_UseSurf(void)
     taskId = CreateTask(sub_8088954, 0xff);
     gTasks[taskId].data[15] = gFieldEffectArguments[0];
     Overworld_ClearSavedMusic();
-    Overworld_ChangeMusicTo(MUS_NAMINORI);
+    Overworld_ChangeMusicTo(MUS_SURF);
     return FALSE;
 }
 
@@ -2679,7 +2679,7 @@ u8 FldEff_NPCFlyOut(void)
     sprite->oam.priority = 1;
     sprite->callback = sub_8088BC4;
     sprite->data[1] = gFieldEffectArguments[0];
-    PlaySE(SE_W019);
+    PlaySE(SE_M_FLY);
     return spriteId;
 }
 
@@ -2799,7 +2799,7 @@ void sub_8088DD8(struct Task *task)
     if ((task->data[2] == 0 || (--task->data[2]) == 0) && ObjectEventClearHeldMovementIfFinished(objectEvent))
     {
         task->data[0]++;
-        PlaySE(SE_W019);
+        PlaySE(SE_M_FLY);
         sub_8088FC0(task->data[1]);
     }
 }
diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c
index c757a4798..9ba7787e0 100644
--- a/src/field_effect_helpers.c
+++ b/src/field_effect_helpers.c
@@ -614,7 +614,7 @@ u32 FldEff_Splash(void)
         sprite->data[1] = gFieldEffectArguments[1];
         sprite->data[2] = gFieldEffectArguments[2];
         sprite->pos2.y = (graphicsInfo->height >> 1) - 4;
-        PlaySE(SE_MIZU);
+        PlaySE(SE_PUDDLE);
     }
     return 0;
 }
@@ -724,7 +724,7 @@ static void UpdateFeetInFlowingWaterFieldEffect(struct Sprite *sprite)
             sprite->data[4] = objectEvent->currentCoords.y;
             if (!sprite->invisible)
             {
-                PlaySE(SE_MIZU);
+                PlaySE(SE_PUDDLE);
             }
         }
     }
@@ -1403,4 +1403,4 @@ static void sub_812882C(struct Sprite *sprite /*r6*/, u8 z, u8 offset)
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/field_fadetransition.c b/src/field_fadetransition.c
index a4959703e..fea93f215 100644
--- a/src/field_fadetransition.c
+++ b/src/field_fadetransition.c
@@ -207,7 +207,7 @@ void sub_8080B78(void)
 {
     Overworld_PlaySpecialMapMusic();
     pal_fill_for_map_transition();
-    PlaySE(SE_TK_WARPOUT);
+    PlaySE(SE_WARP_OUT);
     CreateTask(task_map_chg_seq_0807E2CC, 10);
     ScriptContext2_Enable();
 }
@@ -379,7 +379,7 @@ void sub_8080E88(void)
     TryFadeOutOldMapMusic();
     WarpFadeScreen();
     PlayRainSoundEffect();
-    PlaySE(SE_KAIDAN);
+    PlaySE(SE_EXIT);
     gFieldCallback = mapldr_default;
     CreateTask(task0A_fade_n_map_maybe, 10);
 }
@@ -430,7 +430,7 @@ void sub_8080F68(void)
     ScriptContext2_Enable();
     TryFadeOutOldMapMusic();
     WarpFadeScreen();
-    PlaySE(SE_TK_WARPIN);
+    PlaySE(SE_WARP_IN);
     CreateTask(task0A_fade_n_map_maybe, 10);
     gFieldCallback = sub_8080B78;
 }
@@ -470,7 +470,7 @@ void DoCableClubWarp(void)
     ScriptContext2_Enable();
     TryFadeOutOldMapMusic();
     WarpFadeScreen();
-    PlaySE(SE_KAIDAN);
+    PlaySE(SE_EXIT);
     CreateTask(WaitCableClubWarp, 10);
 }
 
@@ -484,7 +484,7 @@ void sub_8081050(u8 taskId)
         ClearLinkCallback_2();
         FadeScreen(FADE_TO_BLACK, 0);
         TryFadeOutOldMapMusic();
-        PlaySE(SE_KAIDAN);
+        PlaySE(SE_EXIT);
         data[0]++;
         break;
     case 1:
@@ -637,7 +637,7 @@ void sub_8081334(void)
     TryFadeOutOldMapMusic();
     WarpFadeScreen();
     PlayRainSoundEffect();
-    PlaySE(SE_KAIDAN);
+    PlaySE(SE_EXIT);
     gFieldCallback = sub_8080B60;
     CreateTask(sub_80812C8, 10);
 }
diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c
index cb0bf760f..c0c4aad5d 100644
--- a/src/field_player_avatar.c
+++ b/src/field_player_avatar.c
@@ -878,7 +878,7 @@ void PlayerTurnInPlace(u8 direction)
 
 void PlayerJumpLedge(u8 direction)
 {
-    PlaySE(SE_DANSA);
+    PlaySE(SE_LEDGE);
     PlayerSetAnimId(GetJump2MovementAction(direction), 8);
 }
 
@@ -912,28 +912,28 @@ void PlayerEndWheelie(u8 direction)
 // wheelie hopping standing
 void PlayerStandingHoppingWheelie(u8 a)
 {
-    PlaySE(SE_JITE_PYOKO);
+    PlaySE(SE_BIKE_HOP);
     PlayerSetAnimId(GetAcroWheelieHopFaceDirectionMovementAction(a), 1);
 }
 
 // wheelie hopping moving
 void PlayerMovingHoppingWheelie(u8 a)
 {
-    PlaySE(SE_JITE_PYOKO);
+    PlaySE(SE_BIKE_HOP);
     PlayerSetAnimId(GetAcroWheelieHopDirectionMovementAction(a), 2);
 }
 
 // wheelie hopping ledge
 void PlayerLedgeHoppingWheelie(u8 a)
 {
-    PlaySE(SE_JITE_PYOKO);
+    PlaySE(SE_BIKE_HOP);
     PlayerSetAnimId(GetAcroWheelieJumpDirectionMovementAction(a), 8);
 }
 
 // acro turn jump
 void PlayerAcroTurnJump(u8 direction)
 {
-    PlaySE(SE_JITE_PYOKO);
+    PlaySE(SE_BIKE_HOP);
     PlayerSetAnimId(GetJumpInPlaceTurnAroundMovementAction(direction), 1);
 }
 
@@ -1302,7 +1302,7 @@ static bool8 do_boulder_dust(struct Task *task, struct ObjectEvent *playerObject
         gFieldEffectArguments[2] = strengthObject->previousElevation;
         gFieldEffectArguments[3] = gSprites[strengthObject->spriteId].oam.priority;
         FieldEffectStart(FLDEFF_DUST);
-        PlaySE(SE_W070);
+        PlaySE(SE_M_STRENGTH);
         task->data[0]++;
     }
     return FALSE;
@@ -1341,7 +1341,7 @@ static u8 PlayerAvatar_DoSecretBaseMatJump(struct Task *task, struct ObjectEvent
     gPlayerAvatar.preventStep = TRUE;
     if (ObjectEventClearHeldMovementIfFinished(objectEvent))
     {
-        PlaySE(SE_DANSA);
+        PlaySE(SE_LEDGE);
         ObjectEventSetHeldMovement(objectEvent, GetJumpInPlaceMovementAction(objectEvent->facingDirection));
         task->data[1]++;
         if (task->data[1] > 1)
@@ -1375,7 +1375,7 @@ static bool8 PlayerAvatar_SecretBaseMatSpinStep0(struct Task *task, struct Objec
     task->data[1] = objectEvent->movementDirection;
     gPlayerAvatar.preventStep = TRUE;
     ScriptContext2_Enable();
-    PlaySE(SE_TK_WARPIN);
+    PlaySE(SE_WARP_IN);
     return TRUE;
 }
 
diff --git a/src/field_special_scene.c b/src/field_special_scene.c
index 343830f25..0fb0ca097 100644
--- a/src/field_special_scene.c
+++ b/src/field_special_scene.c
@@ -196,7 +196,7 @@ void Task_HandleTruckSequence(u8 taskId)
             data[1] = 0; // reset the timer.
             data[2] = CreateTask(Task_Truck1, 0xA);
             data[0] = 1; // run the next case.
-            PlaySE(SE_TRACK_MOVE);
+            PlaySE(SE_TRUCK_MOVE);
         }
         break;
     case 1:
@@ -216,7 +216,7 @@ void Task_HandleTruckSequence(u8 taskId)
             DestroyTask(data[2]);
             data[3] = CreateTask(Task_Truck2, 0xA);
             data[0] = 3;
-            PlaySE(SE_TRACK_STOP);
+            PlaySE(SE_TRUCK_STOP);
         }
         break;
     case 3:
@@ -231,7 +231,7 @@ void Task_HandleTruckSequence(u8 taskId)
         data[1]++;
         if (data[1] == 90)
         {
-            PlaySE(SE_TRACK_HAIK);
+            PlaySE(SE_TRUCK_UNLOAD);
             data[1] = 0;
             data[0] = 5;
         }
@@ -244,7 +244,7 @@ void Task_HandleTruckSequence(u8 taskId)
             MapGridSetMetatileIdAt(11, 9, METATILE_ID(InsideOfTruck, ExitLight_Mid));
             MapGridSetMetatileIdAt(11, 10, METATILE_ID(InsideOfTruck, ExitLight_Bottom));
             DrawWholeMapView();
-            PlaySE(SE_TRACK_DOOR);
+            PlaySE(SE_TRUCK_DOOR);
             DestroyTask(taskId);
             ScriptContext2_Disable();
         }
diff --git a/src/field_specials.c b/src/field_specials.c
index 38a0bd50b..4a2ddb180 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -218,7 +218,7 @@ void UpdateCyclingRoadState(void) {
     if (VarGet(VAR_CYCLING_CHALLENGE_STATE) == 2 || VarGet(VAR_CYCLING_CHALLENGE_STATE) == 3)
     {
         VarSet(VAR_CYCLING_CHALLENGE_STATE, 0);
-        Overworld_SetSavedMusic(SE_STOP);
+        Overworld_SetSavedMusic(MUS_DUMMY);
     }
 }
 
@@ -571,7 +571,7 @@ void PetalburgGymSlideOpenDoors(void)
 {
     gUnknown_02039258 = 0;
     gPetalburgGymSlidingDoorIndex = 0;
-    PlaySE(SE_KI_GASYAN);
+    PlaySE(SE_UNLOCK);
     CreateTask(Task_SlideOpenPetalburgGymDoors, 8);
 }
 
@@ -1228,7 +1228,7 @@ void ShakeScreenInElevator(void)
     gTasks[taskId].data[5] = 3;
     SetCameraPanningCallback(NULL);
     sub_810ECFC();
-    PlaySE(SE_ELEBETA);
+    PlaySE(SE_ELEVATOR);
 }
 
 void sub_810EC34(u8 taskId)
@@ -1245,7 +1245,7 @@ void sub_810EC34(u8 taskId)
             SetCameraPanning(0, task->data[4]);
             if (task->data[2] == 23)
             {
-                PlaySE(SE_PINPON);
+                PlaySE(SE_DING_DONG);
                 sub_810EC9C(taskId);
                 InstallCameraPanAheadCallback();
             }
@@ -1801,7 +1801,7 @@ void ShakeCamera(void)
     gTasks[taskId].data[4] = gSpecialVar_0x8004;
     gTasks[taskId].data[5] = 5;
     SetCameraPanningCallback(NULL);
-    PlaySE(SE_W070);
+    PlaySE(SE_M_STRENGTH);
 }
 
 static void sub_810F7A8(u8 taskId)
diff --git a/src/field_tasks.c b/src/field_tasks.c
index abc4e1505..5709cb998 100644
--- a/src/field_tasks.c
+++ b/src/field_tasks.c
@@ -336,7 +336,7 @@ void PerStepCallback_8069864(u8 taskId)
                 data[3] = y;
                 if (MetatileBehavior_IsPacifidlogLog(MapGridGetMetatileBehaviorAt(x, y)))
                 {
-                    PlaySE(SE_MIZU);
+                    PlaySE(SE_PUDDLE);
                 }
             }
             break;
@@ -427,7 +427,7 @@ void PerStepCallback_8069AA0(u8 taskId)
             }
             if (flag && (isFortreeBridgeCur == 1 || isFortreeBridgePrev == 1))
             {
-                PlaySE(SE_HASHI);
+                PlaySE(SE_BRIDGE_WALK);
             }
             if (isFortreeBridgePrev)
             {
@@ -603,7 +603,7 @@ void PerStepCallback_8069DD4(u8 taskId)
             {
                 x = data[4];
                 y = data[5];
-                PlaySE(SE_RU_BARI);
+                PlaySE(SE_ICE_CRACK);
                 MapGridSetMetatileIdAt(x, y, METATILE_ID(SootopolisGym, Ice_Cracked));
                 CurrentMapDrawMetatileAt(x, y);
                 sub_8069CFC(x - 7, y - 7);
@@ -619,7 +619,7 @@ void PerStepCallback_8069DD4(u8 taskId)
             {
                 x = data[4];
                 y = data[5];
-                PlaySE(SE_RU_GASYAN);
+                PlaySE(SE_ICE_BREAK);
                 MapGridSetMetatileIdAt(x, y, METATILE_ID(SootopolisGym, Ice_Broken));
                 CurrentMapDrawMetatileAt(x, y);
                 data[1] = 1;
diff --git a/src/field_weather.c b/src/field_weather.c
index eb802ae84..c05fa3d3b 100644
--- a/src/field_weather.c
+++ b/src/field_weather.c
@@ -1194,13 +1194,13 @@ void SetRainStrengthFromSoundEffect(u16 soundEffect)
     {
         switch (soundEffect)
         {
-        case SE_T_KOAME:
+        case SE_RAIN:
             gWeatherPtr->rainStrength = 0;
             break;
-        case SE_T_OOAME:
+        case SE_DOWNPOUR:
             gWeatherPtr->rainStrength = 1;
             break;
-        case SE_T_AME:
+        case SE_THUNDERSTORM:
             gWeatherPtr->rainStrength = 2;
             break;
         default:
@@ -1218,14 +1218,14 @@ void PlayRainSoundEffect(void)
         switch (gWeatherPtr->rainStrength)
         {
         case 0:
-            PlaySE(SE_T_KOAME_E);
+            PlaySE(SE_RAIN_STOP);
             break;
         case 1:
-            PlaySE(SE_T_OOAME_E);
+            PlaySE(SE_DOWNPOUR_STOP);
             break;
         case 2:
         default:
-            PlaySE(SE_T_AME_E);
+            PlaySE(SE_THUNDERSTORM_STOP);
             break;
         }
     }
diff --git a/src/field_weather_effects.c b/src/field_weather_effects.c
index db67be4de..56b802b83 100644
--- a/src/field_weather_effects.c
+++ b/src/field_weather_effects.c
@@ -367,7 +367,7 @@ void LightRain_InitVars(void)
     gWeatherPtr->unknown_6D9 = 10;
     gWeatherPtr->gammaTargetIndex = 3;
     gWeatherPtr->gammaStepDelay = 20;
-    SetRainStrengthFromSoundEffect(SE_T_KOAME);
+    SetRainStrengthFromSoundEffect(SE_RAIN);
 }
 
 void LightRain_Main(void);
@@ -1075,7 +1075,7 @@ void MedRain_InitVars(void)
     gWeatherPtr->gammaStepDelay = 20;
     gWeatherPtr->weatherGfxLoaded = FALSE;  // duplicate assignment
     gWeatherPtr->unknown_6ED = 0;
-    SetRainStrengthFromSoundEffect(SE_T_AME);
+    SetRainStrengthFromSoundEffect(SE_THUNDERSTORM);
 }
 
 void Rain_Main(void);
@@ -1102,7 +1102,7 @@ void HeavyRain_InitVars(void)
     gWeatherPtr->gammaTargetIndex = 3;
     gWeatherPtr->gammaStepDelay = 20;
     gWeatherPtr->weatherGfxLoaded = FALSE;  // duplicate assignment
-    SetRainStrengthFromSoundEffect(SE_T_OOAME);
+    SetRainStrengthFromSoundEffect(SE_DOWNPOUR);
 }
 
 void HeavyRain_InitAll(void)
@@ -1269,9 +1269,9 @@ void UpdateThunderSound(void)
             if (IsSEPlaying())
                 return;
             if (Random() & 1)
-                PlaySE(SE_T_KAMI);
+                PlaySE(SE_THUNDER);
             else
-                PlaySE(SE_T_KAMI2);
+                PlaySE(SE_THUNDER2);
             gWeatherPtr->unknown_6ED = 0;
         }
         else
diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c
index 567e75f2a..7b16a5a9c 100644
--- a/src/fldeff_cut.c
+++ b/src/fldeff_cut.c
@@ -211,7 +211,7 @@ bool8 FldEff_CutGrass(void)
     u8 tileBehavior;
     u8 i = 0, j;
 
-    PlaySE(SE_W015);
+    PlaySE(SE_M_CUT);
     PlayerGetDestCoords(&gPlayerFacingPosition.x, &gPlayerFacingPosition.y);
     for (i = 0; i < 3; i++)
     {
@@ -383,7 +383,7 @@ static void CutGrassSpriteCallbackEnd(struct Sprite *sprite)
 
 static void StartCutTreeFieldEffect(void)
 {
-    PlaySE(SE_W015);
+    PlaySE(SE_M_CUT);
     FieldEffectActiveListRemove(FLDEFF_USE_CUT_ON_TREE);
     EnableBothScriptContexts();
 }
diff --git a/src/fldeff_decoration.c b/src/fldeff_decoration.c
index 62e02df12..d9466dd7d 100644
--- a/src/fldeff_decoration.c
+++ b/src/fldeff_decoration.c
@@ -116,16 +116,16 @@ static void DoBalloonSoundEffect(s16 metatileId)
     switch (metatileId)
     {
     case 824:
-        PlaySE(SE_FUUSEN1);
+        PlaySE(SE_BALLOON_RED);
         break;
     case 828:
-        PlaySE(SE_FUUSEN2);
+        PlaySE(SE_BALLOON_BLUE);
         break;
     case 832:
-        PlaySE(SE_FUUSEN3);
+        PlaySE(SE_BALLOON_YELLOW);
         break;
     case 552:
-        PlaySE(SE_TOY_DANGO);
+        PlaySE(SE_MUD_BALL);
         break;
     }
 }
@@ -142,7 +142,7 @@ bool8 FldEff_Nop48(void)
 
 static void sub_80C69C4(s16 x, s16 y)
 {
-    PlaySE(SE_TOY_KABE);
+    PlaySE(SE_BREAKABLE_DOOR);
     MapGridSetMetatileIdAt(x, y, 630);
     MapGridSetMetatileIdAt(x, y - 1, 622);
     CurrentMapDrawMetatileAt(x, y);
@@ -185,28 +185,28 @@ static void Task_SecretBaseMusicNoteMatSound(u8 taskId)
         switch (gTasks[taskId].data[0]) // metatileId
         {
         case 632:
-            PlaySE(SE_TOY_C);
+            PlaySE(SE_NOTE_C);
             break;
         case 633:
-            PlaySE(SE_TOY_D);
+            PlaySE(SE_NOTE_D);
             break;
         case 634:
-            PlaySE(SE_TOY_E);
+            PlaySE(SE_NOTE_E);
             break;
         case 635:
-            PlaySE(SE_TOY_F);
+            PlaySE(SE_NOTE_F);
             break;
         case 636:
-            PlaySE(SE_TOY_G);
+            PlaySE(SE_NOTE_G);
             break;
         case 637:
-            PlaySE(SE_TOY_A);
+            PlaySE(SE_NOTE_A);
             break;
         case 638:
-            PlaySE(SE_TOY_B);
+            PlaySE(SE_NOTE_B);
             break;
         case 691:
-            PlaySE(SE_TOY_C1);
+            PlaySE(SE_NOTE_C_HIGH);
             break;
         }
 
@@ -229,7 +229,7 @@ void SpriteCB_GlitterMatSparkle(struct Sprite *sprite)
 {
     sprite->data[0]++;
     if (sprite->data[0] == 8)
-        PlaySE(SE_W215);
+        PlaySE(SE_M_HEAL_BELL);
     if (sprite->data[0] >= 32)
         DestroySprite(sprite);
 }
@@ -298,7 +298,7 @@ bool8 FldEff_SandPillar(void)
 
 void SpriteCB_SandPillar_0(struct Sprite *sprite)
 {
-    PlaySE(SE_W088);
+    PlaySE(SE_M_ROCK_THROW);
     if (MapGridGetMetatileIdAt(gFieldEffectArguments[5], gFieldEffectArguments[6] - 1) == 646)
         MapGridSetMetatileIdAt(gFieldEffectArguments[5], gFieldEffectArguments[6] - 1, 3586);
     else
diff --git a/src/fldeff_flash.c b/src/fldeff_flash.c
index a49802af1..cf739b395 100644
--- a/src/fldeff_flash.c
+++ b/src/fldeff_flash.c
@@ -106,7 +106,7 @@ static void sub_810CBFC(void)
 
 static void sub_810CC34(void)
 {
-    PlaySE(SE_W115);
+    PlaySE(SE_M_REFLECT);
     FlagSet(FLAG_SYS_USE_FLASH);
     ScriptContext1_SetupScript(gUnknown_081B694A);
 }
diff --git a/src/fldeff_poison.c b/src/fldeff_poison.c
index 52afc2516..62c182987 100644
--- a/src/fldeff_poison.c
+++ b/src/fldeff_poison.c
@@ -34,7 +34,7 @@ static void Task_FieldPoisonEffect(u8 taskId)
 
 void FldeffPoison_Start(void)
 {
-    PlaySE(SE_DOKU);
+    PlaySE(SE_FIELD_POISON);
     CreateTask(Task_FieldPoisonEffect, 80);
 }
 
diff --git a/src/fldeff_secretpower.c b/src/fldeff_secretpower.c
index 47a8bd608..bd16adbe8 100644
--- a/src/fldeff_secretpower.c
+++ b/src/fldeff_secretpower.c
@@ -360,7 +360,7 @@ bool8 FldEff_SecretPowerCave(void)
 
 static void CaveEntranceSpriteCallback1(struct Sprite *sprite)
 {
-    PlaySE(SE_W088);
+    PlaySE(SE_M_ROCK_THROW);
     sprite->data[0] = 0;
     sprite->callback = CaveEntranceSpriteCallback2;
 }
@@ -433,7 +433,7 @@ bool8 FldEff_SecretPowerTree(void)
 
 static void TreeEntranceSpriteCallback1(struct Sprite *sprite)
 {
-    PlaySE(SE_W010);
+    PlaySE(SE_M_SCRATCH);
     sprite->animNum = gFieldEffectArguments[7];
     sprite->data[0] = 0;
     sprite->callback = TreeEntranceSpriteCallback2;
@@ -494,7 +494,7 @@ bool8 FldEff_SecretPowerShrub(void)
 
 static void ShrubEntranceSpriteCallback1(struct Sprite *sprite)
 {
-    PlaySE(SE_W077);
+    PlaySE(SE_M_POISON_POWDER);
     sprite->data[0] = 0;
     sprite->callback = ShrubEntranceSpriteCallback2;
 }
diff --git a/src/fldeff_softboiled.c b/src/fldeff_softboiled.c
index 3c64ec520..1c1285ad9 100644
--- a/src/fldeff_softboiled.c
+++ b/src/fldeff_softboiled.c
@@ -100,7 +100,7 @@ static void sub_8133D50(u8 taskId) {
         return;
     }
 
-    PlaySE(SE_KAIFUKU);
+    PlaySE(SE_USE_ITEM);
 
     EWRAM_1C000.unk5 = gSprites[EWRAM_1000.unk1].data[0];
 
diff --git a/src/fldeff_sweetscent.c b/src/fldeff_sweetscent.c
index 88069f6e9..a999aa47b 100644
--- a/src/fldeff_sweetscent.c
+++ b/src/fldeff_sweetscent.c
@@ -49,7 +49,7 @@ static void StartSweetScentFieldEffect(void)
 {
     u8 taskId;
 
-    PlaySE(SE_W230);
+    PlaySE(SE_M_SWEET_SCENT);
     BeginNormalPaletteFade(~(1 << (gSprites[GetPlayerAvatarObjectId()].oam.paletteNum + 16)), 4, 0, 8, RGB(31, 0, 0));
     taskId = CreateTask(TrySweetScentEncounter, 0);
     gTasks[taskId].data[0] = 0;
diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c
index 93532d396..2dd3266a3 100644
--- a/src/hall_of_fame.c
+++ b/src/hall_of_fame.c
@@ -451,7 +451,7 @@ static bool8 sub_8141E64(void)
         if (!gPaletteFade.active)
         {
             SetMainCallback2(CB2_HallOfFame);
-            PlayBGM(MUS_DENDOU);
+            PlayBGM(MUS_HALL_OF_FAME);
             return 0;
         }
         break;
@@ -666,7 +666,7 @@ static void sub_8142570(u8 taskID)
     }
     Menu_EraseWindowRect(0, 14, 29, 19);
     sub_8143068(0, 15);
-    PlaySE(SE_DENDOU);
+    PlaySE(SE_APPLAUSE);
     gTasks[taskID].tFrameCount = 400;
     gTasks[taskID].func = sub_8142618;
 }
diff --git a/src/intro.c b/src/intro.c
index 818c4ec54..d1f3fa1ea 100644
--- a/src/intro.c
+++ b/src/intro.c
@@ -1406,7 +1406,7 @@ static void Task_IntroPokemonBattle(u8 taskId)
         gSprites[spriteId].invisible = 1;
     }
     if (gIntroFrameCounter == 800)
-        PlaySE(SE_OP_BASYU);
+        PlaySE(SE_INTRO_BLAST);
     if (gIntroFrameCounter == 850)
         BeginNormalPaletteFade(0xFFFFFFFF, 4, 0, 16, FADE_COLOR_WHITE);
     if (gIntroFrameCounter == 946)
diff --git a/src/item_menu.c b/src/item_menu.c
index ea3faf49e..54ad4518b 100644
--- a/src/item_menu.c
+++ b/src/item_menu.c
@@ -2853,7 +2853,7 @@ static void sub_80A6548(u8 taskId)
 
 static void sub_80A6574(u8 taskId)
 {
-    PlaySE(SE_REGI);
+    PlaySE(SE_SHOP);
     sub_80A6870(gSpecialVar_ItemId, gTasks[taskId].data[1]);
     gTasks[taskId].func = sub_80A6548;
 }
diff --git a/src/item_use.c b/src/item_use.c
index 348806e06..3920ae5bd 100644
--- a/src/item_use.c
+++ b/src/item_use.c
@@ -312,7 +312,7 @@ void RunItemfinderResults(u8 taskId)
             }
             return;
         }
-        PlaySE(SE_DAUGI); // play the itemfinder jingle 4 times before executing the itemfinder.
+        PlaySE(SE_ITEMFINDER); // play the itemfinder jingle 4 times before executing the itemfinder.
         data[4]++;
     }
     data[3] = (data[3] + 1) & 0x1F;
@@ -744,7 +744,7 @@ void ItemUseOutOfBattle_TMHM(u8 taskId)
 
 static void BootTMHM(u8 taskId)
 {
-    PlaySE(SE_PC_LOGON);
+    PlaySE(SE_PC_LOGIN);
     gTasks[taskId].func = WaitButtonPressAndDisplayTMHMInfo;
 }
 
@@ -803,7 +803,7 @@ static void PlayBlackWhiteFluteSound(u8 taskId)
 {
     if(++gTasks[taskId].data[15] > 7)
     {
-        PlaySE(SE_BIDORO);
+        PlaySE(SE_GLASS_FLUTE);
         DisplayItemMessageOnField(taskId, gStringVar4, CleanUpItemMenuMessage, 1);
     }
 }
@@ -896,7 +896,7 @@ void sub_80CA2BC(u8 taskId)
 {
     if(++gTasks[taskId].data[15] > 7)
     {
-        PlaySE(SE_KAIFUKU);
+        PlaySE(SE_USE_ITEM);
         RemoveBagItem(gSpecialVar_ItemId, 1);
         DisplayItemMessageOnField(taskId, sub_803F378(gSpecialVar_ItemId), sub_80CA294, 1);
     }
diff --git a/src/main_menu.c b/src/main_menu.c
index 33bffcb93..f271138d6 100644
--- a/src/main_menu.c
+++ b/src/main_menu.c
@@ -766,7 +766,7 @@ static void Task_NewGameSpeech1(u8 taskId)
     gTasks[taskId].data[3] = 0xFF;
     gTasks[taskId].tFrameCounter = 216;  //Wait 3.6 seconds (216 frames) before starting speech
 
-    PlayBGM(MUS_DOORO_X4);
+    PlayBGM(MUS_ROUTE122);
 }
 
 static void Task_NewGameSpeech2(u8 taskId)
diff --git a/src/mauville_man.c b/src/mauville_man.c
index 96de37c79..a71ce5fe8 100644
--- a/src/mauville_man.c
+++ b/src/mauville_man.c
@@ -745,7 +745,7 @@ static void Task_BardSong(u8 taskId)
     case 3:
         if (gStringVar4[task->tCharIndex] == EOS)
         {
-            FadeInNewBGM(MUS_POKECEN, 6);
+            FadeInNewBGM(MUS_POKE_CENTER, 6);
             m4aMPlayFadeOutTemporarily(&gMPlayInfo_SE2, 2);
             EnableBothScriptContexts();
             DestroyTask(taskId);
diff --git a/src/move_tutor_menu.c b/src/move_tutor_menu.c
index 666eec0da..e17a1d3ea 100644
--- a/src/move_tutor_menu.c
+++ b/src/move_tutor_menu.c
@@ -602,13 +602,13 @@ static void MoveTutorMain(void)
             PrintMainMoveTutorMenuText(gOtherText_ForgotOrDidNotLearnMove);
 #endif
             sMoveTutorMenu->state = 31;
-            PlayFanfare(MUS_FANFA1);
+            PlayFanfare(MUS_LEVEL_UP);
         }
         break;
     case 31:
         if (Menu_UpdateWindowText())
         {
-            PlayFanfare(MUS_FANFA1);
+            PlayFanfare(MUS_LEVEL_UP);
             sMoveTutorMenu->state = 32;
         }
         break;
diff --git a/src/naming_screen.c b/src/naming_screen.c
index bfd9cd54f..eb0d5fd22 100644
--- a/src/naming_screen.c
+++ b/src/naming_screen.c
@@ -1361,7 +1361,7 @@ static void DeleteTextCharacter(void)
     var2 = GetKeyRoleAtCursorPos();
     if (var2 == 0 || var2 == 2)
         sub_80B6460(1, 0, 1);
-    PlaySE(SE_BOWA);
+    PlaySE(SE_BALL);
 }
 
 static bool8 sub_80B7004(void)
diff --git a/src/overworld.c b/src/overworld.c
index 7265cf50a..a0e7939f5 100644
--- a/src/overworld.c
+++ b/src/overworld.c
@@ -51,9 +51,9 @@
 #include "constants/species.h"
 
 #ifdef SAPPHIRE
-#define LEGENDARY_MUSIC MUS_OOAME  // Heavy Rain
+#define LEGENDARY_MUSIC MUS_WEATHER_KYOGRE  // Heavy Rain
 #else
-#define LEGENDARY_MUSIC MUS_HIDERI // Drought
+#define LEGENDARY_MUSIC MUS_WEATHER_GROUDON // Drought
 #endif
 
 extern u8 gUnknown_020297ED;
@@ -845,7 +845,7 @@ static u16 GetLocationMusic(struct WarpData *warp)
     if (ShouldLegendaryMusicPlayAtLocation(warp) == TRUE)
         return LEGENDARY_MUSIC;
     else if (IsInfiltratedWeatherInstitute(warp) == TRUE)
-        return MUS_TOZAN;
+        return MUS_MT_CHIMNEY;
     else
         return Overworld_GetMapHeaderByGroupAndId(warp->mapGroup, warp->mapNum)->music;
 }
@@ -858,7 +858,7 @@ u16 GetCurrLocationDefaultMusic(void)
     if (gSaveBlock1.location.mapGroup == MAP_GROUP(ROUTE111)
      && gSaveBlock1.location.mapNum == MAP_NUM(ROUTE111)
      && GetSav1Weather() == 8)
-        return MUS_ASHROAD;
+        return MUS_ROUTE111;
 
     music = GetLocationMusic(&gSaveBlock1.location);
     if (music != 0x7FFF)
@@ -868,9 +868,9 @@ u16 GetCurrLocationDefaultMusic(void)
     else
     {
         if (gSaveBlock1.pos.x < 24)
-            return MUS_DOORO_X1;
+            return MUS_ROUTE110;
         else
-            return MUS_GRANROAD;
+            return MUS_ROUTE119;
     }
 }
 
@@ -885,9 +885,9 @@ u16 GetWarpDestinationMusic(void)
     {
         if (gSaveBlock1.location.mapGroup == MAP_GROUP(MAUVILLE_CITY)
          && gSaveBlock1.location.mapNum == MAP_NUM(MAUVILLE_CITY))
-            return MUS_DOORO_X1;
+            return MUS_ROUTE110;
         else
-            return MUS_GRANROAD;
+            return MUS_ROUTE119;
     }
 }
 
@@ -905,9 +905,9 @@ void Overworld_PlaySpecialMapMusic(void)
         if (gSaveBlock1.savedMusic)
             music = gSaveBlock1.savedMusic;
         else if (Overworld_GetMapTypeOfSaveblockLocation() == MAP_TYPE_UNDERWATER)
-            music = MUS_DEEPDEEP;
+            music = MUS_UNDERWATER;
         else if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING))
-            music = MUS_NAMINORI;
+            music = MUS_SURF;
     }
 
     if (music != GetCurrentMapMusic())
@@ -932,10 +932,10 @@ void sub_8053F0C(void)
         u16 currentMusic = GetCurrentMapMusic();
         if (newMusic != LEGENDARY_MUSIC)
         {
-            if (currentMusic == MUS_DEEPDEEP || currentMusic == MUS_NAMINORI)
+            if (currentMusic == MUS_UNDERWATER || currentMusic == MUS_SURF)
                 return;
             if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING))
-                newMusic = MUS_NAMINORI;
+                newMusic = MUS_SURF;
         }
         if (newMusic != currentMusic)
         {
diff --git a/src/party_menu.c b/src/party_menu.c
index 343541ac1..f20f2ad16 100644
--- a/src/party_menu.c
+++ b/src/party_menu.c
@@ -3903,7 +3903,7 @@ void Task_TeamMonTMMove3(u8 taskId)
 {
     if (gUnknown_0202E8F6 == 0)
     {
-        PlayFanfare(MUS_FANFA1);
+        PlayFanfare(MUS_LEVEL_UP);
         gTasks[taskId].func = Task_TeamMonTMMove4;
     }
 }
@@ -4159,7 +4159,7 @@ void sub_806FA18(u8 taskId)
     ewram1B000.unk282 = sub_806F7E8(taskId, &sp0, 1);
     if (ewram1B000.unk282 == -1)
     {
-        PlaySE(SE_KAIFUKU);
+        PlaySE(SE_USE_ITEM);
         ewram1C000.unkC = 0;
         gTasks[taskId].data[11] -= gTasks[taskId].data[12];
         SetMonData(ewram1C000.pokemon, MON_DATA_HP, &gTasks[taskId].data[11]);
@@ -4343,9 +4343,9 @@ void UseMedicine(u8 taskId, u16 item, TaskFunc func)
 
         gUnknown_0202E8F4 = 1;
         if (!IsBlueYellowRedFlute(item))
-            PlaySE(SE_KAIFUKU);
+            PlaySE(SE_USE_ITEM);
         else
-            PlaySE(SE_BIDORO);
+            PlaySE(SE_GLASS_FLUTE);
         statusAndPkrs = GetMonStatusAndPokerus(ewram1C000.pokemon);
         if (statusAndPkrs == STATUS_PRIMARY_POKERUS || statusAndPkrs == STATUS_PRIMARY_NONE)
             PartyMenuUpdateLevelOrStatus(ewram1C000.pokemon, ewram1C000.primarySelectedMonIndex);
@@ -4423,7 +4423,7 @@ void sub_8070088(u8 taskId)
         {
             gUnknown_0202E8F4 = 1;
             Menu_EraseWindowRect(WINDOW_LEFT, 14, WINDOW_RIGHT, 19);
-            PlaySE(SE_KAIFUKU);
+            PlaySE(SE_USE_ITEM);
             PartyMenuUpdateLevelOrStatus(ewram1C000.pokemon, ewram1C000.primarySelectedMonIndex);
             task_pc_turn_off(&gUnknown_083769A8[IsDoubleBattle() * 12 + ewram1C000.primarySelectedMonIndex * 2], 9);
             ewram1B000.unk261 = 2;
@@ -4575,7 +4575,7 @@ void DoRecoverPP(u8 taskId)
     else
     {
         gUnknown_0202E8F4 = 1;
-        PlaySE(SE_KAIFUKU);
+        PlaySE(SE_USE_ITEM);
         RemoveBagItem(ewram1C000.secondarySelectedIndex, 1);
         r5 = GetMonData(ewram1C000.pokemon, MON_DATA_MOVE1 + gTasks[taskId].data[11]);
         StringCopy(gStringVar1, gMoveNames[r5]);
diff --git a/src/pokeball.c b/src/pokeball.c
index 8a11440ff..58c1bbaa9 100644
--- a/src/pokeball.c
+++ b/src/pokeball.c
@@ -404,7 +404,7 @@ static void SendOutMonAnimation(u8 taskId)
     gSprites[spriteId].oam.affineParam = taskId;
     gTasks[taskId].data[4] = gBattlerTarget;
     gTasks[taskId].func = TaskDummy;
-    PlaySE(SE_NAGERU);
+    PlaySE(SE_BALL_THROW);
 }
 
 static void objc_0804ABD4(struct Sprite *sprite)
@@ -455,7 +455,7 @@ static void sub_8046760(struct Sprite *sprite)
 {
     sprite->data[5]++;
     if (sprite->data[5] == 11)
-        PlaySE(SE_SUIKOMU);
+        PlaySE(SE_BALL_TRADE);
     if (gSprites[gBattlerSpriteIds[sprite->data[6]]].affineAnimEnded)
     {
         StartSpriteAnim(sprite, 2);
@@ -505,16 +505,16 @@ static void sub_804684C(struct Sprite *sprite)
             switch (sprite->data[3] >> 8)
             {
             case 1:
-                PlaySE(SE_KON);
+                PlaySE(SE_BALL_BOUNCE_1);
                 break;
             case 2:
-                PlaySE(SE_KON2);
+                PlaySE(SE_BALL_BOUNCE_2);
                 break;
             case 3:
-                PlaySE(SE_KON3);
+                PlaySE(SE_BALL_BOUNCE_3);
                 break;
             default:
-                PlaySE(SE_KON4);
+                PlaySE(SE_BALL_BOUNCE_4);
                 break;
             }
         }
@@ -556,7 +556,7 @@ static void sub_8046944(struct Sprite *sprite)
         sprite->affineAnimPaused = TRUE;
         StartSpriteAffineAnim(sprite, 1);
         sprite->callback = sub_8046984;
-        PlaySE(SE_BOWA);
+        PlaySE(SE_BALL);
     }
 }
 
@@ -625,7 +625,7 @@ static void sub_8046984(struct Sprite *sprite)
                 StartSpriteAffineAnim(sprite, 2);
             else
                 StartSpriteAffineAnim(sprite, 1);
-            PlaySE(SE_BOWA);
+            PlaySE(SE_BALL);
         }
         break;
     }
@@ -822,7 +822,7 @@ static void sub_8046FBC(struct Sprite *sprite)
     {
         gDoingBattleAnim = 0;
         m4aMPlayAllStop();
-        PlaySE(MUS_FANFA5);
+        PlaySE(MUS_EVOLVED);
     }
     else if (sprite->data[4] == 315)
     {
@@ -1074,7 +1074,7 @@ static void sub_80476E0(struct Sprite *sprite)
 
     sprite->data[5]++;
     if (sprite->data[5] == 11)
-        PlaySE(SE_SUIKOMU);
+        PlaySE(SE_BALL_TRADE);
     r1 = sprite->data[0];
     if (gSprites[r1].affineAnimEnded)
     {
diff --git a/src/pokedex.c b/src/pokedex.c
index ea6c69478..7da931967 100644
--- a/src/pokedex.c
+++ b/src/pokedex.c
@@ -1534,7 +1534,7 @@ void Task_PokedexMainScreen(u8 taskId)
             gPokedexView->unk614 = gPokedexView->dexMode;
             gPokedexView->unk618 = gPokedexView->dexOrder;
             gTasks[taskId].func = sub_808CB8C;
-            PlaySE(SE_PC_LOGON);
+            PlaySE(SE_PC_LOGIN);
         }
         else if (gMain.newKeys & B_BUTTON)
         {
@@ -1725,7 +1725,7 @@ static void Task_PokedexResultsScreen(u8 taskId)
             gTasks[taskId].data[0] = sub_8091E3C();
             gPokedexView->unk64F = 0;
             gTasks[taskId].func = sub_808CB8C;
-            PlaySE(SE_PC_LOGON);
+            PlaySE(SE_PC_LOGIN);
         }
         else if (gMain.newKeys & B_BUTTON)
         {
@@ -1784,7 +1784,7 @@ static void Task_PokedexResultsScreenMenu(u8 taskId)
             case 3: //BACK TO POKEDEX
                 BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0));
                 gTasks[taskId].func = Task_PokedexResultsScreenReturnToMainScreen;
-                PlaySE(SE_TRACK_DOOR);
+                PlaySE(SE_TRUCK_DOOR);
                 break;
             case 4: //CLOSE POKEDEX
                 BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0));
@@ -3007,7 +3007,7 @@ static void Task_PageScreenProcessInput(u8 taskId)
     {
         BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0));
         gTasks[taskId].func = sub_808F888;
-        PlaySE(SE_Z_SCROLL);
+        PlaySE(SE_DEX_SCROLL);
         return;
     }
     if (gMain.newKeys & B_BUTTON)
@@ -3037,7 +3037,7 @@ static void Task_PageScreenProcessInput(u8 taskId)
         case SIZE_SCREEN:
             if (!gUnknown_0202FFBC->owned)
             {
-                PlaySE(SE_HAZURE);
+                PlaySE(SE_FAILURE);
             }
             else
             {
@@ -3055,7 +3055,7 @@ static void Task_PageScreenProcessInput(u8 taskId)
     {
         gPokedexView->selectedScreen--;
         sub_8090584(gPokedexView->selectedScreen, 0xD);
-        PlaySE(SE_Z_PAGE);
+        PlaySE(SE_DEX_PAGE);
         return;
     }
     if (((gMain.newKeys & DPAD_RIGHT)
@@ -3064,7 +3064,7 @@ static void Task_PageScreenProcessInput(u8 taskId)
     {
         gPokedexView->selectedScreen++;
         sub_8090584(gPokedexView->selectedScreen, 0xD);
-        PlaySE(SE_Z_PAGE);
+        PlaySE(SE_DEX_PAGE);
         return;
     }
 }
@@ -3268,7 +3268,7 @@ static void Task_CryScreenProcessInput(u8 taskId)
             m4aMPlayContinue(&gMPlayInfo_BGM);
             gPokedexView->unk64F = 2;
             gTasks[taskId].func = sub_808FFBC;
-            PlaySE(SE_Z_PAGE);
+            PlaySE(SE_DEX_PAGE);
             return;
         }
         if ((gMain.newKeys & DPAD_RIGHT)
@@ -3276,7 +3276,7 @@ static void Task_CryScreenProcessInput(u8 taskId)
         {
             if (!gUnknown_0202FFBC->owned)
             {
-                PlaySE(SE_HAZURE);
+                PlaySE(SE_FAILURE);
             }
             else
             {
@@ -3284,7 +3284,7 @@ static void Task_CryScreenProcessInput(u8 taskId)
                 m4aMPlayContinue(&gMPlayInfo_BGM);
                 gPokedexView->unk64F = 3;
                 gTasks[taskId].func = sub_808FFBC;
-                PlaySE(SE_Z_PAGE);
+                PlaySE(SE_DEX_PAGE);
             }
             return;
         }
@@ -3428,7 +3428,7 @@ static void Task_SizeScreenProcessInput(u8 taskId)
         BeginNormalPaletteFade(0xFFFFFFEB, 0, 0, 16, RGB(0, 0, 0));
         gPokedexView->unk64F = 2;
         gTasks[taskId].func = sub_8090498;
-        PlaySE(SE_Z_PAGE);
+        PlaySE(SE_DEX_PAGE);
     }
 }
 
@@ -4810,13 +4810,13 @@ static void sub_809207C(u8 taskId)
     }
     if ((gMain.newKeys & DPAD_LEFT) && gTasks[taskId].data[0] > 0)
     {
-        PlaySE(SE_Z_PAGE);
+        PlaySE(SE_DEX_PAGE);
         gTasks[taskId].data[0]--;
         sub_8092AB0(gTasks[taskId].data[0]);
     }
     if ((gMain.newKeys & DPAD_RIGHT) && gTasks[taskId].data[0] < 2)
     {
-        PlaySE(SE_Z_PAGE);
+        PlaySE(SE_DEX_PAGE);
         gTasks[taskId].data[0]++;
         sub_8092AB0(gTasks[taskId].data[0]);
     }
@@ -4850,7 +4850,7 @@ static void sub_80921B0(u8 taskId)
 
     if (gMain.newKeys & B_BUTTON)
     {
-        PlaySE(SE_BOWA);
+        PlaySE(SE_BALL);
         sub_8092EB0(taskId);
         gTasks[taskId].func = sub_809204C;
         return;
@@ -4878,7 +4878,7 @@ static void sub_80921B0(u8 taskId)
             {
                 sub_8091E20(gDexText_Searching);
                 gTasks[taskId].func = sub_80923FC;
-                PlaySE(SE_Z_SEARCH);
+                PlaySE(SE_DEX_SEARCH);
             }
         }
         else
@@ -4934,12 +4934,12 @@ static void sub_80924A4(u8 taskId)
     {
         if (gPokedexView->pokemonListCount != 0)
         {
-            PlaySE(SE_SEIKAI);
+            PlaySE(SE_SUCCESS);
             sub_8091E20(gDexText_SearchComplete);
         }
         else
         {
-            PlaySE(SE_HAZURE);
+            PlaySE(SE_FAILURE);
             sub_8091E20(gDexText_NoMatching);
         }
         gTasks[taskId].func = sub_8092508;
@@ -4961,7 +4961,7 @@ static void sub_8092508(u8 taskId)
         else
         {
             gTasks[taskId].func = sub_809217C;
-            PlaySE(SE_BOWA);
+            PlaySE(SE_BALL);
         }
     }
 }
@@ -5015,7 +5015,7 @@ static void sub_8092644(u8 taskId)
     if (gMain.newKeys & B_BUTTON)
     {
         sub_814ADC8();
-        PlaySE(SE_BOWA);
+        PlaySE(SE_BALL);
         Menu_EraseWindowRect(18, 1, 28, 12);
         sub_8092C8C(1);
         *p1 = gTasks[taskId].data[14];
diff --git a/src/pokedex_area_screen.c b/src/pokedex_area_screen.c
index cd697270c..1dbfdf6aa 100644
--- a/src/pokedex_area_screen.c
+++ b/src/pokedex_area_screen.c
@@ -1285,7 +1285,7 @@ static void Task_PokedexAreaScreen_1(u8 taskId)
             else if (gMain.newKeys & DPAD_RIGHT || (gMain.newKeys & R_BUTTON && gSaveBlock2.optionsButtonMode == OPTIONS_BUTTON_MODE_LR))
             {
                 gTasks[taskId].data[1] = 2;
-                PlaySE(SE_Z_PAGE);
+                PlaySE(SE_DEX_PAGE);
             }
             else
                 return;
diff --git a/src/pokemon_3.c b/src/pokemon_3.c
index 393d76dbc..16c2f3738 100644
--- a/src/pokemon_3.c
+++ b/src/pokemon_3.c
@@ -1112,38 +1112,38 @@ void ClearBattleMonForms(void)
 u16 GetMUS_ForBattle(void)
 {
     if (gBattleTypeFlags & BATTLE_TYPE_KYOGRE_GROUDON)
-        return MUS_BATTLE34;
+        return MUS_VS_KYOGRE_GROUDON;
     if (gBattleTypeFlags & BATTLE_TYPE_REGI)
-        return MUS_BATTLE36;
+        return MUS_VS_REGI;
     if (gBattleTypeFlags & BATTLE_TYPE_LINK)
-        return MUS_BATTLE20;
+        return MUS_VS_TRAINER;
     if (gBattleTypeFlags & BATTLE_TYPE_TRAINER)
     {
         switch (gTrainers[gTrainerBattleOpponent].trainerClass)
         {
         case 2:
         case 0x31:
-            return MUS_BATTLE30;
+            return MUS_VS_AQUA_MAGMA_LEADER;
         case 3:
         case 4:
         case 0x32:
         case 0x33:
-            return MUS_BATTLE31;
+            return MUS_VS_AQUA_MAGMA;
         case 0x19:
-            return MUS_BATTLE32;
+            return MUS_VS_GYM_LEADER;
         case 0x20:
-            return MUS_BATTLE33;
+            return MUS_VS_CHAMPION;
         case 0x2E:
             if (!StringCompare(gTrainers[gTrainerBattleOpponent].trainerName, BattleText_Wally))
-                return MUS_BATTLE20;
-            return MUS_BATTLE35;
+                return MUS_VS_TRAINER;
+            return MUS_VS_RIVAL;
         case 0x18:
-            return MUS_BATTLE38;
+            return MUS_VS_ELITE_FOUR;
         default:
-            return MUS_BATTLE20;
+            return MUS_VS_TRAINER;
         }
     }
-    return MUS_BATTLE27;
+    return MUS_VS_WILD;
 }
 
 void sub_80408BC(void)
diff --git a/src/pokemon_menu.c b/src/pokemon_menu.c
index 8f22586a2..78922e80f 100644
--- a/src/pokemon_menu.c
+++ b/src/pokemon_menu.c
@@ -1030,7 +1030,7 @@ void sub_808B0C0(u8 taskID)
         case A_BUTTON:
             gLastFieldPokeMenuOpened = sub_806CA38(taskID);
             if (GetMonData(&gPlayerParty[gLastFieldPokeMenuOpened], MON_DATA_IS_EGG))
-                PlaySE(SE_HAZURE);
+                PlaySE(SE_FAILURE);
             else
             {
                 sub_806D5A4();
diff --git a/src/pokemon_storage_system_2.c b/src/pokemon_storage_system_2.c
index 6ebb8ff8a..79ebc93ee 100644
--- a/src/pokemon_storage_system_2.c
+++ b/src/pokemon_storage_system_2.c
@@ -412,7 +412,7 @@ void sub_8096BF0(void)
         gPokemonStorageSystemPtr->unk_0004++;
         break;
     case 1:
-        PlaySE(SE_PC_LOGON);
+        PlaySE(SE_PC_LOGIN);
         gPokemonStorageSystemPtr->unk_000c.tileTag = 14;
         gPokemonStorageSystemPtr->unk_000c.paletteTag = 0xdad0;
         gPokemonStorageSystemPtr->unk_000c.unk04 = 0;
@@ -586,12 +586,12 @@ void sub_8096C84(void)
         }
         break;
     case 4:
-        PlaySE(SE_HAZURE);
+        PlaySE(SE_FAILURE);
         PrintStorageActionText(PC_TEXT_LAST_POKE);
         gPokemonStorageSystemPtr->unk_0004 = 6;
         break;
     case 5:
-        PlaySE(SE_HAZURE);
+        PlaySE(SE_FAILURE);
         PrintStorageActionText(PC_TEXT_PLEASE_REMOVE_MAIL);
         gPokemonStorageSystemPtr->unk_0004 = 6;
         break;
@@ -751,17 +751,17 @@ void sub_8097078(void)
         }
         break;
     case 2:
-        PlaySE(SE_HAZURE);
+        PlaySE(SE_FAILURE);
         PrintStorageActionText(PC_TEXT_LAST_POKE);
         gPokemonStorageSystemPtr->unk_0004 = 5;
         break;
     case 4:
-        PlaySE(SE_HAZURE);
+        PlaySE(SE_FAILURE);
         PrintStorageActionText(PC_TEXT_CANT_RELEASE_EGG);
         gPokemonStorageSystemPtr->unk_0004 = 5;
         break;
     case 3:
-        PlaySE(SE_HAZURE);
+        PlaySE(SE_FAILURE);
         PrintStorageActionText(PC_TEXT_PLEASE_REMOVE_MAIL);
         gPokemonStorageSystemPtr->unk_0004 = 5;
         break;
@@ -1305,7 +1305,7 @@ void sub_8097BA0(void)
     case 0:
         if (sub_809BF20())
         {
-            PlaySE(SE_HAZURE);
+            PlaySE(SE_FAILURE);
             PrintStorageActionText(PC_TEXT_HOLDING_POKE);
             gPokemonStorageSystemPtr->unk_0004 = 1;
         }
@@ -1364,7 +1364,7 @@ void sub_8097CC0(void)
     case 0:
         if (sub_809BF20())
         {
-            PlaySE(SE_HAZURE);
+            PlaySE(SE_FAILURE);
             PrintStorageActionText(PC_TEXT_HOLDING_POKE);
             gPokemonStorageSystemPtr->unk_0004 = 1;
         }
diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c
index ef4ee6c9e..57626fc9d 100644
--- a/src/pokemon_summary_screen.c
+++ b/src/pokemon_summary_screen.c
@@ -1010,7 +1010,7 @@ static void sub_809E260(u8 taskId)
         }
         else
         {
-            PlaySE(SE_HAZURE);
+            PlaySE(SE_FAILURE);
             sub_809F9D0(taskId, pssData.selectedMoveIndex);
         }
     }
@@ -1043,7 +1043,7 @@ static void SummaryScreen_MoveSelect_HandleInput(u8 taskId)
         {
             if (!MonKnowsMultipleMoves(&pssData.loadedMon))
             {
-                PlaySE(SE_HAZURE);
+                PlaySE(SE_FAILURE);
             }
             else
             {
diff --git a/src/pokenav_before.c b/src/pokenav_before.c
index 2ff282458..4f29681ac 100644
--- a/src/pokenav_before.c
+++ b/src/pokenav_before.c
@@ -1176,7 +1176,7 @@ void sub_80EBA5C()
         break;
     case 14:
         gPokenavStructPtr->unk6DAB = 1;
-        PlaySE(SE_PN_ON);
+        PlaySE(SE_POKENAV_ON);
         SetMainCallback2(&sub_80EBD90);
         SetVBlankCallback(&sub_80EBD18);
         sub_80F1A74();
diff --git a/src/record_mixing.c b/src/record_mixing.c
index 9a2d32837..1bf92bb41 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -100,7 +100,7 @@ void Task_RecordMixing_SoundEffect(u8 taskId)
     gTasks[taskId].tCounter++;
     if (gTasks[taskId].tCounter == 50)
     {
-        PlaySE(SE_W213);
+        PlaySE(SE_M_ATTRACT);
         gTasks[taskId].tCounter = 0;
     }
 }
@@ -139,7 +139,7 @@ void Task_RecordMixing_Main(u8 taskId)
     case 2:
         data[10] = CreateTask(sub_80BA00C, 10);
         tState = 3;
-        PlaySE(SE_W226);
+        PlaySE(SE_M_BATON_PASS);
         break;
     case 3:        // wait for sub_80BA00C
         if (!gTasks[data[10]].isActive)
diff --git a/src/reset_rtc_screen.c b/src/reset_rtc_screen.c
index e33caed82..71f3fa0c8 100644
--- a/src/reset_rtc_screen.c
+++ b/src/reset_rtc_screen.c
@@ -562,7 +562,7 @@ void Task_ResetRtcScreen(u8 taskId)
         if (Save_WriteData(0) == SAVE_STATUS_OK)
         {
             ResetRtcScreen_ShowMessage(gSystemText_SaveCompleted);
-            PlaySE(SE_PINPON);
+            PlaySE(SE_DING_DONG);
         }
         else
         {
diff --git a/src/rom6.c b/src/rom6.c
index af823ae9c..32c12b502 100644
--- a/src/rom6.c
+++ b/src/rom6.c
@@ -167,7 +167,7 @@ int FldEff_RockSmash(void)
 
 static void sub_810B58C(void)
 {
-    PlaySE(SE_W088);
+    PlaySE(SE_M_ROCK_THROW);
     FieldEffectActiveListRemove(FLDEFF_USE_ROCK_SMASH);
     EnableBothScriptContexts();
 }
diff --git a/src/rotating_gate.c b/src/rotating_gate.c
index 2d2d4437d..16aac66be 100644
--- a/src/rotating_gate.c
+++ b/src/rotating_gate.c
@@ -790,7 +790,7 @@ static void SpriteCallback_RotatingGate(struct Sprite *sprite)
         if (GetPlayerSpeed() != 1)
             affineAnimation += 8;
 
-        PlaySE(SE_HI_TURUN);
+        PlaySE(SE_ROTATING_GATE);
         StartSpriteAffineAnim(sprite, affineAnimation);
     }
     else if (rotationDirection == ROTATE_CLOCKWISE)
@@ -800,7 +800,7 @@ static void SpriteCallback_RotatingGate(struct Sprite *sprite)
         if (GetPlayerSpeed() != 1)
             affineAnimation += 8;
 
-        PlaySE(SE_HI_TURUN);
+        PlaySE(SE_ROTATING_GATE);
         StartSpriteAffineAnim(sprite, affineAnimation);
     }
 
diff --git a/src/roulette.c b/src/roulette.c
index 40acd41c8..d261e7e41 100644
--- a/src/roulette.c
+++ b/src/roulette.c
@@ -801,7 +801,7 @@ void sub_8115E14(u8 taskid)
             PlaySE(SE_BOO);
         else
         {
-            m4aSongNumStart(SE_REGI);
+            m4aSongNumStart(SE_SHOP);
             gTasks[taskid].func = sub_8115DA0;
         }
     }
@@ -983,7 +983,7 @@ void sub_8116308(u8 taskid)
     gTasks[taskid].data[6]++;
     gTasks[taskid].data[8]++;
     sub_81182F8(6 - gTasks[taskid].data[6]);
-    m4aSongNumStart(SE_TAMAKORO);
+    m4aSongNumStart(SE_ROULETTE_BALL);
     gTasks[taskid].func = sub_811637C;
 }
 
@@ -1100,20 +1100,20 @@ void sub_8116638(u8 taskid)
     case 2:
         if (gTasks[taskid].data[2] == 12)
         {
-            PlayFanfare(MUS_ME_B_BIG);
+            PlayFanfare(MUS_SLOTS_JACKPOT);
             Menu_DrawStdWindowFrame(0, 14, 29, 19);
             Menu_PrintText(&gUnknown_081C41A5, 1, 15);
         }
         else
         {
-            PlayFanfare(MUS_ME_B_SMALL);
+            PlayFanfare(MUS_SLOTS_WIN);
             Menu_DrawStdWindowFrame(0, 14, 29, 19);
             Menu_PrintText(&gUnknown_081C4199, 1, 15);
         }
         break;
     case 0:
     default:
-        m4aSongNumStart(SE_HAZURE);
+        m4aSongNumStart(SE_FAILURE);
         Menu_DrawStdWindowFrame(0, 14, 29, 19);
         Menu_PrintText(&gUnknown_081C41AE, 1, 15);
     }
diff --git a/src/roulette_gfx.c b/src/roulette_gfx.c
index 46188123b..b94b18c9c 100644
--- a/src/roulette_gfx.c
+++ b/src/roulette_gfx.c
@@ -1200,7 +1200,7 @@ void sub_811889C(struct Sprite *sprite)
                 sub_811866C(sprite);
                 sprite->data[6] = (sprite->data[6] / 30) * 30 + 15;
                 sprite->callback = sub_8118834;
-                m4aSongNumStartOrChange(SE_HASHI);
+                m4aSongNumStartOrChange(SE_BRIDGE_WALK);
                 eRoulette->var9C = eRoulette->var98 = 0.0f;
                 eRoulette->var8C = -1.0f;
             }
@@ -1217,7 +1217,7 @@ void sub_811889C(struct Sprite *sprite)
                 sub_811866C(sprite);
                 sprite->data[6] = (sprite->data[6] / 30) * 30 + 15;
                 sprite->callback = sub_8118834;
-                m4aSongNumStartOrChange(SE_HASHI);
+                m4aSongNumStartOrChange(SE_BRIDGE_WALK);
                 eRoulette->var9C = eRoulette->var98 = 0.0f;
                 eRoulette->var8C = -1.0f;
             }
@@ -1286,7 +1286,7 @@ void sub_8118B30(struct Sprite *sprite)
         sub_811866C(sprite);
         sprite->data[6] = (sprite->data[6] / 30) * 30 + 15;
         sprite->callback  = sub_8118834;
-        m4aSongNumStartOrChange(SE_HASHI);
+        m4aSongNumStartOrChange(SE_BRIDGE_WALK);
         eRoulette->var03_6 = TRUE;
     }
 }
@@ -1322,7 +1322,7 @@ void sub_8118BD8(struct Sprite *sprite)
             sprite->animEnded     = FALSE;
             sprite->data[2]       = 0;
             sprite->callback      = sub_8118B30;
-            m4aSongNumStart(SE_NAGERU);
+            m4aSongNumStart(SE_BALL_THROW);
         }
     }
 }
@@ -1383,12 +1383,12 @@ void sub_8118D2C(struct Sprite *sprite)
             sub_811866C(sprite);
             sprite->data[6] = (sprite->data[6] / 30) * 30 + 15;
             sprite->callback  = sub_8118834;
-            m4aSongNumStartOrChange(SE_HASHI);
+            m4aSongNumStartOrChange(SE_BRIDGE_WALK);
         }
         else
         {
             sprite->animPaused = TRUE;
-            m4aSongNumStart(SE_KON);
+            m4aSongNumStart(SE_BALL_BOUNCE_1);
             sub_811952C(sprite);
         }
     }
@@ -1401,7 +1401,7 @@ void debug_sub_812E698(struct Sprite *sprite)
     sub_8118724(sprite);
     sprite->data[2] = 0;
     sub_81186B8(sprite);
-    m4aSongNumStart(SE_KON);
+    m4aSongNumStart(SE_BALL_BOUNCE_1);
     if (Random() & 1)
     {
         eRoulette->var8C = 0;
@@ -1436,13 +1436,13 @@ void sub_8118DE4(struct Sprite *sprite)
         sub_811866C(sprite);
         sprite->data[6] = (sprite->data[6] / 30) * 30 + 15;
         sprite->callback  = sub_8118834;
-        m4aSongNumStartOrChange(SE_HASHI);
+        m4aSongNumStartOrChange(SE_BRIDGE_WALK);
     }
     else
     {
         u8 t;
         u32 z;
-        m4aSongNumStart(SE_KON);
+        m4aSongNumStart(SE_BALL_BOUNCE_1);
         if ((z = (Random() & 1)))
         {
             u32 o;
@@ -1547,7 +1547,7 @@ void sub_8119134(struct Sprite *sprite)
     sub_8118724(sprite);
     if (!(eRoulette->var94 > 60.0f))
     {
-        m4aSongNumStartOrChange(SE_TAMAKORO_E);
+        m4aSongNumStartOrChange(SE_ROULETTE_BALL2);
         eRoulette->var98 = - (                20.0f / (float)((u16)eRoulette->var84));
         eRoulette->var90 =   ((1.0f - eRoulette->var8C) / (float)((u16)eRoulette->var84));
         sprite->animNum       = 1;
@@ -1785,7 +1785,7 @@ void sub_8119898(struct Sprite *sprite)
         gSprites[sprite->data[6]].data[1] = -2;
         gSprites[sprite->data[5]].invisible = FALSE;
         gSprites[sprite->data[5]].callback  = sub_81197D8;
-        m4aSongNumStart(SE_W070);
+        m4aSongNumStart(SE_M_STRENGTH);
     }
 }
 
@@ -1810,7 +1810,7 @@ void sub_8119964(struct Sprite *sprite)
         {
             sprite->invisible = FALSE;
             sprite->data[7]++;
-            m4aSongNumStart(SE_RU_HYUU);
+            m4aSongNumStart(SE_FALL);
             eRoulette->var01 = 1;
             eRoulette->var34 = gUnknown_083FA61E[0];
         }
@@ -1858,7 +1858,7 @@ void sub_8119AAC(struct Sprite *sprite)
         sprite->callback   = &SpriteCallbackDummy;
         sprite->invisible  = TRUE;
         sprite->animPaused = TRUE;
-        m4aSongNumStop(SE_BASABASA);
+        m4aSongNumStop(SE_TAILLOW_WING_FLAP);
         DestroySprite(sprite);
         FreeOamMatrix(gSprites[eRoulette->var3C[56]].oam.matrixNum);
         DestroySprite(&gSprites[eRoulette->var3C[56]]);
@@ -1889,7 +1889,7 @@ void sub_8119B24(struct Sprite *sprite)
         }
         else
         {
-            m4aSongNumStart(SE_RU_HYUU);
+            m4aSongNumStart(SE_FALL);
             StartSpriteAnim(sprite, eRoulette->var38->data[0] + 4);
             sprite->callback = sub_8119AAC;
             gSprites[sprite->data[6]].affineAnimPaused = FALSE;
@@ -1929,7 +1929,7 @@ void sub_8119BCC(struct Sprite *sprite)
         }
         else
         {
-            m4aSongNumStartOrChange(SE_BASABASA);
+            m4aSongNumStartOrChange(SE_TAILLOW_WING_FLAP);
             if (eRoulette->var38->data[0] == 0)
                 PlayCry1(SPECIES_TAILLOW, 63);
             else
@@ -1983,5 +1983,5 @@ void sub_8119D80(struct Sprite *sprite)
     }
     gSprites[sprite->data[6]].callback = sub_8119D08;
     gSprites[sprite->data[4]].callback = sub_8119BCC;
-    m4aSongNumStart(SE_RU_HYUU);
+    m4aSongNumStart(SE_FALL);
 }
diff --git a/src/shop.c b/src/shop.c
index 75d83d132..75ed36fa4 100644
--- a/src/shop.c
+++ b/src/shop.c
@@ -657,7 +657,7 @@ static void Shop_DoItemTransaction(u8 taskId)
 {
     IncrementGameStat(GAME_STAT_SHOPPED);
     RemoveMoney(&gSaveBlock1.money, gMartTotalCost);
-    PlaySE(SE_REGI);
+    PlaySE(SE_SHOP);
     UpdateMoneyWindow(gSaveBlock1.money, 0, 0);
     gTasks[taskId].func = Shop_DoPremierBallCheck;
 }
diff --git a/src/slot_machine.c b/src/slot_machine.c
index c6cbdb1c8..fd3e2580d 100644
--- a/src/slot_machine.c
+++ b/src/slot_machine.c
@@ -707,7 +707,7 @@ static bool8 sub_8101E3C(struct Task *task)
             eSlotMachine->coins -= (3 - eSlotMachine->bet);
             eSlotMachine->bet = 3;
             eSlotMachine->state = 9;
-            PlaySE(SE_REGI);
+            PlaySE(SE_SHOP);
         }
         else
         {
@@ -718,7 +718,7 @@ static bool8 sub_8101E3C(struct Task *task)
     {
         if (gMain.newKeys & DPAD_DOWN && eSlotMachine->coins != 0)
         {
-            PlaySE(SE_REGI);
+            PlaySE(SE_SHOP);
             sub_8103D50(eSlotMachine->bet);
             eSlotMachine->coins--;
             eSlotMachine->bet++;
@@ -834,7 +834,7 @@ static bool8 sub_8102058(struct Task *task)
 
     if (gMain.newKeys & A_BUTTON)
     {
-        PlaySE(SE_JYUNI);
+        PlaySE(SE_CONTEST_PLACE);
         sub_8102E1C(eSlotMachine->unk18);
         sub_8103C14(eSlotMachine->unk18);
         eSlotMachine->state = 13;
@@ -927,17 +927,17 @@ bool8 sub_81020C8(struct Task *task)
         }
         if (eSlotMachine->matchedSymbols & ((1 << SLOT_MACHINE_MATCHED_777_BLUE) | (1 << SLOT_MACHINE_MATCHED_777_RED)))
         {
-            PlayFanfare(MUS_ME_B_BIG);
+            PlayFanfare(MUS_SLOTS_JACKPOT);
             sub_8104CAC(6);
         }
         else if (eSlotMachine->matchedSymbols & (1 << SLOT_MACHINE_MATCHED_777_MIXED))
         {
-            PlayFanfare(MUS_ME_B_BIG);
+            PlayFanfare(MUS_SLOTS_JACKPOT);
             sub_8104CAC(5);
         }
         else
         {
-            PlayFanfare(MUS_ME_B_SMALL);
+            PlayFanfare(MUS_SLOTS_WIN);
             sub_8104CAC(2);
         }
         if (eSlotMachine->matchedSymbols & ((1 << SLOT_MACHINE_MATCHED_777_MIXED) | (1 << SLOT_MACHINE_MATCHED_777_BLUE) | (1 << SLOT_MACHINE_MATCHED_777_RED)))
@@ -2682,7 +2682,7 @@ static void sub_810437C(struct Task *task)
     sub_810545C();
     sub_8102680();
     StopMapMusic();
-    PlayNewMapMusic(MUS_BD_TIME);
+    PlayNewMapMusic(MUS_ROULETTE);
 }
 
 static void sub_81043EC(struct Task *task)
@@ -2818,7 +2818,7 @@ static void sub_81046C0(struct Task *task)
         {
             task->data[4] = 0xa0;
             StartSpriteAnimIfDifferent(gSprites + eSlotMachine->unk3F, 5);
-            PlayFanfare(MUS_ME_ZANNEN);
+            PlayFanfare(MUS_TOO_BAD);
         }
         else
         {
@@ -2830,7 +2830,7 @@ static void sub_81046C0(struct Task *task)
                 sub_8104098();
                 eSlotMachine->pikaPower = 0;
             }
-            PlayFanfare(MUS_ME_B_SMALL);
+            PlayFanfare(MUS_SLOTS_WIN);
         }
     }
 }
@@ -2906,8 +2906,8 @@ static void sub_81048CC(struct Task *task)
     task->data[4] = 4;
     task->data[5] = 0;
     StopMapMusic();
-    PlayFanfare(MUS_ME_ZANNEN);
-    PlaySE(SE_W153);
+    PlayFanfare(MUS_TOO_BAD);
+    PlaySE(SE_M_EXPLOSION);
 }
 
 static void sub_8104940(struct Task *task)
diff --git a/src/sound.c b/src/sound.c
index 73040c4df..69f796fca 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -37,18 +37,18 @@ extern struct ToneData gCryTable2[];
 
 static const struct Fanfare sFanfares[] =
 {
-    { MUS_FANFA1,      80 },
-    { MUS_FANFA4,     160 },
-    { MUS_FANFA5,     220 },
-    { MUS_ME_WAZA,    220 },
-    { MUS_ME_ASA,     160 },
-    { MUS_ME_BACHI,   340 },
-    { MUS_ME_WASURE,  180 },
-    { MUS_ME_KINOMI,  120 },
-    { MUS_ME_TAMA,    710 },
-    { MUS_ME_B_BIG,   250 },
-    { MUS_ME_B_SMALL, 150 },
-    { MUS_ME_ZANNEN,  160 },
+    { MUS_LEVEL_UP,      80 },
+    { MUS_OBTAIN_ITEM,     160 },
+    { MUS_EVOLVED,     220 },
+    { MUS_OBTAIN_TMHM,    220 },
+    { MUS_HEAL,     160 },
+    { MUS_OBTAIN_BADGE,   340 },
+    { MUS_MOVE_DELETED,  180 },
+    { MUS_OBTAIN_BERRY,  120 },
+    { MUS_AWAKEN_LEGEND,    710 },
+    { MUS_SLOTS_JACKPOT,   250 },
+    { MUS_SLOTS_WIN, 150 },
+    { MUS_TOO_BAD,  160 },
 };
 
 static void Task_Fanfare(u8 taskId);
@@ -198,7 +198,7 @@ bool8 WaitFanfare(bool8 stop)
         if (!stop)
             m4aMPlayContinue(&gMPlayInfo_BGM);
         else
-            m4aSongNumStart(SE_STOP);
+            m4aSongNumStart(MUS_DUMMY);
 
         return TRUE;
     }
diff --git a/src/strings.c b/src/strings.c
index 7d77d503a..acdbcd9cb 100644
--- a/src/strings.c
+++ b/src/strings.c
@@ -355,7 +355,7 @@ const u8 gOtherText_WantsToLearn[] = _("{STR_VAR_1} wants to learn the\nmove {ST
 const u8 gOtherText_StopTryingTo[] = _("Stop trying to teach\n{STR_VAR_2}?");
 const u8 gOtherText_DidNotLearnMove2[] = _("{STR_VAR_1} did not learn the\nmove {STR_VAR_2}.{PAUSE_UNTIL_PRESS}");
 const u8 gOtherText_WhichMoveToForget2[] = _("Which move should be forgotten?{PAUSE_UNTIL_PRESS}");
-const u8 gOtherText_ForgetMove123_2[] = _("{PAUSE 32}1, {PAUSE 15}2, and{PAUSE 15}... {PAUSE 15}... {PAUSE 15}... {PAUSE 15}{PLAY_SE SE_KON}Poof!\p{STR_VAR_1} forgot how to\nuse {STR_VAR_2}.\pAnd...{PAUSE_UNTIL_PRESS}");
+const u8 gOtherText_ForgetMove123_2[] = _("{PAUSE 32}1, {PAUSE 15}2, and{PAUSE 15}... {PAUSE 15}... {PAUSE 15}... {PAUSE 15}{PLAY_SE SE_BALL_BOUNCE_1}Poof!\p{STR_VAR_1} forgot how to\nuse {STR_VAR_2}.\pAnd...{PAUSE_UNTIL_PRESS}");
 const u8 gOtherText_AlreadyKnows[] = _("{STR_VAR_1} already knows\n{STR_VAR_2}.{PAUSE_UNTIL_PRESS}");
 const u8 gOtherText_HPRestoredBy[] = _("{STR_VAR_1}'s HP was restored by\n{STR_VAR_2} points.{PAUSE_UNTIL_PRESS}");
 const u8 gOtherText_CuredPoisoning[] = _("{STR_VAR_1} was cured of its\npoisoning.{PAUSE_UNTIL_PRESS}");
diff --git a/src/trade.c b/src/trade.c
index 8d57cd60b..41c63e929 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -1194,7 +1194,7 @@ static void sub_8047EC0(void)
             sub_8048C70();
             gMain.state ++;
             nullsub_5(7, 0);
-            PlayBGM(MUS_P_SCHOOL);
+            PlayBGM(MUS_SCHOOL);
             break;
         case 14:
             sub_804ACF4(1);
@@ -3379,7 +3379,7 @@ static void sub_804B058(struct Sprite *sprite)
 {
     if (++ sprite->data[0] == 10)
     {
-        PlaySE(SE_BOWA);
+        PlaySE(SE_BALL);
         sprite->data[0] = 0;
     }
 }
@@ -3414,7 +3414,7 @@ static void sub_804B104(struct Sprite *sprite)
 {
     if (++ sprite->data[0] == 15)
     {
-        PlaySE(SE_W107);
+        PlaySE(SE_M_MINIMIZE);
         sprite->data[0] = 0;
     }
 }
@@ -4356,7 +4356,7 @@ static bool8 sub_804C29C(void)
             gSprites[gUnknown_03004828->pokePicSpriteIdxs[0]].pos2.y = gMonFrontPicCoords[gUnknown_03004828->tradeSpecies[0]].y_offset;
             gUnknown_03004828->unk_00c4 ++;
             gUnknown_03004828->unk_0124 = GetCurrentMapMusic();
-            PlayBGM(MUS_SHINKA);
+            PlayBGM(MUS_EVOLUTION);
             break;
         case 1:
             if (gUnknown_03004828->bg2hofs > 0)
@@ -4509,7 +4509,7 @@ static bool8 sub_804C29C(void)
         case 32:
             if (!gPaletteFade.active)
             {
-                PlaySE(SE_TK_WARPOUT);
+                PlaySE(SE_WARP_OUT);
                 gUnknown_03004828->unk_00c4 ++;
             }
             gSprites[gUnknown_03004828->unk_00ba].pos2.y -= 3;
@@ -4563,7 +4563,7 @@ static bool8 sub_804C29C(void)
             gSprites[gUnknown_03004828->pokePicSpriteIdxs[1]].pos2.y += 3;
             if (-0xa0 > gSprites[gUnknown_03004828->pokePicSpriteIdxs[0]].pos2.y && gSprites[gUnknown_03004828->pokePicSpriteIdxs[0]].pos2.y >= -0xa3)
             {
-                PlaySE(SE_TK_WARPIN);
+                PlaySE(SE_WARP_IN);
             }
             if (gSprites[gUnknown_03004828->pokePicSpriteIdxs[0]].pos2.y < -0xde)
             {
@@ -4659,7 +4659,7 @@ static bool8 sub_804C29C(void)
                 DestroySprite(&gSprites[gUnknown_03004828->unk_00bb]);
                 sub_804BBE8(6);
                 gUnknown_03004828->unk_00c4 ++;
-                PlaySE(SE_W028);
+                PlaySE(SE_M_SAND_ATTACK);
             }
             break;
         case 51:
@@ -4739,7 +4739,7 @@ static bool8 sub_804C29C(void)
         case 68:
             if (++ gUnknown_03004828->unk_00c0 == 4)
             {
-                PlayFanfare(MUS_FANFA5);
+                PlayFanfare(MUS_EVOLVED);
             }
             if (gUnknown_03004828->unk_00c0 == 0xf0)
             {
@@ -4872,10 +4872,10 @@ static void sub_804D738(struct Sprite *sprite)
 {
     sprite->pos2.y += gTradeBallVerticalVelocityTable[sprite->data[0]];
     if (sprite->data[0] == 22)
-        PlaySE(SE_KON);
+        PlaySE(SE_BALL_BOUNCE_1);
     if (++ sprite->data[0] == 44)
     {
-        PlaySE(SE_W025);
+        PlaySE(SE_M_MEGA_KICK);
         sprite->callback = sub_804D7AC;
         sprite->data[0] = 0;
         BeginNormalPaletteFade(1 << (16 + sprite->oam.paletteNum), -1, 0, 16, FADE_COLOR_WHITE);
@@ -4905,17 +4905,17 @@ static void sub_804D80C(struct Sprite *sprite)
         {
             sprite->data[2] ++;
             sprite->data[0] = 0x16;
-            PlaySE(SE_KON);
+            PlaySE(SE_BALL_BOUNCE_1);
         }
     }
     else
     {
         if (sprite->data[0] == 0x42)
-            PlaySE(SE_KON2);
+            PlaySE(SE_BALL_BOUNCE_2);
         if (sprite->data[0] == 0x5c)
-            PlaySE(SE_KON3);
+            PlaySE(SE_BALL_BOUNCE_3);
         if (sprite->data[0] == 0x6b)
-            PlaySE(SE_KON4);
+            PlaySE(SE_BALL_BOUNCE_4);
         sprite->pos2.y += gTradeBallVerticalVelocityTable[sprite->data[0]];
         if (++sprite->data[0] == 0x6c)
             sprite->callback = SpriteCallbackDummy;