From 29d241bcbed555a9d0722edb7907bc2a1e70a987 Mon Sep 17 00:00:00 2001
From: Kara Alexandra <ardnaxelarak@gmail.com>
Date: Tue, 20 Feb 2024 23:02:17 -0600
Subject: [PATCH] Replace long strings of dbs with using a text table

---
 data/textbytecharmap.txt |  61 ++++++++++++++++++
 data/textwordcharmap.txt |  61 ++++++++++++++++++
 itemtext.asm             | 132 ++++++++++++++++++++-------------------
 3 files changed, 189 insertions(+), 65 deletions(-)
 create mode 100644 data/textbytecharmap.txt
 create mode 100644 data/textwordcharmap.txt

diff --git a/data/textbytecharmap.txt b/data/textbytecharmap.txt
new file mode 100644
index 0000000..bf4cfe0
--- /dev/null
+++ b/data/textbytecharmap.txt
@@ -0,0 +1,61 @@
+'=9D
+A=AA
+B=AB
+C=AC
+D=AD
+E=AE
+F=AF
+G=B0
+H=B1
+I=B2
+J=B3
+K=B4
+L=B5
+M=B6
+N=B7
+O=B8
+P=B9
+Q=BA
+R=BB
+S=BC
+T=BD
+U=BE
+V=BF
+W=C0
+X=C1
+Y=C2
+Z=C3
+?=C6
+!=C7
+,=C8
+-=C9
+.=CD
+~=CE
+a=D0
+b=D1
+c=D2
+d=D3
+e=D4
+f=D5
+g=D6
+h=D7
+i=D8
+j=D9
+k=DA
+l=DB
+m=DC
+n=DD
+o=DE
+p=DF
+q=E0
+r=E1
+s=E2
+t=E3
+u=E4
+v=E5
+w=E6
+x=E7
+y=E8
+z=E9
+:=EA
+ =FF
diff --git a/data/textwordcharmap.txt b/data/textwordcharmap.txt
new file mode 100644
index 0000000..a3b8c64
--- /dev/null
+++ b/data/textwordcharmap.txt
@@ -0,0 +1,61 @@
+'=9D00
+A=AA00
+B=AB00
+C=AC00
+D=AD00
+E=AE00
+F=AF00
+G=B000
+H=B100
+I=B200
+J=B300
+K=B400
+L=B500
+M=B600
+N=B700
+O=B800
+P=B900
+Q=BA00
+R=BB00
+S=BC00
+T=BD00
+U=BE00
+V=BF00
+W=C000
+X=C100
+Y=C200
+Z=C300
+?=C600
+!=C700
+,=C800
+-=C900
+.=CD00
+~=CE00
+a=D000
+b=D100
+c=D200
+d=D300
+e=D400
+f=D500
+g=D600
+h=D700
+i=D800
+j=D900
+k=DA00
+l=DB00
+m=DC00
+n=DD00
+o=DE00
+p=DF00
+q=E000
+r=E100
+s=E200
+t=E300
+u=E400
+v=E500
+w=E600
+x=E700
+y=E800
+z=E900
+:=EA00
+ =FF00
diff --git a/itemtext.asm b/itemtext.asm
index d4061f7..dfe9530 100644
--- a/itemtext.asm
+++ b/itemtext.asm
@@ -1,147 +1,149 @@
+table "data/textwordcharmap.txt"
+
 org $B28000
 ; You have found
 ; the map of
 Notice_MapOf:
-	db $74, $00, $C2, $00, $DE, $00, $E4, $00, $FF, $00, $D7, $00, $D0, $00, $E5, $00, $D4, $00, $FF, $00, $D5, $00, $DE, $00, $E4, $00, $DD, $00, $D3
-	db $75, $00, $E3, $00, $D7, $00, $D4, $00, $FF, $00, $DC, $00, $D0, $00, $DF, $00, $FF, $00, $DE, $00, $D5
-	dw #$7F7F
+db $74 : dw "You have found"
+db $75 : dw "the map of"
+dw $7F7F
 
 ; You have found
 ; the compass of
 Notice_CompassOf:
-	db $74, $00, $C2, $00, $DE, $00, $E4, $00, $FF, $00, $D7, $00, $D0, $00, $E5, $00, $D4, $00, $FF, $00, $D5, $00, $DE, $00, $E4, $00, $DD, $00, $D3
-	db $75, $00, $E3, $00, $D7, $00, $D4, $00, $FF, $00, $D2, $00, $DE, $00, $DC, $00, $DF, $00, $D0, $00, $E2, $00, $E2, $00, $FF, $00, $DE, $00, $D5
-	dw #$7F7F
+db $74 : dw "You have found"
+db $75 : dw "the compass of"
+dw $7F7F
 
 ; Oh look! it's
 ; the big key of
 Notice_BigKeyOf:
