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

nes-fix m112 and some other unnecessary things

This commit is contained in:
zeromus 2012-07-16 22:01:10 +00:00
parent ad2e9267e3
commit 9c2a521c19
1 changed files with 24 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper112.cs
View File

@ -9,6 +9,9 @@ namespace BizHawk.Emulation.Consoles.Nintendo
{ {
//TODO: this doesn't work //TODO: this doesn't work
//configuration
int prg_bank_mask_8k;
//state //state
int reg_addr; int reg_addr;
int prg_mask, chr_mask; int prg_mask, chr_mask;
@ -29,21 +32,22 @@ namespace BizHawk.Emulation.Consoles.Nintendo
return false; return false;
} }
int num_prg_banks = Cart.prg_size / 8; prg_bank_mask_8k = (Cart.prg_size / 8) - 1;
prg_mask = num_prg_banks - 1;
int num_chr_banks = (Cart.chr_size); int num_chr_banks = (Cart.chr_size);
chr_mask = num_chr_banks - 1; chr_mask = num_chr_banks - 1;
SetMirrorType(EMirrorType.Vertical); SetMirrorType(EMirrorType.Vertical);
//regs[0] = 1; regs[0] = 0; //<-- its not always clear what mapper regs get initialized to. absent information, assume 0
//regs[1] = 1; regs[1] = 0;
Sync(); //<-- this was the critical part you left out. without this, prg_regs_8k[2] and prg_regs_8k[3] werent getting set
return true; return true;
} }
public void Dispose() public override void Dispose()
{ {
base.Dispose();
regs.Dispose(); regs.Dispose();
chr_regs_1k.Dispose(); chr_regs_1k.Dispose();
prg_regs_8k.Dispose(); prg_regs_8k.Dispose();
@ -51,6 +55,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo
public override void SyncState(Serializer ser) public override void SyncState(Serializer ser)
{ {
base.SyncState(ser); //any syncstate which doesnt call base is a BUG!!!!!!!!! im going to protect against this in the near future.
ser.Sync("reg_addr", ref reg_addr); ser.Sync("reg_addr", ref reg_addr);
ser.Sync("regs", ref regs); ser.Sync("regs", ref regs);
Sync(); Sync();
@ -58,9 +63,17 @@ namespace BizHawk.Emulation.Consoles.Nintendo
public override void WritePRG(int addr, byte value) public override void WritePRG(int addr, byte value)
{ {
//($8001-$9FFF, odd) Console.WriteLine("{0:X4} = {1:X2}", addr, value);
if (addr == 0x6000) switch (addr & 0x6001)
{ {
case 0x0000: //$8000
reg_addr = (value & 7);
break;
case 0x2000: //$A000
regs[reg_addr] = value;
Sync();
break;
case 0x6000:
if ((value & 1) == 0) if ((value & 1) == 0)
{ {
SetMirrorType(EMirrorType.Vertical); SetMirrorType(EMirrorType.Vertical);
@ -69,16 +82,6 @@ namespace BizHawk.Emulation.Consoles.Nintendo
{ {
SetMirrorType(EMirrorType.Horizontal); SetMirrorType(EMirrorType.Horizontal);
} }
}
switch (addr & 0x6001)
{
case 0x0000: //$8000
reg_addr = (value & 7);
break;
case 0x0001: //$8001
regs[reg_addr] = value;
Sync();
break; break;
} }
} }
@ -107,17 +110,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo
public int Get_PRGBank_8K(int addr) public int Get_PRGBank_8K(int addr)
{ {
//int bank_8k = addr >> 13; int bank_8k = addr >> 13;
int bank_8k;
if (addr < 0x8000)
bank_8k = 0;
else if (addr < 0xA000)
bank_8k = 1;
else if (addr < 0xC000)
bank_8k = 2;
else
bank_8k = 3;
bank_8k = prg_regs_8k[bank_8k]; bank_8k = prg_regs_8k[bank_8k];
return bank_8k; return bank_8k;
} }
@ -160,7 +153,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo
public override byte ReadPRG(int addr) public override byte ReadPRG(int addr)
{ {
int bank_8k = Get_PRGBank_8K(addr); int bank_8k = Get_PRGBank_8K(addr);
bank_8k &= prg_mask; bank_8k &= prg_bank_mask_8k;
addr = (bank_8k << 13) | (addr & 0x1FFF); addr = (bank_8k << 13) | (addr & 0x1FFF);
return ROM[addr]; return ROM[addr];
} }