diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/MMC3_family.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/MMC3_family.cs index 156d0e1a82..f170ceb3a5 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/MMC3_family.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/MMC3_family.cs @@ -392,9 +392,6 @@ namespace BizHawk.Emulation.Consoles.Nintendo public abstract class MMC3Board_Base : MMC3_Family_Board_Base { - //configuration - protected int wram_mask; - //state protected MMC3 mmc3; @@ -410,8 +407,6 @@ namespace BizHawk.Emulation.Consoles.Nintendo protected override void BaseSetup() { - wram_mask = (Cart.wram_size * 1024) - 1; - int num_prg_banks = Cart.prg_size / 8; mapper = mmc3 = new MMC3(this, num_prg_banks); diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/TxROM.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/TxROM.cs index f942d1fa80..5b3db1a88a 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/TxROM.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/MMC3_family/TxROM.cs @@ -26,19 +26,6 @@ namespace BizHawk.Emulation.Consoles.Nintendo } } - public override byte ReadWRAM(int addr) - { - if (Cart.wram_size != 0) - return WRAM[addr & wram_mask]; - else return 0xFF; - } - - public override void WriteWRAM(int addr, byte value) - { - if (Cart.wram_size != 0) - WRAM[addr & wram_mask] = value; - } - public override void SyncState(Serializer ser) { diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/SxROM.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/SxROM.cs index 3827eacea3..f09ca796f6 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/SxROM.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/SxROM.cs @@ -198,7 +198,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo { //configuration protected int prg_mask, chr_mask; - protected int vram_mask, wram_mask; + protected int vram_mask; //state protected MMC1 mmc1; @@ -244,24 +244,10 @@ namespace BizHawk.Emulation.Consoles.Nintendo else base.WritePPU(addr, value); } - public override byte ReadWRAM(int addr) - { - if (Cart.wram_size != 0) - return WRAM[addr & wram_mask]; - else return 0xFF; - } - - public override void WriteWRAM(int addr, byte value) - { - if (Cart.wram_size != 0) - WRAM[addr & wram_mask] = value; - } - public override void SyncState(Serializer ser) { base.SyncState(ser); mmc1.SyncState(ser); - } public override bool Configure(NES.EDetectionOrigin origin) @@ -345,7 +331,6 @@ namespace BizHawk.Emulation.Consoles.Nintendo mmc1 = new MMC1(this); prg_mask = (Cart.prg_size / 16) - 1; vram_mask = (Cart.vram_size*1024) - 1; - wram_mask = (Cart.wram_size*1024) - 1; chr_mask = (Cart.chr_size / 8 * 2) - 1; SetMirrorType(mmc1.mirror); }