From a6f688b3ffe8c336ed1194f4691bbbbea9da55e2 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Sat, 10 Sep 2016 23:12:22 -0700 Subject: [PATCH] Fix gen3 ability dupe Thanks @ricksee ! Gen3 second ability for same-ability mons is stored as 0, same deal for gen4. MainPK4 alteration is an unneeded-code removal, gen4 only has abil0&1, not 2 (hidden) like gen5. Closes #256 --- PKHeX/MainWindow/Main.cs | 2 +- PKHeX/MainWindow/MainPK4.cs | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/PKHeX/MainWindow/Main.cs b/PKHeX/MainWindow/Main.cs index a8c11af23..a57a53091 100644 --- a/PKHeX/MainWindow/Main.cs +++ b/PKHeX/MainWindow/Main.cs @@ -1460,7 +1460,7 @@ private void setAbilityList() formnum = CB_Form.SelectedIndex; int[] abils = SAV.Personal.getAbilities(species, formnum); - if (abils[1] == 0) + if (abils[1] == 0 && SAV.Generation != 3) abils[1] = abils[0]; string[] abilIdentifier = {" (1)", " (2)", " (H)"}; List ability_list = abils.Where(a => a != 0).Select((t, i) => abilitylist[t] + abilIdentifier[i]).ToList(); diff --git a/PKHeX/MainWindow/MainPK4.cs b/PKHeX/MainWindow/MainPK4.cs index fef518fd0..ca7c299ad 100644 --- a/PKHeX/MainWindow/MainPK4.cs +++ b/PKHeX/MainWindow/MainPK4.cs @@ -137,8 +137,6 @@ private void populateFieldsPK4() if (abil < 0) CB_Ability.SelectedIndex = 0; - else if (abil == 2) - CB_Ability.SelectedIndex = 2; else if (abils[0] == abils[1] || abils[1] == 0) CB_Ability.SelectedIndex = pk4.PIDAbility; else