diff --git a/BizHawk.Emulation/BizHawk.Emulation.csproj b/BizHawk.Emulation/BizHawk.Emulation.csproj
index cc04200b3e..9d387a75a1 100644
--- a/BizHawk.Emulation/BizHawk.Emulation.csproj
+++ b/BizHawk.Emulation/BizHawk.Emulation.csproj
@@ -76,6 +76,7 @@
Code
+
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/BoardSystem.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/BoardSystem.cs
index 59b0ebb516..bd9d57a69a 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/BoardSystem.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/BoardSystem.cs
@@ -5,6 +5,8 @@ using System.Globalization;
using System.IO;
using System.Collections.Generic;
+//TODO - consider bytebuffer for mirroring
+
namespace BizHawk.Emulation.Consoles.Nintendo
{
partial class NES
diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Irem_H3001.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Irem_H3001.cs
new file mode 100644
index 0000000000..98a6958be7
--- /dev/null
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Boards/Irem_H3001.cs
@@ -0,0 +1,145 @@
+using System;
+using System.IO;
+using System.Diagnostics;
+
+namespace BizHawk.Emulation.Consoles.Nintendo
+{
+ //AKA mapper 65
+
+ //Daiku no Gen San 2
+ //Spartan X 2
+
+ class Irem_H3001 : NES.NESBoardBase
+ {
+ //configuration
+ int prg_bank_mask, chr_bank_mask;
+
+ //state
+ ByteBuffer prg_regs_8k = new ByteBuffer(4);
+ ByteBuffer chr_regs_1k = new ByteBuffer(8);
+ bool irq_counter_enabled, irq_asserted;
+ ushort irq_counter, irq_reload;
+ int clock_counter;
+
+ public override bool Configure(NES.EDetectionOrigin origin)
+ {
+ //configure
+ switch (Cart.board_type)
+ {
+ case "IREM-H3001":
+ AssertPrg(128, 256); AssertChr(128, 256); AssertVram(0); AssertWram(0);
+ break;
+ default:
+ return false;
+ }
+
+ prg_bank_mask = Cart.prg_size / 8 - 1;
+ chr_bank_mask = Cart.chr_size - 1;
+
+ prg_regs_8k[0] = 0x00;
+ prg_regs_8k[1] = 0x01;
+ prg_regs_8k[2] = 0xFE;
+ prg_regs_8k[3] = 0xFF; //constant
+ return true;
+ }
+
+ public override void Dispose()
+ {
+ prg_regs_8k.Dispose();
+ chr_regs_1k.Dispose();
+ }
+
+ public override void ClockPPU()
+ {
+ clock_counter++;
+ if (clock_counter == 3)
+ {
+ ClockCPU();
+ clock_counter = 0;
+ }
+ }
+
+ void ClockCPU()
+ {
+ if(irq_counter==0) return;
+ if(!irq_counter_enabled) return;
+ irq_counter--;
+ if (irq_counter != 0) return;
+ irq_asserted = true;
+ SyncIRQ();
+ }
+
+ void SyncIRQ()
+ {
+ NES.irq_cart = irq_asserted;
+ }
+
+ public override byte ReadPRG(int addr)
+ {
+ int bank_8k = addr >> 13;
+ int ofs = addr & ((1 << 13) - 1);
+ bank_8k = prg_regs_8k[bank_8k];
+ bank_8k &= prg_bank_mask;
+ addr = (bank_8k << 13) | ofs;
+ return ROM[addr];
+ }
+
+ public override byte ReadPPU(int addr)
+ {
+ if (addr < 0x2000)
+ {
+ int bank_1k = addr >> 10;
+ int ofs = addr & ((1 << 10) - 1);
+ bank_1k = chr_regs_1k[bank_1k];
+ bank_1k &= chr_bank_mask;
+ addr = (bank_1k << 10) | ofs;
+ return VROM[addr];
+ }
+ else
+ return base.ReadPPU(addr);
+ }
+
+ public override void WritePRG(int addr, byte value)
+ {
+ switch (addr)
+ {
+ case 0x0000: //$8000: PRG Reg 0 (8k @ $8000)
+ prg_regs_8k[0] = value;
+ break;
+ case 0x2000: //$A000: PRG Reg 1 (8k @ $A000)
+ prg_regs_8k[1] = value;
+ break;
+ case 0x4000: //$C000: PRG Reg 2 (8k @ $C000)
+ prg_regs_8k[2] = value;
+ break;
+
+ case 0x1001: //$9001: [M... ....] Mirroring
+ if ((value & 0x80) == 0) SetMirrorType(EMirrorType.Vertical);
+ else SetMirrorType(EMirrorType.Horizontal);
+ break;
+ case 0x1003: //$9003: [E... ....] IRQ Enable (0=disabled, 1=enabled)
+ irq_counter_enabled = (value & 0x80) != 0;
+ irq_asserted = false;
+ SyncIRQ();
+ break;
+ case 0x1004: //$9004: [.... ....] Reload IRQ counter
+ irq_counter = irq_reload;
+ irq_asserted = false;
+ SyncIRQ();
+ break;
+ case 0x1005: //$9005: [IIII IIII] High 8 bits of IRQ Reload value
+ irq_reload = (ushort)((irq_reload & 0x00FF) | (value << 8));
+ break;
+ case 0x1006: //$9006: [IIII IIII] Low 8 bits of IRQ Reload value
+ irq_reload = (ushort)((irq_reload & 0xFF00) | (value));
+ break;
+
+ //$B000-$B007: CHR regs
+ case 0x3000: case 0x3001: case 0x3002: case 0x3003:
+ case 0x3004: case 0x3005: case 0x3006: case 0x3007:
+ chr_regs_1k[addr - 0x3000] = value;
+ break;
+ }
+ }
+ }
+}
\ No newline at end of file
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 a452433958..4e0f0f2b42 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
@@ -10,6 +10,8 @@
//mappers handled by this:
//004,095,118,119,206
+//TODO - redo this with the 0xFF bank idea from Sunsoft-4
+
using System;
using System.IO;
using System.Diagnostics;