Renaming cry voicegroups

55 files changed, 72 insertions, 103 deletions

diff --git a/sound/songs/bgm_radio_tower_occupied.s b/sound/songs/bgm_radio_tower_occupied.s
index c43995291..748170bd4 100644
--- a/sound/songs/bgm_radio_tower_occupied.s
+++ b/sound/songs/bgm_radio_tower_occupied.s
@@ -1,6 +1,6 @@
 	.include "MPlayDef.s"
 
-	.equ	bgm_radio_tower_occupied_grp, voicegroup121
+	.equ	bgm_radio_tower_occupied_grp, voicegroup113
 	.equ	bgm_radio_tower_occupied_pri, 0
 	.equ	bgm_radio_tower_occupied_rev, reverb_set+50
 	.equ	bgm_radio_tower_occupied_mvl, 127
diff --git a/sound/songs/song_248.s b/sound/songs/song_248.s
index 713381073..6586d6578 100644
--- a/sound/songs/song_248.s
+++ b/sound/songs/song_248.s
@@ -1,6 +1,6 @@
 	.include "MPlayDef.s"
 
-	.equ	song_248_grp, voicegroup120
+	.equ	song_248_grp, voicegroup112
 	.equ	song_248_pri, 4
 	.equ	song_248_rev, 0
 	.equ	song_248_mvl, 127
diff --git a/sound/songs/song_249.s b/sound/songs/song_249.s
index c5fa9ad87..770e24395 100644
--- a/sound/songs/song_249.s
+++ b/sound/songs/song_249.s
@@ -1,6 +1,6 @@
 	.include "MPlayDef.s"
 
-	.equ	song_249_grp, voicegroup120
+	.equ	song_249_grp, voicegroup112
 	.equ	song_249_pri, 4
 	.equ	song_249_rev, 0
 	.equ	song_249_mvl, 127
diff --git a/sound/songs/song_250.s b/sound/songs/song_250.s
index 47e788535..47926edbe 100644
--- a/sound/songs/song_250.s
+++ b/sound/songs/song_250.s
@@ -1,6 +1,6 @@
 	.include "MPlayDef.s"
 
-	.equ	song_250_grp, voicegroup120
+	.equ	song_250_grp, voicegroup112
 	.equ	song_250_pri, 4
 	.equ	song_250_rev, 0
 	.equ	song_250_mvl, 127
diff --git a/sound/songs/song_251.s b/sound/songs/song_251.s
index 76b0a788e..ffef147ba 100644
--- a/sound/songs/song_251.s
+++ b/sound/songs/song_251.s
@@ -1,6 +1,6 @@
 	.include "MPlayDef.s"
 
-	.equ	song_251_grp, voicegroup120
+	.equ	song_251_grp, voicegroup112
 	.equ	song_251_pri, 4
 	.equ	song_251_rev, 0
 	.equ	song_251_mvl, 127
diff --git a/sound/songs/song_252.s b/sound/songs/song_252.s
index 25e11aa28..758a42d72 100644
--- a/sound/songs/song_252.s
+++ b/sound/songs/song_252.s
@@ -1,6 +1,6 @@
 	.include "MPlayDef.s"
 
-	.equ	song_252_grp, voicegroup120
+	.equ	song_252_grp, voicegroup112
 	.equ	song_252_pri, 4
 	.equ	song_252_rev, 0
 	.equ	song_252_mvl, 127
diff --git a/sound/songs/song_253.s b/sound/songs/song_253.s
index 0a9434d51..f25a72b64 100644
--- a/sound/songs/song_253.s
+++ b/sound/songs/song_253.s
@@ -1,6 +1,6 @@
 	.include "MPlayDef.s"
 
-	.equ	song_253_grp, voicegroup120
+	.equ	song_253_grp, voicegroup112
 	.equ	song_253_pri, 4
 	.equ	song_253_rev, 0
 	.equ	song_253_mvl, 127
diff --git a/sound/songs/song_254.s b/sound/songs/song_254.s
index 3cf9c611a..13648f844 100644
--- a/sound/songs/song_254.s
+++ b/sound/songs/song_254.s
@@ -1,6 +1,6 @@
 	.include "MPlayDef.s"
 
-	.equ	song_254_grp, voicegroup120
+	.equ	song_254_grp, voicegroup112
 	.equ	song_254_pri, 4
 	.equ	song_254_rev, 0
 	.equ	song_254_mvl, 127
