diff --git a/data/api/v2/gender/1/index.json b/data/api/v2/gender/1/index.json
index 7dd735517..17930a9e0 100644
--- a/data/api/v2/gender/1/index.json
+++ b/data/api/v2/gender/1/index.json
@@ -191,76 +191,6 @@
             },
             "rate": 4
         },
-        {
-            "pokemon_species": {
-                "name": "venusaur",
-                "url": "/api/v2/pokemon-species/3/"
-            },
-            "rate": 1
-        },
-        {
-            "pokemon_species": {
-                "name": "charizard",
-                "url": "/api/v2/pokemon-species/6/"
-            },
-            "rate": 1
-        },
-        {
-            "pokemon_species": {
-                "name": "wartortle",
-                "url": "/api/v2/pokemon-species/8/"
-            },
-            "rate": 1
-        },
-        {
-            "pokemon_species": {
-                "name": "blastoise",
-                "url": "/api/v2/pokemon-species/9/"
-            },
-            "rate": 1
-        },
-        {
-            "pokemon_species": {
-                "name": "metapod",
-                "url": "/api/v2/pokemon-species/11/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "butterfree",
-                "url": "/api/v2/pokemon-species/12/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "kakuna",
-                "url": "/api/v2/pokemon-species/14/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "beedrill",
-                "url": "/api/v2/pokemon-species/15/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "pidgeotto",
-                "url": "/api/v2/pokemon-species/17/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "pidgeot",
-                "url": "/api/v2/pokemon-species/18/"
-            },
-            "rate": 4
-        },
         {
             "pokemon_species": {
                 "name": "ponyta",
@@ -1577,139 +1507,6 @@
             },
             "rate": 4
         },
-        {
-            "pokemon_species": {
-                "name": "lumineon",
-                "url": "/api/v2/pokemon-species/457/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "weavile",
-                "url": "/api/v2/pokemon-species/461/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "lickilicky",
-                "url": "/api/v2/pokemon-species/463/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "rhyperior",
-                "url": "/api/v2/pokemon-species/464/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "tangrowth",
-                "url": "/api/v2/pokemon-species/465/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "electivire",
-                "url": "/api/v2/pokemon-species/466/"
-            },
-            "rate": 2
-        },
-        {
-            "pokemon_species": {
-                "name": "magmortar",
-                "url": "/api/v2/pokemon-species/467/"
-            },
-            "rate": 2
-        },
-        {
-            "pokemon_species": {
-                "name": "togekiss",
-                "url": "/api/v2/pokemon-species/468/"
-            },
-            "rate": 1
-        },
-        {
-            "pokemon_species": {
-                "name": "gliscor",
-                "url": "/api/v2/pokemon-species/472/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "mamoswine",
-                "url": "/api/v2/pokemon-species/473/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "probopass",
-                "url": "/api/v2/pokemon-species/476/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "dusknoir",
-                "url": "/api/v2/pokemon-species/477/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "froslass",
-                "url": "/api/v2/pokemon-species/478/"
-            },
-            "rate": 8
-        },
-        {
-            "pokemon_species": {
-                "name": "servine",
-                "url": "/api/v2/pokemon-species/496/"
-            },
-            "rate": 1
-        },
-        {
-            "pokemon_species": {
-                "name": "serperior",
-                "url": "/api/v2/pokemon-species/497/"
-            },
-            "rate": 1
-        },
-        {
-            "pokemon_species": {
-                "name": "pignite",
-                "url": "/api/v2/pokemon-species/499/"
-            },
-            "rate": 1
-        },
-        {
-            "pokemon_species": {
-                "name": "emboar",
-                "url": "/api/v2/pokemon-species/500/"
-            },
-            "rate": 1
-        },
-        {
-            "pokemon_species": {
-                "name": "dewott",
-                "url": "/api/v2/pokemon-species/502/"
-            },
-            "rate": 1
-        },
-        {
-            "pokemon_species": {
-                "name": "samurott",
-                "url": "/api/v2/pokemon-species/503/"
-            },
-            "rate": 1
-        },
         {
             "pokemon_species": {
                 "name": "timburr",
@@ -2963,6 +2760,13 @@
             },
             "rate": 1
         },
+        {
+            "pokemon_species": {
+                "name": "venusaur",
+                "url": "/api/v2/pokemon-species/3/"
+            },
+            "rate": 1
+        },
         {
             "pokemon_species": {
                 "name": "charmeleon",
@@ -2970,6 +2774,69 @@
             },
             "rate": 1
         },
+        {
+            "pokemon_species": {
+                "name": "charizard",
+                "url": "/api/v2/pokemon-species/6/"
+            },
+            "rate": 1
+        },
+        {
+            "pokemon_species": {
+                "name": "wartortle",
+                "url": "/api/v2/pokemon-species/8/"
+            },
+            "rate": 1
+        },
+        {
+            "pokemon_species": {
+                "name": "blastoise",
+                "url": "/api/v2/pokemon-species/9/"
+            },
+            "rate": 1
+        },
+        {
+            "pokemon_species": {
+                "name": "metapod",
+                "url": "/api/v2/pokemon-species/11/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "butterfree",
+                "url": "/api/v2/pokemon-species/12/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "kakuna",
+                "url": "/api/v2/pokemon-species/14/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "beedrill",
+                "url": "/api/v2/pokemon-species/15/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "pidgeotto",
+                "url": "/api/v2/pokemon-species/17/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "pidgeot",
+                "url": "/api/v2/pokemon-species/18/"
+            },
+            "rate": 4
+        },
         {
             "pokemon_species": {
                 "name": "raticate",
@@ -4363,6 +4230,13 @@
             },
             "rate": 4
         },
+        {
+            "pokemon_species": {
+                "name": "lumineon",
+                "url": "/api/v2/pokemon-species/457/"
+            },
+            "rate": 4
+        },
         {
             "pokemon_species": {
                 "name": "abomasnow",
@@ -4370,6 +4244,55 @@
             },
             "rate": 4
         },
+        {
+            "pokemon_species": {
+                "name": "weavile",
+                "url": "/api/v2/pokemon-species/461/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "lickilicky",
+                "url": "/api/v2/pokemon-species/463/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "rhyperior",
+                "url": "/api/v2/pokemon-species/464/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "tangrowth",
+                "url": "/api/v2/pokemon-species/465/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "electivire",
+                "url": "/api/v2/pokemon-species/466/"
+            },
+            "rate": 2
+        },
+        {
+            "pokemon_species": {
+                "name": "magmortar",
+                "url": "/api/v2/pokemon-species/467/"
+            },
+            "rate": 2
+        },
+        {
+            "pokemon_species": {
+                "name": "togekiss",
+                "url": "/api/v2/pokemon-species/468/"
+            },
+            "rate": 1
+        },
         {
             "pokemon_species": {
                 "name": "yanmega",
@@ -4391,6 +4314,83 @@
             },
             "rate": 1
         },
+        {
+            "pokemon_species": {
+                "name": "gliscor",
+                "url": "/api/v2/pokemon-species/472/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "mamoswine",
+                "url": "/api/v2/pokemon-species/473/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "probopass",
+                "url": "/api/v2/pokemon-species/476/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "dusknoir",
+                "url": "/api/v2/pokemon-species/477/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "froslass",
+                "url": "/api/v2/pokemon-species/478/"
+            },
+            "rate": 8
+        },
+        {
+            "pokemon_species": {
+                "name": "servine",
+                "url": "/api/v2/pokemon-species/496/"
+            },
+            "rate": 1
+        },
+        {
+            "pokemon_species": {
+                "name": "serperior",
+                "url": "/api/v2/pokemon-species/497/"
+            },
+            "rate": 1
+        },
+        {
+            "pokemon_species": {
+                "name": "pignite",
+                "url": "/api/v2/pokemon-species/499/"
+            },
+            "rate": 1
+        },
+        {
+            "pokemon_species": {
+                "name": "emboar",
+                "url": "/api/v2/pokemon-species/500/"
+            },
+            "rate": 1
+        },
+        {
+            "pokemon_species": {
+                "name": "dewott",
+                "url": "/api/v2/pokemon-species/502/"
+            },
+            "rate": 1
+        },
+        {
+            "pokemon_species": {
+                "name": "samurott",
+                "url": "/api/v2/pokemon-species/503/"
+            },
+            "rate": 1
+        },
         {
             "pokemon_species": {
                 "name": "watchog",
diff --git a/data/api/v2/gender/2/index.json b/data/api/v2/gender/2/index.json
index 643ee3a88..c9bbc4f02 100644
--- a/data/api/v2/gender/2/index.json
+++ b/data/api/v2/gender/2/index.json
@@ -191,76 +191,6 @@
             },
             "rate": 4
         },
-        {
-            "pokemon_species": {
-                "name": "venusaur",
-                "url": "/api/v2/pokemon-species/3/"
-            },
-            "rate": 1
-        },
-        {
-            "pokemon_species": {
-                "name": "charizard",
-                "url": "/api/v2/pokemon-species/6/"
-            },
-            "rate": 1
-        },
-        {
-            "pokemon_species": {
-                "name": "wartortle",
-                "url": "/api/v2/pokemon-species/8/"
-            },
-            "rate": 1
-        },
-        {
-            "pokemon_species": {
-                "name": "blastoise",
-                "url": "/api/v2/pokemon-species/9/"
-            },
-            "rate": 1
-        },
-        {
-            "pokemon_species": {
-                "name": "metapod",
-                "url": "/api/v2/pokemon-species/11/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "butterfree",
-                "url": "/api/v2/pokemon-species/12/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "kakuna",
-                "url": "/api/v2/pokemon-species/14/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "beedrill",
-                "url": "/api/v2/pokemon-species/15/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "pidgeotto",
-                "url": "/api/v2/pokemon-species/17/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "pidgeot",
-                "url": "/api/v2/pokemon-species/18/"
-            },
-            "rate": 4
-        },
         {
             "pokemon_species": {
                 "name": "ponyta",
@@ -1556,139 +1486,6 @@
             },
             "rate": 4
         },
