Voicegroups need names

3 files changed, 29 insertions, 29 deletions

diff --git a/src/debug/sound_check_menu.c b/src/debug/sound_check_menu.c
index d57c699da..dd94eb740 100644
--- a/src/debug/sound_check_menu.c
+++ b/src/debug/sound_check_menu.c
@@ -44,14 +44,14 @@ enum
     MAX
 };
 
-extern struct ToneData voicegroup_84537C0[];
-extern struct ToneData voicegroup_8452590[];
-extern struct ToneData voicegroup_8453DC0[];
-extern struct ToneData voicegroup_8452B90[];
-extern struct ToneData voicegroup_84543C0[];
-extern struct ToneData voicegroup_8453190[];
-extern struct ToneData voicegroup_84549C0[];
-extern struct ToneData voicegroup_8453790[];
+extern struct ToneData voicegroup116[];
+extern struct ToneData voicegroup112[];
+extern struct ToneData voicegroup117[];
+extern struct ToneData voicegroup113[];
+extern struct ToneData voicegroup118[];
+extern struct ToneData voicegroup114[];
+extern struct ToneData voicegroup119[];
+extern struct ToneData voicegroup115[];
 
 static EWRAM_DATA u8 gUnknown_020387B0 = 0;
 static EWRAM_DATA u8 gUnknown_020387B1 = 0;
@@ -544,27 +544,27 @@ void Task_ProcessDriverTestInput(u8 taskId)
         {
         case 0:
             if (gUnknown_020387D8)
-                gUnknown_03005D30 = SetPokemonCryTone(&voicegroup_84537C0[remaining]);
+                gUnknown_03005D30 = SetPokemonCryTone(&voicegroup116[remaining]);
             else
-                gUnknown_03005D30 = SetPokemonCryTone(&voicegroup_8452590[remaining]);
+                gUnknown_03005D30 = SetPokemonCryTone(&voicegroup112[remaining]);
             break;
         case 1:
             if (gUnknown_020387D8)
-                gUnknown_03005D30 = SetPokemonCryTone(&voicegroup_8453DC0[remaining]);
+                gUnknown_03005D30 = SetPokemonCryTone(&voicegroup117[remaining]);
             else
-                gUnknown_03005D30 = SetPokemonCryTone(&voicegroup_8452B90[remaining]);
+                gUnknown_03005D30 = SetPokemonCryTone(&voicegroup113[remaining]);
             break;
         case 2:
             if (gUnknown_020387D8)
-                gUnknown_03005D30 = SetPokemonCryTone(&voicegroup_84543C0[remaining]);
+                gUnknown_03005D30 = SetPokemonCryTone(&voicegroup118[remaining]);
             else
-                gUnknown_03005D30 = SetPokemonCryTone(&voicegroup_8453190[remaining]);
+                gUnknown_03005D30 = SetPokemonCryTone(&voicegroup114[remaining]);
             break;
         case 3:
             if (gUnknown_020387D8)
-                gUnknown_03005D30 = SetPokemonCryTone(&voicegroup_84549C0[remaining]);
+                gUnknown_03005D30 = SetPokemonCryTone(&voicegroup119[remaining]);
             else
-                gUnknown_03005D30 = SetPokemonCryTone(&voicegroup_8453790[remaining]);
+                gUnknown_03005D30 = SetPokemonCryTone(&voicegroup115[remaining]);
             break;
         }
     }
diff --git a/src/libs/m4a_tables.c b/src/libs/m4a_tables.c
index 91f00a31d..9a4ea32e6 100644
--- a/src/libs/m4a_tables.c
+++ b/src/libs/m4a_tables.c
@@ -261,7 +261,7 @@ const struct PokemonCrySong gPokemonCrySongTemplate =
     0, // block count
     255, // priority
     0, // reverb
-    (struct ToneData *)&voicegroup_pokemon_cry,
+    (struct ToneData *)&voicegroup000,
     NULL,
     NULL,
     0,
diff --git a/src/sound.c b/src/sound.c
index 5b41acbc6..36afa1a8b 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -32,15 +32,15 @@ extern struct MusicPlayerInfo gMPlay_SE1;
 extern struct MusicPlayerInfo gMPlay_SE2;
 extern struct MusicPlayerInfo gMPlay_SE3;
 
-extern struct ToneData voicegroup_8452590[];
-extern struct ToneData voicegroup_8452B90[];
-extern struct ToneData voicegroup_8453190[];
-extern struct ToneData voicegroup_8453790[];
+extern struct ToneData voicegroup112[];
+extern struct ToneData voicegroup113[];
+extern struct ToneData voicegroup114[];
+extern struct ToneData voicegroup115[];
 
-extern struct ToneData voicegroup_84537C0[];
-extern struct ToneData voicegroup_8453DC0[];
-extern struct ToneData voicegroup_84543C0[];
-extern struct ToneData voicegroup_84549C0[];
+extern struct ToneData voicegroup116[];
+extern struct ToneData voicegroup117[];
+extern struct ToneData voicegroup118[];
+extern struct ToneData voicegroup119[];
 
 static const struct Fanfare sFanfares[] =
 {
@@ -416,19 +416,19 @@ static void PlayCryInternal(u16 species, s8 pan, s8 volume, u8 priority, u8 mode
     {
     case 0:
         gMPlay_PokemonCry = SetPokemonCryTone(
-          v0 ? &voicegroup_84537C0[index] : &voicegroup_8452590[index]);
+          v0 ? &voicegroup116[index] : &voicegroup112[index]);
         break;
     case 1:
         gMPlay_PokemonCry = SetPokemonCryTone(
-          v0 ? &voicegroup_8453DC0[index] : &voicegroup_8452B90[index]);
+          v0 ? &voicegroup117[index] : &voicegroup113[index]);
         break;
     case 2:
         gMPlay_PokemonCry = SetPokemonCryTone(
-          v0 ? &voicegroup_84543C0[index] : &voicegroup_8453190[index]);
+          v0 ? &voicegroup118[index] : &voicegroup114[index]);
         break;
     case 3:
         gMPlay_PokemonCry = SetPokemonCryTone(
-          v0 ? &voicegroup_84549C0[index] : &voicegroup_8453790[index]);
+          v0 ? &voicegroup119[index] : &voicegroup115[index]);
         break;
     }
 }