2 files changed, 14 insertions, 345 deletions

diff --git a/data/data2.s b/data/data2.s
index 4c3a1f892..2848574d3 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -5,345 +5,6 @@
 
 	.section .rodata
 
-	.global gUnknown_081E29A8
-gUnknown_081E29A8: @ 81E29A8
-	.incbin "baserom.gba", 0x001e29a8, 0x10
-
-	.global gUnknown_081E29B8
-gUnknown_081E29B8: @ 81E29B8
-	.incbin "baserom.gba", 0x001e29b8, 0x10
-
-	.global gUnknown_081E29C8
-gUnknown_081E29C8: @ 81E29C8
-	.incbin "baserom.gba", 0x001e29c8, 0x10
-
-	.global gUnknown_081E29D8
-gUnknown_081E29D8: @ 81E29D8
-	.incbin "baserom.gba", 0x001e29d8, 0x8
-
-	.global gUnknown_081E29E0
-gUnknown_081E29E0: @ 81E29E0
-	.incbin "baserom.gba", 0x001e29e0, 0x8
-
-	.global gUnknown_081E29E8
-gUnknown_081E29E8: @ 81E29E8
-	.incbin "baserom.gba", 0x001e29e8, 0x1008
-
-	.global gUnknown_081E39F0
-gUnknown_081E39F0: @ 81E39F0
-	.incbin "baserom.gba", 0x001e39f0, 0x370
-
-	.global gUnknown_081E3D60
-gUnknown_081E3D60: @ 81E3D60
-	.incbin "baserom.gba", 0x001e3d60, 0x1b90
-
-	.global gUnknown_081E58F0
-gUnknown_081E58F0: @ 81E58F0
-	.incbin "baserom.gba", 0x001e58f0, 0x600
-
-	.global gUnknown_081E5EF0
-gUnknown_081E5EF0: @ 81E5EF0
-	.incbin "baserom.gba", 0x001e5ef0, 0x100
-
-	.global gUnknown_081E5FF0
-gUnknown_081E5FF0: @ 81E5FF0
-	.incbin "baserom.gba", 0x001e5ff0, 0x1ee
-
-	.global gUnknown_081E61DE
-gUnknown_081E61DE: @ 81E61DE
-	.incbin "baserom.gba", 0x001e61de, 0x100
-
-	.global gUnknown_081E62DE
-gUnknown_081E62DE: @ 81E62DE
-	.incbin "baserom.gba", 0x001e62de, 0xdc
-
-	.global gUnknown_081E63BA
-gUnknown_081E63BA: @ 81E63BA
-	.incbin "baserom.gba", 0x001e63ba, 0xdc
-
-	.global gUnknown_081E6496
-gUnknown_081E6496: @ 81E6496
-	.incbin "baserom.gba", 0x001e6496, 0xfe
-
-	.global gUnknown_081E6594
-gUnknown_081E6594: @ 81E6594
-	.incbin "baserom.gba", 0x001e6594, 0xfe
-
-	.global gUnknown_081E6692
-gUnknown_081E6692: @ 81E6692
-	.incbin "baserom.gba", 0x001e6692, 0x2
-
-	.global gUnknown_081E6694
-gUnknown_081E6694: @ 81E6694
-	.incbin "baserom.gba", 0x001e6694, 0x1a
-
-	.global gUnknown_081E66AE
-gUnknown_081E66AE: @ 81E66AE
-	.incbin "baserom.gba", 0x001e66ae, 0x4
-
-	.global gUnknown_081E66B2
-gUnknown_081E66B2: @ 81E66B2
-	.incbin "baserom.gba", 0x001e66b2, 0x20
-
-	.global gUnknown_081E66D2
-gUnknown_081E66D2: @ 81E66D2
-	.incbin "baserom.gba", 0x001e66d2, 0xa
-
-	.global gUnknown_081E66DC
-gUnknown_081E66DC: @ 81E66DC
-	.incbin "baserom.gba", 0x001e66dc, 0x300
-
-	.global gUnknown_081E69DC
-gUnknown_081E69DC: @ 81E69DC
-	.incbin "baserom.gba", 0x001e69dc, 0x60
-
-	.global gUnknown_081E6A3C
-gUnknown_081E6A3C: @ 81E6A3C
-	.incbin "baserom.gba", 0x001e6a3c, 0x40
-
-	.global gUnknown_081E6A7C
-gUnknown_081E6A7C: @ 81E6A7C
-	.incbin "baserom.gba", 0x001e6a7c, 0xc
-
-	.global gUnknown_081E6A88
-gUnknown_081E6A88: @ 81E6A88
-	.incbin "baserom.gba", 0x001e6a88, 0x1c
-
-	.global gUnknown_081E6AA4
-gUnknown_081E6AA4: @ 81E6AA4
-	.incbin "baserom.gba", 0x001e6aa4, 0x30
-
-	.global gUnknown_081E6AD4
-gUnknown_081E6AD4: @ 81E6AD4
-	.incbin "baserom.gba", 0x001e6ad4, 0x5c
-
-	.global gUnknown_081E6B30
-gUnknown_081E6B30: @ 81E6B30
-	.incbin "baserom.gba", 0x001e6b30, 0xa8
-
-	.global gUnknown_081E6BD8
-gUnknown_081E6BD8: @ 81E6BD8
-	.incbin "baserom.gba", 0x001e6bd8, 0x3
-
-	.global gUnknown_081E6BDB
-gUnknown_081E6BDB: @ 81E6BDB
-	.incbin "baserom.gba", 0x001e6bdb, 0x19
-
-	.global gUnknown_081E6BF4
-gUnknown_081E6BF4: @ 81E6BF4
-	.incbin "baserom.gba", 0x001e6bf4, 0x24
-
-	.global gUnknown_081E6C18
-gUnknown_081E6C18: @ 81E6C18
-	.incbin "baserom.gba", 0x001e6c18, 0x24
-
-	.global gUnknown_081E6C3C
-gUnknown_081E6C3C: @ 81E6C3C
-	.incbin "baserom.gba", 0x001e6c3c, 0x1c
-
-	.global gUnknown_081E6C58
-gUnknown_081E6C58: @ 81E6C58
-	.incbin "baserom.gba", 0x001e6c58, 0x1c
-
-	.global gUnknown_081E6C74
-gUnknown_081E6C74: @ 81E6C74
-	.incbin "baserom.gba", 0x001e6c74, 0x1c
-
-	.global gUnknown_081E6C90
-gUnknown_081E6C90: @ 81E6C90
-	.incbin "baserom.gba", 0x001e6c90, 0x1c
-
-	.global gUnknown_081E6CAC
-gUnknown_081E6CAC: @ 81E6CAC
-	.incbin "baserom.gba", 0x001e6cac, 0x1c
-
-	.global gUnknown_081E6CC8
-gUnknown_081E6CC8: @ 81E6CC8
-	.incbin "baserom.gba", 0x001e6cc8, 0x1c
-
-	.global gUnknown_081E6CE4
-gUnknown_081E6CE4: @ 81E6CE4
-	.incbin "baserom.gba", 0x001e6ce4, 0x1c
-
-	.global gUnknown_081E6D00
-gUnknown_081E6D00: @ 81E6D00
-	.incbin "baserom.gba", 0x001e6d00, 0x38
-
-	.global gUnknown_081E6D38
-gUnknown_081E6D38: @ 81E6D38
-	.incbin "baserom.gba", 0x001e6d38, 0x1c
-
-	.global gUnknown_081E6D54
-gUnknown_081E6D54: @ 81E6D54
-	.incbin "baserom.gba", 0x001e6d54, 0x1c
-
-	.global gUnknown_081E6D70
-gUnknown_081E6D70: @ 81E6D70
-	.incbin "baserom.gba", 0x001e6d70, 0x1c
-
-	.global gUnknown_081E6D8C
-gUnknown_081E6D8C: @ 81E6D8C
-	.incbin "baserom.gba", 0x001e6d8c, 0x1c
-
-	.global gUnknown_081E6DA8
-gUnknown_081E6DA8: @ 81E6DA8
-	.incbin "baserom.gba", 0x001e6da8, 0x1c
-
-	.global gUnknown_081E6DC4
-gUnknown_081E6DC4: @ 81E6DC4
-	.incbin "baserom.gba", 0x001e6dc4, 0x1c
-
-	.global gUnknown_081E6DE0
-gUnknown_081E6DE0: @ 81E6DE0
-	.incbin "baserom.gba", 0x001e6de0, 0x1c
-
-	.global gUnknown_081E6DFC
-gUnknown_081E6DFC: @ 81E6DFC
-	.incbin "baserom.gba", 0x001e6dfc, 0x1c
-
-	.global gUnknown_081E6E18
-gUnknown_081E6E18: @ 81E6E18
-	.incbin "baserom.gba", 0x001e6e18, 0x1c
-
-	.global gUnknown_081E6E34
-gUnknown_081E6E34: @ 81E6E34
-	.incbin "baserom.gba", 0x001e6e34, 0x1c
-
-	.global gUnknown_081E6E50
-gUnknown_081E6E50: @ 81E6E50
-	.incbin "baserom.gba", 0x001e6e50, 0x1c
-
-	.global gUnknown_081E6E6C
-gUnknown_081E6E6C: @ 81E6E6C
-	.incbin "baserom.gba", 0x001e6e6c, 0x1c
-
-	.global gUnknown_081E6E88
-gUnknown_081E6E88: @ 81E6E88
-	.incbin "baserom.gba", 0x001e6e88, 0xc4
-
-	.global gUnknown_081E6F4C
-gUnknown_081E6F4C: @ 81E6F4C
-	.incbin "baserom.gba", 0x001e6f4c, 0x1c
-
-	.global gUnknown_081E6F68
-gUnknown_081E6F68: @ 81E6F68
-	.incbin "baserom.gba", 0x001e6f68, 0x1c
-
-	.global gUnknown_081E6F84
-gUnknown_081E6F84: @ 81E6F84
-	.incbin "baserom.gba", 0x001e6f84, 0x1c
-
-	.global gUnknown_081E6FA0
-gUnknown_081E6FA0: @ 81E6FA0
-	.incbin "baserom.gba", 0x001e6fa0, 0x38
-
-	.global gUnknown_081E6FD8
-gUnknown_081E6FD8: @ 81E6FD8
-	.incbin "baserom.gba", 0x001e6fd8, 0x1c
-
-	.global gUnknown_081E6FF4
-gUnknown_081E6FF4: @ 81E6FF4
-	.incbin "baserom.gba", 0x001e6ff4, 0x38
-
-	.global gUnknown_081E702C
-gUnknown_081E702C: @ 81E702C
-	.incbin "baserom.gba", 0x001e702c, 0x1c
-
-	.global gUnknown_081E7048
-gUnknown_081E7048: @ 81E7048
-	.incbin "baserom.gba", 0x001e7048, 0x1c
-
-	.global gUnknown_081E7064
-gUnknown_081E7064: @ 81E7064
-	.incbin "baserom.gba", 0x001e7064, 0x1c
-
-	.global gUnknown_081E7080
-gUnknown_081E7080: @ 81E7080
-	.incbin "baserom.gba", 0x001e7080, 0x1c
-
-	.global gUnknown_081E709C
-gUnknown_081E709C: @ 81E709C
-	.incbin "baserom.gba", 0x001e709c, 0x1c
-
-	.global gUnknown_081E70B8
-gUnknown_081E70B8: @ 81E70B8
-	.incbin "baserom.gba", 0x001e70b8, 0x1c
-
-	.global gUnknown_081E70D4
-gUnknown_081E70D4: @ 81E70D4
-	.incbin "baserom.gba", 0x001e70d4, 0x1c
-
-	.global gUnknown_081E70F0
-gUnknown_081E70F0: @ 81E70F0
-	.incbin "baserom.gba", 0x001e70f0, 0x1c
-
-	.global gUnknown_081E710C
-gUnknown_081E710C: @ 81E710C
-	.incbin "baserom.gba", 0x001e710c, 0x1c
-
-	.global gUnknown_081E7128
-gUnknown_081E7128: @ 81E7128
-	.incbin "baserom.gba", 0x001e7128, 0x1c
-
-	.global gUnknown_081E7144
-gUnknown_081E7144: @ 81E7144
-	.incbin "baserom.gba", 0x001e7144, 0x1c
-
-	.global gUnknown_081E7160
-gUnknown_081E7160: @ 81E7160
-	.incbin "baserom.gba", 0x001e7160, 0x1c
-
-	.global gUnknown_081E717C
-gUnknown_081E717C: @ 81E717C
-	.incbin "baserom.gba", 0x001e717c, 0x1c
-
-	.global gUnknown_081E7198
-gUnknown_081E7198: @ 81E7198
-	.incbin "baserom.gba", 0x001e7198, 0x1c
-
-	.global gUnknown_081E71B4
-gUnknown_081E71B4: @ 81E71B4
-	.incbin "baserom.gba", 0x001e71b4, 0x1c
-
-	.global gUnknown_081E71D0
-gUnknown_081E71D0: @ 81E71D0
-	.incbin "baserom.gba", 0x001e71d0, 0x1c
-
-	.global gUnknown_081E71EC
-gUnknown_081E71EC: @ 81E71EC
-	.incbin "baserom.gba", 0x001e71ec, 0x1c
-
-	.global gUnknown_081E7208
-gUnknown_081E7208: @ 81E7208
-	.incbin "baserom.gba", 0x001e7208, 0x1c
-
-	.global gUnknown_081E7224
-gUnknown_081E7224: @ 81E7224
-	.incbin "baserom.gba", 0x001e7224, 0x1c
-
-	.global gUnknown_081E7240
-gUnknown_081E7240: @ 81E7240
-	.incbin "baserom.gba", 0x001e7240, 0x1c
-
-	.global gUnknown_081E725C
-gUnknown_081E725C: @ 81E725C
-	.incbin "baserom.gba", 0x001e725c, 0x1c
-
-	.global gUnknown_081E7278
-gUnknown_081E7278: @ 81E7278
-	.incbin "baserom.gba", 0x001e7278, 0x1c
-
-	.global gUnknown_081E7294
-gUnknown_081E7294: @ 81E7294
-	.incbin "baserom.gba", 0x001e7294, 0x1c
-
-	.global gUnknown_081E72B0
-gUnknown_081E72B0: @ 81E72B0
-	.incbin "baserom.gba", 0x001e72b0, 0x3
-
-@ 81E72B3
-	.include "data/string_util.s"
-
 	.global gUnknown_081E7330
 gUnknown_081E7330: @ 81E7330
 	.incbin "baserom.gba", 0x001e7330, 0x20