-        {
-            "pokemon_species": {
-                "name": "lumineon",
-                "url": "/api/v2/pokemon-species/457/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "weavile",
-                "url": "/api/v2/pokemon-species/461/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "lickilicky",
-                "url": "/api/v2/pokemon-species/463/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "rhyperior",
-                "url": "/api/v2/pokemon-species/464/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "tangrowth",
-                "url": "/api/v2/pokemon-species/465/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "electivire",
-                "url": "/api/v2/pokemon-species/466/"
-            },
-            "rate": 2
-        },
-        {
-            "pokemon_species": {
-                "name": "magmortar",
-                "url": "/api/v2/pokemon-species/467/"
-            },
-            "rate": 2
-        },
-        {
-            "pokemon_species": {
-                "name": "togekiss",
-                "url": "/api/v2/pokemon-species/468/"
-            },
-            "rate": 1
-        },
-        {
-            "pokemon_species": {
-                "name": "gliscor",
-                "url": "/api/v2/pokemon-species/472/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "mamoswine",
-                "url": "/api/v2/pokemon-species/473/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "gallade",
-                "url": "/api/v2/pokemon-species/475/"
-            },
-            "rate": 0
-        },
-        {
-            "pokemon_species": {
-                "name": "probopass",
-                "url": "/api/v2/pokemon-species/476/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "dusknoir",
-                "url": "/api/v2/pokemon-species/477/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "servine",
-                "url": "/api/v2/pokemon-species/496/"
-            },
-            "rate": 1
-        },
-        {
-            "pokemon_species": {
-                "name": "serperior",
-                "url": "/api/v2/pokemon-species/497/"
-            },
-            "rate": 1
-        },
-        {
-            "pokemon_species": {
-                "name": "pignite",
-                "url": "/api/v2/pokemon-species/499/"
-            },
-            "rate": 1
-        },
-        {
-            "pokemon_species": {
-                "name": "emboar",
-                "url": "/api/v2/pokemon-species/500/"
-            },
-            "rate": 1
-        },
-        {
-            "pokemon_species": {
-                "name": "dewott",
-                "url": "/api/v2/pokemon-species/502/"
-            },
-            "rate": 1
-        },
-        {
-            "pokemon_species": {
-                "name": "samurott",
-                "url": "/api/v2/pokemon-species/503/"
-            },
-            "rate": 1
-        },
         {
             "pokemon_species": {
                 "name": "timburr",
@@ -2935,6 +2732,13 @@
             },
             "rate": 1
         },
+        {
+            "pokemon_species": {
+                "name": "venusaur",
+                "url": "/api/v2/pokemon-species/3/"
+            },
+            "rate": 1
+        },
         {
             "pokemon_species": {
                 "name": "charmeleon",
@@ -2942,6 +2746,69 @@
             },
             "rate": 1
         },
+        {
+            "pokemon_species": {
+                "name": "charizard",
+                "url": "/api/v2/pokemon-species/6/"
+            },
+            "rate": 1
+        },
+        {
+            "pokemon_species": {
+                "name": "wartortle",
+                "url": "/api/v2/pokemon-species/8/"
+            },
+            "rate": 1
+        },
+        {
+            "pokemon_species": {
+                "name": "blastoise",
+                "url": "/api/v2/pokemon-species/9/"
+            },
+            "rate": 1
+        },
+        {
+            "pokemon_species": {
+                "name": "metapod",
+                "url": "/api/v2/pokemon-species/11/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "butterfree",
+                "url": "/api/v2/pokemon-species/12/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "kakuna",
+                "url": "/api/v2/pokemon-species/14/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "beedrill",
+                "url": "/api/v2/pokemon-species/15/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "pidgeotto",
+                "url": "/api/v2/pokemon-species/17/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "pidgeot",
+                "url": "/api/v2/pokemon-species/18/"
+            },
+            "rate": 4
+        },
         {
             "pokemon_species": {
                 "name": "raticate",
@@ -4328,6 +4195,13 @@
             },
             "rate": 4
         },
+        {
+            "pokemon_species": {
+                "name": "lumineon",
+                "url": "/api/v2/pokemon-species/457/"
+            },
+            "rate": 4
+        },
         {
             "pokemon_species": {
                 "name": "abomasnow",
@@ -4335,6 +4209,55 @@
             },
             "rate": 4
         },
+        {
+            "pokemon_species": {
+                "name": "weavile",
+                "url": "/api/v2/pokemon-species/461/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "lickilicky",
+                "url": "/api/v2/pokemon-species/463/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "rhyperior",
+                "url": "/api/v2/pokemon-species/464/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "tangrowth",
+                "url": "/api/v2/pokemon-species/465/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "electivire",
+                "url": "/api/v2/pokemon-species/466/"
+            },
+            "rate": 2
+        },
+        {
+            "pokemon_species": {
+                "name": "magmortar",
+                "url": "/api/v2/pokemon-species/467/"
+            },
+            "rate": 2
+        },
+        {
+            "pokemon_species": {
+                "name": "togekiss",
+                "url": "/api/v2/pokemon-species/468/"
+            },
+            "rate": 1
+        },
         {
             "pokemon_species": {
                 "name": "yanmega",
@@ -4356,6 +4279,83 @@
             },
             "rate": 1
         },
+        {
+            "pokemon_species": {
+                "name": "gliscor",
+                "url": "/api/v2/pokemon-species/472/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "mamoswine",
+                "url": "/api/v2/pokemon-species/473/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "gallade",
+                "url": "/api/v2/pokemon-species/475/"
+            },
+            "rate": 0
+        },
+        {
+            "pokemon_species": {
+                "name": "probopass",
+                "url": "/api/v2/pokemon-species/476/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "dusknoir",
+                "url": "/api/v2/pokemon-species/477/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "servine",
+                "url": "/api/v2/pokemon-species/496/"
+            },
+            "rate": 1
+        },
+        {
+            "pokemon_species": {
+                "name": "serperior",
+                "url": "/api/v2/pokemon-species/497/"
+            },
+            "rate": 1
+        },
+        {
+            "pokemon_species": {
+                "name": "pignite",
+                "url": "/api/v2/pokemon-species/499/"
+            },
+            "rate": 1
+        },
+        {
+            "pokemon_species": {
+                "name": "emboar",
+                "url": "/api/v2/pokemon-species/500/"
+            },
+            "rate": 1
+        },
+        {
+            "pokemon_species": {
+                "name": "dewott",
+                "url": "/api/v2/pokemon-species/502/"
+            },
+            "rate": 1
+        },
+        {
+            "pokemon_species": {
+                "name": "samurott",
+                "url": "/api/v2/pokemon-species/503/"
+            },
+            "rate": 1
+        },
         {
             "pokemon_species": {
                 "name": "watchog",
diff --git a/data/api/v2/gender/3/index.json b/data/api/v2/gender/3/index.json
index eace43230..4553d079a 100644
--- a/data/api/v2/gender/3/index.json
+++ b/data/api/v2/gender/3/index.json
@@ -310,20 +310,6 @@
             },
             "rate": -1
         },
-        {
-            "pokemon_species": {
-                "name": "magnezone",
-                "url": "/api/v2/pokemon-species/462/"
-            },
-            "rate": -1
-        },
-        {
-            "pokemon_species": {
-                "name": "porygon-z",
-                "url": "/api/v2/pokemon-species/474/"
-            },
-            "rate": -1
-        },
         {
             "pokemon_species": {
                 "name": "klink",
@@ -1031,6 +1017,20 @@
             },
             "rate": -1
         },
