diff --git a/PKHeX/Legality/Checks.cs b/PKHeX/Legality/Checks.cs index 688480e27..132620396 100644 --- a/PKHeX/Legality/Checks.cs +++ b/PKHeX/Legality/Checks.cs @@ -1367,9 +1367,9 @@ private void verifyBall() return; } - if (pkm.Species == 292) // Shedinja + if (pkm.Species == 292 && pkm.GenNumber > 3) // Shedinja. For gen3, copy the ball from Nincada { - verifyBallEquals(4); // Pokeball + verifyBallEquals(4); // Pokeball Only return; } diff --git a/PKHeX/Legality/Core.cs b/PKHeX/Legality/Core.cs index 4dcb9b257..e91c0b21f 100644 --- a/PKHeX/Legality/Core.cs +++ b/PKHeX/Legality/Core.cs @@ -1120,7 +1120,7 @@ private static EncounterTrade getValidEncounterTradeVC1(PKM pkm, DexLevel[] p, E var tm = t?.Species ?? invalid; // check for special move static encounter - var special = s?.FirstOrDefault(m => m.Moves[0] != 0 && pkm.Moves.Contains(m.Moves[0])); + var special = s?.FirstOrDefault(m => m.Moves != null && m.Moves[0] != 0 && pkm.Moves.Contains(m.Moves[0])); if (special != null) // return with high priority return new Tuple(s, special.Level, 20); diff --git a/PKHeX/Legality/LegalityCheckStrings.cs b/PKHeX/Legality/LegalityCheckStrings.cs index ce8289248..cb2eb32f1 100644 --- a/PKHeX/Legality/LegalityCheckStrings.cs +++ b/PKHeX/Legality/LegalityCheckStrings.cs @@ -63,10 +63,6 @@ public static class LegalityCheckStrings #region Legality Check Result Strings - public static string V250 {get; set;} = "Gender matches PID."; - public static string V251 {get; set;} = "PID-Gender mismatch."; - public static string V252 {get; set;} = "Nature matches PID."; - public static string V253 {get; set;} = "PID-Nature mismatch."; public static string V203 {get; set;} = "Genderless Pokémon should not have a gender."; public static string V201 {get; set;} = "Encryption Constant is not set."; public static string V204 {get; set;} = "Held item is unreleased."; @@ -75,6 +71,10 @@ public static class LegalityCheckStrings public static string V188 {get; set;} = "Fateful Encounter with no matching Encounter. Has the Mystery Gift data been contributed?"; public static string V194 { get; set;} = "Ingame Trade for Sun/Moon not implemented."; // Valid + public static string V250 {get; set;} = "Gender matches PID."; + public static string V251 {get; set;} = "PID-Gender mismatch."; + public static string V252 {get; set;} = "Nature matches PID."; + public static string V253 {get; set;} = "PID-Nature mismatch."; public static string V207 {get; set;} = "PID is not set."; public static string V208 {get; set;} = "Encryption Constant matches PID."; public static string V209 {get; set;} = "Static Encounter shiny mismatch."; diff --git a/PKHeX/Resources/text/en/LegalityCheckStrings_en.txt b/PKHeX/Resources/text/en/LegalityCheckStrings_en.txt index fd6578490..8fff630c1 100644 --- a/PKHeX/Resources/text/en/LegalityCheckStrings_en.txt +++ b/PKHeX/Resources/text/en/LegalityCheckStrings_en.txt @@ -21,6 +21,7 @@ V174 = Learned by Move Tutor. V175 = Special Non-Relearn Move. V177 = Learned by Level-up. V330 = Learned by Level-up in generation {0}. +V331 = Learned by TM/HM in generation {0}. V332 = Learned by Move Tutor in generation {0}. V333 = Event Egg Move. V344 = Inherited egg move. @@ -35,6 +36,10 @@ V204 = Held item is unreleased. V187 = Species does not exist in origin game. V188 = Fateful Encounter with no matching Encounter. Has the Mystery Gift data been contributed? V194 = Ingame Trade for Sun/Moon not implemented. +V250 = Gender matches PID. +V251 = PID-Gender mismatch. +V252 = Nature matches PID. +V253 = PID-Nature mismatch. V207 = PID is not set. V208 = Encryption Constant matches PID. V209 = Static Encounter shiny mismatch. diff --git a/PKHeX/Resources/text/zh/LegalityCheckStrings_zh.txt b/PKHeX/Resources/text/zh/LegalityCheckStrings_zh.txt index 547486097..ac9081896 100644 --- a/PKHeX/Resources/text/zh/LegalityCheckStrings_zh.txt +++ b/PKHeX/Resources/text/zh/LegalityCheckStrings_zh.txt @@ -21,6 +21,7 @@ V174 = 通过招式教学习得。 V175 = 特殊不可回忆招式。 V177 = 通过升级习得。 V330 = 在第{0}世代通过升级习得。 +V331 = 在第{0}世代通过TM/HM习得。 V332 = 在第{0}世代通过招式教学习得。 V333 = 配信蛋招式。 V344 = 遗传了蛋招式。 @@ -35,6 +36,10 @@ V204 = 持有物未解禁。 V187 = 该宝可梦在来源版本中不存在。 V188 = 没有匹配的“命中注定遇见”的数据。该神秘礼物有被共享吗? V194 = 太阳月亮游戏内交换宝可梦的功能尚未开发。 +V250 = 性别与PID匹配。 +V251 = 性别与PID不匹配。 +V252 = 性格与PID匹配。 +V253 = 性格与PID不匹配。 V207 = 未设置PID。 V208 = 加密常数与PID一致。 V209 = 定点相遇闪光条件不匹配。