diff --git a/Directory.Build.props b/Directory.Build.props index e64c2a02e6b..e177d911c37 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,6 +1,6 @@ - 24.06.03 + 24.07.03 12 enable en diff --git a/PKHeX.Core/Legality/LegalityAnalysis.cs b/PKHeX.Core/Legality/LegalityAnalysis.cs index 20a0ef27be2..6316bfde926 100644 --- a/PKHeX.Core/Legality/LegalityAnalysis.cs +++ b/PKHeX.Core/Legality/LegalityAnalysis.cs @@ -252,7 +252,7 @@ private void ParsePK8() private void ParsePK9() { UpdateChecks(); - Transfer.VerifyTransferLegalityG9(this); + Transfer.VerifyTransferLegalityG8(this); } /// diff --git a/PKHeX.Core/Legality/Verifiers/TransferVerifier.cs b/PKHeX.Core/Legality/Verifiers/TransferVerifier.cs index 588f23a2851..38deddde873 100644 --- a/PKHeX.Core/Legality/Verifiers/TransferVerifier.cs +++ b/PKHeX.Core/Legality/Verifiers/TransferVerifier.cs @@ -142,33 +142,18 @@ public void VerifyTransferLegalityG8(LegalityAnalysis data) } } - if (pk.Format >= 9) - { - VerifyTransferLegalityG9(data); - return; - } - // Starting in Generation 8, games have a selective amount of species/forms from prior games. IPersonalTable pt = pk switch { PA8 => PersonalTable.LA, PB8 => PersonalTable.BDSP, + PK9 => PersonalTable.SV, _ => PersonalTable.SWSH, }; if (!pt.IsPresentInGame(pk.Species, pk.Form)) data.AddLine(GetInvalid(LTransferBad)); } - public void VerifyTransferLegalityG9(LegalityAnalysis data) - { - var pk = data.Entity; - var pt = PersonalTable.SV; - if (!pt.IsPresentInGame(pk.Species, pk.Form)) - data.AddLine(GetInvalid(LTransferBad)); - if (HomeTrackerUtil.IsRequired(data.EncounterMatch, pk)) - VerifyHOMETracker(data, pk); - } - private void VerifyHOMETransfer(LegalityAnalysis data, PKM pk) { if (pk is not IScaledSize s) diff --git a/PKHeX.Core/Resources/legality/mgdb/wc9.pkl b/PKHeX.Core/Resources/legality/mgdb/wc9.pkl index 4f5e7d9545f..88193a4ed15 100644 Binary files a/PKHeX.Core/Resources/legality/mgdb/wc9.pkl and b/PKHeX.Core/Resources/legality/mgdb/wc9.pkl differ diff --git a/PKHeX.Core/Resources/legality/wild/encounter_go_home.pkl b/PKHeX.Core/Resources/legality/wild/encounter_go_home.pkl index 54ada6006f1..091319545be 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 f0b0010fa01..a45ebc74b0b 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.Drawing.Misc/PKHeX.Drawing.Misc.csproj b/PKHeX.Drawing.Misc/PKHeX.Drawing.Misc.csproj index 86ae1d568c5..e2d0d547ba5 100644 --- a/PKHeX.Drawing.Misc/PKHeX.Drawing.Misc.csproj +++ b/PKHeX.Drawing.Misc/PKHeX.Drawing.Misc.csproj @@ -12,7 +12,7 @@ - + diff --git a/PKHeX.Drawing/PKHeX.Drawing.csproj b/PKHeX.Drawing/PKHeX.Drawing.csproj index b69d3fefc5b..e04075958f3 100644 --- a/PKHeX.Drawing/PKHeX.Drawing.csproj +++ b/PKHeX.Drawing/PKHeX.Drawing.csproj @@ -6,7 +6,7 @@ - + diff --git a/PKHeX.WinForms/Resources/text/changelog.txt b/PKHeX.WinForms/Resources/text/changelog.txt index 4bbf4452e35..ba8b8321ce5 100644 --- a/PKHeX.WinForms/Resources/text/changelog.txt +++ b/PKHeX.WinForms/Resources/text/changelog.txt @@ -1,7 +1,21 @@ PKHeX - By Kaphotics http://projectpokemon.org/pkhex/ -24/06/03 - New Update: +24/07/03 - New Update: + - Legality: + - - Added: Slot source legality checks for miscellaneous slots like Daycare. Shouldn't flag anyone ;) + - Added: Gen4 trainer stat record editor. Thanks @abcboy101 ! + - Added: Gen3 memory cards can now be auto-detected as the latest save file on startup/request. + - Added: Gen3 Berry Powder, Pokéblock, and Decoration editors. Thanks @abcboy101 ! + - Fixed: Gen9 eggs now no longer auto-clear trash bytes for nicknames (and no longer flag in doing so). + - Fixed: Gen5 misc editor now opens correctly for editing the Key system. + - Fixed: Gen4 pk4->ranch conversion no longer throws an error. + - Fixed: Gen4 battle revolution nickname/OT now reads correctly. + - Fixed: Gen1-3 saves with misc footers are retained as intended. + - Changed: Some internals changed to better work with web browsers (wasm). Thanks @arleypadua ! + - Changed: Resource fetching abstraction extracted for better reuse with plugins. + +24/06/03 - New Update: (96798) [8875111] - Legality: Added automatic (basic) Trash Byte checks for Switch-era (Gen7b+) files. Further refinement & expansion in the future. - - Fixed: Mystery gifts distributed with nicknames no longer flag IsNicknamed as invalid. - Added: Entity editor move dropdown now displays the move's type on the left side. diff --git a/Tests/PKHeX.Core.Tests/PKHeX.Core.Tests.csproj b/Tests/PKHeX.Core.Tests/PKHeX.Core.Tests.csproj index 33cf134f084..239fd4512bb 100644 --- a/Tests/PKHeX.Core.Tests/PKHeX.Core.Tests.csproj +++ b/Tests/PKHeX.Core.Tests/PKHeX.Core.Tests.csproj @@ -7,9 +7,9 @@ - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive