Fix Mapper 243

This commit is contained in:
alyosha-tas 2016-10-22 12:57:51 -04:00 committed by GitHub
parent 542db672b6
commit 52d26cb740
1 changed files with 99 additions and 37 deletions

View File

@ -7,6 +7,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
// http://wiki.nesdev.com/w/index.php/INES_Mapper_243 // http://wiki.nesdev.com/w/index.php/INES_Mapper_243
int reg_addr; int reg_addr;
bool var_a;
ByteBuffer regs = new ByteBuffer(8); ByteBuffer regs = new ByteBuffer(8);
int chr_bank_mask_8k, prg_bank_mask_32k; int chr_bank_mask_8k, prg_bank_mask_32k;
@ -15,7 +16,9 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
switch (Cart.board_type) switch (Cart.board_type)
{ {
case "MAPPER243": case "MAPPER243":
break;
case "UNIF_UNL-Sachen-74LS374N": case "UNIF_UNL-Sachen-74LS374N":
var_a = true;
break; break;
default: default:
return false; return false;
@ -40,55 +43,114 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
reg_addr = value & 0x07; reg_addr = value & 0x07;
break; break;
case 0x0001: case 0x0001:
switch (reg_addr) if (var_a)
{ {
case 2: switch (reg_addr)
regs[2] = (byte)(value & 0x01); {
break; case 0:
case 4: // set prg bank to 0
regs[4] = (byte)(value & 0x01); regs[5] = 0;
break; // set chr bank to 3
case 5: regs[2] = 0;
regs[5] = (byte)(value & 0x07); regs[4] = 3;
break; regs[6] = 0;
case 6: break;
regs[6] = (byte)(value & 0x03); case 2:
break; regs[2] = (byte)(value & 0x01);
case 7: break;
int mirror = (value >> 1) & 0x03; case 4:
switch (mirror) regs[4] = (byte)(value & 0x01);
{ break;
case 0: case 5:
SetMirrorType(EMirrorType.Horizontal); regs[5] = (byte)(value & 0x07);
break; break;
case 1: case 6:
SetMirrorType(EMirrorType.Vertical); regs[6] = (byte)(value & 0x03);
break; break;
case 2: case 7:
SetMirroring(0, 1, 1, 1); int mirror = value & 1;
break; switch (mirror)
case 3: {
SetMirrorType(EMirrorType.OneScreenB); case 0:
break; SetMirrorType(EMirrorType.Horizontal);
} break;
break; case 1:
SetMirrorType(EMirrorType.Vertical);
break;
}
break;
}
break;
}
else
{
switch (reg_addr)
{
case 2:
regs[2] = (byte)(value & 0x01);
regs[5] = (byte)(value & 0x01);
break;
case 4:
regs[4] = (byte)(value & 0x01);
break;
case 5:
regs[5] = (byte)(value & 0x07);
break;
case 6:
regs[6] = (byte)(value & 0x03);
break;
case 7:
int mirror = (value >> 1) & 0x03;
switch (mirror)
{
case 0:
SetMirrorType(EMirrorType.Horizontal);
break;
case 1:
SetMirrorType(EMirrorType.Vertical);
break;
case 2:
SetMirroring(0, 1, 1, 1);
break;
case 3:
SetMirrorType(EMirrorType.OneScreenA);
break;
}
break;
}
break;
} }
break;
} }
} }
public override byte ReadPPU(int addr) public override byte ReadPPU(int addr)
{ {
if (addr < 0x2000) if (var_a)
{ {
int chr_bank = regs[4] << 2 | (regs[6]) | (regs[2] << 3); if (addr < 0x2000)
{
int chr_bank = regs[4] | (regs[6] << 1) | (regs[2] << 3);
return VROM[((chr_bank & chr_bank_mask_8k) * 0x2000) + addr]; return VROM[((chr_bank & chr_bank_mask_8k) * 0x2000) + addr];
}
else
{
return base.ReadPPU(addr);
}
} }
else else
{ {
return base.ReadPPU(addr); if (addr < 0x2000)
} {
int chr_bank = (regs[4] << 2) | (regs[6]) | (regs[2] << 3);
return VROM[((chr_bank & chr_bank_mask_8k) * 0x2000) + addr];
}
else
{
return base.ReadPPU(addr);
}
}
} }
public override byte ReadPRG(int addr) public override byte ReadPRG(int addr)