Split full width font graphics

11 files changed, 11 insertions, 4 deletions

diff --git a/src/constants/text_constants.asm b/src/constants/text_constants.asm
index ed0938b..434a93a 100644
--- a/src/constants/text_constants.asm
+++ b/src/constants/text_constants.asm
@@ -22,7 +22,8 @@ TX_RAM3       EQU $0c
 
 ; usage: TX_FULLWIDTH*, char1, char2, ...
 ; db char1, char2, ... defaults to the value at hDefaultFont, unless
-; wFontWidth was set to HALF_WIDTH by TX_HALFWIDTH (it is FULL_WIDTH by default)
+; wFontWidth was set to HALF_WIDTH by TX_HALFWIDTH (it is FULL_WIDTH by default).
+; hDefaultFont is TX_FULLWIDTH6 by default.
 TX_FULLWIDTH5 EQU $0e ; sets hDefaultFont to TX_FULLWIDTH5
 TX_FULLWIDTH6 EQU $0f ; sets hDefaultFont to TX_FULLWIDTH6
 
diff --git a/src/engine/home.asm b/src/engine/home.asm
index add74b6..3935919 100644
--- a/src/engine/home.asm
+++ b/src/engine/home.asm
@@ -6389,7 +6389,7 @@ Func_23c1: ; 23c1 (0:23c1)
 	ld a, [hl]
 	cp TX_HALFWIDTH
 	jr nz, .asm_23cf
-	call Func_23d3
+	call .asm_23d3
 	inc b
 	srl b
 	xor a
@@ -6398,7 +6398,7 @@ Func_23c1: ; 23c1 (0:23c1)
 .asm_23cf
 	xor a ; FULL_WIDTH
 	ld [wFontWidth], a
-Func_23d3: ; 23d3 (0:23d3)
+.asm_23d3
 	push hl
 	push de
 	ld bc, $0000
diff --git a/src/gfx.asm b/src/gfx.asm
index f26662c..c2e3489 100644
--- a/src/gfx.asm
+++ b/src/gfx.asm
@@ -3,7 +3,13 @@ INCLUDE "macros.asm"
 SECTION "Gfx 1", ROMX
 
 FullWidthFonts:: ; 74000 (1d:4000)
-INCBIN "gfx/fonts/full_width.t3.1bpp"
+INCBIN "gfx/fonts/full_width/0_0_katakana.1bpp"
+INCBIN "gfx/fonts/full_width/0_1_hiragana.1bpp"
+INCBIN "gfx/fonts/full_width/0_2_digits_kanji1.1bpp"
+INCBIN "gfx/fonts/full_width/1_kanji2.1bpp"
+INCBIN "gfx/fonts/full_width/2_kanji3.1bpp"
+INCBIN "gfx/fonts/full_width/3.1bpp"
+INCBIN "gfx/fonts/full_width/4.t3.1bpp"
 
 HalfWidthFont:: ; 76668 (1d:6668)
 INCBIN "gfx/fonts/half_width.1bpp"
diff --git a/src/gfx/fonts/full_width.t3.png b/src/gfx/fonts/full_width.t3.png
deleted file mode 100644
index 5dc1fe8..0000000
--- a/src/gfx/fonts/full_width.t3.png
+++ /dev/null
diff --git a/src/gfx/fonts/full_width/0_0_katakana.png b/src/gfx/fonts/full_width/0_0_katakana.png
new file mode 100644
index 0000000..70b6612
--- /dev/null
+++ b/src/gfx/fonts/full_width/0_0_katakana.png
diff --git a/src/gfx/fonts/full_width/0_1_hiragana.png b/src/gfx/fonts/full_width/0_1_hiragana.png
new file mode 100644
index 0000000..3fda24a
--- /dev/null
+++ b/src/gfx/fonts/full_width/0_1_hiragana.png
diff --git a/src/gfx/fonts/full_width/0_2_digits_kanji1.png b/src/gfx/fonts/full_width/0_2_digits_kanji1.png
new file mode 100644
index 0000000..393d6b3
--- /dev/null
+++ b/src/gfx/fonts/full_width/0_2_digits_kanji1.png
diff --git a/src/gfx/fonts/full_width/1_kanji2.png b/src/gfx/fonts/full_width/1_kanji2.png
new file mode 100644
index 0000000..0739069
--- /dev/null
+++ b/src/gfx/fonts/full_width/1_kanji2.png
diff --git a/src/gfx/fonts/full_width/2_kanji3.png b/src/gfx/fonts/full_width/2_kanji3.png
new file mode 100644
index 0000000..7259463
--- /dev/null
+++ b/src/gfx/fonts/full_width/2_kanji3.png
diff --git a/src/gfx/fonts/full_width/3.png b/src/gfx/fonts/full_width/3.png
new file mode 100644
index 0000000..6eccd3e
--- /dev/null
+++ b/src/gfx/fonts/full_width/3.png
diff --git a/src/gfx/fonts/full_width/4.t3.png b/src/gfx/fonts/full_width/4.t3.png
new file mode 100644
index 0000000..6ccef5d
--- /dev/null
+++ b/src/gfx/fonts/full_width/4.t3.png