diff --git a/BizHawk.MultiClient/BizHawk.MultiClient.csproj b/BizHawk.MultiClient/BizHawk.MultiClient.csproj
index edbeeff59f..853243f978 100644
--- a/BizHawk.MultiClient/BizHawk.MultiClient.csproj
+++ b/BizHawk.MultiClient/BizHawk.MultiClient.csproj
@@ -303,6 +303,9 @@
Resources.Designer.cs
Designer
+
+ SMSGraphicsConfig.cs
+
RamWatch.cs
Designer
@@ -333,6 +336,12 @@
RecordMovie.cs
+
+ Form
+
+
+ SMSGraphicsConfig.cs
+
Form
diff --git a/BizHawk.MultiClient/MainForm.Designer.cs b/BizHawk.MultiClient/MainForm.Designer.cs
index 27059711d6..03979ac895 100644
--- a/BizHawk.MultiClient/MainForm.Designer.cs
+++ b/BizHawk.MultiClient/MainForm.Designer.cs
@@ -265,6 +265,8 @@
this.screenshotToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.closeROMToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.showMenuToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.sMSToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.smsGraphicsSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.menuStrip1.SuspendLayout();
this.StatusSlot0.SuspendLayout();
this.contextMenuStrip1.SuspendLayout();
@@ -281,6 +283,7 @@
this.toolsToolStripMenuItem,
this.NESToolStripMenuItem,
this.pCEToolStripMenuItem,
+ this.sMSToolStripMenuItem,
this.tI83ToolStripMenuItem,
this.gBToolStripMenuItem,
this.helpToolStripMenuItem});
@@ -2181,6 +2184,21 @@
this.showMenuToolStripMenuItem.Text = "Show Menu";
this.showMenuToolStripMenuItem.Click += new System.EventHandler(this.showMenuToolStripMenuItem_Click);
//
+ // sMSToolStripMenuItem
+ //
+ this.sMSToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.smsGraphicsSettingsToolStripMenuItem});
+ this.sMSToolStripMenuItem.Name = "sMSToolStripMenuItem";
+ this.sMSToolStripMenuItem.Size = new System.Drawing.Size(40, 16);
+ this.sMSToolStripMenuItem.Text = "&SMS";
+ //
+ // smsGraphicsSettingsToolStripMenuItem
+ //
+ this.smsGraphicsSettingsToolStripMenuItem.Name = "smsGraphicsSettingsToolStripMenuItem";
+ this.smsGraphicsSettingsToolStripMenuItem.Size = new System.Drawing.Size(161, 22);
+ this.smsGraphicsSettingsToolStripMenuItem.Text = "Graphics Settings";
+ this.smsGraphicsSettingsToolStripMenuItem.Click += new System.EventHandler(this.smsGraphicsSettingsToolStripMenuItem_Click);
+ //
// MainForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 14F);
@@ -2447,6 +2465,8 @@
private System.Windows.Forms.ToolStripMenuItem pceAlwaysPerformSpriteLimitToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem pceAlwaysEqualizeVolumesToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem pceArcadeCardRewindEnableHackToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem sMSToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem smsGraphicsSettingsToolStripMenuItem;
}
}
diff --git a/BizHawk.MultiClient/MainForm.MenuItems.cs b/BizHawk.MultiClient/MainForm.MenuItems.cs
index 694e1d68b3..b18340aa69 100644
--- a/BizHawk.MultiClient/MainForm.MenuItems.cs
+++ b/BizHawk.MultiClient/MainForm.MenuItems.cs
@@ -738,6 +738,13 @@ namespace BizHawk.MultiClient
SyncCoreInputComm();
}
+ private void smsGraphicsSettingsToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ SMSGraphicsConfig g = new SMSGraphicsConfig();
+ g.ShowDialog();
+ SyncCoreInputComm();
+ }
+
public void MainForm_MouseClick(object sender, MouseEventArgs e)
{
if (Global.Config.ShowContextMenu && e.Button == MouseButtons.Right)
diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs
index 67f8472673..d96487fa56 100644
--- a/BizHawk.MultiClient/MainForm.cs
+++ b/BizHawk.MultiClient/MainForm.cs
@@ -816,15 +816,17 @@ namespace BizHawk.MultiClient
switch (system)
{
case "TI83":
- tI83ToolStripMenuItem.Visible = true;
NESToolStripMenuItem.Visible = false;
+ tI83ToolStripMenuItem.Visible = true;
pCEToolStripMenuItem.Visible = false;
+ sMSToolStripMenuItem.Visible = false;
gBToolStripMenuItem.Visible = false;
break;
case "NES":
NESToolStripMenuItem.Visible = true;
tI83ToolStripMenuItem.Visible = false;
pCEToolStripMenuItem.Visible = false;
+ sMSToolStripMenuItem.Visible = false;
gBToolStripMenuItem.Visible = false;
break;
case "PCE":
@@ -833,18 +835,29 @@ namespace BizHawk.MultiClient
NESToolStripMenuItem.Visible = false;
tI83ToolStripMenuItem.Visible = false;
pCEToolStripMenuItem.Visible = true;
+ sMSToolStripMenuItem.Visible = false;
+ gBToolStripMenuItem.Visible = false;
+ break;
+ case "SMS":
+ case "SG":
+ tI83ToolStripMenuItem.Visible = false;
+ NESToolStripMenuItem.Visible = false;
+ pCEToolStripMenuItem.Visible = false;
+ sMSToolStripMenuItem.Visible = true;
gBToolStripMenuItem.Visible = false;
break;
case "GB":
NESToolStripMenuItem.Visible = false;
tI83ToolStripMenuItem.Visible = false;
pCEToolStripMenuItem.Visible = false;
+ sMSToolStripMenuItem.Visible = false;
gBToolStripMenuItem.Visible = true;
break;
default:
tI83ToolStripMenuItem.Visible = false;
NESToolStripMenuItem.Visible = false;
pCEToolStripMenuItem.Visible = false;
+ sMSToolStripMenuItem.Visible = false;
gBToolStripMenuItem.Visible = false;
break;
}
diff --git a/BizHawk.MultiClient/PCEtools/PCEGraphicsConfig.cs b/BizHawk.MultiClient/PCEtools/PCEGraphicsConfig.cs
index 04c2278d5f..a411dac724 100644
--- a/BizHawk.MultiClient/PCEtools/PCEGraphicsConfig.cs
+++ b/BizHawk.MultiClient/PCEtools/PCEGraphicsConfig.cs
@@ -34,6 +34,8 @@ namespace BizHawk.MultiClient
Global.Config.PCEDispBG1 = DispBG1.Checked;
Global.Config.PCEDispOBJ2 = DispOBJ2.Checked;
Global.Config.PCEDispBG2 = DispBG2.Checked;
+
+ this.Close();
}
}
}
diff --git a/BizHawk.MultiClient/SMStools/SMSGraphicsConfig.Designer.cs b/BizHawk.MultiClient/SMStools/SMSGraphicsConfig.Designer.cs
new file mode 100644
index 0000000000..c7ad190790
--- /dev/null
+++ b/BizHawk.MultiClient/SMStools/SMSGraphicsConfig.Designer.cs
@@ -0,0 +1,127 @@
+namespace BizHawk.MultiClient
+{
+ partial class SMSGraphicsConfig
+ {
+ ///
+ /// 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.OK = new System.Windows.Forms.Button();
+ this.Cancel = new System.Windows.Forms.Button();
+ this.DispOBJ = new System.Windows.Forms.CheckBox();
+ this.DispBG = new System.Windows.Forms.CheckBox();
+ this.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.groupBox1.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // OK
+ //
+ this.OK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+ this.OK.Location = new System.Drawing.Point(62, 89);
+ this.OK.Name = "OK";
+ this.OK.Size = new System.Drawing.Size(75, 23);
+ this.OK.TabIndex = 0;
+ this.OK.Text = "&Ok";
+ this.OK.UseVisualStyleBackColor = true;
+ this.OK.Click += new System.EventHandler(this.OK_Click);
+ //
+ // Cancel
+ //
+ this.Cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+ this.Cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+ this.Cancel.Location = new System.Drawing.Point(143, 89);
+ this.Cancel.Name = "Cancel";
+ this.Cancel.Size = new System.Drawing.Size(75, 23);
+ this.Cancel.TabIndex = 1;
+ this.Cancel.Text = "&Cancel";
+ this.Cancel.UseVisualStyleBackColor = true;
+ //
+ // DispOBJ
+ //
+ this.DispOBJ.AutoSize = true;
+ this.DispOBJ.Checked = true;
+ this.DispOBJ.CheckState = System.Windows.Forms.CheckState.Checked;
+ this.DispOBJ.Location = new System.Drawing.Point(6, 18);
+ this.DispOBJ.Name = "DispOBJ";
+ this.DispOBJ.Size = new System.Drawing.Size(89, 16);
+ this.DispOBJ.TabIndex = 2;
+ this.DispOBJ.Text = "Display OBJ";
+ this.DispOBJ.UseVisualStyleBackColor = true;
+ //
+ // DispBG
+ //
+ this.DispBG.AutoSize = true;
+ this.DispBG.Checked = true;
+ this.DispBG.CheckState = System.Windows.Forms.CheckState.Checked;
+ this.DispBG.Location = new System.Drawing.Point(6, 40);
+ this.DispBG.Name = "DispBG";
+ this.DispBG.Size = new System.Drawing.Size(82, 16);
+ this.DispBG.TabIndex = 3;
+ this.DispBG.Text = "Display BG";
+ this.DispBG.UseVisualStyleBackColor = true;
+ //
+ // groupBox1
+ //
+ this.groupBox1.Controls.Add(this.DispOBJ);
+ this.groupBox1.Controls.Add(this.DispBG);
+ this.groupBox1.Location = new System.Drawing.Point(12, 12);
+ this.groupBox1.Name = "groupBox1";
+ this.groupBox1.Size = new System.Drawing.Size(200, 64);
+ this.groupBox1.TabIndex = 4;
+ this.groupBox1.TabStop = false;
+ this.groupBox1.Text = "Background and Sprites";
+ //
+ // SMSGraphicsConfig
+ //
+ this.AcceptButton = this.OK;
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.CancelButton = this.Cancel;
+ this.ClientSize = new System.Drawing.Size(230, 124);
+ this.Controls.Add(this.groupBox1);
+ this.Controls.Add(this.Cancel);
+ this.Controls.Add(this.OK);
+ this.MaximizeBox = false;
+ this.MinimizeBox = false;
+ this.Name = "SMSGraphicsConfig";
+ this.ShowIcon = false;
+ this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
+ this.Text = "SMS Graphics Settings";
+ this.Load += new System.EventHandler(this.SMSGraphicsConfig_Load);
+ this.groupBox1.ResumeLayout(false);
+ this.groupBox1.PerformLayout();
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.Button OK;
+ private System.Windows.Forms.Button Cancel;
+ private System.Windows.Forms.CheckBox DispOBJ;
+ private System.Windows.Forms.CheckBox DispBG;
+ private System.Windows.Forms.GroupBox groupBox1;
+ }
+}
\ No newline at end of file
diff --git a/BizHawk.MultiClient/SMStools/SMSGraphicsConfig.cs b/BizHawk.MultiClient/SMStools/SMSGraphicsConfig.cs
new file mode 100644
index 0000000000..ce8c29f3dd
--- /dev/null
+++ b/BizHawk.MultiClient/SMStools/SMSGraphicsConfig.cs
@@ -0,0 +1,37 @@
+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.Sega;
+
+namespace BizHawk.MultiClient
+{
+ public partial class SMSGraphicsConfig : Form
+ {
+ SMS sms;
+
+ public SMSGraphicsConfig()
+ {
+ InitializeComponent();
+ }
+
+ private void SMSGraphicsConfig_Load(object sender, EventArgs e)
+ {
+ sms = Global.Emulator as SMS;
+ DispOBJ.Checked = Global.Config.SMSDispOBJ;
+ DispBG.Checked = Global.Config.SMSDispBG;
+ }
+
+ private void OK_Click(object sender, EventArgs e)
+ {
+ Global.Config.SMSDispOBJ = DispOBJ.Checked;
+ Global.Config.SMSDispBG = DispBG.Checked;
+
+ this.Close();
+ }
+ }
+}
diff --git a/BizHawk.MultiClient/SMStools/SMSGraphicsConfig.resx b/BizHawk.MultiClient/SMStools/SMSGraphicsConfig.resx
new file mode 100644
index 0000000000..29dcb1b3a3
--- /dev/null
+++ b/BizHawk.MultiClient/SMStools/SMSGraphicsConfig.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