From 5d5d913a0b009db77e7cc06acd58ed7cc6b4eaa1 Mon Sep 17 00:00:00 2001 From: Kurt Date: Fri, 25 Nov 2022 20:54:01 -0800 Subject: [PATCH] Handle lgpe base friendship case --- PKHeX.Core/Legality/Formatting/LegalityCheckStrings.cs | 2 +- PKHeX.Core/Legality/Verifiers/HistoryVerifier.cs | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/PKHeX.Core/Legality/Formatting/LegalityCheckStrings.cs b/PKHeX.Core/Legality/Formatting/LegalityCheckStrings.cs index f9fce4f2b..388ca2579 100644 --- a/PKHeX.Core/Legality/Formatting/LegalityCheckStrings.cs +++ b/PKHeX.Core/Legality/Formatting/LegalityCheckStrings.cs @@ -59,7 +59,7 @@ public static class LegalityCheckStrings public static string L_XEnigmaBerry_0 { get; set; } = "{0} Berry"; public static string L_XMatches0_1 { get; set; } = "Matches: {0} {1}"; public static string L_XWurmpleEvo_0 { get; set; } = "Wurmple Evolution: {0}"; - public static string L_XRareFormEvo_0_1 { get; set; } = "Evovles into Form: {0} (rare: {1})"; + public static string L_XRareFormEvo_0_1 { get; set; } = "Evolves into form: {0} (rare: {1})"; public static string LAbilityCapsuleUsed { get; set; } = "Ability available with Ability Capsule."; public static string LAbilityPatchUsed { get; set; } = "Ability available with Ability Patch."; diff --git a/PKHeX.Core/Legality/Verifiers/HistoryVerifier.cs b/PKHeX.Core/Legality/Verifiers/HistoryVerifier.cs index 90d31e01c..c7d102042 100644 --- a/PKHeX.Core/Legality/Verifiers/HistoryVerifier.cs +++ b/PKHeX.Core/Legality/Verifiers/HistoryVerifier.cs @@ -266,6 +266,7 @@ public static bool GetCanOTHandle(IEncounterTemplate enc, PKM pk, int generation { EntityContext.Gen6 => PersonalTable.AO[species].BaseFriendship, EntityContext.Gen7 => PersonalTable.USUM[species].BaseFriendship, + EntityContext.Gen7b => PersonalTable.GG[species].BaseFriendship, EntityContext.Gen8 => PersonalTable.SWSH.GetFormEntry(species, form).BaseFriendship, EntityContext.Gen8a => PersonalTable.LA.GetFormEntry(species, form).BaseFriendship, EntityContext.Gen8b => PersonalTable.BDSP.GetFormEntry(species, form).BaseFriendship,