diff --git a/src/mbc.cpp b/src/mbc.cpp index 3fd40e9..fd47057 100644 --- a/src/mbc.cpp +++ b/src/mbc.cpp @@ -51,8 +51,7 @@ Byte *AddressSpace::MBCRead(const Word address) { return &twoBitBankRegister; if (address <= 0x7FFF) return &romRamSelect; - } - if (MBC == MBC1Ram || MBC == MBC1RamBattery) { + } else if (MBC == MBC1Ram || MBC == MBC1RamBattery) { if (address <= 0x1FFF) return &ramEnable; // bits 0-4 @@ -63,14 +62,16 @@ Byte *AddressSpace::MBCRead(const Word address) { } if (address <= 0x7FFF) return &romRamSelect; - } - if (MBC == MBC2 || MBC == MBC2Battery) { + } else if (MBC == MBC2 || MBC == MBC2Battery) { if (address <= 0x3FFF) { if (address & 0x0100) return &romBankRegister; else return &ramEnable; } + } else if (MBC == MBC3 || MBC == MBC3TimerBattery) { + } else if (MBC == MBC3Ram || MBC == MBC3RamBattery || + MBC == MBC3TimerRamBattery) { } return &dummyVal; }