From 9a74ed947eac2dd4b85d813492e284246517d491 Mon Sep 17 00:00:00 2001
From: AdAstra-LD <gianni.laiso.gl@gmail.com>
Date: Thu, 11 Feb 2021 23:05:49 +0100
Subject: [PATCH] Fixed PT Weathers

---
 DS_Map/DS Map.csproj             | 25 ----------------
 DS_Map/Resources/PokeDatabase.cs | 51 +++++++++++++++++++++-----------
 2 files changed, 33 insertions(+), 43 deletions(-)

diff --git a/DS_Map/DS Map.csproj b/DS_Map/DS Map.csproj
index cf9485e..51c9d3b 100644
--- a/DS_Map/DS Map.csproj	
+++ b/DS_Map/DS Map.csproj	
@@ -403,31 +403,6 @@
     <None Include="Resources\Graphics\Weather\DPPt\ptsandstorm.gif" />
     <None Include="Resources\Graphics\Weather\DPPt\ptsnowslow.gif" />
     <None Include="Resources\Graphics\Weather\DPPt\ptthunderstorm.gif" />
-    <None Include="Resources\Graphics\Weather\DPPt\ptweather12.gif" />
-    <None Include="Resources\Graphics\Weather\DPPt\ptweather13.png" />
-    <None Include="Resources\Graphics\Weather\DPPt\ptweather14.png" />
-    <None Include="Resources\Graphics\Weather\DPPt\ptweather15.png" />
-    <None Include="Resources\Graphics\Weather\DPPt\ptweather16.png" />
-    <None Include="Resources\Graphics\Weather\DPPt\ptweather17.gif" />
-    <None Include="Resources\Graphics\Weather\DPPt\ptweather18.png" />
-    <None Include="Resources\Graphics\Weather\DPPt\ptweather19.png" />
-    <None Include="Resources\Graphics\Weather\DPPt\ptweather20.png" />
-    <None Include="Resources\Graphics\Weather\DPPt\ptweather21.gif" />
-    <None Include="Resources\Graphics\Weather\DPPt\ptweather22.gif" />
-    <None Include="Resources\Graphics\Weather\DPPt\ptweather23.gif" />
-    <None Include="Resources\Graphics\Weather\DPPt\ptweather24.gif" />
-    <None Include="Resources\Graphics\Weather\DPPt\ptweather25.gif" />
-    <None Include="Resources\Graphics\Weather\DPPt\ptweather26.png" />
-    <None Include="Resources\Graphics\Weather\DPPt\ptweather27.png" />
-    <None Include="Resources\Graphics\Weather\DPPt\ptweather28.png" />
-    <None Include="Resources\Graphics\Weather\DPPt\ptweather29.png" />
-    <None Include="Resources\Graphics\Weather\DPPt\ptweather30.png" />
-    <None Include="Resources\Graphics\Weather\DPPt\ptweather31.png" />
-    <None Include="Resources\Graphics\Weather\DPPt\ptweather32.gif" />
-    <None Include="Resources\Graphics\Weather\DPPt\ptweather33.png" />
-    <None Include="Resources\Graphics\Weather\DPPt\ptweather34.gif" />
-    <None Include="Resources\Graphics\Weather\DPPt\ptweather35.gif" />
-    <None Include="Resources\Graphics\Weather\DPPt\ptweather36.gif" />
     <None Include="Resources\Graphics\Weather\DPPt\ptcloudy.png" />
     <None Include="Resources\Graphics\Weather\DPPt\ptfog.png" />
     <None Include="Resources\Graphics\Weather\DPPt\ptforestweather.gif" />
