diff --git a/PKHeX.Core/Legality/Evolutions/EvolutionMethod.cs b/PKHeX.Core/Legality/Evolutions/EvolutionMethod.cs index 54063f676..47e68580a 100644 --- a/PKHeX.Core/Legality/Evolutions/EvolutionMethod.cs +++ b/PKHeX.Core/Legality/Evolutions/EvolutionMethod.cs @@ -75,7 +75,7 @@ public bool Valid(PKM pkm, int lvl, bool skipChecks) switch ((EvolutionType)Method) { case UseItem or UseItemWormhole: - case Crit3 or HPDownBy49 or SpinType: + case CriticalHitsInBattle or HitPointsLostInBattle or Spin: case TowerOfDarkness or TowerOfWaters: return true; case UseItemMale: @@ -83,7 +83,7 @@ public bool Valid(PKM pkm, int lvl, bool skipChecks) case UseItemFemale: return pkm.Gender == 1; - case Trade or TradeHeldItem or TradeSpecies: + case Trade or TradeHeldItem or TradeShelmetKarrablast: return !pkm.IsUntraded || skipChecks; // Special Level Up Cases -- return false if invalid diff --git a/PKHeX.Core/Legality/Evolutions/EvolutionType.cs b/PKHeX.Core/Legality/Evolutions/EvolutionType.cs index 572dde1a2..505e1aff9 100644 --- a/PKHeX.Core/Legality/Evolutions/EvolutionType.cs +++ b/PKHeX.Core/Legality/Evolutions/EvolutionType.cs @@ -11,11 +11,11 @@ public enum EvolutionType : byte LevelUp = 4, Trade = 5, TradeHeldItem = 6, - TradeSpecies = 7, + TradeShelmetKarrablast = 7, UseItem = 8, LevelUpATK = 9, - LevelUpDEF = 10, - LevelUpAeqD = 11, + LevelUpAeqD = 10, + LevelUpDEF = 11, LevelUpECl5 = 12, LevelUpECgeq5 = 13, LevelUpNinjask = 14, @@ -47,18 +47,18 @@ public enum EvolutionType : byte LevelUpDusk = 40, LevelUpWormhole = 41, UseItemWormhole = 42, - Crit3, // Sirfetch'd - HPDownBy49, // Runerigus - SpinType, // Alcremie - LevelUpNatureAmped, // Toxtricity - LevelUpNatureLowKey, // Toxtricity - TowerOfDarkness, // Urshifu - TowerOfWaters, // Urshifu + CriticalHitsInBattle = 43, // Sirfetch'd + HitPointsLostInBattle = 44, // Runerigus + Spin = 45, // Alcremie + LevelUpNatureAmped = 46, // Toxtricity + LevelUpNatureLowKey = 47, // Toxtricity + TowerOfDarkness = 48, // Urshifu + TowerOfWaters = 49, // Urshifu } public static class EvolutionTypeExtensions { - public static bool IsTrade(this EvolutionType t) => t is Trade or TradeHeldItem or TradeSpecies; + public static bool IsTrade(this EvolutionType t) => t is Trade or TradeHeldItem or TradeShelmetKarrablast; public static bool IsLevelUpRequired(this EvolutionType t) => t.ToString().StartsWith("LevelUp"); // don't use this } } \ No newline at end of file