chief/rustyboy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix MBC rom bank select

Browse Source
This commit is contained in:
Kevin Hamacher 2016-06-02 13:39:17 +02:00
parent 023b9ff0e4
commit 9508244447
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/cartridge.rs
View File

@ -62,7 +62,6 @@ impl Cartridge {
MemoryBankControllerType::MBC1 => Box::new(super::mbc::mbc1::MBC1::new(rom, ram)), MemoryBankControllerType::MBC1 => Box::new(super::mbc::mbc1::MBC1::new(rom, ram)),
MemoryBankControllerType::MBC2 => Box::new(super::mbc::mbc2::MBC2::new(rom, ram)), MemoryBankControllerType::MBC2 => Box::new(super::mbc::mbc2::MBC2::new(rom, ram)),
MemoryBankControllerType::MBC3 => Box::new(super::mbc::mbc3::MBC3::new(rom, ram)), MemoryBankControllerType::MBC3 => Box::new(super::mbc::mbc3::MBC3::new(rom, ram)),
// _ => panic!("{:?} not implemented", mbc_type),
}; };
Cartridge { Cartridge {

4
src/mbc/mbc1.rs
View File

@ -19,7 +19,7 @@ impl MBC1 {
MBC1 { MBC1 {
rom: rom, rom: rom,
ram: ram, ram: ram,
rom_bank_no: 0, rom_bank_no: 1,
bank_mode: BankMode::RomBankMode, bank_mode: BankMode::RomBankMode,
bank_no_high: 0, bank_no_high: 0,
@ -29,7 +29,7 @@ impl MBC1 {
fn active_rom_bank(&self) -> u8 { fn active_rom_bank(&self) -> u8 {
match self.bank_mode { match self.bank_mode {
BankMode::RomBankMode => self.rom_bank_no | self.bank_no_high << 5, BankMode::RomBankMode => self.rom_bank_no | (self.bank_no_high << 5),
BankMode::RamBankMode => self.rom_bank_no BankMode::RamBankMode => self.rom_bank_no
} }
} }

2
src/mbc/mbc2.rs
View File

@ -12,7 +12,7 @@ impl MBC2 {
MBC2 { MBC2 {
rom: rom, rom: rom,
ram: ram, ram: ram,
rom_bank_no: 0, rom_bank_no: 1,
ram_enable: false, ram_enable: false,
} }
} }

2
src/mbc/mbc3.rs
View File

@ -13,7 +13,7 @@ impl MBC3 {
MBC3 { MBC3 {
rom: rom, rom: rom,
ram: ram, ram: ram,
rom_bank_no: 0, rom_bank_no: 1,
ram_bank_no: 0, ram_bank_no: 0,
ram_rtc_enabled: false, ram_rtc_enabled: false,
} }