Skip to content
Snippets Groups Projects
Verified Commit bb068def authored by João Magalhães's avatar João Magalhães :rocket:
Browse files

feat: small code refactor

parent 164e108f
No related branches found
No related tags found
No related merge requests found
Pipeline #936 failed
...@@ -503,7 +503,7 @@ impl Ppu { ...@@ -503,7 +503,7 @@ impl Ppu {
} }
pub fn ack_vblank(&mut self) { pub fn ack_vblank(&mut self) {
self.int_vblank = false; self.set_int_vblank(false);
} }
/// Fills the frame buffer with pixels of the provided color, /// Fills the frame buffer with pixels of the provided color,
......
...@@ -27,21 +27,22 @@ impl Timer { ...@@ -27,21 +27,22 @@ impl Timer {
pub fn clock(&mut self, cycles: u8) { pub fn clock(&mut self, cycles: u8) {
self.div_clock += cycles as u16; self.div_clock += cycles as u16;
self.tima_clock += cycles as u16;
if self.div_clock >= 256 { if self.div_clock >= 256 {
self.div = self.div.wrapping_add(1); self.div = self.div.wrapping_add(1);
self.div_clock = self.div_clock - 256; self.div_clock = self.div_clock - 256;
} }
if self.tima_enabled && self.tima_clock >= self.tima_ratio { if self.tima_enabled {
if self.tima == 0xff { self.tima_clock += cycles as u16;
self.int_tima = true; if self.tima_clock >= self.tima_ratio {
self.tima = self.tma; if self.tima == 0xff {
} self.int_tima = true;
self.tima = self.tma;
}
self.tima = self.tima.wrapping_add(1); self.tima = self.tima.wrapping_add(1);
self.tima_clock = self.tima_clock - self.tima_ratio; self.tima_clock = self.tima_clock - self.tima_ratio;
}
} }
} }
...@@ -84,6 +85,6 @@ impl Timer { ...@@ -84,6 +85,6 @@ impl Timer {
} }
pub fn ack_tima(&mut self) { pub fn ack_tima(&mut self) {
self.int_tima = false; self.set_int_tima(false);
} }
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment