diff --git a/src/Evolution Table.c b/src/Evolution Table.c
index ec4beea..b6946fe 100644
--- a/src/Evolution Table.c	
+++ b/src/Evolution Table.c	
@@ -589,38 +589,38 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
 	[SPECIES_YAMPER] =           {{EVO_LEVEL, 25, SPECIES_BOLTUND, 0}},
 	[SPECIES_ROLYCOLY] =         {{EVO_LEVEL, 18, SPECIES_CARKOL, 0}},
 	[SPECIES_CARKOL] =           {{EVO_LEVEL, 34, SPECIES_COALOSSAL, 0}},
-	[SPECIES_APPLIN] =           {{EVO_ITEM, ITEM_TART_APPLE, SPECIES_FLAPPLE, 0}, //IS DEFINED IN ITEMS
-								  {EVO_ITEM, ITEM_SWEET_APPLE, SPECIES_APPLETUN, 0}}, //IS DEFINED IN ITEMS
+	[SPECIES_APPLIN] =           {{EVO_ITEM, ITEM_TART_APPLE, SPECIES_FLAPPLE, 0},
+								  {EVO_ITEM, ITEM_SWEET_APPLE, SPECIES_APPLETUN, 0}},
 	[SPECIES_SILICOBRA] =        {{EVO_LEVEL, 36, SPECIES_SANDACONDA, 0}},
 	[SPECIES_ARROKUDA] =         {{EVO_LEVEL, 26, SPECIES_BARRASKEWDA, 0}},
-	[SPECIES_TOXEL] =            {{EVO_LEVEL_CASCOON, 30, SPECIES_TOXTRICITY, 0}, //PERSONALITY VALUES SUBSTITUTE NATURES
-								  {EVO_LEVEL_SILCOON, 30, SPECIES_TOXTRICITY_LOW_KEY, 0}},
+/*	[SPECIES_TOXEL] =            {{EVO_NATURE_HIGH, 30, SPECIES_TOXTRICITY, 0},
+								  {EVO_NATURE_LOW, 30, SPECIES_TOXTRICITY_LOW_KEY, 0}},*/
 	[SPECIES_SIZZLIPEDE] =       {{EVO_LEVEL, 28, SPECIES_CENTISKORCH, 0}},
 	[SPECIES_CLOBBOPUS] =        {{EVO_MOVE, MOVE_TAUNT, SPECIES_GRAPPLOCT, 0}},
