From c14b7b8d913e2917cdb5234680162a70965f41d0 Mon Sep 17 00:00:00 2001
From: Marijn van der Werf <marijn.vanderwerf@gmail.com>
Date: Wed, 21 Jun 2017 15:20:30 +0200
Subject: Move text data

---
 include/fonts/font0_widths.h |  41 -------
 include/fonts/font1_widths.h |  37 -------
 include/fonts/font3_widths.h |  41 -------
 include/fonts/font4_widths.h |  37 -------
 include/fonts/type1_map.h    | 250 -------------------------------------------
 include/fonts/type3_map.h    | 131 -----------------------
 src/data/text/font0_widths.h |  39 +++++++
 src/data/text/font1_widths.h |  35 ++++++
 src/data/text/font3_widths.h |  39 +++++++
 src/data/text/font4_widths.h |  35 ++++++
 src/data/text/type1_map.h    | 249 ++++++++++++++++++++++++++++++++++++++++++
 src/data/text/type3_map.h    | 130 ++++++++++++++++++++++
 src/text.c                   |  14 +--
 13 files changed, 535 insertions(+), 543 deletions(-)
 delete mode 100644 include/fonts/font0_widths.h
 delete mode 100644 include/fonts/font1_widths.h
 delete mode 100644 include/fonts/font3_widths.h
 delete mode 100644 include/fonts/font4_widths.h
 delete mode 100644 include/fonts/type1_map.h
 delete mode 100644 include/fonts/type3_map.h
 create mode 100644 src/data/text/font0_widths.h
 create mode 100644 src/data/text/font1_widths.h
 create mode 100644 src/data/text/font3_widths.h
 create mode 100644 src/data/text/font4_widths.h
 create mode 100644 src/data/text/type1_map.h
 create mode 100644 src/data/text/type3_map.h

