diff --git a/.gitignore b/.gitignore
index 17eec32d5..4871a1ab7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,5 @@ obj/
*.user
*.tss
/PokemonGo-UWP/BundleArtifacts
+/PokemonGoAPI/Proto - kopie
+/pokehash keys.txt
diff --git a/PokemonGo-UWP/App.xaml b/PokemonGo-UWP/App.xaml
index 7a2fe5464..0980d4181 100644
--- a/PokemonGo-UWP/App.xaml
+++ b/PokemonGo-UWP/App.xaml
@@ -15,9 +15,19 @@
+
+
+
+
+
+
+
+
+
+
@@ -57,6 +67,7 @@
+
diff --git a/PokemonGo-UWP/App.xaml.cs b/PokemonGo-UWP/App.xaml.cs
index f958797a5..1b613d2a4 100644
--- a/PokemonGo-UWP/App.xaml.cs
+++ b/PokemonGo-UWP/App.xaml.cs
@@ -327,6 +327,15 @@ public override async Task OnStartAsync(StartKind startKind, IActivatedEventArgs
AsyncSynchronizationContext.Register();
+
+ // See if there is a key for the PokeHash server, ask one from the user if there isn't
+ if (String.IsNullOrEmpty(SettingsService.Instance.PokehashAuthKey))
+ {
+ await NavigationService.NavigateAsync(typeof(PokehashKeyPage), GameMapNavigationModes.AppStart);
+
+ return;
+ }
+
var currentAccessToken = GameClient.LoadAccessToken();
if (currentAccessToken == null || forceToMainPage)
{
diff --git a/PokemonGo-UWP/Assets/Icons/gender-female.png b/PokemonGo-UWP/Assets/Icons/gender-female.png
new file mode 100644
index 000000000..28cfefc60
Binary files /dev/null and b/PokemonGo-UWP/Assets/Icons/gender-female.png differ
diff --git a/PokemonGo-UWP/Assets/Icons/gender-male.png b/PokemonGo-UWP/Assets/Icons/gender-male.png
new file mode 100644
index 000000000..944ffec87
Binary files /dev/null and b/PokemonGo-UWP/Assets/Icons/gender-male.png differ
diff --git a/PokemonGo-UWP/Assets/Icons/ic_buddy_light.png b/PokemonGo-UWP/Assets/Icons/ic_buddy_light.png
new file mode 100644
index 000000000..20cb1e788
Binary files /dev/null and b/PokemonGo-UWP/Assets/Icons/ic_buddy_light.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/152.png b/PokemonGo-UWP/Assets/Pokemons/152.png
new file mode 100644
index 000000000..909a294fa
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/152.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/153.png b/PokemonGo-UWP/Assets/Pokemons/153.png
new file mode 100644
index 000000000..d81ac536e
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/153.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/154.png b/PokemonGo-UWP/Assets/Pokemons/154.png
new file mode 100644
index 000000000..d157f5fd8
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/154.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/155.png b/PokemonGo-UWP/Assets/Pokemons/155.png
new file mode 100644
index 000000000..5a8856ab3
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/155.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/156.png b/PokemonGo-UWP/Assets/Pokemons/156.png
new file mode 100644
index 000000000..602b487de
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/156.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/157.png b/PokemonGo-UWP/Assets/Pokemons/157.png
new file mode 100644
index 000000000..eb782c6ca
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/157.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/158.png b/PokemonGo-UWP/Assets/Pokemons/158.png
new file mode 100644
index 000000000..d2eb2a6bf
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/158.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/159.png b/PokemonGo-UWP/Assets/Pokemons/159.png
new file mode 100644
index 000000000..8ce7efce7
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/159.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/160.png b/PokemonGo-UWP/Assets/Pokemons/160.png
new file mode 100644
index 000000000..dc93abe75
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/160.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/161.png b/PokemonGo-UWP/Assets/Pokemons/161.png
new file mode 100644
index 000000000..e7f093497
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/161.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/162.png b/PokemonGo-UWP/Assets/Pokemons/162.png
new file mode 100644
index 000000000..fa1fa3fcf
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/162.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/163.png b/PokemonGo-UWP/Assets/Pokemons/163.png
new file mode 100644
index 000000000..4a8eb6931
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/163.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/164.png b/PokemonGo-UWP/Assets/Pokemons/164.png
new file mode 100644
index 000000000..f3003442a
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/164.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/165.png b/PokemonGo-UWP/Assets/Pokemons/165.png
new file mode 100644
index 000000000..f29760793
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/165.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/166.png b/PokemonGo-UWP/Assets/Pokemons/166.png
new file mode 100644
index 000000000..9e202946f
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/166.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/167.png b/PokemonGo-UWP/Assets/Pokemons/167.png
new file mode 100644
index 000000000..0f3705bc6
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/167.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/168.png b/PokemonGo-UWP/Assets/Pokemons/168.png
new file mode 100644
index 000000000..6e8f0afcb
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/168.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/169.png b/PokemonGo-UWP/Assets/Pokemons/169.png
new file mode 100644
index 000000000..d674c4ced
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/169.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/170.png b/PokemonGo-UWP/Assets/Pokemons/170.png
new file mode 100644
index 000000000..9dad2e342
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/170.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/171.png b/PokemonGo-UWP/Assets/Pokemons/171.png
new file mode 100644
index 000000000..63034c807
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/171.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/172.png b/PokemonGo-UWP/Assets/Pokemons/172.png
new file mode 100644
index 000000000..4ff5f70e9
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/172.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/173.png b/PokemonGo-UWP/Assets/Pokemons/173.png
new file mode 100644
index 000000000..d567a4659
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/173.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/174.png b/PokemonGo-UWP/Assets/Pokemons/174.png
new file mode 100644
index 000000000..3cce9cc96
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/174.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/175.png b/PokemonGo-UWP/Assets/Pokemons/175.png
new file mode 100644
index 000000000..8aba830e9
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/175.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/176.png b/PokemonGo-UWP/Assets/Pokemons/176.png
new file mode 100644
index 000000000..2e76cd1ea
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/176.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/177.png b/PokemonGo-UWP/Assets/Pokemons/177.png
new file mode 100644
index 000000000..acf28342a
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/177.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/178.png b/PokemonGo-UWP/Assets/Pokemons/178.png
new file mode 100644
index 000000000..e7c3d9055
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/178.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/179.png b/PokemonGo-UWP/Assets/Pokemons/179.png
new file mode 100644
index 000000000..35e43dac2
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/179.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/180.png b/PokemonGo-UWP/Assets/Pokemons/180.png
new file mode 100644
index 000000000..76d5d4afa
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/180.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/181.png b/PokemonGo-UWP/Assets/Pokemons/181.png
new file mode 100644
index 000000000..c596de7d5
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/181.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/182.png b/PokemonGo-UWP/Assets/Pokemons/182.png
new file mode 100644
index 000000000..0c788e058
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/182.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/183.png b/PokemonGo-UWP/Assets/Pokemons/183.png
new file mode 100644
index 000000000..4c753f938
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/183.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/184.png b/PokemonGo-UWP/Assets/Pokemons/184.png
new file mode 100644
index 000000000..aa0c1a64a
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/184.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/185.png b/PokemonGo-UWP/Assets/Pokemons/185.png
new file mode 100644
index 000000000..7abc81891
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/185.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/186.png b/PokemonGo-UWP/Assets/Pokemons/186.png
new file mode 100644
index 000000000..baf959349
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/186.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/187.png b/PokemonGo-UWP/Assets/Pokemons/187.png
new file mode 100644
index 000000000..35eeba833
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/187.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/188.png b/PokemonGo-UWP/Assets/Pokemons/188.png
new file mode 100644
index 000000000..96e708e19
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/188.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/189.png b/PokemonGo-UWP/Assets/Pokemons/189.png
new file mode 100644
index 000000000..9613e116f
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/189.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/190.png b/PokemonGo-UWP/Assets/Pokemons/190.png
new file mode 100644
index 000000000..3b6a77c0a
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/190.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/191.png b/PokemonGo-UWP/Assets/Pokemons/191.png
new file mode 100644
index 000000000..f760ad49d
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/191.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/192.png b/PokemonGo-UWP/Assets/Pokemons/192.png
new file mode 100644
index 000000000..68a1a63df
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/192.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/193.png b/PokemonGo-UWP/Assets/Pokemons/193.png
new file mode 100644
index 000000000..6e1e7bb64
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/193.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/194.png b/PokemonGo-UWP/Assets/Pokemons/194.png
new file mode 100644
index 000000000..ed36722b4
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/194.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/195.png b/PokemonGo-UWP/Assets/Pokemons/195.png
new file mode 100644
index 000000000..0d8fc53dd
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/195.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/196.png b/PokemonGo-UWP/Assets/Pokemons/196.png
new file mode 100644
index 000000000..e6b11c157
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/196.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/197.png b/PokemonGo-UWP/Assets/Pokemons/197.png
new file mode 100644
index 000000000..469fb7fcd
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/197.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/198.png b/PokemonGo-UWP/Assets/Pokemons/198.png
new file mode 100644
index 000000000..7fa3ade66
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/198.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/199.png b/PokemonGo-UWP/Assets/Pokemons/199.png
new file mode 100644
index 000000000..43163cd24
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/199.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/200.png b/PokemonGo-UWP/Assets/Pokemons/200.png
new file mode 100644
index 000000000..b076b505e
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/200.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/201.png b/PokemonGo-UWP/Assets/Pokemons/201.png
new file mode 100644
index 000000000..7b459a6f3
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/201.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/202.png b/PokemonGo-UWP/Assets/Pokemons/202.png
new file mode 100644
index 000000000..e9bfe70fd
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/202.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/203.png b/PokemonGo-UWP/Assets/Pokemons/203.png
new file mode 100644
index 000000000..2771e2149
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/203.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/204.png b/PokemonGo-UWP/Assets/Pokemons/204.png
new file mode 100644
index 000000000..8fc947e68
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/204.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/205.png b/PokemonGo-UWP/Assets/Pokemons/205.png
new file mode 100644
index 000000000..95fa914a6
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/205.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/206.png b/PokemonGo-UWP/Assets/Pokemons/206.png
new file mode 100644
index 000000000..4b6fc16a5
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/206.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/207.png b/PokemonGo-UWP/Assets/Pokemons/207.png
new file mode 100644
index 000000000..23daa5ef4
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/207.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/208.png b/PokemonGo-UWP/Assets/Pokemons/208.png
new file mode 100644
index 000000000..a9477b921
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/208.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/209.png b/PokemonGo-UWP/Assets/Pokemons/209.png
new file mode 100644
index 000000000..1b709fbfb
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/209.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/210.png b/PokemonGo-UWP/Assets/Pokemons/210.png
new file mode 100644
index 000000000..9d80f8b7d
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/210.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/211.png b/PokemonGo-UWP/Assets/Pokemons/211.png
new file mode 100644
index 000000000..9b2284eb4
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/211.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/212.png b/PokemonGo-UWP/Assets/Pokemons/212.png
new file mode 100644
index 000000000..776cbb057
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/212.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/213.png b/PokemonGo-UWP/Assets/Pokemons/213.png
new file mode 100644
index 000000000..ecc601cc3
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/213.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/214.png b/PokemonGo-UWP/Assets/Pokemons/214.png
new file mode 100644
index 000000000..5bdc5a042
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/214.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/215.png b/PokemonGo-UWP/Assets/Pokemons/215.png
new file mode 100644
index 000000000..43a751d41
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/215.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/216.png b/PokemonGo-UWP/Assets/Pokemons/216.png
new file mode 100644
index 000000000..ad4e21dff
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/216.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/217.png b/PokemonGo-UWP/Assets/Pokemons/217.png
new file mode 100644
index 000000000..0735244de
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/217.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/218.png b/PokemonGo-UWP/Assets/Pokemons/218.png
new file mode 100644
index 000000000..e89a273b9
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/218.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/219.png b/PokemonGo-UWP/Assets/Pokemons/219.png
new file mode 100644
index 000000000..854f175de
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/219.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/220.png b/PokemonGo-UWP/Assets/Pokemons/220.png
new file mode 100644
index 000000000..7339d4fd7
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/220.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/221.png b/PokemonGo-UWP/Assets/Pokemons/221.png
new file mode 100644
index 000000000..69fdf9822
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/221.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/222.png b/PokemonGo-UWP/Assets/Pokemons/222.png
new file mode 100644
index 000000000..ba6449835
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/222.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/223.png b/PokemonGo-UWP/Assets/Pokemons/223.png
new file mode 100644
index 000000000..7846d763c
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/223.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/224.png b/PokemonGo-UWP/Assets/Pokemons/224.png
new file mode 100644
index 000000000..74c5cf1a3
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/224.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/225.png b/PokemonGo-UWP/Assets/Pokemons/225.png
new file mode 100644
index 000000000..3c34eddb7
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/225.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/226.png b/PokemonGo-UWP/Assets/Pokemons/226.png
new file mode 100644
index 000000000..e521a92a8
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/226.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/227.png b/PokemonGo-UWP/Assets/Pokemons/227.png
new file mode 100644
index 000000000..f73ba6c03
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/227.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/228.png b/PokemonGo-UWP/Assets/Pokemons/228.png
new file mode 100644
index 000000000..63fa4f907
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/228.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/229.png b/PokemonGo-UWP/Assets/Pokemons/229.png
new file mode 100644
index 000000000..872da97da
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/229.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/230.png b/PokemonGo-UWP/Assets/Pokemons/230.png
new file mode 100644
index 000000000..413a53bb8
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/230.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/231.png b/PokemonGo-UWP/Assets/Pokemons/231.png
new file mode 100644
index 000000000..ebb0fd97b
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/231.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/232.png b/PokemonGo-UWP/Assets/Pokemons/232.png
new file mode 100644
index 000000000..479d9686d
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/232.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/233.png b/PokemonGo-UWP/Assets/Pokemons/233.png
new file mode 100644
index 000000000..e6f5c7d98
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/233.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/234.png b/PokemonGo-UWP/Assets/Pokemons/234.png
new file mode 100644
index 000000000..f78dc2521
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/234.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/235.png b/PokemonGo-UWP/Assets/Pokemons/235.png
new file mode 100644
index 000000000..b3cf83722
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/235.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/236.png b/PokemonGo-UWP/Assets/Pokemons/236.png
new file mode 100644
index 000000000..af520aa4f
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/236.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/237.png b/PokemonGo-UWP/Assets/Pokemons/237.png
new file mode 100644
index 000000000..38ff6c101
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/237.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/238.png b/PokemonGo-UWP/Assets/Pokemons/238.png
new file mode 100644
index 000000000..0971d0ef9
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/238.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/239.png b/PokemonGo-UWP/Assets/Pokemons/239.png
new file mode 100644
index 000000000..80a41e12e
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/239.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/240.png b/PokemonGo-UWP/Assets/Pokemons/240.png
new file mode 100644
index 000000000..347f5ca02
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/240.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/241.png b/PokemonGo-UWP/Assets/Pokemons/241.png
new file mode 100644
index 000000000..fc1f50f1f
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/241.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/242.png b/PokemonGo-UWP/Assets/Pokemons/242.png
new file mode 100644
index 000000000..74ac51340
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/242.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/243.png b/PokemonGo-UWP/Assets/Pokemons/243.png
new file mode 100644
index 000000000..67e0a1187
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/243.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/244.png b/PokemonGo-UWP/Assets/Pokemons/244.png
new file mode 100644
index 000000000..3220b3685
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/244.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/245.png b/PokemonGo-UWP/Assets/Pokemons/245.png
new file mode 100644
index 000000000..5323fbfb0
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/245.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/246.png b/PokemonGo-UWP/Assets/Pokemons/246.png
new file mode 100644
index 000000000..587781d04
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/246.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/247.png b/PokemonGo-UWP/Assets/Pokemons/247.png
new file mode 100644
index 000000000..43a80438d
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/247.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/248.png b/PokemonGo-UWP/Assets/Pokemons/248.png
new file mode 100644
index 000000000..6382b3bde
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/248.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/249.png b/PokemonGo-UWP/Assets/Pokemons/249.png
new file mode 100644
index 000000000..56f88bb3a
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/249.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/250.png b/PokemonGo-UWP/Assets/Pokemons/250.png
new file mode 100644
index 000000000..9891e4cc2
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/250.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/251.png b/PokemonGo-UWP/Assets/Pokemons/251.png
new file mode 100644
index 000000000..e19e6fb65
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/251.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/001.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/001.png
new file mode 100644
index 000000000..7ef5d76fc
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/001.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/002.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/002.png
new file mode 100644
index 000000000..f9a74d171
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/002.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/003.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/003.png
new file mode 100644
index 000000000..4da7b3333
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/003.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/004.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/004.png
new file mode 100644
index 000000000..bd4dd97e1
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/004.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/005.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/005.png
new file mode 100644
index 000000000..27f6aca1b
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/005.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/006.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/006.png
new file mode 100644
index 000000000..95db0e182
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/006.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/007.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/007.png
new file mode 100644
index 000000000..0e1618f3d
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/007.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/008.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/008.png
new file mode 100644
index 000000000..d569b4b3a
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/008.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/009.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/009.png
new file mode 100644
index 000000000..f30978e9d
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/009.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/010.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/010.png
new file mode 100644
index 000000000..af101847f
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/010.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/011.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/011.png
new file mode 100644
index 000000000..1c67d6ccf
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/011.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/012.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/012.png
new file mode 100644
index 000000000..ae3548af7
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/012.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/013.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/013.png
new file mode 100644
index 000000000..cac3cd8cd
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/013.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/014.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/014.png
new file mode 100644
index 000000000..a4352207c
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/014.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/015.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/015.png
new file mode 100644
index 000000000..93f05a735
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/015.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/016.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/016.png
new file mode 100644
index 000000000..38aa90c53
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/016.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/017.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/017.png
new file mode 100644
index 000000000..4a3f2b87e
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/017.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/018.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/018.png
new file mode 100644
index 000000000..792910e81
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/018.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/019.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/019.png
new file mode 100644
index 000000000..93be29483
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/019.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/020.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/020.png
new file mode 100644
index 000000000..bb254679b
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/020.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/021.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/021.png
new file mode 100644
index 000000000..62fda2051
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/021.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/022.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/022.png
new file mode 100644
index 000000000..3922699e8
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/022.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/023.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/023.png
new file mode 100644
index 000000000..95e586e94
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/023.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/024.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/024.png
new file mode 100644
index 000000000..7e61b4555
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/024.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/025.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/025.png
new file mode 100644
index 000000000..c8fc17d88
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/025.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/026.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/026.png
new file mode 100644
index 000000000..440f464e4
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/026.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/027.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/027.png
new file mode 100644
index 000000000..c731b4fb2
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/027.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/028.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/028.png
new file mode 100644
index 000000000..4dc45c2b7
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/028.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/029.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/029.png
new file mode 100644
index 000000000..83840929e
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/029.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/030.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/030.png
new file mode 100644
index 000000000..d23fbbc6f
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/030.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/031.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/031.png
new file mode 100644
index 000000000..360e86d97
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/031.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/032.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/032.png
new file mode 100644
index 000000000..f8866d52c
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/032.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/033.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/033.png
new file mode 100644
index 000000000..0b1b7904a
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/033.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/034.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/034.png
new file mode 100644
index 000000000..10c0bebc8
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/034.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/035.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/035.png
new file mode 100644
index 000000000..f9b66a828
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/035.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/036.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/036.png
new file mode 100644
index 000000000..ae6dfdcdb
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/036.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/037.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/037.png
new file mode 100644
index 000000000..18ea5272c
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/037.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/038.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/038.png
new file mode 100644
index 000000000..184395f3c
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/038.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/039.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/039.png
new file mode 100644
index 000000000..52f71381d
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/039.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/040.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/040.png
new file mode 100644
index 000000000..c8df47f07
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/040.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/041.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/041.png
new file mode 100644
index 000000000..c658185bc
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/041.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/042.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/042.png
new file mode 100644
index 000000000..3e4e09622
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/042.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/043.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/043.png
new file mode 100644
index 000000000..c510e3b7e
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/043.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/044.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/044.png
new file mode 100644
index 000000000..7353d2950
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/044.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/045.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/045.png
new file mode 100644
index 000000000..f412660d7
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/045.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/046.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/046.png
new file mode 100644
index 000000000..2986c4bf2
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/046.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/047.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/047.png
new file mode 100644
index 000000000..03ea7e487
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/047.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/048.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/048.png
new file mode 100644
index 000000000..06d68bce0
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/048.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/049.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/049.png
new file mode 100644
index 000000000..720c14805
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/049.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/050.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/050.png
new file mode 100644
index 000000000..213a3f73b
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/050.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/051.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/051.png
new file mode 100644
index 000000000..47880a952
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/051.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/052.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/052.png
new file mode 100644
index 000000000..361d5f803
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/052.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/053.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/053.png
new file mode 100644
index 000000000..f4cbbf85a
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/053.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/054.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/054.png
new file mode 100644
index 000000000..38a576378
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/054.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/055.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/055.png
new file mode 100644
index 000000000..a647aed5c
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/055.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/056.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/056.png
new file mode 100644
index 000000000..e94128443
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/056.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/057.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/057.png
new file mode 100644
index 000000000..af56715fa
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/057.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/058.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/058.png
new file mode 100644
index 000000000..7b86b01e9
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/058.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/059.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/059.png
new file mode 100644
index 000000000..c4bac3bcb
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/059.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/060.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/060.png
new file mode 100644
index 000000000..73da388ca
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/060.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/061.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/061.png
new file mode 100644
index 000000000..268ec9570
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/061.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/062.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/062.png
new file mode 100644
index 000000000..b14cefccd
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/062.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/063.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/063.png
new file mode 100644
index 000000000..7edd3980f
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/063.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/064.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/064.png
new file mode 100644
index 000000000..5bb44814a
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/064.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/065.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/065.png
new file mode 100644
index 000000000..9bc528b24
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/065.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/066.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/066.png
new file mode 100644
index 000000000..5130438f6
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/066.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/067.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/067.png
new file mode 100644
index 000000000..e3492e66c
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/067.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/068.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/068.png
new file mode 100644
index 000000000..7e72ff9a2
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/068.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/069.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/069.png
new file mode 100644
index 000000000..1bc611eb6
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/069.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/070.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/070.png
new file mode 100644
index 000000000..2d83cb0f2
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/070.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/071.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/071.png
new file mode 100644
index 000000000..08438a780
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/071.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/072.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/072.png
new file mode 100644
index 000000000..32b7cc0f7
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/072.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/073.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/073.png
new file mode 100644
index 000000000..ad33c0e8a
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/073.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/074.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/074.png
new file mode 100644
index 000000000..e102136c2
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/074.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/075.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/075.png
new file mode 100644
index 000000000..09d7edce1
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/075.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/076.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/076.png
new file mode 100644
index 000000000..d811e089c
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/076.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/077.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/077.png
new file mode 100644
index 000000000..48c5698b1
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/077.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/078.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/078.png
new file mode 100644
index 000000000..28e9e5a3c
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/078.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/079.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/079.png
new file mode 100644
index 000000000..aab7522ca
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/079.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/080.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/080.png
new file mode 100644
index 000000000..bd6796645
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/080.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/081.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/081.png
new file mode 100644
index 000000000..f227dbf09
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/081.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/082.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/082.png
new file mode 100644
index 000000000..7f03c77c5
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/082.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/083.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/083.png
new file mode 100644
index 000000000..adab5d1ce
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/083.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/084.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/084.png
new file mode 100644
index 000000000..07534f1c1
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/084.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/085.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/085.png
new file mode 100644
index 000000000..d72599f86
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/085.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/086.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/086.png
new file mode 100644
index 000000000..a1901619c
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/086.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/087.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/087.png
new file mode 100644
index 000000000..681369bb1
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/087.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/088.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/088.png
new file mode 100644
index 000000000..f398b75a8
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/088.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/089.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/089.png
new file mode 100644
index 000000000..85e86b036
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/089.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/090.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/090.png
new file mode 100644
index 000000000..2826c8f25
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/090.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/091.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/091.png
new file mode 100644
index 000000000..f57816a36
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/091.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/092.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/092.png
new file mode 100644
index 000000000..ce3f3ee9c
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/092.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/093.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/093.png
new file mode 100644
index 000000000..3ae78b40d
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/093.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/094.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/094.png
new file mode 100644
index 000000000..b1bf6ab93
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/094.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/095.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/095.png
new file mode 100644
index 000000000..b66791678
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/095.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/096.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/096.png
new file mode 100644
index 000000000..d2925a37d
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/096.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/097.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/097.png
new file mode 100644
index 000000000..f66feceb2
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/097.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/098.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/098.png
new file mode 100644
index 000000000..a2854252b
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/098.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/099.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/099.png
new file mode 100644
index 000000000..b38f92ef4
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/099.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/100.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/100.png
new file mode 100644
index 000000000..833ac585c
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/100.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/101.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/101.png
new file mode 100644
index 000000000..a7699c3ff
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/101.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/102.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/102.png
new file mode 100644
index 000000000..865f6b6d4
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/102.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/103.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/103.png
new file mode 100644
index 000000000..089a0619f
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/103.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/104.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/104.png
new file mode 100644
index 000000000..c88f20785
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/104.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/105.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/105.png
new file mode 100644
index 000000000..981e161b2
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/105.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/106.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/106.png
new file mode 100644
index 000000000..4d771d9f0
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/106.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/107.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/107.png
new file mode 100644
index 000000000..b38dcaf05
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/107.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/108.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/108.png
new file mode 100644
index 000000000..cf75c0958
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/108.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/109.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/109.png
new file mode 100644
index 000000000..17f450b21
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/109.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/110.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/110.png
new file mode 100644
index 000000000..f36b66aef
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/110.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/111.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/111.png
new file mode 100644
index 000000000..d1914ce4e
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/111.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/112.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/112.png
new file mode 100644
index 000000000..c2f5199c9
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/112.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/113.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/113.png
new file mode 100644
index 000000000..49c2a3d13
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/113.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/114.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/114.png
new file mode 100644
index 000000000..50828527c
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/114.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/115.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/115.png
new file mode 100644
index 000000000..19db0d85e
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/115.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/116.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/116.png
new file mode 100644
index 000000000..fa38cfcb0
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/116.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/117.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/117.png
new file mode 100644
index 000000000..4cbd784ed
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/117.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/118.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/118.png
new file mode 100644
index 000000000..acd6f2ddb
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/118.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/119.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/119.png
new file mode 100644
index 000000000..fbfbbd295
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/119.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/120.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/120.png
new file mode 100644
index 000000000..dd2bf0a0a
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/120.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/121.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/121.png
new file mode 100644
index 000000000..93fa7ee5f
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/121.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/122.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/122.png
new file mode 100644
index 000000000..f5fb7849b
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/122.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/123.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/123.png
new file mode 100644
index 000000000..18b825144
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/123.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/124.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/124.png
new file mode 100644
index 000000000..a5531d95f
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/124.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/125.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/125.png
new file mode 100644
index 000000000..284dbb2be
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/125.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/126.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/126.png
new file mode 100644
index 000000000..5ec459fb3
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/126.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/127.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/127.png
new file mode 100644
index 000000000..e2b451e71
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/127.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/128.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/128.png
new file mode 100644
index 000000000..059916f7e
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/128.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/129.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/129.png
new file mode 100644
index 000000000..29888be7a
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/129.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/130.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/130.png
new file mode 100644
index 000000000..bb61f01f5
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/130.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/131.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/131.png
new file mode 100644
index 000000000..ca56f6e59
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/131.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/132.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/132.png
new file mode 100644
index 000000000..43bbc4f73
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/132.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/133.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/133.png
new file mode 100644
index 000000000..bd15bf9b7
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/133.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/134.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/134.png
new file mode 100644
index 000000000..b1fd66092
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/134.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/135.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/135.png
new file mode 100644
index 000000000..18ed9fa50
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/135.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/136.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/136.png
new file mode 100644
index 000000000..cbe68c961
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/136.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/137.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/137.png
new file mode 100644
index 000000000..f3e09774a
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/137.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/138.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/138.png
new file mode 100644
index 000000000..d402cdebf
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/138.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/139.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/139.png
new file mode 100644
index 000000000..e0e75c73f
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/139.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/140.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/140.png
new file mode 100644
index 000000000..2dd7227e3
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/140.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/141.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/141.png
new file mode 100644
index 000000000..c1dc09baf
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/141.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/142.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/142.png
new file mode 100644
index 000000000..87559fa76
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/142.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/143.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/143.png
new file mode 100644
index 000000000..3767e68ac
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/143.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/144.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/144.png
new file mode 100644
index 000000000..117d0f2ba
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/144.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/145.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/145.png
new file mode 100644
index 000000000..891a6fbcd
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/145.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/146.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/146.png
new file mode 100644
index 000000000..c62bc5d47
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/146.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/147.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/147.png
new file mode 100644
index 000000000..e07d4d777
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/147.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/148.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/148.png
new file mode 100644
index 000000000..d475ecfd2
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/148.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/149.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/149.png
new file mode 100644
index 000000000..66c1a5687
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/149.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/150.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/150.png
new file mode 100644
index 000000000..d1220c7b2
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/150.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/151.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/151.png
new file mode 100644
index 000000000..3eef10db0
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/151.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/152.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/152.png
new file mode 100644
index 000000000..909a294fa
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/152.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/153.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/153.png
new file mode 100644
index 000000000..d81ac536e
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/153.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/154.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/154.png
new file mode 100644
index 000000000..d157f5fd8
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/154.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/155.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/155.png
new file mode 100644
index 000000000..5a8856ab3
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/155.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/156.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/156.png
new file mode 100644
index 000000000..602b487de
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/156.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/157.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/157.png
new file mode 100644
index 000000000..eb782c6ca
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/157.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/158.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/158.png
new file mode 100644
index 000000000..d2eb2a6bf
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/158.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/159.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/159.png
new file mode 100644
index 000000000..8ce7efce7
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/159.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/160.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/160.png
new file mode 100644
index 000000000..dc93abe75
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/160.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/161.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/161.png
new file mode 100644
index 000000000..e7f093497
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/161.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/162.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/162.png
new file mode 100644
index 000000000..fa1fa3fcf
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/162.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/163.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/163.png
new file mode 100644
index 000000000..4a8eb6931
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/163.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/164.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/164.png
new file mode 100644
index 000000000..f3003442a
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/164.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/165.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/165.png
new file mode 100644
index 000000000..f29760793
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/165.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/166.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/166.png
new file mode 100644
index 000000000..9e202946f
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/166.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/167.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/167.png
new file mode 100644
index 000000000..0f3705bc6
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/167.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/168.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/168.png
new file mode 100644
index 000000000..6e8f0afcb
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/168.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/169.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/169.png
new file mode 100644
index 000000000..d674c4ced
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/169.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/170.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/170.png
new file mode 100644
index 000000000..9dad2e342
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/170.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/171.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/171.png
new file mode 100644
index 000000000..63034c807
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/171.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/172.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/172.png
new file mode 100644
index 000000000..4ff5f70e9
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/172.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/173.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/173.png
new file mode 100644
index 000000000..d567a4659
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/173.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/174.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/174.png
new file mode 100644
index 000000000..3cce9cc96
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/174.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/175.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/175.png
new file mode 100644
index 000000000..8aba830e9
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/175.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/176.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/176.png
new file mode 100644
index 000000000..2e76cd1ea
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/176.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/177.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/177.png
new file mode 100644
index 000000000..acf28342a
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/177.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/178.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/178.png
new file mode 100644
index 000000000..e7c3d9055
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/178.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/179.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/179.png
new file mode 100644
index 000000000..35e43dac2
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/179.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/180.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/180.png
new file mode 100644
index 000000000..76d5d4afa
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/180.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/181.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/181.png
new file mode 100644
index 000000000..c596de7d5
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/181.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/182.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/182.png
new file mode 100644
index 000000000..0c788e058
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/182.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/183.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/183.png
new file mode 100644
index 000000000..4c753f938
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/183.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/184.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/184.png
new file mode 100644
index 000000000..aa0c1a64a
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/184.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/185.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/185.png
new file mode 100644
index 000000000..7abc81891
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/185.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/186.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/186.png
new file mode 100644
index 000000000..baf959349
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/186.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/187.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/187.png
new file mode 100644
index 000000000..35eeba833
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/187.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/188.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/188.png
new file mode 100644
index 000000000..96e708e19
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/188.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/189.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/189.png
new file mode 100644
index 000000000..9613e116f
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/189.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/190.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/190.png
new file mode 100644
index 000000000..3b6a77c0a
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/190.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/191.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/191.png
new file mode 100644
index 000000000..f760ad49d
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/191.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/192.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/192.png
new file mode 100644
index 000000000..68a1a63df
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/192.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/193.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/193.png
new file mode 100644
index 000000000..6e1e7bb64
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/193.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/194.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/194.png
new file mode 100644
index 000000000..ed36722b4
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/194.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/195.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/195.png
new file mode 100644
index 000000000..0d8fc53dd
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/195.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/196.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/196.png
new file mode 100644
index 000000000..e6b11c157
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/196.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/197.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/197.png
new file mode 100644
index 000000000..469fb7fcd
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/197.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/198.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/198.png
new file mode 100644
index 000000000..7fa3ade66
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/198.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/199.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/199.png
new file mode 100644
index 000000000..43163cd24
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/199.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/200.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/200.png
new file mode 100644
index 000000000..b076b505e
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/200.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/201.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/201.png
new file mode 100644
index 000000000..7b459a6f3
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/201.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/202.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/202.png
new file mode 100644
index 000000000..e9bfe70fd
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/202.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/203.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/203.png
new file mode 100644
index 000000000..2771e2149
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/203.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/204.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/204.png
new file mode 100644
index 000000000..8fc947e68
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/204.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/205.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/205.png
new file mode 100644
index 000000000..95fa914a6
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/205.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/206.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/206.png
new file mode 100644
index 000000000..4b6fc16a5
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/206.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/207.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/207.png
new file mode 100644
index 000000000..23daa5ef4
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/207.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/208.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/208.png
new file mode 100644
index 000000000..a9477b921
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/208.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/209.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/209.png
new file mode 100644
index 000000000..1b709fbfb
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/209.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/210.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/210.png
new file mode 100644
index 000000000..9d80f8b7d
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/210.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/211.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/211.png
new file mode 100644
index 000000000..9b2284eb4
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/211.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/212.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/212.png
new file mode 100644
index 000000000..776cbb057
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/212.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/213.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/213.png
new file mode 100644
index 000000000..ecc601cc3
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/213.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/214.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/214.png
new file mode 100644
index 000000000..5bdc5a042
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/214.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/215.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/215.png
new file mode 100644
index 000000000..43a751d41
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/215.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/216.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/216.png
new file mode 100644
index 000000000..ad4e21dff
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/216.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/217.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/217.png
new file mode 100644
index 000000000..0735244de
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/217.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/218.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/218.png
new file mode 100644
index 000000000..e89a273b9
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/218.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/219.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/219.png
new file mode 100644
index 000000000..854f175de
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/219.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/220.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/220.png
new file mode 100644
index 000000000..7339d4fd7
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/220.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/221.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/221.png
new file mode 100644
index 000000000..69fdf9822
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/221.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/222.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/222.png
new file mode 100644
index 000000000..ba6449835
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/222.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/223.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/223.png
new file mode 100644
index 000000000..7846d763c
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/223.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/224.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/224.png
new file mode 100644
index 000000000..74c5cf1a3
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/224.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/225.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/225.png
new file mode 100644
index 000000000..3c34eddb7
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/225.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/226.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/226.png
new file mode 100644
index 000000000..e521a92a8
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/226.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/227.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/227.png
new file mode 100644
index 000000000..f73ba6c03
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/227.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/228.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/228.png
new file mode 100644
index 000000000..63fa4f907
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/228.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/229.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/229.png
new file mode 100644
index 000000000..872da97da
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/229.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/230.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/230.png
new file mode 100644
index 000000000..413a53bb8
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/230.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/231.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/231.png
new file mode 100644
index 000000000..ebb0fd97b
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/231.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/232.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/232.png
new file mode 100644
index 000000000..479d9686d
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/232.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/233.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/233.png
new file mode 100644
index 000000000..e6f5c7d98
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/233.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/234.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/234.png
new file mode 100644
index 000000000..f78dc2521
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/234.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/235.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/235.png
new file mode 100644
index 000000000..b3cf83722
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/235.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/236.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/236.png
new file mode 100644
index 000000000..af520aa4f
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/236.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/237.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/237.png
new file mode 100644
index 000000000..38ff6c101
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/237.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/238.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/238.png
new file mode 100644
index 000000000..0971d0ef9
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/238.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/239.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/239.png
new file mode 100644
index 000000000..80a41e12e
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/239.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/240.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/240.png
new file mode 100644
index 000000000..347f5ca02
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/240.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/241.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/241.png
new file mode 100644
index 000000000..fc1f50f1f
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/241.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/242.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/242.png
new file mode 100644
index 000000000..74ac51340
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/242.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/243.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/243.png
new file mode 100644
index 000000000..67e0a1187
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/243.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/244.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/244.png
new file mode 100644
index 000000000..3220b3685
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/244.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/245.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/245.png
new file mode 100644
index 000000000..5323fbfb0
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/245.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/246.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/246.png
new file mode 100644
index 000000000..587781d04
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/246.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/247.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/247.png
new file mode 100644
index 000000000..43a80438d
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/247.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/248.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/248.png
new file mode 100644
index 000000000..6382b3bde
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/248.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/249.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/249.png
new file mode 100644
index 000000000..56f88bb3a
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/249.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/250.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/250.png
new file mode 100644
index 000000000..9891e4cc2
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/250.png differ
diff --git a/PokemonGo-UWP/Assets/Pokemons/Gen2/251.png b/PokemonGo-UWP/Assets/Pokemons/Gen2/251.png
new file mode 100644
index 000000000..e19e6fb65
Binary files /dev/null and b/PokemonGo-UWP/Assets/Pokemons/Gen2/251.png differ
diff --git a/PokemonGo-UWP/Assets/UI/player-avatar-incense.png b/PokemonGo-UWP/Assets/UI/player-avatar-incense.png
new file mode 100644
index 000000000..b1569fd06
Binary files /dev/null and b/PokemonGo-UWP/Assets/UI/player-avatar-incense.png differ
diff --git a/PokemonGo-UWP/Assets/UI/player-avatar.png b/PokemonGo-UWP/Assets/UI/player-avatar.png
new file mode 100644
index 000000000..c38e97702
Binary files /dev/null and b/PokemonGo-UWP/Assets/UI/player-avatar.png differ
diff --git a/PokemonGo-UWP/Controls/CircularProgressBar.xaml.cs b/PokemonGo-UWP/Controls/CircularProgressBar.xaml.cs
index 4d4ea8c01..90805cec1 100644
--- a/PokemonGo-UWP/Controls/CircularProgressBar.xaml.cs
+++ b/PokemonGo-UWP/Controls/CircularProgressBar.xaml.cs
@@ -40,6 +40,7 @@ private static void OnImageSourcePathChanged(DependencyObject sender, Dependency
{
if (sender == null) return;
CircularProgressBar circularProgressBar = sender as CircularProgressBar;
+ if (circularProgressBar == null || circularProgressBar.ImageSourcePath == null) return;
BitmapImage fillImg = (circularProgressBar.ImageSourcePath != null) ?new BitmapImage(circularProgressBar.ImageSourcePath) : new BitmapImage();
circularProgressBar.InnerPathRoot.Fill = new ImageBrush { ImageSource = fillImg };
}
diff --git a/PokemonGo-UWP/Entities/FortDataWrapper.cs b/PokemonGo-UWP/Entities/FortDataWrapper.cs
index 3fab2ce18..0444e2aa9 100644
--- a/PokemonGo-UWP/Entities/FortDataWrapper.cs
+++ b/PokemonGo-UWP/Entities/FortDataWrapper.cs
@@ -33,9 +33,15 @@ public class FortDataWrapper : IUpdatable, INotifyPropertyChanged
public FortDataStatus FortDataStatus {
get
{
- var distance = GeoHelper.Distance(Geoposition, LocationServiceHelper.Instance.Geoposition.Coordinate.Point);
+ //var distance = GeoHelper.Distance(Geoposition, LocationServiceHelper.Instance.Geoposition.Coordinate.Point);
FortDataStatus retVal = FortDataStatus.Opened;
+ if (LocationServiceHelper.Instance.Geoposition == null)
+ {
+ return FortDataStatus.Closed;
+ }
+ var distance = GeoHelper.Distance(Geoposition, LocationServiceHelper.Instance.Geoposition.Coordinate.Point);
+
if (distance > GameClient.GameSetting.FortSettings.InteractionRangeMeters)
retVal = FortDataStatus.Closed;
diff --git a/PokemonGo-UWP/Entities/NearbyPokemonWrapper.cs b/PokemonGo-UWP/Entities/NearbyPokemonWrapper.cs
index c6f23b73e..6259e9653 100644
--- a/PokemonGo-UWP/Entities/NearbyPokemonWrapper.cs
+++ b/PokemonGo-UWP/Entities/NearbyPokemonWrapper.cs
@@ -36,15 +36,17 @@ public void Update(NearbyPokemon update)
OnPropertyChanged(nameof(PokemonId));
OnPropertyChanged(nameof(DistanceInMeters));
OnPropertyChanged(nameof(EncounterId));
+ OnPropertyChanged(nameof(FortId));
+ OnPropertyChanged(nameof(FortImageUrl));
}
#region Wrapped Properties
public PokemonId PokemonId => _nearbyPokemon.PokemonId;
-
public float DistanceInMeters => _nearbyPokemon.DistanceInMeters;
-
public ulong EncounterId => _nearbyPokemon.EncounterId;
+ public string FortId => _nearbyPokemon.FortId;
+ public string FortImageUrl => _nearbyPokemon.FortImageUrl;
#endregion
diff --git a/PokemonGo-UWP/Entities/PokemonDataWrapper.cs b/PokemonGo-UWP/Entities/PokemonDataWrapper.cs
index 49701c670..d068676c2 100644
--- a/PokemonGo-UWP/Entities/PokemonDataWrapper.cs
+++ b/PokemonGo-UWP/Entities/PokemonDataWrapper.cs
@@ -95,9 +95,15 @@ public PokemonDataWrapper(PokemonData pokemonData)
public float AdditionalCpMultiplier => WrappedData.AdditionalCpMultiplier;
- // Stubb Var
- public bool IsBuddy = false;
+ public int BuddyCandyAwarded => WrappedData.BuddyCandyAwarded;
+
+ public float BuddyTotalKmWalked => WrappedData.BuddyTotalKmWalked;
+ // Stubb Var
+ public bool IsBuddy
+ {
+ get { return (GameClient.PlayerProfile.BuddyPokemon.Id == WrappedData.Id); }
+ }
public bool IsDeployed { get { return !string.IsNullOrEmpty(DeployedFortId) || IsBuddy; } }
public int Favorite
diff --git a/PokemonGo-UWP/MultilingualResources/PokemonGo-UWP.cs.xlf b/PokemonGo-UWP/MultilingualResources/PokemonGo-UWP.cs.xlf
index 2f2481768..3cb6bcd90 100644
--- a/PokemonGo-UWP/MultilingualResources/PokemonGo-UWP.cs.xlf
+++ b/PokemonGo-UWP/MultilingualResources/PokemonGo-UWP.cs.xlf
@@ -525,8 +525,8 @@ You also got {1} Stardust, {2} Candy and {3} XP.
Set Nickname
-
- O. K.
+
+ OK
Space between . and K
@@ -562,6 +562,18 @@ You also got {1} Stardust, {2} Candy and {3} XP.
Use {0} ?
+
+
+ Streak Bonus
+
+
+
+ First Pokéstop of the day
+
+
+
+ Streak Bonus
+