+        {
+            "pokemon_species": {
+                "name": "magnezone",
+                "url": "/api/v2/pokemon-species/462/"
+            },
+            "rate": -1
+        },
+        {
+            "pokemon_species": {
+                "name": "porygon-z",
+                "url": "/api/v2/pokemon-species/474/"
+            },
+            "rate": -1
+        },
         {
             "pokemon_species": {
                 "name": "klang",
diff --git a/data/api/v2/generation/1/index.json b/data/api/v2/generation/1/index.json
index 72f6041c9..d91ede6dc 100644
--- a/data/api/v2/generation/1/index.json
+++ b/data/api/v2/generation/1/index.json
@@ -846,46 +846,6 @@
             "name": "geodude",
             "url": "/api/v2/pokemon-species/74/"
         },
-        {
-            "name": "venusaur",
-            "url": "/api/v2/pokemon-species/3/"
-        },
-        {
-            "name": "charizard",
-            "url": "/api/v2/pokemon-species/6/"
-        },
-        {
-            "name": "wartortle",
-            "url": "/api/v2/pokemon-species/8/"
-        },
-        {
-            "name": "blastoise",
-            "url": "/api/v2/pokemon-species/9/"
-        },
-        {
-            "name": "metapod",
-            "url": "/api/v2/pokemon-species/11/"
-        },
-        {
-            "name": "butterfree",
-            "url": "/api/v2/pokemon-species/12/"
-        },
-        {
-            "name": "kakuna",
-            "url": "/api/v2/pokemon-species/14/"
-        },
-        {
-            "name": "beedrill",
-            "url": "/api/v2/pokemon-species/15/"
-        },
-        {
-            "name": "pidgeotto",
-            "url": "/api/v2/pokemon-species/17/"
-        },
-        {
-            "name": "pidgeot",
-            "url": "/api/v2/pokemon-species/18/"
-        },
         {
             "name": "ponyta",
             "url": "/api/v2/pokemon-species/77/"
@@ -1050,10 +1010,50 @@
             "name": "ivysaur",
             "url": "/api/v2/pokemon-species/2/"
         },
+        {
+            "name": "venusaur",
+            "url": "/api/v2/pokemon-species/3/"
+        },
         {
             "name": "charmeleon",
             "url": "/api/v2/pokemon-species/5/"
         },
+        {
+            "name": "charizard",
+            "url": "/api/v2/pokemon-species/6/"
+        },
+        {
+            "name": "wartortle",
+            "url": "/api/v2/pokemon-species/8/"
+        },
+        {
+            "name": "blastoise",
+            "url": "/api/v2/pokemon-species/9/"
+        },
+        {
+            "name": "metapod",
+            "url": "/api/v2/pokemon-species/11/"
+        },
+        {
+            "name": "butterfree",
+            "url": "/api/v2/pokemon-species/12/"
+        },
+        {
+            "name": "kakuna",
+            "url": "/api/v2/pokemon-species/14/"
+        },
+        {
+            "name": "beedrill",
+            "url": "/api/v2/pokemon-species/15/"
+        },
+        {
+            "name": "pidgeotto",
+            "url": "/api/v2/pokemon-species/17/"
+        },
+        {
+            "name": "pidgeot",
+            "url": "/api/v2/pokemon-species/18/"
+        },
         {
             "name": "raticate",
             "url": "/api/v2/pokemon-species/20/"
diff --git a/data/api/v2/generation/4/index.json b/data/api/v2/generation/4/index.json
index b668b37ba..dc15a5287 100644
--- a/data/api/v2/generation/4/index.json
+++ b/data/api/v2/generation/4/index.json
@@ -923,70 +923,6 @@
             "name": "arceus",
             "url": "/api/v2/pokemon-species/493/"
         },
-        {
-            "name": "lumineon",
-            "url": "/api/v2/pokemon-species/457/"
-        },
-        {
-            "name": "weavile",
-            "url": "/api/v2/pokemon-species/461/"
-        },
-        {
-            "name": "magnezone",
-            "url": "/api/v2/pokemon-species/462/"
-        },
-        {
-            "name": "lickilicky",
-            "url": "/api/v2/pokemon-species/463/"
-        },
-        {
-            "name": "rhyperior",
-            "url": "/api/v2/pokemon-species/464/"
-        },
-        {
-            "name": "tangrowth",
-            "url": "/api/v2/pokemon-species/465/"
-        },
-        {
-            "name": "electivire",
-            "url": "/api/v2/pokemon-species/466/"
-        },
-        {
-            "name": "magmortar",
-            "url": "/api/v2/pokemon-species/467/"
-        },
-        {
-            "name": "togekiss",
-            "url": "/api/v2/pokemon-species/468/"
-        },
-        {
-            "name": "gliscor",
-            "url": "/api/v2/pokemon-species/472/"
-        },
-        {
-            "name": "mamoswine",
-            "url": "/api/v2/pokemon-species/473/"
-        },
-        {
-            "name": "porygon-z",
-            "url": "/api/v2/pokemon-species/474/"
-        },
-        {
-            "name": "gallade",
-            "url": "/api/v2/pokemon-species/475/"
-        },
-        {
-            "name": "probopass",
-            "url": "/api/v2/pokemon-species/476/"
-        },
-        {
-            "name": "dusknoir",
-            "url": "/api/v2/pokemon-species/477/"
-        },
-        {
-            "name": "froslass",
-            "url": "/api/v2/pokemon-species/478/"
-        },
         {
             "name": "grotle",
             "url": "/api/v2/pokemon-species/388/"
@@ -1127,10 +1063,46 @@
             "name": "toxicroak",
             "url": "/api/v2/pokemon-species/454/"
         },
+        {
+            "name": "lumineon",
+            "url": "/api/v2/pokemon-species/457/"
+        },
         {
             "name": "abomasnow",
             "url": "/api/v2/pokemon-species/460/"
         },
+        {
+            "name": "weavile",
+            "url": "/api/v2/pokemon-species/461/"
+        },
+        {
+            "name": "magnezone",
+            "url": "/api/v2/pokemon-species/462/"
+        },
+        {
+            "name": "lickilicky",
+            "url": "/api/v2/pokemon-species/463/"
+        },
+        {
+            "name": "rhyperior",
+            "url": "/api/v2/pokemon-species/464/"
+        },
+        {
+            "name": "tangrowth",
+            "url": "/api/v2/pokemon-species/465/"
+        },
+        {
+            "name": "electivire",
+            "url": "/api/v2/pokemon-species/466/"
+        },
+        {
+            "name": "magmortar",
+            "url": "/api/v2/pokemon-species/467/"
+        },
+        {
+            "name": "togekiss",
+            "url": "/api/v2/pokemon-species/468/"
+        },
         {
             "name": "yanmega",
             "url": "/api/v2/pokemon-species/469/"
@@ -1142,6 +1114,34 @@
         {
             "name": "glaceon",
             "url": "/api/v2/pokemon-species/471/"
+        },
+        {
+            "name": "gliscor",
+            "url": "/api/v2/pokemon-species/472/"
+        },
+        {
+            "name": "mamoswine",
+            "url": "/api/v2/pokemon-species/473/"
+        },
+        {
+            "name": "porygon-z",
+            "url": "/api/v2/pokemon-species/474/"
+        },
+        {
+            "name": "gallade",
+            "url": "/api/v2/pokemon-species/475/"
+        },
+        {
+            "name": "probopass",
+            "url": "/api/v2/pokemon-species/476/"
+        },
+        {
+            "name": "dusknoir",
+            "url": "/api/v2/pokemon-species/477/"
+        },
+        {
+            "name": "froslass",
+            "url": "/api/v2/pokemon-species/478/"
         }
     ],
     "types": [],
diff --git a/data/api/v2/generation/5/index.json b/data/api/v2/generation/5/index.json
index f10871efe..34bd18bda 100644
--- a/data/api/v2/generation/5/index.json
+++ b/data/api/v2/generation/5/index.json
@@ -915,30 +915,6 @@
             "name": "audino",
             "url": "/api/v2/pokemon-species/531/"
         },
-        {
-            "name": "servine",
-            "url": "/api/v2/pokemon-species/496/"
-        },
-        {
-            "name": "serperior",
-            "url": "/api/v2/pokemon-species/497/"
-        },
-        {
-            "name": "pignite",
-            "url": "/api/v2/pokemon-species/499/"
-        },
-        {
-            "name": "emboar",
-            "url": "/api/v2/pokemon-species/500/"
-        },
-        {
-            "name": "dewott",
-            "url": "/api/v2/pokemon-species/502/"
-        },
-        {
-            "name": "samurott",
-            "url": "/api/v2/pokemon-species/503/"
-        },
         {
             "name": "timburr",
             "url": "/api/v2/pokemon-species/532/"
@@ -1199,6 +1175,30 @@
             "name": "genesect",
             "url": "/api/v2/pokemon-species/649/"
         },
+        {
+            "name": "servine",
+            "url": "/api/v2/pokemon-species/496/"
+        },
+        {
+            "name": "serperior",
+            "url": "/api/v2/pokemon-species/497/"
+        },
+        {
+            "name": "pignite",
+            "url": "/api/v2/pokemon-species/499/"
+        },
+        {
+            "name": "emboar",
+            "url": "/api/v2/pokemon-species/500/"
+        },
+        {
+            "name": "dewott",
+            "url": "/api/v2/pokemon-species/502/"
+        },
+        {
+            "name": "samurott",
+            "url": "/api/v2/pokemon-species/503/"
+        },
         {
             "name": "watchog",
             "url": "/api/v2/pokemon-species/505/"
diff --git a/data/api/v2/growth-rate/1/index.json b/data/api/v2/growth-rate/1/index.json
index 78fcbbc32..8f6b5362d 100644
--- a/data/api/v2/growth-rate/1/index.json
+++ b/data/api/v2/growth-rate/1/index.json
@@ -704,18 +704,6 @@
             "name": "victini",
             "url": "/api/v2/pokemon-species/494/"
         },
-        {
-            "name": "rhyperior",
-            "url": "/api/v2/pokemon-species/464/"
-        },
-        {
-            "name": "mamoswine",
-            "url": "/api/v2/pokemon-species/473/"
-        },
-        {
-            "name": "gallade",
-            "url": "/api/v2/pokemon-species/475/"
-        },
         {
             "name": "vanillite",
             "url": "/api/v2/pokemon-species/582/"
@@ -1300,6 +1288,18 @@
             "name": "abomasnow",
             "url": "/api/v2/pokemon-species/460/"
         },
+        {
+            "name": "rhyperior",
+            "url": "/api/v2/pokemon-species/464/"
+        },
+        {
+            "name": "mamoswine",
+            "url": "/api/v2/pokemon-species/473/"
+        },
+        {
+            "name": "gallade",
+            "url": "/api/v2/pokemon-species/475/"
+        },
         {
             "name": "vanillish",
             "url": "/api/v2/pokemon-species/583/"
diff --git a/data/api/v2/growth-rate/2/index.json b/data/api/v2/growth-rate/2/index.json
index 2533e1bdc..b04e528b4 100644
--- a/data/api/v2/growth-rate/2/index.json
+++ b/data/api/v2/growth-rate/2/index.json
@@ -484,22 +484,6 @@
             "name": "mankey",
             "url": "/api/v2/pokemon-species/56/"
         },
-        {
-            "name": "metapod",
-            "url": "/api/v2/pokemon-species/11/"
-        },
-        {
-            "name": "butterfree",
-            "url": "/api/v2/pokemon-species/12/"
-        },
-        {
-            "name": "kakuna",
-            "url": "/api/v2/pokemon-species/14/"
-        },
-        {
-            "name": "beedrill",
-            "url": "/api/v2/pokemon-species/15/"
-        },
         {
             "name": "ponyta",
             "url": "/api/v2/pokemon-species/77/"
@@ -824,38 +808,6 @@
             "name": "drilbur",
             "url": "/api/v2/pokemon-species/529/"
         },
-        {
-            "name": "magnezone",
-            "url": "/api/v2/pokemon-species/462/"
-        },
-        {
-            "name": "lickilicky",
-            "url": "/api/v2/pokemon-species/463/"
-        },
-        {
-            "name": "tangrowth",
-            "url": "/api/v2/pokemon-species/465/"
-        },
-        {
-            "name": "electivire",
-            "url": "/api/v2/pokemon-species/466/"
-        },
-        {
-            "name": "magmortar",
-            "url": "/api/v2/pokemon-species/467/"
-        },
-        {
-            "name": "porygon-z",
-            "url": "/api/v2/pokemon-species/474/"
-        },
-        {
-            "name": "probopass",
-            "url": "/api/v2/pokemon-species/476/"
-        },
-        {
-            "name": "froslass",
-            "url": "/api/v2/pokemon-species/478/"
-        },
         {
             "name": "throh",
             "url": "/api/v2/pokemon-species/538/"
@@ -1264,6 +1216,22 @@
             "name": "varoom",
             "url": "/api/v2/pokemon-species/965/"
         },
+        {
+            "name": "metapod",
+            "url": "/api/v2/pokemon-species/11/"
+        },
+        {
+            "name": "butterfree",
+            "url": "/api/v2/pokemon-species/12/"
+        },
+        {
+            "name": "kakuna",
+            "url": "/api/v2/pokemon-species/14/"
+        },
+        {
+            "name": "beedrill",
+            "url": "/api/v2/pokemon-species/15/"
+        },
         {
             "name": "raticate",
             "url": "/api/v2/pokemon-species/20/"
@@ -1588,6 +1556,26 @@
             "name": "toxicroak",
             "url": "/api/v2/pokemon-species/454/"
         },
