diff --git a/src/mmu.rs b/src/mmu.rs index 13bd5bbbce36bc4159848bf6110bab64c5d3a0c1..2483ae1b95eec8b75cb771b1afdae06357752716 100644 --- a/src/mmu.rs +++ b/src/mmu.rs @@ -192,8 +192,7 @@ impl Mmu { } if self.boot_active && self.mode == GameBoyMode::Cgb - && addr >= 0x0200 - && addr <= 0x08ff + && (0x0200..=0x08ff).contains(&addr) { return self.boot[addr as usize]; } diff --git a/src/ppu.rs b/src/ppu.rs index 9f1b50cd7c91bdbb5b95d7640746fa5e6685807a..9c86e68f4ae42f41f66383da8273ed0ed13df6c0 100644 --- a/src/ppu.rs +++ b/src/ppu.rs @@ -1333,7 +1333,7 @@ impl Ppu { let r = (first & 0x1f) << 3; let g = (((first & 0xe0) >> 5) | ((second & 0x03) << 3)) << 3; let b = ((second & 0x7c) >> 2) << 3; - [r as u8, g as u8, b as u8] + [r, g, b] } }