Merge pull request #5977 from PokemonGoF/dev

Dev to master
PokemonGoF · Mar 23, 2017 · 8e4165b · 8e4165b
2 parents bd5d340 + ef4389a
commit 8e4165b
Showing 1 changed file with 25 additions and 4 deletions.
diff --git a/data/pokemon.json b/data/pokemon.json
@@ -4010,7 +4010,8 @@
     ],
     "Fast Attack(s)": [
       "Poison Jab",
-      "Mud Slap"
+      "Mud Slap",
+      "Acid"
     ],
     "Weight": "30 kg",
     "Height": "0,9 m",
@@ -4806,6 +4807,12 @@
       "Name": "Tyrogue candies",
       "FamilyID": 236
     },
+    "Previous evolution(s)": [
+      {
+        "Number": "236",
+        "Name": "Tyrogue"
+      }
+    ],
     "Special Attack(s)": [
       "Close Combat",
       "Low Sweep",
@@ -4841,6 +4848,12 @@
       "Name": "Tyrogue candies",
       "FamilyID": 236
     },
+    "Previous evolution(s)": [
+      {
+        "Number": "236",
+        "Name": "Tyrogue"
+      }
+    ],
     "Special Attack(s)": [
       "Fire Punch",
       "Ice Punch",
@@ -4898,9 +4911,9 @@
       "DataNotInGameMaster"
     ],
     "Fast Attack(s)": [
-      "Acid",
       "Tackle",
-      "Infestation"
+      "Infestation",
+      "Acid"
     ],
     "Weight": "1 kg",
     "Height": "0,6 m",
@@ -10245,6 +10258,14 @@
       "Name": "Tyrogue candies"
     },
     "Next evolution(s)": [
+      {
+        "Number": "106",
+        "Name": "Hitmonlee"
+      },
+      {
+        "Number": "107",
+        "Name": "Hitmonchan"
+      },
       {
         "Number": "237",
         "Name": "Hitmontop"
@@ -10877,4 +10898,4 @@
     "FleeRate": 0.04,
     "BuddyDistanceNeeded": 5
   }
-]
+]