+        {
+            "name": "magnezone",
+            "url": "/api/v2/pokemon-species/462/"
+        },
+        {
+            "name": "lickilicky",
+            "url": "/api/v2/pokemon-species/463/"
+        },
+        {
+            "name": "tangrowth",
+            "url": "/api/v2/pokemon-species/465/"
+        },
+        {
+            "name": "electivire",
+            "url": "/api/v2/pokemon-species/466/"
+        },
+        {
+            "name": "magmortar",
+            "url": "/api/v2/pokemon-species/467/"
+        },
         {
             "name": "yanmega",
             "url": "/api/v2/pokemon-species/469/"
@@ -1600,6 +1588,18 @@
             "name": "glaceon",
             "url": "/api/v2/pokemon-species/471/"
         },
+        {
+            "name": "porygon-z",
+            "url": "/api/v2/pokemon-species/474/"
+        },
+        {
+            "name": "probopass",
+            "url": "/api/v2/pokemon-species/476/"
+        },
+        {
+            "name": "froslass",
+            "url": "/api/v2/pokemon-species/478/"
+        },
         {
             "name": "watchog",
             "url": "/api/v2/pokemon-species/505/"
diff --git a/data/api/v2/growth-rate/3/index.json b/data/api/v2/growth-rate/3/index.json
index cc43ed052..0b9745bc3 100644
--- a/data/api/v2/growth-rate/3/index.json
+++ b/data/api/v2/growth-rate/3/index.json
@@ -532,14 +532,6 @@
             "name": "audino",
             "url": "/api/v2/pokemon-species/531/"
         },
-        {
-            "name": "togekiss",
-            "url": "/api/v2/pokemon-species/468/"
-        },
-        {
-            "name": "dusknoir",
-            "url": "/api/v2/pokemon-species/477/"
-        },
         {
             "name": "minccino",
             "url": "/api/v2/pokemon-species/572/"
@@ -668,6 +660,14 @@
             "name": "purugly",
             "url": "/api/v2/pokemon-species/432/"
         },
+        {
+            "name": "togekiss",
+            "url": "/api/v2/pokemon-species/468/"
+        },
+        {
+            "name": "dusknoir",
+            "url": "/api/v2/pokemon-species/477/"
+        },
         {
             "name": "musharna",
             "url": "/api/v2/pokemon-species/518/"
diff --git a/data/api/v2/growth-rate/4/index.json b/data/api/v2/growth-rate/4/index.json
index 1b90ff720..356c6fde6 100644
--- a/data/api/v2/growth-rate/4/index.json
+++ b/data/api/v2/growth-rate/4/index.json
@@ -476,30 +476,6 @@
             "name": "geodude",
             "url": "/api/v2/pokemon-species/74/"
         },
-        {
-            "name": "venusaur",
-            "url": "/api/v2/pokemon-species/3/"
-        },
-        {
-            "name": "charizard",
-            "url": "/api/v2/pokemon-species/6/"
-        },
-        {
-            "name": "wartortle",
-            "url": "/api/v2/pokemon-species/8/"
-        },
-        {
-            "name": "blastoise",
-            "url": "/api/v2/pokemon-species/9/"
-        },
-        {
-            "name": "pidgeotto",
-            "url": "/api/v2/pokemon-species/17/"
-        },
-        {
-            "name": "pidgeot",
-            "url": "/api/v2/pokemon-species/18/"
-        },
         {
             "name": "gastly",
             "url": "/api/v2/pokemon-species/92/"
@@ -672,38 +648,6 @@
             "name": "roggenrola",
             "url": "/api/v2/pokemon-species/524/"
         },
-        {
-            "name": "weavile",
-            "url": "/api/v2/pokemon-species/461/"
-        },
-        {
-            "name": "gliscor",
-            "url": "/api/v2/pokemon-species/472/"
-        },
-        {
-            "name": "servine",
-            "url": "/api/v2/pokemon-species/496/"
-        },
-        {
-            "name": "serperior",
-            "url": "/api/v2/pokemon-species/497/"
-        },
-        {
-            "name": "pignite",
-            "url": "/api/v2/pokemon-species/499/"
-        },
-        {
-            "name": "emboar",
-            "url": "/api/v2/pokemon-species/500/"
-        },
-        {
-            "name": "dewott",
-            "url": "/api/v2/pokemon-species/502/"
-        },
-        {
-            "name": "samurott",
-            "url": "/api/v2/pokemon-species/503/"
-        },
         {
             "name": "timburr",
             "url": "/api/v2/pokemon-species/532/"
@@ -896,10 +840,34 @@
             "name": "ivysaur",
             "url": "/api/v2/pokemon-species/2/"
         },
+        {
+            "name": "venusaur",
+            "url": "/api/v2/pokemon-species/3/"
+        },
         {
             "name": "charmeleon",
             "url": "/api/v2/pokemon-species/5/"
         },
+        {
+            "name": "charizard",
+            "url": "/api/v2/pokemon-species/6/"
+        },
+        {
+            "name": "wartortle",
+            "url": "/api/v2/pokemon-species/8/"
+        },
+        {
+            "name": "blastoise",
+            "url": "/api/v2/pokemon-species/9/"
+        },
+        {
+            "name": "pidgeotto",
+            "url": "/api/v2/pokemon-species/17/"
+        },
+        {
+            "name": "pidgeot",
+            "url": "/api/v2/pokemon-species/18/"
+        },
         {
             "name": "nidorina",
             "url": "/api/v2/pokemon-species/30/"
@@ -1160,6 +1128,38 @@
             "name": "lucario",
             "url": "/api/v2/pokemon-species/448/"
         },
+        {
+            "name": "weavile",
+            "url": "/api/v2/pokemon-species/461/"
+        },
+        {
+            "name": "gliscor",
+            "url": "/api/v2/pokemon-species/472/"
+        },
+        {
+            "name": "servine",
+            "url": "/api/v2/pokemon-species/496/"
+        },
+        {
+            "name": "serperior",
+            "url": "/api/v2/pokemon-species/497/"
+        },
+        {
+            "name": "pignite",
+            "url": "/api/v2/pokemon-species/499/"
+        },
+        {
+            "name": "emboar",
+            "url": "/api/v2/pokemon-species/500/"
+        },
+        {
+            "name": "dewott",
+            "url": "/api/v2/pokemon-species/502/"
+        },
+        {
+            "name": "samurott",
+            "url": "/api/v2/pokemon-species/503/"
+        },
         {
             "name": "herdier",
             "url": "/api/v2/pokemon-species/507/"
diff --git a/data/api/v2/growth-rate/5/index.json b/data/api/v2/growth-rate/5/index.json
index 86d956933..9973fce47 100644
--- a/data/api/v2/growth-rate/5/index.json
+++ b/data/api/v2/growth-rate/5/index.json
@@ -472,10 +472,6 @@
             "name": "finneon",
             "url": "/api/v2/pokemon-species/456/"
         },
-        {
-            "name": "lumineon",
-            "url": "/api/v2/pokemon-species/457/"
-        },
         {
             "name": "applin",
             "url": "/api/v2/pokemon-species/840/"
@@ -528,6 +524,10 @@
             "name": "bastiodon",
             "url": "/api/v2/pokemon-species/411/"
         },
+        {
+            "name": "lumineon",
+            "url": "/api/v2/pokemon-species/457/"
+        },
         {
             "name": "flapple",
             "url": "/api/v2/pokemon-species/841/"
diff --git a/data/api/v2/move/251/index.json b/data/api/v2/move/251/index.json
index 75e78c144..5cd5e496a 100644
--- a/data/api/v2/move/251/index.json
+++ b/data/api/v2/move/251/index.json
@@ -1009,6 +1009,10 @@
             "name": "bramblin",
             "url": "/api/v2/pokemon/946/"
         },
+        {
+            "name": "brambleghast",
+            "url": "/api/v2/pokemon/947/"
+        },
         {
             "name": "fezandipiti",
             "url": "/api/v2/pokemon/1016/"
diff --git a/data/api/v2/move/335/index.json b/data/api/v2/move/335/index.json
index 1b872cf25..36b9a4633 100644
--- a/data/api/v2/move/335/index.json
+++ b/data/api/v2/move/335/index.json
@@ -1215,6 +1215,10 @@
             "name": "bramblin",
             "url": "/api/v2/pokemon/946/"
         },
+        {
+            "name": "brambleghast",
+            "url": "/api/v2/pokemon/947/"
+        },
         {
             "name": "landorus-therian",
             "url": "/api/v2/pokemon/10021/"
diff --git a/data/api/v2/move/425/index.json b/data/api/v2/move/425/index.json
index b47960c42..b6c65cd1d 100644
--- a/data/api/v2/move/425/index.json
+++ b/data/api/v2/move/425/index.json
@@ -824,6 +824,10 @@
             "name": "bramblin",
             "url": "/api/v2/pokemon/946/"
         },
+        {
+            "name": "brambleghast",
+            "url": "/api/v2/pokemon/947/"
+        },
         {
             "name": "greavard",
             "url": "/api/v2/pokemon/971/"
diff --git a/data/api/v2/move/469/index.json b/data/api/v2/move/469/index.json
index 9b1cf8af3..782e45c42 100644
--- a/data/api/v2/move/469/index.json
+++ b/data/api/v2/move/469/index.json
@@ -740,6 +740,10 @@
             "name": "wingull",
             "url": "/api/v2/pokemon/278/"
         },
+        {
+            "name": "pelipper",
+            "url": "/api/v2/pokemon/279/"
+        },
         {
             "name": "makuhita",
             "url": "/api/v2/pokemon/296/"
diff --git a/data/api/v2/move/668/index.json b/data/api/v2/move/668/index.json
index c5ac09551..e2bdad42a 100644
--- a/data/api/v2/move/668/index.json
+++ b/data/api/v2/move/668/index.json
@@ -531,6 +531,10 @@
             "name": "bramblin",
             "url": "/api/v2/pokemon/946/"
         },
