From 3d443b3e2f5e78a05985e4d00032ca2ac02f1bab Mon Sep 17 00:00:00 2001 From: adelikat Date: Tue, 27 Jun 2017 21:06:36 -0500 Subject: [PATCH] Cheats - change button name from Game Genie to Code Converter. Cheat Code Converter - show a not supported message if user tries to enter a Game Genie code for SNES since we do not currently support that scenario --- BizHawk.Client.EmuHawk/tools/Cheats/Cheats.Designer.cs | 6 +++--- BizHawk.Client.EmuHawk/tools/GameShark.cs | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.Designer.cs b/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.Designer.cs index c8709a1964..7f2b1097f4 100644 --- a/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.Designer.cs +++ b/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.Designer.cs @@ -415,7 +415,7 @@ // this.OpenGameGenieEncoderDecoderMenuItem.Name = "OpenGameGenieEncoderDecoderMenuItem"; this.OpenGameGenieEncoderDecoderMenuItem.Size = new System.Drawing.Size(233, 22); - this.OpenGameGenieEncoderDecoderMenuItem.Text = "Game Genie Encoder/Decoder"; + this.OpenGameGenieEncoderDecoderMenuItem.Text = "Code Converter"; this.OpenGameGenieEncoderDecoderMenuItem.Click += new System.EventHandler(this.OpenGameGenieEncoderDecoderMenuItem_Click); // // OptionsSubMenu @@ -615,8 +615,8 @@ this.LoadGameGenieToolbarItem.ImageTransparentColor = System.Drawing.Color.Magenta; this.LoadGameGenieToolbarItem.Name = "LoadGameGenieToolbarItem"; this.LoadGameGenieToolbarItem.Size = new System.Drawing.Size(75, 22); - this.LoadGameGenieToolbarItem.Text = "Game Genie"; - this.LoadGameGenieToolbarItem.ToolTipText = "Open the Game Genie Encoder/Decoder"; + this.LoadGameGenieToolbarItem.Text = "Code Converter"; + this.LoadGameGenieToolbarItem.ToolTipText = "Open the Cheat Code Converter"; this.LoadGameGenieToolbarItem.Click += new System.EventHandler(this.OpenGameGenieEncoderDecoderMenuItem_Click); // // TotalLabel diff --git a/BizHawk.Client.EmuHawk/tools/GameShark.cs b/BizHawk.Client.EmuHawk/tools/GameShark.cs index 1bfa690c73..5cfa34325b 100644 --- a/BizHawk.Client.EmuHawk/tools/GameShark.cs +++ b/BizHawk.Client.EmuHawk/tools/GameShark.cs @@ -3187,8 +3187,9 @@ namespace BizHawk.Client.EmuHawk //Is this correct? if (GameGenie == true) { - var watch = Watch.GenerateWatch(MemoryDomains["CARTROM"], long.Parse(RAMAddress, NumberStyles.HexNumber), WatchSize.Byte, Common.DisplayType.Hex, false, txtDescription.Text); - Global.CheatList.Add(new Cheat(watch, int.Parse(RAMValue, NumberStyles.HexNumber))); + MessageBox.Show("Game genie codes are not currently supported for SNES", "SNES Game Genie not supported", MessageBoxButtons.OK, MessageBoxIcon.Error); + ////var watch = Watch.GenerateWatch(MemoryDomains["CARTROM"], long.Parse(RAMAddress, NumberStyles.HexNumber), WatchSize.Byte, Common.DisplayType.Hex, false, txtDescription.Text); + ////Global.CheatList.Add(new Cheat(watch, int.Parse(RAMValue, NumberStyles.HexNumber))); } else if (GameGenie == false) {