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

NES: fix CPROM with bad dumps. also fix small mainform menu bug with core selection

This commit is contained in:
goyuken 2014-01-18 15:36:35 +00:00
parent 1f7f5fb6d4
commit 77e87688c3
3 changed files with 33 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
BizHawk.Client.EmuHawk/MainForm.Designer.cs generated
View File

@ -1334,7 +1334,7 @@
//
this.ControllersMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.GameController;
this.ControllersMenuItem.Name = "ControllersMenuItem";
this.ControllersMenuItem.Size = new System.Drawing.Size(150, 22);
this.ControllersMenuItem.Size = new System.Drawing.Size(152, 22);
this.ControllersMenuItem.Text = "&Controllers...";
this.ControllersMenuItem.Click += new System.EventHandler(this.ControllersMenuItem_Click);
//
@ -1342,7 +1342,7 @@
//
this.HotkeysMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.HotKeys;
this.HotkeysMenuItem.Name = "HotkeysMenuItem";
this.HotkeysMenuItem.Size = new System.Drawing.Size(150, 22);
this.HotkeysMenuItem.Size = new System.Drawing.Size(152, 22);
this.HotkeysMenuItem.Text = "&Hotkeys...";
this.HotkeysMenuItem.Click += new System.EventHandler(this.HotkeysMenuItem_Click);
//
@ -1350,7 +1350,7 @@
//
this.MessagesMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.MessageConfig;
this.MessagesMenuItem.Name = "MessagesMenuItem";
this.MessagesMenuItem.Size = new System.Drawing.Size(150, 22);
this.MessagesMenuItem.Size = new System.Drawing.Size(152, 22);
this.MessagesMenuItem.Text = "&Messages...";
this.MessagesMenuItem.Click += new System.EventHandler(this.MessagesMenuItem_Click);
//
@ -1358,7 +1358,7 @@
//
this.PathsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.CopyFolderHS;
this.PathsMenuItem.Name = "PathsMenuItem";
this.PathsMenuItem.Size = new System.Drawing.Size(150, 22);
this.PathsMenuItem.Size = new System.Drawing.Size(152, 22);
this.PathsMenuItem.Text = "Paths...";
this.PathsMenuItem.Click += new System.EventHandler(this.PathsMenuItem_Click);
//
@ -1366,7 +1366,7 @@
//
this.SoundMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.AudioHS;
this.SoundMenuItem.Name = "SoundMenuItem";
this.SoundMenuItem.Size = new System.Drawing.Size(150, 22);
this.SoundMenuItem.Size = new System.Drawing.Size(152, 22);
this.SoundMenuItem.Text = "&Sound...";
this.SoundMenuItem.Click += new System.EventHandler(this.SoundMenuItem_Click);
//
@ -1374,7 +1374,7 @@
//
this.AutofireMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Lightning;
this.AutofireMenuItem.Name = "AutofireMenuItem";
this.AutofireMenuItem.Size = new System.Drawing.Size(150, 22);
this.AutofireMenuItem.Size = new System.Drawing.Size(152, 22);
this.AutofireMenuItem.Text = "&Autofire...";
this.AutofireMenuItem.Click += new System.EventHandler(this.AutofireMenuItem_Click);
//
@ -1382,21 +1382,21 @@
//
this.RewindOptionsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Previous;
this.RewindOptionsMenuItem.Name = "RewindOptionsMenuItem";
this.RewindOptionsMenuItem.Size = new System.Drawing.Size(150, 22);
this.RewindOptionsMenuItem.Size = new System.Drawing.Size(152, 22);
this.RewindOptionsMenuItem.Text = "&Rewind...";
this.RewindOptionsMenuItem.Click += new System.EventHandler(this.RewindOptionsMenuItem_Click);
//
// FirmwaresMenuItem
//
this.FirmwaresMenuItem.Name = "FirmwaresMenuItem";
this.FirmwaresMenuItem.Size = new System.Drawing.Size(150, 22);
this.FirmwaresMenuItem.Size = new System.Drawing.Size(152, 22);
this.FirmwaresMenuItem.Text = "&Firmwares";
this.FirmwaresMenuItem.Click += new System.EventHandler(this.FirmwaresMenuItem_Click);
//
// toolStripSeparator9
//
this.toolStripSeparator9.Name = "toolStripSeparator9";
this.toolStripSeparator9.Size = new System.Drawing.Size(147, 6);
this.toolStripSeparator9.Size = new System.Drawing.Size(149, 6);
//
// ConfigEnableSubMenu
//
@ -1408,7 +1408,7 @@
this.FrameAdvanceSkipLagMenuItem,
this.BackupSaveramMenuItem});
this.ConfigEnableSubMenu.Name = "ConfigEnableSubMenu";
this.ConfigEnableSubMenu.Size = new System.Drawing.Size(150, 22);
this.ConfigEnableSubMenu.Size = new System.Drawing.Size(152, 22);
this.ConfigEnableSubMenu.Text = "&Enable";
this.ConfigEnableSubMenu.DropDownOpened += new System.EventHandler(this.EnableMenuItem_DropDownOpened);
//
@ -1472,7 +1472,7 @@
this.toolStripSeparator23,
this.LogWindowAsConsoleMenuItem});
this.GuiSubMenu.Name = "GuiSubMenu";
this.GuiSubMenu.Size = new System.Drawing.Size(150, 22);
this.GuiSubMenu.Size = new System.Drawing.Size(152, 22);
this.GuiSubMenu.Text = "GUI";
this.GuiSubMenu.DropDownOpened += new System.EventHandler(this.GuiSubMenu_DropDownOpened);
//
@ -1597,7 +1597,7 @@
this.Speed150MenuItem,
this.Speed200MenuItem});
this.SpeedSkipSubMenu.Name = "SpeedSkipSubMenu";
this.SpeedSkipSubMenu.Size = new System.Drawing.Size(150, 22);
this.SpeedSkipSubMenu.Size = new System.Drawing.Size(152, 22);
this.SpeedSkipSubMenu.Text = "Speed/Skip";
this.SpeedSkipSubMenu.DropDownOpened += new System.EventHandler(this.FrameSkipMenuItem_DropDownOpened);
//
@ -1763,7 +1763,7 @@
this.InputOverHkMenuItem,
this.HkOverInputMenuItem});
this.KeyPrioritySubMenu.Name = "KeyPrioritySubMenu";
this.KeyPrioritySubMenu.Size = new System.Drawing.Size(150, 22);
this.KeyPrioritySubMenu.Size = new System.Drawing.Size(152, 22);
this.KeyPrioritySubMenu.Text = "Key Priority";
this.KeyPrioritySubMenu.DropDownOpened += new System.EventHandler(this.KeyPriorityMenuItem_DropDownOpened);
//
@ -1795,41 +1795,41 @@
this.SavestateBinaryMenuItem,
this.SavestateTextMenuItem});
this.SavestateTypeSubMenu.Name = "SavestateTypeSubMenu";
this.SavestateTypeSubMenu.Size = new System.Drawing.Size(150, 22);
this.SavestateTypeSubMenu.Size = new System.Drawing.Size(152, 22);
this.SavestateTypeSubMenu.Text = "Savestate Type";
this.SavestateTypeSubMenu.DropDownOpened += new System.EventHandler(this.SavestateTypeMenuItem_DropDownOpened);
//
// SavestateTypeDefaultMenuItem
//
this.SavestateTypeDefaultMenuItem.Name = "SavestateTypeDefaultMenuItem";
this.SavestateTypeDefaultMenuItem.Size = new System.Drawing.Size(109, 22);
this.SavestateTypeDefaultMenuItem.Size = new System.Drawing.Size(152, 22);
this.SavestateTypeDefaultMenuItem.Text = "Default";
this.SavestateTypeDefaultMenuItem.Click += new System.EventHandler(this.SavestateTypeDefaultMenuItem_Click);
//
// SavestateBinaryMenuItem
//
this.SavestateBinaryMenuItem.Name = "SavestateBinaryMenuItem";
this.SavestateBinaryMenuItem.Size = new System.Drawing.Size(109, 22);
this.SavestateBinaryMenuItem.Size = new System.Drawing.Size(152, 22);
this.SavestateBinaryMenuItem.Text = "Binary";
this.SavestateBinaryMenuItem.Click += new System.EventHandler(this.SavestateBinaryMenuItem_Click);
//
// SavestateTextMenuItem
//
this.SavestateTextMenuItem.Name = "SavestateTextMenuItem";
this.SavestateTextMenuItem.Size = new System.Drawing.Size(109, 22);
this.SavestateTextMenuItem.Size = new System.Drawing.Size(152, 22);
this.SavestateTextMenuItem.Text = "Text";
this.SavestateTextMenuItem.Click += new System.EventHandler(this.SavestateTextMenuItem_Click);
//
// toolStripSeparator10
//
this.toolStripSeparator10.Name = "toolStripSeparator10";
this.toolStripSeparator10.Size = new System.Drawing.Size(147, 6);
this.toolStripSeparator10.Size = new System.Drawing.Size(149, 6);
//
// SaveConfigMenuItem
//
this.SaveConfigMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Save;
this.SaveConfigMenuItem.Name = "SaveConfigMenuItem";
this.SaveConfigMenuItem.Size = new System.Drawing.Size(150, 22);
this.SaveConfigMenuItem.Size = new System.Drawing.Size(152, 22);
this.SaveConfigMenuItem.Text = "Save Config";
this.SaveConfigMenuItem.Click += new System.EventHandler(this.SaveConfigMenuItem_Click);
//
@ -1837,14 +1837,14 @@
//
this.LoadConfigMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.LoadConfig;
this.LoadConfigMenuItem.Name = "LoadConfigMenuItem";
this.LoadConfigMenuItem.Size = new System.Drawing.Size(150, 22);
this.LoadConfigMenuItem.Size = new System.Drawing.Size(152, 22);
this.LoadConfigMenuItem.Text = "Load Config";
this.LoadConfigMenuItem.Click += new System.EventHandler(this.LoadConfigMenuItem_Click);
//
// toolStripSeparator8
//
this.toolStripSeparator8.Name = "toolStripSeparator8";
this.toolStripSeparator8.Size = new System.Drawing.Size(147, 6);
this.toolStripSeparator8.Size = new System.Drawing.Size(149, 6);
//
// coreSelectionToolStripMenuItem
//
@ -1852,8 +1852,9 @@
this.gBInSGBToolStripMenuItem,
this.nESInQuickNESToolStripMenuItem});
this.coreSelectionToolStripMenuItem.Name = "coreSelectionToolStripMenuItem";
this.coreSelectionToolStripMenuItem.Size = new System.Drawing.Size(150, 22);
this.coreSelectionToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.coreSelectionToolStripMenuItem.Text = "Core Selection";
this.coreSelectionToolStripMenuItem.DropDownOpened += new System.EventHandler(this.coreSelectionToolStripMenuItem_DropDownOpened);
this.coreSelectionToolStripMenuItem.Click += new System.EventHandler(this.coreSelectionToolStripMenuItem_Click);
//
// gBInSGBToolStripMenuItem

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

@ -3036,8 +3036,6 @@ namespace BizHawk.Client.EmuHawk
private void coreSelectionToolStripMenuItem_Click(object sender, EventArgs e)
{
gBInSGBToolStripMenuItem.Checked = Global.Config.GB_AsSGB;
nESInQuickNESToolStripMenuItem.Checked = Global.Config.NES_InQuickNES;
}
private void gBInSGBToolStripMenuItem_Click(object sender, EventArgs e)
@ -3054,5 +3052,11 @@ namespace BizHawk.Client.EmuHawk
{
new BatchRun().ShowDialog();
}
private void coreSelectionToolStripMenuItem_DropDownOpened(object sender, EventArgs e)
{
gBInSGBToolStripMenuItem.Checked = Global.Config.GB_AsSGB;
nESInQuickNESToolStripMenuItem.Checked = Global.Config.NES_InQuickNES;
}
}
}

4
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/CPROM.cs
View File

@ -15,6 +15,10 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
switch (Cart.board_type)
{
case "MAPPER013":
AssertPrg(32);
AssertChr(0);
Cart.vram_size = 16;
Cart.wram_size = 0;
break;
case "NES-CPROM": //videomation