Gambatte: Make initial colors grey scale

Also make equal length frames false by default, fixes #1176
TASEmulators · May 26, 2018 · b480476 · b480476
1 parent d6a9d69
commit b480476
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 9 deletions.
diff --git a/BizHawk.Client.EmuHawk/config/GB/ColorChooserForm.Designer.cs b/BizHawk.Client.EmuHawk/config/GB/ColorChooserForm.Designer.cs
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.ISettable.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.ISettable.cs
@@ -47,12 +47,21 @@ public bool PutSyncSettings(GambatteSyncSettings o)
 
 		public class GambatteSettings
 		{
+			/* Green Palette
 			private static readonly int[] DefaultPalette =
 			{
 				10798341, 8956165, 1922333, 337157,
 				10798341, 8956165, 1922333, 337157,
 				10798341, 8956165, 1922333, 337157
 			};
+			*/
+			// Grey Scale Palette
+			private static readonly int[] DefaultPalette =
+			{
+				0xFFFFFF, 0xAAAAAA, 0x555555, 0,
+				0xFFFFFF, 0xAAAAAA, 0x555555, 0,
+				0xFFFFFF, 0xAAAAAA, 0x555555, 0
+			};
 
 			public int[] GBPalette;
 			public GBColors.ColorType CGBColors;
@@ -121,7 +130,7 @@ public int RTCInitialTime
 
 			[DisplayName("Equal Length Frames")]
 			[Description("When false, emulation frames sync to vblank.  Only useful for high level TASing.")]
-			[DefaultValue(true)]
+			[DefaultValue(false)]
 			public bool EqualLengthFrames
 			{
 				get { return _equalLengthFrames; }