diff --git a/data/api/v2/encounter-condition-value/161/index.json b/data/api/v2/encounter-condition-value/161/index.json
new file mode 100644
index 0000000000..cca4496c70
--- /dev/null
+++ b/data/api/v2/encounter-condition-value/161/index.json
@@ -0,0 +1,17 @@
+{
+    "condition": {
+        "name": "trade",
+        "url": "/api/v2/encounter-condition/15/"
+    },
+    "id": 161,
+    "name": "trade-bellsprout",
+    "names": [
+        {
+            "language": {
+                "name": "en",
+                "url": "/api/v2/language/9/"
+            },
+            "name": "Give Bellsprout in a Trade"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/api/v2/encounter-condition-value/162/index.json b/data/api/v2/encounter-condition-value/162/index.json
new file mode 100644
index 0000000000..39aad19f41
--- /dev/null
+++ b/data/api/v2/encounter-condition-value/162/index.json
@@ -0,0 +1,17 @@
+{
+    "condition": {
+        "name": "trade",
+        "url": "/api/v2/encounter-condition/15/"
+    },
+    "id": 162,
+    "name": "trade-drowzee",
+    "names": [
+        {
+            "language": {
+                "name": "en",
+                "url": "/api/v2/language/9/"
+            },
+            "name": "Give Drowzee in a Trade"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/api/v2/encounter-condition-value/163/index.json b/data/api/v2/encounter-condition-value/163/index.json
new file mode 100644
index 0000000000..c22aa3da76
--- /dev/null
+++ b/data/api/v2/encounter-condition-value/163/index.json
@@ -0,0 +1,17 @@
+{
+    "condition": {
+        "name": "trade",
+        "url": "/api/v2/encounter-condition/15/"
+    },
+    "id": 163,
+    "name": "trade-krabby",
+    "names": [
+        {
+            "language": {
+                "name": "en",
+                "url": "/api/v2/language/9/"
+            },
+            "name": "Give Krabby in a Trade"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/api/v2/encounter-condition-value/164/index.json b/data/api/v2/encounter-condition-value/164/index.json
new file mode 100644
index 0000000000..bd00bfd2bc
--- /dev/null
+++ b/data/api/v2/encounter-condition-value/164/index.json
@@ -0,0 +1,17 @@
+{
+    "condition": {
+        "name": "trade",
+        "url": "/api/v2/encounter-condition/15/"
+    },
+    "id": 164,
+    "name": "trade-dragonair",
+    "names": [
+        {
+            "language": {
+                "name": "en",
+                "url": "/api/v2/language/9/"
+            },
+            "name": "Give Dragonair in a Trade"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/api/v2/encounter-condition-value/165/index.json b/data/api/v2/encounter-condition-value/165/index.json
new file mode 100644
index 0000000000..602937f052
--- /dev/null
+++ b/data/api/v2/encounter-condition-value/165/index.json
@@ -0,0 +1,17 @@
+{
+    "condition": {
+        "name": "trade",
+        "url": "/api/v2/encounter-condition/15/"
+    },
+    "id": 165,
+    "name": "trade-chansey",
+    "names": [
+        {
+            "language": {
+                "name": "en",
+                "url": "/api/v2/language/9/"
+            },
+            "name": "Give Chansey in a Trade"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/api/v2/encounter-condition-value/166/index.json b/data/api/v2/encounter-condition-value/166/index.json
new file mode 100644
index 0000000000..44089f35d1
--- /dev/null
+++ b/data/api/v2/encounter-condition-value/166/index.json
@@ -0,0 +1,17 @@
+{
+    "condition": {
+        "name": "trade",
+        "url": "/api/v2/encounter-condition/15/"
+    },
+    "id": 166,
+    "name": "trade-gloom",
+    "names": [
+        {
+            "language": {
+                "name": "en",
+                "url": "/api/v2/language/9/"
+            },
+            "name": "Give Gloom in a Trade"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/api/v2/encounter-condition-value/167/index.json b/data/api/v2/encounter-condition-value/167/index.json
new file mode 100644
index 0000000000..e362e11d3c
--- /dev/null
+++ b/data/api/v2/encounter-condition-value/167/index.json
@@ -0,0 +1,17 @@
+{
+    "condition": {
+        "name": "trade",
+        "url": "/api/v2/encounter-condition/15/"
+    },
+    "id": 167,
+    "name": "trade-haunter",
+    "names": [
+        {
+            "language": {
+                "name": "en",
+                "url": "/api/v2/language/9/"
+            },
+            "name": "Give Haunter in a Trade"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/api/v2/encounter-condition-value/168/index.json b/data/api/v2/encounter-condition-value/168/index.json
new file mode 100644
index 0000000000..eb0ba09e02
--- /dev/null
+++ b/data/api/v2/encounter-condition-value/168/index.json
@@ -0,0 +1,17 @@
+{
+    "condition": {
+        "name": "trade",
+        "url": "/api/v2/encounter-condition/15/"
+    },
+    "id": 168,
+    "name": "trade-dugtrio",
+    "names": [
+        {
+            "language": {
+                "name": "en",
+                "url": "/api/v2/language/9/"
+            },
+            "name": "Give Dugtrio in a Trade"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/api/v2/encounter-condition-value/index.json b/data/api/v2/encounter-condition-value/index.json
index 54237fe741..54e78fa26b 100644
--- a/data/api/v2/encounter-condition-value/index.json
+++ b/data/api/v2/encounter-condition-value/index.json
@@ -1,5 +1,5 @@
 {
-    "count": 160,
+    "count": 168,
     "next": null,
     "previous": null,
     "results": [
@@ -642,6 +642,38 @@
         {
             "name": "trade-kangaskhan",
             "url": "/api/v2/encounter-condition-value/160/"
+        },
+        {
+            "name": "trade-bellsprout",
+            "url": "/api/v2/encounter-condition-value/161/"
+        },
+        {
+            "name": "trade-drowzee",
+            "url": "/api/v2/encounter-condition-value/162/"
+        },
+        {
+            "name": "trade-krabby",
+            "url": "/api/v2/encounter-condition-value/163/"
+        },
+        {
+            "name": "trade-dragonair",
+            "url": "/api/v2/encounter-condition-value/164/"
+        },
+        {
+            "name": "trade-chansey",
+            "url": "/api/v2/encounter-condition-value/165/"
+        },
+        {
+            "name": "trade-gloom",
+            "url": "/api/v2/encounter-condition-value/166/"
+        },
+        {
+            "name": "trade-haunter",
+            "url": "/api/v2/encounter-condition-value/167/"
+        },
+        {
+            "name": "trade-dugtrio",
+            "url": "/api/v2/encounter-condition-value/168/"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/api/v2/encounter-condition/15/index.json b/data/api/v2/encounter-condition/15/index.json
index c4706ad737..e6eb28e21b 100644
--- a/data/api/v2/encounter-condition/15/index.json
+++ b/data/api/v2/encounter-condition/15/index.json
@@ -7,7 +7,7 @@
                 "name": "en",
                 "url": "/api/v2/language/9/"
             },
-            "name": "Trade a specific Pokemon to an NPC!"
+            "name": "Trade a specific Pokemon to an NPC"
         }
     ],
     "values": [
@@ -90,6 +90,38 @@
         {
             "name": "trade-kangaskhan",
             "url": "/api/v2/encounter-condition-value/160/"
+        },
+        {
+            "name": "trade-bellsprout",
+            "url": "/api/v2/encounter-condition-value/161/"
+        },
+        {
+            "name": "trade-drowzee",
+            "url": "/api/v2/encounter-condition-value/162/"
+        },
+        {
+            "name": "trade-krabby",
+            "url": "/api/v2/encounter-condition-value/163/"
+        },
+        {
+            "name": "trade-dragonair",
+            "url": "/api/v2/encounter-condition-value/164/"
+        },
+        {
+            "name": "trade-chansey",
+            "url": "/api/v2/encounter-condition-value/165/"
+        },
+        {
+            "name": "trade-gloom",
+            "url": "/api/v2/encounter-condition-value/166/"
+        },
+        {
+            "name": "trade-haunter",
+            "url": "/api/v2/encounter-condition-value/167/"
+        },
+        {
+            "name": "trade-dugtrio",
+            "url": "/api/v2/encounter-condition-value/168/"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/api/v2/gender/1/index.json b/data/api/v2/gender/1/index.json
index b4fde639fd..0916e6685a 100644
--- a/data/api/v2/gender/1/index.json
+++ b/data/api/v2/gender/1/index.json
@@ -919,13 +919,6 @@
             },
             "rate": 1
         },
-        {
-            "pokemon_species": {
-                "name": "eelektrik",
-                "url": "/api/v2/pokemon-species/603/"
-            },
-            "rate": 4
-        },
         {
             "pokemon_species": {
                 "name": "cyndaquil",
@@ -1423,13 +1416,6 @@
             },
             "rate": 4
         },
-        {
-            "pokemon_species": {
-                "name": "eelektross",
-                "url": "/api/v2/pokemon-species/604/"
-            },
-            "rate": 4
-        },
         {
             "pokemon_species": {
                 "name": "skarmory",
@@ -1878,13 +1864,6 @@
             },
             "rate": 2
         },
-        {
-            "pokemon_species": {
-                "name": "beheeyem",
-                "url": "/api/v2/pokemon-species/606/"
-            },
-            "rate": 4
-        },
         {
             "pokemon_species": {
                 "name": "sableye",
@@ -3208,20 +3187,6 @@
             },
             "rate": 2
         },
-        {
-            "pokemon_species": {
-                "name": "amoonguss",
-                "url": "/api/v2/pokemon-species/591/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "jellicent",
-                "url": "/api/v2/pokemon-species/593/"
-            },
-            "rate": 4
-        },
         {
             "pokemon_species": {
                 "name": "tympole",
@@ -3229,20 +3194,6 @@
             },
             "rate": 4
         },
-        {
-            "pokemon_species": {
-                "name": "galvantula",
-                "url": "/api/v2/pokemon-species/596/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "ferrothorn",
-                "url": "/api/v2/pokemon-species/598/"
-            },
-            "rate": 4
-        },
         {
             "pokemon_species": {
                 "name": "sewaddle",
@@ -3635,6 +3586,13 @@
             },
             "rate": 4
         },
+        {
+            "pokemon_species": {
+                "name": "vanillish",
+                "url": "/api/v2/pokemon-species/583/"
+            },
+            "rate": 4
+        },
         {
             "pokemon_species": {
                 "name": "vanilluxe",
@@ -3656,6 +3614,62 @@
             },
             "rate": 4
         },
+        {
+            "pokemon_species": {
+                "name": "amoonguss",
+                "url": "/api/v2/pokemon-species/591/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "jellicent",
+                "url": "/api/v2/pokemon-species/593/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "galvantula",
+                "url": "/api/v2/pokemon-species/596/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "ferrothorn",
+                "url": "/api/v2/pokemon-species/598/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "eelektrik",
+                "url": "/api/v2/pokemon-species/603/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "eelektross",
+                "url": "/api/v2/pokemon-species/604/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "beheeyem",
+                "url": "/api/v2/pokemon-species/606/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "lampent",
+                "url": "/api/v2/pokemon-species/608/"
+            },
+            "rate": 4
+        },
         {
             "pokemon_species": {
                 "name": "axew",
@@ -3859,6 +3873,13 @@
             },
             "rate": 4
         },
+        {
+            "pokemon_species": {
+                "name": "fraxure",
+                "url": "/api/v2/pokemon-species/611/"
+            },
+            "rate": 4
+        },
         {
             "pokemon_species": {
                 "name": "haxorus",
@@ -3880,13 +3901,6 @@
             },
             "rate": 4
         },
-        {
-            "pokemon_species": {
-                "name": "mienshao",
-                "url": "/api/v2/pokemon-species/620/"
-            },
-            "rate": 4
-        },
         {
             "pokemon_species": {
                 "name": "bisharp",
@@ -3971,6 +3985,97 @@
             },
             "rate": 4
         },
+        {
+            "pokemon_species": {
+                "name": "fletchinder",
+                "url": "/api/v2/pokemon-species/662/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "talonflame",
+                "url": "/api/v2/pokemon-species/663/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "spewpa",
+                "url": "/api/v2/pokemon-species/665/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "pyroar",
+                "url": "/api/v2/pokemon-species/668/"
+            },
+            "rate": 7
+        },
+        {
+            "pokemon_species": {
+                "name": "floette",
+                "url": "/api/v2/pokemon-species/670/"
+            },
+            "rate": 8
+        },
+        {
+            "pokemon_species": {
+                "name": "florges",
+                "url": "/api/v2/pokemon-species/671/"
+            },
+            "rate": 8
+        },
+        {
+            "pokemon_species": {
+                "name": "gogoat",
+                "url": "/api/v2/pokemon-species/673/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "pangoro",
+                "url": "/api/v2/pokemon-species/675/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "meowstic",
+                "url": "/api/v2/pokemon-species/678/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "doublade",
+                "url": "/api/v2/pokemon-species/680/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "aegislash",
+                "url": "/api/v2/pokemon-species/681/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "aromatisse",
+                "url": "/api/v2/pokemon-species/683/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "slurpuff",
+                "url": "/api/v2/pokemon-species/685/"
+            },
+            "rate": 4
+        },
         {
             "pokemon_species": {
                 "name": "binacle",
@@ -4209,6 +4314,41 @@
             },
             "rate": 6
         },
+        {
+            "pokemon_species": {
+                "name": "barbaracle",
+                "url": "/api/v2/pokemon-species/689/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "dragalge",
+                "url": "/api/v2/pokemon-species/691/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "clawitzer",
+                "url": "/api/v2/pokemon-species/693/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "heliolisk",
+                "url": "/api/v2/pokemon-species/695/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "aurorus",
+                "url": "/api/v2/pokemon-species/699/"
+            },
+            "rate": 1
+        },
         {
             "pokemon_species": {
                 "name": "sylveon",
@@ -4288,15 +4428,8 @@
         },
         {
             "pokemon_species": {
-                "name": "brionne",
-                "url": "/api/v2/pokemon-species/729/"
-            },
-            "rate": 1
-        },
-        {
-            "pokemon_species": {
-                "name": "primarina",
-                "url": "/api/v2/pokemon-species/730/"
+                "name": "primarina",
+                "url": "/api/v2/pokemon-species/730/"
             },
             "rate": 1
         },
@@ -4321,6 +4454,97 @@
             },
             "rate": 4
         },
+        {
+            "pokemon_species": {
+                "name": "charjabug",
+                "url": "/api/v2/pokemon-species/737/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "vikavolt",
+                "url": "/api/v2/pokemon-species/738/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "crabominable",
+                "url": "/api/v2/pokemon-species/740/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "ribombee",
+                "url": "/api/v2/pokemon-species/743/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "lycanroc",
+                "url": "/api/v2/pokemon-species/745/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "toxapex",
+                "url": "/api/v2/pokemon-species/748/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "mudsdale",
+                "url": "/api/v2/pokemon-species/750/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "araquanid",
+                "url": "/api/v2/pokemon-species/752/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "lurantis",
+                "url": "/api/v2/pokemon-species/754/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "shiinotic",
+                "url": "/api/v2/pokemon-species/756/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "salazzle",
+                "url": "/api/v2/pokemon-species/758/"
+            },
+            "rate": 8
+        },
+        {
+            "pokemon_species": {
+                "name": "bewear",
+                "url": "/api/v2/pokemon-species/760/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "steenee",
+                "url": "/api/v2/pokemon-species/762/"
+            },
+            "rate": 8
+        },
         {
             "pokemon_species": {
                 "name": "oranguru",
@@ -4503,6 +4727,20 @@
             },
             "rate": 4
         },
+        {
+            "pokemon_species": {
+                "name": "hakamo-o",
+                "url": "/api/v2/pokemon-species/783/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "kommo-o",
+                "url": "/api/v2/pokemon-species/784/"
+            },
+            "rate": 4
+        },
         {
             "pokemon_species": {
                 "name": "thwackey",
@@ -4524,6 +4762,20 @@
             },
             "rate": 1
         },
+        {
+            "pokemon_species": {
+                "name": "cinderace",
+                "url": "/api/v2/pokemon-species/815/"
+            },
+            "rate": 1
+        },
+        {
+            "pokemon_species": {
+                "name": "drizzile",
+                "url": "/api/v2/pokemon-species/817/"
+            },
+            "rate": 1
+        },
         {
             "pokemon_species": {
                 "name": "inteleon",
@@ -4559,13 +4811,6 @@
             },
             "rate": 4
         },
-        {
-            "pokemon_species": {
-                "name": "orbeetle",
-                "url": "/api/v2/pokemon-species/826/"
-            },
-            "rate": 4
-        },
         {
             "pokemon_species": {
                 "name": "thievul",
@@ -4797,6 +5042,13 @@
             },
             "rate": 4
         },
+        {
+            "pokemon_species": {
+                "name": "barraskewda",
+                "url": "/api/v2/pokemon-species/847/"
+            },
+            "rate": 4
+        },
         {
             "pokemon_species": {
                 "name": "toxtricity",
@@ -5504,20 +5756,6 @@
             },
             "rate": 4
         },
-        {
-            "pokemon_species": {
-                "name": "vanillish",
-                "url": "/api/v2/pokemon-species/583/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "lampent",
-                "url": "/api/v2/pokemon-species/608/"
-            },
-            "rate": 4
-        },
         {
             "pokemon_species": {
                 "name": "chandelure",
@@ -5527,29 +5765,8 @@
         },
         {
             "pokemon_species": {
-                "name": "fraxure",
-                "url": "/api/v2/pokemon-species/611/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "fletchinder",
-                "url": "/api/v2/pokemon-species/662/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "talonflame",
-                "url": "/api/v2/pokemon-species/663/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "spewpa",
-                "url": "/api/v2/pokemon-species/665/"
+                "name": "mienshao",
+                "url": "/api/v2/pokemon-species/620/"
             },
             "rate": 4
         },
@@ -5560,76 +5777,6 @@
             },
             "rate": 4
         },
-        {
-            "pokemon_species": {
-                "name": "pyroar",
-                "url": "/api/v2/pokemon-species/668/"
-            },
-            "rate": 7
-        },
-        {
-            "pokemon_species": {
-                "name": "floette",
-                "url": "/api/v2/pokemon-species/670/"
-            },
-            "rate": 8
-        },
-        {
-            "pokemon_species": {
-                "name": "florges",
-                "url": "/api/v2/pokemon-species/671/"
-            },
-            "rate": 8
-        },
-        {
-            "pokemon_species": {
-                "name": "gogoat",
-                "url": "/api/v2/pokemon-species/673/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "pangoro",
-                "url": "/api/v2/pokemon-species/675/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "meowstic",
-                "url": "/api/v2/pokemon-species/678/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "doublade",
-                "url": "/api/v2/pokemon-species/680/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "aegislash",
-                "url": "/api/v2/pokemon-species/681/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "aromatisse",
-                "url": "/api/v2/pokemon-species/683/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "slurpuff",
-                "url": "/api/v2/pokemon-species/685/"
-            },
-            "rate": 4
-        },
         {
             "pokemon_species": {
                 "name": "malamar",
@@ -5637,34 +5784,6 @@
             },
             "rate": 4
         },
-        {
-            "pokemon_species": {
-                "name": "barbaracle",
-                "url": "/api/v2/pokemon-species/689/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "dragalge",
-                "url": "/api/v2/pokemon-species/691/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "clawitzer",
-                "url": "/api/v2/pokemon-species/693/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "heliolisk",
-                "url": "/api/v2/pokemon-species/695/"
-            },
-            "rate": 4
-        },
         {
             "pokemon_species": {
                 "name": "tyrantrum",
@@ -5674,116 +5793,11 @@
         },
         {
             "pokemon_species": {
-                "name": "aurorus",
-                "url": "/api/v2/pokemon-species/699/"
+                "name": "brionne",
+                "url": "/api/v2/pokemon-species/729/"
             },
             "rate": 1
         },
-        {
-            "pokemon_species": {
-                "name": "charjabug",
-                "url": "/api/v2/pokemon-species/737/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "vikavolt",
-                "url": "/api/v2/pokemon-species/738/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "crabominable",
-                "url": "/api/v2/pokemon-species/740/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "ribombee",
-                "url": "/api/v2/pokemon-species/743/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "lycanroc",
-                "url": "/api/v2/pokemon-species/745/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "toxapex",
-                "url": "/api/v2/pokemon-species/748/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "mudsdale",
-                "url": "/api/v2/pokemon-species/750/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "araquanid",
-                "url": "/api/v2/pokemon-species/752/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "baxcalibur",
-                "url": "/api/v2/pokemon-species/998/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "hydrapple",
-                "url": "/api/v2/pokemon-species/1019/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "lurantis",
-                "url": "/api/v2/pokemon-species/754/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "shiinotic",
-                "url": "/api/v2/pokemon-species/756/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "salazzle",
-                "url": "/api/v2/pokemon-species/758/"
-            },
-            "rate": 8
-        },
-        {
-            "pokemon_species": {
-                "name": "bewear",
-                "url": "/api/v2/pokemon-species/760/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "steenee",
-                "url": "/api/v2/pokemon-species/762/"
-            },
-            "rate": 8
-        },
         {
             "pokemon_species": {
                 "name": "tsareena",
@@ -5807,32 +5821,11 @@
         },
         {
             "pokemon_species": {
-                "name": "hakamo-o",
-                "url": "/api/v2/pokemon-species/783/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "kommo-o",
-                "url": "/api/v2/pokemon-species/784/"
+                "name": "orbeetle",
+                "url": "/api/v2/pokemon-species/826/"
             },
             "rate": 4
         },
-        {
-            "pokemon_species": {
-                "name": "cinderace",
-                "url": "/api/v2/pokemon-species/815/"
-            },
-            "rate": 1
-        },
-        {
-            "pokemon_species": {
-                "name": "drizzile",
-                "url": "/api/v2/pokemon-species/817/"
-            },
-            "rate": 1
-        },
         {
             "pokemon_species": {
                 "name": "appletun",
@@ -5840,13 +5833,6 @@
             },
             "rate": 4
         },
-        {
-            "pokemon_species": {
-                "name": "barraskewda",
-                "url": "/api/v2/pokemon-species/847/"
-            },
-            "rate": 4
-        },
         {
             "pokemon_species": {
                 "name": "ursaluna",
@@ -5882,12 +5868,26 @@
             },
             "rate": 4
         },
+        {
+            "pokemon_species": {
+                "name": "baxcalibur",
+                "url": "/api/v2/pokemon-species/998/"
+            },
+            "rate": 4
+        },
         {
             "pokemon_species": {
                 "name": "archaludon",
                 "url": "/api/v2/pokemon-species/1018/"
             },
             "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "hydrapple",
+                "url": "/api/v2/pokemon-species/1019/"
+            },
+            "rate": 4
         }
     ],
     "required_for_evolution": [
diff --git a/data/api/v2/gender/2/index.json b/data/api/v2/gender/2/index.json
index 4f8dfa411e..f9dc6cb659 100644
--- a/data/api/v2/gender/2/index.json
+++ b/data/api/v2/gender/2/index.json
@@ -919,13 +919,6 @@
             },
             "rate": 1
         },
-        {
-            "pokemon_species": {
-                "name": "eelektrik",
-                "url": "/api/v2/pokemon-species/603/"
-            },
-            "rate": 4
-        },
         {
             "pokemon_species": {
                 "name": "cyndaquil",
@@ -1423,13 +1416,6 @@
             },
             "rate": 4
         },
-        {
-            "pokemon_species": {
-                "name": "eelektross",
-                "url": "/api/v2/pokemon-species/604/"
-            },
-            "rate": 4
-        },
         {
             "pokemon_species": {
                 "name": "skarmory",
@@ -1871,13 +1857,6 @@
             },
             "rate": 2
         },
-        {
-            "pokemon_species": {
-                "name": "beheeyem",
-                "url": "/api/v2/pokemon-species/606/"
-            },
-            "rate": 4
-        },
         {
             "pokemon_species": {
                 "name": "sableye",
@@ -3180,20 +3159,6 @@
             },
             "rate": 2
         },
-        {
-            "pokemon_species": {
-                "name": "amoonguss",
-                "url": "/api/v2/pokemon-species/591/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "jellicent",
-                "url": "/api/v2/pokemon-species/593/"
-            },
-            "rate": 4
-        },
         {
             "pokemon_species": {
                 "name": "tympole",
@@ -3201,20 +3166,6 @@
             },
             "rate": 4
         },
-        {
-            "pokemon_species": {
-                "name": "galvantula",
-                "url": "/api/v2/pokemon-species/596/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "ferrothorn",
-                "url": "/api/v2/pokemon-species/598/"
-            },
-            "rate": 4
-        },
         {
             "pokemon_species": {
                 "name": "throh",
@@ -3607,6 +3558,13 @@
             },
             "rate": 4
         },
+        {
+            "pokemon_species": {
+                "name": "vanillish",
+                "url": "/api/v2/pokemon-species/583/"
+            },
+            "rate": 4
+        },
         {
             "pokemon_species": {
                 "name": "vanilluxe",
@@ -3628,6 +3586,62 @@
             },
             "rate": 4
         },
+        {
+            "pokemon_species": {
+                "name": "amoonguss",
+                "url": "/api/v2/pokemon-species/591/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "jellicent",
+                "url": "/api/v2/pokemon-species/593/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "galvantula",
+                "url": "/api/v2/pokemon-species/596/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "ferrothorn",
+                "url": "/api/v2/pokemon-species/598/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "eelektrik",
+                "url": "/api/v2/pokemon-species/603/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "eelektross",
+                "url": "/api/v2/pokemon-species/604/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "beheeyem",
+                "url": "/api/v2/pokemon-species/606/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "lampent",
+                "url": "/api/v2/pokemon-species/608/"
+            },
+            "rate": 4
+        },
         {
             "pokemon_species": {
                 "name": "axew",
@@ -3845,6 +3859,13 @@
             },
             "rate": 4
         },
+        {
+            "pokemon_species": {
+                "name": "fraxure",
+                "url": "/api/v2/pokemon-species/611/"
+            },
+            "rate": 4
+        },
         {
             "pokemon_species": {
                 "name": "haxorus",
@@ -3868,17 +3889,17 @@
         },
         {
             "pokemon_species": {
-                "name": "mienshao",
-                "url": "/api/v2/pokemon-species/620/"
+                "name": "bisharp",
+                "url": "/api/v2/pokemon-species/625/"
             },
             "rate": 4
         },
         {
             "pokemon_species": {
-                "name": "bisharp",
-                "url": "/api/v2/pokemon-species/625/"
+                "name": "braviary",
+                "url": "/api/v2/pokemon-species/628/"
             },
-            "rate": 4
+            "rate": 0
         },
         {
             "pokemon_species": {
@@ -3950,6 +3971,83 @@
             },
             "rate": 4
         },
+        {
+            "pokemon_species": {
+                "name": "fletchinder",
+                "url": "/api/v2/pokemon-species/662/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "talonflame",
+                "url": "/api/v2/pokemon-species/663/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "spewpa",
+                "url": "/api/v2/pokemon-species/665/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "pyroar",
+                "url": "/api/v2/pokemon-species/668/"
+            },
+            "rate": 7
+        },
+        {
+            "pokemon_species": {
+                "name": "gogoat",
+                "url": "/api/v2/pokemon-species/673/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "pangoro",
+                "url": "/api/v2/pokemon-species/675/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "meowstic",
+                "url": "/api/v2/pokemon-species/678/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "doublade",
+                "url": "/api/v2/pokemon-species/680/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "aegislash",
+                "url": "/api/v2/pokemon-species/681/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "aromatisse",
+                "url": "/api/v2/pokemon-species/683/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "slurpuff",
+                "url": "/api/v2/pokemon-species/685/"
+            },
+            "rate": 4
+        },
         {
             "pokemon_species": {
                 "name": "binacle",
@@ -4181,6 +4279,41 @@
             },
             "rate": 6
         },
+        {
+            "pokemon_species": {
+                "name": "barbaracle",
+                "url": "/api/v2/pokemon-species/689/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "dragalge",
+                "url": "/api/v2/pokemon-species/691/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "clawitzer",
+                "url": "/api/v2/pokemon-species/693/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "heliolisk",
+                "url": "/api/v2/pokemon-species/695/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "aurorus",
+                "url": "/api/v2/pokemon-species/699/"
+            },
+            "rate": 1
+        },
         {
             "pokemon_species": {
                 "name": "sylveon",
@@ -4258,13 +4391,6 @@
             },
             "rate": 1
         },
-        {
-            "pokemon_species": {
-                "name": "brionne",
-                "url": "/api/v2/pokemon-species/729/"
-            },
-            "rate": 1
-        },
         {
             "pokemon_species": {
                 "name": "primarina",
@@ -4295,15 +4421,92 @@
         },
         {
             "pokemon_species": {
-                "name": "oranguru",
-                "url": "/api/v2/pokemon-species/765/"
+                "name": "charjabug",
+                "url": "/api/v2/pokemon-species/737/"
             },
             "rate": 4
         },
         {
             "pokemon_species": {
-                "name": "passimian",
-                "url": "/api/v2/pokemon-species/766/"
+                "name": "vikavolt",
+                "url": "/api/v2/pokemon-species/738/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "crabominable",
+                "url": "/api/v2/pokemon-species/740/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "ribombee",
+                "url": "/api/v2/pokemon-species/743/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "lycanroc",
+                "url": "/api/v2/pokemon-species/745/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "toxapex",
+                "url": "/api/v2/pokemon-species/748/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "mudsdale",
+                "url": "/api/v2/pokemon-species/750/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "araquanid",
+                "url": "/api/v2/pokemon-species/752/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "lurantis",
+                "url": "/api/v2/pokemon-species/754/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "shiinotic",
+                "url": "/api/v2/pokemon-species/756/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "bewear",
+                "url": "/api/v2/pokemon-species/760/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "oranguru",
+                "url": "/api/v2/pokemon-species/765/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "passimian",
+                "url": "/api/v2/pokemon-species/766/"
             },
             "rate": 4
         },
@@ -4475,6 +4678,20 @@
             },
             "rate": 4
         },
+        {
+            "pokemon_species": {
+                "name": "hakamo-o",
+                "url": "/api/v2/pokemon-species/783/"
+            },
+            "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "kommo-o",
+                "url": "/api/v2/pokemon-species/784/"
+            },
+            "rate": 4
+        },
         {
             "pokemon_species": {
                 "name": "thwackey",
@@ -4496,6 +4713,20 @@
             },
             "rate": 1
         },
+        {
+            "pokemon_species": {
+                "name": "cinderace",
+                "url": "/api/v2/pokemon-species/815/"
+            },
+            "rate": 1
+        },
+        {
+            "pokemon_species": {
+                "name": "drizzile",
+                "url": "/api/v2/pokemon-species/817/"
+            },
+            "rate": 1
+        },
         {
             "pokemon_species": {
                 "name": "inteleon",
@@ -4531,13 +4762,6 @@
             },
             "rate": 4
         },
-        {
-            "pokemon_species": {
-                "name": "orbeetle",
-                "url": "/api/v2/pokemon-species/826/"
-            },
-            "rate": 4
-        },
         {
             "pokemon_species": {
                 "name": "thievul",
@@ -4755,6 +4979,13 @@
             },
             "rate": 4
         },
+        {
+            "pokemon_species": {
+                "name": "barraskewda",
+                "url": "/api/v2/pokemon-species/847/"
+            },
+            "rate": 4
+        },
         {
             "pokemon_species": {
                 "name": "toxtricity",
@@ -4783,13 +5014,6 @@
             },
             "rate": 0
         },
-        {
-            "pokemon_species": {
-                "name": "grimmsnarl",
-                "url": "/api/v2/pokemon-species/861/"
-            },
-            "rate": 0
-        },
         {
             "pokemon_species": {
                 "name": "obstagoon",
@@ -5441,20 +5665,6 @@
             },
             "rate": 4
         },
-        {
-            "pokemon_species": {
-                "name": "vanillish",
-                "url": "/api/v2/pokemon-species/583/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "lampent",
-                "url": "/api/v2/pokemon-species/608/"
-            },
-            "rate": 4
-        },
         {
             "pokemon_species": {
                 "name": "chandelure",
@@ -5464,36 +5674,8 @@
         },
         {
             "pokemon_species": {
-                "name": "fraxure",
-                "url": "/api/v2/pokemon-species/611/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "braviary",
-                "url": "/api/v2/pokemon-species/628/"
-            },
-            "rate": 0
-        },
-        {
-            "pokemon_species": {
-                "name": "fletchinder",
-                "url": "/api/v2/pokemon-species/662/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "talonflame",
-                "url": "/api/v2/pokemon-species/663/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "spewpa",
-                "url": "/api/v2/pokemon-species/665/"
+                "name": "mienshao",
+                "url": "/api/v2/pokemon-species/620/"
             },
             "rate": 4
         },
@@ -5504,62 +5686,6 @@
             },
             "rate": 4
         },
-        {
-            "pokemon_species": {
-                "name": "pyroar",
-                "url": "/api/v2/pokemon-species/668/"
-            },
-            "rate": 7
-        },
-        {
-            "pokemon_species": {
-                "name": "gogoat",
-                "url": "/api/v2/pokemon-species/673/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "pangoro",
-                "url": "/api/v2/pokemon-species/675/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "meowstic",
-                "url": "/api/v2/pokemon-species/678/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "doublade",
-                "url": "/api/v2/pokemon-species/680/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "aegislash",
-                "url": "/api/v2/pokemon-species/681/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "aromatisse",
-                "url": "/api/v2/pokemon-species/683/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "slurpuff",
-                "url": "/api/v2/pokemon-species/685/"
-            },
-            "rate": 4
-        },
         {
             "pokemon_species": {
                 "name": "malamar",
@@ -5567,34 +5693,6 @@
             },
             "rate": 4
         },
-        {
-            "pokemon_species": {
-                "name": "barbaracle",
-                "url": "/api/v2/pokemon-species/689/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "dragalge",
-                "url": "/api/v2/pokemon-species/691/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "clawitzer",
-                "url": "/api/v2/pokemon-species/693/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "heliolisk",
-                "url": "/api/v2/pokemon-species/695/"
-            },
-            "rate": 4
-        },
         {
             "pokemon_species": {
                 "name": "tyrantrum",
@@ -5604,102 +5702,11 @@
         },
         {
             "pokemon_species": {
-                "name": "aurorus",
-                "url": "/api/v2/pokemon-species/699/"
+                "name": "brionne",
+                "url": "/api/v2/pokemon-species/729/"
             },
             "rate": 1
         },
-        {
-            "pokemon_species": {
-                "name": "charjabug",
-                "url": "/api/v2/pokemon-species/737/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "vikavolt",
-                "url": "/api/v2/pokemon-species/738/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "crabominable",
-                "url": "/api/v2/pokemon-species/740/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "ribombee",
-                "url": "/api/v2/pokemon-species/743/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "lycanroc",
-                "url": "/api/v2/pokemon-species/745/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "toxapex",
-                "url": "/api/v2/pokemon-species/748/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "mudsdale",
-                "url": "/api/v2/pokemon-species/750/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "araquanid",
-                "url": "/api/v2/pokemon-species/752/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "baxcalibur",
-                "url": "/api/v2/pokemon-species/998/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "hydrapple",
-                "url": "/api/v2/pokemon-species/1019/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "lurantis",
-                "url": "/api/v2/pokemon-species/754/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "shiinotic",
-                "url": "/api/v2/pokemon-species/756/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "bewear",
-                "url": "/api/v2/pokemon-species/760/"
-            },
-            "rate": 4
-        },
         {
             "pokemon_species": {
                 "name": "golisopod",
@@ -5716,32 +5723,11 @@
         },
         {
             "pokemon_species": {
-                "name": "hakamo-o",
-                "url": "/api/v2/pokemon-species/783/"
-            },
-            "rate": 4
-        },
-        {
-            "pokemon_species": {
-                "name": "kommo-o",
-                "url": "/api/v2/pokemon-species/784/"
+                "name": "orbeetle",
+                "url": "/api/v2/pokemon-species/826/"
             },
             "rate": 4
         },
-        {
-            "pokemon_species": {
-                "name": "cinderace",
-                "url": "/api/v2/pokemon-species/815/"
-            },
-            "rate": 1
-        },
-        {
-            "pokemon_species": {
-                "name": "drizzile",
-                "url": "/api/v2/pokemon-species/817/"
-            },
-            "rate": 1
-        },
         {
             "pokemon_species": {
                 "name": "appletun",
@@ -5751,10 +5737,10 @@
         },
         {
             "pokemon_species": {
-                "name": "barraskewda",
-                "url": "/api/v2/pokemon-species/847/"
+                "name": "grimmsnarl",
+                "url": "/api/v2/pokemon-species/861/"
             },
-            "rate": 4
+            "rate": 0
         },
         {
             "pokemon_species": {
@@ -5791,12 +5777,26 @@
             },
             "rate": 4
         },
+        {
+            "pokemon_species": {
+                "name": "baxcalibur",
+                "url": "/api/v2/pokemon-species/998/"
+            },
+            "rate": 4
+        },
         {
             "pokemon_species": {
                 "name": "archaludon",
                 "url": "/api/v2/pokemon-species/1018/"
             },
             "rate": 4
+        },
+        {
+            "pokemon_species": {
+                "name": "hydrapple",
+                "url": "/api/v2/pokemon-species/1019/"
+            },
+            "rate": 4
         }
     ],
     "required_for_evolution": [
diff --git a/data/api/v2/gender/3/index.json b/data/api/v2/gender/3/index.json
index ec0254f7f2..7b0da09178 100644
--- a/data/api/v2/gender/3/index.json
+++ b/data/api/v2/gender/3/index.json
@@ -2,13 +2,6 @@
     "id": 3,
     "name": "genderless",
     "pokemon_species_details": [
-        {
-            "pokemon_species": {
-                "name": "klinklang",
-                "url": "/api/v2/pokemon-species/601/"
-            },
-            "rate": -1
-        },
         {
             "pokemon_species": {
                 "name": "magnemite",
@@ -389,15 +382,15 @@
         },
         {
             "pokemon_species": {
-                "name": "klang",
-                "url": "/api/v2/pokemon-species/600/"
+                "name": "klink",
+                "url": "/api/v2/pokemon-species/599/"
             },
             "rate": -1
         },
         {
             "pokemon_species": {
-                "name": "klink",
-                "url": "/api/v2/pokemon-species/599/"
+                "name": "klang",
+                "url": "/api/v2/pokemon-species/600/"
             },
             "rate": -1
         },
@@ -695,6 +688,20 @@
             },
             "rate": -1
         },
+        {
+            "pokemon_species": {
+                "name": "silvally",
+                "url": "/api/v2/pokemon-species/773/"
+            },
+            "rate": -1
+        },
+        {
+            "pokemon_species": {
+                "name": "cosmoem",
+                "url": "/api/v2/pokemon-species/790/"
+            },
+            "rate": -1
+        },
         {
             "pokemon_species": {
                 "name": "solgaleo",
@@ -1094,6 +1101,13 @@
             },
             "rate": -1
         },
+        {
+            "pokemon_species": {
+                "name": "klinklang",
+                "url": "/api/v2/pokemon-species/601/"
+            },
+            "rate": -1
+        },
         {
             "pokemon_species": {
                 "name": "gholdengo",
@@ -1114,20 +1128,6 @@
                 "url": "/api/v2/pokemon-species/1013/"
             },
             "rate": -1
-        },
-        {
-            "pokemon_species": {
-                "name": "silvally",
-                "url": "/api/v2/pokemon-species/773/"
-            },
-            "rate": -1
-        },
-        {
-            "pokemon_species": {
-                "name": "cosmoem",
-                "url": "/api/v2/pokemon-species/790/"
-            },
-            "rate": -1
         }
     ],
     "required_for_evolution": []
diff --git a/data/api/v2/generation/5/index.json b/data/api/v2/generation/5/index.json
index 5c8c400271..2d81cb5480 100644
--- a/data/api/v2/generation/5/index.json
+++ b/data/api/v2/generation/5/index.json
@@ -847,22 +847,6 @@
         }
     ],
     "pokemon_species": [
-        {
-            "name": "klinklang",
-            "url": "/api/v2/pokemon-species/601/"
-        },
-        {
-            "name": "eelektrik",
-            "url": "/api/v2/pokemon-species/603/"
-        },
-        {
-            "name": "eelektross",
-            "url": "/api/v2/pokemon-species/604/"
-        },
-        {
-            "name": "beheeyem",
-            "url": "/api/v2/pokemon-species/606/"
-        },
         {
             "name": "victini",
             "url": "/api/v2/pokemon-species/494/"
@@ -1015,26 +999,10 @@
             "name": "timburr",
             "url": "/api/v2/pokemon-species/532/"
         },
-        {
-            "name": "amoonguss",
-            "url": "/api/v2/pokemon-species/591/"
-        },
-        {
-            "name": "jellicent",
-            "url": "/api/v2/pokemon-species/593/"
-        },
         {
             "name": "tympole",
             "url": "/api/v2/pokemon-species/535/"
         },
-        {
-            "name": "galvantula",
-            "url": "/api/v2/pokemon-species/596/"
-        },
-        {
-            "name": "ferrothorn",
-            "url": "/api/v2/pokemon-species/598/"
-        },
         {
             "name": "throh",
             "url": "/api/v2/pokemon-species/538/"
@@ -1047,10 +1015,6 @@
             "name": "sewaddle",
             "url": "/api/v2/pokemon-species/540/"
         },
-        {
-            "name": "klang",
-            "url": "/api/v2/pokemon-species/600/"
-        },
         {
             "name": "venipede",
             "url": "/api/v2/pokemon-species/543/"
@@ -1275,6 +1239,10 @@
             "name": "swanna",
             "url": "/api/v2/pokemon-species/581/"
         },
+        {
+            "name": "vanillish",
+            "url": "/api/v2/pokemon-species/583/"
+        },
         {
             "name": "vanilluxe",
             "url": "/api/v2/pokemon-species/584/"
@@ -1287,6 +1255,42 @@
             "name": "escavalier",
             "url": "/api/v2/pokemon-species/589/"
         },
+        {
+            "name": "amoonguss",
+            "url": "/api/v2/pokemon-species/591/"
+        },
+        {
+            "name": "jellicent",
+            "url": "/api/v2/pokemon-species/593/"
+        },
+        {
+            "name": "galvantula",
+            "url": "/api/v2/pokemon-species/596/"
+        },
+        {
+            "name": "ferrothorn",
+            "url": "/api/v2/pokemon-species/598/"
+        },
+        {
+            "name": "klang",
+            "url": "/api/v2/pokemon-species/600/"
+        },
+        {
+            "name": "eelektrik",
+            "url": "/api/v2/pokemon-species/603/"
+        },
+        {
+            "name": "eelektross",
+            "url": "/api/v2/pokemon-species/604/"
+        },
+        {
+            "name": "beheeyem",
+            "url": "/api/v2/pokemon-species/606/"
+        },
+        {
+            "name": "lampent",
+            "url": "/api/v2/pokemon-species/608/"
+        },
         {
             "name": "axew",
             "url": "/api/v2/pokemon-species/610/"
@@ -1399,6 +1403,10 @@
             "name": "genesect",
             "url": "/api/v2/pokemon-species/649/"
         },
+        {
+            "name": "fraxure",
+            "url": "/api/v2/pokemon-species/611/"
+        },
         {
             "name": "haxorus",
             "url": "/api/v2/pokemon-species/612/"
@@ -1411,10 +1419,6 @@
             "name": "accelgor",
             "url": "/api/v2/pokemon-species/617/"
         },
-        {
-            "name": "mienshao",
-            "url": "/api/v2/pokemon-species/620/"
-        },
         {
             "name": "golurk",
             "url": "/api/v2/pokemon-species/623/"
@@ -1423,6 +1427,10 @@
             "name": "bisharp",
             "url": "/api/v2/pokemon-species/625/"
         },
+        {
+            "name": "braviary",
+            "url": "/api/v2/pokemon-species/628/"
+        },
         {
             "name": "mandibuzz",
             "url": "/api/v2/pokemon-species/630/"
@@ -1452,24 +1460,16 @@
             "url": "/api/v2/pokemon-species/563/"
         },
         {
-            "name": "vanillish",
-            "url": "/api/v2/pokemon-species/583/"
-        },
-        {
-            "name": "lampent",
-            "url": "/api/v2/pokemon-species/608/"
+            "name": "klinklang",
+            "url": "/api/v2/pokemon-species/601/"
         },
         {
             "name": "chandelure",
             "url": "/api/v2/pokemon-species/609/"
         },
         {
-            "name": "fraxure",
-            "url": "/api/v2/pokemon-species/611/"
-        },
-        {
-            "name": "braviary",
-            "url": "/api/v2/pokemon-species/628/"
+            "name": "mienshao",
+            "url": "/api/v2/pokemon-species/620/"
         }
     ],
     "types": [],
diff --git a/data/api/v2/generation/6/index.json b/data/api/v2/generation/6/index.json
index 6d9f86dad6..655ec85a6d 100644
--- a/data/api/v2/generation/6/index.json
+++ b/data/api/v2/generation/6/index.json
@@ -523,6 +523,58 @@
             "name": "diggersby",
             "url": "/api/v2/pokemon-species/660/"
         },
+        {
+            "name": "fletchinder",
+            "url": "/api/v2/pokemon-species/662/"
+        },
+        {
+            "name": "talonflame",
+            "url": "/api/v2/pokemon-species/663/"
+        },
+        {
+            "name": "spewpa",
+            "url": "/api/v2/pokemon-species/665/"
+        },
+        {
+            "name": "pyroar",
+            "url": "/api/v2/pokemon-species/668/"
+        },
+        {
+            "name": "floette",
+            "url": "/api/v2/pokemon-species/670/"
+        },
+        {
+            "name": "florges",
+            "url": "/api/v2/pokemon-species/671/"
+        },
+        {
+            "name": "gogoat",
+            "url": "/api/v2/pokemon-species/673/"
+        },
+        {
+            "name": "pangoro",
+            "url": "/api/v2/pokemon-species/675/"
+        },
+        {
+            "name": "meowstic",
+            "url": "/api/v2/pokemon-species/678/"
+        },
+        {
+            "name": "doublade",
+            "url": "/api/v2/pokemon-species/680/"
+        },
+        {
+            "name": "aegislash",
+            "url": "/api/v2/pokemon-species/681/"
+        },
+        {
+            "name": "aromatisse",
+            "url": "/api/v2/pokemon-species/683/"
+        },
+        {
+            "name": "slurpuff",
+            "url": "/api/v2/pokemon-species/685/"
+        },
         {
             "name": "binacle",
             "url": "/api/v2/pokemon-species/688/"
@@ -607,6 +659,26 @@
             "name": "volcanion",
             "url": "/api/v2/pokemon-species/721/"
         },
+        {
+            "name": "barbaracle",
+            "url": "/api/v2/pokemon-species/689/"
+        },
+        {
+            "name": "dragalge",
+            "url": "/api/v2/pokemon-species/691/"
+        },
+        {
+            "name": "clawitzer",
+            "url": "/api/v2/pokemon-species/693/"
+        },
+        {
+            "name": "heliolisk",
+            "url": "/api/v2/pokemon-species/695/"
+        },
+        {
+            "name": "aurorus",
+            "url": "/api/v2/pokemon-species/699/"
+        },
         {
             "name": "sylveon",
             "url": "/api/v2/pokemon-species/700/"
@@ -635,89 +707,17 @@
             "name": "noivern",
             "url": "/api/v2/pokemon-species/715/"
         },
-        {
-            "name": "fletchinder",
-            "url": "/api/v2/pokemon-species/662/"
-        },
-        {
-            "name": "talonflame",
-            "url": "/api/v2/pokemon-species/663/"
-        },
-        {
-            "name": "spewpa",
-            "url": "/api/v2/pokemon-species/665/"
-        },
         {
             "name": "vivillon",
             "url": "/api/v2/pokemon-species/666/"
         },
-        {
-            "name": "pyroar",
-            "url": "/api/v2/pokemon-species/668/"
-        },
-        {
-            "name": "floette",
-            "url": "/api/v2/pokemon-species/670/"
-        },
-        {
-            "name": "florges",
-            "url": "/api/v2/pokemon-species/671/"
-        },
-        {
-            "name": "gogoat",
-            "url": "/api/v2/pokemon-species/673/"
-        },
-        {
-            "name": "pangoro",
-            "url": "/api/v2/pokemon-species/675/"
-        },
-        {
-            "name": "meowstic",
-            "url": "/api/v2/pokemon-species/678/"
-        },
-        {
-            "name": "doublade",
-            "url": "/api/v2/pokemon-species/680/"
-        },
-        {
-            "name": "aegislash",
-            "url": "/api/v2/pokemon-species/681/"
-        },
-        {
-            "name": "aromatisse",
-            "url": "/api/v2/pokemon-species/683/"
-        },
-        {
-            "name": "slurpuff",
-            "url": "/api/v2/pokemon-species/685/"
-        },
         {
             "name": "malamar",
             "url": "/api/v2/pokemon-species/687/"
         },
-        {
-            "name": "barbaracle",
-            "url": "/api/v2/pokemon-species/689/"
-        },
-        {
-            "name": "dragalge",
-            "url": "/api/v2/pokemon-species/691/"
-        },
-        {
-            "name": "clawitzer",
-            "url": "/api/v2/pokemon-species/693/"
-        },
-        {
-            "name": "heliolisk",
-            "url": "/api/v2/pokemon-species/695/"
-        },
         {
             "name": "tyrantrum",
             "url": "/api/v2/pokemon-species/697/"
-        },
-        {
-            "name": "aurorus",
-            "url": "/api/v2/pokemon-species/699/"
         }
     ],
     "types": [
diff --git a/data/api/v2/generation/7/index.json b/data/api/v2/generation/7/index.json
index 7476e635ca..5db62fa521 100644
--- a/data/api/v2/generation/7/index.json
+++ b/data/api/v2/generation/7/index.json
@@ -823,10 +823,6 @@
             "name": "incineroar",
             "url": "/api/v2/pokemon-species/727/"
         },
-        {
-            "name": "brionne",
-            "url": "/api/v2/pokemon-species/729/"
-        },
         {
             "name": "primarina",
             "url": "/api/v2/pokemon-species/730/"
@@ -843,6 +839,58 @@
             "name": "gumshoos",
             "url": "/api/v2/pokemon-species/735/"
         },
+        {
+            "name": "charjabug",
+            "url": "/api/v2/pokemon-species/737/"
+        },
+        {
+            "name": "vikavolt",
+            "url": "/api/v2/pokemon-species/738/"
+        },
+        {
+            "name": "crabominable",
+            "url": "/api/v2/pokemon-species/740/"
+        },
+        {
+            "name": "ribombee",
+            "url": "/api/v2/pokemon-species/743/"
+        },
+        {
+            "name": "lycanroc",
+            "url": "/api/v2/pokemon-species/745/"
+        },
+        {
+            "name": "toxapex",
+            "url": "/api/v2/pokemon-species/748/"
+        },
+        {
+            "name": "mudsdale",
+            "url": "/api/v2/pokemon-species/750/"
+        },
+        {
+            "name": "araquanid",
+            "url": "/api/v2/pokemon-species/752/"
+        },
+        {
+            "name": "lurantis",
+            "url": "/api/v2/pokemon-species/754/"
+        },
+        {
+            "name": "shiinotic",
+            "url": "/api/v2/pokemon-species/756/"
+        },
+        {
+            "name": "salazzle",
+            "url": "/api/v2/pokemon-species/758/"
+        },
+        {
+            "name": "bewear",
+            "url": "/api/v2/pokemon-species/760/"
+        },
+        {
+            "name": "steenee",
+            "url": "/api/v2/pokemon-species/762/"
+        },
         {
             "name": "oranguru",
             "url": "/api/v2/pokemon-species/765/"
@@ -984,72 +1032,40 @@
             "url": "/api/v2/pokemon-species/808/"
         },
         {
-            "name": "solgaleo",
-            "url": "/api/v2/pokemon-species/791/"
-        },
-        {
-            "name": "lunala",
-            "url": "/api/v2/pokemon-species/792/"
-        },
-        {
-            "name": "naganadel",
-            "url": "/api/v2/pokemon-species/804/"
-        },
-        {
-            "name": "melmetal",
-            "url": "/api/v2/pokemon-species/809/"
-        },
-        {
-            "name": "charjabug",
-            "url": "/api/v2/pokemon-species/737/"
-        },
-        {
-            "name": "vikavolt",
-            "url": "/api/v2/pokemon-species/738/"
-        },
-        {
-            "name": "crabominable",
-            "url": "/api/v2/pokemon-species/740/"
-        },
-        {
-            "name": "ribombee",
-            "url": "/api/v2/pokemon-species/743/"
-        },
-        {
-            "name": "lycanroc",
-            "url": "/api/v2/pokemon-species/745/"
+            "name": "silvally",
+            "url": "/api/v2/pokemon-species/773/"
         },
         {
-            "name": "toxapex",
-            "url": "/api/v2/pokemon-species/748/"
+            "name": "hakamo-o",
+            "url": "/api/v2/pokemon-species/783/"
         },
         {
-            "name": "mudsdale",
-            "url": "/api/v2/pokemon-species/750/"
+            "name": "kommo-o",
+            "url": "/api/v2/pokemon-species/784/"
         },
         {
-            "name": "araquanid",
-            "url": "/api/v2/pokemon-species/752/"
+            "name": "cosmoem",
+            "url": "/api/v2/pokemon-species/790/"
         },
         {
-            "name": "lurantis",
-            "url": "/api/v2/pokemon-species/754/"
+            "name": "solgaleo",
+            "url": "/api/v2/pokemon-species/791/"
         },
         {
-            "name": "shiinotic",
-            "url": "/api/v2/pokemon-species/756/"
+            "name": "lunala",
+            "url": "/api/v2/pokemon-species/792/"
         },
         {
-            "name": "salazzle",
-            "url": "/api/v2/pokemon-species/758/"
+            "name": "naganadel",
+            "url": "/api/v2/pokemon-species/804/"
         },
         {
-            "name": "bewear",
-            "url": "/api/v2/pokemon-species/760/"
+            "name": "melmetal",
+            "url": "/api/v2/pokemon-species/809/"
         },
         {
-            "name": "steenee",
-            "url": "/api/v2/pokemon-species/762/"
+            "name": "brionne",
+            "url": "/api/v2/pokemon-species/729/"
         },
         {
             "name": "tsareena",
@@ -1062,22 +1078,6 @@
         {
             "name": "palossand",
             "url": "/api/v2/pokemon-species/770/"
-        },
-        {
-            "name": "silvally",
-            "url": "/api/v2/pokemon-species/773/"
-        },
-        {
-            "name": "hakamo-o",
-            "url": "/api/v2/pokemon-species/783/"
-        },
-        {
-            "name": "kommo-o",
-            "url": "/api/v2/pokemon-species/784/"
-        },
-        {
-            "name": "cosmoem",
-            "url": "/api/v2/pokemon-species/790/"
         }
     ],
     "types": [],
diff --git a/data/api/v2/generation/8/index.json b/data/api/v2/generation/8/index.json
index c68f9e27b3..0c2a14cc2a 100644
--- a/data/api/v2/generation/8/index.json
+++ b/data/api/v2/generation/8/index.json
@@ -707,6 +707,14 @@
             "name": "raboot",
             "url": "/api/v2/pokemon-species/814/"
         },
+        {
+            "name": "cinderace",
+            "url": "/api/v2/pokemon-species/815/"
+        },
+        {
+            "name": "drizzile",
+            "url": "/api/v2/pokemon-species/817/"
+        },
         {
             "name": "inteleon",
             "url": "/api/v2/pokemon-species/818/"
@@ -727,10 +735,6 @@
             "name": "dottler",
             "url": "/api/v2/pokemon-species/825/"
         },
-        {
-            "name": "orbeetle",
-            "url": "/api/v2/pokemon-species/826/"
-        },
         {
             "name": "thievul",
             "url": "/api/v2/pokemon-species/828/"
@@ -907,6 +911,10 @@
             "name": "sandaconda",
             "url": "/api/v2/pokemon-species/844/"
         },
+        {
+            "name": "barraskewda",
+            "url": "/api/v2/pokemon-species/847/"
+        },
         {
             "name": "toxtricity",
             "url": "/api/v2/pokemon-species/849/"
@@ -935,10 +943,6 @@
             "name": "morgrem",
             "url": "/api/v2/pokemon-species/860/"
         },
-        {
-            "name": "grimmsnarl",
-            "url": "/api/v2/pokemon-species/861/"
-        },
         {
             "name": "obstagoon",
             "url": "/api/v2/pokemon-species/862/"
@@ -1008,20 +1012,16 @@
             "url": "/api/v2/pokemon-species/904/"
         },
         {
-            "name": "cinderace",
-            "url": "/api/v2/pokemon-species/815/"
-        },
-        {
-            "name": "drizzile",
-            "url": "/api/v2/pokemon-species/817/"
+            "name": "orbeetle",
+            "url": "/api/v2/pokemon-species/826/"
         },
         {
             "name": "appletun",
             "url": "/api/v2/pokemon-species/842/"
         },
         {
-            "name": "barraskewda",
-            "url": "/api/v2/pokemon-species/847/"
+            "name": "grimmsnarl",
+            "url": "/api/v2/pokemon-species/861/"
         },
         {
             "name": "ursaluna",
diff --git a/data/api/v2/generation/9/index.json b/data/api/v2/generation/9/index.json
index 81268cccfa..92b1dd2719 100644
--- a/data/api/v2/generation/9/index.json
+++ b/data/api/v2/generation/9/index.json
@@ -951,26 +951,6 @@
             "name": "pecharunt",
             "url": "/api/v2/pokemon-species/1025/"
         },
-        {
-            "name": "baxcalibur",
-            "url": "/api/v2/pokemon-species/998/"
-        },
-        {
-            "name": "gholdengo",
-            "url": "/api/v2/pokemon-species/1000/"
-        },
-        {
-            "name": "dipplin",
-            "url": "/api/v2/pokemon-species/1011/"
-        },
-        {
-            "name": "sinistcha",
-            "url": "/api/v2/pokemon-species/1013/"
-        },
-        {
-            "name": "hydrapple",
-            "url": "/api/v2/pokemon-species/1019/"
-        },
         {
             "name": "lokix",
             "url": "/api/v2/pokemon-species/920/"
@@ -987,9 +967,29 @@
             "name": "arctibax",
             "url": "/api/v2/pokemon-species/997/"
         },
+        {
+            "name": "baxcalibur",
+            "url": "/api/v2/pokemon-species/998/"
+        },
+        {
+            "name": "gholdengo",
+            "url": "/api/v2/pokemon-species/1000/"
+        },
+        {
+            "name": "dipplin",
+            "url": "/api/v2/pokemon-species/1011/"
+        },
+        {
+            "name": "sinistcha",
+            "url": "/api/v2/pokemon-species/1013/"
+        },
         {
             "name": "archaludon",
             "url": "/api/v2/pokemon-species/1018/"
+        },
+        {
+            "name": "hydrapple",
+            "url": "/api/v2/pokemon-species/1019/"
         }
     ],
     "types": [
diff --git a/data/api/v2/growth-rate/1/index.json b/data/api/v2/growth-rate/1/index.json
index f80ef43bbf..11870181ea 100644
--- a/data/api/v2/growth-rate/1/index.json
+++ b/data/api/v2/growth-rate/1/index.json
@@ -532,10 +532,6 @@
             "name": "dragonite",
             "url": "/api/v2/pokemon-species/149/"
         },
-        {
-            "name": "eelektrik",
-            "url": "/api/v2/pokemon-species/603/"
-        },
         {
             "name": "chinchou",
             "url": "/api/v2/pokemon-species/170/"
@@ -556,10 +552,6 @@
             "name": "piloswine",
             "url": "/api/v2/pokemon-species/221/"
         },
-        {
-            "name": "eelektross",
-            "url": "/api/v2/pokemon-species/604/"
-        },
         {
             "name": "skarmory",
             "url": "/api/v2/pokemon-species/227/"
@@ -852,10 +844,22 @@
             "name": "tynamo",
             "url": "/api/v2/pokemon-species/602/"
         },
+        {
+            "name": "vanillish",
+            "url": "/api/v2/pokemon-species/583/"
+        },
         {
             "name": "vanilluxe",
             "url": "/api/v2/pokemon-species/584/"
         },
+        {
+            "name": "eelektrik",
+            "url": "/api/v2/pokemon-species/603/"
+        },
+        {
+            "name": "eelektross",
+            "url": "/api/v2/pokemon-species/604/"
+        },
         {
             "name": "axew",
             "url": "/api/v2/pokemon-species/610/"
@@ -924,10 +928,18 @@
             "name": "genesect",
             "url": "/api/v2/pokemon-species/649/"
         },
+        {
+            "name": "fraxure",
+            "url": "/api/v2/pokemon-species/611/"
+        },
         {
             "name": "haxorus",
             "url": "/api/v2/pokemon-species/612/"
         },
+        {
+            "name": "braviary",
+            "url": "/api/v2/pokemon-species/628/"
+        },
         {
             "name": "mandibuzz",
             "url": "/api/v2/pokemon-species/630/"
@@ -980,6 +992,10 @@
             "name": "volcanion",
             "url": "/api/v2/pokemon-species/721/"
         },
+        {
+            "name": "clawitzer",
+            "url": "/api/v2/pokemon-species/693/"
+        },
         {
             "name": "sliggoo",
             "url": "/api/v2/pokemon-species/705/"
@@ -1088,6 +1104,22 @@
             "name": "meltan",
             "url": "/api/v2/pokemon-species/808/"
         },
+        {
+            "name": "silvally",
+            "url": "/api/v2/pokemon-species/773/"
+        },
+        {
+            "name": "hakamo-o",
+            "url": "/api/v2/pokemon-species/783/"
+        },
+        {
+            "name": "kommo-o",
+            "url": "/api/v2/pokemon-species/784/"
+        },
+        {
+            "name": "cosmoem",
+            "url": "/api/v2/pokemon-species/790/"
+        },
         {
             "name": "solgaleo",
             "url": "/api/v2/pokemon-species/791/"
@@ -1184,6 +1216,10 @@
             "name": "enamorus",
             "url": "/api/v2/pokemon-species/905/"
         },
+        {
+            "name": "barraskewda",
+            "url": "/api/v2/pokemon-species/847/"
+        },
         {
             "name": "hattrem",
             "url": "/api/v2/pokemon-species/857/"
@@ -1393,20 +1429,8 @@
             "url": "/api/v2/pokemon-species/473/"
         },
         {
-            "name": "vanillish",
-            "url": "/api/v2/pokemon-species/583/"
-        },
-        {
-            "name": "fraxure",
-            "url": "/api/v2/pokemon-species/611/"
-        },
-        {
-            "name": "braviary",
-            "url": "/api/v2/pokemon-species/628/"
-        },
-        {
-            "name": "clawitzer",
-            "url": "/api/v2/pokemon-species/693/"
+            "name": "arctibax",
+            "url": "/api/v2/pokemon-species/997/"
         },
         {
             "name": "baxcalibur",
@@ -1423,30 +1447,6 @@
         {
             "name": "sinistcha",
             "url": "/api/v2/pokemon-species/1013/"
-        },
-        {
-            "name": "silvally",
-            "url": "/api/v2/pokemon-species/773/"
-        },
-        {
-            "name": "hakamo-o",
-            "url": "/api/v2/pokemon-species/783/"
-        },
-        {
-            "name": "kommo-o",
-            "url": "/api/v2/pokemon-species/784/"
-        },
-        {
-            "name": "cosmoem",
-            "url": "/api/v2/pokemon-species/790/"
-        },
-        {
-            "name": "barraskewda",
-            "url": "/api/v2/pokemon-species/847/"
-        },
-        {
-            "name": "arctibax",
-            "url": "/api/v2/pokemon-species/997/"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/api/v2/growth-rate/2/index.json b/data/api/v2/growth-rate/2/index.json
index 1b68c6f8e4..84d5d80698 100644
--- a/data/api/v2/growth-rate/2/index.json
+++ b/data/api/v2/growth-rate/2/index.json
@@ -960,10 +960,6 @@
             "name": "masquerain",
             "url": "/api/v2/pokemon-species/284/"
         },
-        {
-            "name": "beheeyem",
-            "url": "/api/v2/pokemon-species/606/"
-        },
         {
             "name": "meditite",
             "url": "/api/v2/pokemon-species/307/"
@@ -1220,22 +1216,6 @@
             "name": "excadrill",
             "url": "/api/v2/pokemon-species/530/"
         },
-        {
-            "name": "amoonguss",
-            "url": "/api/v2/pokemon-species/591/"
-        },
-        {
-            "name": "jellicent",
-            "url": "/api/v2/pokemon-species/593/"
-        },
-        {
-            "name": "galvantula",
-            "url": "/api/v2/pokemon-species/596/"
-        },
-        {
-            "name": "ferrothorn",
-            "url": "/api/v2/pokemon-species/598/"
-        },
         {
             "name": "throh",
             "url": "/api/v2/pokemon-species/538/"
@@ -1364,6 +1344,26 @@
             "name": "escavalier",
             "url": "/api/v2/pokemon-species/589/"
         },
+        {
+            "name": "amoonguss",
+            "url": "/api/v2/pokemon-species/591/"
+        },
+        {
+            "name": "jellicent",
+            "url": "/api/v2/pokemon-species/593/"
+        },
+        {
+            "name": "galvantula",
+            "url": "/api/v2/pokemon-species/596/"
+        },
+        {
+            "name": "ferrothorn",
+            "url": "/api/v2/pokemon-species/598/"
+        },
+        {
+            "name": "beheeyem",
+            "url": "/api/v2/pokemon-species/606/"
+        },
         {
             "name": "cubchoo",
             "url": "/api/v2/pokemon-species/613/"
@@ -1468,6 +1468,46 @@
             "name": "diggersby",
             "url": "/api/v2/pokemon-species/660/"
         },
+        {
+            "name": "spewpa",
+            "url": "/api/v2/pokemon-species/665/"
+        },
+        {
+            "name": "floette",
+            "url": "/api/v2/pokemon-species/670/"
+        },
+        {
+            "name": "florges",
+            "url": "/api/v2/pokemon-species/671/"
+        },
+        {
+            "name": "gogoat",
+            "url": "/api/v2/pokemon-species/673/"
+        },
+        {
+            "name": "pangoro",
+            "url": "/api/v2/pokemon-species/675/"
+        },
+        {
+            "name": "meowstic",
+            "url": "/api/v2/pokemon-species/678/"
+        },
+        {
+            "name": "doublade",
+            "url": "/api/v2/pokemon-species/680/"
+        },
+        {
+            "name": "aegislash",
+            "url": "/api/v2/pokemon-species/681/"
+        },
+        {
+            "name": "aromatisse",
+            "url": "/api/v2/pokemon-species/683/"
+        },
+        {
+            "name": "slurpuff",
+            "url": "/api/v2/pokemon-species/685/"
+        },
         {
             "name": "binacle",
             "url": "/api/v2/pokemon-species/688/"
@@ -1568,6 +1608,22 @@
             "name": "stufful",
             "url": "/api/v2/pokemon-species/759/"
         },
+        {
+            "name": "barbaracle",
+            "url": "/api/v2/pokemon-species/689/"
+        },
+        {
+            "name": "dragalge",
+            "url": "/api/v2/pokemon-species/691/"
+        },
+        {
+            "name": "heliolisk",
+            "url": "/api/v2/pokemon-species/695/"
+        },
+        {
+            "name": "aurorus",
+            "url": "/api/v2/pokemon-species/699/"
+        },
         {
             "name": "sylveon",
             "url": "/api/v2/pokemon-species/700/"
@@ -1600,6 +1656,54 @@
             "name": "gumshoos",
             "url": "/api/v2/pokemon-species/735/"
         },
+        {
+            "name": "charjabug",
+            "url": "/api/v2/pokemon-species/737/"
+        },
+        {
+            "name": "vikavolt",
+            "url": "/api/v2/pokemon-species/738/"
+        },
+        {
+            "name": "crabominable",
+            "url": "/api/v2/pokemon-species/740/"
+        },
+        {
+            "name": "ribombee",
+            "url": "/api/v2/pokemon-species/743/"
+        },
+        {
+            "name": "lycanroc",
+            "url": "/api/v2/pokemon-species/745/"
+        },
+        {
+            "name": "toxapex",
+            "url": "/api/v2/pokemon-species/748/"
+        },
+        {
+            "name": "mudsdale",
+            "url": "/api/v2/pokemon-species/750/"
+        },
+        {
+            "name": "araquanid",
+            "url": "/api/v2/pokemon-species/752/"
+        },
+        {
+            "name": "lurantis",
+            "url": "/api/v2/pokemon-species/754/"
+        },
+        {
+            "name": "shiinotic",
+            "url": "/api/v2/pokemon-species/756/"
+        },
+        {
+            "name": "salazzle",
+            "url": "/api/v2/pokemon-species/758/"
+        },
+        {
+            "name": "bewear",
+            "url": "/api/v2/pokemon-species/760/"
+        },
         {
             "name": "wimpod",
             "url": "/api/v2/pokemon-species/767/"
@@ -1664,10 +1768,6 @@
             "name": "dottler",
             "url": "/api/v2/pokemon-species/825/"
         },
-        {
-            "name": "orbeetle",
-            "url": "/api/v2/pokemon-species/826/"
-        },
         {
             "name": "eldegoss",
             "url": "/api/v2/pokemon-species/830/"
@@ -1748,10 +1848,6 @@
             "name": "morgrem",
             "url": "/api/v2/pokemon-species/860/"
         },
-        {
-            "name": "grimmsnarl",
-            "url": "/api/v2/pokemon-species/861/"
-        },
         {
             "name": "obstagoon",
             "url": "/api/v2/pokemon-species/862/"
@@ -1884,122 +1980,18 @@
             "name": "cofagrigus",
             "url": "/api/v2/pokemon-species/563/"
         },
-        {
-            "name": "spewpa",
-            "url": "/api/v2/pokemon-species/665/"
-        },
         {
             "name": "vivillon",
             "url": "/api/v2/pokemon-species/666/"
         },
-        {
-            "name": "floette",
-            "url": "/api/v2/pokemon-species/670/"
-        },
-        {
-            "name": "florges",
-            "url": "/api/v2/pokemon-species/671/"
-        },
-        {
-            "name": "gogoat",
-            "url": "/api/v2/pokemon-species/673/"
-        },
-        {
-            "name": "pangoro",
-            "url": "/api/v2/pokemon-species/675/"
-        },
-        {
-            "name": "meowstic",
-            "url": "/api/v2/pokemon-species/678/"
-        },
-        {
-            "name": "doublade",
-            "url": "/api/v2/pokemon-species/680/"
-        },
-        {
-            "name": "aegislash",
-            "url": "/api/v2/pokemon-species/681/"
-        },
-        {
-            "name": "aromatisse",
-            "url": "/api/v2/pokemon-species/683/"
-        },
-        {
-            "name": "slurpuff",
-            "url": "/api/v2/pokemon-species/685/"
-        },
         {
             "name": "malamar",
             "url": "/api/v2/pokemon-species/687/"
         },
-        {
-            "name": "barbaracle",
-            "url": "/api/v2/pokemon-species/689/"
-        },
-        {
-            "name": "dragalge",
-            "url": "/api/v2/pokemon-species/691/"
-        },
-        {
-            "name": "heliolisk",
-            "url": "/api/v2/pokemon-species/695/"
-        },
         {
             "name": "tyrantrum",
             "url": "/api/v2/pokemon-species/697/"
         },
-        {
-            "name": "aurorus",
-            "url": "/api/v2/pokemon-species/699/"
-        },
-        {
-            "name": "charjabug",
-            "url": "/api/v2/pokemon-species/737/"
-        },
-        {
-            "name": "vikavolt",
-            "url": "/api/v2/pokemon-species/738/"
-        },
-        {
-            "name": "crabominable",
-            "url": "/api/v2/pokemon-species/740/"
-        },
-        {
-            "name": "ribombee",
-            "url": "/api/v2/pokemon-species/743/"
-        },
-        {
-            "name": "lycanroc",
-            "url": "/api/v2/pokemon-species/745/"
-        },
-        {
-            "name": "toxapex",
-            "url": "/api/v2/pokemon-species/748/"
-        },
-        {
-            "name": "mudsdale",
-            "url": "/api/v2/pokemon-species/750/"
-        },
-        {
-            "name": "araquanid",
-            "url": "/api/v2/pokemon-species/752/"
-        },
-        {
-            "name": "lurantis",
-            "url": "/api/v2/pokemon-species/754/"
-        },
-        {
-            "name": "shiinotic",
-            "url": "/api/v2/pokemon-species/756/"
-        },
-        {
-            "name": "salazzle",
-            "url": "/api/v2/pokemon-species/758/"
-        },
-        {
-            "name": "bewear",
-            "url": "/api/v2/pokemon-species/760/"
-        },
         {
             "name": "golisopod",
             "url": "/api/v2/pokemon-species/768/"
@@ -2008,6 +2000,14 @@
             "name": "palossand",
             "url": "/api/v2/pokemon-species/770/"
         },
+        {
+            "name": "orbeetle",
+            "url": "/api/v2/pokemon-species/826/"
+        },
+        {
+            "name": "grimmsnarl",
+            "url": "/api/v2/pokemon-species/861/"
+        },
         {
             "name": "ursaluna",
             "url": "/api/v2/pokemon-species/901/"
diff --git a/data/api/v2/growth-rate/4/index.json b/data/api/v2/growth-rate/4/index.json
index 8e1477944c..b4491be902 100644
--- a/data/api/v2/growth-rate/4/index.json
+++ b/data/api/v2/growth-rate/4/index.json
@@ -564,10 +564,6 @@
             "name": "graveler",
             "url": "/api/v2/pokemon-species/75/"
         },
-        {
-            "name": "klinklang",
-            "url": "/api/v2/pokemon-species/601/"
-        },
         {
             "name": "gastly",
             "url": "/api/v2/pokemon-species/92/"
@@ -992,10 +988,6 @@
             "name": "sewaddle",
             "url": "/api/v2/pokemon-species/540/"
         },
-        {
-            "name": "klang",
-            "url": "/api/v2/pokemon-species/600/"
-        },
         {
             "name": "venipede",
             "url": "/api/v2/pokemon-species/543/"
@@ -1088,6 +1080,14 @@
             "name": "reuniclus",
             "url": "/api/v2/pokemon-species/579/"
         },
+        {
+            "name": "klang",
+            "url": "/api/v2/pokemon-species/600/"
+        },
+        {
+            "name": "lampent",
+            "url": "/api/v2/pokemon-species/608/"
+        },
         {
             "name": "mienfoo",
             "url": "/api/v2/pokemon-species/619/"
@@ -1112,10 +1112,6 @@
             "name": "litleo",
             "url": "/api/v2/pokemon-species/667/"
         },
-        {
-            "name": "mienshao",
-            "url": "/api/v2/pokemon-species/620/"
-        },
         {
             "name": "quilladin",
             "url": "/api/v2/pokemon-species/651/"
@@ -1140,6 +1136,18 @@
             "name": "greninja",
             "url": "/api/v2/pokemon-species/658/"
         },
+        {
+            "name": "fletchinder",
+            "url": "/api/v2/pokemon-species/662/"
+        },
+        {
+            "name": "talonflame",
+            "url": "/api/v2/pokemon-species/663/"
+        },
+        {
+            "name": "pyroar",
+            "url": "/api/v2/pokemon-species/668/"
+        },
         {
             "name": "rowlet",
             "url": "/api/v2/pokemon-species/722/"
@@ -1172,14 +1180,14 @@
             "name": "incineroar",
             "url": "/api/v2/pokemon-species/727/"
         },
-        {
-            "name": "brionne",
-            "url": "/api/v2/pokemon-species/729/"
-        },
         {
             "name": "primarina",
             "url": "/api/v2/pokemon-species/730/"
         },
+        {
+            "name": "steenee",
+            "url": "/api/v2/pokemon-species/762/"
+        },
         {
             "name": "minior",
             "url": "/api/v2/pokemon-species/774/"
@@ -1216,6 +1224,14 @@
             "name": "raboot",
             "url": "/api/v2/pokemon-species/814/"
         },
+        {
+            "name": "cinderace",
+            "url": "/api/v2/pokemon-species/815/"
+        },
+        {
+            "name": "drizzile",
+            "url": "/api/v2/pokemon-species/817/"
+        },
         {
             "name": "inteleon",
             "url": "/api/v2/pokemon-species/818/"
@@ -1433,41 +1449,25 @@
             "url": "/api/v2/pokemon-species/533/"
         },
         {
-            "name": "lampent",
-            "url": "/api/v2/pokemon-species/608/"
+            "name": "klinklang",
+            "url": "/api/v2/pokemon-species/601/"
         },
         {
             "name": "chandelure",
             "url": "/api/v2/pokemon-species/609/"
         },
         {
-            "name": "fletchinder",
-            "url": "/api/v2/pokemon-species/662/"
-        },
-        {
-            "name": "talonflame",
-            "url": "/api/v2/pokemon-species/663/"
-        },
-        {
-            "name": "pyroar",
-            "url": "/api/v2/pokemon-species/668/"
+            "name": "mienshao",
+            "url": "/api/v2/pokemon-species/620/"
         },
         {
-            "name": "steenee",
-            "url": "/api/v2/pokemon-species/762/"
+            "name": "brionne",
+            "url": "/api/v2/pokemon-species/729/"
         },
         {
             "name": "tsareena",
             "url": "/api/v2/pokemon-species/763/"
         },
-        {
-            "name": "cinderace",
-            "url": "/api/v2/pokemon-species/815/"
-        },
-        {
-            "name": "drizzile",
-            "url": "/api/v2/pokemon-species/817/"
-        },
         {
             "name": "arboliva",
             "url": "/api/v2/pokemon-species/930/"
diff --git a/data/api/v2/growth-rate/5/index.json b/data/api/v2/growth-rate/5/index.json
index b97f9a3958..504ea069a3 100644
--- a/data/api/v2/growth-rate/5/index.json
+++ b/data/api/v2/growth-rate/5/index.json
@@ -536,13 +536,13 @@
             "name": "squawkabilly",
             "url": "/api/v2/pokemon-species/931/"
         },
-        {
-            "name": "hydrapple",
-            "url": "/api/v2/pokemon-species/1019/"
-        },
         {
             "name": "appletun",
             "url": "/api/v2/pokemon-species/842/"
+        },
+        {
+            "name": "hydrapple",
+            "url": "/api/v2/pokemon-species/1019/"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/api/v2/location-area/1200/index.json b/data/api/v2/location-area/1200/index.json
index a25b52edf4..a84317929a 100644
--- a/data/api/v2/location-area/1200/index.json
+++ b/data/api/v2/location-area/1200/index.json
@@ -8,5 +8,94 @@
     },
     "name": "pewter-city-area",
     "names": [],
-    "pokemon_encounters": []
+    "pokemon_encounters": [
+        {
+            "pokemon": {
+                "name": "rapidash",
+                "url": "/api/v2/pokemon/78/"
+            },
+            "version_details": [
+                {
+                    "encounter_details": [
+                        {
+                            "chance": 100,
+                            "condition_values": [
+                                {
+                                    "name": "trade-gloom",
+                                    "url": "/api/v2/encounter-condition-value/166/"
+                                }
+                            ],
+                            "max_level": 100,
+                            "method": {
+                                "name": "npc-trade",
+                                "url": "/api/v2/encounter-method/36/"
+                            },
+                            "min_level": 15
+                        }
+                    ],
+                    "max_chance": 100,
+                    "version": {
+                        "name": "gold",
+                        "url": "/api/v2/version/4/"
+                    }
+                },
+                {
+                    "encounter_details": [
+                        {
+                            "chance": 100,
+                            "condition_values": [
+                                {
+                                    "name": "trade-gloom",
+                                    "url": "/api/v2/encounter-condition-value/166/"
+                                }
+                            ],
+                            "max_level": 100,
+                            "method": {
+                                "name": "npc-trade",
+                                "url": "/api/v2/encounter-method/36/"
+                            },
+                            "min_level": 15
+                        }
+                    ],
+                    "max_chance": 100,
+                    "version": {
+                        "name": "silver",
+                        "url": "/api/v2/version/5/"
+                    }
+                }
+            ]
+        },
+        {
+            "pokemon": {
+                "name": "xatu",
+                "url": "/api/v2/pokemon/178/"
+            },
+            "version_details": [
+                {
+                    "encounter_details": [
+                        {
+                            "chance": 100,
+                            "condition_values": [
+                                {
+                                    "name": "trade-haunter",
+                                    "url": "/api/v2/encounter-condition-value/167/"
+                                }
+                            ],
+                            "max_level": 100,
+                            "method": {
+                                "name": "npc-trade",
+                                "url": "/api/v2/encounter-method/36/"
+                            },
+                            "min_level": 15
+                        }
+                    ],
+                    "max_chance": 100,
+                    "version": {
+                        "name": "crystal",
+                        "url": "/api/v2/version/6/"
+                    }
+                }
+            ]
+        }
+    ]
 }
\ No newline at end of file
diff --git a/data/api/v2/location-area/1303/index.json b/data/api/v2/location-area/1303/index.json
new file mode 100644
index 0000000000..ee949d15a1
--- /dev/null
+++ b/data/api/v2/location-area/1303/index.json
@@ -0,0 +1,101 @@
+{
+    "encounter_method_rates": [],
+    "game_index": 0,
+    "id": 1303,
+    "location": {
+        "name": "violet-city",
+        "url": "/api/v2/location/153/"
+    },
+    "name": "violet-city-southwest-house",
+    "names": [
+        {
+            "language": {
+                "name": "en",
+                "url": "/api/v2/language/9/"
+            },
+            "name": "Violet City (Southwest House)"
+        }
+    ],
+    "pokemon_encounters": [
+        {
+            "pokemon": {
+                "name": "onix",
+                "url": "/api/v2/pokemon/95/"
+            },
+            "version_details": [
+                {
+                    "encounter_details": [
+                        {
+                            "chance": 100,
+                            "condition_values": [
+                                {
+                                    "name": "trade-bellsprout",
+                                    "url": "/api/v2/encounter-condition-value/161/"
+                                }
+                            ],
+                            "max_level": 100,
+                            "method": {
+                                "name": "npc-trade",
+                                "url": "/api/v2/encounter-method/36/"
+                            },
+                            "min_level": 3
+                        }
+                    ],
+                    "max_chance": 100,
+                    "version": {
+                        "name": "gold",
+                        "url": "/api/v2/version/4/"
+                    }
+                },
+                {
+                    "encounter_details": [
+                        {
+                            "chance": 100,
+                            "condition_values": [
+                                {
+                                    "name": "trade-bellsprout",
+                                    "url": "/api/v2/encounter-condition-value/161/"
+                                }
+                            ],
+                            "max_level": 100,
+                            "method": {
+                                "name": "npc-trade",
+                                "url": "/api/v2/encounter-method/36/"
+                            },
+                            "min_level": 3
+                        }
+                    ],
+                    "max_chance": 100,
+                    "version": {
+                        "name": "silver",
+                        "url": "/api/v2/version/5/"
+                    }
+                },
+                {
+                    "encounter_details": [
+                        {
+                            "chance": 100,
+                            "condition_values": [
+                                {
+                                    "name": "trade-bellsprout",
+                                    "url": "/api/v2/encounter-condition-value/161/"
+                                }
+                            ],
+                            "max_level": 100,
+                            "method": {
+                                "name": "npc-trade",
+                                "url": "/api/v2/encounter-method/36/"
+                            },
+                            "min_level": 5
+                        }
+                    ],
+                    "max_chance": 100,
+                    "version": {
+                        "name": "crystal",
+                        "url": "/api/v2/version/6/"
+                    }
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/api/v2/location-area/1304/index.json b/data/api/v2/location-area/1304/index.json
new file mode 100644
index 0000000000..0c8f2a555e
--- /dev/null
+++ b/data/api/v2/location-area/1304/index.json
@@ -0,0 +1,101 @@
+{
+    "encounter_method_rates": [],
+    "game_index": 0,
+    "id": 1304,
+    "location": {
+        "name": "goldenrod-city",
+        "url": "/api/v2/location/229/"
+    },
+    "name": "goldenrod-city-department-store-5f",
+    "names": [
+        {
+            "language": {
+                "name": "en",
+                "url": "/api/v2/language/9/"
+            },
+            "name": "Goldenrod City Department Store 5F"
+        }
+    ],
+    "pokemon_encounters": [
+        {
+            "pokemon": {
+                "name": "machop",
+                "url": "/api/v2/pokemon/66/"
+            },
+            "version_details": [
+                {
+                    "encounter_details": [
+                        {
+                            "chance": 100,
+                            "condition_values": [
+                                {
+                                    "name": "trade-drowzee",
+                                    "url": "/api/v2/encounter-condition-value/162/"
+                                }
+                            ],
+                            "max_level": 100,
+                            "method": {
+                                "name": "npc-trade",
+                                "url": "/api/v2/encounter-method/36/"
+                            },
+                            "min_level": 5
+                        }
+                    ],
+                    "max_chance": 100,
+                    "version": {
+                        "name": "gold",
+                        "url": "/api/v2/version/4/"
+                    }
+                },
+                {
+                    "encounter_details": [
+                        {
+                            "chance": 100,
+                            "condition_values": [
+                                {
+                                    "name": "trade-drowzee",
+                                    "url": "/api/v2/encounter-condition-value/162/"
+                                }
+                            ],
+                            "max_level": 100,
+                            "method": {
+                                "name": "npc-trade",
+                                "url": "/api/v2/encounter-method/36/"
+                            },
+                            "min_level": 5
+                        }
+                    ],
+                    "max_chance": 100,
+                    "version": {
+                        "name": "silver",
+                        "url": "/api/v2/version/5/"
+                    }
+                },
+                {
+                    "encounter_details": [
+                        {
+                            "chance": 100,
+                            "condition_values": [
+                                {
+                                    "name": "trade-abra",
+                                    "url": "/api/v2/encounter-condition-value/145/"
+                                }
+                            ],
+                            "max_level": 100,
+                            "method": {
+                                "name": "npc-trade",
+                                "url": "/api/v2/encounter-method/36/"
+                            },
+                            "min_level": 5
+                        }
+                    ],
+                    "max_chance": 100,
+                    "version": {
+                        "name": "crystal",
+                        "url": "/api/v2/version/6/"
+                    }
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/data/api/v2/location-area/224/index.json b/data/api/v2/location-area/224/index.json
index b403cdd2bc..7393ee7820 100644
--- a/data/api/v2/location-area/224/index.json
+++ b/data/api/v2/location-area/224/index.json
@@ -1362,6 +1362,86 @@
                 }
             ]
         },
+        {
+            "pokemon": {
+                "name": "voltorb",
+                "url": "/api/v2/pokemon/100/"
+            },
+            "version_details": [
+                {
+                    "encounter_details": [
+                        {
+                            "chance": 100,
+                            "condition_values": [
+                                {
+                                    "name": "trade-krabby",
+                                    "url": "/api/v2/encounter-condition-value/163/"
+                                }
+                            ],
+                            "max_level": 100,
+                            "method": {
+                                "name": "npc-trade",
+                                "url": "/api/v2/encounter-method/36/"
+                            },
+                            "min_level": 5
+                        }
+                    ],
+                    "max_chance": 100,
+                    "version": {
+                        "name": "gold",
+                        "url": "/api/v2/version/4/"
+                    }
+                },
+                {
+                    "encounter_details": [
+                        {
+                            "chance": 100,
+                            "condition_values": [
+                                {
+                                    "name": "trade-krabby",
+                                    "url": "/api/v2/encounter-condition-value/163/"
+                                }
+                            ],
+                            "max_level": 100,
+                            "method": {
+                                "name": "npc-trade",
+                                "url": "/api/v2/encounter-method/36/"
+                            },
+                            "min_level": 5
+                        }
+                    ],
+                    "max_chance": 100,
+                    "version": {
+                        "name": "silver",
+                        "url": "/api/v2/version/5/"
+                    }
+                },
+                {
+                    "encounter_details": [
+                        {
+                            "chance": 100,
+                            "condition_values": [
+                                {
+                                    "name": "trade-krabby",
+                                    "url": "/api/v2/encounter-condition-value/163/"
+                                }
+                            ],
+                            "max_level": 100,
+                            "method": {
+                                "name": "npc-trade",
+                                "url": "/api/v2/encounter-method/36/"
+                            },
+                            "min_level": 5
+                        }
+                    ],
+                    "max_chance": 100,
+                    "version": {
+                        "name": "crystal",
+                        "url": "/api/v2/version/6/"
+                    }
+                }
+            ]
+        },
         {
             "pokemon": {
                 "name": "staryu",
diff --git a/data/api/v2/location-area/249/index.json b/data/api/v2/location-area/249/index.json
index 3a646b6f98..a534801086 100644
--- a/data/api/v2/location-area/249/index.json
+++ b/data/api/v2/location-area/249/index.json
@@ -563,6 +563,94 @@
                 }
             ]
         },
+        {
+            "pokemon": {
+                "name": "dodrio",
+                "url": "/api/v2/pokemon/85/"
+            },
+            "version_details": [
+                {
+                    "encounter_details": [
+                        {
+                            "chance": 100,
+                            "condition_values": [
+                                {
+                                    "name": "trade-dragonair",
+                                    "url": "/api/v2/encounter-condition-value/164/"
+                                }
+                            ],
+                            "max_level": 100,
+                            "method": {
+                                "name": "npc-trade",
+                                "url": "/api/v2/encounter-method/36/"
+                            },
+                            "min_level": 30
+                        }
+                    ],
+                    "max_chance": 100,
+                    "version": {
+                        "name": "crystal",
+                        "url": "/api/v2/version/6/"
+                    }
+                }
+            ]
+        },
+        {
+            "pokemon": {
+                "name": "rhydon",
+                "url": "/api/v2/pokemon/112/"
+            },
+            "version_details": [
+                {
+                    "encounter_details": [
+                        {
+                            "chance": 100,
+                            "condition_values": [
+                                {
+                                    "name": "trade-dragonair",
+                                    "url": "/api/v2/encounter-condition-value/164/"
+                                }
+                            ],
+                            "max_level": 100,
+                            "method": {
+                                "name": "npc-trade",
+                                "url": "/api/v2/encounter-method/36/"
+                            },
+                            "min_level": 30
+                        }
+                    ],
+                    "max_chance": 100,
+                    "version": {
+                        "name": "gold",
+                        "url": "/api/v2/version/4/"
+                    }
+                },
+                {
+                    "encounter_details": [
+                        {
+                            "chance": 100,
+                            "condition_values": [
+                                {
+                                    "name": "trade-dragonair",
+                                    "url": "/api/v2/encounter-condition-value/164/"
+                                }
+                            ],
+                            "max_level": 100,
+                            "method": {
+                                "name": "npc-trade",
+                                "url": "/api/v2/encounter-method/36/"
+                            },
+                            "min_level": 30
+                        }
+                    ],
+                    "max_chance": 100,
+                    "version": {
+                        "name": "silver",
+                        "url": "/api/v2/version/5/"
+                    }
+                }
+            ]
+        },
         {
             "pokemon": {
                 "name": "magikarp",
diff --git a/data/api/v2/location-area/307/index.json b/data/api/v2/location-area/307/index.json
index b5e37346b8..c888d94409 100644
--- a/data/api/v2/location-area/307/index.json
+++ b/data/api/v2/location-area/307/index.json
@@ -2754,6 +2754,86 @@
                 }
             ]
         },
+        {
+            "pokemon": {
+                "name": "aerodactyl",
+                "url": "/api/v2/pokemon/142/"
+            },
+            "version_details": [
+                {
+                    "encounter_details": [
+                        {
+                            "chance": 100,
+                            "condition_values": [
+                                {
+                                    "name": "trade-chansey",
+                                    "url": "/api/v2/encounter-condition-value/165/"
+                                }
+                            ],
+                            "max_level": 100,
+                            "method": {
+                                "name": "npc-trade",
+                                "url": "/api/v2/encounter-method/36/"
+                            },
+                            "min_level": 5
+                        }
+                    ],
+                    "max_chance": 100,
+                    "version": {
+                        "name": "gold",
+                        "url": "/api/v2/version/4/"
+                    }
+                },
+                {
+                    "encounter_details": [
+                        {
+                            "chance": 100,
+                            "condition_values": [
+                                {
+                                    "name": "trade-chansey",
+                                    "url": "/api/v2/encounter-condition-value/165/"
+                                }
+                            ],
+                            "max_level": 100,
+                            "method": {
+                                "name": "npc-trade",
+                                "url": "/api/v2/encounter-method/36/"
+                            },
+                            "min_level": 5
+                        }
+                    ],
+                    "max_chance": 100,
+                    "version": {
+                        "name": "silver",
+                        "url": "/api/v2/version/5/"
+                    }
+                },
+                {
+                    "encounter_details": [
+                        {
+                            "chance": 100,
+                            "condition_values": [
+                                {
+                                    "name": "trade-chansey",
+                                    "url": "/api/v2/encounter-condition-value/165/"
+                                }
+                            ],
+                            "max_level": 100,
+                            "method": {
+                                "name": "npc-trade",
+                                "url": "/api/v2/encounter-method/36/"
+                            },
+                            "min_level": 5
+                        }
+                    ],
+                    "max_chance": 100,
+                    "version": {
+                        "name": "crystal",
+                        "url": "/api/v2/version/6/"
+                    }
+                }
+            ]
+        },
         {
             "pokemon": {
                 "name": "articuno",
diff --git a/data/api/v2/location-area/330/index.json b/data/api/v2/location-area/330/index.json
index 9679004140..1c8e784580 100644
--- a/data/api/v2/location-area/330/index.json
+++ b/data/api/v2/location-area/330/index.json
@@ -26,10 +26,10 @@
     "game_index": 0,
     "id": 330,
     "location": {
-        "name": "power-plant",
+        "name": "kanto-power-plant",
         "url": "/api/v2/location/158/"
     },
-    "name": "power-plant-area",
+    "name": "kanto-power-plant-area",
     "names": [
         {
             "language": {
@@ -684,6 +684,30 @@
                         "url": "/api/v2/version/3/"
                     }
                 },
+                {
+                    "encounter_details": [
+                        {
+                            "chance": 100,
+                            "condition_values": [
+                                {
+                                    "name": "trade-dugtrio",
+                                    "url": "/api/v2/encounter-condition-value/168/"
+                                }
+                            ],
+                            "max_level": 100,
+                            "method": {
+                                "name": "npc-trade",
+                                "url": "/api/v2/encounter-method/36/"
+                            },
+                            "min_level": 16
+                        }
+                    ],
+                    "max_chance": 100,
+                    "version": {
+                        "name": "crystal",
+                        "url": "/api/v2/version/6/"
+                    }
+                },
                 {
                     "encounter_details": [
                         {
diff --git a/data/api/v2/location-area/index.json b/data/api/v2/location-area/index.json
index 765eb143f8..4186f643af 100644
--- a/data/api/v2/location-area/index.json
+++ b/data/api/v2/location-area/index.json
@@ -1,5 +1,5 @@
 {
-    "count": 1192,
+    "count": 1194,
     "next": null,
     "previous": null,
     "results": [
@@ -1144,7 +1144,7 @@
             "url": "/api/v2/location-area/329/"
         },
         {
-            "name": "power-plant-area",
+            "name": "kanto-power-plant-area",
             "url": "/api/v2/location-area/330/"
         },
         {
@@ -4770,6 +4770,14 @@
         {
             "name": "kanto-underground-path-area",
             "url": "/api/v2/location-area/1302/"
+        },
+        {
+            "name": "violet-city-southwest-house",
+            "url": "/api/v2/location-area/1303/"
+        },
+        {
+            "name": "goldenrod-city-department-store-5f",
+            "url": "/api/v2/location-area/1304/"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/api/v2/location/153/index.json b/data/api/v2/location/153/index.json
index 76fc238301..ddbc4f5549 100644
--- a/data/api/v2/location/153/index.json
+++ b/data/api/v2/location/153/index.json
@@ -11,6 +11,10 @@
         {
             "name": "violet-city-pokemon-center",
             "url": "/api/v2/location-area/791/"
+        },
+        {
+            "name": "violet-city-southwest-house",
+            "url": "/api/v2/location-area/1303/"
         }
     ],
     "game_indices": [
diff --git a/data/api/v2/location/158/index.json b/data/api/v2/location/158/index.json
index e80cf06c93..1135b49ea3 100644
--- a/data/api/v2/location/158/index.json
+++ b/data/api/v2/location/158/index.json
@@ -1,7 +1,7 @@
 {
     "areas": [
         {
-            "name": "power-plant-area",
+            "name": "kanto-power-plant-area",
             "url": "/api/v2/location-area/330/"
         }
     ],
@@ -15,7 +15,7 @@
         }
     ],
     "id": 158,
-    "name": "power-plant",
+    "name": "kanto-power-plant",
     "names": [
         {
             "language": {
@@ -36,7 +36,7 @@
                 "name": "en",
                 "url": "/api/v2/language/9/"
             },
-            "name": "Power Plant"
+            "name": "Kanto Power Plant"
         }
     ],
     "region": {
diff --git a/data/api/v2/location/229/index.json b/data/api/v2/location/229/index.json
index 09dab6dd3e..189e0cb130 100644
--- a/data/api/v2/location/229/index.json
+++ b/data/api/v2/location/229/index.json
@@ -11,6 +11,10 @@
         {
             "name": "goldenrod-city-game-corner",
             "url": "/api/v2/location-area/1301/"
+        },
+        {
+            "name": "goldenrod-city-department-store-5f",
+            "url": "/api/v2/location-area/1304/"
         }
     ],
     "game_indices": [
diff --git a/data/api/v2/location/index.json b/data/api/v2/location/index.json
index a2620eadc4..b1c95f74af 100644
--- a/data/api/v2/location/index.json
+++ b/data/api/v2/location/index.json
@@ -608,7 +608,7 @@
             "url": "/api/v2/location/157/"
         },
         {
-            "name": "power-plant",
+            "name": "kanto-power-plant",
             "url": "/api/v2/location/158/"
         },
         {
diff --git a/data/api/v2/meta/index.json b/data/api/v2/meta/index.json
index 53c28d8d43..adb0a2c086 100644
--- a/data/api/v2/meta/index.json
+++ b/data/api/v2/meta/index.json
@@ -1,5 +1,5 @@
 {
-    "deploy_date": "1775377190",
-    "hash": "9bd4087ab2876d96f97518ce0b6cf3e3d93fe13c",
+    "deploy_date": "1775534863",
+    "hash": "8d631c17448d88fe96b8a8893c199dcd9203a1a9",
     "tag": null
 }
\ No newline at end of file
diff --git a/data/api/v2/pokemon-color/1/index.json b/data/api/v2/pokemon-color/1/index.json
index 2270e69a61..5224ae24cf 100644
--- a/data/api/v2/pokemon-color/1/index.json
+++ b/data/api/v2/pokemon-color/1/index.json
@@ -178,6 +178,10 @@
             "name": "yamask",
             "url": "/api/v2/pokemon-species/562/"
         },
+        {
+            "name": "lampent",
+            "url": "/api/v2/pokemon-species/608/"
+        },
         {
             "name": "zekrom",
             "url": "/api/v2/pokemon-species/644/"
@@ -186,6 +190,10 @@
             "name": "scatterbug",
             "url": "/api/v2/pokemon-species/664/"
         },
+        {
+            "name": "spewpa",
+            "url": "/api/v2/pokemon-species/665/"
+        },
         {
             "name": "pikipek",
             "url": "/api/v2/pokemon-species/731/"
@@ -202,6 +210,10 @@
             "name": "toucannon",
             "url": "/api/v2/pokemon-species/733/"
         },
+        {
+            "name": "salazzle",
+            "url": "/api/v2/pokemon-species/758/"
+        },
         {
             "name": "pyukumuku",
             "url": "/api/v2/pokemon-species/771/"
@@ -262,21 +274,9 @@
             "name": "fezandipiti",
             "url": "/api/v2/pokemon-species/1016/"
         },
-        {
-            "name": "lampent",
-            "url": "/api/v2/pokemon-species/608/"
-        },
         {
             "name": "chandelure",
             "url": "/api/v2/pokemon-species/609/"
-        },
-        {
-            "name": "spewpa",
-            "url": "/api/v2/pokemon-species/665/"
-        },
-        {
-            "name": "salazzle",
-            "url": "/api/v2/pokemon-species/758/"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/api/v2/pokemon-color/10/index.json b/data/api/v2/pokemon-color/10/index.json
index 5d743ac250..559aad9cd8 100644
--- a/data/api/v2/pokemon-color/10/index.json
+++ b/data/api/v2/pokemon-color/10/index.json
@@ -270,10 +270,6 @@
             "name": "electivire",
             "url": "/api/v2/pokemon-species/466/"
         },
-        {
-            "name": "galvantula",
-            "url": "/api/v2/pokemon-species/596/"
-        },
         {
             "name": "sewaddle",
             "url": "/api/v2/pokemon-species/540/"
@@ -298,6 +294,10 @@
             "name": "archeops",
             "url": "/api/v2/pokemon-species/567/"
         },
+        {
+            "name": "galvantula",
+            "url": "/api/v2/pokemon-species/596/"
+        },
         {
             "name": "mienfoo",
             "url": "/api/v2/pokemon-species/619/"
@@ -322,6 +322,14 @@
             "name": "cutiefly",
             "url": "/api/v2/pokemon-species/742/"
         },
+        {
+            "name": "heliolisk",
+            "url": "/api/v2/pokemon-species/695/"
+        },
+        {
+            "name": "ribombee",
+            "url": "/api/v2/pokemon-species/743/"
+        },
         {
             "name": "mimikyu",
             "url": "/api/v2/pokemon-species/778/"
@@ -414,14 +422,6 @@
             "name": "cofagrigus",
             "url": "/api/v2/pokemon-species/563/"
         },
-        {
-            "name": "heliolisk",
-            "url": "/api/v2/pokemon-species/695/"
-        },
-        {
-            "name": "ribombee",
-            "url": "/api/v2/pokemon-species/743/"
-        },
         {
             "name": "gholdengo",
             "url": "/api/v2/pokemon-species/1000/"
diff --git a/data/api/v2/pokemon-color/2/index.json b/data/api/v2/pokemon-color/2/index.json
index 88efe68241..8578b86b63 100644
--- a/data/api/v2/pokemon-color/2/index.json
+++ b/data/api/v2/pokemon-color/2/index.json
@@ -174,10 +174,6 @@
             "name": "dragonair",
             "url": "/api/v2/pokemon-species/148/"
         },
-        {
-            "name": "eelektrik",
-            "url": "/api/v2/pokemon-species/603/"
-        },
         {
             "name": "totodile",
             "url": "/api/v2/pokemon-species/158/"
@@ -226,10 +222,6 @@
             "name": "wobbuffet",
             "url": "/api/v2/pokemon-species/202/"
         },
-        {
-            "name": "eelektross",
-            "url": "/api/v2/pokemon-species/604/"
-        },
         {
             "name": "phanpy",
             "url": "/api/v2/pokemon-species/231/"
@@ -530,6 +522,14 @@
             "name": "carracosta",
             "url": "/api/v2/pokemon-species/565/"
         },
+        {
+            "name": "eelektrik",
+            "url": "/api/v2/pokemon-species/603/"
+        },
+        {
+            "name": "eelektross",
+            "url": "/api/v2/pokemon-species/604/"
+        },
         {
             "name": "cryogonal",
             "url": "/api/v2/pokemon-species/615/"
@@ -570,6 +570,10 @@
             "name": "greninja",
             "url": "/api/v2/pokemon-species/658/"
         },
+        {
+            "name": "meowstic",
+            "url": "/api/v2/pokemon-species/678/"
+        },
         {
             "name": "clauncher",
             "url": "/api/v2/pokemon-species/692/"
@@ -599,17 +603,29 @@
             "url": "/api/v2/pokemon-species/747/"
         },
         {
-            "name": "avalugg",
-            "url": "/api/v2/pokemon-species/713/"
+            "name": "clawitzer",
+            "url": "/api/v2/pokemon-species/693/"
         },
         {
-            "name": "brionne",
-            "url": "/api/v2/pokemon-species/729/"
+            "name": "aurorus",
+            "url": "/api/v2/pokemon-species/699/"
+        },
+        {
+            "name": "avalugg",
+            "url": "/api/v2/pokemon-species/713/"
         },
         {
             "name": "primarina",
             "url": "/api/v2/pokemon-species/730/"
         },
+        {
+            "name": "vikavolt",
+            "url": "/api/v2/pokemon-species/738/"
+        },
+        {
+            "name": "toxapex",
+            "url": "/api/v2/pokemon-species/748/"
+        },
         {
             "name": "komala",
             "url": "/api/v2/pokemon-species/775/"
@@ -630,6 +646,14 @@
             "name": "blipbug",
             "url": "/api/v2/pokemon-species/824/"
         },
+        {
+            "name": "cosmoem",
+            "url": "/api/v2/pokemon-species/790/"
+        },
+        {
+            "name": "drizzile",
+            "url": "/api/v2/pokemon-species/817/"
+        },
         {
             "name": "inteleon",
             "url": "/api/v2/pokemon-species/818/"
@@ -722,37 +746,13 @@
             "name": "toxicroak",
             "url": "/api/v2/pokemon-species/454/"
         },
-        {
-            "name": "meowstic",
-            "url": "/api/v2/pokemon-species/678/"
-        },
         {
             "name": "malamar",
             "url": "/api/v2/pokemon-species/687/"
         },
         {
-            "name": "clawitzer",
-            "url": "/api/v2/pokemon-species/693/"
-        },
-        {
-            "name": "aurorus",
-            "url": "/api/v2/pokemon-species/699/"
-        },
-        {
-            "name": "vikavolt",
-            "url": "/api/v2/pokemon-species/738/"
-        },
-        {
-            "name": "toxapex",
-            "url": "/api/v2/pokemon-species/748/"
-        },
-        {
-            "name": "cosmoem",
-            "url": "/api/v2/pokemon-species/790/"
-        },
-        {
-            "name": "drizzile",
-            "url": "/api/v2/pokemon-species/817/"
+            "name": "brionne",
+            "url": "/api/v2/pokemon-species/729/"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/api/v2/pokemon-color/3/index.json b/data/api/v2/pokemon-color/3/index.json
index b8c2ad5354..5c6373a296 100644
--- a/data/api/v2/pokemon-color/3/index.json
+++ b/data/api/v2/pokemon-color/3/index.json
@@ -294,10 +294,6 @@
             "name": "hariyama",
             "url": "/api/v2/pokemon-species/297/"
         },
-        {
-            "name": "beheeyem",
-            "url": "/api/v2/pokemon-species/606/"
-        },
         {
             "name": "torkoal",
             "url": "/api/v2/pokemon-species/324/"
@@ -410,6 +406,10 @@
             "name": "sawsbuck",
             "url": "/api/v2/pokemon-species/586/"
         },
+        {
+            "name": "beheeyem",
+            "url": "/api/v2/pokemon-species/606/"
+        },
         {
             "name": "stunfisk",
             "url": "/api/v2/pokemon-species/618/"
@@ -450,6 +450,22 @@
             "name": "diggersby",
             "url": "/api/v2/pokemon-species/660/"
         },
+        {
+            "name": "pyroar",
+            "url": "/api/v2/pokemon-species/668/"
+        },
+        {
+            "name": "gogoat",
+            "url": "/api/v2/pokemon-species/673/"
+        },
+        {
+            "name": "doublade",
+            "url": "/api/v2/pokemon-species/680/"
+        },
+        {
+            "name": "aegislash",
+            "url": "/api/v2/pokemon-species/681/"
+        },
         {
             "name": "binacle",
             "url": "/api/v2/pokemon-species/688/"
@@ -490,6 +506,14 @@
             "name": "mudbray",
             "url": "/api/v2/pokemon-species/749/"
         },
+        {
+            "name": "barbaracle",
+            "url": "/api/v2/pokemon-species/689/"
+        },
+        {
+            "name": "dragalge",
+            "url": "/api/v2/pokemon-species/691/"
+        },
         {
             "name": "trevenant",
             "url": "/api/v2/pokemon-species/709/"
@@ -510,6 +534,14 @@
             "name": "gumshoos",
             "url": "/api/v2/pokemon-species/735/"
         },
+        {
+            "name": "lycanroc",
+            "url": "/api/v2/pokemon-species/745/"
+        },
+        {
+            "name": "mudsdale",
+            "url": "/api/v2/pokemon-species/750/"
+        },
         {
             "name": "sandygast",
             "url": "/api/v2/pokemon-species/769/"
@@ -542,6 +574,10 @@
             "name": "clobbopus",
             "url": "/api/v2/pokemon-species/852/"
         },
+        {
+            "name": "barraskewda",
+            "url": "/api/v2/pokemon-species/847/"
+        },
         {
             "name": "perrserker",
             "url": "/api/v2/pokemon-species/863/"
@@ -618,46 +654,10 @@
             "name": "mamoswine",
             "url": "/api/v2/pokemon-species/473/"
         },
-        {
-            "name": "pyroar",
-            "url": "/api/v2/pokemon-species/668/"
-        },
-        {
-            "name": "gogoat",
-            "url": "/api/v2/pokemon-species/673/"
-        },
-        {
-            "name": "doublade",
-            "url": "/api/v2/pokemon-species/680/"
-        },
-        {
-            "name": "aegislash",
-            "url": "/api/v2/pokemon-species/681/"
-        },
-        {
-            "name": "barbaracle",
-            "url": "/api/v2/pokemon-species/689/"
-        },
-        {
-            "name": "dragalge",
-            "url": "/api/v2/pokemon-species/691/"
-        },
-        {
-            "name": "lycanroc",
-            "url": "/api/v2/pokemon-species/745/"
-        },
-        {
-            "name": "mudsdale",
-            "url": "/api/v2/pokemon-species/750/"
-        },
         {
             "name": "palossand",
             "url": "/api/v2/pokemon-species/770/"
         },
-        {
-            "name": "barraskewda",
-            "url": "/api/v2/pokemon-species/847/"
-        },
         {
             "name": "ursaluna",
             "url": "/api/v2/pokemon-species/901/"
diff --git a/data/api/v2/pokemon-color/4/index.json b/data/api/v2/pokemon-color/4/index.json
index 1b8eadb758..aecc38afad 100644
--- a/data/api/v2/pokemon-color/4/index.json
+++ b/data/api/v2/pokemon-color/4/index.json
@@ -86,10 +86,6 @@
             "name": "machamp",
             "url": "/api/v2/pokemon-species/68/"
         },
-        {
-            "name": "klinklang",
-            "url": "/api/v2/pokemon-species/601/"
-        },
         {
             "name": "magnemite",
             "url": "/api/v2/pokemon-species/81/"
@@ -262,14 +258,6 @@
             "name": "timburr",
             "url": "/api/v2/pokemon-species/532/"
         },
-        {
-            "name": "ferrothorn",
-            "url": "/api/v2/pokemon-species/598/"
-        },
-        {
-            "name": "klang",
-            "url": "/api/v2/pokemon-species/600/"
-        },
         {
             "name": "zorua",
             "url": "/api/v2/pokemon-species/570/"
@@ -302,6 +290,14 @@
             "name": "escavalier",
             "url": "/api/v2/pokemon-species/589/"
         },
+        {
+            "name": "ferrothorn",
+            "url": "/api/v2/pokemon-species/598/"
+        },
+        {
+            "name": "klang",
+            "url": "/api/v2/pokemon-species/600/"
+        },
         {
             "name": "durant",
             "url": "/api/v2/pokemon-species/632/"
@@ -366,6 +362,18 @@
             "name": "nymble",
             "url": "/api/v2/pokemon-species/919/"
         },
+        {
+            "name": "silvally",
+            "url": "/api/v2/pokemon-species/773/"
+        },
+        {
+            "name": "hakamo-o",
+            "url": "/api/v2/pokemon-species/783/"
+        },
+        {
+            "name": "kommo-o",
+            "url": "/api/v2/pokemon-species/784/"
+        },
         {
             "name": "melmetal",
             "url": "/api/v2/pokemon-species/809/"
@@ -471,25 +479,13 @@
             "url": "/api/v2/pokemon-species/533/"
         },
         {
-            "name": "baxcalibur",
-            "url": "/api/v2/pokemon-species/998/"
+            "name": "klinklang",
+            "url": "/api/v2/pokemon-species/601/"
         },
         {
             "name": "golisopod",
             "url": "/api/v2/pokemon-species/768/"
         },
-        {
-            "name": "silvally",
-            "url": "/api/v2/pokemon-species/773/"
-        },
-        {
-            "name": "hakamo-o",
-            "url": "/api/v2/pokemon-species/783/"
-        },
-        {
-            "name": "kommo-o",
-            "url": "/api/v2/pokemon-species/784/"
-        },
         {
             "name": "lokix",
             "url": "/api/v2/pokemon-species/920/"
@@ -501,6 +497,10 @@
         {
             "name": "arctibax",
             "url": "/api/v2/pokemon-species/997/"
+        },
+        {
+            "name": "baxcalibur",
+            "url": "/api/v2/pokemon-species/998/"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/api/v2/pokemon-color/5/index.json b/data/api/v2/pokemon-color/5/index.json
index 76072750f8..008eeb4c02 100644
--- a/data/api/v2/pokemon-color/5/index.json
+++ b/data/api/v2/pokemon-color/5/index.json
@@ -366,6 +366,10 @@
             "name": "chespin",
             "url": "/api/v2/pokemon-species/650/"
         },
+        {
+            "name": "fraxure",
+            "url": "/api/v2/pokemon-species/611/"
+        },
         {
             "name": "golurk",
             "url": "/api/v2/pokemon-species/623/"
@@ -394,6 +398,14 @@
             "name": "comfey",
             "url": "/api/v2/pokemon-species/764/"
         },
+        {
+            "name": "charjabug",
+            "url": "/api/v2/pokemon-species/737/"
+        },
+        {
+            "name": "araquanid",
+            "url": "/api/v2/pokemon-species/752/"
+        },
         {
             "name": "dhelmise",
             "url": "/api/v2/pokemon-species/781/"
@@ -563,16 +575,12 @@
             "url": "/api/v2/pokemon-species/153/"
         },
         {
-            "name": "fraxure",
-            "url": "/api/v2/pokemon-species/611/"
-        },
-        {
-            "name": "charjabug",
-            "url": "/api/v2/pokemon-species/737/"
+            "name": "appletun",
+            "url": "/api/v2/pokemon-species/842/"
         },
         {
-            "name": "araquanid",
-            "url": "/api/v2/pokemon-species/752/"
+            "name": "arboliva",
+            "url": "/api/v2/pokemon-species/930/"
         },
         {
             "name": "dipplin",
@@ -585,14 +593,6 @@
         {
             "name": "hydrapple",
             "url": "/api/v2/pokemon-species/1019/"
-        },
-        {
-            "name": "appletun",
-            "url": "/api/v2/pokemon-species/842/"
-        },
-        {
-            "name": "arboliva",
-            "url": "/api/v2/pokemon-species/930/"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/api/v2/pokemon-color/6/index.json b/data/api/v2/pokemon-color/6/index.json
index 67f2295167..b39babc17c 100644
--- a/data/api/v2/pokemon-color/6/index.json
+++ b/data/api/v2/pokemon-color/6/index.json
@@ -226,6 +226,10 @@
             "name": "spritzee",
             "url": "/api/v2/pokemon-species/682/"
         },
+        {
+            "name": "aromatisse",
+            "url": "/api/v2/pokemon-species/683/"
+        },
         {
             "name": "diancie",
             "url": "/api/v2/pokemon-species/719/"
@@ -242,6 +246,14 @@
             "name": "sylveon",
             "url": "/api/v2/pokemon-species/700/"
         },
+        {
+            "name": "lurantis",
+            "url": "/api/v2/pokemon-species/754/"
+        },
+        {
+            "name": "bewear",
+            "url": "/api/v2/pokemon-species/760/"
+        },
         {
             "name": "bruxish",
             "url": "/api/v2/pokemon-species/779/"
@@ -301,18 +313,6 @@
         {
             "name": "tinkaton",
             "url": "/api/v2/pokemon-species/959/"
-        },
-        {
-            "name": "aromatisse",
-            "url": "/api/v2/pokemon-species/683/"
-        },
-        {
-            "name": "lurantis",
-            "url": "/api/v2/pokemon-species/754/"
-        },
-        {
-            "name": "bewear",
-            "url": "/api/v2/pokemon-species/760/"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/api/v2/pokemon-color/7/index.json b/data/api/v2/pokemon-color/7/index.json
index 043f55becb..e088659a3d 100644
--- a/data/api/v2/pokemon-color/7/index.json
+++ b/data/api/v2/pokemon-color/7/index.json
@@ -294,10 +294,6 @@
             "name": "genesect",
             "url": "/api/v2/pokemon-species/649/"
         },
-        {
-            "name": "mienshao",
-            "url": "/api/v2/pokemon-species/620/"
-        },
         {
             "name": "goomy",
             "url": "/api/v2/pokemon-species/704/"
@@ -334,6 +330,14 @@
             "name": "noivern",
             "url": "/api/v2/pokemon-species/715/"
         },
+        {
+            "name": "shiinotic",
+            "url": "/api/v2/pokemon-species/756/"
+        },
+        {
+            "name": "steenee",
+            "url": "/api/v2/pokemon-species/762/"
+        },
         {
             "name": "tapu-fini",
             "url": "/api/v2/pokemon-species/788/"
@@ -382,10 +386,6 @@
             "name": "polteageist",
             "url": "/api/v2/pokemon-species/855/"
         },
-        {
-            "name": "grimmsnarl",
-            "url": "/api/v2/pokemon-species/861/"
-        },
         {
             "name": "mr-rime",
             "url": "/api/v2/pokemon-species/866/"
@@ -411,16 +411,16 @@
             "url": "/api/v2/pokemon-species/423/"
         },
         {
-            "name": "shiinotic",
-            "url": "/api/v2/pokemon-species/756/"
-        },
-        {
-            "name": "steenee",
-            "url": "/api/v2/pokemon-species/762/"
+            "name": "mienshao",
+            "url": "/api/v2/pokemon-species/620/"
         },
         {
             "name": "tsareena",
             "url": "/api/v2/pokemon-species/763/"
+        },
+        {
+            "name": "grimmsnarl",
+            "url": "/api/v2/pokemon-species/861/"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/api/v2/pokemon-color/8/index.json b/data/api/v2/pokemon-color/8/index.json
index faa582e703..31e4246222 100644
--- a/data/api/v2/pokemon-color/8/index.json
+++ b/data/api/v2/pokemon-color/8/index.json
@@ -346,6 +346,10 @@
             "name": "bisharp",
             "url": "/api/v2/pokemon-species/625/"
         },
+        {
+            "name": "braviary",
+            "url": "/api/v2/pokemon-species/628/"
+        },
         {
             "name": "braixen",
             "url": "/api/v2/pokemon-species/654/"
@@ -354,6 +358,14 @@
             "name": "delphox",
             "url": "/api/v2/pokemon-species/655/"
         },
+        {
+            "name": "fletchinder",
+            "url": "/api/v2/pokemon-species/662/"
+        },
+        {
+            "name": "talonflame",
+            "url": "/api/v2/pokemon-species/663/"
+        },
         {
             "name": "yveltal",
             "url": "/api/v2/pokemon-species/717/"
@@ -386,10 +398,6 @@
             "name": "buzzwole",
             "url": "/api/v2/pokemon-species/794/"
         },
-        {
-            "name": "orbeetle",
-            "url": "/api/v2/pokemon-species/826/"
-        },
         {
             "name": "sizzlipede",
             "url": "/api/v2/pokemon-species/850/"
@@ -446,21 +454,13 @@
             "name": "koraidon",
             "url": "/api/v2/pokemon-species/1007/"
         },
-        {
-            "name": "braviary",
-            "url": "/api/v2/pokemon-species/628/"
-        },
-        {
-            "name": "fletchinder",
-            "url": "/api/v2/pokemon-species/662/"
-        },
-        {
-            "name": "talonflame",
-            "url": "/api/v2/pokemon-species/663/"
-        },
         {
             "name": "tyrantrum",
             "url": "/api/v2/pokemon-species/697/"
+        },
+        {
+            "name": "orbeetle",
+            "url": "/api/v2/pokemon-species/826/"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/api/v2/pokemon-color/9/index.json b/data/api/v2/pokemon-color/9/index.json
index b1840e7a26..fa0875dc18 100644
--- a/data/api/v2/pokemon-color/9/index.json
+++ b/data/api/v2/pokemon-color/9/index.json
@@ -182,14 +182,6 @@
             "name": "froslass",
             "url": "/api/v2/pokemon-species/478/"
         },
-        {
-            "name": "amoonguss",
-            "url": "/api/v2/pokemon-species/591/"
-        },
-        {
-            "name": "jellicent",
-            "url": "/api/v2/pokemon-species/593/"
-        },
         {
             "name": "vanillite",
             "url": "/api/v2/pokemon-species/582/"
@@ -218,10 +210,22 @@
             "name": "swanna",
             "url": "/api/v2/pokemon-species/581/"
         },
+        {
+            "name": "vanillish",
+            "url": "/api/v2/pokemon-species/583/"
+        },
         {
             "name": "vanilluxe",
             "url": "/api/v2/pokemon-species/584/"
         },
+        {
+            "name": "amoonguss",
+            "url": "/api/v2/pokemon-species/591/"
+        },
+        {
+            "name": "jellicent",
+            "url": "/api/v2/pokemon-species/593/"
+        },
         {
             "name": "cubchoo",
             "url": "/api/v2/pokemon-species/613/"
@@ -266,6 +270,26 @@
             "name": "volcarona",
             "url": "/api/v2/pokemon-species/637/"
         },
+        {
+            "name": "floette",
+            "url": "/api/v2/pokemon-species/670/"
+        },
+        {
+            "name": "florges",
+            "url": "/api/v2/pokemon-species/671/"
+        },
+        {
+            "name": "pangoro",
+            "url": "/api/v2/pokemon-species/675/"
+        },
+        {
+            "name": "slurpuff",
+            "url": "/api/v2/pokemon-species/685/"
+        },
+        {
+            "name": "crabominable",
+            "url": "/api/v2/pokemon-species/740/"
+        },
         {
             "name": "oranguru",
             "url": "/api/v2/pokemon-species/765/"
@@ -306,6 +330,10 @@
             "name": "solgaleo",
             "url": "/api/v2/pokemon-species/791/"
         },
+        {
+            "name": "cinderace",
+            "url": "/api/v2/pokemon-species/815/"
+        },
         {
             "name": "dubwool",
             "url": "/api/v2/pokemon-species/832/"
@@ -390,38 +418,10 @@
             "name": "iron-valiant",
             "url": "/api/v2/pokemon-species/1006/"
         },
-        {
-            "name": "vanillish",
-            "url": "/api/v2/pokemon-species/583/"
-        },
         {
             "name": "vivillon",
             "url": "/api/v2/pokemon-species/666/"
         },
-        {
-            "name": "floette",
-            "url": "/api/v2/pokemon-species/670/"
-        },
-        {
-            "name": "florges",
-            "url": "/api/v2/pokemon-species/671/"
-        },
-        {
-            "name": "pangoro",
-            "url": "/api/v2/pokemon-species/675/"
-        },
-        {
-            "name": "slurpuff",
-            "url": "/api/v2/pokemon-species/685/"
-        },
-        {
-            "name": "crabominable",
-            "url": "/api/v2/pokemon-species/740/"
-        },
-        {
-            "name": "cinderace",
-            "url": "/api/v2/pokemon-species/815/"
-        },
         {
             "name": "archaludon",
             "url": "/api/v2/pokemon-species/1018/"
diff --git a/data/api/v2/pokemon-shape/1/index.json b/data/api/v2/pokemon-shape/1/index.json
index 9930256195..7ed039650f 100644
--- a/data/api/v2/pokemon-shape/1/index.json
+++ b/data/api/v2/pokemon-shape/1/index.json
@@ -186,6 +186,10 @@
             "name": "rolycoly",
             "url": "/api/v2/pokemon-species/837/"
         },
+        {
+            "name": "cosmoem",
+            "url": "/api/v2/pokemon-species/790/"
+        },
         {
             "name": "sinistea",
             "url": "/api/v2/pokemon-species/854/"
@@ -233,10 +237,6 @@
         {
             "name": "sinistcha",
             "url": "/api/v2/pokemon-species/1013/"
-        },
-        {
-            "name": "cosmoem",
-            "url": "/api/v2/pokemon-species/790/"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/api/v2/pokemon-shape/10/index.json b/data/api/v2/pokemon-shape/10/index.json
index d6377c867f..2325dabaa1 100644
--- a/data/api/v2/pokemon-shape/10/index.json
+++ b/data/api/v2/pokemon-shape/10/index.json
@@ -70,6 +70,10 @@
             "name": "gigalith",
             "url": "/api/v2/pokemon-species/526/"
         },
+        {
+            "name": "frillish",
+            "url": "/api/v2/pokemon-species/592/"
+        },
         {
             "name": "jellicent",
             "url": "/api/v2/pokemon-species/593/"
@@ -78,10 +82,6 @@
             "name": "ferrothorn",
             "url": "/api/v2/pokemon-species/598/"
         },
-        {
-            "name": "frillish",
-            "url": "/api/v2/pokemon-species/592/"
-        },
         {
             "name": "inkay",
             "url": "/api/v2/pokemon-species/686/"
@@ -90,6 +90,10 @@
             "name": "trevenant",
             "url": "/api/v2/pokemon-species/709/"
         },
+        {
+            "name": "toxapex",
+            "url": "/api/v2/pokemon-species/748/"
+        },
         {
             "name": "wimpod",
             "url": "/api/v2/pokemon-species/767/"
@@ -125,10 +129,6 @@
         {
             "name": "toedscruel",
             "url": "/api/v2/pokemon-species/949/"
-        },
-        {
-            "name": "toxapex",
-            "url": "/api/v2/pokemon-species/748/"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/api/v2/pokemon-shape/11/index.json b/data/api/v2/pokemon-shape/11/index.json
index 579523f360..5922c66d2a 100644
--- a/data/api/v2/pokemon-shape/11/index.json
+++ b/data/api/v2/pokemon-shape/11/index.json
@@ -38,10 +38,6 @@
             "name": "dugtrio",
             "url": "/api/v2/pokemon-species/51/"
         },
-        {
-            "name": "klinklang",
-            "url": "/api/v2/pokemon-species/601/"
-        },
         {
             "name": "exeggcute",
             "url": "/api/v2/pokemon-species/102/"
@@ -66,10 +62,6 @@
             "name": "probopass",
             "url": "/api/v2/pokemon-species/476/"
         },
-        {
-            "name": "klang",
-            "url": "/api/v2/pokemon-species/600/"
-        },
         {
             "name": "klink",
             "url": "/api/v2/pokemon-species/599/"
@@ -78,10 +70,22 @@
             "name": "vanilluxe",
             "url": "/api/v2/pokemon-species/584/"
         },
+        {
+            "name": "klang",
+            "url": "/api/v2/pokemon-species/600/"
+        },
+        {
+            "name": "doublade",
+            "url": "/api/v2/pokemon-species/680/"
+        },
         {
             "name": "binacle",
             "url": "/api/v2/pokemon-species/688/"
         },
+        {
+            "name": "barbaracle",
+            "url": "/api/v2/pokemon-species/689/"
+        },
         {
             "name": "falinks",
             "url": "/api/v2/pokemon-species/870/"
@@ -99,12 +103,8 @@
             "url": "/api/v2/pokemon-species/376/"
         },
         {
-            "name": "doublade",
-            "url": "/api/v2/pokemon-species/680/"
-        },
-        {
-            "name": "barbaracle",
-            "url": "/api/v2/pokemon-species/689/"
+            "name": "klinklang",
+            "url": "/api/v2/pokemon-species/601/"
         },
         {
             "name": "dipplin",
diff --git a/data/api/v2/pokemon-shape/12/index.json b/data/api/v2/pokemon-shape/12/index.json
index 6ed09333ad..5ed1baeddd 100644
--- a/data/api/v2/pokemon-shape/12/index.json
+++ b/data/api/v2/pokemon-shape/12/index.json
@@ -218,10 +218,6 @@
             "name": "hariyama",
             "url": "/api/v2/pokemon-species/297/"
         },
-        {
-            "name": "beheeyem",
-            "url": "/api/v2/pokemon-species/606/"
-        },
         {
             "name": "sableye",
             "url": "/api/v2/pokemon-species/302/"
@@ -414,6 +410,10 @@
             "name": "gothitelle",
             "url": "/api/v2/pokemon-species/576/"
         },
+        {
+            "name": "beheeyem",
+            "url": "/api/v2/pokemon-species/606/"
+        },
         {
             "name": "golett",
             "url": "/api/v2/pokemon-species/622/"
@@ -446,10 +446,34 @@
             "name": "greninja",
             "url": "/api/v2/pokemon-species/658/"
         },
+        {
+            "name": "pangoro",
+            "url": "/api/v2/pokemon-species/675/"
+        },
+        {
+            "name": "aromatisse",
+            "url": "/api/v2/pokemon-species/683/"
+        },
+        {
+            "name": "slurpuff",
+            "url": "/api/v2/pokemon-species/685/"
+        },
         {
             "name": "hawlucha",
             "url": "/api/v2/pokemon-species/701/"
         },
+        {
+            "name": "lurantis",
+            "url": "/api/v2/pokemon-species/754/"
+        },
+        {
+            "name": "shiinotic",
+            "url": "/api/v2/pokemon-species/756/"
+        },
+        {
+            "name": "steenee",
+            "url": "/api/v2/pokemon-species/762/"
+        },
         {
             "name": "oranguru",
             "url": "/api/v2/pokemon-species/765/"
@@ -526,10 +550,6 @@
             "name": "morgrem",
             "url": "/api/v2/pokemon-species/860/"
         },
-        {
-            "name": "grimmsnarl",
-            "url": "/api/v2/pokemon-species/861/"
-        },
         {
             "name": "mr-rime",
             "url": "/api/v2/pokemon-species/866/"
@@ -610,34 +630,6 @@
             "name": "gurdurr",
             "url": "/api/v2/pokemon-species/533/"
         },
-        {
-            "name": "pangoro",
-            "url": "/api/v2/pokemon-species/675/"
-        },
-        {
-            "name": "aromatisse",
-            "url": "/api/v2/pokemon-species/683/"
-        },
-        {
-            "name": "slurpuff",
-            "url": "/api/v2/pokemon-species/685/"
-        },
-        {
-            "name": "gholdengo",
-            "url": "/api/v2/pokemon-species/1000/"
-        },
-        {
-            "name": "lurantis",
-            "url": "/api/v2/pokemon-species/754/"
-        },
-        {
-            "name": "shiinotic",
-            "url": "/api/v2/pokemon-species/756/"
-        },
-        {
-            "name": "steenee",
-            "url": "/api/v2/pokemon-species/762/"
-        },
         {
             "name": "tsareena",
             "url": "/api/v2/pokemon-species/763/"
@@ -646,6 +638,10 @@
             "name": "golisopod",
             "url": "/api/v2/pokemon-species/768/"
         },
+        {
+            "name": "grimmsnarl",
+            "url": "/api/v2/pokemon-species/861/"
+        },
         {
             "name": "lokix",
             "url": "/api/v2/pokemon-species/920/"
@@ -653,6 +649,10 @@
         {
             "name": "arboliva",
             "url": "/api/v2/pokemon-species/930/"
+        },
+        {
+            "name": "gholdengo",
+            "url": "/api/v2/pokemon-species/1000/"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/api/v2/pokemon-shape/13/index.json b/data/api/v2/pokemon-shape/13/index.json
index 9df5ba1d32..612835cae3 100644
--- a/data/api/v2/pokemon-shape/13/index.json
+++ b/data/api/v2/pokemon-shape/13/index.json
@@ -102,6 +102,10 @@
             "name": "volcarona",
             "url": "/api/v2/pokemon-species/637/"
         },
+        {
+            "name": "ribombee",
+            "url": "/api/v2/pokemon-species/743/"
+        },
         {
             "name": "frosmoth",
             "url": "/api/v2/pokemon-species/873/"
@@ -117,10 +121,6 @@
         {
             "name": "vivillon",
             "url": "/api/v2/pokemon-species/666/"
-        },
-        {
-            "name": "ribombee",
-            "url": "/api/v2/pokemon-species/743/"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/api/v2/pokemon-shape/14/index.json b/data/api/v2/pokemon-shape/14/index.json
index a948f5d69b..a1501ceea3 100644
--- a/data/api/v2/pokemon-shape/14/index.json
+++ b/data/api/v2/pokemon-shape/14/index.json
@@ -118,10 +118,6 @@
             "name": "drapion",
             "url": "/api/v2/pokemon-species/452/"
         },
-        {
-            "name": "galvantula",
-            "url": "/api/v2/pokemon-species/596/"
-        },
         {
             "name": "sewaddle",
             "url": "/api/v2/pokemon-species/540/"
@@ -146,6 +142,10 @@
             "name": "crustle",
             "url": "/api/v2/pokemon-species/558/"
         },
+        {
+            "name": "galvantula",
+            "url": "/api/v2/pokemon-species/596/"
+        },
         {
             "name": "durant",
             "url": "/api/v2/pokemon-species/632/"
@@ -174,6 +174,18 @@
             "name": "cutiefly",
             "url": "/api/v2/pokemon-species/742/"
         },
+        {
+            "name": "vikavolt",
+            "url": "/api/v2/pokemon-species/738/"
+        },
+        {
+            "name": "crabominable",
+            "url": "/api/v2/pokemon-species/740/"
+        },
+        {
+            "name": "araquanid",
+            "url": "/api/v2/pokemon-species/752/"
+        },
         {
             "name": "blipbug",
             "url": "/api/v2/pokemon-species/824/"
@@ -205,18 +217,6 @@
         {
             "name": "rabsca",
             "url": "/api/v2/pokemon-species/954/"
-        },
-        {
-            "name": "vikavolt",
-            "url": "/api/v2/pokemon-species/738/"
-        },
-        {
-            "name": "crabominable",
-            "url": "/api/v2/pokemon-species/740/"
-        },
-        {
-            "name": "araquanid",
-            "url": "/api/v2/pokemon-species/752/"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/api/v2/pokemon-shape/2/index.json b/data/api/v2/pokemon-shape/2/index.json
index 9db82da0ae..91d96d0982 100644
--- a/data/api/v2/pokemon-shape/2/index.json
+++ b/data/api/v2/pokemon-shape/2/index.json
@@ -126,10 +126,18 @@
             "name": "zygarde",
             "url": "/api/v2/pokemon-species/718/"
         },
+        {
+            "name": "clawitzer",
+            "url": "/api/v2/pokemon-species/693/"
+        },
         {
             "name": "sliggoo",
             "url": "/api/v2/pokemon-species/705/"
         },
+        {
+            "name": "charjabug",
+            "url": "/api/v2/pokemon-species/737/"
+        },
         {
             "name": "sandygast",
             "url": "/api/v2/pokemon-species/769/"
@@ -182,14 +190,6 @@
             "name": "gastrodon",
             "url": "/api/v2/pokemon-species/423/"
         },
-        {
-            "name": "clawitzer",
-            "url": "/api/v2/pokemon-species/693/"
-        },
-        {
-            "name": "charjabug",
-            "url": "/api/v2/pokemon-species/737/"
-        },
         {
             "name": "palossand",
             "url": "/api/v2/pokemon-species/770/"
diff --git a/data/api/v2/pokemon-shape/3/index.json b/data/api/v2/pokemon-shape/3/index.json
index 92fa926078..79df0cc7e4 100644
--- a/data/api/v2/pokemon-shape/3/index.json
+++ b/data/api/v2/pokemon-shape/3/index.json
@@ -58,10 +58,6 @@
             "name": "seaking",
             "url": "/api/v2/pokemon-species/119/"
         },
-        {
-            "name": "eelektrik",
-            "url": "/api/v2/pokemon-species/603/"
-        },
         {
             "name": "chinchou",
             "url": "/api/v2/pokemon-species/170/"
@@ -78,10 +74,6 @@
             "name": "lanturn",
             "url": "/api/v2/pokemon-species/171/"
         },
-        {
-            "name": "eelektross",
-            "url": "/api/v2/pokemon-species/604/"
-        },
         {
             "name": "carvanha",
             "url": "/api/v2/pokemon-species/318/"
@@ -154,6 +146,14 @@
             "name": "tynamo",
             "url": "/api/v2/pokemon-species/602/"
         },
+        {
+            "name": "eelektrik",
+            "url": "/api/v2/pokemon-species/603/"
+        },
+        {
+            "name": "eelektross",
+            "url": "/api/v2/pokemon-species/604/"
+        },
         {
             "name": "stunfisk",
             "url": "/api/v2/pokemon-species/618/"
@@ -166,10 +166,6 @@
             "name": "wishiwashi",
             "url": "/api/v2/pokemon-species/746/"
         },
-        {
-            "name": "brionne",
-            "url": "/api/v2/pokemon-species/729/"
-        },
         {
             "name": "primarina",
             "url": "/api/v2/pokemon-species/730/"
@@ -186,6 +182,10 @@
             "name": "arctovish",
             "url": "/api/v2/pokemon-species/883/"
         },
+        {
+            "name": "barraskewda",
+            "url": "/api/v2/pokemon-species/847/"
+        },
         {
             "name": "basculegion",
             "url": "/api/v2/pokemon-species/902/"
@@ -219,8 +219,8 @@
             "url": "/api/v2/pokemon-species/1004/"
         },
         {
-            "name": "barraskewda",
-            "url": "/api/v2/pokemon-species/847/"
+            "name": "brionne",
+            "url": "/api/v2/pokemon-species/729/"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/api/v2/pokemon-shape/4/index.json b/data/api/v2/pokemon-shape/4/index.json
index cf8ce339db..15e2a9c8cc 100644
--- a/data/api/v2/pokemon-shape/4/index.json
+++ b/data/api/v2/pokemon-shape/4/index.json
@@ -118,10 +118,6 @@
             "name": "froslass",
             "url": "/api/v2/pokemon-species/478/"
         },
-        {
-            "name": "amoonguss",
-            "url": "/api/v2/pokemon-species/591/"
-        },
         {
             "name": "yamask",
             "url": "/api/v2/pokemon-species/562/"
@@ -142,6 +138,14 @@
             "name": "escavalier",
             "url": "/api/v2/pokemon-species/589/"
         },
+        {
+            "name": "amoonguss",
+            "url": "/api/v2/pokemon-species/591/"
+        },
+        {
+            "name": "lampent",
+            "url": "/api/v2/pokemon-species/608/"
+        },
         {
             "name": "tornadus",
             "url": "/api/v2/pokemon-species/641/"
@@ -166,6 +170,14 @@
             "name": "accelgor",
             "url": "/api/v2/pokemon-species/617/"
         },
+        {
+            "name": "floette",
+            "url": "/api/v2/pokemon-species/670/"
+        },
+        {
+            "name": "florges",
+            "url": "/api/v2/pokemon-species/671/"
+        },
         {
             "name": "phantump",
             "url": "/api/v2/pokemon-species/708/"
@@ -210,21 +222,9 @@
             "name": "drakloak",
             "url": "/api/v2/pokemon-species/886/"
         },
-        {
-            "name": "lampent",
-            "url": "/api/v2/pokemon-species/608/"
-        },
         {
             "name": "chandelure",
             "url": "/api/v2/pokemon-species/609/"
-        },
-        {
-            "name": "floette",
-            "url": "/api/v2/pokemon-species/670/"
-        },
-        {
-            "name": "florges",
-            "url": "/api/v2/pokemon-species/671/"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/api/v2/pokemon-shape/5/index.json b/data/api/v2/pokemon-shape/5/index.json
index ae76dda6bb..951e49d862 100644
--- a/data/api/v2/pokemon-shape/5/index.json
+++ b/data/api/v2/pokemon-shape/5/index.json
@@ -118,10 +118,22 @@
             "name": "lilligant",
             "url": "/api/v2/pokemon-species/549/"
         },
+        {
+            "name": "vanillish",
+            "url": "/api/v2/pokemon-species/583/"
+        },
         {
             "name": "honedge",
             "url": "/api/v2/pokemon-species/679/"
         },
+        {
+            "name": "spewpa",
+            "url": "/api/v2/pokemon-species/665/"
+        },
+        {
+            "name": "aegislash",
+            "url": "/api/v2/pokemon-species/681/"
+        },
         {
             "name": "skrelp",
             "url": "/api/v2/pokemon-species/690/"
@@ -134,6 +146,10 @@
             "name": "morelull",
             "url": "/api/v2/pokemon-species/755/"
         },
+        {
+            "name": "dragalge",
+            "url": "/api/v2/pokemon-species/691/"
+        },
         {
             "name": "gourgeist",
             "url": "/api/v2/pokemon-species/711/"
@@ -178,25 +194,9 @@
             "name": "cofagrigus",
             "url": "/api/v2/pokemon-species/563/"
         },
-        {
-            "name": "vanillish",
-            "url": "/api/v2/pokemon-species/583/"
-        },
-        {
-            "name": "spewpa",
-            "url": "/api/v2/pokemon-species/665/"
-        },
-        {
-            "name": "aegislash",
-            "url": "/api/v2/pokemon-species/681/"
-        },
         {
             "name": "malamar",
             "url": "/api/v2/pokemon-species/687/"
-        },
-        {
-            "name": "dragalge",
-            "url": "/api/v2/pokemon-species/691/"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/api/v2/pokemon-shape/6/index.json b/data/api/v2/pokemon-shape/6/index.json
index aa8de678ed..64ff0d438d 100644
--- a/data/api/v2/pokemon-shape/6/index.json
+++ b/data/api/v2/pokemon-shape/6/index.json
@@ -595,12 +595,12 @@
             "url": "/api/v2/pokemon-species/677/"
         },
         {
-            "name": "haxorus",
-            "url": "/api/v2/pokemon-species/612/"
+            "name": "fraxure",
+            "url": "/api/v2/pokemon-species/611/"
         },
         {
-            "name": "mienshao",
-            "url": "/api/v2/pokemon-species/620/"
+            "name": "haxorus",
+            "url": "/api/v2/pokemon-species/612/"
         },
         {
             "name": "hydreigon",
@@ -626,6 +626,10 @@
             "name": "diggersby",
             "url": "/api/v2/pokemon-species/660/"
         },
+        {
+            "name": "meowstic",
+            "url": "/api/v2/pokemon-species/678/"
+        },
         {
             "name": "helioptile",
             "url": "/api/v2/pokemon-species/694/"
@@ -642,6 +646,10 @@
             "name": "fomantis",
             "url": "/api/v2/pokemon-species/753/"
         },
+        {
+            "name": "heliolisk",
+            "url": "/api/v2/pokemon-species/695/"
+        },
         {
             "name": "goodra",
             "url": "/api/v2/pokemon-species/706/"
@@ -650,6 +658,10 @@
             "name": "incineroar",
             "url": "/api/v2/pokemon-species/727/"
         },
+        {
+            "name": "bewear",
+            "url": "/api/v2/pokemon-species/760/"
+        },
         {
             "name": "passimian",
             "url": "/api/v2/pokemon-species/766/"
@@ -686,6 +698,14 @@
             "name": "skwovet",
             "url": "/api/v2/pokemon-species/819/"
         },
+        {
+            "name": "hakamo-o",
+            "url": "/api/v2/pokemon-species/783/"
+        },
+        {
+            "name": "kommo-o",
+            "url": "/api/v2/pokemon-species/784/"
+        },
         {
             "name": "thwackey",
             "url": "/api/v2/pokemon-species/811/"
@@ -694,6 +714,14 @@
             "name": "raboot",
             "url": "/api/v2/pokemon-species/814/"
         },
+        {
+            "name": "cinderace",
+            "url": "/api/v2/pokemon-species/815/"
+        },
+        {
+            "name": "drizzile",
+            "url": "/api/v2/pokemon-species/817/"
+        },
         {
             "name": "inteleon",
             "url": "/api/v2/pokemon-species/818/"
@@ -851,49 +879,21 @@
             "url": "/api/v2/pokemon-species/391/"
         },
         {
-            "name": "fraxure",
-            "url": "/api/v2/pokemon-species/611/"
-        },
-        {
-            "name": "meowstic",
-            "url": "/api/v2/pokemon-species/678/"
-        },
-        {
-            "name": "heliolisk",
-            "url": "/api/v2/pokemon-species/695/"
+            "name": "mienshao",
+            "url": "/api/v2/pokemon-species/620/"
         },
         {
             "name": "tyrantrum",
             "url": "/api/v2/pokemon-species/697/"
         },
-        {
-            "name": "baxcalibur",
-            "url": "/api/v2/pokemon-species/998/"
-        },
-        {
-            "name": "bewear",
-            "url": "/api/v2/pokemon-species/760/"
-        },
-        {
-            "name": "hakamo-o",
-            "url": "/api/v2/pokemon-species/783/"
-        },
-        {
-            "name": "kommo-o",
-            "url": "/api/v2/pokemon-species/784/"
-        },
-        {
-            "name": "cinderace",
-            "url": "/api/v2/pokemon-species/815/"
-        },
-        {
-            "name": "drizzile",
-            "url": "/api/v2/pokemon-species/817/"
-        },
         {
             "name": "arctibax",
             "url": "/api/v2/pokemon-species/997/"
         },
+        {
+            "name": "baxcalibur",
+            "url": "/api/v2/pokemon-species/998/"
+        },
         {
             "name": "archaludon",
             "url": "/api/v2/pokemon-species/1018/"
diff --git a/data/api/v2/pokemon-shape/8/index.json b/data/api/v2/pokemon-shape/8/index.json
index 017ba756ad..6c716f930d 100644
--- a/data/api/v2/pokemon-shape/8/index.json
+++ b/data/api/v2/pokemon-shape/8/index.json
@@ -518,6 +518,14 @@
             "name": "zweilous",
             "url": "/api/v2/pokemon-species/634/"
         },
+        {
+            "name": "pyroar",
+            "url": "/api/v2/pokemon-species/668/"
+        },
+        {
+            "name": "gogoat",
+            "url": "/api/v2/pokemon-species/673/"
+        },
         {
             "name": "amaura",
             "url": "/api/v2/pokemon-species/698/"
@@ -558,6 +566,10 @@
             "name": "stufful",
             "url": "/api/v2/pokemon-species/759/"
         },
+        {
+            "name": "aurorus",
+            "url": "/api/v2/pokemon-species/699/"
+        },
         {
             "name": "sylveon",
             "url": "/api/v2/pokemon-species/700/"
@@ -574,6 +586,18 @@
             "name": "gumshoos",
             "url": "/api/v2/pokemon-species/735/"
         },
+        {
+            "name": "lycanroc",
+            "url": "/api/v2/pokemon-species/745/"
+        },
+        {
+            "name": "mudsdale",
+            "url": "/api/v2/pokemon-species/750/"
+        },
+        {
+            "name": "salazzle",
+            "url": "/api/v2/pokemon-species/758/"
+        },
         {
             "name": "type-null",
             "url": "/api/v2/pokemon-species/772/"
@@ -606,6 +630,10 @@
             "name": "yamper",
             "url": "/api/v2/pokemon-species/835/"
         },
+        {
+            "name": "silvally",
+            "url": "/api/v2/pokemon-species/773/"
+        },
         {
             "name": "solgaleo",
             "url": "/api/v2/pokemon-species/791/"
@@ -798,34 +826,6 @@
             "name": "herdier",
             "url": "/api/v2/pokemon-species/507/"
         },
-        {
-            "name": "pyroar",
-            "url": "/api/v2/pokemon-species/668/"
-        },
-        {
-            "name": "gogoat",
-            "url": "/api/v2/pokemon-species/673/"
-        },
-        {
-            "name": "aurorus",
-            "url": "/api/v2/pokemon-species/699/"
-        },
-        {
-            "name": "lycanroc",
-            "url": "/api/v2/pokemon-species/745/"
-        },
-        {
-            "name": "mudsdale",
-            "url": "/api/v2/pokemon-species/750/"
-        },
-        {
-            "name": "salazzle",
-            "url": "/api/v2/pokemon-species/758/"
-        },
-        {
-            "name": "silvally",
-            "url": "/api/v2/pokemon-species/773/"
-        },
         {
             "name": "appletun",
             "url": "/api/v2/pokemon-species/842/"
diff --git a/data/api/v2/pokemon-shape/9/index.json b/data/api/v2/pokemon-shape/9/index.json
index 454b7a3db4..0a920dac4f 100644
--- a/data/api/v2/pokemon-shape/9/index.json
+++ b/data/api/v2/pokemon-shape/9/index.json
@@ -254,10 +254,22 @@
             "name": "fletchling",
             "url": "/api/v2/pokemon-species/661/"
         },
+        {
+            "name": "braviary",
+            "url": "/api/v2/pokemon-species/628/"
+        },
         {
             "name": "mandibuzz",
             "url": "/api/v2/pokemon-species/630/"
         },
+        {
+            "name": "fletchinder",
+            "url": "/api/v2/pokemon-species/662/"
+        },
+        {
+            "name": "talonflame",
+            "url": "/api/v2/pokemon-species/663/"
+        },
         {
             "name": "noibat",
             "url": "/api/v2/pokemon-species/714/"
@@ -318,10 +330,6 @@
             "name": "corviknight",
             "url": "/api/v2/pokemon-species/823/"
         },
-        {
-            "name": "orbeetle",
-            "url": "/api/v2/pokemon-species/826/"
-        },
         {
             "name": "flapple",
             "url": "/api/v2/pokemon-species/841/"
@@ -371,16 +379,8 @@
             "url": "/api/v2/pokemon-species/226/"
         },
         {
-            "name": "braviary",
-            "url": "/api/v2/pokemon-species/628/"
-        },
-        {
-            "name": "fletchinder",
-            "url": "/api/v2/pokemon-species/662/"
-        },
-        {
-            "name": "talonflame",
-            "url": "/api/v2/pokemon-species/663/"
+            "name": "orbeetle",
+            "url": "/api/v2/pokemon-species/826/"
         }
     ]
 }
\ No newline at end of file
diff --git a/data/api/v2/pokemon/100/encounters/index.json b/data/api/v2/pokemon/100/encounters/index.json
index 54b38553a4..6c0181aaff 100644
--- a/data/api/v2/pokemon/100/encounters/index.json
+++ b/data/api/v2/pokemon/100/encounters/index.json
@@ -124,6 +124,86 @@
             }
         ]
     },
+    {
+        "location_area": {
+            "name": "olivine-city-area",
+            "url": "/api/v2/location-area/224/"
+        },
+        "version_details": [
+            {
+                "encounter_details": [
+                    {
+                        "chance": 100,
+                        "condition_values": [
+                            {
+                                "name": "trade-krabby",
+                                "url": "/api/v2/encounter-condition-value/163/"
+                            }
+                        ],
+                        "max_level": 100,
+                        "method": {
+                            "name": "npc-trade",
+                            "url": "/api/v2/encounter-method/36/"
+                        },
+                        "min_level": 5
+                    }
+                ],
+                "max_chance": 100,
+                "version": {
+                    "name": "gold",
+                    "url": "/api/v2/version/4/"
+                }
+            },
+            {
+                "encounter_details": [
+                    {
+                        "chance": 100,
+                        "condition_values": [
+                            {
+                                "name": "trade-krabby",
+                                "url": "/api/v2/encounter-condition-value/163/"
+                            }
+                        ],
+                        "max_level": 100,
+                        "method": {
+                            "name": "npc-trade",
+                            "url": "/api/v2/encounter-method/36/"
+                        },
+                        "min_level": 5
+                    }
+                ],
+                "max_chance": 100,
+                "version": {
+                    "name": "silver",
+                    "url": "/api/v2/version/5/"
+                }
+            },
+            {
+                "encounter_details": [
+                    {
+                        "chance": 100,
+                        "condition_values": [
+                            {
+                                "name": "trade-krabby",
+                                "url": "/api/v2/encounter-condition-value/163/"
+                            }
+                        ],
+                        "max_level": 100,
+                        "method": {
+                            "name": "npc-trade",
+                            "url": "/api/v2/encounter-method/36/"
+                        },
+                        "min_level": 5
+                    }
+                ],
+                "max_chance": 100,
+                "version": {
+                    "name": "crystal",
+                    "url": "/api/v2/version/6/"
+                }
+            }
+        ]
+    },
     {
         "location_area": {
             "name": "kanto-route-10-area",
@@ -638,7 +718,7 @@
     },
     {
         "location_area": {
-            "name": "power-plant-area",
+            "name": "kanto-power-plant-area",
             "url": "/api/v2/location-area/330/"
         },
         "version_details": [
diff --git a/data/api/v2/pokemon/101/encounters/index.json b/data/api/v2/pokemon/101/encounters/index.json
index c937c34f3b..c1d15ed087 100644
--- a/data/api/v2/pokemon/101/encounters/index.json
+++ b/data/api/v2/pokemon/101/encounters/index.json
@@ -405,7 +405,7 @@
     },
     {
         "location_area": {
-            "name": "power-plant-area",
+            "name": "kanto-power-plant-area",
             "url": "/api/v2/location-area/330/"
         },
         "version_details": [
diff --git a/data/api/v2/pokemon/109/encounters/index.json b/data/api/v2/pokemon/109/encounters/index.json
index e0b8688c9c..72bcfd07f7 100644
--- a/data/api/v2/pokemon/109/encounters/index.json
+++ b/data/api/v2/pokemon/109/encounters/index.json
@@ -660,7 +660,7 @@
     },
     {
         "location_area": {
-            "name": "power-plant-area",
+            "name": "kanto-power-plant-area",
             "url": "/api/v2/location-area/330/"
         },
         "version_details": [
diff --git a/data/api/v2/pokemon/110/encounters/index.json b/data/api/v2/pokemon/110/encounters/index.json
index 9b4548ed27..3b324726c2 100644
--- a/data/api/v2/pokemon/110/encounters/index.json
+++ b/data/api/v2/pokemon/110/encounters/index.json
@@ -338,7 +338,7 @@
     },
     {
         "location_area": {
-            "name": "power-plant-area",
+            "name": "kanto-power-plant-area",
             "url": "/api/v2/location-area/330/"
         },
         "version_details": [
diff --git a/data/api/v2/pokemon/112/encounters/index.json b/data/api/v2/pokemon/112/encounters/index.json
index 04c7e083b7..439b9d81c0 100644
--- a/data/api/v2/pokemon/112/encounters/index.json
+++ b/data/api/v2/pokemon/112/encounters/index.json
@@ -400,6 +400,62 @@
             }
         ]
     },
+    {
+        "location_area": {
+            "name": "blackthorn-city-area",
+            "url": "/api/v2/location-area/249/"
+        },
+        "version_details": [
+            {
+                "encounter_details": [
+                    {
+                        "chance": 100,
+                        "condition_values": [
+                            {
+                                "name": "trade-dragonair",
+                                "url": "/api/v2/encounter-condition-value/164/"
+                            }
+                        ],
+                        "max_level": 100,
+                        "method": {
+                            "name": "npc-trade",
+                            "url": "/api/v2/encounter-method/36/"
+                        },
+                        "min_level": 30
+                    }
+                ],
+                "max_chance": 100,
+                "version": {
+                    "name": "gold",
+                    "url": "/api/v2/version/4/"
+                }
+            },
+            {
+                "encounter_details": [
+                    {
+                        "chance": 100,
+                        "condition_values": [
+                            {
+                                "name": "trade-dragonair",
+                                "url": "/api/v2/encounter-condition-value/164/"
+                            }
+                        ],
+                        "max_level": 100,
+                        "method": {
+                            "name": "npc-trade",
+                            "url": "/api/v2/encounter-method/36/"
+                        },
+                        "min_level": 30
+                    }
+                ],
+                "max_chance": 100,
+                "version": {
+                    "name": "silver",
+                    "url": "/api/v2/version/5/"
+                }
+            }
+        ]
+    },
     {
         "location_area": {
             "name": "kanto-victory-road-1-1f",
diff --git a/data/api/v2/pokemon/113/encounters/index.json b/data/api/v2/pokemon/113/encounters/index.json
index 9a053afb6a..d61779a8ff 100644
--- a/data/api/v2/pokemon/113/encounters/index.json
+++ b/data/api/v2/pokemon/113/encounters/index.json
@@ -2356,7 +2356,7 @@
     },
     {
         "location_area": {
-            "name": "power-plant-area",
+            "name": "kanto-power-plant-area",
             "url": "/api/v2/location-area/330/"
         },
         "version_details": [
diff --git a/data/api/v2/pokemon/125/encounters/index.json b/data/api/v2/pokemon/125/encounters/index.json
index b3397e319a..52904188a3 100644
--- a/data/api/v2/pokemon/125/encounters/index.json
+++ b/data/api/v2/pokemon/125/encounters/index.json
@@ -516,7 +516,7 @@
     },
     {
         "location_area": {
-            "name": "power-plant-area",
+            "name": "kanto-power-plant-area",
             "url": "/api/v2/location-area/330/"
         },
         "version_details": [
diff --git a/data/api/v2/pokemon/142/encounters/index.json b/data/api/v2/pokemon/142/encounters/index.json
index 6b089d283d..7b7ba27172 100644
--- a/data/api/v2/pokemon/142/encounters/index.json
+++ b/data/api/v2/pokemon/142/encounters/index.json
@@ -1,4 +1,84 @@
 [
+    {
+        "location_area": {
+            "name": "kanto-route-14-area",
+            "url": "/api/v2/location-area/307/"
+        },
+        "version_details": [
+            {
+                "encounter_details": [
+                    {
+                        "chance": 100,
+                        "condition_values": [
+                            {
+                                "name": "trade-chansey",
+                                "url": "/api/v2/encounter-condition-value/165/"
+                            }
+                        ],
+                        "max_level": 100,
+                        "method": {
+                            "name": "npc-trade",
+                            "url": "/api/v2/encounter-method/36/"
+                        },
+                        "min_level": 5
+                    }
+                ],
+                "max_chance": 100,
+                "version": {
+                    "name": "gold",
+                    "url": "/api/v2/version/4/"
+                }
+            },
+            {
+                "encounter_details": [
+                    {
+                        "chance": 100,
+                        "condition_values": [
+                            {
+                                "name": "trade-chansey",
+                                "url": "/api/v2/encounter-condition-value/165/"
+                            }
+                        ],
+                        "max_level": 100,
+                        "method": {
+                            "name": "npc-trade",
+                            "url": "/api/v2/encounter-method/36/"
+                        },
+                        "min_level": 5
+                    }
+                ],
+                "max_chance": 100,
+                "version": {
+                    "name": "silver",
+                    "url": "/api/v2/version/5/"
+                }
+            },
+            {
+                "encounter_details": [
+                    {
+                        "chance": 100,
+                        "condition_values": [
+                            {
+                                "name": "trade-chansey",
+                                "url": "/api/v2/encounter-condition-value/165/"
+                            }
+                        ],
+                        "max_level": 100,
+                        "method": {
+                            "name": "npc-trade",
+                            "url": "/api/v2/encounter-method/36/"
+                        },
+                        "min_level": 5
+                    }
+                ],
+                "max_chance": 100,
+                "version": {
+                    "name": "crystal",
+                    "url": "/api/v2/version/6/"
+                }
+            }
+        ]
+    },
     {
         "location_area": {
             "name": "cinnabar-island-cinnabar-lab",
diff --git a/data/api/v2/pokemon/145/encounters/index.json b/data/api/v2/pokemon/145/encounters/index.json
index c7b627bc86..a09d10a9fd 100644
--- a/data/api/v2/pokemon/145/encounters/index.json
+++ b/data/api/v2/pokemon/145/encounters/index.json
@@ -1439,7 +1439,7 @@
     },
     {
         "location_area": {
-            "name": "power-plant-area",
+            "name": "kanto-power-plant-area",
             "url": "/api/v2/location-area/330/"
         },
         "version_details": [
diff --git a/data/api/v2/pokemon/178/encounters/index.json b/data/api/v2/pokemon/178/encounters/index.json
index 71c0dfa0a9..082d481603 100644
--- a/data/api/v2/pokemon/178/encounters/index.json
+++ b/data/api/v2/pokemon/178/encounters/index.json
@@ -140,6 +140,38 @@
             }
         ]
     },
+    {
+        "location_area": {
+            "name": "pewter-city-area",
+            "url": "/api/v2/location-area/1200/"
+        },
+        "version_details": [
+            {
+                "encounter_details": [
+                    {
+                        "chance": 100,
+                        "condition_values": [
+                            {
+                                "name": "trade-haunter",
+                                "url": "/api/v2/encounter-condition-value/167/"
+                            }
+                        ],
+                        "max_level": 100,
+                        "method": {
+                            "name": "npc-trade",
+                            "url": "/api/v2/encounter-method/36/"
+                        },
+                        "min_level": 15
+                    }
+                ],
+                "max_chance": 100,
+                "version": {
+                    "name": "crystal",
+                    "url": "/api/v2/version/6/"
+                }
+            }
+        ]
+    },
     {
         "location_area": {
             "name": "mirage-spot-island-west-of-dewford-town",
diff --git a/data/api/v2/pokemon/25/encounters/index.json b/data/api/v2/pokemon/25/encounters/index.json
index c696deac47..f8d7cca13c 100644
--- a/data/api/v2/pokemon/25/encounters/index.json
+++ b/data/api/v2/pokemon/25/encounters/index.json
@@ -785,7 +785,7 @@
     },
     {
         "location_area": {
-            "name": "power-plant-area",
+            "name": "kanto-power-plant-area",
             "url": "/api/v2/location-area/330/"
         },
         "version_details": [
diff --git a/data/api/v2/pokemon/26/encounters/index.json b/data/api/v2/pokemon/26/encounters/index.json
index 48d9151de4..9f21579184 100644
--- a/data/api/v2/pokemon/26/encounters/index.json
+++ b/data/api/v2/pokemon/26/encounters/index.json
@@ -169,7 +169,7 @@
     },
     {
         "location_area": {
-            "name": "power-plant-area",
+            "name": "kanto-power-plant-area",
             "url": "/api/v2/location-area/330/"
         },
         "version_details": [
diff --git a/data/api/v2/pokemon/66/encounters/index.json b/data/api/v2/pokemon/66/encounters/index.json
index a3e1cc69e8..e991bbddcd 100644
--- a/data/api/v2/pokemon/66/encounters/index.json
+++ b/data/api/v2/pokemon/66/encounters/index.json
@@ -4136,5 +4136,85 @@
                 }
             }
         ]
+    },
+    {
+        "location_area": {
+            "name": "goldenrod-city-department-store-5f",
+            "url": "/api/v2/location-area/1304/"
+        },
+        "version_details": [
+            {
+                "encounter_details": [
+                    {
+                        "chance": 100,
+                        "condition_values": [
+                            {
+                                "name": "trade-drowzee",
+                                "url": "/api/v2/encounter-condition-value/162/"
+                            }
+                        ],
+                        "max_level": 100,
+                        "method": {
+                            "name": "npc-trade",
+                            "url": "/api/v2/encounter-method/36/"
+                        },
+                        "min_level": 5
+                    }
+                ],
+                "max_chance": 100,
+                "version": {
+                    "name": "gold",
+                    "url": "/api/v2/version/4/"
+                }
+            },
+            {
+                "encounter_details": [
+                    {
+                        "chance": 100,
+                        "condition_values": [
+                            {
+                                "name": "trade-drowzee",
+                                "url": "/api/v2/encounter-condition-value/162/"
+                            }
+                        ],
+                        "max_level": 100,
+                        "method": {
+                            "name": "npc-trade",
+                            "url": "/api/v2/encounter-method/36/"
+                        },
+                        "min_level": 5
+                    }
+                ],
+                "max_chance": 100,
+                "version": {
+                    "name": "silver",
+                    "url": "/api/v2/version/5/"
+                }
+            },
+            {
+                "encounter_details": [
+                    {
+                        "chance": 100,
+                        "condition_values": [
+                            {
+                                "name": "trade-abra",
+                                "url": "/api/v2/encounter-condition-value/145/"
+                            }
+                        ],
+                        "max_level": 100,
+                        "method": {
+                            "name": "npc-trade",
+                            "url": "/api/v2/encounter-method/36/"
+                        },
+                        "min_level": 5
+                    }
+                ],
+                "max_chance": 100,
+                "version": {
+                    "name": "crystal",
+                    "url": "/api/v2/version/6/"
+                }
+            }
+        ]
     }
 ]
\ No newline at end of file
diff --git a/data/api/v2/pokemon/78/encounters/index.json b/data/api/v2/pokemon/78/encounters/index.json
index ac0002f169..7f5ef35667 100644
--- a/data/api/v2/pokemon/78/encounters/index.json
+++ b/data/api/v2/pokemon/78/encounters/index.json
@@ -929,6 +929,62 @@
             }
         ]
     },
+    {
+        "location_area": {
+            "name": "pewter-city-area",
+            "url": "/api/v2/location-area/1200/"
+        },
+        "version_details": [
+            {
+                "encounter_details": [
+                    {
+                        "chance": 100,
+                        "condition_values": [
+                            {
+                                "name": "trade-gloom",
+                                "url": "/api/v2/encounter-condition-value/166/"
+                            }
+                        ],
+                        "max_level": 100,
+                        "method": {
+                            "name": "npc-trade",
+                            "url": "/api/v2/encounter-method/36/"
+                        },
+                        "min_level": 15
+                    }
+                ],
+                "max_chance": 100,
+                "version": {
+                    "name": "gold",
+                    "url": "/api/v2/version/4/"
+                }
+            },
+            {
+                "encounter_details": [
+                    {
+                        "chance": 100,
+                        "condition_values": [
+                            {
+                                "name": "trade-gloom",
+                                "url": "/api/v2/encounter-condition-value/166/"
+                            }
+                        ],
+                        "max_level": 100,
+                        "method": {
+                            "name": "npc-trade",
+                            "url": "/api/v2/encounter-method/36/"
+                        },
+                        "min_level": 15
+                    }
+                ],
+                "max_chance": 100,
+                "version": {
+                    "name": "silver",
+                    "url": "/api/v2/version/5/"
+                }
+            }
+        ]
+    },
     {
         "location_area": {
             "name": "citadark-isle-3f",
diff --git a/data/api/v2/pokemon/81/encounters/index.json b/data/api/v2/pokemon/81/encounters/index.json
index 9432e65c0e..5fdf5e1d7f 100644
--- a/data/api/v2/pokemon/81/encounters/index.json
+++ b/data/api/v2/pokemon/81/encounters/index.json
@@ -1171,7 +1171,7 @@
     },
     {
         "location_area": {
-            "name": "power-plant-area",
+            "name": "kanto-power-plant-area",
             "url": "/api/v2/location-area/330/"
         },
         "version_details": [
diff --git a/data/api/v2/pokemon/82/encounters/index.json b/data/api/v2/pokemon/82/encounters/index.json
index 71d6116117..d9bae0fb8b 100644
--- a/data/api/v2/pokemon/82/encounters/index.json
+++ b/data/api/v2/pokemon/82/encounters/index.json
@@ -518,7 +518,7 @@
     },
     {
         "location_area": {
-            "name": "power-plant-area",
+            "name": "kanto-power-plant-area",
             "url": "/api/v2/location-area/330/"
         },
         "version_details": [
@@ -609,6 +609,30 @@
                     "url": "/api/v2/version/3/"
                 }
             },
+            {
+                "encounter_details": [
+                    {
+                        "chance": 100,
+                        "condition_values": [
+                            {
+                                "name": "trade-dugtrio",
+                                "url": "/api/v2/encounter-condition-value/168/"
+                            }
+                        ],
+                        "max_level": 100,
+                        "method": {
+                            "name": "npc-trade",
+                            "url": "/api/v2/encounter-method/36/"
+                        },
+                        "min_level": 16
+                    }
+                ],
+                "max_chance": 100,
+                "version": {
+                    "name": "crystal",
+                    "url": "/api/v2/version/6/"
+                }
+            },
             {
                 "encounter_details": [
                     {
diff --git a/data/api/v2/pokemon/85/encounters/index.json b/data/api/v2/pokemon/85/encounters/index.json
index c7d0b25cfb..14c5589fd3 100644
--- a/data/api/v2/pokemon/85/encounters/index.json
+++ b/data/api/v2/pokemon/85/encounters/index.json
@@ -1,4 +1,36 @@
 [
+    {
+        "location_area": {
+            "name": "blackthorn-city-area",
+            "url": "/api/v2/location-area/249/"
+        },
+        "version_details": [
+            {
+                "encounter_details": [
+                    {
+                        "chance": 100,
+                        "condition_values": [
+                            {
+                                "name": "trade-dragonair",
+                                "url": "/api/v2/encounter-condition-value/164/"
+                            }
+                        ],
+                        "max_level": 100,
+                        "method": {
+                            "name": "npc-trade",
+                            "url": "/api/v2/encounter-method/36/"
+                        },
+                        "min_level": 30
+                    }
+                ],
+                "max_chance": 100,
+                "version": {
+                    "name": "crystal",
+                    "url": "/api/v2/version/6/"
+                }
+            }
+        ]
+    },
     {
         "location_area": {
             "name": "mt-silver-outside",
diff --git a/data/api/v2/pokemon/88/encounters/index.json b/data/api/v2/pokemon/88/encounters/index.json
index 867068b4ab..337ae9fd72 100644
--- a/data/api/v2/pokemon/88/encounters/index.json
+++ b/data/api/v2/pokemon/88/encounters/index.json
@@ -2161,7 +2161,7 @@
     },
     {
         "location_area": {
-            "name": "power-plant-area",
+            "name": "kanto-power-plant-area",
             "url": "/api/v2/location-area/330/"
         },
         "version_details": [
diff --git a/data/api/v2/pokemon/89/encounters/index.json b/data/api/v2/pokemon/89/encounters/index.json
index f36df019f8..261bb88cf4 100644
--- a/data/api/v2/pokemon/89/encounters/index.json
+++ b/data/api/v2/pokemon/89/encounters/index.json
@@ -1383,7 +1383,7 @@
     },
     {
         "location_area": {
-            "name": "power-plant-area",
+            "name": "kanto-power-plant-area",
             "url": "/api/v2/location-area/330/"
         },
         "version_details": [
diff --git a/data/api/v2/pokemon/95/encounters/index.json b/data/api/v2/pokemon/95/encounters/index.json
index 0718536a61..a7e271ca0c 100644
--- a/data/api/v2/pokemon/95/encounters/index.json
+++ b/data/api/v2/pokemon/95/encounters/index.json
@@ -6701,5 +6701,85 @@
                 }
             }
         ]
+    },
+    {
+        "location_area": {
+            "name": "violet-city-southwest-house",
+            "url": "/api/v2/location-area/1303/"
+        },
+        "version_details": [
+            {
+                "encounter_details": [
+                    {
+                        "chance": 100,
+                        "condition_values": [
+                            {
+                                "name": "trade-bellsprout",
+                                "url": "/api/v2/encounter-condition-value/161/"
+                            }
+                        ],
+                        "max_level": 100,
+                        "method": {
+                            "name": "npc-trade",
+                            "url": "/api/v2/encounter-method/36/"
+                        },
+                        "min_level": 3
+                    }
+                ],
+                "max_chance": 100,
+                "version": {
+                    "name": "gold",
+                    "url": "/api/v2/version/4/"
+                }
+            },
+            {
+                "encounter_details": [
+                    {
+                        "chance": 100,
+                        "condition_values": [
+                            {
+                                "name": "trade-bellsprout",
+                                "url": "/api/v2/encounter-condition-value/161/"
+                            }
+                        ],
+                        "max_level": 100,
+                        "method": {
+                            "name": "npc-trade",
+                            "url": "/api/v2/encounter-method/36/"
+                        },
+                        "min_level": 3
+                    }
+                ],
+                "max_chance": 100,
+                "version": {
+                    "name": "silver",
+                    "url": "/api/v2/version/5/"
+                }
+            },
+            {
+                "encounter_details": [
+                    {
+                        "chance": 100,
+                        "condition_values": [
+                            {
+                                "name": "trade-bellsprout",
+                                "url": "/api/v2/encounter-condition-value/161/"
+                            }
+                        ],
+                        "max_level": 100,
+                        "method": {
+                            "name": "npc-trade",
+                            "url": "/api/v2/encounter-method/36/"
+                        },
+                        "min_level": 5
+                    }
+                ],
+                "max_chance": 100,
+                "version": {
+                    "name": "crystal",
+                    "url": "/api/v2/version/6/"
+                }
+            }
+        ]
     }
 ]
\ No newline at end of file
diff --git a/data/api/v2/region/1/index.json b/data/api/v2/region/1/index.json
index ed97a3ee20..47f6d329de 100644
--- a/data/api/v2/region/1/index.json
+++ b/data/api/v2/region/1/index.json
@@ -170,7 +170,7 @@
             "url": "/api/v2/location/157/"
         },
         {
-            "name": "power-plant",
+            "name": "kanto-power-plant",
             "url": "/api/v2/location/158/"
         },
         {