From bd826eef5cc445fb897197d734716bbabd64b5c5 Mon Sep 17 00:00:00 2001
From: Kurt <kaphotics@gmail.com>
Date: Thu, 5 Aug 2021 13:11:50 -0700
Subject: [PATCH] Show trainer sprites gen6

---
 .../Resources/img/Trainer Sprites/tr_00.png      | Bin 85 -> 702 bytes
 .../Resources/img/Trainer Sprites/tr_01.png      | Bin 85 -> 617 bytes
 PKHeX.Drawing/Sprites/SpriteUtil.cs              |  10 ++++++----
 .../Subforms/Save Editors/Gen6/SAV_Trainer.cs    |   7 ++++---
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/PKHeX.Drawing/Resources/img/Trainer Sprites/tr_00.png b/PKHeX.Drawing/Resources/img/Trainer Sprites/tr_00.png
index 8f2d568c6680d2f95b943c452fa06d6ffff30439..5c6127f5a5decee2079085fbbdbdd213b348710f 100644
GIT binary patch
delta 688
zcmWID$2vi>o|%DxVYh-uJdk264sv&5Sa(k5C6L3C?&#~tz_78O`%fY(kRKA@6XI%M
zV6ed=;YLKk36G3`fPjL6f&&K*{P^+1!^2~SMu3HdMMHwYh6xc13M_VXcs$s#;Kzj>
z8#Y|1sHixwAR!_m<HUlFf`*O>1r8f33Nkzt92^`N>KPcA*Uaw+S|C#r<QM!OH((Io
z^yoTJ9cO_@WHAE+-(e7DJf6QI1?ckAo-U3d7XDi=br&r*;9(62@+nB!zN}QE|Ih#W
zcY8NAIJ_uHFAJL~;A;0{Vd2*wr+=*9P{k{qm{VC_T4{akX{FR})it>_oxkQU%ob>y
zu}glz?rj}y&(<bZl|C16KDTq*&TZG-HgB_S7G02i>c=cw(~Rc0<qxO)h<Mf?u={n+
zjeRv)u}7J*w=H|q^ZeeXUH1;(-q`MaWxK4+%d*b3&tJcPS|%2K`nro#kKvyBB|`G=
zf5qo~kz6Fl>{3{-DR@j?;ZAVCzC)WfeYab>?sbsUw)pDS6>k53KDCXx{!{<|%SbDy
z9dj1v8wNJYS$eOINpL%I;okcg$?W^@a~aN5@;?mVt^NLY?YiVk>}zMmDBS1UJ8y}0
zze~q2M!uLzodD&f6SMjC4W1dC;JA3Ze2U_e9qmHSX@x@PZhSBCRIA@Nr+Mz|fCeTr
z6Q9XFWv>F4ao*;P*k=;E@SEauPQ?W`<{j`2)|{>>nkCKkWQp?fWR1;if=Q8Ok7SZ`
zbOd5UJR&*IUHTq0^Kjxd$%iG=Z~Ru+TwHMO?4kWDih6?5uV^1sz7%=pkQ;+r<o6#F
z998q~?>QkEkX;xMz924o-#kTKtuJ;5b;GwitciQKS+gzljP8f+6*m7E64&Ob$t`M$
Q1;#gnr>mdKI;Vst0HRw=OaK4?

delta 66
zcmdnT8ahGJhK+%Nq37R@Tp%Um>Eaj?;r{j@BO{R4r0{=zo`(aF1q9QxBsCZqqZPwK
OK|D`aKbLh*2~7Y`?hxVt

diff --git a/PKHeX.Drawing/Resources/img/Trainer Sprites/tr_01.png b/PKHeX.Drawing/Resources/img/Trainer Sprites/tr_01.png
index 8f2d568c6680d2f95b943c452fa06d6ffff30439..ae3354f90fb1ef767ab20ff13ee104028d21e522 100644
GIT binary patch
delta 602
zcmWH2$udE*o|%DxVYh-uJdk264sv&5Sa(k5C6L3C?&#~tz_78O`%fY(knbJf6XI%M
zU{GOUFvG%Ng@wTm2MZwZ@bIXpsBmy_NJvOHv7jR%BBG%n;=zsu8!8HZT-dQ;!-X3+
zUi|p+BO{}tVa9@hfB=n%4F(k_faXmq=m!~FFIf`g7yKUwU|=-i+7493S>O>_%)r2R
z7=#&*=dVZsy0*#F#WBRf|Lo<rWlaV=Y!9}qnHYH6s_@a@_?P#V6gsT5{&(ke;H7Vh
zH633njQ_J;GBZoR$+Pj<AA=f?wu8I(#%7;s7noA-8SwrI+omN^HLq8&cm8NG=nqi7
zesEbTcdJrZ*+Tw5ng?IrT=k&(!bIK2a`UFXc3Q4$$#Xbi>T72k=Ob4$debvk>$ZIO
zC9?Nc_=lBQDL0yT6eY@SSGsuX;tsP-whO|K+IU|1C3i$7u&2gvQt`8nj~4$<i59t3
z1WmtmM55TjNvi&;;qnkKPfpQewkHf-_C1*1rrqjavr?B|pq>4n(_${kt=nvz_zdHp
zN1p2`KL0uN!7sOU22U)e-u4x-(|C|%bHG9K_?q${wVz%q`5l+Pk66fNF1PWk!oBdq
zOa6A8;hW9wIGmUm;&)XrdGl7;Bl=<**C#LcVa(Z`Ro(e#J*P=yNM`QmS+Y|?P0nU4
zKYn9RnmxykfaZz>v*^ox9dAl=!uSsV-gH3s^xnt}>qC)IHxDh}^PlsfS!UIZxX)%a
cbB{k}7uk~`;PFUS4j4-ep00i_>zopr098~PQ2+n{

delta 66
zcmaFK5;{TBhK+%Nq37R@Tp%Um>Eaj?;r{j@BO{R4r0{=zo`(aF1q9QxBsCZqqZPwK
OK|D`aKbLh*2~7Z6!x0Ps

diff --git a/PKHeX.Drawing/Sprites/SpriteUtil.cs b/PKHeX.Drawing/Sprites/SpriteUtil.cs
index 9d615c6b5..28589422c 100644
--- a/PKHeX.Drawing/Sprites/SpriteUtil.cs
+++ b/PKHeX.Drawing/Sprites/SpriteUtil.cs
@@ -112,10 +112,12 @@ private static Image GetSprite(PKM pk, bool isBoxBGRed = false)
 
         private static Image? GetSprite(SaveFile sav)
         {
-            string file = "tr_00";
-            if (sav is SAV6AO)
-                file = $"tr_{sav.MultiplayerSpriteID:00}";
-            return Resources.ResourceManager.GetObject(file) as Image;
+            if (sav is SAV6XY or SAV6AO)
+            {
+                string file = $"tr_{sav.MultiplayerSpriteID:00}";
+                return Resources.ResourceManager.GetObject(file) as Image ?? Resources.tr_00;
+            }
+            return null;
         }
 
         private static Image GetWallpaper(SaveFile sav, int box)
diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_Trainer.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_Trainer.cs
index 3f1aa04a3..ad3f14a1a 100644
--- a/PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_Trainer.cs	
+++ b/PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_Trainer.cs	
@@ -42,8 +42,8 @@ public SAV_Trainer(SaveFile sav)
             cba = new[] { CHK_Badge1, CHK_Badge2, CHK_Badge3, CHK_Badge4, CHK_Badge5, CHK_Badge6, CHK_Badge7, CHK_Badge8, };
 
             L_MultiplayerSprite.Enabled = CB_MultiplayerSprite.Enabled =
-            L_MultiplayerSprite.Visible = CB_MultiplayerSprite.Visible =
-            PB_Sprite.Visible = CHK_MegaRayquazaUnlocked.Visible = SAV is SAV6AO;
+            L_MultiplayerSprite.Visible = CB_MultiplayerSprite.Visible = PB_Sprite.Visible = SAV is not SAV6AODemo;
+            CHK_MegaRayquazaUnlocked.Visible = SAV is SAV6AO;
 
             L_Style.Visible = TB_Style.Visible = SAV is SAV6XY;
             if (SAV is not SAV6XY)
@@ -84,8 +84,9 @@ private void GetComboBoxes()
             var names = Enum.GetNames(typeof(TrainerSprite6));
             var values = (int[])Enum.GetValues(typeof(TrainerSprite6));
             var data = names.Zip(values, (a, b) => new ComboItem(a, b))
-                .Where(z => z.Value >= 2) // ignore Calem & Serena (no sprite)
                 .ToList();
+            if (SAV is not SAV6AO)
+                data.RemoveAll(z => z.Value > 36);
 
             CB_MultiplayerSprite.InitializeBinding();
             CB_MultiplayerSprite.DataSource = data;