From 5978562fa17b8663cf85cbe9ced6e4ccbf46d8af Mon Sep 17 00:00:00 2001 From: dannye Date: Wed, 5 Aug 2015 17:56:50 -0500 Subject: Use rgbgfx --- Makefile | 13 +++++++------ gfx/blue/intro_purin_1.6x6.png | Bin 366 -> 380 bytes gfx/blue/intro_purin_2.6x6.png | Bin 360 -> 374 bytes gfx/blue/intro_purin_3.6x6.png | Bin 416 -> 430 bytes gfx/game_boy.norepeat.png | Bin 246 -> 264 bytes gfx/red/intro_nido_1.6x6.png | Bin 462 -> 476 bytes gfx/red/intro_nido_2.6x6.png | Bin 449 -> 463 bytes gfx/red/intro_nido_3.6x6.png | Bin 495 -> 509 bytes gfx/theend.interleave.png | Bin 139 -> 153 bytes gfx/tilesets/cavern.t14.png | Bin 1022 -> 1038 bytes gfx/tilesets/cemetery.t4.png | Bin 928 -> 943 bytes gfx/tilesets/club.t5.png | Bin 899 -> 914 bytes gfx/tilesets/gate.t1.png | Bin 1119 -> 1134 bytes gfx/tilesets/house.t2.png | Bin 1163 -> 1178 bytes gfx/tilesets/interior.t1.png | Bin 1141 -> 1156 bytes gfx/tilesets/lab.t4.png | Bin 1051 -> 1066 bytes gfx/tilesets/lobby.t2.png | Bin 966 -> 981 bytes gfx/tilesets/mansion.t2.png | Bin 960 -> 976 bytes gfx/tilesets/overworld.t2.png | Bin 1309 -> 1324 bytes gfx/tilesets/plateau.t10.png | Bin 1011 -> 1027 bytes gfx/tilesets/reds_house.t7.png | Bin 845 -> 860 bytes gfx/tilesets/ship.t6.png | Bin 865 -> 880 bytes gfx/tilesets/ship_port.t2.png | Bin 1125 -> 1140 bytes gfx/tilesets/underground.t7.png | Bin 272 -> 288 bytes 24 files changed, 7 insertions(+), 6 deletions(-) mode change 100644 => 100755 gfx/tilesets/cavern.t14.png mode change 100644 => 100755 gfx/tilesets/cemetery.t4.png mode change 100644 => 100755 gfx/tilesets/club.t5.png mode change 100644 => 100755 gfx/tilesets/gate.t1.png mode change 100644 => 100755 gfx/tilesets/house.t2.png mode change 100644 => 100755 gfx/tilesets/interior.t1.png mode change 100644 => 100755 gfx/tilesets/lab.t4.png mode change 100644 => 100755 gfx/tilesets/lobby.t2.png mode change 100644 => 100755 gfx/tilesets/mansion.t2.png mode change 100644 => 100755 gfx/tilesets/overworld.t2.png mode change 100644 => 100755 gfx/tilesets/plateau.t10.png mode change 100644 => 100755 gfx/tilesets/reds_house.t7.png mode change 100644 => 100755 gfx/tilesets/ship.t6.png mode change 100644 => 100755 gfx/tilesets/ship_port.t2.png mode change 100644 => 100755 gfx/tilesets/underground.t7.png 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 Binary files a/gfx/blue/intro_purin_1.6x6.png and b/gfx/blue/intro_purin_1.6x6.png differ diff --git a/gfx/blue/intro_purin_2.6x6.png b/gfx/blue/intro_purin_2.6x6.png index 21107af0..31793daf 100644 Binary files a/gfx/blue/intro_purin_2.6x6.png and b/gfx/blue/intro_purin_2.6x6.png differ diff --git a/gfx/blue/intro_purin_3.6x6.png b/gfx/blue/intro_purin_3.6x6.png index 1c30a0e8..d7bfb1f0 100644 Binary files a/gfx/blue/intro_purin_3.6x6.png and b/gfx/blue/intro_purin_3.6x6.png differ diff --git a/gfx/game_boy.norepeat.png b/gfx/game_boy.norepeat.png index 62144956..adeedabb 100644 Binary files a/gfx/game_boy.norepeat.png and b/gfx/game_boy.norepeat.png differ diff --git a/gfx/red/intro_nido_1.6x6.png b/gfx/red/intro_nido_1.6x6.png index 4c7804a1..14d79c6d 100644 Binary files a/gfx/red/intro_nido_1.6x6.png and b/gfx/red/intro_nido_1.6x6.png differ diff --git a/gfx/red/intro_nido_2.6x6.png b/gfx/red/intro_nido_2.6x6.png index a29a4814..78759914 100644 Binary files a/gfx/red/intro_nido_2.6x6.png and b/gfx/red/intro_nido_2.6x6.png differ diff --git a/gfx/red/intro_nido_3.6x6.png b/gfx/red/intro_nido_3.6x6.png index e920d55d..52f35fa5 100644 Binary files a/gfx/red/intro_nido_3.6x6.png and b/gfx/red/intro_nido_3.6x6.png differ diff --git a/gfx/theend.interleave.png b/gfx/theend.interleave.png index 025ebb61..bc6ff558 100644 Binary files a/gfx/theend.interleave.png and b/gfx/theend.interleave.png differ diff --git a/gfx/tilesets/cavern.t14.png b/gfx/tilesets/cavern.t14.png old mode 100644 new mode 100755 index 5397fd65..7a66b727 Binary files a/gfx/tilesets/cavern.t14.png and b/gfx/tilesets/cavern.t14.png differ diff --git a/gfx/tilesets/cemetery.t4.png b/gfx/tilesets/cemetery.t4.png old mode 100644 new mode 100755 index b1df015a..3dcba0f0 Binary files a/gfx/tilesets/cemetery.t4.png and b/gfx/tilesets/cemetery.t4.png differ diff --git a/gfx/tilesets/club.t5.png b/gfx/tilesets/club.t5.png old mode 100644 new mode 100755 index 05a55879..1e367b1e Binary files a/gfx/tilesets/club.t5.png and b/gfx/tilesets/club.t5.png differ diff --git a/gfx/tilesets/gate.t1.png b/gfx/tilesets/gate.t1.png old mode 100644 new mode 100755 index 372e6751..4a97d6f9 Binary files a/gfx/tilesets/gate.t1.png and b/gfx/tilesets/gate.t1.png differ diff --git a/gfx/tilesets/house.t2.png b/gfx/tilesets/house.t2.png old mode 100644 new mode 100755 index b5d67c95..dabd6238 Binary files a/gfx/tilesets/house.t2.png and b/gfx/tilesets/house.t2.png differ diff --git a/gfx/tilesets/interior.t1.png b/gfx/tilesets/interior.t1.png old mode 100644 new mode 100755 index 3123d81c..8273960c Binary files a/gfx/tilesets/interior.t1.png and b/gfx/tilesets/interior.t1.png differ diff --git a/gfx/tilesets/lab.t4.png b/gfx/tilesets/lab.t4.png old mode 100644 new mode 100755 index 4a114337..481b80d7 Binary files a/gfx/tilesets/lab.t4.png and b/gfx/tilesets/lab.t4.png differ diff --git a/gfx/tilesets/lobby.t2.png b/gfx/tilesets/lobby.t2.png old mode 100644 new mode 100755 index f2a1c180..6f6a1189 Binary files a/gfx/tilesets/lobby.t2.png and b/gfx/tilesets/lobby.t2.png differ diff --git a/gfx/tilesets/mansion.t2.png b/gfx/tilesets/mansion.t2.png old mode 100644 new mode 100755 index 557c23b4..8c8ab32d Binary files a/gfx/tilesets/mansion.t2.png and b/gfx/tilesets/mansion.t2.png differ diff --git a/gfx/tilesets/overworld.t2.png b/gfx/tilesets/overworld.t2.png old mode 100644 new mode 100755 index c7533e40..b3b37a2f Binary files a/gfx/tilesets/overworld.t2.png and b/gfx/tilesets/overworld.t2.png differ diff --git a/gfx/tilesets/plateau.t10.png b/gfx/tilesets/plateau.t10.png old mode 100644 new mode 100755 index b87162d8..df92791b Binary files a/gfx/tilesets/plateau.t10.png and b/gfx/tilesets/plateau.t10.png differ diff --git a/gfx/tilesets/reds_house.t7.png b/gfx/tilesets/reds_house.t7.png old mode 100644 new mode 100755 index 5f210d04..9b4f1d8d Binary files a/gfx/tilesets/reds_house.t7.png and b/gfx/tilesets/reds_house.t7.png differ diff --git a/gfx/tilesets/ship.t6.png b/gfx/tilesets/ship.t6.png old mode 100644 new mode 100755 index cf5b6b95..f3db2c24 Binary files a/gfx/tilesets/ship.t6.png and b/gfx/tilesets/ship.t6.png differ diff --git a/gfx/tilesets/ship_port.t2.png b/gfx/tilesets/ship_port.t2.png old mode 100644 new mode 100755 index fa5bbb27..25a92082 Binary files a/gfx/tilesets/ship_port.t2.png and b/gfx/tilesets/ship_port.t2.png differ diff --git a/gfx/tilesets/underground.t7.png b/gfx/tilesets/underground.t7.png old mode 100644 new mode 100755 index baa86c17..65f444b1 Binary files a/gfx/tilesets/underground.t7.png and b/gfx/tilesets/underground.t7.png differ -- cgit v1.2.3