Crown Tundra Update

Co-Authored-By: Matt <17801814+sora10pls@users.noreply.github.com>
Co-Authored-By: SciresM <8676005+SciresM@users.noreply.github.com>

pkNX.Game/GameLocation.cs

@@ -63,8 +63,9 @@ public static GameLocation GetGame(string dir)
         private const int FILECOUNT_USUM = 333;
         private const int FILECOUNT_GG = 27818;
         private const int FILECOUNT_SWSH = 41702;
-        private const int FILECOUNT_SWSH_1 = 41951; // Ver. 1.1.0 update
-        private const int FILECOUNT_SWSH_2 = 46867; // Ver. 1.2.0 update
+        private const int FILECOUNT_SWSH_1 = 41951; // Ver. 1.1.0 update (Galarian Slowpoke)
+        private const int FILECOUNT_SWSH_2 = 46867; // Ver. 1.2.0 update (Isle of Armor)
+        private const int FILECOUNT_SWSH_3 = 50494; // Ver. 1.3.0 update (Crown Tundra)
 
         private static GameVersion GetGameFromCount(int fileCount, string romfs)
         {
@@ -94,6 +95,7 @@ private static GameVersion GetGameFromCount(int fileCount, string romfs)
                 case FILECOUNT_SWSH:
                 case FILECOUNT_SWSH_1:
                 case FILECOUNT_SWSH_2:
+                case FILECOUNT_SWSH_3:
                     return GameVersion.SW; // todo: differentiate between SW/SH
                 default:
                     return GameVersion.Invalid;

pkNX.Game/Misc/SWSHInfo.cs

@@ -173,6 +173,43 @@ public static class SWSHInfo
             {0xC92D06352150C78A, 190}, // in the Insular Sea // Sharpedo
             {0xED1F9772AA35C3CD, 186}, // in the Workout Sea // Sharpedo
             {0x9C0049D3E6129924, 192}, // in the Honeycalm Sea // Sharpedo
+
+            // DLC2
+            {0x87E14B7187BC1CC1, 204}, // on Slippery Slope
+            {0x87E1487187BC17A8, 206}, // in Freezington
+            {0x87E1497187BC195B, 208}, // in Frostpoint Field
+            {0x87E14E7187BC21DA, 210}, // in the Giant’s Bed
+            {0x87E14F7187BC238D, 212}, // in the Old Cemetery
+            {0x87E14C7187BC1E74, 214}, // on Snowslide Slope
+            {0x87E14D7187BC2027, 216}, // in the Tunnel to the Top
+            {0x87E1427187BC0D76, 218}, // on the Path to the Peak
+            {0x87E1437187BC0F29, 220}, // at the Crown Shrine
+            {0x87E4507187BE5B17, 222}, // at the Giant’s Foot
+            {0x87E44F7187BE5964, 224}, // in Roaring-Sea Caves
+            {0x87E4527187BE5E7D, 226}, // at the Frigid Sea
+            {0x87E4517187BE5CCA, 228}, // in Three-Point Pass
+            {0x87DA3F7187B5E9AF, 230}, // at Ballimere Lake
+            {0x87DA407187B5EB62, 232}, // in Lakeside Cave
+            {0x87DA417187B5ED15, 234}, // at Dyna Tree Hill
+
+            {0xD6EA3DE40B009E55, 204}, // on Slippery Slope
+            {0xADF616908BD308DF, 208}, // in Frostpoint Field
+            {0x308C5EB6A846D1F0, 210}, // in the Giant’s Bed
+            {0x50E781F91B97C049, 212}, // in the Old Cemetery
+            {0xC303110BF1EC3322, 214}, // on Snowslide Slope
+            {0xB768660B0BF4C0C3, 216}, // in the Tunnel to the Top
+            {0xFCB78AFCCECAF094, 218}, // on the Path to the Peak
+            {0xA345459C03EA6673, 222}, // at the Giant’s Foot
+            {0xE4A982819ACF7292, 224}, // in Roaring-Sea Caves
+            {0x18AAF85178C7B839, 226}, // at the Frigid Sea
+            {0x3EC6FCDC0C77D460, 228}, // in Three-Point Pass
+            {0xE5225F9325CCA74B, 230}, // at Ballimere Lake
+            {0x2F1B41507D695958, 232}, // in Lakeside Cave
+
+            {0xF8A59FCA719D1EAE, 210}, // in the Giant’s Bed (Surfing), also used for 222 (in the Giant's Foot surfing)
+            {0x55D8F226A42368B7, 224}, // in Roaring-Sea Caves (Surfing)
+            {0x78536116469DC44D, 226}, // at the Frigid Sea (Surfing)
+            {0x9BDD6D11FFBEDA3F, 230}, // at Ballimere Lake (Surfing)
         };
 
         public static readonly IReadOnlyDictionary<ulong, string> Zones = new Dictionary<ulong, string>
