Merge pull request #5926 from PokemonGoF/dev

Dev merge to master
PokemonGoF · Feb 21, 2017 · e00e8db · e00e8db
2 parents 26117e6 + 153071a
commit e00e8db
Show file tree

Hide file tree

Showing 9 changed files with 13,378 additions and 12,022 deletions.
diff --git a/data/charged_moves.json b/data/charged_moves.json
diff --git a/data/fast_moves.json b/data/fast_moves.json
diff --git a/data/items.json b/data/items.json
@@ -39,5 +39,11 @@
     "902": "Incubator",
 
     "1001": "Pokemon Storage Upgrade",
-    "1002": "Item Storage Upgrade"
+    "1002": "Item Storage Upgrade",
+
+	"1101": "Sun Stone",
+	"1102": "Kings Rock",
+	"1103": "Metal Coat",
+	"1104": "Dragon Scale",
+	"1105": "Upgrade"
 }