diff --git a/sound/songs/song_255.s b/sound/songs/song_255.s
index 72eb826a2..5e990c2d0 100644
--- a/sound/songs/song_255.s
+++ b/sound/songs/song_255.s
@@ -1,6 +1,6 @@
 	.include "MPlayDef.s"
 
-	.equ	song_255_grp, voicegroup120
+	.equ	song_255_grp, voicegroup112
 	.equ	song_255_pri, 4
 	.equ	song_255_rev, 0
 	.equ	song_255_mvl, 127
diff --git a/sound/songs/song_256.s b/sound/songs/song_256.s
index 15cd2a3ed..13d1f52cb 100644
--- a/sound/songs/song_256.s
+++ b/sound/songs/song_256.s
@@ -1,6 +1,6 @@
 	.include "MPlayDef.s"
 
-	.equ	song_256_grp, voicegroup120
+	.equ	song_256_grp, voicegroup112
 	.equ	song_256_pri, 4
 	.equ	song_256_rev, 0
 	.equ	song_256_mvl, 127
diff --git a/sound/songs/song_257.s b/sound/songs/song_257.s
index ac49d24b5..58d946bac 100644
--- a/sound/songs/song_257.s
+++ b/sound/songs/song_257.s
@@ -1,6 +1,6 @@
 	.include "MPlayDef.s"
 
-	.equ	song_257_grp, voicegroup120
+	.equ	song_257_grp, voicegroup112
 	.equ	song_257_pri, 4
 	.equ	song_257_rev, 0
 	.equ	song_257_mvl, 127
diff --git a/sound/songs/song_258.s b/sound/songs/song_258.s
index 3d30dfadb..c8264eef5 100644
--- a/sound/songs/song_258.s
+++ b/sound/songs/song_258.s
@@ -1,6 +1,6 @@
 	.include "MPlayDef.s"
 
-	.equ	song_258_grp, voicegroup120
+	.equ	song_258_grp, voicegroup112
 	.equ	song_258_pri, 4
 	.equ	song_258_rev, 0
 	.equ	song_258_mvl, 127
diff --git a/sound/songs/song_259.s b/sound/songs/song_259.s
index e1f13f9b4..754d0ee3d 100644
--- a/sound/songs/song_259.s
+++ b/sound/songs/song_259.s
@@ -1,6 +1,6 @@
 	.include "MPlayDef.s"
 
-	.equ	song_259_grp, voicegroup120
+	.equ	song_259_grp, voicegroup112
 	.equ	song_259_pri, 4
 	.equ	song_259_rev, 0
 	.equ	song_259_mvl, 127
diff --git a/sound/songs/song_260.s b/sound/songs/song_260.s
index d86cb8818..e2404a026 100644
--- a/sound/songs/song_260.s
+++ b/sound/songs/song_260.s
@@ -1,6 +1,6 @@
 	.include "MPlayDef.s"
 
-	.equ	song_260_grp, voicegroup120
+	.equ	song_260_grp, voicegroup112
 	.equ	song_260_pri, 4
 	.equ	song_260_rev, 0
 	.equ	song_260_mvl, 127
diff --git a/sound/songs/song_261.s b/sound/songs/song_261.s
index 12ce50b3b..c6aa7c83b 100644
--- a/sound/songs/song_261.s
+++ b/sound/songs/song_261.s
@@ -1,6 +1,6 @@
 	.include "MPlayDef.s"
 
-	.equ	song_261_grp, voicegroup120
+	.equ	song_261_grp, voicegroup112
 	.equ	song_261_pri, 4
 	.equ	song_261_rev, 0
 	.equ	song_261_mvl, 127
diff --git a/sound/songs/song_262.s b/sound/songs/song_262.s
index fc73a22fd..41becc40f 100644
--- a/sound/songs/song_262.s
+++ b/sound/songs/song_262.s
@@ -1,6 +1,6 @@
 	.include "MPlayDef.s"
 
-	.equ	song_262_grp, voicegroup120
+	.equ	song_262_grp, voicegroup112
 	.equ	song_262_pri, 4
 	.equ	song_262_rev, 0
 	.equ	song_262_mvl, 127
diff --git a/sound/songs/song_263.s b/sound/songs/song_263.s
index 3c2e91ed1..92b2aa904 100644
--- a/sound/songs/song_263.s
+++ b/sound/songs/song_263.s
@@ -1,6 +1,6 @@
 	.include "MPlayDef.s"
 
