From e57db69b6c7ad0c96d1eb8748c94eb0769b70933 Mon Sep 17 00:00:00 2001 From: Filipe Rodrigues Date: Wed, 11 Oct 2023 11:32:42 +0100 Subject: [PATCH] Fixed `ddw3-mkmap` not correctly rounding the entry step and sizes. This didn't matter currently, as all the inputs are rounded, but once we start creating the inputs, they won't be rounded anymore. --- tools/ddw3-mkmap/src/main.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/ddw3-mkmap/src/main.rs b/tools/ddw3-mkmap/src/main.rs index e73588d7f..faad15228 100644 --- a/tools/ddw3-mkmap/src/main.rs +++ b/tools/ddw3-mkmap/src/main.rs @@ -60,6 +60,7 @@ fn main() -> Result<(), anyhow::Error> { }) .collect::, anyhow::Error>>()?; let entry_step = entry_lens.iter().copied().max().context("No entries")?; + let entry_step = entry_step.next_multiple_of(0x800); // Write each file for (entry_path, entry_idx) in input.entries.iter().zip(0..entries_len) { @@ -112,6 +113,7 @@ fn main() -> Result<(), anyhow::Error> { .context("Unable to write entry step")?; for entry_size in entry_lens { + let entry_size = entry_size.next_multiple_of(0x800); output .write_u16::(entry_size) .context("Unable to write header entry")?;