ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NES: switch to quicknes palette as defaut

This commit is contained in:
goyuken 2014-05-13 23:26:39 +00:00
parent 9b0673daa7
commit 3fa2b4629c
3 changed files with 76 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.Client.EmuHawk/config/NES/NESGraphicsConfig.cs
View File

@ -111,7 +111,7 @@ namespace BizHawk.Client.EmuHawk
else // no filename: interpret this as "reset to default"
{
if (showmsg) GlobalWin.OSD.AddMessage("Standard Palette set");
return (int[,])NES.Palettes.FCEUX_Standard.Clone();
return (int[,])NES.Palettes.QuickNESPalette.Clone();
}
}
else // checkbox unchecked: we're reusing whatever palette was set

5
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.cs
View File

@ -36,7 +36,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
CoreComm = comm;
CoreComm.CpuTraceAvailable = true;
BootGodDB.Initialize();
SetPalette(Palettes.FCEUX_Standard);
videoProvider = new MyVideoProvider(this);
Init(game, rom, fdsbios);
if (board is FDS)
@ -907,7 +906,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
public NESSettings()
{
Palette = (int[,])Palettes.FCEUX_Standard.Clone();
Palette = (int[,])Palettes.QuickNESPalette.Clone();
}
[Newtonsoft.Json.JsonConstructor]
@ -915,7 +914,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
{
if (Palette == null)
// only needed for SVN purposes
this.Palette = (int[,])Palettes.FCEUX_Standard.Clone();
this.Palette = (int[,])Palettes.QuickNESPalette.Clone();
else
this.Palette = Palette;
}

79
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Palettes.cs
View File

@ -12,7 +12,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
{
//DEEMPH BITS MAY BE ORDERED WRONG. PLEASE CHECK
if (deemph_bits == 0) return;
int d = deemph_bits-1;
int d = deemph_bits - 1;
r = (int)(r * rtmul[d]);
g = (int)(g * gtmul[d]);
b = (int)(b * btmul[d]);
@ -29,11 +29,11 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
{
if (fileContents.Length != 192) return null;
int[,] ret = new int[64, 3];
int i=0;
int i = 0;
for (int c = 0; c < 64; c++)
{
for(int z=0;z<3;z++)
ret[c,z] = fileContents[i++];
for (int z = 0; z < 3; z++)
ret[c, z] = fileContents[i++];
}
return ret;
}
@ -106,9 +106,76 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
{ 0x00<<SHIFT, 0x00<<SHIFT, 0x00<<SHIFT }, /* Value 62 */
{ 0x00<<SHIFT, 0x00<<SHIFT, 0x00<<SHIFT }, /* Value 63 */
};
public static int[,] QuickNESPalette =
{
{102, 102, 102},
{0, 42, 136},
{20, 18, 168},
{59, 0, 164},
{92, 0, 126},
{110, 0, 64},
{108, 7, 0},
{87, 29, 0},
{52, 53, 0},
{12, 73, 0},
{0, 82, 0},
{0, 79, 8},
{0, 64, 78},
{0, 0, 0},
{0, 0, 0},
{0, 0, 0},
{174, 174, 174},
{21, 95, 218},
{66, 64, 254},
{118, 39, 255},
{161, 27, 205},
{184, 30, 124},
{181, 50, 32},
{153, 79, 0},
{108, 110, 0},
{56, 135, 0},
{13, 148, 0},
{0, 144, 50},
{0, 124, 142},
{0, 0, 0},
{0, 0, 0},
{0, 0, 0},
{254, 254, 254},
{100, 176, 254},
{147, 144, 254},
{199, 119, 254},
{243, 106, 254},
{254, 110, 205},
{254, 130, 112},
{235, 159, 35},
{189, 191, 0},
{137, 217, 0},
{93, 229, 48},
{69, 225, 130},
{72, 206, 223},
{79, 79, 79},
{0, 0, 0},
{0, 0, 0},
{254, 254, 254},
{193, 224, 254},
{212, 211, 254},
{233, 200, 254},
{251, 195, 254},
{254, 197, 235},
{254, 205, 198},
{247, 217, 166},
{229, 230, 149},
{208, 240, 151},
{190, 245, 171},
{180, 243, 205},
{181, 236, 243},
{184, 184, 184},
{0, 0, 0},
{0, 0, 0},
};
} //class palettes
} //partial class NES
} //namespace