-	.equ	song_263_grp, voicegroup120
+	.equ	song_263_grp, voicegroup112
 	.equ	song_263_pri, 4
 	.equ	song_263_rev, 0
 	.equ	song_263_mvl, 127
diff --git a/sound/songs/song_264.s b/sound/songs/song_264.s
index 9aeee0182..c37908cd1 100644
--- a/sound/songs/song_264.s
+++ b/sound/songs/song_264.s
@@ -1,6 +1,6 @@
 	.include "MPlayDef.s"
 
-	.equ	song_264_grp, voicegroup120
+	.equ	song_264_grp, voicegroup112
 	.equ	song_264_pri, 4
 	.equ	song_264_rev, 0
 	.equ	song_264_mvl, 127
diff --git a/sound/songs/song_265.s b/sound/songs/song_265.s
index aad399279..3a470e403 100644
--- a/sound/songs/song_265.s
+++ b/sound/songs/song_265.s
@@ -1,6 +1,6 @@
 	.include "MPlayDef.s"
 
-	.equ	song_265_grp, voicegroup120
+	.equ	song_265_grp, voicegroup112
 	.equ	song_265_pri, 4
 	.equ	song_265_rev, 0
 	.equ	song_265_mvl, 127
diff --git a/sound/songs/song_266.s b/sound/songs/song_266.s
index ff486fcfb..ac0a6c4d0 100644
--- a/sound/songs/song_266.s
+++ b/sound/songs/song_266.s
@@ -1,6 +1,6 @@
 	.include "MPlayDef.s"
 
-	.equ	song_266_grp, voicegroup120
+	.equ	song_266_grp, voicegroup112
 	.equ	song_266_pri, 4
 	.equ	song_266_rev, 0
 	.equ	song_266_mvl, 127
diff --git a/sound/songs/song_267.s b/sound/songs/song_267.s
index 0a3dce443..163f6e756 100644
--- a/sound/songs/song_267.s
+++ b/sound/songs/song_267.s
@@ -1,6 +1,6 @@
 	.include "MPlayDef.s"
 
-	.equ	song_267_grp, voicegroup120
+	.equ	song_267_grp, voicegroup112
 	.equ	song_267_pri, 4
 	.equ	song_267_rev, 0
 	.equ	song_267_mvl, 127
diff --git a/sound/songs/song_268.s b/sound/songs/song_268.s
index 7ac4cde15..37d23fcb6 100644
--- a/sound/songs/song_268.s
+++ b/sound/songs/song_268.s
@@ -1,6 +1,6 @@
 	.include "MPlayDef.s"
 
-	.equ	song_268_grp, voicegroup120
+	.equ	song_268_grp, voicegroup112
 	.equ	song_268_pri, 4
 	.equ	song_268_rev, 0
 	.equ	song_268_mvl, 127
diff --git a/sound/songs/song_269.s b/sound/songs/song_269.s
index 1ad443e79..7a103a7df 100644
--- a/sound/songs/song_269.s
+++ b/sound/songs/song_269.s
@@ -1,6 +1,6 @@
 	.include "MPlayDef.s"
 
-	.equ	song_269_grp, voicegroup120
+	.equ	song_269_grp, voicegroup112
 	.equ	song_269_pri, 4
 	.equ	song_269_rev, 0
 	.equ	song_269_mvl, 127
diff --git a/sound/songs/song_270.s b/sound/songs/song_270.s
index c3a84b767..799531a5d 100644
--- a/sound/songs/song_270.s
+++ b/sound/songs/song_270.s
@@ -1,6 +1,6 @@
 	.include "MPlayDef.s"
 
-	.equ	song_270_grp, voicegroup120
+	.equ	song_270_grp, voicegroup112
 	.equ	song_270_pri, 4
 	.equ	song_270_rev, 0
 	.equ	song_270_mvl, 127
diff --git a/sound/songs/song_271.s b/sound/songs/song_271.s
index d7270de07..bbca2ed7c 100644
--- a/sound/songs/song_271.s
+++ b/sound/songs/song_271.s
@@ -1,6 +1,6 @@
 	.include "MPlayDef.s"
 
-	.equ	song_271_grp, voicegroup120
+	.equ	song_271_grp, voicegroup112
 	.equ	song_271_pri, 4
 	.equ	song_271_rev, 0
 	.equ	song_271_mvl, 127
