Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2024-11-24 13:03:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #822 from ReignOfComputer/b/invalid-ability-indexes

Browse source 
Add Check for Bad Ability Length
This commit is contained in:
Kaphotics 2017-02-05 10:08:36 -08:00 committed by GitHub
commit 2afe7926a5
4 changed files with 24 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
PKHeX.WinForms/MainWindow/MainPK4.cs
View file

@ -142,7 +142,11 @@ namespace PKHeX.WinForms
pk4.SID = Util.ToInt32(TB_SID.Text); pk4.SID = Util.ToInt32(TB_SID.Text);
pk4.EXP = Util.ToUInt32(TB_EXP.Text); pk4.EXP = Util.ToUInt32(TB_EXP.Text);
pk4.PID = Util.getHEXval(TB_PID.Text); pk4.PID = Util.getHEXval(TB_PID.Text);
pk4.Ability = (byte)Array.IndexOf(GameInfo.Strings.abilitylist, CB_Ability.Text.Remove(CB_Ability.Text.Length - 4));
if (CB_Ability.Text.Length >= 4)
{
pk4.Ability = (byte)Array.IndexOf(GameInfo.Strings.abilitylist, CB_Ability.Text.Remove(CB_Ability.Text.Length - 4));
}
pk4.FatefulEncounter = CHK_Fateful.Checked; pk4.FatefulEncounter = CHK_Fateful.Checked;
pk4.Gender = PKX.getGender(Label_Gender.Text); pk4.Gender = PKX.getGender(Label_Gender.Text);

7
PKHeX.WinForms/MainWindow/MainPK5.cs
View file

@ -247,8 +247,11 @@ namespace PKHeX.WinForms
} }
else else
{ {
pk5.Ability = (byte)Array.IndexOf(GameInfo.Strings.abilitylist, CB_Ability.Text.Remove(CB_Ability.Text.Length - 4)); if (CB_Ability.Text.Length >= 4)
pk5.HiddenAbility = CB_Ability.SelectedIndex > 1; // not 0 or 1 {
pk5.Ability = (byte)Array.IndexOf(GameInfo.Strings.abilitylist, CB_Ability.Text.Remove(CB_Ability.Text.Length - 4));
pk5.HiddenAbility = CB_Ability.SelectedIndex > 1; // not 0 or 1
}
} }
// Fix Moves if a slot is empty // Fix Moves if a slot is empty

9
PKHeX.WinForms/MainWindow/MainPK6.cs
View file

@ -184,8 +184,13 @@ namespace PKHeX.WinForms
pk6.TID = Util.ToInt32(TB_TID.Text); pk6.TID = Util.ToInt32(TB_TID.Text);
pk6.SID = Util.ToInt32(TB_SID.Text); pk6.SID = Util.ToInt32(TB_SID.Text);
pk6.EXP = Util.ToUInt32(TB_EXP.Text); pk6.EXP = Util.ToUInt32(TB_EXP.Text);
pk6.Ability = (byte)Array.IndexOf(GameInfo.Strings.abilitylist, CB_Ability.Text.Remove(CB_Ability.Text.Length - 4));
pk6.AbilityNumber = Util.ToInt32(TB_AbilityNumber.Text); // Number if (CB_Ability.Text.Length >= 4)
{
pk6.Ability = (byte)Array.IndexOf(GameInfo.Strings.abilitylist, CB_Ability.Text.Remove(CB_Ability.Text.Length - 4));
pk6.AbilityNumber = Util.ToInt32(TB_AbilityNumber.Text); // Number
}
// pkx[0x16], pkx[0x17] are handled by the Medals UI (Hits & Training Bag) // pkx[0x16], pkx[0x17] are handled by the Medals UI (Hits & Training Bag)
pk6.PID = Util.getHEXval(TB_PID.Text); pk6.PID = Util.getHEXval(TB_PID.Text);
pk6.Nature = (byte)WinFormsUtil.getIndex(CB_Nature); pk6.Nature = (byte)WinFormsUtil.getIndex(CB_Nature);

9
PKHeX.WinForms/MainWindow/MainPK7.cs
View file

@ -184,8 +184,13 @@ namespace PKHeX.WinForms
pk7.TID = Util.ToInt32(TB_TID.Text); pk7.TID = Util.ToInt32(TB_TID.Text);
pk7.SID = Util.ToInt32(TB_SID.Text); pk7.SID = Util.ToInt32(TB_SID.Text);
pk7.EXP = Util.ToUInt32(TB_EXP.Text); pk7.EXP = Util.ToUInt32(TB_EXP.Text);
pk7.Ability = (byte)Array.IndexOf(GameInfo.Strings.abilitylist, CB_Ability.Text.Remove(CB_Ability.Text.Length - 4));
pk7.AbilityNumber = Util.ToInt32(TB_AbilityNumber.Text); // Number if (CB_Ability.Text.Length >= 4)
{
pk7.Ability = (byte)Array.IndexOf(GameInfo.Strings.abilitylist, CB_Ability.Text.Remove(CB_Ability.Text.Length - 4));
pk7.AbilityNumber = Util.ToInt32(TB_AbilityNumber.Text); // Number
}
// pkx[0x16], pkx[0x17] are handled by the Medals UI (Hits & Training Bag) // pkx[0x16], pkx[0x17] are handled by the Medals UI (Hits & Training Bag)
pk7.PID = Util.getHEXval(TB_PID.Text); pk7.PID = Util.getHEXval(TB_PID.Text);
pk7.Nature = (byte)WinFormsUtil.getIndex(CB_Nature); pk7.Nature = (byte)WinFormsUtil.getIndex(CB_Nature);