diff --git a/src/Evolution Table.c b/src/Evolution Table.c
index 5b2e8cd..c66cd3a 100644
--- a/src/Evolution Table.c	
+++ b/src/Evolution Table.c	
@@ -619,8 +619,10 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
 	[SPECIES_SILICOBRA] =        {{EVO_LEVEL, 36, SPECIES_SANDACONDA, 0}},
 //	[SPECIES_SANDACONDA] =       {{EVO_GIGANTAMAX, TRUE, SPECIES_SANDACONDA_GIGA, 0}},
 	[SPECIES_ARROKUDA] =         {{EVO_LEVEL, 26, SPECIES_BARRASKEWDA, 0}},
-	[SPECIES_TOXEL] =            {{EVO_NATURE_HIGH, 30, SPECIES_TOXTRICITY, 0},
-								  {EVO_NATURE_LOW, 30, SPECIES_TOXTRICITY_LOW_KEY, 0}}, 
+	[SPECIES_TOXEL] =            {{EVO_LEVEL_CASCOON, 30, SPECIES_TOXTRICITY, 0},	//Personality values are the closest to nature I can think of. Cascoon has a high personality value, btw
+								  {EVO_LEVEL_SILCOON, 30, SPECIES_TOXTRICITY_LOW_KEY, 0}/*
+								  {EVO_NATURE_HIGH, 30, SPECIES_TOXTRICITY, 0},
+								  {EVO_NATURE_LOW, 30, SPECIES_TOXTRICITY_LOW_KEY, 0}*/}, 
 //	[SPECIES_TOXTRICITY] =       {{EVO_GIGANTAMAX, TRUE, SPECIES_TOXTRICITY_GIGA, 0}},
 	[SPECIES_SIZZLIPEDE] =       {{EVO_LEVEL, 28, SPECIES_CENTISKORCH, 0}},
 //	[SPECIES_CENTISKORCH] =      {{EVO_GIGANTAMAX, TRUE, SPECIES_CENTISKORCH_GIGA, 0}},
@@ -646,8 +648,8 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
 //	[SPECIES_DURALUDON] =        {{EVO_GIGANTAMAX, TRUE, SPECIES_DURALUDON_GIGA, 0}},
 	[SPECIES_DREEPY] =           {{EVO_LEVEL, 50, SPECIES_DRAKLOAK, 0}},
 	[SPECIES_DRAKLOAK] =         {{EVO_LEVEL, 60, SPECIES_DRAGAPULT, 0}},
-	[SPECIES_KUBFU] =            {{EVO_MOVE_TYPE, TYPE_DARK, SPECIES_URSHIFU_SINGLE, 0},
-								  {EVO_MOVE_TYPE, TYPE_WATER, SPECIES_URSHIFU_RAPID, 0}}, //Location/event based evolution
+	[SPECIES_KUBFU] =            {{EVO_ITEM, ITEM_DUSK_STONE, SPECIES_URSHIFU_SINGLE, 0},	//Idk what else to put as a placeholder here
+								  {EVO_ITEM, ITEM_WATER_STONE, SPECIES_URSHIFU_RAPID, 0}}, //Location/event based evolution
 //	[SPECIES_URSHIFU_SINGLE] =   {{EVO_GIGANTAMAX, TRUE, SPECIES_URSHIFU_SINGLE_GIGA, 0}}, 
 //	[SPECIES_TOXTRICITY_LOW_KEY] = {{EVO_GIGANTAMAX, TRUE, SPECIES_TOXTRICITY_LOW_KEY_GIGA, 0}}, 
 	[SPECIES_SINISTEA_CHIPPED] = {{EVO_ITEM, ITEM_CHIPPED_POT, SPECIES_POLTEAGEIST_CHIPPED, 0}},
@@ -661,9 +663,9 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
 	[SPECIES_MEOWTH_G] =         {{EVO_LEVEL, 28, SPECIES_PERRSERKER, 0}},
 	[SPECIES_PONYTA_G] =         {{EVO_LEVEL, 40, SPECIES_RAPIDASH_G, 0}},
 	[SPECIES_SLOWPOKE_G] =       {{EVO_ITEM, ITEM_GALARICA_CUFF, SPECIES_SLOWBRO_G, 0},
-								  {EVO_ITEM, ITEM_GALARICA_CROWN, SPECIES_SLOWKING_G, 0}}, //Item name is a placeholder
-	[SPECIES_FARFETCHD_G] =      {{EVO_FRIENDSHIP, 0, SPECIES_SIRFETCHD, 0},
-								  {EVO_CRITICAL_HIT, 0, SPECIES_SIRFETCHD, 0}},
+								  {EVO_ITEM, ITEM_GALARICA_WREATH, SPECIES_SLOWKING_G, 0}},
+	[SPECIES_FARFETCHD_G] =      {{EVO_FRIENDSHIP, 0, SPECIES_SIRFETCHD, 0}/*,
+								  {EVO_CRITICAL_HIT, 0, SPECIES_SIRFETCHD, 0}*/},
 	[SPECIES_KOFFING_G] =        {{EVO_LEVEL, 35, SPECIES_WEEZING_G, 0}},
 	[SPECIES_MIME_JR_G] =        {{EVO_MOVE, MOVE_MIMIC, SPECIES_MR_MIME_G, 0}},
 	[SPECIES_MR_MIME_G] =        {{EVO_LEVEL, 42, SPECIES_MR_RIME, 0}},
@@ -671,8 +673,8 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
 	[SPECIES_ZIGZAGOON_G] =      {{EVO_LEVEL, 20, SPECIES_LINOONE_G, 0}},
 	[SPECIES_LINOONE_G] =        {{EVO_LEVEL_NIGHT, 35, SPECIES_OBSTAGOON, 0}},
 	[SPECIES_DARUMAKA_G] =       {{EVO_ITEM, ITEM_ICE_STONE, SPECIES_DARMANITAN_G, 0}},
-	[SPECIES_YAMASK_G] =         {{EVO_LEVEL, 35, SPECIES_RUNERIGUS, 0},
-								  {EVO_DAMAGE_LOCATION, 0, SPECIES_RUNERIGUS, 0}},
+	[SPECIES_YAMASK_G] =         {{EVO_LEVEL, 35, SPECIES_RUNERIGUS, 0}/*,
+								  {EVO_DAMAGE_LOCATION, 0, SPECIES_RUNERIGUS, 0}*/},
 	
 /*	[SPECIES_VENUSAUR_GIGA] =    {{EVO_GIGANTAMAX, FALSE, SPECIES_VENUSAUR, 0}},
 	[SPECIES_CHARIZARD_GIGA] =   {{EVO_GIGANTAMAX, FALSE, SPECIES_CHARIZARD, 0}},