diff --git a/sound/songs/song_272.s b/sound/songs/song_272.s
index c01e34fa6..6ca06fa97 100644
--- a/sound/songs/song_272.s
+++ b/sound/songs/song_272.s
@@ -1,6 +1,6 @@
 	.include "MPlayDef.s"
 
-	.equ	song_272_grp, voicegroup120
+	.equ	song_272_grp, voicegroup112
 	.equ	song_272_pri, 4
 	.equ	song_272_rev, 0
 	.equ	song_272_mvl, 127
diff --git a/sound/songs/song_273.s b/sound/songs/song_273.s
index 037ab7462..0f59a1e92 100644
--- a/sound/songs/song_273.s
+++ b/sound/songs/song_273.s
@@ -1,6 +1,6 @@
 	.include "MPlayDef.s"
 
-	.equ	song_273_grp, voicegroup120
+	.equ	song_273_grp, voicegroup112
 	.equ	song_273_pri, 4
 	.equ	song_273_rev, 0
 	.equ	song_273_mvl, 127
diff --git a/sound/songs/song_274.s b/sound/songs/song_274.s
index a2081ab4a..c20cc0489 100644
--- a/sound/songs/song_274.s
+++ b/sound/songs/song_274.s
@@ -1,6 +1,6 @@
 	.include "MPlayDef.s"
 
-	.equ	song_274_grp, voicegroup120
+	.equ	song_274_grp, voicegroup112
 	.equ	song_274_pri, 4
 	.equ	song_274_rev, 0
 	.equ	song_274_mvl, 127
diff --git a/sound/songs/song_275.s b/sound/songs/song_275.s
index b212e3bcf..838e3a422 100644
--- a/sound/songs/song_275.s
+++ b/sound/songs/song_275.s
@@ -1,6 +1,6 @@
 	.include "MPlayDef.s"
 
-	.equ	song_275_grp, voicegroup120
+	.equ	song_275_grp, voicegroup112
 	.equ	song_275_pri, 4
 	.equ	song_275_rev, 0
 	.equ	song_275_mvl, 127
diff --git a/sound/songs/song_276.s b/sound/songs/song_276.s
index 3aa6555e1..cc239a191 100644
--- a/sound/songs/song_276.s
+++ b/sound/songs/song_276.s
@@ -1,6 +1,6 @@
 	.include "MPlayDef.s"
 
-	.equ	song_276_grp, voicegroup120
+	.equ	song_276_grp, voicegroup112
 	.equ	song_276_pri, 4
 	.equ	song_276_rev, 0
 	.equ	song_276_mvl, 127
diff --git a/sound/songs/song_277.s b/sound/songs/song_277.s
index d550895de..baf7b0b7f 100644
--- a/sound/songs/song_277.s
+++ b/sound/songs/song_277.s
@@ -1,6 +1,6 @@
 	.include "MPlayDef.s"
 
-	.equ	song_277_grp, voicegroup120
+	.equ	song_277_grp, voicegroup112
 	.equ	song_277_pri, 4
 	.equ	song_277_rev, 0
 	.equ	song_277_mvl, 127
diff --git a/sound/songs/song_278.s b/sound/songs/song_278.s
index 51964baca..18919f036 100644
--- a/sound/songs/song_278.s
+++ b/sound/songs/song_278.s
@@ -1,6 +1,6 @@
 	.include "MPlayDef.s"
 
-	.equ	song_278_grp, voicegroup120
+	.equ	song_278_grp, voicegroup112
 	.equ	song_278_pri, 4
 	.equ	song_278_rev, 0
 	.equ	song_278_mvl, 127
diff --git a/sound/songs/song_279.s b/sound/songs/song_279.s
index fc7ff6d17..7f46acc46 100644
--- a/sound/songs/song_279.s
+++ b/sound/songs/song_279.s
@@ -1,6 +1,6 @@
 	.include "MPlayDef.s"
 
-	.equ	song_279_grp, voicegroup120
+	.equ	song_279_grp, voicegroup112
 	.equ	song_279_pri, 4
 	.equ	song_279_rev, 0
 	.equ	song_279_mvl, 127
diff --git a/sound/songs/song_280.s b/sound/songs/song_280.s
index d5494cef4..47e96bed0 100644
--- a/sound/songs/song_280.s
+++ b/sound/songs/song_280.s
@@ -1,6 +1,6 @@
 	.include "MPlayDef.s"
 
