From c0173db27c6c13509026c65303ea29d1da6fc766 Mon Sep 17 00:00:00 2001 From: Rangi42 Date: Wed, 28 Aug 2024 13:21:16 -0400 Subject: [PATCH] Separate the usual rgbgfx flags from the `--color` specification --- Makefile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index fef1e36960..3abec3db47 100644 --- a/Makefile +++ b/Makefile @@ -209,15 +209,19 @@ gfx/pokemon/girafarig/front.animated.tilemap: gfx/pokemon/girafarig/front.2bpp g ### Pokemon and trainer sprite rules +gfx/pokemon/%/back.2bpp: rgbgfx += --columns + +gfx/trainers/%.2bpp: rgbgfx += --columns + gfx/pokemon/%/back.2bpp: gfx/pokemon/%/back.png gfx/pokemon/%/normal.gbcpal - $(RGBGFX) --columns --colors gbc:$(word 2,$^) -o $@ $< + $(RGBGFX) $(rgbgfx) --colors gbc:$(word 2,$^) -o $@ $< gfx/pokemon/%/front.2bpp: gfx/pokemon/%/front.png gfx/pokemon/%/normal.gbcpal - $(RGBGFX) --colors gbc:$(word 2,$^) -o $@ $< + $(RGBGFX) $(rgbgfx) --colors gbc:$(word 2,$^) -o $@ $< gfx/pokemon/%/normal.gbcpal: gfx/pokemon/%/front.gbcpal gfx/pokemon/%/back.gbcpal tools/gbcpal $(tools/gbcpal) $@ $^ gfx/trainers/%.2bpp: gfx/trainers/%.png gfx/trainers/%.gbcpal - $(RGBGFX) --columns --colors gbc:$(word 2,$^) -o $@ $< + $(RGBGFX) $(rgbgfx) --colors gbc:$(word 2,$^) -o $@ $< ### Rules to match specific Pokemon and trainer sprites