summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile15
1 files changed, 9 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index acca2ed0..f9b32b9b 100644
--- a/Makefile
+++ b/Makefile
@@ -19,9 +19,6 @@ MD5 := md5sum -c --quiet
poketools := extras/pokemontools
-gfx := $(PYTHON) $(poketools)/gfx.py
-2bpp := $(gfx) 2bpp
-1bpp := $(gfx) 1bpp
pic := $(PYTHON) $(poketools)/pic.py compress
includes := $(PYTHON) $(poketools)/scan_includes.py
@@ -65,9 +62,15 @@ red_opt = $(dmg_opt) -t "POKEMON RED"
blue_opt = $(dmg_opt) -t "POKEMON BLUE"
-%.png: ;
-%.2bpp: %.png ; @$(2bpp) $<
-%.1bpp: %.png ; @$(1bpp) $<
+#%.png: ;
+#%.2bpp: %.png ; @$(2bpp) $<
+#%.1bpp: %.png ; @$(1bpp) $<
+.png.2bpp:
+ @rgbgfx -o $@ $<
+
+.png.1bpp:
+ @rgbgfx -b -o $@ $<
+
%.pic: %.2bpp ; @$(pic) $<
# Assemble source files into objects.