From f1beef872fc84feffa9cbedf8b5446ab9752fecb Mon Sep 17 00:00:00 2001 From: Kurt Date: Tue, 17 Mar 2020 10:34:23 -0700 Subject: [PATCH] Reorder origin mark returns Co-Authored-By: Matt --- PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs b/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs index c4dea513d..d1f100ab2 100644 --- a/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs +++ b/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs @@ -491,18 +491,23 @@ private static Image GetOriginSprite(PKM pkm) { if (pkm.Format < 6) return null; - if (pkm.Gen6) - return Properties.Resources.gen_6; - if (pkm.Gen7) - return Properties.Resources.gen_7; - if (pkm.Gen8) - return Properties.Resources.gen_8; + + // Specific Markings if (pkm.VC) return Properties.Resources.gen_vc; if (pkm.GG) return Properties.Resources.gen_gg; if (pkm.GO) return Properties.Resources.gen_go; + + // Lumped Generations + if (pkm.Gen6) + return Properties.Resources.gen_6; + if (pkm.Gen7) + return Properties.Resources.gen_7; + if (pkm.Gen8) + return Properties.Resources.gen_8; + return null; }