From 640911db33730d80684a55c0a7b4939c37464924 Mon Sep 17 00:00:00 2001 From: feos Date: Thu, 11 Aug 2016 23:46:28 +0300 Subject: [PATCH] make gameshark image and icon properly transparent --- .../BizHawk.Client.EmuHawk.csproj | 2 + BizHawk.Client.EmuHawk/MainForm.Designer.cs | 896 +++++++++--------- BizHawk.Client.EmuHawk/MainForm.resx | 41 +- .../Properties/Resources.Designer.cs | 7 + .../Properties/Resources.resx | 113 +-- BizHawk.Client.EmuHawk/images/Shark.png | Bin 2233 -> 3757 bytes BizHawk.Client.EmuHawk/tools/GameShark.resx | 144 +-- 7 files changed, 609 insertions(+), 594 deletions(-) diff --git a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj index d85d1b2505..9640cfed66 100644 --- a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj +++ b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj @@ -1758,6 +1758,8 @@ + + diff --git a/BizHawk.Client.EmuHawk/MainForm.Designer.cs b/BizHawk.Client.EmuHawk/MainForm.Designer.cs index a084076cf1..e8e760205d 100644 --- a/BizHawk.Client.EmuHawk/MainForm.Designer.cs +++ b/BizHawk.Client.EmuHawk/MainForm.Designer.cs @@ -200,15 +200,15 @@ this.toolStripSeparator12 = new System.Windows.Forms.ToolStripSeparator(); this.RamWatchMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.RamSearchMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.LuaConsoleMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.TAStudioMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.HexEditorMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.TraceLoggerMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.CodeDataLoggerMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.DebuggerMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.TAStudioMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.CodeDataLoggerMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.MacroToolMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.VirtualPadMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.BasicBotMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.LuaConsoleMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator11 = new System.Windows.Forms.ToolStripSeparator(); this.CheatsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.gameSharkConverterToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -426,33 +426,33 @@ // this.MainformMenu.ClickThrough = true; this.MainformMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.FileSubMenu, - this.EmulationSubMenu, - this.ViewSubMenu, - this.ConfigSubMenu, - this.ToolsSubMenu, - this.NESSubMenu, - this.PCESubMenu, - this.SMSSubMenu, - this.TI83SubMenu, - this.AtariSubMenu, - this.GBSubMenu, - this.GBASubMenu, - this.PSXSubMenu, - this.SNESSubMenu, - this.ColecoSubMenu, - this.N64SubMenu, - this.SaturnSubMenu, - this.DGBSubMenu, - this.GenesisSubMenu, - this.wonderSwanToolStripMenuItem, - this.AppleSubMenu, - this.C64SubMenu, - this.HelpSubMenu}); + this.FileSubMenu, + this.EmulationSubMenu, + this.ViewSubMenu, + this.ConfigSubMenu, + this.ToolsSubMenu, + this.NESSubMenu, + this.PCESubMenu, + this.SMSSubMenu, + this.TI83SubMenu, + this.AtariSubMenu, + this.GBSubMenu, + this.GBASubMenu, + this.PSXSubMenu, + this.SNESSubMenu, + this.ColecoSubMenu, + this.N64SubMenu, + this.SaturnSubMenu, + this.DGBSubMenu, + this.GenesisSubMenu, + this.wonderSwanToolStripMenuItem, + this.AppleSubMenu, + this.C64SubMenu, + 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, 55); + 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); @@ -462,21 +462,21 @@ // FileSubMenu // this.FileSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.OpenRomMenuItem, - this.RecentRomSubMenu, - this.OpenAdvancedMenuItem, - this.CloseRomMenuItem, - this.toolStripMenuItem1, - this.SaveStateSubMenu, - this.LoadStateSubMenu, - this.SaveSlotSubMenu, - this.SaveRAMSubMenu, - this.toolStripMenuItem2, - this.MovieSubMenu, - this.AVSubMenu, - this.ScreenshotSubMenu, - this.toolStripSeparator4, - this.ExitMenuItem}); + this.OpenRomMenuItem, + this.RecentRomSubMenu, + this.OpenAdvancedMenuItem, + this.CloseRomMenuItem, + this.toolStripMenuItem1, + this.SaveStateSubMenu, + this.LoadStateSubMenu, + this.SaveSlotSubMenu, + this.SaveRAMSubMenu, + this.toolStripMenuItem2, + this.MovieSubMenu, + this.AVSubMenu, + this.ScreenshotSubMenu, + this.toolStripSeparator4, + this.ExitMenuItem}); this.FileSubMenu.Name = "FileSubMenu"; this.FileSubMenu.Size = new System.Drawing.Size(35, 17); this.FileSubMenu.Text = "&File"; @@ -493,7 +493,7 @@ // RecentRomSubMenu // this.RecentRomSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.toolStripSeparator3}); + this.toolStripSeparator3}); this.RecentRomSubMenu.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Recent; this.RecentRomSubMenu.Name = "RecentRomSubMenu"; this.RecentRomSubMenu.Size = new System.Drawing.Size(162, 22); @@ -528,18 +528,18 @@ // SaveStateSubMenu // this.SaveStateSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.SaveState1MenuItem, - this.SaveState2MenuItem, - this.SaveState3MenuItem, - this.SaveState4MenuItem, - this.SaveState5MenuItem, - this.SaveState6MenuItem, - this.SaveState7MenuItem, - this.SaveState8MenuItem, - this.SaveState9MenuItem, - this.SaveState0MenuItem, - this.toolStripSeparator6, - this.SaveNamedStateMenuItem}); + this.SaveState1MenuItem, + this.SaveState2MenuItem, + this.SaveState3MenuItem, + this.SaveState4MenuItem, + this.SaveState5MenuItem, + this.SaveState6MenuItem, + this.SaveState7MenuItem, + this.SaveState8MenuItem, + this.SaveState9MenuItem, + this.SaveState0MenuItem, + this.toolStripSeparator6, + this.SaveNamedStateMenuItem}); this.SaveStateSubMenu.Name = "SaveStateSubMenu"; this.SaveStateSubMenu.Size = new System.Drawing.Size(162, 22); this.SaveStateSubMenu.Text = "&Save State"; @@ -630,20 +630,20 @@ // LoadStateSubMenu // this.LoadStateSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.LoadState1MenuItem, - this.LoadState2MenuItem, - this.LoadState3MenuItem, - this.LoadState4MenuItem, - this.LoadState5MenuItem, - this.LoadState6MenuItem, - this.LoadState7MenuItem, - this.LoadState8MenuItem, - this.LoadState9MenuItem, - this.LoadState0MenuItem, - this.toolStripSeparator7, - this.LoadNamedStateMenuItem, - this.toolStripSeparator21, - this.AutoloadLastSlotMenuItem}); + this.LoadState1MenuItem, + this.LoadState2MenuItem, + this.LoadState3MenuItem, + this.LoadState4MenuItem, + this.LoadState5MenuItem, + this.LoadState6MenuItem, + this.LoadState7MenuItem, + this.LoadState8MenuItem, + this.LoadState9MenuItem, + this.LoadState0MenuItem, + this.toolStripSeparator7, + this.LoadNamedStateMenuItem, + this.toolStripSeparator21, + this.AutoloadLastSlotMenuItem}); this.LoadStateSubMenu.Name = "LoadStateSubMenu"; this.LoadStateSubMenu.Size = new System.Drawing.Size(162, 22); this.LoadStateSubMenu.Text = "&Load State"; @@ -746,21 +746,21 @@ // SaveSlotSubMenu // this.SaveSlotSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.SelectSlot0MenuItem, - this.SelectSlot1MenuItem, - this.SelectSlot2MenuItem, - this.SelectSlot3MenuItem, - this.SelectSlot4MenuItem, - this.SelectSlot5MenuItem, - this.SelectSlot6MenuItem, - this.SelectSlot7MenuItem, - this.SelectSlot8MenuItem, - this.SelectSlot9MenuItem, - this.PreviousSlotMenuItem, - this.NextSlotMenuItem, - this.toolStripSeparator5, - this.SaveToCurrentSlotMenuItem, - this.LoadCurrentSlotMenuItem}); + this.SelectSlot0MenuItem, + this.SelectSlot1MenuItem, + this.SelectSlot2MenuItem, + this.SelectSlot3MenuItem, + this.SelectSlot4MenuItem, + this.SelectSlot5MenuItem, + this.SelectSlot6MenuItem, + this.SelectSlot7MenuItem, + this.SelectSlot8MenuItem, + this.SelectSlot9MenuItem, + this.PreviousSlotMenuItem, + this.NextSlotMenuItem, + this.toolStripSeparator5, + this.SaveToCurrentSlotMenuItem, + this.LoadCurrentSlotMenuItem}); this.SaveSlotSubMenu.Name = "SaveSlotSubMenu"; this.SaveSlotSubMenu.Size = new System.Drawing.Size(162, 22); this.SaveSlotSubMenu.Text = "Save S&lot"; @@ -874,7 +874,7 @@ // SaveRAMSubMenu // this.SaveRAMSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.FlushSaveRAMMenuItem}); + this.FlushSaveRAMMenuItem}); this.SaveRAMSubMenu.Name = "SaveRAMSubMenu"; this.SaveRAMSubMenu.Size = new System.Drawing.Size(162, 22); this.SaveRAMSubMenu.Text = "Save &RAM"; @@ -894,21 +894,21 @@ // MovieSubMenu // this.MovieSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.ReadonlyMenuItem, - this.toolStripSeparator15, - this.RecentMovieSubMenu, - this.RecordMovieMenuItem, - this.PlayMovieMenuItem, - this.StopMovieMenuItem, - this.PlayFromBeginningMenuItem, - this.ImportMoviesMenuItem, - this.SaveMovieMenuItem, - this.SaveMovieAsMenuItem, - this.StopMovieWithoutSavingMenuItem, - this.toolStripSeparator14, - this.AutomaticallyBackupMoviesMenuItem, - this.FullMovieLoadstatesMenuItem, - this.MovieEndSubMenu}); + this.ReadonlyMenuItem, + this.toolStripSeparator15, + this.RecentMovieSubMenu, + this.RecordMovieMenuItem, + this.PlayMovieMenuItem, + this.StopMovieMenuItem, + this.PlayFromBeginningMenuItem, + this.ImportMoviesMenuItem, + this.SaveMovieMenuItem, + this.SaveMovieAsMenuItem, + this.StopMovieWithoutSavingMenuItem, + this.toolStripSeparator14, + this.AutomaticallyBackupMoviesMenuItem, + this.FullMovieLoadstatesMenuItem, + this.MovieEndSubMenu}); this.MovieSubMenu.Name = "MovieSubMenu"; this.MovieSubMenu.Size = new System.Drawing.Size(162, 22); this.MovieSubMenu.Text = "&Movie"; @@ -930,7 +930,7 @@ // RecentMovieSubMenu // this.RecentMovieSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.toolStripSeparator16}); + this.toolStripSeparator16}); this.RecentMovieSubMenu.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Recent; this.RecentMovieSubMenu.Name = "RecentMovieSubMenu"; this.RecentMovieSubMenu.Size = new System.Drawing.Size(222, 22); @@ -1028,10 +1028,10 @@ // MovieEndSubMenu // this.MovieEndSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.MovieEndFinishMenuItem, - this.MovieEndRecordMenuItem, - this.MovieEndStopMenuItem, - this.MovieEndPauseMenuItem}); + this.MovieEndFinishMenuItem, + this.MovieEndRecordMenuItem, + this.MovieEndStopMenuItem, + this.MovieEndPauseMenuItem}); this.MovieEndSubMenu.Name = "MovieEndSubMenu"; this.MovieEndSubMenu.Size = new System.Drawing.Size(222, 22); this.MovieEndSubMenu.Text = "On Movie End"; @@ -1068,12 +1068,12 @@ // AVSubMenu // this.AVSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.RecordAVMenuItem, - this.ConfigAndRecordAVMenuItem, - this.StopAVIMenuItem, - this.toolStripSeparator19, - this.CaptureOSDMenuItem, - this.SynclessRecordingMenuItem}); + this.RecordAVMenuItem, + this.ConfigAndRecordAVMenuItem, + this.StopAVIMenuItem, + this.toolStripSeparator19, + this.CaptureOSDMenuItem, + this.SynclessRecordingMenuItem}); this.AVSubMenu.Name = "AVSubMenu"; this.AVSubMenu.Size = new System.Drawing.Size(162, 22); this.AVSubMenu.Text = "&AVI/WAV"; @@ -1125,12 +1125,12 @@ // ScreenshotSubMenu // this.ScreenshotSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.ScreenshotMenuItem, - this.ScreenshotAsMenuItem, - this.ScreenshotClipboardMenuItem, - this.ScreenshotClientClipboardMenuItem, - this.toolStripSeparator20, - this.ScreenshotCaptureOSDMenuItem1}); + this.ScreenshotMenuItem, + this.ScreenshotAsMenuItem, + this.ScreenshotClipboardMenuItem, + this.ScreenshotClientClipboardMenuItem, + this.toolStripSeparator20, + this.ScreenshotCaptureOSDMenuItem1}); this.ScreenshotSubMenu.Name = "ScreenshotSubMenu"; this.ScreenshotSubMenu.Size = new System.Drawing.Size(162, 22); this.ScreenshotSubMenu.Text = "Scree&nshot"; @@ -1193,11 +1193,11 @@ // EmulationSubMenu // this.EmulationSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.PauseMenuItem, - this.RebootCoreMenuItem, - this.toolStripSeparator1, - this.SoftResetMenuItem, - this.HardResetMenuItem}); + this.PauseMenuItem, + this.RebootCoreMenuItem, + this.toolStripSeparator1, + this.SoftResetMenuItem, + this.HardResetMenuItem}); this.EmulationSubMenu.Name = "EmulationSubMenu"; this.EmulationSubMenu.Size = new System.Drawing.Size(65, 17); this.EmulationSubMenu.Text = "&Emulation"; @@ -1241,19 +1241,19 @@ // ViewSubMenu // this.ViewSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.WindowSizeSubMenu, - this.SwitchToFullscreenMenuItem, - this.toolStripSeparator2, - this.DisplayFPSMenuItem, - this.DisplayFrameCounterMenuItem, - this.DisplayLagCounterMenuItem, - this.DisplayInputMenuItem, - this.DisplayRerecordCountMenuItem, - this.DisplaySubtitlesMenuItem, - this.toolStripMenuItem4, - this.DisplayStatusBarMenuItem, - this.DisplayMessagesMenuItem, - this.DisplayLogWindowMenuItem}); + this.WindowSizeSubMenu, + this.SwitchToFullscreenMenuItem, + this.toolStripSeparator2, + this.DisplayFPSMenuItem, + this.DisplayFrameCounterMenuItem, + this.DisplayLagCounterMenuItem, + this.DisplayInputMenuItem, + this.DisplayRerecordCountMenuItem, + this.DisplaySubtitlesMenuItem, + this.toolStripMenuItem4, + this.DisplayStatusBarMenuItem, + this.DisplayMessagesMenuItem, + this.DisplayLogWindowMenuItem}); this.ViewSubMenu.Name = "ViewSubMenu"; this.ViewSubMenu.Size = new System.Drawing.Size(41, 17); this.ViewSubMenu.Text = "&View"; @@ -1262,12 +1262,12 @@ // WindowSizeSubMenu // this.WindowSizeSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.x1MenuItem, - this.x2MenuItem, - this.x3MenuItem, - this.x4MenuItem, - this.x5MenuItem, - this.mzMenuItem}); + this.x1MenuItem, + this.x2MenuItem, + this.x3MenuItem, + this.x4MenuItem, + this.x5MenuItem, + this.mzMenuItem}); this.WindowSizeSubMenu.Name = "WindowSizeSubMenu"; this.WindowSizeSubMenu.Size = new System.Drawing.Size(198, 22); this.WindowSizeSubMenu.Text = "&Window Size"; @@ -1399,27 +1399,27 @@ // ConfigSubMenu // this.ConfigSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.ControllersMenuItem, - this.HotkeysMenuItem, - this.DisplayConfigMenuItem, - this.SoundMenuItem, - this.PathsMenuItem, - this.FirmwaresMenuItem, - this.MessagesMenuItem, - this.AutofireMenuItem, - this.RewindOptionsMenuItem, - this.extensionsToolStripMenuItem, - this.ClientOptionsMenuItem, - this.ProfilesMenuItem, - this.toolStripSeparator9, - this.SpeedSkipSubMenu, - this.KeyPrioritySubMenu, - this.CoresSubMenu, - this.toolStripSeparator10, - this.SaveConfigMenuItem, - this.SaveConfigAsMenuItem, - this.LoadConfigMenuItem, - this.LoadConfigFromMenuItem}); + this.ControllersMenuItem, + this.HotkeysMenuItem, + this.DisplayConfigMenuItem, + this.SoundMenuItem, + this.PathsMenuItem, + this.FirmwaresMenuItem, + this.MessagesMenuItem, + this.AutofireMenuItem, + this.RewindOptionsMenuItem, + this.extensionsToolStripMenuItem, + this.ClientOptionsMenuItem, + this.ProfilesMenuItem, + this.toolStripSeparator9, + this.SpeedSkipSubMenu, + this.KeyPrioritySubMenu, + this.CoresSubMenu, + this.toolStripSeparator10, + this.SaveConfigMenuItem, + this.SaveConfigAsMenuItem, + this.LoadConfigMenuItem, + this.LoadConfigFromMenuItem}); this.ConfigSubMenu.Name = "ConfigSubMenu"; this.ConfigSubMenu.Size = new System.Drawing.Size(50, 17); this.ConfigSubMenu.Text = "&Config"; @@ -1527,23 +1527,23 @@ // SpeedSkipSubMenu // this.SpeedSkipSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.ClockThrottleMenuItem, - this.AudioThrottleMenuItem, - this.VsyncThrottleMenuItem, - this.toolStripSeparator27, - this.VsyncEnabledMenuItem, - this.toolStripMenuItem3, - this.miUnthrottled, - this.MinimizeSkippingMenuItem, - this.NeverSkipMenuItem, - this.toolStripMenuItem17, - this.toolStripMenuItem5, - this.Speed50MenuItem, - this.Speed75MenuItem, - this.Speed100MenuItem, - this.Speed150MenuItem, - this.Speed200MenuItem, - this.Speed400MenuItem}); + this.ClockThrottleMenuItem, + this.AudioThrottleMenuItem, + this.VsyncThrottleMenuItem, + this.toolStripSeparator27, + this.VsyncEnabledMenuItem, + this.toolStripMenuItem3, + this.miUnthrottled, + this.MinimizeSkippingMenuItem, + this.NeverSkipMenuItem, + this.toolStripMenuItem17, + this.toolStripMenuItem5, + this.Speed50MenuItem, + this.Speed75MenuItem, + this.Speed100MenuItem, + this.Speed150MenuItem, + this.Speed200MenuItem, + this.Speed400MenuItem}); this.SpeedSkipSubMenu.Name = "SpeedSkipSubMenu"; this.SpeedSkipSubMenu.Size = new System.Drawing.Size(181, 22); this.SpeedSkipSubMenu.Text = "Speed/Skip"; @@ -1611,15 +1611,15 @@ // toolStripMenuItem17 // this.toolStripMenuItem17.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.Frameskip1MenuItem, - this.Frameskip2MenuItem, - this.Frameskip3MenuItem, - this.Frameskip4MenuItem, - this.Frameskip5MenuItem, - this.Frameskip6MenuItem, - this.Frameskip7MenuItem, - this.Frameskip8MenuItem, - this.Frameskip9MenuItem}); + this.Frameskip1MenuItem, + this.Frameskip2MenuItem, + this.Frameskip3MenuItem, + this.Frameskip4MenuItem, + this.Frameskip5MenuItem, + this.Frameskip6MenuItem, + this.Frameskip7MenuItem, + this.Frameskip8MenuItem, + this.Frameskip9MenuItem}); this.toolStripMenuItem17.Name = "toolStripMenuItem17"; this.toolStripMenuItem17.Size = new System.Drawing.Size(192, 22); this.toolStripMenuItem17.Text = "Skip 1..9"; @@ -1737,9 +1737,9 @@ // KeyPrioritySubMenu // this.KeyPrioritySubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.BothHkAndControllerMenuItem, - this.InputOverHkMenuItem, - this.HkOverInputMenuItem}); + this.BothHkAndControllerMenuItem, + this.InputOverHkMenuItem, + this.HkOverInputMenuItem}); this.KeyPrioritySubMenu.Name = "KeyPrioritySubMenu"; this.KeyPrioritySubMenu.Size = new System.Drawing.Size(181, 22); this.KeyPrioritySubMenu.Text = "Key Priority"; @@ -1769,13 +1769,13 @@ // CoresSubMenu // this.CoresSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.GBInSGBMenuItem, - this.NesInQuickNESMenuItem, - this.SnesWithSnes9xMenuItem, - this.gBAWithMGBAToolStripMenuItem, - this.toolStripSeparator8, - this.N64VideoPluginSettingsMenuItem, - this.setLibretroCoreToolStripMenuItem}); + this.GBInSGBMenuItem, + this.NesInQuickNESMenuItem, + this.SnesWithSnes9xMenuItem, + this.gBAWithMGBAToolStripMenuItem, + this.toolStripSeparator8, + this.N64VideoPluginSettingsMenuItem, + this.setLibretroCoreToolStripMenuItem}); this.CoresSubMenu.Name = "CoresSubMenu"; this.CoresSubMenu.Size = new System.Drawing.Size(181, 22); this.CoresSubMenu.Text = "Cores"; @@ -1867,27 +1867,27 @@ // ToolsSubMenu // this.ToolsSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.ToolBoxMenuItem, - this.toolStripSeparator12, - this.RamWatchMenuItem, - this.RamSearchMenuItem, - this.LuaConsoleMenuItem, - this.HexEditorMenuItem, - this.TAStudioMenuItem, - this.TraceLoggerMenuItem, - this.CodeDataLoggerMenuItem, - this.DebuggerMenuItem, - this.MacroToolMenuItem, - this.VirtualPadMenuItem, - this.BasicBotMenuItem, - this.toolStripSeparator11, - this.CheatsMenuItem, - this.gameSharkConverterToolStripMenuItem, - this.toolStripSeparator29, - this.MultiDiskBundlerFileMenuItem, - this.externalToolToolStripMenuItem, - this.batchRunnerToolStripMenuItem, - this.ExperimentalToolsSubMenu}); + this.ToolBoxMenuItem, + this.toolStripSeparator12, + this.RamWatchMenuItem, + this.RamSearchMenuItem, + this.LuaConsoleMenuItem, + this.TAStudioMenuItem, + this.HexEditorMenuItem, + this.TraceLoggerMenuItem, + this.DebuggerMenuItem, + this.CodeDataLoggerMenuItem, + this.MacroToolMenuItem, + this.VirtualPadMenuItem, + this.BasicBotMenuItem, + this.toolStripSeparator11, + this.CheatsMenuItem, + this.gameSharkConverterToolStripMenuItem, + this.toolStripSeparator29, + this.MultiDiskBundlerFileMenuItem, + this.externalToolToolStripMenuItem, + this.batchRunnerToolStripMenuItem, + this.ExperimentalToolsSubMenu}); this.ToolsSubMenu.Name = "ToolsSubMenu"; this.ToolsSubMenu.Size = new System.Drawing.Size(44, 17); this.ToolsSubMenu.Text = "&Tools"; @@ -1922,6 +1922,22 @@ this.RamSearchMenuItem.Text = "RAM &Search"; this.RamSearchMenuItem.Click += new System.EventHandler(this.RamSearchMenuItem_Click); // + // LuaConsoleMenuItem + // + this.LuaConsoleMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Lua; + this.LuaConsoleMenuItem.Name = "LuaConsoleMenuItem"; + this.LuaConsoleMenuItem.Size = new System.Drawing.Size(191, 22); + this.LuaConsoleMenuItem.Text = "Lua Console"; + this.LuaConsoleMenuItem.Click += new System.EventHandler(this.LuaConsoleMenuItem_Click); + // + // TAStudioMenuItem + // + this.TAStudioMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.TAStudio; + this.TAStudioMenuItem.Name = "TAStudioMenuItem"; + this.TAStudioMenuItem.Size = new System.Drawing.Size(191, 22); + this.TAStudioMenuItem.Text = "&TAStudio"; + this.TAStudioMenuItem.Click += new System.EventHandler(this.TAStudioMenuItem_Click); + // // HexEditorMenuItem // this.HexEditorMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.poke; @@ -1938,14 +1954,6 @@ this.TraceLoggerMenuItem.Text = "Trace &Logger"; this.TraceLoggerMenuItem.Click += new System.EventHandler(this.TraceLoggerMenuItem_Click); // - // CodeDataLoggerMenuItem - // - this.CodeDataLoggerMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.cdlogger; - this.CodeDataLoggerMenuItem.Name = "CodeDataLoggerMenuItem"; - this.CodeDataLoggerMenuItem.Size = new System.Drawing.Size(191, 22); - this.CodeDataLoggerMenuItem.Text = "Code-Data Logger"; - this.CodeDataLoggerMenuItem.Click += new System.EventHandler(this.CodeDataLoggerMenuItem_Click); - // // DebuggerMenuItem // this.DebuggerMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Bug; @@ -1954,13 +1962,13 @@ this.DebuggerMenuItem.Text = "&Debugger"; this.DebuggerMenuItem.Click += new System.EventHandler(this.DebuggerMenuItem_Click); // - // TAStudioMenuItem + // CodeDataLoggerMenuItem // - this.TAStudioMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.TAStudio; - this.TAStudioMenuItem.Name = "TAStudioMenuItem"; - this.TAStudioMenuItem.Size = new System.Drawing.Size(191, 22); - this.TAStudioMenuItem.Text = "&TAStudio"; - this.TAStudioMenuItem.Click += new System.EventHandler(this.TAStudioMenuItem_Click); + this.CodeDataLoggerMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.cdlogger; + this.CodeDataLoggerMenuItem.Name = "CodeDataLoggerMenuItem"; + this.CodeDataLoggerMenuItem.Size = new System.Drawing.Size(191, 22); + this.CodeDataLoggerMenuItem.Text = "Code-Data Logger"; + this.CodeDataLoggerMenuItem.Click += new System.EventHandler(this.CodeDataLoggerMenuItem_Click); // // MacroToolMenuItem // @@ -1984,14 +1992,6 @@ this.BasicBotMenuItem.Text = "Basic Bot"; this.BasicBotMenuItem.Click += new System.EventHandler(this.BasicBotMenuItem_Click); // - // LuaConsoleMenuItem - // - this.LuaConsoleMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Lua; - this.LuaConsoleMenuItem.Name = "LuaConsoleMenuItem"; - this.LuaConsoleMenuItem.Size = new System.Drawing.Size(191, 22); - this.LuaConsoleMenuItem.Text = "Lua Console"; - this.LuaConsoleMenuItem.Click += new System.EventHandler(this.LuaConsoleMenuItem_Click); - // // toolStripSeparator11 // this.toolStripSeparator11.Name = "toolStripSeparator11"; @@ -2007,7 +2007,7 @@ // // gameSharkConverterToolStripMenuItem // - this.gameSharkConverterToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("gameSharkConverterToolStripMenuItem.Image"))); + this.gameSharkConverterToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Shark; this.gameSharkConverterToolStripMenuItem.Name = "gameSharkConverterToolStripMenuItem"; this.gameSharkConverterToolStripMenuItem.Size = new System.Drawing.Size(191, 22); this.gameSharkConverterToolStripMenuItem.Text = "GameShark Converter"; @@ -2029,7 +2029,7 @@ // externalToolToolStripMenuItem // this.externalToolToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.dummyExternalTool}); + this.dummyExternalTool}); this.externalToolToolStripMenuItem.Name = "externalToolToolStripMenuItem"; this.externalToolToolStripMenuItem.Size = new System.Drawing.Size(191, 22); this.externalToolToolStripMenuItem.Text = "External Tool"; @@ -2052,8 +2052,8 @@ // ExperimentalToolsSubMenu // this.ExperimentalToolsSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.AutoHawkMenuItem, - this.NewHexEditorMenuItem}); + this.AutoHawkMenuItem, + this.NewHexEditorMenuItem}); this.ExperimentalToolsSubMenu.Name = "ExperimentalToolsSubMenu"; this.ExperimentalToolsSubMenu.Size = new System.Drawing.Size(191, 22); this.ExperimentalToolsSubMenu.Text = "Experimental Tools"; @@ -2075,20 +2075,20 @@ // NESSubMenu // this.NESSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.coreToolStripMenuItem, - this.toolStripSeparator34, - this.NESPPUViewerMenuItem, - this.NESNametableViewerMenuItem, - this.NESGameGenieCodesMenuItem, - this.musicRipperToolStripMenuItem, - this.toolStripSeparator17, - this.NesControllerSettingsMenuItem, - this.NESGraphicSettingsMenuItem, - this.NESSoundChannelsMenuItem, - this.MovieSettingsMenuItem, - this.toolStripSeparator22, - this.FDSControlsMenuItem, - this.barcodeReaderToolStripMenuItem}); + this.coreToolStripMenuItem, + this.toolStripSeparator34, + this.NESPPUViewerMenuItem, + this.NESNametableViewerMenuItem, + this.NESGameGenieCodesMenuItem, + this.musicRipperToolStripMenuItem, + this.toolStripSeparator17, + this.NesControllerSettingsMenuItem, + this.NESGraphicSettingsMenuItem, + this.NESSoundChannelsMenuItem, + this.MovieSettingsMenuItem, + this.toolStripSeparator22, + this.FDSControlsMenuItem, + this.barcodeReaderToolStripMenuItem}); this.NESSubMenu.Name = "NESSubMenu"; this.NESSubMenu.Size = new System.Drawing.Size(38, 17); this.NESSubMenu.Text = "&NES"; @@ -2097,8 +2097,8 @@ // coreToolStripMenuItem // this.coreToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.quickNESToolStripMenuItem, - this.nesHawkToolStripMenuItem}); + this.quickNESToolStripMenuItem, + this.nesHawkToolStripMenuItem}); this.coreToolStripMenuItem.Name = "coreToolStripMenuItem"; this.coreToolStripMenuItem.Size = new System.Drawing.Size(228, 22); this.coreToolStripMenuItem.Text = "&Core"; @@ -2195,7 +2195,7 @@ // FDSControlsMenuItem // this.FDSControlsMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.FdsEjectDiskMenuItem}); + this.FdsEjectDiskMenuItem}); this.FDSControlsMenuItem.Name = "FDSControlsMenuItem"; this.FDSControlsMenuItem.Size = new System.Drawing.Size(228, 22); this.FDSControlsMenuItem.Text = "FDS Controls"; @@ -2218,16 +2218,16 @@ // PCESubMenu // this.PCESubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.PceControllerSettingsMenuItem, - this.PCEGraphicsSettingsMenuItem, - this.toolStripSeparator32, - this.PCEBGViewerMenuItem, - this.PCEtileViewerToolStripMenuItem, - this.PceSoundDebuggerToolStripMenuItem, - this.toolStripSeparator25, - this.PCEAlwaysPerformSpriteLimitMenuItem, - this.PCEAlwaysEqualizeVolumesMenuItem, - this.PCEArcadeCardRewindEnableMenuItem}); + this.PceControllerSettingsMenuItem, + this.PCEGraphicsSettingsMenuItem, + this.toolStripSeparator32, + this.PCEBGViewerMenuItem, + this.PCEtileViewerToolStripMenuItem, + this.PceSoundDebuggerToolStripMenuItem, + this.toolStripSeparator25, + this.PCEAlwaysPerformSpriteLimitMenuItem, + this.PCEAlwaysEqualizeVolumesMenuItem, + this.PCEArcadeCardRewindEnableMenuItem}); this.PCESubMenu.Name = "PCESubMenu"; this.PCESubMenu.Size = new System.Drawing.Size(38, 17); this.PCESubMenu.Text = "&PCE"; @@ -2304,21 +2304,21 @@ // SMSSubMenu // this.SMSSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.SMSregionToolStripMenuItem, - this.SMSdisplayToolStripMenuItem, - this.SMStoolStripMenuItem2, - this.SMSenableBIOSToolStripMenuItem, - this.SMSEnableFMChipMenuItem, - this.SMSOverclockMenuItem, - this.SMSForceStereoMenuItem, - this.SMSSpriteLimitMenuItem, - this.SMSFix3DGameDisplayToolStripMenuItem, - this.ShowClippedRegionsMenuItem, - this.HighlightActiveDisplayRegionMenuItem, - this.SMSGraphicsSettingsMenuItem, - this.toolStripSeparator24, - this.SMSVDPViewerToolStripMenuItem, - this.GGGameGenieMenuItem}); + this.SMSregionToolStripMenuItem, + this.SMSdisplayToolStripMenuItem, + this.SMStoolStripMenuItem2, + this.SMSenableBIOSToolStripMenuItem, + this.SMSEnableFMChipMenuItem, + this.SMSOverclockMenuItem, + this.SMSForceStereoMenuItem, + this.SMSSpriteLimitMenuItem, + this.SMSFix3DGameDisplayToolStripMenuItem, + this.ShowClippedRegionsMenuItem, + this.HighlightActiveDisplayRegionMenuItem, + this.SMSGraphicsSettingsMenuItem, + this.toolStripSeparator24, + this.SMSVDPViewerToolStripMenuItem, + this.GGGameGenieMenuItem}); this.SMSSubMenu.Name = "SMSSubMenu"; this.SMSSubMenu.Size = new System.Drawing.Size(39, 17); this.SMSSubMenu.Text = "&SMS"; @@ -2327,9 +2327,9 @@ // SMSregionToolStripMenuItem // this.SMSregionToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.SMSregionExportToolStripMenuItem, - this.SMSregionJapanToolStripMenuItem, - this.SMSregionAutoToolStripMenuItem}); + this.SMSregionExportToolStripMenuItem, + this.SMSregionJapanToolStripMenuItem, + this.SMSregionAutoToolStripMenuItem}); this.SMSregionToolStripMenuItem.Name = "SMSregionToolStripMenuItem"; this.SMSregionToolStripMenuItem.Size = new System.Drawing.Size(232, 22); this.SMSregionToolStripMenuItem.Text = "Region"; @@ -2358,9 +2358,9 @@ // SMSdisplayToolStripMenuItem // this.SMSdisplayToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.SMSdisplayNtscToolStripMenuItem, - this.SMSdisplayPalToolStripMenuItem, - this.SMSdisplayAutoToolStripMenuItem}); + this.SMSdisplayNtscToolStripMenuItem, + this.SMSdisplayPalToolStripMenuItem, + this.SMSdisplayAutoToolStripMenuItem}); this.SMSdisplayToolStripMenuItem.Name = "SMSdisplayToolStripMenuItem"; this.SMSdisplayToolStripMenuItem.Size = new System.Drawing.Size(232, 22); this.SMSdisplayToolStripMenuItem.Text = "Display Type"; @@ -2476,11 +2476,11 @@ // TI83SubMenu // this.TI83SubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.KeypadMenuItem, - this.LoadTIFileMenuItem, - this.toolStripSeparator13, - this.AutoloadKeypadMenuItem, - this.paletteToolStripMenuItem}); + this.KeypadMenuItem, + this.LoadTIFileMenuItem, + this.toolStripSeparator13, + this.AutoloadKeypadMenuItem, + this.paletteToolStripMenuItem}); this.TI83SubMenu.Name = "TI83SubMenu"; this.TI83SubMenu.Size = new System.Drawing.Size(41, 17); this.TI83SubMenu.Text = "TI83"; @@ -2525,7 +2525,7 @@ // AtariSubMenu // this.AtariSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.AtariSettingsToolStripMenuItem}); + this.AtariSettingsToolStripMenuItem}); this.AtariSubMenu.Name = "AtariSubMenu"; this.AtariSubMenu.Size = new System.Drawing.Size(42, 17); this.AtariSubMenu.Text = "&Atari"; @@ -2541,11 +2541,11 @@ // GBSubMenu // this.GBSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.GBcoreSettingsToolStripMenuItem, - this.LoadGBInSGBMenuItem, - this.toolStripSeparator28, - this.GBGPUViewerMenuItem, - this.GBGameGenieMenuItem}); + this.GBcoreSettingsToolStripMenuItem, + this.LoadGBInSGBMenuItem, + this.toolStripSeparator28, + this.GBGPUViewerMenuItem, + this.GBGameGenieMenuItem}); this.GBSubMenu.Name = "GBSubMenu"; this.GBSubMenu.Size = new System.Drawing.Size(32, 17); this.GBSubMenu.Text = "&GB"; @@ -2587,10 +2587,10 @@ // GBASubMenu // this.GBASubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.GBACoreSelectionSubMenu, - this.GBAcoresettingsToolStripMenuItem1, - this.toolStripSeparator33, - this.GbaGpuViewerMenuItem}); + this.GBACoreSelectionSubMenu, + this.GBAcoresettingsToolStripMenuItem1, + this.toolStripSeparator33, + this.GbaGpuViewerMenuItem}); this.GBASubMenu.Name = "GBASubMenu"; this.GBASubMenu.Size = new System.Drawing.Size(39, 17); this.GBASubMenu.Text = "GBA"; @@ -2598,8 +2598,8 @@ // GBACoreSelectionSubMenu // this.GBACoreSelectionSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.GBAmGBAMenuItem, - this.GBAVBANextMenuItem}); + this.GBAmGBAMenuItem, + this.GBAVBANextMenuItem}); this.GBACoreSelectionSubMenu.Name = "GBACoreSelectionSubMenu"; this.GBACoreSelectionSubMenu.Size = new System.Drawing.Size(140, 22); this.GBACoreSelectionSubMenu.Text = "&Core"; @@ -2641,10 +2641,10 @@ // PSXSubMenu // this.PSXSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.PSXControllerSettingsMenuItem, - this.PSXOptionsMenuItem, - this.PSXDiscControlsMenuItem, - this.PSXHashDiscsToolStripMenuItem}); + this.PSXControllerSettingsMenuItem, + this.PSXOptionsMenuItem, + this.PSXDiscControlsMenuItem, + this.PSXHashDiscsToolStripMenuItem}); this.PSXSubMenu.Name = "PSXSubMenu"; this.PSXSubMenu.Size = new System.Drawing.Size(37, 17); this.PSXSubMenu.Text = "PSX"; @@ -2682,12 +2682,12 @@ // SNESSubMenu // this.SNESSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.SNESDisplayMenuItem, - this.toolStripSeparator18, - this.SnesGfxDebuggerMenuItem, - this.SnesGBInSGBMenuItem, - this.SnesGameGenieMenuItem, - this.SnesOptionsMenuItem}); + this.SNESDisplayMenuItem, + this.toolStripSeparator18, + this.SnesGfxDebuggerMenuItem, + this.SnesGBInSGBMenuItem, + this.SnesGameGenieMenuItem, + this.SnesOptionsMenuItem}); this.SNESSubMenu.Name = "SNESSubMenu"; this.SNESSubMenu.Size = new System.Drawing.Size(44, 17); this.SNESSubMenu.Text = "&SNES"; @@ -2696,14 +2696,14 @@ // SNESDisplayMenuItem // this.SNESDisplayMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.SnesBg1MenuItem, - this.SnesBg2MenuItem, - this.SnesBg3MenuItem, - this.SnesBg4MenuItem, - this.SnesObj1MenuItem, - this.SnesObj2MenuItem, - this.SnesObj3MenuItem, - this.SnesObj4MenuItem}); + this.SnesBg1MenuItem, + this.SnesBg2MenuItem, + this.SnesBg3MenuItem, + this.SnesBg4MenuItem, + this.SnesObj1MenuItem, + this.SnesObj2MenuItem, + this.SnesObj3MenuItem, + this.SnesObj4MenuItem}); this.SNESDisplayMenuItem.Name = "SNESDisplayMenuItem"; this.SNESDisplayMenuItem.Size = new System.Drawing.Size(228, 22); this.SNESDisplayMenuItem.Text = "Display"; @@ -2802,7 +2802,7 @@ // ColecoSubMenu // this.ColecoSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.ColecoSkipBiosMenuItem}); + this.ColecoSkipBiosMenuItem}); this.ColecoSubMenu.Name = "ColecoSubMenu"; this.ColecoSubMenu.Size = new System.Drawing.Size(51, 17); this.ColecoSubMenu.Text = "&Coleco"; @@ -2811,19 +2811,19 @@ // ColecoSkipBiosMenuItem // this.ColecoSkipBiosMenuItem.Name = "ColecoSkipBiosMenuItem"; - this.ColecoSkipBiosMenuItem.Size = new System.Drawing.Size(156, 22); + this.ColecoSkipBiosMenuItem.Size = new System.Drawing.Size(246, 22); this.ColecoSkipBiosMenuItem.Text = "&Skip BIOS intro (When Applicable)"; this.ColecoSkipBiosMenuItem.Click += new System.EventHandler(this.ColecoSkipBiosMenuItem_Click); // // N64SubMenu // this.N64SubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.N64PluginSettingsMenuItem, - this.N64ControllerSettingsMenuItem, - this.toolStripSeparator23, - this.N64CircularAnalogRangeMenuItem, - this.MupenStyleLagMenuItem, - this.N64ExpansionSlotMenuItem}); + this.N64PluginSettingsMenuItem, + this.N64ControllerSettingsMenuItem, + this.toolStripSeparator23, + this.N64CircularAnalogRangeMenuItem, + this.MupenStyleLagMenuItem, + this.N64ExpansionSlotMenuItem}); this.N64SubMenu.Name = "N64SubMenu"; this.N64SubMenu.Size = new System.Drawing.Size(38, 17); this.N64SubMenu.Text = "N64"; @@ -2874,7 +2874,7 @@ // SaturnSubMenu // this.SaturnSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.SaturnPreferencesMenuItem}); + this.SaturnPreferencesMenuItem}); this.SaturnSubMenu.Name = "SaturnSubMenu"; this.SaturnSubMenu.Size = new System.Drawing.Size(51, 17); this.SaturnSubMenu.Text = "&Saturn"; @@ -2889,7 +2889,7 @@ // DGBSubMenu // this.DGBSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.DGBsettingsToolStripMenuItem}); + this.DGBsettingsToolStripMenuItem}); this.DGBSubMenu.Name = "DGBSubMenu"; this.DGBSubMenu.Size = new System.Drawing.Size(53, 17); this.DGBSubMenu.Text = "&GB Link"; @@ -2904,10 +2904,10 @@ // GenesisSubMenu // this.GenesisSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.vDPViewerToolStripMenuItem, - this.GenesisGameGenieECDC, - this.toolStripSeparator26, - this.GenesisSettingsToolStripMenuItem}); + this.vDPViewerToolStripMenuItem, + this.GenesisGameGenieECDC, + this.toolStripSeparator26, + this.GenesisSettingsToolStripMenuItem}); this.GenesisSubMenu.Name = "GenesisSubMenu"; this.GenesisSubMenu.Size = new System.Drawing.Size(56, 17); this.GenesisSubMenu.Text = "&Genesis"; @@ -2941,7 +2941,7 @@ // wonderSwanToolStripMenuItem // this.wonderSwanToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.settingsToolStripMenuItem}); + this.settingsToolStripMenuItem}); this.wonderSwanToolStripMenuItem.Name = "wonderSwanToolStripMenuItem"; this.wonderSwanToolStripMenuItem.Size = new System.Drawing.Size(83, 17); this.wonderSwanToolStripMenuItem.Text = "&WonderSwan"; @@ -2956,8 +2956,8 @@ // AppleSubMenu // this.AppleSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.AppleDisksSubMenu, - this.settingsToolStripMenuItem1}); + this.AppleDisksSubMenu, + this.settingsToolStripMenuItem1}); this.AppleSubMenu.Name = "AppleSubMenu"; this.AppleSubMenu.Size = new System.Drawing.Size(46, 17); this.AppleSubMenu.Text = "Apple"; @@ -2966,7 +2966,7 @@ // AppleDisksSubMenu // this.AppleDisksSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.toolStripSeparator31}); + this.toolStripSeparator31}); this.AppleDisksSubMenu.Name = "AppleDisksSubMenu"; this.AppleDisksSubMenu.Size = new System.Drawing.Size(136, 22); this.AppleDisksSubMenu.Text = "Disks"; @@ -2987,7 +2987,7 @@ // C64SubMenu // this.C64SubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.C64SettingsMenuItem}); + this.C64SettingsMenuItem}); this.C64SubMenu.Name = "C64SubMenu"; this.C64SubMenu.Size = new System.Drawing.Size(38, 17); this.C64SubMenu.Text = "&C64"; @@ -3002,10 +3002,10 @@ // HelpSubMenu // this.HelpSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.OnlineHelpMenuItem, - this.ForumsMenuItem, - this.FeaturesMenuItem, - this.AboutMenuItem}); + this.OnlineHelpMenuItem, + this.ForumsMenuItem, + this.FeaturesMenuItem, + this.AboutMenuItem}); this.HelpSubMenu.Name = "HelpSubMenu"; this.HelpSubMenu.Size = new System.Drawing.Size(40, 17); this.HelpSubMenu.Text = "&Help"; @@ -3047,30 +3047,30 @@ // this.MainStatusBar.ClickThrough = true; this.MainStatusBar.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.DumpStatusButton, - this.EmuStatus, - this.PlayRecordStatusButton, - this.PauseStatusButton, - this.RebootStatusBarIcon, - this.AVIStatusLabel, - this.LedLightStatusLabel, - this.SaveSlotsStatusLabel, - this.Slot1StatusButton, - this.Slot2StatusButton, - this.Slot3StatusButton, - this.Slot4StatusButton, - this.Slot5StatusButton, - this.Slot6StatusButton, - this.Slot7StatusButton, - this.Slot8StatusButton, - this.Slot9StatusButton, - this.Slot0StatusButton, - this.CheatStatusButton, - this.KeyPriorityStatusLabel, - this.CoreNameStatusBarButton, - this.ProfileFirstBootLabel, - this.LinkConnectStatusBarButton, - this.UpdateNotification}); + this.DumpStatusButton, + this.EmuStatus, + this.PlayRecordStatusButton, + this.PauseStatusButton, + this.RebootStatusBarIcon, + this.AVIStatusLabel, + this.LedLightStatusLabel, + this.SaveSlotsStatusLabel, + this.Slot1StatusButton, + this.Slot2StatusButton, + this.Slot3StatusButton, + this.Slot4StatusButton, + this.Slot5StatusButton, + this.Slot6StatusButton, + this.Slot7StatusButton, + this.Slot8StatusButton, + this.Slot9StatusButton, + this.Slot0StatusButton, + this.CheatStatusButton, + this.KeyPriorityStatusLabel, + this.CoreNameStatusBarButton, + this.ProfileFirstBootLabel, + this.LinkConnectStatusBarButton, + this.UpdateNotification}); this.MainStatusBar.Location = new System.Drawing.Point(0, 386); this.MainStatusBar.Name = "MainStatusBar"; this.MainStatusBar.ShowItemToolTips = true; @@ -3289,33 +3289,33 @@ // MainFormContextMenu // this.MainFormContextMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.OpenRomContextMenuItem, - this.LoadLastRomContextMenuItem, - this.StopAVContextMenuItem, - this.ContextSeparator_AfterROM, - this.RecordMovieContextMenuItem, - this.PlayMovieContextMenuItem, - this.RestartMovieContextMenuItem, - this.StopMovieContextMenuItem, - this.LoadLastMovieContextMenuItem, - this.BackupMovieContextMenuItem, - this.StopNoSaveContextMenuItem, - this.ViewSubtitlesContextMenuItem, - this.AddSubtitleContextMenuItem, - this.ViewCommentsContextMenuItem, - this.SaveMovieContextMenuItem, - this.SaveMovieAsContextMenuItem, - this.ContextSeparator_AfterMovie, - this.UndoSavestateContextMenuItem, - this.ContextSeparator_AfterUndo, - this.ConfigContextMenuItem, - this.ScreenshotContextMenuItem, - this.CloseRomContextMenuItem, - this.ClearSRAMContextMenuItem, - this.ShowMenuContextMenuSeparator, - this.ShowMenuContextMenuItem}); + this.OpenRomContextMenuItem, + this.LoadLastRomContextMenuItem, + this.StopAVContextMenuItem, + this.ContextSeparator_AfterROM, + this.RecordMovieContextMenuItem, + this.PlayMovieContextMenuItem, + this.RestartMovieContextMenuItem, + this.StopMovieContextMenuItem, + this.LoadLastMovieContextMenuItem, + this.BackupMovieContextMenuItem, + this.StopNoSaveContextMenuItem, + this.ViewSubtitlesContextMenuItem, + this.AddSubtitleContextMenuItem, + this.ViewCommentsContextMenuItem, + this.SaveMovieContextMenuItem, + this.SaveMovieAsContextMenuItem, + this.ContextSeparator_AfterMovie, + this.UndoSavestateContextMenuItem, + this.ContextSeparator_AfterUndo, + this.ConfigContextMenuItem, + this.ScreenshotContextMenuItem, + this.CloseRomContextMenuItem, + this.ClearSRAMContextMenuItem, + this.ShowMenuContextMenuSeparator, + this.ShowMenuContextMenuItem}); this.MainFormContextMenu.Name = "contextMenuStrip1"; - this.MainFormContextMenu.Size = new System.Drawing.Size(202, 490); + this.MainFormContextMenu.Size = new System.Drawing.Size(213, 490); this.MainFormContextMenu.Closing += new System.Windows.Forms.ToolStripDropDownClosingEventHandler(this.MainFormContextMenu_Closing); this.MainFormContextMenu.Opening += new System.ComponentModel.CancelEventHandler(this.MainFormContextMenu_Opening); // @@ -3323,7 +3323,7 @@ // this.OpenRomContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.OpenFile; this.OpenRomContextMenuItem.Name = "OpenRomContextMenuItem"; - this.OpenRomContextMenuItem.Size = new System.Drawing.Size(201, 22); + this.OpenRomContextMenuItem.Size = new System.Drawing.Size(212, 22); this.OpenRomContextMenuItem.Text = "Open Rom"; this.OpenRomContextMenuItem.Click += new System.EventHandler(this.OpenRomMenuItem_Click); // @@ -3331,7 +3331,7 @@ // this.LoadLastRomContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Recent; this.LoadLastRomContextMenuItem.Name = "LoadLastRomContextMenuItem"; - this.LoadLastRomContextMenuItem.Size = new System.Drawing.Size(201, 22); + this.LoadLastRomContextMenuItem.Size = new System.Drawing.Size(212, 22); this.LoadLastRomContextMenuItem.Text = "Load Last ROM"; this.LoadLastRomContextMenuItem.Click += new System.EventHandler(this.LoadLastRomContextMenuItem_Click); // @@ -3339,20 +3339,20 @@ // this.StopAVContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Stop; this.StopAVContextMenuItem.Name = "StopAVContextMenuItem"; - this.StopAVContextMenuItem.Size = new System.Drawing.Size(201, 22); + this.StopAVContextMenuItem.Size = new System.Drawing.Size(212, 22); this.StopAVContextMenuItem.Text = "Stop AVI/WAV"; this.StopAVContextMenuItem.Click += new System.EventHandler(this.StopAVMenuItem_Click); // // ContextSeparator_AfterROM // this.ContextSeparator_AfterROM.Name = "ContextSeparator_AfterROM"; - this.ContextSeparator_AfterROM.Size = new System.Drawing.Size(198, 6); + this.ContextSeparator_AfterROM.Size = new System.Drawing.Size(209, 6); // // RecordMovieContextMenuItem // this.RecordMovieContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.RecordHS; this.RecordMovieContextMenuItem.Name = "RecordMovieContextMenuItem"; - this.RecordMovieContextMenuItem.Size = new System.Drawing.Size(201, 22); + this.RecordMovieContextMenuItem.Size = new System.Drawing.Size(212, 22); this.RecordMovieContextMenuItem.Text = "Record Movie"; this.RecordMovieContextMenuItem.Click += new System.EventHandler(this.RecordMovieMenuItem_Click); // @@ -3360,7 +3360,7 @@ // this.PlayMovieContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Play; this.PlayMovieContextMenuItem.Name = "PlayMovieContextMenuItem"; - this.PlayMovieContextMenuItem.Size = new System.Drawing.Size(201, 22); + this.PlayMovieContextMenuItem.Size = new System.Drawing.Size(212, 22); this.PlayMovieContextMenuItem.Text = "Play Movie"; this.PlayMovieContextMenuItem.Click += new System.EventHandler(this.PlayMovieMenuItem_Click); // @@ -3368,7 +3368,7 @@ // this.RestartMovieContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.restart; this.RestartMovieContextMenuItem.Name = "RestartMovieContextMenuItem"; - this.RestartMovieContextMenuItem.Size = new System.Drawing.Size(201, 22); + this.RestartMovieContextMenuItem.Size = new System.Drawing.Size(212, 22); this.RestartMovieContextMenuItem.Text = "Restart Movie"; this.RestartMovieContextMenuItem.Click += new System.EventHandler(this.PlayFromBeginningMenuItem_Click); // @@ -3376,7 +3376,7 @@ // this.StopMovieContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Stop; this.StopMovieContextMenuItem.Name = "StopMovieContextMenuItem"; - this.StopMovieContextMenuItem.Size = new System.Drawing.Size(201, 22); + this.StopMovieContextMenuItem.Size = new System.Drawing.Size(212, 22); this.StopMovieContextMenuItem.Text = "Stop Movie"; this.StopMovieContextMenuItem.Click += new System.EventHandler(this.StopMovieMenuItem_Click); // @@ -3384,14 +3384,14 @@ // this.LoadLastMovieContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Recent; this.LoadLastMovieContextMenuItem.Name = "LoadLastMovieContextMenuItem"; - this.LoadLastMovieContextMenuItem.Size = new System.Drawing.Size(201, 22); + this.LoadLastMovieContextMenuItem.Size = new System.Drawing.Size(212, 22); this.LoadLastMovieContextMenuItem.Text = "Load Last Movie"; this.LoadLastMovieContextMenuItem.Click += new System.EventHandler(this.LoadLastMovieContextMenuItem_Click); // // BackupMovieContextMenuItem // this.BackupMovieContextMenuItem.Name = "BackupMovieContextMenuItem"; - this.BackupMovieContextMenuItem.Size = new System.Drawing.Size(201, 22); + this.BackupMovieContextMenuItem.Size = new System.Drawing.Size(212, 22); this.BackupMovieContextMenuItem.Text = "Backup Movie"; this.BackupMovieContextMenuItem.Click += new System.EventHandler(this.BackupMovieContextMenuItem_Click); // @@ -3399,28 +3399,28 @@ // this.StopNoSaveContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Stop; this.StopNoSaveContextMenuItem.Name = "StopNoSaveContextMenuItem"; - this.StopNoSaveContextMenuItem.Size = new System.Drawing.Size(201, 22); + this.StopNoSaveContextMenuItem.Size = new System.Drawing.Size(212, 22); this.StopNoSaveContextMenuItem.Text = "Stop Movie without Saving"; this.StopNoSaveContextMenuItem.Click += new System.EventHandler(this.StopMovieWithoutSavingMenuItem_Click); // // ViewSubtitlesContextMenuItem // this.ViewSubtitlesContextMenuItem.Name = "ViewSubtitlesContextMenuItem"; - this.ViewSubtitlesContextMenuItem.Size = new System.Drawing.Size(201, 22); + this.ViewSubtitlesContextMenuItem.Size = new System.Drawing.Size(212, 22); this.ViewSubtitlesContextMenuItem.Text = "View Subtitles"; this.ViewSubtitlesContextMenuItem.Click += new System.EventHandler(this.ViewSubtitlesContextMenuItem_Click); // // AddSubtitleContextMenuItem // this.AddSubtitleContextMenuItem.Name = "AddSubtitleContextMenuItem"; - this.AddSubtitleContextMenuItem.Size = new System.Drawing.Size(201, 22); + this.AddSubtitleContextMenuItem.Size = new System.Drawing.Size(212, 22); this.AddSubtitleContextMenuItem.Text = "Add Subtitle"; this.AddSubtitleContextMenuItem.Click += new System.EventHandler(this.AddSubtitleContextMenuItem_Click); // // ViewCommentsContextMenuItem // this.ViewCommentsContextMenuItem.Name = "ViewCommentsContextMenuItem"; - this.ViewCommentsContextMenuItem.Size = new System.Drawing.Size(201, 22); + this.ViewCommentsContextMenuItem.Size = new System.Drawing.Size(212, 22); this.ViewCommentsContextMenuItem.Text = "View Comments"; this.ViewCommentsContextMenuItem.Click += new System.EventHandler(this.ViewCommentsContextMenuItem_Click); // @@ -3428,7 +3428,7 @@ // this.SaveMovieContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.SaveAs; this.SaveMovieContextMenuItem.Name = "SaveMovieContextMenuItem"; - this.SaveMovieContextMenuItem.Size = new System.Drawing.Size(201, 22); + this.SaveMovieContextMenuItem.Size = new System.Drawing.Size(212, 22); this.SaveMovieContextMenuItem.Text = "Save Movie"; this.SaveMovieContextMenuItem.Click += new System.EventHandler(this.SaveMovieMenuItem_Click); // @@ -3436,50 +3436,50 @@ // this.SaveMovieAsContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.SaveAs; this.SaveMovieAsContextMenuItem.Name = "SaveMovieAsContextMenuItem"; - this.SaveMovieAsContextMenuItem.Size = new System.Drawing.Size(201, 22); + this.SaveMovieAsContextMenuItem.Size = new System.Drawing.Size(212, 22); this.SaveMovieAsContextMenuItem.Text = "Save Movie As..."; this.SaveMovieAsContextMenuItem.Click += new System.EventHandler(this.SaveMovieAsMenuItem_Click); // // ContextSeparator_AfterMovie // this.ContextSeparator_AfterMovie.Name = "ContextSeparator_AfterMovie"; - this.ContextSeparator_AfterMovie.Size = new System.Drawing.Size(198, 6); + this.ContextSeparator_AfterMovie.Size = new System.Drawing.Size(209, 6); // // UndoSavestateContextMenuItem // this.UndoSavestateContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.undo; this.UndoSavestateContextMenuItem.Name = "UndoSavestateContextMenuItem"; - this.UndoSavestateContextMenuItem.Size = new System.Drawing.Size(201, 22); + this.UndoSavestateContextMenuItem.Size = new System.Drawing.Size(212, 22); this.UndoSavestateContextMenuItem.Text = "Undo Savestate"; this.UndoSavestateContextMenuItem.Click += new System.EventHandler(this.UndoSavestateContextMenuItem_Click); // // ContextSeparator_AfterUndo // this.ContextSeparator_AfterUndo.Name = "ContextSeparator_AfterUndo"; - this.ContextSeparator_AfterUndo.Size = new System.Drawing.Size(198, 6); + this.ContextSeparator_AfterUndo.Size = new System.Drawing.Size(209, 6); // // ConfigContextMenuItem // this.ConfigContextMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.toolStripMenuItem6, - this.toolStripMenuItem7, - this.toolStripMenuItem8, - this.toolStripMenuItem9, - this.toolStripMenuItem10, - this.toolStripMenuItem11, - this.toolStripMenuItem12, - this.toolStripMenuItem13, - this.toolStripMenuItem14, - this.toolStripMenuItem15, - this.customizeToolStripMenuItem, - this.toolStripSeparator30, - this.SavestateTypeContextSubMenu, - this.CoreSelectionContextSubMenu, - this.toolStripSeparator37, - this.toolStripMenuItem66, - this.toolStripMenuItem67}); + this.toolStripMenuItem6, + this.toolStripMenuItem7, + this.toolStripMenuItem8, + this.toolStripMenuItem9, + this.toolStripMenuItem10, + this.toolStripMenuItem11, + this.toolStripMenuItem12, + this.toolStripMenuItem13, + this.toolStripMenuItem14, + this.toolStripMenuItem15, + this.customizeToolStripMenuItem, + this.toolStripSeparator30, + this.SavestateTypeContextSubMenu, + this.CoreSelectionContextSubMenu, + this.toolStripSeparator37, + this.toolStripMenuItem66, + this.toolStripMenuItem67}); this.ConfigContextMenuItem.Name = "ConfigContextMenuItem"; - this.ConfigContextMenuItem.Size = new System.Drawing.Size(201, 22); + this.ConfigContextMenuItem.Size = new System.Drawing.Size(212, 22); this.ConfigContextMenuItem.Text = "Config"; // // toolStripMenuItem6 @@ -3576,9 +3576,9 @@ // SavestateTypeContextSubMenu // this.SavestateTypeContextSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.SavestateTypeDefaultContextMenuItem, - this.SavestateBinaryContextMenuItem, - this.SavestateTextContextMenuItem}); + this.SavestateTypeDefaultContextMenuItem, + this.SavestateBinaryContextMenuItem, + this.SavestateTextContextMenuItem}); this.SavestateTypeContextSubMenu.Name = "SavestateTypeContextSubMenu"; this.SavestateTypeContextSubMenu.Size = new System.Drawing.Size(168, 22); this.SavestateTypeContextSubMenu.Text = "Savestate Type"; @@ -3605,8 +3605,8 @@ // CoreSelectionContextSubMenu // this.CoreSelectionContextSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.GBInSGBContextMenuItem, - this.NesInQuickNESContextMenuItem}); + this.GBInSGBContextMenuItem, + this.NesInQuickNESContextMenuItem}); this.CoreSelectionContextSubMenu.Name = "CoreSelectionContextSubMenu"; this.CoreSelectionContextSubMenu.Size = new System.Drawing.Size(168, 22); this.CoreSelectionContextSubMenu.Text = "Core Selection"; @@ -3651,7 +3651,7 @@ // this.ScreenshotContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.camera; this.ScreenshotContextMenuItem.Name = "ScreenshotContextMenuItem"; - this.ScreenshotContextMenuItem.Size = new System.Drawing.Size(201, 22); + this.ScreenshotContextMenuItem.Size = new System.Drawing.Size(212, 22); this.ScreenshotContextMenuItem.Text = "Screenshot"; this.ScreenshotContextMenuItem.Click += new System.EventHandler(this.ScreenshotMenuItem_Click); // @@ -3659,26 +3659,26 @@ // this.CloseRomContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Close; this.CloseRomContextMenuItem.Name = "CloseRomContextMenuItem"; - this.CloseRomContextMenuItem.Size = new System.Drawing.Size(201, 22); + this.CloseRomContextMenuItem.Size = new System.Drawing.Size(212, 22); this.CloseRomContextMenuItem.Text = "Close ROM"; this.CloseRomContextMenuItem.Click += new System.EventHandler(this.CloseRomMenuItem_Click); // // ClearSRAMContextMenuItem // this.ClearSRAMContextMenuItem.Name = "ClearSRAMContextMenuItem"; - this.ClearSRAMContextMenuItem.Size = new System.Drawing.Size(201, 22); + this.ClearSRAMContextMenuItem.Size = new System.Drawing.Size(212, 22); this.ClearSRAMContextMenuItem.Text = "Close and Clear SRAM"; this.ClearSRAMContextMenuItem.Click += new System.EventHandler(this.ClearSRAMContextMenuItem_Click); // // ShowMenuContextMenuSeparator // this.ShowMenuContextMenuSeparator.Name = "ShowMenuContextMenuSeparator"; - this.ShowMenuContextMenuSeparator.Size = new System.Drawing.Size(198, 6); + this.ShowMenuContextMenuSeparator.Size = new System.Drawing.Size(209, 6); // // ShowMenuContextMenuItem // this.ShowMenuContextMenuItem.Name = "ShowMenuContextMenuItem"; - this.ShowMenuContextMenuItem.Size = new System.Drawing.Size(201, 22); + this.ShowMenuContextMenuItem.Size = new System.Drawing.Size(212, 22); this.ShowMenuContextMenuItem.Text = "Show Menu"; this.ShowMenuContextMenuItem.Click += new System.EventHandler(this.ShowMenuContextMenuItem_Click); // diff --git a/BizHawk.Client.EmuHawk/MainForm.resx b/BizHawk.Client.EmuHawk/MainForm.resx index acfc6c55cb..f8c3ebb43a 100644 --- a/BizHawk.Client.EmuHawk/MainForm.resx +++ b/BizHawk.Client.EmuHawk/MainForm.resx @@ -138,43 +138,10 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAQRAAA - EEQBkUHrYQAAAHVJREFUOE/NkuEKwCAIhN2b781bGsZlarH9aIEEcX2eVxfdVOjTYoCpUhef2d3qWnMR + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAQQwAA + EEMBwwVNHgAAAHVJREFUOE/NkuEKwCAIhN2b781bGsZlarH9aIEEcX2eVxfdVOjTYoCpUhef2d3qWnMR AoTEkV9OMwEMdQTwsxGc9PU19l7BS5qhNVyuOXS4wFlgoXgL4FoMHHUtfqTIgZ6HGaw6I2CCDXMmGagu BaycvB4hAz9wYIvatCqJLwAAAABJRU5ErkJggg== - - - - - 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 @@ -605,8 +572,8 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAQRAAA - EEQBkUHrYQAAAHVJREFUOE/NkuEKwCAIhN2b781bGsZlarH9aIEEcX2eVxfdVOjTYoCpUhef2d3qWnMR + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAQQwAA + EEMBwwVNHgAAAHVJREFUOE/NkuEKwCAIhN2b781bGsZlarH9aIEEcX2eVxfdVOjTYoCpUhef2d3qWnMR AoTEkV9OMwEMdQTwsxGc9PU19l7BS5qhNVyuOXS4wFlgoXgL4FoMHHUtfqTIgZ6HGaw6I2CCDXMmGagu BaycvB4hAz9wYIvatCqJLwAAAABJRU5ErkJggg== diff --git a/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs b/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs index 8dcbc7571f..d96b7f623f 100644 --- a/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs +++ b/BizHawk.Client.EmuHawk/Properties/Resources.Designer.cs @@ -934,6 +934,13 @@ namespace BizHawk.Client.EmuHawk.Properties { } } + internal static System.Drawing.Bitmap Shark { + get { + object obj = ResourceManager.GetObject("Shark", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + internal static System.Drawing.Bitmap sms_icon { get { object obj = ResourceManager.GetObject("sms_icon", resourceCulture); diff --git a/BizHawk.Client.EmuHawk/Properties/Resources.resx b/BizHawk.Client.EmuHawk/Properties/Resources.resx index 927105a400..6c8b097932 100644 --- a/BizHawk.Client.EmuHawk/Properties/Resources.resx +++ b/BizHawk.Client.EmuHawk/Properties/Resources.resx @@ -136,8 +136,8 @@ ..\images\Circle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\images\PrintPreviewHS.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\images\tastudio\ts_v_piano_02_green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\images\ControllerImages\A78Joystick.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -178,6 +178,9 @@ ..\images\ExclamationRed.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\images\tastudio\ts_v_arrow_blue.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\images\tastudio\ts_v_piano_11_green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -238,9 +241,6 @@ ..\images\tastudio\ts_v_piano_03_blue.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\images\ControllerImages\AppleIIKeyboard.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\images\tastudio\ts_h_piano_11.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -283,8 +283,8 @@ ..\images\tastudio\ts_v_piano_18.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\images\tastudio\ts_v_arrow_blue.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\images\kitchensink.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\images\tastudio\ts_h_piano_02.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -741,6 +741,9 @@ ..\images\Refresh.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\images\tastudio\ts_v_piano_04_blue.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\images\tastudio\ts_v_piano_18_blue.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -762,9 +765,6 @@ ..\images\tastudio\ts_h_piano_11_blue.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\images\tastudio\ts_v_piano_02_green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\images\BlueDown.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -819,11 +819,14 @@ ..\images\ppsspp.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\images\tastudio\ts_v_piano_08_blue.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\images\tastudio\ts_v_piano_19_blue.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\images\tastudio\ts_v_piano_02_green_blue.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\images\tastudio\ts_v_piano_00.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\images\tastudio\ts_h_piano_08_blue.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -858,9 +861,6 @@ ..\images\BlueUp.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\images\TurboFastForward.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\images\tastudio\ts_h_piano_16_blue.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -885,8 +885,14 @@ ..\images\tastudio\ts_v_piano_01_blue.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\images\tvIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\images\tastudio\ts_v_piano_11_blue.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\images\tastudio\ts_h_piano_12_green_blue.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\images\PrintPreviewHS.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\images\undo.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -897,8 +903,8 @@ ..\images\tastudio\ts_v_piano_08_green_blue.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\images\NESControllerIcon.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\images\whiteTriDown.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\images\atari_controller.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -912,9 +918,6 @@ ..\images\ControllerImages\psx_dualshock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\images\whiteTriDown.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\images\tastudio\ts_h_piano_05.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -1017,6 +1020,9 @@ ..\images\BlankCursor.cur;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\images\tastudio\ts_v_piano_01_green_blue.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\images\tastudio\ts_v_piano_07_blue.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -1062,6 +1068,9 @@ ..\images\tastudio\ts_v_piano_09_green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\images\tastudio\ts_h_piano_08.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\images\Cross.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -1086,9 +1095,6 @@ ..\images\tastudio\ts_h_piano_06_green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\images\tastudio\ts_v_piano_11_blue.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\images\Stop.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -1098,8 +1104,8 @@ ..\images\tastudio\ts_v_piano_06_green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\images\TAStudio.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\images\tastudio\ts_h_piano_07_green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\images\tastudio\ts_h_piano_00.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -1128,9 +1134,6 @@ ..\images\snes9x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\images\LightOn.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\images\Unfreeze.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -1152,6 +1155,9 @@ ..\images\tastudio\ts_h_piano_14_green_blue.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\images\TAStudio.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\images\ControllerImages\C64Keyboard.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -1164,14 +1170,14 @@ ..\images\MoveRight.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\images\tastudio\ts_v_piano_04_blue.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\images\tastudio\ts_h_piano_17.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\images\tastudio\ts_h_piano_15.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\images\tastudio\ts_v_piano_01_green_blue.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\images\ScrollTo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\images\tastudio\ts_v_piano_06.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -1191,8 +1197,8 @@ ..\images\QuickNes.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\images\tastudio\ts_h_piano_07_green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\images\ControllerImages\AppleIIKeyboard.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\images\tastudio\ts_h_piano_14.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -1239,14 +1245,14 @@ ..\images\Both.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\images\tastudio\ts_h_piano_08.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\images\LightOn.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\images\Duplicate.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\images\tastudio\ts_h_piano_17.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\images\JumpTo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\images\tastudio\ts_v_piano_06_blue.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -1302,8 +1308,8 @@ ..\images\controllerimages\saturncontroller.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\images\tastudio\ts_v_piano_00.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\images\tastudio\ts_v_piano_02_green_blue.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\images\InsertSeparator.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -1320,8 +1326,8 @@ ..\images\ControllerImages\SMSController.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\images\tastudio\ts_v_piano_08_blue.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\images\tvIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\images\tastudio\ts_v_piano_19_green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -1341,6 +1347,9 @@ ..\images\SaveConfig.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\images\Shark.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\images\tastudio\ts_h_piano_03_green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -1380,6 +1389,9 @@ ..\images\tastudio\ts_v_piano_03.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\images\NESControllerIcon.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\images\tastudio\ts_v_piano_00_blue.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -1398,9 +1410,6 @@ ..\images\tastudio\ts_h_piano_04_blue.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\images\kitchensink.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\images\tastudio\ts_h_piano_18.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -1467,8 +1476,8 @@ ..\images\tastudio\ts_v_piano_01.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\images\tastudio\ts_h_piano_12_green_blue.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\images\TurboFastForward.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\images\Freeze.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -1515,10 +1524,4 @@ ..\images\whiteTriUp.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\images\JumpTo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\images\ScrollTo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - \ No newline at end of file diff --git a/BizHawk.Client.EmuHawk/images/Shark.png b/BizHawk.Client.EmuHawk/images/Shark.png index c947ff138718a1e8d9a08653d0aaf9f462efbf42..e6ff5fb55bb06a13b46b9adfc9df5161ba432cdc 100644 GIT binary patch literal 3757 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 X?5GzET=mc;00000NkvXXu0mjf6>bkz literal 2233 zcmV;q2uAmbP)WdKuQbRaS}AVy_kATls9HXtxKIxsalF)|=6FgP$U?Hp{^00007bV*G` z2jBu55C$+y?FNPb000SaNLh0L01FZT01FZU(%pXi00004XF*Lt006O%3;baP000OO zNkloY0$NQc0-E+S4opVJ* zmhh}tu|jO$zI_KnLPFvyDk{3(zkiRBkr9lJj^e|I4`^?1f18$;R%B^ud4ztuVkxm^ zJd%=R8v!f+}zy1#>B+*96o&b)E5OeGBPr+s;YY5+1ZIpmo7m?Sq1B)w?Ng_4f|uW zaHOyUP8EF!tL{SXlNQu9G~vmUCwTn$F{-PpQCV4uva&Md=jY@0?b}dOQ)?6&aQpV{ z3e03>Ww!g(%4 zU}peepUcb3IRI~OZyY#qz|X+IKy-Fc`RwfMiWe_l{AFxxj1%hJyLXcV0|VTNw*DTN z1VqC%znQEBt_3al{$V@nTRYG}X{I{k*|TS8Y-|K^1o83la{%P!=7LCx^z`%xVq#)5 z0jyfJO8n%>lbx()3;<&@WA>XjZ!k181V*^>)*b{FHo-5i0mY3!p{u(KtSpqFX#h{3 zK1D-A!@L$?K!^2_b833Q#Wq3C_hQPqUhB?8ltgJkWi;J;k%T|~k7vRT?JO38|)^ZF$a&j`O zHwU3(@C^hvav?~`L+6VDL_|c4&Im3oEiFes{D+p777kEwpM*@fhF?QbN$G+BSa6nN z7MP{m-`}4DFxhX8vhoU?IdcXUo@d}2p9SB9EHrfVAT~C3at46t=;-?bfdCo?#_+k4 z3U4w&ObW6}{wNf{_3PK6s=f>1kx{U=wn1iQCQJ@}hm@2Q?6Yx1Ny&YDt+$8!^N#u1 z>f5_`Nv4C-slUz2%9@nfx(%M8G4Q?^55dJaB;6^*@bK^)0DXOZJlz%+mQdB*1J|<` z;U5wS6DvDdS=%Du`)e>gU=E*)Kfuw^5e~jV+~4mmCF1N!Yu0Zyyh?s;a7g>((vEEB_j9fg#*H0x#fc zTgRfifN4iTX*v8tqTm{Ep8H^by@JD$mVJ-9pbGf~`PjW%9}X_Ae1L7*wCN59Km#Vj z*47q>?49B4695;oq#rXd`WYP%)&*77H8^o9hOP0en$Ow1?6!T_+|x3I8) zs)iOU9bDjlHe_0ef`fyhuBpwxkBLh{ds`c%q@*h8@S-9#G{Qgs6uXh0j)l#!4L6D_FF(b3_=`?&-a(AL)FZF=R(6;}Jq8S+cS z`8`Y1+O=!3ZrwUcr!*(zLL8V)!kag5vNa3KmoI1S#Wo&JKxVWtb3o+#JuM*;GXQ96 zY93;WMufz&Wy_d0^SUk61&oAKb3ji|kH5!k$_F#n6-)!zZb9AlpY`k4|7Onk6&Dwm zAoTxcWct*Jr>7?mLMz#fjp#YC`0m}i@bdD4jEv0mJF|^(BqJk(&3rzRH*enT_1OiK zepC?_7B&MtGgcOsN?%`J`1tt1)YOza{#?*0V~1g>XGBz2SO2K2tX!#}pm5@|0O$o{ zLOW?^XSbkpVMg}`kgW5}u`J2S$^DZU@Ak{SxmrZnLn$xM$;lxpb>e*ZlE8H9f`fwt zn4&UXuxwGiN63ss7W+^KY$H`1FDNLWQJDxsLqpDJVS$yDl=zN66*wUw0g8%>lf;c| z;+Ev1gHJt_E?p|a7%e7ziOkE(Lu6zmJUl$u@Bo{bjGVMN@hcabeoS=OO^IqfNp03j zw*QL*fBH}zC3o)JnL|K6GRI8I*$J7bFjBEw5Bn}EDvIuYR*c;r33xFHjQNrR&wglB zZX>6m6rfsOUjEOtw1ECH`xjj(dMIcnUE2g3Hf-3ulsNwbzYh7Lh=P~x00000NkvXX Hu0mjfRka`^ diff --git a/BizHawk.Client.EmuHawk/tools/GameShark.resx b/BizHawk.Client.EmuHawk/tools/GameShark.resx index 45b6d9a8ef..906d7033e3 100644 --- a/BizHawk.Client.EmuHawk/tools/GameShark.resx +++ b/BizHawk.Client.EmuHawk/tools/GameShark.resx @@ -123,61 +123,97 @@ - AAABAAEAICAAAAEAGACoDAAAFgAAACgAAAAgAAAAQAAAAAEAGAAAAAAAAAAAAGAAAABgAAAAAAAAAAAA - AAD////+///+///+/////////////////////////////////////////////v/+///+//////////// - //////////////////////////////////////////////////////////////////////////////// - ///+/v77+/vq6urk5OTz8/P+/v7+/v7///////////////////////////////////////////////// - ///////////////////////////////////////+/v7k5OSJiYleXl5ERERGRkZFRUU5OTk4ODhNTU2R - kZHe3t7+/v7///////////////////////////////////////////////////////////////////// - ///6+vqSkpJra2uhoaG6urq9vb27u7u9vb3Dw8PFxcWwsLB9fX04ODhLS0u7u7v9/f3///////////// - ///////////////////////////////////////////////4+PiJiYmgoKCrq6tycnI7OzsZGRkHBwcG - BgYVFRUzMzNeXl6fn5/Ly8urq6tOTk5ERETMzMz///////////////////////////////////////// - //////////////+wsLCkpKRubm4QEBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhISF3d3fKysqu - rq45OTl3d3f4+Pj////////////////////////////////////////////u7u6fn59SUlIAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXFxeGhobV1dV5eXk+Pj7m5ub///////////// - //////////////////////////+9vb1ubm4BAQEAAAAAAAAAAAAVFRVBQUFFRUUlJSUDAwMAAAAAAAAA - AAAAAAAAAAAAAAABAQE5OTnCwsKoqKgzMzORkZHq6ur////////////////////////////5+fmenp4a - GhoAAAAAAAAaGhqcnJzf39/f39/c3Nza2trIyMiJiYlKSkoHBwcAAAAAAAAAAAAAAAAAAAAUFBSioqJx - cXGBgYHh4eH////////////////////////////i4uJ9fX0CAgIBAQERERHJycnj4+Ph4eHe3t7c3Nza - 2trY2NjW1tbT09PExMRzc3MZGRkAAAACAgICAgIBAQFNTU26urqfn589PT3z8/P///////////////// - ///////S0tJdXV0SERESERFvb2/l5eXj4+Ph4eHe3t7c3Nza2trY2NjW1tbT09PQ0NDOzs7GxsZ2dnYT - ExMLCwtLS0u9vb28u7urqqqgoKBiYmL+/v7////////////////////Nzc1SUlEmJCQmJCSamprl5eXj - 4+Ph4eHe3t7c3Nza2trY2NitrKyRkJCPjo6WlZWwsLDIyMi5ubliYmK7u7u/v7+dnJwzMTHLyspoaGix - sbH///////////////////+4uLhMS0s4NTQ4NTOQjo3l5eXj4+Ph4eHe3t7c3Nza2trY2NiCgoIvLy8W - FRQmJCQ3NDNJR0V8enizs7LBwcG/v79tbW04NTNdW1nb29tCQkL09PT////////////////S0tI/Pz8Z - GBgcGhlpaGjl5eXj4+Ph4eHe3t7c3Nza2trY2NjW1tbS0tK4uLhubm4gHx85NjNHQz9LR0Srqqm/v7+E - hIQxLitHQz+dnJmhoaGNjY3////////////////t7e3Z2dnk5OTh4eHn5+fl5eXj4+Ph4eHe3t7c3Nza - 2trY2NjW1tbT09PQ0NDOzs69vb1ISEg0MS1WUUl+e3W/v7+8vLw8OztPSkNdWFHZ2dhNTU34+Pj///// - ///////7+/uenp51c3HMy8nk5OTl5eXj4+Ph4eHe3t7c3Nza2trY2NjW1tbT09PQ0NDOzs7MzMzIyMhj - Y2NAOzVlXlSrqqe9vb2kpKQqKCZgWk+hnZecnJyrq6v////////////////Hx8c2NTRsZVd0bF+FfnLa - 2dnh4eHe3t7c3Nza2trY2NjW1tbT09PQ0NDOzs7MzMzIyMjGxcV3cmdvZ1p6c2a0s7K5ubmPj48qKCV0 - bWHe3d1paWn////////////////o6Oh1dXVLRTt6cWB6cWCinZHh4eHe3t7c3Nza2trY2NjW1tbT09PQ - 0NDOzs7MzMzAv72Ri354cF96cWB4cF+CemurqaS3traIiYgpJyS6uLVra2v9/f3////////////+/v7A - wMArKih9cl+GemSGemTEwbne3t7c3Nza2trY2NjW1tbNzc13d3eSjoWclISFemVuZVNiW06JfmlbVUeJ - fmpVTkKYkIGlop2Pj45nZmR7e3vh4eH////////////////p6emGhoY4MyqPgmePgmeUiG7Rz8rc3Nza - 2trY2NjW1tbT09O9vb1FRURHQTSVjHk9OzdzcW1sZFRbWlmKgWxWVVR+c1uPgmeQhGqkno61tbXFxcX/ - ///////////////////Pz89KSkpjWUWZimmZimiUinXc3Nza2trY2NjW1tbT09PQ0NDOzs6Tk5NPTk6o - qKiPj49KSUatra1RTD+tra5EPjSZimiZimirn4XFxcW9vb3////////////////////39/e6urooJyZ/ - clOMfl+6ubfc3Nza2trY2NjW1tbT09PQ0NDOzs7MzMzJycnGxsbCwsKdnZ2+vr5eXVy2trZvb29+cFKk - kmi2qIvJycnHx8f////////////////////////r6+upqakqKCa0s7He3t7c3Nza2trY2NjW1tbT09PQ - 0NDOzs7MzMzIyMjGxsbExMTBwcG/v7+srKyxsbG0tLRHQjitmWjEuJu9vr3m5ub///////////////// - ///////7+/uTk5O7u7vh4eHe3t7c3Nza2trY2NjV1dXS0tLQ0NDOzs7MzMzIyMjGxsbExMTBwcG/v7+8 - vLy5ubm2trZ6enqAcUzUzLm6urr+/v7////////////////////p6emHh4fU1NTj4+Ph4eHe3t7c3NzZ - 2trTz8LFsH7GtInPzcjOzs7MzMzIyMjGxsbExMTBwcG/v7+9vb25ubm2tratra1NST7k49/S0tL///// - ///////////////////5+fnr6+vl5eXj4+Ph4eHd3d3JyclVU0+Tf0vFqWDHqV/HrWvLwajLy8vIyMnG - xsbExMSIiIiPj4+9vb25ubm2traurq50dHSqqqry8vL////////////////////////////////9/f37 - +/v8/Pzu7u7Q0NCbm5ssLCw4MByTfkXLrFvOrlzNtXXKwajGxsXEw8Szs7O9vb29vb25ubm2traurq6j - o6NfX1/////////////////////////////////////////////////////6+vre3t7Pz8+RkZE3Njcg - GxBfUSqagkC9oE3RtWXNvY7BvK6/v7+8vLy5ubm2traurq6kpKRubm7k5OT///////////////////// - ///////////////////////////////////z8/Pe3t7W1ta4uLh7e3tEQ0MiIiIaGRcfHRokJCNaWlq9 - vb3U1NTOzs7MzMzNzc3U1NT+/v7///////////////////////////////////////////////////// - ///////////29vbn5+fc3Nzc3Nze3t7g4ODh4eHk5OTm5ubn5+fr6+v29vb///////////////////// - ///////////////////////////////////////////////////////////////////+/v739/fx8fHw - 8PDx8fHy8vL19fX7+/v///////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - //////////////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAH/AAAH/8AABwfgAAwA+AAAACAAAAAAAAAA + AAABAAIAEBAAAAAAIABoBAAAJgAAACAgAAAAACAAqBAAAI4EAAAoAAAAEAAAACAAAAABACAAAAAAAEAE + AAAAAAAAAAAAAAAAAAAAAAAA////Af///wEjIyMvVlZWpXFxcedycnL/bW1t8UtLS8EXFxdxFhYWE/// + /wH///8B////Af///wH///8B////Af///wFTU1NNi4uL92ZmZv84ODj/Jycn/zk5Of9lZWX/mpqa/2xs + bPEdHR15CwsLBf///wH///8B////Af///wEuLi4Rf39/6xYWFv8AAAD/AAAA/wAAAP8AAAD/AAAA/wEB + Af9GRkb/np6e/0RERMUVFRUZCAgIA////wH///8Bg4ODbyoqKv8AAAD/UFBQ/5qamv+Xl5f/YmJi/x8f + H/8AAAD/AAAA/wsLC/+Li4v/WFhY7R0dHTH///8B////AW1tba8HBwf/WFhY/+Li4v/e3t7/2tra/9bW + 1v/R0dH/l5eX/zAwMP8EBAT/UlJS/7S0tP9PT0/FBgYGBf///wFbW1vHKScm/5qZmf/j4+P/3t7e/9ra + 2v+6urr/bGtr/3t6ev+dnJz/ioqK/729vf9nZmb/oaGh/ywsLHf///8BZGNjx0tJSP+amZj/4+Pj/97e + 3v/a2tr/1dXV/66urv9qamr/NDIv/1dTUP+4uLf/XVxb/11ZVf+JiYnzEhISE56enoenpqT/2tnZ/+Li + 4f/e3t7/2tra/9bW1v/S0tL/zc3N/6enp/9LSEL/j4yH/6mpqf9GQz3/pqOf/zQ0NHVdXV01WlhU/3Rs + XP+wrKX/3t7e/9ra2v/W1tb/0tLS/83Nzf/CwsD/iYN2/3VtXf+in5j/kZGQ/2RgW/+BgYG/////AXNz + c8FjWkr/jIBp/8/NyP/a2tr/1tbW/76+vv9uamP/gHdl/2FaTv9sZVf/bmhZ/46GdP+GgXb/g4KB8f// + /wFzc3MzYV9d/Yt9X/+gl4P/2tra/9bW1v/S0tL/vr6+/4mIh/+Xl5f/g4KA/398d/9qY1P/mopo/6im + of////8B////AYqKin9iX1n/zs7M/9ra2v/W1tb/0tLS/83Nzf/IyMj/xMTE/729vf+np6f/iIiG/5uJ + Xf+vrqvp////AQgICAN9fX2b1NTU/97e3v/Z2dn/z8ay/8rBq//Mzcz/yMjI/8TExP+/v7//urq6/7Oz + s/+CfG3/tra2qf///wEfHx8Jv7+/acrKypG+vr6pk5OS/2VXNv+3m1X/y7V//8jDt//CwsL/m5ub/7q6 + uv+0tLT/gICA/3t7e0n///8B////Af///wH///8B////AZSUlE2oqKjdbm1r/19VOv9xXy//gHVU/3x6 + d/+6urr/uLi4/5ycnO81NTVL////Af///wH///8B////Af///wH///8BFBQUB6CgoFu3t7e1xMTE88fH + x//T09P3xMTEv6Ojo03///8B////AQAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA + //8AAP//AAD//wAA//8AAP//AAD//wAA//8oAAAAIAAAAEAAAAABACAAAAAAAIAQAAAAAAAAAAAAAAAA + AAAAAAAA////Af///wH///8B////Af///wH///8BDw8PHxYWFnsaGhq5ISEh5ykpKf8hISH/ISEh+RQU + FNEVFRWfGRkZZxERERv///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af// + /wH///8B////Af///wH///8B////Af///wH///8BCQkJFScnJ6NRUVH9hISE/7Gxsf+7u7v/vr6+/8DA + wP+/v7//sbGx/4GBgf9MTEz/Ghoa/RUVFa0WFhZH////Af///wH///8B////Af///wH///8B////Af// + /wH///8B////Af///wH///8B////Af///wH///8B////ARUVFTNRUVHjoKCg/7a2tv+np6f/f39//2Fh + Yf9PT0//UFBQ/2NjY/+CgoL/q6ur/8fHx//CwsL/hISE/ysrK/8XFxfHFxcXRf///wH///8B////Af// + /wH///8B////Af///wH///8B////Af///wH///8B////Af///wEODg4fa2tr5ampqf+Pj4//Ojo6/wQE + BP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/JCQk/2dnZ/+7u7v/zs7O/46Ojv8jIyP/GBgYowsL + CxX///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////AWNjY7Gjo6P/WFhY/wIC + Av8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wUFBf9UVFT/u7u7/87O + zv9oaGj/EBAQ4RAQEDv///8B////Af///wH///8B////Af///wH///8B////Af///wEuLi5Bnp6e/1FR + Uf8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA + AP8JCQn/cHBw/9LS0v+kpKT/HR0d9xUVFV////8BCAgICf///wH///8B////Af///wH///8B////AXFx + cbN8fHz/AQEB/wAAAP8AAAD/AAAA/w0NDf9FRUX/aWlp/2hoaP9CQkL/EhIS/wAAAP8AAAD/AAAA/wAA + AP8AAAD/AAAA/wAAAP8AAAD/Li4u/7y8vP/AwMD/Kysr/SUlJbciIiJd////Af///wH///8B////Af// + /wELCwsPmJiY+S4uLv8AAAD/AAAA/wEBAf9jY2P/0tLS/9/f3//d3d3/29vb/9jY2P/U1NT/pKSk/2Vl + Zf8YGBj/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/EhIS/56env9xcXH/kpKS/xoaGmX///8B////Af// + /wH///8B////AS8vL0mQkJD/AgIC/wEBAf8AAAD/bm5u/+Pj4//i4uL/4ODg/93d3f/b29v/2dnZ/9fX + 1//W1tb/0tLS/87Ozv+RkZH/NDQ0/wAAAP8AAAD/AQEB/wAAAP8AAAD/SkpK/7m5uf+qqqr/JiYm+xAQ + EDf///8B////Af///wH///8BSkpKc25ubv8NDQ3/Dg4O/xcXF//c3Nz/5OTk/+Li4v/g4OD/3d3d/9vb + 2//Z2dn/19fX/9bW1v/T09P/0dHR/87Ozv/MzMz/mJiY/yoqKv8EBAT/DAwM/0VFRf+8vLz/vLy8/7Ky + sv+4uLj/FxcX4QYGBg////8B////Af///wFYWFiJX19f/yEfH/8iICD/TEtL/+Xl5f/k5OT/4uLi/+Dg + 4P/d3d3/29vb/9nZ2f/X19f/0tHR/8LBwf+9vb3/wL+//8jIyP/Kysr/xcXF/3l5ef8yMjL/uLi4/76+ + vv+ysbH/MzEx/8nJyf+Ghob/FhYWn////wH///8B////AWBgYJNXV1f/MS4u/zEvLv9TUVD/5eXm/+Tk + 5P/i4uL/4ODg/93d3f/b29v/2dnZ/9fX1/9qamr/EhIS/x8dHf8vLCz/ODY2/1xaWf+KiYn/vLu7/8LC + wv/AwMD/vr6+/4iIiP8xLy7/V1ZV/+Dg4P9AQED/FRUVQf///wH///8BUFBQoyUkJP8uKyr/NjMx/zYz + Mf/b2tr/5OTk/+Li4v/g4OD/3d3d/9vb2//Z2dn/19fX/9PT0/+vr6//ampq/y4uLv8ZFxf/OTYz/0A9 + Ov9GQkD/f317/8DAwP++vr7/bm5u/zQxLv9BPDn/l5WT/8HBwf8fHx/P////Af///wFra2t9ra2t/21t + bf9bWlr/f35+/9nZ2f/k5OT/4uLi/+Dg4P/d3d3/29vb/9nZ2f/X19f/1tbW/9LS0v/Q0ND/zs7O/5WV + lf8mJSX/MjAt/01IQ/9NSEP/pqWj/76+vv+xsbH/IyIh/0xHQv9STkj/1NTT/11dXf8SEhJH////ASYm + JjO7u7v/3Nzc/+bm5v/m5ub/5eXl/+Pj4//i4uL/4ODg/93d3f/b29v/2dnZ/9fX1//W1tb/09PT/9HR + 0f/Ozs7/zMzM/8PDw/9KSkr/MC4p/1pUS/95dW7/vr6+/7y8vP92dnb/MS8r/1pUS/+QjIf/yMjJ/xYW + FrcCAgIDAgICA5ubm+c2NTP/paKc/8TCwP/a2tn/4eHh/+Li4f/g4OD/3d3d/9vb2//Z2dn/19fX/9bW + 1v/T09P/0dHR/87Ozv/MzMz/ysrK/8bGxv9ZWFj/TEc//2VfVP+ioJ3/vLy8/7i4uP9GRkb/R0M7/2dh + Vv/Z2Nf/T09P/Q8PDx3///8BcHBwn1BQUP9ZU0j/cGhZ/3BoWv+emZD/4eHi/+Dg4P/d3d3/29vb/9nZ + 2f/X19f/1tbW/9PT0//R0dH/zs7O/8zMzP/Kysr/x8fH/7q5t/9ya1z/cWha/3VuYP+urKn/ubm5/7Gx + sf81NDT/T0pA/62qo/+bm5v/DAwMYf///wEpKSk3mpqa/yglIf95cV//eXFf/3pxYf/KyMP/4ODg/93d + 3f/b29v/2dnZ/9fX1//W1tb/09PT/9HR0f/Ozs7/zMzM/8nJyf+xr6n/gXlq/3hwXv95cV//eHBe/312 + Zf+lopz/t7a2/6ipqP82NTX/XlpU/9ra2v8VFRWh////Af///wGQkJDFQUFB/2NaS/+FeGT/hXlj/5KI + dv/c29r/3d3d/9vb2//Z2dn/19fX/9bW1v/S0tL/kJCQ/46MiP+noZT/k4l3/29lU/+Ge2f/XVVH/4d8 + aP9aU0T/hntm/1VPQv+VjHz/pqOd/6alpf9TUlH/kI+P/z09PdP///8B////ATAwMD+goKD/HhwY/4d7 + Y/+NgGf/jIBm/6qhkP/c3Nz/29vb/9nZ2f/X19f/1tbW/9LS0v/FxcX/S0pK/zgzKf+AdV7/f3lu/1FM + Qf9QTkz/i4Nw/0ZFQv+KgGj/VlZW/3JpVP+MgGb/j4Rs/5OLeP/Jx8T/ampq8f///wH///8B////AYKC + gq9mZmb/QDku/5WGaP+Vhmf/lIdm/7OtoP/b29v/2dnZ/9fX1//W1tb/09PT/9HR0f/Ozs7/kZGR/ywr + Kf+Bf33/T05O/5+fn/9NSEH/lJSU/1ZPPv+ura3/ODQt/5WGZ/+Vh2f/lYdn/83Jv/99fX3/////Af// + /wH///8BFxcXHbS0tPUwMDD/ZltF/5+OaP+LfV7/r62r/9vb2//Z2dn/19fX/9bW1v/T09P/0dHR/87O + zv/MzMz/x8fH/7CwsP+6urr/t7e3/25ubv++vr7/RkRB/7KxsP9vb2//b2NK/6CNaf+gjmn/0MrA/4mJ + if////8B////Af///wH///8BTExMYaysrP8cGxv/ZltC/6Gemf/d3d3/29vb/9nZ2f/X19f/1tbW/9PT + 0//R0dH/zs7O/8zMzP/Kysr/x8fH/8XFxf/Dw8P/urq6/76+vv+SkpL/nZ2d/7S0tP88OTL/ppNm/6eU + Zv/Z1cz/fn5+4////wH///8B////Af///wH///8Benp6nXt7e/+NjY3/4ODg/93d3f/b29v/2dnZ/9fX + 1//W1tb/09PT/9HR0f/Ozs7/zMzM/8rKyv/Hx8f/xcXF/8PDw//AwMD/vr6+/7y8vP+0tLT/tra2/319 + ff9wY0P/sJto/+Pi3/9xcXHB////Af///wH///8B////AQcHBwsxMTGTqqqq/+Hh4f/g4OD/3d3d/9vb + 2//Z2dn/19fX/9PSz//OzMb/0NDR/87Ozv/MzMz/ysrK/8fHx//FxcX/w8PD/8DAwP++vr7/vLy8/7m5 + uf+3t7f/sLCw/0E9Nv+/rYL/5ubm/0NDQ3////8B////Af///wEICAgLXV1dzcnJyf/j4+P/4uLi/+Dg + 4P/d3d3/29vb/9jY2P/Qx7H/wqpx/8Cnav/Lwaz/zc7N/8zMzP/Kysr/x8fH/8XFxf/Dw8P/wMDA/76+ + vv+8vLz/ubm5/7e3t/+xsbH/d3d3/5KPh//c29z/FBQUK////wH///8B////AR8fHyGioqKz1dXV7ePj + 4//h4eH/39/f/9nZ2f+5ubn/ODYx/4JwQf/EqF7/xqhe/8apXv/JtYP/yse//8nJyv/Hx8f/xcXF/8HB + wf9ra2v/jY2N/7y8vP+5ubn/t7e3/7Gxsf+mpqf/S0tL/52dnbUGBgYD////Af///wH///8B////Af// + /wH///8BHx8fIx8fHyMZGRkdcnJyi8rKyv2VlZX/JCMk/yskFv+JdUD/x6lZ/82sW//NrmD/y7qP/8fE + vf/ExMX/v7+//7e3t/++vr7/vLy8/7m5uf+3t7f/sbGx/6ioqP9nZ2f/RUVFazk5OQP///8B////Af// + /wH///8B////Af///wH///8B////Af///wH///8BOzs7R7e3t+HMzMz/hISE/yYlJv8bFw7/X1Ap/6CJ + RP/KqlL/0rJY/825fP/Gvqb/wsC9/76+vv+8vLz/ubm5/7a2tv+wsLD/qKio/5ubm/8qKirB////Af// + /wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8BCQkJC3BwcIXKysrz09PT/6Wl + pf9eXl7/ICAg/woIBv8eGQ3/Ni4X/zowGP8lIRj/TUxM/6urq//Jycn/wsLC/7q6uv+mpqbvh4eH0UlJ + SWv///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////ARQU + FBdra2t/wsLC5djY2P/a2tr/yMnI/7W1tf+rq6v/r6+v/8LCwv/e3t7/5ubm/+bm5v/Hx8fbTk5OVf// + /wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af// + /wH///8B////Af///wEFBQUHPj4+R3l5eY2ysrLN4ODg/+Hh4f/i4uL/5eXl/8nJyd+cnJyrS0tLUwUF + BQX///8B////Af///wH///8B////AQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA== + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA \ No newline at end of file