Fix Merge Issues

AnnsAnns · Jun 25, 2024 · 898b879 · 898b879
1 parent bcba2af
commit 898b879
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/cpu/render_operations.rs b/src/cpu/render_operations.rs
@@ -29,7 +29,7 @@ impl CPU {
     }
 
     pub fn get_lcdc_window_tile_high_map(&self) -> bool {
-        self.memory.read_byte(0xFF40) & (1 << 6) == (1 << 6)
+        self.mmu.read_byte(0xFF40) & (1 << 6) == (1 << 6)
     }
 
     pub fn get_lcdc_window_enable(&self) -> bool {
@@ -41,7 +41,7 @@ impl CPU {
     }
 
     pub fn get_lcdc_bg_tile_high_map(&self) -> bool {
-        self.memory.read_byte(0xFF40) & (1 << 3) == (1 << 3)
+        self.mmu.read_byte(0xFF40) & (1 << 3) == (1 << 3)
     }
 
     pub fn get_lcdc_obj_size(&self) -> bool {
@@ -66,15 +66,15 @@ impl CPU {
     }
 
     pub fn get_lcd_scx(&mut self) -> u8 {
-        self.memory.read_byte(SCX_ADDRESS)
+        self.mmu.read_byte(SCX_ADDRESS)
     }
 
     pub fn get_window_wy(&mut self) -> u8 {
-        self.memory.read_byte(WY_ADDRESS)
+        self.mmu.read_byte(WY_ADDRESS)
     }
 
     pub fn get_window_wx(&mut self) -> u8 {
-        self.memory.read_byte(WX_ADDRESS)
+        self.mmu.read_byte(WX_ADDRESS)
     }
 
     // VRAM getters