Do not fatal error out on y-mirroring

This commit is contained in:
Kevin Hamacher 2020-02-20 23:46:22 +01:00
parent 078da395ed
commit bdf51448f7
2 changed files with 12 additions and 11 deletions

View File

@ -948,15 +948,17 @@ impl CPU {
print!("A: {:02X} ", self.regs[REG_A]); print!("A: {:02X} ", self.regs[REG_A]);
*/ */
print!("AF={:02X}{:02X} BC={:02X}{:02X} DE={:02X}{:02X} HL={:02X}{:02X} ", print!(
self.get_8bit_reg(REG_N_A), "AF={:02X}{:02X} BC={:02X}{:02X} DE={:02X}{:02X} HL={:02X}{:02X} ",
self.get_8bit_reg(REG_N_F), self.get_8bit_reg(REG_N_A),
self.get_8bit_reg(REG_N_B), self.get_8bit_reg(REG_N_F),
self.get_8bit_reg(REG_N_C), self.get_8bit_reg(REG_N_B),
self.get_8bit_reg(REG_N_D), self.get_8bit_reg(REG_N_C),
self.get_8bit_reg(REG_N_E), self.get_8bit_reg(REG_N_D),
self.get_8bit_reg(REG_N_H), self.get_8bit_reg(REG_N_E),
self.get_8bit_reg(REG_N_L)); self.get_8bit_reg(REG_N_H),
self.get_8bit_reg(REG_N_L)
);
print!("I: {:02X} ", self.interconnect.read_byte(0xFFFF)); print!("I: {:02X} ", self.interconnect.read_byte(0xFFFF));
// Flags // Flags

View File

@ -90,7 +90,6 @@ impl CgbPalette {
} }
} }
impl std::fmt::Display for CgbPalette { impl std::fmt::Display for CgbPalette {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
write!(f, "Palette: ")?; write!(f, "Palette: ")?;
@ -611,7 +610,7 @@ impl Display {
let actual_h = if wide_mode { 16 } else { 8 }; let actual_h = if wide_mode { 16 } else { 8 };
if sprite.is_y_flipped() { 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 { if y.wrapping_add(actual_h) > render_y && y <= render_y {