diff --git a/Directory.Build.props b/Directory.Build.props index 764ed87b7..c8a4aa3d0 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,6 +1,6 @@ - 23.09.25 + 23.10.11 11 enable en diff --git a/PKHeX.Core/Legality/Encounters/Data/Gen8/Encounters8a.cs b/PKHeX.Core/Legality/Encounters/Data/Gen8/Encounters8a.cs index 94a113bb9..9b0ee6695 100644 --- a/PKHeX.Core/Legality/Encounters/Data/Gen8/Encounters8a.cs +++ b/PKHeX.Core/Legality/Encounters/Data/Gen8/Encounters8a.cs @@ -75,6 +75,7 @@ internal static class Encounters8a new(201,027,25,U) { Location = 006, Method = Fixed }, // Unown ? // Future updates will handle crossovers better. + new(201,002,25,U) { Location = 010, Method = Fixed }, // Unown C (Coronet Highlands) new(201,017,25,U) { Location = 009, Method = Fixed }, // Unown R (Cobalt Coastlands) new(201,026,25,U) { Location = 099, Method = Fixed }, // Unown ! (Arena’s Approach) new(201,026,25,U) { Location = 141, Method = Fixed }, // Unown ! (Icepeak Arena) diff --git a/PKHeX.Core/Resources/legality/wild/encounter_go_home.pkl b/PKHeX.Core/Resources/legality/wild/encounter_go_home.pkl index dea8d85a6..545111ed4 100644 Binary files a/PKHeX.Core/Resources/legality/wild/encounter_go_home.pkl and b/PKHeX.Core/Resources/legality/wild/encounter_go_home.pkl differ diff --git a/PKHeX.Core/Resources/legality/wild/encounter_go_lgpe.pkl b/PKHeX.Core/Resources/legality/wild/encounter_go_lgpe.pkl index 0839daf44..31da31c6b 100644 Binary files a/PKHeX.Core/Resources/legality/wild/encounter_go_lgpe.pkl and b/PKHeX.Core/Resources/legality/wild/encounter_go_lgpe.pkl differ diff --git a/PKHeX.Core/Saves/Access/SaveBlockAccessor9SV.cs b/PKHeX.Core/Saves/Access/SaveBlockAccessor9SV.cs index 06aca1610..ef31b0b8a 100644 --- a/PKHeX.Core/Saves/Access/SaveBlockAccessor9SV.cs +++ b/PKHeX.Core/Saves/Access/SaveBlockAccessor9SV.cs @@ -1,5 +1,4 @@ using System.Collections.Generic; -using System.Runtime.CompilerServices; // ReSharper disable UnusedMember.Local #pragma warning disable IDE0051 // Remove unused private members #pragma warning disable RCS1213 // Remove unused member declaration. diff --git a/PKHeX.Core/Saves/Util/SaveUtil.cs b/PKHeX.Core/Saves/Util/SaveUtil.cs index 4e5c2d545..c4ce1d750 100644 --- a/PKHeX.Core/Saves/Util/SaveUtil.cs +++ b/PKHeX.Core/Saves/Util/SaveUtil.cs @@ -142,6 +142,8 @@ public static class SaveUtil }; #endif + private const int SIZE_G9_202 = 0xC8E; // Add 2 blocks (1 obj 0xC80, 1 bool) = 4{key}1{obj}4{len} + 4{key}1{boolT/boolF} + private static readonly HashSet SizesSV = new() { SIZE_G9_0, SIZE_G9_0a, @@ -155,31 +157,31 @@ public static class SaveUtil SIZE_G9_3G0, SIZE_G9_3G1, SIZE_G9_3P0, SIZE_G9_3P1, - SIZE_G9_DLC1_0, - SIZE_G9_DLC1_1, - SIZE_G9_DLC1_2, - SIZE_G9_DLC1_3, - SIZE_G9_DLC1_4, - SIZE_G9_DLC1_5, - SIZE_G9_DLC1_6, - SIZE_G9_DLC1_7, - SIZE_G9_DLC1_8, - SIZE_G9_DLC1_9, - SIZE_G9_DLC1_A, - SIZE_G9_DLC1_B, - SIZE_G9_DLC1_C, - SIZE_G9_DLC1_D, - SIZE_G9_DLC1_E, - SIZE_G9_DLC1_F, - SIZE_G9_DLC1_G, - SIZE_G9_DLC1_H, - SIZE_G9_DLC1_I, - SIZE_G9_DLC1_Q, - SIZE_G9_DLC1_W, - SIZE_G9_DLC1_R, - SIZE_G9_DLC1_T, - SIZE_G9_DLC1_Y, - SIZE_G9_DLC1_U, + SIZE_G9_DLC1_0, SIZE_G9_DLC1_0 + SIZE_G9_202, + SIZE_G9_DLC1_1, SIZE_G9_DLC1_1 + SIZE_G9_202, + SIZE_G9_DLC1_2, SIZE_G9_DLC1_2 + SIZE_G9_202, + SIZE_G9_DLC1_3, SIZE_G9_DLC1_3 + SIZE_G9_202, + SIZE_G9_DLC1_4, SIZE_G9_DLC1_4 + SIZE_G9_202, + SIZE_G9_DLC1_5, SIZE_G9_DLC1_5 + SIZE_G9_202, + SIZE_G9_DLC1_6, SIZE_G9_DLC1_6 + SIZE_G9_202, + SIZE_G9_DLC1_7, SIZE_G9_DLC1_7 + SIZE_G9_202, + SIZE_G9_DLC1_8, SIZE_G9_DLC1_8 + SIZE_G9_202, + SIZE_G9_DLC1_9, SIZE_G9_DLC1_9 + SIZE_G9_202, + SIZE_G9_DLC1_A, SIZE_G9_DLC1_A + SIZE_G9_202, + SIZE_G9_DLC1_B, SIZE_G9_DLC1_B + SIZE_G9_202, + SIZE_G9_DLC1_C, SIZE_G9_DLC1_C + SIZE_G9_202, + SIZE_G9_DLC1_D, SIZE_G9_DLC1_D + SIZE_G9_202, + SIZE_G9_DLC1_E, SIZE_G9_DLC1_E + SIZE_G9_202, + SIZE_G9_DLC1_F, SIZE_G9_DLC1_F + SIZE_G9_202, + SIZE_G9_DLC1_G, SIZE_G9_DLC1_G + SIZE_G9_202, + SIZE_G9_DLC1_H, SIZE_G9_DLC1_H + SIZE_G9_202, + SIZE_G9_DLC1_I, SIZE_G9_DLC1_I + SIZE_G9_202, + SIZE_G9_DLC1_Q, SIZE_G9_DLC1_Q + SIZE_G9_202, + SIZE_G9_DLC1_W, SIZE_G9_DLC1_W + SIZE_G9_202, + SIZE_G9_DLC1_R, SIZE_G9_DLC1_R + SIZE_G9_202, + SIZE_G9_DLC1_T, SIZE_G9_DLC1_T + SIZE_G9_202, + SIZE_G9_DLC1_Y, SIZE_G9_DLC1_Y + SIZE_G9_202, + SIZE_G9_DLC1_U, SIZE_G9_DLC1_U + SIZE_G9_202, }; private static readonly HashSet SizesSWSH = new() diff --git a/PKHeX.WinForms/Resources/text/changelog.txt b/PKHeX.WinForms/Resources/text/changelog.txt index 433d014f6..6b0bfdaa9 100644 --- a/PKHeX.WinForms/Resources/text/changelog.txt +++ b/PKHeX.WinForms/Resources/text/changelog.txt @@ -1,7 +1,18 @@ PKHeX - By Kaphotics http://projectpokemon.org/pkhex/ -23/09/25 - New Update: +23/10/11 - New Update: + - Added support for Scarlet & Violet 2.0.2 save file sizes. + - Legality: + - - Badwords list has been updated to be more strict per latest Nintendo Switch 16.0.0 firmware. Thanks @Bl4ckSh4rk! + - - Gen9 Distribution Outbreaks now recognized. Thanks @Lusamine & @sora10pls! + - - Gen9 Crossover met location logic tweaked for better location identification in Kitakami. + - - Gen4 Pokéwalker IV spreads are now validated. Thanks @Lincoln-LM & @HappyLappy1! + - Added: Gen8 SW/SH adventure start date can now be changed in the Trainer Editor. Thansk @foohyfooh! + - Added: Gen4 Pokeathlon Points can now be edited via the Block Editor. + - Fixed: Initial program startup now notifies all plugins when a save is loaded on startup. + +23/09/25 - New Update: (100007) [7579695] - Added support for more Scarlet & Violet 2.0.1 save file sizes. - Legality: Added more Kitakami encounters (sub-zones) and basic weather mark recognition. - Fixed: Encounter template recognition regressions resolved (Gen4 Pokewalker, Gen9 static encounter scale).