Finish Merge

This commit is contained in:
Kurt
2014-12-11 23:09:22 -08:00
parent b7b9835772
commit 5a9bdcdcf7
2 changed files with 45 additions and 1543 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -2454,7 +2454,7 @@ public void updateAbilityList(MaskedTextBox tb_abil, int species, ComboBox cb_ab
int newabil = Convert.ToInt16(tb_abil.Text) >> 1;
int form = cb_forme.SelectedIndex;
int[] abils = PKX.getAbilities(species, form);
byte[] abils = PKX.getAbilities(species, form);
// Build Ability List
List<string> ability_list = new List<string>();