summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2018-09-01 20:18:55 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2018-09-01 20:18:55 -0400
commitcac641a5ed32ea5e518e61ef2853d6252bea3328 (patch)
tree24bd2d63b99afa2144e2ff907f7924476ccf5363 /Makefile
parent36b21b39d8854ea4d808146938a75233b003f2a7 (diff)
normal.gbcpal → front.gbcpal
Eliminate redundant Makefile rules Keep Makefile's Pokemon-specific hack rules next to the misc file-specific graphics rules
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile32
1 files changed, 14 insertions, 18 deletions
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