-	[SPECIES_SINISTEA] =         {{EVO_ITEM, ITEM_CRACKED_POT, SPECIES_POLTEAGEIST, 0}, //IS DEFINED IN ITEMS
-	[SPECIES_SINISTEA_CHIPPED] = {{EVO_ITEM, ITEM_CHIPPED_POT, SPECIES_POLTEAGEIST_CHIPPED, 0} //IS DEFINED IN ITEMS
+	[SPECIES_SINISTEA] =         {{EVO_ITEM, ITEM_CRACKED_POT, SPECIES_POLTEAGEIST, 0},
+	[SPECIES_SINISTEA_CHIPPED] = {{EVO_ITEM, ITEM_CHIPPED_POT, SPECIES_POLTEAGEIST_CHIPPED, 0}
 	[SPECIES_HATENNA] =          {{EVO_LEVEL, 32, SPECIES_HATTREM, 0}},
 	[SPECIES_HATTREM] =          {{EVO_LEVEL, 42, SPECIES_HATTERENE, 0}},
 	[SPECIES_IMPIDIMP] =         {{EVO_LEVEL, 32, SPECIES_MORGREM, 0}},
 	[SPECIES_MORGREM] =          {{EVO_LEVEL, 42, SPECIES_GRIMMSNARL, 0}},
-	[SPECIES_MILCERY] =          {{EVO_ITEM, ITEM_STRAWBERRY_SWEET, SPECIES_ALCREMIE_STRAWBERRY, 0}, //IS DEFINED IN ITEMS
-								{EVO_ITEM, ITEM_BERRY_SWEET, SPECIES_ALCREMIE_BERRY, 0}, //IS DEFINED IN ITEMS
-					       			{EVO_ITEM, ITEM_LOVE_SWEET, SPECIES_ALCREMIE_LOVE, 0}, //IS DEFINED IN ITEMS
-								{EVO_ITEM, ITEM_CLOVER_SWEET, SPECIES_ALCREMIE_CLOVER, 0}, //IS DEFINED IN ITEMS
-								{EVO_ITEM, ITEM_FLOWER_SWEET, SPECIES_ALCREMIE_FLOWER, 0}, //IS DEFINED IN ITEMS
-					  			{EVO_ITEM, ITEM_RIBBON_SWEET, SPECIES_ALCREMIE_RIBBON, 0}, //IS DEFINED IN ITEMS
-					   			{EVO_ITEM, ITEM_STAR_SWEET, SPECIES_ALCREMIE_STAR, 0}}, //IS DEFINED IN ITEMS
+	[SPECIES_MILCERY] =          {{EVO_ITEM, ITEM_STRAWBERRY_SWEET, SPECIES_ALCREMIE_STRAWBERRY, 0},
+								{EVO_ITEM, ITEM_BERRY_SWEET, SPECIES_ALCREMIE_BERRY, 0},
+					       			{EVO_ITEM, ITEM_LOVE_SWEET, SPECIES_ALCREMIE_LOVE, 0},
+								{EVO_ITEM, ITEM_CLOVER_SWEET, SPECIES_ALCREMIE_CLOVER, 0},
+								{EVO_ITEM, ITEM_FLOWER_SWEET, SPECIES_ALCREMIE_FLOWER, 0},
+					  			{EVO_ITEM, ITEM_RIBBON_SWEET, SPECIES_ALCREMIE_RIBBON, 0},
+					   			{EVO_ITEM, ITEM_STAR_SWEET, SPECIES_ALCREMIE_STAR, 0}},
 	[SPECIES_SNOM] =             {{EVO_FRIENDSHIP_NIGHT, 0, SPECIES_FROSMOTH, 0}},
 	[SPECIES_CUFANT] =           {{EVO_LEVEL, 34, SPECIES_COPPERAJAH, 0}},
 	[SPECIES_DREEPY] =           {{EVO_LEVEL, 50, SPECIES_DRAKLOAK, 0}},
 	[SPECIES_DRAGAPULT] =        {{EVO_LEVEL, 60, SPECIES_DRAGAPULT, 0}},
-	[SPECIES_KUBFU] =            {{EVO_LEVEL_CASCOON, 50, SPECIES_URSHIFU_SINGLE, 0}, //PLACEHOLDER
-								  {EVO_LEVEL_SILCOON, 50, SPECIES_URSHIFU_RAPID, 0}}, //PLACEHOLDER
+/*	[SPECIES_KUBFU] =            {{EVO_NATURE_HIGH, 50, SPECIES_URSHIFU_SINGLE, 0}, //PLACEHOLDER
+								  {EVO_NATURE_LOW, 50, SPECIES_URSHIFU_RAPID, 0}}, */
 	[SPECIES_MEOWTH_G] =         {{EVO_LEVEL, 28, SPECIES_PERRSERKER, 0}},
 	[SPECIES_PONYTA_G] =         {{EVO_LEVEL, 40, SPECIES_RAPIDASH_G, 0}},
-	[SPECIES_SLOWPOKE_G] =       {{EVO_LEVEL, 37, SPECIES_SLOWBRO_G, 0}, //PLACEHOLDER	 
-								  {EVO_ITEM, ITEM_KINGS_ROCK, SPECIES_SLOWKING_G, 0}}, //PLACEHOLDER
-	[SPECIES_FARFETCHD_G] =      {{EVO_FRIENDSHIP, 0, SPECIES_SIRFETCHD, 0}},
+/*	[SPECIES_SLOWPOKE_G] =       {{EVO_LEVEL, 37, SPECIES_SLOWBRO_G, 0}, //PLACEHOLDER	 
+								  {EVO_ITEM, ITEM_KINGS_ROCK, SPECIES_SLOWKING_G, 0}}, */
+//	[SPECIES_FARFETCHD_G] =      {{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}},
@@ -628,5 +628,5 @@ 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, 34, SPECIES_RUNERIGUS, 0}}, //UNLESS YOU HAVE ANY BETTER IDEAS
+//	[SPECIES_YAMASK_G] =         {{EVO_DAMAGE_LOCATION, 0, SPECIES_RUNERIGUS, 0}},
 };