+        {
+            "name": "brambleghast",
+            "url": "/api/v2/pokemon/947/"
+        },
         {
             "name": "sinistcha",
             "url": "/api/v2/pokemon/1013/"
diff --git a/data/api/v2/move/73/index.json b/data/api/v2/move/73/index.json
index 3d066e0b9..da55047c1 100644
--- a/data/api/v2/move/73/index.json
+++ b/data/api/v2/move/73/index.json
@@ -1101,6 +1101,10 @@
             "name": "bramblin",
             "url": "/api/v2/pokemon/946/"
         },
+        {
+            "name": "brambleghast",
+            "url": "/api/v2/pokemon/947/"
+        },
         {
             "name": "toedscool",
             "url": "/api/v2/pokemon/948/"
diff --git a/data/api/v2/pokemon-color/1/index.json b/data/api/v2/pokemon-color/1/index.json
index 0e7431d2a..333ac7181 100644
--- a/data/api/v2/pokemon-color/1/index.json
+++ b/data/api/v2/pokemon-color/1/index.json
@@ -130,14 +130,6 @@
             "name": "blitzle",
             "url": "/api/v2/pokemon-species/522/"
         },
-        {
-            "name": "weavile",
-            "url": "/api/v2/pokemon-species/461/"
-        },
-        {
-            "name": "dusknoir",
-            "url": "/api/v2/pokemon-species/477/"
-        },
         {
             "name": "sigilyph",
             "url": "/api/v2/pokemon-species/561/"
@@ -230,6 +222,14 @@
             "name": "honchkrow",
             "url": "/api/v2/pokemon-species/430/"
         },
+        {
+            "name": "weavile",
+            "url": "/api/v2/pokemon-species/461/"
+        },
+        {
+            "name": "dusknoir",
+            "url": "/api/v2/pokemon-species/477/"
+        },
         {
             "name": "zebstrika",
             "url": "/api/v2/pokemon-species/523/"
diff --git a/data/api/v2/pokemon-color/10/index.json b/data/api/v2/pokemon-color/10/index.json
index b1a378e6e..f5fc9b5dc 100644
--- a/data/api/v2/pokemon-color/10/index.json
+++ b/data/api/v2/pokemon-color/10/index.json
@@ -86,14 +86,6 @@
             "name": "psyduck",
             "url": "/api/v2/pokemon-species/54/"
         },
-        {
-            "name": "kakuna",
-            "url": "/api/v2/pokemon-species/14/"
-        },
-        {
-            "name": "beedrill",
-            "url": "/api/v2/pokemon-species/15/"
-        },
         {
             "name": "ponyta",
             "url": "/api/v2/pokemon-species/77/"
@@ -186,10 +178,6 @@
             "name": "victini",
             "url": "/api/v2/pokemon-species/494/"
         },
-        {
-            "name": "electivire",
-            "url": "/api/v2/pokemon-species/466/"
-        },
         {
             "name": "sewaddle",
             "url": "/api/v2/pokemon-species/540/"
@@ -286,6 +274,14 @@
             "name": "raging-bolt",
             "url": "/api/v2/pokemon-species/1021/"
         },
+        {
+            "name": "kakuna",
+            "url": "/api/v2/pokemon-species/14/"
+        },
+        {
+            "name": "beedrill",
+            "url": "/api/v2/pokemon-species/15/"
+        },
         {
             "name": "pikachu",
             "url": "/api/v2/pokemon-species/25/"
@@ -366,6 +362,10 @@
             "name": "vespiquen",
             "url": "/api/v2/pokemon-species/416/"
         },
+        {
+            "name": "electivire",
+            "url": "/api/v2/pokemon-species/466/"
+        },
         {
             "name": "leavanny",
             "url": "/api/v2/pokemon-species/542/"
diff --git a/data/api/v2/pokemon-color/2/index.json b/data/api/v2/pokemon-color/2/index.json
index e13e576f4..3cd41bf09 100644
--- a/data/api/v2/pokemon-color/2/index.json
+++ b/data/api/v2/pokemon-color/2/index.json
@@ -94,14 +94,6 @@
             "name": "tentacool",
             "url": "/api/v2/pokemon-species/72/"
         },
-        {
-            "name": "wartortle",
-            "url": "/api/v2/pokemon-species/8/"
-        },
-        {
-            "name": "blastoise",
-            "url": "/api/v2/pokemon-species/9/"
-        },
         {
             "name": "tangela",
             "url": "/api/v2/pokemon-species/114/"
@@ -270,22 +262,6 @@
             "name": "woobat",
             "url": "/api/v2/pokemon-species/527/"
         },
-        {
-            "name": "lumineon",
-            "url": "/api/v2/pokemon-species/457/"
-        },
-        {
-            "name": "tangrowth",
-            "url": "/api/v2/pokemon-species/465/"
-        },
-        {
-            "name": "dewott",
-            "url": "/api/v2/pokemon-species/502/"
-        },
-        {
-            "name": "samurott",
-            "url": "/api/v2/pokemon-species/503/"
-        },
         {
             "name": "tympole",
             "url": "/api/v2/pokemon-species/535/"
@@ -434,6 +410,14 @@
             "name": "terapagos",
             "url": "/api/v2/pokemon-species/1024/"
         },
+        {
+            "name": "wartortle",
+            "url": "/api/v2/pokemon-species/8/"
+        },
+        {
+            "name": "blastoise",
+            "url": "/api/v2/pokemon-species/9/"
+        },
         {
             "name": "nidorina",
             "url": "/api/v2/pokemon-species/30/"
@@ -622,10 +606,26 @@
             "name": "toxicroak",
             "url": "/api/v2/pokemon-species/454/"
         },
+        {
+            "name": "lumineon",
+            "url": "/api/v2/pokemon-species/457/"
+        },
+        {
+            "name": "tangrowth",
+            "url": "/api/v2/pokemon-species/465/"
+        },
         {
             "name": "glaceon",
             "url": "/api/v2/pokemon-species/471/"
         },
+        {
+            "name": "dewott",
+            "url": "/api/v2/pokemon-species/502/"
+        },
+        {
+            "name": "samurott",
+            "url": "/api/v2/pokemon-species/503/"
+        },
         {
             "name": "simipour",
             "url": "/api/v2/pokemon-species/516/"
diff --git a/data/api/v2/pokemon-color/3/index.json b/data/api/v2/pokemon-color/3/index.json
index b16a87f7c..49edf2365 100644
--- a/data/api/v2/pokemon-color/3/index.json
+++ b/data/api/v2/pokemon-color/3/index.json
@@ -110,14 +110,6 @@
             "name": "geodude",
             "url": "/api/v2/pokemon-species/74/"
         },
-        {
-            "name": "pidgeotto",
-            "url": "/api/v2/pokemon-species/17/"
-        },
-        {
-            "name": "pidgeot",
-            "url": "/api/v2/pokemon-species/18/"
-        },
         {
             "name": "farfetchd",
             "url": "/api/v2/pokemon-species/83/"
@@ -258,10 +250,6 @@
             "name": "lillipup",
             "url": "/api/v2/pokemon-species/506/"
         },
-        {
-            "name": "mamoswine",
-            "url": "/api/v2/pokemon-species/473/"
-        },
         {
             "name": "sandile",
             "url": "/api/v2/pokemon-species/551/"
@@ -394,6 +382,14 @@
             "name": "gouging-fire",
             "url": "/api/v2/pokemon-species/1020/"
         },
+        {
+            "name": "pidgeotto",
+            "url": "/api/v2/pokemon-species/17/"
+        },
+        {
+            "name": "pidgeot",
+            "url": "/api/v2/pokemon-species/18/"
+        },
         {
             "name": "raticate",
             "url": "/api/v2/pokemon-species/20/"
@@ -530,6 +526,10 @@
             "name": "hippowdon",
             "url": "/api/v2/pokemon-species/450/"
         },
+        {
+            "name": "mamoswine",
+            "url": "/api/v2/pokemon-species/473/"
+        },
         {
             "name": "watchog",
             "url": "/api/v2/pokemon-species/505/"
diff --git a/data/api/v2/pokemon-color/4/index.json b/data/api/v2/pokemon-color/4/index.json
index ea0612fec..d9a6158f5 100644
--- a/data/api/v2/pokemon-color/4/index.json
+++ b/data/api/v2/pokemon-color/4/index.json
@@ -170,18 +170,6 @@
             "name": "drilbur",
             "url": "/api/v2/pokemon-species/529/"
         },
-        {
-            "name": "magnezone",
-            "url": "/api/v2/pokemon-species/462/"
-        },
-        {
-            "name": "rhyperior",
-            "url": "/api/v2/pokemon-species/464/"
-        },
-        {
-            "name": "probopass",
-            "url": "/api/v2/pokemon-species/476/"
-        },
         {
             "name": "timburr",
             "url": "/api/v2/pokemon-species/532/"
@@ -374,6 +362,18 @@
             "name": "purugly",
             "url": "/api/v2/pokemon-species/432/"
         },
+        {
+            "name": "magnezone",
+            "url": "/api/v2/pokemon-species/462/"
+        },
+        {
+            "name": "rhyperior",
+            "url": "/api/v2/pokemon-species/464/"
+        },
+        {
+            "name": "probopass",
+            "url": "/api/v2/pokemon-species/476/"
+        },
         {
             "name": "herdier",
             "url": "/api/v2/pokemon-species/507/"
diff --git a/data/api/v2/pokemon-color/5/index.json b/data/api/v2/pokemon-color/5/index.json
index 4c7233c7c..44214b470 100644
--- a/data/api/v2/pokemon-color/5/index.json
+++ b/data/api/v2/pokemon-color/5/index.json
@@ -86,14 +86,6 @@
             "name": "bellsprout",
             "url": "/api/v2/pokemon-species/69/"
         },
-        {
-            "name": "venusaur",
-            "url": "/api/v2/pokemon-species/3/"
-        },
-        {
-            "name": "metapod",
-            "url": "/api/v2/pokemon-species/11/"
-        },
         {
             "name": "scyther",
             "url": "/api/v2/pokemon-species/123/"
@@ -182,14 +174,6 @@
             "name": "pansage",
             "url": "/api/v2/pokemon-species/511/"
         },
-        {
-            "name": "servine",
-            "url": "/api/v2/pokemon-species/496/"
-        },
-        {
-            "name": "serperior",
-            "url": "/api/v2/pokemon-species/497/"
-        },
         {
             "name": "cottonee",
             "url": "/api/v2/pokemon-species/546/"
@@ -346,6 +330,14 @@
             "name": "ivysaur",
             "url": "/api/v2/pokemon-species/2/"
         },
