summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-09-19 16:17:01 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-09-19 16:17:01 -0400
commitfcdedfd2e48f0b6ea18bad0093d8b13fb5c1712a (patch)
tree2e893f34f9133f3043c44b7a50cb1d0bf0c91cc0
parent560d6f990aa81346e1ca8029a48f5ea0611f7467 (diff)
Use superfamiconv for 4bpp graphics
-rw-r--r--gfx/gfx.mk13
-rw-r--r--gfx/sgb_border/sgb_border.pngbin2657 -> 2553 bytes
-rw-r--r--source/bank_7a.asm2
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
--- a/gfx/sgb_border/sgb_border.png
+++ b/gfx/sgb_border/sgb_border.png
Binary files 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]