Extract more font graphics

11 files changed, 23 insertions, 10 deletions

diff --git a/gfx/fonts/alphabets.png b/gfx/fonts/alphabets.png
new file mode 100644
index 0000000..2f226a8
--- /dev/null
+++ b/gfx/fonts/alphabets.png
diff --git a/gfx/fonts/text_chars.png b/gfx/fonts/text_chars_dark.png
index 71f1b74..71f1b74 100644
--- a/gfx/fonts/text_chars.png
+++ b/gfx/fonts/text_chars_dark.png
diff --git a/gfx/fonts/text_chars_light.png b/gfx/fonts/text_chars_light.png
new file mode 100644
index 0000000..3e54fbf
--- /dev/null
+++ b/gfx/fonts/text_chars_light.png
diff --git a/gfx/fonts/textbox_border_bw.png b/gfx/fonts/textbox_border_bw.png
new file mode 100644
index 0000000..712751c
--- /dev/null
+++ b/gfx/fonts/textbox_border_bw.png
diff --git a/gfx/textbox_border.png b/gfx/fonts/textbox_border_dark.png
index c0b4a41..c0b4a41 100644
--- a/gfx/textbox_border.png
+++ b/gfx/fonts/textbox_border_dark.png
diff --git a/source/bank_02.asm b/source/bank_02.asm
index f1befc6..07ecdf7 100644
--- a/source/bank_02.asm
+++ b/source/bank_02.asm
@@ -100,13 +100,13 @@ textbox_draw_char::
     ld e, [hl]
     inc hl
     ld d, [hl]
-    ld hl, gfx_text_chars
+    ld hl, gfx_text_chars_dark
     add hl, de
     ld a, l
     ld [w_vwf_char_addr + 0], a
     ld a, h
     ld [w_vwf_char_addr + 1], a
-    ld a, BANK(gfx_text_chars)
+    ld a, BANK(gfx_text_chars_dark)
     ld [w_vwf_char_bank], a
 
     ld a, b
diff --git a/source/bank_3c.asm b/source/bank_3c.asm
index 273da54..2cfed7e 100644
--- a/source/bank_3c.asm
+++ b/source/bank_3c.asm
@@ -1,8 +1,8 @@
 SECTION "textbox_border_load", ROMX[$4d16], BANK[$3c]
 textbox_border_load::
-    ld a, BANK(gfx_textbox_border)
-    ld hl, gfx_textbox_border
+    ld a, BANK(gfx_textbox_border_dark)
+    ld hl, gfx_textbox_border_dark
     ld de, $8900
-    ld bc, gfx_textbox_border.end - gfx_textbox_border
+    ld bc, gfx_textbox_border_dark.end - gfx_textbox_border_dark
     call vram_copy
     jp farcall_ret
diff --git a/source/bank_57.asm b/source/bank_57.asm
new file mode 100644
index 0000000..85ce178
--- /dev/null
+++ b/source/bank_57.asm
@@ -0,0 +1,4 @@
+SECTION "gfx_text_chars_light", ROMX[$4000], BANK[$57]
+gfx_text_chars_light::
+INCBIN "gfx/fonts/text_chars_light.bin"
+.end::
diff --git a/source/bank_69.asm b/source/bank_69.asm
index f76b9d4..8ec3dc4 100644
--- a/source/bank_69.asm
+++ b/source/bank_69.asm
@@ -13,7 +13,12 @@ gfx_lv_1_tokiwa_forest_duplicate::
 INCBIN "gfx/levels/lv_1_tokiwa_forest_unused.bin"
 .end::
 
-SECTION "gfx_textbox_border", ROMX[$6000], BANK[$69]
-gfx_textbox_border::
-INCBIN "gfx/textbox_border.bin"
+SECTION "gfx_textbox_border_dark", ROMX[$6000], BANK[$69]
+gfx_textbox_border_dark::
+INCBIN "gfx/fonts/textbox_border_dark.bin"
+.end::
+
+SECTION "gfx_textbox_border", ROMX[$6800], BANK[$69]
+gfx_textbox_border_bw::
+INCBIN "gfx/fonts/textbox_border_bw.bin"
 .end::
diff --git a/source/bank_6f.asm b/source/bank_6f.asm
index 7240091..cb56bd7 100644
--- a/source/bank_6f.asm
+++ b/source/bank_6f.asm
@@ -1,7 +1,7 @@
 SECTION "bank6f", ROMX[$4000], BANK[$6f]
 
-gfx_text_chars::
-INCBIN "gfx/fonts/text_chars.bin"
+gfx_text_chars_dark::
+INCBIN "gfx/fonts/text_chars_dark.bin"
 .end::
 
 gfx_lv_2_mt_otsukimi::
diff --git a/source/bank_7c.asm b/source/bank_7c.asm
new file mode 100644
index 0000000..e74c94c
--- /dev/null
+++ b/source/bank_7c.asm
@@ -0,0 +1,4 @@
+SECTION "gfx_alphabets", ROMX[$4000], BANK[$7c]
+gfx_alphabets::
+INCBIN "gfx/fonts/alphabets.bin"
+.end::