From b3fc5c62bfbbd5f7d72f7ee63919686be12e83fd Mon Sep 17 00:00:00 2001 From: Kurt Date: Wed, 17 Dec 2025 11:39:03 -0600 Subject: [PATCH] Update IFormArgument.cs --- PKHeX.Core/PKM/Interfaces/IFormArgument.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/PKHeX.Core/PKM/Interfaces/IFormArgument.cs b/PKHeX.Core/PKM/Interfaces/IFormArgument.cs index d853579ac..d89b6247b 100644 --- a/PKHeX.Core/PKM/Interfaces/IFormArgument.cs +++ b/PKHeX.Core/PKM/Interfaces/IFormArgument.cs @@ -76,9 +76,9 @@ public static void SetSuggestedFormArgument(this PKM pk, EvolutionHistory histor // S/V does not set the argument for Hoopa (int)Hoopa => history.HasVisitedGen9 || history.HasVisitedZA, - // S/V does not set the argument for Farfetch'd (Galar) - (int)Farfetchd when form == 1 => history.HasVisitedGen9, - (int)Sirfetchd => history.HasVisitedGen9, + // Does not set the argument for Farfetch'd (Galar) + (int)Farfetchd when form == 1 => history.HasVisitedGen9 || history.HasVisitedSWSH, + (int)Sirfetchd => history.HasVisitedGen9 || history.HasVisitedSWSH, // Z-A does not set the argument for Gimmighoul/Gholdengo (int)Gimmighoul or (int)Gholdengo => history.HasVisitedZA, @@ -171,6 +171,7 @@ public static uint GetFormArgumentMax(ushort species, byte form, EntityContext c (int)Basculin when currentSpecies == (int)Basculegion => 294u, (int)Mankey or (int)Primeape when currentSpecies == (int)Annihilape => 20u, (int)Pawniard or (int)Bisharp when currentSpecies == (int)Kingambit => 3u, + (int)Farfetchd when currentSpecies == (int)Sirfetchd => 3u, (int)Gimmighoul when currentSpecies == (int)Gholdengo => 999u, _ => 0u, };