From 2a66a0672a555fc3eb628d1e2d27e9be086eee2d Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@zeromus.org>
Date: Thu, 14 Aug 2014 15:52:25 +0000
Subject: [PATCH] load 512-entry palettes, but dont do anything with them yet

---
 .../Consoles/Nintendo/NES/Palettes.cs          |  10 +++++++---
 output/NES/Palettes/QuickNes.pal               | Bin 192 -> 1536 bytes
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Palettes.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Palettes.cs
index 5fd123a999..3c4be1e729 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Palettes.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Palettes.cs
@@ -22,12 +22,16 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
 			}
 
 			/// <summary>
-			/// Loads a simple 192 byte (64 entry RGB888) palette which is FCEUX format (and probably other emulators as well)
+			/// Loads a simple 192 byte (64 entry RGB888) or 1536 byte (64*8 = 512 entry) palette which is FCEUX format (and probably other emulators as well)
+			/// The 512-entry format is new and backwards compatible. (actually, the 512-entry format extra data isnt used yet, I just edited this to support the larger quicknes file i committed)
 			/// </summary>
-			/// <param name="fileContents">192 bytes, the contents of the palette file</param>
+			/// <param name="fileContents">192 or 1536 bytes, the contents of the palette file</param>
 			public static int[,] Load_FCEUX_Palette(byte[] fileContents)
 			{
-				if (fileContents.Length != 192) return null;
+				//'validate' file, solely by length
+				if (fileContents.Length == 1536) { }
+				else if (fileContents.Length != 192) return null;
+
 				int[,] ret = new int[64, 3];
 				int i = 0;
 				for (int c = 0; c < 64; c++)
diff --git a/output/NES/Palettes/QuickNes.pal b/output/NES/Palettes/QuickNes.pal
index f511564cb5098deb369a48cc63d3a8fc22ee5962..33d3b5b6be4591c42c15c7f9973e92ff0fa7e797 100644
GIT binary patch
literal 1536
zcmYL}dsNJ69LAqqwvcs~*gB!owsh5oI;qy^vN36*`y$G0o7uEUrP?EO+3iZVsh#dk
zF+{{nrD>TOU35`OIWChev^X3sIXGYYvy=Au<2~;mpXd8N@8$aj1_r_~apC+*E0p;n
zmIvElRd{G&tp(Jb05^cG2HUOptg5Q2MLX}<+fw+dkHyP6B-+uJ%yjr{1oN;i0kboK
zbTdS!e#SvWd(YF!bh>_s#)61=9TXSxv~XoZBa#N;H)6sXigWCIz-F_R7KXp7pj*8(
z+CuMTM9ojBLq0wz9C?)0{W3@TT2wREap~EZL?Ti0p&T|e4(K4m0V!PUi^A6tz@C|~
zU4bRv0viEqU=1^ykTf$*k5$jnAC8}`s8*?JndU2BqH@{-(e7~C5A7&?5x!uCKktjr
zJl($?l}eR7y1SjoahzPrXqN-UphtiLF+ydk-i=;<XD)l&SScM0-!B~<t$s(sw^Te#
zrPoL#AaTsQrr?oIUT<$)Yfo8wTU)CjSIK`LWD6sIERNHe8fynnH!O9X1uG`}24D-Y
z1K<FgR(+0x#F{7s2(?(<uB+P*>+nzLI;LA9%pIG<upkBC16e?vH>ONDy6B3zc+@|K
zvSaD$fxCkTllqg^)CrL+ho=IopJCyXjT(LVmK-Ccf#K61ca`2zNV@K~wzc-&sO-5F
zCs*vLdA_Z1oRji_d-Q$Mv9WU*(l{m0;aEb$3y3tpK_{@iG0zkDZYFeA02Y(yuRWRn
zWF`-+JOlkEAN9s~qzI;2=WF2Cwb<qk?fpy{;2_}t|9iW4|Eyi=U<i-O+&^|Z-gxX1
zHL_EyB?fr{1YX7l8CEnJ>xq(WZ1j~&FnmEnWA*uNxv+DfxOS*CS0M`R6LYS~?9X;?
z%J22exEXb#wNM}kSMnYn$Fa0x`V{$U$hJVR6F>Mt)8R|#GWFI2_RJRaVH!M{pU)qF
zGZ}qDyXR5z^zpJ8<;7n)A72j-FX)B>u`?0ni+y5Xj?ywROwO4U5k_ZxXkaV7aHHpe
z!tSG9C8b8Z26Ow?K*MIqnhRua7c|KWo2XVyoo7f<L8GVWN%e<&4R_nx+ArPeC>?yr
zAE3N$DlPd-$$LBO#;iCslo+GH6%qc}unTYoRxJh$0dv4)3YI%6VP-5iCY)x`W48E1
z0LIhNT#2x9Rm~(__-ulKAMhg(U<kMPN&fHFH|$7?@uKRDbkCe#TgqNJ2ljK9R3ze;
zVmMUknVgO=%kE>XW!C&8h8I<mG@p7iXe60lqz*mLu76naM_1MFb+sv#(&EA^vZ9(N
z70Kt7y#01hXhuSXuYs&}_}LkzOjdJs%+&=f0Xx73FlO3#LNPgcaFow8c*&acG-PUR
zf-3jeQgyB+tURC^0z?B5+6Z8t(S-gSdZd>@oKQ;eq>C=p=6bPZ&koTMwU{C})j><X
zX!<p-+PP*ETjr)eiQ$i2eVbWBr%qFS`Ku=3O<9#lQkPtQ{c!rtnArY|u)d4o9Ru-2
zrAnT~Vqq>1NL`NK?6KD!`plPUJr$bE0H&qZ{nrKh%r#6XK0Y3{^(%FTcc?x%f+{|I
zv*)Ws8N-DQO)d}yge-s`Q*c6EU0v3R^b?l~+0<_T_TlDog}0;Z5VCTxyBZb^YFf2E
zIzq9jsj1Sy@R=7zgynCp<p0x=t+<^l?Jvx26Ge(8+!9$(MoVmhyeLuHoR*fR<o^Zz
CWlE#~

delta 6
NcmZqRIlwsK000Oj0-gW>