Leahnaya/PKHeX
1
0
Fork 0
mirror of https://github.com/kwsch/PKHeX.git synced 2026-09-11 05:19:29 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix colors disappearing

Browse Source 
Thanks SciresM!
This commit is contained in:
Kaphotics
2016-08-08 00:45:30 -07:00
parent 801300adf2
commit 2ce5e442b1
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Subforms/Save Editors/Gen5/CGearBackground.cs
View File

@@ -51,7 +51,7 @@ public CGearBackground(byte[] data)
ColorPalette = new Color[0x10];
for (int i = 0; i < 0x10; i++)
ColorPalette[i] = getRGB555(BitConverter.ToUInt16(ColorData, i * 2));
ColorPalette[i] = getRGB555_16(BitConverter.ToUInt16(ColorData, i * 2));
Tiles = new Tile[0xFF];
for (int i = 0; i < 0xFF; i++)
@@ -145,7 +145,7 @@ public void SetImage(Bitmap img)
for (int i = 0; i < data.Length; i += bpp)
{
uint val = BitConverter.ToUInt32(data, i);
colors[i/bpp] = getRGB555(val);
colors[i/bpp] = getRGB555_32(val);
}
Color[] Palette = colors.Distinct().ToArray();
@@ -328,13 +328,20 @@ private static byte convert8to5(int colorval)
while (colorval > Convert5To8[i]) i++;
return i;
}
private static Color getRGB555(uint val)
private static Color getRGB555_32(uint val)
{
int R = (int)(val >> 0 >> 3) & 0x1F;
int G = (int)(val >> 8 >> 3) & 0x1F;
int B = (int)(val >> 16 >> 3) & 0x1F;
return Color.FromArgb(0xFF, Convert5To8[R], Convert5To8[G], Convert5To8[B]);
}
private static Color getRGB555_16(ushort val)
{
int R = (val >> 0) & 0x1F;
int G = (val >> 5) & 0x1F;
int B = (val >> 10) & 0x1F;
return Color.FromArgb(0xFF, Convert5To8[R], Convert5To8[G], Convert5To8[B]);
}
private static ushort getRGB555(Color c)
{
int val = 0;