From 0ba64a8da294415d18d22cc2e2f5be8fbe8f9e7c Mon Sep 17 00:00:00 2001 From: James Park Date: Wed, 21 Jun 2023 03:36:28 +1000 Subject: [PATCH] Pokemon location tooltip fix for PLA + miscellaneous comment fixes (#3920) * Fix Pokemon tooltip for LA incorrectly referring to SwSh location table * Fixes to comments referring to incorrect generation/version/game --------- Co-authored-by: James Park <5295838+pencilethics@users.noreply.github.com> --- PKHeX.Core/Game/GameStrings/GameStrings.cs | 2 +- PKHeX.Core/Legality/Areas/EncounterArea8a.cs | 2 +- PKHeX.Core/Legality/Encounters/EncounterSlot/EncounterSlot8a.cs | 2 +- PKHeX.Core/Legality/Encounters/EncounterSlot/EncounterSlot9.cs | 2 +- .../Legality/Encounters/EncounterStatic/EncounterStatic8b.cs | 2 +- .../Legality/Encounters/EncounterTrade/EncounterTrade8b.cs | 2 +- PKHeX.Core/Saves/SAV9SV.cs | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/PKHeX.Core/Game/GameStrings/GameStrings.cs b/PKHeX.Core/Game/GameStrings/GameStrings.cs index d193f0972..2bf994b39 100644 --- a/PKHeX.Core/Game/GameStrings/GameStrings.cs +++ b/PKHeX.Core/Game/GameStrings/GameStrings.cs @@ -763,7 +763,7 @@ private static int GetGeneration(int generation, bool isEggLocation, int format) 6 => Gen6, 7 => GameVersion.Gen7b.Contains(version) ? Gen7b : Gen7, - 8 when version is GameVersion.PLA => Gen8, + 8 when version is GameVersion.PLA => Gen8a, 8 when GameVersion.BDSP.Contains(version) => Gen8b, 8 => Gen8, 9 => Gen9, diff --git a/PKHeX.Core/Legality/Areas/EncounterArea8a.cs b/PKHeX.Core/Legality/Areas/EncounterArea8a.cs index e9d960962..266c842c0 100644 --- a/PKHeX.Core/Legality/Areas/EncounterArea8a.cs +++ b/PKHeX.Core/Legality/Areas/EncounterArea8a.cs @@ -6,7 +6,7 @@ namespace PKHeX.Core; /// /// -/// encounter area +/// encounter area /// public sealed record EncounterArea8a : EncounterArea { diff --git a/PKHeX.Core/Legality/Encounters/EncounterSlot/EncounterSlot8a.cs b/PKHeX.Core/Legality/Encounters/EncounterSlot/EncounterSlot8a.cs index c760297c6..cfad79987 100644 --- a/PKHeX.Core/Legality/Encounters/EncounterSlot/EncounterSlot8a.cs +++ b/PKHeX.Core/Legality/Encounters/EncounterSlot/EncounterSlot8a.cs @@ -3,7 +3,7 @@ namespace PKHeX.Core; /// -/// Encounter Slot found in . +/// Encounter Slot found in . /// /// public sealed record EncounterSlot8a : EncounterSlot, IAlphaReadOnly, IMasteryInitialMoveShop8 diff --git a/PKHeX.Core/Legality/Encounters/EncounterSlot/EncounterSlot9.cs b/PKHeX.Core/Legality/Encounters/EncounterSlot/EncounterSlot9.cs index 4e0daff4c..e5492b103 100644 --- a/PKHeX.Core/Legality/Encounters/EncounterSlot/EncounterSlot9.cs +++ b/PKHeX.Core/Legality/Encounters/EncounterSlot/EncounterSlot9.cs @@ -4,7 +4,7 @@ namespace PKHeX.Core; /// -/// Encounter Slot found in . +/// Encounter Slot found in . /// /// public sealed record EncounterSlot9 : EncounterSlot diff --git a/PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic8b.cs b/PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic8b.cs index 8cbe33acb..e5398fa74 100644 --- a/PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic8b.cs +++ b/PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic8b.cs @@ -4,7 +4,7 @@ namespace PKHeX.Core; /// -/// Generation 7 Static Encounter +/// Generation 8 Static Encounter /// /// public sealed record EncounterStatic8b : EncounterStatic, IStaticCorrelation8b diff --git a/PKHeX.Core/Legality/Encounters/EncounterTrade/EncounterTrade8b.cs b/PKHeX.Core/Legality/Encounters/EncounterTrade/EncounterTrade8b.cs index 5717c313b..993ec08b9 100644 --- a/PKHeX.Core/Legality/Encounters/EncounterTrade/EncounterTrade8b.cs +++ b/PKHeX.Core/Legality/Encounters/EncounterTrade/EncounterTrade8b.cs @@ -1,7 +1,7 @@ namespace PKHeX.Core; /// -/// Generation 7 Trade Encounter +/// Generation 8 BD/SP Trade Encounter /// /// public sealed record EncounterTrade8b : EncounterTrade, IContestStatsReadOnly, IScaledSizeReadOnly, IFixedOTFriendship diff --git a/PKHeX.Core/Saves/SAV9SV.cs b/PKHeX.Core/Saves/SAV9SV.cs index e2c0038a0..00c5bc473 100644 --- a/PKHeX.Core/Saves/SAV9SV.cs +++ b/PKHeX.Core/Saves/SAV9SV.cs @@ -5,7 +5,7 @@ namespace PKHeX.Core; /// -/// Generation 9 object for games. +/// Generation 9 object for games. /// public sealed class SAV9SV : SaveFile, ISaveBlock9Main, ISCBlockArray, ISaveFileRevision {