From b480476932299fd8a195144b6046dfb7799cd217 Mon Sep 17 00:00:00 2001 From: alyosha-tas Date: Sat, 26 May 2018 11:54:01 -0400 Subject: [PATCH] Gambatte: Make initial colors grey scale Also make equal length frames false by default, fixes #1176 --- .../config/GB/ColorChooserForm.Designer.cs | 16 ++++++++-------- .../Nintendo/Gameboy/Gambatte.ISettable.cs | 11 ++++++++++- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/BizHawk.Client.EmuHawk/config/GB/ColorChooserForm.Designer.cs b/BizHawk.Client.EmuHawk/config/GB/ColorChooserForm.Designer.cs index 94c24420ba..ba9a874de5 100644 --- a/BizHawk.Client.EmuHawk/config/GB/ColorChooserForm.Designer.cs +++ b/BizHawk.Client.EmuHawk/config/GB/ColorChooserForm.Designer.cs @@ -194,7 +194,7 @@ private void InitializeComponent() // this.OK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.OK.DialogResult = System.Windows.Forms.DialogResult.OK; - this.OK.Location = new System.Drawing.Point(143, 221); + this.OK.Location = new System.Drawing.Point(183, 221); this.OK.Name = "OK"; this.OK.Size = new System.Drawing.Size(75, 23); this.OK.TabIndex = 22; @@ -206,7 +206,7 @@ private void InitializeComponent() // this.Cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.Cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.Cancel.Location = new System.Drawing.Point(224, 221); + this.Cancel.Location = new System.Drawing.Point(264, 221); this.Cancel.Name = "Cancel"; this.Cancel.Size = new System.Drawing.Size(75, 23); this.Cancel.TabIndex = 23; @@ -267,19 +267,19 @@ private void InitializeComponent() // this.DefaultButton.Location = new System.Drawing.Point(149, 137); this.DefaultButton.Name = "DefaultButton"; - this.DefaultButton.Size = new System.Drawing.Size(60, 23); + this.DefaultButton.Size = new System.Drawing.Size(90, 23); this.DefaultButton.TabIndex = 32; - this.DefaultButton.Text = "&Default"; + this.DefaultButton.Text = "&Default Green"; this.DefaultButton.UseVisualStyleBackColor = true; this.DefaultButton.Click += new System.EventHandler(this.DefaultButton_Click); // // DefaultButtonCGB // - this.DefaultButtonCGB.Location = new System.Drawing.Point(215, 137); + this.DefaultButtonCGB.Location = new System.Drawing.Point(245, 137); this.DefaultButtonCGB.Name = "DefaultButtonCGB"; - this.DefaultButtonCGB.Size = new System.Drawing.Size(75, 23); + this.DefaultButtonCGB.Size = new System.Drawing.Size(94, 23); this.DefaultButtonCGB.TabIndex = 33; - this.DefaultButtonCGB.Text = "Default &CGB"; + this.DefaultButtonCGB.Text = "Default &Grey"; this.DefaultButtonCGB.UseVisualStyleBackColor = true; this.DefaultButtonCGB.Click += new System.EventHandler(this.DefaultButtonCGB_Click); // @@ -290,7 +290,7 @@ private void InitializeComponent() this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.CancelButton = this.Cancel; - this.ClientSize = new System.Drawing.Size(313, 254); + this.ClientSize = new System.Drawing.Size(353, 254); this.Controls.Add(this.DefaultButtonCGB); this.Controls.Add(this.DefaultButton); this.Controls.Add(this.buttonSave); diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.ISettable.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.ISettable.cs index 2fd947256c..297b029f11 100644 --- 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; }