From fa9ca3ea590b2ff33dd5fbe4c4710a057ed1d8c8 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Wed, 29 Jun 2016 17:42:00 -0700 Subject: [PATCH] Flag Legality of Battle Primals Mark as illegal. Thanks Asia81! --- Legality/Checks.cs | 2 +- Legality/Tables.cs | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Legality/Checks.cs b/Legality/Checks.cs index 4f8cd46e9..f7c884dd0 100644 --- a/Legality/Checks.cs +++ b/Legality/Checks.cs @@ -807,7 +807,7 @@ private LegalityCheck verifyForm() break; } - return pk6.AltForm > 0 && (Legal.BattleForms.Contains(pk6.Species) || Legal.BattleMegas.Contains(pk6.Species)) + return pk6.AltForm > 0 && new[] {Legal.BattleForms, Legal.BattleMegas, Legal.BattlePrimals}.Any(arr => arr.Contains(pk6.Species)) ? new LegalityCheck(Severity.Invalid, "Form cannot exist outside of a battle.") : new LegalityCheck(); } diff --git a/Legality/Tables.cs b/Legality/Tables.cs index 653ec34b5..84437cf83 100644 --- a/Legality/Tables.cs +++ b/Legality/Tables.cs @@ -488,6 +488,7 @@ public static partial class Legal 531, 719 }; + internal static readonly int[] BattlePrimals = {382, 383}; internal static readonly string[][] TradeXY = { new string[0], // 0 - None