diff --git a/PKHeX.Core/Legality/Verifiers/MiscVerifier.cs b/PKHeX.Core/Legality/Verifiers/MiscVerifier.cs index 3d575b352..be147dfcc 100644 --- a/PKHeX.Core/Legality/Verifiers/MiscVerifier.cs +++ b/PKHeX.Core/Legality/Verifiers/MiscVerifier.cs @@ -518,6 +518,10 @@ private void VerifyBDSPStats(LegalityAnalysis data, PB8 pb8) if (pb8.Favorite) data.AddLine(GetInvalid(LFavoriteMarkingUnavailable, Encounter)); + var affix = pb8.AffixedRibbon; + if (affix != -1) // None + data.AddLine(GetInvalid(string.Format(LRibbonMarkingAffixedF_0, affix))); + var social = pb8.Sociability; if (social != 0) data.AddLine(GetInvalid(LMemorySocialZero, Encounter)); diff --git a/PKHeX.Core/PKM/PB8.cs b/PKHeX.Core/PKM/PB8.cs index d05810505..01430e261 100644 --- a/PKHeX.Core/PKM/PB8.cs +++ b/PKHeX.Core/PKM/PB8.cs @@ -28,7 +28,12 @@ public sealed class PB8 : G8PKM public override IReadOnlyList ExtraBytes => Unused; public override PersonalInfo PersonalInfo => PersonalTable.BDSP.GetFormEntry(Species, Form); - public PB8() => Egg_Location = Met_Location = Locations.Default8bNone; + public PB8() + { + Egg_Location = Met_Location = Locations.Default8bNone; + AffixedRibbon = -1; // 00 would make it show Kalos Champion :) + } + public PB8(byte[] data) : base(data) { } public override PKM Clone() => new PB8((byte[])Data.Clone()); diff --git a/PKHeX.WinForms/Subforms/PKM Editors/RibbonEditor.cs b/PKHeX.WinForms/Subforms/PKM Editors/RibbonEditor.cs index 6f38020f7..940b6a609 100644 --- a/PKHeX.WinForms/Subforms/PKM Editors/RibbonEditor.cs +++ b/PKHeX.WinForms/Subforms/PKM Editors/RibbonEditor.cs @@ -26,7 +26,7 @@ public RibbonEditor(PKM pk) PopulateRibbons(); TLP_Ribbons.ResumeLayout(); - if (pk is PK8 pk8) + if (pk is G8PKM pk8) { var names = Enum.GetNames(typeof(RibbonIndex)); var values = (RibbonIndex[])Enum.GetValues(typeof(RibbonIndex));