scawful/yaze
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Update palette handling in dungeon editor and room rendering for improved graphics consistency

Browse Source
This commit is contained in:
scawful
2025-10-04 03:11:34 -04:00
parent bee1fc3923
commit 0b9c8900d3
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/app/editor/dungeon/dungeon_editor.cc
View File

@@ -301,11 +301,22 @@ void DungeonEditor::DrawCanvasAndPropertiesPanel() {
static std::vector<uint8_t> empty_gfx; static std::vector<uint8_t> empty_gfx;
const auto& gfx_buffer = rom()->graphics_buffer(); const auto& gfx_buffer = rom()->graphics_buffer();
// Get the actual palette being used by this room
const auto& dungeon_pal_group = rom()->palette_group().dungeon_main;
int room_palette_id = rooms_[room_id].palette;
// Validate and clamp palette ID
if (room_palette_id < 0 || room_palette_id >= static_cast<int>(dungeon_pal_group.size())) {
room_palette_id = 0;
}
auto room_palette = dungeon_pal_group[room_palette_id];
zelda3::dungeon::RoomVisualDiagnostic::DrawDiagnosticWindow( zelda3::dungeon::RoomVisualDiagnostic::DrawDiagnosticWindow(
&show_visual_diagnostic_, &show_visual_diagnostic_,
gfx::Arena::Get().bg1(), gfx::Arena::Get().bg1(),
gfx::Arena::Get().bg2(), gfx::Arena::Get().bg2(),
current_palette_, room_palette,
gfx_buffer.empty() ? empty_gfx : gfx_buffer); gfx_buffer.empty() ? empty_gfx : gfx_buffer);
} }
} else { } else {

2
src/app/zelda3/dungeon/room.cc
View File

@@ -312,7 +312,7 @@ void Room::RenderRoomGraphics() {
// Get the palette for this room - just use the 90-color palette as-is // Get the palette for this room - just use the 90-color palette as-is
// The SNES will index into this palette correctly without needing expansion // The SNES will index into this palette correctly without needing expansion
auto& dungeon_pal_group = rom()->mutable_palette_group()->get_group("dungeon_main")[0]; auto& dungeon_pal_group = rom()->mutable_palette_group()->dungeon_main;
int num_palettes = dungeon_pal_group.size(); int num_palettes = dungeon_pal_group.size();
int palette_id = palette; int palette_id = palette;