diff --git a/PKHeX/PKM/PK3.cs b/PKHeX/PKM/PK3.cs index 5f94d7f62..7c0870898 100644 --- a/PKHeX/PKM/PK3.cs +++ b/PKHeX/PKM/PK3.cs @@ -195,10 +195,7 @@ public PK4 convertToPK4() EXP = IsEgg ? PKX.getEXP(5, Species) : EXP, IsEgg = false, OT_Friendship = 70, - MarkCircle = MarkCircle, - MarkSquare = MarkSquare, - MarkTriangle = MarkTriangle, - MarkHeart = MarkHeart, + Markings = Markings, Language = Language, EV_HP = EV_HP, EV_ATK = EV_ATK, diff --git a/PKHeX/PKM/PK5.cs b/PKHeX/PKM/PK5.cs index f75ae2b44..eea44a003 100644 --- a/PKHeX/PKM/PK5.cs +++ b/PKHeX/PKM/PK5.cs @@ -345,12 +345,7 @@ public PK6 convertToPK6() if (HiddenAbility) pk6.AbilityNumber = 4; // Hidden, else G5 or G3/4 correlation. else pk6.AbilityNumber = Gen5 ? 1 << (int)(PID >> 16 & 1) : 1 << (int)(PID & 1); } - pk6.MarkCircle = MarkCircle; - pk6.MarkSquare = MarkSquare; - pk6.MarkTriangle = MarkTriangle; - pk6.MarkHeart = MarkHeart; - pk6.MarkStar = MarkStar; - pk6.MarkDiamond = MarkDiamond; + pk6.Markings = Markings; pk6.Language = Language; pk6.CNT_Cool = CNT_Cool; diff --git a/PKHeX/PKM/PKM.cs b/PKHeX/PKM/PKM.cs index 5523ada8c..23a9bd28a 100644 --- a/PKHeX/PKM/PKM.cs +++ b/PKHeX/PKM/PKM.cs @@ -285,12 +285,6 @@ public int GenNumber public bool PKRS_Cured => PKRS_Days == 0 && PKRS_Strain > 0; public virtual bool ChecksumValid => Checksum == CalculateChecksum(); public int CurrentLevel { get { return PKX.getLevel(Species, EXP); } set { EXP = PKX.getEXP(value, Species); } } - public bool MarkCircle { get { return (MarkValue & (1 << 0)) == 1 << 0; } set { MarkValue = (byte)(MarkValue & ~(1 << 0) | (value ? 1 << 0 : 0)); } } - public bool MarkTriangle { get { return (MarkValue & (1 << 1)) == 1 << 1; } set { MarkValue = (byte)(MarkValue & ~(1 << 0) | (value ? 1 << 0 : 0)); } } - public bool MarkSquare { get { return (MarkValue & (1 << 2)) == 1 << 2; } set { MarkValue = (byte)(MarkValue & ~(1 << 0) | (value ? 1 << 0 : 0)); } } - public bool MarkHeart { get { return (MarkValue & (1 << 3)) == 1 << 3; } set { MarkValue = (byte)(MarkValue & ~(1 << 0) | (value ? 1 << 0 : 0)); } } - public bool MarkStar { get { return (MarkValue & (1 << 4)) == 1 << 4; } set { MarkValue = (byte)(MarkValue & ~(1 << 0) | (value ? 1 << 0 : 0)); } } - public bool MarkDiamond { get { return (MarkValue & (1 << 5)) == 1 << 5; } set { MarkValue = (byte)(MarkValue & ~(1 << 0) | (value ? 1 << 0 : 0)); } } public Image Sprite => PKX.getSprite(this); public string ShowdownText => ShowdownSet.getShowdownText(this); public string[] QRText => PKX.getQRText(this);