diff --git a/BizHawk.Client.Common/RomLoader.cs b/BizHawk.Client.Common/RomLoader.cs index 6a5a924e10..05b22919ac 100644 --- a/BizHawk.Client.Common/RomLoader.cs +++ b/BizHawk.Client.Common/RomLoader.cs @@ -415,7 +415,8 @@ namespace BizHawk.Client.Common nextEmulator = new N64(nextComm, game, rom.RomData, GetCoreSyncSettings()); break; case "WSWAN": - nextEmulator = new WonderSwan(nextComm, rom.RomData, Deterministic); + nextEmulator = new WonderSwan(nextComm, rom.RomData, Deterministic, + GetCoreSettings(), GetCoreSyncSettings()); break; case "DEBUG": if (VersionInfo.INTERIM) diff --git a/BizHawk.Client.EmuHawk/MainForm.Designer.cs b/BizHawk.Client.EmuHawk/MainForm.Designer.cs index dcd93fb94d..73c68b2cdd 100644 --- a/BizHawk.Client.EmuHawk/MainForm.Designer.cs +++ b/BizHawk.Client.EmuHawk/MainForm.Designer.cs @@ -357,6 +357,8 @@ this.ClearSRAMContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ShowMenuContextMenuSeparator = new System.Windows.Forms.ToolStripSeparator(); this.ShowMenuContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.wonderSwanToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.settingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.MainformMenu.SuspendLayout(); this.MainStatusBar.SuspendLayout(); this.MainFormContextMenu.SuspendLayout(); @@ -384,11 +386,12 @@ this.SaturnSubMenu, this.DGBSubMenu, this.GenesisSubMenu, + this.wonderSwanToolStripMenuItem, this.HelpSubMenu}); this.MainformMenu.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.Flow; this.MainformMenu.Location = new System.Drawing.Point(0, 0); this.MainformMenu.Name = "MainformMenu"; - this.MainformMenu.Size = new System.Drawing.Size(470, 61); + this.MainformMenu.Size = new System.Drawing.Size(470, 57); this.MainformMenu.TabIndex = 0; this.MainformMenu.Text = "menuStrip1"; this.MainformMenu.MenuActivate += new System.EventHandler(this.MainformMenu_MenuActivate); @@ -412,7 +415,7 @@ this.toolStripSeparator4, this.ExitMenuItem}); this.FileSubMenu.Name = "FileSubMenu"; - this.FileSubMenu.Size = new System.Drawing.Size(37, 19); + this.FileSubMenu.Size = new System.Drawing.Size(35, 17); this.FileSubMenu.Text = "&File"; this.FileSubMenu.DropDownOpened += new System.EventHandler(this.FileSubMenu_DropDownOpened); // @@ -420,7 +423,7 @@ // this.OpenRomMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.OpenFile; this.OpenRomMenuItem.Name = "OpenRomMenuItem"; - this.OpenRomMenuItem.Size = new System.Drawing.Size(140, 22); + this.OpenRomMenuItem.Size = new System.Drawing.Size(134, 22); this.OpenRomMenuItem.Text = "Open ROM"; this.OpenRomMenuItem.Click += new System.EventHandler(this.OpenRomMenuItem_Click); // @@ -430,7 +433,7 @@ this.toolStripSeparator3}); this.RecentRomSubMenu.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Recent; this.RecentRomSubMenu.Name = "RecentRomSubMenu"; - this.RecentRomSubMenu.Size = new System.Drawing.Size(140, 22); + this.RecentRomSubMenu.Size = new System.Drawing.Size(134, 22); this.RecentRomSubMenu.Text = "Recent ROM"; this.RecentRomSubMenu.DropDownOpened += new System.EventHandler(this.RecentRomMenuItem_DropDownOpened); // @@ -443,14 +446,14 @@ // this.CloseRomMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Close; this.CloseRomMenuItem.Name = "CloseRomMenuItem"; - this.CloseRomMenuItem.Size = new System.Drawing.Size(140, 22); + this.CloseRomMenuItem.Size = new System.Drawing.Size(134, 22); this.CloseRomMenuItem.Text = "&Close ROM"; this.CloseRomMenuItem.Click += new System.EventHandler(this.CloseRomMenuItem_Click); // // toolStripMenuItem1 // this.toolStripMenuItem1.Name = "toolStripMenuItem1"; - this.toolStripMenuItem1.Size = new System.Drawing.Size(137, 6); + this.toolStripMenuItem1.Size = new System.Drawing.Size(131, 6); // // SaveStateSubMenu // @@ -468,89 +471,89 @@ this.toolStripSeparator6, this.SaveNamedStateMenuItem}); this.SaveStateSubMenu.Name = "SaveStateSubMenu"; - this.SaveStateSubMenu.Size = new System.Drawing.Size(140, 22); + this.SaveStateSubMenu.Size = new System.Drawing.Size(134, 22); this.SaveStateSubMenu.Text = "Save State"; this.SaveStateSubMenu.DropDownOpened += new System.EventHandler(this.SaveStateSubMenu_DropDownOpened); // // SaveState1MenuItem // this.SaveState1MenuItem.Name = "SaveState1MenuItem"; - this.SaveState1MenuItem.Size = new System.Drawing.Size(178, 22); + this.SaveState1MenuItem.Size = new System.Drawing.Size(175, 22); this.SaveState1MenuItem.Text = "1"; this.SaveState1MenuItem.Click += new System.EventHandler(this.Savestate1MenuItem_Click); // // SaveState2MenuItem // this.SaveState2MenuItem.Name = "SaveState2MenuItem"; - this.SaveState2MenuItem.Size = new System.Drawing.Size(178, 22); + this.SaveState2MenuItem.Size = new System.Drawing.Size(175, 22); this.SaveState2MenuItem.Text = "2"; this.SaveState2MenuItem.Click += new System.EventHandler(this.Savestate2MenuItem_Click); // // SaveState3MenuItem // this.SaveState3MenuItem.Name = "SaveState3MenuItem"; - this.SaveState3MenuItem.Size = new System.Drawing.Size(178, 22); + this.SaveState3MenuItem.Size = new System.Drawing.Size(175, 22); this.SaveState3MenuItem.Text = "3"; this.SaveState3MenuItem.Click += new System.EventHandler(this.Savestate3MenuItem_Click); // // SaveState4MenuItem // this.SaveState4MenuItem.Name = "SaveState4MenuItem"; - this.SaveState4MenuItem.Size = new System.Drawing.Size(178, 22); + this.SaveState4MenuItem.Size = new System.Drawing.Size(175, 22); this.SaveState4MenuItem.Text = "4"; this.SaveState4MenuItem.Click += new System.EventHandler(this.Savestate4MenuItem_Click); // // SaveState5MenuItem // this.SaveState5MenuItem.Name = "SaveState5MenuItem"; - this.SaveState5MenuItem.Size = new System.Drawing.Size(178, 22); + this.SaveState5MenuItem.Size = new System.Drawing.Size(175, 22); this.SaveState5MenuItem.Text = "5"; this.SaveState5MenuItem.Click += new System.EventHandler(this.Savestate5MenuItem_Click); // // SaveState6MenuItem // this.SaveState6MenuItem.Name = "SaveState6MenuItem"; - this.SaveState6MenuItem.Size = new System.Drawing.Size(178, 22); + this.SaveState6MenuItem.Size = new System.Drawing.Size(175, 22); this.SaveState6MenuItem.Text = "6"; this.SaveState6MenuItem.Click += new System.EventHandler(this.Savestate6MenuItem_Click); // // SaveState7MenuItem // this.SaveState7MenuItem.Name = "SaveState7MenuItem"; - this.SaveState7MenuItem.Size = new System.Drawing.Size(178, 22); + this.SaveState7MenuItem.Size = new System.Drawing.Size(175, 22); this.SaveState7MenuItem.Text = "7"; this.SaveState7MenuItem.Click += new System.EventHandler(this.Savestate7MenuItem_Click); // // SaveState8MenuItem // this.SaveState8MenuItem.Name = "SaveState8MenuItem"; - this.SaveState8MenuItem.Size = new System.Drawing.Size(178, 22); + this.SaveState8MenuItem.Size = new System.Drawing.Size(175, 22); this.SaveState8MenuItem.Text = "8"; this.SaveState8MenuItem.Click += new System.EventHandler(this.Savestate8MenuItem_Click); // // SaveState9MenuItem // this.SaveState9MenuItem.Name = "SaveState9MenuItem"; - this.SaveState9MenuItem.Size = new System.Drawing.Size(178, 22); + this.SaveState9MenuItem.Size = new System.Drawing.Size(175, 22); this.SaveState9MenuItem.Text = "9"; this.SaveState9MenuItem.Click += new System.EventHandler(this.Savestate9MenuItem_Click); // // SaveState0MenuItem // this.SaveState0MenuItem.Name = "SaveState0MenuItem"; - this.SaveState0MenuItem.Size = new System.Drawing.Size(178, 22); + this.SaveState0MenuItem.Size = new System.Drawing.Size(175, 22); this.SaveState0MenuItem.Text = "0"; this.SaveState0MenuItem.Click += new System.EventHandler(this.Savestate0MenuItem_Click); // // toolStripSeparator6 // this.toolStripSeparator6.Name = "toolStripSeparator6"; - this.toolStripSeparator6.Size = new System.Drawing.Size(175, 6); + this.toolStripSeparator6.Size = new System.Drawing.Size(172, 6); // // SaveNamedStateMenuItem // this.SaveNamedStateMenuItem.Name = "SaveNamedStateMenuItem"; - this.SaveNamedStateMenuItem.Size = new System.Drawing.Size(178, 22); + this.SaveNamedStateMenuItem.Size = new System.Drawing.Size(175, 22); this.SaveNamedStateMenuItem.Text = "Save Named State..."; this.SaveNamedStateMenuItem.Click += new System.EventHandler(this.SaveNamedStateMenuItem_Click); // @@ -572,101 +575,101 @@ this.toolStripSeparator21, this.AutoloadLastSlotMenuItem}); this.LoadStateSubMenu.Name = "LoadStateSubMenu"; - this.LoadStateSubMenu.Size = new System.Drawing.Size(140, 22); + this.LoadStateSubMenu.Size = new System.Drawing.Size(134, 22); this.LoadStateSubMenu.Text = "Load State"; this.LoadStateSubMenu.DropDownOpened += new System.EventHandler(this.LoadStateSubMenu_DropDownOpened); // // LoadState1MenuItem // this.LoadState1MenuItem.Name = "LoadState1MenuItem"; - this.LoadState1MenuItem.Size = new System.Drawing.Size(180, 22); + this.LoadState1MenuItem.Size = new System.Drawing.Size(174, 22); this.LoadState1MenuItem.Text = "1"; this.LoadState1MenuItem.Click += new System.EventHandler(this.Loadstate1MenuItem_Click); // // LoadState2MenuItem // this.LoadState2MenuItem.Name = "LoadState2MenuItem"; - this.LoadState2MenuItem.Size = new System.Drawing.Size(180, 22); + this.LoadState2MenuItem.Size = new System.Drawing.Size(174, 22); this.LoadState2MenuItem.Text = "2"; this.LoadState2MenuItem.Click += new System.EventHandler(this.Loadstate2MenuItem_Click); // // LoadState3MenuItem // this.LoadState3MenuItem.Name = "LoadState3MenuItem"; - this.LoadState3MenuItem.Size = new System.Drawing.Size(180, 22); + this.LoadState3MenuItem.Size = new System.Drawing.Size(174, 22); this.LoadState3MenuItem.Text = "3"; this.LoadState3MenuItem.Click += new System.EventHandler(this.Loadstate3MenuItem_Click); // // LoadState4MenuItem // this.LoadState4MenuItem.Name = "LoadState4MenuItem"; - this.LoadState4MenuItem.Size = new System.Drawing.Size(180, 22); + this.LoadState4MenuItem.Size = new System.Drawing.Size(174, 22); this.LoadState4MenuItem.Text = "4"; this.LoadState4MenuItem.Click += new System.EventHandler(this.Loadstate4MenuItem_Click); // // LoadState5MenuItem // this.LoadState5MenuItem.Name = "LoadState5MenuItem"; - this.LoadState5MenuItem.Size = new System.Drawing.Size(180, 22); + this.LoadState5MenuItem.Size = new System.Drawing.Size(174, 22); this.LoadState5MenuItem.Text = "5"; this.LoadState5MenuItem.Click += new System.EventHandler(this.Loadstate5MenuItem_Click); // // LoadState6MenuItem // this.LoadState6MenuItem.Name = "LoadState6MenuItem"; - this.LoadState6MenuItem.Size = new System.Drawing.Size(180, 22); + this.LoadState6MenuItem.Size = new System.Drawing.Size(174, 22); this.LoadState6MenuItem.Text = "6"; this.LoadState6MenuItem.Click += new System.EventHandler(this.Loadstate6MenuItem_Click); // // LoadState7MenuItem // this.LoadState7MenuItem.Name = "LoadState7MenuItem"; - this.LoadState7MenuItem.Size = new System.Drawing.Size(180, 22); + this.LoadState7MenuItem.Size = new System.Drawing.Size(174, 22); this.LoadState7MenuItem.Text = "7"; this.LoadState7MenuItem.Click += new System.EventHandler(this.Loadstate7MenuItem_Click); // // LoadState8MenuItem // this.LoadState8MenuItem.Name = "LoadState8MenuItem"; - this.LoadState8MenuItem.Size = new System.Drawing.Size(180, 22); + this.LoadState8MenuItem.Size = new System.Drawing.Size(174, 22); this.LoadState8MenuItem.Text = "8"; this.LoadState8MenuItem.Click += new System.EventHandler(this.Loadstate8MenuItem_Click); // // LoadState9MenuItem // this.LoadState9MenuItem.Name = "LoadState9MenuItem"; - this.LoadState9MenuItem.Size = new System.Drawing.Size(180, 22); + this.LoadState9MenuItem.Size = new System.Drawing.Size(174, 22); this.LoadState9MenuItem.Text = "9"; this.LoadState9MenuItem.Click += new System.EventHandler(this.Loadstate9MenuItem_Click); // // LoadState0MenuItem // this.LoadState0MenuItem.Name = "LoadState0MenuItem"; - this.LoadState0MenuItem.Size = new System.Drawing.Size(180, 22); + this.LoadState0MenuItem.Size = new System.Drawing.Size(174, 22); this.LoadState0MenuItem.Text = "0"; this.LoadState0MenuItem.Click += new System.EventHandler(this.Loadstate0MenuItem_Click); // // toolStripSeparator7 // this.toolStripSeparator7.Name = "toolStripSeparator7"; - this.toolStripSeparator7.Size = new System.Drawing.Size(177, 6); + this.toolStripSeparator7.Size = new System.Drawing.Size(171, 6); // // LoadNamedStateMenuItem // this.LoadNamedStateMenuItem.Name = "LoadNamedStateMenuItem"; - this.LoadNamedStateMenuItem.Size = new System.Drawing.Size(180, 22); + this.LoadNamedStateMenuItem.Size = new System.Drawing.Size(174, 22); this.LoadNamedStateMenuItem.Text = "Load Named State..."; this.LoadNamedStateMenuItem.Click += new System.EventHandler(this.LoadNamedStateMenuItem_Click); // // toolStripSeparator21 // this.toolStripSeparator21.Name = "toolStripSeparator21"; - this.toolStripSeparator21.Size = new System.Drawing.Size(177, 6); + this.toolStripSeparator21.Size = new System.Drawing.Size(171, 6); // // AutoloadLastSlotMenuItem // this.AutoloadLastSlotMenuItem.Name = "AutoloadLastSlotMenuItem"; - this.AutoloadLastSlotMenuItem.Size = new System.Drawing.Size(180, 22); + this.AutoloadLastSlotMenuItem.Size = new System.Drawing.Size(174, 22); this.AutoloadLastSlotMenuItem.Text = "Autoload last Slot"; this.AutoloadLastSlotMenuItem.Click += new System.EventHandler(this.AutoloadLastSlotMenuItem_Click); // @@ -689,77 +692,77 @@ this.SaveToCurrentSlotMenuItem, this.LoadCurrentSlotMenuItem}); this.SaveSlotSubMenu.Name = "SaveSlotSubMenu"; - this.SaveSlotSubMenu.Size = new System.Drawing.Size(140, 22); + this.SaveSlotSubMenu.Size = new System.Drawing.Size(134, 22); this.SaveSlotSubMenu.Text = "SaveSlot"; this.SaveSlotSubMenu.DropDownOpened += new System.EventHandler(this.SaveSlotSubMenu_DropDownOpened); // // SelectSlot0MenuItem // this.SelectSlot0MenuItem.Name = "SelectSlot0MenuItem"; - this.SelectSlot0MenuItem.Size = new System.Drawing.Size(178, 22); + this.SelectSlot0MenuItem.Size = new System.Drawing.Size(172, 22); this.SelectSlot0MenuItem.Text = "Select Slot 0"; this.SelectSlot0MenuItem.Click += new System.EventHandler(this.SelectSlotMenuItems_Click); // // SelectSlot1MenuItem // this.SelectSlot1MenuItem.Name = "SelectSlot1MenuItem"; - this.SelectSlot1MenuItem.Size = new System.Drawing.Size(178, 22); + this.SelectSlot1MenuItem.Size = new System.Drawing.Size(172, 22); this.SelectSlot1MenuItem.Text = "Select Slot 1"; this.SelectSlot1MenuItem.Click += new System.EventHandler(this.SelectSlotMenuItems_Click); // // SelectSlot2MenuItem // this.SelectSlot2MenuItem.Name = "SelectSlot2MenuItem"; - this.SelectSlot2MenuItem.Size = new System.Drawing.Size(178, 22); + this.SelectSlot2MenuItem.Size = new System.Drawing.Size(172, 22); this.SelectSlot2MenuItem.Text = "Select Slot 2"; this.SelectSlot2MenuItem.Click += new System.EventHandler(this.SelectSlotMenuItems_Click); // // SelectSlot3MenuItem // this.SelectSlot3MenuItem.Name = "SelectSlot3MenuItem"; - this.SelectSlot3MenuItem.Size = new System.Drawing.Size(178, 22); + this.SelectSlot3MenuItem.Size = new System.Drawing.Size(172, 22); this.SelectSlot3MenuItem.Text = "Select Slot 3"; this.SelectSlot3MenuItem.Click += new System.EventHandler(this.SelectSlotMenuItems_Click); // // SelectSlot4MenuItem // this.SelectSlot4MenuItem.Name = "SelectSlot4MenuItem"; - this.SelectSlot4MenuItem.Size = new System.Drawing.Size(178, 22); + this.SelectSlot4MenuItem.Size = new System.Drawing.Size(172, 22); this.SelectSlot4MenuItem.Text = "Select Slot 4"; this.SelectSlot4MenuItem.Click += new System.EventHandler(this.SelectSlotMenuItems_Click); // // SelectSlot5MenuItem // this.SelectSlot5MenuItem.Name = "SelectSlot5MenuItem"; - this.SelectSlot5MenuItem.Size = new System.Drawing.Size(178, 22); + this.SelectSlot5MenuItem.Size = new System.Drawing.Size(172, 22); this.SelectSlot5MenuItem.Text = "Select Slot 5"; this.SelectSlot5MenuItem.Click += new System.EventHandler(this.SelectSlotMenuItems_Click); // // SelectSlot6MenuItem // this.SelectSlot6MenuItem.Name = "SelectSlot6MenuItem"; - this.SelectSlot6MenuItem.Size = new System.Drawing.Size(178, 22); + this.SelectSlot6MenuItem.Size = new System.Drawing.Size(172, 22); this.SelectSlot6MenuItem.Text = "Select Slot 6"; this.SelectSlot6MenuItem.Click += new System.EventHandler(this.SelectSlotMenuItems_Click); // // SelectSlot7MenuItem // this.SelectSlot7MenuItem.Name = "SelectSlot7MenuItem"; - this.SelectSlot7MenuItem.Size = new System.Drawing.Size(178, 22); + this.SelectSlot7MenuItem.Size = new System.Drawing.Size(172, 22); this.SelectSlot7MenuItem.Text = "Select Slot 7"; this.SelectSlot7MenuItem.Click += new System.EventHandler(this.SelectSlotMenuItems_Click); // // SelectSlot8MenuItem // this.SelectSlot8MenuItem.Name = "SelectSlot8MenuItem"; - this.SelectSlot8MenuItem.Size = new System.Drawing.Size(178, 22); + this.SelectSlot8MenuItem.Size = new System.Drawing.Size(172, 22); this.SelectSlot8MenuItem.Text = "Select Slot 8"; this.SelectSlot8MenuItem.Click += new System.EventHandler(this.SelectSlotMenuItems_Click); // // SelectSlot9MenuItem // this.SelectSlot9MenuItem.Name = "SelectSlot9MenuItem"; - this.SelectSlot9MenuItem.Size = new System.Drawing.Size(178, 22); + this.SelectSlot9MenuItem.Size = new System.Drawing.Size(172, 22); this.SelectSlot9MenuItem.Text = "Select Slot 9"; this.SelectSlot9MenuItem.Click += new System.EventHandler(this.SelectSlotMenuItems_Click); // @@ -767,7 +770,7 @@ // this.PreviousSlotMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveLeft; this.PreviousSlotMenuItem.Name = "PreviousSlotMenuItem"; - this.PreviousSlotMenuItem.Size = new System.Drawing.Size(178, 22); + this.PreviousSlotMenuItem.Size = new System.Drawing.Size(172, 22); this.PreviousSlotMenuItem.Text = "Previous Slot"; this.PreviousSlotMenuItem.Click += new System.EventHandler(this.PreviousSlotMenuItem_Click); // @@ -775,33 +778,33 @@ // this.NextSlotMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MoveRight; this.NextSlotMenuItem.Name = "NextSlotMenuItem"; - this.NextSlotMenuItem.Size = new System.Drawing.Size(178, 22); + this.NextSlotMenuItem.Size = new System.Drawing.Size(172, 22); this.NextSlotMenuItem.Text = "Next Slot"; this.NextSlotMenuItem.Click += new System.EventHandler(this.NextSlotMenuItem_Click); // // toolStripSeparator5 // this.toolStripSeparator5.Name = "toolStripSeparator5"; - this.toolStripSeparator5.Size = new System.Drawing.Size(175, 6); + this.toolStripSeparator5.Size = new System.Drawing.Size(169, 6); // // SaveToCurrentSlotMenuItem // this.SaveToCurrentSlotMenuItem.Name = "SaveToCurrentSlotMenuItem"; - this.SaveToCurrentSlotMenuItem.Size = new System.Drawing.Size(178, 22); + this.SaveToCurrentSlotMenuItem.Size = new System.Drawing.Size(172, 22); this.SaveToCurrentSlotMenuItem.Text = "Save to Current Slot"; this.SaveToCurrentSlotMenuItem.Click += new System.EventHandler(this.SaveToCurrentSlotMenuItem_Click); // // LoadCurrentSlotMenuItem // this.LoadCurrentSlotMenuItem.Name = "LoadCurrentSlotMenuItem"; - this.LoadCurrentSlotMenuItem.Size = new System.Drawing.Size(178, 22); + this.LoadCurrentSlotMenuItem.Size = new System.Drawing.Size(172, 22); this.LoadCurrentSlotMenuItem.Text = "Load Current Slot"; this.LoadCurrentSlotMenuItem.Click += new System.EventHandler(this.LoadCurrentSlotMenuItem_Click); // // toolStripMenuItem2 // this.toolStripMenuItem2.Name = "toolStripMenuItem2"; - this.toolStripMenuItem2.Size = new System.Drawing.Size(137, 6); + this.toolStripMenuItem2.Size = new System.Drawing.Size(131, 6); // // MovieSubMenu // @@ -820,7 +823,7 @@ this.AutomaticallyBackupMoviesMenuItem, this.FullMovieLoadstatesMenuItem}); this.MovieSubMenu.Name = "MovieSubMenu"; - this.MovieSubMenu.Size = new System.Drawing.Size(140, 22); + this.MovieSubMenu.Size = new System.Drawing.Size(134, 22); this.MovieSubMenu.Text = "Movie"; this.MovieSubMenu.DropDownOpened += new System.EventHandler(this.MovieSubMenu_DropDownOpened); // @@ -828,14 +831,14 @@ // this.ReadonlyMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.ReadOnly; this.ReadonlyMenuItem.Name = "ReadonlyMenuItem"; - this.ReadonlyMenuItem.Size = new System.Drawing.Size(231, 22); + this.ReadonlyMenuItem.Size = new System.Drawing.Size(211, 22); this.ReadonlyMenuItem.Text = "Read-only"; this.ReadonlyMenuItem.Click += new System.EventHandler(this.ReadonlyMenuItem_Click); // // toolStripSeparator15 // this.toolStripSeparator15.Name = "toolStripSeparator15"; - this.toolStripSeparator15.Size = new System.Drawing.Size(228, 6); + this.toolStripSeparator15.Size = new System.Drawing.Size(208, 6); // // RecentMenuItem // @@ -843,7 +846,7 @@ this.toolStripSeparator16}); this.RecentMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Recent; this.RecentMenuItem.Name = "RecentMenuItem"; - this.RecentMenuItem.Size = new System.Drawing.Size(231, 22); + this.RecentMenuItem.Size = new System.Drawing.Size(211, 22); this.RecentMenuItem.Text = "Recent"; this.RecentMenuItem.DropDownOpened += new System.EventHandler(this.RecentMovieSubMenu_DropDownOpened); // @@ -856,7 +859,7 @@ // this.RecordMovieMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.RecordHS; this.RecordMovieMenuItem.Name = "RecordMovieMenuItem"; - this.RecordMovieMenuItem.Size = new System.Drawing.Size(231, 22); + this.RecordMovieMenuItem.Size = new System.Drawing.Size(211, 22); this.RecordMovieMenuItem.Text = "&Record Movie..."; this.RecordMovieMenuItem.Click += new System.EventHandler(this.RecordMovieMenuItem_Click); // @@ -864,7 +867,7 @@ // this.PlayMovieMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Play; this.PlayMovieMenuItem.Name = "PlayMovieMenuItem"; - this.PlayMovieMenuItem.Size = new System.Drawing.Size(231, 22); + this.PlayMovieMenuItem.Size = new System.Drawing.Size(211, 22); this.PlayMovieMenuItem.Text = "&Play Movie..."; this.PlayMovieMenuItem.Click += new System.EventHandler(this.PlayMovieMenuItem_Click); // @@ -872,7 +875,7 @@ // this.StopMovieMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Stop; this.StopMovieMenuItem.Name = "StopMovieMenuItem"; - this.StopMovieMenuItem.Size = new System.Drawing.Size(231, 22); + this.StopMovieMenuItem.Size = new System.Drawing.Size(211, 22); this.StopMovieMenuItem.Text = "Stop Movie"; this.StopMovieMenuItem.Click += new System.EventHandler(this.StopMovieMenuItem_Click); // @@ -880,7 +883,7 @@ // this.PlayFromBeginningMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.restart; this.PlayFromBeginningMenuItem.Name = "PlayFromBeginningMenuItem"; - this.PlayFromBeginningMenuItem.Size = new System.Drawing.Size(231, 22); + this.PlayFromBeginningMenuItem.Size = new System.Drawing.Size(211, 22); this.PlayFromBeginningMenuItem.Text = "Play from Beginning"; this.PlayFromBeginningMenuItem.Click += new System.EventHandler(this.PlayFromBeginningMenuItem_Click); // @@ -888,7 +891,7 @@ // this.ImportMoviesMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Import; this.ImportMoviesMenuItem.Name = "ImportMoviesMenuItem"; - this.ImportMoviesMenuItem.Size = new System.Drawing.Size(231, 22); + this.ImportMoviesMenuItem.Size = new System.Drawing.Size(211, 22); this.ImportMoviesMenuItem.Text = "Import Movies..."; this.ImportMoviesMenuItem.Click += new System.EventHandler(this.ImportMovieMenuItem_Click); // @@ -896,7 +899,7 @@ // this.SaveMovieMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.SaveAs; this.SaveMovieMenuItem.Name = "SaveMovieMenuItem"; - this.SaveMovieMenuItem.Size = new System.Drawing.Size(231, 22); + this.SaveMovieMenuItem.Size = new System.Drawing.Size(211, 22); this.SaveMovieMenuItem.Text = "&Save Movie"; this.SaveMovieMenuItem.Click += new System.EventHandler(this.SaveMovieMenuItem_Click); // @@ -904,26 +907,26 @@ // this.StopMovieWithoutSavingMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Stop; this.StopMovieWithoutSavingMenuItem.Name = "StopMovieWithoutSavingMenuItem"; - this.StopMovieWithoutSavingMenuItem.Size = new System.Drawing.Size(231, 22); + this.StopMovieWithoutSavingMenuItem.Size = new System.Drawing.Size(211, 22); this.StopMovieWithoutSavingMenuItem.Text = "Stop Movie without Saving"; this.StopMovieWithoutSavingMenuItem.Click += new System.EventHandler(this.StopMovieWithoutSavingMenuItem_Click); // // toolStripSeparator14 // this.toolStripSeparator14.Name = "toolStripSeparator14"; - this.toolStripSeparator14.Size = new System.Drawing.Size(228, 6); + this.toolStripSeparator14.Size = new System.Drawing.Size(208, 6); // // AutomaticallyBackupMoviesMenuItem // this.AutomaticallyBackupMoviesMenuItem.Name = "AutomaticallyBackupMoviesMenuItem"; - this.AutomaticallyBackupMoviesMenuItem.Size = new System.Drawing.Size(231, 22); + this.AutomaticallyBackupMoviesMenuItem.Size = new System.Drawing.Size(211, 22); this.AutomaticallyBackupMoviesMenuItem.Text = "Automatically Backup Movies"; this.AutomaticallyBackupMoviesMenuItem.Click += new System.EventHandler(this.AutomaticMovieBackupMenuItem_Click); // // FullMovieLoadstatesMenuItem // this.FullMovieLoadstatesMenuItem.Name = "FullMovieLoadstatesMenuItem"; - this.FullMovieLoadstatesMenuItem.Size = new System.Drawing.Size(231, 22); + this.FullMovieLoadstatesMenuItem.Size = new System.Drawing.Size(211, 22); this.FullMovieLoadstatesMenuItem.Text = "Full Movie Loadstates"; this.FullMovieLoadstatesMenuItem.Click += new System.EventHandler(this.FullMovieLoadstatesMenuItem_Click); // @@ -935,7 +938,7 @@ this.toolStripSeparator19, this.CaptureOSDMenuItem}); this.AVSubMenu.Name = "AVSubMenu"; - this.AVSubMenu.Size = new System.Drawing.Size(140, 22); + this.AVSubMenu.Size = new System.Drawing.Size(134, 22); this.AVSubMenu.Text = "AVI/WAV"; this.AVSubMenu.DropDownOpened += new System.EventHandler(this.AVSubMenu_DropDownOpened); // @@ -943,7 +946,7 @@ // this.RecordAVMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.AVI; this.RecordAVMenuItem.Name = "RecordAVMenuItem"; - this.RecordAVMenuItem.Size = new System.Drawing.Size(163, 22); + this.RecordAVMenuItem.Size = new System.Drawing.Size(155, 22); this.RecordAVMenuItem.Text = "Record AVI/WAV"; this.RecordAVMenuItem.Click += new System.EventHandler(this.RecordAVMenuItem_Click); // @@ -951,19 +954,19 @@ // this.StopAVIMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Stop; this.StopAVIMenuItem.Name = "StopAVIMenuItem"; - this.StopAVIMenuItem.Size = new System.Drawing.Size(163, 22); + this.StopAVIMenuItem.Size = new System.Drawing.Size(155, 22); this.StopAVIMenuItem.Text = "Stop AVI/WAV"; this.StopAVIMenuItem.Click += new System.EventHandler(this.StopAVMenuItem_Click); // // toolStripSeparator19 // this.toolStripSeparator19.Name = "toolStripSeparator19"; - this.toolStripSeparator19.Size = new System.Drawing.Size(160, 6); + this.toolStripSeparator19.Size = new System.Drawing.Size(152, 6); // // CaptureOSDMenuItem // this.CaptureOSDMenuItem.Name = "CaptureOSDMenuItem"; - this.CaptureOSDMenuItem.Size = new System.Drawing.Size(163, 22); + this.CaptureOSDMenuItem.Size = new System.Drawing.Size(155, 22); this.CaptureOSDMenuItem.Text = "Capture OSD"; this.CaptureOSDMenuItem.Click += new System.EventHandler(this.CaptureOSDMenuItem_Click); // @@ -976,7 +979,7 @@ this.toolStripSeparator20, this.ScreenshotCaptureOSDMenuItem1}); this.ScreenshotSubMenu.Name = "ScreenshotSubMenu"; - this.ScreenshotSubMenu.Size = new System.Drawing.Size(140, 22); + this.ScreenshotSubMenu.Size = new System.Drawing.Size(134, 22); this.ScreenshotSubMenu.Text = "Screenshot"; this.ScreenshotSubMenu.DropDownOpening += new System.EventHandler(this.ScreenshotSubMenu_DropDownOpening); // @@ -984,14 +987,14 @@ // this.ScreenshotMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.camera; this.ScreenshotMenuItem.Name = "ScreenshotMenuItem"; - this.ScreenshotMenuItem.Size = new System.Drawing.Size(245, 22); + this.ScreenshotMenuItem.Size = new System.Drawing.Size(230, 22); this.ScreenshotMenuItem.Text = "Screenshot"; this.ScreenshotMenuItem.Click += new System.EventHandler(this.ScreenshotMenuItem_Click); // // ScreenshotAsMenuItem // this.ScreenshotAsMenuItem.Name = "ScreenshotAsMenuItem"; - this.ScreenshotAsMenuItem.Size = new System.Drawing.Size(245, 22); + this.ScreenshotAsMenuItem.Size = new System.Drawing.Size(230, 22); this.ScreenshotAsMenuItem.Text = "Screenshot As..."; this.ScreenshotAsMenuItem.Click += new System.EventHandler(this.ScreenshotAsMenuItem_Click); // @@ -999,32 +1002,32 @@ // this.ScreenshotClipboardMenuItem.Name = "ScreenshotClipboardMenuItem"; this.ScreenshotClipboardMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.C))); - this.ScreenshotClipboardMenuItem.Size = new System.Drawing.Size(245, 22); + this.ScreenshotClipboardMenuItem.Size = new System.Drawing.Size(230, 22); this.ScreenshotClipboardMenuItem.Text = "Screenshot -> Clipboard"; this.ScreenshotClipboardMenuItem.Click += new System.EventHandler(this.ScreenshotClipboardMenuItem_Click); // // toolStripSeparator20 // this.toolStripSeparator20.Name = "toolStripSeparator20"; - this.toolStripSeparator20.Size = new System.Drawing.Size(242, 6); + this.toolStripSeparator20.Size = new System.Drawing.Size(227, 6); // // ScreenshotCaptureOSDMenuItem1 // this.ScreenshotCaptureOSDMenuItem1.Name = "ScreenshotCaptureOSDMenuItem1"; - this.ScreenshotCaptureOSDMenuItem1.Size = new System.Drawing.Size(245, 22); + this.ScreenshotCaptureOSDMenuItem1.Size = new System.Drawing.Size(230, 22); this.ScreenshotCaptureOSDMenuItem1.Text = "Capture OSD"; this.ScreenshotCaptureOSDMenuItem1.Click += new System.EventHandler(this.ScreenshotCaptureOSDMenuItem_Click); // // toolStripSeparator4 // this.toolStripSeparator4.Name = "toolStripSeparator4"; - this.toolStripSeparator4.Size = new System.Drawing.Size(137, 6); + this.toolStripSeparator4.Size = new System.Drawing.Size(131, 6); // // ExitMenuItem // this.ExitMenuItem.Name = "ExitMenuItem"; this.ExitMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4))); - this.ExitMenuItem.Size = new System.Drawing.Size(140, 22); + this.ExitMenuItem.Size = new System.Drawing.Size(134, 22); this.ExitMenuItem.Text = "Exit"; this.ExitMenuItem.Click += new System.EventHandler(this.ExitMenuItem_Click); // @@ -1037,7 +1040,7 @@ this.SoftResetMenuItem, this.HardResetMenuItem}); this.EmulationSubMenu.Name = "EmulationSubMenu"; - this.EmulationSubMenu.Size = new System.Drawing.Size(73, 19); + this.EmulationSubMenu.Size = new System.Drawing.Size(65, 17); this.EmulationSubMenu.Text = "&Emulation"; this.EmulationSubMenu.DropDownOpened += new System.EventHandler(this.emulationToolStripMenuItem_DropDownOpened); // @@ -1045,7 +1048,7 @@ // this.PauseMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Pause; this.PauseMenuItem.Name = "PauseMenuItem"; - this.PauseMenuItem.Size = new System.Drawing.Size(140, 22); + this.PauseMenuItem.Size = new System.Drawing.Size(135, 22); this.PauseMenuItem.Text = "&Pause"; this.PauseMenuItem.Click += new System.EventHandler(this.PauseMenuItem_Click); // @@ -1053,26 +1056,26 @@ // this.RebootCoreMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.reboot; this.RebootCoreMenuItem.Name = "RebootCoreMenuItem"; - this.RebootCoreMenuItem.Size = new System.Drawing.Size(140, 22); + this.RebootCoreMenuItem.Size = new System.Drawing.Size(135, 22); this.RebootCoreMenuItem.Text = "&Reboot Core"; this.RebootCoreMenuItem.Click += new System.EventHandler(this.PowerMenuItem_Click); // // toolStripSeparator1 // this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(137, 6); + this.toolStripSeparator1.Size = new System.Drawing.Size(132, 6); // // SoftResetMenuItem // this.SoftResetMenuItem.Name = "SoftResetMenuItem"; - this.SoftResetMenuItem.Size = new System.Drawing.Size(140, 22); + this.SoftResetMenuItem.Size = new System.Drawing.Size(135, 22); this.SoftResetMenuItem.Text = "&Soft Reset"; this.SoftResetMenuItem.Click += new System.EventHandler(this.SoftResetMenuItem_Click); // // HardResetMenuItem // this.HardResetMenuItem.Name = "HardResetMenuItem"; - this.HardResetMenuItem.Size = new System.Drawing.Size(140, 22); + this.HardResetMenuItem.Size = new System.Drawing.Size(135, 22); this.HardResetMenuItem.Text = "&Hard Reset"; this.HardResetMenuItem.Click += new System.EventHandler(this.HardResetMenuItem_Click); // @@ -1092,7 +1095,7 @@ this.DisplayStatusBarMenuItem, this.DisplayLogWindowMenuItem}); this.ViewSubMenu.Name = "ViewSubMenu"; - this.ViewSubMenu.Size = new System.Drawing.Size(44, 19); + this.ViewSubMenu.Size = new System.Drawing.Size(41, 17); this.ViewSubMenu.Text = "&View"; this.ViewSubMenu.DropDownOpened += new System.EventHandler(this.ViewSubMenu_DropDownOpened); // @@ -1106,49 +1109,49 @@ this.x5MenuItem, this.mzMenuItem}); this.WindowSizeSubMenu.Name = "WindowSizeSubMenu"; - this.WindowSizeSubMenu.Size = new System.Drawing.Size(198, 22); + this.WindowSizeSubMenu.Size = new System.Drawing.Size(187, 22); this.WindowSizeSubMenu.Text = "&Window Size"; this.WindowSizeSubMenu.DropDownOpened += new System.EventHandler(this.WindowSizeSubMenu_DropDownOpened); // // 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.WindowSize_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.WindowSize_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.WindowSize_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.WindowSize_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.WindowSize_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.WindowSize_Click); // @@ -1156,73 +1159,73 @@ // this.SwitchToFullscreenMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Fullscreen; this.SwitchToFullscreenMenuItem.Name = "SwitchToFullscreenMenuItem"; - this.SwitchToFullscreenMenuItem.Size = new System.Drawing.Size(198, 22); + this.SwitchToFullscreenMenuItem.Size = new System.Drawing.Size(187, 22); this.SwitchToFullscreenMenuItem.Text = "Switch to Fullscreen"; this.SwitchToFullscreenMenuItem.Click += new System.EventHandler(this.SwitchToFullscreenMenuItem_Click); // // toolStripSeparator2 // this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(195, 6); + this.toolStripSeparator2.Size = new System.Drawing.Size(184, 6); // // DisplayFPSMenuItem // this.DisplayFPSMenuItem.Name = "DisplayFPSMenuItem"; - this.DisplayFPSMenuItem.Size = new System.Drawing.Size(198, 22); + this.DisplayFPSMenuItem.Size = new System.Drawing.Size(187, 22); this.DisplayFPSMenuItem.Text = "Display FPS"; this.DisplayFPSMenuItem.Click += new System.EventHandler(this.DisplayFPSMenuItem_Click); // // DisplayFrameCounterMenuItem // this.DisplayFrameCounterMenuItem.Name = "DisplayFrameCounterMenuItem"; - this.DisplayFrameCounterMenuItem.Size = new System.Drawing.Size(198, 22); + this.DisplayFrameCounterMenuItem.Size = new System.Drawing.Size(187, 22); this.DisplayFrameCounterMenuItem.Text = "Display FrameCounter"; this.DisplayFrameCounterMenuItem.Click += new System.EventHandler(this.DisplayFrameCounterMenuItem_Click); // // DisplayLagCounterMenuItem // this.DisplayLagCounterMenuItem.Name = "DisplayLagCounterMenuItem"; - this.DisplayLagCounterMenuItem.Size = new System.Drawing.Size(198, 22); + this.DisplayLagCounterMenuItem.Size = new System.Drawing.Size(187, 22); this.DisplayLagCounterMenuItem.Text = "Display Lag Counter"; this.DisplayLagCounterMenuItem.Click += new System.EventHandler(this.DisplayLagCounterMenuItem_Click); // // DisplayInputMenuItem // this.DisplayInputMenuItem.Name = "DisplayInputMenuItem"; - this.DisplayInputMenuItem.Size = new System.Drawing.Size(198, 22); + this.DisplayInputMenuItem.Size = new System.Drawing.Size(187, 22); this.DisplayInputMenuItem.Text = "Display Input"; this.DisplayInputMenuItem.Click += new System.EventHandler(this.DisplayInputMenuItem_Click); // // DisplayRerecordCountMenuItem // this.DisplayRerecordCountMenuItem.Name = "DisplayRerecordCountMenuItem"; - this.DisplayRerecordCountMenuItem.Size = new System.Drawing.Size(198, 22); + this.DisplayRerecordCountMenuItem.Size = new System.Drawing.Size(187, 22); this.DisplayRerecordCountMenuItem.Text = "Display Rerecord Count"; this.DisplayRerecordCountMenuItem.Click += new System.EventHandler(this.DisplayRerecordsMenuItem_Click); // // DisplaySubtitlesMenuItem // this.DisplaySubtitlesMenuItem.Name = "DisplaySubtitlesMenuItem"; - this.DisplaySubtitlesMenuItem.Size = new System.Drawing.Size(198, 22); + this.DisplaySubtitlesMenuItem.Size = new System.Drawing.Size(187, 22); this.DisplaySubtitlesMenuItem.Text = "Display Subtitles"; this.DisplaySubtitlesMenuItem.Click += new System.EventHandler(this.DisplaySubtitlesMenuItem_Click); // // toolStripMenuItem4 // this.toolStripMenuItem4.Name = "toolStripMenuItem4"; - this.toolStripMenuItem4.Size = new System.Drawing.Size(195, 6); + this.toolStripMenuItem4.Size = new System.Drawing.Size(184, 6); // // DisplayStatusBarMenuItem // this.DisplayStatusBarMenuItem.Name = "DisplayStatusBarMenuItem"; - this.DisplayStatusBarMenuItem.Size = new System.Drawing.Size(198, 22); + this.DisplayStatusBarMenuItem.Size = new System.Drawing.Size(187, 22); this.DisplayStatusBarMenuItem.Text = "Display Status Bar"; this.DisplayStatusBarMenuItem.Click += new System.EventHandler(this.DisplayStatusBarMenuItem_Click); // // DisplayLogWindowMenuItem // this.DisplayLogWindowMenuItem.Name = "DisplayLogWindowMenuItem"; - this.DisplayLogWindowMenuItem.Size = new System.Drawing.Size(198, 22); + this.DisplayLogWindowMenuItem.Size = new System.Drawing.Size(187, 22); this.DisplayLogWindowMenuItem.Text = "Display Log Window"; this.DisplayLogWindowMenuItem.Click += new System.EventHandler(this.DisplayLogWindowMenuItem_Click); // @@ -1249,7 +1252,7 @@ this.SaveConfigMenuItem, this.LoadConfigMenuItem}); this.ConfigSubMenu.Name = "ConfigSubMenu"; - this.ConfigSubMenu.Size = new System.Drawing.Size(55, 19); + this.ConfigSubMenu.Size = new System.Drawing.Size(50, 17); this.ConfigSubMenu.Text = "&Config"; this.ConfigSubMenu.DropDownOpened += new System.EventHandler(this.ConfigSubMenu_DropDownOpened); // @@ -1257,7 +1260,7 @@ // this.ControllersMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.GameController; this.ControllersMenuItem.Name = "ControllersMenuItem"; - this.ControllersMenuItem.Size = new System.Drawing.Size(159, 22); + this.ControllersMenuItem.Size = new System.Drawing.Size(157, 22); this.ControllersMenuItem.Text = "&Controllers..."; this.ControllersMenuItem.Click += new System.EventHandler(this.ControllersMenuItem_Click); // @@ -1265,7 +1268,7 @@ // this.HotkeysMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.HotKeys; this.HotkeysMenuItem.Name = "HotkeysMenuItem"; - this.HotkeysMenuItem.Size = new System.Drawing.Size(159, 22); + this.HotkeysMenuItem.Size = new System.Drawing.Size(157, 22); this.HotkeysMenuItem.Text = "&Hotkeys..."; this.HotkeysMenuItem.Click += new System.EventHandler(this.HotkeysMenuItem_Click); // @@ -1273,7 +1276,7 @@ // this.DisplayConfigMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("DisplayConfigMenuItem.Image"))); this.DisplayConfigMenuItem.Name = "DisplayConfigMenuItem"; - this.DisplayConfigMenuItem.Size = new System.Drawing.Size(159, 22); + this.DisplayConfigMenuItem.Size = new System.Drawing.Size(157, 22); this.DisplayConfigMenuItem.Text = "Display..."; this.DisplayConfigMenuItem.Click += new System.EventHandler(this.DisplayConfigMenuItem_Click); // @@ -1281,7 +1284,7 @@ // this.SoundMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.AudioHS; this.SoundMenuItem.Name = "SoundMenuItem"; - this.SoundMenuItem.Size = new System.Drawing.Size(159, 22); + this.SoundMenuItem.Size = new System.Drawing.Size(157, 22); this.SoundMenuItem.Text = "&Sound..."; this.SoundMenuItem.Click += new System.EventHandler(this.SoundMenuItem_Click); // @@ -1289,7 +1292,7 @@ // this.PathsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.CopyFolderHS; this.PathsMenuItem.Name = "PathsMenuItem"; - this.PathsMenuItem.Size = new System.Drawing.Size(159, 22); + this.PathsMenuItem.Size = new System.Drawing.Size(157, 22); this.PathsMenuItem.Text = "Paths..."; this.PathsMenuItem.Click += new System.EventHandler(this.PathsMenuItem_Click); // @@ -1297,7 +1300,7 @@ // this.FirmwaresMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("FirmwaresMenuItem.Image"))); this.FirmwaresMenuItem.Name = "FirmwaresMenuItem"; - this.FirmwaresMenuItem.Size = new System.Drawing.Size(159, 22); + this.FirmwaresMenuItem.Size = new System.Drawing.Size(157, 22); this.FirmwaresMenuItem.Text = "&Firmwares..."; this.FirmwaresMenuItem.Click += new System.EventHandler(this.FirmwaresMenuItem_Click); // @@ -1305,7 +1308,7 @@ // this.MessagesMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MessageConfig; this.MessagesMenuItem.Name = "MessagesMenuItem"; - this.MessagesMenuItem.Size = new System.Drawing.Size(159, 22); + this.MessagesMenuItem.Size = new System.Drawing.Size(157, 22); this.MessagesMenuItem.Text = "&Messages..."; this.MessagesMenuItem.Click += new System.EventHandler(this.MessagesMenuItem_Click); // @@ -1313,7 +1316,7 @@ // this.AutofireMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Lightning; this.AutofireMenuItem.Name = "AutofireMenuItem"; - this.AutofireMenuItem.Size = new System.Drawing.Size(159, 22); + this.AutofireMenuItem.Size = new System.Drawing.Size(157, 22); this.AutofireMenuItem.Text = "&Autofire..."; this.AutofireMenuItem.Click += new System.EventHandler(this.AutofireMenuItem_Click); // @@ -1321,28 +1324,28 @@ // this.RewindOptionsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Previous; this.RewindOptionsMenuItem.Name = "RewindOptionsMenuItem"; - this.RewindOptionsMenuItem.Size = new System.Drawing.Size(159, 22); + this.RewindOptionsMenuItem.Size = new System.Drawing.Size(157, 22); this.RewindOptionsMenuItem.Text = "&Rewind..."; this.RewindOptionsMenuItem.Click += new System.EventHandler(this.RewindOptionsMenuItem_Click); // // extensionsToolStripMenuItem // this.extensionsToolStripMenuItem.Name = "extensionsToolStripMenuItem"; - this.extensionsToolStripMenuItem.Size = new System.Drawing.Size(159, 22); + this.extensionsToolStripMenuItem.Size = new System.Drawing.Size(157, 22); this.extensionsToolStripMenuItem.Text = "File Extensions..."; this.extensionsToolStripMenuItem.Click += new System.EventHandler(this.FileExtensionsMenuItem_Click); // // ClientOptionsMenuItem // this.ClientOptionsMenuItem.Name = "ClientOptionsMenuItem"; - this.ClientOptionsMenuItem.Size = new System.Drawing.Size(159, 22); + this.ClientOptionsMenuItem.Size = new System.Drawing.Size(157, 22); this.ClientOptionsMenuItem.Text = "&Customize..."; this.ClientOptionsMenuItem.Click += new System.EventHandler(this.CustomizeMenuItem_Click); // // toolStripSeparator9 // this.toolStripSeparator9.Name = "toolStripSeparator9"; - this.toolStripSeparator9.Size = new System.Drawing.Size(156, 6); + this.toolStripSeparator9.Size = new System.Drawing.Size(154, 6); // // SpeedSkipSubMenu // @@ -1371,162 +1374,162 @@ this.Speed150MenuItem, this.Speed200MenuItem}); this.SpeedSkipSubMenu.Name = "SpeedSkipSubMenu"; - this.SpeedSkipSubMenu.Size = new System.Drawing.Size(159, 22); + this.SpeedSkipSubMenu.Size = new System.Drawing.Size(157, 22); this.SpeedSkipSubMenu.Text = "Speed/Skip"; this.SpeedSkipSubMenu.DropDownOpened += new System.EventHandler(this.FrameSkipMenuItem_DropDownOpened); // // ClickThrottleMenuItem // this.ClickThrottleMenuItem.Name = "ClickThrottleMenuItem"; - this.ClickThrottleMenuItem.Size = new System.Drawing.Size(202, 22); + this.ClickThrottleMenuItem.Size = new System.Drawing.Size(181, 22); this.ClickThrottleMenuItem.Text = "Clock Throttle"; this.ClickThrottleMenuItem.Click += new System.EventHandler(this.ClickThrottleMenuItem_Click); // // AudioThrottleMenuItem // this.AudioThrottleMenuItem.Name = "AudioThrottleMenuItem"; - this.AudioThrottleMenuItem.Size = new System.Drawing.Size(202, 22); + this.AudioThrottleMenuItem.Size = new System.Drawing.Size(181, 22); this.AudioThrottleMenuItem.Text = "Audio Throttle"; this.AudioThrottleMenuItem.Click += new System.EventHandler(this.AudioThrottleMenuItem_Click); // // VsyncThrottleMenuItem // this.VsyncThrottleMenuItem.Name = "VsyncThrottleMenuItem"; - this.VsyncThrottleMenuItem.Size = new System.Drawing.Size(202, 22); + this.VsyncThrottleMenuItem.Size = new System.Drawing.Size(181, 22); this.VsyncThrottleMenuItem.Text = "VSync Throttle"; this.VsyncThrottleMenuItem.Click += new System.EventHandler(this.VsyncThrottleMenuItem_Click); // // toolStripSeparator27 // this.toolStripSeparator27.Name = "toolStripSeparator27"; - this.toolStripSeparator27.Size = new System.Drawing.Size(199, 6); + this.toolStripSeparator27.Size = new System.Drawing.Size(178, 6); // // VsyncEnabledMenuItem // this.VsyncEnabledMenuItem.Name = "VsyncEnabledMenuItem"; - this.VsyncEnabledMenuItem.Size = new System.Drawing.Size(202, 22); + this.VsyncEnabledMenuItem.Size = new System.Drawing.Size(181, 22); this.VsyncEnabledMenuItem.Text = "VSync Enabled"; this.VsyncEnabledMenuItem.Click += new System.EventHandler(this.VsyncEnabledMenuItem_Click); // // toolStripMenuItem3 // this.toolStripMenuItem3.Name = "toolStripMenuItem3"; - this.toolStripMenuItem3.Size = new System.Drawing.Size(199, 6); + this.toolStripMenuItem3.Size = new System.Drawing.Size(178, 6); // // MinimizeSkippingMenuItem // this.MinimizeSkippingMenuItem.Name = "MinimizeSkippingMenuItem"; - this.MinimizeSkippingMenuItem.Size = new System.Drawing.Size(202, 22); + this.MinimizeSkippingMenuItem.Size = new System.Drawing.Size(181, 22); this.MinimizeSkippingMenuItem.Text = "Auto-minimize skipping"; this.MinimizeSkippingMenuItem.Click += new System.EventHandler(this.MinimizeSkippingMenuItem_Click); // // NeverSkipMenuItem // this.NeverSkipMenuItem.Name = "NeverSkipMenuItem"; - this.NeverSkipMenuItem.Size = new System.Drawing.Size(202, 22); + this.NeverSkipMenuItem.Size = new System.Drawing.Size(181, 22); this.NeverSkipMenuItem.Text = "0 (never skip)"; this.NeverSkipMenuItem.Click += new System.EventHandler(this.NeverSkipMenuItem_Click); // // Frameskip1MenuItem // this.Frameskip1MenuItem.Name = "Frameskip1MenuItem"; - this.Frameskip1MenuItem.Size = new System.Drawing.Size(202, 22); + this.Frameskip1MenuItem.Size = new System.Drawing.Size(181, 22); this.Frameskip1MenuItem.Text = "1"; this.Frameskip1MenuItem.Click += new System.EventHandler(this.Frameskip1MenuItem_Click); // // Frameskip2MenuItem // this.Frameskip2MenuItem.Name = "Frameskip2MenuItem"; - this.Frameskip2MenuItem.Size = new System.Drawing.Size(202, 22); + this.Frameskip2MenuItem.Size = new System.Drawing.Size(181, 22); this.Frameskip2MenuItem.Text = "2"; this.Frameskip2MenuItem.Click += new System.EventHandler(this.Frameskip2MenuItem_Click); // // Frameskip3MenuItem // this.Frameskip3MenuItem.Name = "Frameskip3MenuItem"; - this.Frameskip3MenuItem.Size = new System.Drawing.Size(202, 22); + this.Frameskip3MenuItem.Size = new System.Drawing.Size(181, 22); this.Frameskip3MenuItem.Text = "3"; this.Frameskip3MenuItem.Click += new System.EventHandler(this.Frameskip3MenuItem_Click); // // Frameskip4MenuItem // this.Frameskip4MenuItem.Name = "Frameskip4MenuItem"; - this.Frameskip4MenuItem.Size = new System.Drawing.Size(202, 22); + this.Frameskip4MenuItem.Size = new System.Drawing.Size(181, 22); this.Frameskip4MenuItem.Text = "4"; this.Frameskip4MenuItem.Click += new System.EventHandler(this.Frameskip4MenuItem_Click); // // Frameskip5MenuItem // this.Frameskip5MenuItem.Name = "Frameskip5MenuItem"; - this.Frameskip5MenuItem.Size = new System.Drawing.Size(202, 22); + this.Frameskip5MenuItem.Size = new System.Drawing.Size(181, 22); this.Frameskip5MenuItem.Text = "5"; this.Frameskip5MenuItem.Click += new System.EventHandler(this.Frameskip5MenuItem_Click); // // Frameskip6MenuItem // this.Frameskip6MenuItem.Name = "Frameskip6MenuItem"; - this.Frameskip6MenuItem.Size = new System.Drawing.Size(202, 22); + this.Frameskip6MenuItem.Size = new System.Drawing.Size(181, 22); this.Frameskip6MenuItem.Text = "6"; this.Frameskip6MenuItem.Click += new System.EventHandler(this.Frameskip6MenuItem_Click); // // Frameskip7MenuItem // this.Frameskip7MenuItem.Name = "Frameskip7MenuItem"; - this.Frameskip7MenuItem.Size = new System.Drawing.Size(202, 22); + this.Frameskip7MenuItem.Size = new System.Drawing.Size(181, 22); this.Frameskip7MenuItem.Text = "7"; this.Frameskip7MenuItem.Click += new System.EventHandler(this.Frameskip7MenuItem_Click); // // Frameskip8MenuItem // this.Frameskip8MenuItem.Name = "Frameskip8MenuItem"; - this.Frameskip8MenuItem.Size = new System.Drawing.Size(202, 22); + this.Frameskip8MenuItem.Size = new System.Drawing.Size(181, 22); this.Frameskip8MenuItem.Text = "8"; this.Frameskip8MenuItem.Click += new System.EventHandler(this.Frameskip8MenuItem_Click); // // Frameskip9MenuItem // this.Frameskip9MenuItem.Name = "Frameskip9MenuItem"; - this.Frameskip9MenuItem.Size = new System.Drawing.Size(202, 22); + this.Frameskip9MenuItem.Size = new System.Drawing.Size(181, 22); this.Frameskip9MenuItem.Text = "9"; this.Frameskip9MenuItem.Click += new System.EventHandler(this.Frameskip9MenuItem_Click); // // toolStripMenuItem5 // this.toolStripMenuItem5.Name = "toolStripMenuItem5"; - this.toolStripMenuItem5.Size = new System.Drawing.Size(199, 6); + this.toolStripMenuItem5.Size = new System.Drawing.Size(178, 6); // // Speed50MenuItem // this.Speed50MenuItem.Name = "Speed50MenuItem"; - this.Speed50MenuItem.Size = new System.Drawing.Size(202, 22); + this.Speed50MenuItem.Size = new System.Drawing.Size(181, 22); this.Speed50MenuItem.Text = "Speed 50%"; this.Speed50MenuItem.Click += new System.EventHandler(this.Speed50MenuItem_Click); // // Speed75MenuItem // this.Speed75MenuItem.Name = "Speed75MenuItem"; - this.Speed75MenuItem.Size = new System.Drawing.Size(202, 22); + this.Speed75MenuItem.Size = new System.Drawing.Size(181, 22); this.Speed75MenuItem.Text = "Speed 75%"; this.Speed75MenuItem.Click += new System.EventHandler(this.Speed75MenuItem_Click); // // Speed100MenuItem // this.Speed100MenuItem.Name = "Speed100MenuItem"; - this.Speed100MenuItem.Size = new System.Drawing.Size(202, 22); + this.Speed100MenuItem.Size = new System.Drawing.Size(181, 22); this.Speed100MenuItem.Text = "Speed 100%"; this.Speed100MenuItem.Click += new System.EventHandler(this.Speed100MenuItem_Click); // // Speed150MenuItem // this.Speed150MenuItem.Name = "Speed150MenuItem"; - this.Speed150MenuItem.Size = new System.Drawing.Size(202, 22); + this.Speed150MenuItem.Size = new System.Drawing.Size(181, 22); this.Speed150MenuItem.Text = "Speed 150%"; this.Speed150MenuItem.Click += new System.EventHandler(this.Speed150MenuItem_Click); // // Speed200MenuItem // this.Speed200MenuItem.Name = "Speed200MenuItem"; - this.Speed200MenuItem.Size = new System.Drawing.Size(202, 22); + this.Speed200MenuItem.Size = new System.Drawing.Size(181, 22); this.Speed200MenuItem.Text = "Speed 200%"; this.Speed200MenuItem.Click += new System.EventHandler(this.Speed200MenuItem_Click); // @@ -1537,28 +1540,28 @@ this.InputOverHkMenuItem, this.HkOverInputMenuItem}); this.KeyPrioritySubMenu.Name = "KeyPrioritySubMenu"; - this.KeyPrioritySubMenu.Size = new System.Drawing.Size(159, 22); + this.KeyPrioritySubMenu.Size = new System.Drawing.Size(157, 22); this.KeyPrioritySubMenu.Text = "Key Priority"; this.KeyPrioritySubMenu.DropDownOpened += new System.EventHandler(this.KeyPriorityMenuItem_DropDownOpened); // // BothHkAndControllerMenuItem // this.BothHkAndControllerMenuItem.Name = "BothHkAndControllerMenuItem"; - this.BothHkAndControllerMenuItem.Size = new System.Drawing.Size(229, 22); + this.BothHkAndControllerMenuItem.Size = new System.Drawing.Size(214, 22); this.BothHkAndControllerMenuItem.Text = "Both Hotkeys and Controllers"; this.BothHkAndControllerMenuItem.Click += new System.EventHandler(this.BothHkAndControllerMenuItem_Click); // // InputOverHkMenuItem // this.InputOverHkMenuItem.Name = "InputOverHkMenuItem"; - this.InputOverHkMenuItem.Size = new System.Drawing.Size(229, 22); + this.InputOverHkMenuItem.Size = new System.Drawing.Size(214, 22); this.InputOverHkMenuItem.Text = "Input overrides Hotkeys"; this.InputOverHkMenuItem.Click += new System.EventHandler(this.InputOverHkMenuItem_Click); // // HkOverInputMenuItem // this.HkOverInputMenuItem.Name = "HkOverInputMenuItem"; - this.HkOverInputMenuItem.Size = new System.Drawing.Size(229, 22); + this.HkOverInputMenuItem.Size = new System.Drawing.Size(214, 22); this.HkOverInputMenuItem.Text = "Hotkeys override Input"; this.HkOverInputMenuItem.Click += new System.EventHandler(this.HkOverInputMenuItem_Click); // @@ -1569,28 +1572,28 @@ this.SavestateBinaryMenuItem, this.SavestateTextMenuItem}); this.SavestateTypeSubMenu.Name = "SavestateTypeSubMenu"; - this.SavestateTypeSubMenu.Size = new System.Drawing.Size(159, 22); + this.SavestateTypeSubMenu.Size = new System.Drawing.Size(157, 22); this.SavestateTypeSubMenu.Text = "Savestate Type"; this.SavestateTypeSubMenu.DropDownOpened += new System.EventHandler(this.SavestateTypeMenuItem_DropDownOpened); // // SavestateTypeDefaultMenuItem // this.SavestateTypeDefaultMenuItem.Name = "SavestateTypeDefaultMenuItem"; - this.SavestateTypeDefaultMenuItem.Size = new System.Drawing.Size(112, 22); + this.SavestateTypeDefaultMenuItem.Size = new System.Drawing.Size(109, 22); this.SavestateTypeDefaultMenuItem.Text = "Default"; this.SavestateTypeDefaultMenuItem.Click += new System.EventHandler(this.SavestateTypeDefaultMenuItem_Click); // // SavestateBinaryMenuItem // this.SavestateBinaryMenuItem.Name = "SavestateBinaryMenuItem"; - this.SavestateBinaryMenuItem.Size = new System.Drawing.Size(112, 22); + this.SavestateBinaryMenuItem.Size = new System.Drawing.Size(109, 22); this.SavestateBinaryMenuItem.Text = "Binary"; this.SavestateBinaryMenuItem.Click += new System.EventHandler(this.SavestateBinaryMenuItem_Click); // // SavestateTextMenuItem // this.SavestateTextMenuItem.Name = "SavestateTextMenuItem"; - this.SavestateTextMenuItem.Size = new System.Drawing.Size(112, 22); + this.SavestateTextMenuItem.Size = new System.Drawing.Size(109, 22); this.SavestateTextMenuItem.Text = "Text"; this.SavestateTextMenuItem.Click += new System.EventHandler(this.SavestateTextMenuItem_Click); // @@ -1602,47 +1605,47 @@ this.toolStripSeparator8, this.N64VideoPluginSettingsMenuItem}); this.CoresSubMenu.Name = "CoresSubMenu"; - this.CoresSubMenu.Size = new System.Drawing.Size(159, 22); + this.CoresSubMenu.Size = new System.Drawing.Size(157, 22); this.CoresSubMenu.Text = "Cores"; this.CoresSubMenu.DropDownOpened += new System.EventHandler(this.CoresSubMenu_DropDownOpened); // // GBInSGBMenuItem // this.GBInSGBMenuItem.Name = "GBInSGBMenuItem"; - this.GBInSGBMenuItem.Size = new System.Drawing.Size(210, 22); + this.GBInSGBMenuItem.Size = new System.Drawing.Size(195, 22); this.GBInSGBMenuItem.Text = "GB in SGB"; this.GBInSGBMenuItem.Click += new System.EventHandler(this.GBInSGBMenuItem_Click); // // NesInQuickNESMenuItem // this.NesInQuickNESMenuItem.Name = "NesInQuickNESMenuItem"; - this.NesInQuickNESMenuItem.Size = new System.Drawing.Size(210, 22); + this.NesInQuickNESMenuItem.Size = new System.Drawing.Size(195, 22); this.NesInQuickNESMenuItem.Text = "NES in QuickNES"; this.NesInQuickNESMenuItem.Click += new System.EventHandler(this.NesInQuickNESMenuItem_Click); // // toolStripSeparator8 // this.toolStripSeparator8.Name = "toolStripSeparator8"; - this.toolStripSeparator8.Size = new System.Drawing.Size(207, 6); + this.toolStripSeparator8.Size = new System.Drawing.Size(192, 6); // // N64VideoPluginSettingsMenuItem // this.N64VideoPluginSettingsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.monitor; this.N64VideoPluginSettingsMenuItem.Name = "N64VideoPluginSettingsMenuItem"; - this.N64VideoPluginSettingsMenuItem.Size = new System.Drawing.Size(210, 22); + this.N64VideoPluginSettingsMenuItem.Size = new System.Drawing.Size(195, 22); this.N64VideoPluginSettingsMenuItem.Text = "N64 Video Plugin Settings"; this.N64VideoPluginSettingsMenuItem.Click += new System.EventHandler(this.N64VideoPluginSettingsMenuItem_Click); // // toolStripSeparator10 // this.toolStripSeparator10.Name = "toolStripSeparator10"; - this.toolStripSeparator10.Size = new System.Drawing.Size(156, 6); + this.toolStripSeparator10.Size = new System.Drawing.Size(154, 6); // // SaveConfigMenuItem // this.SaveConfigMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Save; this.SaveConfigMenuItem.Name = "SaveConfigMenuItem"; - this.SaveConfigMenuItem.Size = new System.Drawing.Size(159, 22); + this.SaveConfigMenuItem.Size = new System.Drawing.Size(157, 22); this.SaveConfigMenuItem.Text = "Save Config"; this.SaveConfigMenuItem.Click += new System.EventHandler(this.SaveConfigMenuItem_Click); // @@ -1650,7 +1653,7 @@ // this.LoadConfigMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.LoadConfig; this.LoadConfigMenuItem.Name = "LoadConfigMenuItem"; - this.LoadConfigMenuItem.Size = new System.Drawing.Size(159, 22); + this.LoadConfigMenuItem.Size = new System.Drawing.Size(157, 22); this.LoadConfigMenuItem.Text = "Load Config"; this.LoadConfigMenuItem.Click += new System.EventHandler(this.LoadConfigMenuItem_Click); // @@ -1672,7 +1675,7 @@ this.CreateDualGbXmlMenuItem, this.batchRunnerToolStripMenuItem}); 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); // @@ -1680,20 +1683,20 @@ // this.ToolBoxMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.ToolBox; this.ToolBoxMenuItem.Name = "ToolBoxMenuItem"; - this.ToolBoxMenuItem.Size = new System.Drawing.Size(183, 22); + this.ToolBoxMenuItem.Size = new System.Drawing.Size(178, 22); this.ToolBoxMenuItem.Text = "&Tool Box"; this.ToolBoxMenuItem.Click += new System.EventHandler(this.ToolBoxMenuItem_Click); // // toolStripSeparator12 // this.toolStripSeparator12.Name = "toolStripSeparator12"; - this.toolStripSeparator12.Size = new System.Drawing.Size(180, 6); + this.toolStripSeparator12.Size = new System.Drawing.Size(175, 6); // // RamWatchMenuItem // this.RamWatchMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.watch; this.RamWatchMenuItem.Name = "RamWatchMenuItem"; - this.RamWatchMenuItem.Size = new System.Drawing.Size(183, 22); + this.RamWatchMenuItem.Size = new System.Drawing.Size(178, 22); this.RamWatchMenuItem.Text = "RAM &Watch"; this.RamWatchMenuItem.Click += new System.EventHandler(this.RamWatchMenuItem_Click); // @@ -1701,7 +1704,7 @@ // this.RamSearchMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.search; this.RamSearchMenuItem.Name = "RamSearchMenuItem"; - this.RamSearchMenuItem.Size = new System.Drawing.Size(183, 22); + this.RamSearchMenuItem.Size = new System.Drawing.Size(178, 22); this.RamSearchMenuItem.Text = "RAM &Search"; this.RamSearchMenuItem.Click += new System.EventHandler(this.RamSearchMenuItem_Click); // @@ -1709,7 +1712,7 @@ // this.HexEditorMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.poke; this.HexEditorMenuItem.Name = "HexEditorMenuItem"; - this.HexEditorMenuItem.Size = new System.Drawing.Size(183, 22); + this.HexEditorMenuItem.Size = new System.Drawing.Size(178, 22); this.HexEditorMenuItem.Text = "&Hex Editor"; this.HexEditorMenuItem.Click += new System.EventHandler(this.HexEditorMenuItem_Click); // @@ -1717,7 +1720,7 @@ // this.TraceLoggerMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.pencil; this.TraceLoggerMenuItem.Name = "TraceLoggerMenuItem"; - this.TraceLoggerMenuItem.Size = new System.Drawing.Size(183, 22); + this.TraceLoggerMenuItem.Size = new System.Drawing.Size(178, 22); this.TraceLoggerMenuItem.Text = "Trace &Logger"; this.TraceLoggerMenuItem.Click += new System.EventHandler(this.TraceLoggerMenuItem_Click); // @@ -1725,7 +1728,7 @@ // this.TAStudioMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.TAStudio; this.TAStudioMenuItem.Name = "TAStudioMenuItem"; - this.TAStudioMenuItem.Size = new System.Drawing.Size(183, 22); + this.TAStudioMenuItem.Size = new System.Drawing.Size(178, 22); this.TAStudioMenuItem.Text = "&TAStudio"; this.TAStudioMenuItem.Click += new System.EventHandler(this.TAStudioMenuItem_Click); // @@ -1733,20 +1736,20 @@ // this.VirtualPadMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.GameController; this.VirtualPadMenuItem.Name = "VirtualPadMenuItem"; - this.VirtualPadMenuItem.Size = new System.Drawing.Size(183, 22); + this.VirtualPadMenuItem.Size = new System.Drawing.Size(178, 22); this.VirtualPadMenuItem.Text = "Virtual Pad"; this.VirtualPadMenuItem.Click += new System.EventHandler(this.VirtualPadMenuItem_Click); // // toolStripSeparator11 // this.toolStripSeparator11.Name = "toolStripSeparator11"; - this.toolStripSeparator11.Size = new System.Drawing.Size(180, 6); + this.toolStripSeparator11.Size = new System.Drawing.Size(175, 6); // // CheatsMenuItem // this.CheatsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Freeze; this.CheatsMenuItem.Name = "CheatsMenuItem"; - this.CheatsMenuItem.Size = new System.Drawing.Size(183, 22); + this.CheatsMenuItem.Size = new System.Drawing.Size(178, 22); this.CheatsMenuItem.Text = "Cheats"; this.CheatsMenuItem.Click += new System.EventHandler(this.CheatsMenuItem_Click); // @@ -1754,27 +1757,27 @@ // this.LuaConsoleMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Lua; this.LuaConsoleMenuItem.Name = "LuaConsoleMenuItem"; - this.LuaConsoleMenuItem.Size = new System.Drawing.Size(183, 22); + this.LuaConsoleMenuItem.Size = new System.Drawing.Size(178, 22); this.LuaConsoleMenuItem.Text = "Lua Console"; this.LuaConsoleMenuItem.Click += new System.EventHandler(this.LuaConsoleMenuItem_Click); // // toolStripSeparator29 // this.toolStripSeparator29.Name = "toolStripSeparator29"; - this.toolStripSeparator29.Size = new System.Drawing.Size(180, 6); + this.toolStripSeparator29.Size = new System.Drawing.Size(175, 6); // // CreateDualGbXmlMenuItem // this.CreateDualGbXmlMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.dual; this.CreateDualGbXmlMenuItem.Name = "CreateDualGbXmlMenuItem"; - this.CreateDualGbXmlMenuItem.Size = new System.Drawing.Size(183, 22); + this.CreateDualGbXmlMenuItem.Size = new System.Drawing.Size(178, 22); this.CreateDualGbXmlMenuItem.Text = "Create Dual GB File..."; this.CreateDualGbXmlMenuItem.Click += new System.EventHandler(this.CreateDualGbXmlMenuItem_Click); // // batchRunnerToolStripMenuItem // this.batchRunnerToolStripMenuItem.Name = "batchRunnerToolStripMenuItem"; - this.batchRunnerToolStripMenuItem.Size = new System.Drawing.Size(183, 22); + this.batchRunnerToolStripMenuItem.Size = new System.Drawing.Size(178, 22); this.batchRunnerToolStripMenuItem.Text = "Batch Runner"; this.batchRunnerToolStripMenuItem.Visible = false; this.batchRunnerToolStripMenuItem.Click += new System.EventHandler(this.batchRunnerToolStripMenuItem_Click); @@ -1794,7 +1797,7 @@ this.toolStripSeparator22, this.FDSControlsMenuItem}); this.NESSubMenu.Name = "NESSubMenu"; - this.NESSubMenu.Size = new System.Drawing.Size(40, 19); + this.NESSubMenu.Size = new System.Drawing.Size(38, 17); this.NESSubMenu.Text = "&NES"; this.NESSubMenu.DropDownOpened += new System.EventHandler(this.NESSubMenu_DropDownOpened); // @@ -1802,41 +1805,41 @@ // this.NESDebuggerMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Bug; this.NESDebuggerMenuItem.Name = "NESDebuggerMenuItem"; - this.NESDebuggerMenuItem.Size = new System.Drawing.Size(233, 22); + this.NESDebuggerMenuItem.Size = new System.Drawing.Size(217, 22); this.NESDebuggerMenuItem.Text = "&Debugger"; this.NESDebuggerMenuItem.Click += new System.EventHandler(this.NESDebuggerMenuItem_Click); // // NESPPUViewerMenuItem // this.NESPPUViewerMenuItem.Name = "NESPPUViewerMenuItem"; - this.NESPPUViewerMenuItem.Size = new System.Drawing.Size(233, 22); + this.NESPPUViewerMenuItem.Size = new System.Drawing.Size(217, 22); this.NESPPUViewerMenuItem.Text = "&PPU Viewer"; this.NESPPUViewerMenuItem.Click += new System.EventHandler(this.NESPPUViewerMenuItem_Click); // // NESNametableViewerMenuItem // this.NESNametableViewerMenuItem.Name = "NESNametableViewerMenuItem"; - this.NESNametableViewerMenuItem.Size = new System.Drawing.Size(233, 22); + this.NESNametableViewerMenuItem.Size = new System.Drawing.Size(217, 22); this.NESNametableViewerMenuItem.Text = "&Nametable Viewer"; this.NESNametableViewerMenuItem.Click += new System.EventHandler(this.NESNametableViewerMenuItem_Click); // // NESGameGenieCodesMenuItem // this.NESGameGenieCodesMenuItem.Name = "NESGameGenieCodesMenuItem"; - this.NESGameGenieCodesMenuItem.Size = new System.Drawing.Size(233, 22); + this.NESGameGenieCodesMenuItem.Size = new System.Drawing.Size(217, 22); this.NESGameGenieCodesMenuItem.Text = "&Game Genie Encoder/Decoder"; this.NESGameGenieCodesMenuItem.Click += new System.EventHandler(this.NESGameGenieCodesMenuItem_Click); // // toolStripSeparator17 // this.toolStripSeparator17.Name = "toolStripSeparator17"; - this.toolStripSeparator17.Size = new System.Drawing.Size(230, 6); + this.toolStripSeparator17.Size = new System.Drawing.Size(214, 6); // // NesControllerSettingsMenuItem // this.NesControllerSettingsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.GameController; this.NesControllerSettingsMenuItem.Name = "NesControllerSettingsMenuItem"; - this.NesControllerSettingsMenuItem.Size = new System.Drawing.Size(233, 22); + this.NesControllerSettingsMenuItem.Size = new System.Drawing.Size(217, 22); this.NesControllerSettingsMenuItem.Text = "Controller Settings..."; this.NesControllerSettingsMenuItem.Click += new System.EventHandler(this.NesControllerSettingsMenuItem_Click); // @@ -1844,7 +1847,7 @@ // this.NESGraphicSettingsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.tvIcon; this.NESGraphicSettingsMenuItem.Name = "NESGraphicSettingsMenuItem"; - this.NESGraphicSettingsMenuItem.Size = new System.Drawing.Size(233, 22); + this.NESGraphicSettingsMenuItem.Size = new System.Drawing.Size(217, 22); this.NESGraphicSettingsMenuItem.Text = "Graphics Settings..."; this.NESGraphicSettingsMenuItem.Click += new System.EventHandler(this.NESGraphicSettingsMenuItem_Click); // @@ -1852,35 +1855,35 @@ // this.NESSoundChannelsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.AudioHS; this.NESSoundChannelsMenuItem.Name = "NESSoundChannelsMenuItem"; - this.NESSoundChannelsMenuItem.Size = new System.Drawing.Size(233, 22); + this.NESSoundChannelsMenuItem.Size = new System.Drawing.Size(217, 22); this.NESSoundChannelsMenuItem.Text = "Sound Channels..."; this.NESSoundChannelsMenuItem.Click += new System.EventHandler(this.NESSoundChannelsMenuItem_Click); // // MovieSettingsMenuItem // this.MovieSettingsMenuItem.Name = "MovieSettingsMenuItem"; - this.MovieSettingsMenuItem.Size = new System.Drawing.Size(233, 22); + this.MovieSettingsMenuItem.Size = new System.Drawing.Size(217, 22); this.MovieSettingsMenuItem.Text = "Advanced Movie Settings..."; this.MovieSettingsMenuItem.Click += new System.EventHandler(this.MovieSettingsMenuItem_Click); // // toolStripSeparator22 // this.toolStripSeparator22.Name = "toolStripSeparator22"; - this.toolStripSeparator22.Size = new System.Drawing.Size(230, 6); + this.toolStripSeparator22.Size = new System.Drawing.Size(214, 6); // // FDSControlsMenuItem // this.FDSControlsMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.FdsEjectDiskMenuItem}); this.FDSControlsMenuItem.Name = "FDSControlsMenuItem"; - this.FDSControlsMenuItem.Size = new System.Drawing.Size(233, 22); + this.FDSControlsMenuItem.Size = new System.Drawing.Size(217, 22); this.FDSControlsMenuItem.Text = "FDS Controls"; this.FDSControlsMenuItem.DropDownOpened += new System.EventHandler(this.FdsControlsMenuItem_DropDownOpened); // // FdsEjectDiskMenuItem // this.FdsEjectDiskMenuItem.Name = "FdsEjectDiskMenuItem"; - this.FdsEjectDiskMenuItem.Size = new System.Drawing.Size(124, 22); + this.FdsEjectDiskMenuItem.Size = new System.Drawing.Size(120, 22); this.FdsEjectDiskMenuItem.Text = "&Eject Disk"; this.FdsEjectDiskMenuItem.Click += new System.EventHandler(this.FdsEjectDiskMenuItem_Click); // @@ -1896,61 +1899,61 @@ this.PCEArcadeCardRewindEnableMenuItem, this.PCEGraphicsSettingsMenuItem}); this.PCESubMenu.Name = "PCESubMenu"; - this.PCESubMenu.Size = new System.Drawing.Size(40, 19); + this.PCESubMenu.Size = new System.Drawing.Size(38, 17); this.PCESubMenu.Text = "&PCE"; this.PCESubMenu.DropDownOpened += new System.EventHandler(this.PCESubMenu_DropDownOpened); // // PCEBGViewerMenuItem // this.PCEBGViewerMenuItem.Name = "PCEBGViewerMenuItem"; - this.PCEBGViewerMenuItem.Size = new System.Drawing.Size(259, 22); + this.PCEBGViewerMenuItem.Size = new System.Drawing.Size(240, 22); this.PCEBGViewerMenuItem.Text = "&BG Viewer"; this.PCEBGViewerMenuItem.Click += new System.EventHandler(this.PCEBGViewerMenuItem_Click); // // PCEtileViewerToolStripMenuItem // this.PCEtileViewerToolStripMenuItem.Name = "PCEtileViewerToolStripMenuItem"; - this.PCEtileViewerToolStripMenuItem.Size = new System.Drawing.Size(259, 22); + this.PCEtileViewerToolStripMenuItem.Size = new System.Drawing.Size(240, 22); this.PCEtileViewerToolStripMenuItem.Text = "&Tile Viewer"; this.PCEtileViewerToolStripMenuItem.Click += new System.EventHandler(this.PceTileViewerMenuItem_Click); // // codeDataLoggerToolStripMenuItem // this.codeDataLoggerToolStripMenuItem.Name = "codeDataLoggerToolStripMenuItem"; - this.codeDataLoggerToolStripMenuItem.Size = new System.Drawing.Size(259, 22); + this.codeDataLoggerToolStripMenuItem.Size = new System.Drawing.Size(240, 22); this.codeDataLoggerToolStripMenuItem.Text = "Code-Data Logger"; this.codeDataLoggerToolStripMenuItem.Click += new System.EventHandler(this.CodeDataLoggerMenuItem_Click); // // toolStripSeparator25 // this.toolStripSeparator25.Name = "toolStripSeparator25"; - this.toolStripSeparator25.Size = new System.Drawing.Size(256, 6); + this.toolStripSeparator25.Size = new System.Drawing.Size(237, 6); // // PCEAlwaysPerformSpriteLimitMenuItem // this.PCEAlwaysPerformSpriteLimitMenuItem.Name = "PCEAlwaysPerformSpriteLimitMenuItem"; - this.PCEAlwaysPerformSpriteLimitMenuItem.Size = new System.Drawing.Size(259, 22); + this.PCEAlwaysPerformSpriteLimitMenuItem.Size = new System.Drawing.Size(240, 22); this.PCEAlwaysPerformSpriteLimitMenuItem.Text = "Always Perform Sprite Limit"; this.PCEAlwaysPerformSpriteLimitMenuItem.Click += new System.EventHandler(this.PCEAlwaysPerformSpriteLimitMenuItem_Click); // // PCEAlwaysEqualizeVolumesMenuItem // this.PCEAlwaysEqualizeVolumesMenuItem.Name = "PCEAlwaysEqualizeVolumesMenuItem"; - this.PCEAlwaysEqualizeVolumesMenuItem.Size = new System.Drawing.Size(259, 22); + this.PCEAlwaysEqualizeVolumesMenuItem.Size = new System.Drawing.Size(240, 22); this.PCEAlwaysEqualizeVolumesMenuItem.Text = "Always Equalize Volumes (PCE-CD)"; this.PCEAlwaysEqualizeVolumesMenuItem.Click += new System.EventHandler(this.PCEAlwaysEqualizeVolumesMenuItem_Click); // // PCEArcadeCardRewindEnableMenuItem // this.PCEArcadeCardRewindEnableMenuItem.Name = "PCEArcadeCardRewindEnableMenuItem"; - this.PCEArcadeCardRewindEnableMenuItem.Size = new System.Drawing.Size(259, 22); + this.PCEArcadeCardRewindEnableMenuItem.Size = new System.Drawing.Size(240, 22); this.PCEArcadeCardRewindEnableMenuItem.Text = "Arcade Card Rewind-Enable Hack"; this.PCEArcadeCardRewindEnableMenuItem.Click += new System.EventHandler(this.PCEArcadeCardRewindEnableMenuItem_Click); // // PCEGraphicsSettingsMenuItem // this.PCEGraphicsSettingsMenuItem.Name = "PCEGraphicsSettingsMenuItem"; - this.PCEGraphicsSettingsMenuItem.Size = new System.Drawing.Size(259, 22); + this.PCEGraphicsSettingsMenuItem.Size = new System.Drawing.Size(240, 22); this.PCEGraphicsSettingsMenuItem.Text = "Graphics Settings"; this.PCEGraphicsSettingsMenuItem.Click += new System.EventHandler(this.PCEGraphicsSettingsMenuItem_Click); // @@ -1973,7 +1976,7 @@ this.SMSVDPViewerToolStripMenuItem, this.GGGameGenieMenuItem}); this.SMSSubMenu.Name = "SMSSubMenu"; - this.SMSSubMenu.Size = new System.Drawing.Size(42, 19); + this.SMSSubMenu.Size = new System.Drawing.Size(39, 17); this.SMSSubMenu.Text = "&SMS"; this.SMSSubMenu.DropDownOpened += new System.EventHandler(this.SMSSubMenu_DropDownOpened); // @@ -1984,27 +1987,27 @@ this.SMSregionJapanToolStripMenuItem, this.SMSregionAutoToolStripMenuItem}); this.SMSregionToolStripMenuItem.Name = "SMSregionToolStripMenuItem"; - this.SMSregionToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.SMSregionToolStripMenuItem.Size = new System.Drawing.Size(221, 22); this.SMSregionToolStripMenuItem.Text = "Region"; // // SMSregionExportToolStripMenuItem // this.SMSregionExportToolStripMenuItem.Name = "SMSregionExportToolStripMenuItem"; - this.SMSregionExportToolStripMenuItem.Size = new System.Drawing.Size(107, 22); + this.SMSregionExportToolStripMenuItem.Size = new System.Drawing.Size(106, 22); this.SMSregionExportToolStripMenuItem.Text = "Export"; this.SMSregionExportToolStripMenuItem.Click += new System.EventHandler(this.SMS_RegionExport_Click); // // SMSregionJapanToolStripMenuItem // this.SMSregionJapanToolStripMenuItem.Name = "SMSregionJapanToolStripMenuItem"; - this.SMSregionJapanToolStripMenuItem.Size = new System.Drawing.Size(107, 22); + this.SMSregionJapanToolStripMenuItem.Size = new System.Drawing.Size(106, 22); this.SMSregionJapanToolStripMenuItem.Text = "Japan"; this.SMSregionJapanToolStripMenuItem.Click += new System.EventHandler(this.SMS_RegionJapan_Click); // // SMSregionAutoToolStripMenuItem // this.SMSregionAutoToolStripMenuItem.Name = "SMSregionAutoToolStripMenuItem"; - this.SMSregionAutoToolStripMenuItem.Size = new System.Drawing.Size(107, 22); + this.SMSregionAutoToolStripMenuItem.Size = new System.Drawing.Size(106, 22); this.SMSregionAutoToolStripMenuItem.Text = "Auto"; this.SMSregionAutoToolStripMenuItem.Click += new System.EventHandler(this.SMS_RegionAuto_Click); // @@ -2015,114 +2018,114 @@ this.SMSdisplayPalToolStripMenuItem, this.SMSdisplayAutoToolStripMenuItem}); this.SMSdisplayToolStripMenuItem.Name = "SMSdisplayToolStripMenuItem"; - this.SMSdisplayToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.SMSdisplayToolStripMenuItem.Size = new System.Drawing.Size(221, 22); this.SMSdisplayToolStripMenuItem.Text = "Display Type"; // // SMSdisplayNtscToolStripMenuItem // this.SMSdisplayNtscToolStripMenuItem.Name = "SMSdisplayNtscToolStripMenuItem"; - this.SMSdisplayNtscToolStripMenuItem.Size = new System.Drawing.Size(104, 22); + this.SMSdisplayNtscToolStripMenuItem.Size = new System.Drawing.Size(100, 22); this.SMSdisplayNtscToolStripMenuItem.Text = "NTSC"; this.SMSdisplayNtscToolStripMenuItem.Click += new System.EventHandler(this.SMS_DisplayNTSC_Click); // // SMSdisplayPalToolStripMenuItem // this.SMSdisplayPalToolStripMenuItem.Name = "SMSdisplayPalToolStripMenuItem"; - this.SMSdisplayPalToolStripMenuItem.Size = new System.Drawing.Size(104, 22); + this.SMSdisplayPalToolStripMenuItem.Size = new System.Drawing.Size(100, 22); this.SMSdisplayPalToolStripMenuItem.Text = "PAL"; this.SMSdisplayPalToolStripMenuItem.Click += new System.EventHandler(this.SMS_DisplayPAL_Click); // // SMSdisplayAutoToolStripMenuItem // this.SMSdisplayAutoToolStripMenuItem.Name = "SMSdisplayAutoToolStripMenuItem"; - this.SMSdisplayAutoToolStripMenuItem.Size = new System.Drawing.Size(104, 22); + this.SMSdisplayAutoToolStripMenuItem.Size = new System.Drawing.Size(100, 22); this.SMSdisplayAutoToolStripMenuItem.Text = "Auto"; this.SMSdisplayAutoToolStripMenuItem.Click += new System.EventHandler(this.SMS_DisplayAuto_Click); // // SMStoolStripMenuItem2 // this.SMStoolStripMenuItem2.Name = "SMStoolStripMenuItem2"; - this.SMStoolStripMenuItem2.Size = new System.Drawing.Size(238, 6); + this.SMStoolStripMenuItem2.Size = new System.Drawing.Size(218, 6); // // SMSenableBIOSToolStripMenuItem // this.SMSenableBIOSToolStripMenuItem.Name = "SMSenableBIOSToolStripMenuItem"; - this.SMSenableBIOSToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.SMSenableBIOSToolStripMenuItem.Size = new System.Drawing.Size(221, 22); this.SMSenableBIOSToolStripMenuItem.Text = "Enable BIOS"; this.SMSenableBIOSToolStripMenuItem.Click += new System.EventHandler(this.SMS_BIOS_Click); // // SMSEnableFMChipMenuItem // this.SMSEnableFMChipMenuItem.Name = "SMSEnableFMChipMenuItem"; - this.SMSEnableFMChipMenuItem.Size = new System.Drawing.Size(241, 22); + this.SMSEnableFMChipMenuItem.Size = new System.Drawing.Size(221, 22); this.SMSEnableFMChipMenuItem.Text = "&Enable FM Chip"; this.SMSEnableFMChipMenuItem.Click += new System.EventHandler(this.SMSEnableFMChipMenuItem_Click); // // SMSOverclockMenuItem // this.SMSOverclockMenuItem.Name = "SMSOverclockMenuItem"; - this.SMSOverclockMenuItem.Size = new System.Drawing.Size(241, 22); + this.SMSOverclockMenuItem.Size = new System.Drawing.Size(221, 22); this.SMSOverclockMenuItem.Text = "&Overclock when Known Safe"; this.SMSOverclockMenuItem.Click += new System.EventHandler(this.SMSOverclockMenuItem_Click); // // SMSForceStereoMenuItem // this.SMSForceStereoMenuItem.Name = "SMSForceStereoMenuItem"; - this.SMSForceStereoMenuItem.Size = new System.Drawing.Size(241, 22); + this.SMSForceStereoMenuItem.Size = new System.Drawing.Size(221, 22); this.SMSForceStereoMenuItem.Text = "&Force Stereo Separation"; this.SMSForceStereoMenuItem.Click += new System.EventHandler(this.SMSForceStereoMenuItem_Click); // // SMSSpriteLimitMenuItem // this.SMSSpriteLimitMenuItem.Name = "SMSSpriteLimitMenuItem"; - this.SMSSpriteLimitMenuItem.Size = new System.Drawing.Size(241, 22); + this.SMSSpriteLimitMenuItem.Size = new System.Drawing.Size(221, 22); this.SMSSpriteLimitMenuItem.Text = "Sprite &Limit"; this.SMSSpriteLimitMenuItem.Click += new System.EventHandler(this.SMSSpriteLimitMenuItem_Click); // // SMSFix3DGameDisplayToolStripMenuItem // this.SMSFix3DGameDisplayToolStripMenuItem.Name = "SMSFix3DGameDisplayToolStripMenuItem"; - this.SMSFix3DGameDisplayToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.SMSFix3DGameDisplayToolStripMenuItem.Size = new System.Drawing.Size(221, 22); this.SMSFix3DGameDisplayToolStripMenuItem.Text = "Fix 3D Game Display"; this.SMSFix3DGameDisplayToolStripMenuItem.Click += new System.EventHandler(this.SMSFix3DDisplayMenuItem_Click); // // ShowClippedRegionsMenuItem // this.ShowClippedRegionsMenuItem.Name = "ShowClippedRegionsMenuItem"; - this.ShowClippedRegionsMenuItem.Size = new System.Drawing.Size(241, 22); + this.ShowClippedRegionsMenuItem.Size = new System.Drawing.Size(221, 22); this.ShowClippedRegionsMenuItem.Text = "&Show Clipped Regions"; this.ShowClippedRegionsMenuItem.Click += new System.EventHandler(this.ShowClippedRegionsMenuItem_Click); // // HighlightActiveDisplayRegionMenuItem // this.HighlightActiveDisplayRegionMenuItem.Name = "HighlightActiveDisplayRegionMenuItem"; - this.HighlightActiveDisplayRegionMenuItem.Size = new System.Drawing.Size(241, 22); + this.HighlightActiveDisplayRegionMenuItem.Size = new System.Drawing.Size(221, 22); this.HighlightActiveDisplayRegionMenuItem.Text = "&Highlight Active Display Region"; this.HighlightActiveDisplayRegionMenuItem.Click += new System.EventHandler(this.HighlightActiveDisplayRegionMenuItem_Click); // // SMSGraphicsSettingsMenuItem // this.SMSGraphicsSettingsMenuItem.Name = "SMSGraphicsSettingsMenuItem"; - this.SMSGraphicsSettingsMenuItem.Size = new System.Drawing.Size(241, 22); + this.SMSGraphicsSettingsMenuItem.Size = new System.Drawing.Size(221, 22); this.SMSGraphicsSettingsMenuItem.Text = "&Graphics Settings..."; this.SMSGraphicsSettingsMenuItem.Click += new System.EventHandler(this.SMSGraphicsSettingsMenuItem_Click); // // toolStripSeparator24 // this.toolStripSeparator24.Name = "toolStripSeparator24"; - this.toolStripSeparator24.Size = new System.Drawing.Size(238, 6); + this.toolStripSeparator24.Size = new System.Drawing.Size(218, 6); // // SMSVDPViewerToolStripMenuItem // this.SMSVDPViewerToolStripMenuItem.Name = "SMSVDPViewerToolStripMenuItem"; - this.SMSVDPViewerToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.SMSVDPViewerToolStripMenuItem.Size = new System.Drawing.Size(221, 22); this.SMSVDPViewerToolStripMenuItem.Text = "&VDP Viewer"; this.SMSVDPViewerToolStripMenuItem.Click += new System.EventHandler(this.SmsVdpViewerMenuItem_Click); // // GGGameGenieMenuItem // this.GGGameGenieMenuItem.Name = "GGGameGenieMenuItem"; - this.GGGameGenieMenuItem.Size = new System.Drawing.Size(241, 22); + this.GGGameGenieMenuItem.Size = new System.Drawing.Size(221, 22); this.GGGameGenieMenuItem.Text = "&Game Genie Encoder/Decoder"; this.GGGameGenieMenuItem.Click += new System.EventHandler(this.GGGameGenieMenuItem_Click); // @@ -2135,7 +2138,7 @@ this.AutoloadKeypadMenuItem, this.paletteToolStripMenuItem}); this.TI83SubMenu.Name = "TI83SubMenu"; - this.TI83SubMenu.Size = new System.Drawing.Size(41, 19); + this.TI83SubMenu.Size = new System.Drawing.Size(41, 17); this.TI83SubMenu.Text = "TI83"; this.TI83SubMenu.DropDownOpened += new System.EventHandler(this.TI83SubMenu_DropDownOpened); // @@ -2143,35 +2146,35 @@ // this.KeypadMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.calculator; this.KeypadMenuItem.Name = "KeypadMenuItem"; - this.KeypadMenuItem.Size = new System.Drawing.Size(165, 22); + this.KeypadMenuItem.Size = new System.Drawing.Size(156, 22); this.KeypadMenuItem.Text = "Keypad"; this.KeypadMenuItem.Click += new System.EventHandler(this.KeypadMenuItem_Click); // // LoadTIFileMenuItem // this.LoadTIFileMenuItem.Name = "LoadTIFileMenuItem"; - this.LoadTIFileMenuItem.Size = new System.Drawing.Size(165, 22); + this.LoadTIFileMenuItem.Size = new System.Drawing.Size(156, 22); this.LoadTIFileMenuItem.Text = "Load TI File..."; this.LoadTIFileMenuItem.Click += new System.EventHandler(this.LoadTIFileMenuItem_Click); // // toolStripSeparator13 // this.toolStripSeparator13.Name = "toolStripSeparator13"; - this.toolStripSeparator13.Size = new System.Drawing.Size(162, 6); + this.toolStripSeparator13.Size = new System.Drawing.Size(153, 6); // // AutoloadKeypadMenuItem // this.AutoloadKeypadMenuItem.Checked = true; this.AutoloadKeypadMenuItem.CheckState = System.Windows.Forms.CheckState.Checked; this.AutoloadKeypadMenuItem.Name = "AutoloadKeypadMenuItem"; - this.AutoloadKeypadMenuItem.Size = new System.Drawing.Size(165, 22); + this.AutoloadKeypadMenuItem.Size = new System.Drawing.Size(156, 22); this.AutoloadKeypadMenuItem.Text = "Autoload Keypad"; this.AutoloadKeypadMenuItem.Click += new System.EventHandler(this.AutoloadKeypadMenuItem_Click); // // paletteToolStripMenuItem // this.paletteToolStripMenuItem.Name = "paletteToolStripMenuItem"; - this.paletteToolStripMenuItem.Size = new System.Drawing.Size(165, 22); + this.paletteToolStripMenuItem.Size = new System.Drawing.Size(156, 22); this.paletteToolStripMenuItem.Text = "Palette..."; this.paletteToolStripMenuItem.Click += new System.EventHandler(this.paletteToolStripMenuItem_Click); // @@ -2182,7 +2185,7 @@ this.toolStripSeparator31, this.AtariSettingsToolStripMenuItem}); this.AtariSubMenu.Name = "AtariSubMenu"; - this.AtariSubMenu.Size = new System.Drawing.Size(44, 19); + this.AtariSubMenu.Size = new System.Drawing.Size(42, 17); this.AtariSubMenu.Text = "&Atari"; this.AtariSubMenu.DropDownOpened += new System.EventHandler(this.AtariSubMenu_DropDownOpened); // @@ -2190,19 +2193,19 @@ // this.Atari2600DebuggerMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Bug; this.Atari2600DebuggerMenuItem.Name = "Atari2600DebuggerMenuItem"; - this.Atari2600DebuggerMenuItem.Size = new System.Drawing.Size(152, 22); + this.Atari2600DebuggerMenuItem.Size = new System.Drawing.Size(125, 22); this.Atari2600DebuggerMenuItem.Text = "Debugger"; this.Atari2600DebuggerMenuItem.Click += new System.EventHandler(this.Atari2600DebuggerMenuItem_Click); // // toolStripSeparator31 // this.toolStripSeparator31.Name = "toolStripSeparator31"; - this.toolStripSeparator31.Size = new System.Drawing.Size(149, 6); + this.toolStripSeparator31.Size = new System.Drawing.Size(122, 6); // // AtariSettingsToolStripMenuItem // this.AtariSettingsToolStripMenuItem.Name = "AtariSettingsToolStripMenuItem"; - this.AtariSettingsToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.AtariSettingsToolStripMenuItem.Size = new System.Drawing.Size(125, 22); this.AtariSettingsToolStripMenuItem.Text = "Settings..."; this.AtariSettingsToolStripMenuItem.Click += new System.EventHandler(this.AtariSettingsToolStripMenuItem_Click); // @@ -2215,40 +2218,40 @@ this.GBGPUViewerMenuItem, this.GBGameGenieMenuItem}); this.GBSubMenu.Name = "GBSubMenu"; - this.GBSubMenu.Size = new System.Drawing.Size(34, 19); + this.GBSubMenu.Size = new System.Drawing.Size(32, 17); this.GBSubMenu.Text = "&GB"; this.GBSubMenu.DropDownOpened += new System.EventHandler(this.GBSubMenu_DropDownOpened); // // GBcoreSettingsToolStripMenuItem // this.GBcoreSettingsToolStripMenuItem.Name = "GBcoreSettingsToolStripMenuItem"; - this.GBcoreSettingsToolStripMenuItem.Size = new System.Drawing.Size(233, 22); + this.GBcoreSettingsToolStripMenuItem.Size = new System.Drawing.Size(217, 22); this.GBcoreSettingsToolStripMenuItem.Text = "Core Settings..."; this.GBcoreSettingsToolStripMenuItem.Click += new System.EventHandler(this.GBcoreSettingsToolStripMenuItem_Click); // // LoadGBInSGBMenuItem // this.LoadGBInSGBMenuItem.Name = "LoadGBInSGBMenuItem"; - this.LoadGBInSGBMenuItem.Size = new System.Drawing.Size(233, 22); + this.LoadGBInSGBMenuItem.Size = new System.Drawing.Size(217, 22); this.LoadGBInSGBMenuItem.Text = "Load GB in SGB"; this.LoadGBInSGBMenuItem.Click += new System.EventHandler(this.LoadGBInSGBMenuItem_Click); // // toolStripSeparator28 // this.toolStripSeparator28.Name = "toolStripSeparator28"; - this.toolStripSeparator28.Size = new System.Drawing.Size(230, 6); + this.toolStripSeparator28.Size = new System.Drawing.Size(214, 6); // // GBGPUViewerMenuItem // this.GBGPUViewerMenuItem.Name = "GBGPUViewerMenuItem"; - this.GBGPUViewerMenuItem.Size = new System.Drawing.Size(233, 22); + this.GBGPUViewerMenuItem.Size = new System.Drawing.Size(217, 22); this.GBGPUViewerMenuItem.Text = "GPU Viewer"; this.GBGPUViewerMenuItem.Click += new System.EventHandler(this.GBGPUViewerMenuItem_Click); // // GBGameGenieMenuItem // this.GBGameGenieMenuItem.Name = "GBGameGenieMenuItem"; - this.GBGameGenieMenuItem.Size = new System.Drawing.Size(233, 22); + this.GBGameGenieMenuItem.Size = new System.Drawing.Size(217, 22); this.GBGameGenieMenuItem.Text = "&Game Genie Encoder/Decoder"; this.GBGameGenieMenuItem.Click += new System.EventHandler(this.GBGameGenieMenuItem_Click); // @@ -2257,13 +2260,13 @@ this.GBASubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.GbaGpuViewerMenuItem}); this.GBASubMenu.Name = "GBASubMenu"; - this.GBASubMenu.Size = new System.Drawing.Size(42, 19); + this.GBASubMenu.Size = new System.Drawing.Size(39, 17); this.GBASubMenu.Text = "GBA"; // // GbaGpuViewerMenuItem // this.GbaGpuViewerMenuItem.Name = "GbaGpuViewerMenuItem"; - this.GbaGpuViewerMenuItem.Size = new System.Drawing.Size(135, 22); + this.GbaGpuViewerMenuItem.Size = new System.Drawing.Size(129, 22); this.GbaGpuViewerMenuItem.Text = "GPU Viewer"; this.GbaGpuViewerMenuItem.Click += new System.EventHandler(this.GbaGpuViewerMenuItem_Click); // @@ -2277,7 +2280,7 @@ this.SnesGameGenieMenuItem, this.SnesOptionsMenuItem}); this.SNESSubMenu.Name = "SNESSubMenu"; - this.SNESSubMenu.Size = new System.Drawing.Size(46, 19); + this.SNESSubMenu.Size = new System.Drawing.Size(44, 17); this.SNESSubMenu.Text = "&SNES"; this.SNESSubMenu.DropDownOpened += new System.EventHandler(this.SNESSubMenu_DropDownOpened); // @@ -2293,97 +2296,97 @@ this.SnesObj3MenuItem, this.SnesObj4MenuItem}); this.SNESDisplayMenuItem.Name = "SNESDisplayMenuItem"; - this.SNESDisplayMenuItem.Size = new System.Drawing.Size(233, 22); + this.SNESDisplayMenuItem.Size = new System.Drawing.Size(217, 22); this.SNESDisplayMenuItem.Text = "Display"; this.SNESDisplayMenuItem.DropDownOpened += new System.EventHandler(this.SNESDisplayMenuItem_DropDownOpened); // // SnesBg1MenuItem // this.SnesBg1MenuItem.Name = "SnesBg1MenuItem"; - this.SnesBg1MenuItem.Size = new System.Drawing.Size(103, 22); + this.SnesBg1MenuItem.Size = new System.Drawing.Size(102, 22); this.SnesBg1MenuItem.Text = "BG 1"; this.SnesBg1MenuItem.Click += new System.EventHandler(this.SnesBg1MenuItem_Click); // // SnesBg2MenuItem // this.SnesBg2MenuItem.Name = "SnesBg2MenuItem"; - this.SnesBg2MenuItem.Size = new System.Drawing.Size(103, 22); + this.SnesBg2MenuItem.Size = new System.Drawing.Size(102, 22); this.SnesBg2MenuItem.Text = "BG 2"; this.SnesBg2MenuItem.Click += new System.EventHandler(this.SnesBg2MenuItem_Click); // // SnesBg3MenuItem // this.SnesBg3MenuItem.Name = "SnesBg3MenuItem"; - this.SnesBg3MenuItem.Size = new System.Drawing.Size(103, 22); + this.SnesBg3MenuItem.Size = new System.Drawing.Size(102, 22); this.SnesBg3MenuItem.Text = "BG 3"; this.SnesBg3MenuItem.Click += new System.EventHandler(this.SnesBg3MenuItem_Click); // // SnesBg4MenuItem // this.SnesBg4MenuItem.Name = "SnesBg4MenuItem"; - this.SnesBg4MenuItem.Size = new System.Drawing.Size(103, 22); + this.SnesBg4MenuItem.Size = new System.Drawing.Size(102, 22); this.SnesBg4MenuItem.Text = "BG 4"; this.SnesBg4MenuItem.Click += new System.EventHandler(this.SnesBg4MenuItem_Click); // // SnesObj1MenuItem // this.SnesObj1MenuItem.Name = "SnesObj1MenuItem"; - this.SnesObj1MenuItem.Size = new System.Drawing.Size(103, 22); + this.SnesObj1MenuItem.Size = new System.Drawing.Size(102, 22); this.SnesObj1MenuItem.Text = "OBJ 1"; this.SnesObj1MenuItem.Click += new System.EventHandler(this.SnesObj1MenuItem_Click); // // SnesObj2MenuItem // this.SnesObj2MenuItem.Name = "SnesObj2MenuItem"; - this.SnesObj2MenuItem.Size = new System.Drawing.Size(103, 22); + this.SnesObj2MenuItem.Size = new System.Drawing.Size(102, 22); this.SnesObj2MenuItem.Text = "OBJ 2"; this.SnesObj2MenuItem.Click += new System.EventHandler(this.SnesObj2MenuItem_Click); // // SnesObj3MenuItem // this.SnesObj3MenuItem.Name = "SnesObj3MenuItem"; - this.SnesObj3MenuItem.Size = new System.Drawing.Size(103, 22); + this.SnesObj3MenuItem.Size = new System.Drawing.Size(102, 22); this.SnesObj3MenuItem.Text = "OBJ 3"; this.SnesObj3MenuItem.Click += new System.EventHandler(this.SnesObj3MenuItem_Click); // // SnesObj4MenuItem // this.SnesObj4MenuItem.Name = "SnesObj4MenuItem"; - this.SnesObj4MenuItem.Size = new System.Drawing.Size(103, 22); + this.SnesObj4MenuItem.Size = new System.Drawing.Size(102, 22); this.SnesObj4MenuItem.Text = "OBJ 4"; this.SnesObj4MenuItem.Click += new System.EventHandler(this.SnesObj4MenuItem_Click); // // toolStripSeparator18 // this.toolStripSeparator18.Name = "toolStripSeparator18"; - this.toolStripSeparator18.Size = new System.Drawing.Size(230, 6); + this.toolStripSeparator18.Size = new System.Drawing.Size(214, 6); // // SnesGfxDebuggerMenuItem // this.SnesGfxDebuggerMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Bug; this.SnesGfxDebuggerMenuItem.Name = "SnesGfxDebuggerMenuItem"; - this.SnesGfxDebuggerMenuItem.Size = new System.Drawing.Size(233, 22); + this.SnesGfxDebuggerMenuItem.Size = new System.Drawing.Size(217, 22); this.SnesGfxDebuggerMenuItem.Text = "Graphics Debugger"; this.SnesGfxDebuggerMenuItem.Click += new System.EventHandler(this.SnesGfxDebuggerMenuItem_Click); // // SnesGBInSGBMenuItem // this.SnesGBInSGBMenuItem.Name = "SnesGBInSGBMenuItem"; - this.SnesGBInSGBMenuItem.Size = new System.Drawing.Size(233, 22); + this.SnesGBInSGBMenuItem.Size = new System.Drawing.Size(217, 22); this.SnesGBInSGBMenuItem.Text = "Load GB in SGB"; this.SnesGBInSGBMenuItem.Click += new System.EventHandler(this.SnesGBInSGBMenuItem_Click); // // SnesGameGenieMenuItem // this.SnesGameGenieMenuItem.Name = "SnesGameGenieMenuItem"; - this.SnesGameGenieMenuItem.Size = new System.Drawing.Size(233, 22); + this.SnesGameGenieMenuItem.Size = new System.Drawing.Size(217, 22); this.SnesGameGenieMenuItem.Text = "&Game Genie Encoder/Decoder"; this.SnesGameGenieMenuItem.Click += new System.EventHandler(this.SnesGameGenieMenuItem_Click); // // SnesOptionsMenuItem // this.SnesOptionsMenuItem.Name = "SnesOptionsMenuItem"; - this.SnesOptionsMenuItem.Size = new System.Drawing.Size(233, 22); + this.SnesOptionsMenuItem.Size = new System.Drawing.Size(217, 22); this.SnesOptionsMenuItem.Text = "&Options"; this.SnesOptionsMenuItem.Click += new System.EventHandler(this.SnesOptionsMenuItem_Click); // @@ -2392,14 +2395,14 @@ this.ColecoSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.ColecoSkipBiosMenuItem}); this.ColecoSubMenu.Name = "ColecoSubMenu"; - this.ColecoSubMenu.Size = new System.Drawing.Size(56, 19); + this.ColecoSubMenu.Size = new System.Drawing.Size(51, 17); this.ColecoSubMenu.Text = "&Coleco"; this.ColecoSubMenu.DropDownOpened += new System.EventHandler(this.ColecoSubMenu_DropDownOpened); // // ColecoSkipBiosMenuItem // this.ColecoSkipBiosMenuItem.Name = "ColecoSkipBiosMenuItem"; - this.ColecoSkipBiosMenuItem.Size = new System.Drawing.Size(152, 22); + this.ColecoSkipBiosMenuItem.Size = new System.Drawing.Size(145, 22); this.ColecoSkipBiosMenuItem.Text = "&Skip BIOS intro"; this.ColecoSkipBiosMenuItem.Click += new System.EventHandler(this.ColecoSkipBiosMenuItem_Click); // @@ -2411,7 +2414,7 @@ this.toolStripSeparator23, this.N64CircularAnalogRangeMenuItem}); this.N64SubMenu.Name = "N64SubMenu"; - this.N64SubMenu.Size = new System.Drawing.Size(40, 19); + this.N64SubMenu.Size = new System.Drawing.Size(38, 17); this.N64SubMenu.Text = "N64"; this.N64SubMenu.DropDownOpened += new System.EventHandler(this.N64SubMenu_DropDownOpened); // @@ -2419,7 +2422,7 @@ // this.N64PluginSettingsMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("N64PluginSettingsMenuItem.Image"))); this.N64PluginSettingsMenuItem.Name = "N64PluginSettingsMenuItem"; - this.N64PluginSettingsMenuItem.Size = new System.Drawing.Size(192, 22); + this.N64PluginSettingsMenuItem.Size = new System.Drawing.Size(180, 22); this.N64PluginSettingsMenuItem.Text = "Plugins"; this.N64PluginSettingsMenuItem.Click += new System.EventHandler(this.N64PluginSettingsMenuItem_Click); // @@ -2427,19 +2430,19 @@ // this.N64ControllerSettingsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.GameController; this.N64ControllerSettingsMenuItem.Name = "N64ControllerSettingsMenuItem"; - this.N64ControllerSettingsMenuItem.Size = new System.Drawing.Size(192, 22); + this.N64ControllerSettingsMenuItem.Size = new System.Drawing.Size(180, 22); this.N64ControllerSettingsMenuItem.Text = "Controller Settings..."; this.N64ControllerSettingsMenuItem.Click += new System.EventHandler(this.N64ControllerSettingsMenuItem_Click); // // toolStripSeparator23 // this.toolStripSeparator23.Name = "toolStripSeparator23"; - this.toolStripSeparator23.Size = new System.Drawing.Size(189, 6); + this.toolStripSeparator23.Size = new System.Drawing.Size(177, 6); // // N64CircularAnalogRangeMenuItem // this.N64CircularAnalogRangeMenuItem.Name = "N64CircularAnalogRangeMenuItem"; - this.N64CircularAnalogRangeMenuItem.Size = new System.Drawing.Size(192, 22); + this.N64CircularAnalogRangeMenuItem.Size = new System.Drawing.Size(180, 22); this.N64CircularAnalogRangeMenuItem.Text = "Circular Analog Range"; this.N64CircularAnalogRangeMenuItem.Click += new System.EventHandler(this.N64CircularAnalogRangeMenuItem_Click); // @@ -2448,7 +2451,7 @@ this.SaturnSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.SaturnPreferencesMenuItem}); this.SaturnSubMenu.Name = "SaturnSubMenu"; - this.SaturnSubMenu.Size = new System.Drawing.Size(53, 19); + this.SaturnSubMenu.Size = new System.Drawing.Size(51, 17); this.SaturnSubMenu.Text = "&Saturn"; // // SaturnPreferencesMenuItem @@ -2463,13 +2466,13 @@ this.DGBSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.DGBsettingsToolStripMenuItem}); this.DGBSubMenu.Name = "DGBSubMenu"; - this.DGBSubMenu.Size = new System.Drawing.Size(59, 19); + this.DGBSubMenu.Size = new System.Drawing.Size(53, 17); this.DGBSubMenu.Text = "&GB Link"; // // DGBsettingsToolStripMenuItem // this.DGBsettingsToolStripMenuItem.Name = "DGBsettingsToolStripMenuItem"; - this.DGBsettingsToolStripMenuItem.Size = new System.Drawing.Size(125, 22); + this.DGBsettingsToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.DGBsettingsToolStripMenuItem.Text = "Settings..."; this.DGBsettingsToolStripMenuItem.Click += new System.EventHandler(this.DGBsettingsToolStripMenuItem_Click); // @@ -2480,25 +2483,25 @@ this.toolStripSeparator26, this.GenesisSettingsToolStripMenuItem}); this.GenesisSubMenu.Name = "GenesisSubMenu"; - this.GenesisSubMenu.Size = new System.Drawing.Size(59, 19); + this.GenesisSubMenu.Size = new System.Drawing.Size(56, 17); this.GenesisSubMenu.Text = "&Genesis"; // // vDPViewerToolStripMenuItem // this.vDPViewerToolStripMenuItem.Name = "vDPViewerToolStripMenuItem"; - this.vDPViewerToolStripMenuItem.Size = new System.Drawing.Size(134, 22); + this.vDPViewerToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.vDPViewerToolStripMenuItem.Text = "&VDP Viewer"; this.vDPViewerToolStripMenuItem.Click += new System.EventHandler(this.GenVdpViewerMenuItem_Click); // // toolStripSeparator26 // this.toolStripSeparator26.Name = "toolStripSeparator26"; - this.toolStripSeparator26.Size = new System.Drawing.Size(131, 6); + this.toolStripSeparator26.Size = new System.Drawing.Size(149, 6); // // GenesisSettingsToolStripMenuItem // this.GenesisSettingsToolStripMenuItem.Name = "GenesisSettingsToolStripMenuItem"; - this.GenesisSettingsToolStripMenuItem.Size = new System.Drawing.Size(134, 22); + this.GenesisSettingsToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.GenesisSettingsToolStripMenuItem.Text = "&Settings..."; this.GenesisSettingsToolStripMenuItem.Click += new System.EventHandler(this.GenesisSettingsMenuItem_Click); // @@ -2509,14 +2512,14 @@ this.ForumsMenuItem, this.AboutMenuItem}); this.HelpSubMenu.Name = "HelpSubMenu"; - this.HelpSubMenu.Size = new System.Drawing.Size(44, 19); + this.HelpSubMenu.Size = new System.Drawing.Size(40, 17); this.HelpSubMenu.Text = "&Help"; // // OnlineHelpMenuItem // this.OnlineHelpMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Help; this.OnlineHelpMenuItem.Name = "OnlineHelpMenuItem"; - this.OnlineHelpMenuItem.Size = new System.Drawing.Size(146, 22); + this.OnlineHelpMenuItem.Size = new System.Drawing.Size(152, 22); this.OnlineHelpMenuItem.Text = "&Online Help..."; this.OnlineHelpMenuItem.Click += new System.EventHandler(this.OnlineHelpMenuItem_Click); // @@ -2524,7 +2527,7 @@ // this.ForumsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.TAStudio; this.ForumsMenuItem.Name = "ForumsMenuItem"; - this.ForumsMenuItem.Size = new System.Drawing.Size(146, 22); + this.ForumsMenuItem.Size = new System.Drawing.Size(152, 22); this.ForumsMenuItem.Text = "Forums..."; this.ForumsMenuItem.Click += new System.EventHandler(this.ForumsMenuItem_Click); // @@ -2532,7 +2535,7 @@ // this.AboutMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.CorpHawkSmall; this.AboutMenuItem.Name = "AboutMenuItem"; - this.AboutMenuItem.Size = new System.Drawing.Size(146, 22); + this.AboutMenuItem.Size = new System.Drawing.Size(152, 22); this.AboutMenuItem.Text = "&About"; this.AboutMenuItem.Click += new System.EventHandler(this.AboutMenuItem_Click); // @@ -2638,7 +2641,7 @@ // this.SaveSlotsStatusLabel.BackColor = System.Drawing.SystemColors.Control; this.SaveSlotsStatusLabel.Name = "SaveSlotsStatusLabel"; - this.SaveSlotsStatusLabel.Size = new System.Drawing.Size(58, 17); + this.SaveSlotsStatusLabel.Size = new System.Drawing.Size(56, 17); this.SaveSlotsStatusLabel.Text = "Save slots"; // // Slot1StatusButton @@ -2731,7 +2734,7 @@ // this.CoreNameStatusBarButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.CorpHawkSmall; this.CoreNameStatusBarButton.Name = "CoreNameStatusBarButton"; - this.CoreNameStatusBarButton.Size = new System.Drawing.Size(71, 17); + this.CoreNameStatusBarButton.Size = new System.Drawing.Size(66, 17); this.CoreNameStatusBarButton.Text = "Neshawk"; // // MainFormContextMenu @@ -2925,7 +2928,7 @@ // this.toolStripMenuItem6.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.GameController; this.toolStripMenuItem6.Name = "toolStripMenuItem6"; - this.toolStripMenuItem6.Size = new System.Drawing.Size(159, 22); + this.toolStripMenuItem6.Size = new System.Drawing.Size(157, 22); this.toolStripMenuItem6.Text = "&Controllers..."; this.toolStripMenuItem6.Click += new System.EventHandler(this.ControllersMenuItem_Click); // @@ -2933,7 +2936,7 @@ // this.toolStripMenuItem7.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.HotKeys; this.toolStripMenuItem7.Name = "toolStripMenuItem7"; - this.toolStripMenuItem7.Size = new System.Drawing.Size(159, 22); + this.toolStripMenuItem7.Size = new System.Drawing.Size(157, 22); this.toolStripMenuItem7.Text = "&Hotkeys..."; this.toolStripMenuItem7.Click += new System.EventHandler(this.HotkeysMenuItem_Click); // @@ -2941,7 +2944,7 @@ // this.toolStripMenuItem8.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem8.Image"))); this.toolStripMenuItem8.Name = "toolStripMenuItem8"; - this.toolStripMenuItem8.Size = new System.Drawing.Size(159, 22); + this.toolStripMenuItem8.Size = new System.Drawing.Size(157, 22); this.toolStripMenuItem8.Text = "Display..."; this.toolStripMenuItem8.Click += new System.EventHandler(this.DisplayConfigMenuItem_Click); // @@ -2949,7 +2952,7 @@ // this.toolStripMenuItem9.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.AudioHS; this.toolStripMenuItem9.Name = "toolStripMenuItem9"; - this.toolStripMenuItem9.Size = new System.Drawing.Size(159, 22); + this.toolStripMenuItem9.Size = new System.Drawing.Size(157, 22); this.toolStripMenuItem9.Text = "&Sound..."; this.toolStripMenuItem9.Click += new System.EventHandler(this.SoundMenuItem_Click); // @@ -2957,7 +2960,7 @@ // this.toolStripMenuItem10.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.CopyFolderHS; this.toolStripMenuItem10.Name = "toolStripMenuItem10"; - this.toolStripMenuItem10.Size = new System.Drawing.Size(159, 22); + this.toolStripMenuItem10.Size = new System.Drawing.Size(157, 22); this.toolStripMenuItem10.Text = "Paths..."; this.toolStripMenuItem10.Click += new System.EventHandler(this.PathsMenuItem_Click); // @@ -2965,7 +2968,7 @@ // this.toolStripMenuItem11.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem11.Image"))); this.toolStripMenuItem11.Name = "toolStripMenuItem11"; - this.toolStripMenuItem11.Size = new System.Drawing.Size(159, 22); + this.toolStripMenuItem11.Size = new System.Drawing.Size(157, 22); this.toolStripMenuItem11.Text = "&Firmwares..."; this.toolStripMenuItem11.Click += new System.EventHandler(this.FirmwaresMenuItem_Click); // @@ -2973,7 +2976,7 @@ // this.toolStripMenuItem12.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MessageConfig; this.toolStripMenuItem12.Name = "toolStripMenuItem12"; - this.toolStripMenuItem12.Size = new System.Drawing.Size(159, 22); + this.toolStripMenuItem12.Size = new System.Drawing.Size(157, 22); this.toolStripMenuItem12.Text = "&Messages..."; this.toolStripMenuItem12.Click += new System.EventHandler(this.MessagesMenuItem_Click); // @@ -2981,35 +2984,35 @@ // this.toolStripMenuItem13.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Lightning; this.toolStripMenuItem13.Name = "toolStripMenuItem13"; - this.toolStripMenuItem13.Size = new System.Drawing.Size(159, 22); + this.toolStripMenuItem13.Size = new System.Drawing.Size(157, 22); this.toolStripMenuItem13.Text = "&Autofire..."; // // toolStripMenuItem14 // this.toolStripMenuItem14.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Previous; this.toolStripMenuItem14.Name = "toolStripMenuItem14"; - this.toolStripMenuItem14.Size = new System.Drawing.Size(159, 22); + this.toolStripMenuItem14.Size = new System.Drawing.Size(157, 22); this.toolStripMenuItem14.Text = "&Rewind..."; this.toolStripMenuItem14.Click += new System.EventHandler(this.RewindOptionsMenuItem_Click); // // toolStripMenuItem15 // this.toolStripMenuItem15.Name = "toolStripMenuItem15"; - this.toolStripMenuItem15.Size = new System.Drawing.Size(159, 22); + this.toolStripMenuItem15.Size = new System.Drawing.Size(157, 22); this.toolStripMenuItem15.Text = "File Extensions..."; this.toolStripMenuItem15.Click += new System.EventHandler(this.FileExtensionsMenuItem_Click); // // customizeToolStripMenuItem // this.customizeToolStripMenuItem.Name = "customizeToolStripMenuItem"; - this.customizeToolStripMenuItem.Size = new System.Drawing.Size(159, 22); + this.customizeToolStripMenuItem.Size = new System.Drawing.Size(157, 22); this.customizeToolStripMenuItem.Text = "Customize..."; this.customizeToolStripMenuItem.Click += new System.EventHandler(this.CustomizeMenuItem_Click); // // toolStripSeparator30 // this.toolStripSeparator30.Name = "toolStripSeparator30"; - this.toolStripSeparator30.Size = new System.Drawing.Size(156, 6); + this.toolStripSeparator30.Size = new System.Drawing.Size(154, 6); // // SavestateTypeContextSubMenu // @@ -3018,28 +3021,28 @@ this.SavestateBinaryContextMenuItem, this.SavestateTextContextMenuItem}); this.SavestateTypeContextSubMenu.Name = "SavestateTypeContextSubMenu"; - this.SavestateTypeContextSubMenu.Size = new System.Drawing.Size(159, 22); + this.SavestateTypeContextSubMenu.Size = new System.Drawing.Size(157, 22); this.SavestateTypeContextSubMenu.Text = "Savestate Type"; this.SavestateTypeContextSubMenu.DropDownOpened += new System.EventHandler(this.SavestateTypeContextSubMenu_DropDownOpened); // // SavestateTypeDefaultContextMenuItem // this.SavestateTypeDefaultContextMenuItem.Name = "SavestateTypeDefaultContextMenuItem"; - this.SavestateTypeDefaultContextMenuItem.Size = new System.Drawing.Size(112, 22); + this.SavestateTypeDefaultContextMenuItem.Size = new System.Drawing.Size(109, 22); this.SavestateTypeDefaultContextMenuItem.Text = "Default"; this.SavestateTypeDefaultContextMenuItem.Click += new System.EventHandler(this.SavestateTypeDefaultMenuItem_Click); // // SavestateBinaryContextMenuItem // this.SavestateBinaryContextMenuItem.Name = "SavestateBinaryContextMenuItem"; - this.SavestateBinaryContextMenuItem.Size = new System.Drawing.Size(112, 22); + this.SavestateBinaryContextMenuItem.Size = new System.Drawing.Size(109, 22); this.SavestateBinaryContextMenuItem.Text = "Binary"; this.SavestateBinaryContextMenuItem.Click += new System.EventHandler(this.SavestateBinaryMenuItem_Click); // // SavestateTextContextMenuItem // this.SavestateTextContextMenuItem.Name = "SavestateTextContextMenuItem"; - this.SavestateTextContextMenuItem.Size = new System.Drawing.Size(112, 22); + this.SavestateTextContextMenuItem.Size = new System.Drawing.Size(109, 22); this.SavestateTextContextMenuItem.Text = "Text"; this.SavestateTextContextMenuItem.Click += new System.EventHandler(this.SavestateTextMenuItem_Click); // @@ -3049,34 +3052,34 @@ this.GBInSGBContextMenuItem, this.NesInQuickNESContextMenuItem}); this.CoreSelectionContextSubMenu.Name = "CoreSelectionContextSubMenu"; - this.CoreSelectionContextSubMenu.Size = new System.Drawing.Size(159, 22); + this.CoreSelectionContextSubMenu.Size = new System.Drawing.Size(157, 22); this.CoreSelectionContextSubMenu.Text = "Core Selection"; this.CoreSelectionContextSubMenu.DropDownOpened += new System.EventHandler(this.CoreSelectionContextSubMenu_DropDownOpened); // // GBInSGBContextMenuItem // this.GBInSGBContextMenuItem.Name = "GBInSGBContextMenuItem"; - this.GBInSGBContextMenuItem.Size = new System.Drawing.Size(163, 22); + this.GBInSGBContextMenuItem.Size = new System.Drawing.Size(152, 22); this.GBInSGBContextMenuItem.Text = "GB in SGB"; this.GBInSGBContextMenuItem.Click += new System.EventHandler(this.GBInSGBMenuItem_Click); // // NesInQuickNESContextMenuItem // this.NesInQuickNESContextMenuItem.Name = "NesInQuickNESContextMenuItem"; - this.NesInQuickNESContextMenuItem.Size = new System.Drawing.Size(163, 22); + this.NesInQuickNESContextMenuItem.Size = new System.Drawing.Size(152, 22); this.NesInQuickNESContextMenuItem.Text = "NES in QuickNES"; this.NesInQuickNESContextMenuItem.Click += new System.EventHandler(this.NesInQuickNESMenuItem_Click); // // toolStripSeparator37 // this.toolStripSeparator37.Name = "toolStripSeparator37"; - this.toolStripSeparator37.Size = new System.Drawing.Size(156, 6); + this.toolStripSeparator37.Size = new System.Drawing.Size(154, 6); // // toolStripMenuItem66 // this.toolStripMenuItem66.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Save; this.toolStripMenuItem66.Name = "toolStripMenuItem66"; - this.toolStripMenuItem66.Size = new System.Drawing.Size(159, 22); + this.toolStripMenuItem66.Size = new System.Drawing.Size(157, 22); this.toolStripMenuItem66.Text = "Save Config"; this.toolStripMenuItem66.Click += new System.EventHandler(this.SaveConfigMenuItem_Click); // @@ -3084,7 +3087,7 @@ // this.toolStripMenuItem67.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.LoadConfig; this.toolStripMenuItem67.Name = "toolStripMenuItem67"; - this.toolStripMenuItem67.Size = new System.Drawing.Size(159, 22); + this.toolStripMenuItem67.Size = new System.Drawing.Size(157, 22); this.toolStripMenuItem67.Text = "Load Config"; this.toolStripMenuItem67.Click += new System.EventHandler(this.LoadConfigMenuItem_Click); // @@ -3123,6 +3126,21 @@ this.ShowMenuContextMenuItem.Text = "Show Menu"; this.ShowMenuContextMenuItem.Click += new System.EventHandler(this.ShowMenuContextMenuItem_Click); // + // wonderSwanToolStripMenuItem + // + this.wonderSwanToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.settingsToolStripMenuItem}); + this.wonderSwanToolStripMenuItem.Name = "wonderSwanToolStripMenuItem"; + this.wonderSwanToolStripMenuItem.Size = new System.Drawing.Size(83, 17); + this.wonderSwanToolStripMenuItem.Text = "&WonderSwan"; + // + // settingsToolStripMenuItem + // + this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem"; + this.settingsToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.settingsToolStripMenuItem.Text = "&Settings..."; + this.settingsToolStripMenuItem.Click += new System.EventHandler(this.settingsToolStripMenuItem_Click); + // // MainForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 14F); @@ -3491,6 +3509,8 @@ private System.Windows.Forms.ToolStripSeparator toolStripSeparator23; private System.Windows.Forms.ToolStripMenuItem N64CircularAnalogRangeMenuItem; private System.Windows.Forms.ToolStripMenuItem paletteToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem wonderSwanToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem settingsToolStripMenuItem; } } diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs index 9b2e91592c..41a25afb14 100644 --- a/BizHawk.Client.EmuHawk/MainForm.cs +++ b/BizHawk.Client.EmuHawk/MainForm.cs @@ -1318,6 +1318,7 @@ namespace BizHawk.Client.EmuHawk SaturnSubMenu.Visible = false; DGBSubMenu.Visible = false; GenesisSubMenu.Visible = false; + wonderSwanToolStripMenuItem.Visible = false; switch (system) { @@ -1381,6 +1382,9 @@ namespace BizHawk.Client.EmuHawk case "DGB": DGBSubMenu.Visible = true; break; + case "WSWAN": + wonderSwanToolStripMenuItem.Visible = true; + break; } } @@ -3234,5 +3238,10 @@ namespace BizHawk.Client.EmuHawk { BizHawk.Client.EmuHawk.config.GB.GBPrefs.DoGBPrefsDialog(this); } + + private void settingsToolStripMenuItem_Click(object sender, EventArgs e) + { + GenericCoreConfig.DoDialog(this, "WonderSwan Settings"); + } } } diff --git a/BizHawk.Emulation.Cores/Consoles/WonderSwan/BizSwan.cs b/BizHawk.Emulation.Cores/Consoles/WonderSwan/BizSwan.cs index 21a1a86e38..fed2f217f6 100644 --- a/BizHawk.Emulation.Cores/Consoles/WonderSwan/BizSwan.cs +++ b/BizHawk.Emulation.Cores/Consoles/WonderSwan/BizSwan.cs @@ -85,6 +85,15 @@ namespace BizHawk.Emulation.Cores.WonderSwan [DllImport(dd, CallingConvention = cc)] public static extern bool bizswan_saveramsave(IntPtr core, byte[] data, int maxsize); + /// + /// put non-sync settings, can be done at any time + /// + /// + /// + [DllImport(dd, CallingConvention = cc)] + public static extern void bizswan_putsettings(IntPtr core, [In] ref Settings settings); + + [Flags] public enum Buttons : ushort { @@ -101,13 +110,13 @@ namespace BizHawk.Emulation.Cores.WonderSwan B = 0x0400, } - public enum Language : byte + public enum Language : uint { Japanese = 0, English = 1 } - public enum Bloodtype : byte + public enum Bloodtype : uint { A = 1, B = 2, @@ -115,7 +124,7 @@ namespace BizHawk.Emulation.Cores.WonderSwan AB = 4 } - public enum Gender : byte + public enum Gender : uint { Male = 1, Female = 2 @@ -124,19 +133,23 @@ namespace BizHawk.Emulation.Cores.WonderSwan [StructLayout(LayoutKind.Sequential, Pack = 4)] public struct SyncSettings { - public ushort byear; - public byte bmonth; - public byte bday; - [MarshalAs(UnmanagedType.ByValArray, SizeConst = 17)] - public byte[] name; + public ulong initialtime; // inital time in unix format; only used when userealtime = false + + public uint byear; + public uint bmonth; + public uint bday; + + [MarshalAs(UnmanagedType.Bool)] + public bool color; // true for color system + [MarshalAs(UnmanagedType.Bool)] + public bool userealtime; // true for use real real RTC instead of emulation pegged time + public Language language; public Gender sex; public Bloodtype blood; - [MarshalAs(UnmanagedType.U1)] - public bool color; // true for color system - [MarshalAs(UnmanagedType.U1)] - public bool userealtime; // true for use real real RTC instead of emulation pegged time - public ulong initialtime; // inital time in unix format; only used when userealtime = false + + [MarshalAs(UnmanagedType.ByValArray, SizeConst = 17)] + public byte[] name; public void SetName(string newname) { @@ -145,5 +158,19 @@ namespace BizHawk.Emulation.Cores.WonderSwan Buffer.BlockCopy(data, 0, name, 0, Math.Min(data.Length, name.Length)); } } + + [Flags] + public enum LayerFlags : uint + { + BG = 1, + FG = 2, + Sprite = 4 + } + + [StructLayout(LayoutKind.Sequential, Pack = 4)] + public struct Settings + { + public LayerFlags LayerMask; // 1 = show + } } } diff --git a/BizHawk.Emulation.Cores/Consoles/WonderSwan/WonderSwan.cs b/BizHawk.Emulation.Cores/Consoles/WonderSwan/WonderSwan.cs index 9dc4a6c279..16e733f0ab 100644 --- a/BizHawk.Emulation.Cores/Consoles/WonderSwan/WonderSwan.cs +++ b/BizHawk.Emulation.Cores/Consoles/WonderSwan/WonderSwan.cs @@ -5,6 +5,8 @@ using System.Text; using BizHawk.Common; using BizHawk.Emulation.Common; using System.IO; +using System.ComponentModel; +using Newtonsoft.Json; namespace BizHawk.Emulation.Cores.WonderSwan { @@ -40,25 +42,19 @@ namespace BizHawk.Emulation.Cores.WonderSwan #endregion - public WonderSwan(CoreComm comm, byte[] rom, bool deterministicEmulation) + public WonderSwan(CoreComm comm, byte[] rom, bool deterministicEmulation, object Settings, object SyncSettings) { - this.CoreComm = comm; + CoreComm = comm; + _Settings = (Settings)Settings ?? new Settings(); + _SyncSettings = (SyncSettings)SyncSettings ?? new SyncSettings(); + DeterministicEmulation = deterministicEmulation; // when true, remember to force the RTC flag! Core = BizSwan.bizswan_new(); if (Core == IntPtr.Zero) throw new InvalidOperationException("bizswan_new() returned NULL!"); try { - var ss = new BizSwan.SyncSettings - { - sex = BizSwan.Gender.Male, - blood = BizSwan.Bloodtype.A, - language = BizSwan.Language.Japanese, - bday = 5, - bmonth = 12, - byear = 1968 - }; - ss.SetName("LaForge"); + var ss = _SyncSettings.GetNativeSettings(); bool rotate = false; @@ -71,6 +67,7 @@ namespace BizHawk.Emulation.Cores.WonderSwan saverambuff = new byte[BizSwan.bizswan_saveramsize(Core)]; InitVideo(rotate); + PutSettings(_Settings); } catch { @@ -202,24 +199,133 @@ namespace BizHawk.Emulation.Cores.WonderSwan #region Settings + Settings _Settings; + SyncSettings _SyncSettings; + + public class Settings + { + [Description("True to display the selected layer.")] + [DefaultValue(true)] + public bool EnableBG { get; set; } + [Description("True to display the selected layer.")] + [DefaultValue(true)] + public bool EnableFG { get; set; } + [Description("True to display the selected layer.")] + [DefaultValue(true)] + public bool EnableSprites { get; set; } + + public BizSwan.Settings GetNativeSettings() + { + var ret = new BizSwan.Settings(); + if (EnableBG) ret.LayerMask |= BizSwan.LayerFlags.BG; + if (EnableFG) ret.LayerMask |= BizSwan.LayerFlags.FG; + if (EnableSprites) ret.LayerMask |= BizSwan.LayerFlags.Sprite; + return ret; + } + + public Settings() + { + SettingsUtil.SetDefaultValues(this); + } + + public Settings Clone() + { + return (Settings)MemberwiseClone(); + } + } + + public class SyncSettings + { + [Description("Initial time of emulation. Only relevant when UseRealTime is false.")] + [DefaultValue(typeof(DateTime), "2010-01-01")] + public DateTime InitialTime { get; set; } + + [Description("Your birthdate. Stored in EEPROM and used by some games.")] + [DefaultValue(typeof(DateTime), "1968-05-13")] + public DateTime BirthDate { get; set; } + + [Description("True to emulate a color system.")] + [DefaultValue(true)] + public bool Color { get; set; } + + [Description("If true, RTC clock will be based off of real time instead of emulated time. Ignored (set to false) when recording a movie.")] + [DefaultValue(false)] + public bool UseRealTime { get; set; } + + [Description("Your gender. Stored in EEPROM and used by some games.")] + [DefaultValue(BizSwan.Gender.Female)] + public BizSwan.Gender Gender { get; set; } + + [Description("Language to play games in. Most games ignore this.")] + [DefaultValue(BizSwan.Language.Japanese)] + public BizSwan.Language Language { get; set; } + + [Description("Your blood type. Stored in EEPROM and used by some games.")] + [DefaultValue(BizSwan.Bloodtype.AB)] + public BizSwan.Bloodtype BloodType { get; set; } + + [Description("Your name. Stored in EEPROM and used by some games. Maximum of 16 characters")] + [DefaultValue("Lady Ashelia")] + public string Name { get; set; } + + public BizSwan.SyncSettings GetNativeSettings() + { + var ret = new BizSwan.SyncSettings + { + color = Color, + userealtime = UseRealTime, + sex = Gender, + language = Language, + blood = BloodType + }; + ret.SetName(Name); + ret.bday = (uint)BirthDate.Day; + ret.bmonth = (uint)BirthDate.Month; + ret.byear = (uint)BirthDate.Year; + ret.initialtime = (ulong)((InitialTime - new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc)).TotalSeconds); + return ret; + } + + public SyncSettings() + { + SettingsUtil.SetDefaultValues(this); + } + + public SyncSettings Clone() + { + return (SyncSettings)MemberwiseClone(); + } + + public static bool NeedsReboot(SyncSettings x, SyncSettings y) + { + return x != y; + } + } + public object GetSettings() { - return null; + return _Settings.Clone(); } public object GetSyncSettings() { - return null; + return _SyncSettings.Clone(); } public bool PutSettings(object o) { + _Settings = (Settings)o; + var native = _Settings.GetNativeSettings(); + BizSwan.bizswan_putsettings(Core, ref native); return false; } public bool PutSyncSettings(object o) { - return false; + var newsettings = (SyncSettings)o; + bool ret = SyncSettings.NeedsReboot(newsettings, _SyncSettings); + _SyncSettings = newsettings; + return ret; } #endregion diff --git a/output/dll/bizswan.dll b/output/dll/bizswan.dll index 654c4169c0..bef04339c7 100644 Binary files a/output/dll/bizswan.dll and b/output/dll/bizswan.dll differ diff --git a/wonderswan/bizswan/bizswan.vcxproj b/wonderswan/bizswan/bizswan.vcxproj index 8b97376655..024581e651 100644 --- a/wonderswan/bizswan/bizswan.vcxproj +++ b/wonderswan/bizswan/bizswan.vcxproj @@ -87,7 +87,6 @@ - diff --git a/wonderswan/bizswan/bizswan.vcxproj.filters b/wonderswan/bizswan/bizswan.vcxproj.filters index 7ae23fe23a..cc5152ee26 100644 --- a/wonderswan/bizswan/bizswan.vcxproj.filters +++ b/wonderswan/bizswan/bizswan.vcxproj.filters @@ -98,9 +98,6 @@ Header Files\mednafen - - Header Files\mednafen - Header Files\blip diff --git a/wonderswan/mednafen/state.h b/wonderswan/mednafen/state.h deleted file mode 100644 index d39a3ad865..0000000000 --- a/wonderswan/mednafen/state.h +++ /dev/null @@ -1,4 +0,0 @@ -#ifndef _STATE_H -#define _STATE_H - -#endif diff --git a/wonderswan/mednafen/types.h b/wonderswan/mednafen/types.h index 570f96aa90..f3bcdded56 100644 --- a/wonderswan/mednafen/types.h +++ b/wonderswan/mednafen/types.h @@ -27,95 +27,6 @@ typedef uint16_t uint16; typedef uint32_t uint32; typedef uint64_t uint64; - -#if !defined(HAVE_NATIVE64BIT) && (SIZEOF_VOID_P >= 8 || defined(__x86_64__)) -#define HAVE_NATIVE64BIT 1 -#endif - -#ifdef __GNUC__ - - #define MDFN_MAKE_GCCV(maj,min,pl) (((maj)*100*100) + ((min) * 100) + (pl)) - #define MDFN_GCC_VERSION MDFN_MAKE_GCCV(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__) - - #define INLINE inline __attribute__((always_inline)) - #define NO_INLINE __attribute__((noinline)) - - // - // Just avoid using fastcall with gcc before 4.1.0, as it(and similar regparm) - // tend to generate bad code on the older versions(between about 3.1.x and 4.0.x, at least) - // - // http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12236 - // http://gcc.gnu.org/bugzilla/show_bug.cgi?id=7574 - // http://gcc.gnu.org/bugzilla/show_bug.cgi?id=17025 - // - #if MDFN_GCC_VERSION >= MDFN_MAKE_GCCV(4,1,0) - #if defined(__386__) || defined(__i386__) || defined(__i386) || defined(_M_IX86) || defined(_M_I386) - #define MDFN_FASTCALL __attribute__((fastcall)) - #else - #define MDFN_FASTCALL - #endif - #else - #define MDFN_FASTCALL - #endif - - #define MDFN_ALIGN(n) __attribute__ ((aligned (n))) - #define MDFN_FORMATSTR(a,b,c) __attribute__ ((format (a, b, c))); - #define MDFN_WARN_UNUSED_RESULT __attribute__ ((warn_unused_result)) - #define MDFN_NOWARN_UNUSED __attribute__((unused)) - - #define MDFN_UNLIKELY(n) __builtin_expect((n) != 0, 0) - #define MDFN_LIKELY(n) __builtin_expect((n) != 0, 1) - - #if MDFN_GCC_VERSION >= MDFN_MAKE_GCCV(4,3,0) - #define MDFN_COLD __attribute__((cold)) - #else - #define MDFN_COLD - #endif - - #undef MDFN_MAKE_GCCV - #undef MDFN_GCC_VERSION -#elif defined(_MSC_VER) - - - #define INLINE __forceinline - #define NO_INLINE __declspec(noinline) - - #define MDFN_FASTCALL __fastcall - - #define MDFN_ALIGN(n) __declspec(align(n)) - - #define MDFN_FORMATSTR(a,b,c) - - #define MDFN_WARN_UNUSED_RESULT - - #define MDFN_NOWARN_UNUSED - - #define MDFN_UNLIKELY(n) ((n) != 0) - #define MDFN_LIKELY(n) ((n) != 0) - - #define MDFN_COLD -#else - #error "Not compiling with GCC nor MSVC" - #define INLINE inline - #define NO_INLINE - - #define MDFN_FASTCALL - - #define MDFN_ALIGN(n) // hence the #error. - - #define MDFN_FORMATSTR(a,b,c) - - #define MDFN_WARN_UNUSED_RESULT - - #define MDFN_NOWARN_UNUSED - - #define MDFN_UNLIKELY(n) ((n) != 0) - #define MDFN_LIKELY(n) ((n) != 0) - - #define MDFN_COLD -#endif - - typedef struct { union diff --git a/wonderswan/mingw/Makefile b/wonderswan/mingw/Makefile new file mode 100644 index 0000000000..d72ea3d600 --- /dev/null +++ b/wonderswan/mingw/Makefile @@ -0,0 +1,36 @@ +CXX = g++ +CXXFLAGS = -Wall -DLSB_FIRST -I.. -Wno-multichar -O3 +TARGET = bizswan.dll +LDFLAGS = -shared -static-libgcc -static-libstdc++ +RM = rm +CP = cp + +SRCS = \ + ../eeprom.cpp \ + ../gfx.cpp \ + ../interrupt.cpp \ + ../main.cpp \ + ../memory.cpp \ + ../rtc.cpp \ + ../sound.cpp \ + ../system.cpp \ + ../tcache.cpp \ + ../v30mz.cpp \ + ../Blip/Blip_Buffer.cpp + +OBJS = $(SRCS:.cpp=.o) + +all: $(TARGET) + +%.o: %.cpp + $(CXX) -c -o $@ $< $(CXXFLAGS) + +$(TARGET) : $(OBJS) + $(CXX) -o $@ $(LDFLAGS) $(OBJS) + +clean: + $(RM) $(OBJS) + $(RM) $(TARGET) + +install: + $(CP) $(TARGET) ../../output/dll diff --git a/wonderswan/system.cpp b/wonderswan/system.cpp index 549a666b05..bae0eaac43 100644 --- a/wonderswan/system.cpp +++ b/wonderswan/system.cpp @@ -97,7 +97,7 @@ namespace MDFN_IEN_WSWAN // Source: http://graphics.stanford.edu/~seander/bithacks.html#RoundUpPowerOf2 // Rounds up to the nearest power of 2. - static INLINE uint32 round_up_pow2(uint32 v) + static inline uint32 round_up_pow2(uint32 v) { v--; v |= v >> 1; @@ -200,7 +200,6 @@ namespace MDFN_IEN_WSWAN rotate = header[6] & 1; - memory.Init(settings); gfx.Init(settings.color); rtc.Init(settings.initialtime, settings.userealtime); @@ -270,6 +269,12 @@ namespace MDFN_IEN_WSWAN return true; } + void System::PutSettings(const Settings &s) + { + gfx.SetLayerEnableMask(s.LayerMask); + } + + EXPORT System *bizswan_new() { return new System(); @@ -312,4 +317,9 @@ namespace MDFN_IEN_WSWAN return s->SaveRamSave(dest, maxsize); } + EXPORT void bizswan_putsettings(System *s, const Settings *settings) + { + s->PutSettings(*settings); + } + } diff --git a/wonderswan/system.h b/wonderswan/system.h index 69d13b048a..3eaea20425 100644 --- a/wonderswan/system.h +++ b/wonderswan/system.h @@ -32,6 +32,7 @@ public: void Reset(); bool Advance(uint16 buttons, bool novideo, uint32 *surface, int16 *soundbuff, int &soundbuffsize); bool Load(const uint8 *data, int length, const SyncSettings &s); + void PutSettings(const Settings &s); int SaveRamSize() const; bool SaveRamLoad(const uint8 *data, int size); @@ -51,16 +52,16 @@ public: struct SyncSettings { - uint16 byear; // birth year, 0000-9999 - uint8 bmonth; // birth month, 1-12 - uint8 bday; // birth day, 1-31 - char name[17]; // up to 16 chars long, most chars don't work (conversion from ascii is internal) - uint8 language; // 0 = J, 1 = E; only affects "Digimon Tamers - Battle Spirit" - uint8 sex; // sex, 1 = male, 2 = female - uint8 blood; // 1 = a, 2 = b, 3 = o, 4 = ab - bool color; // true if wonderswan is in color mode - bool userealtime; // true to use the system's actual clock; false to use an emulation pegged clock uint64 initialtime; // when userealtime is false, the initial time in unix format + uint32 byear; // birth year, 0000-9999 + uint32 bmonth; // birth month, 1-12 + uint32 bday; // birth day, 1-31 + uint32 color; // true if wonderswan is in color mode + uint32 userealtime; // true to use the system's actual clock; false to use an emulation pegged clock + uint32 language; // 0 = J, 1 = E; only affects "Digimon Tamers - Battle Spirit" + uint32 sex; // sex, 1 = male, 2 = female + uint32 blood; // 1 = a, 2 = b, 3 = o, 4 = ab + char name[17]; // up to 16 chars long, most chars don't work (conversion from ascii is internal) }; struct Settings diff --git a/wonderswan/v30mz.cpp b/wonderswan/v30mz.cpp index fbccfd5f4e..6eff7e3a78 100644 --- a/wonderswan/v30mz.cpp +++ b/wonderswan/v30mz.cpp @@ -105,13 +105,13 @@ namespace MDFN_IEN_WSWAN } } - INLINE void V30MZ::i_real_pushf() + inline void V30MZ::i_real_pushf() { PUSH( CompressFlags() ); CLK(2); } - INLINE void V30MZ::i_real_popf() + inline void V30MZ::i_real_popf() { uint32 tmp; POP(tmp); @@ -230,14 +230,14 @@ namespace MDFN_IEN_WSWAN /* OPCODES */ /****************************************************************************/ - INLINE void V30MZ::i_real_insb() + inline void V30MZ::i_real_insb() { PutMemB(DS1,I.regs.w[IY], read_port(I.regs.w[DW])); I.regs.w[IY]+= -2 * I.DF + 1; CLK(6); } - INLINE void V30MZ::i_real_insw() + inline void V30MZ::i_real_insw() { PutMemB(DS1,I.regs.w[IY],read_port(I.regs.w[DW])); PutMemB(DS1,(I.regs.w[IY]+1)&0xffff,read_port((I.regs.w[DW]+1)&0xffff)); @@ -245,14 +245,14 @@ namespace MDFN_IEN_WSWAN CLK(6); } - INLINE void V30MZ::i_real_outsb() + inline void V30MZ::i_real_outsb() { write_port(I.regs.w[DW],GetMemB(DS0,I.regs.w[IX])); I.regs.w[IX]+= -2 * I.DF + 1; CLK(7); } - INLINE void V30MZ::i_real_outsw() + inline void V30MZ::i_real_outsw() { write_port(I.regs.w[DW],GetMemB(DS0,I.regs.w[IX])); write_port((I.regs.w[DW]+1)&0xffff,GetMemB(DS0,(I.regs.w[IX]+1)&0xffff)); @@ -260,7 +260,7 @@ namespace MDFN_IEN_WSWAN CLK(7); } - INLINE void V30MZ::i_real_movsb() + inline void V30MZ::i_real_movsb() { uint32 tmp = GetMemB(DS0,I.regs.w[IX]); PutMemB(DS1,I.regs.w[IY], tmp); @@ -269,51 +269,51 @@ namespace MDFN_IEN_WSWAN CLK(5); } - INLINE void V30MZ::i_real_movsw() + inline void V30MZ::i_real_movsw() { uint32 tmp = GetMemW(DS0,I.regs.w[IX]); PutMemW(DS1,I.regs.w[IY], tmp); I.regs.w[IY] += -4 * I.DF + 2; I.regs.w[IX] += -4 * I.DF + 2; CLK(5); } - INLINE void V30MZ::i_real_cmpsb() + inline void V30MZ::i_real_cmpsb() { uint32 src = GetMemB(DS1, I.regs.w[IY]); uint32 dst = GetMemB(DS0, I.regs.w[IX]); SUBB; I.regs.w[IY] += -2 * I.DF + 1; I.regs.w[IX] += -2 * I.DF + 1; CLK(6); } - INLINE void V30MZ::i_real_cmpsw() + inline void V30MZ::i_real_cmpsw() { uint32 src = GetMemW(DS1, I.regs.w[IY]); uint32 dst = GetMemW(DS0, I.regs.w[IX]); SUBW; I.regs.w[IY] += -4 * I.DF + 2; I.regs.w[IX] += -4 * I.DF + 2; CLK(6); } - INLINE void V30MZ::i_real_stosb() + inline void V30MZ::i_real_stosb() { PutMemB(DS1,I.regs.w[IY],I.regs.b[AL]); I.regs.w[IY] += -2 * I.DF + 1; CLK(3); } - INLINE void V30MZ::i_real_stosw() + inline void V30MZ::i_real_stosw() { PutMemW(DS1,I.regs.w[IY],I.regs.w[AW]); I.regs.w[IY] += -4 * I.DF + 2; CLK(3); } - INLINE void V30MZ::i_real_lodsb() + inline void V30MZ::i_real_lodsb() { I.regs.b[AL] = GetMemB(DS0,I.regs.w[IX]); I.regs.w[IX] += -2 * I.DF + 1; CLK(3); } - INLINE void V30MZ::i_real_lodsw() + inline void V30MZ::i_real_lodsw() { I.regs.w[AW] = GetMemW(DS0,I.regs.w[IX]); I.regs.w[IX] += -4 * I.DF + 2; CLK(3); } - INLINE void V30MZ::i_real_scasb() + inline void V30MZ::i_real_scasb() { uint32 src = GetMemB(DS1, I.regs.w[IY]); uint32 dst = I.regs.b[AL]; SUBB; I.regs.w[IY] += -2 * I.DF + 1; CLK(4); } - INLINE void V30MZ::i_real_scasw() + inline void V30MZ::i_real_scasw() { uint32 src = GetMemW(DS1, I.regs.w[IY]); uint32 dst = I.regs.w[AW]; SUBW; I.regs.w[IY] += -4 * I.DF + 2; CLK(4); diff --git a/wonderswan/wswan.h b/wonderswan/wswan.h index c92937dc16..331f1466b8 100644 --- a/wonderswan/wswan.h +++ b/wonderswan/wswan.h @@ -2,7 +2,6 @@ #define __WSWAN_H #include -#include #include "interrupt.h"