Update 23.09.16 - Teal Mask

Co-Authored-By: Matt <17801814+sora10pls@users.noreply.github.com> Co-Authored-By: SciresM <8676005+SciresM@users.noreply.github.com> Co-Authored-By: Lusamine <30205550+Lusamine@users.noreply.github.com>
kwsch · Sep 16, 2023 · 7703576 · 7703576
1 parent c09a464
commit 7703576
Show file tree

Hide file tree

Showing 657 changed files with 4,861 additions and 2,517 deletions.
diff --git a/.github/README-de.md b/.github/README-de.md
@@ -24,7 +24,7 @@ PKHeX erwartet entschlüsselte Spielstände. Da diese konsolenspezifisch verschl
 
 ## Screenshots
 
-![Main Window](https://i.imgur.com/f2oF00t.png)
+![Main Window](https://i.imgur.com/37SMQSr.png)
 
 ## Erstellen
 

diff --git a/.github/README-es.md b/.github/README-es.md
@@ -24,7 +24,7 @@ PKHeX espera archivos de guardado que no estén cifrados con las claves específ
 
 ## Capturas de Pantalla
 
-![Pantalla principal](https://i.imgur.com/vQrE25t.png)
+![Pantalla principal](https://i.imgur.com/gREbXFH.png)
 
 ## Building
 

diff --git a/.github/README-fr.md b/.github/README-fr.md
@@ -23,7 +23,7 @@ PKHeX attend des fichiers de sauvegarde qui ne sont pas chiffrés avec des clés
 
 ## Captures d'écran
 
-![Main Window](https://i.imgur.com/H3GKLtk.png)
+![Main Window](https://i.imgur.com/fk6IX2a.png)
 
 ## Construction
 

diff --git a/.github/README-it.md b/.github/README-it.md
@@ -24,7 +24,7 @@ PKHeX si aspetta file di salvataggio non criptati con le chiavi specifiche della
 
 ## Screenshots
 
-![Main Window](https://i.imgur.com/18b86pC.png)
+![Main Window](https://i.imgur.com/epXOQ5M.png)
 
 ## Building
 

diff --git a/.github/README-zh.md b/.github/README-zh.md
@@ -24,7 +24,7 @@ PKHeX 所读取存档文件必须是未经主机唯一密钥加密，因此请
 
 ## 截图
 
-![主介面](https://i.imgur.com/KjYhgj9.png)
+![主介面](https://i.imgur.com/hM8GJ4U.png)
 
 ## 构建
 

diff --git a/.github/README-zhHK.md b/.github/README-zhHK.md
@@ -24,7 +24,7 @@ PKHeX 所讀取檔案須未經主機唯一密鑰加密，因而請使用儲存
 
 ## 螢幕擷取截圖
 
-![主介面](https://i.imgur.com/KNwURaM.png)
+![主介面](https://i.imgur.com/U5FKBIF.png)
 
 ## 構建
 

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <Version>23.08.23</Version>
+    <Version>23.09.16</Version>
     <LangVersion>11</LangVersion>
     <Nullable>enable</Nullable>
     <NeutralLanguage>en</NeutralLanguage>

diff --git a/PKHeX.Core/Editing/Showdown/ShowdownParsing.cs b/PKHeX.Core/Editing/Showdown/ShowdownParsing.cs
@@ -102,6 +102,7 @@ public static string GetShowdownFormName(ushort species, string form)
             (int)Necrozma when form is "Dusk"           => $"{form}-Mane",
             (int)Necrozma when form is "Dawn"           => $"{form}-Wings",
             (int)Polteageist or (int)Sinistea           => form == "Antique" ? form : string.Empty,
+            (int)Sinistcha or (int)Poltchageist         => form == "Antique" ? form : string.Empty,
             (int)Maushold when form is "Family of Four" => "Four",
 
             (int)Greninja or (int)Rockruff or (int)Koraidon or (int)Miraidon => string.Empty,

diff --git a/PKHeX.Core/Game/Enums/Ability.cs b/PKHeX.Core/Game/Enums/Ability.cs
@@ -304,5 +304,13 @@ public enum Ability : ushort
     ArmorTail,
     EarthEater,
     MyceliumMight,
+    Hospitality,
+    MindsEye,
+    EmbodyAspect0,
+    EmbodyAspect1,
+    EmbodyAspect2,
+    EmbodyAspect3,
+    ToxicChain,
+    SupersweetSyrup,
     MAX_COUNT,
 }
diff --git a/PKHeX.Core/Game/Enums/Move.cs b/PKHeX.Core/Game/Enums/Move.cs
@@ -906,5 +906,9 @@ public enum Move : ushort
     NoxiousTorque,
     CombatTorque,
     MagicalTorque,
+    BloodMoon,
+    MatchaGotcha,
+    SyrupBomb,
+    IvyCudgel,
     MAX_COUNT,
 }
diff --git a/PKHeX.Core/Game/Enums/Species.cs b/PKHeX.Core/Game/Enums/Species.cs
@@ -1016,5 +1016,12 @@ public enum Species : ushort
     Miraidon,
     WalkingWake,
     IronLeaves,
+    Dipplin,
+    Poltchageist,
+    Sinistcha,
+    Okidogi,
+    Munkidori,
+    Fezandipiti,
+    Ogerpon,
     MAX_COUNT,
 }
diff --git a/PKHeX.Core/Game/GameStrings/GameStrings.cs b/PKHeX.Core/Game/GameStrings/GameStrings.cs
@@ -188,6 +188,11 @@ private void Sanitize()
         // De-duplicate the Calyrex ability names
         abilitylist[(int)Core.Ability.AsOneI] += $" ({specieslist[(int)Core.Species.Glastrier]})";
         abilitylist[(int)Core.Ability.AsOneG] += $" ({specieslist[(int)Core.Species.Spectrier]})";
+        // De-duplicate the Ogerpon ability names
+        abilitylist[(int)Core.Ability.EmbodyAspect0] += $" ({forms[FormConverter.MaskTeal]})";
+        abilitylist[(int)Core.Ability.EmbodyAspect1] += $" ({forms[FormConverter.MaskWellspring]})";
+        abilitylist[(int)Core.Ability.EmbodyAspect2] += $" ({forms[FormConverter.MaskHearthflame]})";
+        abilitylist[(int)Core.Ability.EmbodyAspect3] += $" ({forms[FormConverter.MaskCornerstone]})";
 
         // Replace the Egg Name with ---; egg name already stored to eggname
         specieslist[0] = EmptyIndex;
@@ -290,6 +295,9 @@ private static void SanitizeItemsSV(string[] items)
         items[2329] += " (1)"; // Academy Ball
         items[2330] += " (2)"; // Academy Ball
         items[0694] += " (G6-8)"; // TM100, not held.
+
+        items[2418] += " (SL)"; // Academy Chairs
+        items[2419] += " (VL)"; // Academy Chairs
     }
 
     private static void SanitizeItemsLA(string[] items)
@@ -592,6 +600,19 @@ private void SanitizeMetGen9(LocationSet6 set)
         m[120] += " (2)"; // Zero Lab
         m[122] += " (3)"; // Zero Lab
 
+        m[144] += " (1)"; // Oni Mountain
+        m[147] += " (2)"; // Oni Mountain
+        m[149] += " (3)"; // Oni Mountain
+        m[150] += " (4)"; // Oni Mountain
+        m[169] += " (5)"; // Oni Mountain
+
+        m[152] += " (1)"; // Crystal Pool
+        m[154] += " (2)"; // Crystal Pool
+        m[153] += " (1)"; // Oni Mountain Summit
+        m[155] += " (2)"; // Oni Mountain Summit
+        m[164] += " (1)"; // Kitakami Wilds
+        m[167] += " (2)"; // Kitakami Wilds
+
         set.Met3[1] += $" ({NPC})";      // Anything from an NPC
         set.Met3[2] += $" ({EggName})";  // Egg From Link Trade
         for (int i = 3; i <= 6; i++) // distinguish first set of regions (unused) from second (used)

diff --git a/PKHeX.Core/Game/Locations/Locations9.cs b/PKHeX.Core/Game/Locations/Locations9.cs
@@ -4,6 +4,16 @@ namespace PKHeX.Core;
 
 internal static class Locations9
 {
+    /// <summary>
+    /// Checks if the location is accessible in Paldea (without DLC).
+    /// </summary>
+    public static bool IsAccessiblePreDLC(ushort location) => !IsKitakami(location);
+
+    /// <summary>
+    /// Checks if the location is accessible in Kitakami.
+    /// </summary>
+    public static bool IsKitakami(ushort location) => location is (>= 132 and <= 170);
+
     public static ReadOnlySpan<byte> Met0 => new byte[]
     {
              002, 004, 006, 008,
@@ -23,7 +33,10 @@ internal static class Locations9
         067, 069,
         099, 101, 103, 105, 107, 109,
         111, 113, 115, 117,
-        130, 131,
+        130, 131, 132, 134, 136, 138,
+        140, 142, 144, 146, 148, 150,
+        152, 154, 156, 158, 160, 162,
+        164, 166, 168, 170,
     };
 
     public static ReadOnlySpan<ushort> Met3 => new ushort[]
@@ -45,5 +58,5 @@ internal static class Locations9
         40070, 40071, 40072, 40073, 40074, 40075, 40076, 40077, 40078,
     };
 
-    public static ReadOnlySpan<ushort> Met6 => new ushort[] {/* XY */ 60001, 60003, /* ORAS */ 60004 };
+    public static ReadOnlySpan<ushort> Met6 => new ushort[] {/* XY */ 60001, 60003, /* ORAS */ 60004, /* SV */ 60005 };
 }
diff --git a/PKHeX.Core/Items/HeldItemLumpImage.cs b/PKHeX.Core/Items/HeldItemLumpImage.cs
@@ -45,9 +45,9 @@ public static class HeldItemLumpUtil
         8 when item is (>= 0328 and <= 0427) => HeldItemLumpImage.TechnicalMachine, // BDSP TMs
         8 when item is (>= 1130 and <= 1229) => HeldItemLumpImage.TechnicalRecord, // Gen8 TR
         9 when item is (>= 0328 and <= 0419) // TM01-TM92
-            or (>= 0618 and <= 0620) // TM93-TM95
-            or (>= 0690 and <= 0693) // TM96-TM99
-            or (>= 2160 and <= 2231) /* TM100-TM171 */ => HeldItemLumpImage.TechnicalMachine,
+            or (>= 0618 and <= 0620) // TM093-TM095
+            or (>= 0690 and <= 0693) // TM096-TM099
+            or (>= 2160 and <= 2261) /* TM100-TM201 */ => HeldItemLumpImage.TechnicalMachine,
         _ => HeldItemLumpImage.NotLump,
     };
 }
diff --git a/PKHeX.Core/Items/ItemStorage9SV.cs b/PKHeX.Core/Items/ItemStorage9SV.cs
@@ -47,19 +47,20 @@ public sealed class ItemStorage9SV : IItemStorage
         0279, 0280, 0281, 0282, 0283, 0284, 0285, 0286, 0287, 0288,
         0289, 0290, 0291, 0292, 0293, 0294, 0295, 0296, 0297, 0298,
         0299, 0300, 0301, 0302, 0303, 0304, 0305, 0306, 0307, 0308,
-        0309, 0310, 0311, 0312, 0313, 0326, 0485, 0486, 0487, 0488,
-        0489, 0490, 0491, 0538, 0539, 0540, 0541, 0542, 0543, 0544,
-        0545, 0546, 0547, 0564, 0565, 0566, 0567, 0568, 0569, 0570,
-        0639, 0640, 0644, 0645, 0648, 0649, 0650, 0795, 0796, 0846,
-        0849, 0853, 0854, 0855, 0856, 0879, 0880, 0881, 0882, 0883,
-        0884, 1103, 1104, 1116, 1117, 1118, 1119, 1120, 1121, 1122,
-        1123, 1124, 1125, 1126, 1127, 1128, 1231, 1232, 1233, 1234,
-        1235, 1236, 1237, 1238, 1239, 1240, 1241, 1242, 1243, 1244,
-        1245, 1246, 1247, 1248, 1249, 1250, 1251, 1253, 1254, 1582,
-        1592, 1606, 1777, 1778, 1779, 1861, 1862, 1863, 1864, 1865,
-        1866, 1867, 1868, 1869, 1870, 1871, 1872, 1873, 1874, 1875,
-        1876, 1877, 1878, 1879, 1880, 1881, 1882, 1883, 1884, 1885,
-        1886, 2344, 2345,
+        0309, 0310, 0311, 0312, 0313, 0325, 0326, 0327, 0485, 0486,
+        0487, 0488, 0489, 0490, 0491, 0537, 0538, 0539, 0540, 0541,
+        0542, 0543, 0544, 0545, 0546, 0547, 0564, 0565, 0566, 0567,
+        0568, 0569, 0570, 0639, 0640, 0644, 0645, 0648, 0649, 0650,
+        0795, 0796, 0846, 0849, 0853, 0854, 0855, 0856, 0879, 0880,
+        0881, 0882, 0883, 0884, 1103, 1104, 1116, 1117, 1118, 1119,
+        1120, 1121, 1122, 1123, 1124, 1125, 1126, 1127, 1128, 1231,
+        1232, 1233, 1234, 1235, 1236, 1237, 1238, 1239, 1240, 1241,
+        1242, 1243, 1244, 1245, 1246, 1247, 1248, 1249, 1250, 1251,
+        1253, 1254, 1582, 1592, 1606, 1777, 1778, 1779, 1861, 1862,
+        1863, 1864, 1865, 1866, 1867, 1868, 1869, 1870, 1871, 1872,
+        1873, 1874, 1875, 1876, 1877, 1878, 1879, 1880, 1881, 1882,
+        1883, 1884, 1885, 1886, 2344, 2345, 2401, 2402, 2403, 2404,
+        2406, 2407, 2408, 2411, 2412, 2413, 2414, 2415, 2416, 2479,
     };
 
     private static ReadOnlySpan<ushort> Pouch_TM_SV => new ushort[]
@@ -81,12 +82,10 @@ public sealed class ItemStorage9SV : IItemStorage
         2200, 2201, 2202, 2203, 2204, 2205, 2206, 2207, 2208, 2209,
         2210, 2211, 2212, 2213, 2214, 2215, 2216, 2217, 2218, 2219,
         2220, 2221, 2222, 2223, 2224, 2225, 2226, 2227, 2228, 2229,
-        2230, 2231,
-
-        // DLC additions
-        // 2232, 2233, 2234, 2235, 2236, 2237, 2238, 2239, 2240, 2241,
-        // 2242, 2243, 2244, 2245, 2246, 2247, 2248, 2249, 2250, 2251,
-        // 2252, 2253, 2254, 2255, 2256, 2257, 2258, 2259, 2260, 2261,
+        2230, 2231, 2232, 2233, 2234, 2235, 2236, 2237, 2238, 2239,
+        2240, 2241, 2242, 2243, 2244, 2245, 2246, 2247, 2248, 2249,
+        2250, 2251, 2252, 2253, 2254, 2255, 2256, 2257, 2258, 2259,
+        2260, 2261,
     };
 
     private static ReadOnlySpan<ushort> Pouch_Treasure_SV => new ushort[]
@@ -102,29 +101,25 @@ public sealed class ItemStorage9SV : IItemStorage
         1908, 1909, 1910, 1911, 1912, 1913, 1914, 1915, 1916, 1917,
         1918, 1919, 1920, 1921, 1922, 1923, 1924, 1925, 1926, 1927,
         1928, 1929, 1930, 1931, 1932, 1933, 1934, 1935, 1936, 1937,
-        1938, 1939, 1940, 1941, 1942, 1943, 1944, 1945, 1946,
-        2311, 2313,
-        2314, 2315, 2316, 2317, 2318, 2319, 2320, 2321, 2322, 2323,
-        2324, 2325, 2326, 2327, 2329, 2330, 2331, 2332, 2333, 2334,
-        2335, 2336, 2337, 2338, 2339, 2340, 2341, 2342, 2348, 2349,
-        2350, 2351, 2352, 2353, 2354, 2355, 2356, 2357, 2358, 2359,
-        2360, 2361, 2362, 2363, 2364, 2365, 2366, 2367, 2368, 2369,
-        2370, 2371, 2372, 2373, 2374, 2375, 2376, 2377, 2378, 2379,
-        2380, 2381, 2382, 2383, 2384, 2385, 2386, 2387, 2388, 2389,
-        2390, 2391, 2392, 2393, 2394, 2395, 2396, 2397, 2398, 2399,
-        2400,
-
-        // Item data is present, but the items have no associated text or sprites, so they do not appear in the bag.
-        // 1947, 1948, 1949, 1950, 1951, 1952, 1953, 1954, 1955,
+        1938, 1939, 1940, 1941, 1942, 1943, 1944, 1945, 1946, 2311,
+        2313, 2314, 2315, 2316, 2317, 2318, 2319, 2320, 2321, 2322,
+        2323, 2324, 2325, 2326, 2327, 2329, 2330, 2331, 2332, 2333,
+        2334, 2335, 2336, 2337, 2338, 2339, 2340, 2341, 2342, 2348,
+        2349, 2350, 2351, 2352, 2353, 2354, 2355, 2356, 2357, 2358,
+        2359, 2360, 2361, 2362, 2363, 2364, 2365, 2366, 2367, 2368,
+        2369, 2370, 2371, 2372, 2373, 2374, 2375, 2376, 2377, 2378,
+        2379, 2380, 2381, 2382, 2383, 2384, 2385, 2386, 2387, 2388,
+        2389, 2390, 2391, 2392, 2393, 2394, 2395, 2396, 2397, 2398,
+        2399, 2400, 2417, 2418, 2419, 2420, 2421, 2422, 2423, 2424,
+        2425, 2426, 2427, 2428, 2429, 2430, 2431, 2432, 2433, 2434,
+        2435, 2436, 2437,
     };
 
     private static ReadOnlySpan<ushort> Pouch_Event_SV => new ushort[]
     {
-        0632, 0638, 0703, 0765, 1278, 1590, 1591, 1829, 1830, 1831,
-        1832, 1833, 1834, 1835, 1836, 1857, 1858,
-
-        // Item data is present, but the items have no associated text or sprites, so they do not appear in the bag.
-        // 0078, 0466, 0631, 1267, 1587, 1589, 1837, 1838, 1839, 1840, 1841,
+        0078, 0466, 0631, 0632, 0638, 0703, 0765, 1267, 1278, 1587,
+        1589, 1590, 1591, 1829, 1830, 1831, 1832, 1833, 1834, 1835,
+        1836, 1857, 1858, 2405, 2409, 2410, 2480, 2481,
     };
 
     private static ReadOnlySpan<ushort> Pouch_Material_SV => new ushort[]
@@ -143,18 +138,15 @@ public sealed class ItemStorage9SV : IItemStorage
         2066, 2067, 2068, 2069, 2070, 2071, 2072, 2073, 2074, 2075,
         2076, 2077, 2078, 2079, 2080, 2081, 2082, 2083, 2084, 2085,
         2086, 2087, 2088, 2089, 2090, 2091, 2092, 2093, 2094, 2095,
-        2096, 2097, 2098, 2099, 2103, 2104, 2105,
-        2106, 2107, 2108, 2109, 2110, 2111, 2112, 2113, 2114, 2115,
-        2116, 2117, 2118, 2119, 2120, 2121, 2122, 2123, 2126, 2127,
-        2128, 2129, 2130, 2131, 2132, 2133, 2134, 2135, 2136, 2137,
-
-        2156, 2157,
-        2158, 2159,
-
-        // Item data is present, but the items have no associated text or sprites, so they do not appear in the bag.
-        // 2100, 2101, 2102,
-        // 2138, 2139, 2140, 2141, 2142, 2143, 2144, 2145, 2146, 2147,
-        // 2148, 2149, 2150, 2151, 2152, 2153, 2154, 2155,
+        2096, 2097, 2098, 2099, 2103, 2104, 2105, 2106, 2107, 2108,
+        2109, 2110, 2111, 2112, 2113, 2114, 2115, 2116, 2117, 2118,
+        2119, 2120, 2121, 2122, 2123, 2126, 2127, 2128, 2129, 2130,
+        2131, 2132, 2133, 2134, 2135, 2136, 2137, 2156, 2157, 2158,
+        2159, 2438, 2439, 2440, 2441, 2442, 2443, 2444, 2445, 2446,
+        2447, 2448, 2449, 2450, 2451, 2452, 2453, 2454, 2455, 2456,
+        2457, 2458, 2459, 2460, 2461, 2462, 2463, 2464, 2465, 2466,
+        2467, 2468, 2469, 2470, 2471, 2472, 2473, 2474, 2475, 2476,
+        2477, 2478,
     };
 
     internal static ReadOnlySpan<InventoryType> ValidTypes => new[]
@@ -182,12 +174,6 @@ public sealed class ItemStorage9SV : IItemStorage
 
         0111, // Odd Keystone
 
-        0208, // Enigma Berry
-        0209, // Micle Berry
-        0210, // Custap Berry
-        0211, // Jaboca Berry
-        0212, // Rowap Berry
-
         0485, // Red Apricorn
         0486, // Blue Apricorn
         0487, // Yellow Apricorn

diff --git a/PKHeX.Core/Legality/Breeding.cs b/PKHeX.Core/Legality/Breeding.cs
@@ -136,6 +136,7 @@ public static bool CanHatchAsEgg(ushort species, byte form, EntityContext contex
         (int)Floette when form == 5 => false, // can't get Eternal Flower from egg
         (int)Greninja when form == 1 => false, // can't get Battle Bond Greninja from egg
         (int)Sinistea or (int)Polteageist => false, // can't get Antique eggs
+        (int)Poltchageist or (int)Sinistcha => false, // can't get Antique eggs
         _ => true,
     };
 
@@ -204,6 +205,7 @@ public static bool CanHatchAsEgg(ushort species, byte form, EntityContext contex
         (int)RoaringMoon or (int)IronValiant => false,
         (int)Koraidon or (int)Miraidon => false,
         (int)WalkingWake or (int)IronLeaves => false,
+        (int)Okidogi or (int)Munkidori or (int)Fezandipiti or (int)Ogerpon => false,
 
         _ => true,
     };

diff --git a/PKHeX.Core/Legality/Core.cs b/PKHeX.Core/Legality/Core.cs
@@ -114,10 +114,20 @@ public static class Legal
   //internal const int MaxGameID_8b = (int)GameVersion.SP;
     internal const int MaxAbilityID_8b = MaxAbilityID_8_R2;
 
-    internal const int MaxSpeciesID_9 = (int)Species.IronLeaves;
-    internal const int MaxMoveID_9 = (int)Move.MagicalTorque;
-    internal const int MaxItemID_9 = 2400; // Yellow Dish
-    internal const int MaxAbilityID_9 = (int)Ability.MyceliumMight;
+    internal const int MaxSpeciesID_9 = MaxSpeciesID_9_T1;
+    internal const int MaxMoveID_9 = MaxMoveID_9_T1;
+    internal const int MaxItemID_9 = MaxItemID_9_T1;
+    internal const int MaxAbilityID_9 = MaxAbilityID_9_T1;
+
+    internal const int MaxSpeciesID_9_T0 = (int)Species.IronLeaves;
+    internal const int MaxMoveID_9_T0 = (int)Move.MagicalTorque;
+    internal const int MaxItemID_9_T0 = 2400; // Yellow Dish
+    internal const int MaxAbilityID_9_T0 = (int)Ability.MyceliumMight;
+
+    internal const int MaxSpeciesID_9_T1 = (int)Species.Ogerpon;
+    internal const int MaxMoveID_9_T1 = (int)Move.IvyCudgel;
+    internal const int MaxItemID_9_T1 = 2481; // Glimmering Charm
+    internal const int MaxAbilityID_9_T1 = (int)Ability.SupersweetSyrup;
 
     internal const int MaxBallID_9 = (int)Ball.LAOrigin;
     internal const int MaxGameID_9 = (int)GameVersion.VL;