fix bip tiling

Author: malucard

README.md

@@ -8,17 +8,19 @@ This is an attempt to collect code to decode all file formats in the Infinity se
 Kidfile is a library that can be used by other projects to handle supported files easily.
 Kidfile Explorer is an application that can navigate, preview and convert those files in batch.
 
-Currently supports all images from Never7 on PS2 and most images from 12Riven on PC. Lots of other formats used in the other games and releases are missing, but it's not hard to add support for each.
+Currently supports images in most of the PS2 games and their late PSP and PC ports.
 
-- Archive formats:
-  - AFS
-  - LNK
-  - Concatenated files aligned to 2KiB
-- Compression formats:
-  - LZSS/BIP
-  - CPS (PS2)
 - Image formats:
   - OGDT
   - TIM2
-  - KLZ
+  - BIP (all)
+  - GIM (PSP)
+  - KLZ (PC)
   - common formats (PNG, BMP, etc)
+- Archive formats:
+  - AFS
+  - LNK (partial)
+  - Concatenated OGDT/TIM2 images
+- Compression formats:
+  - LZSS
+  - CPS (PS2)

kidfile/src/data_formats/cps.rs

@@ -11,7 +11,6 @@ pub const ENTRY_CPS: Decoder<Box<[u8]>> = Decoder {
 
 fn decode(data: &mut FileData) -> Result<Box<[u8]>, String> {
 	let expected_size = data.get_u32_at_be(0).unwrap() as usize >> 8;
-	println!("cps expecting size {expected_size}, file size is {}", data.len());
 
 	let buf = &data.read()[3..];
 	let mut in_cursor = 0;

kidfile/src/image_formats/bip.rs

@@ -36,7 +36,7 @@ pub const ENTRY_BIP: Decoder<Image> = Decoder {
 						let palette = &bytes[palette_section..];
 						//let tile_pixel_data = pixel_section; // + bytes.read_u16(index_section + 2)? as usize * 1024;
 						let frame = cur_frame.get_or_insert_with(|| Frame::empty(og_full_width, og_full_height, PixelFormat::RgbaClut8));
-						// this part is SUPER quirky. the source image is split into 30x30 blocks, but the last 2 rows and columns are
+						// this part is SUPER quirky. the source image is split into 30x30 blocks, but the first and last rows and columns are
 						// repeated so the blocks grow to 32x32. however, the blocks aren't stored sequentially, but rather as an image
 						// with its width forced to 512. if the real width is 512, it can be directly read as an image but the
 						// repeated pixels in the blocks will be visible. if it's not 512 the rows of blocks wrap and that breaks.
@@ -50,12 +50,8 @@ pub const ENTRY_BIP: Decoder<Image> = Decoder {
 								if src_block_start + 30 >= bytes.len() {
 									break;
 								}
-								let row = Frame::from_rgba_clut8(30, 1, palette, &bytes[src_block_start..]);
-								if false {
-									frame.paste(dst_block_x_idx * 30 + dst_block_y_idx * tile_x_blocks * 30, dst_y - dst_y_start + tile_idx as u32 * 30, &row); // TODO: revert
-								} else {
-									frame.paste(tile_x + dst_block_x_idx * 30, dst_y, &row);
-								}
+								let row = Frame::from_rgba_clut8(30, 1, palette, &bytes[src_block_start + 1..]);
+								frame.paste(tile_x + dst_block_x_idx * 30, dst_y, &row);
 								src_block_start += 512;
 							}
 							src_block_x_idx += 1;