diff --git a/Pokemon.json b/Pokemon.json
index 391c39d..298584d 100644
--- a/Pokemon.json
+++ b/Pokemon.json
@@ -257,7 +257,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "kadabra", "method": "level", "data": "16" }]
+    "evolutions": [{ "species": "kadabra", "method": "level", "data": 16 }]
   },
   "absol": {
     "species": "absol",
@@ -1235,7 +1235,7 @@
       }
     },
     "evolutions": [
-      { "species": "ambipom", "method": "hasmove", "data": "doublehit" }
+      { "species": "ambipom", "method": "hasmove", "data": "double_hit" }
     ]
   },
   "alakazam": {
@@ -2265,7 +2265,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "armaldo", "method": "level", "data": "40" }]
+    "evolutions": [{ "species": "armaldo", "method": "level", "data": 40 }]
   },
   "araquanid": {
     "species": "araquanid",
@@ -2754,7 +2754,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "archeops", "method": "level", "data": "37" }]
+    "evolutions": [{ "species": "archeops", "method": "level", "data": 37 }]
   },
   "archeops": {
     "species": "archeops",
@@ -3235,7 +3235,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "lairon", "method": "level", "data": "32" }]
+    "evolutions": [{ "species": "lairon", "method": "level", "data": 32 }]
   },
   "articuno": {
     "species": "articuno",
@@ -3836,7 +3836,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "fraxure", "method": "level", "data": "38" }]
+    "evolutions": [{ "species": "fraxure", "method": "level", "data": 38 }]
   },
   "azelf": {
     "species": "azelf",
@@ -4114,7 +4114,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "marill", "method": "happiness", "data": "" }]
+    "evolutions": [{ "species": "marill", "method": "happiness", "data": 220 }]
   },
   "bagon": {
     "species": "bagon",
@@ -4205,7 +4205,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "shelgon", "method": "level", "data": "30" }]
+    "evolutions": [{ "species": "shelgon", "method": "level", "data": 30 }]
   },
   "baltoy": {
     "species": "baltoy",
@@ -4304,7 +4304,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "claydol", "method": "level", "data": "36" }]
+    "evolutions": [{ "species": "claydol", "method": "level", "data": 36 }]
   },
   "banette": {
     "species": "banette",
@@ -4699,7 +4699,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "whiscash", "method": "level", "data": "30" }]
+    "evolutions": [{ "species": "whiscash", "method": "level", "data": 30 }]
   },
   "basculin": {
     "species": "basculin",
@@ -5032,7 +5032,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "meganium", "method": "level", "data": "32" }]
+    "evolutions": [{ "species": "meganium", "method": "level", "data": 32 }]
   },
   "beartic": {
     "species": "beartic",
@@ -5530,7 +5530,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "metang", "method": "level", "data": "20" }]
+    "evolutions": [{ "species": "metang", "method": "level", "data": 20 }]
   },
   "bellossom": {
     "species": "bellossom",
@@ -5710,7 +5710,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "weepinbell", "method": "level", "data": "21" }]
+    "evolutions": [{ "species": "weepinbell", "method": "level", "data": 21 }]
   },
   "bergmite": {
     "species": "bergmite",
@@ -6078,7 +6078,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "bibarel", "method": "level", "data": "15" }]
+    "evolutions": [{ "species": "bibarel", "method": "level", "data": 15 }]
   },
   "binacle": {
     "species": "binacle",
@@ -6855,7 +6855,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "zebstrika", "method": "level", "data": "27" }]
+    "evolutions": [{ "species": "zebstrika", "method": "level", "data": 27 }]
   },
   "boldore": {
     "species": "boldore",
@@ -7773,7 +7773,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "bronzong", "method": "level", "data": "33" }]
+    "evolutions": [{ "species": "bronzong", "method": "level", "data": 33 }]
   },
   "bruxish": {
     "species": "bruxish",
@@ -7954,7 +7954,7 @@
       }
     },
     "evolutions": [
-      { "species": "roselia", "method": "happinessday", "data": "" }
+      { "species": "roselia", "method": "happinessday", "data": 220 }
     ]
   },
   "buizel": {
@@ -8051,7 +8051,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "floatzel", "method": "level", "data": "26" }]
+    "evolutions": [{ "species": "floatzel", "method": "level", "data": 26 }]
   },
   "bulbasaur": {
     "species": "bulbasaur",
@@ -8149,7 +8149,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "ivysaur", "method": "level", "data": "16" }]
+    "evolutions": [{ "species": "ivysaur", "method": "level", "data": 16 }]
   },
   "buneary": {
     "species": "buneary",
@@ -8252,7 +8252,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "lopunny", "method": "happiness", "data": "" }]
+    "evolutions": [{ "species": "lopunny", "method": "happiness", "data": 220 }]
   },
   "bunnelby": {
     "species": "bunnelby",
@@ -8682,7 +8682,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "cacturne", "method": "level", "data": "32" }]
+    "evolutions": [{ "species": "cacturne", "method": "level", "data": 32 }]
   },
   "cacturne": {
     "species": "cacturne",
@@ -9328,7 +9328,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "sharpedo", "method": "level", "data": "30" }]
+    "evolutions": [{ "species": "sharpedo", "method": "level", "data": 30 }]
   },
   "cascoon": {
     "species": "cascoon",
@@ -9371,7 +9371,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "dustox", "method": "level", "data": "10" }]
+    "evolutions": [{ "species": "dustox", "method": "level", "data": 10 }]
   },
   "castform": {
     "species": "castform",
@@ -9723,7 +9723,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "metapod", "method": "level", "data": "7" }]
+    "evolutions": [{ "species": "metapod", "method": "level", "data": 7 }]
   },
   "celebi": {
     "species": "celebi",
@@ -10114,7 +10114,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "blissey", "method": "happiness", "data": "" }]
+    "evolutions": [{ "species": "blissey", "method": "happiness", "data": 220 }]
   },
   "charizard": {
     "species": "charizard",
@@ -10587,7 +10587,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "charmeleon", "method": "level", "data": "16" }]
+    "evolutions": [{ "species": "charmeleon", "method": "level", "data": 16 }]
   },
   "charmeleon": {
     "species": "charmeleon",
@@ -10672,7 +10672,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "charizard", "method": "level", "data": "36" }]
+    "evolutions": [{ "species": "charizard", "method": "level", "data": 36 }]
   },
   "chatot": {
     "species": "chatot",
@@ -10943,7 +10943,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "cherrim", "method": "level", "data": "25" }]
+    "evolutions": [{ "species": "cherrim", "method": "level", "data": 25 }]
   },
   "chesnaught": {
     "species": "chesnaught",
@@ -11253,7 +11253,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "bayleef", "method": "level", "data": "16" }]
+    "evolutions": [{ "species": "bayleef", "method": "level", "data": 16 }]
   },
   "chimchar": {
     "species": "chimchar",
@@ -11356,7 +11356,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "monferno", "method": "level", "data": "14" }]
+    "evolutions": [{ "species": "monferno", "method": "level", "data": 14 }]
   },
   "chimecho": {
     "species": "chimecho",
@@ -11560,7 +11560,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "lanturn", "method": "level", "data": "27" }]
+    "evolutions": [{ "species": "lanturn", "method": "level", "data": 27 }]
   },
   "chingling": {
     "species": "chingling",
@@ -11654,7 +11654,7 @@
       }
     },
     "evolutions": [
-      { "species": "chimecho", "method": "happinessnight", "data": "" }
+      { "species": "chimecho", "method": "happinessnight", "data": 220 }
     ]
   },
   "cinccino": {
@@ -11816,8 +11816,8 @@
       }
     },
     "evolutions": [
-      { "species": "huntail", "method": "tradeitem", "data": "deepseatooth" },
-      { "species": "gorebyss", "method": "tradeitem", "data": "deepseascale" }
+      { "species": "huntail", "method": "tradeitem", "data": "deep_sea_tooth" },
+      { "species": "gorebyss", "method": "tradeitem", "data": "deep_sea_scale" }
     ]
   },
   "clauncher": {
@@ -12303,7 +12303,7 @@
       }
     },
     "evolutions": [
-      { "species": "clefable", "method": "item", "data": "moonstone" }
+      { "species": "clefable", "method": "item", "data": "moon_stone" }
     ]
   },
   "cleffa": {
@@ -12400,7 +12400,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "clefairy", "method": "happiness", "data": "" }]
+    "evolutions": [{ "species": "clefairy", "method": "happiness", "data": 220 }]
   },
   "cloyster": {
     "species": "cloyster",
@@ -12803,7 +12803,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "blaziken", "method": "level", "data": "36" }]
+    "evolutions": [{ "species": "blaziken", "method": "level", "data": 36 }]
   },
   "comfey": {
     "species": "comfey",
@@ -13094,7 +13094,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "crawdaunt", "method": "level", "data": "30" }]
+    "evolutions": [{ "species": "crawdaunt", "method": "level", "data": 30 }]
   },
   "corsola": {
     "species": "corsola",
@@ -13387,7 +13387,7 @@
       }
     },
     "evolutions": [
-      { "species": "whimsicott", "method": "item", "data": "sunstone" }
+      { "species": "whimsicott", "method": "item", "data": "sun_stone" }
     ]
   },
   "crabominable": {
@@ -13762,7 +13762,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "rampardos", "method": "level", "data": "30" }]
+    "evolutions": [{ "species": "rampardos", "method": "level", "data": 30 }]
   },
   "crawdaunt": {
     "species": "crawdaunt",
@@ -14067,7 +14067,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "toxicroak", "method": "level", "data": "37" }]
+    "evolutions": [{ "species": "toxicroak", "method": "level", "data": 37 }]
   },
   "crobat": {
     "species": "crobat",
@@ -14254,7 +14254,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "feraligatr", "method": "level", "data": "30" }]
+    "evolutions": [{ "species": "feraligatr", "method": "level", "data": 30 }]
   },
   "crustle": {
     "species": "crustle",
@@ -14531,7 +14531,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "beartic", "method": "level", "data": "37" }]
+    "evolutions": [{ "species": "beartic", "method": "level", "data": 37 }]
   },
   "cubone": {
     "species": "cubone",
@@ -14633,7 +14633,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "marowak", "method": "level", "data": "28" }]
+    "evolutions": [{ "species": "marowak", "method": "level", "data": 28 }]
   },
   "cutiefly": {
     "species": "cutiefly",
@@ -14820,7 +14820,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "quilava", "method": "level", "data": "14" }]
+    "evolutions": [{ "species": "quilava", "method": "level", "data": 14 }]
   },
   "darkrai": {
     "species": "darkrai",
@@ -15305,7 +15305,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "darmanitan", "method": "level", "data": "35" }]
+    "evolutions": [{ "species": "darmanitan", "method": "level", "data": 35 }]
   },
   "decidueye": {
     "species": "decidueye",
@@ -15586,7 +15586,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "sawsbuck", "method": "level", "data": "34" }]
+    "evolutions": [{ "species": "sawsbuck", "method": "level", "data": 34 }]
   },
   "deino": {
     "species": "deino",
@@ -15680,7 +15680,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "zweilous", "method": "level", "data": "50" }]
+    "evolutions": [{ "species": "zweilous", "method": "level", "data": 50 }]
   },
   "delcatty": {
     "species": "delcatty",
@@ -16503,7 +16503,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "samurott", "method": "level", "data": "36" }]
+    "evolutions": [{ "species": "samurott", "method": "level", "data": 36 }]
   },
   "dewpider": {
     "species": "dewpider",
@@ -17217,7 +17217,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "dugtrio", "method": "level", "data": "26" }]
+    "evolutions": [{ "species": "dugtrio", "method": "level", "data": 26 }]
   },
   "ditto": {
     "species": "ditto",
@@ -17439,7 +17439,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "dodrio", "method": "level", "data": "31" }]
+    "evolutions": [{ "species": "dodrio", "method": "level", "data": 31 }]
   },
   "donphan": {
     "species": "donphan",
@@ -17790,7 +17790,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "dragonite", "method": "level", "data": "55" }]
+    "evolutions": [{ "species": "dragonite", "method": "level", "data": 55 }]
   },
   "dragonite": {
     "species": "dragonite",
@@ -18218,7 +18218,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "dragonair", "method": "level", "data": "30" }]
+    "evolutions": [{ "species": "dragonair", "method": "level", "data": 30 }]
   },
   "drifblim": {
     "species": "drifblim",
@@ -18414,7 +18414,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "drifblim", "method": "level", "data": "28" }]
+    "evolutions": [{ "species": "drifblim", "method": "level", "data": 28 }]
   },
   "drilbur": {
     "species": "drilbur",
@@ -18507,7 +18507,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "excadrill", "method": "level", "data": "31" }]
+    "evolutions": [{ "species": "excadrill", "method": "level", "data": 31 }]
   },
   "drowzee": {
     "species": "drowzee",
@@ -18614,7 +18614,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "hypno", "method": "level", "data": "26" }]
+    "evolutions": [{ "species": "hypno", "method": "level", "data": 26 }]
   },
   "druddigon": {
     "species": "druddigon",
@@ -18813,7 +18813,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "swanna", "method": "level", "data": "35" }]
+    "evolutions": [{ "species": "swanna", "method": "level", "data": 35 }]
   },
   "dugtrio": {
     "species": "dugtrio",
@@ -19192,7 +19192,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "reuniclus", "method": "level", "data": "41" }]
+    "evolutions": [{ "species": "reuniclus", "method": "level", "data": 41 }]
   },
   "durant": {
     "species": "durant",
@@ -19393,7 +19393,7 @@
       }
     },
     "evolutions": [
-      { "species": "dusknoir", "method": "tradeitem", "data": "reapercloth" }
+      { "species": "dusknoir", "method": "tradeitem", "data": "reaper_cloth" }
     ]
   },
   "dusknoir": {
@@ -19604,7 +19604,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "dusclops", "method": "level", "data": "37" }]
+    "evolutions": [{ "species": "dusclops", "method": "level", "data": 37 }]
   },
   "dustox": {
     "species": "dustox",
@@ -19787,7 +19787,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "crustle", "method": "level", "data": "34" }]
+    "evolutions": [{ "species": "crustle", "method": "level", "data": 34 }]
   },
   "eelektrik": {
     "species": "eelektrik",
@@ -19871,7 +19871,7 @@
       }
     },
     "evolutions": [
-      { "species": "eelektross", "method": "item", "data": "thunderstone" }
+      { "species": "eelektross", "method": "item", "data": "thunder_stone" }
     ]
   },
   "eelektross": {
@@ -20053,13 +20053,13 @@
       }
     },
     "evolutions": [
-      { "species": "vaporeon", "method": "item", "data": "waterstone" },
-      { "species": "jolteon", "method": "item", "data": "thunderstone" },
-      { "species": "flareon", "method": "item", "data": "firestone" },
+      { "species": "vaporeon", "method": "item", "data": "water_stone" },
+      { "species": "jolteon", "method": "item", "data": "thunder_stone" },
+      { "species": "flareon", "method": "item", "data": "fire_stone" },
       { "species": "leafeon", "method": "location", "data": "28" },
       { "species": "glaceon", "method": "location", "data": "34" },
-      { "species": "espeon", "method": "happinessday", "data": "" },
-      { "species": "umbreon", "method": "happinessnight", "data": "" }
+      { "species": "espeon", "method": "happinessday", "data": 220 },
+      { "species": "umbreon", "method": "happinessnight", "data": 220 }
     ]
   },
   "ekans": {
@@ -20162,7 +20162,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "arbok", "method": "level", "data": "22" }]
+    "evolutions": [{ "species": "arbok", "method": "level", "data": 22 }]
   },
   "electabuzz": {
     "species": "electabuzz",
@@ -20448,7 +20448,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "manectric", "method": "level", "data": "26" }]
+    "evolutions": [{ "species": "manectric", "method": "level", "data": 26 }]
   },
   "electrode": {
     "species": "electrode",
@@ -20632,7 +20632,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "electabuzz", "method": "level", "data": "30" }]
+    "evolutions": [{ "species": "electabuzz", "method": "level", "data": 30 }]
   },
   "elgyem": {
     "species": "elgyem",
@@ -20739,7 +20739,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "beheeyem", "method": "level", "data": "42" }]
+    "evolutions": [{ "species": "beheeyem", "method": "level", "data": 42 }]
   },
   "emboar": {
     "species": "emboar",
@@ -21595,7 +21595,7 @@
       }
     },
     "evolutions": [
-      { "species": "exeggutor", "method": "item", "data": "leafstone" }
+      { "species": "exeggutor", "method": "item", "data": "leaf_stone" }
     ]
   },
   "exeggutor": {
@@ -22135,8 +22135,7 @@
       }
     },
     "evolutions": [
-      { "species": "milotic", "method": "conteststat", "data": "beauty,170" },
-      { "species": "milotic", "method": "tradeitem", "data": "prismscale" }
+      { "species": "milotic", "method": "tradeitem", "data": "prism_scale" }
     ]
   },
   "fennekin": {
@@ -22418,7 +22417,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "ferrothorn", "method": "level", "data": "40" }]
+    "evolutions": [{ "species": "ferrothorn", "method": "level", "data": 40 }]
   },
   "ferrothorn": {
     "species": "ferrothorn",
@@ -22608,7 +22607,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "lumineon", "method": "level", "data": "31" }]
+    "evolutions": [{ "species": "lumineon", "method": "level", "data": 31 }]
   },
   "flaaffy": {
     "species": "flaaffy",
@@ -22693,7 +22692,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "ampharos", "method": "level", "data": "30" }]
+    "evolutions": [{ "species": "ampharos", "method": "level", "data": 30 }]
   },
   "flabebe": {
     "species": "flabebe",
@@ -23627,7 +23626,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "amoonguss", "method": "level", "data": "39" }]
+    "evolutions": [{ "species": "amoonguss", "method": "level", "data": 39 }]
   },
   "forretress": {
     "species": "forretress",
@@ -23819,7 +23818,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "haxorus", "method": "level", "data": "48" }]
+    "evolutions": [{ "species": "haxorus", "method": "level", "data": 48 }]
   },
   "frillish": {
     "species": "frillish",
@@ -23916,7 +23915,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "jellicent", "method": "level", "data": "40" }]
+    "evolutions": [{ "species": "jellicent", "method": "level", "data": 40 }]
   },
   "froakie": {
     "species": "froakie",
@@ -24465,7 +24464,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "garchomp", "method": "level", "data": "48" }]
+    "evolutions": [{ "species": "garchomp", "method": "level", "data": 48 }]
   },
   "gallade": {
     "species": "gallade",
@@ -25365,7 +25364,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "haunter", "method": "level", "data": "25" }]
+    "evolutions": [{ "species": "haunter", "method": "level", "data": 25 }]
   },
   "gastrodon": {
     "species": "gastrodon",
@@ -25919,7 +25918,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "graveler", "method": "level", "data": "25" }]
+    "evolutions": [{ "species": "graveler", "method": "level", "data": 25 }]
   },
   "gible": {
     "species": "gible",
@@ -26013,7 +26012,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "gabite", "method": "level", "data": "24" }]
+    "evolutions": [{ "species": "gabite", "method": "level", "data": 24 }]
   },
   "gigalith": {
     "species": "gigalith",
@@ -26743,7 +26742,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "purugly", "method": "level", "data": "38" }]
+    "evolutions": [{ "species": "purugly", "method": "level", "data": 38 }]
   },
   "gligar": {
     "species": "gligar",
@@ -26857,7 +26856,7 @@
       }
     },
     "evolutions": [
-      { "species": "gliscor", "method": "nightholditem", "data": "razorfang" }
+      { "species": "gliscor", "method": "nightholditem", "data": "razor_fang" }
     ]
   },
   "gliscor": {
@@ -27052,8 +27051,8 @@
       }
     },
     "evolutions": [
-      { "species": "vileplume", "method": "item", "data": "leafstone" },
-      { "species": "bellossom", "method": "item", "data": "sunstone" }
+      { "species": "vileplume", "method": "item", "data": "leaf_stone" },
+      { "species": "bellossom", "method": "item", "data": "sun_stone" }
     ]
   },
   "gogoat": {
@@ -27243,7 +27242,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "crobat", "method": "happiness", "data": "" }]
+    "evolutions": [{ "species": "crobat", "method": "happiness", "data": 220 }]
   },
   "goldeen": {
     "species": "goldeen",
@@ -27334,7 +27333,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "seaking", "method": "level", "data": "33" }]
+    "evolutions": [{ "species": "seaking", "method": "level", "data": 33 }]
   },
   "golduck": {
     "species": "golduck",
@@ -27701,7 +27700,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "golurk", "method": "level", "data": "43" }]
+    "evolutions": [{ "species": "golurk", "method": "level", "data": 43 }]
   },
   "golisopod": {
     "species": "golisopod",
@@ -28272,7 +28271,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "gothorita", "method": "level", "data": "32" }]
+    "evolutions": [{ "species": "gothorita", "method": "level", "data": 32 }]
   },
   "gothitelle": {
     "species": "gothitelle",
@@ -28476,7 +28475,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "gothitelle", "method": "level", "data": "41" }]
+    "evolutions": [{ "species": "gothitelle", "method": "level", "data": 41 }]
   },
   "gourgeist": {
     "species": "gourgeist",
@@ -29569,7 +29568,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "muk", "method": "level", "data": "38" }]
+    "evolutions": [{ "species": "muk", "method": "level", "data": 38 }]
   },
   "grotle": {
     "species": "grotle",
@@ -29649,7 +29648,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "torterra", "method": "level", "data": "32" }]
+    "evolutions": [{ "species": "torterra", "method": "level", "data": 32 }]
   },
   "groudon": {
     "species": "groudon",
@@ -29925,7 +29924,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "sceptile", "method": "level", "data": "36" }]
+    "evolutions": [{ "species": "sceptile", "method": "level", "data": 36 }]
   },
   "growlithe": {
     "species": "growlithe",
@@ -30027,7 +30026,7 @@
       }
     },
     "evolutions": [
-      { "species": "arcanine", "method": "item", "data": "firestone" }
+      { "species": "arcanine", "method": "item", "data": "fire_stone" }
     ]
   },
   "grubbin": {
@@ -30298,7 +30297,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "swalot", "method": "level", "data": "26" }]
+    "evolutions": [{ "species": "swalot", "method": "level", "data": 26 }]
   },
   "gumshoos": {
     "species": "gumshoos",
@@ -31012,7 +31011,7 @@
       }
     },
     "evolutions": [
-      { "species": "chansey", "method": "dayholditem", "data": "ovalstone" }
+      { "species": "chansey", "method": "dayholditem", "data": "oval_stone" }
     ]
   },
   "hariyama": {
@@ -32062,7 +32061,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "stoutland", "method": "level", "data": "32" }]
+    "evolutions": [{ "species": "stoutland", "method": "level", "data": 32 }]
   },
   "hippopotas": {
     "species": "hippopotas",
@@ -32147,7 +32146,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "hippowdon", "method": "level", "data": "34" }]
+    "evolutions": [{ "species": "hippowdon", "method": "level", "data": 34 }]
   },
   "hippowdon": {
     "species": "hippowdon",
@@ -33078,7 +33077,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "noctowl", "method": "level", "data": "20" }]
+    "evolutions": [{ "species": "noctowl", "method": "level", "data": 20 }]
   },
   "hoppip": {
     "species": "hoppip",
@@ -33177,7 +33176,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "skiploom", "method": "level", "data": "18" }]
+    "evolutions": [{ "species": "skiploom", "method": "level", "data": 18 }]
   },
   "horsea": {
     "species": "horsea",
@@ -33267,7 +33266,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "seadra", "method": "level", "data": "32" }]
+    "evolutions": [{ "species": "seadra", "method": "level", "data": 32 }]
   },
   "houndoom": {
     "species": "houndoom",
@@ -33551,7 +33550,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "houndoom", "method": "level", "data": "24" }]
+    "evolutions": [{ "species": "houndoom", "method": "level", "data": 24 }]
   },
   "huntail": {
     "species": "huntail",
@@ -33940,7 +33939,7 @@
       }
     },
     "evolutions": [
-      { "species": "jigglypuff", "method": "happiness", "data": "" }
+      { "species": "jigglypuff", "method": "happiness", "data": 220 }
     ]
   },
   "illumise": {
@@ -34436,7 +34435,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "venusaur", "method": "level", "data": "32" }]
+    "evolutions": [{ "species": "venusaur", "method": "level", "data": 32 }]
   },
   "jangmo_o": {
     "species": "jangmo_o",
@@ -34725,7 +34724,7 @@
       }
     },
     "evolutions": [
-      { "species": "wigglytuff", "method": "item", "data": "moonstone" }
+      { "species": "wigglytuff", "method": "item", "data": "moon_stone" }
     ]
   },
   "jirachi": {
@@ -35004,7 +35003,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "galvantula", "method": "level", "data": "36" }]
+    "evolutions": [{ "species": "galvantula", "method": "level", "data": 36 }]
   },
   "jumpluff": {
     "species": "jumpluff",
@@ -35294,7 +35293,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "kabutops", "method": "level", "data": "40" }]
+    "evolutions": [{ "species": "kabutops", "method": "level", "data": 40 }]
   },
   "kabutops": {
     "species": "kabutops",
@@ -35528,7 +35527,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "beedrill", "method": "level", "data": "10" }]
+    "evolutions": [{ "species": "beedrill", "method": "level", "data": 10 }]
   },
   "kangaskhan": {
     "species": "kangaskhan",
@@ -35814,7 +35813,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "escavalier", "method": "", "data": "shelmet" }]
+    "evolutions": [{ "species": "escavalier", "method": "tradespecies", "data": "shelmet" }]
   },
   "kartana": {
     "species": "kartana",
@@ -36446,8 +36445,8 @@
       }
     },
     "evolutions": [
-      { "species": "gardevoir", "method": "level", "data": "30" },
-      { "species": "gallade", "method": "itemmale", "data": "dawnstone" }
+      { "species": "gardevoir", "method": "level", "data": 30 },
+      { "species": "gallade", "method": "itemmale", "data": "dawn_stone" }
     ]
   },
   "klang": {
@@ -36530,7 +36529,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "klinklang", "method": "level", "data": "49" }]
+    "evolutions": [{ "species": "klinklang", "method": "level", "data": 49 }]
   },
   "klefki": {
     "species": "klefki",
@@ -36697,7 +36696,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "klang", "method": "level", "data": "38" }]
+    "evolutions": [{ "species": "klang", "method": "level", "data": 38 }]
   },
   "klinklang": {
     "species": "klinklang",
@@ -36887,7 +36886,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "weezing", "method": "level", "data": "35" }]
+    "evolutions": [{ "species": "weezing", "method": "level", "data": 35 }]
   },
   "komala": {
     "species": "komala",
@@ -37267,7 +37266,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "kingler", "method": "level", "data": "28" }]
+    "evolutions": [{ "species": "kingler", "method": "level", "data": 28 }]
   },
   "kricketot": {
     "species": "kricketot",
@@ -37312,7 +37311,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "kricketune", "method": "level", "data": "10" }]
+    "evolutions": [{ "species": "kricketune", "method": "level", "data": 10 }]
   },
   "kricketune": {
     "species": "kricketune",
@@ -37493,7 +37492,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "krookodile", "method": "level", "data": "40" }]
+    "evolutions": [{ "species": "krookodile", "method": "level", "data": 40 }]
   },
   "krookodile": {
     "species": "krookodile",
@@ -38109,7 +38108,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "aggron", "method": "level", "data": "42" }]
+    "evolutions": [{ "species": "aggron", "method": "level", "data": 42 }]
   },
   "lampent": {
     "species": "lampent",
@@ -38205,7 +38204,7 @@
       }
     },
     "evolutions": [
-      { "species": "chandelure", "method": "item", "data": "duskstone" }
+      { "species": "chandelure", "method": "item", "data": "dusk_stone" }
     ]
   },
   "landorus": {
@@ -38683,7 +38682,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "volcarona", "method": "level", "data": "59" }]
+    "evolutions": [{ "species": "volcarona", "method": "level", "data": 59 }]
   },
   "larvitar": {
     "species": "larvitar",
@@ -38783,7 +38782,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "pupitar", "method": "level", "data": "30" }]
+    "evolutions": [{ "species": "pupitar", "method": "level", "data": 30 }]
   },
   "latias": {
     "species": "latias",
@@ -39555,7 +39554,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "ledian", "method": "level", "data": "18" }]
+    "evolutions": [{ "species": "ledian", "method": "level", "data": 18 }]
   },
   "lickilicky": {
     "species": "lickilicky",
@@ -39961,7 +39960,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "cradily", "method": "level", "data": "40" }]
+    "evolutions": [{ "species": "cradily", "method": "level", "data": 40 }]
   },
   "lilligant": {
     "species": "lilligant",
@@ -40133,7 +40132,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "herdier", "method": "level", "data": "16" }]
+    "evolutions": [{ "species": "herdier", "method": "level", "data": 16 }]
   },
   "linoone": {
     "species": "linoone",
@@ -40519,7 +40518,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "lampent", "method": "level", "data": "41" }]
+    "evolutions": [{ "species": "lampent", "method": "level", "data": 41 }]
   },
   "lombre": {
     "species": "lombre",
@@ -40606,7 +40605,7 @@
       }
     },
     "evolutions": [
-      { "species": "ludicolo", "method": "item", "data": "waterstone" }
+      { "species": "ludicolo", "method": "item", "data": "water_stone" }
     ]
   },
   "lopunny": {
@@ -40882,7 +40881,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "lombre", "method": "level", "data": "14" }]
+    "evolutions": [{ "species": "lombre", "method": "level", "data": 14 }]
   },
   "loudred": {
     "species": "loudred",
@@ -40977,7 +40976,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "exploud", "method": "level", "data": "40" }]
+    "evolutions": [{ "species": "exploud", "method": "level", "data": 40 }]
   },
   "lucario": {
     "species": "lucario",
@@ -41983,7 +41982,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "luxray", "method": "level", "data": "30" }]
+    "evolutions": [{ "species": "luxray", "method": "level", "data": 30 }]
   },
   "luxray": {
     "species": "luxray",
@@ -42530,7 +42529,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "machoke", "method": "level", "data": "28" }]
+    "evolutions": [{ "species": "machoke", "method": "level", "data": 28 }]
   },
   "magby": {
     "species": "magby",
@@ -42625,7 +42624,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "magmar", "method": "level", "data": "30" }]
+    "evolutions": [{ "species": "magmar", "method": "level", "data": 30 }]
   },
   "magcargo": {
     "species": "magcargo",
@@ -42943,7 +42942,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "gyarados", "method": "level", "data": "20" }]
+    "evolutions": [{ "species": "gyarados", "method": "level", "data": 20 }]
   },
   "magmar": {
     "species": "magmar",
@@ -43213,7 +43212,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "magneton", "method": "level", "data": "30" }]
+    "evolutions": [{ "species": "magneton", "method": "level", "data": 30 }]
   },
   "magneton": {
     "species": "magneton",
@@ -43512,7 +43511,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "hariyama", "method": "level", "data": "24" }]
+    "evolutions": [{ "species": "hariyama", "method": "level", "data": 24 }]
   },
   "malamar": {
     "species": "malamar",
@@ -44167,7 +44166,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "primeape", "method": "level", "data": "28" }]
+    "evolutions": [{ "species": "primeape", "method": "level", "data": 28 }]
   },
   "mantine": {
     "species": "mantine",
@@ -44368,7 +44367,7 @@
       }
     },
     "evolutions": [
-      { "species": "mantine", "method": "hasinparty", "data": "remoraid" }
+      { "species": "mantine", "method": "custom", "data": ["hasinparty", "remoraid"] }
     ]
   },
   "maractus": {
@@ -44641,7 +44640,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "flaaffy", "method": "level", "data": "15" }]
+    "evolutions": [{ "species": "flaaffy", "method": "level", "data": 15 }]
   },
   "marill": {
     "species": "marill",
@@ -44739,7 +44738,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "azumarill", "method": "level", "data": "18" }]
+    "evolutions": [{ "species": "azumarill", "method": "level", "data": 18 }]
   },
   "marowak": {
     "species": "marowak",
@@ -45115,7 +45114,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "swampert", "method": "level", "data": "36" }]
+    "evolutions": [{ "species": "swampert", "method": "level", "data": 36 }]
   },
   "masquerain": {
     "species": "masquerain",
@@ -45714,7 +45713,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "medicham", "method": "level", "data": "37" }]
+    "evolutions": [{ "species": "medicham", "method": "level", "data": 37 }]
   },
   "meganium": {
     "species": "meganium",
@@ -46365,7 +46364,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "persian", "method": "level", "data": "28" }]
+    "evolutions": [{ "species": "persian", "method": "level", "data": 28 }]
   },
   "mesprit": {
     "species": "mesprit",
@@ -46728,7 +46727,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "metagross", "method": "level", "data": "45" }]
+    "evolutions": [{ "species": "metagross", "method": "level", "data": 45 }]
   },
   "metapod": {
     "species": "metapod",
@@ -46771,7 +46770,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "butterfree", "method": "level", "data": "10" }]
+    "evolutions": [{ "species": "butterfree", "method": "level", "data": 10 }]
   },
   "mew": {
     "species": "mew",
@@ -47357,7 +47356,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "mienshao", "method": "level", "data": "50" }]
+    "evolutions": [{ "species": "mienshao", "method": "level", "data": 50 }]
   },
   "mienshao": {
     "species": "mienshao",
@@ -47866,7 +47865,7 @@
       }
     },
     "evolutions": [
-      { "species": "mrmime", "method": "hasmove", "data": "mimic" }
+      { "species": "mr_mime", "method": "hasmove", "data": "mimic" }
     ]
   },
   "mimikyu": {
@@ -48314,7 +48313,7 @@
       }
     },
     "evolutions": [
-      { "species": "cinccino", "method": "item", "data": "shinystone" }
+      { "species": "cinccino", "method": "item", "data": "shiny_stone" }
     ]
   },
   "minior": {
@@ -49612,7 +49611,7 @@
       }
     },
     "evolutions": [
-      { "species": "mismagius", "method": "item", "data": "duskstone" }
+      { "species": "mismagius", "method": "item", "data": "dusk_stone" }
     ]
   },
   "mismagius": {
@@ -49888,7 +49887,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "infernape", "method": "level", "data": "36" }]
+    "evolutions": [{ "species": "infernape", "method": "level", "data": 36 }]
   },
   "morelull": {
     "species": "morelull",
@@ -50373,7 +50372,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "marshtomp", "method": "level", "data": "16" }]
+    "evolutions": [{ "species": "marshtomp", "method": "level", "data": 16 }]
   },
   "mudsdale": {
     "species": "mudsdale",
@@ -50755,7 +50754,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "snorlax", "method": "happiness", "data": "" }]
+    "evolutions": [{ "species": "snorlax", "method": "happiness", "data": 220 }]
   },
   "munna": {
     "species": "munna",
@@ -50859,7 +50858,7 @@
       }
     },
     "evolutions": [
-      { "species": "musharna", "method": "item", "data": "moonstone" }
+      { "species": "musharna", "method": "item", "data": "moon_stone" }
     ]
   },
   "murkrow": {
@@ -50968,7 +50967,7 @@
       }
     },
     "evolutions": [
-      { "species": "honchkrow", "method": "item", "data": "duskstone" }
+      { "species": "honchkrow", "method": "item", "data": "dusk_stone" }
     ]
   },
   "musharna": {
@@ -51158,7 +51157,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "xatu", "method": "level", "data": "25" }]
+    "evolutions": [{ "species": "xatu", "method": "level", "data": 25 }]
   },
   "necrozma": {
     "species": "necrozma",
@@ -51558,7 +51557,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "nidorina", "method": "level", "data": "16" }]
+    "evolutions": [{ "species": "nidorina", "method": "level", "data": 16 }]
   },
   "nidoran_m": {
     "species": "nidoran_m",
@@ -51655,7 +51654,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "nidorino", "method": "level", "data": "16" }]
+    "evolutions": [{ "species": "nidorino", "method": "level", "data": 16 }]
   },
   "nidorina": {
     "species": "nidorina",
@@ -51738,7 +51737,7 @@
       }
     },
     "evolutions": [
-      { "species": "nidoqueen", "method": "item", "data": "moonstone" }
+      { "species": "nidoqueen", "method": "item", "data": "moon_stone" }
     ]
   },
   "nidorino": {
@@ -51822,7 +51821,7 @@
       }
     },
     "evolutions": [
-      { "species": "nidoking", "method": "item", "data": "moonstone" }
+      { "species": "nidoking", "method": "item", "data": "moon_stone" }
     ]
   },
   "nihilego": {
@@ -52000,8 +51999,8 @@
       }
     },
     "evolutions": [
-      { "species": "ninjask", "method": "ninjask", "data": "20" },
-      { "species": "shedinja", "method": "shedinja", "data": "20" }
+      { "species": "ninjask", "method": "custom", "data": ["ninjask", 20] },
+      { "species": "shedinja", "method": "custom", "data": ["shedinja", 20] }
     ]
   },
   "ninetales": {
@@ -52730,7 +52729,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "camerupt", "method": "level", "data": "33" }]
+    "evolutions": [{ "species": "camerupt", "method": "level", "data": 33 }]
   },
   "nuzleaf": {
     "species": "nuzleaf",
@@ -52822,7 +52821,7 @@
       }
     },
     "evolutions": [
-      { "species": "shiftry", "method": "item", "data": "leafstone" }
+      { "species": "shiftry", "method": "item", "data": "leaf_stone" }
     ]
   },
   "octillery": {
@@ -53013,7 +53012,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "gloom", "method": "level", "data": "21" }]
+    "evolutions": [{ "species": "gloom", "method": "level", "data": 21 }]
   },
   "omanyte": {
     "species": "omanyte",
@@ -53112,7 +53111,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "omastar", "method": "level", "data": "40" }]
+    "evolutions": [{ "species": "omastar", "method": "level", "data": 40 }]
   },
   "omastar": {
     "species": "omastar",
@@ -53312,7 +53311,7 @@
       }
     },
     "evolutions": [
-      { "species": "steelix", "method": "tradeitem", "data": "metalcoat" }
+      { "species": "steelix", "method": "tradeitem", "data": "metal_coat" }
     ]
   },
   "oranguru": {
@@ -53804,7 +53803,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "dewott", "method": "level", "data": "17" }]
+    "evolutions": [{ "species": "dewott", "method": "level", "data": 17 }]
   },
   "pachirisu": {
     "species": "pachirisu",
@@ -54169,7 +54168,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "seismitoad", "method": "level", "data": "36" }]
+    "evolutions": [{ "species": "seismitoad", "method": "level", "data": 36 }]
   },
   "pancham": {
     "species": "pancham",
@@ -54488,7 +54487,7 @@
       }
     },
     "evolutions": [
-      { "species": "simipour", "method": "item", "data": "waterstone" }
+      { "species": "simipour", "method": "item", "data": "water_stone" }
     ]
   },
   "pansage": {
@@ -54589,7 +54588,7 @@
       }
     },
     "evolutions": [
-      { "species": "simisage", "method": "item", "data": "leafstone" }
+      { "species": "simisage", "method": "item", "data": "leaf_stone" }
     ]
   },
   "pansear": {
@@ -54693,7 +54692,7 @@
       }
     },
     "evolutions": [
-      { "species": "simisear", "method": "item", "data": "firestone" }
+      { "species": "simisear", "method": "item", "data": "fire_stone" }
     ]
   },
   "paras": {
@@ -54794,7 +54793,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "parasect", "method": "level", "data": "24" }]
+    "evolutions": [{ "species": "parasect", "method": "level", "data": 24 }]
   },
   "parasect": {
     "species": "parasect",
@@ -55076,7 +55075,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "watchog", "method": "level", "data": "20" }]
+    "evolutions": [{ "species": "watchog", "method": "level", "data": 20 }]
   },
   "pawniard": {
     "species": "pawniard",
@@ -55179,7 +55178,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "bisharp", "method": "level", "data": "52" }]
+    "evolutions": [{ "species": "bisharp", "method": "level", "data": 52 }]
   },
   "pelipper": {
     "species": "pelipper",
@@ -55551,7 +55550,7 @@
       }
     },
     "evolutions": [
-      { "species": "lilligant", "method": "item", "data": "sunstone" }
+      { "species": "lilligant", "method": "item", "data": "sun_stone" }
     ]
   },
   "phanpy": {
@@ -55642,7 +55641,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "donphan", "method": "level", "data": "25" }]
+    "evolutions": [{ "species": "donphan", "method": "level", "data": 25 }]
   },
   "phantump": {
     "species": "phantump",
@@ -55988,7 +55987,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "pikachu", "method": "happiness", "data": "" }]
+    "evolutions": [{ "species": "pikachu", "method": "happiness", "data": 220 }]
   },
   "pidgeot": {
     "species": "pidgeot",
@@ -56224,7 +56223,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "pidgeot", "method": "level", "data": "36" }]
+    "evolutions": [{ "species": "pidgeot", "method": "level", "data": 36 }]
   },
   "pidgey": {
     "species": "pidgey",
@@ -56313,7 +56312,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "pidgeotto", "method": "level", "data": "18" }]
+    "evolutions": [{ "species": "pidgeotto", "method": "level", "data": 18 }]
   },
   "pidove": {
     "species": "pidove",
@@ -56403,7 +56402,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "tranquill", "method": "level", "data": "21" }]
+    "evolutions": [{ "species": "tranquill", "method": "level", "data": 21 }]
   },
   "pignite": {
     "species": "pignite",
@@ -56502,7 +56501,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "emboar", "method": "level", "data": "36" }]
+    "evolutions": [{ "species": "emboar", "method": "level", "data": 36 }]
   },
   "pikachu": {
     "species": "pikachu",
@@ -57153,7 +57152,7 @@
       }
     },
     "evolutions": [
-      { "species": "raichu", "method": "item", "data": "thunderstone" }
+      { "species": "raichu", "method": "item", "data": "thunder_stone" }
     ]
   },
   "pikipek": {
@@ -57333,7 +57332,7 @@
       }
     },
     "evolutions": [
-      { "species": "mamoswine", "method": "hasmove", "data": "ancientpower" }
+      { "species": "mamoswine", "method": "hasmove", "data": "ancient_power" }
     ]
   },
   "pineco": {
@@ -57429,7 +57428,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "forretress", "method": "level", "data": "31" }]
+    "evolutions": [{ "species": "forretress", "method": "level", "data": 31 }]
   },
   "pinsir": {
     "species": "pinsir",
@@ -57704,7 +57703,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "prinplup", "method": "level", "data": "16" }]
+    "evolutions": [{ "species": "prinplup", "method": "level", "data": 16 }]
   },
   "plusle": {
     "species": "plusle",
@@ -57973,7 +57972,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "poliwhirl", "method": "level", "data": "25" }]
+    "evolutions": [{ "species": "poliwhirl", "method": "level", "data": 25 }]
   },
   "poliwhirl": {
     "species": "poliwhirl",
@@ -58058,8 +58057,8 @@
       }
     },
     "evolutions": [
-      { "species": "poliwrath", "method": "item", "data": "waterstone" },
-      { "species": "politoed", "method": "tradeitem", "data": "kingsrock" }
+      { "species": "poliwrath", "method": "item", "data": "water_stone" },
+      { "species": "politoed", "method": "tradeitem", "data": "kings_rock" }
     ]
   },
   "poliwrath": {
@@ -58239,7 +58238,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "rapidash", "method": "level", "data": "40" }]
+    "evolutions": [{ "species": "rapidash", "method": "level", "data": 40 }]
   },
   "poochyena": {
     "species": "poochyena",
@@ -58336,7 +58335,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "mightyena", "method": "level", "data": "18" }]
+    "evolutions": [{ "species": "mightyena", "method": "level", "data": 18 }]
   },
   "popplio": {
     "species": "popplio",
@@ -58514,7 +58513,7 @@
       }
     },
     "evolutions": [
-      { "species": "porygon2", "method": "tradeitem", "data": "upgrade" }
+      { "species": "porygon2", "method": "tradeitem", "data": "up_grade" }
     ]
   },
   "porygon2": {
@@ -58608,7 +58607,7 @@
       }
     },
     "evolutions": [
-      { "species": "porygonz", "method": "tradeitem", "data": "dubiousdisc" }
+      { "species": "porygon_z", "method": "tradeitem", "data": "dubious_disc" }
     ]
   },
   "porygon_z": {
@@ -58990,7 +58989,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "empoleon", "method": "level", "data": "36" }]
+    "evolutions": [{ "species": "empoleon", "method": "level", "data": 36 }]
   },
   "probopass": {
     "species": "probopass",
@@ -59195,7 +59194,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "golduck", "method": "level", "data": "33" }]
+    "evolutions": [{ "species": "golduck", "method": "level", "data": 33 }]
   },
   "pumpkaboo": {
     "species": "pumpkaboo",
@@ -59608,7 +59607,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "tyranitar", "method": "level", "data": "55" }]
+    "evolutions": [{ "species": "tyranitar", "method": "level", "data": 55 }]
   },
   "purrloin": {
     "species": "purrloin",
@@ -59709,7 +59708,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "liepard", "method": "level", "data": "20" }]
+    "evolutions": [{ "species": "liepard", "method": "level", "data": 20 }]
   },
   "purugly": {
     "species": "purugly",
@@ -60150,7 +60149,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "typhlosion", "method": "level", "data": "36" }]
+    "evolutions": [{ "species": "typhlosion", "method": "level", "data": 36 }]
   },
   "quilladin": {
     "species": "quilladin",
@@ -60698,7 +60697,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "kirlia", "method": "level", "data": "20" }]
+    "evolutions": [{ "species": "kirlia", "method": "level", "data": 20 }]
   },
   "rampardos": {
     "species": "rampardos",
@@ -61306,7 +61305,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "raticate", "method": "level", "data": "20" }]
+    "evolutions": [{ "species": "raticate", "method": "level", "data": 20 }]
   },
   "rayquaza": {
     "species": "rayquaza",
@@ -62085,7 +62084,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "octillery", "method": "level", "data": "25" }]
+    "evolutions": [{ "species": "octillery", "method": "level", "data": 25 }]
   },
   "reshiram": {
     "species": "reshiram",
@@ -62506,7 +62505,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "rhydon", "method": "level", "data": "42" }]
+    "evolutions": [{ "species": "rhydon", "method": "level", "data": 42 }]
   },
   "rhyperior": {
     "species": "rhyperior",
@@ -62808,7 +62807,7 @@
       }
     },
     "evolutions": [
-      { "species": "lucario", "method": "happinessday", "data": "" }
+      { "species": "lucario", "method": "happinessday", "data": 220 }
     ]
   },
   "rockruff": {
@@ -62984,7 +62983,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "boldore", "method": "level", "data": "25" }]
+    "evolutions": [{ "species": "boldore", "method": "level", "data": 25 }]
   },
   "roselia": {
     "species": "roselia",
@@ -63085,7 +63084,7 @@
       }
     },
     "evolutions": [
-      { "species": "roserade", "method": "item", "data": "shinystone" }
+      { "species": "roserade", "method": "item", "data": "shiny_stone" }
     ]
   },
   "roserade": {
@@ -63777,7 +63776,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "braviary", "method": "level", "data": "54" }]
+    "evolutions": [{ "species": "braviary", "method": "level", "data": 54 }]
   },
   "sableye": {
     "species": "sableye",
@@ -64625,7 +64624,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "krokorok", "method": "level", "data": "29" }]
+    "evolutions": [{ "species": "krokorok", "method": "level", "data": 29 }]
   },
   "sandshrew": {
     "species": "sandshrew",
@@ -64803,7 +64802,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "sandslash", "method": "level", "data": "22" }]
+    "evolutions": [{ "species": "sandslash", "method": "level", "data": 22 }]
   },
   "sandslash": {
     "species": "sandslash",
@@ -65956,7 +65955,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "scrafty", "method": "level", "data": "39" }]
+    "evolutions": [{ "species": "scrafty", "method": "level", "data": 39 }]
   },
   "scyther": {
     "species": "scyther",
@@ -66059,7 +66058,7 @@
       }
     },
     "evolutions": [
-      { "species": "scizor", "method": "tradeitem", "data": "metalcoat" }
+      { "species": "scizor", "method": "tradeitem", "data": "metal_coat" }
     ]
   },
   "seadra": {
@@ -66143,7 +66142,7 @@
       }
     },
     "evolutions": [
-      { "species": "kingdra", "method": "tradeitem", "data": "dragonscale" }
+      { "species": "kingdra", "method": "tradeitem", "data": "dragon_scale" }
     ]
   },
   "seaking": {
@@ -66314,7 +66313,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "walrein", "method": "level", "data": "44" }]
+    "evolutions": [{ "species": "walrein", "method": "level", "data": 44 }]
   },
   "seedot": {
     "species": "seedot",
@@ -66400,7 +66399,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "nuzleaf", "method": "level", "data": "14" }]
+    "evolutions": [{ "species": "nuzleaf", "method": "level", "data": 14 }]
   },
   "seel": {
     "species": "seel",
@@ -66502,7 +66501,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "dewgong", "method": "level", "data": "34" }]
+    "evolutions": [{ "species": "dewgong", "method": "level", "data": 34 }]
   },
   "seismitoad": {
     "species": "seismitoad",
@@ -66700,7 +66699,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "furret", "method": "level", "data": "15" }]
+    "evolutions": [{ "species": "furret", "method": "level", "data": 15 }]
   },
   "serperior": {
     "species": "serperior",
@@ -66880,7 +66879,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "serperior", "method": "level", "data": "36" }]
+    "evolutions": [{ "species": "serperior", "method": "level", "data": 36 }]
   },
   "seviper": {
     "species": "seviper",
@@ -67072,7 +67071,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "swadloon", "method": "level", "data": "20" }]
+    "evolutions": [{ "species": "swadloon", "method": "level", "data": 20 }]
   },
   "sharpedo": {
     "species": "sharpedo",
@@ -67564,7 +67563,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "salamence", "method": "level", "data": "50" }]
+    "evolutions": [{ "species": "salamence", "method": "level", "data": 50 }]
   },
   "shellder": {
     "species": "shellder",
@@ -67658,7 +67657,7 @@
       }
     },
     "evolutions": [
-      { "species": "cloyster", "method": "item", "data": "waterstone" }
+      { "species": "cloyster", "method": "item", "data": "water_stone" }
     ]
   },
   "shellos": {
@@ -67749,7 +67748,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "gastrodon", "method": "level", "data": "30" }]
+    "evolutions": [{ "species": "gastrodon", "method": "level", "data": 30 }]
   },
   "shelmet": {
     "species": "shelmet",
@@ -67941,7 +67940,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "bastiodon", "method": "level", "data": "30" }]
+    "evolutions": [{ "species": "bastiodon", "method": "level", "data": 30 }]
   },
   "shiftry": {
     "species": "shiftry",
@@ -68210,7 +68209,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "luxio", "method": "level", "data": "15" }]
+    "evolutions": [{ "species": "luxio", "method": "level", "data": 15 }]
   },
   "shroomish": {
     "species": "shroomish",
@@ -68299,7 +68298,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "breloom", "method": "level", "data": "23" }]
+    "evolutions": [{ "species": "breloom", "method": "level", "data": 23 }]
   },
   "shuckle": {
     "species": "shuckle",
@@ -68504,7 +68503,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "banette", "method": "level", "data": "37" }]
+    "evolutions": [{ "species": "banette", "method": "level", "data": 37 }]
   },
   "sigilyph": {
     "species": "sigilyph",
@@ -68654,7 +68653,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "beautifly", "method": "level", "data": "10" }]
+    "evolutions": [{ "species": "beautifly", "method": "level", "data": 10 }]
   },
   "silvally": {
     "species": "silvally",
@@ -69287,7 +69286,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "jumpluff", "method": "level", "data": "27" }]
+    "evolutions": [{ "species": "jumpluff", "method": "level", "data": 27 }]
   },
   "skitty": {
     "species": "skitty",
@@ -69397,7 +69396,7 @@
       }
     },
     "evolutions": [
-      { "species": "delcatty", "method": "item", "data": "moonstone" }
+      { "species": "delcatty", "method": "item", "data": "moon_stone" }
     ]
   },
   "skorupi": {
@@ -69503,7 +69502,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "drapion", "method": "level", "data": "40" }]
+    "evolutions": [{ "species": "drapion", "method": "level", "data": 40 }]
   },
   "skrelp": {
     "species": "skrelp",
@@ -69888,7 +69887,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "vigoroth", "method": "level", "data": "18" }]
+    "evolutions": [{ "species": "vigoroth", "method": "level", "data": 18 }]
   },
   "sliggoo": {
     "species": "sliggoo",
@@ -70373,8 +70372,8 @@
       }
     },
     "evolutions": [
-      { "species": "slowbro", "method": "level", "data": "37" },
-      { "species": "slowking", "method": "tradeitem", "data": "kingsrock" }
+      { "species": "slowbro", "method": "level", "data": 37 },
+      { "species": "slowking", "method": "tradeitem", "data": "kings_rock" }
     ]
   },
   "slugma": {
@@ -70472,7 +70471,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "magcargo", "method": "level", "data": "38" }]
+    "evolutions": [{ "species": "magcargo", "method": "level", "data": 38 }]
   },
   "slurpuff": {
     "species": "slurpuff",
@@ -70713,7 +70712,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "jynx", "method": "level", "data": "30" }]
+    "evolutions": [{ "species": "jynx", "method": "level", "data": 30 }]
   },
   "sneasel": {
     "species": "sneasel",
@@ -70830,7 +70829,7 @@
       }
     },
     "evolutions": [
-      { "species": "weavile", "method": "nightholditem", "data": "razorclaw" }
+      { "species": "weavile", "method": "nightholditem", "data": "razor_claw" }
     ]
   },
   "snivy": {
@@ -70928,7 +70927,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "servine", "method": "level", "data": "17" }]
+    "evolutions": [{ "species": "servine", "method": "level", "data": 17 }]
   },
   "snorlax": {
     "species": "snorlax",
@@ -71127,8 +71126,8 @@
       }
     },
     "evolutions": [
-      { "species": "glalie", "method": "level", "data": "42" },
-      { "species": "froslass", "method": "itemfemale", "data": "dawnstone" }
+      { "species": "glalie", "method": "level", "data": 42 },
+      { "species": "froslass", "method": "itemfemale", "data": "dawn_stone" }
     ]
   },
   "snover": {
@@ -71221,7 +71220,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "abomasnow", "method": "level", "data": "40" }]
+    "evolutions": [{ "species": "abomasnow", "method": "level", "data": 40 }]
   },
   "snubbull": {
     "species": "snubbull",
@@ -71334,7 +71333,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "granbull", "method": "level", "data": "23" }]
+    "evolutions": [{ "species": "granbull", "method": "level", "data": 23 }]
   },
   "solgaleo": {
     "species": "solgaleo",
@@ -71539,7 +71538,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "duosion", "method": "level", "data": "32" }]
+    "evolutions": [{ "species": "duosion", "method": "level", "data": 32 }]
   },
   "solrock": {
     "species": "solrock",
@@ -71734,7 +71733,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "fearow", "method": "level", "data": "20" }]
+    "evolutions": [{ "species": "fearow", "method": "level", "data": 20 }]
   },
   "spewpa": {
     "species": "spewpa",
@@ -71875,7 +71874,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "sealeo", "method": "level", "data": "32" }]
+    "evolutions": [{ "species": "sealeo", "method": "level", "data": 32 }]
   },
   "spinarak": {
     "species": "spinarak",
@@ -71972,7 +71971,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "ariados", "method": "level", "data": "22" }]
+    "evolutions": [{ "species": "ariados", "method": "level", "data": 22 }]
   },
   "spinda": {
     "species": "spinda",
@@ -72274,7 +72273,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "grumpig", "method": "level", "data": "32" }]
+    "evolutions": [{ "species": "grumpig", "method": "level", "data": 32 }]
   },
   "spritzee": {
     "species": "spritzee",
@@ -72462,7 +72461,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "wartortle", "method": "level", "data": "16" }]
+    "evolutions": [{ "species": "wartortle", "method": "level", "data": 16 }]
   },
   "stantler": {
     "species": "stantler",
@@ -72733,7 +72732,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "staraptor", "method": "level", "data": "34" }]
+    "evolutions": [{ "species": "staraptor", "method": "level", "data": 34 }]
   },
   "starly": {
     "species": "starly",
@@ -72825,7 +72824,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "staravia", "method": "level", "data": "14" }]
+    "evolutions": [{ "species": "staravia", "method": "level", "data": 14 }]
   },
   "starmie": {
     "species": "starmie",
@@ -73002,7 +73001,7 @@
       }
     },
     "evolutions": [
-      { "species": "starmie", "method": "item", "data": "waterstone" }
+      { "species": "starmie", "method": "item", "data": "water_stone" }
     ]
   },
   "steelix": {
@@ -73672,7 +73671,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "skuntank", "method": "level", "data": "34" }]
+    "evolutions": [{ "species": "skuntank", "method": "level", "data": 34 }]
   },
   "sudowoodo": {
     "species": "sudowoodo",
@@ -74051,7 +74050,7 @@
       }
     },
     "evolutions": [
-      { "species": "sunflora", "method": "item", "data": "sunstone" }
+      { "species": "sunflora", "method": "item", "data": "sun_stone" }
     ]
   },
   "surskit": {
@@ -74142,7 +74141,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "masquerain", "method": "level", "data": "22" }]
+    "evolutions": [{ "species": "masquerain", "method": "level", "data": 22 }]
   },
   "swablu": {
     "species": "swablu",
@@ -74240,7 +74239,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "altaria", "method": "level", "data": "35" }]
+    "evolutions": [{ "species": "altaria", "method": "level", "data": 35 }]
   },
   "swadloon": {
     "species": "swadloon",
@@ -74313,7 +74312,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "leavanny", "method": "happiness", "data": "" }]
+    "evolutions": [{ "species": "leavanny", "method": "happiness", "data": 220 }]
   },
   "swalot": {
     "species": "swalot",
@@ -74851,7 +74850,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "piloswine", "method": "level", "data": "33" }]
+    "evolutions": [{ "species": "piloswine", "method": "level", "data": 33 }]
   },
   "swirlix": {
     "species": "swirlix",
@@ -75217,7 +75216,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "swellow", "method": "level", "data": "22" }]
+    "evolutions": [{ "species": "swellow", "method": "level", "data": 22 }]
   },
   "talonflame": {
     "species": "talonflame",
@@ -75415,7 +75414,7 @@
       }
     },
     "evolutions": [
-      { "species": "tangrowth", "method": "hasmove", "data": "ancientpower" }
+      { "species": "tangrowth", "method": "hasmove", "data": "ancient_power" }
     ]
   },
   "tangrowth": {
@@ -76108,7 +76107,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "ursaring", "method": "level", "data": "30" }]
+    "evolutions": [{ "species": "ursaring", "method": "level", "data": 30 }]
   },
   "tentacool": {
     "species": "tentacool",
@@ -76210,7 +76209,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "tentacruel", "method": "level", "data": "30" }]
+    "evolutions": [{ "species": "tentacruel", "method": "level", "data": 30 }]
   },
   "tentacruel": {
     "species": "tentacruel",
@@ -76405,7 +76404,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "pignite", "method": "level", "data": "17" }]
+    "evolutions": [{ "species": "pignite", "method": "level", "data": 17 }]
   },
   "terrakion": {
     "species": "terrakion",
@@ -76884,7 +76883,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "gurdurr", "method": "level", "data": "25" }]
+    "evolutions": [{ "species": "gurdurr", "method": "level", "data": 25 }]
   },
   "tirtouga": {
     "species": "tirtouga",
@@ -76984,7 +76983,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "carracosta", "method": "level", "data": "37" }]
+    "evolutions": [{ "species": "carracosta", "method": "level", "data": 37 }]
   },
   "togedemaru": {
     "species": "togedemaru",
@@ -77271,7 +77270,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "togetic", "method": "happiness", "data": "" }]
+    "evolutions": [{ "species": "togetic", "method": "happiness", "data": 220 }]
   },
   "togetic": {
     "species": "togetic",
@@ -77374,7 +77373,7 @@
       }
     },
     "evolutions": [
-      { "species": "togekiss", "method": "item", "data": "shinystone" }
+      { "species": "togekiss", "method": "item", "data": "shiny_stone" }
     ]
   },
   "torchic": {
@@ -77471,7 +77470,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "combusken", "method": "level", "data": "16" }]
+    "evolutions": [{ "species": "combusken", "method": "level", "data": 16 }]
   },
   "torkoal": {
     "species": "torkoal",
@@ -78043,7 +78042,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "croconaw", "method": "level", "data": "18" }]
+    "evolutions": [{ "species": "croconaw", "method": "level", "data": 18 }]
   },
   "toucannon": {
     "species": "toucannon",
@@ -78408,7 +78407,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "unfezant", "method": "level", "data": "32" }]
+    "evolutions": [{ "species": "unfezant", "method": "level", "data": 32 }]
   },
   "trapinch": {
     "species": "trapinch",
@@ -78500,7 +78499,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "vibrava", "method": "level", "data": "35" }]
+    "evolutions": [{ "species": "vibrava", "method": "level", "data": 35 }]
   },
   "treecko": {
     "species": "treecko",
@@ -78601,7 +78600,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "grovyle", "method": "level", "data": "16" }]
+    "evolutions": [{ "species": "grovyle", "method": "level", "data": 16 }]
   },
   "trevenant": {
     "species": "trevenant",
@@ -78896,7 +78895,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "garbodor", "method": "level", "data": "36" }]
+    "evolutions": [{ "species": "garbodor", "method": "level", "data": 36 }]
   },
   "trumbeak": {
     "species": "trumbeak",
@@ -79265,7 +79264,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "grotle", "method": "level", "data": "18" }]
+    "evolutions": [{ "species": "grotle", "method": "level", "data": 18 }]
   },
   "tympole": {
     "species": "tympole",
@@ -79353,7 +79352,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "palpitoad", "method": "level", "data": "25" }]
+    "evolutions": [{ "species": "palpitoad", "method": "level", "data": 25 }]
   },
   "tynamo": {
     "species": "tynamo",
@@ -79398,7 +79397,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "eelektrik", "method": "level", "data": "39" }]
+    "evolutions": [{ "species": "eelektrik", "method": "level", "data": 39 }]
   },
   "type_null": {
     "species": "type_null",
@@ -79971,9 +79970,9 @@
       }
     },
     "evolutions": [
-      { "species": "hitmonlee", "method": "attackgreater", "data": "20" },
-      { "species": "hitmonchan", "method": "defensegreater", "data": "20" },
-      { "species": "hitmontop", "method": "atkdefequal", "data": "20" }
+      { "species": "hitmonlee", "method": "custom", "data": ["attackgreater", 20] },
+      { "species": "hitmonchan", "method": "custom", "data": ["defensegreater", 20] },
+      { "species": "hitmontop", "method": "custom", "data": ["atkdefequal", 20] }
     ]
   },
   "tyrunt": {
@@ -80555,7 +80554,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "vanilluxe", "method": "level", "data": "47" }]
+    "evolutions": [{ "species": "vanilluxe", "method": "level", "data": 47 }]
   },
   "vanillite": {
     "species": "vanillite",
@@ -80644,7 +80643,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "vanillish", "method": "level", "data": "35" }]
+    "evolutions": [{ "species": "vanillish", "method": "level", "data": 35 }]
   },
   "vanilluxe": {
     "species": "vanilluxe",
@@ -80904,7 +80903,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "whirlipede", "method": "level", "data": "22" }]
+    "evolutions": [{ "species": "whirlipede", "method": "level", "data": 22 }]
   },
   "venomoth": {
     "species": "venomoth",
@@ -81087,7 +81086,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "venomoth", "method": "level", "data": "31" }]
+    "evolutions": [{ "species": "venomoth", "method": "level", "data": 31 }]
   },
   "venusaur": {
     "species": "venusaur",
@@ -81437,7 +81436,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "flygon", "method": "level", "data": "45" }]
+    "evolutions": [{ "species": "flygon", "method": "level", "data": 45 }]
   },
   "victini": {
     "species": "victini",
@@ -81715,7 +81714,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "slaking", "method": "level", "data": "36" }]
+    "evolutions": [{ "species": "slaking", "method": "level", "data": 36 }]
   },
   "vikavolt": {
     "species": "vikavolt",
@@ -82526,7 +82525,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "electrode", "method": "level", "data": "30" }]
+    "evolutions": [{ "species": "electrode", "method": "level", "data": 30 }]
   },
   "vullaby": {
     "species": "vullaby",
@@ -82623,7 +82622,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "mandibuzz", "method": "level", "data": "54" }]
+    "evolutions": [{ "species": "mandibuzz", "method": "level", "data": 54 }]
   },
   "vulpix": {
     "species": "vulpix",
@@ -82798,7 +82797,7 @@
       }
     },
     "evolutions": [
-      { "species": "ninetales", "method": "item", "data": "firestone" }
+      { "species": "ninetales", "method": "item", "data": "fire_stone" }
     ]
   },
   "wailmer": {
@@ -82897,7 +82896,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "wailord", "method": "level", "data": "40" }]
+    "evolutions": [{ "species": "wailord", "method": "level", "data": 40 }]
   },
   "wailord": {
     "species": "wailord",
@@ -83163,7 +83162,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "blastoise", "method": "level", "data": "36" }]
+    "evolutions": [{ "species": "blastoise", "method": "level", "data": 36 }]
   },
   "watchog": {
     "species": "watchog",
@@ -83409,7 +83408,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "kakuna", "method": "level", "data": "7" }]
+    "evolutions": [{ "species": "kakuna", "method": "level", "data": 7 }]
   },
   "weepinbell": {
     "species": "weepinbell",
@@ -83494,7 +83493,7 @@
       }
     },
     "evolutions": [
-      { "species": "victreebel", "method": "item", "data": "leafstone" }
+      { "species": "victreebel", "method": "item", "data": "leaf_stone" }
     ]
   },
   "weezing": {
@@ -83755,7 +83754,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "scolipede", "method": "level", "data": "30" }]
+    "evolutions": [{ "species": "scolipede", "method": "level", "data": 30 }]
   },
   "whiscash": {
     "species": "whiscash",
@@ -83941,7 +83940,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "loudred", "method": "level", "data": "20" }]
+    "evolutions": [{ "species": "loudred", "method": "level", "data": 20 }]
   },
   "wigglytuff": {
     "species": "wigglytuff",
@@ -84197,7 +84196,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "pelipper", "method": "level", "data": "25" }]
+    "evolutions": [{ "species": "pelipper", "method": "level", "data": 25 }]
   },
   "wishiwashi": {
     "species": "wishiwashi",
@@ -84494,7 +84493,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "swoobat", "method": "happiness", "data": "" }]
+    "evolutions": [{ "species": "swoobat", "method": "happiness", "data": 220 }]
   },
   "wooper": {
     "species": "wooper",
@@ -84594,7 +84593,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "quagsire", "method": "level", "data": "20" }]
+    "evolutions": [{ "species": "quagsire", "method": "level", "data": 20 }]
   },
   "wormadam": {
     "species": "wormadam",
@@ -84879,8 +84878,8 @@
       }
     },
     "evolutions": [
-      { "species": "silcoon", "method": "silcoon", "data": "7" },
-      { "species": "cascoon", "method": "cascoon", "data": "7" }
+      { "species": "silcoon", "method": "custom", "data": ["silcoon", 7] },
+      { "species": "cascoon", "method": "custom", "data": ["cascoon", 7] }
     ]
   },
   "wynaut": {
@@ -84929,7 +84928,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "wobbuffet", "method": "level", "data": "15" }]
+    "evolutions": [{ "species": "wobbuffet", "method": "level", "data": 15 }]
   },
   "xatu": {
     "species": "xatu",
@@ -85314,7 +85313,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "cofagrigus", "method": "level", "data": "34" }]
+    "evolutions": [{ "species": "cofagrigus", "method": "level", "data": 34 }]
   },
   "yanma": {
     "species": "yanma",
@@ -85408,7 +85407,7 @@
       }
     },
     "evolutions": [
-      { "species": "yanmega", "method": "hasmove", "data": "ancientpower" }
+      { "species": "yanmega", "method": "hasmove", "data": "ancient_power" }
     ]
   },
   "yanmega": {
@@ -86167,7 +86166,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "linoone", "method": "level", "data": "20" }]
+    "evolutions": [{ "species": "linoone", "method": "level", "data": 20 }]
   },
   "zoroark": {
     "species": "zoroark",
@@ -86370,7 +86369,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "zoroark", "method": "level", "data": "30" }]
+    "evolutions": [{ "species": "zoroark", "method": "level", "data": 30 }]
   },
   "zubat": {
     "species": "zubat",
@@ -86472,7 +86471,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "golbat", "method": "level", "data": "22" }]
+    "evolutions": [{ "species": "golbat", "method": "level", "data": 22 }]
   },
   "zweilous": {
     "species": "zweilous",
@@ -86557,7 +86556,7 @@
         }
       }
     },
-    "evolutions": [{ "species": "hydreigon", "method": "level", "data": "64" }]
+    "evolutions": [{ "species": "hydreigon", "method": "level", "data": 64 }]
   },
   "zygarde": {
     "species": "zygarde",