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

NES: fix a few problems were bad dumps were crashing mappers and such. actually fixes a game or two, too.

This commit is contained in:
goyuken 2014-01-17 22:55:48 +00:00
parent 9e6d364b18
commit 2370ab0886
9 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -257,7 +257,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
return (byte)attribute;
}
}
int nt = addr >> 10;
int nt = (addr >> 10) & 3; // &3 to read from the NT mirrors at 3xxx
int offset = addr & ((1<<10)-1);
nt = nt_modes[nt];
switch (nt)
@ -286,7 +286,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
else
{
addr -= 0x2000;
int nt = addr >> 10;
int nt = (addr >> 10) & 3; // &3 to read from the NT mirrors at 3xxx
int offset = addr & ((1 << 10) - 1);
nt = nt_modes[nt];
switch (nt)

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/IC_74x377.cs
View File

@ -45,6 +45,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
default:
return false;
}
AssertPrg(32, 64, 128);
AssertChr(8, 16, 32, 64, 128);
prg_bank_mask_32k = Cart.prg_size / 32 - 1;
chr_bank_mask_8k = Cart.chr_size / 8 - 1;

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/IREM-74_161_161_21_138.cs
View File

@ -16,8 +16,10 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
switch (Cart.board_type)
{
case "MAPPER077":
Cart.vram_size = 8;
break;
case "IREM-74*161/161/21/138":
AssertVram(8);
break;
default:
return false;

5
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper074.cs
View File

@ -1,4 +1,5 @@
//27
using System;
//27
//TODO - could merge functionality with 192 somehow
@ -19,6 +20,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
return false;
}
VRAM = new byte[2048];
if (Cart.chr_size == 0)
throw new Exception("Mapper074 carts MUST have chr rom!");
BaseSetup();
return true;
}

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper058.cs
View File

@ -50,6 +50,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
default:
return false;
}
AssertChr(8, 16, 32, 64);
AssertPrg(16, 32, 64, 128, 256);
SetMirrorType(EMirrorType.Vertical);

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

@ -98,10 +98,10 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
{
if (addr < 0x2000)
{
int bank_2k = (addr >> 11) - 1;
int bank_2k = (addr >> 11);
bank_2k = chr_regs_2k[bank_2k];
bank_2k &= chr_bank_mask_2k;
return VROM[(bank_2k * 0x800) + addr];
return VROM[(bank_2k * 0x800) + (addr & 0x7ff)];
}
return base.ReadPPU(addr);
}

6
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper61.cs
View File

@ -40,6 +40,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
public int prg_page;
public bool prg_mode;
public int prg_byte_mask;
public override bool Configure(NES.EDetectionOrigin origin)
{
@ -53,6 +54,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
SetMirrorType(EMirrorType.Vertical);
prg_page = 0;
prg_mode = false;
prg_byte_mask = Cart.prg_size * 1024 - 1;
return true;
}
@ -82,11 +84,11 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
{
if (prg_mode == false)
{
return ROM[((prg_page >> 1) * 0x8000) + addr];
return ROM[(((prg_page >> 1) * 0x8000) + addr) & prg_byte_mask];
}
else
{
return ROM[(prg_page * 0x4000) + (addr & 0x03FFF)];
return ROM[((prg_page * 0x4000) + (addr & 0x03FFF)) & prg_byte_mask];
}
}
}

10
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper076.cs
View File

@ -1,3 +1,6 @@
using BizHawk.Common;
namespace BizHawk.Emulation.Cores.Nintendo.NES
{
//aka NAMCOT-3446
@ -68,5 +71,12 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
else
return base.ReadPPU(addr);
}
public override void SyncState(BizHawk.Common.Serializer ser)
{
base.SyncState(ser);
ser.Sync("prg", ref prg, false);
ser.Sync("chr", ref chr, false);
ser.Sync("port", ref port);
}
}
}

1
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UxROM.cs
View File

@ -34,6 +34,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
switch (Cart.board_type)
{
case "MAPPER002":
AssertChr(0); Cart.vram_size = 8;
break;
case "NES-UNROM": //mega man