From a2671e7ed504f38cf71552545d0a40bea913ed4a Mon Sep 17 00:00:00 2001
From: cassidoxa <cassidymoen@gmx.com>
Date: Fri, 11 Aug 2023 20:11:50 -0400
Subject: [PATCH] A few font fixes

---
 LTTP_RND_GeneralBugfixes.asm        |   1 +
 data/creditscharmapsmall_yellow.txt |   3 ++
 data/kanjireplacements.asm          |  55 ++++++++++++++++++++++++++++
 data/newfont.bin                    | Bin 4096 -> 4096 bytes
 data/newfont_inverted.bin           | Bin 4096 -> 4096 bytes
 data/smallchars.2bpp                | Bin 512 -> 512 bytes
 stats/fonttable.asm                 |   8 ++--
 textrenderer.asm                    |  18 ++++-----
 8 files changed, 72 insertions(+), 13 deletions(-)
 create mode 100644 data/kanjireplacements.asm

diff --git a/LTTP_RND_GeneralBugfixes.asm b/LTTP_RND_GeneralBugfixes.asm
index 15c8fe3..ed34992 100644
--- a/LTTP_RND_GeneralBugfixes.asm
+++ b/LTTP_RND_GeneralBugfixes.asm
@@ -270,6 +270,7 @@ if !FEATURE_NEW_TEXT
         incbin data/playernamestripes_1.bin
         org $8CE911
         incbin data/playernamestripes_2.bin
+        incsrc data/kanjireplacements.asm ; Overwrites text gfx data and masks in bank $8E
 endif
 
 org $B28000
diff --git a/data/creditscharmapsmall_yellow.txt b/data/creditscharmapsmall_yellow.txt
index 5723ffc..c1c047c 100644
--- a/data/creditscharmapsmall_yellow.txt
+++ b/data/creditscharmapsmall_yellow.txt
@@ -25,4 +25,7 @@ W=30
 X=31
 Y=32
 Z=33
+,=34
 '=35
