diff --git a/BizHawk.Emulation/Consoles/Nintendo/SNES/LibsnesCore.cs b/BizHawk.Emulation/Consoles/Nintendo/SNES/LibsnesCore.cs
index 479e6ff12d..757c70980f 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/SNES/LibsnesCore.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/SNES/LibsnesCore.cs
@@ -200,6 +200,27 @@ namespace BizHawk.Emulation.Consoles.Nintendo.SNES
OBSEL_NAMEBASE = 50,
OBSEL_NAMESEL = 51,
OBSEL_SIZE = 52,
+ //$2131 CGADSUB
+ CGADSUB_MODE = 60,
+ CGADSUB_HALF = 61,
+ CGADSUB_BG4 = 62,
+ CGADSUB_BG3 = 63,
+ CGADSUB_BG2 = 64,
+ CGADSUB_BG1 = 65,
+ CGADSUB_OBJ = 66,
+ CGADSUB_BACKDROP = 67,
+ //$212C TM
+ TM_BG1 =70,
+ TM_BG2 =71,
+ TM_BG3 =72,
+ TM_BG4 =73,
+ TM_OBJ =74,
+ //$212D TM
+ TS_BG1 =80,
+ TS_BG2 =81,
+ TS_BG3 =82,
+ TS_BG4 =83,
+ TS_OBJ =84
}
public enum SNES_MEMORY : uint
diff --git a/BizHawk.Emulation/Consoles/Nintendo/SNES/SNESGraphicsDecoder.cs b/BizHawk.Emulation/Consoles/Nintendo/SNES/SNESGraphicsDecoder.cs
index 91b05ae1c2..00e7ed4430 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/SNES/SNESGraphicsDecoder.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/SNES/SNESGraphicsDecoder.cs
@@ -125,6 +125,21 @@ namespace BizHawk.Emulation.Consoles.Nintendo.SNES
///
public int TILESIZE;
+ ///
+ /// enabled on MAIN Screen via $212C
+ ///
+ public bool MainEnabled;
+
+ ///
+ /// enabled on SUB Screen via $212D
+ ///
+ public bool SubEnabled;
+
+ ///
+ /// enabled for color math via $2131
+ ///
+ public bool MathEnabled;
+
///
/// TileSize; 8 or 16
///
@@ -216,6 +231,8 @@ namespace BizHawk.Emulation.Consoles.Nintendo.SNES
public ModeInfo Mode = new ModeInfo();
+ public bool Mode1_BG3_Priority { private set; get; }
+
public bool SETINI_Mode7ExtBG { private set; get; }
public bool SETINI_HiRes { private set; get; }
public bool SETINI_Overscan { private set; get; }
@@ -226,6 +243,8 @@ namespace BizHawk.Emulation.Consoles.Nintendo.SNES
public int CGWSEL_ColorSubMask { private set; get; }
public int CGWSEL_AddSubMode { private set; get; }
public bool CGWSEL_DirectColor { private set; get; }
+ public int CGADSUB_AddSub { private set; get; }
+ public bool CGADSUB_Half { private set; get; }
public int OBSEL_Size { private set; get; }
public int OBSEL_NameSel { private set; get; }
@@ -234,10 +253,17 @@ namespace BizHawk.Emulation.Consoles.Nintendo.SNES
public int OBJTable0Addr { private set; get; }
public int OBJTable1Addr { private set; get; }
+ public bool OBJ_MainEnabled { private set; get; }
+ public bool OBJ_SubEnabled { private set; get; }
+ public bool OBJ_MathEnabled { private set; get; }
+ public bool BK_MathEnabled { private set; get; }
+
public static ScreenInfo GetScreenInfo()
{
var si = new ScreenInfo();
+ si.Mode1_BG3_Priority = LibsnesDll.snes_peek_logical_register(LibsnesDll.SNES_REG.BG3_PRIORITY) == 1;
+
si.OBSEL_Size = LibsnesDll.snes_peek_logical_register(LibsnesDll.SNES_REG.OBSEL_SIZE);
si.OBSEL_NameSel = LibsnesDll.snes_peek_logical_register(LibsnesDll.SNES_REG.OBSEL_NAMESEL);
si.OBSEL_NameBase = LibsnesDll.snes_peek_logical_register(LibsnesDll.SNES_REG.OBSEL_NAMEBASE);
@@ -256,6 +282,14 @@ namespace BizHawk.Emulation.Consoles.Nintendo.SNES
si.CGWSEL_AddSubMode = LibsnesDll.snes_peek_logical_register(LibsnesDll.SNES_REG.CGWSEL_ADDSUBMODE);
si.CGWSEL_DirectColor = LibsnesDll.snes_peek_logical_register(LibsnesDll.SNES_REG.CGWSEL_DIRECTCOLOR) == 1;
+ si.CGADSUB_AddSub = LibsnesDll.snes_peek_logical_register(LibsnesDll.SNES_REG.CGADSUB_MODE);
+ si.CGADSUB_Half = LibsnesDll.snes_peek_logical_register(LibsnesDll.SNES_REG.CGADSUB_HALF) == 1;
+
+ si.OBJ_MainEnabled = LibsnesDll.snes_peek_logical_register(LibsnesDll.SNES_REG.TM_OBJ) == 1;
+ si.OBJ_SubEnabled = LibsnesDll.snes_peek_logical_register(LibsnesDll.SNES_REG.TS_OBJ) == 1;
+ si.OBJ_MathEnabled = LibsnesDll.snes_peek_logical_register(LibsnesDll.SNES_REG.CGADSUB_OBJ) == 1;
+ si.BK_MathEnabled = LibsnesDll.snes_peek_logical_register(LibsnesDll.SNES_REG.CGADSUB_BACKDROP) == 1;
+
si.Mode.MODE = LibsnesDll.snes_peek_logical_register(LibsnesDll.SNES_REG.BG_MODE);
si.BG.BG1.Bpp = ModeBpps[si.Mode.MODE, 0];
si.BG.BG2.Bpp = ModeBpps[si.Mode.MODE, 1];
@@ -283,6 +317,19 @@ namespace BizHawk.Emulation.Consoles.Nintendo.SNES
si.BG.BG3.TDADDR = LibsnesDll.snes_peek_logical_register(LibsnesDll.SNES_REG.BG3_TDADDR);
si.BG.BG4.TDADDR = LibsnesDll.snes_peek_logical_register(LibsnesDll.SNES_REG.BG4_TDADDR);
+ si.BG.BG1.MainEnabled = LibsnesDll.snes_peek_logical_register(LibsnesDll.SNES_REG.TM_BG1) == 1;
+ si.BG.BG2.MainEnabled = LibsnesDll.snes_peek_logical_register(LibsnesDll.SNES_REG.TM_BG2) == 1;
+ si.BG.BG3.MainEnabled = LibsnesDll.snes_peek_logical_register(LibsnesDll.SNES_REG.TM_BG3) == 1;
+ si.BG.BG4.MainEnabled = LibsnesDll.snes_peek_logical_register(LibsnesDll.SNES_REG.TM_BG4) == 1;
+ si.BG.BG1.SubEnabled = LibsnesDll.snes_peek_logical_register(LibsnesDll.SNES_REG.TS_BG1) == 1;
+ si.BG.BG2.SubEnabled = LibsnesDll.snes_peek_logical_register(LibsnesDll.SNES_REG.TS_BG2) == 1;
+ si.BG.BG3.SubEnabled = LibsnesDll.snes_peek_logical_register(LibsnesDll.SNES_REG.TS_BG3) == 1;
+ si.BG.BG4.SubEnabled = LibsnesDll.snes_peek_logical_register(LibsnesDll.SNES_REG.TS_BG4) == 1;
+ si.BG.BG1.MathEnabled = LibsnesDll.snes_peek_logical_register(LibsnesDll.SNES_REG.CGADSUB_BG1) == 1;
+ si.BG.BG2.MathEnabled = LibsnesDll.snes_peek_logical_register(LibsnesDll.SNES_REG.CGADSUB_BG2) == 1;
+ si.BG.BG3.MathEnabled = LibsnesDll.snes_peek_logical_register(LibsnesDll.SNES_REG.CGADSUB_BG3) == 1;
+ si.BG.BG4.MathEnabled = LibsnesDll.snes_peek_logical_register(LibsnesDll.SNES_REG.CGADSUB_BG4) == 1;
+
for (int i = 1; i <= 4; i++)
si.BG[i].Mode = si.Mode.MODE;
@@ -400,6 +447,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo.SNES
public ushort tilenum;
public byte palette;
public TileEntryFlags flags;
+ public int address;
}
public enum TileEntryFlags : byte
@@ -540,6 +588,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo.SNES
buf[idx].tilenum = (ushort)(entry & 0x3FF);
buf[idx].palette = (byte)((entry >> 10) & 7);
buf[idx].flags = (TileEntryFlags)((entry >> 13) & 7);
+ buf[idx].address = addr;
addr += 2;
}
}
diff --git a/BizHawk.MultiClient/SNESTools/SNESGraphicsDebugger.Designer.cs b/BizHawk.MultiClient/SNESTools/SNESGraphicsDebugger.Designer.cs
index cfc7dc3cbf..6f58b7c0e0 100644
--- a/BizHawk.MultiClient/SNESTools/SNESGraphicsDebugger.Designer.cs
+++ b/BizHawk.MultiClient/SNESTools/SNESGraphicsDebugger.Designer.cs
@@ -41,7 +41,11 @@
this.saveWindowPositionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
this.panel1 = new System.Windows.Forms.Panel();
+ this.groupBox8 = new System.Windows.Forms.GroupBox();
+ this.pnBackdropColor = new System.Windows.Forms.Panel();
this.comboPalette = new System.Windows.Forms.ComboBox();
+ this.checkBackdropColor = new System.Windows.Forms.CheckBox();
+ this.label24 = new System.Windows.Forms.Label();
this.groupBox7 = new System.Windows.Forms.GroupBox();
this.txtOBSELT1OfsBits = new System.Windows.Forms.TextBox();
this.txtOBSELT1OfsDescr = new System.Windows.Forms.TextBox();
@@ -53,17 +57,68 @@
this.label26 = new System.Windows.Forms.Label();
this.txtOBSELSizeDescr = new System.Windows.Forms.TextBox();
this.label28 = new System.Windows.Forms.Label();
+ this.label20 = new System.Windows.Forms.Label();
+ this.checkScreenExtbg = new System.Windows.Forms.CheckBox();
+ this.label21 = new System.Windows.Forms.Label();
+ this.checkScreenHires = new System.Windows.Forms.CheckBox();
+ this.label18391 = new System.Windows.Forms.Label();
+ this.checkScreenOverscan = new System.Windows.Forms.CheckBox();
+ this.label198129381279841 = new System.Windows.Forms.Label();
+ this.checkScreenObjInterlace = new System.Windows.Forms.CheckBox();
+ this.label123812831 = new System.Windows.Forms.Label();
+ this.checkScreenInterlace = new System.Windows.Forms.CheckBox();
+ this.label2193813 = new System.Windows.Forms.Label();
this.groupBox6 = new System.Windows.Forms.GroupBox();
this.labelClipboard = new System.Windows.Forms.Label();
- this.label24 = new System.Windows.Forms.Label();
- this.pnBackdropColor = new System.Windows.Forms.Panel();
- this.checkBackdropColor = new System.Windows.Forms.CheckBox();
this.groupBox3 = new System.Windows.Forms.GroupBox();
this.checkScanlineControl = new System.Windows.Forms.CheckBox();
this.label19 = new System.Windows.Forms.Label();
this.nudScanline = new System.Windows.Forms.NumericUpDown();
this.sliderScanline = new System.Windows.Forms.TrackBar();
this.groupBox2 = new System.Windows.Forms.GroupBox();
+ this.label41 = new System.Windows.Forms.Label();
+ this.checkEN1_OBJ = new System.Windows.Forms.CheckBox();
+ this.checkEN1_BG4 = new System.Windows.Forms.CheckBox();
+ this.checkEN1_BG3 = new System.Windows.Forms.CheckBox();
+ this.checkEN1_BG2 = new System.Windows.Forms.CheckBox();
+ this.checkEN1_BG1 = new System.Windows.Forms.CheckBox();
+ this.checkEN3_OBJ = new System.Windows.Forms.CheckBox();
+ this.checkEN2_OBJ = new System.Windows.Forms.CheckBox();
+ this.label40 = new System.Windows.Forms.Label();
+ this.label39 = new System.Windows.Forms.Label();
+ this.label38 = new System.Windows.Forms.Label();
+ this.txtScreenCGADSUB_Half = new System.Windows.Forms.CheckBox();
+ this.label37 = new System.Windows.Forms.Label();
+ this.checkEN0_OBJ = new System.Windows.Forms.CheckBox();
+ this.checkEN0_BG4 = new System.Windows.Forms.CheckBox();
+ this.checkEN0_BG3 = new System.Windows.Forms.CheckBox();
+ this.checkEN0_BG2 = new System.Windows.Forms.CheckBox();
+ this.checkEN0_BG1 = new System.Windows.Forms.CheckBox();
+ this.txtScreenCGADSUB_AddSub_Descr = new System.Windows.Forms.TextBox();
+ this.txtScreenCGADSUB_AddSub = new System.Windows.Forms.TextBox();
+ this.label36 = new System.Windows.Forms.Label();
+ this.checkTMOBJ = new BizHawk.Core.CustomCheckBox();
+ this.checkTSOBJ = new BizHawk.Core.CustomCheckBox();
+ this.checkMathBK = new BizHawk.Core.CustomCheckBox();
+ this.label35 = new BizHawk.Core.HorizontalLine();
+ this.checkMathBG4 = new BizHawk.Core.CustomCheckBox();
+ this.checkMathBG3 = new BizHawk.Core.CustomCheckBox();
+ this.checkMathBG2 = new BizHawk.Core.CustomCheckBox();
+ this.checkMathBG1 = new BizHawk.Core.CustomCheckBox();
+ this.label33 = new System.Windows.Forms.Label();
+ this.checkMathOBJ = new BizHawk.Core.CustomCheckBox();
+ this.lblTS = new System.Windows.Forms.Label();
+ this.checkTSBG4 = new BizHawk.Core.CustomCheckBox();
+ this.checkTSBG3 = new BizHawk.Core.CustomCheckBox();
+ this.checkTSBG2 = new BizHawk.Core.CustomCheckBox();
+ this.checkTSBG1 = new BizHawk.Core.CustomCheckBox();
+ this.lblTM = new System.Windows.Forms.Label();
+ this.checkTMBG4 = new BizHawk.Core.CustomCheckBox();
+ this.checkTMBG3 = new BizHawk.Core.CustomCheckBox();
+ this.checkTMBG2 = new BizHawk.Core.CustomCheckBox();
+ this.checkTMBG1 = new BizHawk.Core.CustomCheckBox();
+ this.label32 = new System.Windows.Forms.Label();
+ this.label31 = new System.Windows.Forms.Label();
this.label25 = new System.Windows.Forms.Label();
this.txtScreenCGWSEL_MathFixed = new System.Windows.Forms.TextBox();
this.label2893719831 = new System.Windows.Forms.Label();
@@ -73,17 +128,6 @@
this.label22 = new System.Windows.Forms.Label();
this.label27 = new System.Windows.Forms.Label();
this.checkScreenCGWSEL_DirectColor = new System.Windows.Forms.CheckBox();
- this.label2193813 = new System.Windows.Forms.Label();
- this.checkScreenInterlace = new System.Windows.Forms.CheckBox();
- this.label123812831 = new System.Windows.Forms.Label();
- this.checkScreenObjInterlace = new System.Windows.Forms.CheckBox();
- this.label198129381279841 = new System.Windows.Forms.Label();
- this.checkScreenOverscan = new System.Windows.Forms.CheckBox();
- this.label18391 = new System.Windows.Forms.Label();
- this.checkScreenHires = new System.Windows.Forms.CheckBox();
- this.label21 = new System.Windows.Forms.Label();
- this.checkScreenExtbg = new System.Windows.Forms.CheckBox();
- this.label20 = new System.Windows.Forms.Label();
this.label16 = new System.Windows.Forms.Label();
this.txtScreenBG4TSize = new System.Windows.Forms.TextBox();
this.txtScreenBG3TSize = new System.Windows.Forms.TextBox();
@@ -97,12 +141,11 @@
this.label8 = new System.Windows.Forms.Label();
this.label7 = new System.Windows.Forms.Label();
this.txtScreenBG1Bpp = new System.Windows.Forms.TextBox();
- this.label6 = new System.Windows.Forms.Label();
+ this.lblBG3 = new System.Windows.Forms.Label();
this.label4 = new System.Windows.Forms.Label();
this.label5 = new System.Windows.Forms.Label();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.rbBG4 = new System.Windows.Forms.RadioButton();
- this.label18 = new System.Windows.Forms.Label();
this.rbBG3 = new System.Windows.Forms.RadioButton();
this.rbBG2 = new System.Windows.Forms.RadioButton();
this.rbBG1 = new System.Windows.Forms.RadioButton();
@@ -128,19 +171,11 @@
this.txtBG1SizeBits = new System.Windows.Forms.TextBox();
this.groupBox4 = new System.Windows.Forms.GroupBox();
this.radioButton6 = new System.Windows.Forms.RadioButton();
- this.label17 = new System.Windows.Forms.Label();
this.check2x = new System.Windows.Forms.CheckBox();
this.radioButton15 = new System.Windows.Forms.RadioButton();
this.radioButton14 = new System.Windows.Forms.RadioButton();
- this.label14 = new System.Windows.Forms.Label();
this.comboDisplayType = new System.Windows.Forms.ComboBox();
this.radioButton1 = new System.Windows.Forms.RadioButton();
- this.grpQuadrants = new System.Windows.Forms.GroupBox();
- this.rbQuad3 = new System.Windows.Forms.RadioButton();
- this.rbQuad2 = new System.Windows.Forms.RadioButton();
- this.rbQuadAll = new System.Windows.Forms.RadioButton();
- this.rbQuad1 = new System.Windows.Forms.RadioButton();
- this.rbQuad0 = new System.Windows.Forms.RadioButton();
this.radioButton2 = new System.Windows.Forms.RadioButton();
this.radioButton13 = new System.Windows.Forms.RadioButton();
this.radioButton3 = new System.Windows.Forms.RadioButton();
@@ -148,7 +183,6 @@
this.radioButton5 = new System.Windows.Forms.RadioButton();
this.radioButton10 = new System.Windows.Forms.RadioButton();
this.groupBox5 = new System.Windows.Forms.GroupBox();
- this.paletteViewer = new BizHawk.MultiClient.SNESGraphicsViewer();
this.tabctrlDetails = new System.Windows.Forms.TabControl();
this.tpPalette = new System.Windows.Forms.TabPage();
this.txtPaletteDetailsIndexSpecific = new System.Windows.Forms.TextBox();
@@ -161,16 +195,32 @@
this.txtDetailsPaletteColor = new System.Windows.Forms.TextBox();
this.lblDetailsOBJOrBG = new System.Windows.Forms.Label();
this.pnDetailsPaletteColor = new System.Windows.Forms.Panel();
- this.lblDetailsPaletteAddress = new System.Windows.Forms.Label();
this.tpTile = new System.Windows.Forms.TabPage();
- this.viewerTile = new BizHawk.MultiClient.SNESGraphicsViewer();
+ this.tpMapEntry = new System.Windows.Forms.TabPage();
+ this.checkMapEntryVFlip = new System.Windows.Forms.CheckBox();
+ this.label34 = new System.Windows.Forms.Label();
+ this.checkMapEntryHFlip = new System.Windows.Forms.CheckBox();
+ this.label17 = new System.Windows.Forms.Label();
+ this.lblMapEntryHFlip = new System.Windows.Forms.Label();
+ this.txtMapEntryPalette = new System.Windows.Forms.TextBox();
+ this.label14 = new System.Windows.Forms.Label();
+ this.label6 = new System.Windows.Forms.Label();
+ this.txtMapEntryTileAddr = new System.Windows.Forms.TextBox();
+ this.txtMapEntryPrio = new System.Windows.Forms.TextBox();
+ this.txtMapEntryLocation = new System.Windows.Forms.TextBox();
+ this.txtMapEntryTileNum = new System.Windows.Forms.TextBox();
this.viewerPanel = new System.Windows.Forms.Panel();
- this.viewer = new BizHawk.MultiClient.SNESGraphicsViewer();
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
this.messagetimer = new System.Windows.Forms.Timer(this.components);
+ this.txtBGPaletteInfo = new System.Windows.Forms.TextBox();
+ this.paletteViewer = new BizHawk.MultiClient.SNESGraphicsViewer();
+ this.viewerTile = new BizHawk.MultiClient.SNESGraphicsViewer();
+ this.viewerMapEntryTile = new BizHawk.MultiClient.SNESGraphicsViewer();
+ this.viewer = new BizHawk.MultiClient.SNESGraphicsViewer();
this.menuStrip1.SuspendLayout();
this.tableLayoutPanel1.SuspendLayout();
this.panel1.SuspendLayout();
+ this.groupBox8.SuspendLayout();
this.groupBox7.SuspendLayout();
this.groupBox6.SuspendLayout();
this.groupBox3.SuspendLayout();
@@ -179,11 +229,11 @@
this.groupBox2.SuspendLayout();
this.groupBox1.SuspendLayout();
this.groupBox4.SuspendLayout();
- this.grpQuadrants.SuspendLayout();
this.groupBox5.SuspendLayout();
this.tabctrlDetails.SuspendLayout();
this.tpPalette.SuspendLayout();
this.tpTile.SuspendLayout();
+ this.tpMapEntry.SuspendLayout();
this.viewerPanel.SuspendLayout();
this.SuspendLayout();
//
@@ -281,12 +331,9 @@
//
this.panel1.AutoSize = true;
this.panel1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
- this.panel1.Controls.Add(this.comboPalette);
+ this.panel1.Controls.Add(this.groupBox8);
this.panel1.Controls.Add(this.groupBox7);
this.panel1.Controls.Add(this.groupBox6);
- this.panel1.Controls.Add(this.label24);
- this.panel1.Controls.Add(this.pnBackdropColor);
- this.panel1.Controls.Add(this.checkBackdropColor);
this.panel1.Controls.Add(this.groupBox3);
this.panel1.Controls.Add(this.groupBox2);
this.panel1.Controls.Add(this.groupBox1);
@@ -295,21 +342,63 @@
this.panel1.Controls.Add(this.tabctrlDetails);
this.panel1.Location = new System.Drawing.Point(3, 3);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(558, 672);
+ this.panel1.Size = new System.Drawing.Size(557, 666);
this.panel1.TabIndex = 0;
//
+ // groupBox8
+ //
+ this.groupBox8.Controls.Add(this.pnBackdropColor);
+ this.groupBox8.Controls.Add(this.comboPalette);
+ this.groupBox8.Controls.Add(this.checkBackdropColor);
+ this.groupBox8.Controls.Add(this.label24);
+ this.groupBox8.Location = new System.Drawing.Point(3, 558);
+ this.groupBox8.Name = "groupBox8";
+ this.groupBox8.Size = new System.Drawing.Size(200, 70);
+ this.groupBox8.TabIndex = 53;
+ this.groupBox8.TabStop = false;
+ this.groupBox8.Text = "groupBox8";
+ //
+ // pnBackdropColor
+ //
+ this.pnBackdropColor.BackColor = System.Drawing.Color.Red;
+ this.pnBackdropColor.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+ this.pnBackdropColor.Location = new System.Drawing.Point(14, 19);
+ this.pnBackdropColor.Name = "pnBackdropColor";
+ this.pnBackdropColor.Size = new System.Drawing.Size(32, 32);
+ this.pnBackdropColor.TabIndex = 48;
+ this.pnBackdropColor.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.pnBackdropColor_MouseDoubleClick);
+ //
// comboPalette
//
this.comboPalette.DisplayMember = "descr";
this.comboPalette.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.comboPalette.FormattingEnabled = true;
- this.comboPalette.Location = new System.Drawing.Point(108, 588);
+ this.comboPalette.Location = new System.Drawing.Point(65, 19);
this.comboPalette.Name = "comboPalette";
this.comboPalette.Size = new System.Drawing.Size(121, 21);
this.comboPalette.TabIndex = 52;
this.comboPalette.ValueMember = "type";
this.comboPalette.SelectedIndexChanged += new System.EventHandler(this.comboPalette_SelectedIndexChanged);
//
+ // checkBackdropColor
+ //
+ this.checkBackdropColor.AutoSize = true;
+ this.checkBackdropColor.Location = new System.Drawing.Point(14, 54);
+ this.checkBackdropColor.Name = "checkBackdropColor";
+ this.checkBackdropColor.Size = new System.Drawing.Size(15, 14);
+ this.checkBackdropColor.TabIndex = 47;
+ this.checkBackdropColor.UseVisualStyleBackColor = true;
+ this.checkBackdropColor.CheckedChanged += new System.EventHandler(this.checkBackdropColor_CheckedChanged);
+ //
+ // label24
+ //
+ this.label24.AutoSize = true;
+ this.label24.Location = new System.Drawing.Point(32, 53);
+ this.label24.Name = "label24";
+ this.label24.Size = new System.Drawing.Size(78, 13);
+ this.label24.TabIndex = 49;
+ this.label24.Text = "User Backdrop";
+ //
// groupBox7
//
this.groupBox7.Controls.Add(this.txtOBSELT1OfsBits);
@@ -322,9 +411,9 @@
this.groupBox7.Controls.Add(this.label26);
this.groupBox7.Controls.Add(this.txtOBSELSizeDescr);
this.groupBox7.Controls.Add(this.label28);
- this.groupBox7.Location = new System.Drawing.Point(1, 419);
+ this.groupBox7.Location = new System.Drawing.Point(1, 431);
this.groupBox7.Name = "groupBox7";
- this.groupBox7.Size = new System.Drawing.Size(228, 114);
+ this.groupBox7.Size = new System.Drawing.Size(228, 78);
this.groupBox7.TabIndex = 51;
this.groupBox7.TabStop = false;
this.groupBox7.Text = "OBJ";
@@ -332,7 +421,7 @@
// txtOBSELT1OfsBits
//
this.txtOBSELT1OfsBits.BackColor = System.Drawing.Color.LightGreen;
- this.txtOBSELT1OfsBits.Location = new System.Drawing.Point(12, 72);
+ this.txtOBSELT1OfsBits.Location = new System.Drawing.Point(6, 55);
this.txtOBSELT1OfsBits.Multiline = true;
this.txtOBSELT1OfsBits.Name = "txtOBSELT1OfsBits";
this.txtOBSELT1OfsBits.ReadOnly = true;
@@ -342,7 +431,7 @@
//
// txtOBSELT1OfsDescr
//
- this.txtOBSELT1OfsDescr.Location = new System.Drawing.Point(77, 72);
+ this.txtOBSELT1OfsDescr.Location = new System.Drawing.Point(71, 55);
this.txtOBSELT1OfsDescr.Multiline = true;
this.txtOBSELT1OfsDescr.Name = "txtOBSELT1OfsDescr";
this.txtOBSELT1OfsDescr.ReadOnly = true;
@@ -352,7 +441,7 @@
// label30
//
this.label30.AutoSize = true;
- this.label30.Location = new System.Drawing.Point(31, 75);
+ this.label30.Location = new System.Drawing.Point(25, 58);
this.label30.Name = "label30";
this.label30.Size = new System.Drawing.Size(45, 13);
this.label30.TabIndex = 53;
@@ -361,7 +450,7 @@
// txtOBSELBaseBits
//
this.txtOBSELBaseBits.BackColor = System.Drawing.Color.LightGreen;
- this.txtOBSELBaseBits.Location = new System.Drawing.Point(12, 51);
+ this.txtOBSELBaseBits.Location = new System.Drawing.Point(6, 36);
this.txtOBSELBaseBits.Multiline = true;
this.txtOBSELBaseBits.Name = "txtOBSELBaseBits";
this.txtOBSELBaseBits.ReadOnly = true;
@@ -371,7 +460,7 @@
//
// txtOBSELBaseDescr
//
- this.txtOBSELBaseDescr.Location = new System.Drawing.Point(77, 51);
+ this.txtOBSELBaseDescr.Location = new System.Drawing.Point(71, 36);
this.txtOBSELBaseDescr.Multiline = true;
this.txtOBSELBaseDescr.Name = "txtOBSELBaseDescr";
this.txtOBSELBaseDescr.ReadOnly = true;
@@ -381,7 +470,7 @@
// label29
//
this.label29.AutoSize = true;
- this.label29.Location = new System.Drawing.Point(31, 54);
+ this.label29.Location = new System.Drawing.Point(25, 39);
this.label29.Name = "label29";
this.label29.Size = new System.Drawing.Size(47, 13);
this.label29.TabIndex = 50;
@@ -390,7 +479,7 @@
// txtOBSELSizeBits
//
this.txtOBSELSizeBits.BackColor = System.Drawing.Color.LightGreen;
- this.txtOBSELSizeBits.Location = new System.Drawing.Point(12, 29);
+ this.txtOBSELSizeBits.Location = new System.Drawing.Point(6, 16);
this.txtOBSELSizeBits.Multiline = true;
this.txtOBSELSizeBits.Name = "txtOBSELSizeBits";
this.txtOBSELSizeBits.ReadOnly = true;
@@ -401,7 +490,7 @@
// label26
//
this.label26.AutoSize = true;
- this.label26.Location = new System.Drawing.Point(5, 14);
+ this.label26.Location = new System.Drawing.Point(178, 16);
this.label26.Name = "label26";
this.label26.Size = new System.Drawing.Size(42, 13);
this.label26.TabIndex = 45;
@@ -409,7 +498,7 @@
//
// txtOBSELSizeDescr
//
- this.txtOBSELSizeDescr.Location = new System.Drawing.Point(77, 29);
+ this.txtOBSELSizeDescr.Location = new System.Drawing.Point(71, 16);
this.txtOBSELSizeDescr.Multiline = true;
this.txtOBSELSizeDescr.Name = "txtOBSELSizeDescr";
this.txtOBSELSizeDescr.ReadOnly = true;
@@ -420,18 +509,122 @@
// label28
//
this.label28.AutoSize = true;
- this.label28.Location = new System.Drawing.Point(31, 32);
+ this.label28.Location = new System.Drawing.Point(25, 19);
this.label28.Name = "label28";
this.label28.Size = new System.Drawing.Size(27, 13);
this.label28.TabIndex = 47;
this.label28.Text = "Size";
//
+ // label20
+ //
+ this.label20.AutoSize = true;
+ this.label20.Location = new System.Drawing.Point(72, 147);
+ this.label20.Name = "label20";
+ this.label20.Size = new System.Drawing.Size(42, 13);
+ this.label20.TabIndex = 21;
+ this.label20.Text = "SETINI";
+ //
+ // checkScreenExtbg
+ //
+ this.checkScreenExtbg.AutoSize = true;
+ this.checkScreenExtbg.Enabled = false;
+ this.checkScreenExtbg.Location = new System.Drawing.Point(83, 163);
+ this.checkScreenExtbg.Name = "checkScreenExtbg";
+ this.checkScreenExtbg.Size = new System.Drawing.Size(15, 14);
+ this.checkScreenExtbg.TabIndex = 22;
+ this.checkScreenExtbg.UseVisualStyleBackColor = true;
+ //
+ // label21
+ //
+ this.label21.AutoSize = true;
+ this.label21.Location = new System.Drawing.Point(97, 163);
+ this.label21.Name = "label21";
+ this.label21.Size = new System.Drawing.Size(43, 13);
+ this.label21.TabIndex = 23;
+ this.label21.Text = "EXTBG";
+ //
+ // checkScreenHires
+ //
+ this.checkScreenHires.AutoSize = true;
+ this.checkScreenHires.Enabled = false;
+ this.checkScreenHires.Location = new System.Drawing.Point(83, 177);
+ this.checkScreenHires.Name = "checkScreenHires";
+ this.checkScreenHires.Size = new System.Drawing.Size(15, 14);
+ this.checkScreenHires.TabIndex = 24;
+ this.checkScreenHires.UseVisualStyleBackColor = true;
+ //
+ // label18391
+ //
+ this.label18391.AutoSize = true;
+ this.label18391.Location = new System.Drawing.Point(97, 177);
+ this.label18391.Name = "label18391";
+ this.label18391.Size = new System.Drawing.Size(40, 13);
+ this.label18391.TabIndex = 25;
+ this.label18391.Text = "HIRES";
+ //
+ // checkScreenOverscan
+ //
+ this.checkScreenOverscan.AutoSize = true;
+ this.checkScreenOverscan.Enabled = false;
+ this.checkScreenOverscan.Location = new System.Drawing.Point(83, 191);
+ this.checkScreenOverscan.Name = "checkScreenOverscan";
+ this.checkScreenOverscan.Size = new System.Drawing.Size(15, 14);
+ this.checkScreenOverscan.TabIndex = 26;
+ this.checkScreenOverscan.UseVisualStyleBackColor = true;
+ //
+ // label198129381279841
+ //
+ this.label198129381279841.AutoSize = true;
+ this.label198129381279841.Location = new System.Drawing.Point(97, 191);
+ this.label198129381279841.Name = "label198129381279841";
+ this.label198129381279841.Size = new System.Drawing.Size(47, 13);
+ this.label198129381279841.TabIndex = 27;
+ this.label198129381279841.Text = "O.SCAN";
+ //
+ // checkScreenObjInterlace
+ //
+ this.checkScreenObjInterlace.AutoSize = true;
+ this.checkScreenObjInterlace.Enabled = false;
+ this.checkScreenObjInterlace.Location = new System.Drawing.Point(142, 161);
+ this.checkScreenObjInterlace.Name = "checkScreenObjInterlace";
+ this.checkScreenObjInterlace.Size = new System.Drawing.Size(15, 14);
+ this.checkScreenObjInterlace.TabIndex = 28;
+ this.checkScreenObjInterlace.UseVisualStyleBackColor = true;
+ //
+ // label123812831
+ //
+ this.label123812831.AutoSize = true;
+ this.label123812831.Location = new System.Drawing.Point(156, 161);
+ this.label123812831.Name = "label123812831";
+ this.label123812831.Size = new System.Drawing.Size(49, 13);
+ this.label123812831.TabIndex = 29;
+ this.label123812831.Text = "O.INTLC";
+ //
+ // checkScreenInterlace
+ //
+ this.checkScreenInterlace.AutoSize = true;
+ this.checkScreenInterlace.Enabled = false;
+ this.checkScreenInterlace.Location = new System.Drawing.Point(142, 174);
+ this.checkScreenInterlace.Name = "checkScreenInterlace";
+ this.checkScreenInterlace.Size = new System.Drawing.Size(15, 14);
+ this.checkScreenInterlace.TabIndex = 30;
+ this.checkScreenInterlace.UseVisualStyleBackColor = true;
+ //
+ // label2193813
+ //
+ this.label2193813.AutoSize = true;
+ this.label2193813.Location = new System.Drawing.Point(156, 174);
+ this.label2193813.Name = "label2193813";
+ this.label2193813.Size = new System.Drawing.Size(48, 13);
+ this.label2193813.TabIndex = 31;
+ this.label2193813.Text = "S.INTLC";
+ //
// groupBox6
//
this.groupBox6.Controls.Add(this.labelClipboard);
- this.groupBox6.Location = new System.Drawing.Point(1, 539);
+ this.groupBox6.Location = new System.Drawing.Point(0, 515);
this.groupBox6.Name = "groupBox6";
- this.groupBox6.Size = new System.Drawing.Size(228, 43);
+ this.groupBox6.Size = new System.Drawing.Size(228, 38);
this.groupBox6.TabIndex = 50;
this.groupBox6.TabStop = false;
this.groupBox6.Text = "Copy to Clipboard";
@@ -439,48 +632,19 @@
// labelClipboard
//
this.labelClipboard.AutoSize = true;
- this.labelClipboard.Location = new System.Drawing.Point(7, 23);
+ this.labelClipboard.Location = new System.Drawing.Point(4, 18);
this.labelClipboard.Name = "labelClipboard";
this.labelClipboard.Size = new System.Drawing.Size(212, 13);
this.labelClipboard.TabIndex = 0;
this.labelClipboard.Text = "CTRL+C copies the pane under the mouse.";
//
- // label24
- //
- this.label24.AutoSize = true;
- this.label24.Location = new System.Drawing.Point(3, 623);
- this.label24.Name = "label24";
- this.label24.Size = new System.Drawing.Size(78, 13);
- this.label24.TabIndex = 49;
- this.label24.Text = "User Backdrop";
- //
- // pnBackdropColor
- //
- this.pnBackdropColor.BackColor = System.Drawing.Color.Red;
- this.pnBackdropColor.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
- this.pnBackdropColor.Location = new System.Drawing.Point(6, 588);
- this.pnBackdropColor.Name = "pnBackdropColor";
- this.pnBackdropColor.Size = new System.Drawing.Size(32, 32);
- this.pnBackdropColor.TabIndex = 48;
- this.pnBackdropColor.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.pnBackdropColor_MouseDoubleClick);
- //
- // checkBackdropColor
- //
- this.checkBackdropColor.AutoSize = true;
- this.checkBackdropColor.Location = new System.Drawing.Point(44, 606);
- this.checkBackdropColor.Name = "checkBackdropColor";
- this.checkBackdropColor.Size = new System.Drawing.Size(15, 14);
- this.checkBackdropColor.TabIndex = 47;
- this.checkBackdropColor.UseVisualStyleBackColor = true;
- this.checkBackdropColor.CheckedChanged += new System.EventHandler(this.checkBackdropColor_CheckedChanged);
- //
// groupBox3
//
this.groupBox3.Controls.Add(this.checkScanlineControl);
this.groupBox3.Controls.Add(this.label19);
this.groupBox3.Controls.Add(this.nudScanline);
this.groupBox3.Controls.Add(this.sliderScanline);
- this.groupBox3.Location = new System.Drawing.Point(323, 0);
+ this.groupBox3.Location = new System.Drawing.Point(172, 217);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(57, 191);
this.groupBox3.TabIndex = 46;
@@ -537,6 +701,60 @@
//
// groupBox2
//
+ this.groupBox2.Controls.Add(this.label41);
+ this.groupBox2.Controls.Add(this.checkEN1_OBJ);
+ this.groupBox2.Controls.Add(this.checkEN1_BG4);
+ this.groupBox2.Controls.Add(this.checkEN1_BG3);
+ this.groupBox2.Controls.Add(this.checkEN1_BG2);
+ this.groupBox2.Controls.Add(this.checkEN1_BG1);
+ this.groupBox2.Controls.Add(this.checkEN3_OBJ);
+ this.groupBox2.Controls.Add(this.checkEN2_OBJ);
+ this.groupBox2.Controls.Add(this.label40);
+ this.groupBox2.Controls.Add(this.label39);
+ this.groupBox2.Controls.Add(this.label20);
+ this.groupBox2.Controls.Add(this.checkScreenExtbg);
+ this.groupBox2.Controls.Add(this.label38);
+ this.groupBox2.Controls.Add(this.label21);
+ this.groupBox2.Controls.Add(this.txtScreenCGADSUB_Half);
+ this.groupBox2.Controls.Add(this.checkScreenHires);
+ this.groupBox2.Controls.Add(this.label37);
+ this.groupBox2.Controls.Add(this.label18391);
+ this.groupBox2.Controls.Add(this.checkEN0_OBJ);
+ this.groupBox2.Controls.Add(this.checkScreenOverscan);
+ this.groupBox2.Controls.Add(this.checkEN0_BG4);
+ this.groupBox2.Controls.Add(this.label198129381279841);
+ this.groupBox2.Controls.Add(this.checkEN0_BG3);
+ this.groupBox2.Controls.Add(this.checkScreenObjInterlace);
+ this.groupBox2.Controls.Add(this.checkEN0_BG2);
+ this.groupBox2.Controls.Add(this.label123812831);
+ this.groupBox2.Controls.Add(this.checkEN0_BG1);
+ this.groupBox2.Controls.Add(this.checkScreenInterlace);
+ this.groupBox2.Controls.Add(this.txtScreenCGADSUB_AddSub_Descr);
+ this.groupBox2.Controls.Add(this.label2193813);
+ this.groupBox2.Controls.Add(this.txtScreenCGADSUB_AddSub);
+ this.groupBox2.Controls.Add(this.label36);
+ this.groupBox2.Controls.Add(this.checkTMOBJ);
+ this.groupBox2.Controls.Add(this.checkTSOBJ);
+ this.groupBox2.Controls.Add(this.checkMathBK);
+ this.groupBox2.Controls.Add(this.label35);
+ this.groupBox2.Controls.Add(this.checkMathBG4);
+ this.groupBox2.Controls.Add(this.checkMathBG3);
+ this.groupBox2.Controls.Add(this.checkMathBG2);
+ this.groupBox2.Controls.Add(this.checkMathBG1);
+ this.groupBox2.Controls.Add(this.label33);
+ this.groupBox2.Controls.Add(this.checkMathOBJ);
+ this.groupBox2.Controls.Add(this.lblTS);
+ this.groupBox2.Controls.Add(this.checkTSBG4);
+ this.groupBox2.Controls.Add(this.checkTSBG3);
+ this.groupBox2.Controls.Add(this.checkTSBG2);
+ this.groupBox2.Controls.Add(this.checkTSBG1);
+ this.groupBox2.Controls.Add(this.lblTM);
+ this.groupBox2.Controls.Add(this.checkTMBG4);
+ this.groupBox2.Controls.Add(this.checkTMBG3);
+ this.groupBox2.Controls.Add(this.checkTMBG2);
+ this.groupBox2.Controls.Add(this.checkTMBG1);
+ this.groupBox2.Controls.Add(this.label32);
+ this.groupBox2.Controls.Add(this.label31);
this.groupBox2.Controls.Add(this.label25);
this.groupBox2.Controls.Add(this.txtScreenCGWSEL_MathFixed);
this.groupBox2.Controls.Add(this.label2893719831);
@@ -546,17 +764,6 @@
this.groupBox2.Controls.Add(this.label22);
this.groupBox2.Controls.Add(this.label27);
this.groupBox2.Controls.Add(this.checkScreenCGWSEL_DirectColor);
- this.groupBox2.Controls.Add(this.label2193813);
- this.groupBox2.Controls.Add(this.checkScreenInterlace);
- this.groupBox2.Controls.Add(this.label123812831);
- this.groupBox2.Controls.Add(this.checkScreenObjInterlace);
- this.groupBox2.Controls.Add(this.label198129381279841);
- this.groupBox2.Controls.Add(this.checkScreenOverscan);
- this.groupBox2.Controls.Add(this.label18391);
- this.groupBox2.Controls.Add(this.checkScreenHires);
- this.groupBox2.Controls.Add(this.label21);
- this.groupBox2.Controls.Add(this.checkScreenExtbg);
- this.groupBox2.Controls.Add(this.label20);
this.groupBox2.Controls.Add(this.label16);
this.groupBox2.Controls.Add(this.txtScreenBG4TSize);
this.groupBox2.Controls.Add(this.txtScreenBG3TSize);
@@ -570,20 +777,454 @@
this.groupBox2.Controls.Add(this.label8);
this.groupBox2.Controls.Add(this.label7);
this.groupBox2.Controls.Add(this.txtScreenBG1Bpp);
- this.groupBox2.Controls.Add(this.label6);
+ this.groupBox2.Controls.Add(this.lblBG3);
this.groupBox2.Controls.Add(this.label4);
this.groupBox2.Controls.Add(this.label5);
this.groupBox2.Location = new System.Drawing.Point(0, 0);
this.groupBox2.Name = "groupBox2";
- this.groupBox2.Size = new System.Drawing.Size(307, 165);
+ this.groupBox2.Size = new System.Drawing.Size(380, 211);
this.groupBox2.TabIndex = 16;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "Screen";
//
+ // label41
+ //
+ this.label41.AutoSize = true;
+ this.label41.Location = new System.Drawing.Point(10, 161);
+ this.label41.Name = "label41";
+ this.label41.Size = new System.Drawing.Size(41, 13);
+ this.label41.TabIndex = 101;
+ this.label41.Text = "EN.Pr3";
+ //
+ // checkEN1_OBJ
+ //
+ this.checkEN1_OBJ.AutoSize = true;
+ this.checkEN1_OBJ.Location = new System.Drawing.Point(53, 130);
+ this.checkEN1_OBJ.Name = "checkEN1_OBJ";
+ this.checkEN1_OBJ.Size = new System.Drawing.Size(15, 14);
+ this.checkEN1_OBJ.TabIndex = 100;
+ this.checkEN1_OBJ.UseVisualStyleBackColor = true;
+ this.checkEN1_OBJ.CheckedChanged += new System.EventHandler(this.checkEN_CheckedChanged);
+ //
+ // checkEN1_BG4
+ //
+ this.checkEN1_BG4.AutoSize = true;
+ this.checkEN1_BG4.Location = new System.Drawing.Point(145, 130);
+ this.checkEN1_BG4.Name = "checkEN1_BG4";
+ this.checkEN1_BG4.Size = new System.Drawing.Size(15, 14);
+ this.checkEN1_BG4.TabIndex = 99;
+ this.checkEN1_BG4.UseVisualStyleBackColor = true;
+ this.checkEN1_BG4.CheckedChanged += new System.EventHandler(this.checkEN_CheckedChanged);
+ //
+ // checkEN1_BG3
+ //
+ this.checkEN1_BG3.AutoSize = true;
+ this.checkEN1_BG3.Location = new System.Drawing.Point(122, 130);
+ this.checkEN1_BG3.Name = "checkEN1_BG3";
+ this.checkEN1_BG3.Size = new System.Drawing.Size(15, 14);
+ this.checkEN1_BG3.TabIndex = 98;
+ this.checkEN1_BG3.UseVisualStyleBackColor = true;
+ this.checkEN1_BG3.CheckedChanged += new System.EventHandler(this.checkEN_CheckedChanged);
+ //
+ // checkEN1_BG2
+ //
+ this.checkEN1_BG2.AutoSize = true;
+ this.checkEN1_BG2.Location = new System.Drawing.Point(99, 130);
+ this.checkEN1_BG2.Name = "checkEN1_BG2";
+ this.checkEN1_BG2.Size = new System.Drawing.Size(15, 14);
+ this.checkEN1_BG2.TabIndex = 97;
+ this.checkEN1_BG2.UseVisualStyleBackColor = true;
+ this.checkEN1_BG2.CheckedChanged += new System.EventHandler(this.checkEN_CheckedChanged);
+ //
+ // checkEN1_BG1
+ //
+ this.checkEN1_BG1.AutoSize = true;
+ this.checkEN1_BG1.Location = new System.Drawing.Point(76, 130);
+ this.checkEN1_BG1.Name = "checkEN1_BG1";
+ this.checkEN1_BG1.Size = new System.Drawing.Size(15, 14);
+ this.checkEN1_BG1.TabIndex = 96;
+ this.checkEN1_BG1.UseVisualStyleBackColor = true;
+ this.checkEN1_BG1.CheckedChanged += new System.EventHandler(this.checkEN_CheckedChanged);
+ //
+ // checkEN3_OBJ
+ //
+ this.checkEN3_OBJ.AutoSize = true;
+ this.checkEN3_OBJ.Location = new System.Drawing.Point(53, 161);
+ this.checkEN3_OBJ.Name = "checkEN3_OBJ";
+ this.checkEN3_OBJ.Size = new System.Drawing.Size(15, 14);
+ this.checkEN3_OBJ.TabIndex = 95;
+ this.checkEN3_OBJ.UseVisualStyleBackColor = true;
+ this.checkEN3_OBJ.CheckedChanged += new System.EventHandler(this.checkEN_CheckedChanged);
+ //
+ // checkEN2_OBJ
+ //
+ this.checkEN2_OBJ.AutoSize = true;
+ this.checkEN2_OBJ.Location = new System.Drawing.Point(53, 146);
+ this.checkEN2_OBJ.Name = "checkEN2_OBJ";
+ this.checkEN2_OBJ.Size = new System.Drawing.Size(15, 14);
+ this.checkEN2_OBJ.TabIndex = 94;
+ this.checkEN2_OBJ.UseVisualStyleBackColor = true;
+ this.checkEN2_OBJ.CheckedChanged += new System.EventHandler(this.checkEN_CheckedChanged);
+ //
+ // label40
+ //
+ this.label40.AutoSize = true;
+ this.label40.Location = new System.Drawing.Point(10, 146);
+ this.label40.Name = "label40";
+ this.label40.Size = new System.Drawing.Size(41, 13);
+ this.label40.TabIndex = 93;
+ this.label40.Text = "EN.Pr2";
+ //
+ // label39
+ //
+ this.label39.AutoSize = true;
+ this.label39.Location = new System.Drawing.Point(162, 130);
+ this.label39.Name = "label39";
+ this.label39.Size = new System.Drawing.Size(41, 13);
+ this.label39.TabIndex = 92;
+ this.label39.Text = "EN.Pr1";
+ //
+ // label38
+ //
+ this.label38.AutoSize = true;
+ this.label38.Location = new System.Drawing.Point(228, 131);
+ this.label38.Name = "label38";
+ this.label38.Size = new System.Drawing.Size(26, 13);
+ this.label38.TabIndex = 91;
+ this.label38.Text = "Half";
+ //
+ // txtScreenCGADSUB_Half
+ //
+ this.txtScreenCGADSUB_Half.AutoSize = true;
+ this.txtScreenCGADSUB_Half.Enabled = false;
+ this.txtScreenCGADSUB_Half.Location = new System.Drawing.Point(213, 131);
+ this.txtScreenCGADSUB_Half.Name = "txtScreenCGADSUB_Half";
+ this.txtScreenCGADSUB_Half.Size = new System.Drawing.Size(15, 14);
+ this.txtScreenCGADSUB_Half.TabIndex = 90;
+ this.txtScreenCGADSUB_Half.UseVisualStyleBackColor = true;
+ //
+ // label37
+ //
+ this.label37.AutoSize = true;
+ this.label37.Location = new System.Drawing.Point(162, 115);
+ this.label37.Name = "label37";
+ this.label37.Size = new System.Drawing.Size(41, 13);
+ this.label37.TabIndex = 89;
+ this.label37.Text = "EN.Pr0";
+ //
+ // checkEN0_OBJ
+ //
+ this.checkEN0_OBJ.AutoSize = true;
+ this.checkEN0_OBJ.Location = new System.Drawing.Point(53, 114);
+ this.checkEN0_OBJ.Name = "checkEN0_OBJ";
+ this.checkEN0_OBJ.Size = new System.Drawing.Size(15, 14);
+ this.checkEN0_OBJ.TabIndex = 88;
+ this.checkEN0_OBJ.UseVisualStyleBackColor = true;
+ this.checkEN0_OBJ.CheckedChanged += new System.EventHandler(this.checkEN_CheckedChanged);
+ //
+ // checkEN0_BG4
+ //
+ this.checkEN0_BG4.AutoSize = true;
+ this.checkEN0_BG4.Location = new System.Drawing.Point(145, 114);
+ this.checkEN0_BG4.Name = "checkEN0_BG4";
+ this.checkEN0_BG4.Size = new System.Drawing.Size(15, 14);
+ this.checkEN0_BG4.TabIndex = 87;
+ this.checkEN0_BG4.UseVisualStyleBackColor = true;
+ this.checkEN0_BG4.CheckedChanged += new System.EventHandler(this.checkEN_CheckedChanged);
+ //
+ // checkEN0_BG3
+ //
+ this.checkEN0_BG3.AutoSize = true;
+ this.checkEN0_BG3.Location = new System.Drawing.Point(122, 114);
+ this.checkEN0_BG3.Name = "checkEN0_BG3";
+ this.checkEN0_BG3.Size = new System.Drawing.Size(15, 14);
+ this.checkEN0_BG3.TabIndex = 86;
+ this.checkEN0_BG3.UseVisualStyleBackColor = true;
+ this.checkEN0_BG3.CheckedChanged += new System.EventHandler(this.checkEN_CheckedChanged);
+ //
+ // checkEN0_BG2
+ //
+ this.checkEN0_BG2.AutoSize = true;
+ this.checkEN0_BG2.Location = new System.Drawing.Point(99, 114);
+ this.checkEN0_BG2.Name = "checkEN0_BG2";
+ this.checkEN0_BG2.Size = new System.Drawing.Size(15, 14);
+ this.checkEN0_BG2.TabIndex = 85;
+ this.checkEN0_BG2.UseVisualStyleBackColor = true;
+ this.checkEN0_BG2.CheckedChanged += new System.EventHandler(this.checkEN_CheckedChanged);
+ //
+ // checkEN0_BG1
+ //
+ this.checkEN0_BG1.AutoSize = true;
+ this.checkEN0_BG1.Location = new System.Drawing.Point(76, 114);
+ this.checkEN0_BG1.Name = "checkEN0_BG1";
+ this.checkEN0_BG1.Size = new System.Drawing.Size(15, 14);
+ this.checkEN0_BG1.TabIndex = 84;
+ this.checkEN0_BG1.UseVisualStyleBackColor = true;
+ this.checkEN0_BG1.CheckedChanged += new System.EventHandler(this.checkEN_CheckedChanged);
+ //
+ // txtScreenCGADSUB_AddSub_Descr
+ //
+ this.txtScreenCGADSUB_AddSub_Descr.Location = new System.Drawing.Point(233, 112);
+ this.txtScreenCGADSUB_AddSub_Descr.Multiline = true;
+ this.txtScreenCGADSUB_AddSub_Descr.Name = "txtScreenCGADSUB_AddSub_Descr";
+ this.txtScreenCGADSUB_AddSub_Descr.ReadOnly = true;
+ this.txtScreenCGADSUB_AddSub_Descr.Size = new System.Drawing.Size(31, 17);
+ this.txtScreenCGADSUB_AddSub_Descr.TabIndex = 39;
+ this.txtScreenCGADSUB_AddSub_Descr.Text = "ADD";
+ //
+ // txtScreenCGADSUB_AddSub
+ //
+ this.txtScreenCGADSUB_AddSub.BackColor = System.Drawing.Color.LightGreen;
+ this.txtScreenCGADSUB_AddSub.Location = new System.Drawing.Point(212, 112);
+ this.txtScreenCGADSUB_AddSub.Multiline = true;
+ this.txtScreenCGADSUB_AddSub.Name = "txtScreenCGADSUB_AddSub";
+ this.txtScreenCGADSUB_AddSub.ReadOnly = true;
+ this.txtScreenCGADSUB_AddSub.Size = new System.Drawing.Size(15, 17);
+ this.txtScreenCGADSUB_AddSub.TabIndex = 83;
+ this.txtScreenCGADSUB_AddSub.Text = "00";
+ //
+ // label36
+ //
+ this.label36.AutoSize = true;
+ this.label36.Location = new System.Drawing.Point(205, 96);
+ this.label36.Name = "label36";
+ this.label36.Size = new System.Drawing.Size(59, 13);
+ this.label36.TabIndex = 82;
+ this.label36.Text = "CGADSUB";
+ //
+ // checkTMOBJ
+ //
+ this.checkTMOBJ.AutoSize = true;
+ this.checkTMOBJ.CheckBackColor = System.Drawing.SystemColors.Control;
+ this.checkTMOBJ.ForceChecked = null;
+ this.checkTMOBJ.Location = new System.Drawing.Point(53, 62);
+ this.checkTMOBJ.Name = "checkTMOBJ";
+ this.checkTMOBJ.Size = new System.Drawing.Size(15, 14);
+ this.checkTMOBJ.TabIndex = 81;
+ this.checkTMOBJ.UseVisualStyleBackColor = true;
+ //
+ // checkTSOBJ
+ //
+ this.checkTSOBJ.AutoSize = true;
+ this.checkTSOBJ.CheckBackColor = System.Drawing.SystemColors.Control;
+ this.checkTSOBJ.ForceChecked = null;
+ this.checkTSOBJ.Location = new System.Drawing.Point(53, 77);
+ this.checkTSOBJ.Name = "checkTSOBJ";
+ this.checkTSOBJ.Size = new System.Drawing.Size(15, 14);
+ this.checkTSOBJ.TabIndex = 80;
+ this.checkTSOBJ.UseVisualStyleBackColor = true;
+ //
+ // checkMathBK
+ //
+ this.checkMathBK.AutoSize = true;
+ this.checkMathBK.CheckBackColor = System.Drawing.SystemColors.Control;
+ this.checkMathBK.ForceChecked = null;
+ this.checkMathBK.Location = new System.Drawing.Point(30, 93);
+ this.checkMathBK.Name = "checkMathBK";
+ this.checkMathBK.Size = new System.Drawing.Size(15, 14);
+ this.checkMathBK.TabIndex = 79;
+ this.checkMathBK.UseVisualStyleBackColor = true;
+ //
+ // label35
+ //
+ this.label35.Location = new System.Drawing.Point(28, 110);
+ this.label35.Name = "label35";
+ this.label35.Size = new System.Drawing.Size(172, 2);
+ this.label35.TabIndex = 78;
+ this.label35.Text = "label35";
+ //
+ // checkMathBG4
+ //
+ this.checkMathBG4.AutoSize = true;
+ this.checkMathBG4.CheckBackColor = System.Drawing.SystemColors.Control;
+ this.checkMathBG4.ForceChecked = null;
+ this.checkMathBG4.Location = new System.Drawing.Point(145, 94);
+ this.checkMathBG4.Name = "checkMathBG4";
+ this.checkMathBG4.Size = new System.Drawing.Size(15, 14);
+ this.checkMathBG4.TabIndex = 77;
+ this.checkMathBG4.UseVisualStyleBackColor = true;
+ //
+ // checkMathBG3
+ //
+ this.checkMathBG3.AutoSize = true;
+ this.checkMathBG3.CheckBackColor = System.Drawing.SystemColors.Control;
+ this.checkMathBG3.ForceChecked = null;
+ this.checkMathBG3.Location = new System.Drawing.Point(122, 94);
+ this.checkMathBG3.Name = "checkMathBG3";
+ this.checkMathBG3.Size = new System.Drawing.Size(15, 14);
+ this.checkMathBG3.TabIndex = 76;
+ this.checkMathBG3.UseVisualStyleBackColor = true;
+ //
+ // checkMathBG2
+ //
+ this.checkMathBG2.AutoSize = true;
+ this.checkMathBG2.CheckBackColor = System.Drawing.SystemColors.Control;
+ this.checkMathBG2.ForceChecked = null;
+ this.checkMathBG2.Location = new System.Drawing.Point(99, 94);
+ this.checkMathBG2.Name = "checkMathBG2";
+ this.checkMathBG2.Size = new System.Drawing.Size(15, 14);
+ this.checkMathBG2.TabIndex = 75;
+ this.checkMathBG2.UseVisualStyleBackColor = true;
+ //
+ // checkMathBG1
+ //
+ this.checkMathBG1.AutoSize = true;
+ this.checkMathBG1.CheckBackColor = System.Drawing.SystemColors.Control;
+ this.checkMathBG1.ForceChecked = null;
+ this.checkMathBG1.Location = new System.Drawing.Point(76, 94);
+ this.checkMathBG1.Name = "checkMathBG1";
+ this.checkMathBG1.Size = new System.Drawing.Size(15, 14);
+ this.checkMathBG1.TabIndex = 74;
+ this.checkMathBG1.UseVisualStyleBackColor = true;
+ //
+ // label33
+ //
+ this.label33.AutoSize = true;
+ this.label33.Location = new System.Drawing.Point(162, 94);
+ this.label33.Name = "label33";
+ this.label33.Size = new System.Drawing.Size(31, 13);
+ this.label33.TabIndex = 73;
+ this.label33.Text = "Math";
+ //
+ // checkMathOBJ
+ //
+ this.checkMathOBJ.AutoSize = true;
+ this.checkMathOBJ.CheckBackColor = System.Drawing.SystemColors.Control;
+ this.checkMathOBJ.ForceChecked = null;
+ this.checkMathOBJ.Location = new System.Drawing.Point(53, 94);
+ this.checkMathOBJ.Name = "checkMathOBJ";
+ this.checkMathOBJ.Size = new System.Drawing.Size(15, 14);
+ this.checkMathOBJ.TabIndex = 72;
+ this.checkMathOBJ.UseVisualStyleBackColor = true;
+ //
+ // lblTS
+ //
+ this.lblTS.AutoSize = true;
+ this.lblTS.Location = new System.Drawing.Point(162, 78);
+ this.lblTS.Name = "lblTS";
+ this.lblTS.Size = new System.Drawing.Size(21, 13);
+ this.lblTS.TabIndex = 71;
+ this.lblTS.Text = "TS";
+ //
+ // checkTSBG4
+ //
+ this.checkTSBG4.AutoSize = true;
+ this.checkTSBG4.CheckBackColor = System.Drawing.SystemColors.Control;
+ this.checkTSBG4.ForceChecked = null;
+ this.checkTSBG4.Location = new System.Drawing.Point(145, 78);
+ this.checkTSBG4.Name = "checkTSBG4";
+ this.checkTSBG4.Size = new System.Drawing.Size(15, 14);
+ this.checkTSBG4.TabIndex = 70;
+ this.checkTSBG4.UseVisualStyleBackColor = true;
+ //
+ // checkTSBG3
+ //
+ this.checkTSBG3.AutoSize = true;
+ this.checkTSBG3.CheckBackColor = System.Drawing.SystemColors.Control;
+ this.checkTSBG3.ForceChecked = null;
+ this.checkTSBG3.Location = new System.Drawing.Point(122, 78);
+ this.checkTSBG3.Name = "checkTSBG3";
+ this.checkTSBG3.Size = new System.Drawing.Size(15, 14);
+ this.checkTSBG3.TabIndex = 69;
+ this.checkTSBG3.UseVisualStyleBackColor = true;
+ //
+ // checkTSBG2
+ //
+ this.checkTSBG2.AutoSize = true;
+ this.checkTSBG2.CheckBackColor = System.Drawing.SystemColors.Control;
+ this.checkTSBG2.ForceChecked = null;
+ this.checkTSBG2.Location = new System.Drawing.Point(99, 78);
+ this.checkTSBG2.Name = "checkTSBG2";
+ this.checkTSBG2.Size = new System.Drawing.Size(15, 14);
+ this.checkTSBG2.TabIndex = 68;
+ this.checkTSBG2.UseVisualStyleBackColor = true;
+ //
+ // checkTSBG1
+ //
+ this.checkTSBG1.AutoSize = true;
+ this.checkTSBG1.CheckBackColor = System.Drawing.SystemColors.Control;
+ this.checkTSBG1.ForceChecked = null;
+ this.checkTSBG1.Location = new System.Drawing.Point(76, 78);
+ this.checkTSBG1.Name = "checkTSBG1";
+ this.checkTSBG1.Size = new System.Drawing.Size(15, 14);
+ this.checkTSBG1.TabIndex = 67;
+ this.checkTSBG1.UseVisualStyleBackColor = true;
+ //
+ // lblTM
+ //
+ this.lblTM.AutoSize = true;
+ this.lblTM.Location = new System.Drawing.Point(162, 63);
+ this.lblTM.Name = "lblTM";
+ this.lblTM.Size = new System.Drawing.Size(23, 13);
+ this.lblTM.TabIndex = 66;
+ this.lblTM.Text = "TM";
+ //
+ // checkTMBG4
+ //
+ this.checkTMBG4.AutoSize = true;
+ this.checkTMBG4.CheckBackColor = System.Drawing.SystemColors.Control;
+ this.checkTMBG4.ForceChecked = null;
+ this.checkTMBG4.Location = new System.Drawing.Point(145, 63);
+ this.checkTMBG4.Name = "checkTMBG4";
+ this.checkTMBG4.Size = new System.Drawing.Size(15, 14);
+ this.checkTMBG4.TabIndex = 65;
+ this.checkTMBG4.UseVisualStyleBackColor = true;
+ //
+ // checkTMBG3
+ //
+ this.checkTMBG3.AutoSize = true;
+ this.checkTMBG3.CheckBackColor = System.Drawing.SystemColors.Control;
+ this.checkTMBG3.ForceChecked = null;
+ this.checkTMBG3.Location = new System.Drawing.Point(122, 63);
+ this.checkTMBG3.Name = "checkTMBG3";
+ this.checkTMBG3.Size = new System.Drawing.Size(15, 14);
+ this.checkTMBG3.TabIndex = 64;
+ this.checkTMBG3.UseVisualStyleBackColor = true;
+ //
+ // checkTMBG2
+ //
+ this.checkTMBG2.AutoSize = true;
+ this.checkTMBG2.CheckBackColor = System.Drawing.SystemColors.Control;
+ this.checkTMBG2.ForceChecked = null;
+ this.checkTMBG2.Location = new System.Drawing.Point(99, 63);
+ this.checkTMBG2.Name = "checkTMBG2";
+ this.checkTMBG2.Size = new System.Drawing.Size(15, 14);
+ this.checkTMBG2.TabIndex = 63;
+ this.checkTMBG2.UseVisualStyleBackColor = true;
+ //
+ // checkTMBG1
+ //
+ this.checkTMBG1.AutoSize = true;
+ this.checkTMBG1.CheckBackColor = System.Drawing.SystemColors.Control;
+ this.checkTMBG1.ForceChecked = null;
+ this.checkTMBG1.Location = new System.Drawing.Point(76, 63);
+ this.checkTMBG1.Name = "checkTMBG1";
+ this.checkTMBG1.Size = new System.Drawing.Size(15, 14);
+ this.checkTMBG1.TabIndex = 62;
+ this.checkTMBG1.UseVisualStyleBackColor = true;
+ //
+ // label32
+ //
+ this.label32.AutoSize = true;
+ this.label32.Location = new System.Drawing.Point(46, 46);
+ this.label32.Name = "label32";
+ this.label32.Size = new System.Drawing.Size(27, 13);
+ this.label32.TabIndex = 57;
+ this.label32.Text = "OBJ";
+ //
+ // label31
+ //
+ this.label31.AutoSize = true;
+ this.label31.Location = new System.Drawing.Point(26, 78);
+ this.label31.Name = "label31";
+ this.label31.Size = new System.Drawing.Size(21, 13);
+ this.label31.TabIndex = 56;
+ this.label31.Text = "BK";
+ //
// label25
//
this.label25.AutoSize = true;
- this.label25.Location = new System.Drawing.Point(91, 125);
+ this.label25.Location = new System.Drawing.Point(228, 64);
this.label25.Name = "label25";
this.label25.Size = new System.Drawing.Size(61, 13);
this.label25.TabIndex = 44;
@@ -592,7 +1233,7 @@
// txtScreenCGWSEL_MathFixed
//
this.txtScreenCGWSEL_MathFixed.BackColor = System.Drawing.Color.LightGreen;
- this.txtScreenCGWSEL_MathFixed.Location = new System.Drawing.Point(75, 123);
+ this.txtScreenCGWSEL_MathFixed.Location = new System.Drawing.Point(212, 62);
this.txtScreenCGWSEL_MathFixed.Multiline = true;
this.txtScreenCGWSEL_MathFixed.Name = "txtScreenCGWSEL_MathFixed";
this.txtScreenCGWSEL_MathFixed.ReadOnly = true;
@@ -603,16 +1244,16 @@
// label2893719831
//
this.label2893719831.AutoSize = true;
- this.label2893719831.Location = new System.Drawing.Point(91, 106);
+ this.label2893719831.Location = new System.Drawing.Point(228, 45);
this.label2893719831.Name = "label2893719831";
- this.label2893719831.Size = new System.Drawing.Size(76, 13);
+ this.label2893719831.Size = new System.Drawing.Size(52, 13);
this.label2893719831.TabIndex = 42;
- this.label2893719831.Text = "ColorSubMask";
+ this.label2893719831.Text = "SubMask";
//
// txtScreenCGWSEL_ColorSubMask
//
this.txtScreenCGWSEL_ColorSubMask.BackColor = System.Drawing.Color.LightGreen;
- this.txtScreenCGWSEL_ColorSubMask.Location = new System.Drawing.Point(75, 104);
+ this.txtScreenCGWSEL_ColorSubMask.Location = new System.Drawing.Point(212, 43);
this.txtScreenCGWSEL_ColorSubMask.Multiline = true;
this.txtScreenCGWSEL_ColorSubMask.Name = "txtScreenCGWSEL_ColorSubMask";
this.txtScreenCGWSEL_ColorSubMask.ReadOnly = true;
@@ -623,16 +1264,16 @@
// label23
//
this.label23.AutoSize = true;
- this.label23.Location = new System.Drawing.Point(91, 88);
+ this.label23.Location = new System.Drawing.Point(228, 27);
this.label23.Name = "label23";
- this.label23.Size = new System.Drawing.Size(57, 13);
+ this.label23.Size = new System.Drawing.Size(56, 13);
this.label23.TabIndex = 40;
- this.label23.Text = "ColorMask";
+ this.label23.Text = "MainMask";
//
// txtScreenCGWSEL_ColorMask
//
this.txtScreenCGWSEL_ColorMask.BackColor = System.Drawing.Color.LightGreen;
- this.txtScreenCGWSEL_ColorMask.Location = new System.Drawing.Point(75, 86);
+ this.txtScreenCGWSEL_ColorMask.Location = new System.Drawing.Point(212, 25);
this.txtScreenCGWSEL_ColorMask.Multiline = true;
this.txtScreenCGWSEL_ColorMask.Name = "txtScreenCGWSEL_ColorMask";
this.txtScreenCGWSEL_ColorMask.ReadOnly = true;
@@ -643,7 +1284,7 @@
// label22
//
this.label22.AutoSize = true;
- this.label22.Location = new System.Drawing.Point(72, 73);
+ this.label22.Location = new System.Drawing.Point(205, 12);
this.label22.Name = "label22";
this.label22.Size = new System.Drawing.Size(53, 13);
this.label22.TabIndex = 32;
@@ -652,7 +1293,7 @@
// label27
//
this.label27.AutoSize = true;
- this.label27.Location = new System.Drawing.Point(90, 142);
+ this.label27.Location = new System.Drawing.Point(228, 81);
this.label27.Name = "label27";
this.label27.Size = new System.Drawing.Size(59, 13);
this.label27.TabIndex = 31;
@@ -662,120 +1303,16 @@
//
this.checkScreenCGWSEL_DirectColor.AutoSize = true;
this.checkScreenCGWSEL_DirectColor.Enabled = false;
- this.checkScreenCGWSEL_DirectColor.Location = new System.Drawing.Point(76, 142);
+ this.checkScreenCGWSEL_DirectColor.Location = new System.Drawing.Point(213, 81);
this.checkScreenCGWSEL_DirectColor.Name = "checkScreenCGWSEL_DirectColor";
this.checkScreenCGWSEL_DirectColor.Size = new System.Drawing.Size(15, 14);
this.checkScreenCGWSEL_DirectColor.TabIndex = 30;
this.checkScreenCGWSEL_DirectColor.UseVisualStyleBackColor = true;
//
- // label2193813
- //
- this.label2193813.AutoSize = true;
- this.label2193813.Location = new System.Drawing.Point(25, 143);
- this.label2193813.Name = "label2193813";
- this.label2193813.Size = new System.Drawing.Size(48, 13);
- this.label2193813.TabIndex = 31;
- this.label2193813.Text = "S.INTLC";
- //
- // checkScreenInterlace
- //
- this.checkScreenInterlace.AutoSize = true;
- this.checkScreenInterlace.Enabled = false;
- this.checkScreenInterlace.Location = new System.Drawing.Point(11, 143);
- this.checkScreenInterlace.Name = "checkScreenInterlace";
- this.checkScreenInterlace.Size = new System.Drawing.Size(15, 14);
- this.checkScreenInterlace.TabIndex = 30;
- this.checkScreenInterlace.UseVisualStyleBackColor = true;
- //
- // label123812831
- //
- this.label123812831.AutoSize = true;
- this.label123812831.Location = new System.Drawing.Point(25, 130);
- this.label123812831.Name = "label123812831";
- this.label123812831.Size = new System.Drawing.Size(49, 13);
- this.label123812831.TabIndex = 29;
- this.label123812831.Text = "O.INTLC";
- //
- // checkScreenObjInterlace
- //
- this.checkScreenObjInterlace.AutoSize = true;
- this.checkScreenObjInterlace.Enabled = false;
- this.checkScreenObjInterlace.Location = new System.Drawing.Point(11, 130);
- this.checkScreenObjInterlace.Name = "checkScreenObjInterlace";
- this.checkScreenObjInterlace.Size = new System.Drawing.Size(15, 14);
- this.checkScreenObjInterlace.TabIndex = 28;
- this.checkScreenObjInterlace.UseVisualStyleBackColor = true;
- //
- // label198129381279841
- //
- this.label198129381279841.AutoSize = true;
- this.label198129381279841.Location = new System.Drawing.Point(25, 117);
- this.label198129381279841.Name = "label198129381279841";
- this.label198129381279841.Size = new System.Drawing.Size(47, 13);
- this.label198129381279841.TabIndex = 27;
- this.label198129381279841.Text = "O.SCAN";
- //
- // checkScreenOverscan
- //
- this.checkScreenOverscan.AutoSize = true;
- this.checkScreenOverscan.Enabled = false;
- this.checkScreenOverscan.Location = new System.Drawing.Point(11, 117);
- this.checkScreenOverscan.Name = "checkScreenOverscan";
- this.checkScreenOverscan.Size = new System.Drawing.Size(15, 14);
- this.checkScreenOverscan.TabIndex = 26;
- this.checkScreenOverscan.UseVisualStyleBackColor = true;
- //
- // label18391
- //
- this.label18391.AutoSize = true;
- this.label18391.Location = new System.Drawing.Point(25, 103);
- this.label18391.Name = "label18391";
- this.label18391.Size = new System.Drawing.Size(40, 13);
- this.label18391.TabIndex = 25;
- this.label18391.Text = "HIRES";
- //
- // checkScreenHires
- //
- this.checkScreenHires.AutoSize = true;
- this.checkScreenHires.Enabled = false;
- this.checkScreenHires.Location = new System.Drawing.Point(11, 103);
- this.checkScreenHires.Name = "checkScreenHires";
- this.checkScreenHires.Size = new System.Drawing.Size(15, 14);
- this.checkScreenHires.TabIndex = 24;
- this.checkScreenHires.UseVisualStyleBackColor = true;
- //
- // label21
- //
- this.label21.AutoSize = true;
- this.label21.Location = new System.Drawing.Point(25, 89);
- this.label21.Name = "label21";
- this.label21.Size = new System.Drawing.Size(43, 13);
- this.label21.TabIndex = 23;
- this.label21.Text = "EXTBG";
- //
- // checkScreenExtbg
- //
- this.checkScreenExtbg.AutoSize = true;
- this.checkScreenExtbg.Enabled = false;
- this.checkScreenExtbg.Location = new System.Drawing.Point(11, 89);
- this.checkScreenExtbg.Name = "checkScreenExtbg";
- this.checkScreenExtbg.Size = new System.Drawing.Size(15, 14);
- this.checkScreenExtbg.TabIndex = 22;
- this.checkScreenExtbg.UseVisualStyleBackColor = true;
- //
- // label20
- //
- this.label20.AutoSize = true;
- this.label20.Location = new System.Drawing.Point(2, 73);
- this.label20.Name = "label20";
- this.label20.Size = new System.Drawing.Size(42, 13);
- this.label20.TabIndex = 21;
- this.label20.Text = "SETINI";
- //
// label16
//
this.label16.AutoSize = true;
- this.label16.Location = new System.Drawing.Point(170, 53);
+ this.label16.Location = new System.Drawing.Point(162, 46);
this.label16.Name = "label16";
this.label16.Size = new System.Drawing.Size(34, 13);
this.label16.TabIndex = 20;
@@ -783,7 +1320,7 @@
//
// txtScreenBG4TSize
//
- this.txtScreenBG4TSize.Location = new System.Drawing.Point(151, 51);
+ this.txtScreenBG4TSize.Location = new System.Drawing.Point(143, 44);
this.txtScreenBG4TSize.Multiline = true;
this.txtScreenBG4TSize.Name = "txtScreenBG4TSize";
this.txtScreenBG4TSize.ReadOnly = true;
@@ -793,7 +1330,7 @@
//
// txtScreenBG3TSize
//
- this.txtScreenBG3TSize.Location = new System.Drawing.Point(126, 51);
+ this.txtScreenBG3TSize.Location = new System.Drawing.Point(120, 44);
this.txtScreenBG3TSize.Multiline = true;
this.txtScreenBG3TSize.Name = "txtScreenBG3TSize";
this.txtScreenBG3TSize.ReadOnly = true;
@@ -803,7 +1340,7 @@
//
// txtScreenBG2TSize
//
- this.txtScreenBG2TSize.Location = new System.Drawing.Point(102, 51);
+ this.txtScreenBG2TSize.Location = new System.Drawing.Point(97, 44);
this.txtScreenBG2TSize.Multiline = true;
this.txtScreenBG2TSize.Name = "txtScreenBG2TSize";
this.txtScreenBG2TSize.ReadOnly = true;
@@ -813,7 +1350,7 @@
//
// txtScreenBG1TSize
//
- this.txtScreenBG1TSize.Location = new System.Drawing.Point(78, 51);
+ this.txtScreenBG1TSize.Location = new System.Drawing.Point(74, 44);
this.txtScreenBG1TSize.Multiline = true;
this.txtScreenBG1TSize.Name = "txtScreenBG1TSize";
this.txtScreenBG1TSize.ReadOnly = true;
@@ -823,7 +1360,7 @@
//
// txtScreenBG4Bpp
//
- this.txtScreenBG4Bpp.Location = new System.Drawing.Point(151, 28);
+ this.txtScreenBG4Bpp.Location = new System.Drawing.Point(143, 26);
this.txtScreenBG4Bpp.Multiline = true;
this.txtScreenBG4Bpp.Name = "txtScreenBG4Bpp";
this.txtScreenBG4Bpp.ReadOnly = true;
@@ -834,7 +1371,7 @@
// label1
//
this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(37, 30);
+ this.label1.Location = new System.Drawing.Point(4, 20);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(34, 13);
this.label1.TabIndex = 0;
@@ -842,7 +1379,7 @@
//
// txtScreenBG3Bpp
//
- this.txtScreenBG3Bpp.Location = new System.Drawing.Point(126, 28);
+ this.txtScreenBG3Bpp.Location = new System.Drawing.Point(120, 26);
this.txtScreenBG3Bpp.Multiline = true;
this.txtScreenBG3Bpp.Name = "txtScreenBG3Bpp";
this.txtScreenBG3Bpp.ReadOnly = true;
@@ -853,7 +1390,7 @@
// txtModeBits
//
this.txtModeBits.BackColor = System.Drawing.Color.LightGreen;
- this.txtModeBits.Location = new System.Drawing.Point(6, 28);
+ this.txtModeBits.Location = new System.Drawing.Point(40, 19);
this.txtModeBits.Multiline = true;
this.txtModeBits.Name = "txtModeBits";
this.txtModeBits.ReadOnly = true;
@@ -863,7 +1400,7 @@
//
// txtScreenBG2Bpp
//
- this.txtScreenBG2Bpp.Location = new System.Drawing.Point(102, 28);
+ this.txtScreenBG2Bpp.Location = new System.Drawing.Point(97, 26);
this.txtScreenBG2Bpp.Multiline = true;
this.txtScreenBG2Bpp.Name = "txtScreenBG2Bpp";
this.txtScreenBG2Bpp.ReadOnly = true;
@@ -874,7 +1411,7 @@
// label8
//
this.label8.AutoSize = true;
- this.label8.Location = new System.Drawing.Point(170, 29);
+ this.label8.Location = new System.Drawing.Point(162, 27);
this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(25, 13);
this.label8.TabIndex = 7;
@@ -883,7 +1420,7 @@
// label7
//
this.label7.AutoSize = true;
- this.label7.Location = new System.Drawing.Point(147, 12);
+ this.label7.Location = new System.Drawing.Point(142, 10);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(28, 13);
this.label7.TabIndex = 12;
@@ -891,7 +1428,7 @@
//
// txtScreenBG1Bpp
//
- this.txtScreenBG1Bpp.Location = new System.Drawing.Point(78, 28);
+ this.txtScreenBG1Bpp.Location = new System.Drawing.Point(74, 26);
this.txtScreenBG1Bpp.Multiline = true;
this.txtScreenBG1Bpp.Name = "txtScreenBG1Bpp";
this.txtScreenBG1Bpp.ReadOnly = true;
@@ -899,19 +1436,20 @@
this.txtScreenBG1Bpp.TabIndex = 8;
this.txtScreenBG1Bpp.Text = "8";
//
- // label6
+ // lblBG3
//
- this.label6.AutoSize = true;
- this.label6.Location = new System.Drawing.Point(123, 12);
- this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(28, 13);
- this.label6.TabIndex = 11;
- this.label6.Text = "BG3";
+ this.lblBG3.AutoSize = true;
+ this.lblBG3.Location = new System.Drawing.Point(117, 10);
+ this.lblBG3.Name = "lblBG3";
+ this.lblBG3.Size = new System.Drawing.Size(28, 13);
+ this.lblBG3.TabIndex = 11;
+ this.lblBG3.Text = "BG3";
+ this.toolTip1.SetToolTip(this.lblBG3, "Test");
//
// label4
//
this.label4.AutoSize = true;
- this.label4.Location = new System.Drawing.Point(74, 12);
+ this.label4.Location = new System.Drawing.Point(69, 10);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(28, 13);
this.label4.TabIndex = 9;
@@ -920,7 +1458,7 @@
// label5
//
this.label5.AutoSize = true;
- this.label5.Location = new System.Drawing.Point(98, 12);
+ this.label5.Location = new System.Drawing.Point(93, 10);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(28, 13);
this.label5.TabIndex = 10;
@@ -928,8 +1466,8 @@
//
// groupBox1
//
+ this.groupBox1.Controls.Add(this.txtBGPaletteInfo);
this.groupBox1.Controls.Add(this.rbBG4);
- this.groupBox1.Controls.Add(this.label18);
this.groupBox1.Controls.Add(this.rbBG3);
this.groupBox1.Controls.Add(this.rbBG2);
this.groupBox1.Controls.Add(this.rbBG1);
@@ -953,9 +1491,9 @@
this.groupBox1.Controls.Add(this.txtBG1SizeInTiles);
this.groupBox1.Controls.Add(this.label2);
this.groupBox1.Controls.Add(this.txtBG1SizeBits);
- this.groupBox1.Location = new System.Drawing.Point(0, 168);
+ this.groupBox1.Location = new System.Drawing.Point(0, 217);
this.groupBox1.Name = "groupBox1";
- this.groupBox1.Size = new System.Drawing.Size(229, 245);
+ this.groupBox1.Size = new System.Drawing.Size(170, 208);
this.groupBox1.TabIndex = 3;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "BG";
@@ -963,7 +1501,7 @@
// rbBG4
//
this.rbBG4.AutoSize = true;
- this.rbBG4.Location = new System.Drawing.Point(175, 42);
+ this.rbBG4.Location = new System.Drawing.Point(120, 32);
this.rbBG4.Name = "rbBG4";
this.rbBG4.Size = new System.Drawing.Size(46, 17);
this.rbBG4.TabIndex = 35;
@@ -972,19 +1510,10 @@
this.rbBG4.UseVisualStyleBackColor = true;
this.rbBG4.CheckedChanged += new System.EventHandler(this.rbBGX_CheckedChanged);
//
- // label18
- //
- this.label18.AutoSize = true;
- this.label18.Location = new System.Drawing.Point(161, 170);
- this.label18.Name = "label18";
- this.label18.Size = new System.Drawing.Size(56, 26);
- this.label18.TabIndex = 38;
- this.label18.Text = "Todo: BG \r\npal info";
- //
// rbBG3
//
this.rbBG3.AutoSize = true;
- this.rbBG3.Location = new System.Drawing.Point(123, 42);
+ this.rbBG3.Location = new System.Drawing.Point(73, 32);
this.rbBG3.Name = "rbBG3";
this.rbBG3.Size = new System.Drawing.Size(46, 17);
this.rbBG3.TabIndex = 34;
@@ -996,7 +1525,7 @@
// rbBG2
//
this.rbBG2.AutoSize = true;
- this.rbBG2.Location = new System.Drawing.Point(175, 19);
+ this.rbBG2.Location = new System.Drawing.Point(120, 14);
this.rbBG2.Name = "rbBG2";
this.rbBG2.Size = new System.Drawing.Size(46, 17);
this.rbBG2.TabIndex = 33;
@@ -1008,7 +1537,7 @@
// rbBG1
//
this.rbBG1.AutoSize = true;
- this.rbBG1.Location = new System.Drawing.Point(123, 19);
+ this.rbBG1.Location = new System.Drawing.Point(73, 14);
this.rbBG1.Name = "rbBG1";
this.rbBG1.Size = new System.Drawing.Size(46, 17);
this.rbBG1.TabIndex = 32;
@@ -1019,7 +1548,7 @@
//
// txtBG1TSizeDescr
//
- this.txtBG1TSizeDescr.Location = new System.Drawing.Point(83, 86);
+ this.txtBG1TSizeDescr.Location = new System.Drawing.Point(73, 71);
this.txtBG1TSizeDescr.Multiline = true;
this.txtBG1TSizeDescr.Name = "txtBG1TSizeDescr";
this.txtBG1TSizeDescr.ReadOnly = true;
@@ -1036,16 +1565,16 @@
"BG2",
"BG3",
"BG4"});
- this.comboBGProps.Location = new System.Drawing.Point(6, 19);
+ this.comboBGProps.Location = new System.Drawing.Point(6, 15);
this.comboBGProps.Name = "comboBGProps";
- this.comboBGProps.Size = new System.Drawing.Size(108, 21);
+ this.comboBGProps.Size = new System.Drawing.Size(59, 21);
this.comboBGProps.TabIndex = 32;
this.comboBGProps.SelectedIndexChanged += new System.EventHandler(this.comboBGProps_SelectedIndexChanged);
//
// label15
//
this.label15.AutoSize = true;
- this.label15.Location = new System.Drawing.Point(33, 89);
+ this.label15.Location = new System.Drawing.Point(33, 74);
this.label15.Name = "label15";
this.label15.Size = new System.Drawing.Size(34, 13);
this.label15.TabIndex = 22;
@@ -1054,7 +1583,7 @@
// txtBG1TSizeBits
//
this.txtBG1TSizeBits.BackColor = System.Drawing.Color.LightGreen;
- this.txtBG1TSizeBits.Location = new System.Drawing.Point(5, 85);
+ this.txtBG1TSizeBits.Location = new System.Drawing.Point(5, 70);
this.txtBG1TSizeBits.Multiline = true;
this.txtBG1TSizeBits.Name = "txtBG1TSizeBits";
this.txtBG1TSizeBits.ReadOnly = true;
@@ -1065,7 +1594,7 @@
// label13
//
this.label13.AutoSize = true;
- this.label13.Location = new System.Drawing.Point(156, 66);
+ this.label13.Location = new System.Drawing.Point(124, 52);
this.label13.Name = "label13";
this.label13.Size = new System.Drawing.Size(36, 13);
this.label13.TabIndex = 20;
@@ -1073,17 +1602,17 @@
//
// txtBG1Colors
//
- this.txtBG1Colors.Location = new System.Drawing.Point(83, 64);
+ this.txtBG1Colors.Location = new System.Drawing.Point(73, 50);
this.txtBG1Colors.Multiline = true;
this.txtBG1Colors.Name = "txtBG1Colors";
this.txtBG1Colors.ReadOnly = true;
- this.txtBG1Colors.Size = new System.Drawing.Size(72, 17);
+ this.txtBG1Colors.Size = new System.Drawing.Size(48, 17);
this.txtBG1Colors.TabIndex = 19;
- this.txtBG1Colors.Text = "00";
+ this.txtBG1Colors.Text = "256";
//
// txtBG1Bpp
//
- this.txtBG1Bpp.Location = new System.Drawing.Point(6, 62);
+ this.txtBG1Bpp.Location = new System.Drawing.Point(6, 50);
this.txtBG1Bpp.Multiline = true;
this.txtBG1Bpp.Name = "txtBG1Bpp";
this.txtBG1Bpp.ReadOnly = true;
@@ -1094,7 +1623,7 @@
// label12
//
this.label12.AutoSize = true;
- this.label12.Location = new System.Drawing.Point(33, 64);
+ this.label12.Location = new System.Drawing.Point(33, 52);
this.label12.Name = "label12";
this.label12.Size = new System.Drawing.Size(32, 13);
this.label12.TabIndex = 17;
@@ -1102,46 +1631,46 @@
//
// txtBG1TDAddrDescr
//
- this.txtBG1TDAddrDescr.Location = new System.Drawing.Point(84, 178);
+ this.txtBG1TDAddrDescr.Location = new System.Drawing.Point(73, 156);
this.txtBG1TDAddrDescr.Multiline = true;
this.txtBG1TDAddrDescr.Name = "txtBG1TDAddrDescr";
this.txtBG1TDAddrDescr.ReadOnly = true;
- this.txtBG1TDAddrDescr.Size = new System.Drawing.Size(71, 19);
+ this.txtBG1TDAddrDescr.Size = new System.Drawing.Size(72, 19);
this.txtBG1TDAddrDescr.TabIndex = 15;
this.txtBG1TDAddrDescr.Text = "1024z1024";
//
// label11
//
this.label11.AutoSize = true;
- this.label11.Location = new System.Drawing.Point(34, 183);
+ this.label11.Location = new System.Drawing.Point(30, 161);
this.label11.Name = "label11";
- this.label11.Size = new System.Drawing.Size(47, 13);
+ this.label11.Size = new System.Drawing.Size(40, 13);
this.label11.TabIndex = 14;
- this.label11.Text = "TD.Addr";
+ this.label11.Text = "@Tiles";
//
// txtBG1SCAddrDescr
//
- this.txtBG1SCAddrDescr.Location = new System.Drawing.Point(84, 157);
+ this.txtBG1SCAddrDescr.Location = new System.Drawing.Point(73, 134);
this.txtBG1SCAddrDescr.Multiline = true;
this.txtBG1SCAddrDescr.Name = "txtBG1SCAddrDescr";
this.txtBG1SCAddrDescr.ReadOnly = true;
- this.txtBG1SCAddrDescr.Size = new System.Drawing.Size(71, 19);
+ this.txtBG1SCAddrDescr.Size = new System.Drawing.Size(72, 19);
this.txtBG1SCAddrDescr.TabIndex = 12;
this.txtBG1SCAddrDescr.Text = "1024z1024";
//
// label9
//
this.label9.AutoSize = true;
- this.label9.Location = new System.Drawing.Point(156, 135);
+ this.label9.Location = new System.Drawing.Point(145, 116);
this.label9.Name = "label9";
- this.label9.Size = new System.Drawing.Size(34, 13);
+ this.label9.Size = new System.Drawing.Size(18, 13);
this.label9.TabIndex = 9;
- this.label9.Text = "Pixels";
+ this.label9.Text = "px";
//
// txtBG1TDAddrBits
//
this.txtBG1TDAddrBits.BackColor = System.Drawing.Color.LightGreen;
- this.txtBG1TDAddrBits.Location = new System.Drawing.Point(5, 180);
+ this.txtBG1TDAddrBits.Location = new System.Drawing.Point(5, 158);
this.txtBG1TDAddrBits.Multiline = true;
this.txtBG1TDAddrBits.Name = "txtBG1TDAddrBits";
this.txtBG1TDAddrBits.ReadOnly = true;
@@ -1152,15 +1681,15 @@
// label10
//
this.label10.AutoSize = true;
- this.label10.Location = new System.Drawing.Point(34, 160);
+ this.label10.Location = new System.Drawing.Point(30, 137);
this.label10.Name = "label10";
- this.label10.Size = new System.Drawing.Size(46, 13);
+ this.label10.Size = new System.Drawing.Size(40, 13);
this.label10.TabIndex = 11;
- this.label10.Text = "SC.Addr";
+ this.label10.Text = "@Scrn";
//
// txtBG1SizeInPixels
//
- this.txtBG1SizeInPixels.Location = new System.Drawing.Point(83, 132);
+ this.txtBG1SizeInPixels.Location = new System.Drawing.Point(73, 112);
this.txtBG1SizeInPixels.Multiline = true;
this.txtBG1SizeInPixels.Name = "txtBG1SizeInPixels";
this.txtBG1SizeInPixels.ReadOnly = true;
@@ -1171,7 +1700,7 @@
// label3
//
this.label3.AutoSize = true;
- this.label3.Location = new System.Drawing.Point(156, 113);
+ this.label3.Location = new System.Drawing.Point(124, 95);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(32, 13);
this.label3.TabIndex = 7;
@@ -1180,7 +1709,7 @@
// txtBG1SCAddrBits
//
this.txtBG1SCAddrBits.BackColor = System.Drawing.Color.LightGreen;
- this.txtBG1SCAddrBits.Location = new System.Drawing.Point(5, 157);
+ this.txtBG1SCAddrBits.Location = new System.Drawing.Point(5, 134);
this.txtBG1SCAddrBits.Multiline = true;
this.txtBG1SCAddrBits.Name = "txtBG1SCAddrBits";
this.txtBG1SCAddrBits.ReadOnly = true;
@@ -1190,18 +1719,18 @@
//
// txtBG1SizeInTiles
//
- this.txtBG1SizeInTiles.Location = new System.Drawing.Point(84, 110);
+ this.txtBG1SizeInTiles.Location = new System.Drawing.Point(73, 92);
this.txtBG1SizeInTiles.Multiline = true;
this.txtBG1SizeInTiles.Name = "txtBG1SizeInTiles";
this.txtBG1SizeInTiles.ReadOnly = true;
- this.txtBG1SizeInTiles.Size = new System.Drawing.Size(71, 17);
+ this.txtBG1SizeInTiles.Size = new System.Drawing.Size(48, 17);
this.txtBG1SizeInTiles.TabIndex = 6;
this.txtBG1SizeInTiles.Text = "64x64";
//
// label2
//
this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(34, 113);
+ this.label2.Location = new System.Drawing.Point(34, 95);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(27, 13);
this.label2.TabIndex = 4;
@@ -1210,7 +1739,7 @@
// txtBG1SizeBits
//
this.txtBG1SizeBits.BackColor = System.Drawing.Color.LightGreen;
- this.txtBG1SizeBits.Location = new System.Drawing.Point(5, 110);
+ this.txtBG1SizeBits.Location = new System.Drawing.Point(5, 92);
this.txtBG1SizeBits.Multiline = true;
this.txtBG1SizeBits.Name = "txtBG1SizeBits";
this.txtBG1SizeBits.ReadOnly = true;
@@ -1221,14 +1750,11 @@
// groupBox4
//
this.groupBox4.Controls.Add(this.radioButton6);
- this.groupBox4.Controls.Add(this.label17);
this.groupBox4.Controls.Add(this.check2x);
this.groupBox4.Controls.Add(this.radioButton15);
this.groupBox4.Controls.Add(this.radioButton14);
- this.groupBox4.Controls.Add(this.label14);
this.groupBox4.Controls.Add(this.comboDisplayType);
this.groupBox4.Controls.Add(this.radioButton1);
- this.groupBox4.Controls.Add(this.grpQuadrants);
this.groupBox4.Controls.Add(this.radioButton2);
this.groupBox4.Controls.Add(this.radioButton13);
this.groupBox4.Controls.Add(this.radioButton3);
@@ -1245,7 +1771,7 @@
//
this.radioButton6.AutoSize = true;
this.radioButton6.Enabled = false;
- this.radioButton6.Location = new System.Drawing.Point(56, 99);
+ this.radioButton6.Location = new System.Drawing.Point(56, 97);
this.radioButton6.Name = "radioButton6";
this.radioButton6.Size = new System.Drawing.Size(73, 17);
this.radioButton6.TabIndex = 49;
@@ -1253,15 +1779,6 @@
this.radioButton6.Text = "Mode7Ext";
this.radioButton6.UseVisualStyleBackColor = true;
//
- // label17
- //
- this.label17.AutoSize = true;
- this.label17.Location = new System.Drawing.Point(84, 173);
- this.label17.Name = "label17";
- this.label17.Size = new System.Drawing.Size(61, 13);
- this.label17.TabIndex = 48;
- this.label17.Text = "deprecated";
- //
// check2x
//
this.check2x.Appearance = System.Windows.Forms.Appearance.Button;
@@ -1280,7 +1797,7 @@
//
this.radioButton15.AutoSize = true;
this.radioButton15.Enabled = false;
- this.radioButton15.Location = new System.Drawing.Point(56, 83);
+ this.radioButton15.Location = new System.Drawing.Point(56, 81);
this.radioButton15.Name = "radioButton15";
this.radioButton15.Size = new System.Drawing.Size(58, 17);
this.radioButton15.TabIndex = 33;
@@ -1292,7 +1809,7 @@
//
this.radioButton14.AutoSize = true;
this.radioButton14.Enabled = false;
- this.radioButton14.Location = new System.Drawing.Point(6, 100);
+ this.radioButton14.Location = new System.Drawing.Point(6, 98);
this.radioButton14.Name = "radioButton14";
this.radioButton14.Size = new System.Drawing.Size(45, 17);
this.radioButton14.TabIndex = 32;
@@ -1300,15 +1817,6 @@
this.radioButton14.Text = "OBJ";
this.radioButton14.UseVisualStyleBackColor = true;
//
- // label14
- //
- this.label14.AutoSize = true;
- this.label14.Location = new System.Drawing.Point(41, 127);
- this.label14.Name = "label14";
- this.label14.Size = new System.Drawing.Size(46, 13);
- this.label14.TabIndex = 47;
- this.label14.Text = "disabled";
- //
// comboDisplayType
//
this.comboDisplayType.DisplayMember = "descr";
@@ -1328,7 +1836,7 @@
//
this.radioButton1.AutoSize = true;
this.radioButton1.Enabled = false;
- this.radioButton1.Location = new System.Drawing.Point(6, 35);
+ this.radioButton1.Location = new System.Drawing.Point(6, 33);
this.radioButton1.Name = "radioButton1";
this.radioButton1.Size = new System.Drawing.Size(46, 17);
this.radioButton1.TabIndex = 19;
@@ -1336,77 +1844,11 @@
this.radioButton1.Text = "BG1";
this.radioButton1.UseVisualStyleBackColor = true;
//
- // grpQuadrants
- //
- this.grpQuadrants.Controls.Add(this.rbQuad3);
- this.grpQuadrants.Controls.Add(this.rbQuad2);
- this.grpQuadrants.Controls.Add(this.rbQuadAll);
- this.grpQuadrants.Controls.Add(this.rbQuad1);
- this.grpQuadrants.Controls.Add(this.rbQuad0);
- this.grpQuadrants.Enabled = false;
- this.grpQuadrants.Location = new System.Drawing.Point(88, 117);
- this.grpQuadrants.Name = "grpQuadrants";
- this.grpQuadrants.Size = new System.Drawing.Size(44, 53);
- this.grpQuadrants.TabIndex = 44;
- this.grpQuadrants.TabStop = false;
- //
- // rbQuad3
- //
- this.rbQuad3.AutoSize = true;
- this.rbQuad3.Location = new System.Drawing.Point(26, 34);
- this.rbQuad3.Name = "rbQuad3";
- this.rbQuad3.Size = new System.Drawing.Size(14, 13);
- this.rbQuad3.TabIndex = 47;
- this.rbQuad3.UseVisualStyleBackColor = true;
- this.rbQuad3.CheckedChanged += new System.EventHandler(this.rbQuad_CheckedChanged);
- //
- // rbQuad2
- //
- this.rbQuad2.AutoSize = true;
- this.rbQuad2.Location = new System.Drawing.Point(4, 35);
- this.rbQuad2.Name = "rbQuad2";
- this.rbQuad2.Size = new System.Drawing.Size(14, 13);
- this.rbQuad2.TabIndex = 46;
- this.rbQuad2.UseVisualStyleBackColor = true;
- this.rbQuad2.CheckedChanged += new System.EventHandler(this.rbQuad_CheckedChanged);
- //
- // rbQuadAll
- //
- this.rbQuadAll.AutoSize = true;
- this.rbQuadAll.Location = new System.Drawing.Point(15, 22);
- this.rbQuadAll.Name = "rbQuadAll";
- this.rbQuadAll.Size = new System.Drawing.Size(14, 13);
- this.rbQuadAll.TabIndex = 45;
- this.rbQuadAll.UseVisualStyleBackColor = true;
- this.rbQuadAll.CheckedChanged += new System.EventHandler(this.rbQuad_CheckedChanged);
- //
- // rbQuad1
- //
- this.rbQuad1.AutoSize = true;
- this.rbQuad1.Location = new System.Drawing.Point(26, 10);
- this.rbQuad1.Name = "rbQuad1";
- this.rbQuad1.Size = new System.Drawing.Size(14, 13);
- this.rbQuad1.TabIndex = 44;
- this.rbQuad1.UseVisualStyleBackColor = true;
- this.rbQuad1.CheckedChanged += new System.EventHandler(this.rbQuad_CheckedChanged);
- //
- // rbQuad0
- //
- this.rbQuad0.AutoSize = true;
- this.rbQuad0.Checked = true;
- this.rbQuad0.Location = new System.Drawing.Point(5, 10);
- this.rbQuad0.Name = "rbQuad0";
- this.rbQuad0.Size = new System.Drawing.Size(14, 13);
- this.rbQuad0.TabIndex = 43;
- this.rbQuad0.TabStop = true;
- this.rbQuad0.UseVisualStyleBackColor = true;
- this.rbQuad0.CheckedChanged += new System.EventHandler(this.rbQuad_CheckedChanged);
- //
// radioButton2
//
this.radioButton2.AutoSize = true;
this.radioButton2.Enabled = false;
- this.radioButton2.Location = new System.Drawing.Point(6, 51);
+ this.radioButton2.Location = new System.Drawing.Point(6, 49);
this.radioButton2.Name = "radioButton2";
this.radioButton2.Size = new System.Drawing.Size(46, 17);
this.radioButton2.TabIndex = 20;
@@ -1418,7 +1860,7 @@
//
this.radioButton13.AutoSize = true;
this.radioButton13.Enabled = false;
- this.radioButton13.Location = new System.Drawing.Point(56, 67);
+ this.radioButton13.Location = new System.Drawing.Point(56, 65);
this.radioButton13.Name = "radioButton13";
this.radioButton13.Size = new System.Drawing.Size(49, 17);
this.radioButton13.TabIndex = 31;
@@ -1430,7 +1872,7 @@
//
this.radioButton3.AutoSize = true;
this.radioButton3.Enabled = false;
- this.radioButton3.Location = new System.Drawing.Point(6, 67);
+ this.radioButton3.Location = new System.Drawing.Point(6, 65);
this.radioButton3.Name = "radioButton3";
this.radioButton3.Size = new System.Drawing.Size(46, 17);
this.radioButton3.TabIndex = 21;
@@ -1442,7 +1884,7 @@
//
this.radioButton4.AutoSize = true;
this.radioButton4.Enabled = false;
- this.radioButton4.Location = new System.Drawing.Point(6, 83);
+ this.radioButton4.Location = new System.Drawing.Point(6, 81);
this.radioButton4.Name = "radioButton4";
this.radioButton4.Size = new System.Drawing.Size(46, 17);
this.radioButton4.TabIndex = 22;
@@ -1454,7 +1896,7 @@
//
this.radioButton5.AutoSize = true;
this.radioButton5.Enabled = false;
- this.radioButton5.Location = new System.Drawing.Point(56, 35);
+ this.radioButton5.Location = new System.Drawing.Point(56, 33);
this.radioButton5.Name = "radioButton5";
this.radioButton5.Size = new System.Drawing.Size(49, 17);
this.radioButton5.TabIndex = 23;
@@ -1466,7 +1908,7 @@
//
this.radioButton10.AutoSize = true;
this.radioButton10.Enabled = false;
- this.radioButton10.Location = new System.Drawing.Point(56, 51);
+ this.radioButton10.Location = new System.Drawing.Point(56, 49);
this.radioButton10.Name = "radioButton10";
this.radioButton10.Size = new System.Drawing.Size(49, 17);
this.radioButton10.TabIndex = 28;
@@ -1477,32 +1919,22 @@
// groupBox5
//
this.groupBox5.Controls.Add(this.paletteViewer);
- this.groupBox5.Location = new System.Drawing.Point(236, 342);
+ this.groupBox5.Location = new System.Drawing.Point(235, 336);
this.groupBox5.Name = "groupBox5";
this.groupBox5.Size = new System.Drawing.Size(319, 327);
this.groupBox5.TabIndex = 36;
this.groupBox5.TabStop = false;
this.groupBox5.Text = "Palette";
//
- // paletteViewer
- //
- this.paletteViewer.BackColor = System.Drawing.Color.Transparent;
- this.paletteViewer.Location = new System.Drawing.Point(6, 14);
- this.paletteViewer.Name = "paletteViewer";
- this.paletteViewer.Size = new System.Drawing.Size(307, 307);
- this.paletteViewer.TabIndex = 18;
- this.paletteViewer.TabStop = false;
- this.paletteViewer.MouseClick += new System.Windows.Forms.MouseEventHandler(this.paletteViewer_MouseClick);
- this.paletteViewer.MouseMove += new System.Windows.Forms.MouseEventHandler(this.paletteViewer_MouseMove);
- //
// tabctrlDetails
//
this.tabctrlDetails.Controls.Add(this.tpPalette);
this.tabctrlDetails.Controls.Add(this.tpTile);
- this.tabctrlDetails.Location = new System.Drawing.Point(236, 193);
+ this.tabctrlDetails.Controls.Add(this.tpMapEntry);
+ this.tabctrlDetails.Location = new System.Drawing.Point(235, 214);
this.tabctrlDetails.Name = "tabctrlDetails";
this.tabctrlDetails.SelectedIndex = 0;
- this.tabctrlDetails.Size = new System.Drawing.Size(317, 147);
+ this.tabctrlDetails.Size = new System.Drawing.Size(317, 120);
this.tabctrlDetails.TabIndex = 0;
//
// tpPalette
@@ -1517,18 +1949,17 @@
this.tpPalette.Controls.Add(this.txtDetailsPaletteColor);
this.tpPalette.Controls.Add(this.lblDetailsOBJOrBG);
this.tpPalette.Controls.Add(this.pnDetailsPaletteColor);
- this.tpPalette.Controls.Add(this.lblDetailsPaletteAddress);
this.tpPalette.Location = new System.Drawing.Point(4, 22);
this.tpPalette.Name = "tpPalette";
this.tpPalette.Padding = new System.Windows.Forms.Padding(3);
- this.tpPalette.Size = new System.Drawing.Size(309, 121);
+ this.tpPalette.Size = new System.Drawing.Size(309, 94);
this.tpPalette.TabIndex = 0;
this.tpPalette.Text = "Color";
this.tpPalette.UseVisualStyleBackColor = true;
//
// txtPaletteDetailsIndexSpecific
//
- this.txtPaletteDetailsIndexSpecific.Location = new System.Drawing.Point(200, 3);
+ this.txtPaletteDetailsIndexSpecific.Location = new System.Drawing.Point(69, 42);
this.txtPaletteDetailsIndexSpecific.Multiline = true;
this.txtPaletteDetailsIndexSpecific.Name = "txtPaletteDetailsIndexSpecific";
this.txtPaletteDetailsIndexSpecific.ReadOnly = true;
@@ -1538,7 +1969,7 @@
//
// txtPaletteDetailsIndexHexSpecific
//
- this.txtPaletteDetailsIndexHexSpecific.Location = new System.Drawing.Point(173, 3);
+ this.txtPaletteDetailsIndexHexSpecific.Location = new System.Drawing.Point(42, 42);
this.txtPaletteDetailsIndexHexSpecific.Multiline = true;
this.txtPaletteDetailsIndexHexSpecific.Name = "txtPaletteDetailsIndexHexSpecific";
this.txtPaletteDetailsIndexHexSpecific.ReadOnly = true;
@@ -1554,7 +1985,7 @@
this.txtPaletteDetailsAddress.ReadOnly = true;
this.txtPaletteDetailsAddress.Size = new System.Drawing.Size(58, 18);
this.txtPaletteDetailsAddress.TabIndex = 42;
- this.txtPaletteDetailsAddress.Text = "$1FE";
+ this.txtPaletteDetailsAddress.Text = "@1FE";
//
// txtPaletteDetailsIndex
//
@@ -1578,7 +2009,7 @@
//
// txtDetailsPaletteColorRGB
//
- this.txtDetailsPaletteColorRGB.Location = new System.Drawing.Point(3, 84);
+ this.txtDetailsPaletteColorRGB.Location = new System.Drawing.Point(102, 42);
this.txtDetailsPaletteColorRGB.Multiline = true;
this.txtDetailsPaletteColorRGB.Name = "txtDetailsPaletteColorRGB";
this.txtDetailsPaletteColorRGB.ReadOnly = true;
@@ -1588,7 +2019,7 @@
//
// txtDetailsPaletteColorHex
//
- this.txtDetailsPaletteColorHex.Location = new System.Drawing.Point(3, 63);
+ this.txtDetailsPaletteColorHex.Location = new System.Drawing.Point(102, 22);
this.txtDetailsPaletteColorHex.Multiline = true;
this.txtDetailsPaletteColorHex.Name = "txtDetailsPaletteColorHex";
this.txtDetailsPaletteColorHex.ReadOnly = true;
@@ -1598,7 +2029,7 @@
//
// txtDetailsPaletteColor
//
- this.txtDetailsPaletteColor.Location = new System.Drawing.Point(3, 42);
+ this.txtDetailsPaletteColor.Location = new System.Drawing.Point(102, 2);
this.txtDetailsPaletteColor.Multiline = true;
this.txtDetailsPaletteColor.Name = "txtDetailsPaletteColor";
this.txtDetailsPaletteColor.ReadOnly = true;
@@ -1608,12 +2039,12 @@
//
// lblDetailsOBJOrBG
//
- this.lblDetailsOBJOrBG.Location = new System.Drawing.Point(100, 5);
+ this.lblDetailsOBJOrBG.Location = new System.Drawing.Point(2, 42);
this.lblDetailsOBJOrBG.Name = "lblDetailsOBJOrBG";
- this.lblDetailsOBJOrBG.Size = new System.Drawing.Size(72, 13);
+ this.lblDetailsOBJOrBG.Size = new System.Drawing.Size(36, 16);
this.lblDetailsOBJOrBG.TabIndex = 40;
- this.lblDetailsOBJOrBG.Text = "(OBJ Palette:)";
- this.lblDetailsOBJOrBG.TextAlign = System.Drawing.ContentAlignment.TopCenter;
+ this.lblDetailsOBJOrBG.Text = "(OBJ:)";
+ this.lblDetailsOBJOrBG.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// pnDetailsPaletteColor
//
@@ -1625,26 +2056,201 @@
this.pnDetailsPaletteColor.TabIndex = 3;
this.pnDetailsPaletteColor.DoubleClick += new System.EventHandler(this.pnDetailsPaletteColor_DoubleClick);
//
- // lblDetailsPaletteAddress
- //
- this.lblDetailsPaletteAddress.AutoSize = true;
- this.lblDetailsPaletteAddress.Location = new System.Drawing.Point(102, 25);
- this.lblDetailsPaletteAddress.Name = "lblDetailsPaletteAddress";
- this.lblDetailsPaletteAddress.Size = new System.Drawing.Size(90, 13);
- this.lblDetailsPaletteAddress.TabIndex = 1;
- this.lblDetailsPaletteAddress.Text = "CGRAM Address ";
- //
// tpTile
//
this.tpTile.Controls.Add(this.viewerTile);
this.tpTile.Location = new System.Drawing.Point(4, 22);
this.tpTile.Name = "tpTile";
this.tpTile.Padding = new System.Windows.Forms.Padding(3);
- this.tpTile.Size = new System.Drawing.Size(309, 121);
+ this.tpTile.Size = new System.Drawing.Size(309, 94);
this.tpTile.TabIndex = 1;
this.tpTile.Text = "Tile";
this.tpTile.UseVisualStyleBackColor = true;
//
+ // tpMapEntry
+ //
+ this.tpMapEntry.Controls.Add(this.checkMapEntryVFlip);
+ this.tpMapEntry.Controls.Add(this.label34);
+ this.tpMapEntry.Controls.Add(this.checkMapEntryHFlip);
+ this.tpMapEntry.Controls.Add(this.label17);
+ this.tpMapEntry.Controls.Add(this.lblMapEntryHFlip);
+ this.tpMapEntry.Controls.Add(this.txtMapEntryPalette);
+ this.tpMapEntry.Controls.Add(this.label14);
+ this.tpMapEntry.Controls.Add(this.label6);
+ this.tpMapEntry.Controls.Add(this.txtMapEntryTileAddr);
+ this.tpMapEntry.Controls.Add(this.txtMapEntryPrio);
+ this.tpMapEntry.Controls.Add(this.txtMapEntryLocation);
+ this.tpMapEntry.Controls.Add(this.txtMapEntryTileNum);
+ this.tpMapEntry.Controls.Add(this.viewerMapEntryTile);
+ this.tpMapEntry.Location = new System.Drawing.Point(4, 22);
+ this.tpMapEntry.Name = "tpMapEntry";
+ this.tpMapEntry.Size = new System.Drawing.Size(309, 94);
+ this.tpMapEntry.TabIndex = 2;
+ this.tpMapEntry.Text = "Map Entry";
+ this.tpMapEntry.UseVisualStyleBackColor = true;
+ //
+ // checkMapEntryVFlip
+ //
+ this.checkMapEntryVFlip.AutoSize = true;
+ this.checkMapEntryVFlip.Enabled = false;
+ this.checkMapEntryVFlip.Location = new System.Drawing.Point(42, 76);
+ this.checkMapEntryVFlip.Name = "checkMapEntryVFlip";
+ this.checkMapEntryVFlip.Size = new System.Drawing.Size(15, 14);
+ this.checkMapEntryVFlip.TabIndex = 61;
+ this.checkMapEntryVFlip.UseVisualStyleBackColor = true;
+ //
+ // label34
+ //
+ this.label34.AutoSize = true;
+ this.label34.Location = new System.Drawing.Point(56, 76);
+ this.label34.Name = "label34";
+ this.label34.Size = new System.Drawing.Size(14, 13);
+ this.label34.TabIndex = 62;
+ this.label34.Text = "V";
+ //
+ // checkMapEntryHFlip
+ //
+ this.checkMapEntryHFlip.AutoSize = true;
+ this.checkMapEntryHFlip.Enabled = false;
+ this.checkMapEntryHFlip.Location = new System.Drawing.Point(8, 76);
+ this.checkMapEntryHFlip.Name = "checkMapEntryHFlip";
+ this.checkMapEntryHFlip.Size = new System.Drawing.Size(15, 14);
+ this.checkMapEntryHFlip.TabIndex = 56;
+ this.checkMapEntryHFlip.UseVisualStyleBackColor = true;
+ //
+ // label17
+ //
+ this.label17.AutoSize = true;
+ this.label17.Location = new System.Drawing.Point(145, 46);
+ this.label17.Name = "label17";
+ this.label17.Size = new System.Drawing.Size(40, 13);
+ this.label17.TabIndex = 60;
+ this.label17.Text = "Palette";
+ //
+ // lblMapEntryHFlip
+ //
+ this.lblMapEntryHFlip.AutoSize = true;
+ this.lblMapEntryHFlip.Location = new System.Drawing.Point(22, 76);
+ this.lblMapEntryHFlip.Name = "lblMapEntryHFlip";
+ this.lblMapEntryHFlip.Size = new System.Drawing.Size(15, 13);
+ this.lblMapEntryHFlip.TabIndex = 57;
+ this.lblMapEntryHFlip.Text = "H";
+ //
+ // txtMapEntryPalette
+ //
+ this.txtMapEntryPalette.BackColor = System.Drawing.Color.LightGreen;
+ this.txtMapEntryPalette.Location = new System.Drawing.Point(126, 43);
+ this.txtMapEntryPalette.Multiline = true;
+ this.txtMapEntryPalette.Name = "txtMapEntryPalette";
+ this.txtMapEntryPalette.ReadOnly = true;
+ this.txtMapEntryPalette.Size = new System.Drawing.Size(15, 17);
+ this.txtMapEntryPalette.TabIndex = 59;
+ this.txtMapEntryPalette.Text = "00";
+ //
+ // label14
+ //
+ this.label14.AutoSize = true;
+ this.label14.Location = new System.Drawing.Point(95, 46);
+ this.label14.Name = "label14";
+ this.label14.Size = new System.Drawing.Size(25, 13);
+ this.label14.TabIndex = 58;
+ this.label14.Text = "Prio";
+ //
+ // label6
+ //
+ this.label6.AutoSize = true;
+ this.label6.Location = new System.Drawing.Point(121, 27);
+ this.label6.Name = "label6";
+ this.label6.Size = new System.Drawing.Size(31, 13);
+ this.label6.TabIndex = 56;
+ this.label6.Text = "Tile#";
+ //
+ // txtMapEntryTileAddr
+ //
+ this.txtMapEntryTileAddr.Location = new System.Drawing.Point(153, 25);
+ this.txtMapEntryTileAddr.Multiline = true;
+ this.txtMapEntryTileAddr.Name = "txtMapEntryTileAddr";
+ this.txtMapEntryTileAddr.ReadOnly = true;
+ this.txtMapEntryTileAddr.Size = new System.Drawing.Size(42, 18);
+ this.txtMapEntryTileAddr.TabIndex = 57;
+ this.txtMapEntryTileAddr.Text = "@FFFF";
+ //
+ // txtMapEntryPrio
+ //
+ this.txtMapEntryPrio.BackColor = System.Drawing.Color.LightGreen;
+ this.txtMapEntryPrio.Location = new System.Drawing.Point(76, 43);
+ this.txtMapEntryPrio.Multiline = true;
+ this.txtMapEntryPrio.Name = "txtMapEntryPrio";
+ this.txtMapEntryPrio.ReadOnly = true;
+ this.txtMapEntryPrio.Size = new System.Drawing.Size(15, 17);
+ this.txtMapEntryPrio.TabIndex = 56;
+ this.txtMapEntryPrio.Text = "00";
+ //
+ // txtMapEntryLocation
+ //
+ this.txtMapEntryLocation.Location = new System.Drawing.Point(76, 6);
+ this.txtMapEntryLocation.Multiline = true;
+ this.txtMapEntryLocation.Name = "txtMapEntryLocation";
+ this.txtMapEntryLocation.ReadOnly = true;
+ this.txtMapEntryLocation.Size = new System.Drawing.Size(87, 18);
+ this.txtMapEntryLocation.TabIndex = 56;
+ this.txtMapEntryLocation.Text = "(64,64) @FFFF";
+ //
+ // txtMapEntryTileNum
+ //
+ this.txtMapEntryTileNum.BackColor = System.Drawing.Color.LightGreen;
+ this.txtMapEntryTileNum.Location = new System.Drawing.Point(76, 25);
+ this.txtMapEntryTileNum.Multiline = true;
+ this.txtMapEntryTileNum.Name = "txtMapEntryTileNum";
+ this.txtMapEntryTileNum.ReadOnly = true;
+ this.txtMapEntryTileNum.Size = new System.Drawing.Size(43, 17);
+ this.txtMapEntryTileNum.TabIndex = 39;
+ this.txtMapEntryTileNum.Text = "$1024";
+ //
+ // viewerPanel
+ //
+ this.viewerPanel.AutoScroll = true;
+ this.viewerPanel.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+ this.viewerPanel.Controls.Add(this.viewer);
+ this.viewerPanel.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.viewerPanel.Location = new System.Drawing.Point(566, 3);
+ this.viewerPanel.Name = "viewerPanel";
+ this.tableLayoutPanel1.SetRowSpan(this.viewerPanel, 2);
+ this.viewerPanel.Size = new System.Drawing.Size(517, 667);
+ this.viewerPanel.TabIndex = 1;
+ //
+ // toolTip1
+ //
+ this.toolTip1.AutoPopDelay = 5000;
+ this.toolTip1.InitialDelay = 250;
+ this.toolTip1.ReshowDelay = 100;
+ //
+ // messagetimer
+ //
+ this.messagetimer.Interval = 5000;
+ this.messagetimer.Tick += new System.EventHandler(this.messagetimer_Tick);
+ //
+ // txtBGPaletteInfo
+ //
+ this.txtBGPaletteInfo.Location = new System.Drawing.Point(5, 181);
+ this.txtBGPaletteInfo.Multiline = true;
+ this.txtBGPaletteInfo.Name = "txtBGPaletteInfo";
+ this.txtBGPaletteInfo.ReadOnly = true;
+ this.txtBGPaletteInfo.Size = new System.Drawing.Size(155, 19);
+ this.txtBGPaletteInfo.TabIndex = 39;
+ this.txtBGPaletteInfo.Text = "256 colors from $FF to $FF";
+ //
+ // paletteViewer
+ //
+ this.paletteViewer.BackColor = System.Drawing.Color.Transparent;
+ this.paletteViewer.Location = new System.Drawing.Point(6, 14);
+ this.paletteViewer.Name = "paletteViewer";
+ this.paletteViewer.Size = new System.Drawing.Size(307, 307);
+ this.paletteViewer.TabIndex = 18;
+ this.paletteViewer.TabStop = false;
+ this.paletteViewer.MouseClick += new System.Windows.Forms.MouseEventHandler(this.paletteViewer_MouseClick);
+ this.paletteViewer.MouseMove += new System.Windows.Forms.MouseEventHandler(this.paletteViewer_MouseMove);
+ //
// viewerTile
//
this.viewerTile.BackColor = System.Drawing.Color.Transparent;
@@ -1654,17 +2260,14 @@
this.viewerTile.TabIndex = 19;
this.viewerTile.TabStop = false;
//
- // viewerPanel
+ // viewerMapEntryTile
//
- this.viewerPanel.AutoScroll = true;
- this.viewerPanel.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
- this.viewerPanel.Controls.Add(this.viewer);
- this.viewerPanel.Dock = System.Windows.Forms.DockStyle.Fill;
- this.viewerPanel.Location = new System.Drawing.Point(567, 3);
- this.viewerPanel.Name = "viewerPanel";
- this.tableLayoutPanel1.SetRowSpan(this.viewerPanel, 2);
- this.viewerPanel.Size = new System.Drawing.Size(516, 667);
- this.viewerPanel.TabIndex = 1;
+ this.viewerMapEntryTile.BackColor = System.Drawing.Color.Transparent;
+ this.viewerMapEntryTile.Location = new System.Drawing.Point(6, 6);
+ this.viewerMapEntryTile.Name = "viewerMapEntryTile";
+ this.viewerMapEntryTile.Size = new System.Drawing.Size(64, 64);
+ this.viewerMapEntryTile.TabIndex = 20;
+ this.viewerMapEntryTile.TabStop = false;
//
// viewer
//
@@ -1678,17 +2281,6 @@
this.viewer.MouseMove += new System.Windows.Forms.MouseEventHandler(this.viewer_MouseMove);
this.viewer.MouseUp += new System.Windows.Forms.MouseEventHandler(this.viewer_MouseUp);
//
- // toolTip1
- //
- this.toolTip1.AutoPopDelay = 5000;
- this.toolTip1.InitialDelay = 250;
- this.toolTip1.ReshowDelay = 100;
- //
- // messagetimer
- //
- this.messagetimer.Interval = 5000;
- this.messagetimer.Tick += new System.EventHandler(this.messagetimer_Tick);
- //
// SNESGraphicsDebugger
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -1707,7 +2299,8 @@
this.tableLayoutPanel1.ResumeLayout(false);
this.tableLayoutPanel1.PerformLayout();
this.panel1.ResumeLayout(false);
- this.panel1.PerformLayout();
+ this.groupBox8.ResumeLayout(false);
+ this.groupBox8.PerformLayout();
this.groupBox7.ResumeLayout(false);
this.groupBox7.PerformLayout();
this.groupBox6.ResumeLayout(false);
@@ -1722,13 +2315,13 @@
this.groupBox1.PerformLayout();
this.groupBox4.ResumeLayout(false);
this.groupBox4.PerformLayout();
- this.grpQuadrants.ResumeLayout(false);
- this.grpQuadrants.PerformLayout();
this.groupBox5.ResumeLayout(false);
this.tabctrlDetails.ResumeLayout(false);
this.tpPalette.ResumeLayout(false);
this.tpPalette.PerformLayout();
this.tpTile.ResumeLayout(false);
+ this.tpMapEntry.ResumeLayout(false);
+ this.tpMapEntry.PerformLayout();
this.viewerPanel.ResumeLayout(false);
this.ResumeLayout(false);
this.PerformLayout();
@@ -1762,18 +2355,11 @@
private System.Windows.Forms.Label label8;
private System.Windows.Forms.Label label7;
private System.Windows.Forms.TextBox txtScreenBG1Bpp;
- private System.Windows.Forms.Label label6;
+ private System.Windows.Forms.Label lblBG3;
private System.Windows.Forms.Label label4;
private System.Windows.Forms.Label label5;
- private System.Windows.Forms.GroupBox grpQuadrants;
- private System.Windows.Forms.RadioButton rbQuad3;
- private System.Windows.Forms.RadioButton rbQuad2;
- private System.Windows.Forms.RadioButton rbQuadAll;
- private System.Windows.Forms.RadioButton rbQuad1;
- private System.Windows.Forms.RadioButton rbQuad0;
private System.Windows.Forms.GroupBox groupBox1;
private System.Windows.Forms.RadioButton rbBG4;
- private System.Windows.Forms.Label label18;
private System.Windows.Forms.RadioButton rbBG3;
private System.Windows.Forms.RadioButton rbBG2;
private System.Windows.Forms.RadioButton rbBG1;
@@ -1825,14 +2411,11 @@
private System.Windows.Forms.TextBox txtDetailsPaletteColor;
private System.Windows.Forms.Label lblDetailsOBJOrBG;
private System.Windows.Forms.Panel pnDetailsPaletteColor;
- private System.Windows.Forms.Label lblDetailsPaletteAddress;
private System.Windows.Forms.TabPage tpTile;
private System.Windows.Forms.Panel viewerPanel;
private SNESGraphicsViewer viewer;
private System.Windows.Forms.GroupBox groupBox3;
private System.Windows.Forms.CheckBox checkScanlineControl;
- private System.Windows.Forms.Label label17;
- private System.Windows.Forms.Label label14;
private System.Windows.Forms.ToolTip toolTip1;
private System.Windows.Forms.CheckBox check2x;
private System.Windows.Forms.Label label21;
@@ -1875,5 +2458,64 @@
private System.Windows.Forms.TextBox txtOBSELSizeDescr;
private System.Windows.Forms.Label label28;
private System.Windows.Forms.ComboBox comboPalette;
+ private System.Windows.Forms.GroupBox groupBox8;
+ private System.Windows.Forms.Label lblTS;
+ private System.Windows.Forms.Label lblTM;
+ private System.Windows.Forms.Label label32;
+ private System.Windows.Forms.Label label31;
+ private Core.CustomCheckBox checkTSBG4;
+ private Core.CustomCheckBox checkTSBG3;
+ private Core.CustomCheckBox checkTSBG2;
+ private Core.CustomCheckBox checkTSBG1;
+ private Core.CustomCheckBox checkTMBG4;
+ private Core.CustomCheckBox checkTMBG3;
+ private Core.CustomCheckBox checkTMBG2;
+ private Core.CustomCheckBox checkTMBG1;
+ private System.Windows.Forms.TabPage tpMapEntry;
+ private System.Windows.Forms.TextBox txtMapEntryTileNum;
+ private SNESGraphicsViewer viewerMapEntryTile;
+ private System.Windows.Forms.CheckBox checkMapEntryVFlip;
+ private System.Windows.Forms.Label label34;
+ private System.Windows.Forms.CheckBox checkMapEntryHFlip;
+ private System.Windows.Forms.Label label17;
+ private System.Windows.Forms.Label lblMapEntryHFlip;
+ private System.Windows.Forms.TextBox txtMapEntryPalette;
+ private System.Windows.Forms.Label label14;
+ private System.Windows.Forms.Label label6;
+ private System.Windows.Forms.TextBox txtMapEntryTileAddr;
+ private System.Windows.Forms.TextBox txtMapEntryPrio;
+ private System.Windows.Forms.TextBox txtMapEntryLocation;
+ private Core.HorizontalLine label35;
+ private Core.CustomCheckBox checkMathBG4;
+ private Core.CustomCheckBox checkMathBG3;
+ private Core.CustomCheckBox checkMathBG2;
+ private Core.CustomCheckBox checkMathBG1;
+ private System.Windows.Forms.Label label33;
+ private Core.CustomCheckBox checkMathOBJ;
+ private Core.CustomCheckBox checkTMOBJ;
+ private Core.CustomCheckBox checkTSOBJ;
+ private Core.CustomCheckBox checkMathBK;
+ private System.Windows.Forms.TextBox txtScreenCGADSUB_AddSub;
+ private System.Windows.Forms.Label label36;
+ private System.Windows.Forms.TextBox txtScreenCGADSUB_AddSub_Descr;
+ private System.Windows.Forms.Label label38;
+ private System.Windows.Forms.CheckBox txtScreenCGADSUB_Half;
+ private System.Windows.Forms.Label label37;
+ private System.Windows.Forms.CheckBox checkEN0_OBJ;
+ private System.Windows.Forms.CheckBox checkEN0_BG4;
+ private System.Windows.Forms.CheckBox checkEN0_BG3;
+ private System.Windows.Forms.CheckBox checkEN0_BG2;
+ private System.Windows.Forms.CheckBox checkEN0_BG1;
+ private System.Windows.Forms.Label label41;
+ private System.Windows.Forms.CheckBox checkEN1_OBJ;
+ private System.Windows.Forms.CheckBox checkEN1_BG4;
+ private System.Windows.Forms.CheckBox checkEN1_BG3;
+ private System.Windows.Forms.CheckBox checkEN1_BG2;
+ private System.Windows.Forms.CheckBox checkEN1_BG1;
+ private System.Windows.Forms.CheckBox checkEN3_OBJ;
+ private System.Windows.Forms.CheckBox checkEN2_OBJ;
+ private System.Windows.Forms.Label label40;
+ private System.Windows.Forms.Label label39;
+ private System.Windows.Forms.TextBox txtBGPaletteInfo;
}
}
\ No newline at end of file
diff --git a/BizHawk.MultiClient/SNESTools/SNESGraphicsDebugger.cs b/BizHawk.MultiClient/SNESTools/SNESGraphicsDebugger.cs
index dcbc8aa464..b103dbde01 100644
--- a/BizHawk.MultiClient/SNESTools/SNESGraphicsDebugger.cs
+++ b/BizHawk.MultiClient/SNESTools/SNESGraphicsDebugger.cs
@@ -16,6 +16,7 @@ using System.Linq;
using System.Text;
using System.Windows.Forms;
using BizHawk.Emulation.Consoles.Nintendo.SNES;
+using BizHawk.Core;
namespace BizHawk.MultiClient
{
@@ -142,10 +143,11 @@ namespace BizHawk.MultiClient
currentSnesCore.ScanlineHookManager.Unregister(this);
}
- if(currentSnesCore != core)
+ if(currentSnesCore != core && core != null)
{
suppression = true;
comboPalette.SelectedValue = core.CurrPalette;
+ RefreshBGENCheckStatesFromConfig();
suppression = false;
}
@@ -206,6 +208,9 @@ namespace BizHawk.MultiClient
txtScreenCGWSEL_ColorSubMask.Text = si.CGWSEL_ColorSubMask.ToString();
txtScreenCGWSEL_MathFixed.Text = si.CGWSEL_AddSubMode.ToString();
checkScreenCGWSEL_DirectColor.Checked = si.CGWSEL_DirectColor;
+ txtScreenCGADSUB_AddSub.Text = si.CGWSEL_AddSubMode.ToString();
+ txtScreenCGADSUB_AddSub_Descr.Text = si.CGADSUB_AddSub == 1 ? "SUB" : "ADD";
+ txtScreenCGADSUB_Half.Checked = si.CGADSUB_Half;
txtModeBits.Text = si.Mode.MODE.ToString();
txtScreenBG1Bpp.Text = FormatBpp(si.BG.BG1.Bpp);
@@ -219,28 +224,68 @@ namespace BizHawk.MultiClient
int bgnum = comboBGProps.SelectedIndex + 1;
- txtBG1TSizeBits.Text = si.BG[bgnum].TILESIZE.ToString();
- txtBG1TSizeDescr.Text = string.Format("{0}x{0}", si.BG[bgnum].TileSize);
- txtBG1Bpp.Text = FormatBpp(si.BG[bgnum].Bpp);
- txtBG1SizeBits.Text = si.BG[bgnum].SCSIZE.ToString();
- txtBG1SizeInTiles.Text = FormatScreenSizeInTiles(si.BG[bgnum].ScreenSize);
- txtBG1SCAddrBits.Text = si.BG[bgnum].SCADDR.ToString();
- txtBG1SCAddrDescr.Text = FormatVramAddress(si.BG[bgnum].SCADDR << 9);
- txtBG1Colors.Text = (1 << si.BG[bgnum].Bpp).ToString();
- if (si.BG[bgnum].Bpp == 8 && si.CGWSEL_DirectColor) txtBG1Colors.Text = "(Direct Color)";
- txtBG1TDAddrBits.Text = si.BG[bgnum].TDADDR.ToString();
- txtBG1TDAddrDescr.Text = FormatVramAddress(si.BG[bgnum].TDADDR << 13);
+ var bg = si.BG[bgnum];
+ txtBG1TSizeBits.Text = bg.TILESIZE.ToString();
+ txtBG1TSizeDescr.Text = string.Format("{0}x{0}", bg.TileSize);
+ txtBG1Bpp.Text = FormatBpp(bg.Bpp);
+ txtBG1SizeBits.Text = bg.SCSIZE.ToString();
+ txtBG1SizeInTiles.Text = FormatScreenSizeInTiles(bg.ScreenSize);
+ txtBG1SCAddrBits.Text = bg.SCADDR.ToString();
+ txtBG1SCAddrDescr.Text = FormatVramAddress(bg.SCADDR << 9);
+ txtBG1Colors.Text = (1 << bg.Bpp).ToString();
+ if (bg.Bpp == 8 && si.CGWSEL_DirectColor) txtBG1Colors.Text = "(Direct Color)";
+ txtBG1TDAddrBits.Text = bg.TDADDR.ToString();
+ txtBG1TDAddrDescr.Text = FormatVramAddress(bg.TDADDR << 13);
- var sizeInPixels = SNESGraphicsDecoder.SizeInTilesForBGSize(si.BG[bgnum].ScreenSize);
+ if (bg.Bpp != 0)
+ {
+ var pi = bg.PaletteSelection;
+ txtBGPaletteInfo.Text = string.Format("{0} colors from ${1:X2} - ${2:X2}", pi.size, pi.start, pi.start + pi.size - 1);
+ }
+ else txtBGPaletteInfo.Text = "";
+
+ var sizeInPixels = SNESGraphicsDecoder.SizeInTilesForBGSize(bg.ScreenSize);
sizeInPixels.Width *= si.BG[bgnum].TileSize;
sizeInPixels.Height *= si.BG[bgnum].TileSize;
txtBG1SizeInPixels.Text = string.Format("{0}x{1}", sizeInPixels.Width, sizeInPixels.Height);
+ checkTMOBJ.Checked = si.OBJ_MainEnabled;
+ checkTMBG1.Checked = si.BG.BG1.MainEnabled;
+ checkTMBG2.Checked = si.BG.BG2.MainEnabled;
+ checkTMBG3.Checked = si.BG.BG3.MainEnabled;
+ checkTMBG4.Checked = si.BG.BG4.MainEnabled;
+ checkTMOBJ.Checked = si.OBJ_SubEnabled;
+ checkTSBG1.Checked = si.BG.BG1.SubEnabled;
+ checkTSBG2.Checked = si.BG.BG2.SubEnabled;
+ checkTSBG3.Checked = si.BG.BG3.SubEnabled;
+ checkTSBG4.Checked = si.BG.BG4.SubEnabled;
+ checkTSOBJ.Checked = si.OBJ_MainEnabled;
+ checkMathOBJ.Checked = si.OBJ_MathEnabled;
+ checkMathBK.Checked = si.BK_MathEnabled;
+ checkMathBG1.Checked = si.BG.BG1.MathEnabled;
+ checkMathBG2.Checked = si.BG.BG2.MathEnabled;
+ checkMathBG3.Checked = si.BG.BG3.MathEnabled;
+ checkMathBG4.Checked = si.BG.BG4.MathEnabled;
+
+ if (si.Mode.MODE == 1 && si.Mode1_BG3_Priority)
+ {
+ lblBG3.ForeColor = Color.Red;
+ if(toolTip1.GetToolTip(lblBG3) != "Mode 1 BG3 priority toggle bit of $2105 is SET")
+ toolTip1.SetToolTip(lblBG3, "Mode 1 BG3 priority toggle bit of $2105 is SET");
+ }
+ else
+ {
+ lblBG3.ForeColor = Color.Black;
+ if (toolTip1.GetToolTip(lblBG3) != "Mode 1 BG3 priority toggle bit of $2105 is CLEAR")
+ toolTip1.SetToolTip(lblBG3, "Mode 1 BG3 priority toggle bit of $2105 is CLEAR");
+ }
+
SyncColorSelection();
RenderView();
RenderPalette();
RenderTileView();
UpdateColorDetails();
+ UpdateMapEntryDetails();
}
eDisplayType CurrDisplaySelection { get { return (comboDisplayType.SelectedValue as eDisplayType?).Value; } }
@@ -621,6 +666,28 @@ namespace BizHawk.MultiClient
paletteViewer.SetBitmap(bmp);
}
+ void UpdateMapEntryDetails()
+ {
+ if (currMapEntryState == null) return;
+ txtMapEntryLocation.Text = string.Format("({0},{1}), @{2:X4}", currMapEntryState.Location.X, currMapEntryState.Location.Y, currMapEntryState.entry.address);
+ txtMapEntryTileNum.Text = string.Format("${0:X3}", currMapEntryState.entry.tilenum);
+ txtMapEntryPrio.Text = string.Format("{0}", (currMapEntryState.entry.flags & SNESGraphicsDecoder.TileEntryFlags.Priority)!=0?1:0);
+ txtMapEntryPalette.Text = string.Format("{0}", currMapEntryState.entry.palette);
+ checkMapEntryHFlip.Checked = (currMapEntryState.entry.flags & SNESGraphicsDecoder.TileEntryFlags.Horz) != 0;
+ checkMapEntryVFlip.Checked = (currMapEntryState.entry.flags & SNESGraphicsDecoder.TileEntryFlags.Vert) != 0;
+
+ //calculate address of tile
+ var bg = si.BG[currMapEntryState.bgnum];
+ int bpp = bg.Bpp;
+ int tiledataBaseAddr = bg.TiledataAddr;
+ int tileSizeBytes = 8 * bpp;
+ int baseTileNum = tiledataBaseAddr / tileSizeBytes;
+ int tileNum = baseTileNum + currMapEntryState.entry.tilenum;
+ int addr = tileNum * tileSizeBytes;
+ addr &= 0xFFFF;
+ txtMapEntryTileAddr.Text = "@" + addr.ToHexString(4);
+ }
+
void UpdateColorDetails()
{
int rgb555 = lastPalette[lastColorNum];
@@ -632,13 +699,15 @@ namespace BizHawk.MultiClient
txtDetailsPaletteColorHex.Text = string.Format("#{0:X6}", color & 0xFFFFFF);
txtDetailsPaletteColorRGB.Text = string.Format("({0},{1},{2})", (color >> 16) & 0xFF, (color >> 8) & 0xFF, (color & 0xFF));
- if (lastColorNum < 128) lblDetailsOBJOrBG.Text = "(BG Palette:)"; else lblDetailsOBJOrBG.Text = "(OBJ Palette:)";
+ if (lastColorNum < 128) lblDetailsOBJOrBG.Text = "(BG:)"; else lblDetailsOBJOrBG.Text = "(OBJ:)";
txtPaletteDetailsIndexHex.Text = string.Format("${0:X2}", lastColorNum);
txtPaletteDetailsIndexHexSpecific.Text = string.Format("${0:X2}", lastColorNum & 0x7F);
txtPaletteDetailsIndex.Text = string.Format("{0}", lastColorNum);
txtPaletteDetailsIndexSpecific.Text = string.Format("{0}", lastColorNum & 0x7F);
txtPaletteDetailsAddress.Text = string.Format("${0:X3}", lastColorNum * 2);
+
+ string test = string.Format(@"Pal# ${0:X2} @{1:X3}", lastColorNum, lastColorNum * 2);
}
@@ -710,7 +779,7 @@ namespace BizHawk.MultiClient
{
viewerPan = true;
panStartLocation = viewer.PointToScreen(e.Location);
- this.Cursor = Cursors.Hand;
+ this.Cursor = Cursors.SizeAll;
}
}
@@ -718,6 +787,7 @@ namespace BizHawk.MultiClient
{
viewerPan = false;
viewer.Capture = false;
+ this.Cursor = Cursors.Default;
}
private void viewer_MouseMove(object sender, MouseEventArgs e)
@@ -742,12 +812,13 @@ namespace BizHawk.MultiClient
}
}
- class TileViewerBGState
+ class MapEntryState
{
public SNESGraphicsDecoder.TileEntry entry;
public int bgnum;
+ public Point Location;
}
- TileViewerBGState currTileViewerBGState;
+ MapEntryState currMapEntryState;
int currViewingTile = -1;
int currViewingTileBpp = -1;
int currViewingSprite = -1;
@@ -755,17 +826,17 @@ namespace BizHawk.MultiClient
{
//TODO - blech - handle invalid some other way with a dedicated black-setter
bool valid = currViewingTile != -1;
- valid |= (currTileViewerBGState != null);
+ valid |= (currMapEntryState != null);
if (!valid && !force) return;
- if (currTileViewerBGState != null)
+ if (currMapEntryState != null)
{
//view a BG tile (no mode7 support yet) - itd be nice if we could generalize this code a bit
//TODO - choose correct palette (commonize that code)
int paletteStart = 0;
var bmp = new Bitmap(8, 8, System.Drawing.Imaging.PixelFormat.Format32bppArgb);
var bmpdata = bmp.LockBits(new Rectangle(0, 0, 8, 8), System.Drawing.Imaging.ImageLockMode.WriteOnly, System.Drawing.Imaging.PixelFormat.Format32bppArgb);
- var bgs = currTileViewerBGState;
+ var bgs = currMapEntryState;
var oneTileEntry = new SNESGraphicsDecoder.TileEntry[] { bgs.entry };
if (valid)
{
@@ -775,7 +846,7 @@ namespace BizHawk.MultiClient
}
bmp.UnlockBits(bmpdata);
- viewerTile.SetBitmap(bmp);
+ viewerMapEntryTile.SetBitmap(bmp);
}
else
{
@@ -792,7 +863,7 @@ namespace BizHawk.MultiClient
void UpdateViewerMouseover(Point loc)
{
- currTileViewerBGState = null;
+ currMapEntryState = null;
currViewingTile = -1;
currViewingTileBpp = -1;
int tx = loc.X / 8;
@@ -821,9 +892,10 @@ namespace BizHawk.MultiClient
int tloc = ty * bg.ScreenSizeInTiles.Width + tx;
if (tloc > map.Length) break;
- currTileViewerBGState = new TileViewerBGState();
- currTileViewerBGState.bgnum = (int)CurrDisplaySelection;
- currTileViewerBGState.entry = map[tloc];
+ currMapEntryState = new MapEntryState();
+ currMapEntryState.bgnum = (int)CurrDisplaySelection;
+ currMapEntryState.entry = map[tloc];
+ currMapEntryState.Location = new Point(tx, ty);
//public void DecodeBG(int* screen, int stride, TileEntry[] map, int tiledataBaseAddr, ScreenSize size, int bpp, int tilesize, int paletteStart)
@@ -927,7 +999,7 @@ namespace BizHawk.MultiClient
Control found = null;
do
{
- found = top.GetChildAtPoint(top.PointToClient(m));
+ found = top.GetChildAtPoint(top.PointToClient(m), GetChildAtPointSkip.Invisible);
top = found;
} while (found != null && found.HasChildren);
@@ -965,6 +1037,62 @@ namespace BizHawk.MultiClient
RenderTileView();
}
+ void RefreshBGENCheckStatesFromConfig()
+ {
+ checkEN0_BG1.Checked = Global.Config.SNES_ShowBG1_0;
+ checkEN0_BG2.Checked = Global.Config.SNES_ShowBG2_0;
+ checkEN0_BG3.Checked = Global.Config.SNES_ShowBG3_0;
+ checkEN0_BG4.Checked = Global.Config.SNES_ShowBG4_0;
+ checkEN1_BG1.Checked = Global.Config.SNES_ShowBG1_1;
+ checkEN1_BG2.Checked = Global.Config.SNES_ShowBG2_1;
+ checkEN1_BG3.Checked = Global.Config.SNES_ShowBG3_1;
+ checkEN1_BG4.Checked = Global.Config.SNES_ShowBG4_1;
+ checkEN0_OBJ.Checked = Global.Config.SNES_ShowOBJ1;
+ checkEN1_OBJ.Checked = Global.Config.SNES_ShowOBJ2;
+ checkEN2_OBJ.Checked = Global.Config.SNES_ShowOBJ3;
+ checkEN3_OBJ.Checked = Global.Config.SNES_ShowOBJ4;
+ }
+
+ private void checkEN_CheckedChanged(object sender, EventArgs e)
+ {
+ if(suppression) return;
+ if (sender == checkEN0_BG1) Global.Config.SNES_ShowBG1_0 = checkEN0_BG1.Checked;
+ if (sender == checkEN0_BG2) Global.Config.SNES_ShowBG2_0 = checkEN0_BG2.Checked;
+ if (sender == checkEN0_BG3) Global.Config.SNES_ShowBG3_0 = checkEN0_BG3.Checked;
+ if (sender == checkEN0_BG4) Global.Config.SNES_ShowBG4_0 = checkEN0_BG4.Checked;
+ if (sender == checkEN1_BG1) Global.Config.SNES_ShowBG1_1 = checkEN1_BG1.Checked;
+ if (sender == checkEN1_BG2) Global.Config.SNES_ShowBG2_1 = checkEN1_BG2.Checked;
+ if (sender == checkEN1_BG3) Global.Config.SNES_ShowBG3_1 = checkEN1_BG3.Checked;
+ if (sender == checkEN1_BG4) Global.Config.SNES_ShowBG4_1 = checkEN1_BG4.Checked;
+ if (sender == checkEN0_OBJ) Global.Config.SNES_ShowOBJ1 = checkEN0_OBJ.Checked;
+ if (sender == checkEN1_OBJ) Global.Config.SNES_ShowOBJ2 = checkEN1_OBJ.Checked;
+ if (sender == checkEN2_OBJ) Global.Config.SNES_ShowOBJ3 = checkEN2_OBJ.Checked;
+ if (sender == checkEN3_OBJ) Global.Config.SNES_ShowOBJ4 = checkEN3_OBJ.Checked;
+
+ if ((Control.ModifierKeys & Keys.Shift) != 0)
+ {
+ if (sender == checkEN0_BG1) Global.Config.SNES_ShowBG1_1 = Global.Config.SNES_ShowBG1_0;
+ if (sender == checkEN1_BG1) Global.Config.SNES_ShowBG1_0 = Global.Config.SNES_ShowBG1_1;
+ if (sender == checkEN0_BG2) Global.Config.SNES_ShowBG2_1 = Global.Config.SNES_ShowBG2_0;
+ if (sender == checkEN1_BG2) Global.Config.SNES_ShowBG2_0 = Global.Config.SNES_ShowBG2_1;
+ if (sender == checkEN0_BG3) Global.Config.SNES_ShowBG3_1 = Global.Config.SNES_ShowBG3_0;
+ if (sender == checkEN1_BG3) Global.Config.SNES_ShowBG3_0 = Global.Config.SNES_ShowBG3_1;
+ if (sender == checkEN0_BG4) Global.Config.SNES_ShowBG4_1 = Global.Config.SNES_ShowBG4_0;
+ if (sender == checkEN1_BG4) Global.Config.SNES_ShowBG4_0 = Global.Config.SNES_ShowBG4_1;
+ if (sender == checkEN0_OBJ) Global.Config.SNES_ShowOBJ2 = Global.Config.SNES_ShowOBJ3 = Global.Config.SNES_ShowOBJ4 = Global.Config.SNES_ShowOBJ1;
+ if (sender == checkEN1_OBJ) Global.Config.SNES_ShowOBJ1 = Global.Config.SNES_ShowOBJ3 = Global.Config.SNES_ShowOBJ4 = Global.Config.SNES_ShowOBJ2;
+ if (sender == checkEN2_OBJ) Global.Config.SNES_ShowOBJ1 = Global.Config.SNES_ShowOBJ2 = Global.Config.SNES_ShowOBJ4 = Global.Config.SNES_ShowOBJ3;
+ if (sender == checkEN3_OBJ) Global.Config.SNES_ShowOBJ1 = Global.Config.SNES_ShowOBJ2 = Global.Config.SNES_ShowOBJ3 = Global.Config.SNES_ShowOBJ4;
+ suppression = true;
+ RefreshBGENCheckStatesFromConfig();
+ suppression = false;
+ }
+
+ Global.MainForm.SyncCoreInputComm();
+ }
+
}
+
+
}
diff --git a/BizHawk.MultiClient/SNESTools/SNESGraphicsDebugger.resx b/BizHawk.MultiClient/SNESTools/SNESGraphicsDebugger.resx
index 3fe4dea3e4..416878dadc 100644
--- a/BizHawk.MultiClient/SNESTools/SNESGraphicsDebugger.resx
+++ b/BizHawk.MultiClient/SNESTools/SNESGraphicsDebugger.resx
@@ -134,6 +134,6 @@ BG parameters at certain scanlines.
218, 5
- 25
+ 61
\ No newline at end of file
diff --git a/BizHawk.MultiClient/output/dll/libsneshawk.dll b/BizHawk.MultiClient/output/dll/libsneshawk.dll
index eb50f62fce..be31526a73 100644
Binary files a/BizHawk.MultiClient/output/dll/libsneshawk.dll and b/BizHawk.MultiClient/output/dll/libsneshawk.dll differ
diff --git a/BizHawk.Util/MiscControls.cs b/BizHawk.Util/MiscControls.cs
index b2fceb8445..2e4fa1a932 100644
--- a/BizHawk.Util/MiscControls.cs
+++ b/BizHawk.Util/MiscControls.cs
@@ -22,4 +22,57 @@ namespace BizHawk.Core
}
}
+ public class CustomCheckBox : CheckBox
+ {
+ Color _CheckBackColor = SystemColors.Control;
+ public Color CheckBackColor
+ {
+ get { return _CheckBackColor; }
+ set { _CheckBackColor = value; Refresh(); }
+ }
+
+ bool? _ForceChecked = null;
+ public bool? ForceChecked
+ {
+ get { return _ForceChecked; }
+ set { _ForceChecked = value; Refresh(); }
+ }
+
+ protected override void OnPaint(PaintEventArgs pevent)
+ {
+ //draw text-label part of the control with something so that it isn't hallofmirrorsy
+ using(var brush = new SolidBrush(Parent.BackColor))
+ pevent.Graphics.FillRectangle(brush, ClientRectangle);
+
+ var r = new Rectangle(ClientRectangle.Location, SystemInformation.MenuCheckSize);
+ var glyphLoc = ClientRectangle;
+ glyphLoc.Size = SystemInformation.MenuCheckSize;
+
+ //draw the selectedbackdrop color roughly where the glyph belongs
+ using (var brush = new SolidBrush(_CheckBackColor))
+ pevent.Graphics.FillRectangle(brush, glyphLoc);
+
+ //draw a checkbox menu glyph (we could do this more elegantly with DrawFrameControl)
+ bool c = CheckState == System.Windows.Forms.CheckState.Checked;
+ if (ForceChecked.HasValue)
+ {
+ c = ForceChecked.Value;
+ }
+ if (c)
+ {
+ glyphLoc.Y--;
+ glyphLoc.X++;
+ ControlPaint.DrawMenuGlyph(pevent.Graphics, glyphLoc, MenuGlyph.Checkmark, Color.Black, Color.Transparent);
+ }
+
+ //draw a border on top of it all
+ ControlPaint.DrawBorder3D(pevent.Graphics, r, Border3DStyle.Sunken);
+
+ //stuff that didnt work
+ //CheckBoxRenderer.DrawParentBackground(pevent.Graphics, ClientRectangle, this);
+ //CheckBoxRenderer.DrawCheckBox(pevent.Graphics, ClientRectangle.Location, System.Windows.Forms.VisualStyles.CheckBoxState.CheckedNormal);
+ //glyphLoc.Size = new System.Drawing.Size(SystemInformation.MenuCheckSize.Width-1,SystemInformation.MenuCheckSize.Height-1);
+ }
+ }
+
}
\ No newline at end of file
diff --git a/libsnes/bsnes/target-libsnes/libsnes.cpp b/libsnes/bsnes/target-libsnes/libsnes.cpp
index 8fce35e1b0..c11e4f70b8 100644
--- a/libsnes/bsnes/target-libsnes/libsnes.cpp
+++ b/libsnes/bsnes/target-libsnes/libsnes.cpp
@@ -332,13 +332,35 @@ int snes_peek_logical_register(int reg)
case SNES_REG_SETINI_SCREEN_INTERLACE: return SNES::ppu.regs.interlace?1:0;
//$2130 CGWSEL
case SNES_REG_CGWSEL_COLORMASK: return SNES::ppu.regs.color_mask;
- case SNES_REG_CGWSEL_COLORSUBMASK: return SNES::ppu.regs.color_mask;
+ case SNES_REG_CGWSEL_COLORSUBMASK: return SNES::ppu.regs.colorsub_mask;
case SNES_REG_CGWSEL_ADDSUBMODE: return SNES::ppu.regs.addsub_mode?1:0;
case SNES_REG_CGWSEL_DIRECTCOLOR: return SNES::ppu.regs.direct_color?1:0;
//$2101 OBSEL
case SNES_REG_OBSEL_NAMEBASE: return SNES::ppu.regs.oam_tdaddr>>14;
case SNES_REG_OBSEL_NAMESEL: return SNES::ppu.regs.oam_nameselect;
case SNES_REG_OBSEL_SIZE: return SNES::ppu.regs.oam_basesize;
+ //$2131 CGADSUB
+ //enum { BG1 = 0, BG2 = 1, BG3 = 2, BG4 = 3, OAM = 4, BACK = 5, COL = 5 };
+ case SNES_REG_CGADSUB_MODE: return SNES::ppu.regs.color_mode;
+ case SNES_REG_CGADSUB_HALF: return SNES::ppu.regs.color_halve;
+ case SNES_REG_CGADSUB_BG4: return SNES::ppu.regs.color_enabled[3];
+ case SNES_REG_CGADSUB_BG3: return SNES::ppu.regs.color_enabled[2];
+ case SNES_REG_CGADSUB_BG2: return SNES::ppu.regs.color_enabled[1];
+ case SNES_REG_CGADSUB_BG1: return SNES::ppu.regs.color_enabled[0];
+ case SNES_REG_CGADSUB_OBJ: return SNES::ppu.regs.color_enabled[4];
+ case SNES_REG_CGADSUB_BACKDROP: return SNES::ppu.regs.color_enabled[5];
+ //$212C TM
+ case SNES_REG_TM_BG1: return SNES::ppu.regs.bg_enabled[0];
+ case SNES_REG_TM_BG2: return SNES::ppu.regs.bg_enabled[1];
+ case SNES_REG_TM_BG3: return SNES::ppu.regs.bg_enabled[2];
+ case SNES_REG_TM_BG4: return SNES::ppu.regs.bg_enabled[3];
+ case SNES_REG_TM_OBJ: return SNES::ppu.regs.bg_enabled[4];
+ //$212D TM
+ case SNES_REG_TS_BG1: return SNES::ppu.regs.bgsub_enabled[0];
+ case SNES_REG_TS_BG2: return SNES::ppu.regs.bgsub_enabled[1];
+ case SNES_REG_TS_BG3: return SNES::ppu.regs.bgsub_enabled[2];
+ case SNES_REG_TS_BG4: return SNES::ppu.regs.bgsub_enabled[3];
+ case SNES_REG_TS_OBJ: return SNES::ppu.regs.bgsub_enabled[4];
}
return 0;
}
diff --git a/libsnes/bsnes/target-libsnes/libsnes.hpp b/libsnes/bsnes/target-libsnes/libsnes.hpp
index 5e6eb9679e..c194bb3721 100644
--- a/libsnes/bsnes/target-libsnes/libsnes.hpp
+++ b/libsnes/bsnes/target-libsnes/libsnes.hpp
@@ -189,6 +189,27 @@ void bus_write(unsigned addr, uint8_t val);
#define SNES_REG_OBSEL_NAMEBASE 50
#define SNES_REG_OBSEL_NAMESEL 51
#define SNES_REG_OBSEL_SIZE 52
+//$2131 CGADSUB
+#define SNES_REG_CGADSUB_MODE 60
+#define SNES_REG_CGADSUB_HALF 61
+#define SNES_REG_CGADSUB_BG4 62
+#define SNES_REG_CGADSUB_BG3 63
+#define SNES_REG_CGADSUB_BG2 64
+#define SNES_REG_CGADSUB_BG1 65
+#define SNES_REG_CGADSUB_OBJ 66
+#define SNES_REG_CGADSUB_BACKDROP 67
+//$212C TM
+#define SNES_REG_TM_BG1 70
+#define SNES_REG_TM_BG2 71
+#define SNES_REG_TM_BG3 72
+#define SNES_REG_TM_BG4 73
+#define SNES_REG_TM_OBJ 74
+//$212D TM
+#define SNES_REG_TS_BG1 80
+#define SNES_REG_TS_BG2 81
+#define SNES_REG_TS_BG3 82
+#define SNES_REG_TS_BG4 83
+#define SNES_REG_TS_OBJ 84
int snes_peek_logical_register(int reg);