GBC: Increase supported boot rom length

This commit is contained in:
Kevin Hamacher 2020-02-18 12:38:41 +01:00
parent 368150e4c3
commit 79e31318e0

View File

@ -265,14 +265,14 @@ impl Interconnect {
// TODO: if some flag set, use bios, otherwise only use rom // TODO: if some flag set, use bios, otherwise only use rom
// For now, just use bios // For now, just use bios
match addr { match addr {
0x0000..=0x100 => { 0x0000..=0x0FF | 0x200..=0x8FF => {
if self.disable_bootrom == 0 { if self.disable_bootrom == 0 && self.bios.len() > addr as usize {
self.bios[addr as usize] self.bios[addr as usize]
} else { } else {
self.cartridge.read_byte(addr) self.cartridge.read_byte(addr)
} }
} }
0x100..=0x7FFF => self.cartridge.read_byte(addr), 0x100..=0x1FF | 0x900..=0x7FFF => self.cartridge.read_byte(addr),
0x8000..=0x9FFF => self.display.read_byte(addr), 0x8000..=0x9FFF => self.display.read_byte(addr),
0xA000..=0xBFFF => self.cartridge.read_byte(addr), 0xA000..=0xBFFF => self.cartridge.read_byte(addr),
0xC000..=0xCFFF => self.ram[(addr - 0xC000) as usize], 0xC000..=0xCFFF => self.ram[(addr - 0xC000) as usize],