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

Minor refactor

Browse source 
cleanup, remove parenthesis/unused

EV total backcolor matches IV backcolor instead of a defined color (for
those who alter their default color schemes)
This commit is contained in:
Kaphotics 2016-04-28 21:43:16 -07:00
parent 888d979fce
commit 1de3f31e9f
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Misc/PKM.cs
View file

@ -19,8 +19,7 @@ namespace PKHeX
return seed = seed * a + c;
}
internal static Converter Config = new Converter();
internal static readonly string[] speclang_ja = Util.getStringList("species", "ja");
internal static readonly string[] speclang_en = Util.getStringList("species", "en");
internal static readonly string[] speclang_fr = Util.getStringList("species", "fr");

13
PKX/f1-Main.cs
View file

@ -878,7 +878,7 @@ namespace PKHeX
for (int i = 0; i < balllist.Length; i++)
balllist[i] = itemlist[Legal.Items_Ball[i]];
if ((l != "pt") || (l == "pt" && !fieldsInitialized)) // load initial binaries
if (l != "pt" || (l == "pt" && !fieldsInitialized)) // load initial binaries
{
pokeblocks = Util.getStringList("pokeblock", l);
forms = Util.getStringList("forms", l);
@ -1514,7 +1514,6 @@ namespace PKHeX
TB_HPIV.Text = newIVs[0].ToString();
TB_ATKIV.Text = newIVs[1].ToString();
TB_DEFIV.Text = newIVs[2].ToString();
TB_SPAIV.Text = newIVs[3].ToString();
TB_SPDIV.Text = newIVs[4].ToString();
TB_SPEIV.Text = newIVs[5].ToString();
@ -1575,7 +1574,7 @@ namespace PKHeX
TB_EVTotal.BackColor = Color.Honeydew;
else if (evtotal == 508) // Fishy EVs
TB_EVTotal.BackColor = Color.LightYellow;
else TB_EVTotal.BackColor = Color.WhiteSmoke;
else TB_EVTotal.BackColor = TB_IVTotal.BackColor;
TB_EVTotal.Text = evtotal.ToString();
changingFields = false;
@ -1878,7 +1877,7 @@ namespace PKHeX
}
#endregion
}
else if (Version > 23 && (origintrack != "XY"))
else if (Version > 23 && origintrack != "XY")
{
// Load X/Y/OR/AS locations
#region ORAS Met Locations
@ -1924,9 +1923,9 @@ namespace PKHeX
}
// Visibility logic for Gen 4 encounter type; only show for Gen 4 Pokemon.
CB_EncounterType.Visible = Label_EncounterType.Visible = !(Version > 12 || Version < 7);
// If not Gen 4, set Encounter Type to 0 after it set !visible.
if (Version > 12 || Version < 7)
bool g4 = Version >= 7 && Version <= 12 && Version != 9;
CB_EncounterType.Visible = Label_EncounterType.Visible = g4;
if (!g4)
CB_EncounterType.SelectedValue = 0;
setMarkings(); // Set/Remove KB marking