diff --git a/data/graphics.s b/data/graphics.s
index 7712965fc..981766fe7 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -1053,10 +1053,18 @@ gUnknown_08EA260C: @ 8EA260C
 gUnknown_08EA2A44: @ 8EA2A44
 	.incbin "baserom.gba", 0x00ea2a44, 0x200
 
-	.global gUnknown_08EA2C44
-gUnknown_08EA2C44: @ 8EA2C44
-	.incbin "baserom.gba", 0x00ea2c44, 0x3f80
+	.global gFont3LatinGlyphs
+gFont3LatinGlyphs: @ 8EA2C44
+	.incbin "graphics/fonts/font3_lat.4bpp"
 
-	.global gUnknown_08EA6BC4
-gUnknown_08EA6BC4: @ 8EA6BC4
-	.incbin "baserom.gba", 0x00ea6bc4
+	.global gFont4LatinGlyphs
+gFont4LatinGlyphs: @ 8EA6BC4
+	.incbin "graphics/fonts/font4_lat.4bpp"
+
+	.global gFont3JapaneseGlyphs
+gFont3JapaneseGlyphs: @ 8EA8744
+	.incbin "graphics/fonts/font3_jpn.4bpp"
+
+	.global gFont4JapaneseGlyphs
+gFont4JapaneseGlyphs: @ 8EAC6C4
+	.incbin "graphics/fonts/font4_jpn.4bpp"