diff --git a/tools/Makefile b/tools/Makefile index f8a93429f..55fd34cb9 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -1,13 +1,12 @@ .PHONY: all clean CC := gcc -CFLAGS := -O3 -std=c99 -Wall -Wextra -Wno-missing-field-initializers +CFLAGS := -O3 -std=c17 -Wall -Wextra -pedantic -Wno-missing-field-initializers tools := \ lzcomp \ png_dimensions \ scan_includes \ - palette \ pokemon_animation \ pokemon_animation_graphics \ gfx \ @@ -20,7 +19,7 @@ clean: gfx: common.h -lzcomp: CFLAGS = -O3 -flto -std=c11 -Wall -Wextra -pedantic -Wno-strict-overflow -Wno-sign-compare +lzcomp: CFLAGS = -O3 -flto -std=c17 -Wall -Wextra -pedantic -Wno-strict-overflow -Wno-sign-compare lzcomp: $(wildcard lz/*.c) $(wildcard lz/*.h) $(CC) $(CFLAGS) -o $@ lz/*.c diff --git a/tools/palette.c b/tools/palette.c deleted file mode 100644 index 9b575efdc..000000000 --- a/tools/palette.c +++ /dev/null @@ -1,105 +0,0 @@ -#include -#include -#include -#include -#include -#include - -void usage(void) { - printf("Usage: palette palfile\n"); - exit(1); -} - -void print_rgb(uint16_t word) { - int r, g, b; - r = word & 0x1f; - g = (word >> 5) & 0x1f; - b = (word >> 10) & 0x1f; - printf("\tRGB %2d, %2d, %2d\n", r, g, b); -} - -void print_pokemon_palette(char* palette_filename) { - FILE* f; - uint8_t bytes[4]; - - f = fopen(palette_filename, "rb"); - if (f == NULL) { - fprintf(stderr, "failed to open file %s\n", palette_filename); - exit(1); - } - - fseek(f, 2, SEEK_SET); - size_t size = 4; - if (size != fread(bytes, 1, size, f)) { - fprintf(stderr, "failed to read file %s\n", palette_filename); - exit(1); - } - fclose(f); - - print_rgb((bytes[1] << 8) | bytes[0]); - print_rgb((bytes[3] << 8) | bytes[2]); -} - -void print_palette(char* palette_filename) { - FILE* f; - uint8_t* bytes; - size_t size; - int i; - - f = fopen(palette_filename, "rb"); - if (f == NULL) { - fprintf(stderr, "failed to open file %s\n", palette_filename); - exit(1); - } - - fseek(f, 0, SEEK_END); - size = ftell(f); - if (!size) { - fprintf(stderr, "empty file %s\n", palette_filename); - exit(1); - } - rewind(f); - - bytes = malloc(size); - if (!bytes) { - fprintf(stderr, "malloc failure\n"); - exit(1); - } - - fseek(f, 0, SEEK_SET); - if (size != fread(bytes, 1, size, f)) { - fprintf(stderr, "failed to read file %s\n", palette_filename); - exit(1); - } - fclose(f); - - for (i = 0; i + 1 < (int)size; i += 2) { - print_rgb((bytes[i + 1] << 8) | bytes[i]); - } -} - -int main(int argc, char* argv[]) { - int ch; - bool pokemon = false; - - while ((ch = getopt(argc, argv, "p")) != -1) { - switch (ch) { - case 'p': - pokemon = true; - break; - default: - usage(); - } - } - argc -= optind; - argv += optind; - if (argc < 1) { - usage(); - } - if (pokemon) { - print_pokemon_palette(argv[0]); - } else { - print_palette(argv[0]); - } - return 0; -}