+-=36
+.=37
diff --git a/data/kanjireplacements.asm b/data/kanjireplacements.asm
new file mode 100644
index 0000000..feeccf4
--- /dev/null
+++ b/data/kanjireplacements.asm
@@ -0,0 +1,55 @@
+; Kanji replacement characters
+
+org $8E9AC9
+;.charDD ; 𓄿
+db $FB, $8C, $73, $CB, $30, $4B, $30, $54
+db $2B, $5B, $24, $2D, $12, $13, $61, $1E
+db $36, $09, $1B, $04, $14, $0B, $15, $0A
+db $15, $0A, $21, $1E, $1E, $48, $30, $38
+;.charDE ; ☥
+db $1E, $33, $0C, $2D, $12, $2D, $12, $2D
+db $12, $F3, $0C, $01, $01, $BF, $40, $C0
+db $3F, $BF, $40, $F2, $0C, $12, $0C, $12
+db $0C, $12, $0C, $1E, $50, $A0, $F0
+;.charDF ; ≈
+db $01, $3B, $6E, $11, $C4, $3B, $91, $6E
+db $BB, $44, $26, $18, $3C, $E7, $3B, $6E
+db $11, $C4, $3B, $91, $6E, $BB, $44, $EE
+db $98, $60, $F0
+;.charE0 ; 🡅
+db $0C, $12, $0C, $21, $1E, $40, $3F, $80
+db $7F, $02, $01, $01, $E1, $1E, $21, $1E
+db $21, $1E, $21, $1E, $21, $1E, $21, $1E
+db $21, $1E, $3F, $80, $80
+;.charE1 ; 🡇
+db $3F, $21, $1E, $21, $1E, $21, $1E, $21
+db $1E, $21, $1E, $21, $1E, $E1, $1E, $80
+db $7F, $40, $3F, $21, $1E, $12, $0C, $0C
+db $28, $10, $30
+;.charE2 ; 🡆
+db $18, $14, $08, $12, $0C, $F1, $0E, $80
+db $7F, $01, $80, $7F, $80, $7F, $80, $7F
+db $F1, $0E, $12, $0C, $14, $08, $18, $20
+db $C0, $C0
+;.charE3 ; 🡄
+db $06, $0A, $04, $12, $0C, $23, $1C, $40
+db $3F, $02, $01, $03, $80, $7F, $80, $7F
+db $40, $3F, $23, $1C, $12, $0C, $0A, $04
+db $06, $10, $E0, $F0
+
+
+org $8EBD94
+;.charDD ; 𓄿
+db $BF, $FE, $3F, $FF, $B8 ; 10111111 11111110 00111111 11111111 10111000
+;.charDE ; ☥
+db $BF, $FA, $3F, $FF, $B8 ; 10111111 11111010 00111111 11111111 10111000
+;.charDF ; ≈
+db $AF, $FE, $2B, $FE, $38 ; 10101111 11111110 00101011 11111110 00111000
+;.charE0 ; 🡅
+db $2F, $FE, $3F, $FF, $A8 ; 00101111 11111110 00111111 11111111 10101000
+;.charE1 ; 🡇
+db $2F, $F0, $3F, $FF, $B8 ; 00101111 11110000 00111111 11111111 10111000
+;.charE2 ; 🡆
+db $2F, $F8, $3F, $FE, $38 ; 00101111 11111000 00111111 11111110 00111000
+;.charE3 ; 🡄
+db $2F, $FE, $3F, $FE, $38 ; 00101111 11111110 00111111 11111110 00111000
diff --git a/data/newfont.bin b/data/newfont.bin
index 44d294640a45137f6874531d724feaf1303cda0a..8d6cba4137d549bc63291dad8b6c147c006059e8 100644
GIT binary patch
delta 338
zcmZorXi(U|!e{fHLE`!Jgy{(@!nb=c0D%odnnaWe2tJnp@tGOQ81E=|mMPyU>j3fX
z85HGUaPmPWu_zt}As$6J2m6M4kTeW5FgP?o*gOneEI-*A>T%19aHvb5>OTO~?a(lJ
zB5y$bA)8zwGfoY0Z4oUICmS1vy2i%3y2hsxDqv{Ca30BhcYrp6-1bneq29q>QBH`5
z2kZuraZuMVJcPR*q|%<@09XZr06Fw08y5>iCxaT2R)`{y(drT+98d*dmmUB*H5ve%
Cyg}~(

delta 31
XcmZorXi(U|!Z&#VZwdy!z{CLnxIYV|

diff --git a/data/newfont_inverted.bin b/data/newfont_inverted.bin
index 13323eecf17ef1a9fb66dbf4e6badf25573c098c..0b78c5c87ffef7065ba4a7ffbf7be76375bb6855 100644
GIT binary patch
delta 478
zcmZorXi(VD%*D$91vU~Y5-O7?aJg#pvvIOX@(J=7%P7Gl!L*G;8knv(^EC4m%2kPG
zD4WFHz{g+%6b0)Bu_pI%J4sl$S-2RSDd<R;kuZVb15nn<#tEp|X7WKM$;pg7N|TQ;
ziA}cTc|Q396DK=V>tqAotJdG2OC(HBm>#~uV>`@Bl_(IDcn;<>GnOgeDeJtW+))PR
z+si4!Akb{_NFE*`IYoPi`UbEpjA&?ZfHHYlxY&NyH{h1%5Rp(v(|@4Bp}}GDMBadU
zn?pjmoMz%0BHAKaHckvSjdgX6jdc=FK_Mrh0`&cPB<I~>U;sPqVSR(WgPbCd5Cad`
z5kTV@8X(S*dkAwph-R>7H~<lcksyb%{bb>S>QrYyXoV;N87-mCAp%tZln1If0CZ~<
E04yzD4FCWD

delta 195
zcmZorXi(VD%*89uCCVkr@V~B+=`R!O<Oy7^laDd+$?~(y^IOZS%ctAd+t)KNFnoCM
z<HMOBEkD}+ocr@{5_bb16Dt({t!rfXKe><F$pEMf1(?@s0X56lv)ePs^BXY8*ZkY_
z@6W#<|33U-_)*Zq@M98>GOvw9n$5YI`E~p2=GIM}Y{2tDpl&UYGrR7)&3lPD1{(&3
R$p*YvCokYlMaN7G3;;?~Mgsr<

diff --git a/data/smallchars.2bpp b/data/smallchars.2bpp
index 1b5594176c8ea5ce37b99c44b73ad0006b628f5b..8cda2eebabf08b0c15577bc104ba506f234e7f94 100644
GIT binary patch
delta 88
wcmZo*X<*r~fiZvq4k{`<fH0#XqN1PxE(m4(|KIrk|9@mri0X<8WHAsM07gO(mH+?%

delta 88
ccmZo*X<*r~fia+>!lOdNBA_54fq^Oj0Q3<CN&o-=

diff --git a/stats/fonttable.asm b/stats/fonttable.asm
index 342073d..9c68676 100644
--- a/stats/fonttable.asm
+++ b/stats/fonttable.asm
@@ -53,10 +53,10 @@ dw $2DF6 ; W               ;
 dw $2DF7 ; X               ;
 dw $2DF8 ; Y               ;
 dw $2DF9 ; Z               ; $33
-dw $0000 ; Unused          ;
-dw $2DFB ; '               ;
-dw $0000 ; Unused          ;
-dw $0000 ; Unused          ;
+dw $2DFB ; ,               ;
+dw $2DFC ; '               ;
+dw $2DFD ; -               ;
+dw $2DFE ; .               ;
                            ;
 ; Small letters green      ;
 dw $29E0 ; A               ; $38
diff --git a/textrenderer.asm b/textrenderer.asm
index 0232d27..16fd926 100644
--- a/textrenderer.asm
+++ b/textrenderer.asm
@@ -368,8 +368,8 @@ FontProperties:
     dw $8001, $06C0     ; C7 ; !
     dw $8001, $02D0     ; C8 ; ,
     dw $8001, $02B0     ; C9 ; -
-    dw $8000, $0000     ; CA
-    dw $8000, $0000     ; CB
+    dw $8000, $0000     ; CA ; 🡄"
+    dw $8000, $0000     ; CB ; 🡆
     dw $0000, $0000     ; CC ; Blank char
     dw $8001, $02C0     ; CD ; .
     dw $8001, $02F0     ; CE ; ~
@@ -406,14 +406,14 @@ FontProperties:
     dw $8001, $0A90     ; EB ; @ (thin)
     dw $8001, $0AA0     ; EC ; # (thin)
     dw $8001, $0A00     ; ED ; _
-    dw $0000, $0000     ; EE ;
-    dw $0000, $0000     ; EF
+    dw $0000, $0000     ; EE ; bird
+    dw $0000, $0000     ; EF ; ankh
 
-    dw $0000, $0000     ; F0
-    dw $0000, $0000     ; F1
-    dw $0000, $0000     ; F2
-    dw $0000, $0000     ; F3
-    dw $0000, $0000     ; F4
+    dw $0000, $0000     ; F0 ; wavy
+    dw $0000, $0000     ; F1 ; down arrow
+    dw $0000, $0000     ; F2 ; up arrow
+    dw $0000, $0000     ; F3 ; right arrow
+    dw $0000, $0000     ; F4 ; left arrow
     dw $0000, $0000     ; F5
     dw $0000, $0000     ; F6
     dw $0000, $0000     ; F7