+        {
+            "name": "venusaur",
+            "url": "/api/v2/pokemon-species/3/"
+        },
+        {
+            "name": "metapod",
+            "url": "/api/v2/pokemon-species/11/"
+        },
         {
             "name": "weepinbell",
             "url": "/api/v2/pokemon-species/70/"
@@ -454,6 +446,14 @@
             "name": "leafeon",
             "url": "/api/v2/pokemon-species/470/"
         },
+        {
+            "name": "servine",
+            "url": "/api/v2/pokemon-species/496/"
+        },
+        {
+            "name": "serperior",
+            "url": "/api/v2/pokemon-species/497/"
+        },
         {
             "name": "simisage",
             "url": "/api/v2/pokemon-species/512/"
diff --git a/data/api/v2/pokemon-color/6/index.json b/data/api/v2/pokemon-color/6/index.json
index 6322850c7..f6a59c8b9 100644
--- a/data/api/v2/pokemon-color/6/index.json
+++ b/data/api/v2/pokemon-color/6/index.json
@@ -158,10 +158,6 @@
             "name": "audino",
             "url": "/api/v2/pokemon-species/531/"
         },
-        {
-            "name": "lickilicky",
-            "url": "/api/v2/pokemon-species/463/"
-        },
         {
             "name": "deerling",
             "url": "/api/v2/pokemon-species/585/"
@@ -274,6 +270,10 @@
             "name": "gorebyss",
             "url": "/api/v2/pokemon-species/368/"
         },
+        {
+            "name": "lickilicky",
+            "url": "/api/v2/pokemon-species/463/"
+        },
         {
             "name": "musharna",
             "url": "/api/v2/pokemon-species/518/"
diff --git a/data/api/v2/pokemon-color/7/index.json b/data/api/v2/pokemon-color/7/index.json
index 41185f44d..7206c1b28 100644
--- a/data/api/v2/pokemon-color/7/index.json
+++ b/data/api/v2/pokemon-color/7/index.json
@@ -174,10 +174,6 @@
             "name": "purrloin",
             "url": "/api/v2/pokemon-species/509/"
         },
-        {
-            "name": "gliscor",
-            "url": "/api/v2/pokemon-species/472/"
-        },
         {
             "name": "gothita",
             "url": "/api/v2/pokemon-species/574/"
@@ -354,6 +350,10 @@
             "name": "drapion",
             "url": "/api/v2/pokemon-species/452/"
         },
+        {
+            "name": "gliscor",
+            "url": "/api/v2/pokemon-species/472/"
+        },
         {
             "name": "liepard",
             "url": "/api/v2/pokemon-species/510/"
diff --git a/data/api/v2/pokemon-color/8/index.json b/data/api/v2/pokemon-color/8/index.json
index 7a4e5abdd..35e5226c1 100644
--- a/data/api/v2/pokemon-color/8/index.json
+++ b/data/api/v2/pokemon-color/8/index.json
@@ -82,10 +82,6 @@
             "name": "paras",
             "url": "/api/v2/pokemon-species/46/"
         },
-        {
-            "name": "charizard",
-            "url": "/api/v2/pokemon-species/6/"
-        },
         {
             "name": "krabby",
             "url": "/api/v2/pokemon-species/98/"
@@ -174,22 +170,6 @@
             "name": "pansear",
             "url": "/api/v2/pokemon-species/513/"
         },
-        {
-            "name": "magmortar",
-            "url": "/api/v2/pokemon-species/467/"
-        },
-        {
-            "name": "porygon-z",
-            "url": "/api/v2/pokemon-species/474/"
-        },
-        {
-            "name": "pignite",
-            "url": "/api/v2/pokemon-species/499/"
-        },
-        {
-            "name": "emboar",
-            "url": "/api/v2/pokemon-species/500/"
-        },
         {
             "name": "throh",
             "url": "/api/v2/pokemon-species/538/"
@@ -294,6 +274,10 @@
             "name": "charmeleon",
             "url": "/api/v2/pokemon-species/5/"
         },
+        {
+            "name": "charizard",
+            "url": "/api/v2/pokemon-species/6/"
+        },
         {
             "name": "vileplume",
             "url": "/api/v2/pokemon-species/45/"
@@ -374,6 +358,22 @@
             "name": "kricketune",
             "url": "/api/v2/pokemon-species/402/"
         },
