OR Masks

IsaacMarovitz · May 2, 2024 · 78c26ee · 78c26ee
1 parent c8cfcea
commit 78c26ee
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/components/mmu.rs b/src/components/mmu.rs
@@ -143,7 +143,7 @@ impl Memory for MMU {
             0xFF10..=0xFF3F => self.apu.read(a),
             0xFF0F => self.intf.bits(),
             0xFF51..=0xFF6F => self.ppu.read(a),
-            0xFF70 => self.wram_bank as u8,
+            0xFF70 => 0xF8 | self.wram_bank as u8,
             0xFEA0..=0xFEFF => 0xFF,
             0xFFFF => self.inte.bits(),
             _ => panic!("Read to unsupported address ({:#06x})!", a),

diff --git a/src/components/ppu/ppu.rs b/src/components/ppu/ppu.rs
@@ -564,7 +564,8 @@ impl Memory for PPU {
             0xFF49 => self.op1,
             0xFF4A => self.wy,
             0xFF4B => self.wx,
-            0xFF4D => 0x00,
+            // TODO: Speed Switch
+            0xFF4D => 0x7E,
             0xFF4F => 0xFE | self.vram_bank as u8,
             // TODO: DMA
             0xFF51..=0xFF55 => 0x00,

diff --git a/src/components/serial.rs b/src/components/serial.rs
@@ -24,7 +24,7 @@ impl Memory for Serial {
     fn read(&self, a: u16) -> u8 {
         match a {
             0xFF01 => self.sb,
-            0xFF02 => self.sc,
+            0xFF02 => 0x7C | self.sc,
             _ => panic!("Read to unsupported Serial address ({:#06x})!", a),
         }
     }