diff --git a/Dockerfile b/Dockerfile index 1d15c84..3f7e23b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,4 +9,4 @@ ARG GROUP_ID ENV DEBIAN_FRONTEND="noninteractive" -RUN apt update && apt install -y build-essential python3-pip && pip install pandas requests openpyxl +RUN apt update && apt install -y build-essential python3-pip && pip install pandas requests openpyxl --break-system-packages diff --git a/Makefile b/Makefile index 22047ab..ce096d0 100644 --- a/Makefile +++ b/Makefile @@ -175,7 +175,7 @@ clean: @$(MAKE) -C tools/data-generator clean @$(MAKE) -C loader clean @rm -fr $(BUILD) $(TARGET).elf $(TARGET).gba data/ to_compress/ - @rm text_helper/output.json + @rm -f text_helper/output.json diff --git a/compress_lz10.sh b/compress_lz10.sh index 79ca64f..6ca2ffc 100755 --- a/compress_lz10.sh +++ b/compress_lz10.sh @@ -1,7 +1,7 @@ #!/bin/sh infile="$1" outfile="data/$(basename "$infile" .bin)_lz10.bin" -if [ "$infile" -nt "$outfile" ]; then +if [ ! -f "$outfile" ] || [ "$infile" -nt "$outfile" ]; then gbalzss e "$infile" "$outfile" echo -n "C" else diff --git a/tools/data-generator/include/extern_pokemon_data.h b/tools/data-generator/include/extern_pokemon_data.h index 356d520..f958bf5 100644 --- a/tools/data-generator/include/extern_pokemon_data.h +++ b/tools/data-generator/include/extern_pokemon_data.h @@ -7,10 +7,12 @@ #define NUM_POKEMON 252 #define POKEMON_ARRAY_SIZE NUM_POKEMON + 1 +#ifndef TONC_TYPES typedef uint8_t u8; typedef uint8_t byte; typedef uint16_t u16; typedef uint32_t u32; +#endif void generate_pokemon_data(const char *output_path);