paoda
/
gb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix(cartridge): fix bug preventing MBC1 from working
continuous-integration/drone/push Build is passing Details

This commit is contained in:
Rekai Nyangadzayi Musuka 2021-07-05 00:43:02 -05:00
parent 18b790a777
commit 48e81ff426
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/cartridge.rs
View File

@ -137,7 +137,7 @@ impl BusIo for Cartridge {
}
}
#[derive(Debug, Clone, Default)]
#[derive(Debug, Clone)]
struct Mbc1 {
/// 5-bit number
rom_bank: u8,
@ -150,6 +150,20 @@ struct Mbc1 {
ram_enabled: bool,
}
impl Default for Mbc1 {
fn default() -> Self {
Self {
rom_bank: 0x01,
ram_bank: Default::default(),
mode: Default::default(),
ram_size: Default::default(),
ram: Default::default(),
bank_count: Default::default(),
ram_enabled: Default::default(),
}
}
}
impl Mbc1 {
fn zero_bank(&self) -> u8 {
use BankCount::*;
@ -223,13 +237,13 @@ impl MemoryBankController for Mbc1 {
match addr {
0x0000..=0x3FFF => {
if self.mode {
Address((0x4000 * self.zero_bank() as usize) + addr as usize)
Address(0x4000 * self.zero_bank() as usize + addr as usize)
} else {
Address(addr as usize)
}
}
0x4000..=0x7FFF => {
Address((0x4000 * self.high_bank() as usize) + (addr as usize - 0x4000))
Address(0x4000 * self.high_bank() as usize + (addr as usize - 0x4000))
}
0xA000..=0xBFFF => {
if self.ram_enabled {