From 52ea545b29e1155951b4b38af1abe3e00aae1eb9 Mon Sep 17 00:00:00 2001 From: Kurt Date: Tue, 5 Jan 2016 18:16:58 -0800 Subject: [PATCH] Remove more parenthesis No functional change, just src clarity. --- Misc/PGF.cs | 2 +- Misc/PGT.cs | 4 +- Misc/PK3.cs | 8 ++-- Misc/PK4.cs | 8 ++-- Misc/PK5.cs | 8 ++-- Misc/PK6.cs | 8 ++-- Misc/PKM.cs | 18 ++++----- Misc/PKX.cs | 84 +++++++++++++++++++++--------------------- Misc/SAV6.cs | 4 +- PKX/f1-Main.cs | 2 +- SAV/SAV_Database.cs | 4 +- SAV/SAV_HallOfFame.cs | 28 +++++++------- SAV/SAV_PokedexORAS.cs | 20 +++++----- SAV/SAV_PokedexXY.cs | 22 +++++------ SAV/SAV_Pokepuff.cs | 6 +-- SAV/SAV_SecretBase.cs | 18 ++++----- SAV/SAV_Trainer.cs | 10 ++--- SAV/SAV_Wondercard.cs | 8 ++-- 18 files changed, 129 insertions(+), 133 deletions(-) diff --git a/Misc/PGF.cs b/Misc/PGF.cs index d2a1c1ec7..ac39cae1f 100644 --- a/Misc/PGF.cs +++ b/Misc/PGF.cs @@ -203,7 +203,7 @@ public PK5 convertToPK5(SAV6 SAV) // Dumb way to generate random IVs. int[] finalIVs = new int[6]; for (int i = 0; i < IVs.Length; i++) - finalIVs[i] = (IVs[i] == 0xFF) ? (int)(Util.rnd32() & 0x1F) : IVs[i]; + finalIVs[i] = IVs[i] == 0xFF ? (int)(Util.rnd32() & 0x1F) : IVs[i]; pk.IVs = finalIVs; int av = 0; diff --git a/Misc/PGT.cs b/Misc/PGT.cs index d037105de..2b07343b3 100644 --- a/Misc/PGT.cs +++ b/Misc/PGT.cs @@ -94,7 +94,7 @@ public PK4 convertToPK4(SAV6 SAV) while ((pid1 ^ pid2 ^ pk4.TID ^ pk4.SID) < 8) { - uint testPID = pid1 | (pid2 << 16); + uint testPID = pid1 | pid2 << 16; // Call the ARNG to change the PID testPID = testPID * 0x6c078965 + 1; @@ -110,7 +110,7 @@ public PK4 convertToPK4(SAV6 SAV) { uint iv1 = PKM.LCRNG(ref seed) >> 16; uint iv2 = PKM.LCRNG(ref seed) >> 16; - pk4.IV32 = (iv1 | (iv2 << 16)) & 0x3FFFFFFF; + pk4.IV32 = (iv1 | iv2 << 16) & 0x3FFFFFFF; } // Generate Met Info diff --git a/Misc/PK3.cs b/Misc/PK3.cs index 3fde41149..b6dbf451a 100644 --- a/Misc/PK3.cs +++ b/Misc/PK3.cs @@ -89,7 +89,7 @@ public PK3(byte[] decryptedData = null, string ident = null) #region Block D private byte PKRS { get { return Data[0x44]; } set { Data[0x44] = value; } } public int PKRS_Days { get { return PKRS & 0xF; } set { PKRS = (byte)(PKRS & ~0xF | value); } } - public int PKRS_Strain { get { return PKRS >> 4; } set { PKRS = (byte)(PKRS & 0xF | (value << 4)); } } + public int PKRS_Strain { get { return PKRS >> 4; } set { PKRS = (byte)(PKRS & 0xF | value << 4); } } public int Met_Location { get { return Data[0x45]; } set { Data[0x45] = (byte)value; } } // Origins private ushort Origins { get { return BitConverter.ToUInt16(Data, 0x46); } set { BitConverter.GetBytes(value).CopyTo(Data, 0x46); } } @@ -134,7 +134,7 @@ public PK3(byte[] decryptedData = null, string ident = null) // Simple Generated Attributes public bool Japanese { get { return Language == 1; } } - public bool Gen3 { get { return ((Version >= 1 && Version <= 5) || Version == 15); } } + public bool Gen3 { get { return Version >= 1 && Version <= 5 || Version == 15; } } public int[] Moves { get { return new[] { Move1, Move2, Move3, Move4 }; } @@ -227,7 +227,7 @@ public PK4 convertToPK4() PKRS_Strain = PKRS_Strain, PKRS_Days = PKRS_Days, OT_Gender = OT_Gender, - Met_Year = (moment.Year - 2000), + Met_Year = moment.Year - 2000, Met_Month = moment.Month, Met_Day = moment.Day, Met_Location = 0x37, // Pal Park @@ -278,7 +278,7 @@ public PK4 convertToPK4() // Set Final Data pk4.Met_Level = PKX.getLevel(pk4.Species, pk4.EXP); pk4.Gender = PKM.getGender(pk4.Species, pk4.PID); - pk4.IsNicknamed |= (pk4.Nickname != PKM.getSpeciesName(pk4.Species, pk4.Language)); + pk4.IsNicknamed |= pk4.Nickname != PKM.getSpeciesName(pk4.Species, pk4.Language); // Remove HM moves int[] banned = { 15, 19, 57, 70, 148, 249, 127, 291 }; diff --git a/Misc/PK4.cs b/Misc/PK4.cs index 9d5021d30..fb7190607 100644 --- a/Misc/PK4.cs +++ b/Misc/PK4.cs @@ -258,7 +258,7 @@ public string OT_Name public int PKRS_Strain { get { return PKRS >> 4; } set { PKRS = (byte)(PKRS & 0xF | (value << 4)); } } public int Ball { get { return Data[0x83]; } set { Data[0x83] = (byte)value; } } public int Met_Level { get { return Data[0x84] & ~0x80; } set { Data[0x84] = (byte)((Data[0x84] & 0x80) | value); } } - public int OT_Gender { get { return Data[0x84] >> 7; } set { Data[0x84] = (byte)((Data[0x84] & ~0x80) | (value << 7)); } } + public int OT_Gender { get { return Data[0x84] >> 7; } set { Data[0x84] = (byte)((Data[0x84] & ~0x80) | value << 7); } } public int EncounterType { get { return Data[0x85]; } set { Data[0x85] = (byte)value; } } public int HGSSBall { get { return Data[0x86]; } set { Data[0x86] = (byte)value; } } // Unused 0x87 @@ -276,13 +276,13 @@ public int[] IVs } } public int[] EVs { get { return new[] { EV_HP, EV_ATK, EV_DEF, EV_SPE, EV_SPA, EV_SPD }; } } - public int PSV { get { return (int)(((PID >> 16) ^ (PID & 0xFFFF)) >> 3); } } + public int PSV { get { return (int)((PID >> 16 ^ PID & 0xFFFF) >> 3); } } public int TSV { get { return (TID ^ SID) >> 3; } } public bool IsShiny { get { return TSV == PSV; } } public bool PKRS_Infected { get { return PKRS_Strain > 0; } } public bool PKRS_Cured { get { return PKRS_Days == 0 && PKRS_Strain > 0; } } - public bool Gen4 { get { return (Version >= 10 && Version < 12) || (Version >= 7 && Version <= 8); } } - public bool Gen3 { get { return ((Version >= 1 && Version <= 5) || Version == 15); } } + public bool Gen4 { get { return Version >= 10 && Version < 12 || Version >= 7 && Version <= 8; } } + public bool Gen3 { get { return Version >= 1 && Version <= 5 || Version == 15; } } public bool GenU { get { return !(Gen4 || Gen3); } } public int[] Moves { diff --git a/Misc/PK5.cs b/Misc/PK5.cs index add769684..b3cb9e6ff 100644 --- a/Misc/PK5.cs +++ b/Misc/PK5.cs @@ -261,7 +261,7 @@ public string OT_Name public int PKRS_Strain { get { return PKRS >> 4; } set { PKRS = (byte)(PKRS & 0xF | (value << 4)); } } public int Ball { get { return Data[0x83]; } set { Data[0x83] = (byte)value; } } public int Met_Level { get { return Data[0x84] & ~0x80; } set { Data[0x84] = (byte)((Data[0x84] & 0x80) | value); } } - public int OT_Gender { get { return Data[0x84] >> 7; } set { Data[0x84] = (byte)((Data[0x84] & ~0x80) | (value << 7)); } } + public int OT_Gender { get { return Data[0x84] >> 7; } set { Data[0x84] = (byte)((Data[0x84] & ~0x80) | value << 7); } } public int EncounterType { get { return Data[0x85]; } set { Data[0x85] = (byte)value; } } // 0x86-0x87 Unused #endregion @@ -278,14 +278,14 @@ public int[] IVs } } public int[] EVs { get { return new[] { EV_HP, EV_ATK, EV_DEF, EV_SPE, EV_SPA, EV_SPD }; } } - public int PSV { get { return (int)(((PID >> 16) ^ (PID & 0xFFFF)) >> 3); } } + public int PSV { get { return (int)((PID >> 16 ^ PID & 0xFFFF) >> 3); } } public int TSV { get { return (TID ^ SID) >> 3; } } public bool IsShiny { get { return TSV == PSV; } } public bool PKRS_Infected { get { return PKRS_Strain > 0; } } public bool PKRS_Cured { get { return PKRS_Days == 0 && PKRS_Strain > 0; } } public bool Gen5 { get { return Version >= 20 && Version <= 23; } } - public bool Gen4 { get { return (Version >= 10 && Version < 12) || (Version >= 7 && Version <= 8); } } - public bool Gen3 { get { return ((Version >= 1 && Version <= 5) || Version == 15); } } + public bool Gen4 { get { return Version >= 10 && Version < 12 || Version >= 7 && Version <= 8; } } + public bool Gen3 { get { return Version >= 1 && Version <= 5 || Version == 15; } } public bool GenU { get { return !(Gen5 || Gen4 || Gen3); } } public int[] Moves { get { return new[] {Move1, Move2, Move3, Move4}; } diff --git a/Misc/PK6.cs b/Misc/PK6.cs index 2380fe66f..479b8f574 100644 --- a/Misc/PK6.cs +++ b/Misc/PK6.cs @@ -98,7 +98,7 @@ public uint PID public bool Diamond { get { return (Markings & (1 << 5)) == 1 << 5; } set { Markings = (byte)(Markings & ~(1 << 5) | (value ? 1 << 5 : 0)); } } private byte PKRS { get { return Data[0x2B]; } set { Data[0x2B] = value; } } public int PKRS_Days { get { return PKRS & 0xF; } set { PKRS = (byte)(PKRS & ~0xF | value); } } - public int PKRS_Strain { get { return PKRS >> 4; } set { PKRS = (byte)(PKRS & 0xF | (value << 4)); } } + public int PKRS_Strain { get { return PKRS >> 4; } set { PKRS = (byte)(PKRS & 0xF | value << 4); } } private byte ST1 { get { return Data[0x2C]; } set { Data[0x2C] = value; } } public bool Unused0 { get { return (ST1 & (1 << 0)) == 1 << 0; } set { ST1 = (byte)(ST1 & ~(1 << 0) | (value ? 1 << 0 : 0)); } } public bool Unused1 { get { return (ST1 & (1 << 1)) == 1 << 1; } set { ST1 = (byte)(ST1 & ~(1 << 1) | (value ? 1 << 1 : 0)); } } @@ -417,7 +417,7 @@ public int OppositeFriendship IV_HP = value[0]; IV_ATK = value[1]; IV_DEF = value[2]; IV_SPE = value[3]; IV_SPA = value[4]; IV_SPD = value[5]; } } public int[] EVs { get { return new[] { EV_HP, EV_ATK, EV_DEF, EV_SPE, EV_SPA, EV_SPD }; } } - public int PSV { get { return (int)(((PID >> 16) ^ (PID & 0xFFFF)) >> 4); } } + public int PSV { get { return (int)((PID >> 16 ^ PID & 0xFFFF) >> 4); } } public int TSV { get { return (TID ^ SID) >> 4; } } public bool IsShiny { get { return TSV == PSV; } } public bool PKRS_Infected { get { return PKRS_Strain > 0; } } @@ -426,8 +426,8 @@ public int OppositeFriendship public bool IsUntradedEvent6 { get { return Geo1_Country == 0 && Geo1_Region == 0 && Met_Location / 10000 == 4 && Gen6; } } public bool Gen6 { get { return Version >= 24 && Version <= 29; } } public bool Gen5 { get { return Version >= 20 && Version <= 23; } } - public bool Gen4 { get { return (Version >= 10 && Version < 12) || (Version >= 7 && Version <= 8); } } - public bool Gen3 { get { return ((Version >= 1 && Version <= 5) || Version == 15); } } + public bool Gen4 { get { return Version >= 10 && Version < 12 || Version >= 7 && Version <= 8; } } + public bool Gen3 { get { return Version >= 1 && Version <= 5 || Version == 15; } } public bool GenU { get { return !(Gen6 || Gen5 || Gen4 || Gen3); } } public int[] Moves { diff --git a/Misc/PKM.cs b/Misc/PKM.cs index 3ec56d894..a8076da54 100644 --- a/Misc/PKM.cs +++ b/Misc/PKM.cs @@ -10,16 +10,14 @@ internal static uint LCRNG(uint seed) const uint a = 0x41C64E6D; const uint c = 0x00006073; - seed = (seed * a + c) & 0xFFFFFFFF; - return seed; + return seed * a + c; } internal static uint LCRNG(ref uint seed) { const uint a = 0x41C64E6D; const uint c = 0x00006073; - seed = (seed * a + c) & 0xFFFFFFFF; - return seed; + return seed = seed * a + c; } internal static Converter Config = new Converter(); @@ -68,13 +66,13 @@ internal static byte[] decryptArray(byte[] ekm, uint seed = 0x10000) byte[] pkm = (byte[])ekm.Clone(); uint pv = BitConverter.ToUInt32(pkm, 0); - uint sv = (((pv & 0x3E000) >> 0xD) % 24); + uint sv = ((pv & 0x3E000) >> 0xD) % 24; seed = seed > 0xFFFF ? pv : seed; // Decrypt Blocks with RNG Seed for (int i = 8; i < 136; i += 2) - BitConverter.GetBytes((ushort)(BitConverter.ToUInt16(pkm, i) ^ (LCRNG(ref seed) >> 16))).CopyTo(pkm, i); + BitConverter.GetBytes((ushort)(BitConverter.ToUInt16(pkm, i) ^ LCRNG(ref seed) >> 16)).CopyTo(pkm, i); // Deshuffle pkm = shuffleArray(pkm, sv); @@ -83,7 +81,7 @@ internal static byte[] decryptArray(byte[] ekm, uint seed = 0x10000) seed = pv; if (pkm.Length <= 136) return pkm; for (int i = 136; i < 236; i += 2) - BitConverter.GetBytes((ushort)(BitConverter.ToUInt16(pkm, i) ^ (LCRNG(ref seed) >> 16))).CopyTo(pkm, i); + BitConverter.GetBytes((ushort)(BitConverter.ToUInt16(pkm, i) ^ LCRNG(ref seed) >> 16)).CopyTo(pkm, i); return pkm; } @@ -91,7 +89,7 @@ internal static byte[] encryptArray(byte[] pkm, uint seed = 0x10000) { // Shuffle uint pv = BitConverter.ToUInt32(pkm, 0); - uint sv = (((pv & 0x3E000) >> 0xD) % 24); + uint sv = ((pv & 0x3E000) >> 0xD) % 24; byte[] ekm = (byte[])pkm.Clone(); @@ -101,7 +99,7 @@ internal static byte[] encryptArray(byte[] pkm, uint seed = 0x10000) // Encrypt Blocks with RNG Seed for (int i = 8; i < 136; i += 2) - BitConverter.GetBytes((ushort)(BitConverter.ToUInt16(ekm, i) ^ (LCRNG(ref seed) >> 16))).CopyTo(ekm, i); + BitConverter.GetBytes((ushort)(BitConverter.ToUInt16(ekm, i) ^ LCRNG(ref seed) >> 16)).CopyTo(ekm, i); // If no party stats, return. if (ekm.Length <= 136) return ekm; @@ -109,7 +107,7 @@ internal static byte[] encryptArray(byte[] pkm, uint seed = 0x10000) // Encrypt the Party Stats seed = pv; for (int i = 136; i < 236; i += 2) - BitConverter.GetBytes((ushort)(BitConverter.ToUInt16(ekm, i) ^ (LCRNG(ref seed) >> 16))).CopyTo(ekm, i); + BitConverter.GetBytes((ushort)(BitConverter.ToUInt16(ekm, i) ^ LCRNG(ref seed) >> 16)).CopyTo(ekm, i); // Done return ekm; diff --git a/Misc/PKX.cs b/Misc/PKX.cs index be508f304..c8dc01e50 100644 --- a/Misc/PKX.cs +++ b/Misc/PKX.cs @@ -19,16 +19,14 @@ internal static uint LCRNG(uint seed) const uint a = 0x41C64E6D; const uint c = 0x00006073; - seed = (seed * a + c) & 0xFFFFFFFF; - return seed; + return seed * a + c; } internal static uint LCRNG(ref uint seed) { const uint a = 0x41C64E6D; const uint c = 0x00006073; - seed = (seed * a + c) & 0xFFFFFFFF; - return seed; + return seed = seed * a + c; } #region ExpTable internal static readonly uint[,] ExpTable = @@ -218,10 +216,10 @@ internal static byte[] getRandomEVs() { evs[0] = (byte)Math.Min(Util.rnd32() % 300, 252); // bias two to get maybe 252 evs[1] = (byte)Math.Min(Util.rnd32() % 300, 252); - evs[2] = (byte)Math.Min(((Util.rnd32()) % (510 - evs[0] - evs[1])), 252); - evs[3] = (byte)Math.Min(((Util.rnd32()) % (510 - evs[0] - evs[1] - evs[2])), 252); - evs[4] = (byte)Math.Min(((Util.rnd32()) % (510 - evs[0] - evs[1] - evs[2] - evs[3])), 252); - evs[5] = (byte)Math.Min((510 - evs[0] - evs[1] - evs[2] - evs[3] - evs[4]), 252); + evs[2] = (byte)Math.Min(Util.rnd32() % (510 - evs[0] - evs[1]), 252); + evs[3] = (byte)Math.Min(Util.rnd32() % (510 - evs[0] - evs[1] - evs[2]), 252); + evs[4] = (byte)Math.Min(Util.rnd32() % (510 - evs[0] - evs[1] - evs[2] - evs[3]), 252); + evs[5] = (byte)Math.Min(510 - evs[0] - evs[1] - evs[2] - evs[3] - evs[4], 252); } Util.Shuffle(evs); return evs; @@ -423,12 +421,12 @@ internal static ushort[] getStats(PK6 pk6) // Calculate Stats ushort[] stats = new ushort[6]; // Stats are stored as ushorts in the PKX structure. We'll cap them as such. - stats[0] = (ushort)(HP_B == 1 ? 1 : ((((HP_IV + (2 * HP_B) + (HP_EV / 4) + 100) * level) / 100) + 10)); - stats[1] = (ushort)((((ATK_IV + (2 * ATK_B) + (ATK_EV / 4)) * level) / 100) + 5); - stats[2] = (ushort)((((DEF_IV + (2 * DEF_B) + (DEF_EV / 4)) * level) / 100) + 5); - stats[4] = (ushort)((((SPA_IV + (2 * SPA_B) + (SPA_EV / 4)) * level) / 100) + 5); - stats[5] = (ushort)((((SPD_IV + (2 * SPD_B) + (SPD_EV / 4)) * level) / 100) + 5); - stats[3] = (ushort)((((SPE_IV + (2 * SPE_B) + (SPE_EV / 4)) * level) / 100) + 5); + stats[0] = (ushort)(HP_B == 1 ? 1 : (HP_IV + 2 * HP_B + HP_EV / 4 + 100) * level / 100 + 10); + stats[1] = (ushort)((ATK_IV + 2 * ATK_B + ATK_EV / 4) * level / 100 + 5); + stats[2] = (ushort)((DEF_IV + 2 * DEF_B + DEF_EV / 4) * level / 100 + 5); + stats[4] = (ushort)((SPA_IV + 2 * SPA_B + SPA_EV / 4) * level / 100 + 5); + stats[5] = (ushort)((SPD_IV + 2 * SPD_B + SPD_EV / 4) * level / 100 + 5); + stats[3] = (ushort)((SPE_IV + 2 * SPE_B + SPE_EV / 4) * level / 100 + 5); // Account for nature int incr = nature / 5 + 1; @@ -474,13 +472,13 @@ internal static byte[] decryptArray(byte[] ekx) byte[] pkx = (byte[])ekx.Clone(); uint pv = BitConverter.ToUInt32(pkx, 0); - uint sv = (((pv & 0x3E000) >> 0xD) % 24); + uint sv = ((pv & 0x3E000) >> 0xD) % 24; uint seed = pv; // Decrypt Blocks with RNG Seed for (int i = 8; i < 232; i += 2) - BitConverter.GetBytes((ushort)(BitConverter.ToUInt16(pkx, i) ^ (LCRNG(ref seed) >> 16))).CopyTo(pkx, i); + BitConverter.GetBytes((ushort)(BitConverter.ToUInt16(pkx, i) ^ LCRNG(ref seed) >> 16)).CopyTo(pkx, i); // Deshuffle pkx = shuffleArray(pkx, sv); @@ -489,7 +487,7 @@ internal static byte[] decryptArray(byte[] ekx) seed = pv; if (pkx.Length <= 232) return pkx; for (int i = 232; i < 260; i += 2) - BitConverter.GetBytes((ushort)(BitConverter.ToUInt16(pkx, i) ^ (LCRNG(ref seed) >> 16))).CopyTo(pkx, i); + BitConverter.GetBytes((ushort)(BitConverter.ToUInt16(pkx, i) ^ LCRNG(ref seed) >> 16)).CopyTo(pkx, i); return pkx; } @@ -497,7 +495,7 @@ internal static byte[] encryptArray(byte[] pkx) { // Shuffle uint pv = BitConverter.ToUInt32(pkx, 0); - uint sv = (((pv & 0x3E000) >> 0xD) % 24); + uint sv = ((pv & 0x3E000) >> 0xD) % 24; byte[] ekx = (byte[])pkx.Clone(); @@ -507,7 +505,7 @@ internal static byte[] encryptArray(byte[] pkx) // Encrypt Blocks with RNG Seed for (int i = 8; i < 232; i += 2) - BitConverter.GetBytes((ushort)(BitConverter.ToUInt16(ekx, i) ^ (LCRNG(ref seed) >> 16))).CopyTo(ekx, i); + BitConverter.GetBytes((ushort)(BitConverter.ToUInt16(ekx, i) ^ LCRNG(ref seed) >> 16)).CopyTo(ekx, i); // If no party stats, return. if (ekx.Length <= 232) return ekx; @@ -515,7 +513,7 @@ internal static byte[] encryptArray(byte[] pkx) // Encrypt the Party Stats seed = pv; for (int i = 232; i < 260; i += 2) - BitConverter.GetBytes((ushort)(BitConverter.ToUInt16(ekx, i) ^ (LCRNG(ref seed) >> 16))).CopyTo(ekx, i); + BitConverter.GetBytes((ushort)(BitConverter.ToUInt16(ekx, i) ^ LCRNG(ref seed) >> 16)).CopyTo(ekx, i); // Done return ekx; @@ -554,11 +552,11 @@ internal static bool verifychk(byte[] input) } internal static uint getPSV(uint PID) { - return Convert.ToUInt16(((PID >> 16) ^ (PID & 0xFFFF)) >> 4); + return Convert.ToUInt16((PID >> 16 ^ PID & 0xFFFF) >> 4); } internal static uint getTSV(uint TID, uint SID) { - return ((TID ^ SID) >> 4); + return (TID ^ SID) >> 4; } internal static uint getRandomPID(int species, int cg) { @@ -570,12 +568,12 @@ internal static uint getRandomPID(int species, int cg) gt++; while (true) // Loop until we find a suitable PID { - uint gv = (pid & 0xFF); + uint gv = pid & 0xFF; if (cg == 2) // Genderless break; // PID Passes - if ((cg == 1) && (gv <= gt)) // Female + if (cg == 1 && gv <= gt) // Female break; // PID Passes - if ((cg == 0) && (gv > gt)) + if (cg == 0 && gv > gt) break; // PID Passes pid = Util.rnd32(); } @@ -595,7 +593,7 @@ internal static ushort ccitt16(byte[] chunk) for (int j = 0; j < 8; j++) { if ((crc & 0x8000) > 0) - crc = (ushort)((crc << 1) ^ 0x1021); + crc = (ushort)(crc << 1 ^ 0x1021); else crc <<= 1; } @@ -671,9 +669,9 @@ internal static string verifyG6CHK(byte[] savefile) BlockIDs[i] = BitConverter.ToUInt16(savefile, verificationOffset + 4 + 8 * i); Checksums[i] = BitConverter.ToUInt16(savefile, verificationOffset + 6 + 8 * i); - CurrentPosition += (Lengths[i] % 0x200 == 0) ? Lengths[i] : (0x200 - Lengths[i] % 0x200 + Lengths[i]); + CurrentPosition += Lengths[i] % 0x200 == 0 ? Lengths[i] : 0x200 - Lengths[i] % 0x200 + Lengths[i]; - if ((BlockIDs[i] != 0) || i == 0) continue; + if (BlockIDs[i] != 0 || i == 0) continue; count = i; break; } @@ -717,9 +715,9 @@ internal static void writeG6CHK(byte[] savefile) BlockIDs[i] = BitConverter.ToUInt16(savefile, verificationOffset + 4 + 8 * i); Checksums[i] = BitConverter.ToUInt16(savefile, verificationOffset + 6 + 8 * i); - CurrentPosition += (Lengths[i]%0x200 == 0) ? Lengths[i] : (0x200 - Lengths[i]%0x200 + Lengths[i]); + CurrentPosition += Lengths[i]%0x200 == 0 ? Lengths[i] : 0x200 - Lengths[i]%0x200 + Lengths[i]; - if ((BlockIDs[i] != 0) || i == 0) continue; + if (BlockIDs[i] != 0 || i == 0) continue; count = i; break; } @@ -1295,7 +1293,7 @@ public ShowdownSet(string input = null) case "Trait": case "Ability": { Ability = Array.IndexOf(abilities, brokenline[1]); break; } case "Level": { Level = Util.ToInt32(brokenline[1]); break; } - case "Shiny": { Shiny = (brokenline[1] == "Yes"); break; } + case "Shiny": { Shiny = brokenline[1] == "Yes"; break; } case "Happiness": { Friendship = Util.ToInt32(brokenline[1]); break; } case "EVs": { @@ -1343,7 +1341,7 @@ public ShowdownSet(string input = null) (Species = Array.IndexOf(species, spec)) < 0 // Not an Edge Case && (Species = Array.IndexOf(species, spec.Replace(" ", ""))) < 0 // Has Form - ) + ) { string[] tmp = spec.Split(new[] { "-" }, StringSplitOptions.None); Species = Array.IndexOf(species, tmp[0].Replace(" ", "")); @@ -1431,7 +1429,7 @@ internal static string getShowdownText(PK6 pk6) Friendship = pk6.CurrentFriendship, Level = getLevel(pk6.Species, pk6.EXP), Shiny = pk6.IsShiny, - Form = (pk6.AltForm > 0) ? getFormList(pk6.Species, + Form = pk6.AltForm > 0 ? getFormList(pk6.Species, Util.getStringList("Types", "en"), Util.getStringList("Forms", "en"), new [] {"", "F", ""})[pk6.AltForm] : "", }; @@ -1472,12 +1470,12 @@ public PersonalInfo(byte[] data) EvoStage = br.ReadByte(); ushort EVs = br.ReadUInt16(); - EV_HP = ((EVs >> 0) & 0x3); - EV_ATK = ((EVs >> 2) & 0x3); - EV_DEF = ((EVs >> 4) & 0x3); - EV_SPE = ((EVs >> 6) & 0x3); - EV_SPA = ((EVs >> 8) & 0x3); - EV_SPD = ((EVs >> 10) & 0x3); + EV_HP = EVs >> 0 & 0x3; + EV_ATK = EVs >> 2 & 0x3; + EV_DEF = EVs >> 4 & 0x3; + EV_SPE = EVs >> 6 & 0x3; + EV_SPA = EVs >> 8 & 0x3; + EV_SPD = EVs >> 10 & 0x3; Items = new[] { br.ReadUInt16(), br.ReadUInt16(), br.ReadUInt16() }; Gender = br.ReadByte(); @@ -1501,12 +1499,12 @@ public PersonalInfo(byte[] data) byte[] TMHMData = br.ReadBytes(0x10); TMHM = new bool[8 * TMHMData.Length]; for (int j = 0; j < TMHM.Length; j++) - TMHM[j] = ((TMHMData[j / 8] >> (j % 8)) & 0x1) == 1; //Bitflags for TMHM + TMHM[j] = (TMHMData[j / 8] >> (j % 8) & 0x1) == 1; //Bitflags for TMHM byte[] TutorData = br.ReadBytes(8); Tutors = new bool[8 * TutorData.Length]; for (int j = 0; j < Tutors.Length; j++) - Tutors[j] = ((TutorData[j / 8] >> (j % 8)) & 0x1) == 1; //Bitflags for Tutors + Tutors[j] = (TutorData[j / 8] >> (j % 8) & 0x1) == 1; //Bitflags for Tutors if (br.BaseStream.Length - br.BaseStream.Position == 0x10) // ORAS { @@ -1521,7 +1519,7 @@ public PersonalInfo(byte[] data) { ORASTutors[i] = new bool[8 * ORASTutorData[i].Length]; for (int b = 0; b < 8 * ORASTutorData[i].Length; b++) - ORASTutors[i][b] = ((ORASTutorData[i][b / 8] >> (b % 8)) & 0x1) == 1; + ORASTutors[i][b] = (ORASTutorData[i][b / 8] >> (b % 8) & 0x1) == 1; } } } @@ -1530,7 +1528,7 @@ public PersonalInfo(byte[] data) // Data Manipulation public int FormeIndex(int species, int forme) { - return forme == 0 || FormStats == 0 ? species : (FormStats + forme - 1); + return forme == 0 || FormStats == 0 ? species : FormStats + forme - 1; } public int RandomGender { diff --git a/Misc/SAV6.cs b/Misc/SAV6.cs index b81bdab81..995077307 100644 --- a/Misc/SAV6.cs +++ b/Misc/SAV6.cs @@ -478,7 +478,7 @@ public uint DaycareEXP2 public bool DaycareOccupied1 { get { return Data[DaycareSlot[DaycareIndex] + (PK6.SIZE_STORED + 8)*0] != 0; } - set { Data[DaycareSlot[DaycareIndex] + (PK6.SIZE_STORED + 8)*0] = (byte) (value ? 1 : 0); } + set { Data[DaycareSlot[DaycareIndex] + (PK6.SIZE_STORED + 8)*0] = (byte)(value ? 1 : 0); } } public bool DaycareOccupied2 { @@ -579,7 +579,7 @@ public void setDex(PK6 pk6) int origin = pk6.Version; int gender = pk6.Gender % 2; // genderless -> male int shiny = pk6.IsShiny ? 1 : 0; - int shiftoff = (shiny * 0x60 * 2) + (gender * 0x60) + 0x60; + int shiftoff = shiny * 0x60 * 2 + gender * 0x60 + 0x60; // Set the [Species/Gender/Shiny] Owned Flag Data[PokeDex + shiftoff + bit / 8 + 0x8] |= (byte)(1 << (bit % 8)); diff --git a/PKX/f1-Main.cs b/PKX/f1-Main.cs index bbad93570..fa64c417d 100644 --- a/PKX/f1-Main.cs +++ b/PKX/f1-Main.cs @@ -2870,7 +2870,7 @@ private int getPKXOffset(int slot) } private int getSlot(object sender) { - string name = (sender is ToolStripItem) + string name = sender is ToolStripItem ? ((sender as ToolStripItem).Owner as ContextMenuStrip).SourceControl.Name : (sender as PictureBox).Name; diff --git a/SAV/SAV_Database.cs b/SAV/SAV_Database.cs index 84983d675..0d6115564 100644 --- a/SAV/SAV_Database.cs +++ b/SAV/SAV_Database.cs @@ -116,7 +116,7 @@ public SAV_Database(Main f1) // Important Events private void clickView(object sender, EventArgs e) { - string name = (sender is ToolStripItem) + string name = sender is ToolStripItem ? ((sender as ToolStripItem).Owner as ContextMenuStrip).SourceControl.Name : (sender as PictureBox).Name; @@ -135,7 +135,7 @@ private void clickView(object sender, EventArgs e) } private void clickDelete(object sender, EventArgs e) { - string name = (sender is ToolStripItem) + string name = sender is ToolStripItem ? ((sender as ToolStripItem).Owner as ContextMenuStrip).SourceControl.Name : (sender as PictureBox).Name; diff --git a/SAV/SAV_HallOfFame.cs b/SAV/SAV_HallOfFame.cs index 4617feac8..4b648a0ea 100644 --- a/SAV/SAV_HallOfFame.cs +++ b/SAV/SAV_HallOfFame.cs @@ -113,10 +113,10 @@ private void displayEntry(object sender, EventArgs e) uint vn = vnd & 0xFF; TB_VN.Text = vn.ToString("000"); string s = "Entry #" + vn + Environment.NewLine; - uint date = (vnd >> 14) & 0x1FFFF; + uint date = vnd >> 14 & 0x1FFFF; uint year = (date & 0xFF) + 2000; - uint month = (date >> 8) & 0xF; - uint day = (date >> 12); + uint month = date >> 8 & 0xF; + uint day = date >> 12; if (day == 0) { s += "No records in this slot."; @@ -147,9 +147,9 @@ private void displayEntry(object sender, EventArgs e) uint slgf = BitConverter.ToUInt32(data, offset + 0x14); // uint form = slgf & 0x1F; - uint gender = (slgf >> 5) & 3; // 0 M; 1 F; 2 G - uint level = (slgf >> 7) & 0x7F; - uint shiny = (slgf >> 14) & 0x1; + uint gender = slgf >> 5 & 3; // 0 M; 1 F; 2 G + uint level = slgf >> 7 & 0x7F; + uint shiny = slgf >> 14 & 0x1; // uint unkn = slgf >> 15; string nickname = Util.TrimFromZero(Encoding.Unicode.GetString(data, offset + 0x18, 22)); @@ -160,7 +160,7 @@ private void displayEntry(object sender, EventArgs e) moncount++; string genderstr=gendersymbols[gender]; - string shinystr = (shiny == 1) ? "Yes" : "No"; + string shinystr = shiny == 1 ? "Yes" : "No"; s += "Name: " + nickname; s += " (" + Main.specieslist[species] + " - " + genderstr + ")" + Environment.NewLine; @@ -179,7 +179,7 @@ private void displayEntry(object sender, EventArgs e) if (sender != null) { - NUP_PartyIndex.Maximum = (moncount == 0) ? 1 : moncount; + NUP_PartyIndex.Maximum = moncount == 0 ? 1 : moncount; NUP_PartyIndex.Value = 1; NUP_PartyIndex_ValueChanged(sender, e); } @@ -220,9 +220,9 @@ private void NUP_PartyIndex_ValueChanged(object sender, EventArgs e) uint slgf = BitConverter.ToUInt32(data, offset + 0x14); uint form = slgf & 0x1F; - uint gender = (slgf >> 5) & 3; // 0 M; 1 F; 2 G - uint level = (slgf >> 7) & 0x7F; - uint shiny = (slgf >> 14) & 0x1; + uint gender = slgf >> 5 & 3; // 0 M; 1 F; 2 G + uint level = slgf >> 7 & 0x7F; + uint shiny = slgf >> 14 & 0x1; uint nick = BitConverter.ToUInt16(data,offset+0x16); CHK_Shiny.Checked = shiny == 1; @@ -260,7 +260,7 @@ private void Write_Entry(object sender, EventArgs e) offset += 0x48; } - int partymember = (Convert.ToInt32(NUP_PartyIndex.Value) - 1); + int partymember = Convert.ToInt32(NUP_PartyIndex.Value) - 1; text_writes[partymember * 2] = TB_Nickname.Text; text_writes[partymember * 2 + 1] = TB_OT.Text; @@ -437,10 +437,10 @@ private void B_Delete_Click(object sender, EventArgs e) private void changeNickname(object sender, MouseEventArgs e) { - TextBox tb = (!(sender is TextBox)) ? TB_Nickname : (sender as TextBox); + TextBox tb = !(sender is TextBox) ? TB_Nickname : sender as TextBox; // Special Character Form if (ModifierKeys == Keys.Control && !Main.specialChars) - (new f2_Text(tb)).Show(); + new f2_Text(tb).Show(); } } } diff --git a/SAV/SAV_PokedexORAS.cs b/SAV/SAV_PokedexORAS.cs index eb748ddea..b65199e81 100644 --- a/SAV/SAV_PokedexORAS.cs +++ b/SAV/SAV_PokedexORAS.cs @@ -88,8 +88,8 @@ private void loadchks() int index = LB_Species.SelectedIndex + 1; int gt = PKX.Personal[index].Gender; - CHK_P2.Enabled = CHK_P4.Enabled = CHK_P6.Enabled = CHK_P8.Enabled = (gt != 254); // Not Female-Only - CHK_P3.Enabled = CHK_P5.Enabled = CHK_P7.Enabled = CHK_P9.Enabled = (gt != 0) && (gt != 255); // Not Male-Only and Not Genderless + CHK_P2.Enabled = CHK_P4.Enabled = CHK_P6.Enabled = CHK_P8.Enabled = gt != 254; // Not Female-Only + CHK_P3.Enabled = CHK_P5.Enabled = CHK_P7.Enabled = CHK_P9.Enabled = gt != 0 && gt != 255; // Not Male-Only and Not Genderless for (int i = 0; i < 7; i++) CL[i].Enabled = true; @@ -109,10 +109,10 @@ private void changeDisplayed(object sender, EventArgs e) if (!(sender as CheckBox).Checked) return; - CHK_P6.Checked = (sender as CheckBox == CHK_P6); - CHK_P7.Checked = (sender as CheckBox == CHK_P7); - CHK_P8.Checked = (sender as CheckBox == CHK_P8); - CHK_P9.Checked = (sender as CheckBox == CHK_P9); + CHK_P6.Checked = sender as CheckBox == CHK_P6; + CHK_P7.Checked = sender as CheckBox == CHK_P7; + CHK_P8.Checked = sender as CheckBox == CHK_P8; + CHK_P9.Checked = sender as CheckBox == CHK_P9; CHK_P2.Checked |= CHK_P6.Checked; CHK_P3.Checked |= CHK_P7.Checked; @@ -221,7 +221,7 @@ private void getBools() int offset = Main.SAV.PokeDex + 0x8 + 0x60 * i; Array.Copy(sav, offset, data, 0, 0x60); BitArray BitRegion = new BitArray(data); - for (int b = 0; b < (0x60 * 8); b++) + for (int b = 0; b < 0x60 * 8; b++) specbools[i, b] = BitRegion[b]; } @@ -229,7 +229,7 @@ private void getBools() byte[] langdata = new byte[0x280]; Array.Copy(sav, Main.SAV.PokeDexLanguageFlags, langdata, 0, 0x280); BitArray LangRegion = new BitArray(langdata); - for (int b = 0; b < (721); b++) // 721 Species + for (int b = 0; b < 721; b++) // 721 Species for (int i = 0; i < 7; i++) // 7 Languages langbools[i, b] = LangRegion[7 * b + i]; } @@ -254,8 +254,8 @@ private void B_GiveAll_Click(object sender, EventArgs e) int index = LB_Species.SelectedIndex+1; int gt = PKX.Personal[index].Gender; - CHK_P2.Checked = CHK_P4.Checked = (gt != 254) && ModifierKeys != Keys.Control; - CHK_P3.Checked = CHK_P5.Checked = (gt != 0) && (gt != 255) && ModifierKeys != Keys.Control; + CHK_P2.Checked = CHK_P4.Checked = gt != 254 && ModifierKeys != Keys.Control; + CHK_P3.Checked = CHK_P5.Checked = gt != 0 && gt != 255 && ModifierKeys != Keys.Control; if (ModifierKeys == Keys.Control) foreach (var chk in new[]{CHK_P6, CHK_P7, CHK_P8, CHK_P9}) diff --git a/SAV/SAV_PokedexXY.cs b/SAV/SAV_PokedexXY.cs index f4717811b..53857903a 100644 --- a/SAV/SAV_PokedexXY.cs +++ b/SAV/SAV_PokedexXY.cs @@ -102,8 +102,8 @@ private void loadchks() int index = LB_Species.SelectedIndex + 1; int gt = PKX.Personal[index].Gender; - CHK_P2.Enabled = CHK_P4.Enabled = CHK_P6.Enabled = CHK_P8.Enabled = (gt != 254); // Not Female-Only - CHK_P3.Enabled = CHK_P5.Enabled = CHK_P7.Enabled = CHK_P9.Enabled = (gt != 0) && (gt != 255); // Not Male-Only and Not Genderless + CHK_P2.Enabled = CHK_P4.Enabled = CHK_P6.Enabled = CHK_P8.Enabled = gt != 254; // Not Female-Only + CHK_P3.Enabled = CHK_P5.Enabled = CHK_P7.Enabled = CHK_P9.Enabled = !(gt == 0 || (gt == 255)); // Not Male-Only and Not Genderless for (int i = 0; i < 7; i++) CL[i].Enabled = true; @@ -118,10 +118,10 @@ private void changeDisplayed(object sender, EventArgs e) if (!(sender as CheckBox).Checked) return; - CHK_P6.Checked = (sender as CheckBox == CHK_P6); - CHK_P7.Checked = (sender as CheckBox == CHK_P7); - CHK_P8.Checked = (sender as CheckBox == CHK_P8); - CHK_P9.Checked = (sender as CheckBox == CHK_P9); + CHK_P6.Checked = sender as CheckBox == CHK_P6; + CHK_P7.Checked = sender as CheckBox == CHK_P7; + CHK_P8.Checked = sender as CheckBox == CHK_P8; + CHK_P9.Checked = sender as CheckBox == CHK_P9; CHK_P2.Checked |= CHK_P6.Checked; CHK_P3.Checked |= CHK_P7.Checked; @@ -240,7 +240,7 @@ private void getBools() byte[] data = new byte[0x60]; Array.Copy(sav, Main.SAV.PokeDex + 8 + 0x60 * i, data, 0, 0x60); BitArray BitRegion = new BitArray(data); - for (int b = 0; b < (0x60 * 8); b++) + for (int b = 0; b < 0x60 * 8; b++) specbools[i, b] = BitRegion[b]; } @@ -248,7 +248,7 @@ private void getBools() byte[] langdata = new byte[0x280]; Array.Copy(sav, Main.SAV.PokeDexLanguageFlags, langdata, 0, 0x280); BitArray LangRegion = new BitArray(langdata); - for (int b = 0; b < (721); b++) // 721 Species + for (int b = 0; b < 721; b++) // 721 Species for (int i = 0; i < 7; i++) // 7 Languages langbools[i, b] = LangRegion[7 * b + i]; @@ -257,7 +257,7 @@ private void getBools() byte[] foreigndata = new byte[0x52]; Array.Copy(sav, Main.SAV.PokeDex + 0x64C, foreigndata, 0, 0x52); BitArray ForeignRegion = new BitArray(foreigndata); - for (int b = 0; b < (0x52 * 8); b++) + for (int b = 0; b < 0x52 * 8; b++) foreignbools[b] = ForeignRegion[b]; } } @@ -285,8 +285,8 @@ private void B_GiveAll_Click(object sender, EventArgs e) int index = LB_Species.SelectedIndex+1; int gt = PKX.Personal[index].Gender; - CHK_P2.Checked = CHK_P4.Checked = (gt != 254) && ModifierKeys != Keys.Control; - CHK_P3.Checked = CHK_P5.Checked = (gt != 0) && (gt != 255) && ModifierKeys != Keys.Control; + CHK_P2.Checked = CHK_P4.Checked = gt != 254 && ModifierKeys != Keys.Control; + CHK_P3.Checked = CHK_P5.Checked = gt != 0 && gt != 255 && ModifierKeys != Keys.Control; if (ModifierKeys == Keys.Control) foreach (var chk in new[] { CHK_P6, CHK_P7, CHK_P8, CHK_P9 }) diff --git a/SAV/SAV_Pokepuff.cs b/SAV/SAV_Pokepuff.cs index 3317a89b3..008a21381 100644 --- a/SAV/SAV_Pokepuff.cs +++ b/SAV/SAV_Pokepuff.cs @@ -86,7 +86,7 @@ private void B_All_Click(object sender, EventArgs e) } byte[] newpuffs = new byte[100]; for (int i = 0; i < 100; i++) - newpuffs[i] = (byte) (Util.rnd32()%basemod + basepuff); + newpuffs[i] = (byte)(Util.rnd32()%basemod + basepuff); Array.Copy(newpuffs, 0, sav, Main.SAV.Puff, 100); Setup(); @@ -110,7 +110,7 @@ private void B_Sort_Click(object sender, EventArgs e) for (int i = 0; i < 100; i++) { string puff = dgv.Rows[i].Cells[1].Value.ToString(); - puffarray[i] = (byte) Array.IndexOf(pfa, puff); + puffarray[i] = (byte)Array.IndexOf(pfa, puff); } Array.Sort(puffarray); Array.Reverse(puffarray); @@ -121,7 +121,7 @@ private void B_Sort_Click(object sender, EventArgs e) for (int i = 0; i < 100; i++) { string puff = dgv.Rows[i].Cells[1].Value.ToString(); - byte puffval = (byte) Array.IndexOf(pfa, puff); + byte puffval = (byte)Array.IndexOf(pfa, puff); if (puffval == 0) continue; puffarray[count] = puffval; count++; diff --git a/SAV/SAV_SecretBase.cs b/SAV/SAV_SecretBase.cs index e3b6d8482..6d30047cc 100644 --- a/SAV/SAV_SecretBase.cs +++ b/SAV/SAV_SecretBase.cs @@ -115,7 +115,7 @@ private void B_SAV2FAV(object sender, EventArgs e) NUD_FObject.Value = 1; // Trigger Update changeObjectIndex(null, null); - GB_PKM.Enabled = (index > 0); + GB_PKM.Enabled = index > 0; // Trainer Pokemon pkmdata = new byte[3, 0x34]; @@ -250,12 +250,12 @@ private void changeObjectQuality(object sender, EventArgs e) { if (editing) return; - int objindex = (int)(NUD_FObject.Value) - 1; + int objindex = (int)NUD_FObject.Value - 1; - byte val = (byte)(NUD_FObjType.Value); - byte x = (byte)(NUD_FX.Value); - byte y = (byte)(NUD_FY.Value); - byte rot = (byte)(NUD_FRot.Value); + byte val = (byte)NUD_FObjType.Value; + byte x = (byte)NUD_FX.Value; + byte y = (byte)NUD_FY.Value; + byte rot = (byte)NUD_FRot.Value; objdata[objindex, 0] = val; objdata[objindex, 2] = x; @@ -266,7 +266,7 @@ private void changeObjectQuality(object sender, EventArgs e) private int currentpkm; private void changeFavPKM(object sender, EventArgs e) { - int index = (int)(NUD_FPKM.Value); + int index = (int)NUD_FPKM.Value; saveFavPKM(); // Save existing PKM currentpkm = index; loadFavPKM(); @@ -340,7 +340,7 @@ private void loadFavPKM() int nature = fpkm[0x14]; byte genform = fpkm[0x15]; - genderflag = (genform >> 1) & 0x3; + genderflag = genform >> 1 & 0x3; setGenderLabel(); byte HP_EV = fpkm[0x16]; @@ -367,7 +367,7 @@ private void loadFavPKM() byte SD_IV = fpkm[0x2C]; byte SP_IV = fpkm[0x2D]; - bool isshiny = ((SP_IV & 0x40) > 0); + bool isshiny = (SP_IV & 0x40) > 0; SP_IV &= 0x1F; byte friendship = fpkm[0x2E]; diff --git a/SAV/SAV_Trainer.cs b/SAV/SAV_Trainer.cs index 4a90fd48c..17055ddfb 100644 --- a/SAV/SAV_Trainer.cs +++ b/SAV/SAV_Trainer.cs @@ -329,7 +329,7 @@ private void getComboBoxes() private void getBadges() { // Fetch Badges - Bitmap[] bma = (Main.SAV.ORAS || Main.SAV.ORASDEMO) ? + Bitmap[] bma = Main.SAV.ORAS || Main.SAV.ORASDEMO ? new[] { Properties.Resources.badge_01, // ORAS Badges Properties.Resources.badge_02, @@ -361,7 +361,7 @@ private void getTextBoxes() int badgeval = SAV.Badges; CheckBox[] cba = { cb1, cb2, cb3, cb4, cb5, cb6, cb7, cb8, }; for (int i = 0; i < 8; i++) - cba[i].Checked = (badgeval & (1 << i)) != 0; + cba[i].Checked = (badgeval & 1 << i) != 0; // Get Data string OT_NAME = SAV.OT; @@ -521,10 +521,10 @@ private void save() private void clickOT(object sender, MouseEventArgs e) { - TextBox tb = (!(sender is TextBox)) ? TB_OTName : (sender as TextBox); + TextBox tb = !(sender is TextBox) ? TB_OTName : sender as TextBox; // Special Character Form if (ModifierKeys == Keys.Control && !Main.specialChars) - (new f2_Text(tb)).Show(); + new f2_Text(tb).Show(); } private void showTSV(object sender, EventArgs e) { @@ -618,7 +618,7 @@ private void toggleBadge(object sender, EventArgs e) private void CB_Multi_SelectedIndexChanged(object sender, EventArgs e) { - PB_Sprite.Image = (Image)Properties.Resources.ResourceManager.GetObject((Main.SAV.ORAS || Main.SAV.ORASDEMO) ? "tr_" + Util.getIndex(CB_Multi).ToString("00") : "tr_00"); + PB_Sprite.Image = (Image)Properties.Resources.ResourceManager.GetObject(Main.SAV.ORAS || Main.SAV.ORASDEMO ? "tr_" + Util.getIndex(CB_Multi).ToString("00") : "tr_00"); } } } \ No newline at end of file diff --git a/SAV/SAV_Wondercard.cs b/SAV/SAV_Wondercard.cs index d02a6aac4..8072a64ed 100644 --- a/SAV/SAV_Wondercard.cs +++ b/SAV/SAV_Wondercard.cs @@ -164,7 +164,7 @@ private void B_Output_Click(object sender, EventArgs e) // Wonder Card RW (window<->sav) private void clickView(object sender, EventArgs e) { - string name = (sender is ToolStripItem) + string name = sender is ToolStripItem ? ((sender as ToolStripItem).Owner as ContextMenuStrip).SourceControl.Name : (sender as PictureBox).Name; @@ -177,7 +177,7 @@ private void clickView(object sender, EventArgs e) } private void clickSet(object sender, EventArgs e) { - string name = (sender is ToolStripItem) + string name = sender is ToolStripItem ? ((sender as ToolStripItem).Owner as ContextMenuStrip).SourceControl.Name : (sender as PictureBox).Name; @@ -200,7 +200,7 @@ private void clickSet(object sender, EventArgs e) } private void clickDelete(object sender, EventArgs e) { - string name = (sender is ToolStripItem) + string name = sender is ToolStripItem ? ((sender as ToolStripItem).Owner as ContextMenuStrip).SourceControl.Name : (sender as PictureBox).Name; @@ -404,7 +404,7 @@ private void pbBoxSlot_MouseDown(object sender, MouseEventArgs e) } return; } - PictureBox pb = (PictureBox)(sender); + PictureBox pb = (PictureBox)sender; if (pb.Image == null) return;