-	.equ	song_280_grp, voicegroup120
+	.equ	song_280_grp, voicegroup112
 	.equ	song_280_pri, 4
 	.equ	song_280_rev, 0
 	.equ	song_280_mvl, 127
diff --git a/sound/songs/song_281.s b/sound/songs/song_281.s
index 656d371e9..8f37bade2 100644
--- a/sound/songs/song_281.s
+++ b/sound/songs/song_281.s
@@ -1,6 +1,6 @@
 	.include "MPlayDef.s"
 
-	.equ	song_281_grp, voicegroup120
+	.equ	song_281_grp, voicegroup112
 	.equ	song_281_pri, 4
 	.equ	song_281_rev, 0
 	.equ	song_281_mvl, 127
diff --git a/sound/songs/song_282.s b/sound/songs/song_282.s
index 7f464a81d..9b109ae7e 100644
--- a/sound/songs/song_282.s
+++ b/sound/songs/song_282.s
@@ -1,6 +1,6 @@
 	.include "MPlayDef.s"
 
-	.equ	song_282_grp, voicegroup120
+	.equ	song_282_grp, voicegroup112
 	.equ	song_282_pri, 4
 	.equ	song_282_rev, 0
 	.equ	song_282_mvl, 127
diff --git a/sound/songs/song_283.s b/sound/songs/song_283.s
index ddb61f9cd..2b49a4f9a 100644
--- a/sound/songs/song_283.s
+++ b/sound/songs/song_283.s
@@ -1,6 +1,6 @@
 	.include "MPlayDef.s"
 
-	.equ	song_283_grp, voicegroup120
+	.equ	song_283_grp, voicegroup112
 	.equ	song_283_pri, 4
 	.equ	song_283_rev, 0
 	.equ	song_283_mvl, 127
diff --git a/sound/songs/song_284.s b/sound/songs/song_284.s
index 494161568..ce5489999 100644
--- a/sound/songs/song_284.s
+++ b/sound/songs/song_284.s
@@ -1,6 +1,6 @@
 	.include "MPlayDef.s"
 
-	.equ	song_284_grp, voicegroup120
+	.equ	song_284_grp, voicegroup112
 	.equ	song_284_pri, 4
 	.equ	song_284_rev, 0
 	.equ	song_284_mvl, 127
diff --git a/sound/songs/song_285.s b/sound/songs/song_285.s
index 1f7d2e390..18605965a 100644
--- a/sound/songs/song_285.s
+++ b/sound/songs/song_285.s
@@ -1,6 +1,6 @@
 	.include "MPlayDef.s"
 
-	.equ	song_285_grp, voicegroup120
+	.equ	song_285_grp, voicegroup112
 	.equ	song_285_pri, 4
 	.equ	song_285_rev, 0
 	.equ	song_285_mvl, 127
diff --git a/sound/songs/song_286.s b/sound/songs/song_286.s
index aad68c4ae..d72d601d9 100644
--- a/sound/songs/song_286.s
+++ b/sound/songs/song_286.s
@@ -1,6 +1,6 @@
 	.include "MPlayDef.s"
 
-	.equ	song_286_grp, voicegroup120
+	.equ	song_286_grp, voicegroup112
 	.equ	song_286_pri, 4
 	.equ	song_286_rev, 0
 	.equ	song_286_mvl, 127
diff --git a/sound/songs/song_287.s b/sound/songs/song_287.s
index 3086d750b..279339f0a 100644
--- a/sound/songs/song_287.s
+++ b/sound/songs/song_287.s
@@ -1,6 +1,6 @@
 	.include "MPlayDef.s"
 
-	.equ	song_287_grp, voicegroup120
+	.equ	song_287_grp, voicegroup112
 	.equ	song_287_pri, 4
 	.equ	song_287_rev, 0
 	.equ	song_287_mvl, 127
diff --git a/sound/songs/song_288.s b/sound/songs/song_288.s
index 3e42b6216..f5f09e907 100644
--- a/sound/songs/song_288.s
+++ b/sound/songs/song_288.s
@@ -1,6 +1,6 @@
 	.include "MPlayDef.s"
 
-	.equ	song_288_grp, voicegroup120
+	.equ	song_288_grp, voicegroup112
 	.equ	song_288_pri, 4
 	.equ	song_288_rev, 0
 	.equ	song_288_mvl, 127
