Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2025-02-17 05:48:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make ContestStat fields byte (from int)

Browse source
This commit is contained in:
Kurt 2021-01-01 13:39:08 -08:00
parent f6d4d93613
commit 7523e0e200
21 changed files with 144 additions and 144 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
PKHeX.Core/Legality/Encounters/Data/Encounters3.cs
View file

@ -143,11 +143,11 @@ namespace PKHeX.Core
private static readonly EncounterStatic3[] Encounter_RSE = ArrayUtil.ConcatAll(Encounter_RSE_Roam, Encounter_RSE_Regular);
private static readonly EncounterStatic3[] Encounter_FRLG = ArrayUtil.ConcatAll(Encounter_FRLG_Roam, Encounter_FRLG_Stationary);
private static readonly int[] TradeContest_Cool = { 30, 05, 05, 05, 05, 10 };
private static readonly int[] TradeContest_Beauty = { 05, 30, 05, 05, 05, 10 };
private static readonly int[] TradeContest_Cute = { 05, 05, 30, 05, 05, 10 };
private static readonly int[] TradeContest_Clever = { 05, 05, 05, 30, 05, 10 };
private static readonly int[] TradeContest_Tough = { 05, 05, 05, 05, 30, 10 };
private static readonly byte[] TradeContest_Cool = { 30, 05, 05, 05, 05, 10 };
private static readonly byte[] TradeContest_Beauty = { 05, 30, 05, 05, 05, 10 };
private static readonly byte[] TradeContest_Cute = { 05, 05, 30, 05, 05, 10 };
private static readonly byte[] TradeContest_Clever = { 05, 05, 05, 30, 05, 10 };
private static readonly byte[] TradeContest_Tough = { 05, 05, 05, 05, 30, 10 };
internal static readonly EncounterTrade3[] TradeGift_RSE =
{

12
PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic6.cs
View file

@ -8,12 +8,12 @@
{
public override int Generation => 6;
public int CNT_Cool { get; init; }
public int CNT_Beauty { get; init; }
public int CNT_Cute { get; init; }
public int CNT_Smart { get; init; }
public int CNT_Tough { get; init; }
public int CNT_Sheen { get; init; }
public byte CNT_Cool { get; init; }
public byte CNT_Beauty { get; init; }
public byte CNT_Cute { get; init; }
public byte CNT_Smart { get; init; }
public byte CNT_Tough { get; init; }
public byte CNT_Sheen { get; init; }
protected override bool IsMatchLocation(PKM pkm)
{

14
PKHeX.Core/Legality/Encounters/EncounterTrade/EncounterTrade3.cs
View file

@ -11,14 +11,14 @@ namespace PKHeX.Core
/// </summary>
public readonly uint PID;
public int CNT_Cool { get; private init; }
public int CNT_Beauty { get; private init; }
public int CNT_Cute { get; private init; }
public int CNT_Smart { get; private init; }
public int CNT_Tough { get; private init; }
public int CNT_Sheen { get; private init; }
public byte CNT_Cool { get; private init; }
public byte CNT_Beauty { get; private init; }
public byte CNT_Cute { get; private init; }
public byte CNT_Smart { get; private init; }
public byte CNT_Tough { get; private init; }
public byte CNT_Sheen { get; private init; }
public IReadOnlyList<int> Contest
public IReadOnlyList<byte> Contest
{
init
{

14
PKHeX.Core/Legality/Encounters/EncounterTrade/EncounterTrade4.cs
View file

@ -20,14 +20,14 @@
Level = level;
}
public int CNT_Cool { get; init; }
public int CNT_Beauty { get; init; }
public int CNT_Cute { get; init; }
public int CNT_Smart { get; init; }
public int CNT_Tough { get; init; }
public int CNT_Sheen { get; init; }
public byte CNT_Cool { get; init; }
public byte CNT_Beauty { get; init; }
public byte CNT_Cute { get; init; }
public byte CNT_Smart { get; init; }
public byte CNT_Tough { get; init; }
public byte CNT_Sheen { get; init; }
public int Contest
public byte Contest
{
init
{

12
PKHeX.Core/MysteryGifts/PGF.cs
View file

@ -63,12 +63,12 @@ namespace PKHeX.Core
public override int EggLocation { get => BitConverter.ToUInt16(Data, 0x38); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x38); }
public ushort MetLocation { get => BitConverter.ToUInt16(Data, 0x3A); set => BitConverter.GetBytes(value).CopyTo(Data, 0x3A); }
public int MetLevel { get => Data[0x3C]; set => Data[0x3C] = (byte)value; }
public int CNT_Cool { get => Data[0x3D]; set => Data[0x3D] = (byte)value; }
public int CNT_Beauty { get => Data[0x3E]; set => Data[0x3E] = (byte)value; }
public int CNT_Cute { get => Data[0x3F]; set => Data[0x3F] = (byte)value; }
public int CNT_Smart { get => Data[0x40]; set => Data[0x40] = (byte)value; }
public int CNT_Tough { get => Data[0x41]; set => Data[0x41] = (byte)value; }
public int CNT_Sheen { get => Data[0x42]; set => Data[0x42] = (byte)value; }
public byte CNT_Cool { get => Data[0x3D]; set => Data[0x3D] = value; }
public byte CNT_Beauty { get => Data[0x3E]; set => Data[0x3E] = value; }
public byte CNT_Cute { get => Data[0x3F]; set => Data[0x3F] = value; }
public byte CNT_Smart { get => Data[0x40]; set => Data[0x40] = value; }
public byte CNT_Tough { get => Data[0x41]; set => Data[0x41] = value; }
public byte CNT_Sheen { get => Data[0x42]; set => Data[0x42] = value; }
public int IV_HP { get => Data[0x43]; set => Data[0x43] = (byte)value; }
public int IV_ATK { get => Data[0x44]; set => Data[0x44] = (byte)value; }
public int IV_DEF { get => Data[0x45]; set => Data[0x45] = (byte)value; }

12
PKHeX.Core/MysteryGifts/WC6.cs
View file

@ -153,12 +153,12 @@ namespace PKHeX.Core
public override int EggLocation { get => BitConverter.ToUInt16(Data, 0xA4); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0xA4); }
public int MetLocation { get => BitConverter.ToUInt16(Data, 0xA6); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0xA6); }
public int CNT_Cool { get => Data[0xA9]; set => Data[0xA9] = (byte)value; }
public int CNT_Beauty { get => Data[0xAA]; set => Data[0xAA] = (byte)value; }
public int CNT_Cute { get => Data[0xAB]; set => Data[0xAB] = (byte)value; }
public int CNT_Smart { get => Data[0xAC]; set => Data[0xAC] = (byte)value; }
public int CNT_Tough { get => Data[0xAD]; set => Data[0xAD] = (byte)value; }
public int CNT_Sheen { get => Data[0xAE]; set => Data[0xAE] = (byte)value; }
public byte CNT_Cool { get => Data[0xA9]; set => Data[0xA9] = value; }
public byte CNT_Beauty { get => Data[0xAA]; set => Data[0xAA] = value; }
public byte CNT_Cute { get => Data[0xAB]; set => Data[0xAB] = value; }
public byte CNT_Smart { get => Data[0xAC]; set => Data[0xAC] = value; }
public byte CNT_Tough { get => Data[0xAD]; set => Data[0xAD] = value; }
public byte CNT_Sheen { get => Data[0xAE]; set => Data[0xAE] = value; }
public int IV_HP { get => Data[0xAF]; set => Data[0xAF] = (byte)value; }
public int IV_ATK { get => Data[0xB0]; set => Data[0xB0] = (byte)value; }

12
PKHeX.Core/MysteryGifts/WC7.cs
View file

@ -195,12 +195,12 @@ namespace PKHeX.Core
public int MetLocation { get => BitConverter.ToUInt16(Data, 0xA6); set => BitConverter.GetBytes((ushort)value).CopyTo(Data, 0xA6); }
public int MetLevel { get => Data[0xA8]; set => Data[0xA8] = (byte)value; }
public int CNT_Cool { get => Data[0xA9]; set => Data[0xA9] = (byte)value; }
public int CNT_Beauty { get => Data[0xAA]; set => Data[0xAA] = (byte)value; }
public int CNT_Cute { get => Data[0xAB]; set => Data[0xAB] = (byte)value; }
public int CNT_Smart { get => Data[0xAC]; set => Data[0xAC] = (byte)value; }
public int CNT_Tough { get => Data[0xAD]; set => Data[0xAD] = (byte)value; }
public int CNT_Sheen { get => Data[0xAE]; set => Data[0xAE] = (byte)value; }
public byte CNT_Cool { get => Data[0xA9]; set => Data[0xA9] = value; }
public byte CNT_Beauty { get => Data[0xAA]; set => Data[0xAA] = value; }
public byte CNT_Cute { get => Data[0xAB]; set => Data[0xAB] = value; }
public byte CNT_Smart { get => Data[0xAC]; set => Data[0xAC] = value; }
public byte CNT_Tough { get => Data[0xAD]; set => Data[0xAD] = value; }
public byte CNT_Sheen { get => Data[0xAE]; set => Data[0xAE] = value; }
public int IV_HP { get => Data[0xAF]; set => Data[0xAF] = (byte)value; }
public int IV_ATK { get => Data[0xB0]; set => Data[0xB0] = (byte)value; }

12
PKHeX.Core/PKM/BK4.cs
View file

@ -76,12 +76,12 @@ namespace PKHeX.Core
public override int EV_SPE { get => Data[0x1B]; set => Data[0x1B] = (byte)value; }
public override int EV_SPA { get => Data[0x1C]; set => Data[0x1C] = (byte)value; }
public override int EV_SPD { get => Data[0x1D]; set => Data[0x1D] = (byte)value; }
public override int CNT_Cool { get => Data[0x1E]; set => Data[0x1E] = (byte)value; }
public override int CNT_Beauty { get => Data[0x1F]; set => Data[0x1F] = (byte)value; }
public override int CNT_Cute { get => Data[0x20]; set => Data[0x20] = (byte)value; }
public override int CNT_Smart { get => Data[0x21]; set => Data[0x21] = (byte)value; }
public override int CNT_Tough { get => Data[0x22]; set => Data[0x22] = (byte)value; }
public override int CNT_Sheen { get => Data[0x23]; set => Data[0x23] = (byte)value; }
public override byte CNT_Cool { get => Data[0x1E]; set => Data[0x1E] = value; }
public override byte CNT_Beauty { get => Data[0x1F]; set => Data[0x1F] = value; }
public override byte CNT_Cute { get => Data[0x20]; set => Data[0x20] = value; }
public override byte CNT_Smart { get => Data[0x21]; set => Data[0x21] = value; }
public override byte CNT_Tough { get => Data[0x22]; set => Data[0x22] = value; }
public override byte CNT_Sheen { get => Data[0x23]; set => Data[0x23] = value; }
private byte RIB3 { get => Data[0x24]; set => Data[0x24] = value; } // Unova 2
private byte RIB2 { get => Data[0x25]; set => Data[0x25] = value; } // Unova 1

12
PKHeX.Core/PKM/CK3.cs
View file

@ -142,17 +142,17 @@ namespace PKHeX.Core
public override int OT_Friendship { get => Data[0xB0]; set => Data[0xB0] = (byte)value; }
// Contest
public override int CNT_Cool { get => Data[0xB2]; set => Data[0xB2] = (byte)value; }
public override int CNT_Beauty { get => Data[0xB3]; set => Data[0xB3] = (byte)value; }
public override int CNT_Cute { get => Data[0xB4]; set => Data[0xB4] = (byte)value; }
public override int CNT_Smart { get => Data[0xB5]; set => Data[0xB5] = (byte)value; }
public override int CNT_Tough { get => Data[0xB6]; set => Data[0xB6] = (byte)value; }
public override byte CNT_Cool { get => Data[0xB2]; set => Data[0xB2] = value; }
public override byte CNT_Beauty { get => Data[0xB3]; set => Data[0xB3] = value; }
public override byte CNT_Cute { get => Data[0xB4]; set => Data[0xB4] = value; }
public override byte CNT_Smart { get => Data[0xB5]; set => Data[0xB5] = value; }
public override byte CNT_Tough { get => Data[0xB6]; set => Data[0xB6] = value; }
public override int RibbonCountG3Cool { get => Data[0xB7]; set => Data[0xB7] = (byte)value; }
public override int RibbonCountG3Beauty { get => Data[0xB8]; set => Data[0xB8] = (byte)value; }
public override int RibbonCountG3Cute { get => Data[0xB9]; set => Data[0xB9] = (byte)value; }
public override int RibbonCountG3Smart { get => Data[0xBA]; set => Data[0xBA] = (byte)value; }
public override int RibbonCountG3Tough { get => Data[0xBB]; set => Data[0xBB] = (byte)value; }
public override int CNT_Sheen { get => Data[0xBC]; set => Data[0xBC] = (byte)value; }
public override byte CNT_Sheen { get => Data[0xBC]; set => Data[0xBC] = value; }
// Ribbons
public override bool RibbonChampionG3Hoenn { get => Data[0xBD] == 1; set => Data[0xBD] = value ? 1 : 0; }

12
PKHeX.Core/PKM/PK3.cs
View file

@ -106,12 +106,12 @@ namespace PKHeX.Core
public override int EV_SPE { get => Data[0x3B]; set => Data[0x3B] = (byte)value; }
public override int EV_SPA { get => Data[0x3C]; set => Data[0x3C] = (byte)value; }
public override int EV_SPD { get => Data[0x3D]; set => Data[0x3D] = (byte)value; }
public override int CNT_Cool { get => Data[0x3E]; set => Data[0x3E] = (byte)value; }
public override int CNT_Beauty { get => Data[0x3F]; set => Data[0x3F] = (byte)value; }
public override int CNT_Cute { get => Data[0x40]; set => Data[0x40] = (byte)value; }
public override int CNT_Smart { get => Data[0x41]; set => Data[0x41] = (byte)value; }
public override int CNT_Tough { get => Data[0x42]; set => Data[0x42] = (byte)value; }
public override int CNT_Sheen { get => Data[0x43]; set => Data[0x43] = (byte)value; }
public override byte CNT_Cool { get => Data[0x3E]; set => Data[0x3E] = value; }
public override byte CNT_Beauty { get => Data[0x3F]; set => Data[0x3F] = value; }
public override byte CNT_Cute { get => Data[0x40]; set => Data[0x40] = value; }
public override byte CNT_Smart { get => Data[0x41]; set => Data[0x41] = value; }
public override byte CNT_Tough { get => Data[0x42]; set => Data[0x42] = value; }
public override byte CNT_Sheen { get => Data[0x43]; set => Data[0x43] = value; }
#endregion
#region Block D

12
PKHeX.Core/PKM/PK4.cs
View file

@ -55,12 +55,12 @@ namespace PKHeX.Core
public override int EV_SPE { get => Data[0x1B]; set => Data[0x1B] = (byte)value; }
public override int EV_SPA { get => Data[0x1C]; set => Data[0x1C] = (byte)value; }
public override int EV_SPD { get => Data[0x1D]; set => Data[0x1D] = (byte)value; }
public override int CNT_Cool { get => Data[0x1E]; set => Data[0x1E] = (byte)value; }
public override int CNT_Beauty { get => Data[0x1F]; set => Data[0x1F] = (byte)value; }
public override int CNT_Cute { get => Data[0x20]; set => Data[0x20] = (byte)value; }
public override int CNT_Smart { get => Data[0x21]; set => Data[0x21] = (byte)value; }
public override int CNT_Tough { get => Data[0x22]; set => Data[0x22] = (byte)value; }
public override int CNT_Sheen { get => Data[0x23]; set => Data[0x23] = (byte)value; }
public override byte CNT_Cool { get => Data[0x1E]; set => Data[0x1E] = value; }
public override byte CNT_Beauty { get => Data[0x1F]; set => Data[0x1F] = value; }
public override byte CNT_Cute { get => Data[0x20]; set => Data[0x20] = value; }
public override byte CNT_Smart { get => Data[0x21]; set => Data[0x21] = value; }
public override byte CNT_Tough { get => Data[0x22]; set => Data[0x22] = value; }
public override byte CNT_Sheen { get => Data[0x23]; set => Data[0x23] = value; }
private byte RIB0 { get => Data[0x24]; set => Data[0x24] = value; } // Sinnoh 1
private byte RIB1 { get => Data[0x25]; set => Data[0x25] = value; } // Sinnoh 2

12
PKHeX.Core/PKM/PK5.cs
View file

@ -69,12 +69,12 @@ namespace PKHeX.Core
public override int EV_SPE { get => Data[0x1B]; set => Data[0x1B] = (byte)value; }
public override int EV_SPA { get => Data[0x1C]; set => Data[0x1C] = (byte)value; }
public override int EV_SPD { get => Data[0x1D]; set => Data[0x1D] = (byte)value; }
public int CNT_Cool { get => Data[0x1E]; set => Data[0x1E] = (byte)value; }
public int CNT_Beauty { get => Data[0x1F]; set => Data[0x1F] = (byte)value; }
public int CNT_Cute { get => Data[0x20]; set => Data[0x20] = (byte)value; }
public int CNT_Smart { get => Data[0x21]; set => Data[0x21] = (byte)value; }
public int CNT_Tough { get => Data[0x22]; set => Data[0x22] = (byte)value; }
public int CNT_Sheen { get => Data[0x23]; set => Data[0x23] = (byte)value; }
public byte CNT_Cool { get => Data[0x1E]; set => Data[0x1E] = value; }
public byte CNT_Beauty { get => Data[0x1F]; set => Data[0x1F] = value; }
public byte CNT_Cute { get => Data[0x20]; set => Data[0x20] = value; }
public byte CNT_Smart { get => Data[0x21]; set => Data[0x21] = value; }
public byte CNT_Tough { get => Data[0x22]; set => Data[0x22] = value; }
public byte CNT_Sheen { get => Data[0x23]; set => Data[0x23] = value; }
private byte RIB0 { get => Data[0x24]; set => Data[0x24] = value; } // Sinnoh 1
private byte RIB1 { get => Data[0x25]; set => Data[0x25] = value; } // Sinnoh 2

12
PKHeX.Core/PKM/PK6.cs
View file

@ -103,12 +103,12 @@ namespace PKHeX.Core
public override int EV_SPE { get => Data[0x21]; set => Data[0x21] = (byte)value; }
public override int EV_SPA { get => Data[0x22]; set => Data[0x22] = (byte)value; }
public override int EV_SPD { get => Data[0x23]; set => Data[0x23] = (byte)value; }
public int CNT_Cool { get => Data[0x24]; set => Data[0x24] = (byte)value; }
public int CNT_Beauty { get => Data[0x25]; set => Data[0x25] = (byte)value; }
public int CNT_Cute { get => Data[0x26]; set => Data[0x26] = (byte)value; }
public int CNT_Smart { get => Data[0x27]; set => Data[0x27] = (byte)value; }
public int CNT_Tough { get => Data[0x28]; set => Data[0x28] = (byte)value; }
public int CNT_Sheen { get => Data[0x29]; set => Data[0x29] = (byte)value; }
public byte CNT_Cool { get => Data[0x24]; set => Data[0x24] = value; }
public byte CNT_Beauty { get => Data[0x25]; set => Data[0x25] = value; }
public byte CNT_Cute { get => Data[0x26]; set => Data[0x26] = value; }
public byte CNT_Smart { get => Data[0x27]; set => Data[0x27] = value; }
public byte CNT_Tough { get => Data[0x28]; set => Data[0x28] = value; }
public byte CNT_Sheen { get => Data[0x29]; set => Data[0x29] = value; }
public override int MarkValue { get => Data[0x2A]; protected set => Data[0x2A] = (byte)value; }
private byte PKRS { get => Data[0x2B]; set => Data[0x2B] = value; }
public override int PKRS_Days { get => PKRS & 0xF; set => PKRS = (byte)((PKRS & ~0xF) | value); }

12
PKHeX.Core/PKM/PK7.cs
View file

@ -103,12 +103,12 @@ namespace PKHeX.Core
public override int EV_SPE { get => Data[0x21]; set => Data[0x21] = (byte)value; }
public override int EV_SPA { get => Data[0x22]; set => Data[0x22] = (byte)value; }
public override int EV_SPD { get => Data[0x23]; set => Data[0x23] = (byte)value; }
public int CNT_Cool { get => Data[0x24]; set => Data[0x24] = (byte)value; }
public int CNT_Beauty { get => Data[0x25]; set => Data[0x25] = (byte)value; }
public int CNT_Cute { get => Data[0x26]; set => Data[0x26] = (byte)value; }
public int CNT_Smart { get => Data[0x27]; set => Data[0x27] = (byte)value; }
public int CNT_Tough { get => Data[0x28]; set => Data[0x28] = (byte)value; }
public int CNT_Sheen { get => Data[0x29]; set => Data[0x29] = (byte)value; }
public byte CNT_Cool { get => Data[0x24]; set => Data[0x24] = value; }
public byte CNT_Beauty { get => Data[0x25]; set => Data[0x25] = value; }
public byte CNT_Cute { get => Data[0x26]; set => Data[0x26] = value; }
public byte CNT_Smart { get => Data[0x27]; set => Data[0x27] = value; }
public byte CNT_Tough { get => Data[0x28]; set => Data[0x28] = value; }
public byte CNT_Sheen { get => Data[0x29]; set => Data[0x29] = value; }
public byte ResortEventStatus { get => Data[0x2A]; set => Data[0x2A] = value; }
private byte PKRS { get => Data[0x2B]; set => Data[0x2B] = value; }
public override int PKRS_Days { get => PKRS & 0xF; set => PKRS = (byte)((PKRS & ~0xF) | value); }

12
PKHeX.Core/PKM/PK8.cs
View file

@ -184,12 +184,12 @@ namespace PKHeX.Core
public override int EV_SPE { get => Data[0x29]; set => Data[0x29] = (byte)value; }
public override int EV_SPA { get => Data[0x2A]; set => Data[0x2A] = (byte)value; }
public override int EV_SPD { get => Data[0x2B]; set => Data[0x2B] = (byte)value; }
public int CNT_Cool { get => Data[0x2C]; set => Data[0x2C] = (byte)value; }
public int CNT_Beauty { get => Data[0x2D]; set => Data[0x2D] = (byte)value; }
public int CNT_Cute { get => Data[0x2E]; set => Data[0x2E] = (byte)value; }
public int CNT_Smart { get => Data[0x2F]; set => Data[0x2F] = (byte)value; }
public int CNT_Tough { get => Data[0x30]; set => Data[0x30] = (byte)value; }
public int CNT_Sheen { get => Data[0x31]; set => Data[0x31] = (byte)value; }
public byte CNT_Cool { get => Data[0x2C]; set => Data[0x2C] = value; }
public byte CNT_Beauty { get => Data[0x2D]; set => Data[0x2D] = value; }
public byte CNT_Cute { get => Data[0x2E]; set => Data[0x2E] = value; }
public byte CNT_Smart { get => Data[0x2F]; set => Data[0x2F] = value; }
public byte CNT_Tough { get => Data[0x30]; set => Data[0x30] = value; }
public byte CNT_Sheen { get => Data[0x31]; set => Data[0x31] = value; }
private byte PKRS { get => Data[0x32]; set => Data[0x32] = value; }
public override int PKRS_Days { get => PKRS & 0xF; set => PKRS = (byte)((PKRS & ~0xF) | value); }
public override int PKRS_Strain { get => PKRS >> 4; set => PKRS = (byte)((PKRS & 0xF) | value << 4); }

12
PKHeX.Core/PKM/Shared/G3PKM.cs
View file

@ -69,12 +69,12 @@
public abstract bool Unused3 { get; set; }
public abstract bool Unused4 { get; set; }
public abstract int CNT_Cool { get; set; }
public abstract int CNT_Beauty { get; set; }
public abstract int CNT_Cute { get; set; }
public abstract int CNT_Smart { get; set; }
public abstract int CNT_Tough { get; set; }
public abstract int CNT_Sheen { get; set; }
public abstract byte CNT_Cool { get; set; }
public abstract byte CNT_Beauty { get; set; }
public abstract byte CNT_Cute { get; set; }
public abstract byte CNT_Smart { get; set; }
public abstract byte CNT_Tough { get; set; }
public abstract byte CNT_Sheen { get; set; }
/// <summary>
/// Swaps bits at a given position

12
PKHeX.Core/PKM/Shared/G4PKM.cs
View file

@ -155,12 +155,12 @@
public abstract bool RIBB_7 { get; set; }
#endregion
public abstract int CNT_Cool { get; set; }
public abstract int CNT_Beauty { get; set; }
public abstract int CNT_Cute { get; set; }
public abstract int CNT_Smart { get; set; }
public abstract int CNT_Tough { get; set; }
public abstract int CNT_Sheen { get; set; }
public abstract byte CNT_Cool { get; set; }
public abstract byte CNT_Beauty { get; set; }
public abstract byte CNT_Cute { get; set; }
public abstract byte CNT_Smart { get; set; }
public abstract byte CNT_Tough { get; set; }
public abstract byte CNT_Sheen { get; set; }
protected T ConvertTo<T>() where T : G4PKM, new()
{

26
PKHeX.Core/PKM/Shared/IContestStats.cs
View file

@ -2,27 +2,27 @@
{
public interface IContestStats
{
int CNT_Cool { get; }
int CNT_Beauty { get; }
int CNT_Cute { get; }
int CNT_Smart { get; }
int CNT_Tough { get; }
int CNT_Sheen { get; }
byte CNT_Cool { get; }
byte CNT_Beauty { get; }
byte CNT_Cute { get; }
byte CNT_Smart { get; }
byte CNT_Tough { get; }
byte CNT_Sheen { get; }
}
public interface IContestStatsMutable
{
int CNT_Cool { set; }
int CNT_Beauty { set; }
int CNT_Cute { set; }
int CNT_Smart { set; }
int CNT_Tough { set; }
int CNT_Sheen { set; }
byte CNT_Cool { set; }
byte CNT_Beauty { set; }
byte CNT_Cute { set; }
byte CNT_Smart { set; }
byte CNT_Tough { set; }
byte CNT_Sheen { set; }
}
public static partial class Extensions
{
public static int[] GetContestStats(this IContestStats stats) => new[]
public static byte[] GetContestStats(this IContestStats stats) => new[]
{
stats.CNT_Cool,
stats.CNT_Beauty,

12
PKHeX.Core/PKM/XK3.cs
View file

@ -48,7 +48,7 @@ namespace PKHeX.Core
public override int Ball { get => Data[0x0F]; set => Data[0x0F] = (byte)value; }
public override int OT_Gender { get => Data[0x10]; set => Data[0x10] = (byte)value; }
public override int Stat_Level { get => Data[0x11]; set => Data[0x11] = (byte)value; }
public override int CNT_Sheen { get => Data[0x12]; set => Data[0x12] = (byte)value; }
public override byte CNT_Sheen { get => Data[0x12]; set => Data[0x12] = value; }
public override int PKRS_Strain { get => Data[0x13] & 0xF; set => Data[0x13] = (byte)(value & 0xF); }
public override int MarkValue { get => SwapBits(Data[0x14], 1, 2); protected set => Data[0x14] = (byte)SwapBits(value, 1, 2); }
public override int PKRS_Days { get => Math.Max((sbyte)Data[0x15], (sbyte)0); set => Data[0x15] = (byte)(value == 0 ? 0xFF : value & 0xF); }
@ -183,11 +183,11 @@ namespace PKHeX.Core
public override int IV_SPE { get => Data[0xAD]; set => Data[0xAD] = (byte)(value & 0x1F); }
// Contest
public override int CNT_Cool { get => Data[0xAE]; set => Data[0xAE] = (byte)value; }
public override int CNT_Beauty { get => Data[0xAF]; set => Data[0xAF] = (byte)value; }
public override int CNT_Cute { get => Data[0xB0]; set => Data[0xB0] = (byte)value; }
public override int CNT_Smart { get => Data[0xB1]; set => Data[0xB1] = (byte)value; }
public override int CNT_Tough { get => Data[0xB2]; set => Data[0xB2] = (byte)value; }
public override byte CNT_Cool { get => Data[0xAE]; set => Data[0xAE] = value; }
public override byte CNT_Beauty { get => Data[0xAF]; set => Data[0xAF] = value; }
public override byte CNT_Cute { get => Data[0xB0]; set => Data[0xB0] = value; }
public override byte CNT_Smart { get => Data[0xB1]; set => Data[0xB1] = value; }
public override byte CNT_Tough { get => Data[0xB2]; set => Data[0xB2] = value; }
public override int RibbonCountG3Cool { get => Data[0xB3]; set => Data[0xB3] = (byte)value; }
public override int RibbonCountG3Beauty { get => Data[0xB4]; set => Data[0xB4] = (byte)value; }
public override int RibbonCountG3Cute { get => Data[0xB5]; set => Data[0xB5] = (byte)value; }

12
PKHeX.Core/Saves/Substructures/Gen3/Roamer3.cs
View file

@ -53,12 +53,12 @@ namespace PKHeX.Core
public int Status { get => SAV.Data[Offset + 0x0D]; set => SAV.Data[Offset + 0x0D] = (byte)value; }
public int CNT_Cool { get => SAV.Data[Offset + 0x0E]; set => SAV.Data[Offset + 0x0E] = (byte)value; }
public int CNT_Beauty { get => SAV.Data[Offset + 0x0F]; set => SAV.Data[Offset + 0x0F] = (byte)value; }
public int CNT_Cute { get => SAV.Data[Offset + 0x10]; set => SAV.Data[Offset + 0x10] = (byte)value; }
public int CNT_Smart { get => SAV.Data[Offset + 0x11]; set => SAV.Data[Offset + 0x11] = (byte)value; }
public int CNT_Tough { get => SAV.Data[Offset + 0x12]; set => SAV.Data[Offset + 0x12] = (byte)value; }
public int CNT_Sheen { get => 0; set { } }
public byte CNT_Cool { get => SAV.Data[Offset + 0x0E]; set => SAV.Data[Offset + 0x0E] = value; }
public byte CNT_Beauty { get => SAV.Data[Offset + 0x0F]; set => SAV.Data[Offset + 0x0F] = value; }
public byte CNT_Cute { get => SAV.Data[Offset + 0x10]; set => SAV.Data[Offset + 0x10] = value; }
public byte CNT_Smart { get => SAV.Data[Offset + 0x11]; set => SAV.Data[Offset + 0x11] = value; }
public byte CNT_Tough { get => SAV.Data[Offset + 0x12]; set => SAV.Data[Offset + 0x12] = value; }
public byte CNT_Sheen { get => 0; set { } }
public bool Active { get => SAV.Data[Offset + 0x13] == 1; set => SAV.Data[Offset + 0x13] = value ? 1 : 0; }
// Derived Properties

32
PKHeX.WinForms/Controls/PKM Editor/ContestStat.cs
View file

@ -11,42 +11,42 @@ namespace PKHeX.WinForms.Controls
InitializeComponent();
}
public int CNT_Sheen
public byte CNT_Cool
{
get => Util.ToInt32(TB_Sheen.Text);
set => TB_Sheen.Text = value.ToString();
}
public int CNT_Cool
{
get => Util.ToInt32(TB_Cool.Text);
get => (byte)Util.ToInt32(TB_Cool.Text);
set => TB_Cool.Text = value.ToString();
}
public int CNT_Beauty
public byte CNT_Beauty
{
get => Util.ToInt32(TB_Beauty.Text);
get => (byte)Util.ToInt32(TB_Beauty.Text);
set => TB_Beauty.Text = value.ToString();
}
public int CNT_Cute
public byte CNT_Cute
{
get => Util.ToInt32(TB_Cute.Text);
get => (byte)Util.ToInt32(TB_Cute.Text);
set => TB_Cute.Text = value.ToString();
}
public int CNT_Smart
public byte CNT_Smart
{
get => Util.ToInt32(TB_Smart.Text);
get => (byte)Util.ToInt32(TB_Smart.Text);
set => TB_Smart.Text = value.ToString();
}
public int CNT_Tough
public byte CNT_Tough
{
get => Util.ToInt32(TB_Tough.Text);
get => (byte)Util.ToInt32(TB_Tough.Text);
set => TB_Tough.Text = value.ToString();
}
public byte CNT_Sheen
{
get => (byte)Util.ToInt32(TB_Sheen.Text);
set => TB_Sheen.Text = value.ToString();
}
private void Update255_MTB(object sender, EventArgs e)
{
if (sender is not MaskedTextBox tb) return;