@@ -343,6 +380,43 @@ public static class SWSHInfo
             { 0xC92D06352150C78A, "Insular Sea (Sharpedo)" },
             { 0xED1F9772AA35C3CD, "Workout Sea (Sharpedo)" },
             { 0x9C0049D3E6129924, "Honeycalm Sea (Sharpedo)" },
+
+             // DLC2
+            { 0x87E14B7187BC1CC1, "Slippery Slope" },
+            { 0x87E1487187BC17A8, "Freezington" },
+            { 0x87E1497187BC195B, "Frostpoint Field" },
+            { 0x87E14E7187BC21DA, "the Giant’s Bed" },
+            { 0x87E14F7187BC238D, "the Old Cemetery" },
+            { 0x87E14C7187BC1E74, "Snowslide Slope" },
+            { 0x87E14D7187BC2027, "the Tunnel to the Top" },
+            { 0x87E1427187BC0D76, "the Path to the Peak" },
+            { 0x87E1437187BC0F29, "the Crown Shrine" },
+            { 0x87E4507187BE5B17, "the Giant’s Foot" },
+            { 0x87E44F7187BE5964, "Roaring-Sea Caves" },
+            { 0x87E4527187BE5E7D, "the Frigid Sea" },
+            { 0x87E4517187BE5CCA, "Three-Point Pass" },
+            { 0x87DA3F7187B5E9AF, "Ballimere Lake" },
+            { 0x87DA407187B5EB62, "Lakeside Cave" },
+            { 0x87DA417187B5ED15, "Dyna Tree Hill" },
+
+            { 0xD6EA3DE40B009E55, "Slippery Slope" },
+            { 0xADF616908BD308DF, "Frostpoint Field" },
+            { 0x308C5EB6A846D1F0, "the Giant’s Bed" },
+            { 0x50E781F91B97C049, "the Old Cemetery" },
+            { 0xC303110BF1EC3322, "Snowslide Slope" },
+            { 0xB768660B0BF4C0C3, "the Tunnel to the Top" },
+            { 0xFCB78AFCCECAF094, "the Path to the Peak" },
+            { 0xA345459C03EA6673, "the Giant’s Foot" },
+            { 0xE4A982819ACF7292, "Roaring-Sea Caves" },
+            { 0x18AAF85178C7B839, "the Frigid Sea" },
+            { 0x3EC6FCDC0C77D460, "Three-Point Pass" },
+            { 0xE5225F9325CCA74B, "Ballimere Lake" },
+            { 0x2F1B41507D695958, "Lakeside Cave" },
+
+            { 0xF8A59FCA719D1EAE,"Giant’s Bed and Giant's Foot (Surfing)" },
+            { 0x55D8F226A42368B7,"Roaring-Sea Caves (Surfing)" },
+            { 0x78536116469DC44D,"Frigid Sea (Surfing)" },
+            { 0x9BDD6D11FFBEDA3F,"Ballimere Lake (Surfing)" },
         };
     }
 

pkNX.Randomization/Randomizers/FormRandomizer.cs