diff --git a/sound/songs/song_289.s b/sound/songs/song_289.s
index 877b60865..09c96ed93 100644
--- a/sound/songs/song_289.s
+++ b/sound/songs/song_289.s
@@ -1,6 +1,6 @@
 	.include "MPlayDef.s"
 
-	.equ	song_289_grp, voicegroup120
+	.equ	song_289_grp, voicegroup112
 	.equ	song_289_pri, 4
 	.equ	song_289_rev, 0
 	.equ	song_289_mvl, 127
diff --git a/sound/songs/song_290.s b/sound/songs/song_290.s
index f20504963..000cfd41f 100644
--- a/sound/songs/song_290.s
+++ b/sound/songs/song_290.s
@@ -1,6 +1,6 @@
 	.include "MPlayDef.s"
 
-	.equ	song_290_grp, voicegroup120
+	.equ	song_290_grp, voicegroup112
 	.equ	song_290_pri, 4
 	.equ	song_290_rev, 0
 	.equ	song_290_mvl, 127
diff --git a/sound/songs/song_291.s b/sound/songs/song_291.s
index b0f09ae96..14c2c0403 100644
--- a/sound/songs/song_291.s
+++ b/sound/songs/song_291.s
@@ -1,6 +1,6 @@
 	.include "MPlayDef.s"
 
-	.equ	song_291_grp, voicegroup120
+	.equ	song_291_grp, voicegroup112
 	.equ	song_291_pri, 4
 	.equ	song_291_rev, 0
 	.equ	song_291_mvl, 127
diff --git a/sound/songs/song_292.s b/sound/songs/song_292.s
index 142778575..a55779eb1 100644
--- a/sound/songs/song_292.s
+++ b/sound/songs/song_292.s
@@ -1,6 +1,6 @@
 	.include "MPlayDef.s"
 
-	.equ	song_292_grp, voicegroup120
+	.equ	song_292_grp, voicegroup112
 	.equ	song_292_pri, 4
 	.equ	song_292_rev, 0
 	.equ	song_292_mvl, 127
diff --git a/sound/songs/song_293.s b/sound/songs/song_293.s
index bc23b99d2..28976cfd9 100644
--- a/sound/songs/song_293.s
+++ b/sound/songs/song_293.s
@@ -1,6 +1,6 @@
 	.include "MPlayDef.s"
 
-	.equ	song_293_grp, voicegroup120
+	.equ	song_293_grp, voicegroup112
 	.equ	song_293_pri, 4
 	.equ	song_293_rev, 0
 	.equ	song_293_mvl, 127
diff --git a/sound/songs/song_294.s b/sound/songs/song_294.s
index 6116d6616..1b5ab2d75 100644
--- a/sound/songs/song_294.s
+++ b/sound/songs/song_294.s
@@ -1,6 +1,6 @@
 	.include "MPlayDef.s"
 
-	.equ	song_294_grp, voicegroup120
+	.equ	song_294_grp, voicegroup112
 	.equ	song_294_pri, 4
 	.equ	song_294_rev, 0
 	.equ	song_294_mvl, 127
diff --git a/sound/songs/song_295.s b/sound/songs/song_295.s
index 9cc3de9db..6a8ac6cfa 100644
--- a/sound/songs/song_295.s
+++ b/sound/songs/song_295.s
@@ -1,6 +1,6 @@
 	.include "MPlayDef.s"
 
-	.equ	song_295_grp, voicegroup120
+	.equ	song_295_grp, voicegroup112
 	.equ	song_295_pri, 4
 	.equ	song_295_rev, 0
 	.equ	song_295_mvl, 127
diff --git a/sound/songs/song_296.s b/sound/songs/song_296.s
index dcacf6f15..9226b1a6c 100644
--- a/sound/songs/song_296.s
+++ b/sound/songs/song_296.s
@@ -1,6 +1,6 @@
 	.include "MPlayDef.s"
 
-	.equ	song_296_grp, voicegroup120
+	.equ	song_296_grp, voicegroup112
 	.equ	song_296_pri, 4
 	.equ	song_296_rev, 0
 	.equ	song_296_mvl, 127
diff --git a/sound/songs/song_297.s b/sound/songs/song_297.s
index 57199cf23..d92598fd4 100644
--- a/sound/songs/song_297.s
+++ b/sound/songs/song_297.s
@@ -1,6 +1,6 @@
 	.include "MPlayDef.s"
 
