summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-09-19 18:50:54 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-09-19 18:50:54 -0400
commited9ef68f3103ca6f688883b2edfcc6ca5ca038b7 (patch)
treefd9fddd6c2d88633ec398cd8ca29ab459b7150f6
parent7169472f58923df09835b0f1abe9f82d6ac7ca45 (diff)
Fix SGB border graphics
-rw-r--r--gfx/gfx.mk2
-rw-r--r--gfx/sgb_border/sgb_border.pngbin2553 -> 0 bytes
-rw-r--r--gfx/sgb_border/sgb_border_1.pngbin0 -> 1093 bytes
-rw-r--r--gfx/sgb_border/sgb_border_2.pngbin0 -> 1229 bytes
-rw-r--r--source/bank_7a.asm11
5 files changed, 8 insertions, 5 deletions
diff --git a/gfx/gfx.mk b/gfx/gfx.mk
index cd9857d..07c7756 100644
--- a/gfx/gfx.mk
+++ b/gfx/gfx.mk
@@ -15,8 +15,6 @@ $(dir_build)/%.4bpp: %.png | $$(dir $$@)
$(dir_build)/gfx/sprites/%.2bpp: RGBGFXFLAGS = -h
-$(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 $$@)
$(RGBGFX) $(RGBGFXFLAGS) -o $@ $<
diff --git a/gfx/sgb_border/sgb_border.png b/gfx/sgb_border/sgb_border.png
deleted file mode 100644
index f18620b..0000000
--- a/gfx/sgb_border/sgb_border.png
+++ /dev/null
Binary files differ
diff --git a/gfx/sgb_border/sgb_border_1.png b/gfx/sgb_border/sgb_border_1.png
new file mode 100644
index 0000000..e35bf24
--- /dev/null
+++ b/gfx/sgb_border/sgb_border_1.png
Binary files differ
diff --git a/gfx/sgb_border/sgb_border_2.png b/gfx/sgb_border/sgb_border_2.png
new file mode 100644
index 0000000..54c57d2
--- /dev/null
+++ b/gfx/sgb_border/sgb_border_2.png
Binary files differ
diff --git a/source/bank_7a.asm b/source/bank_7a.asm
index 49aa64b..4aa775b 100644
--- a/source/bank_7a.asm
+++ b/source/bank_7a.asm
@@ -1,6 +1,11 @@
-SECTION "gfx_sgb_border", ROMX[$4000], BANK[$7a]
-gfx_sgb_border::
-INCBIN "gfx/sgb_border/sgb_border.4bpp"
+SECTION "gfx_sgb_border_2", ROMX[$4010], BANK[$7a]
+gfx_sgb_border_2::
+INCBIN "gfx/sgb_border/sgb_border_2.4bpp"
+.end::
+
+SECTION "gfx_sgb_border_1", ROMX[$5020], BANK[$7a]
+gfx_sgb_border_1::
+INCBIN "gfx/sgb_border/sgb_border_1.4bpp"
.end::
SECTION "tilemap_unknown_7a_6020", ROMX[$6020], BANK[$7a]