ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add Geneis Game Genie to toolbox, and re-enable the feature but INTERIM flag it

This commit is contained in:
adelikat 2013-12-22 20:38:36 +00:00
parent 2448ad0dda
commit 7acc64c37e
4 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BizHawk.Client.EmuHawk/MainForm.cs
View File

@ -709,12 +709,10 @@ namespace BizHawk.Client.EmuHawk
{ {
GlobalWin.Tools.Load<GBGameGenie>(); GlobalWin.Tools.Load<GBGameGenie>();
} }
/* adelikat: Genesis decoding doesn't seem to work yet else if (Global.Emulator.SystemId == "GEN" && VersionInfo.INTERIM)
else if (Global.Emulator.SystemId == "GEN")
{ {
GlobalWin.Tools.Load<GenGameGenie>(); GlobalWin.Tools.Load<GenGameGenie>();
} }
*/
} }
public void LoadTraceLogger() public void LoadTraceLogger()

2
BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs
View File

@ -200,7 +200,7 @@ namespace BizHawk.Client.EmuHawk
GameGenieToolbarSeparator.Visible = GameGenieToolbarSeparator.Visible =
LoadGameGenieToolbarItem.Visible = LoadGameGenieToolbarItem.Visible =
((Global.Emulator is NES) ((Global.Emulator is NES)
/*|| (Global.Emulator.SystemId == "GEN")*/ || (Global.Emulator.SystemId == "GEN" && VersionInfo.INTERIM)
|| (Global.Emulator.SystemId == "GB") || (Global.Emulator.SystemId == "GB")
|| (Global.Game.System == "GG") || (Global.Game.System == "GG")
|| (Global.Emulator is LibsnesCore)); || (Global.Emulator is LibsnesCore));

15
BizHawk.Client.EmuHawk/tools/ToolBox.Designer.cs generated
View File

@ -49,6 +49,7 @@
this.GBGameGenieToolbarItem = new System.Windows.Forms.ToolStripButton(); this.GBGameGenieToolbarItem = new System.Windows.Forms.ToolStripButton();
this.PceBgViewerToolbarItem = new System.Windows.Forms.ToolStripButton(); this.PceBgViewerToolbarItem = new System.Windows.Forms.ToolStripButton();
this.GbaGpuViewerToolBarItem = new System.Windows.Forms.ToolStripButton(); this.GbaGpuViewerToolBarItem = new System.Windows.Forms.ToolStripButton();
this.GenesisGameGenieToolBarItem = new System.Windows.Forms.ToolStripButton();
this.ToolBoxStrip.SuspendLayout(); this.ToolBoxStrip.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
@ -81,7 +82,8 @@
this.GbGpuViewerToolBarItem, this.GbGpuViewerToolBarItem,
this.GBGameGenieToolbarItem, this.GBGameGenieToolbarItem,
this.PceBgViewerToolbarItem, this.PceBgViewerToolbarItem,
this.GbaGpuViewerToolBarItem}); this.GbaGpuViewerToolBarItem,
this.GenesisGameGenieToolBarItem});
this.ToolBoxStrip.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.Flow; this.ToolBoxStrip.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.Flow;
this.ToolBoxStrip.Location = new System.Drawing.Point(2, 2); this.ToolBoxStrip.Location = new System.Drawing.Point(2, 2);
this.ToolBoxStrip.Name = "ToolBoxStrip"; this.ToolBoxStrip.Name = "ToolBoxStrip";
@ -273,6 +275,16 @@
this.GbaGpuViewerToolBarItem.ToolTipText = "Gameboy Advance Gpu Viewer"; this.GbaGpuViewerToolBarItem.ToolTipText = "Gameboy Advance Gpu Viewer";
this.GbaGpuViewerToolBarItem.Click += new System.EventHandler(this.GbaGpuViewerToolBarItem_Click); this.GbaGpuViewerToolBarItem.Click += new System.EventHandler(this.GbaGpuViewerToolBarItem_Click);
// //
// GenesisGameGenieToolBarItem
//
this.GenesisGameGenieToolBarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.GenesisControllerIcon;
this.GenesisGameGenieToolBarItem.ImageTransparentColor = System.Drawing.Color.Magenta;
this.GenesisGameGenieToolBarItem.Name = "GenesisGameGenieToolBarItem";
this.GenesisGameGenieToolBarItem.Size = new System.Drawing.Size(43, 20);
this.GenesisGameGenieToolBarItem.Text = "GG";
this.GenesisGameGenieToolBarItem.ToolTipText = "Genesis Game Genie Encoder/Decoder";
this.GenesisGameGenieToolBarItem.Click += new System.EventHandler(this.GenesisGameGenieToolBarItem_Click);
//
// ToolBox // ToolBox
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@ -313,6 +325,7 @@
private System.Windows.Forms.ToolStripButton GBGameGenieToolbarItem; private System.Windows.Forms.ToolStripButton GBGameGenieToolbarItem;
private System.Windows.Forms.ToolStripButton GbGpuViewerToolBarItem; private System.Windows.Forms.ToolStripButton GbGpuViewerToolBarItem;
private System.Windows.Forms.ToolStripButton GbaGpuViewerToolBarItem; private System.Windows.Forms.ToolStripButton GbaGpuViewerToolBarItem;
private System.Windows.Forms.ToolStripButton GenesisGameGenieToolBarItem;
} }
} }

7
BizHawk.Client.EmuHawk/tools/ToolBox.cs
View File

@ -68,6 +68,8 @@ namespace BizHawk.Client.EmuHawk
GbaGpuViewerToolBarItem.Visible = Global.Emulator is GBA; GbaGpuViewerToolBarItem.Visible = Global.Emulator is GBA;
GenesisGameGenieToolBarItem.Visible = Global.Emulator.SystemId == "GEN" && VersionInfo.INTERIM;
foreach (var button in ToolBoxItems) foreach (var button in ToolBoxItems)
{ {
if (button.Visible) if (button.Visible)
@ -207,6 +209,11 @@ namespace BizHawk.Client.EmuHawk
GlobalWin.Tools.Load<GBAGPUView>(); GlobalWin.Tools.Load<GBAGPUView>();
} }
private void GenesisGameGenieToolBarItem_Click(object sender, EventArgs e)
{
GlobalWin.Tools.Load<GenGameGenie>();
}
#endregion #endregion
} }
} }