Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2025-02-16 21:38:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Show trainer sprites gen6

Browse source
This commit is contained in:
Kurt 2021-08-05 13:11:50 -07:00
parent ab3795abaa
commit bd826eef5c
4 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
PKHeX.Drawing/Resources/img/Trainer Sprites/tr_00.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 85 B

After

Width:  |  Height:  |  Size: 702 B

BIN
PKHeX.Drawing/Resources/img/Trainer Sprites/tr_01.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 85 B

After

Width:  |  Height:  |  Size: 617 B

10
PKHeX.Drawing/Sprites/SpriteUtil.cs
View file

@ -112,10 +112,12 @@ namespace PKHeX.Drawing
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)

7
PKHeX.WinForms/Subforms/Save Editors/Gen6/SAV_Trainer.cs
View file

@ -42,8 +42,8 @@ namespace PKHeX.WinForms
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 @@ namespace PKHeX.WinForms
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;