diff --git a/DS_Map/Resources/PokeDatabase.cs b/DS_Map/Resources/PokeDatabase.cs
index 533e5c4..8b1a5fb 100644
--- a/DS_Map/Resources/PokeDatabase.cs
+++ b/DS_Map/Resources/PokeDatabase.cs
@@ -113,18 +113,35 @@ namespace DSPRE.Resources {
                 [05] = "Snowfall, slow",
                 [06] = "Diamond dust",
                 [07] = "Blizzard",
+                [08] = "Normal [08]",
                 [09] = "Volcanic ash fall, slow",
                 [10] = "Sand storm",
                 [11] = "Hail",
                 [12] = "Rocks ascending (?)",
+                [13] = "Normal [13]",
                 [14] = "Fog",
                 [15] = "Deep fog",
                 [16] = "Dark, Flash usable",
                 [17] = "Lightning, no rain",
+                [18] = "Normal [18]",
+                [19] = "Normal [19]",
+                [20] = "Normal [20]",
+                [21] = "Diamond dust [21]",
                 [22] = "Volcanic ash fall, steady",
                 [23] = "Eterna forest weather",
-                [24] = "Player in circle of light",
-                [25] = "Player in a circle of light",
+                [24] = "Player spotlight [24]",
+                [25] = "Player spotlight [25]",
+                [26] = "Normal [26]",
+                [27] = "Normal [27]",
+                [28] = "Normal [28]",
+                [29] = "Normal [29]",
+                [30] = "Normal [30]",
+                [31] = "Normal [31]",
+                [32] = "Rain [32]",
+                [33] = "Normal [33]",
+                [34] = "Diamond dust [34]",
+                [35] = "Diamond dust [35]",
+                [36] = "Snowfall, slow [36]",
             };
             public static Dictionary<int, string> HGSSWeatherDict = new Dictionary<int, string> {
                 [00] = "Normal",
@@ -3663,26 +3680,24 @@ namespace DSPRE.Resources {
                     [new byte[] { 22 }] = "dplightsandstorm"
                 };
                 public static Dictionary<byte[], string> ptWeatherImageDict = new Dictionary<byte[], string>() {
-                    [new byte[] { 0 } ] = "ptnormal",
+                    [new byte[] { 0, 8, 13, 18, 19, 20, 26, 27, 28, 29, 30, 31, 33 } ] = "ptnormal",
                     [new byte[] { 1 } ] = "ptcloudy",
-                    [new byte[] { 2 } ] = "ptrain",
+                    [new byte[] { 2, 32 } ] = "ptrain",
                     [new byte[] { 3 } ] = "ptheavyrain",
                     [new byte[] { 4 } ] = "ptthunderstorm",
-                    [new byte[] { 5 } ] = "ptsnowslow",
-                    [new byte[] { 6 } ] = "ptDsnow",
+                    [new byte[] { 5, 36 } ] = "ptsnowslow",
+                    [new byte[] { 6, 21, 34, 35 } ] = "ptdiamondsnow",
                     [new byte[] { 7 } ] = "ptblizzard",
-                    [new byte[] { 8 } ] = "ptsandfall",
-                    [new byte[] { 9 } ] = "ptsandstorm",
-                    [new byte[] { 10 } ] = "pthail",
-                    [new byte[] { 11 } ] = "ptrocksascending",
-                    [new byte[] { 12 } ] = "ptfog",
-                    [new byte[] { 13 } ] = "ptfog",
-                    [new byte[] { 14 } ] = "ptdark",
-                    [new byte[] { 15 } ] = "ptlightning",
-                    [new byte[] { 16 } ] = "ptlightsandstorm",
-                    [new byte[] { 17 } ] = "ptforestweather",
-                    [new byte[] { 18 } ] = "ptspotlight",
-                    [new byte[] { 19 } ] = "ptspotlight"
+                    [new byte[] { 9 } ] = "ptsandfall",
+                    [new byte[] { 10 } ] = "ptsandstorm",
+                    [new byte[] { 11 } ] = "pthail",
+                    [new byte[] { 12 } ] = "ptrocksascending",
+                    [new byte[] { 14, 15 } ] = "ptfog",
+                    [new byte[] { 16 } ] = "ptdark",
+                    [new byte[] { 17 } ] = "ptlightning",
+                    [new byte[] { 22 } ] = "ptlightsandstorm",
+                    [new byte[] { 23 } ] = "ptforestweather",
+                    [new byte[] { 24, 25 } ] = "ptspotlight",
                 };
                 public static Dictionary<byte[], string> hgssweatherImageDict = new Dictionary<byte[], string>() {
                     [new byte[] { 0, 1 }] = "hgssnormal",