-	.equ	song_297_grp, voicegroup120
+	.equ	song_297_grp, voicegroup112
 	.equ	song_297_pri, 4
 	.equ	song_297_rev, 0
 	.equ	song_297_mvl, 127
diff --git a/sound/songs/song_298.s b/sound/songs/song_298.s
index f3e7ec882..0bcf70111 100644
--- a/sound/songs/song_298.s
+++ b/sound/songs/song_298.s
@@ -1,6 +1,6 @@
 	.include "MPlayDef.s"
 
-	.equ	song_298_grp, voicegroup120
+	.equ	song_298_grp, voicegroup112
 	.equ	song_298_pri, 4
 	.equ	song_298_rev, 0
 	.equ	song_298_mvl, 127
diff --git a/sound/voice_groups.inc b/sound/voice_groups.inc
index 52f332f8c..267dddea6 100644
--- a/sound/voice_groups.inc
+++ b/sound/voice_groups.inc
@@ -12133,7 +12133,7 @@ voicegroup111:: @ 8451F90
 	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel6, 255, 0, 255, 165
 
 	.align 2
-voicegroup112:: @ 8452590
+gCryTable:: @ 8452590
 	cry Cry_Bulbasaur
 	cry Cry_Ivysaur
 	cry Cry_Venusaur
@@ -12262,9 +12262,6 @@ voicegroup112:: @ 8452590
 	cry Cry_Magmar
 	cry Cry_Pinsir
 	cry Cry_Tauros
-
-	.align 2
-voicegroup113:: @ 8452B90
 	cry Cry_Magikarp
 	cry Cry_Gyarados
 	cry Cry_Lapras
@@ -12393,9 +12390,6 @@ voicegroup113:: @ 8452B90
 	cry Cry_Torkoal
 	cry Cry_Electrike
 	cry Cry_Manectric
-
-	.align 2
-voicegroup114:: @ 8453190
 	cry Cry_Duskull
 	cry Cry_Latias
 	cry Cry_Wynaut
@@ -12524,16 +12518,13 @@ voicegroup114:: @ 8453190
 	cry Cry_Wailord
 	cry Cry_Whismur
 	cry Cry_Snorunt
-
-	.align 2
-voicegroup115:: @ 8453790
 	cry Cry_Latios
 	cry Cry_Jirachi
 	cry Cry_Deoxys
 	cry Cry_Chimecho
 
 	.align 2
-voicegroup116:: @ 84537C0
+gCryTable2:: @ 84537C0
 	cry2 Cry_Bulbasaur
 	cry2 Cry_Ivysaur
 	cry2 Cry_Venusaur
@@ -12662,9 +12653,6 @@ voicegroup116:: @ 84537C0
 	cry2 Cry_Magmar
 	cry2 Cry_Pinsir
 	cry2 Cry_Tauros
-
-	.align 2
-voicegroup117:: @ 8453DC0
 	cry2 Cry_Magikarp
 	cry2 Cry_Gyarados
 	cry2 Cry_Lapras
@@ -12793,9 +12781,6 @@ voicegroup117:: @ 8453DC0
 	cry2 Cry_Torkoal
 	cry2 Cry_Electrike
 	cry2 Cry_Manectric
-
-	.align 2
-voicegroup118:: @ 84543C0
 	cry2 Cry_Duskull
 	cry2 Cry_Latias
 	cry2 Cry_Wynaut
@@ -12924,16 +12909,13 @@ voicegroup118:: @ 84543C0
 	cry2 Cry_Wailord
 	cry2 Cry_Whismur
 	cry2 Cry_Snorunt
-
-	.align 2
-voicegroup119:: @ 84549C0
 	cry2 Cry_Latios
 	cry2 Cry_Jirachi
 	cry2 Cry_Deoxys
 	cry2 Cry_Chimecho
 
 	.align 2
-voicegroup120:: @ 84549F0
+voicegroup112:: @ 84549F0
 	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel7, 255, 0, 255, 0
 	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel8, 255, 0, 255, 0
 	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel9, 255, 0, 255, 0
@@ -12987,7 +12969,7 @@ voicegroup120:: @ 84549F0
 	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel57, 255, 0, 255, 0
 
 	.align 2
-voicegroup121:: @ 8454C54
+voicegroup113:: @ 8454C54
 	voice_keysplit_all voicegroup001
 	voice_square_1 0, 2, 0, 0, 15, 0
 	voice_square_1 0, 2, 0, 0, 15, 0
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;
     }
 }