From 41f7a17234baaeb8b4d27d8350ac720e429c0cff Mon Sep 17 00:00:00 2001 From: Jaby Date: Sun, 26 Nov 2023 18:41:31 -0500 Subject: [PATCH] Fix TIM conversion bug in palette count --- .../src/images/reduced_tim/mod.rs | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/Tools/jaby_engine_fconv/src/images/reduced_tim/mod.rs b/src/Tools/jaby_engine_fconv/src/images/reduced_tim/mod.rs index 597d5fee..c9c779b1 100644 --- a/src/Tools/jaby_engine_fconv/src/images/reduced_tim/mod.rs +++ b/src/Tools/jaby_engine_fconv/src/images/reduced_tim/mod.rs @@ -96,10 +96,20 @@ fn encode(image: T, color_depth: ColorType, clut_align: Cl let palette = image.get_palette(); let (pal_width, pal_height) = { if let Some(palette) = &palette { + let pal_length_adjusted = { + let pal_length = palette.len(); + if pal_length <= 16 { + 16u16 + } + + else { + 256u16 + } + }; match clut_align { ClutAlignment::None | - ClutAlignment::Linear => (palette.len() as u16, 1u16), - ClutAlignment::Block => (16u16, (palette.len()/16) as u16), + ClutAlignment::Linear => (pal_length_adjusted, 1u16), + ClutAlignment::Block => (16u16, pal_length_adjusted/16u16), } }