summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-06-14 21:19:15 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-06-14 21:19:15 -0400
commit51a580a83f971fd5685824c86cfe186a2939a2cd (patch)
treecb46040186ff2a0b0cd8b4d1ac075f80102bd196
parentae14056d11119e7cfc04529a07daa35240a9d868 (diff)
SGB border maps include the middle $00 area, which make strips out using tr
-rw-r--r--.gitignore1
-rw-r--r--Makefile4
-rw-r--r--gfx/sgb/gold_border.binbin0 -> 1792 bytes
-rw-r--r--gfx/sgb/gold_border.sgb.tilemap2
-rw-r--r--gfx/sgb/silver_border.binbin0 -> 1792 bytes
-rw-r--r--gfx/sgb/silver_border.sgb.tilemap2
6 files changed, 4 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore
index 3b13848f..c9d8218d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,3 +52,4 @@ used_space.png
*.lz
*.gbcpal
*.dimensions
+*.sgb.tilemap
diff --git a/Makefile b/Makefile
index f197fde4..c52dd8d1 100644
--- a/Makefile
+++ b/Makefile
@@ -53,7 +53,7 @@ silver: pokesilver.gbc
clean:
rm -f $(roms) $(gold_obj) $(silver_obj) $(roms:.gbc=.map) $(roms:.gbc=.sym) rgbdscheck.o
- find gfx \( -name "*.[12]bpp" -o -name "*.lz" -o -name "*.gbcpal" -o -name "*.dimensions" \) -delete
+ find gfx \( -name "*.[12]bpp" -o -name "*.lz" -o -name "*.gbcpal" -o -name "*.dimensions" -o -name "*.sgb.tilemap" \) -delete
$(MAKE) clean -C tools/
tidy:
@@ -214,6 +214,8 @@ gfx/font/unused_bold_font.1bpp: tools/gfx += --trim-whitespace
gfx/sgb/gold_border.2bpp: tools/gfx += --trim-whitespace
gfx/sgb/silver_border.2bpp: tools/gfx += --trim-whitespace
+gfx/sgb/gold_border.sgb.tilemap: gfx/sgb/gold_border.bin ; tr < $< -d '\000' > $@
+gfx/sgb/silver_border.sgb.tilemap: gfx/sgb/silver_border.bin ; tr < $< -d '\000' > $@
### Catch-all graphics rules
diff --git a/gfx/sgb/gold_border.bin b/gfx/sgb/gold_border.bin
new file mode 100644
index 00000000..7a32f4d9
--- /dev/null
+++ b/gfx/sgb/gold_border.bin
Binary files differ
diff --git a/gfx/sgb/gold_border.sgb.tilemap b/gfx/sgb/gold_border.sgb.tilemap
deleted file mode 100644
index 3a3edb57..00000000
--- a/gfx/sgb/gold_border.sgb.tilemap
+++ /dev/null
@@ -1,2 +0,0 @@
-TTTTTTT$%&T&T%T$TTTTTTTTT$455T4T3TTTT!"##T"T!T T  
-  !"##T"T!T122T688888888888888888888'2TT2T1TTT7TTTTT7TTT%&T&T7&T&T%T3455T4T7455T4T3T7TTT7TTT7"T!T T7 !"2T1T0T7012TTT7TTT7&T%T$T7$%&4T3TT7347TT7TTTTT7TTT!"##T"T7"##T"T!T122T72TT2T1TTT.////////////////////-TTTTTTT9 ( )*+,9TTT%&T&T%T$TTTT$%&T&T%T3455T4T$TTTTTT$455T4T3T !"##T"T!T T \ No newline at end of file
diff --git a/gfx/sgb/silver_border.bin b/gfx/sgb/silver_border.bin
new file mode 100644
index 00000000..ed853e00
--- /dev/null
+++ b/gfx/sgb/silver_border.bin
Binary files differ
diff --git a/gfx/sgb/silver_border.sgb.tilemap b/gfx/sgb/silver_border.sgb.tilemap
deleted file mode 100644
index 30f04252..00000000
--- a/gfx/sgb/silver_border.sgb.tilemap
+++ /dev/null
@@ -1,2 +0,0 @@
-TTTTTTT$%&T&T%T$TTTTTTTTT$455T4T3TTTT!"##T"T!T T  
-  !"##T"T!T122T688888888888888888888'2TT2T1TTT7TTTTT7TTT%&T&T7&T&T%T3455T4T7455T4T3T7TTT7TTT7"T!T T7 !"2T1T0T7012TTT7TTT7&T%T$T7$%&4T3TT7347TT7TTTTT7TTT!"##T"T7"##T"T!T122T72TT2T1TTT.////////////////////-TTTTTTT9  )*+,9TTT%&T&T%T$TTTT$%&T&T%T3455T4T$TTTTTT$455T4T3T !"##T"T!T T \ No newline at end of file