From cac641a5ed32ea5e518e61ef2853d6252bea3328 Mon Sep 17 00:00:00 2001 From: Rangi Date: Sat, 1 Sep 2018 20:18:55 -0400 Subject: =?UTF-8?q?normal.gbcpal=20=E2=86=92=20front.gbcpal=20Eliminate=20?= =?UTF-8?q?redundant=20Makefile=20rules=20Keep=20Makefile's=20Pokemon-spec?= =?UTF-8?q?ific=20hack=20rules=20next=20to=20the=20misc=20file-specific=20?= =?UTF-8?q?graphics=20rules?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 99013ca06..54ce918ec 100644 --- a/Makefile +++ b/Makefile @@ -99,6 +99,20 @@ pokecrystal11.gbc: $(crystal11_obj) pokecrystal.link tools/lzcomp -- $< $@) +### Pokemon pic graphics rules + +gfx/pokemon/%/front.animated.2bpp: gfx/pokemon/%/front.2bpp gfx/pokemon/%/front.dimensions + tools/pokemon_animation_graphics -o $@ $^ +gfx/pokemon/%/front.animated.tilemap: gfx/pokemon/%/front.2bpp gfx/pokemon/%/front.dimensions + tools/pokemon_animation_graphics -t $@ $^ +gfx/pokemon/%/bitmask.asm: gfx/pokemon/%/front.animated.tilemap gfx/pokemon/%/front.dimensions + tools/pokemon_animation -b $^ > $@ +gfx/pokemon/%/frames.asm: gfx/pokemon/%/front.animated.tilemap gfx/pokemon/%/front.dimensions + tools/pokemon_animation -f $^ > $@ +gfx/pokemon/%/back.2bpp: gfx/pokemon/%/back.png + $(RGBGFX) -h -o $@ $< + + ### Terrible hacks to match animations. Delete these rules if you don't care about matching. # Dewgong has an unused tile id in its last frame. The tile itself is missing. @@ -119,24 +133,6 @@ gfx/pokemon/girafarig/front.animated.tilemap: gfx/pokemon/girafarig/front.2bpp g tools/pokemon_animation_graphics --girafarig -t $@ $^ -### Pokemon pic graphics rules - -gfx/pokemon/%/front.dimensions: gfx/pokemon/%/front.png - tools/png_dimensions $< $@ -gfx/pokemon/%/normal.gbcpal: gfx/pokemon/%/front.png - $(RGBGFX) -p $@ $< -gfx/pokemon/%/back.2bpp: gfx/pokemon/%/back.png - $(RGBGFX) -h -o $@ $< -gfx/pokemon/%/bitmask.asm: gfx/pokemon/%/front.animated.tilemap gfx/pokemon/%/front.dimensions - tools/pokemon_animation -b $^ > $@ -gfx/pokemon/%/frames.asm: gfx/pokemon/%/front.animated.tilemap gfx/pokemon/%/front.dimensions - tools/pokemon_animation -f $^ > $@ -gfx/pokemon/%/front.animated.2bpp: gfx/pokemon/%/front.2bpp gfx/pokemon/%/front.dimensions - tools/pokemon_animation_graphics -o $@ $^ -gfx/pokemon/%/front.animated.tilemap: gfx/pokemon/%/front.2bpp gfx/pokemon/%/front.dimensions - tools/pokemon_animation_graphics -t $@ $^ - - ### Misc file-specific graphics rules gfx/new_game/shrink1.2bpp: rgbgfx += -h -- cgit v1.2.3