-	db $74, $00, $B8, $00, $D7, $00, $FF, $00, $DB, $00, $DE, $00, $DE, $00, $DA, $00, $C7, $00, $FF, $00, $D8, $00, $E3, $00, $9D, $00, $E2
-	db $75, $00, $E3, $00, $D7, $00, $D4, $00, $FF, $00, $D1, $00, $D8, $00, $D6, $00, $FF, $00, $DA, $00, $D4, $00, $E8, $00, $FF, $00, $DE, $00, $D5
-	dw #$7F7F
+db $74 : dw "Oh look! it's"
+db $75 : dw "the big key of"
+dw $7F7F
 
-; this is a
+; This is a
 ; small key to
 Notice_SmallKeyOf:
-	db $74, $00, $BD, $00, $D7, $00, $D8, $00, $E2, $00, $FF, $00, $D8, $00, $E2, $00, $FF, $00, $D0
-	db $75, $00, $E2, $00, $DC, $00, $D0, $00, $DB, $00, $DB, $00, $FF, $00, $DA, $00, $D4, $00, $E8, $00, $FF, $00, $E3, $00, $DE
-	dw #$7F7F
+db $74 : dw "This is a"
+db $75 : dw "small key to"
+dw $7F7F
 
 ; You picked up
 Notice_Crystal:
-	db $74, $00, $C2, $00, $DE, $00, $E4, $00, $FF, $00, $DF, $00, $D8, $00, $D2, $00, $DA, $00, $D4, $00, $D3, $00, $FF, $00, $E4, $00, $DF
-        dw $7F7F
+db $74 : dw "You picked up"
+dw $7F7F
 
-; light world
+; Light World
 Notice_LightWorld:
-	db $76, $00, $B5, $00, $D8, $00, $D6, $00, $D7, $00, $E3, $00, $FF, $00, $C0, $00, $DE, $00, $E1, $00, $DB, $00, $D3
-	dw #$7F7F
+db $76 : dw "Light World"
+dw $7F7F
 
-; dark world
+; Dark World
 Notice_DarkWorld:
-	db $76, $00, $AD, $00, $D0, $00, $E1, $00, $DA, $00, $FF, $00, $C0, $00, $DE, $00, $E1, $00, $DB, $00, $D3
-	dw #$7F7F
+db $76 : dw "Dark World"
+dw $7F7F
 
 ; Ganons Tower
 Notice_GTower:
-	db $76, $00, $B0, $00, $D0, $00, $DD, $00, $DE, $00, $DD, $00, $E2, $00, $FF, $00, $BD, $00, $DE, $00, $E6, $00, $D4, $00, $E1
-	dw #$7F7F
+db $76 : dw "Ganons Tower"
+dw $7F7F
 
 ; Turtle Rock
 Notice_TRock:
-	db $76, $00, $BD, $00, $E4, $00, $E1, $00, $E3, $00, $DB, $00, $D4, $00, $FF, $00, $BB, $00, $DE, $00, $D2, $00, $DA
-	dw #$7F7F
+db $76 : dw "Turtle Rock"
+dw $7F7F
 
 ; Thieves Town
 Notice_Thieves:
-	db $76, $00, $BD, $00, $D7, $00, $D8, $00, $D4, $00, $E5, $00, $D4, $00, $E2, $00, $FF, $00, $BD, $00, $DE, $00, $E6, $00, $DD
-	dw #$7F7F
+db $76 : dw "Thieves Town"
+dw $7F7F
 
 ; Tower of Hera
 Notice_Hera:
-	db $76, $00, $BD, $00, $DE, $00, $E6, $00, $D4, $00, $E1, $00, $FF, $00, $DE, $00, $D5, $00, $FF, $00, $B1, $00, $D4, $00, $E1, $00, $D0
-	dw #$7F7F
+db $76 : dw "Tower of Hera"
+dw $7F7F
 
 ; Ice Palace
 Notice_Ice:
-	db $76, $00, $B2, $00, $D2, $00, $D4, $00, $FF, $00, $B9, $00, $D0, $00, $DB, $00, $D0, $00, $D2, $00, $D4
-	dw #$7F7F
+db $76 : dw "Ice Palace"
+dw $7F7F
 
 ; Skull Woods
 Notice_Skull:
-	db $76, $00, $BC, $00, $DA, $00, $E4, $00, $DB, $00, $DB, $00, $FF, $00, $C0, $00, $DE, $00, $DE, $00, $D3, $00, $E2
-	dw #$7F7F
+db $76 : dw "Skull Woods"
+dw $7F7F
 
 ; Misery Mire
 Notice_Mire:
-	db $76, $00, $B6, $00, $D8, $00, $E2, $00, $D4, $00, $E1, $00, $E8, $00, $FF, $00, $B6, $00, $D8, $00, $E1, $00, $D4
-	dw #$7F7F
+db $76 : dw "Misery Mire"
+dw $7F7F
 
 ; Dark Palace
 Notice_PoD:
-	db $76, $00, $AD, $00, $D0, $00, $E1, $00, $DA, $00, $FF, $00, $B9, $00, $D0, $00, $DB, $00, $D0, $00, $D2, $00, $D4
-	dw #$7F7F
+db $76 : dw "Dark Palace"
+dw $7F7F
 
 ; Swamp Palace
 Notice_Swamp:
