From 8d20c2e3516ed9f22e189e8b93611dca0ed41cd5 Mon Sep 17 00:00:00 2001 From: goyuken Date: Sun, 18 Nov 2012 18:46:57 +0000 Subject: [PATCH] gambatte: fully implement cgb palette selection --- .../Consoles/Nintendo/Gameboy/GBColors.cs | 37 +- .../Consoles/Nintendo/Gameboy/Gambatte.cs | 11 +- .../BizHawk.MultiClient.csproj | 9 + BizHawk.MultiClient/Config.cs | 1 + .../GBtools/CGBColorChooserForm.Designer.cs | 190 +++++++ .../GBtools/CGBColorChooserForm.cs | 89 +++ .../GBtools/CGBColorChooserForm.resx | 120 ++++ BizHawk.MultiClient/MainForm.Designer.cs | 520 +++++++++--------- BizHawk.MultiClient/MainForm.MenuItems.cs | 3 +- BizHawk.MultiClient/MainForm.cs | 36 +- .../output/dll/libgambatte.dll | Bin 177664 -> 178176 bytes libgambatte/src/video.cpp | 1 + 12 files changed, 738 insertions(+), 279 deletions(-) create mode 100644 BizHawk.MultiClient/GBtools/CGBColorChooserForm.Designer.cs create mode 100644 BizHawk.MultiClient/GBtools/CGBColorChooserForm.cs create mode 100644 BizHawk.MultiClient/GBtools/CGBColorChooserForm.resx diff --git a/BizHawk.Emulation/Consoles/Nintendo/Gameboy/GBColors.cs b/BizHawk.Emulation/Consoles/Nintendo/Gameboy/GBColors.cs index be05f3e920..392068c879 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/Gameboy/GBColors.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/Gameboy/GBColors.cs @@ -61,7 +61,7 @@ namespace BizHawk.Emulation.Consoles.GB } // vba's default mode - public static Triple VividColor(Triple c) + public static Triple VividVBAColor(Triple c) { return c.Bit5to8Bad(); } @@ -96,5 +96,40 @@ namespace BizHawk.Emulation.Consoles.GB ret.b = (c.r * 2 + c.g * 2 + c.b * 12 + 8) >> 4; return ret.Bit5to8Bad(); } + + // as vivid as possible + public static Triple UltraVividColor(Triple c) + { + return c.Bit5to8Good(); + } + + public enum ColorType + { + gambatte, + vivid, + vbavivid, + vbagbnew, + vgabgbold + }; + + public static int[] GetLut(ColorType c) + { + Func f = null; + switch (c) + { + case ColorType.gambatte: f = GambatteColor; break; + case ColorType.vivid: f = UltraVividColor; break; + case ColorType.vbavivid: f = VividVBAColor; break; + case ColorType.vbagbnew: f = NewVBAColor; break; + case ColorType.vgabgbold: f = OldVBAColor; break; + } + int[] ret = new int[32768]; + int i = 0; + for (int b = 0; b < 32; b++) + for (int g = 0; g < 32; g++) + for (int r = 0; r < 32; r++) + ret[i++] = f(new Triple(r, g, b)).ToARGB32(); + return ret; + } } } diff --git a/BizHawk.Emulation/Consoles/Nintendo/Gameboy/Gambatte.cs b/BizHawk.Emulation/Consoles/Nintendo/Gameboy/Gambatte.cs index 6856a50ffb..2813d11bcb 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/Gameboy/Gambatte.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/Gameboy/Gambatte.cs @@ -50,7 +50,7 @@ namespace BizHawk.Emulation.Consoles.GB // set real default colors (before anyone mucks with them at all) ChangeDMGColors(new int[] { 10798341, 8956165, 1922333, 337157, 10798341, 8956165, 1922333, 337157, 10798341, 8956165, 1922333, 337157 }); - SetCGBColors(); + SetCGBColors(GBColors.ColorType.gambatte); InitSound(); @@ -707,14 +707,9 @@ namespace BizHawk.Emulation.Consoles.GB LibGambatte.gambatte_setdmgpalettecolor(GambatteState, (LibGambatte.PalType)(i / 4), (uint)i % 4, (uint)colors[i]); } - void SetCGBColors() + public void SetCGBColors(GBColors.ColorType type) { - int[] lut = new int[32768]; - int i = 0; - for (int b = 0; b < 32; b++) - for (int g = 0; g < 32; g++) - for (int r = 0; r < 32; r++) - lut[i++] = GBColors.GambatteColor(new GBColors.Triple(r, g, b)).ToARGB32(); + int[] lut = GBColors.GetLut(type); unsafe { fixed (int* p = &lut[0]) diff --git a/BizHawk.MultiClient/BizHawk.MultiClient.csproj b/BizHawk.MultiClient/BizHawk.MultiClient.csproj index 728b646f9a..0064fc4cd5 100644 --- a/BizHawk.MultiClient/BizHawk.MultiClient.csproj +++ b/BizHawk.MultiClient/BizHawk.MultiClient.csproj @@ -220,6 +220,12 @@ Component + + Form + + + CGBColorChooserForm.cs + Form @@ -479,6 +485,9 @@ PathInfo.cs + + CGBColorChooserForm.cs + ColorChooserForm.cs diff --git a/BizHawk.MultiClient/Config.cs b/BizHawk.MultiClient/Config.cs index 88b13f8f9b..16019cf0a9 100644 --- a/BizHawk.MultiClient/Config.cs +++ b/BizHawk.MultiClient/Config.cs @@ -710,6 +710,7 @@ namespace BizHawk.MultiClient public bool GB_MulticartCompat = false; public string GB_PaletteFile = ""; public bool GB_AsSGB = false; + public Emulation.Consoles.GB.GBColors.ColorType CGBColors = Emulation.Consoles.GB.GBColors.ColorType.gambatte; //Commodore 64 Settings public SingleButtonJoyStickTemplate[] C64Joysticks = new SingleButtonJoyStickTemplate[2]; diff --git a/BizHawk.MultiClient/GBtools/CGBColorChooserForm.Designer.cs b/BizHawk.MultiClient/GBtools/CGBColorChooserForm.Designer.cs new file mode 100644 index 0000000000..1b12fb8c33 --- /dev/null +++ b/BizHawk.MultiClient/GBtools/CGBColorChooserForm.Designer.cs @@ -0,0 +1,190 @@ +namespace BizHawk.MultiClient.GBtools +{ + partial class CGBColorChooserForm + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.radioButton1 = new System.Windows.Forms.RadioButton(); + this.radioButton2 = new System.Windows.Forms.RadioButton(); + this.radioButton3 = new System.Windows.Forms.RadioButton(); + this.radioButton4 = new System.Windows.Forms.RadioButton(); + this.radioButton5 = new System.Windows.Forms.RadioButton(); + this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.buttonOK = new System.Windows.Forms.Button(); + this.buttonCancel = new System.Windows.Forms.Button(); + this.bmpView1 = new BizHawk.MultiClient.GBtools.BmpView(); + this.groupBox1.SuspendLayout(); + this.groupBox2.SuspendLayout(); + this.SuspendLayout(); + // + // groupBox1 + // + this.groupBox1.Controls.Add(this.radioButton5); + this.groupBox1.Controls.Add(this.radioButton3); + this.groupBox1.Controls.Add(this.radioButton4); + this.groupBox1.Controls.Add(this.radioButton2); + this.groupBox1.Controls.Add(this.radioButton1); + this.groupBox1.Location = new System.Drawing.Point(12, 12); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Size = new System.Drawing.Size(132, 132); + this.groupBox1.TabIndex = 0; + this.groupBox1.TabStop = false; + this.groupBox1.Text = "Preset Select"; + // + // radioButton1 + // + this.radioButton1.AutoSize = true; + this.radioButton1.Location = new System.Drawing.Point(6, 19); + this.radioButton1.Name = "radioButton1"; + this.radioButton1.Size = new System.Drawing.Size(71, 17); + this.radioButton1.TabIndex = 0; + this.radioButton1.TabStop = true; + this.radioButton1.Text = "Gambatte"; + this.radioButton1.UseVisualStyleBackColor = true; + this.radioButton1.CheckedChanged += new System.EventHandler(this.radioButton1_CheckedChanged); + // + // radioButton2 + // + this.radioButton2.AutoSize = true; + this.radioButton2.Location = new System.Drawing.Point(6, 42); + this.radioButton2.Name = "radioButton2"; + this.radioButton2.Size = new System.Drawing.Size(48, 17); + this.radioButton2.TabIndex = 1; + this.radioButton2.TabStop = true; + this.radioButton2.Text = "Vivid"; + this.radioButton2.UseVisualStyleBackColor = true; + this.radioButton2.CheckedChanged += new System.EventHandler(this.radioButton1_CheckedChanged); + // + // radioButton3 + // + this.radioButton3.AutoSize = true; + this.radioButton3.Location = new System.Drawing.Point(6, 65); + this.radioButton3.Name = "radioButton3"; + this.radioButton3.Size = new System.Drawing.Size(72, 17); + this.radioButton3.TabIndex = 2; + this.radioButton3.TabStop = true; + this.radioButton3.Text = "VBA Vivid"; + this.radioButton3.UseVisualStyleBackColor = true; + this.radioButton3.CheckedChanged += new System.EventHandler(this.radioButton1_CheckedChanged); + // + // radioButton4 + // + this.radioButton4.AutoSize = true; + this.radioButton4.Location = new System.Drawing.Point(6, 88); + this.radioButton4.Name = "radioButton4"; + this.radioButton4.Size = new System.Drawing.Size(92, 17); + this.radioButton4.TabIndex = 1; + this.radioButton4.TabStop = true; + this.radioButton4.Text = "VBA Accurate"; + this.radioButton4.UseVisualStyleBackColor = true; + this.radioButton4.CheckedChanged += new System.EventHandler(this.radioButton1_CheckedChanged); + // + // radioButton5 + // + this.radioButton5.AutoSize = true; + this.radioButton5.Location = new System.Drawing.Point(6, 111); + this.radioButton5.Name = "radioButton5"; + this.radioButton5.Size = new System.Drawing.Size(117, 17); + this.radioButton5.TabIndex = 2; + this.radioButton5.TabStop = true; + this.radioButton5.Text = "VBA Accurate (Old)"; + this.radioButton5.UseVisualStyleBackColor = true; + this.radioButton5.CheckedChanged += new System.EventHandler(this.radioButton1_CheckedChanged); + // + // groupBox2 + // + this.groupBox2.Controls.Add(this.bmpView1); + this.groupBox2.Location = new System.Drawing.Point(150, 12); + this.groupBox2.Name = "groupBox2"; + this.groupBox2.Size = new System.Drawing.Size(268, 153); + this.groupBox2.TabIndex = 2; + this.groupBox2.TabStop = false; + this.groupBox2.Text = "Preview"; + // + // buttonOK + // + this.buttonOK.DialogResult = System.Windows.Forms.DialogResult.OK; + this.buttonOK.Location = new System.Drawing.Point(107, 171); + this.buttonOK.Name = "buttonOK"; + this.buttonOK.Size = new System.Drawing.Size(75, 23); + this.buttonOK.TabIndex = 3; + this.buttonOK.Text = "OK"; + this.buttonOK.UseVisualStyleBackColor = true; + // + // buttonCancel + // + this.buttonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.buttonCancel.Location = new System.Drawing.Point(188, 171); + this.buttonCancel.Name = "buttonCancel"; + this.buttonCancel.Size = new System.Drawing.Size(75, 23); + this.buttonCancel.TabIndex = 4; + this.buttonCancel.Text = "Cancel"; + this.buttonCancel.UseVisualStyleBackColor = true; + // + // bmpView1 + // + this.bmpView1.Location = new System.Drawing.Point(6, 19); + this.bmpView1.Name = "bmpView1"; + this.bmpView1.Size = new System.Drawing.Size(256, 128); + this.bmpView1.TabIndex = 3; + this.bmpView1.Text = "bmpView1"; + // + // CGBColorChooserForm + // + this.AcceptButton = this.buttonOK; + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.CancelButton = this.buttonCancel; + this.ClientSize = new System.Drawing.Size(426, 202); + this.Controls.Add(this.buttonCancel); + this.Controls.Add(this.buttonOK); + this.Controls.Add(this.groupBox2); + this.Controls.Add(this.groupBox1); + this.Name = "CGBColorChooserForm"; + this.Text = "Gameboy Color Palette Config"; + this.groupBox1.ResumeLayout(false); + this.groupBox1.PerformLayout(); + this.groupBox2.ResumeLayout(false); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.GroupBox groupBox1; + private System.Windows.Forms.RadioButton radioButton2; + private System.Windows.Forms.RadioButton radioButton1; + private System.Windows.Forms.RadioButton radioButton5; + private System.Windows.Forms.RadioButton radioButton3; + private System.Windows.Forms.RadioButton radioButton4; + private System.Windows.Forms.GroupBox groupBox2; + private BmpView bmpView1; + private System.Windows.Forms.Button buttonOK; + private System.Windows.Forms.Button buttonCancel; + } +} \ No newline at end of file diff --git a/BizHawk.MultiClient/GBtools/CGBColorChooserForm.cs b/BizHawk.MultiClient/GBtools/CGBColorChooserForm.cs new file mode 100644 index 0000000000..7bdd4a3679 --- /dev/null +++ b/BizHawk.MultiClient/GBtools/CGBColorChooserForm.cs @@ -0,0 +1,89 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; +using BizHawk.Emulation.Consoles.GB; + +namespace BizHawk.MultiClient.GBtools +{ + public partial class CGBColorChooserForm : Form + { + CGBColorChooserForm() + { + InitializeComponent(); + bmpView1.ChangeBitmapSize(bmpView1.Size); + type = Global.Config.CGBColors; + switch (type) + { + case GBColors.ColorType.gambatte: radioButton1.Checked = true; break; + case GBColors.ColorType.vivid: radioButton2.Checked = true; break; + case GBColors.ColorType.vbavivid: radioButton3.Checked = true; break; + case GBColors.ColorType.vbagbnew: radioButton4.Checked = true; break; + case GBColors.ColorType.vgabgbold: radioButton5.Checked = true; break; + } + } + GBColors.ColorType type; + + unsafe void RefreshType() + { + var lockdata = bmpView1.bmp.LockBits(new Rectangle(0, 0, 256, 128), System.Drawing.Imaging.ImageLockMode.WriteOnly, System.Drawing.Imaging.PixelFormat.Format32bppArgb); + + int[] lut = GBColors.GetLut(type); + + int* dest = (int*)lockdata.Scan0; + + for (int j = 0; j < 128; j++) + { + for (int i = 0; i < 256; i++) + { + int r = i % 32; + int g = j % 32; + int b = i / 32 * 4 + j / 32; + int color = lut[r | g << 5 | b << 10]; + *dest++ = color; + } + dest -= 256; + dest += lockdata.Stride / sizeof(int); + } + + bmpView1.bmp.UnlockBits(lockdata); + bmpView1.Refresh(); + } + + private void radioButton1_CheckedChanged(object sender, EventArgs e) + { + if (sender == radioButton1) + type = GBColors.ColorType.gambatte; + if (sender == radioButton2) + type = GBColors.ColorType.vivid; + if (sender == radioButton3) + type = GBColors.ColorType.vbavivid; + if (sender == radioButton4) + type = GBColors.ColorType.vbagbnew; + if (sender == radioButton5) + type = GBColors.ColorType.vgabgbold; + if ((sender as RadioButton).Checked) + RefreshType(); + } + + public static bool DoCGBColorChooserFormDialog(IWin32Window parent) + { + using (var dlg = new CGBColorChooserForm()) + { + var result = dlg.ShowDialog(parent); + if (result == DialogResult.OK) + { + Global.Config.CGBColors = dlg.type; + return true; + } + else + return false; + } + } + + } +} diff --git a/BizHawk.MultiClient/GBtools/CGBColorChooserForm.resx b/BizHawk.MultiClient/GBtools/CGBColorChooserForm.resx new file mode 100644 index 0000000000..29dcb1b3a3 --- /dev/null +++ b/BizHawk.MultiClient/GBtools/CGBColorChooserForm.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/BizHawk.MultiClient/MainForm.Designer.cs b/BizHawk.MultiClient/MainForm.Designer.cs index 21f6e9b954..b37ce7d7a2 100644 --- a/BizHawk.MultiClient/MainForm.Designer.cs +++ b/BizHawk.MultiClient/MainForm.Designer.cs @@ -252,6 +252,7 @@ this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator(); this.changeDMGPalettesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.loadGBInSGBToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator28 = new System.Windows.Forms.ToolStripSeparator(); this.gPUViewerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.sNESToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.displayToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -310,7 +311,6 @@ this.cmiScreenshotClipboard = new System.Windows.Forms.ToolStripMenuItem(); this.cmiCloseRom = new System.Windows.Forms.ToolStripMenuItem(); this.cmiShowMenu = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator28 = new System.Windows.Forms.ToolStripSeparator(); this.menuStrip1.SuspendLayout(); this.StatusSlot0.SuspendLayout(); this.contextMenuStrip1.SuspendLayout(); @@ -336,7 +336,7 @@ this.menuStrip1.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.Flow; this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Name = "menuStrip1"; - this.menuStrip1.Size = new System.Drawing.Size(470, 42); + this.menuStrip1.Size = new System.Drawing.Size(470, 40); this.menuStrip1.TabIndex = 0; this.menuStrip1.Text = "menuStrip1"; this.menuStrip1.MenuActivate += new System.EventHandler(this.menuStrip1_MenuActivate); @@ -359,7 +359,7 @@ this.toolStripSeparator4, this.exitToolStripMenuItem}); this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; - this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 19); + this.fileToolStripMenuItem.Size = new System.Drawing.Size(35, 17); this.fileToolStripMenuItem.Text = "&File"; this.fileToolStripMenuItem.DropDownOpened += new System.EventHandler(this.fileToolStripMenuItem_DropDownOpened); // @@ -367,7 +367,7 @@ // this.openROMToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.OpenFile; this.openROMToolStripMenuItem.Name = "openROMToolStripMenuItem"; - this.openROMToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.openROMToolStripMenuItem.Size = new System.Drawing.Size(134, 22); this.openROMToolStripMenuItem.Text = "Open ROM"; this.openROMToolStripMenuItem.Click += new System.EventHandler(this.openROMToolStripMenuItem_Click); // @@ -380,32 +380,32 @@ this.autoloadMostRecentToolStripMenuItem}); this.recentROMToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Recent; this.recentROMToolStripMenuItem.Name = "recentROMToolStripMenuItem"; - this.recentROMToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.recentROMToolStripMenuItem.Size = new System.Drawing.Size(134, 22); this.recentROMToolStripMenuItem.Text = "Recent ROM"; this.recentROMToolStripMenuItem.DropDownOpened += new System.EventHandler(this.recentROMToolStripMenuItem_DropDownOpened); // // noneToolStripMenuItem // this.noneToolStripMenuItem.Name = "noneToolStripMenuItem"; - this.noneToolStripMenuItem.Size = new System.Drawing.Size(192, 22); + this.noneToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.noneToolStripMenuItem.Text = "None"; // // toolStripSeparator3 // this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(189, 6); + this.toolStripSeparator3.Size = new System.Drawing.Size(177, 6); // // clearToolStripMenuItem // this.clearToolStripMenuItem.Name = "clearToolStripMenuItem"; - this.clearToolStripMenuItem.Size = new System.Drawing.Size(192, 22); + this.clearToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.clearToolStripMenuItem.Text = "&Clear"; this.clearToolStripMenuItem.Click += new System.EventHandler(this.clearToolStripMenuItem_Click); // // autoloadMostRecentToolStripMenuItem // this.autoloadMostRecentToolStripMenuItem.Name = "autoloadMostRecentToolStripMenuItem"; - this.autoloadMostRecentToolStripMenuItem.Size = new System.Drawing.Size(192, 22); + this.autoloadMostRecentToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.autoloadMostRecentToolStripMenuItem.Text = "&Autoload Most Recent"; this.autoloadMostRecentToolStripMenuItem.Click += new System.EventHandler(this.autoloadMostRecentToolStripMenuItem_Click); // @@ -413,14 +413,14 @@ // this.closeROMToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Close; this.closeROMToolStripMenuItem.Name = "closeROMToolStripMenuItem"; - this.closeROMToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.closeROMToolStripMenuItem.Size = new System.Drawing.Size(134, 22); this.closeROMToolStripMenuItem.Text = "&Close ROM"; this.closeROMToolStripMenuItem.Click += new System.EventHandler(this.closeROMToolStripMenuItem_Click); // // toolStripMenuItem1 // this.toolStripMenuItem1.Name = "toolStripMenuItem1"; - this.toolStripMenuItem1.Size = new System.Drawing.Size(137, 6); + this.toolStripMenuItem1.Size = new System.Drawing.Size(131, 6); // // saveStateToolStripMenuItem // @@ -438,89 +438,89 @@ this.toolStripSeparator6, this.saveNamedStateToolStripMenuItem}); this.saveStateToolStripMenuItem.Name = "saveStateToolStripMenuItem"; - this.saveStateToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.saveStateToolStripMenuItem.Size = new System.Drawing.Size(134, 22); this.saveStateToolStripMenuItem.Text = "Save State"; this.saveStateToolStripMenuItem.DropDownOpened += new System.EventHandler(this.saveStateToolStripMenuItem_DropDownOpened); // // savestate1toolStripMenuItem // this.savestate1toolStripMenuItem.Name = "savestate1toolStripMenuItem"; - this.savestate1toolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.savestate1toolStripMenuItem.Size = new System.Drawing.Size(175, 22); this.savestate1toolStripMenuItem.Text = "1"; this.savestate1toolStripMenuItem.Click += new System.EventHandler(this.savestate1toolStripMenuItem_Click); // // savestate2toolStripMenuItem // this.savestate2toolStripMenuItem.Name = "savestate2toolStripMenuItem"; - this.savestate2toolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.savestate2toolStripMenuItem.Size = new System.Drawing.Size(175, 22); this.savestate2toolStripMenuItem.Text = "2"; this.savestate2toolStripMenuItem.Click += new System.EventHandler(this.savestate2toolStripMenuItem_Click); // // savestate3toolStripMenuItem // this.savestate3toolStripMenuItem.Name = "savestate3toolStripMenuItem"; - this.savestate3toolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.savestate3toolStripMenuItem.Size = new System.Drawing.Size(175, 22); this.savestate3toolStripMenuItem.Text = "3"; this.savestate3toolStripMenuItem.Click += new System.EventHandler(this.savestate3toolStripMenuItem_Click); // // savestate4toolStripMenuItem // this.savestate4toolStripMenuItem.Name = "savestate4toolStripMenuItem"; - this.savestate4toolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.savestate4toolStripMenuItem.Size = new System.Drawing.Size(175, 22); this.savestate4toolStripMenuItem.Text = "4"; this.savestate4toolStripMenuItem.Click += new System.EventHandler(this.savestate4toolStripMenuItem_Click); // // savestate5toolStripMenuItem // this.savestate5toolStripMenuItem.Name = "savestate5toolStripMenuItem"; - this.savestate5toolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.savestate5toolStripMenuItem.Size = new System.Drawing.Size(175, 22); this.savestate5toolStripMenuItem.Text = "5"; this.savestate5toolStripMenuItem.Click += new System.EventHandler(this.savestate5toolStripMenuItem_Click); // // savestate6toolStripMenuItem // this.savestate6toolStripMenuItem.Name = "savestate6toolStripMenuItem"; - this.savestate6toolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.savestate6toolStripMenuItem.Size = new System.Drawing.Size(175, 22); this.savestate6toolStripMenuItem.Text = "6"; this.savestate6toolStripMenuItem.Click += new System.EventHandler(this.savestate6toolStripMenuItem_Click); // // savestate7toolStripMenuItem // this.savestate7toolStripMenuItem.Name = "savestate7toolStripMenuItem"; - this.savestate7toolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.savestate7toolStripMenuItem.Size = new System.Drawing.Size(175, 22); this.savestate7toolStripMenuItem.Text = "7"; this.savestate7toolStripMenuItem.Click += new System.EventHandler(this.savestate7toolStripMenuItem_Click); // // savestate8toolStripMenuItem // this.savestate8toolStripMenuItem.Name = "savestate8toolStripMenuItem"; - this.savestate8toolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.savestate8toolStripMenuItem.Size = new System.Drawing.Size(175, 22); this.savestate8toolStripMenuItem.Text = "8"; this.savestate8toolStripMenuItem.Click += new System.EventHandler(this.savestate8toolStripMenuItem_Click); // // savestate9toolStripMenuItem // this.savestate9toolStripMenuItem.Name = "savestate9toolStripMenuItem"; - this.savestate9toolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.savestate9toolStripMenuItem.Size = new System.Drawing.Size(175, 22); this.savestate9toolStripMenuItem.Text = "9"; this.savestate9toolStripMenuItem.Click += new System.EventHandler(this.savestate9toolStripMenuItem_Click); // // savestate0toolStripMenuItem // this.savestate0toolStripMenuItem.Name = "savestate0toolStripMenuItem"; - this.savestate0toolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.savestate0toolStripMenuItem.Size = new System.Drawing.Size(175, 22); this.savestate0toolStripMenuItem.Text = "0"; this.savestate0toolStripMenuItem.Click += new System.EventHandler(this.savestate0toolStripMenuItem_Click); // // toolStripSeparator6 // this.toolStripSeparator6.Name = "toolStripSeparator6"; - this.toolStripSeparator6.Size = new System.Drawing.Size(175, 6); + this.toolStripSeparator6.Size = new System.Drawing.Size(172, 6); // // saveNamedStateToolStripMenuItem // this.saveNamedStateToolStripMenuItem.Name = "saveNamedStateToolStripMenuItem"; - this.saveNamedStateToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.saveNamedStateToolStripMenuItem.Size = new System.Drawing.Size(175, 22); this.saveNamedStateToolStripMenuItem.Text = "Save Named State..."; this.saveNamedStateToolStripMenuItem.Click += new System.EventHandler(this.saveNamedStateToolStripMenuItem_Click); // @@ -542,101 +542,101 @@ this.toolStripSeparator21, this.autoLoadLastSlotToolStripMenuItem}); this.loadStateToolStripMenuItem.Name = "loadStateToolStripMenuItem"; - this.loadStateToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.loadStateToolStripMenuItem.Size = new System.Drawing.Size(134, 22); this.loadStateToolStripMenuItem.Text = "Load State"; this.loadStateToolStripMenuItem.DropDownOpened += new System.EventHandler(this.loadStateToolStripMenuItem_DropDownOpened); // // loadstate1toolStripMenuItem // this.loadstate1toolStripMenuItem.Name = "loadstate1toolStripMenuItem"; - this.loadstate1toolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.loadstate1toolStripMenuItem.Size = new System.Drawing.Size(174, 22); this.loadstate1toolStripMenuItem.Text = "1"; this.loadstate1toolStripMenuItem.Click += new System.EventHandler(this.loadstate1toolStripMenuItem_Click); // // loadstate2toolStripMenuItem // this.loadstate2toolStripMenuItem.Name = "loadstate2toolStripMenuItem"; - this.loadstate2toolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.loadstate2toolStripMenuItem.Size = new System.Drawing.Size(174, 22); this.loadstate2toolStripMenuItem.Text = "2"; this.loadstate2toolStripMenuItem.Click += new System.EventHandler(this.loadstate2toolStripMenuItem_Click); // // loadstate3toolStripMenuItem // this.loadstate3toolStripMenuItem.Name = "loadstate3toolStripMenuItem"; - this.loadstate3toolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.loadstate3toolStripMenuItem.Size = new System.Drawing.Size(174, 22); this.loadstate3toolStripMenuItem.Text = "3"; this.loadstate3toolStripMenuItem.Click += new System.EventHandler(this.loadstate3toolStripMenuItem_Click); // // loadstate4toolStripMenuItem // this.loadstate4toolStripMenuItem.Name = "loadstate4toolStripMenuItem"; - this.loadstate4toolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.loadstate4toolStripMenuItem.Size = new System.Drawing.Size(174, 22); this.loadstate4toolStripMenuItem.Text = "4"; this.loadstate4toolStripMenuItem.Click += new System.EventHandler(this.loadstate4toolStripMenuItem_Click); // // loadstate5toolStripMenuItem // this.loadstate5toolStripMenuItem.Name = "loadstate5toolStripMenuItem"; - this.loadstate5toolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.loadstate5toolStripMenuItem.Size = new System.Drawing.Size(174, 22); this.loadstate5toolStripMenuItem.Text = "5"; this.loadstate5toolStripMenuItem.Click += new System.EventHandler(this.loadstate5toolStripMenuItem_Click); // // loadstate6toolStripMenuItem // this.loadstate6toolStripMenuItem.Name = "loadstate6toolStripMenuItem"; - this.loadstate6toolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.loadstate6toolStripMenuItem.Size = new System.Drawing.Size(174, 22); this.loadstate6toolStripMenuItem.Text = "6"; this.loadstate6toolStripMenuItem.Click += new System.EventHandler(this.loadstate6toolStripMenuItem_Click); // // loadstate7toolStripMenuItem // this.loadstate7toolStripMenuItem.Name = "loadstate7toolStripMenuItem"; - this.loadstate7toolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.loadstate7toolStripMenuItem.Size = new System.Drawing.Size(174, 22); this.loadstate7toolStripMenuItem.Text = "7"; this.loadstate7toolStripMenuItem.Click += new System.EventHandler(this.loadstate7toolStripMenuItem_Click); // // loadstate8toolStripMenuItem // this.loadstate8toolStripMenuItem.Name = "loadstate8toolStripMenuItem"; - this.loadstate8toolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.loadstate8toolStripMenuItem.Size = new System.Drawing.Size(174, 22); this.loadstate8toolStripMenuItem.Text = "8"; this.loadstate8toolStripMenuItem.Click += new System.EventHandler(this.loadstate8toolStripMenuItem_Click); // // loadstate9toolStripMenuItem // this.loadstate9toolStripMenuItem.Name = "loadstate9toolStripMenuItem"; - this.loadstate9toolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.loadstate9toolStripMenuItem.Size = new System.Drawing.Size(174, 22); this.loadstate9toolStripMenuItem.Text = "9"; this.loadstate9toolStripMenuItem.Click += new System.EventHandler(this.loadstate9toolStripMenuItem_Click); // // loadstate0toolStripMenuItem // this.loadstate0toolStripMenuItem.Name = "loadstate0toolStripMenuItem"; - this.loadstate0toolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.loadstate0toolStripMenuItem.Size = new System.Drawing.Size(174, 22); this.loadstate0toolStripMenuItem.Text = "0"; this.loadstate0toolStripMenuItem.Click += new System.EventHandler(this.loadstate0toolStripMenuItem_Click); // // toolStripSeparator7 // this.toolStripSeparator7.Name = "toolStripSeparator7"; - this.toolStripSeparator7.Size = new System.Drawing.Size(177, 6); + this.toolStripSeparator7.Size = new System.Drawing.Size(171, 6); // // loadNamedStateToolStripMenuItem // this.loadNamedStateToolStripMenuItem.Name = "loadNamedStateToolStripMenuItem"; - this.loadNamedStateToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.loadNamedStateToolStripMenuItem.Size = new System.Drawing.Size(174, 22); this.loadNamedStateToolStripMenuItem.Text = "Load Named State..."; this.loadNamedStateToolStripMenuItem.Click += new System.EventHandler(this.loadNamedStateToolStripMenuItem_Click); // // toolStripSeparator21 // this.toolStripSeparator21.Name = "toolStripSeparator21"; - this.toolStripSeparator21.Size = new System.Drawing.Size(177, 6); + this.toolStripSeparator21.Size = new System.Drawing.Size(171, 6); // // autoLoadLastSlotToolStripMenuItem // this.autoLoadLastSlotToolStripMenuItem.Name = "autoLoadLastSlotToolStripMenuItem"; - this.autoLoadLastSlotToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.autoLoadLastSlotToolStripMenuItem.Size = new System.Drawing.Size(174, 22); this.autoLoadLastSlotToolStripMenuItem.Text = "AutoLoad last Slot"; this.autoLoadLastSlotToolStripMenuItem.Click += new System.EventHandler(this.autoLoadLastSlotToolStripMenuItem_Click); // @@ -659,77 +659,77 @@ this.saveToCurrentSlotToolStripMenuItem, this.loadCurrentSlotToolStripMenuItem}); this.saveSlotToolStripMenuItem.Name = "saveSlotToolStripMenuItem"; - this.saveSlotToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.saveSlotToolStripMenuItem.Size = new System.Drawing.Size(134, 22); this.saveSlotToolStripMenuItem.Text = "SaveSlot"; this.saveSlotToolStripMenuItem.DropDownOpened += new System.EventHandler(this.saveSlotToolStripMenuItem_DropDownOpened); // // selectSlot10ToolStripMenuItem // this.selectSlot10ToolStripMenuItem.Name = "selectSlot10ToolStripMenuItem"; - this.selectSlot10ToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.selectSlot10ToolStripMenuItem.Size = new System.Drawing.Size(172, 22); this.selectSlot10ToolStripMenuItem.Text = "Select Slot 0"; this.selectSlot10ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot10ToolStripMenuItem_Click); // // selectSlot1ToolStripMenuItem // this.selectSlot1ToolStripMenuItem.Name = "selectSlot1ToolStripMenuItem"; - this.selectSlot1ToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.selectSlot1ToolStripMenuItem.Size = new System.Drawing.Size(172, 22); this.selectSlot1ToolStripMenuItem.Text = "Select Slot 1"; this.selectSlot1ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot1ToolStripMenuItem_Click); // // selectSlot2ToolStripMenuItem // this.selectSlot2ToolStripMenuItem.Name = "selectSlot2ToolStripMenuItem"; - this.selectSlot2ToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.selectSlot2ToolStripMenuItem.Size = new System.Drawing.Size(172, 22); this.selectSlot2ToolStripMenuItem.Text = "Select Slot 2"; this.selectSlot2ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot2ToolStripMenuItem_Click); // // selectSlot3ToolStripMenuItem // this.selectSlot3ToolStripMenuItem.Name = "selectSlot3ToolStripMenuItem"; - this.selectSlot3ToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.selectSlot3ToolStripMenuItem.Size = new System.Drawing.Size(172, 22); this.selectSlot3ToolStripMenuItem.Text = "Select Slot 3"; this.selectSlot3ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot3ToolStripMenuItem_Click); // // selectSlot4ToolStripMenuItem // this.selectSlot4ToolStripMenuItem.Name = "selectSlot4ToolStripMenuItem"; - this.selectSlot4ToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.selectSlot4ToolStripMenuItem.Size = new System.Drawing.Size(172, 22); this.selectSlot4ToolStripMenuItem.Text = "Select Slot 4"; this.selectSlot4ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot4ToolStripMenuItem_Click); // // selectSlot5ToolStripMenuItem // this.selectSlot5ToolStripMenuItem.Name = "selectSlot5ToolStripMenuItem"; - this.selectSlot5ToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.selectSlot5ToolStripMenuItem.Size = new System.Drawing.Size(172, 22); this.selectSlot5ToolStripMenuItem.Text = "Select Slot 5"; this.selectSlot5ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot5ToolStripMenuItem_Click); // // selectSlot6ToolStripMenuItem // this.selectSlot6ToolStripMenuItem.Name = "selectSlot6ToolStripMenuItem"; - this.selectSlot6ToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.selectSlot6ToolStripMenuItem.Size = new System.Drawing.Size(172, 22); this.selectSlot6ToolStripMenuItem.Text = "Select Slot 6"; this.selectSlot6ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot6ToolStripMenuItem_Click); // // selectSlot7ToolStripMenuItem // this.selectSlot7ToolStripMenuItem.Name = "selectSlot7ToolStripMenuItem"; - this.selectSlot7ToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.selectSlot7ToolStripMenuItem.Size = new System.Drawing.Size(172, 22); this.selectSlot7ToolStripMenuItem.Text = "Select Slot 7"; this.selectSlot7ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot7ToolStripMenuItem_Click); // // selectSlot8ToolStripMenuItem // this.selectSlot8ToolStripMenuItem.Name = "selectSlot8ToolStripMenuItem"; - this.selectSlot8ToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.selectSlot8ToolStripMenuItem.Size = new System.Drawing.Size(172, 22); this.selectSlot8ToolStripMenuItem.Text = "Select Slot 8"; this.selectSlot8ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot8ToolStripMenuItem_Click); // // selectSlot9ToolStripMenuItem // this.selectSlot9ToolStripMenuItem.Name = "selectSlot9ToolStripMenuItem"; - this.selectSlot9ToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.selectSlot9ToolStripMenuItem.Size = new System.Drawing.Size(172, 22); this.selectSlot9ToolStripMenuItem.Text = "Select Slot 9"; this.selectSlot9ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot9ToolStripMenuItem_Click); // @@ -737,7 +737,7 @@ // this.previousSlotToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.MoveLeft; this.previousSlotToolStripMenuItem.Name = "previousSlotToolStripMenuItem"; - this.previousSlotToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.previousSlotToolStripMenuItem.Size = new System.Drawing.Size(172, 22); this.previousSlotToolStripMenuItem.Text = "Previous Slot"; this.previousSlotToolStripMenuItem.Click += new System.EventHandler(this.previousSlotToolStripMenuItem_Click); // @@ -745,33 +745,33 @@ // this.nextSlotToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.MoveRight; this.nextSlotToolStripMenuItem.Name = "nextSlotToolStripMenuItem"; - this.nextSlotToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.nextSlotToolStripMenuItem.Size = new System.Drawing.Size(172, 22); this.nextSlotToolStripMenuItem.Text = "Next Slot"; this.nextSlotToolStripMenuItem.Click += new System.EventHandler(this.nextSlotToolStripMenuItem_Click); // // toolStripSeparator5 // this.toolStripSeparator5.Name = "toolStripSeparator5"; - this.toolStripSeparator5.Size = new System.Drawing.Size(175, 6); + this.toolStripSeparator5.Size = new System.Drawing.Size(169, 6); // // saveToCurrentSlotToolStripMenuItem // this.saveToCurrentSlotToolStripMenuItem.Name = "saveToCurrentSlotToolStripMenuItem"; - this.saveToCurrentSlotToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.saveToCurrentSlotToolStripMenuItem.Size = new System.Drawing.Size(172, 22); this.saveToCurrentSlotToolStripMenuItem.Text = "Save to Current Slot"; this.saveToCurrentSlotToolStripMenuItem.Click += new System.EventHandler(this.saveToCurrentSlotToolStripMenuItem_Click); // // loadCurrentSlotToolStripMenuItem // this.loadCurrentSlotToolStripMenuItem.Name = "loadCurrentSlotToolStripMenuItem"; - this.loadCurrentSlotToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.loadCurrentSlotToolStripMenuItem.Size = new System.Drawing.Size(172, 22); this.loadCurrentSlotToolStripMenuItem.Text = "Load Current Slot"; this.loadCurrentSlotToolStripMenuItem.Click += new System.EventHandler(this.loadCurrentSlotToolStripMenuItem_Click); // // toolStripMenuItem2 // this.toolStripMenuItem2.Name = "toolStripMenuItem2"; - this.toolStripMenuItem2.Size = new System.Drawing.Size(137, 6); + this.toolStripMenuItem2.Size = new System.Drawing.Size(131, 6); // // movieToolStripMenuItem // @@ -789,7 +789,7 @@ this.bindSavestatesToMoviesToolStripMenuItem, this.automaticallyBackupMoviesToolStripMenuItem}); this.movieToolStripMenuItem.Name = "movieToolStripMenuItem"; - this.movieToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.movieToolStripMenuItem.Size = new System.Drawing.Size(134, 22); this.movieToolStripMenuItem.Text = "Movie"; this.movieToolStripMenuItem.DropDownOpened += new System.EventHandler(this.movieToolStripMenuItem_DropDownOpened); // @@ -797,14 +797,14 @@ // this.readonlyToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.ReadOnly; this.readonlyToolStripMenuItem.Name = "readonlyToolStripMenuItem"; - this.readonlyToolStripMenuItem.Size = new System.Drawing.Size(231, 22); + this.readonlyToolStripMenuItem.Size = new System.Drawing.Size(211, 22); this.readonlyToolStripMenuItem.Text = "Read-only"; this.readonlyToolStripMenuItem.Click += new System.EventHandler(this.readonlyToolStripMenuItem_Click); // // toolStripSeparator15 // this.toolStripSeparator15.Name = "toolStripSeparator15"; - this.toolStripSeparator15.Size = new System.Drawing.Size(228, 6); + this.toolStripSeparator15.Size = new System.Drawing.Size(208, 6); // // recentToolStripMenuItem // @@ -815,38 +815,38 @@ this.autoloadMostRecentToolStripMenuItem1}); this.recentToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Recent; this.recentToolStripMenuItem.Name = "recentToolStripMenuItem"; - this.recentToolStripMenuItem.Size = new System.Drawing.Size(231, 22); + this.recentToolStripMenuItem.Size = new System.Drawing.Size(211, 22); this.recentToolStripMenuItem.Text = "Recent"; this.recentToolStripMenuItem.DropDownOpened += new System.EventHandler(this.recentToolStripMenuItem_DropDownOpened); // // noneToolStripMenuItem1 // this.noneToolStripMenuItem1.Name = "noneToolStripMenuItem1"; - this.noneToolStripMenuItem1.Size = new System.Drawing.Size(192, 22); + this.noneToolStripMenuItem1.Size = new System.Drawing.Size(180, 22); this.noneToolStripMenuItem1.Text = "None"; // // toolStripSeparator16 // this.toolStripSeparator16.Name = "toolStripSeparator16"; - this.toolStripSeparator16.Size = new System.Drawing.Size(189, 6); + this.toolStripSeparator16.Size = new System.Drawing.Size(177, 6); // // clearToolStripMenuItem1 // this.clearToolStripMenuItem1.Name = "clearToolStripMenuItem1"; - this.clearToolStripMenuItem1.Size = new System.Drawing.Size(192, 22); + this.clearToolStripMenuItem1.Size = new System.Drawing.Size(180, 22); this.clearToolStripMenuItem1.Text = "Clear"; // // autoloadMostRecentToolStripMenuItem1 // this.autoloadMostRecentToolStripMenuItem1.Name = "autoloadMostRecentToolStripMenuItem1"; - this.autoloadMostRecentToolStripMenuItem1.Size = new System.Drawing.Size(192, 22); + this.autoloadMostRecentToolStripMenuItem1.Size = new System.Drawing.Size(180, 22); this.autoloadMostRecentToolStripMenuItem1.Text = "&Autoload Most Recent"; // // recordMovieToolStripMenuItem // this.recordMovieToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.RecordHS; this.recordMovieToolStripMenuItem.Name = "recordMovieToolStripMenuItem"; - this.recordMovieToolStripMenuItem.Size = new System.Drawing.Size(231, 22); + this.recordMovieToolStripMenuItem.Size = new System.Drawing.Size(211, 22); this.recordMovieToolStripMenuItem.Text = "&Record Movie..."; this.recordMovieToolStripMenuItem.Click += new System.EventHandler(this.recordMovieToolStripMenuItem_Click); // @@ -854,7 +854,7 @@ // this.playMovieToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Play; this.playMovieToolStripMenuItem.Name = "playMovieToolStripMenuItem"; - this.playMovieToolStripMenuItem.Size = new System.Drawing.Size(231, 22); + this.playMovieToolStripMenuItem.Size = new System.Drawing.Size(211, 22); this.playMovieToolStripMenuItem.Text = "&Play Movie..."; this.playMovieToolStripMenuItem.Click += new System.EventHandler(this.playMovieToolStripMenuItem_Click); // @@ -862,7 +862,7 @@ // this.stopMovieToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Stop; this.stopMovieToolStripMenuItem.Name = "stopMovieToolStripMenuItem"; - this.stopMovieToolStripMenuItem.Size = new System.Drawing.Size(231, 22); + this.stopMovieToolStripMenuItem.Size = new System.Drawing.Size(211, 22); this.stopMovieToolStripMenuItem.Text = "Stop Movie"; this.stopMovieToolStripMenuItem.Click += new System.EventHandler(this.stopMovieToolStripMenuItem_Click); // @@ -870,7 +870,7 @@ // this.playFromBeginningToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.restart; this.playFromBeginningToolStripMenuItem.Name = "playFromBeginningToolStripMenuItem"; - this.playFromBeginningToolStripMenuItem.Size = new System.Drawing.Size(231, 22); + this.playFromBeginningToolStripMenuItem.Size = new System.Drawing.Size(211, 22); this.playFromBeginningToolStripMenuItem.Text = "Play from Beginning"; this.playFromBeginningToolStripMenuItem.Click += new System.EventHandler(this.playFromBeginningToolStripMenuItem_Click); // @@ -878,7 +878,7 @@ // this.importMovieToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Import; this.importMovieToolStripMenuItem.Name = "importMovieToolStripMenuItem"; - this.importMovieToolStripMenuItem.Size = new System.Drawing.Size(231, 22); + this.importMovieToolStripMenuItem.Size = new System.Drawing.Size(211, 22); this.importMovieToolStripMenuItem.Text = "Import Movies..."; this.importMovieToolStripMenuItem.Click += new System.EventHandler(this.importMovieToolStripMenuItem_Click); // @@ -886,26 +886,26 @@ // this.saveMovieToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.SaveAs; this.saveMovieToolStripMenuItem.Name = "saveMovieToolStripMenuItem"; - this.saveMovieToolStripMenuItem.Size = new System.Drawing.Size(231, 22); + this.saveMovieToolStripMenuItem.Size = new System.Drawing.Size(211, 22); this.saveMovieToolStripMenuItem.Text = "&Save Movie"; this.saveMovieToolStripMenuItem.Click += new System.EventHandler(this.saveMovieToolStripMenuItem_Click); // // toolStripSeparator14 // this.toolStripSeparator14.Name = "toolStripSeparator14"; - this.toolStripSeparator14.Size = new System.Drawing.Size(228, 6); + this.toolStripSeparator14.Size = new System.Drawing.Size(208, 6); // // bindSavestatesToMoviesToolStripMenuItem // this.bindSavestatesToMoviesToolStripMenuItem.Name = "bindSavestatesToMoviesToolStripMenuItem"; - this.bindSavestatesToMoviesToolStripMenuItem.Size = new System.Drawing.Size(231, 22); + this.bindSavestatesToMoviesToolStripMenuItem.Size = new System.Drawing.Size(211, 22); this.bindSavestatesToMoviesToolStripMenuItem.Text = "Bind Savestates to Movies"; this.bindSavestatesToMoviesToolStripMenuItem.Click += new System.EventHandler(this.bindSavestatesToMoviesToolStripMenuItem_Click); // // automaticallyBackupMoviesToolStripMenuItem // this.automaticallyBackupMoviesToolStripMenuItem.Name = "automaticallyBackupMoviesToolStripMenuItem"; - this.automaticallyBackupMoviesToolStripMenuItem.Size = new System.Drawing.Size(231, 22); + this.automaticallyBackupMoviesToolStripMenuItem.Size = new System.Drawing.Size(211, 22); this.automaticallyBackupMoviesToolStripMenuItem.Text = "Automatically Backup Movies"; this.automaticallyBackupMoviesToolStripMenuItem.Click += new System.EventHandler(this.automaticallyBackupMoviesToolStripMenuItem_Click); // @@ -917,7 +917,7 @@ this.toolStripSeparator19, this.captureOSDToolStripMenuItem}); this.AVIWAVToolStripMenuItem.Name = "AVIWAVToolStripMenuItem"; - this.AVIWAVToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.AVIWAVToolStripMenuItem.Size = new System.Drawing.Size(134, 22); this.AVIWAVToolStripMenuItem.Text = "AVI/WAV"; this.AVIWAVToolStripMenuItem.DropDownOpened += new System.EventHandler(this.aVIWAVToolStripMenuItem_DropDownOpened); // @@ -925,7 +925,7 @@ // this.recordAVIToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.AVI; this.recordAVIToolStripMenuItem.Name = "recordAVIToolStripMenuItem"; - this.recordAVIToolStripMenuItem.Size = new System.Drawing.Size(163, 22); + this.recordAVIToolStripMenuItem.Size = new System.Drawing.Size(155, 22); this.recordAVIToolStripMenuItem.Text = "Record AVI/WAV"; this.recordAVIToolStripMenuItem.Click += new System.EventHandler(this.recordAVIToolStripMenuItem_Click); // @@ -933,19 +933,19 @@ // this.stopAVIToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Stop; this.stopAVIToolStripMenuItem.Name = "stopAVIToolStripMenuItem"; - this.stopAVIToolStripMenuItem.Size = new System.Drawing.Size(163, 22); + this.stopAVIToolStripMenuItem.Size = new System.Drawing.Size(155, 22); this.stopAVIToolStripMenuItem.Text = "Stop AVI/WAV"; this.stopAVIToolStripMenuItem.Click += new System.EventHandler(this.stopAVIToolStripMenuItem_Click); // // toolStripSeparator19 // this.toolStripSeparator19.Name = "toolStripSeparator19"; - this.toolStripSeparator19.Size = new System.Drawing.Size(160, 6); + this.toolStripSeparator19.Size = new System.Drawing.Size(152, 6); // // captureOSDToolStripMenuItem // this.captureOSDToolStripMenuItem.Name = "captureOSDToolStripMenuItem"; - this.captureOSDToolStripMenuItem.Size = new System.Drawing.Size(163, 22); + this.captureOSDToolStripMenuItem.Size = new System.Drawing.Size(155, 22); this.captureOSDToolStripMenuItem.Text = "Capture OSD"; this.captureOSDToolStripMenuItem.Click += new System.EventHandler(this.captureOSDToolStripMenuItem_Click); // @@ -958,7 +958,7 @@ this.toolStripSeparator20, this.captureOSDToolStripMenuItem1}); this.screenshotToolStripMenuItem.Name = "screenshotToolStripMenuItem"; - this.screenshotToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.screenshotToolStripMenuItem.Size = new System.Drawing.Size(134, 22); this.screenshotToolStripMenuItem.Text = "Screenshot"; this.screenshotToolStripMenuItem.DropDownOpening += new System.EventHandler(this.screenshotToolStripMenuItem_DropDownOpening); // @@ -966,14 +966,14 @@ // this.screenshotF12ToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.camera; this.screenshotF12ToolStripMenuItem.Name = "screenshotF12ToolStripMenuItem"; - this.screenshotF12ToolStripMenuItem.Size = new System.Drawing.Size(245, 22); + this.screenshotF12ToolStripMenuItem.Size = new System.Drawing.Size(230, 22); this.screenshotF12ToolStripMenuItem.Text = "Screenshot"; this.screenshotF12ToolStripMenuItem.Click += new System.EventHandler(this.screenshotF12ToolStripMenuItem_Click); // // screenshotAsToolStripMenuItem // this.screenshotAsToolStripMenuItem.Name = "screenshotAsToolStripMenuItem"; - this.screenshotAsToolStripMenuItem.Size = new System.Drawing.Size(245, 22); + this.screenshotAsToolStripMenuItem.Size = new System.Drawing.Size(230, 22); this.screenshotAsToolStripMenuItem.Text = "Screenshot As..."; this.screenshotAsToolStripMenuItem.Click += new System.EventHandler(this.screenshotAsToolStripMenuItem_Click); // @@ -981,32 +981,32 @@ // this.screenshotClipboardToolStripMenuItem.Name = "screenshotClipboardToolStripMenuItem"; this.screenshotClipboardToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.C))); - this.screenshotClipboardToolStripMenuItem.Size = new System.Drawing.Size(245, 22); + this.screenshotClipboardToolStripMenuItem.Size = new System.Drawing.Size(230, 22); this.screenshotClipboardToolStripMenuItem.Text = "Screenshot -> Clipboard"; this.screenshotClipboardToolStripMenuItem.Click += new System.EventHandler(this.screenshotClipboardToolStripMenuItem_Click); // // toolStripSeparator20 // this.toolStripSeparator20.Name = "toolStripSeparator20"; - this.toolStripSeparator20.Size = new System.Drawing.Size(242, 6); + this.toolStripSeparator20.Size = new System.Drawing.Size(227, 6); // // captureOSDToolStripMenuItem1 // this.captureOSDToolStripMenuItem1.Name = "captureOSDToolStripMenuItem1"; - this.captureOSDToolStripMenuItem1.Size = new System.Drawing.Size(245, 22); + this.captureOSDToolStripMenuItem1.Size = new System.Drawing.Size(230, 22); this.captureOSDToolStripMenuItem1.Text = "Capture OSD"; this.captureOSDToolStripMenuItem1.Click += new System.EventHandler(this.captureOSDToolStripMenuItem1_Click); // // toolStripSeparator4 // this.toolStripSeparator4.Name = "toolStripSeparator4"; - this.toolStripSeparator4.Size = new System.Drawing.Size(137, 6); + this.toolStripSeparator4.Size = new System.Drawing.Size(131, 6); // // exitToolStripMenuItem // this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; this.exitToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4))); - this.exitToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.exitToolStripMenuItem.Size = new System.Drawing.Size(134, 22); this.exitToolStripMenuItem.Text = "Exit"; this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); // @@ -1019,7 +1019,7 @@ this.resetToolStripMenuItem, this.hardResetToolStripMenuItem}); this.emulationToolStripMenuItem.Name = "emulationToolStripMenuItem"; - this.emulationToolStripMenuItem.Size = new System.Drawing.Size(73, 19); + this.emulationToolStripMenuItem.Size = new System.Drawing.Size(65, 17); this.emulationToolStripMenuItem.Text = "&Emulation"; this.emulationToolStripMenuItem.DropDownOpened += new System.EventHandler(this.emulationToolStripMenuItem_DropDownOpened); // @@ -1027,7 +1027,7 @@ // this.pauseToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Pause; this.pauseToolStripMenuItem.Name = "pauseToolStripMenuItem"; - this.pauseToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.pauseToolStripMenuItem.Size = new System.Drawing.Size(135, 22); this.pauseToolStripMenuItem.Text = "&Pause"; this.pauseToolStripMenuItem.Click += new System.EventHandler(this.pauseToolStripMenuItem_Click); // @@ -1035,26 +1035,26 @@ // this.rebootCoreToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.reboot; this.rebootCoreToolStripMenuItem.Name = "rebootCoreToolStripMenuItem"; - this.rebootCoreToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.rebootCoreToolStripMenuItem.Size = new System.Drawing.Size(135, 22); this.rebootCoreToolStripMenuItem.Text = "&Reboot Core"; this.rebootCoreToolStripMenuItem.Click += new System.EventHandler(this.powerToolStripMenuItem_Click); // // toolStripSeparator1 // this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(137, 6); + this.toolStripSeparator1.Size = new System.Drawing.Size(132, 6); // // resetToolStripMenuItem // this.resetToolStripMenuItem.Name = "resetToolStripMenuItem"; - this.resetToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.resetToolStripMenuItem.Size = new System.Drawing.Size(135, 22); this.resetToolStripMenuItem.Text = "&Soft Reset"; this.resetToolStripMenuItem.Click += new System.EventHandler(this.resetToolStripMenuItem_Click); // // hardResetToolStripMenuItem // this.hardResetToolStripMenuItem.Name = "hardResetToolStripMenuItem"; - this.hardResetToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.hardResetToolStripMenuItem.Size = new System.Drawing.Size(135, 22); this.hardResetToolStripMenuItem.Text = "&Hard Reset"; this.hardResetToolStripMenuItem.Click += new System.EventHandler(this.hardResetToolStripMenuItem_Click); // @@ -1075,7 +1075,7 @@ this.displayStatusBarToolStripMenuItem, this.displayLogWindowToolStripMenuItem}); this.viewToolStripMenuItem.Name = "viewToolStripMenuItem"; - this.viewToolStripMenuItem.Size = new System.Drawing.Size(44, 19); + this.viewToolStripMenuItem.Size = new System.Drawing.Size(41, 17); this.viewToolStripMenuItem.Text = "&View"; this.viewToolStripMenuItem.DropDownOpened += new System.EventHandler(this.viewToolStripMenuItem_DropDownOpened); // @@ -1087,34 +1087,34 @@ this.SuperX2SAIMenuItem, this.SuperEagleMenuItem}); this.windowFilterMenuItem.Name = "windowFilterMenuItem"; - this.windowFilterMenuItem.Size = new System.Drawing.Size(198, 22); + this.windowFilterMenuItem.Size = new System.Drawing.Size(187, 22); this.windowFilterMenuItem.Text = "Display Filter"; // // DisplayFilterNoneMenuItem // this.DisplayFilterNoneMenuItem.Name = "DisplayFilterNoneMenuItem"; - this.DisplayFilterNoneMenuItem.Size = new System.Drawing.Size(135, 22); + this.DisplayFilterNoneMenuItem.Size = new System.Drawing.Size(134, 22); this.DisplayFilterNoneMenuItem.Text = "None"; this.DisplayFilterNoneMenuItem.Click += new System.EventHandler(this.DisplayFilterMenuItem_Click); // // x2SAIMenuItem // this.x2SAIMenuItem.Name = "x2SAIMenuItem"; - this.x2SAIMenuItem.Size = new System.Drawing.Size(135, 22); + this.x2SAIMenuItem.Size = new System.Drawing.Size(134, 22); this.x2SAIMenuItem.Text = "2xSAI"; this.x2SAIMenuItem.Click += new System.EventHandler(this.DisplayFilterMenuItem_Click); // // SuperX2SAIMenuItem // this.SuperX2SAIMenuItem.Name = "SuperX2SAIMenuItem"; - this.SuperX2SAIMenuItem.Size = new System.Drawing.Size(135, 22); + this.SuperX2SAIMenuItem.Size = new System.Drawing.Size(134, 22); this.SuperX2SAIMenuItem.Text = "Super 2xSAI"; this.SuperX2SAIMenuItem.Click += new System.EventHandler(this.DisplayFilterMenuItem_Click); // // SuperEagleMenuItem // this.SuperEagleMenuItem.Name = "SuperEagleMenuItem"; - this.SuperEagleMenuItem.Size = new System.Drawing.Size(135, 22); + this.SuperEagleMenuItem.Size = new System.Drawing.Size(134, 22); this.SuperEagleMenuItem.Text = "Super Eagle"; this.SuperEagleMenuItem.Click += new System.EventHandler(this.DisplayFilterMenuItem_Click); // @@ -1128,48 +1128,48 @@ this.x5MenuItem, this.mzMenuItem}); this.windowSizeMenuItem.Name = "windowSizeMenuItem"; - this.windowSizeMenuItem.Size = new System.Drawing.Size(198, 22); + this.windowSizeMenuItem.Size = new System.Drawing.Size(187, 22); this.windowSizeMenuItem.Text = "&Window Size"; // // x1MenuItem // this.x1MenuItem.Name = "x1MenuItem"; - this.x1MenuItem.Size = new System.Drawing.Size(96, 22); + this.x1MenuItem.Size = new System.Drawing.Size(94, 22); this.x1MenuItem.Text = "&1x"; this.x1MenuItem.Click += new System.EventHandler(this.zoomMenuItem_Click); // // x2MenuItem // this.x2MenuItem.Name = "x2MenuItem"; - this.x2MenuItem.Size = new System.Drawing.Size(96, 22); + this.x2MenuItem.Size = new System.Drawing.Size(94, 22); this.x2MenuItem.Text = "&2x"; this.x2MenuItem.Click += new System.EventHandler(this.zoomMenuItem_Click); // // x3MenuItem // this.x3MenuItem.Name = "x3MenuItem"; - this.x3MenuItem.Size = new System.Drawing.Size(96, 22); + this.x3MenuItem.Size = new System.Drawing.Size(94, 22); this.x3MenuItem.Text = "&3x"; this.x3MenuItem.Click += new System.EventHandler(this.zoomMenuItem_Click); // // x4MenuItem // this.x4MenuItem.Name = "x4MenuItem"; - this.x4MenuItem.Size = new System.Drawing.Size(96, 22); + this.x4MenuItem.Size = new System.Drawing.Size(94, 22); this.x4MenuItem.Text = "&4x"; this.x4MenuItem.Click += new System.EventHandler(this.zoomMenuItem_Click); // // x5MenuItem // this.x5MenuItem.Name = "x5MenuItem"; - this.x5MenuItem.Size = new System.Drawing.Size(96, 22); + this.x5MenuItem.Size = new System.Drawing.Size(94, 22); this.x5MenuItem.Text = "&5x"; this.x5MenuItem.Click += new System.EventHandler(this.zoomMenuItem_Click); // // mzMenuItem // this.mzMenuItem.Name = "mzMenuItem"; - this.mzMenuItem.Size = new System.Drawing.Size(96, 22); + this.mzMenuItem.Size = new System.Drawing.Size(94, 22); this.mzMenuItem.Text = "&Max"; this.mzMenuItem.Click += new System.EventHandler(this.zoomMenuItem_Click); // @@ -1177,73 +1177,73 @@ // this.switchToFullscreenToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Fullscreen; this.switchToFullscreenToolStripMenuItem.Name = "switchToFullscreenToolStripMenuItem"; - this.switchToFullscreenToolStripMenuItem.Size = new System.Drawing.Size(198, 22); + this.switchToFullscreenToolStripMenuItem.Size = new System.Drawing.Size(187, 22); this.switchToFullscreenToolStripMenuItem.Text = "Switch to Fullscreen"; this.switchToFullscreenToolStripMenuItem.Click += new System.EventHandler(this.switchToFullscreenToolStripMenuItem_Click); // // toolStripSeparator2 // this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(195, 6); + this.toolStripSeparator2.Size = new System.Drawing.Size(184, 6); // // displayFPSToolStripMenuItem // this.displayFPSToolStripMenuItem.Name = "displayFPSToolStripMenuItem"; - this.displayFPSToolStripMenuItem.Size = new System.Drawing.Size(198, 22); + this.displayFPSToolStripMenuItem.Size = new System.Drawing.Size(187, 22); this.displayFPSToolStripMenuItem.Text = "Display FPS"; this.displayFPSToolStripMenuItem.Click += new System.EventHandler(this.displayFPSToolStripMenuItem_Click); // // displayFrameCounterToolStripMenuItem // this.displayFrameCounterToolStripMenuItem.Name = "displayFrameCounterToolStripMenuItem"; - this.displayFrameCounterToolStripMenuItem.Size = new System.Drawing.Size(198, 22); + this.displayFrameCounterToolStripMenuItem.Size = new System.Drawing.Size(187, 22); this.displayFrameCounterToolStripMenuItem.Text = "Display FrameCounter"; this.displayFrameCounterToolStripMenuItem.Click += new System.EventHandler(this.displayFrameCounterToolStripMenuItem_Click); // // displayLagCounterToolStripMenuItem // this.displayLagCounterToolStripMenuItem.Name = "displayLagCounterToolStripMenuItem"; - this.displayLagCounterToolStripMenuItem.Size = new System.Drawing.Size(198, 22); + this.displayLagCounterToolStripMenuItem.Size = new System.Drawing.Size(187, 22); this.displayLagCounterToolStripMenuItem.Text = "Display Lag Counter"; this.displayLagCounterToolStripMenuItem.Click += new System.EventHandler(this.displayLagCounterToolStripMenuItem_Click); // // displayInputToolStripMenuItem // this.displayInputToolStripMenuItem.Name = "displayInputToolStripMenuItem"; - this.displayInputToolStripMenuItem.Size = new System.Drawing.Size(198, 22); + this.displayInputToolStripMenuItem.Size = new System.Drawing.Size(187, 22); this.displayInputToolStripMenuItem.Text = "Display Input"; this.displayInputToolStripMenuItem.Click += new System.EventHandler(this.displayInputToolStripMenuItem_Click); // // displayRerecordCountToolStripMenuItem // this.displayRerecordCountToolStripMenuItem.Name = "displayRerecordCountToolStripMenuItem"; - this.displayRerecordCountToolStripMenuItem.Size = new System.Drawing.Size(198, 22); + this.displayRerecordCountToolStripMenuItem.Size = new System.Drawing.Size(187, 22); this.displayRerecordCountToolStripMenuItem.Text = "Display Rerecord Count"; this.displayRerecordCountToolStripMenuItem.Click += new System.EventHandler(this.displayRerecordCountToolStripMenuItem_Click); // // displaySubtitlesToolStripMenuItem // this.displaySubtitlesToolStripMenuItem.Name = "displaySubtitlesToolStripMenuItem"; - this.displaySubtitlesToolStripMenuItem.Size = new System.Drawing.Size(198, 22); + this.displaySubtitlesToolStripMenuItem.Size = new System.Drawing.Size(187, 22); this.displaySubtitlesToolStripMenuItem.Text = "Display Subtitles"; this.displaySubtitlesToolStripMenuItem.Click += new System.EventHandler(this.displaySubtitlesToolStripMenuItem_Click); // // toolStripMenuItem4 // this.toolStripMenuItem4.Name = "toolStripMenuItem4"; - this.toolStripMenuItem4.Size = new System.Drawing.Size(195, 6); + this.toolStripMenuItem4.Size = new System.Drawing.Size(184, 6); // // displayStatusBarToolStripMenuItem // this.displayStatusBarToolStripMenuItem.Name = "displayStatusBarToolStripMenuItem"; - this.displayStatusBarToolStripMenuItem.Size = new System.Drawing.Size(198, 22); + this.displayStatusBarToolStripMenuItem.Size = new System.Drawing.Size(187, 22); this.displayStatusBarToolStripMenuItem.Text = "Display Status Bar"; this.displayStatusBarToolStripMenuItem.Click += new System.EventHandler(this.displayStatusBarToolStripMenuItem_Click); // // displayLogWindowToolStripMenuItem // this.displayLogWindowToolStripMenuItem.Name = "displayLogWindowToolStripMenuItem"; - this.displayLogWindowToolStripMenuItem.Size = new System.Drawing.Size(198, 22); + this.displayLogWindowToolStripMenuItem.Size = new System.Drawing.Size(187, 22); this.displayLogWindowToolStripMenuItem.Text = "Display Log Window"; this.displayLogWindowToolStripMenuItem.Click += new System.EventHandler(this.displayLogWindowToolStripMenuItem_Click); // @@ -1264,14 +1264,14 @@ this.saveConfigToolStripMenuItem, this.loadConfigToolStripMenuItem}); this.configToolStripMenuItem.Name = "configToolStripMenuItem"; - this.configToolStripMenuItem.Size = new System.Drawing.Size(55, 19); + this.configToolStripMenuItem.Size = new System.Drawing.Size(50, 17); this.configToolStripMenuItem.Text = "&Config"; // // controllersToolStripMenuItem // this.controllersToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.GameController; this.controllersToolStripMenuItem.Name = "controllersToolStripMenuItem"; - this.controllersToolStripMenuItem.Size = new System.Drawing.Size(141, 22); + this.controllersToolStripMenuItem.Size = new System.Drawing.Size(138, 22); this.controllersToolStripMenuItem.Text = "&Controllers..."; this.controllersToolStripMenuItem.Click += new System.EventHandler(this.controllersToolStripMenuItem_Click); // @@ -1279,7 +1279,7 @@ // this.hotkeysToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.HotKeys; this.hotkeysToolStripMenuItem.Name = "hotkeysToolStripMenuItem"; - this.hotkeysToolStripMenuItem.Size = new System.Drawing.Size(141, 22); + this.hotkeysToolStripMenuItem.Size = new System.Drawing.Size(138, 22); this.hotkeysToolStripMenuItem.Text = "&Hotkeys..."; this.hotkeysToolStripMenuItem.Click += new System.EventHandler(this.hotkeysToolStripMenuItem_Click); // @@ -1287,7 +1287,7 @@ // this.messagesToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.MessageConfig; this.messagesToolStripMenuItem.Name = "messagesToolStripMenuItem"; - this.messagesToolStripMenuItem.Size = new System.Drawing.Size(141, 22); + this.messagesToolStripMenuItem.Size = new System.Drawing.Size(138, 22); this.messagesToolStripMenuItem.Text = "&Messages..."; this.messagesToolStripMenuItem.Click += new System.EventHandler(this.messagesToolStripMenuItem_Click); // @@ -1295,7 +1295,7 @@ // this.pathsToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.CopyFolderHS; this.pathsToolStripMenuItem.Name = "pathsToolStripMenuItem"; - this.pathsToolStripMenuItem.Size = new System.Drawing.Size(141, 22); + this.pathsToolStripMenuItem.Size = new System.Drawing.Size(138, 22); this.pathsToolStripMenuItem.Text = "Paths..."; this.pathsToolStripMenuItem.Click += new System.EventHandler(this.pathsToolStripMenuItem_Click); // @@ -1303,7 +1303,7 @@ // this.soundToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.AudioHS; this.soundToolStripMenuItem.Name = "soundToolStripMenuItem"; - this.soundToolStripMenuItem.Size = new System.Drawing.Size(141, 22); + this.soundToolStripMenuItem.Size = new System.Drawing.Size(138, 22); this.soundToolStripMenuItem.Text = "&Sound..."; this.soundToolStripMenuItem.Click += new System.EventHandler(this.soundToolStripMenuItem_Click); // @@ -1311,14 +1311,14 @@ // this.autofireToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Lightning; this.autofireToolStripMenuItem.Name = "autofireToolStripMenuItem"; - this.autofireToolStripMenuItem.Size = new System.Drawing.Size(141, 22); + this.autofireToolStripMenuItem.Size = new System.Drawing.Size(138, 22); this.autofireToolStripMenuItem.Text = "&Autofire..."; this.autofireToolStripMenuItem.Click += new System.EventHandler(this.autofireToolStripMenuItem_Click); // // toolStripSeparator9 // this.toolStripSeparator9.Name = "toolStripSeparator9"; - this.toolStripSeparator9.Size = new System.Drawing.Size(138, 6); + this.toolStripSeparator9.Size = new System.Drawing.Size(135, 6); // // enableToolStripMenuItem // @@ -1331,56 +1331,56 @@ this.frameAdvanceSkipLagFramesToolStripMenuItem, this.backupSaveramToolStripMenuItem}); this.enableToolStripMenuItem.Name = "enableToolStripMenuItem"; - this.enableToolStripMenuItem.Size = new System.Drawing.Size(141, 22); + this.enableToolStripMenuItem.Size = new System.Drawing.Size(138, 22); this.enableToolStripMenuItem.Text = "&Enable"; this.enableToolStripMenuItem.DropDownOpened += new System.EventHandler(this.enableToolStripMenuItem_DropDownOpened); // // enableRewindToolStripMenuItem // this.enableRewindToolStripMenuItem.Name = "enableRewindToolStripMenuItem"; - this.enableRewindToolStripMenuItem.Size = new System.Drawing.Size(252, 22); + this.enableRewindToolStripMenuItem.Size = new System.Drawing.Size(236, 22); this.enableRewindToolStripMenuItem.Text = "&Enable Rewind"; this.enableRewindToolStripMenuItem.Click += new System.EventHandler(this.enableRewindToolStripMenuItem_Click); // // enableContextMenuToolStripMenuItem // this.enableContextMenuToolStripMenuItem.Name = "enableContextMenuToolStripMenuItem"; - this.enableContextMenuToolStripMenuItem.Size = new System.Drawing.Size(252, 22); + this.enableContextMenuToolStripMenuItem.Size = new System.Drawing.Size(236, 22); this.enableContextMenuToolStripMenuItem.Text = "Enable Context Menu"; this.enableContextMenuToolStripMenuItem.Click += new System.EventHandler(this.enableContextMenuToolStripMenuItem_Click); // // backupSavestatesToolStripMenuItem // this.backupSavestatesToolStripMenuItem.Name = "backupSavestatesToolStripMenuItem"; - this.backupSavestatesToolStripMenuItem.Size = new System.Drawing.Size(252, 22); + this.backupSavestatesToolStripMenuItem.Size = new System.Drawing.Size(236, 22); this.backupSavestatesToolStripMenuItem.Text = "Backup Savestates"; this.backupSavestatesToolStripMenuItem.Click += new System.EventHandler(this.backupSavestatesToolStripMenuItem_Click); // // autoSavestatesToolStripMenuItem // this.autoSavestatesToolStripMenuItem.Name = "autoSavestatesToolStripMenuItem"; - this.autoSavestatesToolStripMenuItem.Size = new System.Drawing.Size(252, 22); + this.autoSavestatesToolStripMenuItem.Size = new System.Drawing.Size(236, 22); this.autoSavestatesToolStripMenuItem.Text = "Auto Savestates"; this.autoSavestatesToolStripMenuItem.Click += new System.EventHandler(this.autoSavestatesToolStripMenuItem_Click); // // saveScreenshotWithSavestatesToolStripMenuItem // this.saveScreenshotWithSavestatesToolStripMenuItem.Name = "saveScreenshotWithSavestatesToolStripMenuItem"; - this.saveScreenshotWithSavestatesToolStripMenuItem.Size = new System.Drawing.Size(252, 22); + this.saveScreenshotWithSavestatesToolStripMenuItem.Size = new System.Drawing.Size(236, 22); this.saveScreenshotWithSavestatesToolStripMenuItem.Text = "Save Screenshot with Savestates"; this.saveScreenshotWithSavestatesToolStripMenuItem.Click += new System.EventHandler(this.screenshotWithSavestatesToolStripMenuItem_Click); // // frameAdvanceSkipLagFramesToolStripMenuItem // this.frameAdvanceSkipLagFramesToolStripMenuItem.Name = "frameAdvanceSkipLagFramesToolStripMenuItem"; - this.frameAdvanceSkipLagFramesToolStripMenuItem.Size = new System.Drawing.Size(252, 22); + this.frameAdvanceSkipLagFramesToolStripMenuItem.Size = new System.Drawing.Size(236, 22); this.frameAdvanceSkipLagFramesToolStripMenuItem.Text = "Frame Advance - Skip Lag Frames"; this.frameAdvanceSkipLagFramesToolStripMenuItem.Click += new System.EventHandler(this.frameAdvanceSkipLagFramesToolStripMenuItem_Click); // // backupSaveramToolStripMenuItem // this.backupSaveramToolStripMenuItem.Name = "backupSaveramToolStripMenuItem"; - this.backupSaveramToolStripMenuItem.Size = new System.Drawing.Size(252, 22); + this.backupSaveramToolStripMenuItem.Size = new System.Drawing.Size(236, 22); this.backupSaveramToolStripMenuItem.Text = "Backup Saveram"; this.backupSaveramToolStripMenuItem.Click += new System.EventHandler(this.backupSaveramToolStripMenuItem_Click); // @@ -1402,101 +1402,101 @@ this.toolStripSeparator23, this.logWindowAsConsoleToolStripMenuItem}); this.gUIToolStripMenuItem.Name = "gUIToolStripMenuItem"; - this.gUIToolStripMenuItem.Size = new System.Drawing.Size(141, 22); + this.gUIToolStripMenuItem.Size = new System.Drawing.Size(138, 22); this.gUIToolStripMenuItem.Text = "GUI"; this.gUIToolStripMenuItem.DropDownOpened += new System.EventHandler(this.gUIToolStripMenuItem_DropDownOpened); // // pauseWhenMenuActivatedToolStripMenuItem // this.pauseWhenMenuActivatedToolStripMenuItem.Name = "pauseWhenMenuActivatedToolStripMenuItem"; - this.pauseWhenMenuActivatedToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.pauseWhenMenuActivatedToolStripMenuItem.Size = new System.Drawing.Size(231, 22); this.pauseWhenMenuActivatedToolStripMenuItem.Text = "Pause when menu activated"; this.pauseWhenMenuActivatedToolStripMenuItem.Click += new System.EventHandler(this.pauseWhenMenuActivatedToolStripMenuItem_Click); // // startPausedToolStripMenuItem // this.startPausedToolStripMenuItem.Name = "startPausedToolStripMenuItem"; - this.startPausedToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.startPausedToolStripMenuItem.Size = new System.Drawing.Size(231, 22); this.startPausedToolStripMenuItem.Text = "Start paused"; this.startPausedToolStripMenuItem.Click += new System.EventHandler(this.startPausedToolStripMenuItem_Click); // // toolStripSeparator22 // this.toolStripSeparator22.Name = "toolStripSeparator22"; - this.toolStripSeparator22.Size = new System.Drawing.Size(238, 6); + this.toolStripSeparator22.Size = new System.Drawing.Size(228, 6); // // saveWindowPositionToolStripMenuItem // this.saveWindowPositionToolStripMenuItem.Name = "saveWindowPositionToolStripMenuItem"; - this.saveWindowPositionToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.saveWindowPositionToolStripMenuItem.Size = new System.Drawing.Size(231, 22); this.saveWindowPositionToolStripMenuItem.Text = "Save window position"; this.saveWindowPositionToolStripMenuItem.Click += new System.EventHandler(this.saveWindowPositionToolStripMenuItem_Click); // // forceGDIPPresentationToolStripMenuItem // this.forceGDIPPresentationToolStripMenuItem.Name = "forceGDIPPresentationToolStripMenuItem"; - this.forceGDIPPresentationToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.forceGDIPPresentationToolStripMenuItem.Size = new System.Drawing.Size(231, 22); this.forceGDIPPresentationToolStripMenuItem.Text = "Use GDI+ Display Method"; this.forceGDIPPresentationToolStripMenuItem.Click += new System.EventHandler(this.forceGDIPPresentationToolStripMenuItem_Click); // // blurryToolStripMenuItem // this.blurryToolStripMenuItem.Name = "blurryToolStripMenuItem"; - this.blurryToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.blurryToolStripMenuItem.Size = new System.Drawing.Size(231, 22); this.blurryToolStripMenuItem.Text = "Use Bilinear Filtering"; this.blurryToolStripMenuItem.Click += new System.EventHandler(this.blurryToolStripMenuItem_Click); // // miSuppressGuiLayer // this.miSuppressGuiLayer.Name = "miSuppressGuiLayer"; - this.miSuppressGuiLayer.Size = new System.Drawing.Size(241, 22); + this.miSuppressGuiLayer.Size = new System.Drawing.Size(231, 22); this.miSuppressGuiLayer.Text = "Suppress GUI Layer"; this.miSuppressGuiLayer.Click += new System.EventHandler(this.miSuppressGuiLayer_Click); // // showMenuInFullScreenToolStripMenuItem // this.showMenuInFullScreenToolStripMenuItem.Name = "showMenuInFullScreenToolStripMenuItem"; - this.showMenuInFullScreenToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.showMenuInFullScreenToolStripMenuItem.Size = new System.Drawing.Size(231, 22); this.showMenuInFullScreenToolStripMenuItem.Text = "Show Menu in Full Screen"; this.showMenuInFullScreenToolStripMenuItem.Click += new System.EventHandler(this.showMenuInFullScreenToolStripMenuItem_Click); // // runInBackgroundToolStripMenuItem // this.runInBackgroundToolStripMenuItem.Name = "runInBackgroundToolStripMenuItem"; - this.runInBackgroundToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.runInBackgroundToolStripMenuItem.Size = new System.Drawing.Size(231, 22); this.runInBackgroundToolStripMenuItem.Text = "Run in Background"; this.runInBackgroundToolStripMenuItem.Click += new System.EventHandler(this.runInBackgroundToolStripMenuItem_Click); // // acceptBackgroundInputToolStripMenuItem // this.acceptBackgroundInputToolStripMenuItem.Name = "acceptBackgroundInputToolStripMenuItem"; - this.acceptBackgroundInputToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.acceptBackgroundInputToolStripMenuItem.Size = new System.Drawing.Size(231, 22); this.acceptBackgroundInputToolStripMenuItem.Text = "Accept Background Input"; this.acceptBackgroundInputToolStripMenuItem.Click += new System.EventHandler(this.acceptBackgroundInputToolStripMenuItem_Click); // // singleInstanceModeToolStripMenuItem // this.singleInstanceModeToolStripMenuItem.Name = "singleInstanceModeToolStripMenuItem"; - this.singleInstanceModeToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.singleInstanceModeToolStripMenuItem.Size = new System.Drawing.Size(231, 22); this.singleInstanceModeToolStripMenuItem.Text = "Single Instance Mode"; this.singleInstanceModeToolStripMenuItem.Click += new System.EventHandler(this.singleInstanceModeToolStripMenuItem_Click); // // neverBeAskedToSaveChangesToolStripMenuItem // this.neverBeAskedToSaveChangesToolStripMenuItem.Name = "neverBeAskedToSaveChangesToolStripMenuItem"; - this.neverBeAskedToSaveChangesToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.neverBeAskedToSaveChangesToolStripMenuItem.Size = new System.Drawing.Size(231, 22); this.neverBeAskedToSaveChangesToolStripMenuItem.Text = "Never be asked to save changes"; this.neverBeAskedToSaveChangesToolStripMenuItem.Click += new System.EventHandler(this.neverBeAskedToSaveChangesToolStripMenuItem_Click); // // toolStripSeparator23 // this.toolStripSeparator23.Name = "toolStripSeparator23"; - this.toolStripSeparator23.Size = new System.Drawing.Size(238, 6); + this.toolStripSeparator23.Size = new System.Drawing.Size(228, 6); // // logWindowAsConsoleToolStripMenuItem // this.logWindowAsConsoleToolStripMenuItem.Name = "logWindowAsConsoleToolStripMenuItem"; - this.logWindowAsConsoleToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.logWindowAsConsoleToolStripMenuItem.Size = new System.Drawing.Size(231, 22); this.logWindowAsConsoleToolStripMenuItem.Text = "Log Window as Console"; this.logWindowAsConsoleToolStripMenuItem.Click += new System.EventHandler(this.logWindowAsConsoleToolStripMenuItem_Click); // @@ -1527,14 +1527,14 @@ this.miSpeed150, this.miSpeed200}); this.frameSkipToolStripMenuItem.Name = "frameSkipToolStripMenuItem"; - this.frameSkipToolStripMenuItem.Size = new System.Drawing.Size(141, 22); + this.frameSkipToolStripMenuItem.Size = new System.Drawing.Size(138, 22); this.frameSkipToolStripMenuItem.Text = "Speed/Skip"; this.frameSkipToolStripMenuItem.DropDownOpened += new System.EventHandler(this.frameSkipToolStripMenuItem_DropDownOpened); // // miLimitFramerate // this.miLimitFramerate.Name = "miLimitFramerate"; - this.miLimitFramerate.Size = new System.Drawing.Size(202, 22); + this.miLimitFramerate.Size = new System.Drawing.Size(181, 22); this.miLimitFramerate.Text = "Clock Throttle"; this.miLimitFramerate.DropDownOpened += new System.EventHandler(this.miLimitFramerate_DropDownOpened); this.miLimitFramerate.Click += new System.EventHandler(this.miLimitFramerate_Click); @@ -1542,161 +1542,161 @@ // audioThrottleToolStripMenuItem // this.audioThrottleToolStripMenuItem.Name = "audioThrottleToolStripMenuItem"; - this.audioThrottleToolStripMenuItem.Size = new System.Drawing.Size(202, 22); + this.audioThrottleToolStripMenuItem.Size = new System.Drawing.Size(181, 22); this.audioThrottleToolStripMenuItem.Text = "Audio Throttle"; this.audioThrottleToolStripMenuItem.Click += new System.EventHandler(this.audioThrottleToolStripMenuItem_Click); // // miDisplayVsync // this.miDisplayVsync.Name = "miDisplayVsync"; - this.miDisplayVsync.Size = new System.Drawing.Size(202, 22); + this.miDisplayVsync.Size = new System.Drawing.Size(181, 22); this.miDisplayVsync.Text = "VSync Throttle"; this.miDisplayVsync.Click += new System.EventHandler(this.miDisplayVsync_Click); // // toolStripSeparator27 // this.toolStripSeparator27.Name = "toolStripSeparator27"; - this.toolStripSeparator27.Size = new System.Drawing.Size(199, 6); + this.toolStripSeparator27.Size = new System.Drawing.Size(178, 6); // // vSyncEnabledToolStripMenuItem // this.vSyncEnabledToolStripMenuItem.Name = "vSyncEnabledToolStripMenuItem"; - this.vSyncEnabledToolStripMenuItem.Size = new System.Drawing.Size(202, 22); + this.vSyncEnabledToolStripMenuItem.Size = new System.Drawing.Size(181, 22); this.vSyncEnabledToolStripMenuItem.Text = "VSync Enabled"; this.vSyncEnabledToolStripMenuItem.Click += new System.EventHandler(this.vSyncEnabledToolStripMenuItem_Click); // // toolStripMenuItem3 // this.toolStripMenuItem3.Name = "toolStripMenuItem3"; - this.toolStripMenuItem3.Size = new System.Drawing.Size(199, 6); + this.toolStripMenuItem3.Size = new System.Drawing.Size(178, 6); // // miAutoMinimizeSkipping // this.miAutoMinimizeSkipping.Name = "miAutoMinimizeSkipping"; - this.miAutoMinimizeSkipping.Size = new System.Drawing.Size(202, 22); + this.miAutoMinimizeSkipping.Size = new System.Drawing.Size(181, 22); this.miAutoMinimizeSkipping.Text = "Auto-minimize skipping"; this.miAutoMinimizeSkipping.Click += new System.EventHandler(this.miAutoMinimizeSkipping_Click); // // miFrameskip0 // this.miFrameskip0.Name = "miFrameskip0"; - this.miFrameskip0.Size = new System.Drawing.Size(202, 22); + this.miFrameskip0.Size = new System.Drawing.Size(181, 22); this.miFrameskip0.Text = "0 (never skip)"; this.miFrameskip0.Click += new System.EventHandler(this.miFrameskip0_Click); // // miFrameskip1 // this.miFrameskip1.Name = "miFrameskip1"; - this.miFrameskip1.Size = new System.Drawing.Size(202, 22); + this.miFrameskip1.Size = new System.Drawing.Size(181, 22); this.miFrameskip1.Text = "1"; this.miFrameskip1.Click += new System.EventHandler(this.miFrameskip1_Click); // // miFrameskip2 // this.miFrameskip2.Name = "miFrameskip2"; - this.miFrameskip2.Size = new System.Drawing.Size(202, 22); + this.miFrameskip2.Size = new System.Drawing.Size(181, 22); this.miFrameskip2.Text = "2"; this.miFrameskip2.Click += new System.EventHandler(this.miFrameskip2_Click); // // miFrameskip3 // this.miFrameskip3.Name = "miFrameskip3"; - this.miFrameskip3.Size = new System.Drawing.Size(202, 22); + this.miFrameskip3.Size = new System.Drawing.Size(181, 22); this.miFrameskip3.Text = "3"; this.miFrameskip3.Click += new System.EventHandler(this.miFrameskip3_Click); // // miFrameskip4 // this.miFrameskip4.Name = "miFrameskip4"; - this.miFrameskip4.Size = new System.Drawing.Size(202, 22); + this.miFrameskip4.Size = new System.Drawing.Size(181, 22); this.miFrameskip4.Text = "4"; this.miFrameskip4.Click += new System.EventHandler(this.miFrameskip4_Click); // // miFrameskip5 // this.miFrameskip5.Name = "miFrameskip5"; - this.miFrameskip5.Size = new System.Drawing.Size(202, 22); + this.miFrameskip5.Size = new System.Drawing.Size(181, 22); this.miFrameskip5.Text = "5"; this.miFrameskip5.Click += new System.EventHandler(this.miFrameskip5_Click); // // miFrameskip6 // this.miFrameskip6.Name = "miFrameskip6"; - this.miFrameskip6.Size = new System.Drawing.Size(202, 22); + this.miFrameskip6.Size = new System.Drawing.Size(181, 22); this.miFrameskip6.Text = "6"; this.miFrameskip6.Click += new System.EventHandler(this.miFrameskip6_Click); // // miFrameskip7 // this.miFrameskip7.Name = "miFrameskip7"; - this.miFrameskip7.Size = new System.Drawing.Size(202, 22); + this.miFrameskip7.Size = new System.Drawing.Size(181, 22); this.miFrameskip7.Text = "7"; this.miFrameskip7.Click += new System.EventHandler(this.miFrameskip7_Click); // // miFrameskip8 // this.miFrameskip8.Name = "miFrameskip8"; - this.miFrameskip8.Size = new System.Drawing.Size(202, 22); + this.miFrameskip8.Size = new System.Drawing.Size(181, 22); this.miFrameskip8.Text = "8"; this.miFrameskip8.Click += new System.EventHandler(this.miFrameskip8_Click); // // miFrameskip9 // this.miFrameskip9.Name = "miFrameskip9"; - this.miFrameskip9.Size = new System.Drawing.Size(202, 22); + this.miFrameskip9.Size = new System.Drawing.Size(181, 22); this.miFrameskip9.Text = "9"; this.miFrameskip9.Click += new System.EventHandler(this.miFrameskip9_Click); // // toolStripMenuItem5 // this.toolStripMenuItem5.Name = "toolStripMenuItem5"; - this.toolStripMenuItem5.Size = new System.Drawing.Size(199, 6); + this.toolStripMenuItem5.Size = new System.Drawing.Size(178, 6); // // miSpeed50 // this.miSpeed50.Name = "miSpeed50"; - this.miSpeed50.Size = new System.Drawing.Size(202, 22); + this.miSpeed50.Size = new System.Drawing.Size(181, 22); this.miSpeed50.Text = "Speed 50%"; this.miSpeed50.Click += new System.EventHandler(this.miSpeed50_Click); // // miSpeed75 // this.miSpeed75.Name = "miSpeed75"; - this.miSpeed75.Size = new System.Drawing.Size(202, 22); + this.miSpeed75.Size = new System.Drawing.Size(181, 22); this.miSpeed75.Text = "Speed 75%"; this.miSpeed75.Click += new System.EventHandler(this.miSpeed75_Click); // // miSpeed100 // this.miSpeed100.Name = "miSpeed100"; - this.miSpeed100.Size = new System.Drawing.Size(202, 22); + this.miSpeed100.Size = new System.Drawing.Size(181, 22); this.miSpeed100.Text = "Speed 100%"; this.miSpeed100.Click += new System.EventHandler(this.miSpeed100_Click); // // miSpeed150 // this.miSpeed150.Name = "miSpeed150"; - this.miSpeed150.Size = new System.Drawing.Size(202, 22); + this.miSpeed150.Size = new System.Drawing.Size(181, 22); this.miSpeed150.Text = "Speed 150%"; this.miSpeed150.Click += new System.EventHandler(this.miSpeed150_Click); // // miSpeed200 // this.miSpeed200.Name = "miSpeed200"; - this.miSpeed200.Size = new System.Drawing.Size(202, 22); + this.miSpeed200.Size = new System.Drawing.Size(181, 22); this.miSpeed200.Text = "Speed 200%"; this.miSpeed200.Click += new System.EventHandler(this.miSpeed200_Click); // // toolStripSeparator10 // this.toolStripSeparator10.Name = "toolStripSeparator10"; - this.toolStripSeparator10.Size = new System.Drawing.Size(138, 6); + this.toolStripSeparator10.Size = new System.Drawing.Size(135, 6); // // saveConfigToolStripMenuItem // this.saveConfigToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Save; this.saveConfigToolStripMenuItem.Name = "saveConfigToolStripMenuItem"; - this.saveConfigToolStripMenuItem.Size = new System.Drawing.Size(141, 22); + this.saveConfigToolStripMenuItem.Size = new System.Drawing.Size(138, 22); this.saveConfigToolStripMenuItem.Text = "Save Config"; this.saveConfigToolStripMenuItem.Click += new System.EventHandler(this.saveConfigToolStripMenuItem_Click); // @@ -1704,7 +1704,7 @@ // this.loadConfigToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.LoadConfig; this.loadConfigToolStripMenuItem.Name = "loadConfigToolStripMenuItem"; - this.loadConfigToolStripMenuItem.Size = new System.Drawing.Size(141, 22); + this.loadConfigToolStripMenuItem.Size = new System.Drawing.Size(138, 22); this.loadConfigToolStripMenuItem.Text = "Load Config"; this.loadConfigToolStripMenuItem.Click += new System.EventHandler(this.loadConfigToolStripMenuItem_Click); // @@ -1724,7 +1724,7 @@ this.luaConsoleToolStripMenuItem, this.cheatsToolStripMenuItem}); this.toolsToolStripMenuItem.Name = "toolsToolStripMenuItem"; - this.toolsToolStripMenuItem.Size = new System.Drawing.Size(48, 19); + this.toolsToolStripMenuItem.Size = new System.Drawing.Size(44, 17); this.toolsToolStripMenuItem.Text = "&Tools"; this.toolsToolStripMenuItem.DropDownOpened += new System.EventHandler(this.toolsToolStripMenuItem_DropDownOpened); // @@ -1732,20 +1732,20 @@ // this.toolBoxToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.ToolBox; this.toolBoxToolStripMenuItem.Name = "toolBoxToolStripMenuItem"; - this.toolBoxToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.toolBoxToolStripMenuItem.Size = new System.Drawing.Size(137, 22); this.toolBoxToolStripMenuItem.Text = "&Tool Box"; this.toolBoxToolStripMenuItem.Click += new System.EventHandler(this.toolBoxToolStripMenuItem_Click); // // toolStripSeparator12 // this.toolStripSeparator12.Name = "toolStripSeparator12"; - this.toolStripSeparator12.Size = new System.Drawing.Size(140, 6); + this.toolStripSeparator12.Size = new System.Drawing.Size(134, 6); // // rAMWatchToolStripMenuItem // this.rAMWatchToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.FindHS; this.rAMWatchToolStripMenuItem.Name = "rAMWatchToolStripMenuItem"; - this.rAMWatchToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.rAMWatchToolStripMenuItem.Size = new System.Drawing.Size(137, 22); this.rAMWatchToolStripMenuItem.Text = "RAM &Watch"; this.rAMWatchToolStripMenuItem.Click += new System.EventHandler(this.RAMWatchToolStripMenuItem_Click); // @@ -1753,7 +1753,7 @@ // this.rAMSearchToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.search; this.rAMSearchToolStripMenuItem.Name = "rAMSearchToolStripMenuItem"; - this.rAMSearchToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.rAMSearchToolStripMenuItem.Size = new System.Drawing.Size(137, 22); this.rAMSearchToolStripMenuItem.Text = "RAM &Search"; this.rAMSearchToolStripMenuItem.Click += new System.EventHandler(this.rAMSearchToolStripMenuItem_Click); // @@ -1761,7 +1761,7 @@ // this.rAMPokeToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.poke; this.rAMPokeToolStripMenuItem.Name = "rAMPokeToolStripMenuItem"; - this.rAMPokeToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.rAMPokeToolStripMenuItem.Size = new System.Drawing.Size(137, 22); this.rAMPokeToolStripMenuItem.Text = "RAM &Poke"; this.rAMPokeToolStripMenuItem.Click += new System.EventHandler(this.RAMPokeToolStripMenuItem_Click); // @@ -1769,7 +1769,7 @@ // this.hexEditorToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.poke; this.hexEditorToolStripMenuItem.Name = "hexEditorToolStripMenuItem"; - this.hexEditorToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.hexEditorToolStripMenuItem.Size = new System.Drawing.Size(137, 22); this.hexEditorToolStripMenuItem.Text = "&Hex Editor"; this.hexEditorToolStripMenuItem.Click += new System.EventHandler(this.hexEditorToolStripMenuItem_Click); // @@ -1777,7 +1777,7 @@ // this.traceLoggerToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.pencil; this.traceLoggerToolStripMenuItem.Name = "traceLoggerToolStripMenuItem"; - this.traceLoggerToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.traceLoggerToolStripMenuItem.Size = new System.Drawing.Size(137, 22); this.traceLoggerToolStripMenuItem.Text = "Trace &Logger"; this.traceLoggerToolStripMenuItem.Click += new System.EventHandler(this.traceLoggerToolStripMenuItem_Click); // @@ -1785,7 +1785,7 @@ // this.tAStudioToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.TAStudio; this.tAStudioToolStripMenuItem.Name = "tAStudioToolStripMenuItem"; - this.tAStudioToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.tAStudioToolStripMenuItem.Size = new System.Drawing.Size(137, 22); this.tAStudioToolStripMenuItem.Text = "&TAStudio"; this.tAStudioToolStripMenuItem.Click += new System.EventHandler(this.tAStudioToolStripMenuItem_Click); // @@ -1793,20 +1793,20 @@ // this.virtualPadToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.GameController; this.virtualPadToolStripMenuItem.Name = "virtualPadToolStripMenuItem"; - this.virtualPadToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.virtualPadToolStripMenuItem.Size = new System.Drawing.Size(137, 22); this.virtualPadToolStripMenuItem.Text = "Virtual Pad"; this.virtualPadToolStripMenuItem.Click += new System.EventHandler(this.virtualPadToolStripMenuItem_Click); // // toolStripSeparator11 // this.toolStripSeparator11.Name = "toolStripSeparator11"; - this.toolStripSeparator11.Size = new System.Drawing.Size(140, 6); + this.toolStripSeparator11.Size = new System.Drawing.Size(134, 6); // // luaConsoleToolStripMenuItem // this.luaConsoleToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Lua; this.luaConsoleToolStripMenuItem.Name = "luaConsoleToolStripMenuItem"; - this.luaConsoleToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.luaConsoleToolStripMenuItem.Size = new System.Drawing.Size(137, 22); this.luaConsoleToolStripMenuItem.Text = "Lua Console"; this.luaConsoleToolStripMenuItem.Click += new System.EventHandler(this.luaConsoleToolStripMenuItem_Click); // @@ -1814,7 +1814,7 @@ // this.cheatsToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Freeze; this.cheatsToolStripMenuItem.Name = "cheatsToolStripMenuItem"; - this.cheatsToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.cheatsToolStripMenuItem.Size = new System.Drawing.Size(137, 22); this.cheatsToolStripMenuItem.Text = "Cheats"; this.cheatsToolStripMenuItem.Click += new System.EventHandler(this.cheatsToolStripMenuItem_Click); // @@ -1830,61 +1830,61 @@ this.soundChannelsToolStripMenuItem, this.nESSpeicalToolStripMenuItem}); this.NESToolStripMenuItem.Name = "NESToolStripMenuItem"; - this.NESToolStripMenuItem.Size = new System.Drawing.Size(40, 19); + this.NESToolStripMenuItem.Size = new System.Drawing.Size(38, 17); this.NESToolStripMenuItem.Text = "&NES"; // // debuggerToolStripMenuItem // this.debuggerToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Bug; this.debuggerToolStripMenuItem.Name = "debuggerToolStripMenuItem"; - this.debuggerToolStripMenuItem.Size = new System.Drawing.Size(233, 22); + this.debuggerToolStripMenuItem.Size = new System.Drawing.Size(217, 22); this.debuggerToolStripMenuItem.Text = "&Debugger"; this.debuggerToolStripMenuItem.Click += new System.EventHandler(this.debuggerToolStripMenuItem_Click); // // pPUViewerToolStripMenuItem // this.pPUViewerToolStripMenuItem.Name = "pPUViewerToolStripMenuItem"; - this.pPUViewerToolStripMenuItem.Size = new System.Drawing.Size(233, 22); + this.pPUViewerToolStripMenuItem.Size = new System.Drawing.Size(217, 22); this.pPUViewerToolStripMenuItem.Text = "&PPU Viewer"; this.pPUViewerToolStripMenuItem.Click += new System.EventHandler(this.PPUViewerToolStripMenuItem_Click); // // nametableViewerToolStripMenuItem // this.nametableViewerToolStripMenuItem.Name = "nametableViewerToolStripMenuItem"; - this.nametableViewerToolStripMenuItem.Size = new System.Drawing.Size(233, 22); + this.nametableViewerToolStripMenuItem.Size = new System.Drawing.Size(217, 22); this.nametableViewerToolStripMenuItem.Text = "&Nametable Viewer"; this.nametableViewerToolStripMenuItem.Click += new System.EventHandler(this.nametableViewerToolStripMenuItem_Click); // // gameGenieCodesToolStripMenuItem // this.gameGenieCodesToolStripMenuItem.Name = "gameGenieCodesToolStripMenuItem"; - this.gameGenieCodesToolStripMenuItem.Size = new System.Drawing.Size(233, 22); + this.gameGenieCodesToolStripMenuItem.Size = new System.Drawing.Size(217, 22); this.gameGenieCodesToolStripMenuItem.Text = "&Game Genie Encoder/Decoder"; this.gameGenieCodesToolStripMenuItem.Click += new System.EventHandler(this.gameGenieCodesToolStripMenuItem_Click); // // toolStripSeparator17 // this.toolStripSeparator17.Name = "toolStripSeparator17"; - this.toolStripSeparator17.Size = new System.Drawing.Size(230, 6); + this.toolStripSeparator17.Size = new System.Drawing.Size(214, 6); // // graphicsSettingsToolStripMenuItem // this.graphicsSettingsToolStripMenuItem.Name = "graphicsSettingsToolStripMenuItem"; - this.graphicsSettingsToolStripMenuItem.Size = new System.Drawing.Size(233, 22); + this.graphicsSettingsToolStripMenuItem.Size = new System.Drawing.Size(217, 22); this.graphicsSettingsToolStripMenuItem.Text = "Graphics Settings"; this.graphicsSettingsToolStripMenuItem.Click += new System.EventHandler(this.graphicsSettingsToolStripMenuItem_Click); // // soundChannelsToolStripMenuItem // this.soundChannelsToolStripMenuItem.Name = "soundChannelsToolStripMenuItem"; - this.soundChannelsToolStripMenuItem.Size = new System.Drawing.Size(233, 22); + this.soundChannelsToolStripMenuItem.Size = new System.Drawing.Size(217, 22); this.soundChannelsToolStripMenuItem.Text = "Sound Channels"; this.soundChannelsToolStripMenuItem.Click += new System.EventHandler(this.soundChannelsToolStripMenuItem_Click); // // nESSpeicalToolStripMenuItem // this.nESSpeicalToolStripMenuItem.Name = "nESSpeicalToolStripMenuItem"; - this.nESSpeicalToolStripMenuItem.Size = new System.Drawing.Size(233, 22); + this.nESSpeicalToolStripMenuItem.Size = new System.Drawing.Size(217, 22); this.nESSpeicalToolStripMenuItem.Text = "Special Controls"; // // pCEToolStripMenuItem @@ -1897,47 +1897,47 @@ this.pceArcadeCardRewindEnableHackToolStripMenuItem, this.pceGraphicsSettingsToolStripMenuItem}); this.pCEToolStripMenuItem.Name = "pCEToolStripMenuItem"; - this.pCEToolStripMenuItem.Size = new System.Drawing.Size(40, 19); + this.pCEToolStripMenuItem.Size = new System.Drawing.Size(38, 17); this.pCEToolStripMenuItem.Text = "&PCE"; this.pCEToolStripMenuItem.DropDownOpened += new System.EventHandler(this.pCEToolStripMenuItem_DropDownOpened); // // pceBGViewerToolStripMenuItem // this.pceBGViewerToolStripMenuItem.Name = "pceBGViewerToolStripMenuItem"; - this.pceBGViewerToolStripMenuItem.Size = new System.Drawing.Size(259, 22); + this.pceBGViewerToolStripMenuItem.Size = new System.Drawing.Size(240, 22); this.pceBGViewerToolStripMenuItem.Text = "&BG Viewer"; this.pceBGViewerToolStripMenuItem.Click += new System.EventHandler(this.justatestToolStripMenuItem_Click); // // toolStripSeparator25 // this.toolStripSeparator25.Name = "toolStripSeparator25"; - this.toolStripSeparator25.Size = new System.Drawing.Size(256, 6); + this.toolStripSeparator25.Size = new System.Drawing.Size(237, 6); // // pceAlwaysPerformSpriteLimitToolStripMenuItem // this.pceAlwaysPerformSpriteLimitToolStripMenuItem.Name = "pceAlwaysPerformSpriteLimitToolStripMenuItem"; - this.pceAlwaysPerformSpriteLimitToolStripMenuItem.Size = new System.Drawing.Size(259, 22); + this.pceAlwaysPerformSpriteLimitToolStripMenuItem.Size = new System.Drawing.Size(240, 22); this.pceAlwaysPerformSpriteLimitToolStripMenuItem.Text = "Always Perform Sprite Limit"; this.pceAlwaysPerformSpriteLimitToolStripMenuItem.Click += new System.EventHandler(this.pceAlwaysPerformSpriteLimitToolStripMenuItem_Click); // // pceAlwaysEqualizeVolumesToolStripMenuItem // this.pceAlwaysEqualizeVolumesToolStripMenuItem.Name = "pceAlwaysEqualizeVolumesToolStripMenuItem"; - this.pceAlwaysEqualizeVolumesToolStripMenuItem.Size = new System.Drawing.Size(259, 22); + this.pceAlwaysEqualizeVolumesToolStripMenuItem.Size = new System.Drawing.Size(240, 22); this.pceAlwaysEqualizeVolumesToolStripMenuItem.Text = "Always Equalize Volumes (PCE-CD)"; this.pceAlwaysEqualizeVolumesToolStripMenuItem.Click += new System.EventHandler(this.pceAlwayEqualizeVolumesLimitToolStripMenuItem_Click); // // pceArcadeCardRewindEnableHackToolStripMenuItem // this.pceArcadeCardRewindEnableHackToolStripMenuItem.Name = "pceArcadeCardRewindEnableHackToolStripMenuItem"; - this.pceArcadeCardRewindEnableHackToolStripMenuItem.Size = new System.Drawing.Size(259, 22); + this.pceArcadeCardRewindEnableHackToolStripMenuItem.Size = new System.Drawing.Size(240, 22); this.pceArcadeCardRewindEnableHackToolStripMenuItem.Text = "Arcade Card Rewind-Enable Hack"; this.pceArcadeCardRewindEnableHackToolStripMenuItem.Click += new System.EventHandler(this.pceArcadeCardRewindEnableHackToolStripMenuItem_Click); // // pceGraphicsSettingsToolStripMenuItem // this.pceGraphicsSettingsToolStripMenuItem.Name = "pceGraphicsSettingsToolStripMenuItem"; - this.pceGraphicsSettingsToolStripMenuItem.Size = new System.Drawing.Size(259, 22); + this.pceGraphicsSettingsToolStripMenuItem.Size = new System.Drawing.Size(240, 22); this.pceGraphicsSettingsToolStripMenuItem.Text = "Graphics Settings"; this.pceGraphicsSettingsToolStripMenuItem.Click += new System.EventHandler(this.pceGraphicsSettingsToolStripMenuItem_Click); // @@ -1953,61 +1953,61 @@ this.toolStripSeparator24, this.smsGraphicsSettingsToolStripMenuItem}); this.sMSToolStripMenuItem.Name = "sMSToolStripMenuItem"; - this.sMSToolStripMenuItem.Size = new System.Drawing.Size(42, 19); + this.sMSToolStripMenuItem.Size = new System.Drawing.Size(39, 17); this.sMSToolStripMenuItem.Text = "&SMS"; this.sMSToolStripMenuItem.DropDownOpened += new System.EventHandler(this.sMSToolStripMenuItem_DropDownOpened); // // smsEnableFMChipToolStripMenuItem // this.smsEnableFMChipToolStripMenuItem.Name = "smsEnableFMChipToolStripMenuItem"; - this.smsEnableFMChipToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.smsEnableFMChipToolStripMenuItem.Size = new System.Drawing.Size(221, 22); this.smsEnableFMChipToolStripMenuItem.Text = "&Enable FM Chip"; this.smsEnableFMChipToolStripMenuItem.Click += new System.EventHandler(this.smsEnableFMChipToolStripMenuItem_Click); // // smsOverclockWhenKnownSafeToolStripMenuItem // this.smsOverclockWhenKnownSafeToolStripMenuItem.Name = "smsOverclockWhenKnownSafeToolStripMenuItem"; - this.smsOverclockWhenKnownSafeToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.smsOverclockWhenKnownSafeToolStripMenuItem.Size = new System.Drawing.Size(221, 22); this.smsOverclockWhenKnownSafeToolStripMenuItem.Text = "&Overclock when Known Safe"; this.smsOverclockWhenKnownSafeToolStripMenuItem.Click += new System.EventHandler(this.smsOverclockWhenKnownSafeToolStripMenuItem_Click); // // smsForceStereoSeparationToolStripMenuItem // this.smsForceStereoSeparationToolStripMenuItem.Name = "smsForceStereoSeparationToolStripMenuItem"; - this.smsForceStereoSeparationToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.smsForceStereoSeparationToolStripMenuItem.Size = new System.Drawing.Size(221, 22); this.smsForceStereoSeparationToolStripMenuItem.Text = "&Force Stereo Separation"; this.smsForceStereoSeparationToolStripMenuItem.Click += new System.EventHandler(this.smsForceStereoSeparationToolStripMenuItem_Click); // // smsSpriteLimitToolStripMenuItem // this.smsSpriteLimitToolStripMenuItem.Name = "smsSpriteLimitToolStripMenuItem"; - this.smsSpriteLimitToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.smsSpriteLimitToolStripMenuItem.Size = new System.Drawing.Size(221, 22); this.smsSpriteLimitToolStripMenuItem.Text = "Sprite &Limit"; this.smsSpriteLimitToolStripMenuItem.Click += new System.EventHandler(this.smsSpriteLimitToolStripMenuItem_Click); // // showClippedRegionsToolStripMenuItem // this.showClippedRegionsToolStripMenuItem.Name = "showClippedRegionsToolStripMenuItem"; - this.showClippedRegionsToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.showClippedRegionsToolStripMenuItem.Size = new System.Drawing.Size(221, 22); this.showClippedRegionsToolStripMenuItem.Text = "&Show Clipped Regions"; this.showClippedRegionsToolStripMenuItem.Click += new System.EventHandler(this.showClippedRegionsToolStripMenuItem_Click); // // highlightActiveDisplayRegionToolStripMenuItem // this.highlightActiveDisplayRegionToolStripMenuItem.Name = "highlightActiveDisplayRegionToolStripMenuItem"; - this.highlightActiveDisplayRegionToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.highlightActiveDisplayRegionToolStripMenuItem.Size = new System.Drawing.Size(221, 22); this.highlightActiveDisplayRegionToolStripMenuItem.Text = "&Highlight Active Display Region"; this.highlightActiveDisplayRegionToolStripMenuItem.Click += new System.EventHandler(this.highlightActiveDisplayRegionToolStripMenuItem_Click); // // toolStripSeparator24 // this.toolStripSeparator24.Name = "toolStripSeparator24"; - this.toolStripSeparator24.Size = new System.Drawing.Size(238, 6); + this.toolStripSeparator24.Size = new System.Drawing.Size(218, 6); // // smsGraphicsSettingsToolStripMenuItem // this.smsGraphicsSettingsToolStripMenuItem.Name = "smsGraphicsSettingsToolStripMenuItem"; - this.smsGraphicsSettingsToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.smsGraphicsSettingsToolStripMenuItem.Size = new System.Drawing.Size(221, 22); this.smsGraphicsSettingsToolStripMenuItem.Text = "&Graphics Settings..."; this.smsGraphicsSettingsToolStripMenuItem.Click += new System.EventHandler(this.smsGraphicsSettingsToolStripMenuItem_Click); // @@ -2018,7 +2018,7 @@ this.toolStripSeparator13, this.autoloadVirtualKeyboardToolStripMenuItem}); this.tI83ToolStripMenuItem.Name = "tI83ToolStripMenuItem"; - this.tI83ToolStripMenuItem.Size = new System.Drawing.Size(41, 19); + this.tI83ToolStripMenuItem.Size = new System.Drawing.Size(41, 17); this.tI83ToolStripMenuItem.Text = "TI83"; this.tI83ToolStripMenuItem.DropDownOpened += new System.EventHandler(this.tI83ToolStripMenuItem_DropDownOpened); // @@ -2026,21 +2026,21 @@ // this.keypadToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.calculator; this.keypadToolStripMenuItem.Name = "keypadToolStripMenuItem"; - this.keypadToolStripMenuItem.Size = new System.Drawing.Size(165, 22); + this.keypadToolStripMenuItem.Size = new System.Drawing.Size(156, 22); this.keypadToolStripMenuItem.Text = "Keypad"; this.keypadToolStripMenuItem.Click += new System.EventHandler(this.keypadToolStripMenuItem_Click); // // toolStripSeparator13 // this.toolStripSeparator13.Name = "toolStripSeparator13"; - this.toolStripSeparator13.Size = new System.Drawing.Size(162, 6); + this.toolStripSeparator13.Size = new System.Drawing.Size(153, 6); // // autoloadVirtualKeyboardToolStripMenuItem // this.autoloadVirtualKeyboardToolStripMenuItem.Checked = true; this.autoloadVirtualKeyboardToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked; this.autoloadVirtualKeyboardToolStripMenuItem.Name = "autoloadVirtualKeyboardToolStripMenuItem"; - this.autoloadVirtualKeyboardToolStripMenuItem.Size = new System.Drawing.Size(165, 22); + this.autoloadVirtualKeyboardToolStripMenuItem.Size = new System.Drawing.Size(156, 22); this.autoloadVirtualKeyboardToolStripMenuItem.Text = "Autoload Keypad"; this.autoloadVirtualKeyboardToolStripMenuItem.Click += new System.EventHandler(this.autoloadVirtualKeyboardToolStripMenuItem_Click); // @@ -2059,82 +2059,82 @@ this.showMissle2ToolStripMenuItem, this.showBallToolStripMenuItem}); this.atariToolStripMenuItem.Name = "atariToolStripMenuItem"; - this.atariToolStripMenuItem.Size = new System.Drawing.Size(44, 19); + this.atariToolStripMenuItem.Size = new System.Drawing.Size(42, 17); this.atariToolStripMenuItem.Text = "&Atari"; this.atariToolStripMenuItem.DropDownOpened += new System.EventHandler(this.atariToolStripMenuItem_DropDownOpened); // // bWToolStripMenuItem // this.bWToolStripMenuItem.Name = "bWToolStripMenuItem"; - this.bWToolStripMenuItem.Size = new System.Drawing.Size(153, 22); + this.bWToolStripMenuItem.Size = new System.Drawing.Size(144, 22); this.bWToolStripMenuItem.Text = "B-W TV"; this.bWToolStripMenuItem.Click += new System.EventHandler(this.bWToolStripMenuItem_Click); // // p0DifficultyToolStripMenuItem // this.p0DifficultyToolStripMenuItem.Name = "p0DifficultyToolStripMenuItem"; - this.p0DifficultyToolStripMenuItem.Size = new System.Drawing.Size(153, 22); + this.p0DifficultyToolStripMenuItem.Size = new System.Drawing.Size(144, 22); this.p0DifficultyToolStripMenuItem.Text = "Left Difficulty"; this.p0DifficultyToolStripMenuItem.Click += new System.EventHandler(this.p0DifficultyToolStripMenuItem_Click); // // rightDifficultyToolStripMenuItem // this.rightDifficultyToolStripMenuItem.Name = "rightDifficultyToolStripMenuItem"; - this.rightDifficultyToolStripMenuItem.Size = new System.Drawing.Size(153, 22); + this.rightDifficultyToolStripMenuItem.Size = new System.Drawing.Size(144, 22); this.rightDifficultyToolStripMenuItem.Text = "Right Difficulty"; this.rightDifficultyToolStripMenuItem.Click += new System.EventHandler(this.rightDifficultyToolStripMenuItem_Click); // // toolStripSeparator26 // this.toolStripSeparator26.Name = "toolStripSeparator26"; - this.toolStripSeparator26.Size = new System.Drawing.Size(150, 6); + this.toolStripSeparator26.Size = new System.Drawing.Size(141, 6); // // showBGToolStripMenuItem // this.showBGToolStripMenuItem.Name = "showBGToolStripMenuItem"; - this.showBGToolStripMenuItem.Size = new System.Drawing.Size(153, 22); + this.showBGToolStripMenuItem.Size = new System.Drawing.Size(144, 22); this.showBGToolStripMenuItem.Text = "Show BG"; this.showBGToolStripMenuItem.Click += new System.EventHandler(this.showBGToolStripMenuItem_Click); // // showPlayfieldToolStripMenuItem // this.showPlayfieldToolStripMenuItem.Name = "showPlayfieldToolStripMenuItem"; - this.showPlayfieldToolStripMenuItem.Size = new System.Drawing.Size(153, 22); + this.showPlayfieldToolStripMenuItem.Size = new System.Drawing.Size(144, 22); this.showPlayfieldToolStripMenuItem.Text = "Show Playfield"; this.showPlayfieldToolStripMenuItem.Click += new System.EventHandler(this.showPlayfieldToolStripMenuItem_Click); // // showPlayer1ToolStripMenuItem // this.showPlayer1ToolStripMenuItem.Name = "showPlayer1ToolStripMenuItem"; - this.showPlayer1ToolStripMenuItem.Size = new System.Drawing.Size(153, 22); + this.showPlayer1ToolStripMenuItem.Size = new System.Drawing.Size(144, 22); this.showPlayer1ToolStripMenuItem.Text = "Show Player 1"; this.showPlayer1ToolStripMenuItem.Click += new System.EventHandler(this.showPlayer1ToolStripMenuItem_Click); // // showPlayer2ToolStripMenuItem // this.showPlayer2ToolStripMenuItem.Name = "showPlayer2ToolStripMenuItem"; - this.showPlayer2ToolStripMenuItem.Size = new System.Drawing.Size(153, 22); + this.showPlayer2ToolStripMenuItem.Size = new System.Drawing.Size(144, 22); this.showPlayer2ToolStripMenuItem.Text = "Show Player 2"; this.showPlayer2ToolStripMenuItem.Click += new System.EventHandler(this.showPlayer2ToolStripMenuItem_Click); // // showMissle1ToolStripMenuItem // this.showMissle1ToolStripMenuItem.Name = "showMissle1ToolStripMenuItem"; - this.showMissle1ToolStripMenuItem.Size = new System.Drawing.Size(153, 22); + this.showMissle1ToolStripMenuItem.Size = new System.Drawing.Size(144, 22); this.showMissle1ToolStripMenuItem.Text = "Show Missle 1"; this.showMissle1ToolStripMenuItem.Click += new System.EventHandler(this.showMissle1ToolStripMenuItem_Click); // // showMissle2ToolStripMenuItem // this.showMissle2ToolStripMenuItem.Name = "showMissle2ToolStripMenuItem"; - this.showMissle2ToolStripMenuItem.Size = new System.Drawing.Size(153, 22); + this.showMissle2ToolStripMenuItem.Size = new System.Drawing.Size(144, 22); this.showMissle2ToolStripMenuItem.Text = "Show Missle 2"; this.showMissle2ToolStripMenuItem.Click += new System.EventHandler(this.showMissle2ToolStripMenuItem_Click); // // showBallToolStripMenuItem // this.showBallToolStripMenuItem.Name = "showBallToolStripMenuItem"; - this.showBallToolStripMenuItem.Size = new System.Drawing.Size(153, 22); + this.showBallToolStripMenuItem.Size = new System.Drawing.Size(144, 22); this.showBallToolStripMenuItem.Text = "Show Ball"; this.showBallToolStripMenuItem.Click += new System.EventHandler(this.showBallToolStripMenuItem_Click); // @@ -2150,54 +2150,59 @@ this.toolStripSeparator28, this.gPUViewerToolStripMenuItem}); this.gBToolStripMenuItem.Name = "gBToolStripMenuItem"; - this.gBToolStripMenuItem.Size = new System.Drawing.Size(34, 19); + this.gBToolStripMenuItem.Size = new System.Drawing.Size(32, 17); this.gBToolStripMenuItem.Text = "&GB"; this.gBToolStripMenuItem.DropDownOpened += new System.EventHandler(this.gBToolStripMenuItem_DropDownOpened); // // forceDMGModeToolStripMenuItem // this.forceDMGModeToolStripMenuItem.Name = "forceDMGModeToolStripMenuItem"; - this.forceDMGModeToolStripMenuItem.Size = new System.Drawing.Size(198, 22); + this.forceDMGModeToolStripMenuItem.Size = new System.Drawing.Size(179, 22); this.forceDMGModeToolStripMenuItem.Text = "Force DMG Mode"; this.forceDMGModeToolStripMenuItem.Click += new System.EventHandler(this.forceDMGModeToolStripMenuItem_Click); // // gBAInCGBModeToolStripMenuItem // this.gBAInCGBModeToolStripMenuItem.Name = "gBAInCGBModeToolStripMenuItem"; - this.gBAInCGBModeToolStripMenuItem.Size = new System.Drawing.Size(198, 22); + this.gBAInCGBModeToolStripMenuItem.Size = new System.Drawing.Size(179, 22); this.gBAInCGBModeToolStripMenuItem.Text = "GBA in CGB mode"; this.gBAInCGBModeToolStripMenuItem.Click += new System.EventHandler(this.gBAInCGBModeToolStripMenuItem_Click); // // multicartCompatibilityToolStripMenuItem // this.multicartCompatibilityToolStripMenuItem.Name = "multicartCompatibilityToolStripMenuItem"; - this.multicartCompatibilityToolStripMenuItem.Size = new System.Drawing.Size(198, 22); + this.multicartCompatibilityToolStripMenuItem.Size = new System.Drawing.Size(179, 22); this.multicartCompatibilityToolStripMenuItem.Text = "Multicart Compatibility"; this.multicartCompatibilityToolStripMenuItem.Click += new System.EventHandler(this.multicartCompatibilityToolStripMenuItem_Click); // // toolStripSeparator8 // this.toolStripSeparator8.Name = "toolStripSeparator8"; - this.toolStripSeparator8.Size = new System.Drawing.Size(195, 6); + this.toolStripSeparator8.Size = new System.Drawing.Size(176, 6); // // changeDMGPalettesToolStripMenuItem // this.changeDMGPalettesToolStripMenuItem.Name = "changeDMGPalettesToolStripMenuItem"; - this.changeDMGPalettesToolStripMenuItem.Size = new System.Drawing.Size(198, 22); - this.changeDMGPalettesToolStripMenuItem.Text = "Change DMG Palettes..."; + this.changeDMGPalettesToolStripMenuItem.Size = new System.Drawing.Size(179, 22); + this.changeDMGPalettesToolStripMenuItem.Text = "Change Palettes..."; this.changeDMGPalettesToolStripMenuItem.Click += new System.EventHandler(this.changeDMGPalettesToolStripMenuItem_Click); // // loadGBInSGBToolStripMenuItem1 // this.loadGBInSGBToolStripMenuItem1.Name = "loadGBInSGBToolStripMenuItem1"; - this.loadGBInSGBToolStripMenuItem1.Size = new System.Drawing.Size(198, 22); + this.loadGBInSGBToolStripMenuItem1.Size = new System.Drawing.Size(179, 22); this.loadGBInSGBToolStripMenuItem1.Text = "Load GB in SGB"; this.loadGBInSGBToolStripMenuItem1.Click += new System.EventHandler(this.loadGBInSGBToolStripMenuItem1_Click); // + // toolStripSeparator28 + // + this.toolStripSeparator28.Name = "toolStripSeparator28"; + this.toolStripSeparator28.Size = new System.Drawing.Size(176, 6); + // // gPUViewerToolStripMenuItem // this.gPUViewerToolStripMenuItem.Name = "gPUViewerToolStripMenuItem"; - this.gPUViewerToolStripMenuItem.Size = new System.Drawing.Size(198, 22); + this.gPUViewerToolStripMenuItem.Size = new System.Drawing.Size(179, 22); this.gPUViewerToolStripMenuItem.Text = "GPU Viewer"; this.gPUViewerToolStripMenuItem.Click += new System.EventHandler(this.gPUViewerToolStripMenuItem_Click); // @@ -2209,7 +2214,7 @@ this.graphicsDebuggerToolStripMenuItem, this.loadGBInSGBToolStripMenuItem}); this.sNESToolStripMenuItem.Name = "sNESToolStripMenuItem"; - this.sNESToolStripMenuItem.Size = new System.Drawing.Size(46, 19); + this.sNESToolStripMenuItem.Size = new System.Drawing.Size(44, 17); this.sNESToolStripMenuItem.Text = "&SNES"; this.sNESToolStripMenuItem.DropDownOpened += new System.EventHandler(this.sNESToolStripMenuItem_DropDownOpened); // @@ -2225,83 +2230,83 @@ this.oBJ2ToolStripMenuItem, this.oBJ3ToolStripMenuItem}); this.displayToolStripMenuItem.Name = "displayToolStripMenuItem"; - this.displayToolStripMenuItem.Size = new System.Drawing.Size(175, 22); + this.displayToolStripMenuItem.Size = new System.Drawing.Size(165, 22); this.displayToolStripMenuItem.Text = "Display"; this.displayToolStripMenuItem.DropDownOpened += new System.EventHandler(this.displayToolStripMenuItem_DropDownOpened); // // bG0ToolStripMenuItem // this.bG0ToolStripMenuItem.Name = "bG0ToolStripMenuItem"; - this.bG0ToolStripMenuItem.Size = new System.Drawing.Size(103, 22); + this.bG0ToolStripMenuItem.Size = new System.Drawing.Size(102, 22); this.bG0ToolStripMenuItem.Text = "BG 1"; this.bG0ToolStripMenuItem.Click += new System.EventHandler(this.bG1ToolStripMenuItem_Click); // // bG1ToolStripMenuItem // this.bG1ToolStripMenuItem.Name = "bG1ToolStripMenuItem"; - this.bG1ToolStripMenuItem.Size = new System.Drawing.Size(103, 22); + this.bG1ToolStripMenuItem.Size = new System.Drawing.Size(102, 22); this.bG1ToolStripMenuItem.Text = "BG 2"; this.bG1ToolStripMenuItem.Click += new System.EventHandler(this.bG1ToolStripMenuItem_Click_1); // // bG2ToolStripMenuItem // this.bG2ToolStripMenuItem.Name = "bG2ToolStripMenuItem"; - this.bG2ToolStripMenuItem.Size = new System.Drawing.Size(103, 22); + this.bG2ToolStripMenuItem.Size = new System.Drawing.Size(102, 22); this.bG2ToolStripMenuItem.Text = "BG 3"; this.bG2ToolStripMenuItem.Click += new System.EventHandler(this.bG2ToolStripMenuItem_Click); // // bG3ToolStripMenuItem // this.bG3ToolStripMenuItem.Name = "bG3ToolStripMenuItem"; - this.bG3ToolStripMenuItem.Size = new System.Drawing.Size(103, 22); + this.bG3ToolStripMenuItem.Size = new System.Drawing.Size(102, 22); this.bG3ToolStripMenuItem.Text = "BG 4"; this.bG3ToolStripMenuItem.Click += new System.EventHandler(this.bG3ToolStripMenuItem_Click); // // oBJ0ToolStripMenuItem // this.oBJ0ToolStripMenuItem.Name = "oBJ0ToolStripMenuItem"; - this.oBJ0ToolStripMenuItem.Size = new System.Drawing.Size(103, 22); + this.oBJ0ToolStripMenuItem.Size = new System.Drawing.Size(102, 22); this.oBJ0ToolStripMenuItem.Text = "OBJ 1"; this.oBJ0ToolStripMenuItem.Click += new System.EventHandler(this.oBJ0ToolStripMenuItem_Click); // // oBJ1ToolStripMenuItem // this.oBJ1ToolStripMenuItem.Name = "oBJ1ToolStripMenuItem"; - this.oBJ1ToolStripMenuItem.Size = new System.Drawing.Size(103, 22); + this.oBJ1ToolStripMenuItem.Size = new System.Drawing.Size(102, 22); this.oBJ1ToolStripMenuItem.Text = "OBJ 2"; this.oBJ1ToolStripMenuItem.Click += new System.EventHandler(this.oBJ1ToolStripMenuItem_Click); // // oBJ2ToolStripMenuItem // this.oBJ2ToolStripMenuItem.Name = "oBJ2ToolStripMenuItem"; - this.oBJ2ToolStripMenuItem.Size = new System.Drawing.Size(103, 22); + this.oBJ2ToolStripMenuItem.Size = new System.Drawing.Size(102, 22); this.oBJ2ToolStripMenuItem.Text = "OBJ 3"; this.oBJ2ToolStripMenuItem.Click += new System.EventHandler(this.oBJ2ToolStripMenuItem_Click); // // oBJ3ToolStripMenuItem // this.oBJ3ToolStripMenuItem.Name = "oBJ3ToolStripMenuItem"; - this.oBJ3ToolStripMenuItem.Size = new System.Drawing.Size(103, 22); + this.oBJ3ToolStripMenuItem.Size = new System.Drawing.Size(102, 22); this.oBJ3ToolStripMenuItem.Text = "OBJ 4"; this.oBJ3ToolStripMenuItem.Click += new System.EventHandler(this.oBJ3ToolStripMenuItem_Click); // // toolStripSeparator18 // this.toolStripSeparator18.Name = "toolStripSeparator18"; - this.toolStripSeparator18.Size = new System.Drawing.Size(172, 6); + this.toolStripSeparator18.Size = new System.Drawing.Size(162, 6); // // graphicsDebuggerToolStripMenuItem // this.graphicsDebuggerToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Bug; this.graphicsDebuggerToolStripMenuItem.Name = "graphicsDebuggerToolStripMenuItem"; - this.graphicsDebuggerToolStripMenuItem.Size = new System.Drawing.Size(175, 22); + this.graphicsDebuggerToolStripMenuItem.Size = new System.Drawing.Size(165, 22); this.graphicsDebuggerToolStripMenuItem.Text = "Graphics Debugger"; this.graphicsDebuggerToolStripMenuItem.Click += new System.EventHandler(this.graphicsDebuggerToolStripMenuItem_Click); // // loadGBInSGBToolStripMenuItem // this.loadGBInSGBToolStripMenuItem.Name = "loadGBInSGBToolStripMenuItem"; - this.loadGBInSGBToolStripMenuItem.Size = new System.Drawing.Size(175, 22); + this.loadGBInSGBToolStripMenuItem.Size = new System.Drawing.Size(165, 22); this.loadGBInSGBToolStripMenuItem.Text = "Load GB in SGB"; this.loadGBInSGBToolStripMenuItem.Click += new System.EventHandler(this.loadGBInSGBToolStripMenuItem_Click); // @@ -2312,14 +2317,14 @@ this.forumsToolStripMenuItem, this.aboutToolStripMenuItem}); this.helpToolStripMenuItem.Name = "helpToolStripMenuItem"; - this.helpToolStripMenuItem.Size = new System.Drawing.Size(44, 19); + this.helpToolStripMenuItem.Size = new System.Drawing.Size(40, 17); this.helpToolStripMenuItem.Text = "&Help"; // // helpToolStripMenuItem1 // this.helpToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.Help; this.helpToolStripMenuItem1.Name = "helpToolStripMenuItem1"; - this.helpToolStripMenuItem1.Size = new System.Drawing.Size(146, 22); + this.helpToolStripMenuItem1.Size = new System.Drawing.Size(140, 22); this.helpToolStripMenuItem1.Text = "&Online Help..."; this.helpToolStripMenuItem1.Click += new System.EventHandler(this.helpToolStripMenuItem1_Click); // @@ -2327,7 +2332,7 @@ // this.forumsToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.TAStudio; this.forumsToolStripMenuItem.Name = "forumsToolStripMenuItem"; - this.forumsToolStripMenuItem.Size = new System.Drawing.Size(146, 22); + this.forumsToolStripMenuItem.Size = new System.Drawing.Size(140, 22); this.forumsToolStripMenuItem.Text = "Forums..."; this.forumsToolStripMenuItem.Click += new System.EventHandler(this.forumsToolStripMenuItem_Click); // @@ -2335,7 +2340,7 @@ // this.aboutToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.CorpHawkSmall; this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem"; - this.aboutToolStripMenuItem.Size = new System.Drawing.Size(146, 22); + this.aboutToolStripMenuItem.Size = new System.Drawing.Size(140, 22); this.aboutToolStripMenuItem.Text = "&About"; this.aboutToolStripMenuItem.Click += new System.EventHandler(this.aboutToolStripMenuItem_Click); // @@ -2430,7 +2435,7 @@ // this.toolStripStatusLabel1.BackColor = System.Drawing.SystemColors.Control; this.toolStripStatusLabel1.Name = "toolStripStatusLabel1"; - this.toolStripStatusLabel1.Size = new System.Drawing.Size(58, 17); + this.toolStripStatusLabel1.Size = new System.Drawing.Size(56, 17); this.toolStripStatusLabel1.Text = "Save slots"; // // StatusSlot1 @@ -2682,11 +2687,6 @@ this.cmiShowMenu.Text = "Show Menu"; this.cmiShowMenu.Click += new System.EventHandler(this.showMenuToolStripMenuItem_Click); // - // toolStripSeparator28 - // - this.toolStripSeparator28.Name = "toolStripSeparator28"; - this.toolStripSeparator28.Size = new System.Drawing.Size(195, 6); - // // MainForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 14F); diff --git a/BizHawk.MultiClient/MainForm.MenuItems.cs b/BizHawk.MultiClient/MainForm.MenuItems.cs index 82f871269c..83eaa67309 100644 --- a/BizHawk.MultiClient/MainForm.MenuItems.cs +++ b/BizHawk.MultiClient/MainForm.MenuItems.cs @@ -1782,11 +1782,12 @@ namespace BizHawk.MultiClient private void gBToolStripMenuItem_DropDownOpened(object sender, EventArgs e) { // the palettes have no effect when CGB mode is active + /* if (Global.Emulator is Emulation.Consoles.GB.Gameboy) { changeDMGPalettesToolStripMenuItem.Enabled = !((Emulation.Consoles.GB.Gameboy)Global.Emulator).IsCGBMode(); - } + }*/ //skipBIOSIntroToolStripMenuItem.Checked = Global.Config.GameBoySkipBIOS; forceDMGModeToolStripMenuItem.Checked = Global.Config.GB_ForceDMG; diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs index 237b9bac1a..388ac8124b 100644 --- a/BizHawk.MultiClient/MainForm.cs +++ b/BizHawk.MultiClient/MainForm.cs @@ -1731,16 +1731,23 @@ namespace BizHawk.MultiClient if (Global.Config.GB_MulticartCompat) game.AddOption("MulitcartCompat"); Emulation.Consoles.GB.Gameboy gb = new Emulation.Consoles.GB.Gameboy(game, rom.FileData); nextEmulator = gb; - try + if (gb.IsCGBMode()) { - using (StreamReader f = new StreamReader(Global.Config.GB_PaletteFile)) - { - int[] colors = GBtools.ColorChooserForm.LoadPalFile(f); - if (colors != null) - gb.ChangeDMGColors(colors); - } + gb.SetCGBColors(Global.Config.CGBColors); + } + else + { + try + { + using (StreamReader f = new StreamReader(Global.Config.GB_PaletteFile)) + { + int[] colors = GBtools.ColorChooserForm.LoadPalFile(f); + if (colors != null) + gb.ChangeDMGColors(colors); + } + } + catch { } } - catch { } } else { @@ -4242,7 +4249,18 @@ namespace BizHawk.MultiClient { if (Global.Emulator is Gameboy) { - GBtools.ColorChooserForm.DoColorChooserFormDialog(((Gameboy)Global.Emulator).ChangeDMGColors, this); + var g = Global.Emulator as Gameboy; + if (g.IsCGBMode()) + { + if (GBtools.CGBColorChooserForm.DoCGBColorChooserFormDialog(this)) + { + g.SetCGBColors(Global.Config.CGBColors); + } + } + else + { + GBtools.ColorChooserForm.DoColorChooserFormDialog(g.ChangeDMGColors, this); + } } } diff --git a/BizHawk.MultiClient/output/dll/libgambatte.dll b/BizHawk.MultiClient/output/dll/libgambatte.dll index b1c05386050683412cec6a88b495bd49ea4dac13..86475202c682356e2c164cf540616991d5f72a15 100644 GIT binary patch delta 33334 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