Use rgbgfx

24 files changed, 7 insertions, 6 deletions

diff --git a/Makefile b/Makefile
index 5cc485c1..6333a776 100644
--- a/Makefile
+++ b/Makefile
@@ -66,18 +66,19 @@ $(foreach obj, $(all_obj), \
 )
 
 
-# Image files are added to a queue to reduce build time. They're converted when building parent objects.
-%.png:  ;
-%.2bpp: %.png  ; $(eval 2bppq += $<) @rm -f $@
-%.1bpp: %.png  ; $(eval 1bppq += $<) @rm -f $@
+# Image files are converted using rgbgfx. Pokemon pics are added to a queue and compressed.
+.png.2bpp:
+	@rgbgfx -o $@ $<
+
+.png.1bpp:
+	@rgbgfx -b -o $@ $<
+
 %.pic:  %.2bpp ; $(eval picq  += $<) @rm -f $@
 
 # Assemble source files into objects.
 # Queue payloads are here. These are made silent since there may be hundreds of targets.
 # Use rgbasm -h to use halts without nops.
 $(all_obj): $$*.asm $$($$*_dep)
-	@$(gfx) 2bpp $(2bppq);    $(eval 2bppq :=)
-	@$(gfx) 1bpp $(1bppq);    $(eval 1bppq :=)
 	@$(pic) compress $(picq); $(eval picq  :=)
 	rgbasm -h -o $@ $*.asm
 
diff --git a/gfx/blue/intro_purin_1.6x6.png b/gfx/blue/intro_purin_1.6x6.png
index 0e53582c..a14acfb3 100644
--- a/gfx/blue/intro_purin_1.6x6.png
+++ b/gfx/blue/intro_purin_1.6x6.png
diff --git a/gfx/blue/intro_purin_2.6x6.png b/gfx/blue/intro_purin_2.6x6.png
index 21107af0..31793daf 100644
--- a/gfx/blue/intro_purin_2.6x6.png
+++ b/gfx/blue/intro_purin_2.6x6.png
diff --git a/gfx/blue/intro_purin_3.6x6.png b/gfx/blue/intro_purin_3.6x6.png
index 1c30a0e8..d7bfb1f0 100644
--- a/gfx/blue/intro_purin_3.6x6.png
+++ b/gfx/blue/intro_purin_3.6x6.png
diff --git a/gfx/game_boy.norepeat.png b/gfx/game_boy.norepeat.png
index 62144956..adeedabb 100644
--- a/gfx/game_boy.norepeat.png
+++ b/gfx/game_boy.norepeat.png
diff --git a/gfx/red/intro_nido_1.6x6.png b/gfx/red/intro_nido_1.6x6.png
index 4c7804a1..14d79c6d 100644
--- a/gfx/red/intro_nido_1.6x6.png
+++ b/gfx/red/intro_nido_1.6x6.png
diff --git a/gfx/red/intro_nido_2.6x6.png b/gfx/red/intro_nido_2.6x6.png
index a29a4814..78759914 100644
--- a/gfx/red/intro_nido_2.6x6.png
+++ b/gfx/red/intro_nido_2.6x6.png
diff --git a/gfx/red/intro_nido_3.6x6.png b/gfx/red/intro_nido_3.6x6.png
index e920d55d..52f35fa5 100644
--- a/gfx/red/intro_nido_3.6x6.png
+++ b/gfx/red/intro_nido_3.6x6.png
diff --git a/gfx/theend.interleave.png b/gfx/theend.interleave.png
index 025ebb61..bc6ff558 100644
--- a/gfx/theend.interleave.png
+++ b/gfx/theend.interleave.png
diff --git a/gfx/tilesets/cavern.t14.png b/gfx/tilesets/cavern.t14.png
index 5397fd65..7a66b727 100644..100755
--- a/gfx/tilesets/cavern.t14.png
+++ b/gfx/tilesets/cavern.t14.png
diff --git a/gfx/tilesets/cemetery.t4.png b/gfx/tilesets/cemetery.t4.png
index b1df015a..3dcba0f0 100644..100755
--- a/gfx/tilesets/cemetery.t4.png
+++ b/gfx/tilesets/cemetery.t4.png
diff --git a/gfx/tilesets/club.t5.png b/gfx/tilesets/club.t5.png
index 05a55879..1e367b1e 100644..100755
--- a/gfx/tilesets/club.t5.png
+++ b/gfx/tilesets/club.t5.png
diff --git a/gfx/tilesets/gate.t1.png b/gfx/tilesets/gate.t1.png
index 372e6751..4a97d6f9 100644..100755
--- a/gfx/tilesets/gate.t1.png
+++ b/gfx/tilesets/gate.t1.png
diff --git a/gfx/tilesets/house.t2.png b/gfx/tilesets/house.t2.png
index b5d67c95..dabd6238 100644..100755
--- a/gfx/tilesets/house.t2.png
+++ b/gfx/tilesets/house.t2.png
diff --git a/gfx/tilesets/interior.t1.png b/gfx/tilesets/interior.t1.png
index 3123d81c..8273960c 100644..100755
--- a/gfx/tilesets/interior.t1.png
+++ b/gfx/tilesets/interior.t1.png
diff --git a/gfx/tilesets/lab.t4.png b/gfx/tilesets/lab.t4.png
index 4a114337..481b80d7 100644..100755
--- a/gfx/tilesets/lab.t4.png
+++ b/gfx/tilesets/lab.t4.png
diff --git a/gfx/tilesets/lobby.t2.png b/gfx/tilesets/lobby.t2.png
index f2a1c180..6f6a1189 100644..100755
--- a/gfx/tilesets/lobby.t2.png
+++ b/gfx/tilesets/lobby.t2.png
diff --git a/gfx/tilesets/mansion.t2.png b/gfx/tilesets/mansion.t2.png
index 557c23b4..8c8ab32d 100644..100755
--- a/gfx/tilesets/mansion.t2.png
+++ b/gfx/tilesets/mansion.t2.png
diff --git a/gfx/tilesets/overworld.t2.png b/gfx/tilesets/overworld.t2.png
index c7533e40..b3b37a2f 100644..100755
--- a/gfx/tilesets/overworld.t2.png
+++ b/gfx/tilesets/overworld.t2.png
diff --git a/gfx/tilesets/plateau.t10.png b/gfx/tilesets/plateau.t10.png
index b87162d8..df92791b 100644..100755
--- a/gfx/tilesets/plateau.t10.png
+++ b/gfx/tilesets/plateau.t10.png
diff --git a/gfx/tilesets/reds_house.t7.png b/gfx/tilesets/reds_house.t7.png
index 5f210d04..9b4f1d8d 100644..100755
--- a/gfx/tilesets/reds_house.t7.png
+++ b/gfx/tilesets/reds_house.t7.png
diff --git a/gfx/tilesets/ship.t6.png b/gfx/tilesets/ship.t6.png
index cf5b6b95..f3db2c24 100644..100755
--- a/gfx/tilesets/ship.t6.png
+++ b/gfx/tilesets/ship.t6.png
diff --git a/gfx/tilesets/ship_port.t2.png b/gfx/tilesets/ship_port.t2.png
index fa5bbb27..25a92082 100644..100755
--- a/gfx/tilesets/ship_port.t2.png
+++ b/gfx/tilesets/ship_port.t2.png
diff --git a/gfx/tilesets/underground.t7.png b/gfx/tilesets/underground.t7.png
index baa86c17..65f444b1 100644..100755
--- a/gfx/tilesets/underground.t7.png
+++ b/gfx/tilesets/underground.t7.png