summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2017-05-28 01:20:46 -0400
committeryenatch <yenatch@gmail.com>2017-05-28 01:20:58 -0400
commit517136b0d99c65bc7294acb6991ea88974ac7831 (patch)
tree5d3aab32540715a042971c4144082ffabcd62e0d
parentfe38946b0e2717c973839a4f8db647de0f1d9f3a (diff)
Fix the graphics rules
-rw-r--r--Makefile13
1 files changed, 8 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index ea5e15bc7..89991b22e 100644
--- a/Makefile
+++ b/Makefile
@@ -80,12 +80,12 @@ pokecrystal.gbc: $(crystal_obj)
%.pal.bin: %.png
rgbgfx -p $@ $<
-gfx/pics/%/normal.pal: gfx/pics/normal.pal.bin
+gfx/pics/%/normal.pal: gfx/pics/%/normal.pal.bin
tools/palette -p $< > $@
gfx/pics/%/normal.pal.bin: gfx/pics/%/front.png
rgbgfx -p $@ $<
-gfx/pics/%/front.tilemap: gfx/pics/%/front.png
- rgbgfx -t $@ $<
+gfx/pics/%/back.2bpp: gfx/pics/%/back.png
+ rgbgfx -h -o $@ $<
gfx/pics/%/bitmask.asm: gfx/pics/%/front.animated.tilemap gfx/pics/%/front.dimensions
tools/pokemon_animation -b $^ > $@
gfx/pics/%/frames.asm: gfx/pics/%/front.animated.tilemap gfx/pics/%/front.dimensions
@@ -94,8 +94,11 @@ gfx/pics/%/front.animated.2bpp: gfx/pics/%/front.2bpp gfx/pics/%/front.dimension
tools/pokemon_animation_graphics -o $@ $^
gfx/pics/%/front.animated.tilemap: gfx/pics/%/front.2bpp gfx/pics/%/front.dimensions
tools/pokemon_animation_graphics -t $@ $^
-gfx/pics/%/front.2bpp: gfx/pics/%/front.png
- rgbgfx -o $@ $<
+# Don't use -h, pokemon_animation_graphics takes care of it
+#gfx/pics/%/front.2bpp: gfx/pics/%/front.png
+# rgbgfx -o $@ $<
+gfx/pics/%/front.2bpp.lz: gfx/pics/%/front.animated.2bpp
+ tools/lzcomp $< $@
gfx/shrink1.2bpp: gfx/shrink1.png
rgbgfx -h -o $@ $<