+        {
+            "name": "magmortar",
+            "url": "/api/v2/pokemon-species/467/"
+        },
+        {
+            "name": "porygon-z",
+            "url": "/api/v2/pokemon-species/474/"
+        },
+        {
+            "name": "pignite",
+            "url": "/api/v2/pokemon-species/499/"
+        },
+        {
+            "name": "emboar",
+            "url": "/api/v2/pokemon-species/500/"
+        },
         {
             "name": "simisear",
             "url": "/api/v2/pokemon-species/514/"
diff --git a/data/api/v2/pokemon-color/9/index.json b/data/api/v2/pokemon-color/9/index.json
index c1edc080c..efbd10e8e 100644
--- a/data/api/v2/pokemon-color/9/index.json
+++ b/data/api/v2/pokemon-color/9/index.json
@@ -74,10 +74,6 @@
         }
     ],
     "pokemon_species": [
-        {
-            "name": "butterfree",
-            "url": "/api/v2/pokemon-species/12/"
-        },
         {
             "name": "seel",
             "url": "/api/v2/pokemon-species/86/"
@@ -134,18 +130,6 @@
             "name": "arceus",
             "url": "/api/v2/pokemon-species/493/"
         },
-        {
-            "name": "togekiss",
-            "url": "/api/v2/pokemon-species/468/"
-        },
-        {
-            "name": "gallade",
-            "url": "/api/v2/pokemon-species/475/"
-        },
-        {
-            "name": "froslass",
-            "url": "/api/v2/pokemon-species/478/"
-        },
         {
             "name": "vanillite",
             "url": "/api/v2/pokemon-species/582/"
@@ -294,6 +278,10 @@
             "name": "iron-valiant",
             "url": "/api/v2/pokemon-species/1006/"
         },
+        {
+            "name": "butterfree",
+            "url": "/api/v2/pokemon-species/12/"
+        },
         {
             "name": "dewgong",
             "url": "/api/v2/pokemon-species/87/"
@@ -330,6 +318,18 @@
             "name": "abomasnow",
             "url": "/api/v2/pokemon-species/460/"
         },
+        {
+            "name": "togekiss",
+            "url": "/api/v2/pokemon-species/468/"
+        },
+        {
+            "name": "gallade",
+            "url": "/api/v2/pokemon-species/475/"
+        },
+        {
+            "name": "froslass",
+            "url": "/api/v2/pokemon-species/478/"
+        },
         {
             "name": "swanna",
             "url": "/api/v2/pokemon-species/581/"
diff --git a/data/api/v2/pokemon-habitat/2/index.json b/data/api/v2/pokemon-habitat/2/index.json
index 3aed10e52..c7de3b05c 100644
--- a/data/api/v2/pokemon-habitat/2/index.json
+++ b/data/api/v2/pokemon-habitat/2/index.json
@@ -49,30 +49,6 @@
             "name": "bellsprout",
             "url": "/api/v2/pokemon-species/69/"
         },
-        {
-            "name": "metapod",
-            "url": "/api/v2/pokemon-species/11/"
-        },
-        {
-            "name": "butterfree",
-            "url": "/api/v2/pokemon-species/12/"
-        },
-        {
-            "name": "kakuna",
-            "url": "/api/v2/pokemon-species/14/"
-        },
-        {
-            "name": "beedrill",
-            "url": "/api/v2/pokemon-species/15/"
-        },
-        {
-            "name": "pidgeotto",
-            "url": "/api/v2/pokemon-species/17/"
-        },
-        {
-            "name": "pidgeot",
-            "url": "/api/v2/pokemon-species/18/"
-        },
         {
             "name": "exeggcute",
             "url": "/api/v2/pokemon-species/102/"
@@ -189,6 +165,30 @@
             "name": "tropius",
             "url": "/api/v2/pokemon-species/357/"
         },
+        {
+            "name": "metapod",
+            "url": "/api/v2/pokemon-species/11/"
+        },
+        {
+            "name": "butterfree",
+            "url": "/api/v2/pokemon-species/12/"
+        },
+        {
+            "name": "kakuna",
+            "url": "/api/v2/pokemon-species/14/"
+        },
+        {
+            "name": "beedrill",
+            "url": "/api/v2/pokemon-species/15/"
+        },
+        {
+            "name": "pidgeotto",
+            "url": "/api/v2/pokemon-species/17/"
+        },
+        {
+            "name": "pidgeot",
+            "url": "/api/v2/pokemon-species/18/"
+        },
         {
             "name": "pikachu",
             "url": "/api/v2/pokemon-species/25/"
diff --git a/data/api/v2/pokemon-habitat/3/index.json b/data/api/v2/pokemon-habitat/3/index.json
index 6cf2e1568..6ebfe2e0b 100644
--- a/data/api/v2/pokemon-habitat/3/index.json
+++ b/data/api/v2/pokemon-habitat/3/index.json
@@ -57,10 +57,6 @@
             "name": "growlithe",
             "url": "/api/v2/pokemon-species/58/"
         },
-        {
-            "name": "venusaur",
-            "url": "/api/v2/pokemon-species/3/"
-        },
         {
             "name": "ponyta",
             "url": "/api/v2/pokemon-species/77/"
@@ -197,6 +193,10 @@
             "name": "ivysaur",
             "url": "/api/v2/pokemon-species/2/"
         },
+        {
+            "name": "venusaur",
+            "url": "/api/v2/pokemon-species/3/"
+        },
         {
             "name": "raticate",
             "url": "/api/v2/pokemon-species/20/"
diff --git a/data/api/v2/pokemon-habitat/4/index.json b/data/api/v2/pokemon-habitat/4/index.json
index f4d6f853c..3e91fc1d3 100644
--- a/data/api/v2/pokemon-habitat/4/index.json
+++ b/data/api/v2/pokemon-habitat/4/index.json
@@ -41,10 +41,6 @@
             "name": "geodude",
             "url": "/api/v2/pokemon-species/74/"
         },
-        {
-            "name": "charizard",
-            "url": "/api/v2/pokemon-species/6/"
-        },
         {
             "name": "cubone",
             "url": "/api/v2/pokemon-species/104/"
@@ -125,6 +121,10 @@
             "name": "charmeleon",
             "url": "/api/v2/pokemon-species/5/"
         },
+        {
+            "name": "charizard",
+            "url": "/api/v2/pokemon-species/6/"
+        },
         {
             "name": "clefairy",
             "url": "/api/v2/pokemon-species/35/"
diff --git a/data/api/v2/pokemon-habitat/9/index.json b/data/api/v2/pokemon-habitat/9/index.json
index 8781d5299..e2819e685 100644
--- a/data/api/v2/pokemon-habitat/9/index.json
+++ b/data/api/v2/pokemon-habitat/9/index.json
@@ -37,14 +37,6 @@
             "name": "poliwag",
             "url": "/api/v2/pokemon-species/60/"
         },
-        {
-            "name": "wartortle",
-            "url": "/api/v2/pokemon-species/8/"
-        },
-        {
-            "name": "blastoise",
-            "url": "/api/v2/pokemon-species/9/"
-        },
         {
             "name": "slowpoke",
             "url": "/api/v2/pokemon-species/79/"
@@ -113,6 +105,14 @@
             "name": "latios",
             "url": "/api/v2/pokemon-species/381/"
         },
+        {
+            "name": "wartortle",
+            "url": "/api/v2/pokemon-species/8/"
+        },
+        {
+            "name": "blastoise",
+            "url": "/api/v2/pokemon-species/9/"
+        },
         {
             "name": "golduck",
             "url": "/api/v2/pokemon-species/55/"
diff --git a/data/api/v2/pokemon-shape/11/index.json b/data/api/v2/pokemon-shape/11/index.json
index ed316dd3b..053b24c83 100644
--- a/data/api/v2/pokemon-shape/11/index.json
+++ b/data/api/v2/pokemon-shape/11/index.json
@@ -46,10 +46,6 @@
             "name": "cherubi",
             "url": "/api/v2/pokemon-species/420/"
         },
-        {
-            "name": "probopass",
-            "url": "/api/v2/pokemon-species/476/"
-        },
         {
             "name": "klink",
             "url": "/api/v2/pokemon-species/599/"
@@ -82,6 +78,10 @@
             "name": "metagross",
             "url": "/api/v2/pokemon-species/376/"
         },
+        {
+            "name": "probopass",
+            "url": "/api/v2/pokemon-species/476/"
+        },
         {
             "name": "vanilluxe",
             "url": "/api/v2/pokemon-species/584/"
diff --git a/data/api/v2/pokemon-shape/12/index.json b/data/api/v2/pokemon-shape/12/index.json
index 3738a95b1..4a0d88616 100644
--- a/data/api/v2/pokemon-shape/12/index.json
+++ b/data/api/v2/pokemon-shape/12/index.json
@@ -194,18 +194,6 @@
             "name": "victini",
             "url": "/api/v2/pokemon-species/494/"
         },
-        {
-            "name": "lickilicky",
-            "url": "/api/v2/pokemon-species/463/"
-        },
-        {
-            "name": "tangrowth",
-            "url": "/api/v2/pokemon-species/465/"
-        },
-        {
-            "name": "gallade",
-            "url": "/api/v2/pokemon-species/475/"
-        },
         {
             "name": "timburr",
             "url": "/api/v2/pokemon-species/532/"
@@ -482,6 +470,18 @@
             "name": "toxicroak",
             "url": "/api/v2/pokemon-species/454/"
         },
+        {
+            "name": "lickilicky",
+            "url": "/api/v2/pokemon-species/463/"
+        },
+        {
+            "name": "tangrowth",
+            "url": "/api/v2/pokemon-species/465/"
+        },
+        {
+            "name": "gallade",
+            "url": "/api/v2/pokemon-species/475/"
+        },
         {
             "name": "musharna",
             "url": "/api/v2/pokemon-species/518/"
diff --git a/data/api/v2/pokemon-shape/13/index.json b/data/api/v2/pokemon-shape/13/index.json
index a726240c3..e107c7d18 100644
--- a/data/api/v2/pokemon-shape/13/index.json
+++ b/data/api/v2/pokemon-shape/13/index.json
@@ -34,14 +34,6 @@
         }
     ],
     "pokemon_species": [
-        {
-            "name": "butterfree",
-            "url": "/api/v2/pokemon-species/12/"
-        },
-        {
-            "name": "beedrill",
-            "url": "/api/v2/pokemon-species/15/"
-        },
         {
             "name": "scyther",
             "url": "/api/v2/pokemon-species/123/"
@@ -54,6 +46,14 @@
             "name": "iron-moth",
             "url": "/api/v2/pokemon-species/994/"
         },
+        {
+            "name": "butterfree",
+            "url": "/api/v2/pokemon-species/12/"
+        },
+        {
+            "name": "beedrill",
+            "url": "/api/v2/pokemon-species/15/"
+        },
         {
             "name": "venomoth",
             "url": "/api/v2/pokemon-species/49/"
diff --git a/data/api/v2/pokemon-shape/2/index.json b/data/api/v2/pokemon-shape/2/index.json
index 104e13483..4ffe64729 100644
--- a/data/api/v2/pokemon-shape/2/index.json
+++ b/data/api/v2/pokemon-shape/2/index.json
@@ -38,14 +38,6 @@
             "name": "ekans",
             "url": "/api/v2/pokemon-species/23/"
         },
-        {
-            "name": "metapod",
-            "url": "/api/v2/pokemon-species/11/"
-        },
-        {
-            "name": "kakuna",
-            "url": "/api/v2/pokemon-species/14/"
-        },
         {
             "name": "onix",
             "url": "/api/v2/pokemon-species/95/"
@@ -78,10 +70,6 @@
             "name": "cresselia",
             "url": "/api/v2/pokemon-species/488/"
         },
-        {
-            "name": "serperior",
-            "url": "/api/v2/pokemon-species/497/"
-        },
         {
             "name": "goomy",
             "url": "/api/v2/pokemon-species/704/"
@@ -130,6 +118,14 @@
             "name": "wo-chien",
             "url": "/api/v2/pokemon-species/1001/"
         },
+        {
+            "name": "metapod",
+            "url": "/api/v2/pokemon-species/11/"
+        },
+        {
+            "name": "kakuna",
+            "url": "/api/v2/pokemon-species/14/"
+        },
         {
             "name": "arbok",
             "url": "/api/v2/pokemon-species/24/"
@@ -170,6 +166,10 @@
             "name": "gastrodon",
             "url": "/api/v2/pokemon-species/423/"
         },
+        {
+            "name": "serperior",
+            "url": "/api/v2/pokemon-species/497/"
+        },
         {
             "name": "clawitzer",
             "url": "/api/v2/pokemon-species/693/"
diff --git a/data/api/v2/pokemon-shape/3/index.json b/data/api/v2/pokemon-shape/3/index.json
index cae5ecb2d..742b318fd 100644
--- a/data/api/v2/pokemon-shape/3/index.json
+++ b/data/api/v2/pokemon-shape/3/index.json
@@ -98,10 +98,6 @@
             "name": "finneon",
             "url": "/api/v2/pokemon-species/456/"
         },
-        {
-            "name": "lumineon",
-            "url": "/api/v2/pokemon-species/457/"
-        },
         {
             "name": "tympole",
             "url": "/api/v2/pokemon-species/535/"
@@ -190,6 +186,10 @@
             "name": "sealeo",
             "url": "/api/v2/pokemon-species/364/"
         },
+        {
+            "name": "lumineon",
+            "url": "/api/v2/pokemon-species/457/"
+        },
         {
             "name": "eelektrik",
             "url": "/api/v2/pokemon-species/603/"
diff --git a/data/api/v2/pokemon-shape/4/index.json b/data/api/v2/pokemon-shape/4/index.json
index e192b2c9a..75c8cc768 100644
--- a/data/api/v2/pokemon-shape/4/index.json
+++ b/data/api/v2/pokemon-shape/4/index.json
@@ -70,22 +70,6 @@
             "name": "phione",
             "url": "/api/v2/pokemon-species/489/"
         },
-        {
-            "name": "magnezone",
-            "url": "/api/v2/pokemon-species/462/"
-        },
-        {
-            "name": "porygon-z",
-            "url": "/api/v2/pokemon-species/474/"
-        },
-        {
-            "name": "dusknoir",
-            "url": "/api/v2/pokemon-species/477/"
-        },
-        {
-            "name": "froslass",
-            "url": "/api/v2/pokemon-species/478/"
-        },
         {
             "name": "yamask",
             "url": "/api/v2/pokemon-species/562/"
@@ -182,6 +166,22 @@
             "name": "bronzong",
             "url": "/api/v2/pokemon-species/437/"
         },
+        {
+            "name": "magnezone",
+            "url": "/api/v2/pokemon-species/462/"
+        },
+        {
+            "name": "porygon-z",
+            "url": "/api/v2/pokemon-species/474/"
+        },
+        {
+            "name": "dusknoir",
+            "url": "/api/v2/pokemon-species/477/"
+        },
+        {
+            "name": "froslass",
+            "url": "/api/v2/pokemon-species/478/"
+        },
         {
             "name": "swadloon",
             "url": "/api/v2/pokemon-species/541/"
diff --git a/data/api/v2/pokemon-shape/6/index.json b/data/api/v2/pokemon-shape/6/index.json
index 892ec5747..71de1ec3d 100644
--- a/data/api/v2/pokemon-shape/6/index.json
+++ b/data/api/v2/pokemon-shape/6/index.json
@@ -62,18 +62,6 @@
             "name": "machop",
             "url": "/api/v2/pokemon-species/66/"
         },
-        {
-            "name": "charizard",
-            "url": "/api/v2/pokemon-species/6/"
-        },
-        {
-            "name": "wartortle",
-            "url": "/api/v2/pokemon-species/8/"
-        },
-        {
-            "name": "blastoise",
-            "url": "/api/v2/pokemon-species/9/"
-        },
         {
             "name": "cubone",
             "url": "/api/v2/pokemon-species/104/"
@@ -242,38 +230,6 @@
             "name": "audino",
             "url": "/api/v2/pokemon-species/531/"
         },
-        {
-            "name": "weavile",
-            "url": "/api/v2/pokemon-species/461/"
-        },
-        {
-            "name": "rhyperior",
-            "url": "/api/v2/pokemon-species/464/"
-        },
-        {
-            "name": "electivire",
-            "url": "/api/v2/pokemon-species/466/"
-        },
-        {
-            "name": "magmortar",
-            "url": "/api/v2/pokemon-species/467/"
-        },
-        {
-            "name": "servine",
-            "url": "/api/v2/pokemon-species/496/"
-        },
-        {
-            "name": "pignite",
-            "url": "/api/v2/pokemon-species/499/"
-        },
-        {
-            "name": "emboar",
-            "url": "/api/v2/pokemon-species/500/"
-        },
-        {
-            "name": "dewott",
-            "url": "/api/v2/pokemon-species/502/"
-        },
         {
             "name": "scraggy",
             "url": "/api/v2/pokemon-species/559/"
@@ -462,6 +418,18 @@
             "name": "charmeleon",
             "url": "/api/v2/pokemon-species/5/"
         },
+        {
+            "name": "charizard",
+            "url": "/api/v2/pokemon-species/6/"
+        },
+        {
+            "name": "wartortle",
+            "url": "/api/v2/pokemon-species/8/"
+        },
+        {
+            "name": "blastoise",
+            "url": "/api/v2/pokemon-species/9/"
+        },
         {
             "name": "raichu",
             "url": "/api/v2/pokemon-species/26/"
@@ -694,6 +662,38 @@
             "name": "abomasnow",
             "url": "/api/v2/pokemon-species/460/"
         },
+        {
+            "name": "weavile",
+            "url": "/api/v2/pokemon-species/461/"
+        },
+        {
+            "name": "rhyperior",
+            "url": "/api/v2/pokemon-species/464/"
+        },
+        {
+            "name": "electivire",
+            "url": "/api/v2/pokemon-species/466/"
+        },
+        {
+            "name": "magmortar",
+            "url": "/api/v2/pokemon-species/467/"
+        },
+        {
+            "name": "servine",
+            "url": "/api/v2/pokemon-species/496/"
+        },
+        {
+            "name": "pignite",
+            "url": "/api/v2/pokemon-species/499/"
+        },
+        {
+            "name": "emboar",
+            "url": "/api/v2/pokemon-species/500/"
+        },
+        {
+            "name": "dewott",
+            "url": "/api/v2/pokemon-species/502/"
+        },
         {
             "name": "watchog",
             "url": "/api/v2/pokemon-species/505/"
diff --git a/data/api/v2/pokemon-shape/8/index.json b/data/api/v2/pokemon-shape/8/index.json
index 853f08152..71c127a7f 100644
--- a/data/api/v2/pokemon-shape/8/index.json
+++ b/data/api/v2/pokemon-shape/8/index.json
@@ -62,10 +62,6 @@
             "name": "growlithe",
             "url": "/api/v2/pokemon-species/58/"
         },
-        {
-            "name": "venusaur",
-            "url": "/api/v2/pokemon-species/3/"
-        },
         {
             "name": "ponyta",
             "url": "/api/v2/pokemon-species/77/"
@@ -254,14 +250,6 @@
             "name": "blitzle",
             "url": "/api/v2/pokemon-species/522/"
         },
-        {
-            "name": "mamoswine",
-            "url": "/api/v2/pokemon-species/473/"
-        },
-        {
-            "name": "samurott",
-            "url": "/api/v2/pokemon-species/503/"
-        },
         {
             "name": "sandile",
             "url": "/api/v2/pokemon-species/551/"
@@ -518,6 +506,10 @@
             "name": "ivysaur",
             "url": "/api/v2/pokemon-species/2/"
         },
+        {
+            "name": "venusaur",
+            "url": "/api/v2/pokemon-species/3/"
+        },
         {
             "name": "raticate",
             "url": "/api/v2/pokemon-species/20/"
@@ -682,6 +674,14 @@
             "name": "glaceon",
             "url": "/api/v2/pokemon-species/471/"
         },
+        {
+            "name": "mamoswine",
+            "url": "/api/v2/pokemon-species/473/"
+        },
+        {
+            "name": "samurott",
+            "url": "/api/v2/pokemon-species/503/"
+        },
         {
             "name": "herdier",
             "url": "/api/v2/pokemon-species/507/"
diff --git a/data/api/v2/pokemon-shape/9/index.json b/data/api/v2/pokemon-shape/9/index.json
index 57fcfdb13..ee9e61f12 100644
--- a/data/api/v2/pokemon-shape/9/index.json
+++ b/data/api/v2/pokemon-shape/9/index.json
@@ -46,14 +46,6 @@
             "name": "zubat",
             "url": "/api/v2/pokemon-species/41/"
         },
-        {
-            "name": "pidgeotto",
-            "url": "/api/v2/pokemon-species/17/"
-        },
-        {
-            "name": "pidgeot",
-            "url": "/api/v2/pokemon-species/18/"
-        },
         {
             "name": "farfetchd",
             "url": "/api/v2/pokemon-species/83/"
@@ -150,14 +142,6 @@
             "name": "woobat",
             "url": "/api/v2/pokemon-species/527/"
         },
-        {
-            "name": "togekiss",
-            "url": "/api/v2/pokemon-species/468/"
-        },
-        {
-            "name": "gliscor",
-            "url": "/api/v2/pokemon-species/472/"
-        },
         {
             "name": "sigilyph",
             "url": "/api/v2/pokemon-species/561/"
@@ -242,6 +226,14 @@
             "name": "fezandipiti",
             "url": "/api/v2/pokemon-species/1016/"
         },
+        {
+            "name": "pidgeotto",
+            "url": "/api/v2/pokemon-species/17/"
+        },
+        {
+            "name": "pidgeot",
+            "url": "/api/v2/pokemon-species/18/"
+        },
         {
             "name": "fearow",
             "url": "/api/v2/pokemon-species/22/"
@@ -294,6 +286,14 @@
             "name": "honchkrow",
             "url": "/api/v2/pokemon-species/430/"
         },
+        {
+            "name": "togekiss",
+            "url": "/api/v2/pokemon-species/468/"
+        },
+        {
+            "name": "gliscor",
+            "url": "/api/v2/pokemon-species/472/"
+        },
         {
             "name": "tranquill",
             "url": "/api/v2/pokemon-species/520/"
diff --git a/data/api/v2/pokemon/279/index.json b/data/api/v2/pokemon/279/index.json
index e912211d3..afc761aaf 100644
--- a/data/api/v2/pokemon/279/index.json
+++ b/data/api/v2/pokemon/279/index.json
@@ -9973,6 +9973,25 @@
                 }
             ]
         },
