summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2013-09-11 01:24:20 -0400
committeryenatch <yenatch@gmail.com>2013-09-11 01:24:20 -0400
commitc195276073a9ae9b8ed5acc4de54600820992593 (patch)
treed1598485ce2b995f37a4a0a3b9baac7a344dd16b
parent6a21963799575fa8a88ed55cde5408ef67c92d63 (diff)
rename make variables for graphics files
-rw-r--r--Makefile11
1 files changed, 7 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 614462cf9..4b47205a7 100644
--- a/Makefile
+++ b/Makefile
@@ -7,9 +7,10 @@ TEXTQUEUE :=
OBJS := pokecrystal.o
-PNG_GFX := $(shell find gfx/ -type f -name '*.png')
-LZ_GFX := $(shell find gfx/ -type f -name '*.lz')
-TWOBPP_GFX := $(shell find gfx/ -type f -name '*.2bpp')
+PNGS := $(shell find gfx/ -type f -name '*.png')
+LZS := $(shell find gfx/ -type f -name '*.lz')
+_2BPPS := $(shell find gfx/ -type f -name '*.2bpp')
+_1BPPS := $(shell find gfx/ -type f -name '*.1bpp')
$(shell $(foreach obj, $(OBJS), $(eval OBJ_$(obj:.o=) := $(shell $(PYTHON) scan_includes.py $(obj:.o=.asm)))))
@@ -41,7 +42,7 @@ pngs:
$(PYTHON) extras/pokemontools/gfx.py mass-decompress
$(PYTHON) extras/pokemontools/gfx.py dump-pngs
-lzs: $(LZ_GFX) $(TWOBPP_GFX)
+lzs: $(LZS) $(_2BPPS) $(_1BPPS)
@:
gfx/pics/%/front.lz: gfx/pics/%/tiles.2bpp gfx/pics/%/front.png
@@ -56,6 +57,8 @@ gfx/trainers/%.lz: gfx/trainers/%.png
$(PYTHON) extras/pokemontools/gfx.py png-to-lz $<
.png.2bpp:
$(PYTHON) extras/pokemontools/gfx.py png-to-lz $<
+.png.1bpp:
+ $(PYTHON) extras/pokemontools/gfx.py png-to-lz $<
%.2bpp:
@:
%.1bpp: