From bdf51448f7a50628125031623939cf68446b11bc Mon Sep 17 00:00:00 2001 From: Kevin Hamacher Date: Thu, 20 Feb 2020 23:46:22 +0100 Subject: [PATCH] Do not fatal error out on y-mirroring --- src/cpu.rs | 20 +++++++++++--------- src/display.rs | 3 +-- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/cpu.rs b/src/cpu.rs index 3f7aa1c..7972394 100644 --- a/src/cpu.rs +++ b/src/cpu.rs @@ -948,15 +948,17 @@ impl CPU { print!("A: {:02X} ", self.regs[REG_A]); */ - print!("AF={:02X}{:02X} BC={:02X}{:02X} DE={:02X}{:02X} HL={:02X}{:02X} ", - self.get_8bit_reg(REG_N_A), - self.get_8bit_reg(REG_N_F), - self.get_8bit_reg(REG_N_B), - self.get_8bit_reg(REG_N_C), - self.get_8bit_reg(REG_N_D), - self.get_8bit_reg(REG_N_E), - self.get_8bit_reg(REG_N_H), - self.get_8bit_reg(REG_N_L)); + print!( + "AF={:02X}{:02X} BC={:02X}{:02X} DE={:02X}{:02X} HL={:02X}{:02X} ", + self.get_8bit_reg(REG_N_A), + self.get_8bit_reg(REG_N_F), + self.get_8bit_reg(REG_N_B), + self.get_8bit_reg(REG_N_C), + self.get_8bit_reg(REG_N_D), + self.get_8bit_reg(REG_N_E), + self.get_8bit_reg(REG_N_H), + self.get_8bit_reg(REG_N_L) + ); print!("I: {:02X} ", self.interconnect.read_byte(0xFFFF)); // Flags diff --git a/src/display.rs b/src/display.rs index e2dc634..aa05059 100644 --- a/src/display.rs +++ b/src/display.rs @@ -90,7 +90,6 @@ impl CgbPalette { } } - impl std::fmt::Display for CgbPalette { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { write!(f, "Palette: ")?; @@ -611,7 +610,7 @@ impl Display { let actual_h = if wide_mode { 16 } else { 8 }; if sprite.is_y_flipped() { - panic!("Sorry, no y flip support yet"); + eprintln!("Sorry, no y flip support yet, rendering as-is"); } if y.wrapping_add(actual_h) > render_y && y <= render_y {