NESHawk - fix mapper 164

This commit is contained in:
adelikat 2015-08-25 20:11:32 -04:00
parent d91c7a26df
commit defdfa6e2e
1 changed files with 22 additions and 16 deletions

View File

@ -6,8 +6,10 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
{ {
// http://wiki.nesdev.com/w/index.php/INES_Mapper_164 // http://wiki.nesdev.com/w/index.php/INES_Mapper_164
int prg_bank; private int _prgHigh;
int prg_bank_mask_32k; private int _prgLow;
private int prg_bank_mask_32k;
public override bool Configure(NES.EDetectionOrigin origin) public override bool Configure(NES.EDetectionOrigin origin)
{ {
@ -18,7 +20,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
default: default:
return false; return false;
} }
prg_bank = 0xFF;
_prgLow = 0xFF;
prg_bank_mask_32k = Cart.prg_size / 32 - 1; prg_bank_mask_32k = Cart.prg_size / 32 - 1;
SetMirrorType(Cart.pad_h, Cart.pad_v); SetMirrorType(Cart.pad_h, Cart.pad_v);
return true; return true;
@ -26,32 +29,35 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
public override void WriteEXP(int addr, byte value) public override void WriteEXP(int addr, byte value)
{ {
addr = (addr + 0x4000) & 0xF300; addr = (addr + 0x4000) & 0x7300;
if (addr == 0x5000 || addr == 0xD000) switch (addr)
prg_bank = value; {
} case 0x5000:
_prgLow = value;
public override void WritePRG(int addr, byte value) break;
{ case 0x5100:
addr = (addr + 0x8000) & 0xF300; _prgHigh = value;
if (addr == 0x5000 || addr == 0xD000) break;
prg_bank = value; }
} }
public override byte ReadPRG(int addr) public override byte ReadPRG(int addr)
{ {
return ROM[addr + ((prg_bank & prg_bank_mask_32k) * 0x8000)]; int bank = (_prgHigh << 4) | (_prgLow & 0xF);
bank &= prg_bank_mask_32k;
return ROM[(bank * 0x8000) + (addr & 0x7FFF)];
} }
public override void SyncState(Serializer ser) public override void SyncState(Serializer ser)
{ {
base.SyncState(ser); base.SyncState(ser);
ser.Sync("prg", ref prg_bank); ser.Sync("prgHigh", ref _prgHigh);
ser.Sync("prgLow", ref _prgLow);
} }
public override void NESSoftReset() public override void NESSoftReset()
{ {
prg_bank = 0xFF; _prgHigh = 0xFF;
base.NESSoftReset(); base.NESSoftReset();
} }
} }