-	db $76, $00, $BC, $00, $E6, $00, $D0, $00, $DC, $00, $DF, $00, $FF, $00, $B9, $00, $D0, $00, $DB, $00, $D0, $00, $D2, $00, $D4
-	dw #$7F7F
+db $76 : dw "Swamp Palace"
+dw $7F7F
 
 ; Castle Tower
 Notice_AgaTower:
-	db $76, $00, $AC, $00, $D0, $00, $E2, $00, $E3, $00, $DB, $00, $D4, $00, $FF, $00, $BD, $00, $DE, $00, $E6, $00, $D4, $00, $E1
-	dw #$7F7F
+db $76 : dw "Castle Tower"
+dw $7F7F
 
 ; Desert Palace
 Notice_Desert:
-	db $76, $00, $AD, $00, $D4, $00, $E2, $00, $D4, $00, $E1, $00, $E3, $00, $FF, $00, $B9, $00, $D0, $00, $DB, $00, $D0, $00, $D2, $00, $D4
-	dw #$7F7F
+db $76 : dw "Desert Palace"
+dw $7F7F
 
 ; Eastern Palace
 Notice_Eastern:
-	db $76, $00, $AE, $00, $D0, $00, $E2, $00, $E3, $00, $D4, $00, $E1, $00, $DD, $00, $FF, $00, $B9, $00, $D0, $00, $DB, $00, $D0, $00, $D2, $00, $D4
-	dw #$7F7F
+db $76 : dw "Eastern Palace"
+dw $7F7F
 
 ; Hyrule Castle
 Notice_Castle:
-	db $76, $00, $B1, $00, $E8, $00, $E1, $00, $E4, $00, $DB, $00, $D4, $00, $FF, $00, $AC, $00, $D0, $00, $E2, $00, $E3, $00, $DB, $00, $D4
-	dw #$7F7F
+db $76 : dw "Hyrule Castle"
+dw $7F7F
 
 ; Hyrule Castle
 Notice_Sewers:
-	db $76, $00, $B1, $00, $E8, $00, $E1, $00, $E4, $00, $DB, $00, $D4, $00, $FF, $00, $AC, $00, $D0, $00, $E2, $00, $E3, $00, $DB, $00, $D4
-	dw #$7F7F
+db $76 : dw "Hyrule Castle"
+dw $7F7F
 
 ; This Dungeon
 Notice_Self:
-	db $76, $00, $E3, $00, $D7, $00, $D8, $00, $E2, $00, $FF, $00, $D3, $00, $E4, $00, $DD, $00, $D6, $00, $D4, $00, $DE, $00, $Dd
-	dw #$7F7F
+db $76 : dw "this dungeon"
+dw $7F7F
 
 ; Crystal numbers
 Notice_One:
-        db $75, $00, $D2, $00, $E1, $00, $E8, $00, $E2, $00, $E3, $00, $D0, $00, $DB, $00, $FF, $00, $DE, $00, $DD, $00, $D4
-	dw #$7F7F
+db $75 : dw "crystal one"
+dw $7F7F
 
 Notice_Two:
-        db $75, $00, $D2, $00, $E1, $00, $E8, $00, $E2, $00, $E3, $00, $D0, $00, $DB, $00, $FF, $00, $E3, $00, $E6, $00, $DE
-	dw #$7F7F
+db $75 : dw "crystal two"
+dw $7F7F
 
 Notice_Three:
-        db $75, $00, $D2, $00, $E1, $00, $E8, $00, $E2, $00, $E3, $00, $D0, $00, $DB, $00, $FF, $00, $E3, $00, $D7, $00, $E1, $00, $D4, $00, $D4
-	dw #$7F7F
+db $75 : dw "crystal three"
+dw $7F7F
 
 Notice_Four:
-        db $75, $00, $D2, $00, $E1, $00, $E8, $00, $E2, $00, $E3, $00, $D0, $00, $DB, $00, $FF, $00, $D5, $00, $DE, $00, $E4, $00, $E1
-	dw #$7F7F
+db $75 : dw "crystal four"
+dw $7F7F
 
 Notice_Five:
-        db $75, $00, $D2, $00, $E1, $00, $E8, $00, $E2, $00, $E3, $00, $D0, $00, $DB, $00, $FF, $00, $D5, $00, $D8, $00, $E5, $00, $D4
-	dw #$7F7F
+db $75 : dw "crystal five"
+dw $7F7F
 
 Notice_Six:
-        db $75, $00, $D2, $00, $E1, $00, $E8, $00, $E2, $00, $E3, $00, $D0, $00, $DB, $00, $FF, $00, $E2, $00, $D8, $00, $E7
-	dw #$7F7F
+db $75 : dw "crystal six"
+dw $7F7F
 
 Notice_Seven:
-        db $75, $00, $D2, $00, $E1, $00, $E8, $00, $E2, $00, $E3, $00, $D0, $00, $DB, $00, $FF, $00, $E2, $00, $D4, $00, $E5, $00, $D4, $00, $DD
-	dw #$7F7F
+db $75 : dw "crystal seven"
+dw $7F7F