diff --git a/include/fonts/font0_widths.h b/include/fonts/font0_widths.h
deleted file mode 100644
index 77fcff3ee..000000000
--- a/include/fonts/font0_widths.h
+++ /dev/null
@@ -1,41 +0,0 @@
-#if REVISION >= 1
-static const u8 sFont0Widths[] =
-{
-    3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 8, 6, 6, 6, 6, 6,
-    6, 6, 6, 6, 6, 6, 6, 6, 8, 6, 6, 6, 6, 6, 4, 8,
-    6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 8, 6, 6, 8,
-    8, 8, 8, 8, 8, 8, 3, 8, 8, 8, 8, 8, 8, 8, 8, 8,
-    8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
-    7, 6, 4, 8, 8, 8, 7, 8, 8, 4, 6, 6, 4, 4, 8, 8,
-    8, 8, 8, 8, 8, 8, 8, 8, 6, 7, 8, 7, 7, 8, 8, 4,
-    7, 8, 8, 8, 8, 8, 7, 8, 7, 7, 7, 7, 7, 7, 8, 7,
-    7, 7, 7, 7, 5, 6, 6, 8, 8, 8, 8, 8, 8, 8, 8, 8,
-    8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
-    8, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 3, 6, 3, 5, 3,
-    6, 6, 6, 3, 3, 6, 6, 6, 3, 6, 6, 6, 6, 6, 6, 6,
-    6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
-    6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 4, 5, 6,
-    3, 6, 6, 6, 6, 6, 5, 6, 6, 6, 6, 6, 6, 6, 6, 7,
-    3, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 1, 1,
-};
-#else
-static const u8 sFont0Widths[] =
-{
-    3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 8, 6, 6, 6, 6, 6,
-    6, 6, 6, 6, 6, 6, 6, 6, 8, 6, 6, 6, 6, 6, 5, 8,
-    6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 8,
-    7, 7, 7, 8, 8, 8, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8,
-    8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
-    7, 6, 3, 8, 8, 8, 7, 8, 8, 4, 6, 6, 4, 4, 8, 8,
-    8, 8, 8, 8, 8, 8, 8, 8, 8, 7, 8, 7, 7, 8, 8, 6,
-    7, 8, 8, 8, 8, 8, 7, 8, 7, 7, 7, 7, 7, 7, 8, 7,
-    7, 7, 7, 7, 7, 7, 7, 8, 6, 8, 8, 8, 8, 8, 8, 8,
-    8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
-    7, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 3, 6, 3, 5, 3,
-    6, 6, 6, 3, 3, 6, 6, 6, 3, 6, 6, 6, 6, 6, 6, 6,
-    6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
-    6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 4, 5, 6,
-    3, 6, 6, 6, 6, 6, 5, 6, 6, 6, 6, 6, 6, 6, 6, 7,
-    3, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 1, 1,
-};
-#endif
diff --git a/include/fonts/font1_widths.h b/include/fonts/font1_widths.h
deleted file mode 100644
index 454bbfaca..000000000
--- a/include/fonts/font1_widths.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#if REVISION >= 1
-static const u8 sFont1Widths[] =
-{
-    5, 3, 8, 8, 8, 8, 8, 8, 8, 4, 5, 4, 4, 8, 8, 8,
-    8, 8, 8, 8, 8, 8, 8, 5, 8, 8, 8, 8, 8, 4, 8, 8,
-    8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 7, 5, 5, 5,
-    6, 5, 5, 5, 5, 5, 5, 5, 5, 4, 8, 4, 4, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 8, 4, 5, 5, 5, 5, 4, 8,
-    4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 8, 5, 6, 6,
-    8, 7, 3, 5, 3, 3, 5, 4, 3, 6, 6, 6, 7, 7, 8, 5,
-    5, 5, 3, 5, 6, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 4, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 4, 5, 5, 5, 5, 4, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 4, 4, 5, 3, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 6, 6, 7, 7, 7, 7, 6, 7, 6, 6, 7, 6,
-    7, 7, 7, 6, 7, 6, 7, 6, 7, 6, 6, 7, 6, 6, 3, 3,
-    5, 5, 5, 5, 3, 3, 5, 5, 5, 5, 5, 5,
-};
-#else
-static const u8 sFont1Widths[] =
-{
-    5, 3, 8, 8, 8, 8, 8, 8, 8, 4, 5, 4, 4, 8, 8, 8,
-    8, 8, 8, 8, 8, 8, 8, 5, 8, 8, 8, 8, 8, 4, 8, 8,
-    8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 6, 6, 6, 5,
-    6, 5, 5, 5, 5, 5, 5, 5, 5, 4, 8, 4, 4, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 8, 4, 5, 5, 5, 5, 4, 8,
-    4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 6, 6,
-    8, 7, 6, 5, 3, 3, 5, 4, 3, 6, 6, 6, 7, 7, 8, 5,
-    5, 5, 3, 5, 6, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 4, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 4, 5, 5, 5, 5, 4, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 4, 4, 5, 3, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 6, 6, 7, 7, 7, 7, 6, 7, 6, 6, 7, 6,
-    7, 7, 7, 6, 7, 6, 7, 6, 7, 6, 6, 7, 6, 6, 3, 3,
-    5, 5, 5, 5, 3, 3, 5, 5, 5, 5, 5, 5,
-};
-#endif
diff --git a/include/fonts/font3_widths.h b/include/fonts/font3_widths.h
deleted file mode 100644
index 45dc69c06..000000000
--- a/include/fonts/font3_widths.h
+++ /dev/null
@@ -1,41 +0,0 @@
-#if REVISION >= 1
-static const u8 sFont3Widths[] =
-{
-    3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 8, 6, 6, 6, 6, 6,
-    6, 6, 6, 6, 6, 6, 6, 6, 8, 6, 6, 6, 6, 6, 4, 8,
-    6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 8, 6, 6, 8,
-    8, 8, 8, 8, 8, 8, 3, 8, 8, 8, 8, 8, 8, 8, 8, 8,
-    8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
-    7, 6, 4, 8, 8, 8, 7, 8, 8, 4, 6, 6, 4, 4, 8, 8,
-    8, 8, 8, 8, 8, 8, 8, 8, 6, 7, 8, 7, 7, 8, 8, 4,
-    7, 8, 8, 8, 8, 8, 7, 8, 7, 7, 7, 7, 7, 7, 8, 7,
-    7, 7, 7, 7, 5, 6, 6, 8, 8, 8, 8, 8, 8, 8, 8, 8,
-    8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
-    8, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 3, 6, 3, 5, 3,
-    6, 6, 6, 3, 3, 6, 6, 6, 3, 6, 6, 6, 6, 6, 6, 6,
-    6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
-    6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 4, 5, 6,
-    3, 6, 6, 6, 6, 6, 5, 6, 6, 6, 6, 6, 6, 6, 6, 7,
-    3, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 1, 1,
-};
-#else
-static const u8 sFont3Widths[] =
-{
-    3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 8, 6, 6, 6, 6, 6,
-    6, 6, 6, 6, 6, 6, 6, 6, 8, 6, 6, 6, 6, 6, 4, 8,
-    6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 8,
-    8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
-    8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
-    7, 6, 4, 8, 8, 8, 7, 8, 8, 4, 6, 6, 4, 4, 8, 8,
-    8, 8, 8, 8, 8, 8, 8, 8, 6, 7, 8, 7, 7, 8, 8, 4,
-    7, 8, 8, 8, 8, 8, 7, 8, 7, 7, 7, 7, 7, 7, 8, 7,
-    7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8,
-    8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
-    7, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 3, 6, 3, 5, 3,
-    6, 6, 6, 3, 3, 6, 6, 6, 3, 6, 6, 6, 6, 6, 6, 6,
-    6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
-    6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 4, 5, 6,
-    3, 6, 6, 6, 6, 6, 5, 6, 6, 6, 6, 6, 6, 6, 6, 7,
-    3, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 1, 1,
-};
-#endif
diff --git a/include/fonts/font4_widths.h b/include/fonts/font4_widths.h
deleted file mode 100644
index 63adf4921..000000000
--- a/include/fonts/font4_widths.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#if REVISION >= 1
-static const u8 sFont4Widths[] =
-{
-    5, 3, 8, 8, 8, 8, 8, 8, 8, 4, 5, 4, 4, 8, 8, 8,
-    8, 8, 8, 8, 8, 8, 8, 5, 8, 8, 8, 8, 8, 4, 8, 8,
-    8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 7, 5, 5, 5,
-    6, 5, 5, 5, 5, 5, 5, 5, 5, 4, 8, 4, 4, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 8, 4, 5, 5, 5, 5, 4, 8,
-    4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 8, 5, 6, 6,
-    8, 7, 3, 5, 3, 3, 5, 4, 3, 6, 6, 6, 7, 7, 8, 5,
-    5, 5, 3, 5, 6, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 4, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 4, 5, 5, 5, 5, 4, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 4, 4, 5, 3, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 6, 6, 7, 7, 7, 7, 6, 7, 6, 6, 7, 6,
-    7, 7, 7, 6, 7, 6, 7, 6, 7, 6, 6, 7, 6, 6, 3, 3,
-    5, 5, 5, 5, 3, 3, 5, 5, 5, 5, 5, 5,
-};
-#else
-static const u8 sFont4Widths[] =
-{
-    5, 3, 8, 8, 8, 8, 8, 8, 8, 4, 5, 4, 4, 8, 8, 8,
-    8, 8, 8, 8, 8, 8, 8, 5, 8, 8, 8, 8, 8, 4, 8, 8,
-    8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 6, 6, 6, 5,
-    6, 5, 5, 5, 5, 5, 5, 5, 5, 4, 8, 4, 4, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 8, 4, 5, 5, 5, 5, 4, 8,
-    4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 6, 6,
-    8, 7, 6, 5, 3, 3, 5, 4, 3, 6, 6, 6, 7, 7, 8, 5,
-    5, 5, 3, 5, 6, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 5, 5, 5, 5, 4, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 4, 5, 5, 5, 5, 4, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 4, 4, 5, 3, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    5, 5, 5, 5, 6, 6, 7, 7, 7, 7, 6, 7, 6, 6, 7, 6,
-    7, 7, 7, 6, 7, 6, 7, 6, 7, 6, 6, 7, 6, 6, 3, 3,
-    5, 5, 5, 5, 3, 3, 5, 5, 5, 5, 5, 5,
-};
-#endif
diff --git a/include/fonts/type1_map.h b/include/fonts/type1_map.h
deleted file mode 100644
index 45e42f62c..000000000
--- a/include/fonts/type1_map.h
+++ /dev/null
@@ -1,250 +0,0 @@
-static const u8 sFontType1Map[] =
-{
-    0xD4, 0xD4,
-    0xD4, 0x31,
-    0xD4, 0x32,
-    0xD4, 0x33,
-    0xD4, 0x34,
-    0xD4, 0x35,
-    0xD4, 0x36,
-    0xD4, 0x37,
-    0xD4, 0x38,
-    0xD4, 0x39,
-    0xD4, 0x3A,
-    0xD4, 0x3B,
-    0xD4, 0x3C,
-    0xD4, 0x3D,
-    0xD4, 0x3E,
-    0xD4, 0x3F,
-    0xD4, 0x40,
-    0xD4, 0x41,
-    0xD4, 0x42,
-    0xD4, 0x43,
-    0xD4, 0x44,
-    0xD4, 0x45,
-    0xD4, 0x46,
-    0xD4, 0x47,
-    0xD4, 0x48,
-    0xD4, 0x49,
-    0xD4, 0x4A,
-    0xD4, 0x4B,
-    0xD4, 0x4C,
-    0xD4, 0x4D,
-    0xD4, 0x4E,
-    0xD4, 0x4F,
-    0xD4, 0x50,
-    0xD4, 0x51,
-    0xD4, 0x52,
-    0xD4, 0x53,
-    0xD4, 0x54,
-    0xD4, 0x55,
-    0xD4, 0x56,
-    0xD4, 0x57,
-    0xD4, 0x58,
-    0xD4, 0x59,
-    0xD4, 0x5A,
-    0xD4, 0x5B,
-    0xD4, 0x5C,
-    0xD4, 0x5D,
-    0xD4, 0x5E,
-    0xD4, 0x31,
-    0xD4, 0x32,
-    0xD4, 0x33,
-    0xD4, 0x34,
-    0xD4, 0x35,
-    0xD4, 0x60,
-    0xD4, 0x61,
-    0xD4, 0x62,
-    0x65, 0x36,
-    0x65, 0x37,
-    0x65, 0x38,
-    0x65, 0x39,
-    0x65, 0x3A,
-    0x65, 0x3B,
-    0x65, 0x3C,
-    0x65, 0x3D,
-    0x65, 0x3E,
-    0x65, 0x3F,
-    0x65, 0x40,
-    0x65, 0x41,
-    0x65, 0x42,
-    0x65, 0x43,
-    0x65, 0x44,
-    0x65, 0x4A,
-    0x65, 0x4B,
-    0x65, 0x4C,
-    0x65, 0x4D,
-    0x65, 0x4E,
-    0x64, 0x4A,
-    0x64, 0x4B,
-    0x64, 0x4C,
-    0x64, 0x4D,
-    0x64, 0x4E,
-    0xD4, 0x5F,
-    0xD4, 0x00,
-    0xD4, 0x01,
-    0xD4, 0x02,
-    0xD4, 0x03,
-    0xD4, 0x04,
-    0xD4, 0x05,
-    0xD4, 0x06,
-    0xD4, 0x07,
-    0xD4, 0x08,
-    0xD4, 0x09,
-    0xD4, 0x0A,
-    0xD4, 0x0B,
-    0xD4, 0x0C,
-    0xD4, 0x0D,
-    0xD4, 0x0E,
-    0xD4, 0x0F,
-    0xD4, 0x10,
-    0xD4, 0x11,
-    0xD4, 0x12,
-    0xD4, 0x13,
-    0xD4, 0x14,
-    0xD4, 0x15,
-    0xD4, 0x16,
-    0xD4, 0x17,
-    0xD4, 0x18,
-    0xD4, 0x19,
-    0xD4, 0x1A,
-    0xD4, 0x1B,
-    0xD4, 0x4D,
-    0xD4, 0x1C,
-    0xD4, 0x1D,
-    0xD4, 0x1E,
-    0xD4, 0x1F,
-    0xD4, 0x20,
-    0xD4, 0x21,
-    0xD4, 0x22,
-    0xD4, 0x23,
-    0xD4, 0x24,
-    0xD4, 0x25,
-    0xD4, 0x58,
-    0xD4, 0x26,
-    0xD4, 0x27,
-    0xD4, 0x28,
-    0xD4, 0x29,
-    0xD4, 0x2A,
-    0xD4, 0x2B,
-    0xD4, 0x69,
-    0xD4, 0x30,
-    0xD4, 0x6A,
-    0xD4, 0x6B,
-    0xD4, 0x74,
-    0xD4, 0x2D,
-    0xD4, 0x2E,
-    0xD4, 0x2F,
-    0x65, 0x05,
-    0x65, 0x06,
-    0x65, 0x07,
-    0x65, 0x08,
-    0x65, 0x09,
-    0x65, 0x0A,
-    0x65, 0x0B,
-    0x65, 0x0C,
-    0x65, 0x0D,
-    0x65, 0x0E,
-    0x65, 0x0F,
-    0x65, 0x10,
-    0x65, 0x11,
-    0x65, 0x12,
-    0x65, 0x13,
-    0x65, 0x19,
-    0x65, 0x1A,
-    0x65, 0x1B,
-    0x65, 0x4D,
-    0x65, 0x1C,
-    0x64, 0x19,
-    0x64, 0x1A,
-    0x64, 0x1B,
-    0x64, 0x4D,
-    0x64, 0x1C,
-    0xD4, 0x2C,
-    0xD4, 0x76,
-    0xD4, 0x77,
-    0xD4, 0x78,
-    0xD4, 0x79,
-    0xD4, 0x7A,
-    0xD4, 0x7B,
-    0xD4, 0x7C,
-    0xD4, 0x7D,
-    0xD4, 0x7E,
-    0xD4, 0x7F,
-    0xD4, 0x67,
-    0xD4, 0x66,
-    0xD4, 0x68,
-    0xD4, 0x63,
-    0xD4, 0xD2,
-    0xD4, 0xD3,
-    0xD4, 0xD0,
-    0xD4, 0xD1,
-    0xD4, 0xCE,
-    0xD4, 0xCF,
-    0xD4, 0x6F,
-    0xD4, 0x75,
-    0xD4, 0x70,
-    0xD4, 0x72,
-    0xD4, 0x71,
-    0xD4, 0x73,
-    0xD4, 0x80,
-    0xD4, 0x81,
-    0xD4, 0x82,
-    0xD4, 0x83,
-    0xD4, 0x84,
-    0xD4, 0x85,
-    0xD4, 0x86,
-    0xD4, 0x87,
-    0xD4, 0x88,
-    0xD4, 0x89,
-    0xD4, 0x8A,
-    0xD4, 0x8B,
-    0xD4, 0x8C,
-    0xD4, 0x8D,
-    0xD4, 0x8E,
-    0xD4, 0x8F,
-    0xD4, 0x90,
-    0xD4, 0x91,
-    0xD4, 0x92,
-    0xD4, 0x93,
-    0xD4, 0x94,
-    0xD4, 0x95,
-    0xD4, 0x96,
-    0xD4, 0x97,
-    0xD4, 0x98,
-    0xD4, 0x99,
-    0xD4, 0x9A,
-    0xD4, 0x9B,
-    0xD4, 0x9C,
-    0xD4, 0x9D,
-    0xD4, 0x9E,
-    0xD4, 0x9F,
-    0xD4, 0xA0,
-    0xD4, 0xA1,
-    0xD4, 0xA2,
-    0xD4, 0xA3,
-    0xD4, 0xA4,
-    0xD4, 0xA5,
-    0xD4, 0xA6,
-    0xD4, 0xA7,
-    0xD4, 0xA8,
-    0xD4, 0xA9,
-    0xD4, 0xAA,
-    0xD4, 0xAB,
-    0xD4, 0xAC,
-    0xD4, 0xAD,
-    0xD4, 0xAE,
-    0xD4, 0xAF,
-    0xD4, 0xB0,
-    0xD4, 0xB1,
-    0xD4, 0xB2,
-    0xD4, 0xB3,
-    0xD4, 0x6D,
-    0xD4, 0xD5,
-    0xD4, 0xD6,
-    0xD4, 0xD7,
-    0xD4, 0xD8,
-    0xD4, 0xD9,
-    0xD4, 0xDA,
-    0xD4, 0xDB,
-};
diff --git a/include/fonts/type3_map.h b/include/fonts/type3_map.h
deleted file mode 100644
index 48219423b..000000000
--- a/include/fonts/type3_map.h
+++ /dev/null
@@ -1,131 +0,0 @@
-static const u8 sFontType3Map[] =
-{
-    0x00, 0x10,
-    0x01, 0x10,
-    0x02, 0x10,
-    0x03, 0x10,
-    0x04, 0x11,
-    0x05, 0x11,
-    0x06, 0x11,
-    0x07, 0x11,
-    0x08, 0x12,
-    0x09, 0x12,
-    0x0A, 0x12,
-    0x0B, 0x12,
-    0x0C, 0x13,
-    0x0D, 0x13,
-    0x0E, 0x13,
-    0x0F, 0x13,
-    0x00, 0x14,
-    0x01, 0x14,
-    0x02, 0x14,
-    0x03, 0x14,
-    0x04, 0x15,
-    0x05, 0x15,
-    0x06, 0x15,
-    0x07, 0x15,
-    0x08, 0x16,
-    0x09, 0x16,
-    0x0A, 0x16,
-    0x0B, 0x16,
-    0x0C, 0x17,
-    0x0D, 0x17,
-    0x0E, 0x17,
-    0x0F, 0x17,
-    0x00, 0x18,
-    0x01, 0x18,
-    0x02, 0x18,
-    0x03, 0x18,
-    0x04, 0x19,
-    0x05, 0x19,
-    0x06, 0x19,
-    0x07, 0x19,
-    0x08, 0x1A,
-    0x09, 0x1A,
-    0x0A, 0x1A,
-    0x0B, 0x1A,
-    0x0C, 0x1B,
-    0x0D, 0x1B,
-    0x0E, 0x1B,
-    0x0F, 0x1B,
-    0x00, 0x1C,
-    0x01, 0x1C,
-    0x02, 0x1C,
-    0x03, 0x1C,
-    0x04, 0x1D,
-    0x05, 0x1D,
-    0x06, 0x1D,
-    0x07, 0x1D,
-    0x08, 0x1E,
-    0x09, 0x1E,
-    0x0A, 0x1E,
-    0x0B, 0x1E,
-    0x0C, 0x1F,
-    0x0D, 0x1F,
-    0x0E, 0x1F,
-    0x0F, 0x1F,
-    0x20, 0x24,
-    0x20, 0x24,
-    0x21, 0x24,
-    0x21, 0x24,
-    0x20, 0x24,
-    0x20, 0x24,
-    0x21, 0x24,
-    0x21, 0x24,
-    0x22, 0x25,
-    0x22, 0x25,
-    0x23, 0x25,
-    0x23, 0x25,
-    0x22, 0x25,
-    0x22, 0x25,
-    0x23, 0x25,
-    0x23, 0x25,
-    0x20, 0x24,
-    0x20, 0x24,
-    0x21, 0x24,
-    0x21, 0x24,
-    0x20, 0x24,
-    0x20, 0x24,
-    0x21, 0x24,
-    0x21, 0x24,
-    0x22, 0x25,
-    0x22, 0x25,
-    0x23, 0x25,
-    0x23, 0x25,
-    0x22, 0x25,
-    0x22, 0x25,
-    0x23, 0x25,
-    0x23, 0x25,
-    0x20, 0x26,
-    0x20, 0x26,
-    0x21, 0x26,
-    0x21, 0x26,
-    0x20, 0x26,
-    0x20, 0x26,
-    0x21, 0x26,
-    0x21, 0x26,
-    0x22, 0x27,
-    0x22, 0x27,
-    0x23, 0x27,
-    0x23, 0x27,
-    0x22, 0x27,
-    0x22, 0x27,
-    0x23, 0x27,
-    0x23, 0x27,
-    0x20, 0x26,
-    0x20, 0x26,
-    0x21, 0x26,
-    0x21, 0x26,
-    0x20, 0x26,
-    0x20, 0x26,
-    0x21, 0x26,
-    0x21, 0x26,
-    0x22, 0x27,
-    0x22, 0x27,
-    0x23, 0x27,
-    0x23, 0x27,
-    0x22, 0x27,
-    0x22, 0x27,
-    0x23, 0x27,
-    0x23, 0x27,
-};
diff --git a/src/data/text/font0_widths.h b/src/data/text/font0_widths.h
new file mode 100644
index 000000000..ff102ecec
--- /dev/null
+++ b/src/data/text/font0_widths.h
@@ -0,0 +1,39 @@
+#if REVISION >= 1
+static const u8 sFont0Widths[] = {
+    3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 8, 6, 6, 6, 6, 6,
+    6, 6, 6, 6, 6, 6, 6, 6, 8, 6, 6, 6, 6, 6, 4, 8,
+    6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 8, 6, 6, 8,
+    8, 8, 8, 8, 8, 8, 3, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+    8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+    7, 6, 4, 8, 8, 8, 7, 8, 8, 4, 6, 6, 4, 4, 8, 8,
+    8, 8, 8, 8, 8, 8, 8, 8, 6, 7, 8, 7, 7, 8, 8, 4,
+    7, 8, 8, 8, 8, 8, 7, 8, 7, 7, 7, 7, 7, 7, 8, 7,
+    7, 7, 7, 7, 5, 6, 6, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+    8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+    8, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 3, 6, 3, 5, 3,
+    6, 6, 6, 3, 3, 6, 6, 6, 3, 6, 6, 6, 6, 6, 6, 6,
+    6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+    6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 4, 5, 6,
+    3, 6, 6, 6, 6, 6, 5, 6, 6, 6, 6, 6, 6, 6, 6, 7,
+    3, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 1, 1,
+};
+#else
+static const u8 sFont0Widths[] = {
+    3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 8, 6, 6, 6, 6, 6,
+    6, 6, 6, 6, 6, 6, 6, 6, 8, 6, 6, 6, 6, 6, 5, 8,
+    6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 8,
+    7, 7, 7, 8, 8, 8, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+    8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+    7, 6, 3, 8, 8, 8, 7, 8, 8, 4, 6, 6, 4, 4, 8, 8,
+    8, 8, 8, 8, 8, 8, 8, 8, 8, 7, 8, 7, 7, 8, 8, 6,
+    7, 8, 8, 8, 8, 8, 7, 8, 7, 7, 7, 7, 7, 7, 8, 7,
+    7, 7, 7, 7, 7, 7, 7, 8, 6, 8, 8, 8, 8, 8, 8, 8,
+    8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+    7, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 3, 6, 3, 5, 3,
+    6, 6, 6, 3, 3, 6, 6, 6, 3, 6, 6, 6, 6, 6, 6, 6,
+    6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+    6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 4, 5, 6,
+    3, 6, 6, 6, 6, 6, 5, 6, 6, 6, 6, 6, 6, 6, 6, 7,
+    3, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 1, 1,
+};
+#endif
diff --git a/src/data/text/font1_widths.h b/src/data/text/font1_widths.h
new file mode 100644
index 000000000..05b4da130
--- /dev/null
+++ b/src/data/text/font1_widths.h
@@ -0,0 +1,35 @@
+#if REVISION >= 1
+static const u8 sFont1Widths[] = {
+    5, 3, 8, 8, 8, 8, 8, 8, 8, 4, 5, 4, 4, 8, 8, 8,
+    8, 8, 8, 8, 8, 8, 8, 5, 8, 8, 8, 8, 8, 4, 8, 8,
+    8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 7, 5, 5, 5,
+    6, 5, 5, 5, 5, 5, 5, 5, 5, 4, 8, 4, 4, 5, 5, 5,
+    5, 5, 5, 5, 5, 5, 5, 5, 8, 4, 5, 5, 5, 5, 4, 8,
+    4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 8, 5, 6, 6,
+    8, 7, 3, 5, 3, 3, 5, 4, 3, 6, 6, 6, 7, 7, 8, 5,
+    5, 5, 3, 5, 6, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
+    5, 5, 5, 5, 5, 5, 5, 5, 4, 5, 5, 5, 5, 5, 5, 5,
+    5, 5, 5, 4, 5, 5, 5, 5, 4, 5, 5, 5, 5, 5, 5, 5,
+    5, 5, 4, 4, 5, 3, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
+    5, 5, 5, 5, 6, 6, 7, 7, 7, 7, 6, 7, 6, 6, 7, 6,
+    7, 7, 7, 6, 7, 6, 7, 6, 7, 6, 6, 7, 6, 6, 3, 3,
+    5, 5, 5, 5, 3, 3, 5, 5, 5, 5, 5, 5,
+};
+#else
+static const u8 sFont1Widths[] = {
+    5, 3, 8, 8, 8, 8, 8, 8, 8, 4, 5, 4, 4, 8, 8, 8,
+    8, 8, 8, 8, 8, 8, 8, 5, 8, 8, 8, 8, 8, 4, 8, 8,
+    8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 6, 6, 6, 5,
+    6, 5, 5, 5, 5, 5, 5, 5, 5, 4, 8, 4, 4, 5, 5, 5,
+    5, 5, 5, 5, 5, 5, 5, 5, 8, 4, 5, 5, 5, 5, 4, 8,
+    4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 6, 6,
+    8, 7, 6, 5, 3, 3, 5, 4, 3, 6, 6, 6, 7, 7, 8, 5,
+    5, 5, 3, 5, 6, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
+    5, 5, 5, 5, 5, 5, 5, 5, 4, 5, 5, 5, 5, 5, 5, 5,
+    5, 5, 5, 4, 5, 5, 5, 5, 4, 5, 5, 5, 5, 5, 5, 5,
+    5, 5, 4, 4, 5, 3, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
+    5, 5, 5, 5, 6, 6, 7, 7, 7, 7, 6, 7, 6, 6, 7, 6,
+    7, 7, 7, 6, 7, 6, 7, 6, 7, 6, 6, 7, 6, 6, 3, 3,
+    5, 5, 5, 5, 3, 3, 5, 5, 5, 5, 5, 5,
+};
+#endif
diff --git a/src/data/text/font3_widths.h b/src/data/text/font3_widths.h
new file mode 100644
index 000000000..d84cbdf73
--- /dev/null
+++ b/src/data/text/font3_widths.h
@@ -0,0 +1,39 @@
+#if REVISION >= 1
+static const u8 sFont3Widths[] = {
+    3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 8, 6, 6, 6, 6, 6,
+    6, 6, 6, 6, 6, 6, 6, 6, 8, 6, 6, 6, 6, 6, 4, 8,
+    6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 8, 6, 6, 8,
+    8, 8, 8, 8, 8, 8, 3, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+    8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+    7, 6, 4, 8, 8, 8, 7, 8, 8, 4, 6, 6, 4, 4, 8, 8,
+    8, 8, 8, 8, 8, 8, 8, 8, 6, 7, 8, 7, 7, 8, 8, 4,
+    7, 8, 8, 8, 8, 8, 7, 8, 7, 7, 7, 7, 7, 7, 8, 7,
+    7, 7, 7, 7, 5, 6, 6, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+    8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+    8, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 3, 6, 3, 5, 3,
+    6, 6, 6, 3, 3, 6, 6, 6, 3, 6, 6, 6, 6, 6, 6, 6,
+    6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+    6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 4, 5, 6,
+    3, 6, 6, 6, 6, 6, 5, 6, 6, 6, 6, 6, 6, 6, 6, 7,
+    3, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 1, 1,
+};
+#else
+static const u8 sFont3Widths[] = {
+    3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 8, 6, 6, 6, 6, 6,
+    6, 6, 6, 6, 6, 6, 6, 6, 8, 6, 6, 6, 6, 6, 4, 8,
+    6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 8,
+    8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+    8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+    7, 6, 4, 8, 8, 8, 7, 8, 8, 4, 6, 6, 4, 4, 8, 8,
+    8, 8, 8, 8, 8, 8, 8, 8, 6, 7, 8, 7, 7, 8, 8, 4,
+    7, 8, 8, 8, 8, 8, 7, 8, 7, 7, 7, 7, 7, 7, 8, 7,
+    7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+    8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
+    7, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 3, 6, 3, 5, 3,
+    6, 6, 6, 3, 3, 6, 6, 6, 3, 6, 6, 6, 6, 6, 6, 6,
+    6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+    6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 4, 5, 6,
+    3, 6, 6, 6, 6, 6, 5, 6, 6, 6, 6, 6, 6, 6, 6, 7,
+    3, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 1, 1,
+};
+#endif
diff --git a/src/data/text/font4_widths.h b/src/data/text/font4_widths.h
new file mode 100644
index 000000000..bfa30b8e1
--- /dev/null
+++ b/src/data/text/font4_widths.h
@@ -0,0 +1,35 @@
+#if REVISION >= 1
+static const u8 sFont4Widths[] = {
+    5, 3, 8, 8, 8, 8, 8, 8, 8, 4, 5, 4, 4, 8, 8, 8,
+    8, 8, 8, 8, 8, 8, 8, 5, 8, 8, 8, 8, 8, 4, 8, 8,
+    8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 7, 5, 5, 5,
+    6, 5, 5, 5, 5, 5, 5, 5, 5, 4, 8, 4, 4, 5, 5, 5,
+    5, 5, 5, 5, 5, 5, 5, 5, 8, 4, 5, 5, 5, 5, 4, 8,
+    4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 8, 5, 6, 6,
+    8, 7, 3, 5, 3, 3, 5, 4, 3, 6, 6, 6, 7, 7, 8, 5,
+    5, 5, 3, 5, 6, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
+    5, 5, 5, 5, 5, 5, 5, 5, 4, 5, 5, 5, 5, 5, 5, 5,
+    5, 5, 5, 4, 5, 5, 5, 5, 4, 5, 5, 5, 5, 5, 5, 5,
+    5, 5, 4, 4, 5, 3, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
+    5, 5, 5, 5, 6, 6, 7, 7, 7, 7, 6, 7, 6, 6, 7, 6,
+    7, 7, 7, 6, 7, 6, 7, 6, 7, 6, 6, 7, 6, 6, 3, 3,
+    5, 5, 5, 5, 3, 3, 5, 5, 5, 5, 5, 5,
+};
+#else
+static const u8 sFont4Widths[] = {
+    5, 3, 8, 8, 8, 8, 8, 8, 8, 4, 5, 4, 4, 8, 8, 8,
+    8, 8, 8, 8, 8, 8, 8, 5, 8, 8, 8, 8, 8, 4, 8, 8,
+    8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 6, 6, 6, 5,
+    6, 5, 5, 5, 5, 5, 5, 5, 5, 4, 8, 4, 4, 5, 5, 5,
+    5, 5, 5, 5, 5, 5, 5, 5, 8, 4, 5, 5, 5, 5, 4, 8,
+    4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 6, 6,
+    8, 7, 6, 5, 3, 3, 5, 4, 3, 6, 6, 6, 7, 7, 8, 5,
+    5, 5, 3, 5, 6, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
+    5, 5, 5, 5, 5, 5, 5, 5, 4, 5, 5, 5, 5, 5, 5, 5,
+    5, 5, 5, 4, 5, 5, 5, 5, 4, 5, 5, 5, 5, 5, 5, 5,
+    5, 5, 4, 4, 5, 3, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
+    5, 5, 5, 5, 6, 6, 7, 7, 7, 7, 6, 7, 6, 6, 7, 6,
+    7, 7, 7, 6, 7, 6, 7, 6, 7, 6, 6, 7, 6, 6, 3, 3,
+    5, 5, 5, 5, 3, 3, 5, 5, 5, 5, 5, 5,
+};
+#endif
diff --git a/src/data/text/type1_map.h b/src/data/text/type1_map.h
new file mode 100644
index 000000000..ff22e560a
--- /dev/null
+++ b/src/data/text/type1_map.h
@@ -0,0 +1,249 @@
+static const u8 sFontType1Map[] = {
+    0xD4, 0xD4,
+    0xD4, 0x31,
+    0xD4, 0x32,
+    0xD4, 0x33,
+    0xD4, 0x34,
+    0xD4, 0x35,
+    0xD4, 0x36,
+    0xD4, 0x37,
+    0xD4, 0x38,
+    0xD4, 0x39,
+    0xD4, 0x3A,
+    0xD4, 0x3B,
+    0xD4, 0x3C,
+    0xD4, 0x3D,
+    0xD4, 0x3E,
+    0xD4, 0x3F,
+    0xD4, 0x40,
+    0xD4, 0x41,
+    0xD4, 0x42,
+    0xD4, 0x43,
+    0xD4, 0x44,
+    0xD4, 0x45,
+    0xD4, 0x46,
+    0xD4, 0x47,
+    0xD4, 0x48,
+    0xD4, 0x49,
+    0xD4, 0x4A,
+    0xD4, 0x4B,
+    0xD4, 0x4C,
+    0xD4, 0x4D,
+    0xD4, 0x4E,
+    0xD4, 0x4F,
+    0xD4, 0x50,
+    0xD4, 0x51,
+    0xD4, 0x52,
+    0xD4, 0x53,
+    0xD4, 0x54,
+    0xD4, 0x55,
+    0xD4, 0x56,
+    0xD4, 0x57,
+    0xD4, 0x58,
+    0xD4, 0x59,
+    0xD4, 0x5A,
+    0xD4, 0x5B,
+    0xD4, 0x5C,
+    0xD4, 0x5D,
+    0xD4, 0x5E,
+    0xD4, 0x31,
+    0xD4, 0x32,
+    0xD4, 0x33,
+    0xD4, 0x34,
+    0xD4, 0x35,
+    0xD4, 0x60,
+    0xD4, 0x61,
+    0xD4, 0x62,
+    0x65, 0x36,
+    0x65, 0x37,
+    0x65, 0x38,
+    0x65, 0x39,
+    0x65, 0x3A,
+    0x65, 0x3B,
+    0x65, 0x3C,
+    0x65, 0x3D,
+    0x65, 0x3E,
+    0x65, 0x3F,
+    0x65, 0x40,
+    0x65, 0x41,
+    0x65, 0x42,
+    0x65, 0x43,
+    0x65, 0x44,
+    0x65, 0x4A,
+    0x65, 0x4B,
+    0x65, 0x4C,
+    0x65, 0x4D,
+    0x65, 0x4E,
+    0x64, 0x4A,
+    0x64, 0x4B,
+    0x64, 0x4C,
+    0x64, 0x4D,
+    0x64, 0x4E,
+    0xD4, 0x5F,
+    0xD4, 0x00,
+    0xD4, 0x01,
+    0xD4, 0x02,
+    0xD4, 0x03,
+    0xD4, 0x04,
+    0xD4, 0x05,
+    0xD4, 0x06,
+    0xD4, 0x07,
+    0xD4, 0x08,
+    0xD4, 0x09,
+    0xD4, 0x0A,
+    0xD4, 0x0B,
+    0xD4, 0x0C,
+    0xD4, 0x0D,
+    0xD4, 0x0E,
+    0xD4, 0x0F,
+    0xD4, 0x10,
+    0xD4, 0x11,
+    0xD4, 0x12,
+    0xD4, 0x13,
+    0xD4, 0x14,
+    0xD4, 0x15,
+    0xD4, 0x16,
+    0xD4, 0x17,
+    0xD4, 0x18,
+    0xD4, 0x19,
+    0xD4, 0x1A,
+    0xD4, 0x1B,
+    0xD4, 0x4D,
+    0xD4, 0x1C,
+    0xD4, 0x1D,
+    0xD4, 0x1E,
+    0xD4, 0x1F,
+    0xD4, 0x20,
+    0xD4, 0x21,
+    0xD4, 0x22,
+    0xD4, 0x23,
+    0xD4, 0x24,
+    0xD4, 0x25,
+    0xD4, 0x58,
+    0xD4, 0x26,
+    0xD4, 0x27,
+    0xD4, 0x28,
+    0xD4, 0x29,
+    0xD4, 0x2A,
+    0xD4, 0x2B,
+    0xD4, 0x69,
+    0xD4, 0x30,
+    0xD4, 0x6A,
+    0xD4, 0x6B,
+    0xD4, 0x74,
+    0xD4, 0x2D,
+    0xD4, 0x2E,
+    0xD4, 0x2F,
+    0x65, 0x05,
+    0x65, 0x06,
+    0x65, 0x07,
+    0x65, 0x08,
+    0x65, 0x09,
+    0x65, 0x0A,
+    0x65, 0x0B,
+    0x65, 0x0C,
+    0x65, 0x0D,
+    0x65, 0x0E,
+    0x65, 0x0F,
+    0x65, 0x10,
+    0x65, 0x11,
+    0x65, 0x12,
+    0x65, 0x13,
+    0x65, 0x19,
+    0x65, 0x1A,
+    0x65, 0x1B,
+    0x65, 0x4D,
+    0x65, 0x1C,
+    0x64, 0x19,
+    0x64, 0x1A,
+    0x64, 0x1B,
+    0x64, 0x4D,
+    0x64, 0x1C,
+    0xD4, 0x2C,
+    0xD4, 0x76,
+    0xD4, 0x77,
+    0xD4, 0x78,
+    0xD4, 0x79,
+    0xD4, 0x7A,
+    0xD4, 0x7B,
+    0xD4, 0x7C,
+    0xD4, 0x7D,
+    0xD4, 0x7E,
+    0xD4, 0x7F,
+    0xD4, 0x67,
+    0xD4, 0x66,
+    0xD4, 0x68,
+    0xD4, 0x63,
+    0xD4, 0xD2,
+    0xD4, 0xD3,
+    0xD4, 0xD0,
+    0xD4, 0xD1,
+    0xD4, 0xCE,
+    0xD4, 0xCF,
+    0xD4, 0x6F,
+    0xD4, 0x75,
+    0xD4, 0x70,
+    0xD4, 0x72,
+    0xD4, 0x71,
+    0xD4, 0x73,
+    0xD4, 0x80,
+    0xD4, 0x81,
+    0xD4, 0x82,
+    0xD4, 0x83,
+    0xD4, 0x84,
+    0xD4, 0x85,
+    0xD4, 0x86,
+    0xD4, 0x87,
+    0xD4, 0x88,
+    0xD4, 0x89,
+    0xD4, 0x8A,
+    0xD4, 0x8B,
+    0xD4, 0x8C,
+    0xD4, 0x8D,
+    0xD4, 0x8E,
+    0xD4, 0x8F,
+    0xD4, 0x90,
+    0xD4, 0x91,
+    0xD4, 0x92,
+    0xD4, 0x93,
+    0xD4, 0x94,
+    0xD4, 0x95,
+    0xD4, 0x96,
+    0xD4, 0x97,
+    0xD4, 0x98,
+    0xD4, 0x99,
+    0xD4, 0x9A,
+    0xD4, 0x9B,
+    0xD4, 0x9C,
+    0xD4, 0x9D,
+    0xD4, 0x9E,
+    0xD4, 0x9F,
+    0xD4, 0xA0,
+    0xD4, 0xA1,
+    0xD4, 0xA2,
+    0xD4, 0xA3,
+    0xD4, 0xA4,
+    0xD4, 0xA5,
+    0xD4, 0xA6,
+    0xD4, 0xA7,
+    0xD4, 0xA8,
+    0xD4, 0xA9,
+    0xD4, 0xAA,
+    0xD4, 0xAB,
+    0xD4, 0xAC,
+    0xD4, 0xAD,
+    0xD4, 0xAE,
+    0xD4, 0xAF,
+    0xD4, 0xB0,
+    0xD4, 0xB1,
+    0xD4, 0xB2,
+    0xD4, 0xB3,
+    0xD4, 0x6D,
+    0xD4, 0xD5,
+    0xD4, 0xD6,
+    0xD4, 0xD7,
+    0xD4, 0xD8,
+    0xD4, 0xD9,
+    0xD4, 0xDA,
+    0xD4, 0xDB,
+};
diff --git a/src/data/text/type3_map.h b/src/data/text/type3_map.h
new file mode 100644
index 000000000..cb3694b39
--- /dev/null
+++ b/src/data/text/type3_map.h
@@ -0,0 +1,130 @@
+static const u8 sFontType3Map[] = {
+    0x00, 0x10,
+    0x01, 0x10,
+    0x02, 0x10,
+    0x03, 0x10,
+    0x04, 0x11,
+    0x05, 0x11,
+    0x06, 0x11,
+    0x07, 0x11,
+    0x08, 0x12,
+    0x09, 0x12,
+    0x0A, 0x12,
+    0x0B, 0x12,
+    0x0C, 0x13,
+    0x0D, 0x13,
+    0x0E, 0x13,
+    0x0F, 0x13,
+    0x00, 0x14,
+    0x01, 0x14,
+    0x02, 0x14,
+    0x03, 0x14,
+    0x04, 0x15,
+    0x05, 0x15,
+    0x06, 0x15,
+    0x07, 0x15,
+    0x08, 0x16,
+    0x09, 0x16,
+    0x0A, 0x16,
+    0x0B, 0x16,
+    0x0C, 0x17,
+    0x0D, 0x17,
+    0x0E, 0x17,
+    0x0F, 0x17,
+    0x00, 0x18,
+    0x01, 0x18,
+    0x02, 0x18,
+    0x03, 0x18,
+    0x04, 0x19,
+    0x05, 0x19,
+    0x06, 0x19,
+    0x07, 0x19,
+    0x08, 0x1A,
+    0x09, 0x1A,
+    0x0A, 0x1A,
+    0x0B, 0x1A,
+    0x0C, 0x1B,
+    0x0D, 0x1B,
+    0x0E, 0x1B,
+    0x0F, 0x1B,
+    0x00, 0x1C,
+    0x01, 0x1C,
+    0x02, 0x1C,
+    0x03, 0x1C,
+    0x04, 0x1D,
+    0x05, 0x1D,
+    0x06, 0x1D,
+    0x07, 0x1D,
+    0x08, 0x1E,
+    0x09, 0x1E,
+    0x0A, 0x1E,
+    0x0B, 0x1E,
+    0x0C, 0x1F,
+    0x0D, 0x1F,
+    0x0E, 0x1F,
+    0x0F, 0x1F,
+    0x20, 0x24,
+    0x20, 0x24,
+    0x21, 0x24,
+    0x21, 0x24,
+    0x20, 0x24,
+    0x20, 0x24,
+    0x21, 0x24,
+    0x21, 0x24,
+    0x22, 0x25,
+    0x22, 0x25,
+    0x23, 0x25,
+    0x23, 0x25,
+    0x22, 0x25,
+    0x22, 0x25,
+    0x23, 0x25,
+    0x23, 0x25,
+    0x20, 0x24,
+    0x20, 0x24,
+    0x21, 0x24,
+    0x21, 0x24,
+    0x20, 0x24,
+    0x20, 0x24,
+    0x21, 0x24,
+    0x21, 0x24,
+    0x22, 0x25,
+    0x22, 0x25,
+    0x23, 0x25,
+    0x23, 0x25,
+    0x22, 0x25,
+    0x22, 0x25,
+    0x23, 0x25,
+    0x23, 0x25,
+    0x20, 0x26,
+    0x20, 0x26,
+    0x21, 0x26,
+    0x21, 0x26,
+    0x20, 0x26,
+    0x20, 0x26,
+    0x21, 0x26,
+    0x21, 0x26,
+    0x22, 0x27,
+    0x22, 0x27,
+    0x23, 0x27,
+    0x23, 0x27,
+    0x22, 0x27,
+    0x22, 0x27,
+    0x23, 0x27,
+    0x23, 0x27,
+    0x20, 0x26,
+    0x20, 0x26,
+    0x21, 0x26,
+    0x21, 0x26,
+    0x20, 0x26,
+    0x20, 0x26,
+    0x21, 0x26,
+    0x21, 0x26,
+    0x22, 0x27,
+    0x22, 0x27,
+    0x23, 0x27,
+    0x23, 0x27,
+    0x22, 0x27,
+    0x22, 0x27,
+    0x23, 0x27,
+    0x23, 0x27,
+};
diff --git a/src/text.c b/src/text.c
index 02cafea48..b27084b86 100644
--- a/src/text.c
+++ b/src/text.c
@@ -218,12 +218,14 @@ static const u8 sFont1JapaneseGlyphs[] = INCBIN_U8("graphics/fonts/font1_jpn.1bp
 static const u8 sBrailleGlyphs[] = INCBIN_U8("graphics/fonts/font6_braille.1bpp");
 static const u32 sDownArrowTiles[] = INCBIN_U32("graphics/fonts/down_arrow.4bpp");
 
-#include "fonts/type1_map.h"
-#include "fonts/type3_map.h"
-#include "fonts/font1_widths.h"
-#include "fonts/font4_widths.h"
-#include "fonts/font0_widths.h"
-#include "fonts/font3_widths.h"
+// clang-format off
+#include "data/text/type1_map.h"
+#include "data/text/type3_map.h"
+#include "data/text/font1_widths.h"
+#include "data/text/font4_widths.h"
+#include "data/text/font0_widths.h"
+#include "data/text/font3_widths.h"
+// clang-format on
 
 const u16 gUnknownPalette_81E6692[] = INCBIN_U16("graphics/fonts/unknown_81E6692.gbapal");
 const u16 gFontDefaultPalette[] = INCBIN_U16("graphics/fonts/default.gbapal");
-- 
cgit v1.2.3