From fcdedfd2e48f0b6ea18bad0093d8b13fb5c1712a Mon Sep 17 00:00:00 2001
From: Rangi <remy.oukaour+rangi42@gmail.com>
Date: Sat, 19 Sep 2020 16:17:01 -0400
Subject: Use superfamiconv for 4bpp graphics

---
 gfx/gfx.mk                    |  13 ++++++++++++-
 gfx/sgb_border/sgb_border.png | Bin 2657 -> 2553 bytes
 source/bank_7a.asm            |   2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/gfx/gfx.mk b/gfx/gfx.mk
index c7785b7..cd9857d 100644
--- a/gfx/gfx.mk
+++ b/gfx/gfx.mk
@@ -1,10 +1,21 @@
+# These intermediate build products need specifying here to be PRECIOUS
+gfx := \
+$(dir_build)/gfx/copyright/copyright.2bpp \
+$(dir_build)/gfx/game_select/game_select.2bpp \
+$(dir_build)/gfx/title/title_1.2bpp \
+$(dir_build)/gfx/title/title_2.2bpp
+
 RGBGFXFLAGS :=
 $(dir_build)/%.2bpp: %.png | $$(dir $$@)
 	$(RGBGFX) $(RGBGFXFLAGS) -o $@ $<
 
+SUPERFAMICONVFLAGS :=
+$(dir_build)/%.4bpp: %.png | $$(dir $$@)
+	superfamiconv tiles -i $< -d $@ -R $(SUPERFAMICONVFLAGS)
+
 $(dir_build)/gfx/sprites/%.2bpp: RGBGFXFLAGS = -h
 
-$(dir_build)/gfx/sgb_border/sgb_border.2bpp: RGBGFXFLAGS = -x 14
+$(dir_build)/gfx/sgb_border/sgb_border.4bpp: SUPERFAMICONVFLAGS = -T 257
 
 # data_select.2bpp.xor decompresses to 2bpp-encoded data_select.png with an extra byte $33 (ASCII "3") appended
 $(dir_build)/gfx/data_select/data_select.2bpp: gfx/data_select/data_select.png | $$(dir $$@)
diff --git a/gfx/sgb_border/sgb_border.png b/gfx/sgb_border/sgb_border.png
index b06f06e..f18620b 100644
Binary files a/gfx/sgb_border/sgb_border.png and b/gfx/sgb_border/sgb_border.png differ
diff --git a/source/bank_7a.asm b/source/bank_7a.asm
index 0452b06..49aa64b 100644
--- a/source/bank_7a.asm
+++ b/source/bank_7a.asm
@@ -1,6 +1,6 @@
 SECTION "gfx_sgb_border", ROMX[$4000], BANK[$7a]
 gfx_sgb_border::
-INCBIN "gfx/sgb_border/sgb_border.2bpp"
+INCBIN "gfx/sgb_border/sgb_border.4bpp"
 .end::
 
 SECTION "tilemap_unknown_7a_6020", ROMX[$6020], BANK[$7a]
-- 
cgit v1.2.3