@@ -20,6 +20,7 @@ public int GetRandomForme(int species, bool mega, bool fused, bool alola, bool g
                 stats = Personal.Table;
             if (stats[species].FormeCount <= 1)
                 return 0;
+            bool IsGen6 = Personal.MaxSpeciesID == 721;
 
             switch ((Species)species)
             {
@@ -33,6 +34,8 @@ public int GetRandomForme(int species, bool mega, bool fused, bool alola, bool g
                 case Spewpa:
                 case Vivillon:
                     return 30; // save file specific
+                case Zygarde when !IsGen6:
+                    return Util.Random.Next(4); // Complete Forme is battle only
                 case Minior:
                     return Util.Random.Next(7); // keep the core color a surprise
 
@@ -69,7 +72,7 @@ public int GetInvalidForm(int species, bool galar, PersonalTable stats)
             {
                 (int)Pikachu when stats.TableLength == 1181 => 8, // LGPE Partner Pikachu
                 (int)Slowbro when galar => 1, // Mega Slowbro
-                (int)Darmanitan => 1, // Zen Mode
+                (int)Darmanitan => 1, // Zen Mode (battle only)
                 _ => throw new ArgumentOutOfRangeException(nameof(species))
             };
         }

pkNX.Randomization/Randomizers/Settings/SpeciesSettings.cs

@@ -167,7 +167,7 @@ private void AddGen6Species(List<int> list, int maxSpecies)
 
         private void AddGen7Species(List<int> list, int maxSpecies)
         {
-            if (maxSpecies <= 721)
+            if (maxSpecies <= Legal.MaxSpeciesID_6)
                 return;
             list.AddRange(Enumerable.Range(722, 50)); // Rowlet - Pyukumuku
             list.AddRange(Enumerable.Range(774, 11)); // Minior - Kommo-o
@@ -201,6 +201,7 @@ private void AddGen8Species(List<int> list, int maxSpecies)
             {
                 list.AddRange(Enumerable.Range(888, 3)); // Zacian, Zamazenta, Eternatus
                 list.AddRange(Enumerable.Range(891, 2)); // Kubfu, Urshifu
+                list.AddRange(Enumerable.Range(894, 5)); // Regieleki, Regidrago, Glastrier, Spectrier, Calyrex
             }
             if (Events) list.Add(893); // Zarude
         }

pkNX.Sprites/Properties/Resources.Designer.cs

@@ -22550,6 +22550,16 @@ public class Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap b_144_1 {
+            get {
+                object obj = ResourceManager.GetObject("b_144_1", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -22570,6 +22580,16 @@ public class Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap b_145_1 {
+            get {
+                object obj = ResourceManager.GetObject("b_145_1", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -22590,6 +22610,16 @@ public class Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap b_146_1 {
+            get {
+                object obj = ResourceManager.GetObject("b_146_1", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -23890,6 +23920,16 @@ public class Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap b_199_1 {
+            get {
+                object obj = ResourceManager.GetObject("b_199_1", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -45630,6 +45670,76 @@ public class Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap b_894 {
+            get {
+                object obj = ResourceManager.GetObject("b_894", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap b_895 {
+            get {
+                object obj = ResourceManager.GetObject("b_895", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap b_896 {
+            get {
+                object obj = ResourceManager.GetObject("b_896", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap b_897 {
+            get {
+                object obj = ResourceManager.GetObject("b_897", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap b_898 {
+            get {
+                object obj = ResourceManager.GetObject("b_898", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap b_898_1 {
+            get {
+                object obj = ResourceManager.GetObject("b_898_1", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap b_898_2 {
+            get {
+                object obj = ResourceManager.GetObject("b_898_2", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -47180,6 +47290,16 @@ public class Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap bitem_1592 {
+            get {
+                object obj = ResourceManager.GetObject("bitem_1592", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -47200,6 +47320,26 @@ public class Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap bitem_1604 {
+            get {
+                object obj = ResourceManager.GetObject("bitem_1604", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap bitem_1606 {
+            get {
+                object obj = ResourceManager.GetObject("bitem_1606", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>

pkNX.Sprites/Properties/Resources.resx

@@ -15763,4 +15763,46 @@
   <data name="b_490_e" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Sprites\Big Pokemon Sprites\b_490-e.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="bitem_1592" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Sprites\Big Items\bitem_1592.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="bitem_1604" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Sprites\Big Items\bitem_1604.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="bitem_1606" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Sprites\Big Items\bitem_1606.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="b_144_1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Sprites\Big Pokemon Sprites\b_144-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="b_145_1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Sprites\Big Pokemon Sprites\b_145-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="b_146_1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Sprites\Big Pokemon Sprites\b_146-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="b_199_1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Sprites\Big Pokemon Sprites\b_199-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="b_894" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Sprites\Big Pokemon Sprites\b_894.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="b_895" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Sprites\Big Pokemon Sprites\b_895.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="b_896" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Sprites\Big Pokemon Sprites\b_896.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="b_897" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Sprites\Big Pokemon Sprites\b_897.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="b_898" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Sprites\Big Pokemon Sprites\b_898.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="b_898_1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Sprites\Big Pokemon Sprites\b_898-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="b_898_2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Sprites\Big Pokemon Sprites\b_898-2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>