diff --git a/P3D/Content/Data/Scripts/embtower/kyurem.dat b/P3D/Content/Data/Scripts/embtower/kyurem.dat
index 5ab29635a..4f3c36ba6 100644
Binary files a/P3D/Content/Data/Scripts/embtower/kyurem.dat and b/P3D/Content/Data/Scripts/embtower/kyurem.dat differ
diff --git a/P3D/Content/Data/Scripts/embtower/mapscript.dat b/P3D/Content/Data/Scripts/embtower/mapscript.dat
index ae736d838..34096b0e4 100644
Binary files a/P3D/Content/Data/Scripts/embtower/mapscript.dat and b/P3D/Content/Data/Scripts/embtower/mapscript.dat differ
diff --git a/P3D/Content/Data/Scripts/embtower/n.dat b/P3D/Content/Data/Scripts/embtower/n.dat
index ab56e346c..921938bd6 100644
Binary files a/P3D/Content/Data/Scripts/embtower/n.dat and b/P3D/Content/Data/Scripts/embtower/n.dat differ
diff --git a/P3D/Content/Data/Scripts/fortune/dot/dstone.dat b/P3D/Content/Data/Scripts/fortune/dot/dstone.dat
index 0dc609f20..306231516 100644
Binary files a/P3D/Content/Data/Scripts/fortune/dot/dstone.dat and b/P3D/Content/Data/Scripts/fortune/dot/dstone.dat differ
diff --git a/P3D/Content/Data/Scripts/fortune/dot/dstonemap.dat b/P3D/Content/Data/Scripts/fortune/dot/dstonemap.dat
index e4766b101..db3d5c209 100644
Binary files a/P3D/Content/Data/Scripts/fortune/dot/dstonemap.dat and b/P3D/Content/Data/Scripts/fortune/dot/dstonemap.dat differ
diff --git a/P3D/Content/Data/Scripts/fortune/dot/n.dat b/P3D/Content/Data/Scripts/fortune/dot/n.dat
index f07958f0c..eb44a7490 100644
Binary files a/P3D/Content/Data/Scripts/fortune/dot/n.dat and b/P3D/Content/Data/Scripts/fortune/dot/n.dat differ
diff --git a/P3D/Content/Data/Scripts/mtember/lstone.dat b/P3D/Content/Data/Scripts/mtember/lstone.dat
index 885a96c1b..b72e52aa6 100644
Binary files a/P3D/Content/Data/Scripts/mtember/lstone.dat and b/P3D/Content/Data/Scripts/mtember/lstone.dat differ
diff --git a/P3D/Content/Data/Scripts/mtember/lstonemap.dat b/P3D/Content/Data/Scripts/mtember/lstonemap.dat
index 1774abcf2..9b1cf63a1 100644
Binary files a/P3D/Content/Data/Scripts/mtember/lstonemap.dat and b/P3D/Content/Data/Scripts/mtember/lstonemap.dat differ
diff --git a/P3D/Content/Data/Scripts/mtember/n.dat b/P3D/Content/Data/Scripts/mtember/n.dat
index 037ccc44f..cde836ceb 100644
Binary files a/P3D/Content/Data/Scripts/mtember/n.dat and b/P3D/Content/Data/Scripts/mtember/n.dat differ
diff --git a/P3D/Content/Pokemon/Overworld/Normal/646_black.png b/P3D/Content/Pokemon/Overworld/Normal/646_black.png
new file mode 100644
index 000000000..1e682c124
Binary files /dev/null and b/P3D/Content/Pokemon/Overworld/Normal/646_black.png differ
diff --git a/P3D/Content/Pokemon/Overworld/Normal/646_white.png b/P3D/Content/Pokemon/Overworld/Normal/646_white.png
new file mode 100644
index 000000000..bf4b4bf48
Binary files /dev/null and b/P3D/Content/Pokemon/Overworld/Normal/646_white.png differ
diff --git a/P3D/Content/Pokemon/Overworld/Shiny/646_black.png b/P3D/Content/Pokemon/Overworld/Shiny/646_black.png
new file mode 100644
index 000000000..1e682c124
Binary files /dev/null and b/P3D/Content/Pokemon/Overworld/Shiny/646_black.png differ
diff --git a/P3D/Content/Pokemon/Overworld/Shiny/646_white.png b/P3D/Content/Pokemon/Overworld/Shiny/646_white.png
new file mode 100644
index 000000000..bf4b4bf48
Binary files /dev/null and b/P3D/Content/Pokemon/Overworld/Shiny/646_white.png differ
diff --git a/P3D/Content/Textures/NPC/Haydos.png b/P3D/Content/Textures/NPC/Haydos.png
deleted file mode 100644
index dd73f699c..000000000
Binary files a/P3D/Content/Textures/NPC/Haydos.png and /dev/null differ
diff --git a/P3D/Content/Textures/NPC/princevade.png b/P3D/Content/Textures/NPC/princevade.png
index 7b6721deb..2a91902c7 100644
Binary files a/P3D/Content/Textures/NPC/princevade.png and b/P3D/Content/Textures/NPC/princevade.png differ
diff --git a/P3D/Content/Textures/NPC/queen.png b/P3D/Content/Textures/NPC/queen.png
index 3a80319bd..1c8d8049f 100644
Binary files a/P3D/Content/Textures/NPC/queen.png and b/P3D/Content/Textures/NPC/queen.png differ
diff --git a/P3D/P3D.vbproj b/P3D/P3D.vbproj
index 168ebe4e8..00b76cfec 100644
--- a/P3D/P3D.vbproj
+++ b/P3D/P3D.vbproj
@@ -13510,6 +13510,12 @@
     <Content Include="Content\Pokemon\Overworld\Normal\53_alola.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Content\Pokemon\Overworld\Normal\646_black.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Pokemon\Overworld\Normal\646_white.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Content\Pokemon\Overworld\Normal\723.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -13708,6 +13714,13 @@
     <Content Include="Content\Pokemon\Overworld\Shiny\53_alola.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Content\Pokemon\Overworld\Shiny\646.png" />
+    <Content Include="Content\Pokemon\Overworld\Shiny\646_black.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Pokemon\Overworld\Shiny\646_white.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Content\Pokemon\Overworld\Shiny\719_mega.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -19369,9 +19382,6 @@
     <Content Include="Content\Pokemon\Overworld\Shiny\645_therian.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Pokemon\Overworld\Shiny\646.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="Content\Pokemon\Overworld\Shiny\647.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -25684,9 +25694,6 @@
     <Content Include="Content\Textures\NPC\GymGuy.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Textures\NPC\Haydos.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="Content\Textures\NPC\HCSwagmar.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
diff --git a/P3D/credits.txt b/P3D/credits.txt
index 0b65a6007..52a9608df 100644
--- a/P3D/credits.txt
+++ b/P3D/credits.txt
@@ -52,6 +52,7 @@ Pokémon 3D
 		"Zender1752"
 		"nicomts"
 		"Wolfang62"
+		"PowerCrystal"
 		"SweeperSnivy"
 		"Clara"
 		"piphybuilder88"
@@ -59,6 +60,8 @@ Pokémon 3D
 		"Carlotta4th"
 		"WesleyFG"
 		"tebited15"
+		"Eli-eli76"
+		"Zyon17"
 
 	Map Design
 		Nils Drescher