Merge pull request #690 from Kermalis/master

Renaming cry table voicegroups

2 files changed, 16 insertions, 29 deletions

diff --git a/src/debug/sound_check_menu.c b/src/debug/sound_check_menu.c
index dd94eb740..ba2439a64 100644
--- a/src/debug/sound_check_menu.c
+++ b/src/debug/sound_check_menu.c
@@ -44,14 +44,8 @@ enum
     MAX
 };
 
-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[];
+extern struct ToneData gCryTable[];
+extern struct ToneData gCryTable2[];
 
 static EWRAM_DATA u8 gUnknown_020387B0 = 0;
 static EWRAM_DATA u8 gUnknown_020387B1 = 0;
@@ -544,27 +538,27 @@ void Task_ProcessDriverTestInput(u8 taskId)
         {
         case 0:
             if (gUnknown_020387D8)
-                gUnknown_03005D30 = SetPokemonCryTone(&voicegroup116[remaining]);
+                gUnknown_03005D30 = SetPokemonCryTone(&gCryTable2[(128 * 0) + remaining]);
             else
-                gUnknown_03005D30 = SetPokemonCryTone(&voicegroup112[remaining]);
+                gUnknown_03005D30 = SetPokemonCryTone(&gCryTable[(128 * 0) + remaining]);
             break;
         case 1:
             if (gUnknown_020387D8)
-                gUnknown_03005D30 = SetPokemonCryTone(&voicegroup117[remaining]);
+                gUnknown_03005D30 = SetPokemonCryTone(&gCryTable2[(128 * 1) + remaining]);
             else
-                gUnknown_03005D30 = SetPokemonCryTone(&voicegroup113[remaining]);
+                gUnknown_03005D30 = SetPokemonCryTone(&gCryTable[(128 * 1) + remaining]);
             break;
         case 2:
             if (gUnknown_020387D8)
-                gUnknown_03005D30 = SetPokemonCryTone(&voicegroup118[remaining]);
+                gUnknown_03005D30 = SetPokemonCryTone(&gCryTable2[(128 * 2) + remaining]);
             else
-                gUnknown_03005D30 = SetPokemonCryTone(&voicegroup114[remaining]);
+                gUnknown_03005D30 = SetPokemonCryTone(&gCryTable[(128 * 2) + remaining]);
             break;
         case 3:
             if (gUnknown_020387D8)
-                gUnknown_03005D30 = SetPokemonCryTone(&voicegroup119[remaining]);
+                gUnknown_03005D30 = SetPokemonCryTone(&gCryTable2[(128 * 3) + remaining]);
             else
-                gUnknown_03005D30 = SetPokemonCryTone(&voicegroup115[remaining]);
+                gUnknown_03005D30 = SetPokemonCryTone(&gCryTable[(128 * 3) + remaining]);
             break;
         }
     }
diff --git a/src/sound.c b/src/sound.c
index 36afa1a8b..b9756c1dc 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -32,15 +32,8 @@ extern struct MusicPlayerInfo gMPlay_SE1;
 extern struct MusicPlayerInfo gMPlay_SE2;
 extern struct MusicPlayerInfo gMPlay_SE3;
 
-extern struct ToneData voicegroup112[];
-extern struct ToneData voicegroup113[];
-extern struct ToneData voicegroup114[];
-extern struct ToneData voicegroup115[];
-
-extern struct ToneData voicegroup116[];
-extern struct ToneData voicegroup117[];
-extern struct ToneData voicegroup118[];
-extern struct ToneData voicegroup119[];
+extern struct ToneData gCryTable[];
+extern struct ToneData gCryTable2[];
 
 static const struct Fanfare sFanfares[] =
 {
@@ -416,19 +409,19 @@ static void PlayCryInternal(u16 species, s8 pan, s8 volume, u8 priority, u8 mode
     {
     case 0:
         gMPlay_PokemonCry = SetPokemonCryTone(
-          v0 ? &voicegroup116[index] : &voicegroup112[index]);
+          v0 ? &gCryTable2[(128 * 0) + index] : &gCryTable[(128 * 0) + index]);
         break;
     case 1:
         gMPlay_PokemonCry = SetPokemonCryTone(
-          v0 ? &voicegroup117[index] : &voicegroup113[index]);
+          v0 ? &gCryTable2[(128 * 1) + index] : &gCryTable[(128 * 1) + index]);
         break;
     case 2:
         gMPlay_PokemonCry = SetPokemonCryTone(
-          v0 ? &voicegroup118[index] : &voicegroup114[index]);
+          v0 ? &gCryTable2[(128 * 2) + index] : &gCryTable[(128 * 2) + index]);
         break;
     case 3:
         gMPlay_PokemonCry = SetPokemonCryTone(
-          v0 ? &voicegroup119[index] : &voicegroup115[index]);
+          v0 ? &gCryTable2[(128 * 3) + index] : &gCryTable[(128 * 3) + index]);
         break;
     }
 }