diff --git a/src/boards/bmc64in1nr.c b/src/boards/bmc64in1nr.c index 88c46cf..7013765 100644 --- a/src/boards/bmc64in1nr.c +++ b/src/boards/bmc64in1nr.c @@ -31,7 +31,7 @@ static SFORMAT StateRegs[] = }; static void Sync(void) { - if (regs[0] & 0x80) { + if (regs[0] & 0x80) { /* NROM mode */ if (regs[1] & 0x80) setprg32(0x8000, regs[1] & 0x1F); else { @@ -39,9 +39,9 @@ static void Sync(void) { setprg16(0x8000, bank); setprg16(0xC000, bank); } - } else { - int bank = ((regs[1] & 0x1f) << 1) | ((regs[1] >> 6) & 1); - setprg16(0xC000, bank); + } else { /* UNROM mode */ + setprg16(0x8000, regs[1] <<1 | regs[3] &7); + setprg16(0xC000, regs[1] <<1 | 7); } if (regs[0] & 0x20) setmirror(MI_H); @@ -51,6 +51,8 @@ static void Sync(void) { } static DECLFW(BMC64in1nrWriteLo) { + A &=3; + if (A ==3) A =1; /* K-42001's "Aladdin III" */ regs[A & 3] = V; Sync(); } @@ -65,17 +67,26 @@ static void BMC64in1nrPower(void) { regs[1] = 0x43; regs[2] = regs[3] = 0; Sync(); - SetWriteHandler(0x5000, 0x5003, BMC64in1nrWriteLo); + SetWriteHandler(0x5000, 0x5FFF, BMC64in1nrWriteLo); SetWriteHandler(0x8000, 0xFFFF, BMC64in1nrWriteHi); SetReadHandler(0x8000, 0xFFFF, CartBR); } +static void BMC64in1nrReset(void) { + /* Reset returns to menu */ + regs[0] = 0x80; + regs[1] = 0x43; + regs[2] = regs[3] = 0; + Sync(); +} + static void StateRestore(int version) { Sync(); } void BMC64in1nr_Init(CartInfo *info) { info->Power = BMC64in1nrPower; + info->Reset = BMC64in1nrReset; AddExState(&StateRegs, ~0, 0, 0); GameStateRestore = StateRestore; }