diff --git a/examples/PoolBox/assets/Makefile b/examples/PoolBox/assets/Makefile index c93cc47b..3456f708 100644 --- a/examples/PoolBox/assets/Makefile +++ b/examples/PoolBox/assets/Makefile @@ -40,7 +40,7 @@ $(OUTPUT_DIR)/fox.xa: audio/temp/fox.wav $(OUTPUT_DIR)/%.vag: audio/temp/%.wav @mkdir -p $(OUTPUT_DIR) - jaby_engine_fconv $< -o $@ vag + jaby_engine_fconv --lz4 $< -o $@ vag $(OUTPUT_DIR)/%.xa: audio/%.wav @mkdir -p $(OUTPUT_DIR) diff --git a/examples/PoolBox/iso/Config.xml b/examples/PoolBox/iso/Config.xml index 10858289..b6a4ac15 100644 --- a/examples/PoolBox/iso/Config.xml +++ b/examples/PoolBox/iso/Config.xml @@ -49,8 +49,8 @@ ../assets/audio/temp/breaking.wav diff --git a/src/Library/src/BootLoader/start_boot.cpp b/src/Library/src/BootLoader/start_boot.cpp index 177250bd..e996258c 100644 --- a/src/Library/src/BootLoader/start_boot.cpp +++ b/src/Library/src/BootLoader/start_boot.cpp @@ -58,8 +58,6 @@ namespace JabyEngine { simple_assert(1, SPU_MMU::allocate(1, 0x800), calculate_spu_adr(0x600)); simple_assert(2, SPU_MMU::allocate(0, 0x300), calculate_spu_adr(0x0)); simple_assert(3, SPU_MMU::allocate(2, 0x300), calculate_spu_adr(0x300)); - - // TODO: More tests } namespace boot { diff --git a/src/Tools/jaby_engine_fconv/src/main.rs b/src/Tools/jaby_engine_fconv/src/main.rs index e96f4413..23e43e01 100644 --- a/src/Tools/jaby_engine_fconv/src/main.rs +++ b/src/Tools/jaby_engine_fconv/src/main.rs @@ -1,7 +1,7 @@ use clap::{Parser, Subcommand}; use jaby_engine_fconv::{audio::*, images::*, nothing}; use std::path::PathBuf; -use tool_helper::{Error, exit_with_error}; +use tool_helper::{exit_with_error, print_warning, Error}; #[derive(Parser)] #[clap(about = "Converts files to various JabyEngine related file formats", long_about = None)] @@ -89,6 +89,10 @@ fn run_external_conversion(cmd: CommandLine) -> Result<(), Error> { let input_file = cmd.input_file.ok_or(Error::from_str("Input has to be a file"))?; let output_file = cmd.output_file.ok_or(Error::from_str("Output has to be a file"))?; + if cmd.compress_lz4 { + print_warning("LZ4 compression not supported for external commands".to_owned()); + } + match cmd.sub_command { SubCommands::VAG(args) => vag::convert(args, input_file, output_file), SubCommands::XA(args) => xa::convert(args, input_file, output_file),