diff --git a/BizHawk.Emulation/BizHawk.Emulation.csproj b/BizHawk.Emulation/BizHawk.Emulation.csproj index 86a0992056..0e9e075304 100644 --- a/BizHawk.Emulation/BizHawk.Emulation.csproj +++ b/BizHawk.Emulation/BizHawk.Emulation.csproj @@ -231,6 +231,7 @@ + @@ -338,7 +339,6 @@ - diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/BoardSystem.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/BoardSystem.cs index 53022c4778..ec2cae317b 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/BoardSystem.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/BoardSystem.cs @@ -429,6 +429,8 @@ namespace BizHawk.Emulation.Consoles.Nintendo if (!dict.ContainsKey("board")) throw new Exception("NES gamedb entries must have a board identifier!"); cart.board_type = dict["board"]; + if (dict.ContainsKey("system")) + cart.system = dict["system"]; cart.prg_size = -1; cart.vram_size = -1; cart.wram_size = -1; diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper099.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper099.cs new file mode 100644 index 0000000000..1a48e110f1 --- /dev/null +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Mapper099.cs @@ -0,0 +1,39 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace BizHawk.Emulation.Consoles.Nintendo +{ + // one of the VS unisystem mappers + // a lot of dumps are labelled incorrectly + public class Mapper099 : NES.NESBoardBase + { + int chr; + public override bool Configure(NES.EDetectionOrigin origin) + { + switch (Cart.board_type) + { + case "MAPPER099": + AssertPrg(32); AssertChr(16); Cart.vram_size = 0; Cart.wram_size = 0; + break; + default: + return false; + } + return true; + } + + public void Signal4016(int val) + { + chr = val & 1; + } + + public override byte ReadPPU(int addr) + { + if (addr < 0x2000) + return VROM[addr | chr << 13]; + else + return base.ReadPPU(addr); + } + } +} diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/VsUnisys.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/VsUnisys.cs deleted file mode 100644 index c29d14d283..0000000000 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/VsUnisys.cs +++ /dev/null @@ -1,73 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace BizHawk.Emulation.Consoles.Nintendo -{ - public class VsUnisys : NES.NESBoardBase - { - - // this is a copy of UNROM until i figure out what the hell is going on - - int prg_mask; - int vram_byte_mask; - - int prg; - - - public override bool Configure(NES.EDetectionOrigin origin) - { - switch (Cart.board_type) - { - case "MAPPER099": - break; - default: - return false; - } - - vram_byte_mask = (Cart.vram_size * 1024) - 1; - prg_mask = (Cart.prg_size / 16) - 1; - SetMirrorType(Cart.pad_h, Cart.pad_v); - - return true; - } - - public override byte ReadPRG(int addr) - { - int block = addr >> 14; - int page = block == 1 ? prg_mask : prg; - int ofs = addr & 0x3FFF; - return ROM[(page << 14) | ofs]; - } - public override void WritePRG(int addr, byte value) - { - prg = value & prg_mask; - } - - public override byte ReadPPU(int addr) - { - if (addr < 0x2000) - { - return VRAM[addr & vram_byte_mask]; - } - else return base.ReadPPU(addr); - } - - public override void WritePPU(int addr, byte value) - { - if (addr < 0x2000) - { - VRAM[addr & vram_byte_mask] = value; - } - else base.WritePPU(addr, value); - } - - public override void SyncState(Serializer ser) - { - base.SyncState(ser); - ser.Sync("prg", ref prg); - } - - } -} diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Core.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Core.cs index d0761780a8..ed6014a12f 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Core.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Core.cs @@ -30,6 +30,10 @@ namespace BizHawk.Emulation.Consoles.Nintendo public bool SoundOn = true; int sprdma_countdown; bool _irq_apu; //various irq signals that get merged to the cpu irq pin + /// if true, use VS. system arrangement of $4016..$4020 + bool vs_io = false; + bool vs_coin1; + bool vs_coin2; //irq state management public bool irq_apu { get { return _irq_apu; } set { _irq_apu = value; } } @@ -148,11 +152,12 @@ namespace BizHawk.Emulation.Consoles.Nintendo magicSoundProvider = new MagicSoundProvider(this, 1789773); break; // there's no official name for these in bootgod, not sure what we should use - case "PC10": + //case "PC10"://TODO case "VS": ppu.region = PPU.Region.RGB; cpu_sequence = cpu_sequence_NTSC; magicSoundProvider = new MagicSoundProvider(this, 1789773); + vs_io = true; break; // this is in bootgod, but not used at all case "Dendy": @@ -208,6 +213,13 @@ namespace BizHawk.Emulation.Consoles.Nintendo if (Controller["FDS Insert " + i]) b.InsertSide(i); } + if (vs_io) + { + if (Controller["VS Coin 1"]) + vs_coin1 = true; + if (Controller["VS Coin 2"]) + vs_coin2 = true; + } ppu.FrameAdvance(); if (lagged) @@ -307,6 +319,12 @@ namespace BizHawk.Emulation.Consoles.Nintendo case 0x4016: ports[0].Write(val & 1); ports[1].Write(val & 1); + if (vs_io && board is Mapper099) + { + // happily, there aren't any other "VS exceptions" like this + var b = board as Mapper099; + b.Signal4016(val >> 2 & 1); + } break; case 0x4017: apu.WriteReg(addr, val); break; default: @@ -322,9 +340,45 @@ namespace BizHawk.Emulation.Consoles.Nintendo //many todos here lagged = false; byte ret; - if(addr == 0x4016) - ret = ports[0].Read(); - else ret = ports[1].Read(); + if (addr == 0x4016) + ret = ports[vs_io ? 1 : 0].Read(); + else + ret = ports[vs_io ? 0 : 1].Read(); + if (vs_io) + { + if (addr == 0x4016) + { + // clear bits 2-6 + ret &= 0x83; + if (false) // service switch + ret |= 0x04; + if (false) // DIP1 + ret |= 0x08; + if (false) // DIP2 + ret |= 0x10; + if (vs_coin1) + ret |= 0x20; + if (vs_coin2) + ret |= 0x40; + } + else + { + // clear bits 2-7 + ret &= 0x03; + if (false) // DIP3 + ret |= 0x04; + if (false) // DIP4 + ret |= 0x08; + if (false) // DIP5 + ret |= 0x10; + if (false) // DIP6 + ret |= 0x20; + if (false) // DIP7 + ret |= 0x40; + if (false) // DIP8 + ret |= 0x80; + } + } return ret; } @@ -481,6 +535,13 @@ namespace BizHawk.Emulation.Consoles.Nintendo } else if (addr < 0x6000) { + Console.WriteLine("{0:x4}:{1:x2}", addr, value); + if (vs_io && addr == 0x4020 && (value & 1) != 0) + { + // acknowledge coin insertion + vs_coin1 = false; + vs_coin2 = false; + } board.WriteEXP(addr - 0x4000, value); } else if (addr < 0x8000) diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/NES.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/NES.cs index 74fd17a715..663dc62b39 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/NES.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/NES.cs @@ -33,6 +33,11 @@ namespace BizHawk.Emulation.Consoles.Nintendo for (int i = 0; i < b.NumSides; i++) ControllerDefinition.BoolButtons.Add("FDS Insert " + i); } + if (vs_io) + { + ControllerDefinition.BoolButtons.Add("VS Coin 1"); + ControllerDefinition.BoolButtons.Add("VS Coin 2"); + } } private NES() @@ -759,6 +764,11 @@ namespace BizHawk.Emulation.Consoles.Nintendo ser.Sync("cpu_step", ref cpu_step); ser.Sync("cpu_stepcounter", ref cpu_stepcounter); ser.Sync("cpu_deadcounter", ref cpu_deadcounter); + if (vs_io) + { + ser.Sync("vs_coin1", ref vs_coin1); + ser.Sync("vs_coin2", ref vs_coin2); + } board.SyncState(ser); if (board is NESBoardBase && !((NESBoardBase)board).SyncStateFlag) throw new InvalidOperationException("the current NES mapper didnt call base.SyncState"); diff --git a/BizHawk.MultiClient/MainForm.Designer.cs b/BizHawk.MultiClient/MainForm.Designer.cs index 8c4c40edfc..d7afa15fe1 100644 --- a/BizHawk.MultiClient/MainForm.Designer.cs +++ b/BizHawk.MultiClient/MainForm.Designer.cs @@ -209,7 +209,7 @@ this.toolStripSeparator17 = new System.Windows.Forms.ToolStripSeparator(); this.graphicsSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.soundChannelsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.fDSToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.nESSpeicalToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.pCEToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.pceBGViewerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator25 = new System.Windows.Forms.ToolStripSeparator(); @@ -236,6 +236,7 @@ this.rightDifficultyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator26 = new System.Windows.Forms.ToolStripSeparator(); this.showBGToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.showPlayfieldToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.showPlayer1ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.showPlayer2ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.showMissle1ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -305,7 +306,6 @@ this.cmiScreenshotClipboard = new System.Windows.Forms.ToolStripMenuItem(); this.cmiCloseRom = new System.Windows.Forms.ToolStripMenuItem(); this.cmiShowMenu = new System.Windows.Forms.ToolStripMenuItem(); - this.showPlayfieldToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.menuStrip1.SuspendLayout(); this.StatusSlot0.SuspendLayout(); this.contextMenuStrip1.SuspendLayout(); @@ -331,7 +331,7 @@ this.menuStrip1.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.Flow; this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Name = "menuStrip1"; - this.menuStrip1.Size = new System.Drawing.Size(470, 42); + this.menuStrip1.Size = new System.Drawing.Size(470, 40); this.menuStrip1.TabIndex = 0; this.menuStrip1.Text = "menuStrip1"; this.menuStrip1.MenuActivate += new System.EventHandler(this.menuStrip1_MenuActivate); @@ -354,7 +354,7 @@ this.toolStripSeparator4, this.exitToolStripMenuItem}); this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; - this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 19); + this.fileToolStripMenuItem.Size = new System.Drawing.Size(35, 17); this.fileToolStripMenuItem.Text = "&File"; this.fileToolStripMenuItem.DropDownOpened += new System.EventHandler(this.fileToolStripMenuItem_DropDownOpened); // @@ -362,7 +362,7 @@ // this.openROMToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.OpenFile; this.openROMToolStripMenuItem.Name = "openROMToolStripMenuItem"; - this.openROMToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.openROMToolStripMenuItem.Size = new System.Drawing.Size(134, 22); this.openROMToolStripMenuItem.Text = "Open ROM"; this.openROMToolStripMenuItem.Click += new System.EventHandler(this.openROMToolStripMenuItem_Click); // @@ -375,32 +375,32 @@ this.autoloadMostRecentToolStripMenuItem}); this.recentROMToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Recent; this.recentROMToolStripMenuItem.Name = "recentROMToolStripMenuItem"; - this.recentROMToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.recentROMToolStripMenuItem.Size = new System.Drawing.Size(134, 22); this.recentROMToolStripMenuItem.Text = "Recent ROM"; this.recentROMToolStripMenuItem.DropDownOpened += new System.EventHandler(this.recentROMToolStripMenuItem_DropDownOpened); // // noneToolStripMenuItem // this.noneToolStripMenuItem.Name = "noneToolStripMenuItem"; - this.noneToolStripMenuItem.Size = new System.Drawing.Size(192, 22); + this.noneToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.noneToolStripMenuItem.Text = "None"; // // toolStripSeparator3 // this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(189, 6); + this.toolStripSeparator3.Size = new System.Drawing.Size(177, 6); // // clearToolStripMenuItem // this.clearToolStripMenuItem.Name = "clearToolStripMenuItem"; - this.clearToolStripMenuItem.Size = new System.Drawing.Size(192, 22); + this.clearToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.clearToolStripMenuItem.Text = "&Clear"; this.clearToolStripMenuItem.Click += new System.EventHandler(this.clearToolStripMenuItem_Click); // // autoloadMostRecentToolStripMenuItem // this.autoloadMostRecentToolStripMenuItem.Name = "autoloadMostRecentToolStripMenuItem"; - this.autoloadMostRecentToolStripMenuItem.Size = new System.Drawing.Size(192, 22); + this.autoloadMostRecentToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.autoloadMostRecentToolStripMenuItem.Text = "&Autoload Most Recent"; this.autoloadMostRecentToolStripMenuItem.Click += new System.EventHandler(this.autoloadMostRecentToolStripMenuItem_Click); // @@ -408,14 +408,14 @@ // this.closeROMToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Close; this.closeROMToolStripMenuItem.Name = "closeROMToolStripMenuItem"; - this.closeROMToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.closeROMToolStripMenuItem.Size = new System.Drawing.Size(134, 22); this.closeROMToolStripMenuItem.Text = "&Close ROM"; this.closeROMToolStripMenuItem.Click += new System.EventHandler(this.closeROMToolStripMenuItem_Click); // // toolStripMenuItem1 // this.toolStripMenuItem1.Name = "toolStripMenuItem1"; - this.toolStripMenuItem1.Size = new System.Drawing.Size(137, 6); + this.toolStripMenuItem1.Size = new System.Drawing.Size(131, 6); // // saveStateToolStripMenuItem // @@ -433,89 +433,89 @@ this.toolStripSeparator6, this.saveNamedStateToolStripMenuItem}); this.saveStateToolStripMenuItem.Name = "saveStateToolStripMenuItem"; - this.saveStateToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.saveStateToolStripMenuItem.Size = new System.Drawing.Size(134, 22); this.saveStateToolStripMenuItem.Text = "Save State"; this.saveStateToolStripMenuItem.DropDownOpened += new System.EventHandler(this.saveStateToolStripMenuItem_DropDownOpened); // // savestate1toolStripMenuItem // this.savestate1toolStripMenuItem.Name = "savestate1toolStripMenuItem"; - this.savestate1toolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.savestate1toolStripMenuItem.Size = new System.Drawing.Size(175, 22); this.savestate1toolStripMenuItem.Text = "1"; this.savestate1toolStripMenuItem.Click += new System.EventHandler(this.savestate1toolStripMenuItem_Click); // // savestate2toolStripMenuItem // this.savestate2toolStripMenuItem.Name = "savestate2toolStripMenuItem"; - this.savestate2toolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.savestate2toolStripMenuItem.Size = new System.Drawing.Size(175, 22); this.savestate2toolStripMenuItem.Text = "2"; this.savestate2toolStripMenuItem.Click += new System.EventHandler(this.savestate2toolStripMenuItem_Click); // // savestate3toolStripMenuItem // this.savestate3toolStripMenuItem.Name = "savestate3toolStripMenuItem"; - this.savestate3toolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.savestate3toolStripMenuItem.Size = new System.Drawing.Size(175, 22); this.savestate3toolStripMenuItem.Text = "3"; this.savestate3toolStripMenuItem.Click += new System.EventHandler(this.savestate3toolStripMenuItem_Click); // // savestate4toolStripMenuItem // this.savestate4toolStripMenuItem.Name = "savestate4toolStripMenuItem"; - this.savestate4toolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.savestate4toolStripMenuItem.Size = new System.Drawing.Size(175, 22); this.savestate4toolStripMenuItem.Text = "4"; this.savestate4toolStripMenuItem.Click += new System.EventHandler(this.savestate4toolStripMenuItem_Click); // // savestate5toolStripMenuItem // this.savestate5toolStripMenuItem.Name = "savestate5toolStripMenuItem"; - this.savestate5toolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.savestate5toolStripMenuItem.Size = new System.Drawing.Size(175, 22); this.savestate5toolStripMenuItem.Text = "5"; this.savestate5toolStripMenuItem.Click += new System.EventHandler(this.savestate5toolStripMenuItem_Click); // // savestate6toolStripMenuItem // this.savestate6toolStripMenuItem.Name = "savestate6toolStripMenuItem"; - this.savestate6toolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.savestate6toolStripMenuItem.Size = new System.Drawing.Size(175, 22); this.savestate6toolStripMenuItem.Text = "6"; this.savestate6toolStripMenuItem.Click += new System.EventHandler(this.savestate6toolStripMenuItem_Click); // // savestate7toolStripMenuItem // this.savestate7toolStripMenuItem.Name = "savestate7toolStripMenuItem"; - this.savestate7toolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.savestate7toolStripMenuItem.Size = new System.Drawing.Size(175, 22); this.savestate7toolStripMenuItem.Text = "7"; this.savestate7toolStripMenuItem.Click += new System.EventHandler(this.savestate7toolStripMenuItem_Click); // // savestate8toolStripMenuItem // this.savestate8toolStripMenuItem.Name = "savestate8toolStripMenuItem"; - this.savestate8toolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.savestate8toolStripMenuItem.Size = new System.Drawing.Size(175, 22); this.savestate8toolStripMenuItem.Text = "8"; this.savestate8toolStripMenuItem.Click += new System.EventHandler(this.savestate8toolStripMenuItem_Click); // // savestate9toolStripMenuItem // this.savestate9toolStripMenuItem.Name = "savestate9toolStripMenuItem"; - this.savestate9toolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.savestate9toolStripMenuItem.Size = new System.Drawing.Size(175, 22); this.savestate9toolStripMenuItem.Text = "9"; this.savestate9toolStripMenuItem.Click += new System.EventHandler(this.savestate9toolStripMenuItem_Click); // // savestate0toolStripMenuItem // this.savestate0toolStripMenuItem.Name = "savestate0toolStripMenuItem"; - this.savestate0toolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.savestate0toolStripMenuItem.Size = new System.Drawing.Size(175, 22); this.savestate0toolStripMenuItem.Text = "0"; this.savestate0toolStripMenuItem.Click += new System.EventHandler(this.savestate0toolStripMenuItem_Click); // // toolStripSeparator6 // this.toolStripSeparator6.Name = "toolStripSeparator6"; - this.toolStripSeparator6.Size = new System.Drawing.Size(175, 6); + this.toolStripSeparator6.Size = new System.Drawing.Size(172, 6); // // saveNamedStateToolStripMenuItem // this.saveNamedStateToolStripMenuItem.Name = "saveNamedStateToolStripMenuItem"; - this.saveNamedStateToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.saveNamedStateToolStripMenuItem.Size = new System.Drawing.Size(175, 22); this.saveNamedStateToolStripMenuItem.Text = "Save Named State..."; this.saveNamedStateToolStripMenuItem.Click += new System.EventHandler(this.saveNamedStateToolStripMenuItem_Click); // @@ -537,101 +537,101 @@ this.toolStripSeparator21, this.autoLoadLastSlotToolStripMenuItem}); this.loadStateToolStripMenuItem.Name = "loadStateToolStripMenuItem"; - this.loadStateToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.loadStateToolStripMenuItem.Size = new System.Drawing.Size(134, 22); this.loadStateToolStripMenuItem.Text = "Load State"; this.loadStateToolStripMenuItem.DropDownOpened += new System.EventHandler(this.loadStateToolStripMenuItem_DropDownOpened); // // loadstate1toolStripMenuItem // this.loadstate1toolStripMenuItem.Name = "loadstate1toolStripMenuItem"; - this.loadstate1toolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.loadstate1toolStripMenuItem.Size = new System.Drawing.Size(174, 22); this.loadstate1toolStripMenuItem.Text = "1"; this.loadstate1toolStripMenuItem.Click += new System.EventHandler(this.loadstate1toolStripMenuItem_Click); // // loadstate2toolStripMenuItem // this.loadstate2toolStripMenuItem.Name = "loadstate2toolStripMenuItem"; - this.loadstate2toolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.loadstate2toolStripMenuItem.Size = new System.Drawing.Size(174, 22); this.loadstate2toolStripMenuItem.Text = "2"; this.loadstate2toolStripMenuItem.Click += new System.EventHandler(this.loadstate2toolStripMenuItem_Click); // // loadstate3toolStripMenuItem // this.loadstate3toolStripMenuItem.Name = "loadstate3toolStripMenuItem"; - this.loadstate3toolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.loadstate3toolStripMenuItem.Size = new System.Drawing.Size(174, 22); this.loadstate3toolStripMenuItem.Text = "3"; this.loadstate3toolStripMenuItem.Click += new System.EventHandler(this.loadstate3toolStripMenuItem_Click); // // loadstate4toolStripMenuItem // this.loadstate4toolStripMenuItem.Name = "loadstate4toolStripMenuItem"; - this.loadstate4toolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.loadstate4toolStripMenuItem.Size = new System.Drawing.Size(174, 22); this.loadstate4toolStripMenuItem.Text = "4"; this.loadstate4toolStripMenuItem.Click += new System.EventHandler(this.loadstate4toolStripMenuItem_Click); // // loadstate5toolStripMenuItem // this.loadstate5toolStripMenuItem.Name = "loadstate5toolStripMenuItem"; - this.loadstate5toolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.loadstate5toolStripMenuItem.Size = new System.Drawing.Size(174, 22); this.loadstate5toolStripMenuItem.Text = "5"; this.loadstate5toolStripMenuItem.Click += new System.EventHandler(this.loadstate5toolStripMenuItem_Click); // // loadstate6toolStripMenuItem // this.loadstate6toolStripMenuItem.Name = "loadstate6toolStripMenuItem"; - this.loadstate6toolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.loadstate6toolStripMenuItem.Size = new System.Drawing.Size(174, 22); this.loadstate6toolStripMenuItem.Text = "6"; this.loadstate6toolStripMenuItem.Click += new System.EventHandler(this.loadstate6toolStripMenuItem_Click); // // loadstate7toolStripMenuItem // this.loadstate7toolStripMenuItem.Name = "loadstate7toolStripMenuItem"; - this.loadstate7toolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.loadstate7toolStripMenuItem.Size = new System.Drawing.Size(174, 22); this.loadstate7toolStripMenuItem.Text = "7"; this.loadstate7toolStripMenuItem.Click += new System.EventHandler(this.loadstate7toolStripMenuItem_Click); // // loadstate8toolStripMenuItem // this.loadstate8toolStripMenuItem.Name = "loadstate8toolStripMenuItem"; - this.loadstate8toolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.loadstate8toolStripMenuItem.Size = new System.Drawing.Size(174, 22); this.loadstate8toolStripMenuItem.Text = "8"; this.loadstate8toolStripMenuItem.Click += new System.EventHandler(this.loadstate8toolStripMenuItem_Click); // // loadstate9toolStripMenuItem // this.loadstate9toolStripMenuItem.Name = "loadstate9toolStripMenuItem"; - this.loadstate9toolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.loadstate9toolStripMenuItem.Size = new System.Drawing.Size(174, 22); this.loadstate9toolStripMenuItem.Text = "9"; this.loadstate9toolStripMenuItem.Click += new System.EventHandler(this.loadstate9toolStripMenuItem_Click); // // loadstate0toolStripMenuItem // this.loadstate0toolStripMenuItem.Name = "loadstate0toolStripMenuItem"; - this.loadstate0toolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.loadstate0toolStripMenuItem.Size = new System.Drawing.Size(174, 22); this.loadstate0toolStripMenuItem.Text = "0"; this.loadstate0toolStripMenuItem.Click += new System.EventHandler(this.loadstate0toolStripMenuItem_Click); // // toolStripSeparator7 // this.toolStripSeparator7.Name = "toolStripSeparator7"; - this.toolStripSeparator7.Size = new System.Drawing.Size(177, 6); + this.toolStripSeparator7.Size = new System.Drawing.Size(171, 6); // // loadNamedStateToolStripMenuItem // this.loadNamedStateToolStripMenuItem.Name = "loadNamedStateToolStripMenuItem"; - this.loadNamedStateToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.loadNamedStateToolStripMenuItem.Size = new System.Drawing.Size(174, 22); this.loadNamedStateToolStripMenuItem.Text = "Load Named State..."; this.loadNamedStateToolStripMenuItem.Click += new System.EventHandler(this.loadNamedStateToolStripMenuItem_Click); // // toolStripSeparator21 // this.toolStripSeparator21.Name = "toolStripSeparator21"; - this.toolStripSeparator21.Size = new System.Drawing.Size(177, 6); + this.toolStripSeparator21.Size = new System.Drawing.Size(171, 6); // // autoLoadLastSlotToolStripMenuItem // this.autoLoadLastSlotToolStripMenuItem.Name = "autoLoadLastSlotToolStripMenuItem"; - this.autoLoadLastSlotToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.autoLoadLastSlotToolStripMenuItem.Size = new System.Drawing.Size(174, 22); this.autoLoadLastSlotToolStripMenuItem.Text = "AutoLoad last Slot"; this.autoLoadLastSlotToolStripMenuItem.Click += new System.EventHandler(this.autoLoadLastSlotToolStripMenuItem_Click); // @@ -654,77 +654,77 @@ this.saveToCurrentSlotToolStripMenuItem, this.loadCurrentSlotToolStripMenuItem}); this.saveSlotToolStripMenuItem.Name = "saveSlotToolStripMenuItem"; - this.saveSlotToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.saveSlotToolStripMenuItem.Size = new System.Drawing.Size(134, 22); this.saveSlotToolStripMenuItem.Text = "SaveSlot"; this.saveSlotToolStripMenuItem.DropDownOpened += new System.EventHandler(this.saveSlotToolStripMenuItem_DropDownOpened); // // selectSlot10ToolStripMenuItem // this.selectSlot10ToolStripMenuItem.Name = "selectSlot10ToolStripMenuItem"; - this.selectSlot10ToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.selectSlot10ToolStripMenuItem.Size = new System.Drawing.Size(172, 22); this.selectSlot10ToolStripMenuItem.Text = "Select Slot 0"; this.selectSlot10ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot10ToolStripMenuItem_Click); // // selectSlot1ToolStripMenuItem // this.selectSlot1ToolStripMenuItem.Name = "selectSlot1ToolStripMenuItem"; - this.selectSlot1ToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.selectSlot1ToolStripMenuItem.Size = new System.Drawing.Size(172, 22); this.selectSlot1ToolStripMenuItem.Text = "Select Slot 1"; this.selectSlot1ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot1ToolStripMenuItem_Click); // // selectSlot2ToolStripMenuItem // this.selectSlot2ToolStripMenuItem.Name = "selectSlot2ToolStripMenuItem"; - this.selectSlot2ToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.selectSlot2ToolStripMenuItem.Size = new System.Drawing.Size(172, 22); this.selectSlot2ToolStripMenuItem.Text = "Select Slot 2"; this.selectSlot2ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot2ToolStripMenuItem_Click); // // selectSlot3ToolStripMenuItem // this.selectSlot3ToolStripMenuItem.Name = "selectSlot3ToolStripMenuItem"; - this.selectSlot3ToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.selectSlot3ToolStripMenuItem.Size = new System.Drawing.Size(172, 22); this.selectSlot3ToolStripMenuItem.Text = "Select Slot 3"; this.selectSlot3ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot3ToolStripMenuItem_Click); // // selectSlot4ToolStripMenuItem // this.selectSlot4ToolStripMenuItem.Name = "selectSlot4ToolStripMenuItem"; - this.selectSlot4ToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.selectSlot4ToolStripMenuItem.Size = new System.Drawing.Size(172, 22); this.selectSlot4ToolStripMenuItem.Text = "Select Slot 4"; this.selectSlot4ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot4ToolStripMenuItem_Click); // // selectSlot5ToolStripMenuItem // this.selectSlot5ToolStripMenuItem.Name = "selectSlot5ToolStripMenuItem"; - this.selectSlot5ToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.selectSlot5ToolStripMenuItem.Size = new System.Drawing.Size(172, 22); this.selectSlot5ToolStripMenuItem.Text = "Select Slot 5"; this.selectSlot5ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot5ToolStripMenuItem_Click); // // selectSlot6ToolStripMenuItem // this.selectSlot6ToolStripMenuItem.Name = "selectSlot6ToolStripMenuItem"; - this.selectSlot6ToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.selectSlot6ToolStripMenuItem.Size = new System.Drawing.Size(172, 22); this.selectSlot6ToolStripMenuItem.Text = "Select Slot 6"; this.selectSlot6ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot6ToolStripMenuItem_Click); // // selectSlot7ToolStripMenuItem // this.selectSlot7ToolStripMenuItem.Name = "selectSlot7ToolStripMenuItem"; - this.selectSlot7ToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.selectSlot7ToolStripMenuItem.Size = new System.Drawing.Size(172, 22); this.selectSlot7ToolStripMenuItem.Text = "Select Slot 7"; this.selectSlot7ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot7ToolStripMenuItem_Click); // // selectSlot8ToolStripMenuItem // this.selectSlot8ToolStripMenuItem.Name = "selectSlot8ToolStripMenuItem"; - this.selectSlot8ToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.selectSlot8ToolStripMenuItem.Size = new System.Drawing.Size(172, 22); this.selectSlot8ToolStripMenuItem.Text = "Select Slot 8"; this.selectSlot8ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot8ToolStripMenuItem_Click); // // selectSlot9ToolStripMenuItem // this.selectSlot9ToolStripMenuItem.Name = "selectSlot9ToolStripMenuItem"; - this.selectSlot9ToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.selectSlot9ToolStripMenuItem.Size = new System.Drawing.Size(172, 22); this.selectSlot9ToolStripMenuItem.Text = "Select Slot 9"; this.selectSlot9ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot9ToolStripMenuItem_Click); // @@ -732,7 +732,7 @@ // this.previousSlotToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.MoveLeft; this.previousSlotToolStripMenuItem.Name = "previousSlotToolStripMenuItem"; - this.previousSlotToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.previousSlotToolStripMenuItem.Size = new System.Drawing.Size(172, 22); this.previousSlotToolStripMenuItem.Text = "Previous Slot"; this.previousSlotToolStripMenuItem.Click += new System.EventHandler(this.previousSlotToolStripMenuItem_Click); // @@ -740,33 +740,33 @@ // this.nextSlotToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.MoveRight; this.nextSlotToolStripMenuItem.Name = "nextSlotToolStripMenuItem"; - this.nextSlotToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.nextSlotToolStripMenuItem.Size = new System.Drawing.Size(172, 22); this.nextSlotToolStripMenuItem.Text = "Next Slot"; this.nextSlotToolStripMenuItem.Click += new System.EventHandler(this.nextSlotToolStripMenuItem_Click); // // toolStripSeparator5 // this.toolStripSeparator5.Name = "toolStripSeparator5"; - this.toolStripSeparator5.Size = new System.Drawing.Size(175, 6); + this.toolStripSeparator5.Size = new System.Drawing.Size(169, 6); // // saveToCurrentSlotToolStripMenuItem // this.saveToCurrentSlotToolStripMenuItem.Name = "saveToCurrentSlotToolStripMenuItem"; - this.saveToCurrentSlotToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.saveToCurrentSlotToolStripMenuItem.Size = new System.Drawing.Size(172, 22); this.saveToCurrentSlotToolStripMenuItem.Text = "Save to Current Slot"; this.saveToCurrentSlotToolStripMenuItem.Click += new System.EventHandler(this.saveToCurrentSlotToolStripMenuItem_Click); // // loadCurrentSlotToolStripMenuItem // this.loadCurrentSlotToolStripMenuItem.Name = "loadCurrentSlotToolStripMenuItem"; - this.loadCurrentSlotToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.loadCurrentSlotToolStripMenuItem.Size = new System.Drawing.Size(172, 22); this.loadCurrentSlotToolStripMenuItem.Text = "Load Current Slot"; this.loadCurrentSlotToolStripMenuItem.Click += new System.EventHandler(this.loadCurrentSlotToolStripMenuItem_Click); // // toolStripMenuItem2 // this.toolStripMenuItem2.Name = "toolStripMenuItem2"; - this.toolStripMenuItem2.Size = new System.Drawing.Size(137, 6); + this.toolStripMenuItem2.Size = new System.Drawing.Size(131, 6); // // movieToolStripMenuItem // @@ -784,7 +784,7 @@ this.bindSavestatesToMoviesToolStripMenuItem, this.automaticallyBackupMoviesToolStripMenuItem}); this.movieToolStripMenuItem.Name = "movieToolStripMenuItem"; - this.movieToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.movieToolStripMenuItem.Size = new System.Drawing.Size(134, 22); this.movieToolStripMenuItem.Text = "Movie"; this.movieToolStripMenuItem.DropDownOpened += new System.EventHandler(this.movieToolStripMenuItem_DropDownOpened); // @@ -792,14 +792,14 @@ // this.readonlyToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.ReadOnly; this.readonlyToolStripMenuItem.Name = "readonlyToolStripMenuItem"; - this.readonlyToolStripMenuItem.Size = new System.Drawing.Size(231, 22); + this.readonlyToolStripMenuItem.Size = new System.Drawing.Size(211, 22); this.readonlyToolStripMenuItem.Text = "Read-only"; this.readonlyToolStripMenuItem.Click += new System.EventHandler(this.readonlyToolStripMenuItem_Click); // // toolStripSeparator15 // this.toolStripSeparator15.Name = "toolStripSeparator15"; - this.toolStripSeparator15.Size = new System.Drawing.Size(228, 6); + this.toolStripSeparator15.Size = new System.Drawing.Size(208, 6); // // recentToolStripMenuItem // @@ -810,38 +810,38 @@ this.autoloadMostRecentToolStripMenuItem1}); this.recentToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Recent; this.recentToolStripMenuItem.Name = "recentToolStripMenuItem"; - this.recentToolStripMenuItem.Size = new System.Drawing.Size(231, 22); + this.recentToolStripMenuItem.Size = new System.Drawing.Size(211, 22); this.recentToolStripMenuItem.Text = "Recent"; this.recentToolStripMenuItem.DropDownOpened += new System.EventHandler(this.recentToolStripMenuItem_DropDownOpened); // // noneToolStripMenuItem1 // this.noneToolStripMenuItem1.Name = "noneToolStripMenuItem1"; - this.noneToolStripMenuItem1.Size = new System.Drawing.Size(192, 22); + this.noneToolStripMenuItem1.Size = new System.Drawing.Size(180, 22); this.noneToolStripMenuItem1.Text = "None"; // // toolStripSeparator16 // this.toolStripSeparator16.Name = "toolStripSeparator16"; - this.toolStripSeparator16.Size = new System.Drawing.Size(189, 6); + this.toolStripSeparator16.Size = new System.Drawing.Size(177, 6); // // clearToolStripMenuItem1 // this.clearToolStripMenuItem1.Name = "clearToolStripMenuItem1"; - this.clearToolStripMenuItem1.Size = new System.Drawing.Size(192, 22); + this.clearToolStripMenuItem1.Size = new System.Drawing.Size(180, 22); this.clearToolStripMenuItem1.Text = "Clear"; // // autoloadMostRecentToolStripMenuItem1 // this.autoloadMostRecentToolStripMenuItem1.Name = "autoloadMostRecentToolStripMenuItem1"; - this.autoloadMostRecentToolStripMenuItem1.Size = new System.Drawing.Size(192, 22); + this.autoloadMostRecentToolStripMenuItem1.Size = new System.Drawing.Size(180, 22); this.autoloadMostRecentToolStripMenuItem1.Text = "&Autoload Most Recent"; // // recordMovieToolStripMenuItem // this.recordMovieToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.RecordHS; this.recordMovieToolStripMenuItem.Name = "recordMovieToolStripMenuItem"; - this.recordMovieToolStripMenuItem.Size = new System.Drawing.Size(231, 22); + this.recordMovieToolStripMenuItem.Size = new System.Drawing.Size(211, 22); this.recordMovieToolStripMenuItem.Text = "&Record Movie..."; this.recordMovieToolStripMenuItem.Click += new System.EventHandler(this.recordMovieToolStripMenuItem_Click); // @@ -849,7 +849,7 @@ // this.playMovieToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Play; this.playMovieToolStripMenuItem.Name = "playMovieToolStripMenuItem"; - this.playMovieToolStripMenuItem.Size = new System.Drawing.Size(231, 22); + this.playMovieToolStripMenuItem.Size = new System.Drawing.Size(211, 22); this.playMovieToolStripMenuItem.Text = "&Play Movie..."; this.playMovieToolStripMenuItem.Click += new System.EventHandler(this.playMovieToolStripMenuItem_Click); // @@ -857,7 +857,7 @@ // this.stopMovieToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Stop; this.stopMovieToolStripMenuItem.Name = "stopMovieToolStripMenuItem"; - this.stopMovieToolStripMenuItem.Size = new System.Drawing.Size(231, 22); + this.stopMovieToolStripMenuItem.Size = new System.Drawing.Size(211, 22); this.stopMovieToolStripMenuItem.Text = "Stop Movie"; this.stopMovieToolStripMenuItem.Click += new System.EventHandler(this.stopMovieToolStripMenuItem_Click); // @@ -865,7 +865,7 @@ // this.playFromBeginningToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.restart; this.playFromBeginningToolStripMenuItem.Name = "playFromBeginningToolStripMenuItem"; - this.playFromBeginningToolStripMenuItem.Size = new System.Drawing.Size(231, 22); + this.playFromBeginningToolStripMenuItem.Size = new System.Drawing.Size(211, 22); this.playFromBeginningToolStripMenuItem.Text = "Play from Beginning"; this.playFromBeginningToolStripMenuItem.Click += new System.EventHandler(this.playFromBeginningToolStripMenuItem_Click); // @@ -873,7 +873,7 @@ // this.importMovieToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Import; this.importMovieToolStripMenuItem.Name = "importMovieToolStripMenuItem"; - this.importMovieToolStripMenuItem.Size = new System.Drawing.Size(231, 22); + this.importMovieToolStripMenuItem.Size = new System.Drawing.Size(211, 22); this.importMovieToolStripMenuItem.Text = "Import Movies..."; this.importMovieToolStripMenuItem.Click += new System.EventHandler(this.importMovieToolStripMenuItem_Click); // @@ -881,26 +881,26 @@ // this.saveMovieToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.SaveAs; this.saveMovieToolStripMenuItem.Name = "saveMovieToolStripMenuItem"; - this.saveMovieToolStripMenuItem.Size = new System.Drawing.Size(231, 22); + this.saveMovieToolStripMenuItem.Size = new System.Drawing.Size(211, 22); this.saveMovieToolStripMenuItem.Text = "&Save Movie"; this.saveMovieToolStripMenuItem.Click += new System.EventHandler(this.saveMovieToolStripMenuItem_Click); // // toolStripSeparator14 // this.toolStripSeparator14.Name = "toolStripSeparator14"; - this.toolStripSeparator14.Size = new System.Drawing.Size(228, 6); + this.toolStripSeparator14.Size = new System.Drawing.Size(208, 6); // // bindSavestatesToMoviesToolStripMenuItem // this.bindSavestatesToMoviesToolStripMenuItem.Name = "bindSavestatesToMoviesToolStripMenuItem"; - this.bindSavestatesToMoviesToolStripMenuItem.Size = new System.Drawing.Size(231, 22); + this.bindSavestatesToMoviesToolStripMenuItem.Size = new System.Drawing.Size(211, 22); this.bindSavestatesToMoviesToolStripMenuItem.Text = "Bind Savestates to Movies"; this.bindSavestatesToMoviesToolStripMenuItem.Click += new System.EventHandler(this.bindSavestatesToMoviesToolStripMenuItem_Click); // // automaticallyBackupMoviesToolStripMenuItem // this.automaticallyBackupMoviesToolStripMenuItem.Name = "automaticallyBackupMoviesToolStripMenuItem"; - this.automaticallyBackupMoviesToolStripMenuItem.Size = new System.Drawing.Size(231, 22); + this.automaticallyBackupMoviesToolStripMenuItem.Size = new System.Drawing.Size(211, 22); this.automaticallyBackupMoviesToolStripMenuItem.Text = "Automatically Backup Movies"; this.automaticallyBackupMoviesToolStripMenuItem.Click += new System.EventHandler(this.automaticallyBackupMoviesToolStripMenuItem_Click); // @@ -912,7 +912,7 @@ this.toolStripSeparator19, this.captureOSDToolStripMenuItem}); this.AVIWAVToolStripMenuItem.Name = "AVIWAVToolStripMenuItem"; - this.AVIWAVToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.AVIWAVToolStripMenuItem.Size = new System.Drawing.Size(134, 22); this.AVIWAVToolStripMenuItem.Text = "AVI/WAV"; this.AVIWAVToolStripMenuItem.DropDownOpened += new System.EventHandler(this.aVIWAVToolStripMenuItem_DropDownOpened); // @@ -920,7 +920,7 @@ // this.recordAVIToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.AVI; this.recordAVIToolStripMenuItem.Name = "recordAVIToolStripMenuItem"; - this.recordAVIToolStripMenuItem.Size = new System.Drawing.Size(163, 22); + this.recordAVIToolStripMenuItem.Size = new System.Drawing.Size(155, 22); this.recordAVIToolStripMenuItem.Text = "Record AVI/WAV"; this.recordAVIToolStripMenuItem.Click += new System.EventHandler(this.recordAVIToolStripMenuItem_Click); // @@ -928,19 +928,19 @@ // this.stopAVIToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Stop; this.stopAVIToolStripMenuItem.Name = "stopAVIToolStripMenuItem"; - this.stopAVIToolStripMenuItem.Size = new System.Drawing.Size(163, 22); + this.stopAVIToolStripMenuItem.Size = new System.Drawing.Size(155, 22); this.stopAVIToolStripMenuItem.Text = "Stop AVI/WAV"; this.stopAVIToolStripMenuItem.Click += new System.EventHandler(this.stopAVIToolStripMenuItem_Click); // // toolStripSeparator19 // this.toolStripSeparator19.Name = "toolStripSeparator19"; - this.toolStripSeparator19.Size = new System.Drawing.Size(160, 6); + this.toolStripSeparator19.Size = new System.Drawing.Size(152, 6); // // captureOSDToolStripMenuItem // this.captureOSDToolStripMenuItem.Name = "captureOSDToolStripMenuItem"; - this.captureOSDToolStripMenuItem.Size = new System.Drawing.Size(163, 22); + this.captureOSDToolStripMenuItem.Size = new System.Drawing.Size(155, 22); this.captureOSDToolStripMenuItem.Text = "Capture OSD"; this.captureOSDToolStripMenuItem.Click += new System.EventHandler(this.captureOSDToolStripMenuItem_Click); // @@ -953,7 +953,7 @@ this.toolStripSeparator20, this.captureOSDToolStripMenuItem1}); this.screenshotToolStripMenuItem.Name = "screenshotToolStripMenuItem"; - this.screenshotToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.screenshotToolStripMenuItem.Size = new System.Drawing.Size(134, 22); this.screenshotToolStripMenuItem.Text = "Screenshot"; this.screenshotToolStripMenuItem.DropDownOpening += new System.EventHandler(this.screenshotToolStripMenuItem_DropDownOpening); // @@ -961,14 +961,14 @@ // this.screenshotF12ToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.camera; this.screenshotF12ToolStripMenuItem.Name = "screenshotF12ToolStripMenuItem"; - this.screenshotF12ToolStripMenuItem.Size = new System.Drawing.Size(245, 22); + this.screenshotF12ToolStripMenuItem.Size = new System.Drawing.Size(230, 22); this.screenshotF12ToolStripMenuItem.Text = "Screenshot"; this.screenshotF12ToolStripMenuItem.Click += new System.EventHandler(this.screenshotF12ToolStripMenuItem_Click); // // screenshotAsToolStripMenuItem // this.screenshotAsToolStripMenuItem.Name = "screenshotAsToolStripMenuItem"; - this.screenshotAsToolStripMenuItem.Size = new System.Drawing.Size(245, 22); + this.screenshotAsToolStripMenuItem.Size = new System.Drawing.Size(230, 22); this.screenshotAsToolStripMenuItem.Text = "Screenshot As..."; this.screenshotAsToolStripMenuItem.Click += new System.EventHandler(this.screenshotAsToolStripMenuItem_Click); // @@ -976,32 +976,32 @@ // this.screenshotClipboardToolStripMenuItem.Name = "screenshotClipboardToolStripMenuItem"; this.screenshotClipboardToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.C))); - this.screenshotClipboardToolStripMenuItem.Size = new System.Drawing.Size(245, 22); + this.screenshotClipboardToolStripMenuItem.Size = new System.Drawing.Size(230, 22); this.screenshotClipboardToolStripMenuItem.Text = "Screenshot -> Clipboard"; this.screenshotClipboardToolStripMenuItem.Click += new System.EventHandler(this.screenshotClipboardToolStripMenuItem_Click); // // toolStripSeparator20 // this.toolStripSeparator20.Name = "toolStripSeparator20"; - this.toolStripSeparator20.Size = new System.Drawing.Size(242, 6); + this.toolStripSeparator20.Size = new System.Drawing.Size(227, 6); // // captureOSDToolStripMenuItem1 // this.captureOSDToolStripMenuItem1.Name = "captureOSDToolStripMenuItem1"; - this.captureOSDToolStripMenuItem1.Size = new System.Drawing.Size(245, 22); + this.captureOSDToolStripMenuItem1.Size = new System.Drawing.Size(230, 22); this.captureOSDToolStripMenuItem1.Text = "Capture OSD"; this.captureOSDToolStripMenuItem1.Click += new System.EventHandler(this.captureOSDToolStripMenuItem1_Click); // // toolStripSeparator4 // this.toolStripSeparator4.Name = "toolStripSeparator4"; - this.toolStripSeparator4.Size = new System.Drawing.Size(137, 6); + this.toolStripSeparator4.Size = new System.Drawing.Size(131, 6); // // exitToolStripMenuItem // this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; this.exitToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4))); - this.exitToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.exitToolStripMenuItem.Size = new System.Drawing.Size(134, 22); this.exitToolStripMenuItem.Text = "Exit"; this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); // @@ -1014,7 +1014,7 @@ this.resetToolStripMenuItem, this.hardResetToolStripMenuItem}); this.emulationToolStripMenuItem.Name = "emulationToolStripMenuItem"; - this.emulationToolStripMenuItem.Size = new System.Drawing.Size(73, 19); + this.emulationToolStripMenuItem.Size = new System.Drawing.Size(65, 17); this.emulationToolStripMenuItem.Text = "&Emulation"; this.emulationToolStripMenuItem.DropDownOpened += new System.EventHandler(this.emulationToolStripMenuItem_DropDownOpened); // @@ -1022,7 +1022,7 @@ // this.pauseToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Pause; this.pauseToolStripMenuItem.Name = "pauseToolStripMenuItem"; - this.pauseToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.pauseToolStripMenuItem.Size = new System.Drawing.Size(135, 22); this.pauseToolStripMenuItem.Text = "&Pause"; this.pauseToolStripMenuItem.Click += new System.EventHandler(this.pauseToolStripMenuItem_Click); // @@ -1030,26 +1030,26 @@ // this.rebootCoreToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.reboot; this.rebootCoreToolStripMenuItem.Name = "rebootCoreToolStripMenuItem"; - this.rebootCoreToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.rebootCoreToolStripMenuItem.Size = new System.Drawing.Size(135, 22); this.rebootCoreToolStripMenuItem.Text = "&Reboot Core"; this.rebootCoreToolStripMenuItem.Click += new System.EventHandler(this.powerToolStripMenuItem_Click); // // toolStripSeparator1 // this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(137, 6); + this.toolStripSeparator1.Size = new System.Drawing.Size(132, 6); // // resetToolStripMenuItem // this.resetToolStripMenuItem.Name = "resetToolStripMenuItem"; - this.resetToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.resetToolStripMenuItem.Size = new System.Drawing.Size(135, 22); this.resetToolStripMenuItem.Text = "&Soft Reset"; this.resetToolStripMenuItem.Click += new System.EventHandler(this.resetToolStripMenuItem_Click); // // hardResetToolStripMenuItem // this.hardResetToolStripMenuItem.Name = "hardResetToolStripMenuItem"; - this.hardResetToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.hardResetToolStripMenuItem.Size = new System.Drawing.Size(135, 22); this.hardResetToolStripMenuItem.Text = "&Hard Reset"; this.hardResetToolStripMenuItem.Click += new System.EventHandler(this.hardResetToolStripMenuItem_Click); // @@ -1070,7 +1070,7 @@ this.displayStatusBarToolStripMenuItem, this.displayLogWindowToolStripMenuItem}); this.viewToolStripMenuItem.Name = "viewToolStripMenuItem"; - this.viewToolStripMenuItem.Size = new System.Drawing.Size(44, 19); + this.viewToolStripMenuItem.Size = new System.Drawing.Size(41, 17); this.viewToolStripMenuItem.Text = "&View"; this.viewToolStripMenuItem.DropDownOpened += new System.EventHandler(this.viewToolStripMenuItem_DropDownOpened); // @@ -1082,34 +1082,34 @@ this.SuperX2SAIMenuItem, this.SuperEagleMenuItem}); this.windowFilterMenuItem.Name = "windowFilterMenuItem"; - this.windowFilterMenuItem.Size = new System.Drawing.Size(198, 22); + this.windowFilterMenuItem.Size = new System.Drawing.Size(187, 22); this.windowFilterMenuItem.Text = "Display Filter"; // // DisplayFilterNoneMenuItem // this.DisplayFilterNoneMenuItem.Name = "DisplayFilterNoneMenuItem"; - this.DisplayFilterNoneMenuItem.Size = new System.Drawing.Size(135, 22); + this.DisplayFilterNoneMenuItem.Size = new System.Drawing.Size(134, 22); this.DisplayFilterNoneMenuItem.Text = "None"; this.DisplayFilterNoneMenuItem.Click += new System.EventHandler(this.DisplayFilterMenuItem_Click); // // x2SAIMenuItem // this.x2SAIMenuItem.Name = "x2SAIMenuItem"; - this.x2SAIMenuItem.Size = new System.Drawing.Size(135, 22); + this.x2SAIMenuItem.Size = new System.Drawing.Size(134, 22); this.x2SAIMenuItem.Text = "2xSAI"; this.x2SAIMenuItem.Click += new System.EventHandler(this.DisplayFilterMenuItem_Click); // // SuperX2SAIMenuItem // this.SuperX2SAIMenuItem.Name = "SuperX2SAIMenuItem"; - this.SuperX2SAIMenuItem.Size = new System.Drawing.Size(135, 22); + this.SuperX2SAIMenuItem.Size = new System.Drawing.Size(134, 22); this.SuperX2SAIMenuItem.Text = "Super 2xSAI"; this.SuperX2SAIMenuItem.Click += new System.EventHandler(this.DisplayFilterMenuItem_Click); // // SuperEagleMenuItem // this.SuperEagleMenuItem.Name = "SuperEagleMenuItem"; - this.SuperEagleMenuItem.Size = new System.Drawing.Size(135, 22); + this.SuperEagleMenuItem.Size = new System.Drawing.Size(134, 22); this.SuperEagleMenuItem.Text = "Super Eagle"; this.SuperEagleMenuItem.Click += new System.EventHandler(this.DisplayFilterMenuItem_Click); // @@ -1123,48 +1123,48 @@ this.x5MenuItem, this.mzMenuItem}); this.windowSizeMenuItem.Name = "windowSizeMenuItem"; - this.windowSizeMenuItem.Size = new System.Drawing.Size(198, 22); + this.windowSizeMenuItem.Size = new System.Drawing.Size(187, 22); this.windowSizeMenuItem.Text = "&Window Size"; // // x1MenuItem // this.x1MenuItem.Name = "x1MenuItem"; - this.x1MenuItem.Size = new System.Drawing.Size(96, 22); + this.x1MenuItem.Size = new System.Drawing.Size(94, 22); this.x1MenuItem.Text = "&1x"; this.x1MenuItem.Click += new System.EventHandler(this.zoomMenuItem_Click); // // x2MenuItem // this.x2MenuItem.Name = "x2MenuItem"; - this.x2MenuItem.Size = new System.Drawing.Size(96, 22); + this.x2MenuItem.Size = new System.Drawing.Size(94, 22); this.x2MenuItem.Text = "&2x"; this.x2MenuItem.Click += new System.EventHandler(this.zoomMenuItem_Click); // // x3MenuItem // this.x3MenuItem.Name = "x3MenuItem"; - this.x3MenuItem.Size = new System.Drawing.Size(96, 22); + this.x3MenuItem.Size = new System.Drawing.Size(94, 22); this.x3MenuItem.Text = "&3x"; this.x3MenuItem.Click += new System.EventHandler(this.zoomMenuItem_Click); // // x4MenuItem // this.x4MenuItem.Name = "x4MenuItem"; - this.x4MenuItem.Size = new System.Drawing.Size(96, 22); + this.x4MenuItem.Size = new System.Drawing.Size(94, 22); this.x4MenuItem.Text = "&4x"; this.x4MenuItem.Click += new System.EventHandler(this.zoomMenuItem_Click); // // x5MenuItem // this.x5MenuItem.Name = "x5MenuItem"; - this.x5MenuItem.Size = new System.Drawing.Size(96, 22); + this.x5MenuItem.Size = new System.Drawing.Size(94, 22); this.x5MenuItem.Text = "&5x"; this.x5MenuItem.Click += new System.EventHandler(this.zoomMenuItem_Click); // // mzMenuItem // this.mzMenuItem.Name = "mzMenuItem"; - this.mzMenuItem.Size = new System.Drawing.Size(96, 22); + this.mzMenuItem.Size = new System.Drawing.Size(94, 22); this.mzMenuItem.Text = "&Max"; this.mzMenuItem.Click += new System.EventHandler(this.zoomMenuItem_Click); // @@ -1172,73 +1172,73 @@ // this.switchToFullscreenToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Fullscreen; this.switchToFullscreenToolStripMenuItem.Name = "switchToFullscreenToolStripMenuItem"; - this.switchToFullscreenToolStripMenuItem.Size = new System.Drawing.Size(198, 22); + this.switchToFullscreenToolStripMenuItem.Size = new System.Drawing.Size(187, 22); this.switchToFullscreenToolStripMenuItem.Text = "Switch to Fullscreen"; this.switchToFullscreenToolStripMenuItem.Click += new System.EventHandler(this.switchToFullscreenToolStripMenuItem_Click); // // toolStripSeparator2 // this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(195, 6); + this.toolStripSeparator2.Size = new System.Drawing.Size(184, 6); // // displayFPSToolStripMenuItem // this.displayFPSToolStripMenuItem.Name = "displayFPSToolStripMenuItem"; - this.displayFPSToolStripMenuItem.Size = new System.Drawing.Size(198, 22); + this.displayFPSToolStripMenuItem.Size = new System.Drawing.Size(187, 22); this.displayFPSToolStripMenuItem.Text = "Display FPS"; this.displayFPSToolStripMenuItem.Click += new System.EventHandler(this.displayFPSToolStripMenuItem_Click); // // displayFrameCounterToolStripMenuItem // this.displayFrameCounterToolStripMenuItem.Name = "displayFrameCounterToolStripMenuItem"; - this.displayFrameCounterToolStripMenuItem.Size = new System.Drawing.Size(198, 22); + this.displayFrameCounterToolStripMenuItem.Size = new System.Drawing.Size(187, 22); this.displayFrameCounterToolStripMenuItem.Text = "Display FrameCounter"; this.displayFrameCounterToolStripMenuItem.Click += new System.EventHandler(this.displayFrameCounterToolStripMenuItem_Click); // // displayLagCounterToolStripMenuItem // this.displayLagCounterToolStripMenuItem.Name = "displayLagCounterToolStripMenuItem"; - this.displayLagCounterToolStripMenuItem.Size = new System.Drawing.Size(198, 22); + this.displayLagCounterToolStripMenuItem.Size = new System.Drawing.Size(187, 22); this.displayLagCounterToolStripMenuItem.Text = "Display Lag Counter"; this.displayLagCounterToolStripMenuItem.Click += new System.EventHandler(this.displayLagCounterToolStripMenuItem_Click); // // displayInputToolStripMenuItem // this.displayInputToolStripMenuItem.Name = "displayInputToolStripMenuItem"; - this.displayInputToolStripMenuItem.Size = new System.Drawing.Size(198, 22); + this.displayInputToolStripMenuItem.Size = new System.Drawing.Size(187, 22); this.displayInputToolStripMenuItem.Text = "Display Input"; this.displayInputToolStripMenuItem.Click += new System.EventHandler(this.displayInputToolStripMenuItem_Click); // // displayRerecordCountToolStripMenuItem // this.displayRerecordCountToolStripMenuItem.Name = "displayRerecordCountToolStripMenuItem"; - this.displayRerecordCountToolStripMenuItem.Size = new System.Drawing.Size(198, 22); + this.displayRerecordCountToolStripMenuItem.Size = new System.Drawing.Size(187, 22); this.displayRerecordCountToolStripMenuItem.Text = "Display Rerecord Count"; this.displayRerecordCountToolStripMenuItem.Click += new System.EventHandler(this.displayRerecordCountToolStripMenuItem_Click); // // displaySubtitlesToolStripMenuItem // this.displaySubtitlesToolStripMenuItem.Name = "displaySubtitlesToolStripMenuItem"; - this.displaySubtitlesToolStripMenuItem.Size = new System.Drawing.Size(198, 22); + this.displaySubtitlesToolStripMenuItem.Size = new System.Drawing.Size(187, 22); this.displaySubtitlesToolStripMenuItem.Text = "Display Subtitles"; this.displaySubtitlesToolStripMenuItem.Click += new System.EventHandler(this.displaySubtitlesToolStripMenuItem_Click); // // toolStripMenuItem4 // this.toolStripMenuItem4.Name = "toolStripMenuItem4"; - this.toolStripMenuItem4.Size = new System.Drawing.Size(195, 6); + this.toolStripMenuItem4.Size = new System.Drawing.Size(184, 6); // // displayStatusBarToolStripMenuItem // this.displayStatusBarToolStripMenuItem.Name = "displayStatusBarToolStripMenuItem"; - this.displayStatusBarToolStripMenuItem.Size = new System.Drawing.Size(198, 22); + this.displayStatusBarToolStripMenuItem.Size = new System.Drawing.Size(187, 22); this.displayStatusBarToolStripMenuItem.Text = "Display Status Bar"; this.displayStatusBarToolStripMenuItem.Click += new System.EventHandler(this.displayStatusBarToolStripMenuItem_Click); // // displayLogWindowToolStripMenuItem // this.displayLogWindowToolStripMenuItem.Name = "displayLogWindowToolStripMenuItem"; - this.displayLogWindowToolStripMenuItem.Size = new System.Drawing.Size(198, 22); + this.displayLogWindowToolStripMenuItem.Size = new System.Drawing.Size(187, 22); this.displayLogWindowToolStripMenuItem.Text = "Display Log Window"; this.displayLogWindowToolStripMenuItem.Click += new System.EventHandler(this.displayLogWindowToolStripMenuItem_Click); // @@ -1259,14 +1259,14 @@ this.saveConfigToolStripMenuItem, this.loadConfigToolStripMenuItem}); this.configToolStripMenuItem.Name = "configToolStripMenuItem"; - this.configToolStripMenuItem.Size = new System.Drawing.Size(55, 19); + this.configToolStripMenuItem.Size = new System.Drawing.Size(50, 17); this.configToolStripMenuItem.Text = "&Config"; // // controllersToolStripMenuItem // this.controllersToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.GameController; this.controllersToolStripMenuItem.Name = "controllersToolStripMenuItem"; - this.controllersToolStripMenuItem.Size = new System.Drawing.Size(141, 22); + this.controllersToolStripMenuItem.Size = new System.Drawing.Size(138, 22); this.controllersToolStripMenuItem.Text = "&Controllers..."; this.controllersToolStripMenuItem.Click += new System.EventHandler(this.controllersToolStripMenuItem_Click); // @@ -1274,7 +1274,7 @@ // this.hotkeysToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.HotKeys; this.hotkeysToolStripMenuItem.Name = "hotkeysToolStripMenuItem"; - this.hotkeysToolStripMenuItem.Size = new System.Drawing.Size(141, 22); + this.hotkeysToolStripMenuItem.Size = new System.Drawing.Size(138, 22); this.hotkeysToolStripMenuItem.Text = "&Hotkeys..."; this.hotkeysToolStripMenuItem.Click += new System.EventHandler(this.hotkeysToolStripMenuItem_Click); // @@ -1282,7 +1282,7 @@ // this.messagesToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.MessageConfig; this.messagesToolStripMenuItem.Name = "messagesToolStripMenuItem"; - this.messagesToolStripMenuItem.Size = new System.Drawing.Size(141, 22); + this.messagesToolStripMenuItem.Size = new System.Drawing.Size(138, 22); this.messagesToolStripMenuItem.Text = "&Messages..."; this.messagesToolStripMenuItem.Click += new System.EventHandler(this.messagesToolStripMenuItem_Click); // @@ -1290,7 +1290,7 @@ // this.pathsToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.CopyFolderHS; this.pathsToolStripMenuItem.Name = "pathsToolStripMenuItem"; - this.pathsToolStripMenuItem.Size = new System.Drawing.Size(141, 22); + this.pathsToolStripMenuItem.Size = new System.Drawing.Size(138, 22); this.pathsToolStripMenuItem.Text = "Paths..."; this.pathsToolStripMenuItem.Click += new System.EventHandler(this.pathsToolStripMenuItem_Click); // @@ -1298,7 +1298,7 @@ // this.soundToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.AudioHS; this.soundToolStripMenuItem.Name = "soundToolStripMenuItem"; - this.soundToolStripMenuItem.Size = new System.Drawing.Size(141, 22); + this.soundToolStripMenuItem.Size = new System.Drawing.Size(138, 22); this.soundToolStripMenuItem.Text = "&Sound..."; this.soundToolStripMenuItem.Click += new System.EventHandler(this.soundToolStripMenuItem_Click); // @@ -1306,14 +1306,14 @@ // this.autofireToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Lightning; this.autofireToolStripMenuItem.Name = "autofireToolStripMenuItem"; - this.autofireToolStripMenuItem.Size = new System.Drawing.Size(141, 22); + this.autofireToolStripMenuItem.Size = new System.Drawing.Size(138, 22); this.autofireToolStripMenuItem.Text = "&Autofire..."; this.autofireToolStripMenuItem.Click += new System.EventHandler(this.autofireToolStripMenuItem_Click); // // toolStripSeparator9 // this.toolStripSeparator9.Name = "toolStripSeparator9"; - this.toolStripSeparator9.Size = new System.Drawing.Size(138, 6); + this.toolStripSeparator9.Size = new System.Drawing.Size(135, 6); // // enableToolStripMenuItem // @@ -1326,56 +1326,56 @@ this.frameAdvanceSkipLagFramesToolStripMenuItem, this.backupSaveramToolStripMenuItem}); this.enableToolStripMenuItem.Name = "enableToolStripMenuItem"; - this.enableToolStripMenuItem.Size = new System.Drawing.Size(141, 22); + this.enableToolStripMenuItem.Size = new System.Drawing.Size(138, 22); this.enableToolStripMenuItem.Text = "&Enable"; this.enableToolStripMenuItem.DropDownOpened += new System.EventHandler(this.enableToolStripMenuItem_DropDownOpened); // // enableRewindToolStripMenuItem // this.enableRewindToolStripMenuItem.Name = "enableRewindToolStripMenuItem"; - this.enableRewindToolStripMenuItem.Size = new System.Drawing.Size(252, 22); + this.enableRewindToolStripMenuItem.Size = new System.Drawing.Size(236, 22); this.enableRewindToolStripMenuItem.Text = "&Enable Rewind"; this.enableRewindToolStripMenuItem.Click += new System.EventHandler(this.enableRewindToolStripMenuItem_Click); // // enableContextMenuToolStripMenuItem // this.enableContextMenuToolStripMenuItem.Name = "enableContextMenuToolStripMenuItem"; - this.enableContextMenuToolStripMenuItem.Size = new System.Drawing.Size(252, 22); + this.enableContextMenuToolStripMenuItem.Size = new System.Drawing.Size(236, 22); this.enableContextMenuToolStripMenuItem.Text = "Enable Context Menu"; this.enableContextMenuToolStripMenuItem.Click += new System.EventHandler(this.enableContextMenuToolStripMenuItem_Click); // // backupSavestatesToolStripMenuItem // this.backupSavestatesToolStripMenuItem.Name = "backupSavestatesToolStripMenuItem"; - this.backupSavestatesToolStripMenuItem.Size = new System.Drawing.Size(252, 22); + this.backupSavestatesToolStripMenuItem.Size = new System.Drawing.Size(236, 22); this.backupSavestatesToolStripMenuItem.Text = "Backup Savestates"; this.backupSavestatesToolStripMenuItem.Click += new System.EventHandler(this.backupSavestatesToolStripMenuItem_Click); // // autoSavestatesToolStripMenuItem // this.autoSavestatesToolStripMenuItem.Name = "autoSavestatesToolStripMenuItem"; - this.autoSavestatesToolStripMenuItem.Size = new System.Drawing.Size(252, 22); + this.autoSavestatesToolStripMenuItem.Size = new System.Drawing.Size(236, 22); this.autoSavestatesToolStripMenuItem.Text = "Auto Savestates"; this.autoSavestatesToolStripMenuItem.Click += new System.EventHandler(this.autoSavestatesToolStripMenuItem_Click); // // saveScreenshotWithSavestatesToolStripMenuItem // this.saveScreenshotWithSavestatesToolStripMenuItem.Name = "saveScreenshotWithSavestatesToolStripMenuItem"; - this.saveScreenshotWithSavestatesToolStripMenuItem.Size = new System.Drawing.Size(252, 22); + this.saveScreenshotWithSavestatesToolStripMenuItem.Size = new System.Drawing.Size(236, 22); this.saveScreenshotWithSavestatesToolStripMenuItem.Text = "Save Screenshot with Savestates"; this.saveScreenshotWithSavestatesToolStripMenuItem.Click += new System.EventHandler(this.screenshotWithSavestatesToolStripMenuItem_Click); // // frameAdvanceSkipLagFramesToolStripMenuItem // this.frameAdvanceSkipLagFramesToolStripMenuItem.Name = "frameAdvanceSkipLagFramesToolStripMenuItem"; - this.frameAdvanceSkipLagFramesToolStripMenuItem.Size = new System.Drawing.Size(252, 22); + this.frameAdvanceSkipLagFramesToolStripMenuItem.Size = new System.Drawing.Size(236, 22); this.frameAdvanceSkipLagFramesToolStripMenuItem.Text = "Frame Advance - Skip Lag Frames"; this.frameAdvanceSkipLagFramesToolStripMenuItem.Click += new System.EventHandler(this.frameAdvanceSkipLagFramesToolStripMenuItem_Click); // // backupSaveramToolStripMenuItem // this.backupSaveramToolStripMenuItem.Name = "backupSaveramToolStripMenuItem"; - this.backupSaveramToolStripMenuItem.Size = new System.Drawing.Size(252, 22); + this.backupSaveramToolStripMenuItem.Size = new System.Drawing.Size(236, 22); this.backupSaveramToolStripMenuItem.Text = "Backup Saveram"; this.backupSaveramToolStripMenuItem.Click += new System.EventHandler(this.backupSaveramToolStripMenuItem_Click); // @@ -1397,101 +1397,101 @@ this.toolStripSeparator23, this.logWindowAsConsoleToolStripMenuItem}); this.gUIToolStripMenuItem.Name = "gUIToolStripMenuItem"; - this.gUIToolStripMenuItem.Size = new System.Drawing.Size(141, 22); + this.gUIToolStripMenuItem.Size = new System.Drawing.Size(138, 22); this.gUIToolStripMenuItem.Text = "GUI"; this.gUIToolStripMenuItem.DropDownOpened += new System.EventHandler(this.gUIToolStripMenuItem_DropDownOpened); // // pauseWhenMenuActivatedToolStripMenuItem // this.pauseWhenMenuActivatedToolStripMenuItem.Name = "pauseWhenMenuActivatedToolStripMenuItem"; - this.pauseWhenMenuActivatedToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.pauseWhenMenuActivatedToolStripMenuItem.Size = new System.Drawing.Size(231, 22); this.pauseWhenMenuActivatedToolStripMenuItem.Text = "Pause when menu activated"; this.pauseWhenMenuActivatedToolStripMenuItem.Click += new System.EventHandler(this.pauseWhenMenuActivatedToolStripMenuItem_Click); // // startPausedToolStripMenuItem // this.startPausedToolStripMenuItem.Name = "startPausedToolStripMenuItem"; - this.startPausedToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.startPausedToolStripMenuItem.Size = new System.Drawing.Size(231, 22); this.startPausedToolStripMenuItem.Text = "Start paused"; this.startPausedToolStripMenuItem.Click += new System.EventHandler(this.startPausedToolStripMenuItem_Click); // // toolStripSeparator22 // this.toolStripSeparator22.Name = "toolStripSeparator22"; - this.toolStripSeparator22.Size = new System.Drawing.Size(238, 6); + this.toolStripSeparator22.Size = new System.Drawing.Size(228, 6); // // saveWindowPositionToolStripMenuItem // this.saveWindowPositionToolStripMenuItem.Name = "saveWindowPositionToolStripMenuItem"; - this.saveWindowPositionToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.saveWindowPositionToolStripMenuItem.Size = new System.Drawing.Size(231, 22); this.saveWindowPositionToolStripMenuItem.Text = "Save window position"; this.saveWindowPositionToolStripMenuItem.Click += new System.EventHandler(this.saveWindowPositionToolStripMenuItem_Click); // // forceGDIPPresentationToolStripMenuItem // this.forceGDIPPresentationToolStripMenuItem.Name = "forceGDIPPresentationToolStripMenuItem"; - this.forceGDIPPresentationToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.forceGDIPPresentationToolStripMenuItem.Size = new System.Drawing.Size(231, 22); this.forceGDIPPresentationToolStripMenuItem.Text = "Use GDI+ Display Method"; this.forceGDIPPresentationToolStripMenuItem.Click += new System.EventHandler(this.forceGDIPPresentationToolStripMenuItem_Click); // // blurryToolStripMenuItem // this.blurryToolStripMenuItem.Name = "blurryToolStripMenuItem"; - this.blurryToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.blurryToolStripMenuItem.Size = new System.Drawing.Size(231, 22); this.blurryToolStripMenuItem.Text = "Use Bilinear Filtering"; this.blurryToolStripMenuItem.Click += new System.EventHandler(this.blurryToolStripMenuItem_Click); // // miSuppressGuiLayer // this.miSuppressGuiLayer.Name = "miSuppressGuiLayer"; - this.miSuppressGuiLayer.Size = new System.Drawing.Size(241, 22); + this.miSuppressGuiLayer.Size = new System.Drawing.Size(231, 22); this.miSuppressGuiLayer.Text = "Suppress GUI Layer"; this.miSuppressGuiLayer.Click += new System.EventHandler(this.miSuppressGuiLayer_Click); // // showMenuInFullScreenToolStripMenuItem // this.showMenuInFullScreenToolStripMenuItem.Name = "showMenuInFullScreenToolStripMenuItem"; - this.showMenuInFullScreenToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.showMenuInFullScreenToolStripMenuItem.Size = new System.Drawing.Size(231, 22); this.showMenuInFullScreenToolStripMenuItem.Text = "Show Menu in Full Screen"; this.showMenuInFullScreenToolStripMenuItem.Click += new System.EventHandler(this.showMenuInFullScreenToolStripMenuItem_Click); // // runInBackgroundToolStripMenuItem // this.runInBackgroundToolStripMenuItem.Name = "runInBackgroundToolStripMenuItem"; - this.runInBackgroundToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.runInBackgroundToolStripMenuItem.Size = new System.Drawing.Size(231, 22); this.runInBackgroundToolStripMenuItem.Text = "Run in Background"; this.runInBackgroundToolStripMenuItem.Click += new System.EventHandler(this.runInBackgroundToolStripMenuItem_Click); // // acceptBackgroundInputToolStripMenuItem // this.acceptBackgroundInputToolStripMenuItem.Name = "acceptBackgroundInputToolStripMenuItem"; - this.acceptBackgroundInputToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.acceptBackgroundInputToolStripMenuItem.Size = new System.Drawing.Size(231, 22); this.acceptBackgroundInputToolStripMenuItem.Text = "Accept Background Input"; this.acceptBackgroundInputToolStripMenuItem.Click += new System.EventHandler(this.acceptBackgroundInputToolStripMenuItem_Click); // // singleInstanceModeToolStripMenuItem // this.singleInstanceModeToolStripMenuItem.Name = "singleInstanceModeToolStripMenuItem"; - this.singleInstanceModeToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.singleInstanceModeToolStripMenuItem.Size = new System.Drawing.Size(231, 22); this.singleInstanceModeToolStripMenuItem.Text = "Single Instance Mode"; this.singleInstanceModeToolStripMenuItem.Click += new System.EventHandler(this.singleInstanceModeToolStripMenuItem_Click); // // neverBeAskedToSaveChangesToolStripMenuItem // this.neverBeAskedToSaveChangesToolStripMenuItem.Name = "neverBeAskedToSaveChangesToolStripMenuItem"; - this.neverBeAskedToSaveChangesToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.neverBeAskedToSaveChangesToolStripMenuItem.Size = new System.Drawing.Size(231, 22); this.neverBeAskedToSaveChangesToolStripMenuItem.Text = "Never be asked to save changes"; this.neverBeAskedToSaveChangesToolStripMenuItem.Click += new System.EventHandler(this.neverBeAskedToSaveChangesToolStripMenuItem_Click); // // toolStripSeparator23 // this.toolStripSeparator23.Name = "toolStripSeparator23"; - this.toolStripSeparator23.Size = new System.Drawing.Size(238, 6); + this.toolStripSeparator23.Size = new System.Drawing.Size(228, 6); // // logWindowAsConsoleToolStripMenuItem // this.logWindowAsConsoleToolStripMenuItem.Name = "logWindowAsConsoleToolStripMenuItem"; - this.logWindowAsConsoleToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.logWindowAsConsoleToolStripMenuItem.Size = new System.Drawing.Size(231, 22); this.logWindowAsConsoleToolStripMenuItem.Text = "Log Window as Console"; this.logWindowAsConsoleToolStripMenuItem.Click += new System.EventHandler(this.logWindowAsConsoleToolStripMenuItem_Click); // @@ -1519,156 +1519,156 @@ this.miSpeed150, this.miSpeed200}); this.frameSkipToolStripMenuItem.Name = "frameSkipToolStripMenuItem"; - this.frameSkipToolStripMenuItem.Size = new System.Drawing.Size(141, 22); + this.frameSkipToolStripMenuItem.Size = new System.Drawing.Size(138, 22); this.frameSkipToolStripMenuItem.Text = "Speed/Skip"; this.frameSkipToolStripMenuItem.DropDownOpened += new System.EventHandler(this.frameSkipToolStripMenuItem_DropDownOpened); // // miLimitFramerate // this.miLimitFramerate.Name = "miLimitFramerate"; - this.miLimitFramerate.Size = new System.Drawing.Size(202, 22); + this.miLimitFramerate.Size = new System.Drawing.Size(181, 22); this.miLimitFramerate.Text = "Limit Framerate"; this.miLimitFramerate.Click += new System.EventHandler(this.miLimitFramerate_Click); // // miDisplayVsync // this.miDisplayVsync.Name = "miDisplayVsync"; - this.miDisplayVsync.Size = new System.Drawing.Size(202, 22); + this.miDisplayVsync.Size = new System.Drawing.Size(181, 22); this.miDisplayVsync.Text = "Display VSync"; this.miDisplayVsync.Click += new System.EventHandler(this.miDisplayVsync_Click); // // toolStripMenuItem3 // this.toolStripMenuItem3.Name = "toolStripMenuItem3"; - this.toolStripMenuItem3.Size = new System.Drawing.Size(199, 6); + this.toolStripMenuItem3.Size = new System.Drawing.Size(178, 6); // // miAutoMinimizeSkipping // this.miAutoMinimizeSkipping.Name = "miAutoMinimizeSkipping"; - this.miAutoMinimizeSkipping.Size = new System.Drawing.Size(202, 22); + this.miAutoMinimizeSkipping.Size = new System.Drawing.Size(181, 22); this.miAutoMinimizeSkipping.Text = "Auto-minimize skipping"; this.miAutoMinimizeSkipping.Click += new System.EventHandler(this.miAutoMinimizeSkipping_Click); // // miFrameskip0 // this.miFrameskip0.Name = "miFrameskip0"; - this.miFrameskip0.Size = new System.Drawing.Size(202, 22); + this.miFrameskip0.Size = new System.Drawing.Size(181, 22); this.miFrameskip0.Text = "0 (never skip)"; this.miFrameskip0.Click += new System.EventHandler(this.miFrameskip0_Click); // // miFrameskip1 // this.miFrameskip1.Name = "miFrameskip1"; - this.miFrameskip1.Size = new System.Drawing.Size(202, 22); + this.miFrameskip1.Size = new System.Drawing.Size(181, 22); this.miFrameskip1.Text = "1"; this.miFrameskip1.Click += new System.EventHandler(this.miFrameskip1_Click); // // miFrameskip2 // this.miFrameskip2.Name = "miFrameskip2"; - this.miFrameskip2.Size = new System.Drawing.Size(202, 22); + this.miFrameskip2.Size = new System.Drawing.Size(181, 22); this.miFrameskip2.Text = "2"; this.miFrameskip2.Click += new System.EventHandler(this.miFrameskip2_Click); // // miFrameskip3 // this.miFrameskip3.Name = "miFrameskip3"; - this.miFrameskip3.Size = new System.Drawing.Size(202, 22); + this.miFrameskip3.Size = new System.Drawing.Size(181, 22); this.miFrameskip3.Text = "3"; this.miFrameskip3.Click += new System.EventHandler(this.miFrameskip3_Click); // // miFrameskip4 // this.miFrameskip4.Name = "miFrameskip4"; - this.miFrameskip4.Size = new System.Drawing.Size(202, 22); + this.miFrameskip4.Size = new System.Drawing.Size(181, 22); this.miFrameskip4.Text = "4"; this.miFrameskip4.Click += new System.EventHandler(this.miFrameskip4_Click); // // miFrameskip5 // this.miFrameskip5.Name = "miFrameskip5"; - this.miFrameskip5.Size = new System.Drawing.Size(202, 22); + this.miFrameskip5.Size = new System.Drawing.Size(181, 22); this.miFrameskip5.Text = "5"; this.miFrameskip5.Click += new System.EventHandler(this.miFrameskip5_Click); // // miFrameskip6 // this.miFrameskip6.Name = "miFrameskip6"; - this.miFrameskip6.Size = new System.Drawing.Size(202, 22); + this.miFrameskip6.Size = new System.Drawing.Size(181, 22); this.miFrameskip6.Text = "6"; this.miFrameskip6.Click += new System.EventHandler(this.miFrameskip6_Click); // // miFrameskip7 // this.miFrameskip7.Name = "miFrameskip7"; - this.miFrameskip7.Size = new System.Drawing.Size(202, 22); + this.miFrameskip7.Size = new System.Drawing.Size(181, 22); this.miFrameskip7.Text = "7"; this.miFrameskip7.Click += new System.EventHandler(this.miFrameskip7_Click); // // miFrameskip8 // this.miFrameskip8.Name = "miFrameskip8"; - this.miFrameskip8.Size = new System.Drawing.Size(202, 22); + this.miFrameskip8.Size = new System.Drawing.Size(181, 22); this.miFrameskip8.Text = "8"; this.miFrameskip8.Click += new System.EventHandler(this.miFrameskip8_Click); // // miFrameskip9 // this.miFrameskip9.Name = "miFrameskip9"; - this.miFrameskip9.Size = new System.Drawing.Size(202, 22); + this.miFrameskip9.Size = new System.Drawing.Size(181, 22); this.miFrameskip9.Text = "9"; this.miFrameskip9.Click += new System.EventHandler(this.miFrameskip9_Click); // // toolStripMenuItem5 // this.toolStripMenuItem5.Name = "toolStripMenuItem5"; - this.toolStripMenuItem5.Size = new System.Drawing.Size(199, 6); + this.toolStripMenuItem5.Size = new System.Drawing.Size(178, 6); // // miSpeed50 // this.miSpeed50.Name = "miSpeed50"; - this.miSpeed50.Size = new System.Drawing.Size(202, 22); + this.miSpeed50.Size = new System.Drawing.Size(181, 22); this.miSpeed50.Text = "Speed 50%"; this.miSpeed50.Click += new System.EventHandler(this.miSpeed50_Click); // // miSpeed75 // this.miSpeed75.Name = "miSpeed75"; - this.miSpeed75.Size = new System.Drawing.Size(202, 22); + this.miSpeed75.Size = new System.Drawing.Size(181, 22); this.miSpeed75.Text = "Speed 75%"; this.miSpeed75.Click += new System.EventHandler(this.miSpeed75_Click); // // miSpeed100 // this.miSpeed100.Name = "miSpeed100"; - this.miSpeed100.Size = new System.Drawing.Size(202, 22); + this.miSpeed100.Size = new System.Drawing.Size(181, 22); this.miSpeed100.Text = "Speed 100%"; this.miSpeed100.Click += new System.EventHandler(this.miSpeed100_Click); // // miSpeed150 // this.miSpeed150.Name = "miSpeed150"; - this.miSpeed150.Size = new System.Drawing.Size(202, 22); + this.miSpeed150.Size = new System.Drawing.Size(181, 22); this.miSpeed150.Text = "Speed 150%"; this.miSpeed150.Click += new System.EventHandler(this.miSpeed150_Click); // // miSpeed200 // this.miSpeed200.Name = "miSpeed200"; - this.miSpeed200.Size = new System.Drawing.Size(202, 22); + this.miSpeed200.Size = new System.Drawing.Size(181, 22); this.miSpeed200.Text = "Speed 200%"; this.miSpeed200.Click += new System.EventHandler(this.miSpeed200_Click); // // toolStripSeparator10 // this.toolStripSeparator10.Name = "toolStripSeparator10"; - this.toolStripSeparator10.Size = new System.Drawing.Size(138, 6); + this.toolStripSeparator10.Size = new System.Drawing.Size(135, 6); // // saveConfigToolStripMenuItem // this.saveConfigToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Save; this.saveConfigToolStripMenuItem.Name = "saveConfigToolStripMenuItem"; - this.saveConfigToolStripMenuItem.Size = new System.Drawing.Size(141, 22); + this.saveConfigToolStripMenuItem.Size = new System.Drawing.Size(138, 22); this.saveConfigToolStripMenuItem.Text = "Save Config"; this.saveConfigToolStripMenuItem.Click += new System.EventHandler(this.saveConfigToolStripMenuItem_Click); // @@ -1676,7 +1676,7 @@ // this.loadConfigToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.LoadConfig; this.loadConfigToolStripMenuItem.Name = "loadConfigToolStripMenuItem"; - this.loadConfigToolStripMenuItem.Size = new System.Drawing.Size(141, 22); + this.loadConfigToolStripMenuItem.Size = new System.Drawing.Size(138, 22); this.loadConfigToolStripMenuItem.Text = "Load Config"; this.loadConfigToolStripMenuItem.Click += new System.EventHandler(this.loadConfigToolStripMenuItem_Click); // @@ -1696,7 +1696,7 @@ this.luaConsoleToolStripMenuItem, this.cheatsToolStripMenuItem}); this.toolsToolStripMenuItem.Name = "toolsToolStripMenuItem"; - this.toolsToolStripMenuItem.Size = new System.Drawing.Size(48, 19); + this.toolsToolStripMenuItem.Size = new System.Drawing.Size(44, 17); this.toolsToolStripMenuItem.Text = "&Tools"; this.toolsToolStripMenuItem.DropDownOpened += new System.EventHandler(this.toolsToolStripMenuItem_DropDownOpened); // @@ -1704,20 +1704,20 @@ // this.toolBoxToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.ToolBox; this.toolBoxToolStripMenuItem.Name = "toolBoxToolStripMenuItem"; - this.toolBoxToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.toolBoxToolStripMenuItem.Size = new System.Drawing.Size(137, 22); this.toolBoxToolStripMenuItem.Text = "&Tool Box"; this.toolBoxToolStripMenuItem.Click += new System.EventHandler(this.toolBoxToolStripMenuItem_Click); // // toolStripSeparator12 // this.toolStripSeparator12.Name = "toolStripSeparator12"; - this.toolStripSeparator12.Size = new System.Drawing.Size(140, 6); + this.toolStripSeparator12.Size = new System.Drawing.Size(134, 6); // // rAMWatchToolStripMenuItem // this.rAMWatchToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.FindHS; this.rAMWatchToolStripMenuItem.Name = "rAMWatchToolStripMenuItem"; - this.rAMWatchToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.rAMWatchToolStripMenuItem.Size = new System.Drawing.Size(137, 22); this.rAMWatchToolStripMenuItem.Text = "RAM &Watch"; this.rAMWatchToolStripMenuItem.Click += new System.EventHandler(this.RAMWatchToolStripMenuItem_Click); // @@ -1725,7 +1725,7 @@ // this.rAMSearchToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.search; this.rAMSearchToolStripMenuItem.Name = "rAMSearchToolStripMenuItem"; - this.rAMSearchToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.rAMSearchToolStripMenuItem.Size = new System.Drawing.Size(137, 22); this.rAMSearchToolStripMenuItem.Text = "RAM &Search"; this.rAMSearchToolStripMenuItem.Click += new System.EventHandler(this.rAMSearchToolStripMenuItem_Click); // @@ -1733,7 +1733,7 @@ // this.rAMPokeToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.poke; this.rAMPokeToolStripMenuItem.Name = "rAMPokeToolStripMenuItem"; - this.rAMPokeToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.rAMPokeToolStripMenuItem.Size = new System.Drawing.Size(137, 22); this.rAMPokeToolStripMenuItem.Text = "RAM &Poke"; this.rAMPokeToolStripMenuItem.Click += new System.EventHandler(this.RAMPokeToolStripMenuItem_Click); // @@ -1741,7 +1741,7 @@ // this.hexEditorToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.poke; this.hexEditorToolStripMenuItem.Name = "hexEditorToolStripMenuItem"; - this.hexEditorToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.hexEditorToolStripMenuItem.Size = new System.Drawing.Size(137, 22); this.hexEditorToolStripMenuItem.Text = "&Hex Editor"; this.hexEditorToolStripMenuItem.Click += new System.EventHandler(this.hexEditorToolStripMenuItem_Click); // @@ -1749,7 +1749,7 @@ // this.traceLoggerToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.pencil; this.traceLoggerToolStripMenuItem.Name = "traceLoggerToolStripMenuItem"; - this.traceLoggerToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.traceLoggerToolStripMenuItem.Size = new System.Drawing.Size(137, 22); this.traceLoggerToolStripMenuItem.Text = "Trace &Logger"; this.traceLoggerToolStripMenuItem.Click += new System.EventHandler(this.traceLoggerToolStripMenuItem_Click); // @@ -1757,7 +1757,7 @@ // this.tAStudioToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.TAStudio; this.tAStudioToolStripMenuItem.Name = "tAStudioToolStripMenuItem"; - this.tAStudioToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.tAStudioToolStripMenuItem.Size = new System.Drawing.Size(137, 22); this.tAStudioToolStripMenuItem.Text = "&TAStudio"; this.tAStudioToolStripMenuItem.Click += new System.EventHandler(this.tAStudioToolStripMenuItem_Click); // @@ -1765,20 +1765,20 @@ // this.virtualPadToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.GameController; this.virtualPadToolStripMenuItem.Name = "virtualPadToolStripMenuItem"; - this.virtualPadToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.virtualPadToolStripMenuItem.Size = new System.Drawing.Size(137, 22); this.virtualPadToolStripMenuItem.Text = "Virtual Pad"; this.virtualPadToolStripMenuItem.Click += new System.EventHandler(this.virtualPadToolStripMenuItem_Click); // // toolStripSeparator11 // this.toolStripSeparator11.Name = "toolStripSeparator11"; - this.toolStripSeparator11.Size = new System.Drawing.Size(140, 6); + this.toolStripSeparator11.Size = new System.Drawing.Size(134, 6); // // luaConsoleToolStripMenuItem // this.luaConsoleToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Lua; this.luaConsoleToolStripMenuItem.Name = "luaConsoleToolStripMenuItem"; - this.luaConsoleToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.luaConsoleToolStripMenuItem.Size = new System.Drawing.Size(137, 22); this.luaConsoleToolStripMenuItem.Text = "Lua Console"; this.luaConsoleToolStripMenuItem.Click += new System.EventHandler(this.luaConsoleToolStripMenuItem_Click); // @@ -1786,7 +1786,7 @@ // this.cheatsToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Freeze; this.cheatsToolStripMenuItem.Name = "cheatsToolStripMenuItem"; - this.cheatsToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.cheatsToolStripMenuItem.Size = new System.Drawing.Size(137, 22); this.cheatsToolStripMenuItem.Text = "Cheats"; this.cheatsToolStripMenuItem.Click += new System.EventHandler(this.cheatsToolStripMenuItem_Click); // @@ -1800,64 +1800,64 @@ this.toolStripSeparator17, this.graphicsSettingsToolStripMenuItem, this.soundChannelsToolStripMenuItem, - this.fDSToolStripMenuItem}); + this.nESSpeicalToolStripMenuItem}); this.NESToolStripMenuItem.Name = "NESToolStripMenuItem"; - this.NESToolStripMenuItem.Size = new System.Drawing.Size(40, 19); + this.NESToolStripMenuItem.Size = new System.Drawing.Size(38, 17); this.NESToolStripMenuItem.Text = "&NES"; // // debuggerToolStripMenuItem // this.debuggerToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Bug; this.debuggerToolStripMenuItem.Name = "debuggerToolStripMenuItem"; - this.debuggerToolStripMenuItem.Size = new System.Drawing.Size(233, 22); + this.debuggerToolStripMenuItem.Size = new System.Drawing.Size(217, 22); this.debuggerToolStripMenuItem.Text = "&Debugger"; this.debuggerToolStripMenuItem.Click += new System.EventHandler(this.debuggerToolStripMenuItem_Click); // // pPUViewerToolStripMenuItem // this.pPUViewerToolStripMenuItem.Name = "pPUViewerToolStripMenuItem"; - this.pPUViewerToolStripMenuItem.Size = new System.Drawing.Size(233, 22); + this.pPUViewerToolStripMenuItem.Size = new System.Drawing.Size(217, 22); this.pPUViewerToolStripMenuItem.Text = "&PPU Viewer"; this.pPUViewerToolStripMenuItem.Click += new System.EventHandler(this.PPUViewerToolStripMenuItem_Click); // // nametableViewerToolStripMenuItem // this.nametableViewerToolStripMenuItem.Name = "nametableViewerToolStripMenuItem"; - this.nametableViewerToolStripMenuItem.Size = new System.Drawing.Size(233, 22); + this.nametableViewerToolStripMenuItem.Size = new System.Drawing.Size(217, 22); this.nametableViewerToolStripMenuItem.Text = "&Nametable Viewer"; this.nametableViewerToolStripMenuItem.Click += new System.EventHandler(this.nametableViewerToolStripMenuItem_Click); // // gameGenieCodesToolStripMenuItem // this.gameGenieCodesToolStripMenuItem.Name = "gameGenieCodesToolStripMenuItem"; - this.gameGenieCodesToolStripMenuItem.Size = new System.Drawing.Size(233, 22); + this.gameGenieCodesToolStripMenuItem.Size = new System.Drawing.Size(217, 22); this.gameGenieCodesToolStripMenuItem.Text = "&Game Genie Encoder/Decoder"; this.gameGenieCodesToolStripMenuItem.Click += new System.EventHandler(this.gameGenieCodesToolStripMenuItem_Click); // // toolStripSeparator17 // this.toolStripSeparator17.Name = "toolStripSeparator17"; - this.toolStripSeparator17.Size = new System.Drawing.Size(230, 6); + this.toolStripSeparator17.Size = new System.Drawing.Size(214, 6); // // graphicsSettingsToolStripMenuItem // this.graphicsSettingsToolStripMenuItem.Name = "graphicsSettingsToolStripMenuItem"; - this.graphicsSettingsToolStripMenuItem.Size = new System.Drawing.Size(233, 22); + this.graphicsSettingsToolStripMenuItem.Size = new System.Drawing.Size(217, 22); this.graphicsSettingsToolStripMenuItem.Text = "Graphics Settings"; this.graphicsSettingsToolStripMenuItem.Click += new System.EventHandler(this.graphicsSettingsToolStripMenuItem_Click); // // soundChannelsToolStripMenuItem // this.soundChannelsToolStripMenuItem.Name = "soundChannelsToolStripMenuItem"; - this.soundChannelsToolStripMenuItem.Size = new System.Drawing.Size(233, 22); + this.soundChannelsToolStripMenuItem.Size = new System.Drawing.Size(217, 22); this.soundChannelsToolStripMenuItem.Text = "Sound Channels"; this.soundChannelsToolStripMenuItem.Click += new System.EventHandler(this.soundChannelsToolStripMenuItem_Click); // - // fDSToolStripMenuItem + // nESSpeicalToolStripMenuItem // - this.fDSToolStripMenuItem.Name = "fDSToolStripMenuItem"; - this.fDSToolStripMenuItem.Size = new System.Drawing.Size(233, 22); - this.fDSToolStripMenuItem.Text = "FDS"; + this.nESSpeicalToolStripMenuItem.Name = "nESSpeicalToolStripMenuItem"; + this.nESSpeicalToolStripMenuItem.Size = new System.Drawing.Size(217, 22); + this.nESSpeicalToolStripMenuItem.Text = "Special Controls"; // // pCEToolStripMenuItem // @@ -1869,47 +1869,47 @@ this.pceArcadeCardRewindEnableHackToolStripMenuItem, this.pceGraphicsSettingsToolStripMenuItem}); this.pCEToolStripMenuItem.Name = "pCEToolStripMenuItem"; - this.pCEToolStripMenuItem.Size = new System.Drawing.Size(40, 19); + this.pCEToolStripMenuItem.Size = new System.Drawing.Size(38, 17); this.pCEToolStripMenuItem.Text = "&PCE"; this.pCEToolStripMenuItem.DropDownOpened += new System.EventHandler(this.pCEToolStripMenuItem_DropDownOpened); // // pceBGViewerToolStripMenuItem // this.pceBGViewerToolStripMenuItem.Name = "pceBGViewerToolStripMenuItem"; - this.pceBGViewerToolStripMenuItem.Size = new System.Drawing.Size(259, 22); + this.pceBGViewerToolStripMenuItem.Size = new System.Drawing.Size(240, 22); this.pceBGViewerToolStripMenuItem.Text = "&BG Viewer"; this.pceBGViewerToolStripMenuItem.Click += new System.EventHandler(this.justatestToolStripMenuItem_Click); // // toolStripSeparator25 // this.toolStripSeparator25.Name = "toolStripSeparator25"; - this.toolStripSeparator25.Size = new System.Drawing.Size(256, 6); + this.toolStripSeparator25.Size = new System.Drawing.Size(237, 6); // // pceAlwaysPerformSpriteLimitToolStripMenuItem // this.pceAlwaysPerformSpriteLimitToolStripMenuItem.Name = "pceAlwaysPerformSpriteLimitToolStripMenuItem"; - this.pceAlwaysPerformSpriteLimitToolStripMenuItem.Size = new System.Drawing.Size(259, 22); + this.pceAlwaysPerformSpriteLimitToolStripMenuItem.Size = new System.Drawing.Size(240, 22); this.pceAlwaysPerformSpriteLimitToolStripMenuItem.Text = "Always Perform Sprite Limit"; this.pceAlwaysPerformSpriteLimitToolStripMenuItem.Click += new System.EventHandler(this.pceAlwaysPerformSpriteLimitToolStripMenuItem_Click); // // pceAlwaysEqualizeVolumesToolStripMenuItem // this.pceAlwaysEqualizeVolumesToolStripMenuItem.Name = "pceAlwaysEqualizeVolumesToolStripMenuItem"; - this.pceAlwaysEqualizeVolumesToolStripMenuItem.Size = new System.Drawing.Size(259, 22); + this.pceAlwaysEqualizeVolumesToolStripMenuItem.Size = new System.Drawing.Size(240, 22); this.pceAlwaysEqualizeVolumesToolStripMenuItem.Text = "Always Equalize Volumes (PCE-CD)"; this.pceAlwaysEqualizeVolumesToolStripMenuItem.Click += new System.EventHandler(this.pceAlwayEqualizeVolumesLimitToolStripMenuItem_Click); // // pceArcadeCardRewindEnableHackToolStripMenuItem // this.pceArcadeCardRewindEnableHackToolStripMenuItem.Name = "pceArcadeCardRewindEnableHackToolStripMenuItem"; - this.pceArcadeCardRewindEnableHackToolStripMenuItem.Size = new System.Drawing.Size(259, 22); + this.pceArcadeCardRewindEnableHackToolStripMenuItem.Size = new System.Drawing.Size(240, 22); this.pceArcadeCardRewindEnableHackToolStripMenuItem.Text = "Arcade Card Rewind-Enable Hack"; this.pceArcadeCardRewindEnableHackToolStripMenuItem.Click += new System.EventHandler(this.pceArcadeCardRewindEnableHackToolStripMenuItem_Click); // // pceGraphicsSettingsToolStripMenuItem // this.pceGraphicsSettingsToolStripMenuItem.Name = "pceGraphicsSettingsToolStripMenuItem"; - this.pceGraphicsSettingsToolStripMenuItem.Size = new System.Drawing.Size(259, 22); + this.pceGraphicsSettingsToolStripMenuItem.Size = new System.Drawing.Size(240, 22); this.pceGraphicsSettingsToolStripMenuItem.Text = "Graphics Settings"; this.pceGraphicsSettingsToolStripMenuItem.Click += new System.EventHandler(this.pceGraphicsSettingsToolStripMenuItem_Click); // @@ -1925,61 +1925,61 @@ this.toolStripSeparator24, this.smsGraphicsSettingsToolStripMenuItem}); this.sMSToolStripMenuItem.Name = "sMSToolStripMenuItem"; - this.sMSToolStripMenuItem.Size = new System.Drawing.Size(42, 19); + this.sMSToolStripMenuItem.Size = new System.Drawing.Size(39, 17); this.sMSToolStripMenuItem.Text = "&SMS"; this.sMSToolStripMenuItem.DropDownOpened += new System.EventHandler(this.sMSToolStripMenuItem_DropDownOpened); // // smsEnableFMChipToolStripMenuItem // this.smsEnableFMChipToolStripMenuItem.Name = "smsEnableFMChipToolStripMenuItem"; - this.smsEnableFMChipToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.smsEnableFMChipToolStripMenuItem.Size = new System.Drawing.Size(221, 22); this.smsEnableFMChipToolStripMenuItem.Text = "&Enable FM Chip"; this.smsEnableFMChipToolStripMenuItem.Click += new System.EventHandler(this.smsEnableFMChipToolStripMenuItem_Click); // // smsOverclockWhenKnownSafeToolStripMenuItem // this.smsOverclockWhenKnownSafeToolStripMenuItem.Name = "smsOverclockWhenKnownSafeToolStripMenuItem"; - this.smsOverclockWhenKnownSafeToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.smsOverclockWhenKnownSafeToolStripMenuItem.Size = new System.Drawing.Size(221, 22); this.smsOverclockWhenKnownSafeToolStripMenuItem.Text = "&Overclock when Known Safe"; this.smsOverclockWhenKnownSafeToolStripMenuItem.Click += new System.EventHandler(this.smsOverclockWhenKnownSafeToolStripMenuItem_Click); // // smsForceStereoSeparationToolStripMenuItem // this.smsForceStereoSeparationToolStripMenuItem.Name = "smsForceStereoSeparationToolStripMenuItem"; - this.smsForceStereoSeparationToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.smsForceStereoSeparationToolStripMenuItem.Size = new System.Drawing.Size(221, 22); this.smsForceStereoSeparationToolStripMenuItem.Text = "&Force Stereo Separation"; this.smsForceStereoSeparationToolStripMenuItem.Click += new System.EventHandler(this.smsForceStereoSeparationToolStripMenuItem_Click); // // smsSpriteLimitToolStripMenuItem // this.smsSpriteLimitToolStripMenuItem.Name = "smsSpriteLimitToolStripMenuItem"; - this.smsSpriteLimitToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.smsSpriteLimitToolStripMenuItem.Size = new System.Drawing.Size(221, 22); this.smsSpriteLimitToolStripMenuItem.Text = "Sprite &Limit"; this.smsSpriteLimitToolStripMenuItem.Click += new System.EventHandler(this.smsSpriteLimitToolStripMenuItem_Click); // // showClippedRegionsToolStripMenuItem // this.showClippedRegionsToolStripMenuItem.Name = "showClippedRegionsToolStripMenuItem"; - this.showClippedRegionsToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.showClippedRegionsToolStripMenuItem.Size = new System.Drawing.Size(221, 22); this.showClippedRegionsToolStripMenuItem.Text = "&Show Clipped Regions"; this.showClippedRegionsToolStripMenuItem.Click += new System.EventHandler(this.showClippedRegionsToolStripMenuItem_Click); // // highlightActiveDisplayRegionToolStripMenuItem // this.highlightActiveDisplayRegionToolStripMenuItem.Name = "highlightActiveDisplayRegionToolStripMenuItem"; - this.highlightActiveDisplayRegionToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.highlightActiveDisplayRegionToolStripMenuItem.Size = new System.Drawing.Size(221, 22); this.highlightActiveDisplayRegionToolStripMenuItem.Text = "&Highlight Active Display Region"; this.highlightActiveDisplayRegionToolStripMenuItem.Click += new System.EventHandler(this.highlightActiveDisplayRegionToolStripMenuItem_Click); // // toolStripSeparator24 // this.toolStripSeparator24.Name = "toolStripSeparator24"; - this.toolStripSeparator24.Size = new System.Drawing.Size(238, 6); + this.toolStripSeparator24.Size = new System.Drawing.Size(218, 6); // // smsGraphicsSettingsToolStripMenuItem // this.smsGraphicsSettingsToolStripMenuItem.Name = "smsGraphicsSettingsToolStripMenuItem"; - this.smsGraphicsSettingsToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.smsGraphicsSettingsToolStripMenuItem.Size = new System.Drawing.Size(221, 22); this.smsGraphicsSettingsToolStripMenuItem.Text = "&Graphics Settings..."; this.smsGraphicsSettingsToolStripMenuItem.Click += new System.EventHandler(this.smsGraphicsSettingsToolStripMenuItem_Click); // @@ -1990,7 +1990,7 @@ this.toolStripSeparator13, this.autoloadVirtualKeyboardToolStripMenuItem}); this.tI83ToolStripMenuItem.Name = "tI83ToolStripMenuItem"; - this.tI83ToolStripMenuItem.Size = new System.Drawing.Size(41, 19); + this.tI83ToolStripMenuItem.Size = new System.Drawing.Size(41, 17); this.tI83ToolStripMenuItem.Text = "TI83"; this.tI83ToolStripMenuItem.DropDownOpened += new System.EventHandler(this.tI83ToolStripMenuItem_DropDownOpened); // @@ -1998,21 +1998,21 @@ // this.keypadToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.calculator; this.keypadToolStripMenuItem.Name = "keypadToolStripMenuItem"; - this.keypadToolStripMenuItem.Size = new System.Drawing.Size(165, 22); + this.keypadToolStripMenuItem.Size = new System.Drawing.Size(156, 22); this.keypadToolStripMenuItem.Text = "Keypad"; this.keypadToolStripMenuItem.Click += new System.EventHandler(this.keypadToolStripMenuItem_Click); // // toolStripSeparator13 // this.toolStripSeparator13.Name = "toolStripSeparator13"; - this.toolStripSeparator13.Size = new System.Drawing.Size(162, 6); + this.toolStripSeparator13.Size = new System.Drawing.Size(153, 6); // // autoloadVirtualKeyboardToolStripMenuItem // this.autoloadVirtualKeyboardToolStripMenuItem.Checked = true; this.autoloadVirtualKeyboardToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked; this.autoloadVirtualKeyboardToolStripMenuItem.Name = "autoloadVirtualKeyboardToolStripMenuItem"; - this.autoloadVirtualKeyboardToolStripMenuItem.Size = new System.Drawing.Size(165, 22); + this.autoloadVirtualKeyboardToolStripMenuItem.Size = new System.Drawing.Size(156, 22); this.autoloadVirtualKeyboardToolStripMenuItem.Text = "Autoload Keypad"; this.autoloadVirtualKeyboardToolStripMenuItem.Click += new System.EventHandler(this.autoloadVirtualKeyboardToolStripMenuItem_Click); // @@ -2031,75 +2031,82 @@ this.showMissle2ToolStripMenuItem, this.showBallToolStripMenuItem}); this.atariToolStripMenuItem.Name = "atariToolStripMenuItem"; - this.atariToolStripMenuItem.Size = new System.Drawing.Size(44, 19); + this.atariToolStripMenuItem.Size = new System.Drawing.Size(42, 17); this.atariToolStripMenuItem.Text = "&Atari"; this.atariToolStripMenuItem.DropDownOpened += new System.EventHandler(this.atariToolStripMenuItem_DropDownOpened); // // bWToolStripMenuItem // this.bWToolStripMenuItem.Name = "bWToolStripMenuItem"; - this.bWToolStripMenuItem.Size = new System.Drawing.Size(153, 22); + this.bWToolStripMenuItem.Size = new System.Drawing.Size(144, 22); this.bWToolStripMenuItem.Text = "B-W TV"; this.bWToolStripMenuItem.Click += new System.EventHandler(this.bWToolStripMenuItem_Click); // // p0DifficultyToolStripMenuItem // this.p0DifficultyToolStripMenuItem.Name = "p0DifficultyToolStripMenuItem"; - this.p0DifficultyToolStripMenuItem.Size = new System.Drawing.Size(153, 22); + this.p0DifficultyToolStripMenuItem.Size = new System.Drawing.Size(144, 22); this.p0DifficultyToolStripMenuItem.Text = "Left Difficulty"; this.p0DifficultyToolStripMenuItem.Click += new System.EventHandler(this.p0DifficultyToolStripMenuItem_Click); // // rightDifficultyToolStripMenuItem // this.rightDifficultyToolStripMenuItem.Name = "rightDifficultyToolStripMenuItem"; - this.rightDifficultyToolStripMenuItem.Size = new System.Drawing.Size(153, 22); + this.rightDifficultyToolStripMenuItem.Size = new System.Drawing.Size(144, 22); this.rightDifficultyToolStripMenuItem.Text = "Right Difficulty"; this.rightDifficultyToolStripMenuItem.Click += new System.EventHandler(this.rightDifficultyToolStripMenuItem_Click); // // toolStripSeparator26 // this.toolStripSeparator26.Name = "toolStripSeparator26"; - this.toolStripSeparator26.Size = new System.Drawing.Size(150, 6); + this.toolStripSeparator26.Size = new System.Drawing.Size(141, 6); // // showBGToolStripMenuItem // this.showBGToolStripMenuItem.Name = "showBGToolStripMenuItem"; - this.showBGToolStripMenuItem.Size = new System.Drawing.Size(153, 22); + this.showBGToolStripMenuItem.Size = new System.Drawing.Size(144, 22); this.showBGToolStripMenuItem.Text = "Show BG"; this.showBGToolStripMenuItem.Click += new System.EventHandler(this.showBGToolStripMenuItem_Click); // + // showPlayfieldToolStripMenuItem + // + this.showPlayfieldToolStripMenuItem.Name = "showPlayfieldToolStripMenuItem"; + this.showPlayfieldToolStripMenuItem.Size = new System.Drawing.Size(144, 22); + this.showPlayfieldToolStripMenuItem.Text = "Show Playfield"; + this.showPlayfieldToolStripMenuItem.Click += new System.EventHandler(this.showPlayfieldToolStripMenuItem_Click); + // // showPlayer1ToolStripMenuItem // this.showPlayer1ToolStripMenuItem.Name = "showPlayer1ToolStripMenuItem"; - this.showPlayer1ToolStripMenuItem.Size = new System.Drawing.Size(153, 22); + this.showPlayer1ToolStripMenuItem.Size = new System.Drawing.Size(144, 22); this.showPlayer1ToolStripMenuItem.Text = "Show Player 1"; this.showPlayer1ToolStripMenuItem.Click += new System.EventHandler(this.showPlayer1ToolStripMenuItem_Click); // // showPlayer2ToolStripMenuItem // this.showPlayer2ToolStripMenuItem.Name = "showPlayer2ToolStripMenuItem"; - this.showPlayer2ToolStripMenuItem.Size = new System.Drawing.Size(153, 22); + this.showPlayer2ToolStripMenuItem.Size = new System.Drawing.Size(144, 22); this.showPlayer2ToolStripMenuItem.Text = "Show Player 2"; this.showPlayer2ToolStripMenuItem.Click += new System.EventHandler(this.showPlayer2ToolStripMenuItem_Click); // // showMissle1ToolStripMenuItem // this.showMissle1ToolStripMenuItem.Name = "showMissle1ToolStripMenuItem"; - this.showMissle1ToolStripMenuItem.Size = new System.Drawing.Size(153, 22); + this.showMissle1ToolStripMenuItem.Size = new System.Drawing.Size(144, 22); this.showMissle1ToolStripMenuItem.Text = "Show Missle 1"; this.showMissle1ToolStripMenuItem.Click += new System.EventHandler(this.showMissle1ToolStripMenuItem_Click); // // showMissle2ToolStripMenuItem // this.showMissle2ToolStripMenuItem.Name = "showMissle2ToolStripMenuItem"; - this.showMissle2ToolStripMenuItem.Size = new System.Drawing.Size(153, 22); + this.showMissle2ToolStripMenuItem.Size = new System.Drawing.Size(144, 22); this.showMissle2ToolStripMenuItem.Text = "Show Missle 2"; this.showMissle2ToolStripMenuItem.Click += new System.EventHandler(this.showMissle2ToolStripMenuItem_Click); // // showBallToolStripMenuItem // this.showBallToolStripMenuItem.Name = "showBallToolStripMenuItem"; - this.showBallToolStripMenuItem.Size = new System.Drawing.Size(153, 22); + this.showBallToolStripMenuItem.Size = new System.Drawing.Size(144, 22); this.showBallToolStripMenuItem.Text = "Show Ball"; this.showBallToolStripMenuItem.Click += new System.EventHandler(this.showBallToolStripMenuItem_Click); // @@ -2113,47 +2120,47 @@ this.changeDMGPalettesToolStripMenuItem, this.loadGBInSGBToolStripMenuItem1}); this.gBToolStripMenuItem.Name = "gBToolStripMenuItem"; - this.gBToolStripMenuItem.Size = new System.Drawing.Size(34, 19); + this.gBToolStripMenuItem.Size = new System.Drawing.Size(32, 17); this.gBToolStripMenuItem.Text = "&GB"; this.gBToolStripMenuItem.DropDownOpened += new System.EventHandler(this.gBToolStripMenuItem_DropDownOpened); // // forceDMGModeToolStripMenuItem // this.forceDMGModeToolStripMenuItem.Name = "forceDMGModeToolStripMenuItem"; - this.forceDMGModeToolStripMenuItem.Size = new System.Drawing.Size(198, 22); + this.forceDMGModeToolStripMenuItem.Size = new System.Drawing.Size(190, 22); this.forceDMGModeToolStripMenuItem.Text = "Force DMG Mode"; this.forceDMGModeToolStripMenuItem.Click += new System.EventHandler(this.forceDMGModeToolStripMenuItem_Click); // // gBAInCGBModeToolStripMenuItem // this.gBAInCGBModeToolStripMenuItem.Name = "gBAInCGBModeToolStripMenuItem"; - this.gBAInCGBModeToolStripMenuItem.Size = new System.Drawing.Size(198, 22); + this.gBAInCGBModeToolStripMenuItem.Size = new System.Drawing.Size(190, 22); this.gBAInCGBModeToolStripMenuItem.Text = "GBA in CGB mode"; this.gBAInCGBModeToolStripMenuItem.Click += new System.EventHandler(this.gBAInCGBModeToolStripMenuItem_Click); // // multicartCompatibilityToolStripMenuItem // this.multicartCompatibilityToolStripMenuItem.Name = "multicartCompatibilityToolStripMenuItem"; - this.multicartCompatibilityToolStripMenuItem.Size = new System.Drawing.Size(198, 22); + this.multicartCompatibilityToolStripMenuItem.Size = new System.Drawing.Size(190, 22); this.multicartCompatibilityToolStripMenuItem.Text = "Multicart Compatibility"; this.multicartCompatibilityToolStripMenuItem.Click += new System.EventHandler(this.multicartCompatibilityToolStripMenuItem_Click); // // toolStripSeparator8 // this.toolStripSeparator8.Name = "toolStripSeparator8"; - this.toolStripSeparator8.Size = new System.Drawing.Size(195, 6); + this.toolStripSeparator8.Size = new System.Drawing.Size(187, 6); // // changeDMGPalettesToolStripMenuItem // this.changeDMGPalettesToolStripMenuItem.Name = "changeDMGPalettesToolStripMenuItem"; - this.changeDMGPalettesToolStripMenuItem.Size = new System.Drawing.Size(198, 22); + this.changeDMGPalettesToolStripMenuItem.Size = new System.Drawing.Size(190, 22); this.changeDMGPalettesToolStripMenuItem.Text = "Change DMG Palettes..."; this.changeDMGPalettesToolStripMenuItem.Click += new System.EventHandler(this.changeDMGPalettesToolStripMenuItem_Click); // // loadGBInSGBToolStripMenuItem1 // this.loadGBInSGBToolStripMenuItem1.Name = "loadGBInSGBToolStripMenuItem1"; - this.loadGBInSGBToolStripMenuItem1.Size = new System.Drawing.Size(198, 22); + this.loadGBInSGBToolStripMenuItem1.Size = new System.Drawing.Size(190, 22); this.loadGBInSGBToolStripMenuItem1.Text = "Load GB in SGB"; this.loadGBInSGBToolStripMenuItem1.Click += new System.EventHandler(this.loadGBInSGBToolStripMenuItem1_Click); // @@ -2165,7 +2172,7 @@ this.graphicsDebuggerToolStripMenuItem, this.loadGBInSGBToolStripMenuItem}); this.sNESToolStripMenuItem.Name = "sNESToolStripMenuItem"; - this.sNESToolStripMenuItem.Size = new System.Drawing.Size(46, 19); + this.sNESToolStripMenuItem.Size = new System.Drawing.Size(44, 17); this.sNESToolStripMenuItem.Text = "&SNES"; this.sNESToolStripMenuItem.DropDownOpened += new System.EventHandler(this.sNESToolStripMenuItem_DropDownOpened); // @@ -2181,83 +2188,83 @@ this.oBJ2ToolStripMenuItem, this.oBJ3ToolStripMenuItem}); this.displayToolStripMenuItem.Name = "displayToolStripMenuItem"; - this.displayToolStripMenuItem.Size = new System.Drawing.Size(175, 22); + this.displayToolStripMenuItem.Size = new System.Drawing.Size(165, 22); this.displayToolStripMenuItem.Text = "Display"; this.displayToolStripMenuItem.DropDownOpened += new System.EventHandler(this.displayToolStripMenuItem_DropDownOpened); // // bG0ToolStripMenuItem // this.bG0ToolStripMenuItem.Name = "bG0ToolStripMenuItem"; - this.bG0ToolStripMenuItem.Size = new System.Drawing.Size(103, 22); + this.bG0ToolStripMenuItem.Size = new System.Drawing.Size(102, 22); this.bG0ToolStripMenuItem.Text = "BG 1"; this.bG0ToolStripMenuItem.Click += new System.EventHandler(this.bG1ToolStripMenuItem_Click); // // bG1ToolStripMenuItem // this.bG1ToolStripMenuItem.Name = "bG1ToolStripMenuItem"; - this.bG1ToolStripMenuItem.Size = new System.Drawing.Size(103, 22); + this.bG1ToolStripMenuItem.Size = new System.Drawing.Size(102, 22); this.bG1ToolStripMenuItem.Text = "BG 2"; this.bG1ToolStripMenuItem.Click += new System.EventHandler(this.bG1ToolStripMenuItem_Click_1); // // bG2ToolStripMenuItem // this.bG2ToolStripMenuItem.Name = "bG2ToolStripMenuItem"; - this.bG2ToolStripMenuItem.Size = new System.Drawing.Size(103, 22); + this.bG2ToolStripMenuItem.Size = new System.Drawing.Size(102, 22); this.bG2ToolStripMenuItem.Text = "BG 3"; this.bG2ToolStripMenuItem.Click += new System.EventHandler(this.bG2ToolStripMenuItem_Click); // // bG3ToolStripMenuItem // this.bG3ToolStripMenuItem.Name = "bG3ToolStripMenuItem"; - this.bG3ToolStripMenuItem.Size = new System.Drawing.Size(103, 22); + this.bG3ToolStripMenuItem.Size = new System.Drawing.Size(102, 22); this.bG3ToolStripMenuItem.Text = "BG 4"; this.bG3ToolStripMenuItem.Click += new System.EventHandler(this.bG3ToolStripMenuItem_Click); // // oBJ0ToolStripMenuItem // this.oBJ0ToolStripMenuItem.Name = "oBJ0ToolStripMenuItem"; - this.oBJ0ToolStripMenuItem.Size = new System.Drawing.Size(103, 22); + this.oBJ0ToolStripMenuItem.Size = new System.Drawing.Size(102, 22); this.oBJ0ToolStripMenuItem.Text = "OBJ 1"; this.oBJ0ToolStripMenuItem.Click += new System.EventHandler(this.oBJ0ToolStripMenuItem_Click); // // oBJ1ToolStripMenuItem // this.oBJ1ToolStripMenuItem.Name = "oBJ1ToolStripMenuItem"; - this.oBJ1ToolStripMenuItem.Size = new System.Drawing.Size(103, 22); + this.oBJ1ToolStripMenuItem.Size = new System.Drawing.Size(102, 22); this.oBJ1ToolStripMenuItem.Text = "OBJ 2"; this.oBJ1ToolStripMenuItem.Click += new System.EventHandler(this.oBJ1ToolStripMenuItem_Click); // // oBJ2ToolStripMenuItem // this.oBJ2ToolStripMenuItem.Name = "oBJ2ToolStripMenuItem"; - this.oBJ2ToolStripMenuItem.Size = new System.Drawing.Size(103, 22); + this.oBJ2ToolStripMenuItem.Size = new System.Drawing.Size(102, 22); this.oBJ2ToolStripMenuItem.Text = "OBJ 3"; this.oBJ2ToolStripMenuItem.Click += new System.EventHandler(this.oBJ2ToolStripMenuItem_Click); // // oBJ3ToolStripMenuItem // this.oBJ3ToolStripMenuItem.Name = "oBJ3ToolStripMenuItem"; - this.oBJ3ToolStripMenuItem.Size = new System.Drawing.Size(103, 22); + this.oBJ3ToolStripMenuItem.Size = new System.Drawing.Size(102, 22); this.oBJ3ToolStripMenuItem.Text = "OBJ 4"; this.oBJ3ToolStripMenuItem.Click += new System.EventHandler(this.oBJ3ToolStripMenuItem_Click); // // toolStripSeparator18 // this.toolStripSeparator18.Name = "toolStripSeparator18"; - this.toolStripSeparator18.Size = new System.Drawing.Size(172, 6); + this.toolStripSeparator18.Size = new System.Drawing.Size(162, 6); // // graphicsDebuggerToolStripMenuItem // this.graphicsDebuggerToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Bug; this.graphicsDebuggerToolStripMenuItem.Name = "graphicsDebuggerToolStripMenuItem"; - this.graphicsDebuggerToolStripMenuItem.Size = new System.Drawing.Size(175, 22); + this.graphicsDebuggerToolStripMenuItem.Size = new System.Drawing.Size(165, 22); this.graphicsDebuggerToolStripMenuItem.Text = "Graphics Debugger"; this.graphicsDebuggerToolStripMenuItem.Click += new System.EventHandler(this.graphicsDebuggerToolStripMenuItem_Click); // // loadGBInSGBToolStripMenuItem // this.loadGBInSGBToolStripMenuItem.Name = "loadGBInSGBToolStripMenuItem"; - this.loadGBInSGBToolStripMenuItem.Size = new System.Drawing.Size(175, 22); + this.loadGBInSGBToolStripMenuItem.Size = new System.Drawing.Size(165, 22); this.loadGBInSGBToolStripMenuItem.Text = "Load GB in SGB"; this.loadGBInSGBToolStripMenuItem.Click += new System.EventHandler(this.loadGBInSGBToolStripMenuItem_Click); // @@ -2268,14 +2275,14 @@ this.forumsToolStripMenuItem, this.aboutToolStripMenuItem}); this.helpToolStripMenuItem.Name = "helpToolStripMenuItem"; - this.helpToolStripMenuItem.Size = new System.Drawing.Size(44, 19); + this.helpToolStripMenuItem.Size = new System.Drawing.Size(40, 17); this.helpToolStripMenuItem.Text = "&Help"; // // helpToolStripMenuItem1 // this.helpToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.Help; this.helpToolStripMenuItem1.Name = "helpToolStripMenuItem1"; - this.helpToolStripMenuItem1.Size = new System.Drawing.Size(146, 22); + this.helpToolStripMenuItem1.Size = new System.Drawing.Size(140, 22); this.helpToolStripMenuItem1.Text = "&Online Help..."; this.helpToolStripMenuItem1.Click += new System.EventHandler(this.helpToolStripMenuItem1_Click); // @@ -2283,7 +2290,7 @@ // this.forumsToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.TAStudio; this.forumsToolStripMenuItem.Name = "forumsToolStripMenuItem"; - this.forumsToolStripMenuItem.Size = new System.Drawing.Size(146, 22); + this.forumsToolStripMenuItem.Size = new System.Drawing.Size(140, 22); this.forumsToolStripMenuItem.Text = "Forums..."; this.forumsToolStripMenuItem.Click += new System.EventHandler(this.forumsToolStripMenuItem_Click); // @@ -2291,7 +2298,7 @@ // this.aboutToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.CorpHawkSmall; this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem"; - this.aboutToolStripMenuItem.Size = new System.Drawing.Size(146, 22); + this.aboutToolStripMenuItem.Size = new System.Drawing.Size(140, 22); this.aboutToolStripMenuItem.Text = "&About"; this.aboutToolStripMenuItem.Click += new System.EventHandler(this.aboutToolStripMenuItem_Click); // @@ -2386,7 +2393,7 @@ // this.toolStripStatusLabel1.BackColor = System.Drawing.SystemColors.Control; this.toolStripStatusLabel1.Name = "toolStripStatusLabel1"; - this.toolStripStatusLabel1.Size = new System.Drawing.Size(58, 17); + this.toolStripStatusLabel1.Size = new System.Drawing.Size(56, 17); this.toolStripStatusLabel1.Text = "Save slots"; // // StatusSlot1 @@ -2638,13 +2645,6 @@ this.cmiShowMenu.Text = "Show Menu"; this.cmiShowMenu.Click += new System.EventHandler(this.showMenuToolStripMenuItem_Click); // - // showPlayfieldToolStripMenuItem - // - this.showPlayfieldToolStripMenuItem.Name = "showPlayfieldToolStripMenuItem"; - this.showPlayfieldToolStripMenuItem.Size = new System.Drawing.Size(153, 22); - this.showPlayfieldToolStripMenuItem.Text = "Show Playfield"; - this.showPlayfieldToolStripMenuItem.Click += new System.EventHandler(this.showPlayfieldToolStripMenuItem_Click); - // // MainForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 14F); @@ -2950,7 +2950,7 @@ private System.Windows.Forms.ToolStripMenuItem showClippedRegionsToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator24; private System.Windows.Forms.ToolStripMenuItem highlightActiveDisplayRegionToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem fDSToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem nESSpeicalToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem saveMovieToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem saveMovieToolStripMenuItem1; private System.Windows.Forms.ToolStripMenuItem virtualPadToolStripMenuItem; diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs index b8644d6954..48878c4b62 100644 --- a/BizHawk.MultiClient/MainForm.cs +++ b/BizHawk.MultiClient/MainForm.cs @@ -1192,7 +1192,7 @@ namespace BizHawk.MultiClient break; case "NES": NESToolStripMenuItem.Visible = true; - NESFDSMenuControls(); + NESSpeicalMenuControls(); break; case "PCE": case "PCECD": @@ -1231,10 +1231,10 @@ namespace BizHawk.MultiClient } } - void NESFDSMenuAdd(string name, string button, string msg) + void NESSpeicalMenuAdd(string name, string button, string msg) { - fDSToolStripMenuItem.Visible = true; - fDSToolStripMenuItem.DropDownItems.Add(name, null, delegate(object sender, EventArgs e) + nESSpeicalToolStripMenuItem.Visible = true; + nESSpeicalToolStripMenuItem.DropDownItems.Add(name, null, delegate(object sender, EventArgs e) { if (Global.Emulator.ControllerDefinition.BoolButtons.Contains(button)) { @@ -1249,22 +1249,25 @@ namespace BizHawk.MultiClient ); } - void NESFDSMenuControls() + void NESSpeicalMenuControls() { // ugly and hacky - fDSToolStripMenuItem.Visible = false; - fDSToolStripMenuItem.DropDownItems.Clear(); + nESSpeicalToolStripMenuItem.Visible = false; + nESSpeicalToolStripMenuItem.DropDownItems.Clear(); var ss = Global.Emulator.ControllerDefinition.BoolButtons; - if (ss.Contains("FDS Eject")) - NESFDSMenuAdd("Eject Disk", "FDS Eject", "FDS Disk Ejected."); + NESSpeicalMenuAdd("Eject Disk", "FDS Eject", "FDS Disk Ejected."); for (int i = 0; i < 16; i++) { string s = "FDS Insert " + i; if (ss.Contains(s)) - NESFDSMenuAdd("Insert Disk " + i, s, "FDS Disk " + i + " inserted."); + NESSpeicalMenuAdd("Insert Disk " + i, s, "FDS Disk " + i + " inserted."); } + if (ss.Contains("VS Coin 1")) + NESSpeicalMenuAdd("Insert Coin 1", "VS Coin 1", "Coin 1 inserted."); + if (ss.Contains("VS Coin 2")) + NESSpeicalMenuAdd("Insert Coin 2", "VS Coin 2", "Coin 2 inserted."); } void SyncControls() diff --git a/BizHawk.MultiClient/output/gamedb/gamedb.txt b/BizHawk.MultiClient/output/gamedb/gamedb.txt index c3ebda8a9d..9cc26a28c1 100644 --- a/BizHawk.MultiClient/output/gamedb/gamedb.txt +++ b/BizHawk.MultiClient/output/gamedb/gamedb.txt @@ -121,4 +121,5 @@ sha1:2F29F3DC724027FAD926BC9D4470A481884E42A5 Blargg's 6-MMC6.nes (newer) NES ;;;;;;;;;;;;;;;;;;;----------------------------------------------------------------------- #include gamedb_neshomebrew.txt +#include gamedb_vs.txt #include gamedb_user.txt diff --git a/BizHawk.MultiClient/output/gamedb/gamedb_vs.txt b/BizHawk.MultiClient/output/gamedb/gamedb_vs.txt new file mode 100644 index 0000000000..f9f7f39b28 --- /dev/null +++ b/BizHawk.MultiClient/output/gamedb/gamedb_vs.txt @@ -0,0 +1,85 @@ +;; NES vs unisys + +sha1:085ACDCB5E1FB136F74DC5265C85F0C45CFE98AA U Balloon Fight (VS) (Player 2 Mode) NES board=MAPPER000;system=VS; +sha1:87F156BC568959E7648973DE3AB401A85DC5502A G Balloon Fight (VS) [!] NES board=MAPPER099;system=VS; +sha1:E1BB6A1858E57D83AC84784075D89D7EDFE066ED U Baseball (VS) (Player 1 Mode) [a1] NES board=MAPPER000;system=VS; +sha1:6287B45DD16BD8366E9D58A6F135ECD81502A1B4 U Baseball (VS) (Player 1 Mode) [a2] NES board=MAPPER000;system=VS; +sha1:7AF6CBA6BF62A7D1B5A5EB310738645064FF9945 U Baseball (VS) (Player 1 Mode) NES board=MAPPER000;system=VS; +sha1:48F46D306CD2EFDCEF1B4066D7A5067AD5C57B34 U Baseball (VS) (Player 2 Mode) [a1] NES board=MAPPER000;system=VS; +sha1:C57B1F474D78357141918BF777C10C8E68D47546 U Baseball (VS) (Player 2 Mode) [a2] NES board=MAPPER000;system=VS; +sha1:E9C2F93FF3E7E9ACDCFFCCD0C1A1BDD0AE415B0C U Baseball (VS) (Player 2 Mode) NES board=MAPPER000;system=VS; +sha1:0548BD2ECD8740D716DACA27A037B59791168281 B Baseball (VS) [b1] NES board=MAPPER099;system=VS; +sha1:6A01FB7F185A45BAA21CC1EEDEB945CACA1C4D92 B Battle City (VS) [p1][!] NES board=MAPPER000;system=VS; +sha1:75480C5F2C0B370F6D0A0EB4E25ADCB45B672417 O Battle City (VS) [p1][o1] NES board=MAPPER000;system=VS; +sha1:B7FD645A523E57864024369BA7201D851842CC5A B Battle City (VS) [p2] NES board=MAPPER099;system=VS; +sha1:E0572DA111D05BF622EC137DF8A658F7B0687DDF U Battle City (VS) NES board=MAPPER099;system=VS; +sha1:EF5FC47CE468457846B64309312CFE7A68ED6280 B VS. Castlevania (VS) [b1] NES board=NES-UNROM;system=VS; +sha1:279A5A31BA7AB61EF39AE6ED04B5FF7946CBFC62 O VS. Castlevania (VS) [o1] NES board=NES-UNROM;system=VS; +sha1:9EB3B75E7B45DF51B8BCD29DF84689A7E8557F4F U VS. Castlevania (VS) NES board=NES-UNROM;system=VS; +sha1:7FD66E0A4CC0E404F404D8164FA221EE2ACB7A38 U Clu Clu Land (VS) NES board=MAPPER099;system=VS; +sha1:2191BC8619EF2EC4E242FFC42402E6764FB4A740 U Dr. Mario (VS) NES board=MAPPER001;system=VS; +sha1:DE3D2828D34EC8ADF070825A296073D9CA4004FB B Duck Hunt (VS) [b1] NES board=MAPPER099;system=VS; +sha1:41DFF720139CED20A7D1F240D687D7F84FF4FD2E U Duck Hunt (VS) NES board=MAPPER099;system=VS; +sha1:56FB1AAABA3B8C05452B2D5B8F232FAFB64AC70D U Excitebike (VS) [a1] NES board=MAPPER099;system=VS; +sha1:1CF6AA8625AD1558E1F1AAF2E1710D5A09A2CED0 U Excitebike (VS) NES board=MAPPER099;system=VS; +sha1:1B516CF7688792F5DBD669850C047A7AFE9EB59F U Freedom Force (VS) NES board=MAPPER004;system=VS; +sha1:B73D62711B55F5B1065AC6F352A4F6AECD91A731 B Goonies, The (VS) [b1] NES board=MAPPER151;system=VS; +sha1:C5534A442BE65436B3FCB8A2ED0129354ED42DF1 B Goonies, The (VS) [b2] NES board=MAPPER151;system=VS; +sha1:726E10E484FCEFA32EDD531AFE4EEBB9F9F8C536 O Goonies, The (VS) [o1] NES board=MAPPER151;system=VS; +sha1:730AFCD33209469D4F2B2B0ABBF86A22AA052609 U Goonies, The (VS) NES board=MAPPER151;system=VS; +sha1:0C0E33BE229E36229EFA12912285A3ED2858D9F9 B Gradius (VS) [b1] NES board=MAPPER151;system=VS; +sha1:B0D1852782B4E9A9CCC2BA24CD40B170C38B940F U Gradius (VS) NES board=MAPPER151;system=VS; +sha1:CCEBFBABC6CC3F0671E5C61CAF6E211B05FFDE27 B Gumshoe (VS) [b1] NES board=MAPPER099;system=VS; +sha1:D4B28408591853F84B9749CFD837A529B4E094AF B Gumshoe (VS) [b2] NES board=MAPPER099;system=VS; +sha1:21674A6571F0D4C812B9C30092C0C5ABED0C92E1 U Gumshoe (VS) NES board=MAPPER099;system=VS; +sha1:52A06B9D7367845395EEB544AC5C73FD68A25B7D U Hogan's Alley (VS) NES board=MAPPER099;system=VS; +sha1:77959F436F2A0D18249A44133FC4068B61029283 U Ice Climber (VS) (Player 1 Mode) NES board=MAPPER000;system=VS; +sha1:200E5B57CE68676E5B5159A551EBBE8EBFBA063F U Ice Climber (VS) (Player 2 Mode) NES board=MAPPER000;system=VS; +sha1:15BECCD6CA1D165B23531CF5CFAC35C327328335 O Ice Climber (VS) [o1] NES board=MAPPER099;system=VS; +sha1:9F1943AADE4233285589CEA5BDC96B5380D49337 U Ice Climber (VS) NES board=MAPPER099;system=VS; +sha1:CDE1ECAF212A9F5A5A49F904F87951EDA15D54DD U Ladies Golf (VS) NES board=MAPPER099;system=VS; +sha1:F8ED6FAFA057DBEEB0398EECCC9DE91747D479AD B Mach Rider (VS) [b1] NES board=MAPPER099;system=VS; +sha1:F8A0F2C5A4B7212CB35F53EA7193B3DD85D6E1CD U Mach Rider (VS) NES board=MAPPER099;system=VS; +sha1:A8548AE518289D276B93589A8BD0759134FEAEA4 U Mahjong (VS) (Player 1 Mode) NES board=MAPPER000;system=VS; +sha1:EE89B382CF21A2E4E1806059EA0FBB192435C1CA U Mahjong (VS) (Player 2 Mode) NES board=MAPPER000;system=VS; +sha1:5B3B4B34063EDED81470CC78FC55ECDA8CE366F2 G Mahjong (VS) [!] NES board=MAPPER099;system=VS; +sha1:C4ABEFDDA0321ACC8498BBC24FD3E91156837C8A U Mahjong (VS) [a1] NES board=MAPPER099;system=VS; +sha1:CAE9CB4C0452C56BED58AEACCEACE8A3107F843A U Mighty Bomb Jack (J) (VS) NES board=MAPPER099;system=VS; +sha1:D232F7BE509E3B745D9E9803DA945C3FABA37A70 U Ninja Jajamaru-kun (VS) NES board=MAPPER099;system=VS; +sha1:5CD3A16DEFAAEDC714CCC39F821E3034E5465D5F U Pinball (VS) [a1] NES board=MAPPER099;system=VS; +sha1:1A4EC64E576BAD64DAF320AEED0BE1B8B50D21DF U Pinball (VS) NES board=MAPPER099;system=VS; +sha1:4D88CB1C97C25C50F113BB9A76101E3DCADEE818 B Platoon (VS) [b1] NES board=MAPPER068;system=VS; +sha1:4ADAB0DD9AD0702451DAC94E3E827483E81A3F01 B Platoon (VS) [b2] NES board=MAPPER001;system=VS; +sha1:4E38B4C231C44BB1408AC6C6F941A136DD33D0EB U Platoon (VS) NES board=MAPPER068;system=VS; +sha1:4543F0D7EB387793F6C92FC6A075AA776C07085A B Atari RBI Baseball (VS) [b1] NES board=MAPPER004;system=VS; +sha1:B35C68AC81CC2D2B13237B6FF3927F3DFC852226 U Atari RBI Baseball (VS) NES board=MAPPER004;system=VS; +sha1:3F9CB2322FBAD6671DF328A77D5B89FB8299F213 G VS. TKO Boxing (VS) [!] NES board=MAPPER151;system=VS; +sha1:8EC5D4DEED22E230020596993BB1C42AEB2215DA U VS. TKO Boxing (VS) [a1] NES board=MAPPER151;system=VS; +sha1:76DE1A5FA7094E3CBB805C56908E5F452EBE0547 B VS. TKO Boxing (VS) [hM04] NES board=MAPPER004;system=VS; +sha1:40A801FF63DB5E719A8A53537C1C78F398483FC8 U Super Sky Kid (VS) NES board=MAPPER004;system=VS; +sha1:68DE623B2AD92BA19D18F17EAA0B97EE4523F6DF U VS. Slalom (VS) NES board=MAPPER000;system=VS; +sha1:BBB0AF27B313D7C838A38FB772A6FE8AFBAFBB95 U Soccer (VS) NES board=MAPPER099;system=VS; +sha1:C145803B5FEE71172A890606A44C6D5DF6D2FA8F U Star Luster (VS) NES board=MAPPER099;system=VS; +sha1:F08357458FF1DBFEBE152CAE100ACEF62F84774B G Stroke & Match Golf (VS) [!] NES board=MAPPER099;system=VS; +sha1:E0F7BDBD2C96B14D4B8D2146A900AAAD17F9E3B1 U Stroke & Match Golf (VS) [a1] NES board=MAPPER099;system=VS; +sha1:136DB00766AF39AF9E4FAB7306A3346C2F062446 B Stroke & Match Golf (VS) [a1][b1] NES board=MAPPER099;system=VS; +sha1:FBA72452977AE8602B628B39AC4A5A7A6FD0F92F B Stroke & Match Golf (VS) [a1][b2] NES board=MAPPER099;system=VS; +sha1:91FA719B4B05ADBAC0B9D507D2051ED361D1DED4 U VS. Super Mario Bros. (VS) [a1] NES board=MAPPER099;system=VS; +sha1:C81B9D98851E9BBC6172A10FFB218823D3C3B223 B VS. Super Mario Bros. (VS) [b1] NES board=MAPPER003;system=VS; +sha1:DD09C4FD6B440FBA948A5DC5269F5302A4DE75A2 B VS. Super Mario Bros. (VS) [b1][o1] NES board=MAPPER003;system=VS; +sha1:3E73109098A478F6AC3EA3CCCCA19BA3A31010C6 B VS. Super Mario Bros. (VS) [b2] NES board=MAPPER099;system=VS; +sha1:0C538B47CBB6CE03988B80ACF8A9AFEB68A6A179 B VS. Super Mario Bros. (VS) [b3] NES board=MAPPER099;system=VS; +sha1:EB9E0F838B4688C241B30516BE132E723EA21044 O VS. Super Mario Bros. (VS) [o1] NES board=MAPPER099;system=VS; +sha1:B21AA940728ED80C72EE23C251C96E42CC84B2D6 U VS. Super Mario Bros. (VS) NES board=MAPPER099;system=VS; +sha1:D7AB201265390588AB3CF3C2BB6B72BEA3F97137 B Super Xevious - Gump no Nazo (VS) [b1] NES board=MAPPER001;system=VS; +sha1:E291969D53D245E2E4F932D16E61B7DDE2E2570F B Super Xevious - Gump no Nazo (VS) [b2] NES board=MAPPER001;system=VS; +sha1:881B6413FBCBFB9A0308583F0510C09283A72D2A U Super Xevious - Gump no Nazo (VS) NES board=MAPPER002;system=VS; +sha1:01B0635D2A8BCFB6AD5B65C460967EE6BAEE89F5 U Tennis (VS) (Player 2 Mode) NES board=MAPPER000;system=VS; +sha1:7D29F60C718E03C54954D84D2773C6824790ACE8 G Tennis (VS) [!] NES board=MAPPER099;system=VS; +sha1:1FF8696E82EA1ECE787A17D26B26A04A76708657 O Tennis (VS) [o1] NES board=MAPPER099;system=VS; +sha1:B1AF292CEDE58BDD1A7AEE177C5F90801F98F73E U Tetris (VS) [a1] NES board=MAPPER099;system=VS; +sha1:1A17DF593C658F56D71B7026D2771396BFF95B36 U Tetris (VS) NES board=MAPPER099;system=VS; +sha1:D9B1B87204E025A637821A0168475E1209CE0C8A U Top Gun (VS) NES board=MAPPER002;system=VS; +sha1:C517A9ED1F163232D459C600596865125AA3E461 U Wrecking Crew (VS) (Player 1 Mode) NES board=MAPPER000;system=VS; +sha1:325157B00D1EF2BEA53BA76929E1F65F866497B9 U Wrecking Crew (VS) (Player 2 Mode) NES board=MAPPER000;system=VS; +sha1:6715FAEA7CCF322082ECB5C7DECE31796DA47995 G Wrecking Crew (VS) [!] NES board=MAPPER099;system=VS;