From 7598d2f59fe14b10b5eb31d4690cef53c1d80266 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Magalh=C3=A3es?= <joamag@gmail.com>
Date: Sun, 30 Apr 2023 20:20:45 +0100
Subject: [PATCH] feat: better palette usage for obj
---
src/ppu.rs | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/ppu.rs b/src/ppu.rs
index aca5adbb..713a90d8 100644
--- a/src/ppu.rs
+++ b/src/ppu.rs
@@ -1173,12 +1173,12 @@ impl Ppu {
let palette = if self.gb_mode == GameBoyMode::Cgb {
&self.palettes_color_obj[obj.palette_cgb as usize]
+ } else if obj.palette == 0 {
+ &self.palette_obj_0
+ } else if obj.palette == 1 {
+ &self.palette_obj_1
} else {
- if obj.palette == 0 {
- &self.palette_obj_0
- } else {
- &self.palette_obj_1
- }
+ panic!("Invalid object palette: {:02x}", obj.palette);
};
// calculates the offset in the color buffer (raw color information
@@ -1229,7 +1229,7 @@ impl Ppu {
// the tile directly from the object's tile index
else {
let tile_index = obj.tile as usize + tile_bank_offset;
- tile = &self.tiles[tile_index as usize];
+ tile = &self.tiles[tile_index];
}
let tile_row = tile.get_row(tile_offset as usize);
--
GitLab