From fc2cd6e8bf6e9210707365690e78d470aa5659cd Mon Sep 17 00:00:00 2001 From: ReignOfComputer Date: Mon, 2 Jan 2017 07:32:31 +0800 Subject: [PATCH] HA Legality Check for Gen 7 Island Scan + Disable Unused Controls in Memories (#689) * HA Legality Check for Gen 7 Island Scan Pokemon Sun/Moon Island Scan Pokemon cannot have Hidden Abilities. * Disable unused controls in Memories for Gen 7 AFAIK those aren't used for Gen 7. --- PKHeX/Legality/Tables7.cs | 86 ++++++++++++++++++++++++ PKHeX/Subforms/PKM Editors/MemoryAmie.cs | 8 ++- 2 files changed, 93 insertions(+), 1 deletion(-) diff --git a/PKHeX/Legality/Tables7.cs b/PKHeX/Legality/Tables7.cs index 1ec0cb514..92cb5e404 100644 --- a/PKHeX/Legality/Tables7.cs +++ b/PKHeX/Legality/Tables7.cs @@ -536,6 +536,92 @@ namespace PKHeX 565, // Carracosta 566, // Archen 567, // Archeops + + // Island Scan + 069, // Bellsprout + 070, // Weepinbell + 071, // Victreebel + 111, // Rhyhorn + 112, // Rhydon + 464, // Rhyperior + 116, // Horsea + 117, // Seadra + 230, // Kingdra + 152, // Chikorita + 153, // Bayleef + 154, // Meganium + 155, // Cyndaquil + 156, // Quilava + 157, // Typhlosion + 158, // Totodile + 159, // Croconaw + 160, // Feraligatr + 175, // Togepi + 176, // Togetic + 468, // Togekiss + 183, // Marill + 184, // Azumarill + 220, // Swinub + 221, // Piloswine + 287, // Slakoth + 288, // Vigoroth + 289, // Slaking + 473, // Mamoswine + 298, // Azurill + 363, // Spheal + 364, // Sealeo + 365, // Walrein + 396, // Starly + 397, // Staravia + 398, // Staraptor + 403, // Shinx + 404, // Luxio + 405, // Luxray + 406, // Budew + 407, // Roserade + 315, // Roselia + 495, // Snivy + 496, // Servine + 497, // Serperior + 498, // Tepig + 499, // Pignite + 500, // Emboar + 501, // Oshawott + 502, // Dewott + 503, // Samurott + 532, // Timburr + 533, // Gurdurr + 534, // Conkeldurr + 540, // Sewaddle + 541, // Swadloon + 542, // Leavanny + 543, // Venipede + 544, // Whirlipede + 545, // Scolipede + 574, // Gothita + 575, // Gothorita + 576, // Gothitelle + 577, // Solosis + 578, // Duosion + 579, // Reuniclus + 599, // Klink + 600, // Klang + 601, // Klinklang + 602, // Tynamo + 603, // Eelektrik + 604, // Eelektross + 607, // Litwick + 608, // Lampent + 609, // Chandelure + 610, // Axew + 611, // Fraxure + 612, // Haxorus + 633, // Deino + 634, // Zweilous + 635, // Hydreigon + 679, // Honedge + 680, // Doublade + 681, // Aegislash }; internal static readonly int[] Bank_NotAvailable7 = // Unobtainable Species { diff --git a/PKHeX/Subforms/PKM Editors/MemoryAmie.cs b/PKHeX/Subforms/PKM Editors/MemoryAmie.cs index 31d120e47..15c2ad71c 100644 --- a/PKHeX/Subforms/PKM Editors/MemoryAmie.cs +++ b/PKHeX/Subforms/PKM Editors/MemoryAmie.cs @@ -128,7 +128,13 @@ namespace PKHeX else GB_M_OT.Text = GB_M_CT.Text = $"N/A: {Main.GameStrings.eggname}"; - init = true; + if (pkm.GenNumber == 7) + { + Tab_Residence.Enabled = false; + CB_OTMemory.Visible = CB_CTMemory.Visible = L_OT_TextLine.Visible = L_CT_TextLine.Visible = RTB_OT.Visible = RTB_CT.Visible = false; + } + + init = true; // Manually load the Memory Parse RTB_CT.Text = getMemoryString(CB_CTMemory, CB_CTVar, CB_CTQual, CB_CTFeel, pkm.HT_Name);