+        {
+            "move": {
+                "name": "wide-guard",
+                "url": "/api/v2/move/469/"
+            },
+            "version_group_details": [
+                {
+                    "level_learned_at": 0,
+                    "move_learn_method": {
+                        "name": "egg",
+                        "url": "/api/v2/move-learn-method/2/"
+                    },
+                    "version_group": {
+                        "name": "scarlet-violet",
+                        "url": "/api/v2/version-group/25/"
+                    }
+                }
+            ]
+        },
         {
             "move": {
                 "name": "soak",
diff --git a/data/api/v2/pokemon/947/index.json b/data/api/v2/pokemon/947/index.json
index a3b49a6a6..46f471529 100644
--- a/data/api/v2/pokemon/947/index.json
+++ b/data/api/v2/pokemon/947/index.json
@@ -111,6 +111,25 @@
                 }
             ]
         },
+        {
+            "move": {
+                "name": "leech-seed",
+                "url": "/api/v2/move/73/"
+            },
+            "version_group_details": [
+                {
+                    "level_learned_at": 0,
+                    "move_learn_method": {
+                        "name": "egg",
+                        "url": "/api/v2/move-learn-method/2/"
+                    },
+                    "version_group": {
+                        "name": "scarlet-violet",
+                        "url": "/api/v2/version-group/25/"
+                    }
+                }
+            ]
+        },
         {
             "move": {
                 "name": "solar-beam",
@@ -505,6 +524,25 @@
                 }
             ]
         },
+        {
+            "move": {
+                "name": "beat-up",
+                "url": "/api/v2/move/251/"
+            },
+            "version_group_details": [
+                {
+                    "level_learned_at": 0,
+                    "move_learn_method": {
+                        "name": "egg",
+                        "url": "/api/v2/move-learn-method/2/"
+                    },
+                    "version_group": {
+                        "name": "scarlet-violet",
+                        "url": "/api/v2/version-group/25/"
+                    }
+                }
+            ]
+        },
         {
             "move": {
                 "name": "facade",
@@ -573,6 +611,25 @@
                 }
             ]
         },
+        {
+            "move": {
+                "name": "block",
+                "url": "/api/v2/move/335/"
+            },
+            "version_group_details": [
+                {
+                    "level_learned_at": 0,
+                    "move_learn_method": {
+                        "name": "egg",
+                        "url": "/api/v2/move-learn-method/2/"
+                    },
+                    "version_group": {
+                        "name": "scarlet-violet",
+                        "url": "/api/v2/version-group/25/"
+                    }
+                }
+            ]
+        },
         {
             "move": {
                 "name": "seed-bomb",
@@ -630,6 +687,25 @@
                 }
             ]
         },
+        {
+            "move": {
+                "name": "shadow-sneak",
+                "url": "/api/v2/move/425/"
+            },
+            "version_group_details": [
+                {
+                    "level_learned_at": 0,
+                    "move_learn_method": {
+                        "name": "egg",
+                        "url": "/api/v2/move-learn-method/2/"
+                    },
+                    "version_group": {
+                        "name": "scarlet-violet",
+                        "url": "/api/v2/version-group/25/"
+                    }
+                }
+            ]
+        },
         {
             "move": {
                 "name": "leaf-storm",
@@ -785,6 +861,25 @@
                 }
             ]
         },
+        {
+            "move": {
+                "name": "strength-sap",
+                "url": "/api/v2/move/668/"
+            },
+            "version_group_details": [
+                {
+                    "level_learned_at": 0,
+                    "move_learn_method": {
+                        "name": "egg",
+                        "url": "/api/v2/move-learn-method/2/"
+                    },
+                    "version_group": {
+                        "name": "scarlet-violet",
+                        "url": "/api/v2/version-group/25/"
+                    }
+                }
+            ]
+        },
         {
             "move": {
                 "name": "grassy-glide",