diff --git a/src/Cry_Table.c b/src/Cry_Table.c
index f66cc2a..6c3d2a6 100644
--- a/src/Cry_Table.c
+++ b/src/Cry_Table.c
@@ -12920,7 +12920,7 @@ const struct ToneData gCryTable[NUM_SPECIES] =
 		.sustain = 0xff,
 		.release = 0x0,
 	},
-/*	[SPECIES_GROOKEY] =
+	[SPECIES_GROOKEY] =
 	{	
 		.type = 0x20,
 		.key = 0x3c,
@@ -13394,7 +13394,7 @@ const struct ToneData gCryTable[NUM_SPECIES] =
 		.key = 0x3c,
 		.length = 0x0,
 		.pan_sweep = 0x0,
-		.wav = gCryToxtricity,
+		.wav = gCryToxtricityAmped,
 		.attack = 0xff,
 		.decay = 0x0,
 		.sustain = 0xff,
@@ -13718,7 +13718,7 @@ const struct ToneData gCryTable[NUM_SPECIES] =
 		.key = 0x3c,
 		.length = 0x0,
 		.pan_sweep = 0x0,
-		.wav = gCryIndeedee,
+		.wav = gCryIndeedeeMale,
 		.attack = 0xff,
 		.decay = 0x0,
 		.sustain = 0xff,
@@ -13892,7 +13892,7 @@ const struct ToneData gCryTable[NUM_SPECIES] =
 		.sustain = 0xff,
 		.release = 0x0,
 	},
-	[SPECIES_ZARUDE] =
+/*	[SPECIES_ZARUDE] =
 	{	
 		.type = 0x20,
 		.key = 0x3c,
@@ -13963,7 +13963,7 @@ const struct ToneData gCryTable[NUM_SPECIES] =
 		.decay = 0x0,
 		.sustain = 0xff,
 		.release = 0x0,
-	},
+	}, */
 	[SPECIES_CRAMORANT_GULPING] =
 	{	
 		.type = 0x20,
@@ -13994,7 +13994,7 @@ const struct ToneData gCryTable[NUM_SPECIES] =
 		.key = 0x3c,
 		.length = 0x0,
 		.pan_sweep = 0x0,
-		.wav = gCryToxtricity,
+		.wav = gCryToxtricityLowKey,
 		.attack = 0xff,
 		.decay = 0x0,
 		.sustain = 0xff,
@@ -14114,7 +14114,7 @@ const struct ToneData gCryTable[NUM_SPECIES] =
 		.key = 0x3c,
 		.length = 0x0,
 		.pan_sweep = 0x0,
-		.wav = gCryIndeedee,
+		.wav = gCryIndeedeeFemale,
 		.attack = 0xff,
 		.decay = 0x0,
 		.sustain = 0xff,
@@ -14138,7 +14138,7 @@ const struct ToneData gCryTable[NUM_SPECIES] =
 		.key = 0x3c,
 		.length = 0x0,
 		.pan_sweep = 0x0,
-		.wav = gCryZacian,
+		.wav = gCryZacianCrowned,
 		.attack = 0xff,
 		.decay = 0x0,
 		.sustain = 0xff,
@@ -14150,7 +14150,7 @@ const struct ToneData gCryTable[NUM_SPECIES] =
 		.key = 0x3c,
 		.length = 0x0,
 		.pan_sweep = 0x0,
-		.wav = gCryZamazenta,
+		.wav = gCryZamazentaCrowned,
 		.attack = 0xff,
 		.decay = 0x0,
 		.sustain = 0xff,
@@ -14168,7 +14168,7 @@ const struct ToneData gCryTable[NUM_SPECIES] =
 		.sustain = 0xff,
 		.release = 0x0,
 	},
-	[SPECIES_URSHIFU_RAPID] =
+/*	[SPECIES_URSHIFU_RAPID] =
 	{	
 		.type = 0x20,
 		.key = 0x3c,
@@ -14179,7 +14179,7 @@ const struct ToneData gCryTable[NUM_SPECIES] =
 		.decay = 0x0,
 		.sustain = 0xff,
 		.release = 0x0,
-	},
+	}, */
 	[SPECIES_MEOWTH_G] =
 	{	
 		.type = 0x20,
@@ -14714,7 +14714,7 @@ const struct ToneData gCryTable[NUM_SPECIES] =
 		.key = 0x3c,
 		.length = 0x0,
 		.pan_sweep = 0x0,
-		.wav = gCryToxtricity,
+		.wav = gCryToxtricityAmped,
 		.attack = 0xff,
 		.decay = 0x0,
 		.sustain = 0xff,
@@ -14726,7 +14726,7 @@ const struct ToneData gCryTable[NUM_SPECIES] =
 		.key = 0x3c,
 		.length = 0x0,
 		.pan_sweep = 0x0,
-		.wav = gCryToxtricity,
+		.wav = gCryToxtricityLowKey,
 		.attack = 0xff,
 		.decay = 0x0,
 		.sustain = 0xff,
@@ -14804,7 +14804,7 @@ const struct ToneData gCryTable[NUM_SPECIES] =
 		.sustain = 0xff,
 		.release = 0x0,
 	},
-	[SPECIES_URSHIFU_SINGLE_GIGA] =
+/*	[SPECIES_URSHIFU_SINGLE_GIGA] =
 	{	
 		.type = 0x20,
 		.key = 0x3c,