diff --git a/src/game/activemenu/activemenu.c b/src/game/activemenu/activemenu.c
index cc82fb481..6b3220d84 100644
--- a/src/game/activemenu/activemenu.c
+++ b/src/game/activemenu/activemenu.c
@@ -26,7 +26,7 @@
 #include "types.h"
 
 struct activemenu g_AmMenus[4];
-struct font2a4 *g_AmFont1;
+struct fontchar *g_AmFont1;
 struct font *g_AmFont2;
 s32 g_AmIndex;
 
@@ -477,12 +477,12 @@ glabel var7f1b2cd8
 /*  f0fdbf0:	0c002f06 */ 	jal	viGetHeight
 /*  f0fdbf4:	a7a2005c */ 	sh	$v0,0x5c($sp)
 /*  f0fdbf8:	8fb80058 */ 	lw	$t8,0x58($sp)
-/*  f0fdbfc:	3c198008 */ 	lui	$t9,%hi(g_FontHandelGothicSm1)
-/*  f0fdc00:	3c0f8008 */ 	lui	$t7,%hi(g_FontHandelGothicSm2)
+/*  f0fdbfc:	3c198008 */ 	lui	$t9,%hi(g_CharsHandelGothicSm)
+/*  f0fdc00:	3c0f8008 */ 	lui	$t7,%hi(g_FontHandelGothicSm)
 /*  f0fdc04:	8f070000 */ 	lw	$a3,0x0($t8)
 /*  f0fdc08:	87b8005c */ 	lh	$t8,0x5c($sp)
-/*  f0fdc0c:	8deffb0c */ 	lw	$t7,%lo(g_FontHandelGothicSm2)($t7)
-/*  f0fdc10:	8f39fb10 */ 	lw	$t9,%lo(g_FontHandelGothicSm1)($t9)
+/*  f0fdc0c:	8deffb0c */ 	lw	$t7,%lo(g_FontHandelGothicSm)($t7)
+/*  f0fdc10:	8f39fb10 */ 	lw	$t9,%lo(g_CharsHandelGothicSm)($t9)
 /*  f0fdc14:	8fae0084 */ 	lw	$t6,0x84($sp)
 /*  f0fdc18:	afa00028 */ 	sw	$zero,0x28($sp)
 /*  f0fdc1c:	afa00024 */ 	sw	$zero,0x24($sp)
@@ -864,11 +864,11 @@ void amInit(void)
 	}
 
 	if (PLAYERCOUNT() >= 2) {
-		g_AmFont1 = g_FontHandelGothicXs1;
-		g_AmFont2 = g_FontHandelGothicXs2;
+		g_AmFont1 = g_CharsHandelGothicXs;
+		g_AmFont2 = g_FontHandelGothicXs;
 	} else {
-		g_AmFont1 = g_FontHandelGothicSm1;
-		g_AmFont2 = g_FontHandelGothicSm2;
+		g_AmFont1 = g_CharsHandelGothicSm;
+		g_AmFont2 = g_FontHandelGothicSm;
 	}
 
 	g_AmIndex = 0;
diff --git a/src/game/bondgun.c b/src/game/bondgun.c
index 841dd1edc..1b53d7027 100644
--- a/src/game/bondgun.c
+++ b/src/game/bondgun.c
@@ -29072,7 +29072,7 @@ Gfx *bgunRenderHudString(Gfx *gdl, char *text, s32 x, bool halign, s32 y, s32 va
 	textwidth = 0;
 	textheight = 0;
 
-	textMeasure(&textheight, &textwidth, text, g_FontNumeric1, g_FontNumeric2, 0);
+	textMeasure(&textheight, &textwidth, text, g_CharsNumeric, g_FontNumeric, 0);
 
 	if (halign == HUDHALIGN_LEFT) { // left
 		x2 = x + textwidth;
@@ -29097,7 +29097,7 @@ Gfx *bgunRenderHudString(Gfx *gdl, char *text, s32 x, bool halign, s32 y, s32 va
 	}
 
 	gdl = func0f153858(gdl, &x1, &y1, &x2, &y2);
-	gdl = textRender(gdl, &x1, &y1, text, g_FontNumeric1, g_FontNumeric2, colour, 0x000000a0, viGetWidth(), viGetHeight(), 0, 0);
+	gdl = textRender(gdl, &x1, &y1, text, g_CharsNumeric, g_FontNumeric, colour, 0x000000a0, viGetWidth(), viGetHeight(), 0, 0);
 
 	return gdl;
 }
@@ -32310,7 +32310,7 @@ glabel bgunRenderHud
 /*  f0aad7c:	a5430072 */ 	sh	$v1,0x72($t2)
 .L0f0aad80:
 /*  f0aad80:	9143006f */ 	lbu	$v1,0x6f($t2)
-/*  f0aad84:	3c078008 */ 	lui	$a3,%hi(g_FontHandelGothicXs1)
+/*  f0aad84:	3c078008 */ 	lui	$a3,%hi(g_CharsHandelGothicXs)
 /*  f0aad88:	286100ff */ 	slti	$at,$v1,0xff
 /*  f0aad8c:	5020008b */ 	beqzl	$at,.L0f0aafbc
 /*  f0aad90:	8fa200bc */ 	lw	$v0,0xbc($sp)
@@ -32328,9 +32328,9 @@ glabel bgunRenderHud
 /*  f0aadbc:	0062c821 */ 	addu	$t9,$v1,$v0
 /*  f0aadc0:	a159006f */ 	sb	$t9,0x6f($t2)
 .L0f0aadc4:
-/*  f0aadc4:	3c0e8008 */ 	lui	$t6,%hi(g_FontHandelGothicXs2)
-/*  f0aadc8:	8dcefb04 */ 	lw	$t6,%lo(g_FontHandelGothicXs2)($t6)
-/*  f0aadcc:	8ce7fb08 */ 	lw	$a3,%lo(g_FontHandelGothicXs1)($a3)
+/*  f0aadc4:	3c0e8008 */ 	lui	$t6,%hi(g_FontHandelGothicXs)
+/*  f0aadc8:	8dcefb04 */ 	lw	$t6,%lo(g_FontHandelGothicXs)($t6)
+/*  f0aadcc:	8ce7fb08 */ 	lw	$a3,%lo(g_CharsHandelGothicXs)($a3)
 /*  f0aadd0:	afa00014 */ 	sw	$zero,0x14($sp)
 /*  f0aadd4:	afa600d4 */ 	sw	$a2,0xd4($sp)
 /*  f0aadd8:	afaa0058 */ 	sw	$t2,0x58($sp)
@@ -32435,10 +32435,10 @@ glabel bgunRenderHud
 /*  f0aaf54:	2404ffff */ 	addiu	$a0,$zero,-1
 /*  f0aaf58:	0fc54f8e */ 	jal	func0f153e38
 /*  f0aaf5c:	2405ffff */ 	addiu	$a1,$zero,-1
-/*  f0aaf60:	3c0f8008 */ 	lui	$t7,%hi(g_FontHandelGothicXs1)
-/*  f0aaf64:	8deffb08 */ 	lw	$t7,%lo(g_FontHandelGothicXs1)($t7)
-/*  f0aaf68:	3c188008 */ 	lui	$t8,%hi(g_FontHandelGothicXs2)
-/*  f0aaf6c:	8f18fb04 */ 	lw	$t8,%lo(g_FontHandelGothicXs2)($t8)
+/*  f0aaf60:	3c0f8008 */ 	lui	$t7,%hi(g_CharsHandelGothicXs)
+/*  f0aaf64:	8deffb08 */ 	lw	$t7,%lo(g_CharsHandelGothicXs)($t7)
+/*  f0aaf68:	3c188008 */ 	lui	$t8,%hi(g_FontHandelGothicXs)
+/*  f0aaf6c:	8f18fb04 */ 	lw	$t8,%lo(g_FontHandelGothicXs)($t8)
 /*  f0aaf70:	8fb900d0 */ 	lw	$t9,0xd0($sp)
 /*  f0aaf74:	8fae00c0 */ 	lw	$t6,0xc0($sp)
 /*  f0aaf78:	afaf0010 */ 	sw	$t7,0x10($sp)
@@ -32503,7 +32503,7 @@ glabel bgunRenderHud
 /*  f0ab054:	00627021 */ 	addu	$t6,$v1,$v0
 /*  f0ab058:	29c10100 */ 	slti	$at,$t6,0x100
 /*  f0ab05c:	14200004 */ 	bnez	$at,.L0f0ab070
-/*  f0ab060:	3c078008 */ 	lui	$a3,%hi(g_FontHandelGothicXs1)
+/*  f0ab060:	3c078008 */ 	lui	$a3,%hi(g_CharsHandelGothicXs)
 /*  f0ab064:	240f00ff */ 	addiu	$t7,$zero,0xff
 /*  f0ab068:	10000003 */ 	b	.L0f0ab078
 /*  f0ab06c:	a14f006e */ 	sb	$t7,0x6e($t2)
@@ -32536,9 +32536,9 @@ glabel bgunRenderHud
 /*  f0ab0cc:	0301c825 */ 	or	$t9,$t8,$at
 /*  f0ab0d0:	afb900d0 */ 	sw	$t9,0xd0($sp)
 .L0f0ab0d4:
-/*  f0ab0d4:	3c0f8008 */ 	lui	$t7,%hi(g_FontHandelGothicXs2)
-/*  f0ab0d8:	8deffb04 */ 	lw	$t7,%lo(g_FontHandelGothicXs2)($t7)
-/*  f0ab0dc:	8ce7fb08 */ 	lw	$a3,%lo(g_FontHandelGothicXs1)($a3)
+/*  f0ab0d4:	3c0f8008 */ 	lui	$t7,%hi(g_FontHandelGothicXs)
+/*  f0ab0d8:	8deffb04 */ 	lw	$t7,%lo(g_FontHandelGothicXs)($t7)
+/*  f0ab0dc:	8ce7fb08 */ 	lw	$a3,%lo(g_CharsHandelGothicXs)($a3)
 /*  f0ab0e0:	afa00014 */ 	sw	$zero,0x14($sp)
 /*  f0ab0e4:	afa600d4 */ 	sw	$a2,0xd4($sp)
 /*  f0ab0e8:	afaa0058 */ 	sw	$t2,0x58($sp)
@@ -32635,10 +32635,10 @@ glabel bgunRenderHud
 /*  f0ab24c:	2404ffff */ 	addiu	$a0,$zero,-1
 /*  f0ab250:	0fc54f8e */ 	jal	func0f153e38
 /*  f0ab254:	2405ffff */ 	addiu	$a1,$zero,-1
-/*  f0ab258:	3c0f8008 */ 	lui	$t7,%hi(g_FontHandelGothicXs1)
-/*  f0ab25c:	8deffb08 */ 	lw	$t7,%lo(g_FontHandelGothicXs1)($t7)
-/*  f0ab260:	3c0e8008 */ 	lui	$t6,%hi(g_FontHandelGothicXs2)
-/*  f0ab264:	8dcefb04 */ 	lw	$t6,%lo(g_FontHandelGothicXs2)($t6)
+/*  f0ab258:	3c0f8008 */ 	lui	$t7,%hi(g_CharsHandelGothicXs)
+/*  f0ab25c:	8deffb08 */ 	lw	$t7,%lo(g_CharsHandelGothicXs)($t7)
+/*  f0ab260:	3c0e8008 */ 	lui	$t6,%hi(g_FontHandelGothicXs)
+/*  f0ab264:	8dcefb04 */ 	lw	$t6,%lo(g_FontHandelGothicXs)($t6)
 /*  f0ab268:	8fb800d0 */ 	lw	$t8,0xd0($sp)
 /*  f0ab26c:	8fb900c0 */ 	lw	$t9,0xc0($sp)
 /*  f0ab270:	afaf0010 */ 	sw	$t7,0x10($sp)
@@ -34664,7 +34664,7 @@ const char var7f1ac19c[] = "%02d:%02d\n";
 //				ctrl->guntypetimer = (u32)ctrl->guntypetimer + g_Vars.lvupdate240_60;
 //			}
 //
-//			textMeasure(&textheight, &textwidth, str, g_FontHandelGothicXs1, g_FontHandelGothicXs2, 0);
+//			textMeasure(&textheight, &textwidth, str, g_CharsHandelGothicXs, g_FontHandelGothicXs, 0);
 //			textwidth += 2;
 //
 //			if (textwidth > ctrl->guntypetimer * 3) {
@@ -34692,7 +34692,7 @@ const char var7f1ac19c[] = "%02d:%02d\n";
 //			gdl = func0f153838(gdl);
 //			func0f153d50(var80061630 * 50.0f, 0, 50);
 //			func0f153e38(0xffffffff, 0xffffffff);
-//			gdl = textRenderProjected(gdl, &x, &y, str, g_FontHandelGothicXs1, g_FontHandelGothicXs2, colour, textwidth, 1000, 0, 0);
+//			gdl = textRenderProjected(gdl, &x, &y, str, g_CharsHandelGothicXs, g_FontHandelGothicXs, colour, textwidth, 1000, 0, 0);
 //			func0f153e4c();
 //		}
 //
@@ -34737,7 +34737,7 @@ const char var7f1ac19c[] = "%02d:%02d\n";
 //				}
 //#endif
 //
-//				textMeasure(&textheight, &textwidth, str, g_FontHandelGothicXs1, g_FontHandelGothicXs2, 0);
+//				textMeasure(&textheight, &textwidth, str, g_CharsHandelGothicXs, g_FontHandelGothicXs, 0);
 //				textwidth += 2;
 //
 //				if (textwidth > ctrl->fnstrtimer * 3) {
@@ -34763,7 +34763,7 @@ const char var7f1ac19c[] = "%02d:%02d\n";
 //				func0f153e38(0xffffffff, 0xffffffff);
 //
 //				gdl = textRenderProjected(gdl, &x, &y, str,
-//						g_FontHandelGothicXs1, g_FontHandelGothicXs2, colour, textwidth,
+//						g_CharsHandelGothicXs, g_FontHandelGothicXs, colour, textwidth,
 //						1000, 0, 0);
 //
 //				func0f153e4c();
diff --git a/src/game/bondview.c b/src/game/bondview.c
index dfb23826f..067c48759 100644
--- a/src/game/bondview.c
+++ b/src/game/bondview.c
@@ -6814,10 +6814,10 @@ glabel var7f1b5f58
 /*  f1443b0:	460021a1 */ 	cvt.d.s	$f6,$f4
 /*  f1443b4:	0c004dad */ 	jal	sprintf
 /*  f1443b8:	f7a60010 */ 	sdc1	$f6,0x10($sp)
-/*  f1443bc:	3c198008 */ 	lui	$t9,%hi(g_FontHandelGothicXs2)
-/*  f1443c0:	8f39fb04 */ 	lw	$t9,%lo(g_FontHandelGothicXs2)($t9)
-/*  f1443c4:	3c078008 */ 	lui	$a3,%hi(g_FontHandelGothicXs1)
-/*  f1443c8:	8ce7fb08 */ 	lw	$a3,%lo(g_FontHandelGothicXs1)($a3)
+/*  f1443bc:	3c198008 */ 	lui	$t9,%hi(g_FontHandelGothicXs)
+/*  f1443c0:	8f39fb04 */ 	lw	$t9,%lo(g_FontHandelGothicXs)($t9)
+/*  f1443c4:	3c078008 */ 	lui	$a3,%hi(g_CharsHandelGothicXs)
+/*  f1443c8:	8ce7fb08 */ 	lw	$a3,%lo(g_CharsHandelGothicXs)($a3)
 /*  f1443cc:	27a402e0 */ 	addiu	$a0,$sp,0x2e0
 /*  f1443d0:	27a502e4 */ 	addiu	$a1,$sp,0x2e4
 /*  f1443d4:	02603025 */ 	or	$a2,$s3,$zero
@@ -6857,10 +6857,10 @@ glabel var7f1b5f58
 /*  f14445c:	0010cc03 */ 	sra	$t9,$s0,0x10
 /*  f144460:	0c002f06 */ 	jal	viGetHeight
 /*  f144464:	03208025 */ 	or	$s0,$t9,$zero
-/*  f144468:	3c0e8008 */ 	lui	$t6,%hi(g_FontHandelGothicXs1)
-/*  f14446c:	3c0f8008 */ 	lui	$t7,%hi(g_FontHandelGothicXs2)
-/*  f144470:	8deffb04 */ 	lw	$t7,%lo(g_FontHandelGothicXs2)($t7)
-/*  f144474:	8dcefb08 */ 	lw	$t6,%lo(g_FontHandelGothicXs1)($t6)
+/*  f144468:	3c0e8008 */ 	lui	$t6,%hi(g_CharsHandelGothicXs)
+/*  f14446c:	3c0f8008 */ 	lui	$t7,%hi(g_FontHandelGothicXs)
+/*  f144470:	8deffb04 */ 	lw	$t7,%lo(g_FontHandelGothicXs)($t7)
+/*  f144474:	8dcefb08 */ 	lw	$t6,%lo(g_CharsHandelGothicXs)($t6)
 /*  f144478:	8fb802b0 */ 	lw	$t8,0x2b0($sp)
 /*  f14447c:	02a02025 */ 	or	$a0,$s5,$zero
 /*  f144480:	27a502ec */ 	addiu	$a1,$sp,0x2ec
@@ -6893,11 +6893,11 @@ glabel var7f1b5f58
 /*  f1444ec:	460021a1 */ 	cvt.d.s	$f6,$f4
 /*  f1444f0:	0c004dad */ 	jal	sprintf
 /*  f1444f4:	f7a60010 */ 	sdc1	$f6,0x10($sp)
-/*  f1444f8:	3c0f8008 */ 	lui	$t7,%hi(g_FontHandelGothicXs2)
-/*  f1444fc:	8deffb04 */ 	lw	$t7,%lo(g_FontHandelGothicXs2)($t7)
-/*  f144500:	3c078008 */ 	lui	$a3,%hi(g_FontHandelGothicXs1)
+/*  f1444f8:	3c0f8008 */ 	lui	$t7,%hi(g_FontHandelGothicXs)
+/*  f1444fc:	8deffb04 */ 	lw	$t7,%lo(g_FontHandelGothicXs)($t7)
+/*  f144500:	3c078008 */ 	lui	$a3,%hi(g_CharsHandelGothicXs)
 /*  f144504:	26510009 */ 	addiu	$s1,$s2,0x9
-/*  f144508:	8ce7fb08 */ 	lw	$a3,%lo(g_FontHandelGothicXs1)($a3)
+/*  f144508:	8ce7fb08 */ 	lw	$a3,%lo(g_CharsHandelGothicXs)($a3)
 /*  f14450c:	27a402e0 */ 	addiu	$a0,$sp,0x2e0
 /*  f144510:	27a502e4 */ 	addiu	$a1,$sp,0x2e4
 /*  f144514:	02603025 */ 	or	$a2,$s3,$zero
@@ -6926,10 +6926,10 @@ glabel var7f1b5f58
 /*  f144570:	0010cc03 */ 	sra	$t9,$s0,0x10
 /*  f144574:	0c002f06 */ 	jal	viGetHeight
 /*  f144578:	03208025 */ 	or	$s0,$t9,$zero
-/*  f14457c:	3c0e8008 */ 	lui	$t6,%hi(g_FontHandelGothicXs1)
-/*  f144580:	3c0f8008 */ 	lui	$t7,%hi(g_FontHandelGothicXs2)
-/*  f144584:	8deffb04 */ 	lw	$t7,%lo(g_FontHandelGothicXs2)($t7)
-/*  f144588:	8dcefb08 */ 	lw	$t6,%lo(g_FontHandelGothicXs1)($t6)
+/*  f14457c:	3c0e8008 */ 	lui	$t6,%hi(g_CharsHandelGothicXs)
+/*  f144580:	3c0f8008 */ 	lui	$t7,%hi(g_FontHandelGothicXs)
+/*  f144584:	8deffb04 */ 	lw	$t7,%lo(g_FontHandelGothicXs)($t7)
+/*  f144588:	8dcefb08 */ 	lw	$t6,%lo(g_CharsHandelGothicXs)($t6)
 /*  f14458c:	8fb802b0 */ 	lw	$t8,0x2b0($sp)
 /*  f144590:	02a02025 */ 	or	$a0,$s5,$zero
 /*  f144594:	27a502ec */ 	addiu	$a1,$sp,0x2ec
@@ -6958,11 +6958,11 @@ glabel var7f1b5f58
 /*  f1445f0:	44074000 */ 	mfc1	$a3,$f8
 /*  f1445f4:	0c004dad */ 	jal	sprintf
 /*  f1445f8:	00000000 */ 	nop
-/*  f1445fc:	3c188008 */ 	lui	$t8,%hi(g_FontHandelGothicXs2)
-/*  f144600:	8f18fb04 */ 	lw	$t8,%lo(g_FontHandelGothicXs2)($t8)
-/*  f144604:	3c078008 */ 	lui	$a3,%hi(g_FontHandelGothicXs1)
+/*  f1445fc:	3c188008 */ 	lui	$t8,%hi(g_FontHandelGothicXs)
+/*  f144600:	8f18fb04 */ 	lw	$t8,%lo(g_FontHandelGothicXs)($t8)
+/*  f144604:	3c078008 */ 	lui	$a3,%hi(g_CharsHandelGothicXs)
 /*  f144608:	26310009 */ 	addiu	$s1,$s1,0x9
-/*  f14460c:	8ce7fb08 */ 	lw	$a3,%lo(g_FontHandelGothicXs1)($a3)
+/*  f14460c:	8ce7fb08 */ 	lw	$a3,%lo(g_CharsHandelGothicXs)($a3)
 /*  f144610:	27a402e0 */ 	addiu	$a0,$sp,0x2e0
 /*  f144614:	27a502e4 */ 	addiu	$a1,$sp,0x2e4
 /*  f144618:	02603025 */ 	or	$a2,$s3,$zero
@@ -6991,10 +6991,10 @@ glabel var7f1b5f58
 /*  f144674:	00107403 */ 	sra	$t6,$s0,0x10
 /*  f144678:	0c002f06 */ 	jal	viGetHeight
 /*  f14467c:	01c08025 */ 	or	$s0,$t6,$zero
-/*  f144680:	3c0f8008 */ 	lui	$t7,%hi(g_FontHandelGothicXs1)
-/*  f144684:	3c188008 */ 	lui	$t8,%hi(g_FontHandelGothicXs2)
-/*  f144688:	8f18fb04 */ 	lw	$t8,%lo(g_FontHandelGothicXs2)($t8)
-/*  f14468c:	8deffb08 */ 	lw	$t7,%lo(g_FontHandelGothicXs1)($t7)
+/*  f144680:	3c0f8008 */ 	lui	$t7,%hi(g_CharsHandelGothicXs)
+/*  f144684:	3c188008 */ 	lui	$t8,%hi(g_FontHandelGothicXs)
+/*  f144688:	8f18fb04 */ 	lw	$t8,%lo(g_FontHandelGothicXs)($t8)
+/*  f14468c:	8deffb08 */ 	lw	$t7,%lo(g_CharsHandelGothicXs)($t7)
 /*  f144690:	8fb902b0 */ 	lw	$t9,0x2b0($sp)
 /*  f144694:	02a02025 */ 	or	$a0,$s5,$zero
 /*  f144698:	27a502ec */ 	addiu	$a1,$sp,0x2ec
@@ -7023,11 +7023,11 @@ glabel var7f1b5f58
 /*  f1446f4:	44073000 */ 	mfc1	$a3,$f6
 /*  f1446f8:	0c004dad */ 	jal	sprintf
 /*  f1446fc:	00000000 */ 	nop
-/*  f144700:	3c198008 */ 	lui	$t9,%hi(g_FontHandelGothicXs2)
-/*  f144704:	8f39fb04 */ 	lw	$t9,%lo(g_FontHandelGothicXs2)($t9)
-/*  f144708:	3c078008 */ 	lui	$a3,%hi(g_FontHandelGothicXs1)
+/*  f144700:	3c198008 */ 	lui	$t9,%hi(g_FontHandelGothicXs)
+/*  f144704:	8f39fb04 */ 	lw	$t9,%lo(g_FontHandelGothicXs)($t9)
+/*  f144708:	3c078008 */ 	lui	$a3,%hi(g_CharsHandelGothicXs)
 /*  f14470c:	26310009 */ 	addiu	$s1,$s1,0x9
-/*  f144710:	8ce7fb08 */ 	lw	$a3,%lo(g_FontHandelGothicXs1)($a3)
+/*  f144710:	8ce7fb08 */ 	lw	$a3,%lo(g_CharsHandelGothicXs)($a3)
 /*  f144714:	27a402e0 */ 	addiu	$a0,$sp,0x2e0
 /*  f144718:	27a502e4 */ 	addiu	$a1,$sp,0x2e4
 /*  f14471c:	02603025 */ 	or	$a2,$s3,$zero
@@ -7056,10 +7056,10 @@ glabel var7f1b5f58
 /*  f144778:	00107c03 */ 	sra	$t7,$s0,0x10
 /*  f14477c:	0c002f06 */ 	jal	viGetHeight
 /*  f144780:	01e08025 */ 	or	$s0,$t7,$zero
-/*  f144784:	3c188008 */ 	lui	$t8,%hi(g_FontHandelGothicXs1)
-/*  f144788:	3c198008 */ 	lui	$t9,%hi(g_FontHandelGothicXs2)
-/*  f14478c:	8f39fb04 */ 	lw	$t9,%lo(g_FontHandelGothicXs2)($t9)
-/*  f144790:	8f18fb08 */ 	lw	$t8,%lo(g_FontHandelGothicXs1)($t8)
+/*  f144784:	3c188008 */ 	lui	$t8,%hi(g_CharsHandelGothicXs)
+/*  f144788:	3c198008 */ 	lui	$t9,%hi(g_FontHandelGothicXs)
+/*  f14478c:	8f39fb04 */ 	lw	$t9,%lo(g_FontHandelGothicXs)($t9)
+/*  f144790:	8f18fb08 */ 	lw	$t8,%lo(g_CharsHandelGothicXs)($t8)
 /*  f144794:	8fae02b0 */ 	lw	$t6,0x2b0($sp)
 /*  f144798:	02a02025 */ 	or	$a0,$s5,$zero
 /*  f14479c:	27a502ec */ 	addiu	$a1,$sp,0x2ec
@@ -7082,10 +7082,10 @@ glabel var7f1b5f58
 /*  f1447e0:	02602025 */ 	or	$a0,$s3,$zero
 /*  f1447e4:	0c004dad */ 	jal	sprintf
 /*  f1447e8:	00403025 */ 	or	$a2,$v0,$zero
-/*  f1447ec:	3c0f8008 */ 	lui	$t7,%hi(g_FontHandelGothicXs2)
-/*  f1447f0:	8deffb04 */ 	lw	$t7,%lo(g_FontHandelGothicXs2)($t7)
-/*  f1447f4:	3c078008 */ 	lui	$a3,%hi(g_FontHandelGothicXs1)
-/*  f1447f8:	8ce7fb08 */ 	lw	$a3,%lo(g_FontHandelGothicXs1)($a3)
+/*  f1447ec:	3c0f8008 */ 	lui	$t7,%hi(g_FontHandelGothicXs)
+/*  f1447f0:	8deffb04 */ 	lw	$t7,%lo(g_FontHandelGothicXs)($t7)
+/*  f1447f4:	3c078008 */ 	lui	$a3,%hi(g_CharsHandelGothicXs)
+/*  f1447f8:	8ce7fb08 */ 	lw	$a3,%lo(g_CharsHandelGothicXs)($a3)
 /*  f1447fc:	27a402e0 */ 	addiu	$a0,$sp,0x2e0
 /*  f144800:	27a502e4 */ 	addiu	$a1,$sp,0x2e4
 /*  f144804:	02603025 */ 	or	$a2,$s3,$zero
@@ -7134,10 +7134,10 @@ glabel var7f1b5f58
 /*  f1448a0:	0010cc03 */ 	sra	$t9,$s0,0x10
 /*  f1448a4:	0c002f06 */ 	jal	viGetHeight
 /*  f1448a8:	03208025 */ 	or	$s0,$t9,$zero
-/*  f1448ac:	3c0e8008 */ 	lui	$t6,%hi(g_FontHandelGothicXs1)
-/*  f1448b0:	3c0f8008 */ 	lui	$t7,%hi(g_FontHandelGothicXs2)
-/*  f1448b4:	8deffb04 */ 	lw	$t7,%lo(g_FontHandelGothicXs2)($t7)
-/*  f1448b8:	8dcefb08 */ 	lw	$t6,%lo(g_FontHandelGothicXs1)($t6)
+/*  f1448ac:	3c0e8008 */ 	lui	$t6,%hi(g_CharsHandelGothicXs)
+/*  f1448b0:	3c0f8008 */ 	lui	$t7,%hi(g_FontHandelGothicXs)
+/*  f1448b4:	8deffb04 */ 	lw	$t7,%lo(g_FontHandelGothicXs)($t7)
+/*  f1448b8:	8dcefb08 */ 	lw	$t6,%lo(g_CharsHandelGothicXs)($t6)
 /*  f1448bc:	8fb802b4 */ 	lw	$t8,0x2b4($sp)
 /*  f1448c0:	8fb902b0 */ 	lw	$t9,0x2b0($sp)
 /*  f1448c4:	02a02025 */ 	or	$a0,$s5,$zero
@@ -7190,10 +7190,10 @@ glabel var7f1b5f58
 /*  f144978:	0c004dad */ 	jal	sprintf
 /*  f14497c:	00403025 */ 	or	$a2,$v0,$zero
 .L0f144980:
-/*  f144980:	3c188008 */ 	lui	$t8,%hi(g_FontHandelGothicXs2)
-/*  f144984:	8f18fb04 */ 	lw	$t8,%lo(g_FontHandelGothicXs2)($t8)
-/*  f144988:	3c078008 */ 	lui	$a3,%hi(g_FontHandelGothicXs1)
-/*  f14498c:	8ce7fb08 */ 	lw	$a3,%lo(g_FontHandelGothicXs1)($a3)
+/*  f144980:	3c188008 */ 	lui	$t8,%hi(g_FontHandelGothicXs)
+/*  f144984:	8f18fb04 */ 	lw	$t8,%lo(g_FontHandelGothicXs)($t8)
+/*  f144988:	3c078008 */ 	lui	$a3,%hi(g_CharsHandelGothicXs)
+/*  f14498c:	8ce7fb08 */ 	lw	$a3,%lo(g_CharsHandelGothicXs)($a3)
 /*  f144990:	27a402e0 */ 	addiu	$a0,$sp,0x2e0
 /*  f144994:	27a502e4 */ 	addiu	$a1,$sp,0x2e4
 /*  f144998:	02603025 */ 	or	$a2,$s3,$zero
@@ -7242,10 +7242,10 @@ glabel var7f1b5f58
 /*  f144a34:	00107403 */ 	sra	$t6,$s0,0x10
 /*  f144a38:	0c002f06 */ 	jal	viGetHeight
 /*  f144a3c:	01c08025 */ 	or	$s0,$t6,$zero
-/*  f144a40:	3c0f8008 */ 	lui	$t7,%hi(g_FontHandelGothicXs1)
-/*  f144a44:	3c188008 */ 	lui	$t8,%hi(g_FontHandelGothicXs2)
-/*  f144a48:	8f18fb04 */ 	lw	$t8,%lo(g_FontHandelGothicXs2)($t8)
-/*  f144a4c:	8deffb08 */ 	lw	$t7,%lo(g_FontHandelGothicXs1)($t7)
+/*  f144a40:	3c0f8008 */ 	lui	$t7,%hi(g_CharsHandelGothicXs)
+/*  f144a44:	3c188008 */ 	lui	$t8,%hi(g_FontHandelGothicXs)
+/*  f144a48:	8f18fb04 */ 	lw	$t8,%lo(g_FontHandelGothicXs)($t8)
+/*  f144a4c:	8deffb08 */ 	lw	$t7,%lo(g_CharsHandelGothicXs)($t7)
 /*  f144a50:	8fb902b4 */ 	lw	$t9,0x2b4($sp)
 /*  f144a54:	8fae02b0 */ 	lw	$t6,0x2b0($sp)
 /*  f144a58:	02a02025 */ 	or	$a0,$s5,$zero
@@ -7274,10 +7274,10 @@ glabel var7f1b5f58
 /*  f144ab4:	02602025 */ 	or	$a0,$s3,$zero
 /*  f144ab8:	0c004dad */ 	jal	sprintf
 /*  f144abc:	00403025 */ 	or	$a2,$v0,$zero
-/*  f144ac0:	3c198008 */ 	lui	$t9,%hi(g_FontHandelGothicXs2)
-/*  f144ac4:	8f39fb04 */ 	lw	$t9,%lo(g_FontHandelGothicXs2)($t9)
-/*  f144ac8:	3c078008 */ 	lui	$a3,%hi(g_FontHandelGothicXs1)
-/*  f144acc:	8ce7fb08 */ 	lw	$a3,%lo(g_FontHandelGothicXs1)($a3)
+/*  f144ac0:	3c198008 */ 	lui	$t9,%hi(g_FontHandelGothicXs)
+/*  f144ac4:	8f39fb04 */ 	lw	$t9,%lo(g_FontHandelGothicXs)($t9)
+/*  f144ac8:	3c078008 */ 	lui	$a3,%hi(g_CharsHandelGothicXs)
+/*  f144acc:	8ce7fb08 */ 	lw	$a3,%lo(g_CharsHandelGothicXs)($a3)
 /*  f144ad0:	27a402e0 */ 	addiu	$a0,$sp,0x2e0
 /*  f144ad4:	27a502e4 */ 	addiu	$a1,$sp,0x2e4
 /*  f144ad8:	02603025 */ 	or	$a2,$s3,$zero
@@ -7325,10 +7325,10 @@ glabel var7f1b5f58
 /*  f144b78:	0010c403 */ 	sra	$t8,$s0,0x10
 /*  f144b7c:	0c002f06 */ 	jal	viGetHeight
 /*  f144b80:	03008025 */ 	or	$s0,$t8,$zero
-/*  f144b84:	3c198008 */ 	lui	$t9,%hi(g_FontHandelGothicXs1)
-/*  f144b88:	3c0f8008 */ 	lui	$t7,%hi(g_FontHandelGothicXs2)
-/*  f144b8c:	8deffb04 */ 	lw	$t7,%lo(g_FontHandelGothicXs2)($t7)
-/*  f144b90:	8f39fb08 */ 	lw	$t9,%lo(g_FontHandelGothicXs1)($t9)
+/*  f144b84:	3c198008 */ 	lui	$t9,%hi(g_CharsHandelGothicXs)
+/*  f144b88:	3c0f8008 */ 	lui	$t7,%hi(g_FontHandelGothicXs)
+/*  f144b8c:	8deffb04 */ 	lw	$t7,%lo(g_FontHandelGothicXs)($t7)
+/*  f144b90:	8f39fb08 */ 	lw	$t9,%lo(g_CharsHandelGothicXs)($t9)
 /*  f144b94:	8fae02b4 */ 	lw	$t6,0x2b4($sp)
 /*  f144b98:	8fb802b0 */ 	lw	$t8,0x2b0($sp)
 /*  f144b9c:	02a02025 */ 	or	$a0,$s5,$zero
@@ -7357,10 +7357,10 @@ glabel var7f1b5f58
 /*  f144bf4:	02602025 */ 	or	$a0,$s3,$zero
 /*  f144bf8:	0c004dad */ 	jal	sprintf
 /*  f144bfc:	00403025 */ 	or	$a2,$v0,$zero
-/*  f144c00:	3c198008 */ 	lui	$t9,%hi(g_FontHandelGothicXs2)
-/*  f144c04:	8f39fb04 */ 	lw	$t9,%lo(g_FontHandelGothicXs2)($t9)
-/*  f144c08:	3c078008 */ 	lui	$a3,%hi(g_FontHandelGothicXs1)
-/*  f144c0c:	8ce7fb08 */ 	lw	$a3,%lo(g_FontHandelGothicXs1)($a3)
+/*  f144c00:	3c198008 */ 	lui	$t9,%hi(g_FontHandelGothicXs)
+/*  f144c04:	8f39fb04 */ 	lw	$t9,%lo(g_FontHandelGothicXs)($t9)
+/*  f144c08:	3c078008 */ 	lui	$a3,%hi(g_CharsHandelGothicXs)
+/*  f144c0c:	8ce7fb08 */ 	lw	$a3,%lo(g_CharsHandelGothicXs)($a3)
 /*  f144c10:	27a402e0 */ 	addiu	$a0,$sp,0x2e0
 /*  f144c14:	27a502e4 */ 	addiu	$a1,$sp,0x2e4
 /*  f144c18:	02603025 */ 	or	$a2,$s3,$zero
@@ -7408,10 +7408,10 @@ glabel var7f1b5f58
 /*  f144cb8:	0010c403 */ 	sra	$t8,$s0,0x10
 /*  f144cbc:	0c002f06 */ 	jal	viGetHeight
 /*  f144cc0:	03008025 */ 	or	$s0,$t8,$zero
-/*  f144cc4:	3c198008 */ 	lui	$t9,%hi(g_FontHandelGothicXs1)
-/*  f144cc8:	3c0e8008 */ 	lui	$t6,%hi(g_FontHandelGothicXs2)
-/*  f144ccc:	8dcefb04 */ 	lw	$t6,%lo(g_FontHandelGothicXs2)($t6)
-/*  f144cd0:	8f39fb08 */ 	lw	$t9,%lo(g_FontHandelGothicXs1)($t9)
+/*  f144cc4:	3c198008 */ 	lui	$t9,%hi(g_CharsHandelGothicXs)
+/*  f144cc8:	3c0e8008 */ 	lui	$t6,%hi(g_FontHandelGothicXs)
+/*  f144ccc:	8dcefb04 */ 	lw	$t6,%lo(g_FontHandelGothicXs)($t6)
+/*  f144cd0:	8f39fb08 */ 	lw	$t9,%lo(g_CharsHandelGothicXs)($t9)
 /*  f144cd4:	8faf02b4 */ 	lw	$t7,0x2b4($sp)
 /*  f144cd8:	8fb802b0 */ 	lw	$t8,0x2b0($sp)
 /*  f144cdc:	02a02025 */ 	or	$a0,$s5,$zero
@@ -7437,10 +7437,10 @@ glabel var7f1b5f58
 /*  f144d28:	02602025 */ 	or	$a0,$s3,$zero
 /*  f144d2c:	0c004dad */ 	jal	sprintf
 /*  f144d30:	00403025 */ 	or	$a2,$v0,$zero
-/*  f144d34:	3c198008 */ 	lui	$t9,%hi(g_FontHandelGothicXs2)
-/*  f144d38:	8f39fb04 */ 	lw	$t9,%lo(g_FontHandelGothicXs2)($t9)
-/*  f144d3c:	3c078008 */ 	lui	$a3,%hi(g_FontHandelGothicXs1)
-/*  f144d40:	8ce7fb08 */ 	lw	$a3,%lo(g_FontHandelGothicXs1)($a3)
+/*  f144d34:	3c198008 */ 	lui	$t9,%hi(g_FontHandelGothicXs)
+/*  f144d38:	8f39fb04 */ 	lw	$t9,%lo(g_FontHandelGothicXs)($t9)
+/*  f144d3c:	3c078008 */ 	lui	$a3,%hi(g_CharsHandelGothicXs)
+/*  f144d40:	8ce7fb08 */ 	lw	$a3,%lo(g_CharsHandelGothicXs)($a3)
 /*  f144d44:	27a402e0 */ 	addiu	$a0,$sp,0x2e0
 /*  f144d48:	27a502e4 */ 	addiu	$a1,$sp,0x2e4
 /*  f144d4c:	02603025 */ 	or	$a2,$s3,$zero
@@ -7486,10 +7486,10 @@ glabel var7f1b5f58
 /*  f144de4:	0010c403 */ 	sra	$t8,$s0,0x10
 /*  f144de8:	0c002f06 */ 	jal	viGetHeight
 /*  f144dec:	03008025 */ 	or	$s0,$t8,$zero
-/*  f144df0:	3c198008 */ 	lui	$t9,%hi(g_FontHandelGothicXs1)
-/*  f144df4:	3c0f8008 */ 	lui	$t7,%hi(g_FontHandelGothicXs2)
-/*  f144df8:	8deffb04 */ 	lw	$t7,%lo(g_FontHandelGothicXs2)($t7)
-/*  f144dfc:	8f39fb08 */ 	lw	$t9,%lo(g_FontHandelGothicXs1)($t9)
+/*  f144df0:	3c198008 */ 	lui	$t9,%hi(g_CharsHandelGothicXs)
+/*  f144df4:	3c0f8008 */ 	lui	$t7,%hi(g_FontHandelGothicXs)
+/*  f144df8:	8deffb04 */ 	lw	$t7,%lo(g_FontHandelGothicXs)($t7)
+/*  f144dfc:	8f39fb08 */ 	lw	$t9,%lo(g_CharsHandelGothicXs)($t9)
 /*  f144e00:	8fae02b4 */ 	lw	$t6,0x2b4($sp)
 /*  f144e04:	8fb802b0 */ 	lw	$t8,0x2b0($sp)
 /*  f144e08:	02a02025 */ 	or	$a0,$s5,$zero
@@ -7543,10 +7543,10 @@ glabel var7f1b5f58
 /*  f144ebc:	0c004dad */ 	jal	sprintf
 /*  f144ec0:	00403025 */ 	or	$a2,$v0,$zero
 .L0f144ec4:
-/*  f144ec4:	3c0e8008 */ 	lui	$t6,%hi(g_FontHandelGothicXs2)
-/*  f144ec8:	8dcefb04 */ 	lw	$t6,%lo(g_FontHandelGothicXs2)($t6)
-/*  f144ecc:	3c078008 */ 	lui	$a3,%hi(g_FontHandelGothicXs1)
-/*  f144ed0:	8ce7fb08 */ 	lw	$a3,%lo(g_FontHandelGothicXs1)($a3)
+/*  f144ec4:	3c0e8008 */ 	lui	$t6,%hi(g_FontHandelGothicXs)
+/*  f144ec8:	8dcefb04 */ 	lw	$t6,%lo(g_FontHandelGothicXs)($t6)
+/*  f144ecc:	3c078008 */ 	lui	$a3,%hi(g_CharsHandelGothicXs)
+/*  f144ed0:	8ce7fb08 */ 	lw	$a3,%lo(g_CharsHandelGothicXs)($a3)
 /*  f144ed4:	27a402e0 */ 	addiu	$a0,$sp,0x2e0
 /*  f144ed8:	27a502e4 */ 	addiu	$a1,$sp,0x2e4
 /*  f144edc:	02603025 */ 	or	$a2,$s3,$zero
@@ -7600,10 +7600,10 @@ glabel var7f1b5f58
 /*  f144f8c:	0010cc03 */ 	sra	$t9,$s0,0x10
 /*  f144f90:	0c002f06 */ 	jal	viGetHeight
 /*  f144f94:	03208025 */ 	or	$s0,$t9,$zero
-/*  f144f98:	3c0e8008 */ 	lui	$t6,%hi(g_FontHandelGothicXs1)
-/*  f144f9c:	3c188008 */ 	lui	$t8,%hi(g_FontHandelGothicXs2)
-/*  f144fa0:	8f18fb04 */ 	lw	$t8,%lo(g_FontHandelGothicXs2)($t8)
-/*  f144fa4:	8dcefb08 */ 	lw	$t6,%lo(g_FontHandelGothicXs1)($t6)
+/*  f144f98:	3c0e8008 */ 	lui	$t6,%hi(g_CharsHandelGothicXs)
+/*  f144f9c:	3c188008 */ 	lui	$t8,%hi(g_FontHandelGothicXs)
+/*  f144fa0:	8f18fb04 */ 	lw	$t8,%lo(g_FontHandelGothicXs)($t8)
+/*  f144fa4:	8dcefb08 */ 	lw	$t6,%lo(g_CharsHandelGothicXs)($t6)
 /*  f144fa8:	8faf02b4 */ 	lw	$t7,0x2b4($sp)
 /*  f144fac:	8fb902b0 */ 	lw	$t9,0x2b0($sp)
 /*  f144fb0:	02a02025 */ 	or	$a0,$s5,$zero
@@ -7646,10 +7646,10 @@ glabel var7f1b5f58
 /*  f14503c:	0c004dad */ 	jal	sprintf
 /*  f145040:	00403025 */ 	or	$a2,$v0,$zero
 .L0f145044:
-/*  f145044:	3c0f8008 */ 	lui	$t7,%hi(g_FontHandelGothicXs2)
-/*  f145048:	8deffb04 */ 	lw	$t7,%lo(g_FontHandelGothicXs2)($t7)
-/*  f14504c:	3c078008 */ 	lui	$a3,%hi(g_FontHandelGothicXs1)
-/*  f145050:	8ce7fb08 */ 	lw	$a3,%lo(g_FontHandelGothicXs1)($a3)
+/*  f145044:	3c0f8008 */ 	lui	$t7,%hi(g_FontHandelGothicXs)
+/*  f145048:	8deffb04 */ 	lw	$t7,%lo(g_FontHandelGothicXs)($t7)
+/*  f14504c:	3c078008 */ 	lui	$a3,%hi(g_CharsHandelGothicXs)
+/*  f145050:	8ce7fb08 */ 	lw	$a3,%lo(g_CharsHandelGothicXs)($a3)
 /*  f145054:	27a402e0 */ 	addiu	$a0,$sp,0x2e0
 /*  f145058:	27a502e4 */ 	addiu	$a1,$sp,0x2e4
 /*  f14505c:	02603025 */ 	or	$a2,$s3,$zero
@@ -7711,10 +7711,10 @@ glabel var7f1b5f58
 /*  f145130:	00107c03 */ 	sra	$t7,$s0,0x10
 /*  f145134:	0c002f06 */ 	jal	viGetHeight
 /*  f145138:	01e08025 */ 	or	$s0,$t7,$zero
-/*  f14513c:	3c198008 */ 	lui	$t9,%hi(g_FontHandelGothicXs1)
-/*  f145140:	3c0e8008 */ 	lui	$t6,%hi(g_FontHandelGothicXs2)
-/*  f145144:	8dcefb04 */ 	lw	$t6,%lo(g_FontHandelGothicXs2)($t6)
-/*  f145148:	8f39fb08 */ 	lw	$t9,%lo(g_FontHandelGothicXs1)($t9)
+/*  f14513c:	3c198008 */ 	lui	$t9,%hi(g_CharsHandelGothicXs)
+/*  f145140:	3c0e8008 */ 	lui	$t6,%hi(g_FontHandelGothicXs)
+/*  f145144:	8dcefb04 */ 	lw	$t6,%lo(g_FontHandelGothicXs)($t6)
+/*  f145148:	8f39fb08 */ 	lw	$t9,%lo(g_CharsHandelGothicXs)($t9)
 /*  f14514c:	8fb802b4 */ 	lw	$t8,0x2b4($sp)
 /*  f145150:	8faf02b0 */ 	lw	$t7,0x2b0($sp)
 /*  f145154:	02a02025 */ 	or	$a0,$s5,$zero
@@ -13881,65 +13881,65 @@ glabel var7f1b5f58
 //	// 437c
 //	sprintf(text, "%s %s%5.2f", langGet(L_MISC_073), "", movedist * 0.6f);
 //	savedy = viewtop + 14;
-//	textMeasure(&textheight, &textwidth, text, g_FontHandelGothicXs1, g_FontHandelGothicXs2, 0);
+//	textMeasure(&textheight, &textwidth, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, 0);
 //	x = viewleft + 25 * scale;
 //	y = savedy;
 //	x2 = x + textwidth;
 //	y2 = y + textheight;
 //	gdl = func0f153858(gdl, &x, &y, &x2, &y2);
-//	gdl = textRender(gdl, &x, &y, text, g_FontHandelGothicXs1, g_FontHandelGothicXs2,
+//	gdl = textRender(gdl, &x, &y, text, g_CharsHandelGothicXs, g_FontHandelGothicXs,
 //			colourtextbright, colourglow, viGetWidth(), viGetHeight(), 0, 0);
 //
 //	// "H/M"
 //	// 44b4
 //	sprintf(text, "%s %s%4.2f", langGet(L_MISC_074), "", g_Vars.currentplayer->eyespy->height * 0.01f);
 //	savedy += 9;
-//	textMeasure(&textheight, &textwidth, text, g_FontHandelGothicXs1, g_FontHandelGothicXs2, 0);
+//	textMeasure(&textheight, &textwidth, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, 0);
 //	x = viewleft + 25 * scale;
 //	y = savedy;
 //	x2 = x + textwidth;
 //	y2 = y + textheight;
 //	gdl = func0f153858(gdl, &x, &y, &x2, &y2);
-//	gdl = textRender(gdl, &x, &y, text, g_FontHandelGothicXs1, g_FontHandelGothicXs2,
+//	gdl = textRender(gdl, &x, &y, text, g_CharsHandelGothicXs, g_FontHandelGothicXs,
 //			colourtextbright, colourglow, viGetWidth(), viGetHeight(), 0, 0);
 //
 //	// "Y/D"
 //	// 45c8
 //	sprintf(text, "%s %d", langGet(L_MISC_075), (s32)g_Vars.currentplayer->eyespy->theta);
 //	savedy += 9;
-//	textMeasure(&textheight, &textwidth, text, g_FontHandelGothicXs1, g_FontHandelGothicXs2, 0);
+//	textMeasure(&textheight, &textwidth, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, 0);
 //	y = savedy;
 //	x = viewleft + 25 * scale;
 //	x2 = x + textwidth;
 //	y2 = y + textheight;
 //	gdl = func0f153858(gdl, &x, &y, &x2, &y2);
-//	gdl = textRender(gdl, &x, &y, text, g_FontHandelGothicXs1, g_FontHandelGothicXs2,
+//	gdl = textRender(gdl, &x, &y, text, g_CharsHandelGothicXs, g_FontHandelGothicXs,
 //			colourtextbright, colourglow, viGetWidth(), viGetHeight(), 0, 0);
 //
 //	// "P/D"
 //	// 46cc
 //	sprintf(text, "%s %d", langGet(L_MISC_076), (s32)g_Vars.currentplayer->eyespy->verta);
 //	savedy += 9;
-//	textMeasure(&textheight, &textwidth, text, g_FontHandelGothicXs1, g_FontHandelGothicXs2, 0);
+//	textMeasure(&textheight, &textwidth, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, 0);
 //	y = savedy;
 //	x = viewleft + 25 * scale;
 //	x2 = x + textwidth;
 //	y2 = y + textheight;
 //	gdl = func0f153858(gdl, &x, &y, &x2, &y2);
-//	gdl = textRender(gdl, &x, &y, text, g_FontHandelGothicXs1, g_FontHandelGothicXs2,
+//	gdl = textRender(gdl, &x, &y, text, g_CharsHandelGothicXs, g_FontHandelGothicXs,
 //			colourtextbright, colourglow, viGetWidth(), viGetHeight(), 0, 0);
 //
 //	// "CI 2023"
 //	// 47d0
 //	sprintf(text, "%s", langGet(L_MISC_077));
-//	textMeasure(&textheight, &textwidth, text, g_FontHandelGothicXs1, g_FontHandelGothicXs2, 0);
+//	textMeasure(&textheight, &textwidth, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, 0);
 //
 //	x = (vsplit ? -3 : 0) + viewleft + 25 * scale + 5;
 //	y = (vsplit ? 18 : 0) + viewbottom - 41;
 //	x2 = x + textwidth;
 //	y2 = y + textheight;
 //	gdl = func0f153858(gdl, &x, &y, &x2, &y2);
-//	gdl = textRender(gdl, &x, &y, text, g_FontHandelGothicXs1, g_FontHandelGothicXs2,
+//	gdl = textRender(gdl, &x, &y, text, g_CharsHandelGothicXs, g_FontHandelGothicXs,
 //			colourtextdull, colourglow, viGetWidth(), viGetHeight(), 0, 0);
 //
 //	// 48f8
@@ -13951,7 +13951,7 @@ glabel var7f1b5f58
 //		sprintf(text, "%s", langGet(L_MISC_217)); // "BNC: 15877"
 //	}
 //
-//	textMeasure(&textheight, &textwidth, text, g_FontHandelGothicXs1, g_FontHandelGothicXs2, 0);
+//	textMeasure(&textheight, &textwidth, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, 0);
 //
 //	// 49a8
 //	x = (vsplit ? -3 : 0) + viewleft + 25 * scale + 5;
@@ -13959,47 +13959,47 @@ glabel var7f1b5f58
 //	x2 = x + textwidth;
 //	y2 = y + textheight;
 //	gdl = func0f153858(gdl, &x, &y, &x2, &y2);
-//	gdl = textRender(gdl, &x, &y, text, g_FontHandelGothicXs1, g_FontHandelGothicXs2,
+//	gdl = textRender(gdl, &x, &y, text, g_CharsHandelGothicXs, g_FontHandelGothicXs,
 //			colourtextdull, colourglow, viGetWidth(), viGetHeight(), 0, 0);
 //
 //	// 4a8c
 //	if (g_Vars.currentplayer->eyespy->mode == EYESPYMODE_CAMSPY) {
 //		// "CAMSPY"
 //		sprintf(text, "   %s", langGet(L_MISC_079));
-//		textMeasure(&textheight, &textwidth, text, g_FontHandelGothicXs1, g_FontHandelGothicXs2, 0);
+//		textMeasure(&textheight, &textwidth, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, 0);
 //
 //		x = viewright - scale * 53 - 25;
 //		y = (vsplit ? -13 : 0) + viewtop + 27;
 //		x2 = x + textwidth;
 //		y2 = y + textheight;
 //		gdl = func0f153858(gdl, &x, &y, &x2, &y2);
-//		gdl = textRender(gdl, &x, &y, text, g_FontHandelGothicXs1, g_FontHandelGothicXs2,
+//		gdl = textRender(gdl, &x, &y, text, g_CharsHandelGothicXs, g_FontHandelGothicXs,
 //				colourtextdull, colourglow, viGetWidth(), viGetHeight(), 0, 0);
 //	} else if (g_Vars.currentplayer->eyespy->mode == EYESPYMODE_DRUGSPY) {
 //		// "DRUGSPY"
 //		// 4be4
 //		sprintf(text, "   %s", langGet(L_MISC_468));
-//		textMeasure(&textheight, &textwidth, text, g_FontHandelGothicXs1, g_FontHandelGothicXs2, 0);
+//		textMeasure(&textheight, &textwidth, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, 0);
 //
 //		x = viewright - scale * 53 - 25;
 //		y = (vsplit ? -13 : 0) + viewtop + 27;
 //		x2 = x + textwidth;
 //		y2 = y + textheight;
 //		gdl = func0f153858(gdl, &x, &y, &x2, &y2);
-//		gdl = textRender(gdl, &x, &y, text, g_FontHandelGothicXs1, g_FontHandelGothicXs2,
+//		gdl = textRender(gdl, &x, &y, text, g_CharsHandelGothicXs, g_FontHandelGothicXs,
 //				colourtextdull, colourglow, viGetWidth(), viGetHeight(), 0, 0);
 //	} else {
 //		// "BOMBSPY"
 //		// 4d18
 //		sprintf(text, "   %s", langGet(L_MISC_469));
-//		textMeasure(&textheight, &textwidth, text, g_FontHandelGothicXs1, g_FontHandelGothicXs2, 0);
+//		textMeasure(&textheight, &textwidth, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, 0);
 //
 //		x = viewright - scale * 59 - 25;
 //		y = (vsplit ? -13 : 0) + viewtop + 27;
 //		x2 = x + textwidth;
 //		y2 = y + textheight;
 //		gdl = func0f153858(gdl, &x, &y, &x2, &y2);
-//		gdl = textRender(gdl, &x, &y, text, g_FontHandelGothicXs1, g_FontHandelGothicXs2,
+//		gdl = textRender(gdl, &x, &y, text, g_CharsHandelGothicXs, g_FontHandelGothicXs,
 //				colourtextdull, colourglow, viGetWidth(), viGetHeight(), 0, 0);
 //	}
 //
@@ -14013,13 +14013,13 @@ glabel var7f1b5f58
 //		sprintf(text, "%s", langGet(L_MISC_216)); // "MODEL 1.3"
 //	}
 //
-//	textMeasure(&textheight, &textwidth, text, g_FontHandelGothicXs1, g_FontHandelGothicXs2, 0);
+//	textMeasure(&textheight, &textwidth, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, 0);
 //	x = (vsplit ? 3 : 0) + viewright - scale * 46 - 25;
 //	y = (vsplit ? -11 : 0) + viewtop + 34;
 //	x2 = x + textwidth;
 //	y2 = y + textheight;
 //	gdl = func0f153858(gdl, &x, &y, &x2, &y2);
-//	gdl = textRender(gdl, &x, &y, text, g_FontHandelGothicXs1, g_FontHandelGothicXs2,
+//	gdl = textRender(gdl, &x, &y, text, g_CharsHandelGothicXs, g_FontHandelGothicXs,
 //			colourtextdull, colourglow, viGetWidth(), viGetHeight(), 0, 0);
 //
 //	// 4fe4
@@ -14031,13 +14031,13 @@ glabel var7f1b5f58
 //		sprintf(text, "%s", langGet(L_MISC_206)); // "DARTAMMO"
 //	}
 //
-//	textMeasure(&textheight, &textwidth, text, g_FontHandelGothicXs1, g_FontHandelGothicXs2, 0);
+//	textMeasure(&textheight, &textwidth, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, 0);
 //	x = (vsplit ? -35 : 0) + (viewright - viewwidth / 5.0f - 3 - (scale * 5 - 5));
 //	y = (vsplit ? -2 : 0) + viewbottom - 12;
 //	x2 = x + textwidth;
 //	y2 = y + textheight;
 //	gdl = func0f153858(gdl, &x, &y, &x2, &y2);
-//	gdl = textRender(gdl, &x, &y, text, g_FontHandelGothicXs1, g_FontHandelGothicXs2,
+//	gdl = textRender(gdl, &x, &y, text, g_CharsHandelGothicXs, g_FontHandelGothicXs,
 //			colourtextdull, colourglow, viGetWidth(), viGetHeight(), 0, 0);
 //
 //	gdl = func0f153838(gdl);
@@ -16129,7 +16129,7 @@ Gfx *bviewRenderHorizonScanner(Gfx *gdl)
 
 	y = lenstop - 7;
 	gdl = textRenderProjected(gdl, &x, &y, arrows,
-			g_FontHandelGothicXs1, g_FontHandelGothicXs2, 0xffffff7f, viGetWidth(), viGetHeight(), 0, 0);
+			g_CharsHandelGothicXs, g_FontHandelGothicXs, 0xffffff7f, viGetWidth(), viGetHeight(), 0, 0);
 
 	// Product name
 	strcpy(nametext, " JMBC");
@@ -16141,13 +16141,13 @@ Gfx *bviewRenderHorizonScanner(Gfx *gdl)
 	strcat(nametext, " SCANNER\n");
 
 	gdl = textRenderProjected(gdl, &x, &y, nametext,
-			g_FontHandelGothicXs1, g_FontHandelGothicXs2, 0xffffff7f, viGetWidth(), viGetHeight(), 0, 0);
+			g_CharsHandelGothicXs, g_FontHandelGothicXs, 0xffffff7f, viGetWidth(), viGetHeight(), 0, 0);
 
 	// Hertz
 	x = viewleft + 75 * scale;
 	y = lenstop + lensheight + 1;
 	gdl = textRenderProjected(gdl, &x, &y, hertztext,
-			g_FontHandelGothicXs1, g_FontHandelGothicXs2, 0xffffff7f, viGetWidth(), viGetHeight(), 0, 0);
+			g_CharsHandelGothicXs, g_FontHandelGothicXs, 0xffffff7f, viGetWidth(), viGetHeight(), 0, 0);
 
 	// Zoom level
 	if (vsplit) {
@@ -16159,7 +16159,7 @@ Gfx *bviewRenderHorizonScanner(Gfx *gdl)
 	}
 
 	gdl = textRenderProjected(gdl, &x, &y, zoomtext,
-			g_FontHandelGothicXs1, g_FontHandelGothicXs2, 0xffffff7f, viGetWidth(), viGetHeight(), 0, 0);
+			g_CharsHandelGothicXs, g_FontHandelGothicXs, 0xffffff7f, viGetWidth(), viGetHeight(), 0, 0);
 
 	// Direction
 	if (vsplit) {
@@ -16171,7 +16171,7 @@ Gfx *bviewRenderHorizonScanner(Gfx *gdl)
 	}
 
 	gdl = textRenderProjected(gdl, &x, &y, directiontext,
-			g_FontHandelGothicXs1, g_FontHandelGothicXs2, 0xffffff7f, viGetWidth(), viGetHeight(), 0, 0);
+			g_CharsHandelGothicXs, g_FontHandelGothicXs, 0xffffff7f, viGetWidth(), viGetHeight(), 0, 0);
 	gdl = func0f153780(gdl);
 
 	gDPPipeSync(gdl++);
diff --git a/src/game/credits.c b/src/game/credits.c
index a7e40074d..8c42ecc26 100644
--- a/src/game/credits.c
+++ b/src/game/credits.c
@@ -4175,35 +4175,35 @@ glabel var7f1b592c
 /*  f13a538:	8c2c5878 */ 	lw	$t4,%lo(var7f1b5878)($at)
 /*  f13a53c:	01800008 */ 	jr	$t4
 /*  f13a540:	00000000 */ 	nop
-/*  f13a544:	3c0d8008 */ 	lui	$t5,%hi(g_FontHandelGothicLg1)
-/*  f13a548:	8dadfb20 */ 	lw	$t5,%lo(g_FontHandelGothicLg1)($t5)
-/*  f13a54c:	3c0e8008 */ 	lui	$t6,%hi(g_FontHandelGothicLg2)
+/*  f13a544:	3c0d8008 */ 	lui	$t5,%hi(g_CharsHandelGothicLg)
+/*  f13a548:	8dadfb20 */ 	lw	$t5,%lo(g_CharsHandelGothicLg)($t5)
+/*  f13a54c:	3c0e8008 */ 	lui	$t6,%hi(g_FontHandelGothicLg)
 /*  f13a550:	ae0d0000 */ 	sw	$t5,0x0($s0)
-/*  f13a554:	8dcefb1c */ 	lw	$t6,%lo(g_FontHandelGothicLg2)($t6)
+/*  f13a554:	8dcefb1c */ 	lw	$t6,%lo(g_FontHandelGothicLg)($t6)
 /*  f13a558:	1000000e */ 	b	.L0f13a594
 /*  f13a55c:	ae2e0000 */ 	sw	$t6,0x0($s1)
-/*  f13a560:	3c0f8008 */ 	lui	$t7,%hi(g_FontHandelGothicMd1)
-/*  f13a564:	8deffb18 */ 	lw	$t7,%lo(g_FontHandelGothicMd1)($t7)
-/*  f13a568:	3c188008 */ 	lui	$t8,%hi(g_FontHandelGothicMd2)
+/*  f13a560:	3c0f8008 */ 	lui	$t7,%hi(g_CharsHandelGothicMd)
+/*  f13a564:	8deffb18 */ 	lw	$t7,%lo(g_CharsHandelGothicMd)($t7)
+/*  f13a568:	3c188008 */ 	lui	$t8,%hi(g_FontHandelGothicMd)
 /*  f13a56c:	ae0f0000 */ 	sw	$t7,0x0($s0)
-/*  f13a570:	8f18fb14 */ 	lw	$t8,%lo(g_FontHandelGothicMd2)($t8)
+/*  f13a570:	8f18fb14 */ 	lw	$t8,%lo(g_FontHandelGothicMd)($t8)
 /*  f13a574:	10000007 */ 	b	.L0f13a594
 /*  f13a578:	ae380000 */ 	sw	$t8,0x0($s1)
 .L0f13a57c:
-/*  f13a57c:	3c198008 */ 	lui	$t9,%hi(g_FontHandelGothicSm1)
-/*  f13a580:	8f39fb10 */ 	lw	$t9,%lo(g_FontHandelGothicSm1)($t9)
-/*  f13a584:	3c0a8008 */ 	lui	$t2,%hi(g_FontHandelGothicSm2)
+/*  f13a57c:	3c198008 */ 	lui	$t9,%hi(g_CharsHandelGothicSm)
+/*  f13a580:	8f39fb10 */ 	lw	$t9,%lo(g_CharsHandelGothicSm)($t9)
+/*  f13a584:	3c0a8008 */ 	lui	$t2,%hi(g_FontHandelGothicSm)
 /*  f13a588:	ae190000 */ 	sw	$t9,0x0($s0)
-/*  f13a58c:	8d4afb0c */ 	lw	$t2,%lo(g_FontHandelGothicSm2)($t2)
+/*  f13a58c:	8d4afb0c */ 	lw	$t2,%lo(g_FontHandelGothicSm)($t2)
 /*  f13a590:	ae2a0000 */ 	sw	$t2,0x0($s1)
 .L0f13a594:
 /*  f13a594:	90620001 */ 	lbu	$v0,0x1($v1)
 /*  f13a598:	24010001 */ 	addiu	$at,$zero,0x1
-/*  f13a59c:	3c0d8008 */ 	lui	$t5,%hi(g_FontHandelGothicMd1)
+/*  f13a59c:	3c0d8008 */ 	lui	$t5,%hi(g_CharsHandelGothicMd)
 /*  f13a5a0:	10410013 */ 	beq	$v0,$at,.L0f13a5f0
 /*  f13a5a4:	24010006 */ 	addiu	$at,$zero,0x6
 /*  f13a5a8:	10410009 */ 	beq	$v0,$at,.L0f13a5d0
-/*  f13a5ac:	3c0b8008 */ 	lui	$t3,%hi(g_FontHandelGothicSm1)
+/*  f13a5ac:	3c0b8008 */ 	lui	$t3,%hi(g_CharsHandelGothicSm)
 /*  f13a5b0:	2401000a */ 	addiu	$at,$zero,0xa
 /*  f13a5b4:	1041000e */ 	beq	$v0,$at,.L0f13a5f0
 /*  f13a5b8:	00000000 */ 	nop
@@ -4213,20 +4213,20 @@ glabel var7f1b592c
 /*  f13a5c8:	10000010 */ 	b	.L0f13a60c
 /*  f13a5cc:	ae220004 */ 	sw	$v0,0x4($s1)
 .L0f13a5d0:
-/*  f13a5d0:	8d6bfb10 */ 	lw	$t3,%lo(g_FontHandelGothicSm1)($t3)
-/*  f13a5d4:	3c0c8008 */ 	lui	$t4,%hi(g_FontHandelGothicSm2)
+/*  f13a5d0:	8d6bfb10 */ 	lw	$t3,%lo(g_CharsHandelGothicSm)($t3)
+/*  f13a5d4:	3c0c8008 */ 	lui	$t4,%hi(g_FontHandelGothicSm)
 /*  f13a5d8:	8e070000 */ 	lw	$a3,0x0($s0)
 /*  f13a5dc:	ae0b0004 */ 	sw	$t3,0x4($s0)
-/*  f13a5e0:	8d8cfb0c */ 	lw	$t4,%lo(g_FontHandelGothicSm2)($t4)
+/*  f13a5e0:	8d8cfb0c */ 	lw	$t4,%lo(g_FontHandelGothicSm)($t4)
 /*  f13a5e4:	8e220000 */ 	lw	$v0,0x0($s1)
 /*  f13a5e8:	10000008 */ 	b	.L0f13a60c
 /*  f13a5ec:	ae2c0004 */ 	sw	$t4,0x4($s1)
 .L0f13a5f0:
-/*  f13a5f0:	8dadfb18 */ 	lw	$t5,%lo(g_FontHandelGothicMd1)($t5)
-/*  f13a5f4:	3c0e8008 */ 	lui	$t6,%hi(g_FontHandelGothicMd2)
+/*  f13a5f0:	8dadfb18 */ 	lw	$t5,%lo(g_CharsHandelGothicMd)($t5)
+/*  f13a5f4:	3c0e8008 */ 	lui	$t6,%hi(g_FontHandelGothicMd)
 /*  f13a5f8:	8e070000 */ 	lw	$a3,0x0($s0)
 /*  f13a5fc:	ae0d0004 */ 	sw	$t5,0x4($s0)
-/*  f13a600:	8dcefb14 */ 	lw	$t6,%lo(g_FontHandelGothicMd2)($t6)
+/*  f13a600:	8dcefb14 */ 	lw	$t6,%lo(g_FontHandelGothicMd)($t6)
 /*  f13a604:	8e220000 */ 	lw	$v0,0x0($s1)
 /*  f13a608:	ae2e0004 */ 	sw	$t6,0x4($s1)
 .L0f13a60c:
diff --git a/src/game/game_0f09f0.c b/src/game/game_0f09f0.c
index 2a44c1e8a..ee7cd02bf 100644
--- a/src/game/game_0f09f0.c
+++ b/src/game/game_0f09f0.c
@@ -706,21 +706,21 @@ glabel func0f0f0ce8
 /*  f0f0ce8:	27bdff70 */ 	addiu	$sp,$sp,-144
 /*  f0f0cec:	8fae00a4 */ 	lw	$t6,0xa4($sp)
 /*  f0f0cf0:	afb10038 */ 	sw	$s1,0x38($sp)
-/*  f0f0cf4:	3c038008 */ 	lui	$v1,%hi(g_FontHandelGothicSm1)
-/*  f0f0cf8:	3c088008 */ 	lui	$t0,%hi(g_FontHandelGothicSm2)
+/*  f0f0cf4:	3c038008 */ 	lui	$v1,%hi(g_CharsHandelGothicSm)
+/*  f0f0cf8:	3c088008 */ 	lui	$t0,%hi(g_FontHandelGothicSm)
 /*  f0f0cfc:	00808825 */ 	or	$s1,$a0,$zero
 /*  f0f0d00:	afbf003c */ 	sw	$ra,0x3c($sp)
 /*  f0f0d04:	afb00034 */ 	sw	$s0,0x34($sp)
 /*  f0f0d08:	afa50094 */ 	sw	$a1,0x94($sp)
 /*  f0f0d0c:	afa60098 */ 	sw	$a2,0x98($sp)
 /*  f0f0d10:	afa7009c */ 	sw	$a3,0x9c($sp)
-/*  f0f0d14:	8c63fb10 */ 	lw	$v1,%lo(g_FontHandelGothicSm1)($v1)
+/*  f0f0d14:	8c63fb10 */ 	lw	$v1,%lo(g_CharsHandelGothicSm)($v1)
 /*  f0f0d18:	11c00005 */ 	beqz	$t6,.L0f0f0d30
-/*  f0f0d1c:	8d08fb0c */ 	lw	$t0,%lo(g_FontHandelGothicSm2)($t0)
-/*  f0f0d20:	3c038008 */ 	lui	$v1,%hi(g_FontHandelGothicMd1)
-/*  f0f0d24:	3c088008 */ 	lui	$t0,%hi(g_FontHandelGothicMd2)
-/*  f0f0d28:	8c63fb18 */ 	lw	$v1,%lo(g_FontHandelGothicMd1)($v1)
-/*  f0f0d2c:	8d08fb14 */ 	lw	$t0,%lo(g_FontHandelGothicMd2)($t0)
+/*  f0f0d1c:	8d08fb0c */ 	lw	$t0,%lo(g_FontHandelGothicSm)($t0)
+/*  f0f0d20:	3c038008 */ 	lui	$v1,%hi(g_CharsHandelGothicMd)
+/*  f0f0d24:	3c088008 */ 	lui	$t0,%hi(g_FontHandelGothicMd)
+/*  f0f0d28:	8c63fb18 */ 	lw	$v1,%lo(g_CharsHandelGothicMd)($v1)
+/*  f0f0d2c:	8d08fb14 */ 	lw	$t0,%lo(g_FontHandelGothicMd)($t0)
 .L0f0f0d30:
 /*  f0f0d30:	8faf0098 */ 	lw	$t7,0x98($sp)
 /*  f0f0d34:	8fb800a0 */ 	lw	$t8,0xa0($sp)
@@ -1090,10 +1090,10 @@ glabel func0f0f0ce8
 /*  f0f12c0:	0010cc03 */ 	sra	$t9,$s0,0x10
 /*  f0f12c4:	0c002f02 */ 	jal	viGetWidth
 /*  f0f12c8:	03208025 */ 	or	$s0,$t9,$zero
-/*  f0f12cc:	3c188008 */ 	lui	$t8,%hi(g_FontHandelGothicXs1)
-/*  f0f12d0:	3c0b8008 */ 	lui	$t3,%hi(g_FontHandelGothicXs2)
-/*  f0f12d4:	8d6bfb04 */ 	lw	$t3,%lo(g_FontHandelGothicXs2)($t3)
-/*  f0f12d8:	8f18fb08 */ 	lw	$t8,%lo(g_FontHandelGothicXs1)($t8)
+/*  f0f12cc:	3c188008 */ 	lui	$t8,%hi(g_CharsHandelGothicXs)
+/*  f0f12d0:	3c0b8008 */ 	lui	$t3,%hi(g_FontHandelGothicXs)
+/*  f0f12d4:	8d6bfb04 */ 	lw	$t3,%lo(g_FontHandelGothicXs)($t3)
+/*  f0f12d8:	8f18fb08 */ 	lw	$t8,%lo(g_CharsHandelGothicXs)($t8)
 /*  f0f12dc:	3c0abfbf */ 	lui	$t2,0xbfbf
 /*  f0f12e0:	354affff */ 	ori	$t2,$t2,0xffff
 /*  f0f12e4:	3c077f1b */ 	lui	$a3,%hi(var7f1b23e8)
@@ -2290,10 +2290,10 @@ glabel var7f1b28c0
 .word func0f0f1618+0x9c # f0f16b4
 .text
 /*  f0f1618:	27bdff88 */ 	addiu	$sp,$sp,-120
-/*  f0f161c:	3c0e8008 */ 	lui	$t6,%hi(g_FontHandelGothicSm1)
-/*  f0f1620:	3c0f8008 */ 	lui	$t7,%hi(g_FontHandelGothicSm2)
-/*  f0f1624:	8dcefb10 */ 	lw	$t6,%lo(g_FontHandelGothicSm1)($t6)
-/*  f0f1628:	8deffb0c */ 	lw	$t7,%lo(g_FontHandelGothicSm2)($t7)
+/*  f0f161c:	3c0e8008 */ 	lui	$t6,%hi(g_CharsHandelGothicSm)
+/*  f0f1620:	3c0f8008 */ 	lui	$t7,%hi(g_FontHandelGothicSm)
+/*  f0f1624:	8dcefb10 */ 	lw	$t6,%lo(g_CharsHandelGothicSm)($t6)
+/*  f0f1628:	8deffb0c */ 	lw	$t7,%lo(g_FontHandelGothicSm)($t7)
 /*  f0f162c:	afbf002c */ 	sw	$ra,0x2c($sp)
 /*  f0f1630:	afb20028 */ 	sw	$s2,0x28($sp)
 /*  f0f1634:	afb10024 */ 	sw	$s1,0x24($sp)
@@ -2405,10 +2405,10 @@ glabel var7f1b28c0
 /*  f0f17bc:	afa00070 */ 	sw	$zero,0x70($sp)
 /*  f0f17c0:	10c0000a */ 	beqz	$a2,.L0f0f17ec
 /*  f0f17c4:	afa0006c */ 	sw	$zero,0x6c($sp)
-/*  f0f17c8:	3c198008 */ 	lui	$t9,%hi(g_FontHandelGothicSm2)
-/*  f0f17cc:	8f39fb0c */ 	lw	$t9,%lo(g_FontHandelGothicSm2)($t9)
-/*  f0f17d0:	3c078008 */ 	lui	$a3,%hi(g_FontHandelGothicSm1)
-/*  f0f17d4:	8ce7fb10 */ 	lw	$a3,%lo(g_FontHandelGothicSm1)($a3)
+/*  f0f17c8:	3c198008 */ 	lui	$t9,%hi(g_FontHandelGothicSm)
+/*  f0f17cc:	8f39fb0c */ 	lw	$t9,%lo(g_FontHandelGothicSm)($t9)
+/*  f0f17d0:	3c078008 */ 	lui	$a3,%hi(g_CharsHandelGothicSm)
+/*  f0f17d4:	8ce7fb10 */ 	lw	$a3,%lo(g_CharsHandelGothicSm)($a3)
 /*  f0f17d8:	27a4006c */ 	addiu	$a0,$sp,0x6c
 /*  f0f17dc:	27a50070 */ 	addiu	$a1,$sp,0x70
 /*  f0f17e0:	afa00014 */ 	sw	$zero,0x14($sp)
@@ -2436,10 +2436,10 @@ glabel var7f1b28c0
 /*  f0f1834:	02002825 */ 	or	$a1,$s0,$zero
 /*  f0f1838:	0320f809 */ 	jalr	$t9
 /*  f0f183c:	02403025 */ 	or	$a2,$s2,$zero
-/*  f0f1840:	3c0c8008 */ 	lui	$t4,%hi(g_FontHandelGothicSm2)
-/*  f0f1844:	8d8cfb0c */ 	lw	$t4,%lo(g_FontHandelGothicSm2)($t4)
-/*  f0f1848:	3c078008 */ 	lui	$a3,%hi(g_FontHandelGothicSm1)
-/*  f0f184c:	8ce7fb10 */ 	lw	$a3,%lo(g_FontHandelGothicSm1)($a3)
+/*  f0f1840:	3c0c8008 */ 	lui	$t4,%hi(g_FontHandelGothicSm)
+/*  f0f1844:	8d8cfb0c */ 	lw	$t4,%lo(g_FontHandelGothicSm)($t4)
+/*  f0f1848:	3c078008 */ 	lui	$a3,%hi(g_CharsHandelGothicSm)
+/*  f0f184c:	8ce7fb10 */ 	lw	$a3,%lo(g_CharsHandelGothicSm)($a3)
 /*  f0f1850:	27a4006c */ 	addiu	$a0,$sp,0x6c
 /*  f0f1854:	27a50070 */ 	addiu	$a1,$sp,0x70
 /*  f0f1858:	00403025 */ 	or	$a2,$v0,$zero
@@ -2482,13 +2482,13 @@ glabel var7f1b28c0
 /*  f0f18e4:	1000011b */ 	b	.L0f0f1d54
 /*  f0f18e8:	a6220000 */ 	sh	$v0,0x0($s1)
 /*  f0f18ec:	8e180004 */ 	lw	$t8,0x4($s0)
-/*  f0f18f0:	3c098008 */ 	lui	$t1,%hi(g_FontHandelGothicXs1)
-/*  f0f18f4:	3c0a8008 */ 	lui	$t2,%hi(g_FontHandelGothicXs2)
+/*  f0f18f0:	3c098008 */ 	lui	$t1,%hi(g_CharsHandelGothicXs)
+/*  f0f18f4:	3c0a8008 */ 	lui	$t2,%hi(g_FontHandelGothicXs)
 /*  f0f18f8:	33080200 */ 	andi	$t0,$t8,0x200
 /*  f0f18fc:	11000005 */ 	beqz	$t0,.L0f0f1914
 /*  f0f1900:	00000000 */ 	nop
-/*  f0f1904:	8d29fb08 */ 	lw	$t1,%lo(g_FontHandelGothicXs1)($t1)
-/*  f0f1908:	8d4afb04 */ 	lw	$t2,%lo(g_FontHandelGothicXs2)($t2)
+/*  f0f1904:	8d29fb08 */ 	lw	$t1,%lo(g_CharsHandelGothicXs)($t1)
+/*  f0f1908:	8d4afb04 */ 	lw	$t2,%lo(g_FontHandelGothicXs)($t2)
 /*  f0f190c:	afa90068 */ 	sw	$t1,0x68($sp)
 /*  f0f1910:	afaa0064 */ 	sw	$t2,0x64($sp)
 .L0f0f1914:
@@ -2567,19 +2567,19 @@ glabel var7f1b28c0
 /*  f0f1a1c:	304d0200 */ 	andi	$t5,$v0,0x200
 /*  f0f1a20:	11a00007 */ 	beqz	$t5,.L0f0f1a40
 /*  f0f1a24:	0002c240 */ 	sll	$t8,$v0,0x9
-/*  f0f1a28:	3c0e8008 */ 	lui	$t6,%hi(g_FontHandelGothicXs1)
-/*  f0f1a2c:	3c0f8008 */ 	lui	$t7,%hi(g_FontHandelGothicXs2)
-/*  f0f1a30:	8dcefb08 */ 	lw	$t6,%lo(g_FontHandelGothicXs1)($t6)
-/*  f0f1a34:	8deffb04 */ 	lw	$t7,%lo(g_FontHandelGothicXs2)($t7)
+/*  f0f1a28:	3c0e8008 */ 	lui	$t6,%hi(g_CharsHandelGothicXs)
+/*  f0f1a2c:	3c0f8008 */ 	lui	$t7,%hi(g_FontHandelGothicXs)
+/*  f0f1a30:	8dcefb08 */ 	lw	$t6,%lo(g_CharsHandelGothicXs)($t6)
+/*  f0f1a34:	8deffb04 */ 	lw	$t7,%lo(g_FontHandelGothicXs)($t7)
 /*  f0f1a38:	afae0068 */ 	sw	$t6,0x68($sp)
 /*  f0f1a3c:	afaf0064 */ 	sw	$t7,0x64($sp)
 .L0f0f1a40:
 /*  f0f1a40:	07010007 */ 	bgez	$t8,.L0f0f1a60
 /*  f0f1a44:	24a523f8 */ 	addiu	$a1,$a1,%lo(var7f1b23f8)
-/*  f0f1a48:	3c088008 */ 	lui	$t0,%hi(g_FontHandelGothicMd1)
-/*  f0f1a4c:	3c098008 */ 	lui	$t1,%hi(g_FontHandelGothicMd2)
-/*  f0f1a50:	8d08fb18 */ 	lw	$t0,%lo(g_FontHandelGothicMd1)($t0)
-/*  f0f1a54:	8d29fb14 */ 	lw	$t1,%lo(g_FontHandelGothicMd2)($t1)
+/*  f0f1a48:	3c088008 */ 	lui	$t0,%hi(g_CharsHandelGothicMd)
+/*  f0f1a4c:	3c098008 */ 	lui	$t1,%hi(g_FontHandelGothicMd)
+/*  f0f1a50:	8d08fb18 */ 	lw	$t0,%lo(g_CharsHandelGothicMd)($t0)
+/*  f0f1a54:	8d29fb14 */ 	lw	$t1,%lo(g_FontHandelGothicMd)($t1)
 /*  f0f1a58:	afa80068 */ 	sw	$t0,0x68($sp)
 /*  f0f1a5c:	afa90064 */ 	sw	$t1,0x64($sp)
 .L0f0f1a60:
@@ -3734,10 +3734,10 @@ glabel func0f0f2134
 /*  f0f229c:	2610000c */ 	addiu	$s0,$s0,0xc
 /*  f0f22a0:	0fc3c560 */ 	jal	menuResolveParam1Text
 /*  f0f22a4:	8d640000 */ 	lw	$a0,0x0($t3)
-/*  f0f22a8:	3c0c8008 */ 	lui	$t4,%hi(g_FontHandelGothicSm2)
-/*  f0f22ac:	8d8cfb0c */ 	lw	$t4,%lo(g_FontHandelGothicSm2)($t4)
-/*  f0f22b0:	3c078008 */ 	lui	$a3,%hi(g_FontHandelGothicSm1)
-/*  f0f22b4:	8ce7fb10 */ 	lw	$a3,%lo(g_FontHandelGothicSm1)($a3)
+/*  f0f22a8:	3c0c8008 */ 	lui	$t4,%hi(g_FontHandelGothicSm)
+/*  f0f22ac:	8d8cfb0c */ 	lw	$t4,%lo(g_FontHandelGothicSm)($t4)
+/*  f0f22b0:	3c078008 */ 	lui	$a3,%hi(g_CharsHandelGothicSm)
+/*  f0f22b4:	8ce7fb10 */ 	lw	$a3,%lo(g_CharsHandelGothicSm)($a3)
 /*  f0f22b8:	27a4007c */ 	addiu	$a0,$sp,0x7c
 /*  f0f22bc:	27a50080 */ 	addiu	$a1,$sp,0x80
 /*  f0f22c0:	00403025 */ 	or	$a2,$v0,$zero
@@ -10950,10 +10950,10 @@ glabel func0f0f5360
 /*  f0f5c40:	0c002f06 */ 	jal	viGetHeight
 /*  f0f5c44:	afa301d0 */ 	sw	$v1,0x1d0($sp)
 /*  f0f5c48:	8faf01bc */ 	lw	$t7,0x1bc($sp)
-/*  f0f5c4c:	3c118008 */ 	lui	$s1,%hi(g_FontHandelGothicSm1)
-/*  f0f5c50:	3c138008 */ 	lui	$s3,%hi(g_FontHandelGothicSm2)
-/*  f0f5c54:	2673fb0c */ 	addiu	$s3,$s3,%lo(g_FontHandelGothicSm2)
-/*  f0f5c58:	2631fb10 */ 	addiu	$s1,$s1,%lo(g_FontHandelGothicSm1)
+/*  f0f5c4c:	3c118008 */ 	lui	$s1,%hi(g_CharsHandelGothicSm)
+/*  f0f5c50:	3c138008 */ 	lui	$s3,%hi(g_FontHandelGothicSm)
+/*  f0f5c54:	2673fb0c */ 	addiu	$s3,$s3,%lo(g_FontHandelGothicSm)
+/*  f0f5c58:	2631fb10 */ 	addiu	$s1,$s1,%lo(g_CharsHandelGothicSm)
 /*  f0f5c5c:	8e380000 */ 	lw	$t8,0x0($s1)
 /*  f0f5c60:	8e790000 */ 	lw	$t9,0x0($s3)
 /*  f0f5c64:	87ae01ca */ 	lh	$t6,0x1ca($sp)
@@ -12464,11 +12464,11 @@ glabel func0f0f5360
 /*  f0f729c:	8d8f0000 */ 	lw	$t7,0x0($t4)
 /*  f0f72a0:	0fc3c560 */ 	jal	menuResolveParam1Text
 /*  f0f72a4:	8de40000 */ 	lw	$a0,0x0($t7)
-/*  f0f72a8:	3c138008 */ 	lui	$s3,%hi(g_FontHandelGothicXs2)
-/*  f0f72ac:	2673fb04 */ 	addiu	$s3,$s3,%lo(g_FontHandelGothicXs2)
+/*  f0f72a8:	3c138008 */ 	lui	$s3,%hi(g_FontHandelGothicXs)
+/*  f0f72ac:	2673fb04 */ 	addiu	$s3,$s3,%lo(g_FontHandelGothicXs)
 /*  f0f72b0:	8e6d0000 */ 	lw	$t5,0x0($s3)
-/*  f0f72b4:	3c128008 */ 	lui	$s2,%hi(g_FontHandelGothicXs1)
-/*  f0f72b8:	2652fb08 */ 	addiu	$s2,$s2,%lo(g_FontHandelGothicXs1)
+/*  f0f72b4:	3c128008 */ 	lui	$s2,%hi(g_CharsHandelGothicXs)
+/*  f0f72b8:	2652fb08 */ 	addiu	$s2,$s2,%lo(g_CharsHandelGothicXs)
 /*  f0f72bc:	27b600b0 */ 	addiu	$s6,$sp,0xb0
 /*  f0f72c0:	27b700ac */ 	addiu	$s7,$sp,0xac
 /*  f0f72c4:	00408025 */ 	or	$s0,$v0,$zero
@@ -25897,10 +25897,10 @@ glabel var7f1b2afc
 .L0f0fc3bc:
 /*  f0fc3bc:	120000cc */ 	beqz	$s0,.L0f0fc6f0
 /*  f0fc3c0:	27a400e0 */ 	addiu	$a0,$sp,0xe0
-/*  f0fc3c4:	3c0f8008 */ 	lui	$t7,%hi(g_FontHandelGothicSm2)
-/*  f0fc3c8:	8deffb0c */ 	lw	$t7,%lo(g_FontHandelGothicSm2)($t7)
-/*  f0fc3cc:	3c078008 */ 	lui	$a3,%hi(g_FontHandelGothicSm1)
-/*  f0fc3d0:	8ce7fb10 */ 	lw	$a3,%lo(g_FontHandelGothicSm1)($a3)
+/*  f0fc3c4:	3c0f8008 */ 	lui	$t7,%hi(g_FontHandelGothicSm)
+/*  f0fc3c8:	8deffb0c */ 	lw	$t7,%lo(g_FontHandelGothicSm)($t7)
+/*  f0fc3cc:	3c078008 */ 	lui	$a3,%hi(g_CharsHandelGothicSm)
+/*  f0fc3d0:	8ce7fb10 */ 	lw	$a3,%lo(g_CharsHandelGothicSm)($a3)
 /*  f0fc3d4:	27a500dc */ 	addiu	$a1,$sp,0xdc
 /*  f0fc3d8:	02803025 */ 	or	$a2,$s4,$zero
 /*  f0fc3dc:	afa00014 */ 	sw	$zero,0x14($sp)
@@ -26038,11 +26038,11 @@ glabel var7f1b2afc
 /*  f0fc5bc:	0c002f06 */ 	jal	viGetHeight
 /*  f0fc5c0:	03208025 */ 	or	$s0,$t9,$zero
 /*  f0fc5c4:	922b0017 */ 	lbu	$t3,0x17($s1)
-/*  f0fc5c8:	3c0c8008 */ 	lui	$t4,%hi(g_FontHandelGothicSm1)
-/*  f0fc5cc:	3c0a8008 */ 	lui	$t2,%hi(g_FontHandelGothicSm2)
+/*  f0fc5c8:	3c0c8008 */ 	lui	$t4,%hi(g_CharsHandelGothicSm)
+/*  f0fc5cc:	3c0a8008 */ 	lui	$t2,%hi(g_FontHandelGothicSm)
 /*  f0fc5d0:	3c015070 */ 	lui	$at,0x5070
-/*  f0fc5d4:	8d4afb0c */ 	lw	$t2,%lo(g_FontHandelGothicSm2)($t2)
-/*  f0fc5d8:	8d8cfb10 */ 	lw	$t4,%lo(g_FontHandelGothicSm1)($t4)
+/*  f0fc5d4:	8d4afb0c */ 	lw	$t2,%lo(g_FontHandelGothicSm)($t2)
+/*  f0fc5d8:	8d8cfb10 */ 	lw	$t4,%lo(g_CharsHandelGothicSm)($t4)
 /*  f0fc5dc:	3421ff00 */ 	ori	$at,$at,0xff00
 /*  f0fc5e0:	01616825 */ 	or	$t5,$t3,$at
 /*  f0fc5e4:	afad0018 */ 	sw	$t5,0x18($sp)
@@ -26096,10 +26096,10 @@ glabel var7f1b2afc
 /*  f0fc69c:	00105403 */ 	sra	$t2,$s0,0x10
 /*  f0fc6a0:	0c002f06 */ 	jal	viGetHeight
 /*  f0fc6a4:	01408025 */ 	or	$s0,$t2,$zero
-/*  f0fc6a8:	3c0b8008 */ 	lui	$t3,%hi(g_FontHandelGothicSm1)
-/*  f0fc6ac:	3c0d8008 */ 	lui	$t5,%hi(g_FontHandelGothicSm2)
-/*  f0fc6b0:	8dadfb0c */ 	lw	$t5,%lo(g_FontHandelGothicSm2)($t5)
-/*  f0fc6b4:	8d6bfb10 */ 	lw	$t3,%lo(g_FontHandelGothicSm1)($t3)
+/*  f0fc6a8:	3c0b8008 */ 	lui	$t3,%hi(g_CharsHandelGothicSm)
+/*  f0fc6ac:	3c0d8008 */ 	lui	$t5,%hi(g_FontHandelGothicSm)
+/*  f0fc6b0:	8dadfb0c */ 	lw	$t5,%lo(g_FontHandelGothicSm)($t5)
+/*  f0fc6b4:	8d6bfb10 */ 	lw	$t3,%lo(g_CharsHandelGothicSm)($t3)
 /*  f0fc6b8:	8fa300a4 */ 	lw	$v1,0xa4($sp)
 /*  f0fc6bc:	02a02025 */ 	or	$a0,$s5,$zero
 /*  f0fc6c0:	27a500ac */ 	addiu	$a1,$sp,0xac
diff --git a/src/game/game_102240.c b/src/game/game_102240.c
index 5cbb31e0f..0dcf699c9 100644
--- a/src/game/game_102240.c
+++ b/src/game/game_102240.c
@@ -3113,10 +3113,10 @@ glabel var7f1b2dfc
 /*  f105498:	00107c03 */ 	sra	$t7,$s0,0x10
 /*  f10549c:	0c002f06 */ 	jal	viGetHeight
 /*  f1054a0:	01e08025 */ 	or	$s0,$t7,$zero
-/*  f1054a4:	3c0e8008 */ 	lui	$t6,%hi(g_FontHandelGothicMd1)
-/*  f1054a8:	3c198008 */ 	lui	$t9,%hi(g_FontHandelGothicMd2)
-/*  f1054ac:	8f39fb14 */ 	lw	$t9,%lo(g_FontHandelGothicMd2)($t9)
-/*  f1054b0:	8dcefb18 */ 	lw	$t6,%lo(g_FontHandelGothicMd1)($t6)
+/*  f1054a4:	3c0e8008 */ 	lui	$t6,%hi(g_CharsHandelGothicMd)
+/*  f1054a8:	3c198008 */ 	lui	$t9,%hi(g_FontHandelGothicMd)
+/*  f1054ac:	8f39fb14 */ 	lw	$t9,%lo(g_FontHandelGothicMd)($t9)
+/*  f1054b0:	8dcefb18 */ 	lw	$t6,%lo(g_CharsHandelGothicMd)($t6)
 /*  f1054b4:	8faa0134 */ 	lw	$t2,0x134($sp)
 /*  f1054b8:	afb90014 */ 	sw	$t9,0x14($sp)
 /*  f1054bc:	afae0010 */ 	sw	$t6,0x10($sp)
@@ -3144,10 +3144,10 @@ glabel var7f1b2dfc
 /*  f105514:	00107403 */ 	sra	$t6,$s0,0x10
 /*  f105518:	0c002f06 */ 	jal	viGetHeight
 /*  f10551c:	01c08025 */ 	or	$s0,$t6,$zero
-/*  f105520:	3c198008 */ 	lui	$t9,%hi(g_FontHandelGothicSm1)
-/*  f105524:	3c188008 */ 	lui	$t8,%hi(g_FontHandelGothicSm2)
-/*  f105528:	8f18fb0c */ 	lw	$t8,%lo(g_FontHandelGothicSm2)($t8)
-/*  f10552c:	8f39fb10 */ 	lw	$t9,%lo(g_FontHandelGothicSm1)($t9)
+/*  f105520:	3c198008 */ 	lui	$t9,%hi(g_CharsHandelGothicSm)
+/*  f105524:	3c188008 */ 	lui	$t8,%hi(g_FontHandelGothicSm)
+/*  f105528:	8f18fb0c */ 	lw	$t8,%lo(g_FontHandelGothicSm)($t8)
+/*  f10552c:	8f39fb10 */ 	lw	$t9,%lo(g_CharsHandelGothicSm)($t9)
 /*  f105530:	8faa0134 */ 	lw	$t2,0x134($sp)
 /*  f105534:	afb80014 */ 	sw	$t8,0x14($sp)
 /*  f105538:	afb90010 */ 	sw	$t9,0x10($sp)
diff --git a/src/game/game_107fb0.c b/src/game/game_107fb0.c
index 47dcd0fc6..1ed9c5a02 100644
--- a/src/game/game_107fb0.c
+++ b/src/game/game_107fb0.c
@@ -656,7 +656,7 @@ char *filemgrMenuTextInsertOriginalPak(struct menuitem *item)
 	// "Please insert the Controller Pak containing your %s into any controller."
 	sprintf(fullbuffer, langGet(L_OPTIONS_363), namebuffer);
 
-	textWrap(120, fullbuffer, g_StringPointer, g_FontHandelGothicSm1, g_FontHandelGothicSm2);
+	textWrap(120, fullbuffer, g_StringPointer, g_CharsHandelGothicSm, g_FontHandelGothicSm);
 
 	return g_StringPointer;
 }
@@ -2145,7 +2145,7 @@ s32 filemgrFileToCopyOrDeleteListMenuHandler(s32 operation, struct menuitem *ite
 
 				if (location000) {
 					filemgrGetFileName(text, location000, g_Menus[g_MpPlayerNum].data.filemgr.filetypeplusone - 1);
-					gdl = textRenderProjected(gdl, &x, &y, text, g_FontHandelGothicSm1, g_FontHandelGothicSm2,
+					gdl = textRenderProjected(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm,
 							colour, viGetWidth(), viGetHeight(), 0, 1);
 					y = renderdata->y + 12;
 					x = renderdata->x + 2;
@@ -2311,7 +2311,7 @@ s32 pakGameNoteListMenuHandler(s32 operation, struct menuitem *item, union handl
 		sprintf(generalbuffer, "%d:\n", data->list.unk04 + 1);
 		x = renderdata->x + 4;
 		y = renderdata->y + 1;
-		gdl = textRenderProjected(gdl, &x, &y, generalbuffer, g_FontHandelGothicSm1, g_FontHandelGothicSm2,
+		gdl = textRenderProjected(gdl, &x, &y, generalbuffer, g_CharsHandelGothicSm, g_FontHandelGothicSm,
 				renderdata->colour, viGetWidth(), viGetHeight(), 0, 1);
 
 		// Prepare buffers for remaining text
@@ -2333,21 +2333,21 @@ s32 pakGameNoteListMenuHandler(s32 operation, struct menuitem *item, union handl
 		// Render note name
 		x = renderdata->x + 20;
 		y = renderdata->y + 1;
-		gdl = textRenderProjected(gdl, &x, &y, generalbuffer, g_FontHandelGothicSm1, g_FontHandelGothicSm2,
+		gdl = textRenderProjected(gdl, &x, &y, generalbuffer, g_CharsHandelGothicSm, g_FontHandelGothicSm,
 				renderdata->colour, viGetWidth(), viGetHeight(), 0, 1);
 
 		// Render ext character (for when a game has multiple notes)
 		x = renderdata->x + 190;
 		y = renderdata->y + 1;
-		gdl = textRenderProjected(gdl, &x, &y, extbuffer, g_FontHandelGothicSm1, g_FontHandelGothicSm2,
+		gdl = textRenderProjected(gdl, &x, &y, extbuffer, g_CharsHandelGothicSm, g_FontHandelGothicSm,
 				renderdata->colour, viGetWidth(), viGetHeight(), 0, 1);
 
 		// Render number of pages
-		textMeasure(&textheight, &textwidth, pagesbuffer, g_FontHandelGothicSm1, g_FontHandelGothicSm2, 0);
+		textMeasure(&textheight, &textwidth, pagesbuffer, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0);
 
 		x = renderdata->x + renderdata->width - textwidth - 6;
 		y = renderdata->y + 1;
-		gdl = textRenderProjected(gdl, &x, &y, pagesbuffer, g_FontHandelGothicSm1, g_FontHandelGothicSm2,
+		gdl = textRenderProjected(gdl, &x, &y, pagesbuffer, g_CharsHandelGothicSm, g_FontHandelGothicSm,
 				renderdata->colour, viGetWidth(), viGetHeight(), 0, 1);
 
 		return (u32)gdl;
@@ -2784,12 +2784,12 @@ s32 filemgrChooseAgentListMenuHandler(s32 operation, struct menuitem *item, unio
 		if (data->list.unk04 == g_FileLists[0]->numfiles) {
 			// "New Agent..."
 			gdl = textRenderProjected(gdl, &x, &y, langGet(L_OPTIONS_403),
-					g_FontHandelGothicMd1, g_FontHandelGothicMd2, renderdata->colour, viGetWidth(), viGetHeight(), 0, 0);
+					g_CharsHandelGothicMd, g_FontHandelGothicMd, renderdata->colour, viGetWidth(), viGetHeight(), 0, 0);
 		} else {
 			if (location000) {
 				// Render file name
 				gdl = textRenderProjected(gdl, &x, &y, name,
-						g_FontHandelGothicMd1, g_FontHandelGothicMd2, renderdata->colour, viGetWidth(), viGetHeight(), 0, 1);
+						g_CharsHandelGothicMd, g_FontHandelGothicMd, renderdata->colour, viGetWidth(), viGetHeight(), 0, 1);
 
 				// Prepare and render stage name
 				y = renderdata->y + 18;
@@ -2806,7 +2806,7 @@ s32 filemgrChooseAgentListMenuHandler(s32 operation, struct menuitem *item, unio
 
 				strcat(buffer, "\n");
 				gdl = textRenderProjected(gdl, &x, &y, buffer,
-						g_FontHandelGothicSm1, g_FontHandelGothicSm2, renderdata->colour, viGetWidth(), viGetHeight(), 0, 0);
+						g_CharsHandelGothicSm, g_FontHandelGothicSm, renderdata->colour, viGetWidth(), viGetHeight(), 0, 0);
 
 				// Prepare and render mission time
 				x = renderdata->x + 62;
@@ -2821,17 +2821,17 @@ s32 filemgrChooseAgentListMenuHandler(s32 operation, struct menuitem *item, unio
 				}
 
 				// Useless - textwidth and textheight are not used
-				textMeasure(&textheight, &textwidth, buffer, g_FontHandelGothicSm1, g_FontHandelGothicSm2, 0);
+				textMeasure(&textheight, &textwidth, buffer, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0);
 
 				gdl = textRenderProjected(gdl, &x, &y, buffer,
-						g_FontHandelGothicSm1, g_FontHandelGothicSm2, renderdata->colour, viGetWidth(), viGetHeight(), 0, 0);
+						g_CharsHandelGothicSm, g_FontHandelGothicSm, renderdata->colour, viGetWidth(), viGetHeight(), 0, 0);
 
 				// Render seconds part of mission time (uses a smaller font)
 				y++;
 				x++;
 				sprintf(buffer, ".%02d", seconds);
 				gdl = textRenderProjected(gdl, &x, &y, buffer,
-						g_FontHandelGothicXs1, g_FontHandelGothicXs2, renderdata->colour, viGetWidth(), viGetHeight(), 0, 0);
+						g_CharsHandelGothicXs, g_FontHandelGothicXs, renderdata->colour, viGetWidth(), viGetHeight(), 0, 0);
 			}
 		}
 		gdl = func0f153780(gdl);
diff --git a/src/game/game_1531a0.c b/src/game/game_1531a0.c
index 93c9d7143..7edabd556 100644
--- a/src/game/game_1531a0.c
+++ b/src/game/game_1531a0.c
@@ -46,17 +46,17 @@ u32 var8007faec = 0x00000000;
 u32 var8007faf0 = 0x00000000;
 
 struct font *g_FontTahoma2 = NULL;
-struct font2a4 *g_FontTahoma1 = NULL;
-struct font *g_FontNumeric2 = NULL;
-struct font2a4 *g_FontNumeric1 = NULL;
-struct font *g_FontHandelGothicXs2 = NULL;
-struct font2a4 *g_FontHandelGothicXs1 = NULL;
-struct font *g_FontHandelGothicSm2 = NULL;
-struct font2a4 *g_FontHandelGothicSm1 = NULL;
-struct font *g_FontHandelGothicMd2 = NULL;
-struct font2a4 *g_FontHandelGothicMd1 = NULL;
-struct font *g_FontHandelGothicLg2 = NULL;
-struct font2a4 *g_FontHandelGothicLg1 = NULL;
+struct fontchar *g_FontTahoma1 = NULL;
+struct font *g_FontNumeric = NULL;
+struct fontchar *g_CharsNumeric = NULL;
+struct font *g_FontHandelGothicXs = NULL;
+struct fontchar *g_CharsHandelGothicXs = NULL;
+struct font *g_FontHandelGothicSm = NULL;
+struct fontchar *g_CharsHandelGothicSm = NULL;
+struct font *g_FontHandelGothicMd = NULL;
+struct fontchar *g_CharsHandelGothicMd = NULL;
+struct font *g_FontHandelGothicLg = NULL;
+struct fontchar *g_CharsHandelGothicLg = NULL;
 
 u32 var8007fb24 = 0x00000000;
 u32 var8007fb28 = 0x00000000;
@@ -155,148 +155,87 @@ void func0f1531dc(bool arg0)
 	}
 }
 
-#if VERSION >= VERSION_PAL_FINAL
-GLOBAL_ASM(
-glabel fontLoad
-/*  f153eb4:	27bdffc0 */ 	addiu	$sp,$sp,-64
-/*  f153eb8:	3c0e007e */ 	lui	$t6,0x7e
-/*  f153ebc:	afb00018 */ 	sw	$s0,0x18($sp)
-/*  f153ec0:	25ce5530 */ 	addiu	$t6,$t6,0x5530
-/*  f153ec4:	00808025 */ 	move	$s0,$a0
-/*  f153ec8:	afbf001c */ 	sw	$ra,0x1c($sp)
-/*  f153ecc:	afa50044 */ 	sw	$a1,0x44($sp)
-/*  f153ed0:	afa60048 */ 	sw	$a2,0x48($sp)
-/*  f153ed4:	afa7004c */ 	sw	$a3,0x4c($sp)
-/*  f153ed8:	108e0008 */ 	beq	$a0,$t6,.PF0f153efc
-/*  f153edc:	2408005e */ 	li	$t0,0x5e
-/*  f153ee0:	3c0f007f */ 	lui	$t7,0x7f
-/*  f153ee4:	25ef87b0 */ 	addiu	$t7,$t7,-30800
-/*  f153ee8:	108f0004 */ 	beq	$a0,$t7,.PF0f153efc
-/*  f153eec:	3c18007f */ 	lui	$t8,0x7f
-/*  f153ef0:	2718ae20 */ 	addiu	$t8,$t8,-20960
-/*  f153ef4:	54980003 */ 	bnel	$a0,$t8,.PF0f153f04
-/*  f153ef8:	8fb90044 */ 	lw	$t9,0x44($sp)
-.PF0f153efc:
-/*  f153efc:	24080087 */ 	li	$t0,0x87
-/*  f153f00:	8fb90044 */ 	lw	$t9,0x44($sp)
-.PF0f153f04:
-/*  f153f04:	24050004 */ 	li	$a1,0x4
-/*  f153f08:	afa80028 */ 	sw	$t0,0x28($sp)
-/*  f153f0c:	03303023 */ 	subu	$a2,$t9,$s0
-/*  f153f10:	00c02025 */ 	move	$a0,$a2
-/*  f153f14:	0c004856 */ 	jal	malloc
-/*  f153f18:	afa60024 */ 	sw	$a2,0x24($sp)
-/*  f153f1c:	244902a4 */ 	addiu	$t1,$v0,0x2a4
-/*  f153f20:	8fa60024 */ 	lw	$a2,0x24($sp)
-/*  f153f24:	afa9002c */ 	sw	$t1,0x2c($sp)
-/*  f153f28:	00402025 */ 	move	$a0,$v0
-/*  f153f2c:	02002825 */ 	move	$a1,$s0
-/*  f153f30:	0c003454 */ 	jal	dmaExec
-/*  f153f34:	afa20030 */ 	sw	$v0,0x30($sp)
-/*  f153f38:	8fa80028 */ 	lw	$t0,0x28($sp)
-/*  f153f3c:	8fa70030 */ 	lw	$a3,0x30($sp)
-/*  f153f40:	8fa9002c */ 	lw	$t1,0x2c($sp)
-/*  f153f44:	19000008 */ 	blez	$t0,.PF0f153f68
-/*  f153f48:	00001825 */ 	move	$v1,$zero
-/*  f153f4c:	01201025 */ 	move	$v0,$t1
-.PF0f153f50:
-/*  f153f50:	8c4a0008 */ 	lw	$t2,0x8($v0)
-/*  f153f54:	24630001 */ 	addiu	$v1,$v1,0x1
-/*  f153f58:	2442000c */ 	addiu	$v0,$v0,0xc
-/*  f153f5c:	01475821 */ 	addu	$t3,$t2,$a3
-/*  f153f60:	1468fffb */ 	bne	$v1,$t0,.PF0f153f50
-/*  f153f64:	ac4bfffc */ 	sw	$t3,-0x4($v0)
-.PF0f153f68:
-/*  f153f68:	8fac0050 */ 	lw	$t4,0x50($sp)
-/*  f153f6c:	00002825 */ 	move	$a1,$zero
-/*  f153f70:	3c0e007e */ 	lui	$t6,0x7e
-/*  f153f74:	11800014 */ 	beqz	$t4,.PF0f153fc8
-/*  f153f78:	3c0f007f */ 	lui	$t7,0x7f
-/*  f153f7c:	1900000b */ 	blez	$t0,.PF0f153fac
-/*  f153f80:	00001825 */ 	move	$v1,$zero
-/*  f153f84:	01201025 */ 	move	$v0,$t1
-.PF0f153f88:
-/*  f153f88:	90440003 */ 	lbu	$a0,0x3($v0)
-/*  f153f8c:	24630001 */ 	addiu	$v1,$v1,0x1
-/*  f153f90:	00a4082a */ 	slt	$at,$a1,$a0
-/*  f153f94:	10200002 */ 	beqz	$at,.PF0f153fa0
-/*  f153f98:	00000000 */ 	nop
-/*  f153f9c:	00802825 */ 	move	$a1,$a0
-.PF0f153fa0:
-/*  f153fa0:	1468fff9 */ 	bne	$v1,$t0,.PF0f153f88
-/*  f153fa4:	2442000c */ 	addiu	$v0,$v0,0xc
-/*  f153fa8:	00001825 */ 	move	$v1,$zero
-.PF0f153fac:
-/*  f153fac:	19000006 */ 	blez	$t0,.PF0f153fc8
-/*  f153fb0:	24a5ffff */ 	addiu	$a1,$a1,-1
-/*  f153fb4:	01201025 */ 	move	$v0,$t1
-.PF0f153fb8:
-/*  f153fb8:	24630001 */ 	addiu	$v1,$v1,0x1
-/*  f153fbc:	2442000c */ 	addiu	$v0,$v0,0xc
-/*  f153fc0:	1468fffd */ 	bne	$v1,$t0,.PF0f153fb8
-/*  f153fc4:	a045fff7 */ 	sb	$a1,-0x9($v0)
-.PF0f153fc8:
-/*  f153fc8:	8fad0048 */ 	lw	$t5,0x48($sp)
-/*  f153fcc:	8fa3004c */ 	lw	$v1,0x4c($sp)
-/*  f153fd0:	25ce5530 */ 	addiu	$t6,$t6,0x5530
-/*  f153fd4:	ada70000 */ 	sw	$a3,0x0($t5)
-/*  f153fd8:	120e0007 */ 	beq	$s0,$t6,.PF0f153ff8
-/*  f153fdc:	ac690000 */ 	sw	$t1,0x0($v1)
-/*  f153fe0:	25ef87b0 */ 	addiu	$t7,$t7,-30800
-/*  f153fe4:	120f0004 */ 	beq	$s0,$t7,.PF0f153ff8
-/*  f153fe8:	3c18007f */ 	lui	$t8,0x7f
-/*  f153fec:	2718ae20 */ 	addiu	$t8,$t8,-20960
-/*  f153ff0:	56180006 */ 	bnel	$s0,$t8,.PF0f15400c
-/*  f153ff4:	8fbf001c */ 	lw	$ra,0x1c($sp)
-.PF0f153ff8:
-/*  f153ff8:	8c620000 */ 	lw	$v0,0x0($v1)
-/*  f153ffc:	80590445 */ 	lb	$t9,0x445($v0)
-/*  f154000:	272a0001 */ 	addiu	$t2,$t9,0x1
-/*  f154004:	a04a0445 */ 	sb	$t2,0x445($v0)
-/*  f154008:	8fbf001c */ 	lw	$ra,0x1c($sp)
-.PF0f15400c:
-/*  f15400c:	8fb00018 */ 	lw	$s0,0x18($sp)
-/*  f154010:	27bd0040 */ 	addiu	$sp,$sp,0x40
-/*  f154014:	03e00008 */ 	jr	$ra
-/*  f154018:	00000000 */ 	nop
-);
-#else
-void fontLoad(u8 *romstart, u8 *romend, struct font **font1, struct font2a4 **font2, bool monospace)
+void fontLoad(u8 *romstart, u8 *romend, struct font **fontptr, struct fontchar **charsptr, bool monospace)
 {
-	u32 len = (u32)romend - (u32)romstart;
+	extern u8 _fonthandelgothicsmSegmentRomStart;
+	extern u8 _fonthandelgothicxsSegmentRomStart;
+	extern u8 _fonthandelgothicmdSegmentRomStart;
+
+	u32 len;
 	s32 maxwidth;
 	s32 i;
-	struct font *font = malloc(len, MEMPOOL_STAGE);
-	struct font2a4 *font2a4 = font->unk2a4;
+	struct font *font;
+	struct fontchar *chars;
+
+#if PAL
+	// PAL has more characters in these fonts
+	s32 numchars = 94;
+
+	if (romstart == &_fonthandelgothicsmSegmentRomStart
+			|| romstart == &_fonthandelgothicxsSegmentRomStart
+			|| romstart == &_fonthandelgothicmdSegmentRomStart) {
+		numchars = 135;
+	}
+#endif
+
+	len = (u32)romend - (u32)romstart;
+	font = malloc(len, MEMPOOL_STAGE);
+	chars = font->chars;
 
 	dmaExec(font, (u32) romstart, len);
 
 	// Convert pointers
-	for (i = 0; i < 94; i++) {
-		font2a4[i].data += (u32)font;
+#if PAL
+	for (i = 0; i < numchars; i++)
+#else
+	for (i = 0; i < 94; i++)
+#endif
+	{
+		chars[i].pixeldata += (u32)font;
 	}
 
 	// If requested monospace, set all widths to the max, minus 1 for some reason
 	if (monospace) {
 		maxwidth = 0;
 
-		for (i = 0; i < 94; i++) {
-			if (font2a4[i].width > maxwidth) {
-				maxwidth = font2a4[i].width;
+#if PAL
+		for (i = 0; i < numchars; i++)
+#else
+		for (i = 0; i < 94; i++)
+#endif
+		{
+			if (chars[i].width > maxwidth) {
+				maxwidth = chars[i].width;
 			}
 		}
 
 		maxwidth--;
 
-		for (i = 0; i < 94; i++) {
-			font2a4[i].width = maxwidth;
+#if PAL
+		for (i = 0; i < numchars; i++)
+#else
+		for (i = 0; i < 94; i++)
+#endif
+		{
+			chars[i].width = maxwidth;
 		}
 	}
 
-	*font1 = font;
-	*font2 = font2a4;
-}
+	*fontptr = font;
+	*charsptr = chars;
+
+#if PAL
+	if (romstart == &_fonthandelgothicsmSegmentRomStart
+			|| romstart == &_fonthandelgothicxsSegmentRomStart
+			|| romstart == &_fonthandelgothicmdSegmentRomStart) {
+		// Increment the baseline of the pipe character.
+		// It is suspected that the pipe character is used as a reference to set
+		// the size for all other text, so changing this increases the line
+		// height of these fonts.
+		(*charsptr)['|' - 0x21].baseline++;
+	}
 #endif
+}
 
 void fontsLoadForCurrentStage(void)
 {
@@ -313,22 +252,22 @@ void fontsLoadForCurrentStage(void)
 
 	var8007faec = 0;
 	g_FontTahoma2 = NULL;
-	g_FontNumeric2 = NULL;
-	g_FontHandelGothicXs2 = NULL;
-	g_FontHandelGothicSm2 = NULL;
-	g_FontHandelGothicMd2 = NULL;
-	g_FontHandelGothicLg2 = NULL;
+	g_FontNumeric = NULL;
+	g_FontHandelGothicXs = NULL;
+	g_FontHandelGothicSm = NULL;
+	g_FontHandelGothicMd = NULL;
+	g_FontHandelGothicLg = NULL;
 	var8007fb24 = 0;
 	var8007fb2c = 0;
 	var8007fb34 = 0;
 
 	var8007faf0 = 0;
 	g_FontTahoma1 = NULL;
-	g_FontNumeric1 = NULL;
-	g_FontHandelGothicXs1 = NULL;
-	g_FontHandelGothicSm1 = NULL;
-	g_FontHandelGothicMd1 = NULL;
-	g_FontHandelGothicLg1 = NULL;
+	g_CharsNumeric = NULL;
+	g_CharsHandelGothicXs = NULL;
+	g_CharsHandelGothicSm = NULL;
+	g_CharsHandelGothicMd = NULL;
+	g_CharsHandelGothicLg = NULL;
 	var8007fb28 = 0;
 	var8007fb30 = 0;
 	var8007fb38 = 0;
@@ -344,34 +283,34 @@ void fontsLoadForCurrentStage(void)
 	var8007fae8 = 0;
 
 	if (g_Vars.stagenum == STAGE_TITLE) {
-		fontLoad(&_fonthandelgothicsmSegmentRomStart, &_fonthandelgothicsmSegmentRomEnd, &g_FontHandelGothicSm2, &g_FontHandelGothicSm1, false);
-		fontLoad(&_fonthandelgothicmdSegmentRomStart, &_fonthandelgothicmdSegmentRomEnd, &g_FontHandelGothicMd2, &g_FontHandelGothicMd1, false);
-		fontLoad(&_fonthandelgothiclgSegmentRomStart, &_fonthandelgothiclgSegmentRomEnd, &g_FontHandelGothicLg2, &g_FontHandelGothicLg1, false);
+		fontLoad(&_fonthandelgothicsmSegmentRomStart, &_fonthandelgothicsmSegmentRomEnd, &g_FontHandelGothicSm, &g_CharsHandelGothicSm, false);
+		fontLoad(&_fonthandelgothicmdSegmentRomStart, &_fonthandelgothicmdSegmentRomEnd, &g_FontHandelGothicMd, &g_CharsHandelGothicMd, false);
+		fontLoad(&_fonthandelgothiclgSegmentRomStart, &_fonthandelgothiclgSegmentRomEnd, &g_FontHandelGothicLg, &g_CharsHandelGothicLg, false);
 	} else if (g_Vars.stagenum == STAGE_CREDITS) {
-		fontLoad(&_fonthandelgothicxsSegmentRomStart, &_fonthandelgothicxsSegmentRomEnd, &g_FontHandelGothicXs2, &g_FontHandelGothicXs1, false);
-		fontLoad(&_fonthandelgothicsmSegmentRomStart, &_fonthandelgothicsmSegmentRomEnd, &g_FontHandelGothicSm2, &g_FontHandelGothicSm1, false);
-		fontLoad(&_fonthandelgothicmdSegmentRomStart, &_fonthandelgothicmdSegmentRomEnd, &g_FontHandelGothicMd2, &g_FontHandelGothicMd1, false);
-		fontLoad(&_fonthandelgothiclgSegmentRomStart, &_fonthandelgothiclgSegmentRomEnd, &g_FontHandelGothicLg2, &g_FontHandelGothicLg1, false);
+		fontLoad(&_fonthandelgothicxsSegmentRomStart, &_fonthandelgothicxsSegmentRomEnd, &g_FontHandelGothicXs, &g_CharsHandelGothicXs, false);
+		fontLoad(&_fonthandelgothicsmSegmentRomStart, &_fonthandelgothicsmSegmentRomEnd, &g_FontHandelGothicSm, &g_CharsHandelGothicSm, false);
+		fontLoad(&_fonthandelgothicmdSegmentRomStart, &_fonthandelgothicmdSegmentRomEnd, &g_FontHandelGothicMd, &g_CharsHandelGothicMd, false);
+		fontLoad(&_fonthandelgothiclgSegmentRomStart, &_fonthandelgothiclgSegmentRomEnd, &g_FontHandelGothicLg, &g_CharsHandelGothicLg, false);
 	} else {
 #if !PAL
 		// This unused GE font exists in NTSC but was removed in the PAL version
 		fontLoad(&_fonttahomaSegmentRomStart, &_fonttahomaSegmentRomEnd, &g_FontTahoma2, &g_FontTahoma1, false);
 #endif
 
-		fontLoad(&_fontnumericSegmentRomStart, &_fontnumericSegmentRomEnd, &g_FontNumeric2, &g_FontNumeric1, false);
-		fontLoad(&_fonthandelgothicxsSegmentRomStart, &_fonthandelgothicxsSegmentRomEnd, &g_FontHandelGothicXs2, &g_FontHandelGothicXs1, false);
-		fontLoad(&_fonthandelgothicsmSegmentRomStart, &_fonthandelgothicsmSegmentRomEnd, &g_FontHandelGothicSm2, &g_FontHandelGothicSm1, false);
+		fontLoad(&_fontnumericSegmentRomStart, &_fontnumericSegmentRomEnd, &g_FontNumeric, &g_CharsNumeric, false);
+		fontLoad(&_fonthandelgothicxsSegmentRomStart, &_fonthandelgothicxsSegmentRomEnd, &g_FontHandelGothicXs, &g_CharsHandelGothicXs, false);
+		fontLoad(&_fonthandelgothicsmSegmentRomStart, &_fonthandelgothicsmSegmentRomEnd, &g_FontHandelGothicSm, &g_CharsHandelGothicSm, false);
 
 #if PAL
 		if (!g_Vars.normmplayerisrunning) {
-			fontLoad(&_fonthandelgothicmdSegmentRomStart, &_fonthandelgothicmdSegmentRomEnd, &g_FontHandelGothicMd2, &g_FontHandelGothicMd1, false);
+			fontLoad(&_fonthandelgothicmdSegmentRomStart, &_fonthandelgothicmdSegmentRomEnd, &g_FontHandelGothicMd, &g_CharsHandelGothicMd, false);
 		}
 #else
-		fontLoad(&_fonthandelgothicmdSegmentRomStart, &_fonthandelgothicmdSegmentRomEnd, &g_FontHandelGothicMd2, &g_FontHandelGothicMd1, false);
+		fontLoad(&_fonthandelgothicmdSegmentRomStart, &_fonthandelgothicmdSegmentRomEnd, &g_FontHandelGothicMd, &g_CharsHandelGothicMd, false);
 #endif
 
 		if (g_Vars.stagenum == STAGE_TEST_OLD) {
-			fontLoad(&_fonthandelgothiclgSegmentRomStart, &_fonthandelgothiclgSegmentRomEnd, &g_FontHandelGothicLg2, &g_FontHandelGothicLg1, false);
+			fontLoad(&_fonthandelgothiclgSegmentRomStart, &_fonthandelgothiclgSegmentRomEnd, &g_FontHandelGothicLg, &g_CharsHandelGothicLg, false);
 		}
 	}
 }
@@ -6698,7 +6637,7 @@ glabel textMeasure
 
 // Mismatch: Goal moves textheight to s0 then uses a0 for text[i] and/or
 // thischar.
-//void textMeasure(s32 *textheight, s32 *textwidth, char *text, struct font2a4 *font1, struct font *font2, s32 lineheight)
+//void textMeasure(s32 *textheight, s32 *textwidth, char *text, struct fontchar *font1, struct font *font2, s32 lineheight)
 //{
 //	s32 thischar;
 //	s32 prevchar;
diff --git a/src/game/hudmsg.c b/src/game/hudmsg.c
index 1f9feb4d6..ac4156fc4 100644
--- a/src/game/hudmsg.c
+++ b/src/game/hudmsg.c
@@ -53,18 +53,18 @@ s32 g_NumHudMessages = 0;
 struct hudmessage *g_HudMessages = NULL;
 
 struct hudmsgtype g_HudmsgTypes[] = {
-	/* 0*/ { 1, 1, 0, (void *) &g_FontHandelGothicSm1, (void *) &g_FontHandelGothicSm2, 0x00ff0000, 0x000000a0, HUDMSGALIGN_LEFT,    HUDMSGALIGN_BOTTOM,        0, 0, 80  },
-	/* 1*/ { 0, 1, 0, (void *) &g_FontHandelGothicMd1, (void *) &g_FontHandelGothicMd2, 0x00ff0000, 0x000000a0, HUDMSGALIGN_XMIDDLE, HUDMSGALIGN_YMIDDLE,       0, 0, 120 },
-	/* 2*/ { 0, 0, 1, (void *) &g_FontHandelGothicMd1, (void *) &g_FontHandelGothicMd2, 0xff000000, 0xffffffa0, HUDMSGALIGN_XMIDDLE, HUDMSGALIGN_YMIDDLE,       0, 0, 120 },
-	/* 3*/ { 0, 1, 0, (void *) &g_FontHandelGothicMd1, (void *) &g_FontHandelGothicMd2, 0x00ff0000, 0x000000a0, HUDMSGALIGN_LEFT,    HUDMSGALIGN_BOTTOM,        0, 0, 120 },
-	/* 4*/ { 1, 1, 0, (void *) &g_FontHandelGothicSm1, (void *) &g_FontHandelGothicSm2, 0x00ffc000, 0x000000a0, HUDMSGALIGN_LEFT,    HUDMSGALIGN_BOTTOM,        0, 0, 40  },
-	/* 5*/ { 0, 0, 0, (void *) &g_FontHandelGothicMd1, (void *) &g_FontHandelGothicMd2, 0x00ff0000, 0x000000a0, HUDMSGALIGN_LEFT,    HUDMSGALIGN_TOP,           0, 0, 120 },
-	/* 6*/ { 1, 0, 0, (void *) &g_FontHandelGothicSm1, (void *) &g_FontHandelGothicSm2, 0x00ff0000, 0x000000a0, HUDMSGALIGN_XMIDDLE, HUDMSGALIGN_TOP,           0, 0, 120 },
-	/* 7*/ { 1, 1, 0, (void *) &g_FontHandelGothicSm1, (void *) &g_FontHandelGothicSm2, 0x00ff0000, 0x000000a0, HUDMSGALIGN_XMIDDLE, HUDMSGALIGN_TOP,           0, 0, -1  },
-	/* 8*/ { 1, 1, 0, (void *) &g_FontHandelGothicSm1, (void *) &g_FontHandelGothicSm2, 0x00ffc000, 0x000000a0, HUDMSGALIGN_XMIDDLE, HUDMSGALIGN_BOTTOM,        0, 0, 500 },
-	/* 9*/ { 1, 1, 0, (void *) &g_FontHandelGothicXs1, (void *) &g_FontHandelGothicXs2, 0x00ff0000, 0x000000a0, HUDMSGALIGN_LEFT,    HUDMSGALIGN_BOTTOM,        0, 0, 120 },
-	/*10*/ { 1, 1, 0, (void *) &g_FontHandelGothicSm1, (void *) &g_FontHandelGothicSm2, 0x00ff0000, 0x000000a0, HUDMSGALIGN_LEFT,    HUDMSGALIGN_BOTTOM,        0, 0, 240 },
-	/*11*/ { 0, 0, 0, (void *) &g_FontHandelGothicSm1, (void *) &g_FontHandelGothicSm2, 0x00ff0000, 0x000000a0, HUDMSGALIGN_XMIDDLE, HUDMSGALIGN_BELOWVIEWPORT, 0, 0, 120 },
+	/* 0*/ { 1, 1, 0, (void *) &g_CharsHandelGothicSm, (void *) &g_FontHandelGothicSm, 0x00ff0000, 0x000000a0, HUDMSGALIGN_LEFT,    HUDMSGALIGN_BOTTOM,        0, 0, 80  },
+	/* 1*/ { 0, 1, 0, (void *) &g_CharsHandelGothicMd, (void *) &g_FontHandelGothicMd, 0x00ff0000, 0x000000a0, HUDMSGALIGN_XMIDDLE, HUDMSGALIGN_YMIDDLE,       0, 0, 120 },
+	/* 2*/ { 0, 0, 1, (void *) &g_CharsHandelGothicMd, (void *) &g_FontHandelGothicMd, 0xff000000, 0xffffffa0, HUDMSGALIGN_XMIDDLE, HUDMSGALIGN_YMIDDLE,       0, 0, 120 },
+	/* 3*/ { 0, 1, 0, (void *) &g_CharsHandelGothicMd, (void *) &g_FontHandelGothicMd, 0x00ff0000, 0x000000a0, HUDMSGALIGN_LEFT,    HUDMSGALIGN_BOTTOM,        0, 0, 120 },
+	/* 4*/ { 1, 1, 0, (void *) &g_CharsHandelGothicSm, (void *) &g_FontHandelGothicSm, 0x00ffc000, 0x000000a0, HUDMSGALIGN_LEFT,    HUDMSGALIGN_BOTTOM,        0, 0, 40  },
+	/* 5*/ { 0, 0, 0, (void *) &g_CharsHandelGothicMd, (void *) &g_FontHandelGothicMd, 0x00ff0000, 0x000000a0, HUDMSGALIGN_LEFT,    HUDMSGALIGN_TOP,           0, 0, 120 },
+	/* 6*/ { 1, 0, 0, (void *) &g_CharsHandelGothicSm, (void *) &g_FontHandelGothicSm, 0x00ff0000, 0x000000a0, HUDMSGALIGN_XMIDDLE, HUDMSGALIGN_TOP,           0, 0, 120 },
+	/* 7*/ { 1, 1, 0, (void *) &g_CharsHandelGothicSm, (void *) &g_FontHandelGothicSm, 0x00ff0000, 0x000000a0, HUDMSGALIGN_XMIDDLE, HUDMSGALIGN_TOP,           0, 0, -1  },
+	/* 8*/ { 1, 1, 0, (void *) &g_CharsHandelGothicSm, (void *) &g_FontHandelGothicSm, 0x00ffc000, 0x000000a0, HUDMSGALIGN_XMIDDLE, HUDMSGALIGN_BOTTOM,        0, 0, 500 },
+	/* 9*/ { 1, 1, 0, (void *) &g_CharsHandelGothicXs, (void *) &g_FontHandelGothicXs, 0x00ff0000, 0x000000a0, HUDMSGALIGN_LEFT,    HUDMSGALIGN_BOTTOM,        0, 0, 120 },
+	/*10*/ { 1, 1, 0, (void *) &g_CharsHandelGothicSm, (void *) &g_FontHandelGothicSm, 0x00ff0000, 0x000000a0, HUDMSGALIGN_LEFT,    HUDMSGALIGN_BOTTOM,        0, 0, 240 },
+	/*11*/ { 0, 0, 0, (void *) &g_CharsHandelGothicSm, (void *) &g_FontHandelGothicSm, 0x00ff0000, 0x000000a0, HUDMSGALIGN_XMIDDLE, HUDMSGALIGN_BELOWVIEWPORT, 0, 0, 120 },
 };
 
 u32 var80071170 = 0x2e3b213f;
@@ -331,10 +331,10 @@ glabel hudmsgRenderMissionTimer
 /*  f0dd240:	afa70088 */ 	sw	$a3,0x88($sp)
 /*  f0dd244:	0c002f06 */ 	jal	viGetHeight
 /*  f0dd248:	a7a20042 */ 	sh	$v0,0x42($sp)
-/*  f0dd24c:	3c0d8008 */ 	lui	$t5,%hi(g_FontNumeric1)
-/*  f0dd250:	3c0e8008 */ 	lui	$t6,%hi(g_FontNumeric2)
-/*  f0dd254:	8dcefafc */ 	lw	$t6,%lo(g_FontNumeric2)($t6)
-/*  f0dd258:	8dadfb00 */ 	lw	$t5,%lo(g_FontNumeric1)($t5)
+/*  f0dd24c:	3c0d8008 */ 	lui	$t5,%hi(g_CharsNumeric)
+/*  f0dd250:	3c0e8008 */ 	lui	$t6,%hi(g_FontNumeric)
+/*  f0dd254:	8dcefafc */ 	lw	$t6,%lo(g_FontNumeric)($t6)
+/*  f0dd258:	8dadfb00 */ 	lw	$t5,%lo(g_CharsNumeric)($t5)
 /*  f0dd25c:	8faf0064 */ 	lw	$t7,0x64($sp)
 /*  f0dd260:	87b90042 */ 	lh	$t9,0x42($sp)
 /*  f0dd264:	241800a0 */ 	addiu	$t8,$zero,0xa0
@@ -434,7 +434,7 @@ glabel hudmsgRenderMissionTimer
 //	// 208
 //	formatTime(buffer, getMissionTime(), 4);
 //
-//	return textRender(gdl, &sp8c, &sp88, buffer, g_FontNumeric1, g_FontNumeric2, textcolour, 0x000000a0, viGetWidth(), viGetHeight(), 0, 0);
+//	return textRender(gdl, &sp8c, &sp88, buffer, g_CharsNumeric, g_FontNumeric, textcolour, 0x000000a0, viGetWidth(), viGetHeight(), 0, 0);
 //}
 
 #if VERSION >= VERSION_NTSC_FINAL
@@ -630,10 +630,10 @@ glabel hudmsgRenderZoomRange
 /*  f0dd548:	f7a80010 */ 	sdc1	$f8,0x10($sp)
 /*  f0dd54c:	0c004dad */ 	jal	sprintf
 /*  f0dd550:	27a40084 */ 	addiu	$a0,$sp,0x84
-/*  f0dd554:	3c0f8008 */ 	lui	$t7,%hi(g_FontNumeric2)
-/*  f0dd558:	8deffafc */ 	lw	$t7,%lo(g_FontNumeric2)($t7)
-/*  f0dd55c:	3c078008 */ 	lui	$a3,%hi(g_FontNumeric1)
-/*  f0dd560:	8ce7fb00 */ 	lw	$a3,%lo(g_FontNumeric1)($a3)
+/*  f0dd554:	3c0f8008 */ 	lui	$t7,%hi(g_FontNumeric)
+/*  f0dd558:	8deffafc */ 	lw	$t7,%lo(g_FontNumeric)($t7)
+/*  f0dd55c:	3c078008 */ 	lui	$a3,%hi(g_CharsNumeric)
+/*  f0dd560:	8ce7fb00 */ 	lw	$a3,%lo(g_CharsNumeric)($a3)
 /*  f0dd564:	27a4006c */ 	addiu	$a0,$sp,0x6c
 /*  f0dd568:	27a50070 */ 	addiu	$a1,$sp,0x70
 /*  f0dd56c:	27a60084 */ 	addiu	$a2,$sp,0x84
@@ -667,14 +667,14 @@ glabel hudmsgRenderZoomRange
 /*  f0dd5dc:	a7a2004c */ 	sh	$v0,0x4c($sp)
 /*  f0dd5e0:	8fa300c4 */ 	lw	$v1,0xc4($sp)
 /*  f0dd5e4:	240100ff */ 	addiu	$at,$zero,0xff
-/*  f0dd5e8:	3c0d8008 */ 	lui	$t5,%hi(g_FontNumeric1)
+/*  f0dd5e8:	3c0d8008 */ 	lui	$t5,%hi(g_CharsNumeric)
 /*  f0dd5ec:	00037880 */ 	sll	$t7,$v1,0x2
 /*  f0dd5f0:	01e37821 */ 	addu	$t7,$t7,$v1
 /*  f0dd5f4:	000f7940 */ 	sll	$t7,$t7,0x5
 /*  f0dd5f8:	01e1001b */ 	divu	$zero,$t7,$at
-/*  f0dd5fc:	3c0e8008 */ 	lui	$t6,%hi(g_FontNumeric2)
-/*  f0dd600:	8dcefafc */ 	lw	$t6,%lo(g_FontNumeric2)($t6)
-/*  f0dd604:	8dadfb00 */ 	lw	$t5,%lo(g_FontNumeric1)($t5)
+/*  f0dd5fc:	3c0e8008 */ 	lui	$t6,%hi(g_FontNumeric)
+/*  f0dd600:	8dcefafc */ 	lw	$t6,%lo(g_FontNumeric)($t6)
+/*  f0dd604:	8dadfb00 */ 	lw	$t5,%lo(g_CharsNumeric)($t5)
 /*  f0dd608:	87aa004c */ 	lh	$t2,0x4c($sp)
 /*  f0dd60c:	0000c012 */ 	mflo	$t8
 /*  f0dd610:	3c0100ff */ 	lui	$at,0xff
@@ -699,10 +699,10 @@ glabel hudmsgRenderZoomRange
 /*  f0dd65c:	24a5de94 */ 	addiu	$a1,$a1,%lo(var7f1ade94)
 /*  f0dd660:	0c004dad */ 	jal	sprintf
 /*  f0dd664:	27a40084 */ 	addiu	$a0,$sp,0x84
-/*  f0dd668:	3c0b8008 */ 	lui	$t3,%hi(g_FontNumeric2)
-/*  f0dd66c:	8d6bfafc */ 	lw	$t3,%lo(g_FontNumeric2)($t3)
-/*  f0dd670:	3c078008 */ 	lui	$a3,%hi(g_FontNumeric1)
-/*  f0dd674:	8ce7fb00 */ 	lw	$a3,%lo(g_FontNumeric1)($a3)
+/*  f0dd668:	3c0b8008 */ 	lui	$t3,%hi(g_FontNumeric)
+/*  f0dd66c:	8d6bfafc */ 	lw	$t3,%lo(g_FontNumeric)($t3)
+/*  f0dd670:	3c078008 */ 	lui	$a3,%hi(g_CharsNumeric)
+/*  f0dd674:	8ce7fb00 */ 	lw	$a3,%lo(g_CharsNumeric)($a3)
 /*  f0dd678:	27a4006c */ 	addiu	$a0,$sp,0x6c
 /*  f0dd67c:	27a50070 */ 	addiu	$a1,$sp,0x70
 /*  f0dd680:	27a60084 */ 	addiu	$a2,$sp,0x84
@@ -731,10 +731,10 @@ glabel hudmsgRenderZoomRange
 /*  f0dd6dc:	afa200c0 */ 	sw	$v0,0xc0($sp)
 /*  f0dd6e0:	0c002f06 */ 	jal	viGetHeight
 /*  f0dd6e4:	a7a2004c */ 	sh	$v0,0x4c($sp)
-/*  f0dd6e8:	3c098008 */ 	lui	$t1,%hi(g_FontNumeric1)
-/*  f0dd6ec:	3c0a8008 */ 	lui	$t2,%hi(g_FontNumeric2)
-/*  f0dd6f0:	8d4afafc */ 	lw	$t2,%lo(g_FontNumeric2)($t2)
-/*  f0dd6f4:	8d29fb00 */ 	lw	$t1,%lo(g_FontNumeric1)($t1)
+/*  f0dd6e8:	3c098008 */ 	lui	$t1,%hi(g_CharsNumeric)
+/*  f0dd6ec:	3c0a8008 */ 	lui	$t2,%hi(g_FontNumeric)
+/*  f0dd6f0:	8d4afafc */ 	lw	$t2,%lo(g_FontNumeric)($t2)
+/*  f0dd6f4:	8d29fb00 */ 	lw	$t1,%lo(g_CharsNumeric)($t1)
 /*  f0dd6f8:	8fab0048 */ 	lw	$t3,0x48($sp)
 /*  f0dd6fc:	87ad004c */ 	lh	$t5,0x4c($sp)
 /*  f0dd700:	240c00a0 */ 	addiu	$t4,$zero,0xa0
@@ -763,10 +763,10 @@ glabel hudmsgRenderZoomRange
 /*  f0dd75c:	24a5de98 */ 	addiu	$a1,$a1,%lo(var7f1ade98)
 /*  f0dd760:	0c004dad */ 	jal	sprintf
 /*  f0dd764:	27a40084 */ 	addiu	$a0,$sp,0x84
-/*  f0dd768:	3c0e8008 */ 	lui	$t6,%hi(g_FontNumeric2)
-/*  f0dd76c:	8dcefafc */ 	lw	$t6,%lo(g_FontNumeric2)($t6)
-/*  f0dd770:	3c078008 */ 	lui	$a3,%hi(g_FontNumeric1)
-/*  f0dd774:	8ce7fb00 */ 	lw	$a3,%lo(g_FontNumeric1)($a3)
+/*  f0dd768:	3c0e8008 */ 	lui	$t6,%hi(g_FontNumeric)
+/*  f0dd76c:	8dcefafc */ 	lw	$t6,%lo(g_FontNumeric)($t6)
+/*  f0dd770:	3c078008 */ 	lui	$a3,%hi(g_CharsNumeric)
+/*  f0dd774:	8ce7fb00 */ 	lw	$a3,%lo(g_CharsNumeric)($a3)
 /*  f0dd778:	27a4006c */ 	addiu	$a0,$sp,0x6c
 /*  f0dd77c:	27a50070 */ 	addiu	$a1,$sp,0x70
 /*  f0dd780:	27a60084 */ 	addiu	$a2,$sp,0x84
@@ -794,10 +794,10 @@ glabel hudmsgRenderZoomRange
 /*  f0dd7d8:	afa200c0 */ 	sw	$v0,0xc0($sp)
 /*  f0dd7dc:	0c002f06 */ 	jal	viGetHeight
 /*  f0dd7e0:	a7a2004c */ 	sh	$v0,0x4c($sp)
-/*  f0dd7e4:	3c0a8008 */ 	lui	$t2,%hi(g_FontNumeric1)
-/*  f0dd7e8:	3c0b8008 */ 	lui	$t3,%hi(g_FontNumeric2)
-/*  f0dd7ec:	8d6bfafc */ 	lw	$t3,%lo(g_FontNumeric2)($t3)
-/*  f0dd7f0:	8d4afb00 */ 	lw	$t2,%lo(g_FontNumeric1)($t2)
+/*  f0dd7e4:	3c0a8008 */ 	lui	$t2,%hi(g_CharsNumeric)
+/*  f0dd7e8:	3c0b8008 */ 	lui	$t3,%hi(g_FontNumeric)
+/*  f0dd7ec:	8d6bfafc */ 	lw	$t3,%lo(g_FontNumeric)($t3)
+/*  f0dd7f0:	8d4afb00 */ 	lw	$t2,%lo(g_CharsNumeric)($t2)
 /*  f0dd7f4:	8fac0048 */ 	lw	$t4,0x48($sp)
 /*  f0dd7f8:	87ae004c */ 	lh	$t6,0x4c($sp)
 /*  f0dd7fc:	240d00a0 */ 	addiu	$t5,$zero,0xa0
@@ -1014,10 +1014,10 @@ glabel hudmsgRenderZoomRange
 /*  f0dd528:	f7a80010 */ 	sdc1	$f8,0x10($sp)
 /*  f0dd52c:	0c004dad */ 	jal	sprintf
 /*  f0dd530:	27a40084 */ 	addiu	$a0,$sp,0x84
-/*  f0dd534:	3c0f8008 */ 	lui	$t7,%hi(g_FontNumeric2)
-/*  f0dd538:	8deffafc */ 	lw	$t7,%lo(g_FontNumeric2)($t7)
-/*  f0dd53c:	3c078008 */ 	lui	$a3,%hi(g_FontNumeric1)
-/*  f0dd540:	8ce7fb00 */ 	lw	$a3,%lo(g_FontNumeric1)($a3)
+/*  f0dd534:	3c0f8008 */ 	lui	$t7,%hi(g_FontNumeric)
+/*  f0dd538:	8deffafc */ 	lw	$t7,%lo(g_FontNumeric)($t7)
+/*  f0dd53c:	3c078008 */ 	lui	$a3,%hi(g_CharsNumeric)
+/*  f0dd540:	8ce7fb00 */ 	lw	$a3,%lo(g_CharsNumeric)($a3)
 /*  f0dd544:	27a4006c */ 	addiu	$a0,$sp,0x6c
 /*  f0dd548:	27a50070 */ 	addiu	$a1,$sp,0x70
 /*  f0dd54c:	27a60084 */ 	addiu	$a2,$sp,0x84
@@ -1051,14 +1051,14 @@ glabel hudmsgRenderZoomRange
 /*  f0dd5bc:	a7a2004c */ 	sh	$v0,0x4c($sp)
 /*  f0dd5c0:	8fa300c4 */ 	lw	$v1,0xc4($sp)
 /*  f0dd5c4:	240100ff */ 	addiu	$at,$zero,0xff
-/*  f0dd5c8:	3c0d8008 */ 	lui	$t5,%hi(g_FontNumeric1)
+/*  f0dd5c8:	3c0d8008 */ 	lui	$t5,%hi(g_CharsNumeric)
 /*  f0dd5cc:	00037880 */ 	sll	$t7,$v1,0x2
 /*  f0dd5d0:	01e37821 */ 	addu	$t7,$t7,$v1
 /*  f0dd5d4:	000f7940 */ 	sll	$t7,$t7,0x5
 /*  f0dd5d8:	01e1001b */ 	divu	$zero,$t7,$at
-/*  f0dd5dc:	3c0e8008 */ 	lui	$t6,%hi(g_FontNumeric2)
-/*  f0dd5e0:	8dcefafc */ 	lw	$t6,%lo(g_FontNumeric2)($t6)
-/*  f0dd5e4:	8dadfb00 */ 	lw	$t5,%lo(g_FontNumeric1)($t5)
+/*  f0dd5dc:	3c0e8008 */ 	lui	$t6,%hi(g_FontNumeric)
+/*  f0dd5e0:	8dcefafc */ 	lw	$t6,%lo(g_FontNumeric)($t6)
+/*  f0dd5e4:	8dadfb00 */ 	lw	$t5,%lo(g_CharsNumeric)($t5)
 /*  f0dd5e8:	87aa004c */ 	lh	$t2,0x4c($sp)
 /*  f0dd5ec:	0000c012 */ 	mflo	$t8
 /*  f0dd5f0:	3c0100ff */ 	lui	$at,0xff
@@ -1083,10 +1083,10 @@ glabel hudmsgRenderZoomRange
 /*  f0dd63c:	24a5dc54 */ 	addiu	$a1,$a1,-9132
 /*  f0dd640:	0c004dad */ 	jal	sprintf
 /*  f0dd644:	27a40084 */ 	addiu	$a0,$sp,0x84
-/*  f0dd648:	3c0b8008 */ 	lui	$t3,%hi(g_FontNumeric2)
-/*  f0dd64c:	8d6bfafc */ 	lw	$t3,%lo(g_FontNumeric2)($t3)
-/*  f0dd650:	3c078008 */ 	lui	$a3,%hi(g_FontNumeric1)
-/*  f0dd654:	8ce7fb00 */ 	lw	$a3,%lo(g_FontNumeric1)($a3)
+/*  f0dd648:	3c0b8008 */ 	lui	$t3,%hi(g_FontNumeric)
+/*  f0dd64c:	8d6bfafc */ 	lw	$t3,%lo(g_FontNumeric)($t3)
+/*  f0dd650:	3c078008 */ 	lui	$a3,%hi(g_CharsNumeric)
+/*  f0dd654:	8ce7fb00 */ 	lw	$a3,%lo(g_CharsNumeric)($a3)
 /*  f0dd658:	27a4006c */ 	addiu	$a0,$sp,0x6c
 /*  f0dd65c:	27a50070 */ 	addiu	$a1,$sp,0x70
 /*  f0dd660:	27a60084 */ 	addiu	$a2,$sp,0x84
@@ -1115,10 +1115,10 @@ glabel hudmsgRenderZoomRange
 /*  f0dd6bc:	afa200c0 */ 	sw	$v0,0xc0($sp)
 /*  f0dd6c0:	0c002f06 */ 	jal	viGetHeight
 /*  f0dd6c4:	a7a2004c */ 	sh	$v0,0x4c($sp)
-/*  f0dd6c8:	3c098008 */ 	lui	$t1,%hi(g_FontNumeric1)
-/*  f0dd6cc:	3c0a8008 */ 	lui	$t2,%hi(g_FontNumeric2)
-/*  f0dd6d0:	8d4afafc */ 	lw	$t2,%lo(g_FontNumeric2)($t2)
-/*  f0dd6d4:	8d29fb00 */ 	lw	$t1,%lo(g_FontNumeric1)($t1)
+/*  f0dd6c8:	3c098008 */ 	lui	$t1,%hi(g_CharsNumeric)
+/*  f0dd6cc:	3c0a8008 */ 	lui	$t2,%hi(g_FontNumeric)
+/*  f0dd6d0:	8d4afafc */ 	lw	$t2,%lo(g_FontNumeric)($t2)
+/*  f0dd6d4:	8d29fb00 */ 	lw	$t1,%lo(g_CharsNumeric)($t1)
 /*  f0dd6d8:	8fab0048 */ 	lw	$t3,0x48($sp)
 /*  f0dd6dc:	87ad004c */ 	lh	$t5,0x4c($sp)
 /*  f0dd6e0:	240c00a0 */ 	addiu	$t4,$zero,0xa0
@@ -1147,10 +1147,10 @@ glabel hudmsgRenderZoomRange
 /*  f0dd73c:	24a5dc58 */ 	addiu	$a1,$a1,-9128
 /*  f0dd740:	0c004dad */ 	jal	sprintf
 /*  f0dd744:	27a40084 */ 	addiu	$a0,$sp,0x84
-/*  f0dd748:	3c0e8008 */ 	lui	$t6,%hi(g_FontNumeric2)
-/*  f0dd74c:	8dcefafc */ 	lw	$t6,%lo(g_FontNumeric2)($t6)
-/*  f0dd750:	3c078008 */ 	lui	$a3,%hi(g_FontNumeric1)
-/*  f0dd754:	8ce7fb00 */ 	lw	$a3,%lo(g_FontNumeric1)($a3)
+/*  f0dd748:	3c0e8008 */ 	lui	$t6,%hi(g_FontNumeric)
+/*  f0dd74c:	8dcefafc */ 	lw	$t6,%lo(g_FontNumeric)($t6)
+/*  f0dd750:	3c078008 */ 	lui	$a3,%hi(g_CharsNumeric)
+/*  f0dd754:	8ce7fb00 */ 	lw	$a3,%lo(g_CharsNumeric)($a3)
 /*  f0dd758:	27a4006c */ 	addiu	$a0,$sp,0x6c
 /*  f0dd75c:	27a50070 */ 	addiu	$a1,$sp,0x70
 /*  f0dd760:	27a60084 */ 	addiu	$a2,$sp,0x84
@@ -1178,10 +1178,10 @@ glabel hudmsgRenderZoomRange
 /*  f0dd7b8:	afa200c0 */ 	sw	$v0,0xc0($sp)
 /*  f0dd7bc:	0c002f06 */ 	jal	viGetHeight
 /*  f0dd7c0:	a7a2004c */ 	sh	$v0,0x4c($sp)
-/*  f0dd7c4:	3c0a8008 */ 	lui	$t2,%hi(g_FontNumeric1)
-/*  f0dd7c8:	3c0b8008 */ 	lui	$t3,%hi(g_FontNumeric2)
-/*  f0dd7cc:	8d6bfafc */ 	lw	$t3,%lo(g_FontNumeric2)($t3)
-/*  f0dd7d0:	8d4afb00 */ 	lw	$t2,%lo(g_FontNumeric1)($t2)
+/*  f0dd7c4:	3c0a8008 */ 	lui	$t2,%hi(g_CharsNumeric)
+/*  f0dd7c8:	3c0b8008 */ 	lui	$t3,%hi(g_FontNumeric)
+/*  f0dd7cc:	8d6bfafc */ 	lw	$t3,%lo(g_FontNumeric)($t3)
+/*  f0dd7d0:	8d4afb00 */ 	lw	$t2,%lo(g_CharsNumeric)($t2)
 /*  f0dd7d4:	8fac0048 */ 	lw	$t4,0x48($sp)
 /*  f0dd7d8:	87ae004c */ 	lh	$t6,0x4c($sp)
 /*  f0dd7dc:	240d00a0 */ 	addiu	$t5,$zero,0xa0
@@ -1753,15 +1753,15 @@ glabel func0f0de160
 /*  f0de4fc:	a098ffff */ 	sb	$t8,-0x1($a0)
 .L0f0de500:
 /*  f0de500:	8fae0074 */ 	lw	$t6,0x74($sp)
-/*  f0de504:	3c0f8008 */ 	lui	$t7,%hi(g_FontHandelGothicSm2)
-/*  f0de508:	3c078008 */ 	lui	$a3,%hi(g_FontHandelGothicSm1)
+/*  f0de504:	3c0f8008 */ 	lui	$t7,%hi(g_FontHandelGothicSm)
+/*  f0de508:	3c078008 */ 	lui	$a3,%hi(g_CharsHandelGothicSm)
 /*  f0de50c:	01d01021 */ 	addu	$v0,$t6,$s0
 /*  f0de510:	a0590000 */ 	sb	$t9,0x0($v0)
 /*  f0de514:	a0400001 */ 	sb	$zero,0x1($v0)
-/*  f0de518:	8deffb0c */ 	lw	$t7,%lo(g_FontHandelGothicSm2)($t7)
+/*  f0de518:	8deffb0c */ 	lw	$t7,%lo(g_FontHandelGothicSm)($t7)
 /*  f0de51c:	a7ad04ae */ 	sh	$t5,0x4ae($sp)
 /*  f0de520:	afa800a4 */ 	sw	$t0,0xa4($sp)
-/*  f0de524:	8ce7fb10 */ 	lw	$a3,%lo(g_FontHandelGothicSm1)($a3)
+/*  f0de524:	8ce7fb10 */ 	lw	$a3,%lo(g_CharsHandelGothicSm)($a3)
 /*  f0de528:	8fa404a4 */ 	lw	$a0,0x4a4($sp)
 /*  f0de52c:	27a601b0 */ 	addiu	$a2,$sp,0x1b0
 /*  f0de530:	0fc55d48 */ 	jal	textWrap
diff --git a/src/game/menu/items.c b/src/game/menu/items.c
index a10981ba8..d81fb7192 100644
--- a/src/game/menu/items.c
+++ b/src/game/menu/items.c
@@ -421,10 +421,10 @@ glabel func0f0e6038
 /*  f0e6230:	8ca52148 */ 	lw	$a1,%lo(g_MenuColourPalettes2+0x30)($a1)
 /*  f0e6234:	0fc54f8e */ 	jal	func0f153e38
 /*  f0e6238:	8c8422b0 */ 	lw	$a0,%lo(g_MenuColourPalettes3+0x30)($a0)
-/*  f0e623c:	3c0a8008 */ 	lui	$t2,%hi(g_FontHandelGothicSm1)
-/*  f0e6240:	3c0b8008 */ 	lui	$t3,%hi(g_FontHandelGothicSm2)
-/*  f0e6244:	8d6bfb0c */ 	lw	$t3,%lo(g_FontHandelGothicSm2)($t3)
-/*  f0e6248:	8d4afb10 */ 	lw	$t2,%lo(g_FontHandelGothicSm1)($t2)
+/*  f0e623c:	3c0a8008 */ 	lui	$t2,%hi(g_CharsHandelGothicSm)
+/*  f0e6240:	3c0b8008 */ 	lui	$t3,%hi(g_FontHandelGothicSm)
+/*  f0e6244:	8d6bfb0c */ 	lw	$t3,%lo(g_FontHandelGothicSm)($t3)
+/*  f0e6248:	8d4afb10 */ 	lw	$t2,%lo(g_CharsHandelGothicSm)($t2)
 /*  f0e624c:	87a8005e */ 	lh	$t0,0x5e($sp)
 /*  f0e6250:	87ac0066 */ 	lh	$t4,0x66($sp)
 /*  f0e6254:	8fa40050 */ 	lw	$a0,0x50($sp)
@@ -625,12 +625,12 @@ glabel menuRenderItemList
 /*  f0e6350:	afb00038 */ 	sw	$s0,0x38($sp)
 /*  f0e6354:	8cae0014 */ 	lw	$t6,0x14($a1)
 /*  f0e6358:	afa00120 */ 	sw	$zero,0x120($sp)
-/*  f0e635c:	3c0a8008 */ 	lui	$t2,%hi(g_FontHandelGothicSm2)
+/*  f0e635c:	3c0a8008 */ 	lui	$t2,%hi(g_FontHandelGothicSm)
 /*  f0e6360:	afae016c */ 	sw	$t6,0x16c($sp)
 /*  f0e6364:	84af0000 */ 	lh	$t7,0x0($a1)
-/*  f0e6368:	3c0b8008 */ 	lui	$t3,%hi(g_FontHandelGothicSm1)
-/*  f0e636c:	8d4afb0c */ 	lw	$t2,%lo(g_FontHandelGothicSm2)($t2)
-/*  f0e6370:	8d6bfb10 */ 	lw	$t3,%lo(g_FontHandelGothicSm1)($t3)
+/*  f0e6368:	3c0b8008 */ 	lui	$t3,%hi(g_CharsHandelGothicSm)
+/*  f0e636c:	8d4afb0c */ 	lw	$t2,%lo(g_FontHandelGothicSm)($t2)
+/*  f0e6370:	8d6bfb10 */ 	lw	$t3,%lo(g_CharsHandelGothicSm)($t3)
 /*  f0e6374:	2419270f */ 	addiu	$t9,$zero,0x270f
 /*  f0e6378:	25f80002 */ 	addiu	$t8,$t7,0x2
 /*  f0e637c:	afb8011c */ 	sw	$t8,0x11c($sp)
@@ -3468,13 +3468,13 @@ glabel menuRenderItemDropdown
 /*  f0e7f74:	0fc54d8a */ 	jal	func0f153628
 /*  f0e7f78:	8fa40080 */ 	lw	$a0,0x80($sp)
 /*  f0e7f7c:	86190000 */ 	lh	$t9,0x0($s0)
-/*  f0e7f80:	3c0b8008 */ 	lui	$t3,%hi(g_FontHandelGothicSm1)
-/*  f0e7f84:	3c0c8008 */ 	lui	$t4,%hi(g_FontHandelGothicSm2)
+/*  f0e7f80:	3c0b8008 */ 	lui	$t3,%hi(g_CharsHandelGothicSm)
+/*  f0e7f84:	3c0c8008 */ 	lui	$t4,%hi(g_FontHandelGothicSm)
 /*  f0e7f88:	2728000a */ 	addiu	$t0,$t9,0xa
 /*  f0e7f8c:	afa80074 */ 	sw	$t0,0x74($sp)
 /*  f0e7f90:	860f0002 */ 	lh	$t7,0x2($s0)
-/*  f0e7f94:	8d8cfb0c */ 	lw	$t4,%lo(g_FontHandelGothicSm2)($t4)
-/*  f0e7f98:	8d6bfb10 */ 	lw	$t3,%lo(g_FontHandelGothicSm1)($t3)
+/*  f0e7f94:	8d8cfb0c */ 	lw	$t4,%lo(g_FontHandelGothicSm)($t4)
+/*  f0e7f98:	8d6bfb10 */ 	lw	$t3,%lo(g_CharsHandelGothicSm)($t3)
 /*  f0e7f9c:	25e90002 */ 	addiu	$t1,$t7,0x2
 /*  f0e7fa0:	afa90070 */ 	sw	$t1,0x70($sp)
 /*  f0e7fa4:	afb10018 */ 	sw	$s1,0x18($sp)
@@ -3537,11 +3537,11 @@ glabel menuRenderItemDropdown
 /*  f0e807c:	8cb90010 */ 	lw	$t9,0x10($a1)
 /*  f0e8080:	0320f809 */ 	jalr	$t9
 /*  f0e8084:	00000000 */ 	nop
-/*  f0e8088:	3c0c8008 */ 	lui	$t4,%hi(g_FontHandelGothicSm2)
-/*  f0e808c:	8d8cfb0c */ 	lw	$t4,%lo(g_FontHandelGothicSm2)($t4)
-/*  f0e8090:	3c078008 */ 	lui	$a3,%hi(g_FontHandelGothicSm1)
+/*  f0e8088:	3c0c8008 */ 	lui	$t4,%hi(g_FontHandelGothicSm)
+/*  f0e808c:	8d8cfb0c */ 	lw	$t4,%lo(g_FontHandelGothicSm)($t4)
+/*  f0e8090:	3c078008 */ 	lui	$a3,%hi(g_CharsHandelGothicSm)
 /*  f0e8094:	afa20078 */ 	sw	$v0,0x78($sp)
-/*  f0e8098:	8ce7fb10 */ 	lw	$a3,%lo(g_FontHandelGothicSm1)($a3)
+/*  f0e8098:	8ce7fb10 */ 	lw	$a3,%lo(g_CharsHandelGothicSm)($a3)
 /*  f0e809c:	27a4004c */ 	addiu	$a0,$sp,0x4c
 /*  f0e80a0:	27a50048 */ 	addiu	$a1,$sp,0x48
 /*  f0e80a4:	00403025 */ 	or	$a2,$v0,$zero
@@ -3551,10 +3551,10 @@ glabel menuRenderItemDropdown
 /*  f0e80b4:	860d0000 */ 	lh	$t5,0x0($s0)
 /*  f0e80b8:	860a0004 */ 	lh	$t2,0x4($s0)
 /*  f0e80bc:	8fb80048 */ 	lw	$t8,0x48($sp)
-/*  f0e80c0:	3c098008 */ 	lui	$t1,%hi(g_FontHandelGothicSm1)
-/*  f0e80c4:	3c0b8008 */ 	lui	$t3,%hi(g_FontHandelGothicSm2)
-/*  f0e80c8:	8d6bfb0c */ 	lw	$t3,%lo(g_FontHandelGothicSm2)($t3)
-/*  f0e80cc:	8d29fb10 */ 	lw	$t1,%lo(g_FontHandelGothicSm1)($t1)
+/*  f0e80c0:	3c098008 */ 	lui	$t1,%hi(g_CharsHandelGothicSm)
+/*  f0e80c4:	3c0b8008 */ 	lui	$t3,%hi(g_FontHandelGothicSm)
+/*  f0e80c8:	8d6bfb0c */ 	lw	$t3,%lo(g_FontHandelGothicSm)($t3)
+/*  f0e80cc:	8d29fb10 */ 	lw	$t1,%lo(g_CharsHandelGothicSm)($t1)
 /*  f0e80d0:	01aa7021 */ 	addu	$t6,$t5,$t2
 /*  f0e80d4:	01d84023 */ 	subu	$t0,$t6,$t8
 /*  f0e80d8:	250ffff6 */ 	addiu	$t7,$t0,-10
@@ -3727,10 +3727,10 @@ glabel menuRenderOverlayDropdown
 /*  f0e83f8:	a7a90072 */ 	sh	$t1,0x72($sp)
 /*  f0e83fc:	52c00021 */ 	beqzl	$s6,.L0f0e8484
 /*  f0e8400:	87ac00ae */ 	lh	$t4,0xae($sp)
-/*  f0e8404:	3c158008 */ 	lui	$s5,%hi(g_FontHandelGothicSm2)
-/*  f0e8408:	3c148008 */ 	lui	$s4,%hi(g_FontHandelGothicSm1)
-/*  f0e840c:	2694fb10 */ 	addiu	$s4,$s4,%lo(g_FontHandelGothicSm1)
-/*  f0e8410:	26b5fb0c */ 	addiu	$s5,$s5,%lo(g_FontHandelGothicSm2)
+/*  f0e8404:	3c158008 */ 	lui	$s5,%hi(g_FontHandelGothicSm)
+/*  f0e8408:	3c148008 */ 	lui	$s4,%hi(g_CharsHandelGothicSm)
+/*  f0e840c:	2694fb10 */ 	addiu	$s4,$s4,%lo(g_CharsHandelGothicSm)
+/*  f0e8410:	26b5fb0c */ 	addiu	$s5,$s5,%lo(g_FontHandelGothicSm)
 /*  f0e8414:	27b30098 */ 	addiu	$s3,$sp,0x98
 /*  f0e8418:	27b20094 */ 	addiu	$s2,$sp,0x94
 /*  f0e841c:	afb0005c */ 	sw	$s0,0x5c($sp)
@@ -4069,7 +4069,7 @@ glabel menuRenderOverlayDropdown
 //			// 420
 //			handlerdata.dropdown.value = i;
 //			text = (char *)item->handler(MENUOP_GETOPTIONTEXT, item, &handlerdata);
-//			textMeasure(&textheight, &textwidth, text, g_FontHandelGothicSm1, g_FontHandelGothicSm2, 0);
+//			textMeasure(&textheight, &textwidth, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0);
 //			textwidth += 6;
 //
 //			if (textwidth > context.width) {
@@ -4184,7 +4184,7 @@ Gfx *menuRenderItemKeyboard(Gfx *gdl, struct menurendercontext *context)
 	y = context->y + 2;
 
 	gdl = func0f153628(gdl);
-	gdl = textRenderProjected(gdl, &x, &y, data->string, g_FontHandelGothicSm1, g_FontHandelGothicSm2, 0xffffffff, context->width, context->height, 0, 0);
+	gdl = textRenderProjected(gdl, &x, &y, data->string, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0xffffffff, context->width, context->height, 0, 0);
 	gdl = func0f153780(gdl);
 
 	// Render cursor
@@ -4303,7 +4303,7 @@ Gfx *menuRenderItemKeyboard(Gfx *gdl, struct menurendercontext *context)
 						buttonwidth = 36;
 					}
 
-					textMeasure(&textheight, &textwidth, langGet(labels[index]), g_FontHandelGothicXs1, g_FontHandelGothicXs2, 0);
+					textMeasure(&textheight, &textwidth, langGet(labels[index]), g_CharsHandelGothicXs, g_FontHandelGothicXs, 0);
 					x = (buttonwidth - textwidth) / 2 + x;
 
 					// Dim the OK button if string is empty
@@ -4326,7 +4326,7 @@ Gfx *menuRenderItemKeyboard(Gfx *gdl, struct menurendercontext *context)
 								g_MenuColourPalettes2[context->frame->type].disabled);
 					}
 
-					gdl = textRenderProjected(gdl, &x, &y, langGet(labels[index]), g_FontHandelGothicXs1, g_FontHandelGothicXs2, textcolour, context->width, context->height, 0, 0);
+					gdl = textRenderProjected(gdl, &x, &y, langGet(labels[index]), g_CharsHandelGothicXs, g_FontHandelGothicXs, textcolour, context->width, context->height, 0, 0);
 
 					if (index == 3 && menuIsStringEmptyOrSpaces(data->string)) {
 						func0f153e38(
@@ -4343,9 +4343,9 @@ Gfx *menuRenderItemKeyboard(Gfx *gdl, struct menurendercontext *context)
 					label[0] += 32;
 				}
 
-				textMeasure(&textheight, &textwidth, label, g_FontHandelGothicSm1, g_FontHandelGothicSm2, 0);
+				textMeasure(&textheight, &textwidth, label, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0);
 				x = (12 - textwidth) / 2 + x;
-				gdl = textRenderProjected(gdl, &x, &y, label, g_FontHandelGothicSm1, g_FontHandelGothicSm2, textcolour, context->width, context->height, 0, 0);
+				gdl = textRenderProjected(gdl, &x, &y, label, g_CharsHandelGothicSm, g_FontHandelGothicSm, textcolour, context->width, context->height, 0, 0);
 			}
 		}
 	}
@@ -4547,7 +4547,7 @@ bool menuTickItemKeyboard(struct menuitem *item, struct menuinputs *inputs, u32
 						i++;
 					}
 
-					textMeasure(&textheight, &textwidth, kb->string, g_FontHandelGothicSm1, g_FontHandelGothicSm2, 0);
+					textMeasure(&textheight, &textwidth, kb->string, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0);
 
 					if (item->param3 == 0 && textwidth > 58) {
 						delete = true;
@@ -4743,10 +4743,10 @@ glabel menuRenderObjective
 /*  f0e9a14:	02002025 */ 	or	$a0,$s0,$zero
 /*  f0e9a18:	0c004dad */ 	jal	sprintf
 /*  f0e9a1c:	8fa6013c */ 	lw	$a2,0x13c($sp)
-/*  f0e9a20:	3c198008 */ 	lui	$t9,%hi(g_FontHandelGothicSm2)
-/*  f0e9a24:	8f39fb0c */ 	lw	$t9,%lo(g_FontHandelGothicSm2)($t9)
-/*  f0e9a28:	3c078008 */ 	lui	$a3,%hi(g_FontHandelGothicSm1)
-/*  f0e9a2c:	8ce7fb10 */ 	lw	$a3,%lo(g_FontHandelGothicSm1)($a3)
+/*  f0e9a20:	3c198008 */ 	lui	$t9,%hi(g_FontHandelGothicSm)
+/*  f0e9a24:	8f39fb0c */ 	lw	$t9,%lo(g_FontHandelGothicSm)($t9)
+/*  f0e9a28:	3c078008 */ 	lui	$a3,%hi(g_CharsHandelGothicSm)
+/*  f0e9a2c:	8ce7fb10 */ 	lw	$a3,%lo(g_CharsHandelGothicSm)($a3)
 /*  f0e9a30:	27a400c0 */ 	addiu	$a0,$sp,0xc0
 /*  f0e9a34:	27a500c4 */ 	addiu	$a1,$sp,0xc4
 /*  f0e9a38:	02003025 */ 	or	$a2,$s0,$zero
@@ -4755,10 +4755,10 @@ glabel menuRenderObjective
 /*  f0e9a44:	afb90010 */ 	sw	$t9,0x10($sp)
 /*  f0e9a48:	87ae0142 */ 	lh	$t6,0x142($sp)
 /*  f0e9a4c:	8fa900c4 */ 	lw	$t1,0xc4($sp)
-/*  f0e9a50:	3c0b8008 */ 	lui	$t3,%hi(g_FontHandelGothicSm1)
-/*  f0e9a54:	3c0d8008 */ 	lui	$t5,%hi(g_FontHandelGothicSm2)
-/*  f0e9a58:	8dadfb0c */ 	lw	$t5,%lo(g_FontHandelGothicSm2)($t5)
-/*  f0e9a5c:	8d6bfb10 */ 	lw	$t3,%lo(g_FontHandelGothicSm1)($t3)
+/*  f0e9a50:	3c0b8008 */ 	lui	$t3,%hi(g_CharsHandelGothicSm)
+/*  f0e9a54:	3c0d8008 */ 	lui	$t5,%hi(g_FontHandelGothicSm)
+/*  f0e9a58:	8dadfb0c */ 	lw	$t5,%lo(g_FontHandelGothicSm)($t5)
+/*  f0e9a5c:	8d6bfb10 */ 	lw	$t3,%lo(g_CharsHandelGothicSm)($t3)
 /*  f0e9a60:	8faf012c */ 	lw	$t7,0x12c($sp)
 /*  f0e9a64:	87b8014a */ 	lh	$t8,0x14a($sp)
 /*  f0e9a68:	87b9014e */ 	lh	$t9,0x14e($sp)
@@ -4783,19 +4783,19 @@ glabel menuRenderObjective
 /*  f0e9ab4:	25c90019 */ 	addiu	$t1,$t6,0x19
 /*  f0e9ab8:	1140001f */ 	beqz	$t2,.L0f0e9b38
 /*  f0e9abc:	afa90128 */ 	sw	$t1,0x128($sp)
-/*  f0e9ac0:	3c0c8008 */ 	lui	$t4,%hi(g_FontHandelGothicXs2)
-/*  f0e9ac4:	8d8cfb04 */ 	lw	$t4,%lo(g_FontHandelGothicXs2)($t4)
-/*  f0e9ac8:	3c078008 */ 	lui	$a3,%hi(g_FontHandelGothicXs1)
-/*  f0e9acc:	8ce7fb08 */ 	lw	$a3,%lo(g_FontHandelGothicXs1)($a3)
+/*  f0e9ac0:	3c0c8008 */ 	lui	$t4,%hi(g_FontHandelGothicXs)
+/*  f0e9ac4:	8d8cfb04 */ 	lw	$t4,%lo(g_FontHandelGothicXs)($t4)
+/*  f0e9ac8:	3c078008 */ 	lui	$a3,%hi(g_CharsHandelGothicXs)
+/*  f0e9acc:	8ce7fb08 */ 	lw	$a3,%lo(g_CharsHandelGothicXs)($a3)
 /*  f0e9ad0:	24040055 */ 	addiu	$a0,$zero,0x55
 /*  f0e9ad4:	8fa50120 */ 	lw	$a1,0x120($sp)
 /*  f0e9ad8:	02003025 */ 	or	$a2,$s0,$zero
 /*  f0e9adc:	0fc55d48 */ 	jal	textWrap
 /*  f0e9ae0:	afac0010 */ 	sw	$t4,0x10($sp)
-/*  f0e9ae4:	3c0b8008 */ 	lui	$t3,%hi(g_FontHandelGothicXs1)
-/*  f0e9ae8:	3c0d8008 */ 	lui	$t5,%hi(g_FontHandelGothicXs2)
-/*  f0e9aec:	8dadfb04 */ 	lw	$t5,%lo(g_FontHandelGothicXs2)($t5)
-/*  f0e9af0:	8d6bfb08 */ 	lw	$t3,%lo(g_FontHandelGothicXs1)($t3)
+/*  f0e9ae4:	3c0b8008 */ 	lui	$t3,%hi(g_CharsHandelGothicXs)
+/*  f0e9ae8:	3c0d8008 */ 	lui	$t5,%hi(g_FontHandelGothicXs)
+/*  f0e9aec:	8dadfb04 */ 	lw	$t5,%lo(g_FontHandelGothicXs)($t5)
+/*  f0e9af0:	8d6bfb08 */ 	lw	$t3,%lo(g_CharsHandelGothicXs)($t3)
 /*  f0e9af4:	8faf012c */ 	lw	$t7,0x12c($sp)
 /*  f0e9af8:	87b8014a */ 	lh	$t8,0x14a($sp)
 /*  f0e9afc:	87b9014e */ 	lh	$t9,0x14e($sp)
@@ -4819,10 +4819,10 @@ glabel menuRenderObjective
 /*  f0e9b40:	02002025 */ 	or	$a0,$s0,$zero
 /*  f0e9b44:	0c004dad */ 	jal	sprintf
 /*  f0e9b48:	8fa60120 */ 	lw	$a2,0x120($sp)
-/*  f0e9b4c:	3c0e8008 */ 	lui	$t6,%hi(g_FontHandelGothicSm1)
-/*  f0e9b50:	3c098008 */ 	lui	$t1,%hi(g_FontHandelGothicSm2)
-/*  f0e9b54:	8d29fb0c */ 	lw	$t1,%lo(g_FontHandelGothicSm2)($t1)
-/*  f0e9b58:	8dcefb10 */ 	lw	$t6,%lo(g_FontHandelGothicSm1)($t6)
+/*  f0e9b4c:	3c0e8008 */ 	lui	$t6,%hi(g_CharsHandelGothicSm)
+/*  f0e9b50:	3c098008 */ 	lui	$t1,%hi(g_FontHandelGothicSm)
+/*  f0e9b54:	8d29fb0c */ 	lw	$t1,%lo(g_FontHandelGothicSm)($t1)
+/*  f0e9b58:	8dcefb10 */ 	lw	$t6,%lo(g_CharsHandelGothicSm)($t6)
 /*  f0e9b5c:	8faa012c */ 	lw	$t2,0x12c($sp)
 /*  f0e9b60:	87ac014a */ 	lh	$t4,0x14a($sp)
 /*  f0e9b64:	87ab014e */ 	lh	$t3,0x14e($sp)
@@ -4844,7 +4844,7 @@ glabel menuRenderObjective
 /*  f0e9ba0:	27a400c0 */ 	addiu	$a0,$sp,0xc0
 /*  f0e9ba4:	27a500c4 */ 	addiu	$a1,$sp,0xc4
 /*  f0e9ba8:	11a00141 */ 	beqz	$t5,.L0f0ea0b0
-/*  f0e9bac:	3c078008 */ 	lui	$a3,%hi(g_FontHandelGothicSm1)
+/*  f0e9bac:	3c078008 */ 	lui	$a3,%hi(g_CharsHandelGothicSm)
 /*  f0e9bb0:	0fc255a1 */ 	jal	objectiveCheck
 /*  f0e9bb4:	8fa40138 */ 	lw	$a0,0x138($sp)
 /*  f0e9bb8:	10400007 */ 	beqz	$v0,.L0f0e9bd8
@@ -4895,15 +4895,15 @@ glabel menuRenderObjective
 /*  f0e9c5c:	27a400c0 */ 	addiu	$a0,$sp,0xc0
 /*  f0e9c60:	27a500c4 */ 	addiu	$a1,$sp,0xc4
 /*  f0e9c64:	11cc0004 */ 	beq	$t6,$t4,.L0f0e9c78
-/*  f0e9c68:	3c078008 */ 	lui	$a3,%hi(g_FontHandelGothicXs1)
+/*  f0e9c68:	3c078008 */ 	lui	$a3,%hi(g_CharsHandelGothicXs)
 /*  f0e9c6c:	3c0b7f1b */ 	lui	$t3,%hi(g_MenuColourPalettes+0x18)
 /*  f0e9c70:	8d6b1fc8 */ 	lw	$t3,%lo(g_MenuColourPalettes+0x18)($t3)
 /*  f0e9c74:	afab00c8 */ 	sw	$t3,0xc8($sp)
 .L0f0e9c78:
-/*  f0e9c78:	3c0d8008 */ 	lui	$t5,%hi(g_FontHandelGothicXs2)
-/*  f0e9c7c:	8dadfb04 */ 	lw	$t5,%lo(g_FontHandelGothicXs2)($t5)
+/*  f0e9c78:	3c0d8008 */ 	lui	$t5,%hi(g_FontHandelGothicXs)
+/*  f0e9c7c:	8dadfb04 */ 	lw	$t5,%lo(g_FontHandelGothicXs)($t5)
 /*  f0e9c80:	8fa600cc */ 	lw	$a2,0xcc($sp)
-/*  f0e9c84:	8ce7fb08 */ 	lw	$a3,%lo(g_FontHandelGothicXs1)($a3)
+/*  f0e9c84:	8ce7fb08 */ 	lw	$a3,%lo(g_CharsHandelGothicXs)($a3)
 /*  f0e9c88:	afa00014 */ 	sw	$zero,0x14($sp)
 /*  f0e9c8c:	0fc55cbe */ 	jal	textMeasure
 /*  f0e9c90:	afad0010 */ 	sw	$t5,0x10($sp)
@@ -4912,7 +4912,7 @@ glabel menuRenderObjective
 /*  f0e9c9c:	27a50128 */ 	addiu	$a1,$sp,0x128
 /*  f0e9ca0:	27a60124 */ 	addiu	$a2,$sp,0x124
 /*  f0e9ca4:	10400002 */ 	beqz	$v0,.L0f0e9cb0
-/*  f0e9ca8:	3c0c8008 */ 	lui	$t4,%hi(g_FontHandelGothicXs1)
+/*  f0e9ca8:	3c0c8008 */ 	lui	$t4,%hi(g_CharsHandelGothicXs)
 /*  f0e9cac:	afa200c8 */ 	sw	$v0,0xc8($sp)
 .L0f0e9cb0:
 /*  f0e9cb0:	87a2014a */ 	lh	$v0,0x14a($sp)
@@ -4921,10 +4921,10 @@ glabel menuRenderObjective
 /*  f0e9cbc:	87aa0146 */ 	lh	$t2,0x146($sp)
 /*  f0e9cc0:	8fae00bc */ 	lw	$t6,0xbc($sp)
 /*  f0e9cc4:	01e28021 */ 	addu	$s0,$t7,$v0
-/*  f0e9cc8:	3c0b8008 */ 	lui	$t3,%hi(g_FontHandelGothicXs2)
-/*  f0e9ccc:	8d6bfb04 */ 	lw	$t3,%lo(g_FontHandelGothicXs2)($t3)
+/*  f0e9cc8:	3c0b8008 */ 	lui	$t3,%hi(g_FontHandelGothicXs)
+/*  f0e9ccc:	8d6bfb04 */ 	lw	$t3,%lo(g_FontHandelGothicXs)($t3)
 /*  f0e9cd0:	87af014e */ 	lh	$t7,0x14e($sp)
-/*  f0e9cd4:	8d8cfb08 */ 	lw	$t4,%lo(g_FontHandelGothicXs1)($t4)
+/*  f0e9cd4:	8d8cfb08 */ 	lw	$t4,%lo(g_CharsHandelGothicXs)($t4)
 /*  f0e9cd8:	8fad00c8 */ 	lw	$t5,0xc8($sp)
 /*  f0e9cdc:	0218c823 */ 	subu	$t9,$s0,$t8
 /*  f0e9ce0:	014e1821 */ 	addu	$v1,$t2,$t6
@@ -4945,11 +4945,11 @@ glabel menuRenderObjective
 /*  f0e9d1c:	afad0018 */ 	sw	$t5,0x18($sp)
 /*  f0e9d20:	8fb800c4 */ 	lw	$t8,0xc4($sp)
 /*  f0e9d24:	8fac00c8 */ 	lw	$t4,0xc8($sp)
-/*  f0e9d28:	3c0a8008 */ 	lui	$t2,%hi(g_FontHandelGothicXs1)
-/*  f0e9d2c:	3c0e8008 */ 	lui	$t6,%hi(g_FontHandelGothicXs2)
+/*  f0e9d28:	3c0a8008 */ 	lui	$t2,%hi(g_CharsHandelGothicXs)
+/*  f0e9d2c:	3c0e8008 */ 	lui	$t6,%hi(g_FontHandelGothicXs)
 /*  f0e9d30:	8fa30058 */ 	lw	$v1,0x58($sp)
-/*  f0e9d34:	8dcefb04 */ 	lw	$t6,%lo(g_FontHandelGothicXs2)($t6)
-/*  f0e9d38:	8d4afb08 */ 	lw	$t2,%lo(g_FontHandelGothicXs1)($t2)
+/*  f0e9d34:	8dcefb04 */ 	lw	$t6,%lo(g_FontHandelGothicXs)($t6)
+/*  f0e9d38:	8d4afb08 */ 	lw	$t2,%lo(g_CharsHandelGothicXs)($t2)
 /*  f0e9d3c:	87ad014a */ 	lh	$t5,0x14a($sp)
 /*  f0e9d40:	87af014e */ 	lh	$t7,0x14e($sp)
 /*  f0e9d44:	2401ff7f */ 	addiu	$at,$zero,-129
@@ -5176,8 +5176,8 @@ glabel menuRenderObjective
 /*  f0ea0b0:	87b80146 */ 	lh	$t8,0x146($sp)
 /*  f0ea0b4:	87ad0142 */ 	lh	$t5,0x142($sp)
 /*  f0ea0b8:	8faa0124 */ 	lw	$t2,0x124($sp)
-/*  f0ea0bc:	3c0b8008 */ 	lui	$t3,%hi(g_FontHandelGothicSm2)
-/*  f0ea0c0:	8d6bfb0c */ 	lw	$t3,%lo(g_FontHandelGothicSm2)($t3)
+/*  f0ea0bc:	3c0b8008 */ 	lui	$t3,%hi(g_FontHandelGothicSm)
+/*  f0ea0c0:	8d6bfb0c */ 	lw	$t3,%lo(g_FontHandelGothicSm)($t3)
 /*  f0ea0c4:	2719fffe */ 	addiu	$t9,$t8,-2
 /*  f0ea0c8:	27090008 */ 	addiu	$t1,$t8,0x8
 /*  f0ea0cc:	25af0016 */ 	addiu	$t7,$t5,0x16
@@ -5187,7 +5187,7 @@ glabel menuRenderObjective
 /*  f0ea0dc:	afa90078 */ 	sw	$t1,0x78($sp)
 /*  f0ea0e0:	afac0074 */ 	sw	$t4,0x74($sp)
 /*  f0ea0e4:	8fa60120 */ 	lw	$a2,0x120($sp)
-/*  f0ea0e8:	8ce7fb10 */ 	lw	$a3,%lo(g_FontHandelGothicSm1)($a3)
+/*  f0ea0e8:	8ce7fb10 */ 	lw	$a3,%lo(g_CharsHandelGothicSm)($a3)
 /*  f0ea0ec:	afa00014 */ 	sw	$zero,0x14($sp)
 /*  f0ea0f0:	0fc55cbe */ 	jal	textMeasure
 /*  f0ea0f4:	afab0010 */ 	sw	$t3,0x10($sp)
@@ -5396,10 +5396,10 @@ glabel menuRenderObjective
 /*  f0e9a14:	02002025 */ 	or	$a0,$s0,$zero
 /*  f0e9a18:	0c004dad */ 	jal	sprintf
 /*  f0e9a1c:	8fa6013c */ 	lw	$a2,0x13c($sp)
-/*  f0e9a20:	3c198008 */ 	lui	$t9,%hi(g_FontHandelGothicSm2)
-/*  f0e9a24:	8f39fb0c */ 	lw	$t9,%lo(g_FontHandelGothicSm2)($t9)
-/*  f0e9a28:	3c078008 */ 	lui	$a3,%hi(g_FontHandelGothicSm1)
-/*  f0e9a2c:	8ce7fb10 */ 	lw	$a3,%lo(g_FontHandelGothicSm1)($a3)
+/*  f0e9a20:	3c198008 */ 	lui	$t9,%hi(g_FontHandelGothicSm)
+/*  f0e9a24:	8f39fb0c */ 	lw	$t9,%lo(g_FontHandelGothicSm)($t9)
+/*  f0e9a28:	3c078008 */ 	lui	$a3,%hi(g_CharsHandelGothicSm)
+/*  f0e9a2c:	8ce7fb10 */ 	lw	$a3,%lo(g_CharsHandelGothicSm)($a3)
 /*  f0e9a30:	27a400c0 */ 	addiu	$a0,$sp,0xc0
 /*  f0e9a34:	27a500c4 */ 	addiu	$a1,$sp,0xc4
 /*  f0e9a38:	02003025 */ 	or	$a2,$s0,$zero
@@ -5408,10 +5408,10 @@ glabel menuRenderObjective
 /*  f0e9a44:	afb90010 */ 	sw	$t9,0x10($sp)
 /*  f0e9a48:	87ae0142 */ 	lh	$t6,0x142($sp)
 /*  f0e9a4c:	8fa900c4 */ 	lw	$t1,0xc4($sp)
-/*  f0e9a50:	3c0b8008 */ 	lui	$t3,%hi(g_FontHandelGothicSm1)
-/*  f0e9a54:	3c0d8008 */ 	lui	$t5,%hi(g_FontHandelGothicSm2)
-/*  f0e9a58:	8dadfb0c */ 	lw	$t5,%lo(g_FontHandelGothicSm2)($t5)
-/*  f0e9a5c:	8d6bfb10 */ 	lw	$t3,%lo(g_FontHandelGothicSm1)($t3)
+/*  f0e9a50:	3c0b8008 */ 	lui	$t3,%hi(g_CharsHandelGothicSm)
+/*  f0e9a54:	3c0d8008 */ 	lui	$t5,%hi(g_FontHandelGothicSm)
+/*  f0e9a58:	8dadfb0c */ 	lw	$t5,%lo(g_FontHandelGothicSm)($t5)
+/*  f0e9a5c:	8d6bfb10 */ 	lw	$t3,%lo(g_CharsHandelGothicSm)($t3)
 /*  f0e9a60:	8faf012c */ 	lw	$t7,0x12c($sp)
 /*  f0e9a64:	87b8014a */ 	lh	$t8,0x14a($sp)
 /*  f0e9a68:	87b9014e */ 	lh	$t9,0x14e($sp)
@@ -5436,19 +5436,19 @@ glabel menuRenderObjective
 /*  f0e9ab4:	25c90019 */ 	addiu	$t1,$t6,0x19
 /*  f0e9ab8:	1140001f */ 	beqz	$t2,.L0f0e9b38
 /*  f0e9abc:	afa90128 */ 	sw	$t1,0x128($sp)
-/*  f0e9ac0:	3c0c8008 */ 	lui	$t4,%hi(g_FontHandelGothicXs2)
-/*  f0e9ac4:	8d8cfb04 */ 	lw	$t4,%lo(g_FontHandelGothicXs2)($t4)
-/*  f0e9ac8:	3c078008 */ 	lui	$a3,%hi(g_FontHandelGothicXs1)
-/*  f0e9acc:	8ce7fb08 */ 	lw	$a3,%lo(g_FontHandelGothicXs1)($a3)
+/*  f0e9ac0:	3c0c8008 */ 	lui	$t4,%hi(g_FontHandelGothicXs)
+/*  f0e9ac4:	8d8cfb04 */ 	lw	$t4,%lo(g_FontHandelGothicXs)($t4)
+/*  f0e9ac8:	3c078008 */ 	lui	$a3,%hi(g_CharsHandelGothicXs)
+/*  f0e9acc:	8ce7fb08 */ 	lw	$a3,%lo(g_CharsHandelGothicXs)($a3)
 /*  f0e9ad0:	24040055 */ 	addiu	$a0,$zero,0x55
 /*  f0e9ad4:	8fa50120 */ 	lw	$a1,0x120($sp)
 /*  f0e9ad8:	02003025 */ 	or	$a2,$s0,$zero
 /*  f0e9adc:	0fc55d48 */ 	jal	textWrap
 /*  f0e9ae0:	afac0010 */ 	sw	$t4,0x10($sp)
-/*  f0e9ae4:	3c0b8008 */ 	lui	$t3,%hi(g_FontHandelGothicXs1)
-/*  f0e9ae8:	3c0d8008 */ 	lui	$t5,%hi(g_FontHandelGothicXs2)
-/*  f0e9aec:	8dadfb04 */ 	lw	$t5,%lo(g_FontHandelGothicXs2)($t5)
-/*  f0e9af0:	8d6bfb08 */ 	lw	$t3,%lo(g_FontHandelGothicXs1)($t3)
+/*  f0e9ae4:	3c0b8008 */ 	lui	$t3,%hi(g_CharsHandelGothicXs)
+/*  f0e9ae8:	3c0d8008 */ 	lui	$t5,%hi(g_FontHandelGothicXs)
+/*  f0e9aec:	8dadfb04 */ 	lw	$t5,%lo(g_FontHandelGothicXs)($t5)
+/*  f0e9af0:	8d6bfb08 */ 	lw	$t3,%lo(g_CharsHandelGothicXs)($t3)
 /*  f0e9af4:	8faf012c */ 	lw	$t7,0x12c($sp)
 /*  f0e9af8:	87b8014a */ 	lh	$t8,0x14a($sp)
 /*  f0e9afc:	87b9014e */ 	lh	$t9,0x14e($sp)
@@ -5472,10 +5472,10 @@ glabel menuRenderObjective
 /*  f0e9b40:	02002025 */ 	or	$a0,$s0,$zero
 /*  f0e9b44:	0c004dad */ 	jal	sprintf
 /*  f0e9b48:	8fa60120 */ 	lw	$a2,0x120($sp)
-/*  f0e9b4c:	3c0e8008 */ 	lui	$t6,%hi(g_FontHandelGothicSm1)
-/*  f0e9b50:	3c098008 */ 	lui	$t1,%hi(g_FontHandelGothicSm2)
-/*  f0e9b54:	8d29fb0c */ 	lw	$t1,%lo(g_FontHandelGothicSm2)($t1)
-/*  f0e9b58:	8dcefb10 */ 	lw	$t6,%lo(g_FontHandelGothicSm1)($t6)
+/*  f0e9b4c:	3c0e8008 */ 	lui	$t6,%hi(g_CharsHandelGothicSm)
+/*  f0e9b50:	3c098008 */ 	lui	$t1,%hi(g_FontHandelGothicSm)
+/*  f0e9b54:	8d29fb0c */ 	lw	$t1,%lo(g_FontHandelGothicSm)($t1)
+/*  f0e9b58:	8dcefb10 */ 	lw	$t6,%lo(g_CharsHandelGothicSm)($t6)
 /*  f0e9b5c:	8faa012c */ 	lw	$t2,0x12c($sp)
 /*  f0e9b60:	87ac014a */ 	lh	$t4,0x14a($sp)
 /*  f0e9b64:	87ab014e */ 	lh	$t3,0x14e($sp)
@@ -5497,7 +5497,7 @@ glabel menuRenderObjective
 /*  f0e9ba0:	27a400c0 */ 	addiu	$a0,$sp,0xc0
 /*  f0e9ba4:	27a500c4 */ 	addiu	$a1,$sp,0xc4
 /*  f0e9ba8:	11a00141 */ 	beqz	$t5,.L0f0ea0b0
-/*  f0e9bac:	3c078008 */ 	lui	$a3,%hi(g_FontHandelGothicSm1)
+/*  f0e9bac:	3c078008 */ 	lui	$a3,%hi(g_CharsHandelGothicSm)
 /*  f0e9bb0:	0fc255a1 */ 	jal	objectiveCheck
 /*  f0e9bb4:	8fa40138 */ 	lw	$a0,0x138($sp)
 /*  f0e9bb8:	10400007 */ 	beqz	$v0,.L0f0e9bd8
@@ -5548,15 +5548,15 @@ glabel menuRenderObjective
 /*  f0e9c5c:	27a400c0 */ 	addiu	$a0,$sp,0xc0
 /*  f0e9c60:	27a500c4 */ 	addiu	$a1,$sp,0xc4
 /*  f0e9c64:	11cc0004 */ 	beq	$t6,$t4,.L0f0e9c78
-/*  f0e9c68:	3c078008 */ 	lui	$a3,%hi(g_FontHandelGothicXs1)
+/*  f0e9c68:	3c078008 */ 	lui	$a3,%hi(g_CharsHandelGothicXs)
 /*  f0e9c6c:	3c0b7f1b */ 	lui	$t3,%hi(g_MenuColourPalettes+0x18)
 /*  f0e9c70:	8d6b1fc8 */ 	lw	$t3,%lo(g_MenuColourPalettes+0x18)($t3)
 /*  f0e9c74:	afab00c8 */ 	sw	$t3,0xc8($sp)
 .L0f0e9c78:
-/*  f0e9c78:	3c0d8008 */ 	lui	$t5,%hi(g_FontHandelGothicXs2)
-/*  f0e9c7c:	8dadfb04 */ 	lw	$t5,%lo(g_FontHandelGothicXs2)($t5)
+/*  f0e9c78:	3c0d8008 */ 	lui	$t5,%hi(g_FontHandelGothicXs)
+/*  f0e9c7c:	8dadfb04 */ 	lw	$t5,%lo(g_FontHandelGothicXs)($t5)
 /*  f0e9c80:	8fa600cc */ 	lw	$a2,0xcc($sp)
-/*  f0e9c84:	8ce7fb08 */ 	lw	$a3,%lo(g_FontHandelGothicXs1)($a3)
+/*  f0e9c84:	8ce7fb08 */ 	lw	$a3,%lo(g_CharsHandelGothicXs)($a3)
 /*  f0e9c88:	afa00014 */ 	sw	$zero,0x14($sp)
 /*  f0e9c8c:	0fc55cbe */ 	jal	textMeasure
 /*  f0e9c90:	afad0010 */ 	sw	$t5,0x10($sp)
@@ -5565,7 +5565,7 @@ glabel menuRenderObjective
 /*  f0e9c9c:	27a50128 */ 	addiu	$a1,$sp,0x128
 /*  f0e9ca0:	27a60124 */ 	addiu	$a2,$sp,0x124
 /*  f0e9ca4:	10400002 */ 	beqz	$v0,.L0f0e9cb0
-/*  f0e9ca8:	3c0c8008 */ 	lui	$t4,%hi(g_FontHandelGothicXs1)
+/*  f0e9ca8:	3c0c8008 */ 	lui	$t4,%hi(g_CharsHandelGothicXs)
 /*  f0e9cac:	afa200c8 */ 	sw	$v0,0xc8($sp)
 .L0f0e9cb0:
 /*  f0e9cb0:	87a2014a */ 	lh	$v0,0x14a($sp)
@@ -5574,10 +5574,10 @@ glabel menuRenderObjective
 /*  f0e9cbc:	87aa0146 */ 	lh	$t2,0x146($sp)
 /*  f0e9cc0:	8fae00bc */ 	lw	$t6,0xbc($sp)
 /*  f0e9cc4:	01e28021 */ 	addu	$s0,$t7,$v0
-/*  f0e9cc8:	3c0b8008 */ 	lui	$t3,%hi(g_FontHandelGothicXs2)
-/*  f0e9ccc:	8d6bfb04 */ 	lw	$t3,%lo(g_FontHandelGothicXs2)($t3)
+/*  f0e9cc8:	3c0b8008 */ 	lui	$t3,%hi(g_FontHandelGothicXs)
+/*  f0e9ccc:	8d6bfb04 */ 	lw	$t3,%lo(g_FontHandelGothicXs)($t3)
 /*  f0e9cd0:	87af014e */ 	lh	$t7,0x14e($sp)
-/*  f0e9cd4:	8d8cfb08 */ 	lw	$t4,%lo(g_FontHandelGothicXs1)($t4)
+/*  f0e9cd4:	8d8cfb08 */ 	lw	$t4,%lo(g_CharsHandelGothicXs)($t4)
 /*  f0e9cd8:	8fad00c8 */ 	lw	$t5,0xc8($sp)
 /*  f0e9cdc:	0218c823 */ 	subu	$t9,$s0,$t8
 /*  f0e9ce0:	014e1821 */ 	addu	$v1,$t2,$t6
@@ -5598,11 +5598,11 @@ glabel menuRenderObjective
 /*  f0e9d1c:	afad0018 */ 	sw	$t5,0x18($sp)
 /*  f0e9d20:	8fb800c4 */ 	lw	$t8,0xc4($sp)
 /*  f0e9d24:	8fac00c8 */ 	lw	$t4,0xc8($sp)
-/*  f0e9d28:	3c0a8008 */ 	lui	$t2,%hi(g_FontHandelGothicXs1)
-/*  f0e9d2c:	3c0e8008 */ 	lui	$t6,%hi(g_FontHandelGothicXs2)
+/*  f0e9d28:	3c0a8008 */ 	lui	$t2,%hi(g_CharsHandelGothicXs)
+/*  f0e9d2c:	3c0e8008 */ 	lui	$t6,%hi(g_FontHandelGothicXs)
 /*  f0e9d30:	8fa30058 */ 	lw	$v1,0x58($sp)
-/*  f0e9d34:	8dcefb04 */ 	lw	$t6,%lo(g_FontHandelGothicXs2)($t6)
-/*  f0e9d38:	8d4afb08 */ 	lw	$t2,%lo(g_FontHandelGothicXs1)($t2)
+/*  f0e9d34:	8dcefb04 */ 	lw	$t6,%lo(g_FontHandelGothicXs)($t6)
+/*  f0e9d38:	8d4afb08 */ 	lw	$t2,%lo(g_CharsHandelGothicXs)($t2)
 /*  f0e9d3c:	87ad014a */ 	lh	$t5,0x14a($sp)
 /*  f0e9d40:	87af014e */ 	lh	$t7,0x14e($sp)
 /*  f0e9d44:	2401ff7f */ 	addiu	$at,$zero,-129
@@ -5829,8 +5829,8 @@ glabel menuRenderObjective
 /*  f0ea0b0:	87b80146 */ 	lh	$t8,0x146($sp)
 /*  f0ea0b4:	87ad0142 */ 	lh	$t5,0x142($sp)
 /*  f0ea0b8:	8faa0124 */ 	lw	$t2,0x124($sp)
-/*  f0ea0bc:	3c0b8008 */ 	lui	$t3,%hi(g_FontHandelGothicSm2)
-/*  f0ea0c0:	8d6bfb0c */ 	lw	$t3,%lo(g_FontHandelGothicSm2)($t3)
+/*  f0ea0bc:	3c0b8008 */ 	lui	$t3,%hi(g_FontHandelGothicSm)
+/*  f0ea0c0:	8d6bfb0c */ 	lw	$t3,%lo(g_FontHandelGothicSm)($t3)
 /*  f0ea0c4:	2719fffe */ 	addiu	$t9,$t8,-2
 /*  f0ea0c8:	27090008 */ 	addiu	$t1,$t8,0x8
 /*  f0ea0cc:	25af0016 */ 	addiu	$t7,$t5,0x16
@@ -5840,7 +5840,7 @@ glabel menuRenderObjective
 /*  f0ea0dc:	afa90078 */ 	sw	$t1,0x78($sp)
 /*  f0ea0e0:	afac0074 */ 	sw	$t4,0x74($sp)
 /*  f0ea0e4:	8fa60120 */ 	lw	$a2,0x120($sp)
-/*  f0ea0e8:	8ce7fb10 */ 	lw	$a3,%lo(g_FontHandelGothicSm1)($a3)
+/*  f0ea0e8:	8ce7fb10 */ 	lw	$a3,%lo(g_CharsHandelGothicSm)($a3)
 /*  f0ea0ec:	afa00014 */ 	sw	$zero,0x14($sp)
 /*  f0ea0f0:	0fc55cbe */ 	jal	textMeasure
 /*  f0ea0f4:	afab0010 */ 	sw	$t3,0x10($sp)
@@ -6025,8 +6025,8 @@ Gfx *menuRenderItemLabel(Gfx *gdl, struct menurendercontext *context)
 	s32 y;
 	struct menudfc *menudfc;
 	u8 savedvalue = var8007fb9c;
-	struct font2a4 *font1 = g_FontHandelGothicSm1;
-	struct font *font2 = g_FontHandelGothicSm2;
+	struct fontchar *font1 = g_CharsHandelGothicSm;
+	struct font *font2 = g_FontHandelGothicSm;
 
 	x = context->x + 10;
 	y = context->y + 2;
@@ -6042,8 +6042,8 @@ Gfx *menuRenderItemLabel(Gfx *gdl, struct menurendercontext *context)
 	}
 
 	if (context->item->param1 & 0x00000200) {
-		font1 = g_FontHandelGothicXs1;
-		font2 = g_FontHandelGothicXs2;
+		font1 = g_CharsHandelGothicXs;
+		font2 = g_FontHandelGothicXs;
 		y -= 2;
 	}
 
@@ -6254,7 +6254,7 @@ Gfx *menuRenderItemMeter(Gfx *gdl, struct menurendercontext *context)
 		gdl = func0f153628(gdl);
 		x = context->x;
 		y = context->y - 1;
-		gdl = textRenderProjected(gdl, &x, &y, text, g_FontHandelGothicXs1, g_FontHandelGothicXs2,
+		gdl = textRenderProjected(gdl, &x, &y, text, g_CharsHandelGothicXs, g_FontHandelGothicXs,
 				colour2 & 0xffffff7f, context->width, context->height, 0, 0);
 		gdl = func0f153780(gdl);
 	}
@@ -6270,17 +6270,17 @@ glabel menuRenderItemSelectable
 /*  f0eaecc:	afb00034 */ 	sw	$s0,0x34($sp)
 /*  f0eaed0:	afa40080 */ 	sw	$a0,0x80($sp)
 /*  f0eaed4:	84ae0000 */ 	lh	$t6,0x0($a1)
-/*  f0eaed8:	3c038008 */ 	lui	$v1,%hi(g_FontHandelGothicSm1)
-/*  f0eaedc:	3c078008 */ 	lui	$a3,%hi(g_FontHandelGothicSm2)
+/*  f0eaed8:	3c038008 */ 	lui	$v1,%hi(g_CharsHandelGothicSm)
+/*  f0eaedc:	3c078008 */ 	lui	$a3,%hi(g_FontHandelGothicSm)
 /*  f0eaee0:	25cf000a */ 	addiu	$t7,$t6,0xa
 /*  f0eaee4:	afaf0070 */ 	sw	$t7,0x70($sp)
 /*  f0eaee8:	84b80002 */ 	lh	$t8,0x2($a1)
 /*  f0eaeec:	00a08025 */ 	or	$s0,$a1,$zero
-/*  f0eaef0:	8c63fb10 */ 	lw	$v1,%lo(g_FontHandelGothicSm1)($v1)
+/*  f0eaef0:	8c63fb10 */ 	lw	$v1,%lo(g_CharsHandelGothicSm)($v1)
 /*  f0eaef4:	27190002 */ 	addiu	$t9,$t8,0x2
 /*  f0eaef8:	afb9006c */ 	sw	$t9,0x6c($sp)
 /*  f0eaefc:	8ca60008 */ 	lw	$a2,0x8($a1)
-/*  f0eaf00:	8ce7fb0c */ 	lw	$a3,%lo(g_FontHandelGothicSm2)($a3)
+/*  f0eaf00:	8ce7fb0c */ 	lw	$a3,%lo(g_FontHandelGothicSm)($a3)
 /*  f0eaf04:	8cc20004 */ 	lw	$v0,0x4($a2)
 /*  f0eaf08:	30480010 */ 	andi	$t0,$v0,0x10
 /*  f0eaf0c:	11000004 */ 	beqz	$t0,.L0f0eaf20
@@ -6292,10 +6292,10 @@ glabel menuRenderItemSelectable
 /*  f0eaf20:	00025a40 */ 	sll	$t3,$v0,0x9
 /*  f0eaf24:	05610005 */ 	bgez	$t3,.L0f0eaf3c
 /*  f0eaf28:	00c02025 */ 	or	$a0,$a2,$zero
-/*  f0eaf2c:	3c038008 */ 	lui	$v1,%hi(g_FontHandelGothicMd1)
-/*  f0eaf30:	3c078008 */ 	lui	$a3,%hi(g_FontHandelGothicMd2)
-/*  f0eaf34:	8c63fb18 */ 	lw	$v1,%lo(g_FontHandelGothicMd1)($v1)
-/*  f0eaf38:	8ce7fb14 */ 	lw	$a3,%lo(g_FontHandelGothicMd2)($a3)
+/*  f0eaf2c:	3c038008 */ 	lui	$v1,%hi(g_CharsHandelGothicMd)
+/*  f0eaf30:	3c078008 */ 	lui	$a3,%hi(g_FontHandelGothicMd)
+/*  f0eaf34:	8c63fb18 */ 	lw	$v1,%lo(g_CharsHandelGothicMd)($v1)
+/*  f0eaf38:	8ce7fb14 */ 	lw	$a3,%lo(g_FontHandelGothicMd)($a3)
 .L0f0eaf3c:
 /*  f0eaf3c:	afa30068 */ 	sw	$v1,0x68($sp)
 /*  f0eaf40:	0fc3c557 */ 	jal	menuResolveParam2Text
@@ -6658,16 +6658,16 @@ const char var7f1adfb8[] = "";
 //	char *text;
 //	s32 x = context->x + 10;
 //	s32 y = context->y + 2;
-//	struct font2a4 *font1 = g_FontHandelGothicSm1;
-//	struct font *font2 = g_FontHandelGothicSm2;
+//	struct fontchar *font1 = g_CharsHandelGothicSm;
+//	struct font *font2 = g_FontHandelGothicSm;
 //
 //	if (context->item->param1 & 0x00000010) {
 //		x -= 6;
 //	}
 //
 //	if (context->item->param1 & 0x00400000) {
-//		font1 = g_FontHandelGothicMd1;
-//		font2 = g_FontHandelGothicMd2;
+//		font1 = g_CharsHandelGothicMd;
+//		font2 = g_FontHandelGothicMd;
 //	}
 //
 //	text = menuResolveParam2Text(context->item);
@@ -7306,10 +7306,10 @@ glabel menuRenderItemSlider
 .L0f0ebc60:
 /*  f0ebc60:	0fc54d8a */ 	jal	func0f153628
 /*  f0ebc64:	8fa400b0 */ 	lw	$a0,0xb0($sp)
-/*  f0ebc68:	3c0f8008 */ 	lui	$t7,%hi(g_FontHandelGothicSm1)
-/*  f0ebc6c:	3c188008 */ 	lui	$t8,%hi(g_FontHandelGothicSm2)
-/*  f0ebc70:	8f18fb0c */ 	lw	$t8,%lo(g_FontHandelGothicSm2)($t8)
-/*  f0ebc74:	8deffb10 */ 	lw	$t7,%lo(g_FontHandelGothicSm1)($t7)
+/*  f0ebc68:	3c0f8008 */ 	lui	$t7,%hi(g_CharsHandelGothicSm)
+/*  f0ebc6c:	3c188008 */ 	lui	$t8,%hi(g_FontHandelGothicSm)
+/*  f0ebc70:	8f18fb0c */ 	lw	$t8,%lo(g_FontHandelGothicSm)($t8)
+/*  f0ebc74:	8deffb10 */ 	lw	$t7,%lo(g_CharsHandelGothicSm)($t7)
 /*  f0ebc78:	afb00018 */ 	sw	$s0,0x18($sp)
 /*  f0ebc7c:	afb80014 */ 	sw	$t8,0x14($sp)
 /*  f0ebc80:	afaf0010 */ 	sw	$t7,0x10($sp)
@@ -7355,10 +7355,10 @@ glabel menuRenderItemSlider
 /*  f0ebd20:	0320f809 */ 	jalr	$t9
 /*  f0ebd24:	00000000 */ 	nop
 .L0f0ebd28:
-/*  f0ebd28:	3c188008 */ 	lui	$t8,%hi(g_FontHandelGothicSm2)
-/*  f0ebd2c:	8f18fb0c */ 	lw	$t8,%lo(g_FontHandelGothicSm2)($t8)
-/*  f0ebd30:	3c078008 */ 	lui	$a3,%hi(g_FontHandelGothicSm1)
-/*  f0ebd34:	8ce7fb10 */ 	lw	$a3,%lo(g_FontHandelGothicSm1)($a3)
+/*  f0ebd28:	3c188008 */ 	lui	$t8,%hi(g_FontHandelGothicSm)
+/*  f0ebd2c:	8f18fb0c */ 	lw	$t8,%lo(g_FontHandelGothicSm)($t8)
+/*  f0ebd30:	3c078008 */ 	lui	$a3,%hi(g_CharsHandelGothicSm)
+/*  f0ebd34:	8ce7fb10 */ 	lw	$a3,%lo(g_CharsHandelGothicSm)($a3)
 /*  f0ebd38:	27a40084 */ 	addiu	$a0,$sp,0x84
 /*  f0ebd3c:	27a50088 */ 	addiu	$a1,$sp,0x88
 /*  f0ebd40:	27a60098 */ 	addiu	$a2,$sp,0x98
@@ -7430,10 +7430,10 @@ glabel menuRenderItemSlider
 /*  f0ebe3c:	8ca52130 */ 	lw	$a1,%lo(g_MenuColourPalettes2+0x18)($a1)
 /*  f0ebe40:	0fc54f8e */ 	jal	func0f153e38
 /*  f0ebe44:	8c842298 */ 	lw	$a0,%lo(g_MenuColourPalettes3+0x18)($a0)
-/*  f0ebe48:	3c098008 */ 	lui	$t1,%hi(g_FontHandelGothicSm1)
-/*  f0ebe4c:	3c0a8008 */ 	lui	$t2,%hi(g_FontHandelGothicSm2)
-/*  f0ebe50:	8d4afb0c */ 	lw	$t2,%lo(g_FontHandelGothicSm2)($t2)
-/*  f0ebe54:	8d29fb10 */ 	lw	$t1,%lo(g_FontHandelGothicSm1)($t1)
+/*  f0ebe48:	3c098008 */ 	lui	$t1,%hi(g_CharsHandelGothicSm)
+/*  f0ebe4c:	3c0a8008 */ 	lui	$t2,%hi(g_FontHandelGothicSm)
+/*  f0ebe50:	8d4afb0c */ 	lw	$t2,%lo(g_FontHandelGothicSm)($t2)
+/*  f0ebe54:	8d29fb10 */ 	lw	$t1,%lo(g_CharsHandelGothicSm)($t1)
 /*  f0ebe58:	2401ff00 */ 	addiu	$at,$zero,-256
 /*  f0ebe5c:	320d00ff */ 	andi	$t5,$s0,0xff
 /*  f0ebe60:	000d5842 */ 	srl	$t3,$t5,0x1
@@ -7695,18 +7695,18 @@ glabel menuRenderItemCheckbox
 /*  f0ec668:	afa00060 */ 	sw	$zero,0x60($sp)
 /*  f0ec66c:	afae005c */ 	sw	$t6,0x5c($sp)
 /*  f0ec670:	8caf0008 */ 	lw	$t7,0x8($a1)
-/*  f0ec674:	3c028008 */ 	lui	$v0,%hi(g_FontHandelGothicSm2)
-/*  f0ec678:	3c038008 */ 	lui	$v1,%hi(g_FontHandelGothicSm1)
+/*  f0ec674:	3c028008 */ 	lui	$v0,%hi(g_FontHandelGothicSm)
+/*  f0ec678:	3c038008 */ 	lui	$v1,%hi(g_CharsHandelGothicSm)
 /*  f0ec67c:	8df80004 */ 	lw	$t8,0x4($t7)
 /*  f0ec680:	00a08825 */ 	or	$s1,$a1,$zero
-/*  f0ec684:	8c42fb0c */ 	lw	$v0,%lo(g_FontHandelGothicSm2)($v0)
+/*  f0ec684:	8c42fb0c */ 	lw	$v0,%lo(g_FontHandelGothicSm)($v0)
 /*  f0ec688:	33190200 */ 	andi	$t9,$t8,0x200
 /*  f0ec68c:	13200005 */ 	beqz	$t9,.L0f0ec6a4
-/*  f0ec690:	8c63fb10 */ 	lw	$v1,%lo(g_FontHandelGothicSm1)($v1)
-/*  f0ec694:	3c028008 */ 	lui	$v0,%hi(g_FontHandelGothicXs2)
-/*  f0ec698:	3c038008 */ 	lui	$v1,%hi(g_FontHandelGothicXs1)
-/*  f0ec69c:	8c42fb04 */ 	lw	$v0,%lo(g_FontHandelGothicXs2)($v0)
-/*  f0ec6a0:	8c63fb08 */ 	lw	$v1,%lo(g_FontHandelGothicXs1)($v1)
+/*  f0ec690:	8c63fb10 */ 	lw	$v1,%lo(g_CharsHandelGothicSm)($v1)
+/*  f0ec694:	3c028008 */ 	lui	$v0,%hi(g_FontHandelGothicXs)
+/*  f0ec698:	3c038008 */ 	lui	$v1,%hi(g_CharsHandelGothicXs)
+/*  f0ec69c:	8c42fb04 */ 	lw	$v0,%lo(g_FontHandelGothicXs)($v0)
+/*  f0ec6a0:	8c63fb08 */ 	lw	$v1,%lo(g_CharsHandelGothicXs)($v1)
 .L0f0ec6a4:
 /*  f0ec6a4:	86280000 */ 	lh	$t0,0x0($s1)
 /*  f0ec6a8:	afa8006c */ 	sw	$t0,0x6c($sp)
@@ -8080,12 +8080,12 @@ glabel menuRenderItemCheckbox
 //	u8 data[3];
 //	bool checked = false;
 //	u32 fillcolour = 0xff002faf;
-//	struct font *font2 = g_FontHandelGothicSm2;
-//	struct font2a4 *font1 = g_FontHandelGothicSm1;
+//	struct font *font2 = g_FontHandelGothicSm;
+//	struct fontchar *font1 = g_CharsHandelGothicSm;
 //
 //	if (context->item->param1 & 0x00000200) {
-//		font2 = g_FontHandelGothicXs2;
-//		font1 = g_FontHandelGothicXs1;
+//		font2 = g_FontHandelGothicXs;
+//		font1 = g_CharsHandelGothicXs;
 //	}
 //
 //	x = context->x;
@@ -8273,7 +8273,7 @@ Gfx *menuRenderItemScrollable(Gfx *gdl, struct menurendercontext *context)
 	}
 
 	if (rawtext) {
-		textWrap(context->width - paddingright, rawtext, alltext, g_FontHandelGothicSm1, g_FontHandelGothicSm2);
+		textWrap(context->width - paddingright, rawtext, alltext, g_CharsHandelGothicSm, g_FontHandelGothicSm);
 	}
 
 	inptr = alltext;
@@ -8339,20 +8339,20 @@ Gfx *menuRenderItemScrollable(Gfx *gdl, struct menurendercontext *context)
 	// Heading text shadow
 	x = context->x + 3;
 	y = context->y + 3;
-	gdl = textRenderProjected(gdl, &x, &y, headingtext, g_FontHandelGothicSm1, g_FontHandelGothicSm2,
+	gdl = textRenderProjected(gdl, &x, &y, headingtext, g_CharsHandelGothicSm, g_FontHandelGothicSm,
 			0x000000ff, context->width - 4, context->height - 4, -data->unk00, 0);
 
 	// Heading text (red)
 	x = context->x + 2;
 	y = context->y + 2;
-	gdl = textRenderProjected(gdl, &x, &y, headingtext, g_FontHandelGothicSm1, g_FontHandelGothicSm2,
+	gdl = textRenderProjected(gdl, &x, &y, headingtext, g_CharsHandelGothicSm, g_FontHandelGothicSm,
 			0xff4444ff, context->width - 4, context->height - 4, -data->unk00, 0);
 
 	// Body text
 	x = menuIsScrollableUnscrollable(context->item) ? context->x + 5 : context->x + 12;
 	y = context->y + 2;
 
-	gdl = textRenderProjected(gdl, &x, &y, bodytext, g_FontHandelGothicSm1, g_FontHandelGothicSm2,
+	gdl = textRenderProjected(gdl, &x, &y, bodytext, g_CharsHandelGothicSm, g_FontHandelGothicSm,
 			colour, context->width - 4, context->height - 1, -data->unk00, 0);
 
 	return func0f153780(gdl);
@@ -8394,10 +8394,10 @@ bool menuTickItemScrollable(struct menuitem *item, struct menuframe *frame, stru
 		rawtext = menuItemScrollableGetText(item->param);
 
 		if (rawtext) {
-			textWrap(width, rawtext, wrapped, g_FontHandelGothicSm1, g_FontHandelGothicSm2);
+			textWrap(width, rawtext, wrapped, g_CharsHandelGothicSm, g_FontHandelGothicSm);
 		}
 
-		textMeasure(&height, &width, wrapped, g_FontHandelGothicSm1, g_FontHandelGothicSm2, 0);
+		textMeasure(&height, &width, wrapped, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0);
 
 		data->scrollable.unk04 = height - hvalue + 5;
 
@@ -8474,25 +8474,25 @@ glabel menuRenderItemMarquee
 /*  f0ed548:	0fc3c557 */ 	jal	menuResolveParam2Text
 /*  f0ed54c:	8ca40008 */ 	lw	$a0,0x8($a1)
 /*  f0ed550:	3c0f8007 */ 	lui	$t7,%hi(var800711ec)
-/*  f0ed554:	3c188008 */ 	lui	$t8,%hi(g_FontHandelGothicSm2)
-/*  f0ed558:	3c198008 */ 	lui	$t9,%hi(g_FontHandelGothicSm1)
+/*  f0ed554:	3c188008 */ 	lui	$t8,%hi(g_FontHandelGothicSm)
+/*  f0ed558:	3c198008 */ 	lui	$t9,%hi(g_CharsHandelGothicSm)
 /*  f0ed55c:	95ef11ec */ 	lhu	$t7,%lo(var800711ec)($t7)
-/*  f0ed560:	8f18fb0c */ 	lw	$t8,%lo(g_FontHandelGothicSm2)($t8)
-/*  f0ed564:	8f39fb10 */ 	lw	$t9,%lo(g_FontHandelGothicSm1)($t9)
+/*  f0ed560:	8f18fb0c */ 	lw	$t8,%lo(g_FontHandelGothicSm)($t8)
+/*  f0ed564:	8f39fb10 */ 	lw	$t9,%lo(g_CharsHandelGothicSm)($t9)
 /*  f0ed568:	afa20080 */ 	sw	$v0,0x80($sp)
 /*  f0ed56c:	afa00070 */ 	sw	$zero,0x70($sp)
 /*  f0ed570:	a7af0064 */ 	sh	$t7,0x64($sp)
 /*  f0ed574:	afb8005c */ 	sw	$t8,0x5c($sp)
 /*  f0ed578:	afb90058 */ 	sw	$t9,0x58($sp)
 /*  f0ed57c:	8e280008 */ 	lw	$t0,0x8($s1)
-/*  f0ed580:	3c0b8008 */ 	lui	$t3,%hi(g_FontHandelGothicXs2)
-/*  f0ed584:	3c0c8008 */ 	lui	$t4,%hi(g_FontHandelGothicXs1)
+/*  f0ed580:	3c0b8008 */ 	lui	$t3,%hi(g_FontHandelGothicXs)
+/*  f0ed584:	3c0c8008 */ 	lui	$t4,%hi(g_CharsHandelGothicXs)
 /*  f0ed588:	8d090004 */ 	lw	$t1,0x4($t0)
 /*  f0ed58c:	312a0200 */ 	andi	$t2,$t1,0x200
 /*  f0ed590:	11400005 */ 	beqz	$t2,.L0f0ed5a8
 /*  f0ed594:	00000000 */ 	nop
-/*  f0ed598:	8d6bfb04 */ 	lw	$t3,%lo(g_FontHandelGothicXs2)($t3)
-/*  f0ed59c:	8d8cfb08 */ 	lw	$t4,%lo(g_FontHandelGothicXs1)($t4)
+/*  f0ed598:	8d6bfb04 */ 	lw	$t3,%lo(g_FontHandelGothicXs)($t3)
+/*  f0ed59c:	8d8cfb08 */ 	lw	$t4,%lo(g_CharsHandelGothicXs)($t4)
 /*  f0ed5a0:	afab005c */ 	sw	$t3,0x5c($sp)
 /*  f0ed5a4:	afac0058 */ 	sw	$t4,0x58($sp)
 .L0f0ed5a8:
@@ -9086,12 +9086,12 @@ u32 var800711ec = 0x20000000;
 //	s32 textheight; // 68
 //	char string[] = {' ', '\0'}; // 64 - var800711ec
 //	s32 hasmore;
-//	struct font *font2 = g_FontHandelGothicSm2; // 5c
-//	struct font2a4 *font1 = g_FontHandelGothicSm1; // 58
+//	struct font *font2 = g_FontHandelGothicSm; // 5c
+//	struct fontchar *font1 = g_CharsHandelGothicSm; // 58
 //
 //	if (context->item->param1 & 0x00000200) {
-//		font2 = g_FontHandelGothicXs2;
-//		font1 = g_FontHandelGothicXs1;
+//		font2 = g_FontHandelGothicXs;
+//		font1 = g_CharsHandelGothicXs;
 //	}
 //
 //	if (!text) {
@@ -9301,19 +9301,19 @@ bool menuTickItemMarquee(struct menuitem *item, union menuitemdata *data)
 	s32 i;
 	s32 textheight;
 	s32 textwidth;
-	struct font2a4 *font1;
+	struct fontchar *font1;
 	struct font *font2;
 	s32 increment;
 	u16 sum = 0;
 	char *text = menuResolveParam2Text(item);
 	s32 limit;
 
-	font2 = g_FontHandelGothicSm2;
-	font1 = g_FontHandelGothicSm1;
+	font2 = g_FontHandelGothicSm;
+	font1 = g_CharsHandelGothicSm;
 
 	if (item->param1 & 0x00000200) {
-		font2 = g_FontHandelGothicXs2;
-		font1 = g_FontHandelGothicXs1;
+		font2 = g_FontHandelGothicXs;
+		font1 = g_CharsHandelGothicXs;
 	}
 
 	if (!text) {
@@ -9414,18 +9414,18 @@ Gfx *menuRenderItemRanking(Gfx *gdl, struct menurendercontext *context)
 
 	if (!team) {
 		// "Deaths"
-		textMeasure(&textheight, &textwidth, langGet(L_MPMENU_277), g_FontHandelGothicXs1, g_FontHandelGothicXs2, 0);
+		textMeasure(&textheight, &textwidth, langGet(L_MPMENU_277), g_CharsHandelGothicXs, g_FontHandelGothicXs, 0);
 		x = (context->x - textwidth) + 91;
 		y = context->y + 1;
-		gdl = textRenderProjected(gdl, &x, &y, langGet(L_MPMENU_277), g_FontHandelGothicXs1, g_FontHandelGothicXs2,
+		gdl = textRenderProjected(gdl, &x, &y, langGet(L_MPMENU_277), g_CharsHandelGothicXs, g_FontHandelGothicXs,
 				textcolour, context->width, context->height, 0, 0);
 	}
 
 	// "Score"
-	textMeasure(&textheight, &textwidth, langGet(L_MPMENU_278), g_FontHandelGothicXs1, g_FontHandelGothicXs2, 0);
+	textMeasure(&textheight, &textwidth, langGet(L_MPMENU_278), g_CharsHandelGothicXs, g_FontHandelGothicXs, 0);
 	x = (context->x - textwidth) + 120;
 	y = context->y + 1;
-	gdl = textRenderProjected(gdl, &x, &y, langGet(L_MPMENU_278), g_FontHandelGothicXs1, g_FontHandelGothicXs2,
+	gdl = textRenderProjected(gdl, &x, &y, langGet(L_MPMENU_278), g_CharsHandelGothicXs, g_FontHandelGothicXs,
 			textcolour, context->width, context->height, 0, 0);
 	gdl = func0f153780(gdl);
 
@@ -9532,30 +9532,30 @@ Gfx *menuRenderItemRanking(Gfx *gdl, struct menurendercontext *context)
 
 		if (team) {
 			gdl = textRenderProjected(gdl, &x, &y, g_MpSetupSaveFile.teamnames[thisinfo->teamnum],
-					g_FontHandelGothicSm1, g_FontHandelGothicSm2, textcolour, context->width, context->height, 0, 0);
+					g_CharsHandelGothicSm, g_FontHandelGothicSm, textcolour, context->width, context->height, 0, 0);
 		} else {
 			gdl = textRenderProjected(gdl, &x, &y, thisinfo->mpchr->name,
-					g_FontHandelGothicSm1, g_FontHandelGothicSm2, textcolour, context->width, context->height, 0, 0);
+					g_CharsHandelGothicSm, g_FontHandelGothicSm, textcolour, context->width, context->height, 0, 0);
 		}
 
 		if (!team) {
 			// Deaths value (red)
 			textcolour = colourBlend(0xcf0000ff, 0xff4040ff, weight);
 			sprintf(valuebuffer, "%d\n", thisinfo->mpchr->numdeaths);
-			textMeasure(&textheight, &textwidth, valuebuffer, g_FontHandelGothicSm1, g_FontHandelGothicSm2, 0);
+			textMeasure(&textheight, &textwidth, valuebuffer, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0);
 			x = context->x - textwidth + 91;
 			y = context->y + i * 10 - data->scrolloffset + 14;
-			gdl = textRenderProjected(gdl, &x, &y, valuebuffer, g_FontHandelGothicSm1, g_FontHandelGothicSm2,
+			gdl = textRenderProjected(gdl, &x, &y, valuebuffer, g_CharsHandelGothicSm, g_FontHandelGothicSm,
 					textcolour, context->width, context->height, 0, 0);
 		}
 
 		// Score value (green)
 		textcolour = colourBlend(0x009f00ff, 0x00ff00ff, weight);
 		sprintf(valuebuffer, "%d\n", thisinfo->score);
-		textMeasure(&textheight, &textwidth, valuebuffer, g_FontHandelGothicSm1, g_FontHandelGothicSm2, 0);
+		textMeasure(&textheight, &textwidth, valuebuffer, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0);
 		x = context->x - textwidth + 120;
 		y = context->y + i * 10 - data->scrolloffset + 14;
-		gdl = textRenderProjected(gdl, &x, &y, valuebuffer, g_FontHandelGothicSm1, g_FontHandelGothicSm2,
+		gdl = textRenderProjected(gdl, &x, &y, valuebuffer, g_CharsHandelGothicSm, g_FontHandelGothicSm,
 				textcolour, context->width, context->height, 0, 0);
 	}
 
@@ -10247,7 +10247,7 @@ Gfx *menuRenderItemPlayerStats(Gfx *gdl, struct menurendercontext *context)
 	x = context->x + 2;
 	y = context->y + 1;
 
-	gdl = textRenderProjected(gdl, &x, &y, mpchr->name, g_FontHandelGothicSm1, g_FontHandelGothicSm2,
+	gdl = textRenderProjected(gdl, &x, &y, mpchr->name, g_CharsHandelGothicSm, g_FontHandelGothicSm,
 			selectioncolour, context->width, context->height, 0, 0);
 
 	// "Suicides" heading
@@ -10264,20 +10264,20 @@ Gfx *menuRenderItemPlayerStats(Gfx *gdl, struct menurendercontext *context)
 		maincolour = colourBlend(maincolour, 0x00000000, 127) & 0xffffff00 | maincolour & 0xff;
 	}
 
-	textMeasure(&textheight, &textwidth, langGet(L_MPMENU_281), g_FontHandelGothicXs1, g_FontHandelGothicXs2, 0);
+	textMeasure(&textheight, &textwidth, langGet(L_MPMENU_281), g_CharsHandelGothicXs, g_FontHandelGothicXs, 0);
 	x = context->x - textwidth + 121;
 	y = context->y + 1;
 
-	gdl = textRenderProjected(gdl, &x, &y, langGet(L_MPMENU_281), g_FontHandelGothicXs1, g_FontHandelGothicXs2,
+	gdl = textRenderProjected(gdl, &x, &y, langGet(L_MPMENU_281), g_CharsHandelGothicXs, g_FontHandelGothicXs,
 			maincolour, context->width, context->height, 0, 0);
 
 	// Num suicides
 	x = context->x - textwidth + 119;
 	sprintf(buffer, "%d\n", mpchr->killcounts[playernum]);
-	textMeasure(&textheight, &textwidth, buffer, g_FontHandelGothicSm1, g_FontHandelGothicSm2, 0);
+	textMeasure(&textheight, &textwidth, buffer, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0);
 	x -= textwidth;
 	y = context->y + 1;
-	gdl = textRenderProjected(gdl, &x, &y, buffer, g_FontHandelGothicSm1, g_FontHandelGothicSm2,
+	gdl = textRenderProjected(gdl, &x, &y, buffer, g_CharsHandelGothicSm, g_FontHandelGothicSm,
 			0xffff00ff, context->width, context->height, 0, 0);
 
 	// Move ypos past top row
@@ -10298,17 +10298,17 @@ Gfx *menuRenderItemPlayerStats(Gfx *gdl, struct menurendercontext *context)
 		}
 
 		// "Deaths" heading
-		textMeasure(&textheight, &textwidth, langGet(L_MPMENU_282), g_FontHandelGothicXs1, g_FontHandelGothicXs2, 0);
+		textMeasure(&textheight, &textwidth, langGet(L_MPMENU_282), g_CharsHandelGothicXs, g_FontHandelGothicXs, 0);
 		x = context->x - textwidth + 120;
 		y = context->y + ypos;
-		gdl = textRenderProjected(gdl, &x, &y, langGet(L_MPMENU_282), g_FontHandelGothicXs1, g_FontHandelGothicXs2,
+		gdl = textRenderProjected(gdl, &x, &y, langGet(L_MPMENU_282), g_CharsHandelGothicXs, g_FontHandelGothicXs,
 				maincolour, context->width, context->height, 0, 0);
 
 		// "Kills" heading
-		textMeasure(&textheight, &textwidth, langGet(L_MPMENU_283), g_FontHandelGothicXs1, g_FontHandelGothicXs2, 0);
+		textMeasure(&textheight, &textwidth, langGet(L_MPMENU_283), g_CharsHandelGothicXs, g_FontHandelGothicXs, 0);
 		x = context->x - textwidth + 25;
 		y = context->y + ypos;
-		gdl = textRenderProjected(gdl, &x, &y, langGet(L_MPMENU_283),  g_FontHandelGothicXs1, g_FontHandelGothicXs2,
+		gdl = textRenderProjected(gdl, &x, &y, langGet(L_MPMENU_283),  g_CharsHandelGothicXs, g_FontHandelGothicXs,
 				maincolour, context->width, context->height, 0, 0);
 
 		// Move ypos past heading row
@@ -10391,23 +10391,23 @@ Gfx *menuRenderItemPlayerStats(Gfx *gdl, struct menurendercontext *context)
 					// Name
 					x = context->x + 29;
 					y = context->y + ypos;
-					gdl = textRenderProjected(gdl, &x, &y, loopmpchr->name, g_FontHandelGothicSm1, g_FontHandelGothicSm2,
+					gdl = textRenderProjected(gdl, &x, &y, loopmpchr->name, g_CharsHandelGothicSm, g_FontHandelGothicSm,
 							0x00ffffff, context->width, context->height, 0, 0);
 
 					// Num deaths
 					sprintf(buffer, "%d\n", loopmpchr->killcounts[playernum]);
-					textMeasure(&textheight, &textwidth, buffer, g_FontHandelGothicSm1, g_FontHandelGothicSm2, 0);
+					textMeasure(&textheight, &textwidth, buffer, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0);
 					x = context->x - textwidth + 120;
 					y = context->y + ypos;
-					gdl = textRenderProjected(gdl, &x, &y, buffer, g_FontHandelGothicSm1, g_FontHandelGothicSm2,
+					gdl = textRenderProjected(gdl, &x, &y, buffer, g_CharsHandelGothicSm, g_FontHandelGothicSm,
 							0xff4040ff, context->width, context->height, 0, 0);
 
 					// Num kills
 					sprintf(buffer, "%d\n", mpchr->killcounts[i]);
-					textMeasure(&textheight, &textwidth, buffer, g_FontHandelGothicSm1, g_FontHandelGothicSm2, 0);
+					textMeasure(&textheight, &textwidth, buffer, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0);
 					x = context->x - textwidth + 25;
 					y = context->y + ypos;
-					gdl = textRenderProjected(gdl, &x, &y, buffer, g_FontHandelGothicSm1, g_FontHandelGothicSm2,
+					gdl = textRenderProjected(gdl, &x, &y, buffer, g_CharsHandelGothicSm, g_FontHandelGothicSm,
 							0x00ff00ff, context->width, context->height, 0, 0);
 
 					ypos += 10;
@@ -11550,7 +11550,7 @@ Gfx *menuRenderControllerText(Gfx *gdl, s32 curmode, struct menurendercontext *c
 			// Rendering a label such as "L/R BUTTONS:"
 			rx = context->x + x + 76;
 			gdl = textRenderProjected(gdl, &rx, &ry, langGet(labels[i]),
-					g_FontHandelGothicXs1, g_FontHandelGothicXs2, labelcolour, viGetWidth(), viGetHeight(), 0, 0);
+					g_CharsHandelGothicXs, g_FontHandelGothicXs, labelcolour, viGetWidth(), viGetHeight(), 0, 0);
 		}
 
 		textnum = menuControllerGetButtonAction(curmode, i);
@@ -11585,7 +11585,7 @@ Gfx *menuRenderControllerText(Gfx *gdl, s32 curmode, struct menurendercontext *c
 		}
 
 		gdl = textRenderProjected(gdl, &rx, &ry, langGet(textnum),
-				g_FontHandelGothicXs1, g_FontHandelGothicXs2, colour, viGetWidth(), viGetHeight(), 0, 0);
+				g_CharsHandelGothicXs, g_FontHandelGothicXs, colour, viGetWidth(), viGetHeight(), 0, 0);
 	}
 
 	return func0f153780(gdl);
@@ -11873,7 +11873,7 @@ Gfx *menuRenderItemController(Gfx *gdl, struct menurendercontext *context)
 	x = context->x + 2;
 	y = context->y + 2;
 	gdl = textRenderProjected(gdl, &x, &y, text,
-			g_FontHandelGothicSm1, g_FontHandelGothicSm2, colour, viGetWidth(), viGetHeight(), 0, 0);
+			g_CharsHandelGothicSm, g_FontHandelGothicSm, colour, viGetWidth(), viGetHeight(), 0, 0);
 	gdl = func0f153780(gdl);
 
 	textcolour = colourBlend(colour, colour & 0xffffff00, textalpha);
@@ -11895,7 +11895,7 @@ Gfx *menuRenderItemController(Gfx *gdl, struct menurendercontext *context)
 		y = context->y + 92;
 		gdl = func0f153628(gdl);
 		gdl = textRenderProjected(gdl, &x, &y, langGet(L_MPWEAPONS_216), // "Hold weapon button for ..."
-				g_FontHandelGothicSm1, g_FontHandelGothicSm2, colour, viGetWidth(), viGetHeight(), 0, 0);
+				g_CharsHandelGothicSm, g_FontHandelGothicSm, colour, viGetWidth(), viGetHeight(), 0, 0);
 		gdl = func0f153780(gdl);
 	}
 
diff --git a/src/game/mplayer/mplayer.c b/src/game/mplayer/mplayer.c
index baf8a7890..c9e2bdac2 100644
--- a/src/game/mplayer/mplayer.c
+++ b/src/game/mplayer/mplayer.c
@@ -2008,10 +2008,10 @@ glabel mpRenderModalText
 /*  f189864:	01f8c821 */ 	addu	$t9,$t7,$t8
 /*  f189868:	afb90090 */ 	sw	$t9,0x90($sp)
 .L0f18986c:
-/*  f18986c:	3c088008 */ 	lui	$t0,%hi(g_FontHandelGothicSm2)
-/*  f189870:	8d08fb14 */ 	lw	$t0,%lo(g_FontHandelGothicSm2)($t0)
-/*  f189874:	3c078008 */ 	lui	$a3,%hi(g_FontHandelGothicSm1)
-/*  f189878:	8ce7fb18 */ 	lw	$a3,%lo(g_FontHandelGothicSm1)($a3)
+/*  f18986c:	3c088008 */ 	lui	$t0,%hi(g_FontHandelGothicSm)
+/*  f189870:	8d08fb14 */ 	lw	$t0,%lo(g_FontHandelGothicSm)($t0)
+/*  f189874:	3c078008 */ 	lui	$a3,%hi(g_CharsHandelGothicSm)
+/*  f189878:	8ce7fb18 */ 	lw	$a3,%lo(g_CharsHandelGothicSm)($a3)
 /*  f18987c:	27a40098 */ 	addiu	$a0,$sp,0x98
 /*  f189880:	27a5009c */ 	addiu	$a1,$sp,0x9c
 /*  f189884:	27a6005c */ 	addiu	$a2,$sp,0x5c
@@ -2031,11 +2031,11 @@ glabel mpRenderModalText
 /*  f1898b8:	0c002f02 */ 	jal	viGetWidth
 /*  f1898bc:	a7a20040 */ 	sh	$v0,0x40($sp)
 /*  f1898c0:	8faf0054 */ 	lw	$t7,0x54($sp)
-/*  f1898c4:	3c0d8008 */ 	lui	$t5,%hi(g_FontHandelGothicSm1)
-/*  f1898c8:	3c0e8008 */ 	lui	$t6,%hi(g_FontHandelGothicSm2)
+/*  f1898c4:	3c0d8008 */ 	lui	$t5,%hi(g_CharsHandelGothicSm)
+/*  f1898c8:	3c0e8008 */ 	lui	$t6,%hi(g_FontHandelGothicSm)
 /*  f1898cc:	3c0100ff */ 	lui	$at,0xff
-/*  f1898d0:	8dcefb14 */ 	lw	$t6,%lo(g_FontHandelGothicSm2)($t6)
-/*  f1898d4:	8dadfb18 */ 	lw	$t5,%lo(g_FontHandelGothicSm1)($t5)
+/*  f1898d0:	8dcefb14 */ 	lw	$t6,%lo(g_FontHandelGothicSm)($t6)
+/*  f1898d4:	8dadfb18 */ 	lw	$t5,%lo(g_CharsHandelGothicSm)($t5)
 /*  f1898d8:	87aa0040 */ 	lh	$t2,0x40($sp)
 /*  f1898dc:	342100ff */ 	ori	$at,$at,0xff
 /*  f1898e0:	000fc600 */ 	sll	$t8,$t7,0x18
@@ -2135,17 +2135,17 @@ glabel mpRenderModalText
 /*  f189a44:	0c002f26 */ 	jal	viGetViewHeight
 /*  f189a48:	a7a20042 */ 	sh	$v0,0x42($sp)
 /*  f189a4c:	87aa0042 */ 	lh	$t2,0x42($sp)
-/*  f189a50:	3c0b8008 */ 	lui	$t3,%hi(g_FontHandelGothicSm2)
-/*  f189a54:	8d6bfb0c */ 	lw	$t3,%lo(g_FontHandelGothicSm2)($t3)
+/*  f189a50:	3c0b8008 */ 	lui	$t3,%hi(g_FontHandelGothicSm)
+/*  f189a54:	8d6bfb0c */ 	lw	$t3,%lo(g_FontHandelGothicSm)($t3)
 /*  f189a58:	04410003 */ 	bgez	$v0,.L0f189a68
 /*  f189a5c:	00024043 */ 	sra	$t0,$v0,0x1
 /*  f189a60:	24410001 */ 	addiu	$at,$v0,0x1
 /*  f189a64:	00014043 */ 	sra	$t0,$at,0x1
 .L0f189a68:
-/*  f189a68:	3c078008 */ 	lui	$a3,%hi(g_FontHandelGothicSm1)
+/*  f189a68:	3c078008 */ 	lui	$a3,%hi(g_CharsHandelGothicSm)
 /*  f189a6c:	010a4821 */ 	addu	$t1,$t0,$t2
 /*  f189a70:	afa90090 */ 	sw	$t1,0x90($sp)
-/*  f189a74:	8ce7fb10 */ 	lw	$a3,%lo(g_FontHandelGothicSm1)($a3)
+/*  f189a74:	8ce7fb10 */ 	lw	$a3,%lo(g_CharsHandelGothicSm)($a3)
 /*  f189a78:	27a40098 */ 	addiu	$a0,$sp,0x98
 /*  f189a7c:	27a5009c */ 	addiu	$a1,$sp,0x9c
 /*  f189a80:	27a6005c */ 	addiu	$a2,$sp,0x5c
@@ -2164,10 +2164,10 @@ glabel mpRenderModalText
 /*  f189ab0:	afaf0094 */ 	sw	$t7,0x94($sp)
 /*  f189ab4:	0c002f02 */ 	jal	viGetWidth
 /*  f189ab8:	a7a20040 */ 	sh	$v0,0x40($sp)
-/*  f189abc:	3c188008 */ 	lui	$t8,%hi(g_FontHandelGothicSm1)
-/*  f189ac0:	3c198008 */ 	lui	$t9,%hi(g_FontHandelGothicSm2)
-/*  f189ac4:	8f39fb0c */ 	lw	$t9,%lo(g_FontHandelGothicSm2)($t9)
-/*  f189ac8:	8f18fb10 */ 	lw	$t8,%lo(g_FontHandelGothicSm1)($t8)
+/*  f189abc:	3c188008 */ 	lui	$t8,%hi(g_CharsHandelGothicSm)
+/*  f189ac0:	3c198008 */ 	lui	$t9,%hi(g_FontHandelGothicSm)
+/*  f189ac4:	8f39fb0c */ 	lw	$t9,%lo(g_FontHandelGothicSm)($t9)
+/*  f189ac8:	8f18fb10 */ 	lw	$t8,%lo(g_CharsHandelGothicSm)($t8)
 /*  f189acc:	87a90040 */ 	lh	$t1,0x40($sp)
 /*  f189ad0:	3c08ff00 */ 	lui	$t0,0xff00
 /*  f189ad4:	350800ff */ 	ori	$t0,$t0,0xff
@@ -2228,10 +2228,10 @@ glabel mpRenderModalText
 /*  f189ba8:	24a58aa4 */ 	addiu	$a1,$a1,%lo(var7f1b8aa4)
 /*  f189bac:	0c004dad */ 	jal	sprintf
 /*  f189bb0:	27a4005c */ 	addiu	$a0,$sp,0x5c
-/*  f189bb4:	3c0e8008 */ 	lui	$t6,%hi(g_FontHandelGothicSm2)
-/*  f189bb8:	8dcefb0c */ 	lw	$t6,%lo(g_FontHandelGothicSm2)($t6)
-/*  f189bbc:	3c078008 */ 	lui	$a3,%hi(g_FontHandelGothicSm1)
-/*  f189bc0:	8ce7fb10 */ 	lw	$a3,%lo(g_FontHandelGothicSm1)($a3)
+/*  f189bb4:	3c0e8008 */ 	lui	$t6,%hi(g_FontHandelGothicSm)
+/*  f189bb8:	8dcefb0c */ 	lw	$t6,%lo(g_FontHandelGothicSm)($t6)
+/*  f189bbc:	3c078008 */ 	lui	$a3,%hi(g_CharsHandelGothicSm)
+/*  f189bc0:	8ce7fb10 */ 	lw	$a3,%lo(g_CharsHandelGothicSm)($a3)
 /*  f189bc4:	27a40098 */ 	addiu	$a0,$sp,0x98
 /*  f189bc8:	27a5009c */ 	addiu	$a1,$sp,0x9c
 /*  f189bcc:	27a6005c */ 	addiu	$a2,$sp,0x5c
@@ -2252,10 +2252,10 @@ glabel mpRenderModalText
 /*  f189c04:	afaa0090 */ 	sw	$t2,0x90($sp)
 /*  f189c08:	0c002f02 */ 	jal	viGetWidth
 /*  f189c0c:	a7a20040 */ 	sh	$v0,0x40($sp)
-/*  f189c10:	3c098008 */ 	lui	$t1,%hi(g_FontHandelGothicSm1)
-/*  f189c14:	3c0b8008 */ 	lui	$t3,%hi(g_FontHandelGothicSm2)
-/*  f189c18:	8d6bfb0c */ 	lw	$t3,%lo(g_FontHandelGothicSm2)($t3)
-/*  f189c1c:	8d29fb10 */ 	lw	$t1,%lo(g_FontHandelGothicSm1)($t1)
+/*  f189c10:	3c098008 */ 	lui	$t1,%hi(g_CharsHandelGothicSm)
+/*  f189c14:	3c0b8008 */ 	lui	$t3,%hi(g_FontHandelGothicSm)
+/*  f189c18:	8d6bfb0c */ 	lw	$t3,%lo(g_FontHandelGothicSm)($t3)
+/*  f189c1c:	8d29fb10 */ 	lw	$t1,%lo(g_CharsHandelGothicSm)($t1)
 /*  f189c20:	87ae0040 */ 	lh	$t6,0x40($sp)
 /*  f189c24:	3c0dff00 */ 	lui	$t5,0xff00
 /*  f189c28:	35ad00ff */ 	ori	$t5,$t5,0xff
@@ -2383,10 +2383,10 @@ glabel mpRenderModalText
 /*  f189864:	01f8c821 */ 	addu	$t9,$t7,$t8
 /*  f189868:	afb90090 */ 	sw	$t9,0x90($sp)
 .L0f18986c:
-/*  f18986c:	3c088008 */ 	lui	$t0,%hi(g_FontHandelGothicMd2)
-/*  f189870:	8d08fb14 */ 	lw	$t0,%lo(g_FontHandelGothicMd2)($t0)
-/*  f189874:	3c078008 */ 	lui	$a3,%hi(g_FontHandelGothicMd1)
-/*  f189878:	8ce7fb18 */ 	lw	$a3,%lo(g_FontHandelGothicMd1)($a3)
+/*  f18986c:	3c088008 */ 	lui	$t0,%hi(g_FontHandelGothicMd)
+/*  f189870:	8d08fb14 */ 	lw	$t0,%lo(g_FontHandelGothicMd)($t0)
+/*  f189874:	3c078008 */ 	lui	$a3,%hi(g_CharsHandelGothicMd)
+/*  f189878:	8ce7fb18 */ 	lw	$a3,%lo(g_CharsHandelGothicMd)($a3)
 /*  f18987c:	27a40098 */ 	addiu	$a0,$sp,0x98
 /*  f189880:	27a5009c */ 	addiu	$a1,$sp,0x9c
 /*  f189884:	27a6005c */ 	addiu	$a2,$sp,0x5c
@@ -2406,11 +2406,11 @@ glabel mpRenderModalText
 /*  f1898b8:	0c002f02 */ 	jal	viGetWidth
 /*  f1898bc:	a7a20040 */ 	sh	$v0,0x40($sp)
 /*  f1898c0:	8faf0054 */ 	lw	$t7,0x54($sp)
-/*  f1898c4:	3c0d8008 */ 	lui	$t5,%hi(g_FontHandelGothicMd1)
-/*  f1898c8:	3c0e8008 */ 	lui	$t6,%hi(g_FontHandelGothicMd2)
+/*  f1898c4:	3c0d8008 */ 	lui	$t5,%hi(g_CharsHandelGothicMd)
+/*  f1898c8:	3c0e8008 */ 	lui	$t6,%hi(g_FontHandelGothicMd)
 /*  f1898cc:	3c0100ff */ 	lui	$at,0xff
-/*  f1898d0:	8dcefb14 */ 	lw	$t6,%lo(g_FontHandelGothicMd2)($t6)
-/*  f1898d4:	8dadfb18 */ 	lw	$t5,%lo(g_FontHandelGothicMd1)($t5)
+/*  f1898d0:	8dcefb14 */ 	lw	$t6,%lo(g_FontHandelGothicMd)($t6)
+/*  f1898d4:	8dadfb18 */ 	lw	$t5,%lo(g_CharsHandelGothicMd)($t5)
 /*  f1898d8:	87aa0040 */ 	lh	$t2,0x40($sp)
 /*  f1898dc:	342100ff */ 	ori	$at,$at,0xff
 /*  f1898e0:	000fc600 */ 	sll	$t8,$t7,0x18
@@ -2510,17 +2510,17 @@ glabel mpRenderModalText
 /*  f189a44:	0c002f26 */ 	jal	viGetViewHeight
 /*  f189a48:	a7a20042 */ 	sh	$v0,0x42($sp)
 /*  f189a4c:	87aa0042 */ 	lh	$t2,0x42($sp)
-/*  f189a50:	3c0b8008 */ 	lui	$t3,%hi(g_FontHandelGothicSm2)
-/*  f189a54:	8d6bfb0c */ 	lw	$t3,%lo(g_FontHandelGothicSm2)($t3)
+/*  f189a50:	3c0b8008 */ 	lui	$t3,%hi(g_FontHandelGothicSm)
+/*  f189a54:	8d6bfb0c */ 	lw	$t3,%lo(g_FontHandelGothicSm)($t3)
 /*  f189a58:	04410003 */ 	bgez	$v0,.L0f189a68
 /*  f189a5c:	00024043 */ 	sra	$t0,$v0,0x1
 /*  f189a60:	24410001 */ 	addiu	$at,$v0,0x1
 /*  f189a64:	00014043 */ 	sra	$t0,$at,0x1
 .L0f189a68:
-/*  f189a68:	3c078008 */ 	lui	$a3,%hi(g_FontHandelGothicSm1)
+/*  f189a68:	3c078008 */ 	lui	$a3,%hi(g_CharsHandelGothicSm)
 /*  f189a6c:	010a4821 */ 	addu	$t1,$t0,$t2
 /*  f189a70:	afa90090 */ 	sw	$t1,0x90($sp)
-/*  f189a74:	8ce7fb10 */ 	lw	$a3,%lo(g_FontHandelGothicSm1)($a3)
+/*  f189a74:	8ce7fb10 */ 	lw	$a3,%lo(g_CharsHandelGothicSm)($a3)
 /*  f189a78:	27a40098 */ 	addiu	$a0,$sp,0x98
 /*  f189a7c:	27a5009c */ 	addiu	$a1,$sp,0x9c
 /*  f189a80:	27a6005c */ 	addiu	$a2,$sp,0x5c
@@ -2539,10 +2539,10 @@ glabel mpRenderModalText
 /*  f189ab0:	afaf0094 */ 	sw	$t7,0x94($sp)
 /*  f189ab4:	0c002f02 */ 	jal	viGetWidth
 /*  f189ab8:	a7a20040 */ 	sh	$v0,0x40($sp)
-/*  f189abc:	3c188008 */ 	lui	$t8,%hi(g_FontHandelGothicSm1)
-/*  f189ac0:	3c198008 */ 	lui	$t9,%hi(g_FontHandelGothicSm2)
-/*  f189ac4:	8f39fb0c */ 	lw	$t9,%lo(g_FontHandelGothicSm2)($t9)
-/*  f189ac8:	8f18fb10 */ 	lw	$t8,%lo(g_FontHandelGothicSm1)($t8)
+/*  f189abc:	3c188008 */ 	lui	$t8,%hi(g_CharsHandelGothicSm)
+/*  f189ac0:	3c198008 */ 	lui	$t9,%hi(g_FontHandelGothicSm)
+/*  f189ac4:	8f39fb0c */ 	lw	$t9,%lo(g_FontHandelGothicSm)($t9)
+/*  f189ac8:	8f18fb10 */ 	lw	$t8,%lo(g_CharsHandelGothicSm)($t8)
 /*  f189acc:	87a90040 */ 	lh	$t1,0x40($sp)
 /*  f189ad0:	3c08ff00 */ 	lui	$t0,0xff00
 /*  f189ad4:	350800ff */ 	ori	$t0,$t0,0xff
@@ -2603,10 +2603,10 @@ glabel mpRenderModalText
 /*  f189ba8:	24a58aa4 */ 	addiu	$a1,$a1,%lo(var7f1b8aa4)
 /*  f189bac:	0c004dad */ 	jal	sprintf
 /*  f189bb0:	27a4005c */ 	addiu	$a0,$sp,0x5c
-/*  f189bb4:	3c0e8008 */ 	lui	$t6,%hi(g_FontHandelGothicSm2)
-/*  f189bb8:	8dcefb0c */ 	lw	$t6,%lo(g_FontHandelGothicSm2)($t6)
-/*  f189bbc:	3c078008 */ 	lui	$a3,%hi(g_FontHandelGothicSm1)
-/*  f189bc0:	8ce7fb10 */ 	lw	$a3,%lo(g_FontHandelGothicSm1)($a3)
+/*  f189bb4:	3c0e8008 */ 	lui	$t6,%hi(g_FontHandelGothicSm)
+/*  f189bb8:	8dcefb0c */ 	lw	$t6,%lo(g_FontHandelGothicSm)($t6)
+/*  f189bbc:	3c078008 */ 	lui	$a3,%hi(g_CharsHandelGothicSm)
+/*  f189bc0:	8ce7fb10 */ 	lw	$a3,%lo(g_CharsHandelGothicSm)($a3)
 /*  f189bc4:	27a40098 */ 	addiu	$a0,$sp,0x98
 /*  f189bc8:	27a5009c */ 	addiu	$a1,$sp,0x9c
 /*  f189bcc:	27a6005c */ 	addiu	$a2,$sp,0x5c
@@ -2627,10 +2627,10 @@ glabel mpRenderModalText
 /*  f189c04:	afaa0090 */ 	sw	$t2,0x90($sp)
 /*  f189c08:	0c002f02 */ 	jal	viGetWidth
 /*  f189c0c:	a7a20040 */ 	sh	$v0,0x40($sp)
-/*  f189c10:	3c098008 */ 	lui	$t1,%hi(g_FontHandelGothicSm1)
-/*  f189c14:	3c0b8008 */ 	lui	$t3,%hi(g_FontHandelGothicSm2)
-/*  f189c18:	8d6bfb0c */ 	lw	$t3,%lo(g_FontHandelGothicSm2)($t3)
-/*  f189c1c:	8d29fb10 */ 	lw	$t1,%lo(g_FontHandelGothicSm1)($t1)
+/*  f189c10:	3c098008 */ 	lui	$t1,%hi(g_CharsHandelGothicSm)
+/*  f189c14:	3c0b8008 */ 	lui	$t3,%hi(g_FontHandelGothicSm)
+/*  f189c18:	8d6bfb0c */ 	lw	$t3,%lo(g_FontHandelGothicSm)($t3)
+/*  f189c1c:	8d29fb10 */ 	lw	$t1,%lo(g_CharsHandelGothicSm)($t1)
 /*  f189c20:	87ae0040 */ 	lh	$t6,0x40($sp)
 /*  f189c24:	3c0dff00 */ 	lui	$t5,0xff00
 /*  f189c28:	35ad00ff */ 	ori	$t5,$t5,0xff
diff --git a/src/game/mplayer/scenarios.c b/src/game/mplayer/scenarios.c
index dce010832..297fcf868 100644
--- a/src/game/mplayer/scenarios.c
+++ b/src/game/mplayer/scenarios.c
@@ -1121,11 +1121,11 @@ glabel scenarioHtbCallback18
 /*  f180860:	00000000 */ 	nop
 /*  f180864:	0fc54d8a */ 	jal	func0f153628
 /*  f180868:	02002025 */ 	or	$a0,$s0,$zero
-/*  f18086c:	3c0d8008 */ 	lui	$t5,%hi(g_FontHandelGothicXs2)
-/*  f180870:	8dadfb04 */ 	lw	$t5,%lo(g_FontHandelGothicXs2)($t5)
-/*  f180874:	3c078008 */ 	lui	$a3,%hi(g_FontHandelGothicXs1)
+/*  f18086c:	3c0d8008 */ 	lui	$t5,%hi(g_FontHandelGothicXs)
+/*  f180870:	8dadfb04 */ 	lw	$t5,%lo(g_FontHandelGothicXs)($t5)
+/*  f180874:	3c078008 */ 	lui	$a3,%hi(g_CharsHandelGothicXs)
 /*  f180878:	00408025 */ 	or	$s0,$v0,$zero
-/*  f18087c:	8ce7fb08 */ 	lw	$a3,%lo(g_FontHandelGothicXs1)($a3)
+/*  f18087c:	8ce7fb08 */ 	lw	$a3,%lo(g_CharsHandelGothicXs)($a3)
 /*  f180880:	27a40094 */ 	addiu	$a0,$sp,0x94
 /*  f180884:	27a50098 */ 	addiu	$a1,$sp,0x98
 /*  f180888:	27a6004c */ 	addiu	$a2,$sp,0x4c
@@ -1154,10 +1154,10 @@ glabel scenarioHtbCallback18
 /*  f1808e0:	00408025 */ 	or	$s0,$v0,$zero
 /*  f1808e4:	0c002f06 */ 	jal	viGetHeight
 /*  f1808e8:	a7a20048 */ 	sh	$v0,0x48($sp)
-/*  f1808ec:	3c0f8008 */ 	lui	$t7,%hi(g_FontNumeric1)
-/*  f1808f0:	3c188008 */ 	lui	$t8,%hi(g_FontNumeric2)
-/*  f1808f4:	8f18fafc */ 	lw	$t8,%lo(g_FontNumeric2)($t8)
-/*  f1808f8:	8deffb00 */ 	lw	$t7,%lo(g_FontNumeric1)($t7)
+/*  f1808ec:	3c0f8008 */ 	lui	$t7,%hi(g_CharsNumeric)
+/*  f1808f0:	3c188008 */ 	lui	$t8,%hi(g_FontNumeric)
+/*  f1808f4:	8f18fafc */ 	lw	$t8,%lo(g_FontNumeric)($t8)
+/*  f1808f8:	8deffb00 */ 	lw	$t7,%lo(g_CharsNumeric)($t7)
 /*  f1808fc:	87ab0048 */ 	lh	$t3,0x48($sp)
 /*  f180900:	3c1900ff */ 	lui	$t9,0xff
 /*  f180904:	373900a0 */ 	ori	$t9,$t9,0xa0
@@ -4308,11 +4308,11 @@ glabel scenarioKohCallback18
 .L0f18280c:
 /*  f18280c:	0fc54d8a */ 	jal	func0f153628
 /*  f182810:	02002025 */ 	or	$a0,$s0,$zero
-/*  f182814:	3c0b8008 */ 	lui	$t3,%hi(g_FontHandelGothicXs2)
-/*  f182818:	8d6bfb04 */ 	lw	$t3,%lo(g_FontHandelGothicXs2)($t3)
-/*  f18281c:	3c078008 */ 	lui	$a3,%hi(g_FontHandelGothicXs1)
+/*  f182814:	3c0b8008 */ 	lui	$t3,%hi(g_FontHandelGothicXs)
+/*  f182818:	8d6bfb04 */ 	lw	$t3,%lo(g_FontHandelGothicXs)($t3)
+/*  f18281c:	3c078008 */ 	lui	$a3,%hi(g_CharsHandelGothicXs)
 /*  f182820:	00408025 */ 	or	$s0,$v0,$zero
-/*  f182824:	8ce7fb08 */ 	lw	$a3,%lo(g_FontHandelGothicXs1)($a3)
+/*  f182824:	8ce7fb08 */ 	lw	$a3,%lo(g_CharsHandelGothicXs)($a3)
 /*  f182828:	27a4009c */ 	addiu	$a0,$sp,0x9c
 /*  f18282c:	27a500a0 */ 	addiu	$a1,$sp,0xa0
 /*  f182830:	27a60050 */ 	addiu	$a2,$sp,0x50
@@ -4341,10 +4341,10 @@ glabel scenarioKohCallback18
 /*  f182888:	00408025 */ 	or	$s0,$v0,$zero
 /*  f18288c:	0c002f06 */ 	jal	viGetHeight
 /*  f182890:	a7a2004c */ 	sh	$v0,0x4c($sp)
-/*  f182894:	3c0d8008 */ 	lui	$t5,%hi(g_FontNumeric1)
-/*  f182898:	3c0e8008 */ 	lui	$t6,%hi(g_FontNumeric2)
-/*  f18289c:	8dcefafc */ 	lw	$t6,%lo(g_FontNumeric2)($t6)
-/*  f1828a0:	8dadfb00 */ 	lw	$t5,%lo(g_FontNumeric1)($t5)
+/*  f182894:	3c0d8008 */ 	lui	$t5,%hi(g_CharsNumeric)
+/*  f182898:	3c0e8008 */ 	lui	$t6,%hi(g_FontNumeric)
+/*  f18289c:	8dcefafc */ 	lw	$t6,%lo(g_FontNumeric)($t6)
+/*  f1828a0:	8dadfb00 */ 	lw	$t5,%lo(g_CharsNumeric)($t5)
 /*  f1828a4:	87b9004c */ 	lh	$t9,0x4c($sp)
 /*  f1828a8:	3c0f00ff */ 	lui	$t7,0xff
 /*  f1828ac:	35ef00a0 */ 	ori	$t7,$t7,0xa0
@@ -7937,11 +7937,11 @@ glabel scenarioPacCallback18
 /*  f184b18:	00000000 */ 	nop
 /*  f184b1c:	0fc54d8a */ 	jal	func0f153628
 /*  f184b20:	02002025 */ 	or	$a0,$s0,$zero
-/*  f184b24:	3c098008 */ 	lui	$t1,%hi(g_FontHandelGothicXs2)
-/*  f184b28:	8d29fb04 */ 	lw	$t1,%lo(g_FontHandelGothicXs2)($t1)
-/*  f184b2c:	3c078008 */ 	lui	$a3,%hi(g_FontHandelGothicXs1)
+/*  f184b24:	3c098008 */ 	lui	$t1,%hi(g_FontHandelGothicXs)
+/*  f184b28:	8d29fb04 */ 	lw	$t1,%lo(g_FontHandelGothicXs)($t1)
+/*  f184b2c:	3c078008 */ 	lui	$a3,%hi(g_CharsHandelGothicXs)
 /*  f184b30:	00408025 */ 	or	$s0,$v0,$zero
-/*  f184b34:	8ce7fb08 */ 	lw	$a3,%lo(g_FontHandelGothicXs1)($a3)
+/*  f184b34:	8ce7fb08 */ 	lw	$a3,%lo(g_CharsHandelGothicXs)($a3)
 /*  f184b38:	27a40090 */ 	addiu	$a0,$sp,0x90
 /*  f184b3c:	27a50094 */ 	addiu	$a1,$sp,0x94
 /*  f184b40:	27a60048 */ 	addiu	$a2,$sp,0x48
@@ -7970,10 +7970,10 @@ glabel scenarioPacCallback18
 /*  f184b98:	00408025 */ 	or	$s0,$v0,$zero
 /*  f184b9c:	0c002f06 */ 	jal	viGetHeight
 /*  f184ba0:	a7a20044 */ 	sh	$v0,0x44($sp)
-/*  f184ba4:	3c0b8008 */ 	lui	$t3,%hi(g_FontNumeric1)
-/*  f184ba8:	3c0d8008 */ 	lui	$t5,%hi(g_FontNumeric2)
-/*  f184bac:	8dadfafc */ 	lw	$t5,%lo(g_FontNumeric2)($t5)
-/*  f184bb0:	8d6bfb00 */ 	lw	$t3,%lo(g_FontNumeric1)($t3)
+/*  f184ba4:	3c0b8008 */ 	lui	$t3,%hi(g_CharsNumeric)
+/*  f184ba8:	3c0d8008 */ 	lui	$t5,%hi(g_FontNumeric)
+/*  f184bac:	8dadfafc */ 	lw	$t5,%lo(g_FontNumeric)($t5)
+/*  f184bb0:	8d6bfb00 */ 	lw	$t3,%lo(g_CharsNumeric)($t3)
 /*  f184bb4:	87b80044 */ 	lh	$t8,0x44($sp)
 /*  f184bb8:	3c0c00ff */ 	lui	$t4,0xff
 /*  f184bbc:	358c00a0 */ 	ori	$t4,$t4,0xa0
@@ -8076,11 +8076,11 @@ glabel scenarioPacCallback18
 /*  f184b18:	00000000 */ 	nop
 /*  f184b1c:	0fc54d8a */ 	jal	func0f153628
 /*  f184b20:	02002025 */ 	or	$a0,$s0,$zero
-/*  f184b24:	3c098008 */ 	lui	$t1,%hi(g_FontHandelGothicXs2)
-/*  f184b28:	8d29fb04 */ 	lw	$t1,%lo(g_FontHandelGothicXs2)($t1)
-/*  f184b2c:	3c078008 */ 	lui	$a3,%hi(g_FontHandelGothicXs1)
+/*  f184b24:	3c098008 */ 	lui	$t1,%hi(g_FontHandelGothicXs)
+/*  f184b28:	8d29fb04 */ 	lw	$t1,%lo(g_FontHandelGothicXs)($t1)
+/*  f184b2c:	3c078008 */ 	lui	$a3,%hi(g_CharsHandelGothicXs)
 /*  f184b30:	00408025 */ 	or	$s0,$v0,$zero
-/*  f184b34:	8ce7fb08 */ 	lw	$a3,%lo(g_FontHandelGothicXs1)($a3)
+/*  f184b34:	8ce7fb08 */ 	lw	$a3,%lo(g_CharsHandelGothicXs)($a3)
 /*  f184b38:	27a40090 */ 	addiu	$a0,$sp,0x90
 /*  f184b3c:	27a50094 */ 	addiu	$a1,$sp,0x94
 /*  f184b40:	27a60048 */ 	addiu	$a2,$sp,0x48
@@ -8109,10 +8109,10 @@ glabel scenarioPacCallback18
 /*  f184b98:	00408025 */ 	or	$s0,$v0,$zero
 /*  f184b9c:	0c002f06 */ 	jal	viGetHeight
 /*  f184ba0:	a7a20044 */ 	sh	$v0,0x44($sp)
-/*  f184ba4:	3c0b8008 */ 	lui	$t3,%hi(g_FontNumeric1)
-/*  f184ba8:	3c0d8008 */ 	lui	$t5,%hi(g_FontNumeric2)
-/*  f184bac:	8dadfafc */ 	lw	$t5,%lo(g_FontNumeric2)($t5)
-/*  f184bb0:	8d6bfb00 */ 	lw	$t3,%lo(g_FontNumeric1)($t3)
+/*  f184ba4:	3c0b8008 */ 	lui	$t3,%hi(g_CharsNumeric)
+/*  f184ba8:	3c0d8008 */ 	lui	$t5,%hi(g_FontNumeric)
+/*  f184bac:	8dadfafc */ 	lw	$t5,%lo(g_FontNumeric)($t5)
+/*  f184bb0:	8d6bfb00 */ 	lw	$t3,%lo(g_CharsNumeric)($t3)
 /*  f184bb4:	87b80044 */ 	lh	$t8,0x44($sp)
 /*  f184bb8:	3c0c00ff */ 	lui	$t4,0xff
 /*  f184bbc:	358c00a0 */ 	ori	$t4,$t4,0xa0
diff --git a/src/game/mplayer/setup.c b/src/game/mplayer/setup.c
index 4b8aabbef..03943c5a8 100644
--- a/src/game/mplayer/setup.c
+++ b/src/game/mplayer/setup.c
@@ -1394,7 +1394,7 @@ s32 mpChallengesListHandler(s32 operation, struct menuitem *item, union handlerd
 		name = mpChallengeGetNameWithArg(g_MpPlayerNum, challengeindex);
 
 		gdl = textRenderProjected(gdl, &x, &y, name,
-				g_FontHandelGothicSm1, g_FontHandelGothicSm2, renderdata->colour,
+				g_CharsHandelGothicSm, g_FontHandelGothicSm, renderdata->colour,
 				viGetWidth(), viGetHeight(), 0, 0);
 
 		gdl = func0f153780(gdl);
@@ -6531,10 +6531,10 @@ glabel var7f1b8288
 /*  f17e678:	0012c403 */ 	sra	$t8,$s2,0x10
 /*  f17e67c:	0c002f06 */ 	jal	viGetHeight
 /*  f17e680:	03009025 */ 	or	$s2,$t8,$zero
-/*  f17e684:	3c198008 */ 	lui	$t9,%hi(g_FontHandelGothicSm1)
-/*  f17e688:	3c0c8008 */ 	lui	$t4,%hi(g_FontHandelGothicSm2)
-/*  f17e68c:	8d8cfb0c */ 	lw	$t4,%lo(g_FontHandelGothicSm2)($t4)
-/*  f17e690:	8f39fb10 */ 	lw	$t9,%lo(g_FontHandelGothicSm1)($t9)
+/*  f17e684:	3c198008 */ 	lui	$t9,%hi(g_CharsHandelGothicSm)
+/*  f17e688:	3c0c8008 */ 	lui	$t4,%hi(g_FontHandelGothicSm)
+/*  f17e68c:	8d8cfb0c */ 	lw	$t4,%lo(g_FontHandelGothicSm)($t4)
+/*  f17e690:	8f39fb10 */ 	lw	$t9,%lo(g_CharsHandelGothicSm)($t9)
 /*  f17e694:	8fa400b4 */ 	lw	$a0,0xb4($sp)
 /*  f17e698:	afac0014 */ 	sw	$t4,0x14($sp)
 /*  f17e69c:	afb90010 */ 	sw	$t9,0x10($sp)
diff --git a/src/game/sight.c b/src/game/sight.c
index d41c2ae59..929665d15 100644
--- a/src/game/sight.c
+++ b/src/game/sight.c
@@ -716,10 +716,10 @@ glabel sightRenderTargetBox
 /*  f0d7e68:	a3b8004c */ 	sb	$t8,0x4c($sp)
 /*  f0d7e6c:	0c002f06 */ 	jal	viGetHeight
 /*  f0d7e70:	a7a20040 */ 	sh	$v0,0x40($sp)
-/*  f0d7e74:	3c0f8008 */ 	lui	$t7,%hi(g_FontNumeric1)
-/*  f0d7e78:	8deffb00 */ 	lw	$t7,%lo(g_FontNumeric1)($t7)
-/*  f0d7e7c:	3c198008 */ 	lui	$t9,%hi(g_FontNumeric2)
-/*  f0d7e80:	8f39fafc */ 	lw	$t9,%lo(g_FontNumeric2)($t9)
+/*  f0d7e74:	3c0f8008 */ 	lui	$t7,%hi(g_CharsNumeric)
+/*  f0d7e78:	8deffb00 */ 	lw	$t7,%lo(g_CharsNumeric)($t7)
+/*  f0d7e7c:	3c198008 */ 	lui	$t9,%hi(g_FontNumeric)
+/*  f0d7e80:	8f39fafc */ 	lw	$t9,%lo(g_FontNumeric)($t9)
 /*  f0d7e84:	afaf0010 */ 	sw	$t7,0x10($sp)
 /*  f0d7e88:	87af0040 */ 	lh	$t7,0x40($sp)
 /*  f0d7e8c:	3c0e00ff */ 	lui	$t6,0xff
@@ -746,10 +746,10 @@ glabel sightRenderTargetBox
 /*  f0d7edc:	afa20048 */ 	sw	$v0,0x48($sp)
 /*  f0d7ee0:	0c002f06 */ 	jal	viGetHeight
 /*  f0d7ee4:	a7a20040 */ 	sh	$v0,0x40($sp)
-/*  f0d7ee8:	3c198008 */ 	lui	$t9,%hi(g_FontHandelGothicXs1)
-/*  f0d7eec:	8f39fb08 */ 	lw	$t9,%lo(g_FontHandelGothicXs1)($t9)
-/*  f0d7ef0:	3c0e8008 */ 	lui	$t6,%hi(g_FontHandelGothicXs2)
-/*  f0d7ef4:	8dcefb04 */ 	lw	$t6,%lo(g_FontHandelGothicXs2)($t6)
+/*  f0d7ee8:	3c198008 */ 	lui	$t9,%hi(g_CharsHandelGothicXs)
+/*  f0d7eec:	8f39fb08 */ 	lw	$t9,%lo(g_CharsHandelGothicXs)($t9)
+/*  f0d7ef0:	3c0e8008 */ 	lui	$t6,%hi(g_FontHandelGothicXs)
+/*  f0d7ef4:	8dcefb04 */ 	lw	$t6,%lo(g_FontHandelGothicXs)($t6)
 /*  f0d7ef8:	afb90010 */ 	sw	$t9,0x10($sp)
 /*  f0d7efc:	87b90040 */ 	lh	$t9,0x40($sp)
 /*  f0d7f00:	3c1800ff */ 	lui	$t8,0xff
@@ -1160,10 +1160,10 @@ glabel sightRenderTargetBox
 /*  f0d7e68:	a3b8004c */ 	sb	$t8,0x4c($sp)
 /*  f0d7e6c:	0c002f06 */ 	jal	viGetHeight
 /*  f0d7e70:	a7a20040 */ 	sh	$v0,0x40($sp)
-/*  f0d7e74:	3c0f8008 */ 	lui	$t7,%hi(g_FontNumeric1)
-/*  f0d7e78:	8deffb00 */ 	lw	$t7,%lo(g_FontNumeric1)($t7)
-/*  f0d7e7c:	3c198008 */ 	lui	$t9,%hi(g_FontNumeric2)
-/*  f0d7e80:	8f39fafc */ 	lw	$t9,%lo(g_FontNumeric2)($t9)
+/*  f0d7e74:	3c0f8008 */ 	lui	$t7,%hi(g_CharsNumeric)
+/*  f0d7e78:	8deffb00 */ 	lw	$t7,%lo(g_CharsNumeric)($t7)
+/*  f0d7e7c:	3c198008 */ 	lui	$t9,%hi(g_FontNumeric)
+/*  f0d7e80:	8f39fafc */ 	lw	$t9,%lo(g_FontNumeric)($t9)
 /*  f0d7e84:	afaf0010 */ 	sw	$t7,0x10($sp)
 /*  f0d7e88:	87af0040 */ 	lh	$t7,0x40($sp)
 /*  f0d7e8c:	3c0e00ff */ 	lui	$t6,0xff
@@ -1190,10 +1190,10 @@ glabel sightRenderTargetBox
 /*  f0d7edc:	afa20048 */ 	sw	$v0,0x48($sp)
 /*  f0d7ee0:	0c002f06 */ 	jal	viGetHeight
 /*  f0d7ee4:	a7a20040 */ 	sh	$v0,0x40($sp)
-/*  f0d7ee8:	3c198008 */ 	lui	$t9,%hi(g_FontHandelGothicXs1)
-/*  f0d7eec:	8f39fb08 */ 	lw	$t9,%lo(g_FontHandelGothicXs1)($t9)
-/*  f0d7ef0:	3c0e8008 */ 	lui	$t6,%hi(g_FontHandelGothicXs2)
-/*  f0d7ef4:	8dcefb04 */ 	lw	$t6,%lo(g_FontHandelGothicXs2)($t6)
+/*  f0d7ee8:	3c198008 */ 	lui	$t9,%hi(g_CharsHandelGothicXs)
+/*  f0d7eec:	8f39fb08 */ 	lw	$t9,%lo(g_CharsHandelGothicXs)($t9)
+/*  f0d7ef0:	3c0e8008 */ 	lui	$t6,%hi(g_FontHandelGothicXs)
+/*  f0d7ef4:	8dcefb04 */ 	lw	$t6,%lo(g_FontHandelGothicXs)($t6)
 /*  f0d7ef8:	afb90010 */ 	sw	$t9,0x10($sp)
 /*  f0d7efc:	87b90040 */ 	lh	$t9,0x40($sp)
 /*  f0d7f00:	3c1800ff */ 	lui	$t8,0xff
@@ -3067,10 +3067,10 @@ glabel var7f1ade50
 /*  f0d91d0:	00409025 */ 	or	$s2,$v0,$zero
 /*  f0d91d4:	0c002f06 */ 	jal	viGetHeight
 /*  f0d91d8:	a7a20060 */ 	sh	$v0,0x60($sp)
-/*  f0d91dc:	3c0c8008 */ 	lui	$t4,%hi(g_FontHandelGothicXs1)
-/*  f0d91e0:	3c0d8008 */ 	lui	$t5,%hi(g_FontHandelGothicXs2)
-/*  f0d91e4:	8dadfb04 */ 	lw	$t5,%lo(g_FontHandelGothicXs2)($t5)
-/*  f0d91e8:	8d8cfb08 */ 	lw	$t4,%lo(g_FontHandelGothicXs1)($t4)
+/*  f0d91dc:	3c0c8008 */ 	lui	$t4,%hi(g_CharsHandelGothicXs)
+/*  f0d91e0:	3c0d8008 */ 	lui	$t5,%hi(g_FontHandelGothicXs)
+/*  f0d91e4:	8dadfb04 */ 	lw	$t5,%lo(g_FontHandelGothicXs)($t5)
+/*  f0d91e8:	8d8cfb08 */ 	lw	$t4,%lo(g_CharsHandelGothicXs)($t4)
 /*  f0d91ec:	87b80060 */ 	lh	$t8,0x60($sp)
 /*  f0d91f0:	3c0e00ff */ 	lui	$t6,0xff
 /*  f0d91f4:	35ce00a0 */ 	ori	$t6,$t6,0xa0
@@ -3529,10 +3529,10 @@ glabel var7f1ade50
 /*  f0d91d0:	00409025 */ 	or	$s2,$v0,$zero
 /*  f0d91d4:	0c002f06 */ 	jal	viGetHeight
 /*  f0d91d8:	a7a20060 */ 	sh	$v0,0x60($sp)
-/*  f0d91dc:	3c0c8008 */ 	lui	$t4,%hi(g_FontHandelGothicXs1)
-/*  f0d91e0:	3c0d8008 */ 	lui	$t5,%hi(g_FontHandelGothicXs2)
-/*  f0d91e4:	8dadfb04 */ 	lw	$t5,%lo(g_FontHandelGothicXs2)($t5)
-/*  f0d91e8:	8d8cfb08 */ 	lw	$t4,%lo(g_FontHandelGothicXs1)($t4)
+/*  f0d91dc:	3c0c8008 */ 	lui	$t4,%hi(g_CharsHandelGothicXs)
+/*  f0d91e0:	3c0d8008 */ 	lui	$t5,%hi(g_FontHandelGothicXs)
+/*  f0d91e4:	8dadfb04 */ 	lw	$t5,%lo(g_FontHandelGothicXs)($t5)
+/*  f0d91e8:	8d8cfb08 */ 	lw	$t4,%lo(g_CharsHandelGothicXs)($t4)
 /*  f0d91ec:	87b80060 */ 	lh	$t8,0x60($sp)
 /*  f0d91f0:	3c0e00ff */ 	lui	$t6,0xff
 /*  f0d91f4:	35ce00a0 */ 	ori	$t6,$t6,0xa0
@@ -3841,7 +3841,7 @@ glabel var7f1ade50
 //			if (var80070f98 & 0x80) {
 //				// "Identify"
 //				gdl = textRender(gdl, &textx, &texty, langGet(L_MISC_439),
-//						g_FontHandelGothicXs1, g_FontHandelGothicXs2, 0x00ff00a0, 0x000000a0,
+//						g_CharsHandelGothicXs, g_FontHandelGothicXs, 0x00ff00a0, 0x000000a0,
 //						viGetWidth(), viGetHeight(), 0, 0);
 //			}
 //
diff --git a/src/game/title.c b/src/game/title.c
index ef2c86299..86f420a4f 100644
--- a/src/game/title.c
+++ b/src/game/title.c
@@ -485,17 +485,17 @@ Gfx *titleRenderCheckControllers(Gfx *gdl)
 GLOBAL_ASM(
 glabel func0f0165f0
 /*  f0165f0:	27bdffb0 */ 	addiu	$sp,$sp,-80
-/*  f0165f4:	3c0e8008 */ 	lui	$t6,%hi(g_FontHandelGothicLg2)
-/*  f0165f8:	8dcefb1c */ 	lw	$t6,%lo(g_FontHandelGothicLg2)($t6)
+/*  f0165f4:	3c0e8008 */ 	lui	$t6,%hi(g_FontHandelGothicLg)
+/*  f0165f8:	8dcefb1c */ 	lw	$t6,%lo(g_FontHandelGothicLg)($t6)
 /*  f0165fc:	afa7005c */ 	sw	$a3,0x5c($sp)
 /*  f016600:	afbf0034 */ 	sw	$ra,0x34($sp)
 /*  f016604:	afa40050 */ 	sw	$a0,0x50($sp)
 /*  f016608:	afa50054 */ 	sw	$a1,0x54($sp)
 /*  f01660c:	afa60058 */ 	sw	$a2,0x58($sp)
-/*  f016610:	3c078008 */ 	lui	$a3,%hi(g_FontHandelGothicLg1)
+/*  f016610:	3c078008 */ 	lui	$a3,%hi(g_CharsHandelGothicLg)
 /*  f016614:	afa00048 */ 	sw	$zero,0x48($sp)
 /*  f016618:	afa0004c */ 	sw	$zero,0x4c($sp)
-/*  f01661c:	8ce7fb20 */ 	lw	$a3,%lo(g_FontHandelGothicLg1)($a3)
+/*  f01661c:	8ce7fb20 */ 	lw	$a3,%lo(g_CharsHandelGothicLg)($a3)
 /*  f016620:	8fa60064 */ 	lw	$a2,0x64($sp)
 /*  f016624:	27a50048 */ 	addiu	$a1,$sp,0x48
 /*  f016628:	27a4004c */ 	addiu	$a0,$sp,0x4c
@@ -1092,15 +1092,15 @@ glabel var7f1a83e4
 /*  f01677c:	3c0d8006 */ 	lui	$t5,%hi(var800626ec)
 /*  f016780:	3c108006 */ 	lui	$s0,%hi(var800625f0)
 /*  f016784:	25ad26ec */ 	addiu	$t5,$t5,%lo(var800626ec)
-/*  f016788:	3c1e8008 */ 	lui	$s8,%hi(g_FontHandelGothicSm1)
-/*  f01678c:	3c178008 */ 	lui	$s7,%hi(g_FontHandelGothicLg2)
-/*  f016790:	3c168008 */ 	lui	$s6,%hi(g_FontHandelGothicLg1)
+/*  f016788:	3c1e8008 */ 	lui	$s8,%hi(g_CharsHandelGothicSm)
+/*  f01678c:	3c178008 */ 	lui	$s7,%hi(g_FontHandelGothicLg)
+/*  f016790:	3c168008 */ 	lui	$s6,%hi(g_CharsHandelGothicLg)
 /*  f016794:	afa20128 */ 	sw	$v0,0x128($sp)
 /*  f016798:	261025f0 */ 	addiu	$s0,$s0,%lo(var800625f0)
 /*  f01679c:	afad0120 */ 	sw	$t5,0x120($sp)
-/*  f0167a0:	26d6fb20 */ 	addiu	$s6,$s6,%lo(g_FontHandelGothicLg1)
-/*  f0167a4:	26f7fb1c */ 	addiu	$s7,$s7,%lo(g_FontHandelGothicLg2)
-/*  f0167a8:	27defb10 */ 	addiu	$s8,$s8,%lo(g_FontHandelGothicSm1)
+/*  f0167a0:	26d6fb20 */ 	addiu	$s6,$s6,%lo(g_CharsHandelGothicLg)
+/*  f0167a4:	26f7fb1c */ 	addiu	$s7,$s7,%lo(g_FontHandelGothicLg)
+/*  f0167a8:	27defb10 */ 	addiu	$s8,$s8,%lo(g_CharsHandelGothicSm)
 /*  f0167ac:	86030008 */ 	lh	$v1,0x8($s0)
 .L0f0167b0:
 /*  f0167b0:	3c157f7f */ 	lui	$s5,0x7f7f
@@ -1113,15 +1113,15 @@ glabel var7f1a83e4
 /*  f0167cc:	8c3983cc */ 	lw	$t9,%lo(var7f1a83cc)($at)
 /*  f0167d0:	03200008 */ 	jr	$t9
 /*  f0167d4:	00000000 */ 	nop
-/*  f0167d8:	3c128008 */ 	lui	$s2,%hi(g_FontHandelGothicSm2)
+/*  f0167d8:	3c128008 */ 	lui	$s2,%hi(g_FontHandelGothicSm)
 /*  f0167dc:	8fd10000 */ 	lw	$s1,0x0($s8)
 /*  f0167e0:	10000024 */ 	b	.L0f016874
-/*  f0167e4:	8e52fb0c */ 	lw	$s2,%lo(g_FontHandelGothicSm2)($s2)
-/*  f0167e8:	3c118008 */ 	lui	$s1,%hi(g_FontHandelGothicMd1)
-/*  f0167ec:	3c128008 */ 	lui	$s2,%hi(g_FontHandelGothicMd2)
-/*  f0167f0:	8e31fb18 */ 	lw	$s1,%lo(g_FontHandelGothicMd1)($s1)
+/*  f0167e4:	8e52fb0c */ 	lw	$s2,%lo(g_FontHandelGothicSm)($s2)
+/*  f0167e8:	3c118008 */ 	lui	$s1,%hi(g_CharsHandelGothicMd)
+/*  f0167ec:	3c128008 */ 	lui	$s2,%hi(g_FontHandelGothicMd)
+/*  f0167f0:	8e31fb18 */ 	lw	$s1,%lo(g_CharsHandelGothicMd)($s1)
 /*  f0167f4:	1000001f */ 	b	.L0f016874
-/*  f0167f8:	8e52fb14 */ 	lw	$s2,%lo(g_FontHandelGothicMd2)($s2)
+/*  f0167f8:	8e52fb14 */ 	lw	$s2,%lo(g_FontHandelGothicMd)($s2)
 /*  f0167fc:	8ed10000 */ 	lw	$s1,0x0($s6)
 /*  f016800:	1000001c */ 	b	.L0f016874
 /*  f016804:	8ef20000 */ 	lw	$s2,0x0($s7)
@@ -1147,9 +1147,9 @@ glabel var7f1a83e4
 /*  f01684c:	a60f000a */ 	sh	$t7,0xa($s0)
 /*  f016850:	10000008 */ 	b	.L0f016874
 /*  f016854:	86030008 */ 	lh	$v1,0x8($s0)
-/*  f016858:	3c128008 */ 	lui	$s2,%hi(g_FontHandelGothicSm2)
+/*  f016858:	3c128008 */ 	lui	$s2,%hi(g_FontHandelGothicSm)
 /*  f01685c:	8fd10000 */ 	lw	$s1,0x0($s8)
-/*  f016860:	8e52fb0c */ 	lw	$s2,%lo(g_FontHandelGothicSm2)($s2)
+/*  f016860:	8e52fb0c */ 	lw	$s2,%lo(g_FontHandelGothicSm)($s2)
 /*  f016864:	10000003 */ 	b	.L0f016874
 /*  f016868:	2415ffff */ 	addiu	$s5,$zero,-1
 .L0f01686c:
@@ -5228,11 +5228,11 @@ glabel func0f018ebc
 /*  f018fe0:	01609825 */ 	or	$s3,$t3,$zero
 /*  f018fe4:	3c017f7f */ 	lui	$at,0x7f7f
 /*  f018fe8:	3421ffff */ 	ori	$at,$at,0xffff
-/*  f018fec:	3c0c8008 */ 	lui	$t4,%hi(g_FontHandelGothicLg1)
-/*  f018ff0:	3c0d8008 */ 	lui	$t5,%hi(g_FontHandelGothicLg2)
+/*  f018fec:	3c0c8008 */ 	lui	$t4,%hi(g_CharsHandelGothicLg)
+/*  f018ff0:	3c0d8008 */ 	lui	$t5,%hi(g_FontHandelGothicLg)
 /*  f018ff4:	00107200 */ 	sll	$t6,$s0,0x8
-/*  f018ff8:	8dadfb1c */ 	lw	$t5,%lo(g_FontHandelGothicLg2)($t5)
-/*  f018ffc:	8d8cfb20 */ 	lw	$t4,%lo(g_FontHandelGothicLg1)($t4)
+/*  f018ff8:	8dadfb1c */ 	lw	$t5,%lo(g_FontHandelGothicLg)($t5)
+/*  f018ffc:	8d8cfb20 */ 	lw	$t4,%lo(g_CharsHandelGothicLg)($t4)
 /*  f019000:	01c17825 */ 	or	$t7,$t6,$at
 /*  f019004:	0010c400 */ 	sll	$t8,$s0,0x10
 /*  f019008:	01f8c825 */ 	or	$t9,$t7,$t8
@@ -7048,11 +7048,11 @@ glabel titleRenderNoController
 /*  f01a534:	00408025 */ 	or	$s0,$v0,$zero
 /*  f01a538:	0fc5b9f1 */ 	jal	langGet
 /*  f01a53c:	24045647 */ 	addiu	$a0,$zero,0x5647
-/*  f01a540:	3c0e8008 */ 	lui	$t6,%hi(g_FontHandelGothicLg2)
-/*  f01a544:	8dcefb1c */ 	lw	$t6,%lo(g_FontHandelGothicLg2)($t6)
-/*  f01a548:	3c078008 */ 	lui	$a3,%hi(g_FontHandelGothicLg1)
+/*  f01a540:	3c0e8008 */ 	lui	$t6,%hi(g_FontHandelGothicLg)
+/*  f01a544:	8dcefb1c */ 	lw	$t6,%lo(g_FontHandelGothicLg)($t6)
+/*  f01a548:	3c078008 */ 	lui	$a3,%hi(g_CharsHandelGothicLg)
 /*  f01a54c:	afa20054 */ 	sw	$v0,0x54($sp)
-/*  f01a550:	8ce7fb20 */ 	lw	$a3,%lo(g_FontHandelGothicLg1)($a3)
+/*  f01a550:	8ce7fb20 */ 	lw	$a3,%lo(g_CharsHandelGothicLg)($a3)
 /*  f01a554:	27a40064 */ 	addiu	$a0,$sp,0x64
 /*  f01a558:	27a50060 */ 	addiu	$a1,$sp,0x60
 /*  f01a55c:	00403025 */ 	or	$a2,$v0,$zero
@@ -7083,10 +7083,10 @@ glabel titleRenderNoController
 /*  f01a5bc:	00000000 */ 	nop
 /*  f01a5c0:	0c002f06 */ 	jal	viGetHeight
 /*  f01a5c4:	a7a20048 */ 	sh	$v0,0x48($sp)
-/*  f01a5c8:	3c198008 */ 	lui	$t9,%hi(g_FontHandelGothicLg1)
-/*  f01a5cc:	3c188008 */ 	lui	$t8,%hi(g_FontHandelGothicLg2)
-/*  f01a5d0:	8f18fb1c */ 	lw	$t8,%lo(g_FontHandelGothicLg2)($t8)
-/*  f01a5d4:	8f39fb20 */ 	lw	$t9,%lo(g_FontHandelGothicLg1)($t9)
+/*  f01a5c8:	3c198008 */ 	lui	$t9,%hi(g_CharsHandelGothicLg)
+/*  f01a5cc:	3c188008 */ 	lui	$t8,%hi(g_FontHandelGothicLg)
+/*  f01a5d0:	8f18fb1c */ 	lw	$t8,%lo(g_FontHandelGothicLg)($t8)
+/*  f01a5d4:	8f39fb20 */ 	lw	$t9,%lo(g_CharsHandelGothicLg)($t9)
 /*  f01a5d8:	87ab0048 */ 	lh	$t3,0x48($sp)
 /*  f01a5dc:	3c090080 */ 	lui	$t1,0x80
 /*  f01a5e0:	352900ff */ 	ori	$t1,$t1,0xff
@@ -7111,10 +7111,10 @@ glabel titleRenderNoController
 /*  f01a628:	00000000 */ 	nop
 /*  f01a62c:	0c002f06 */ 	jal	viGetHeight
 /*  f01a630:	a7a20048 */ 	sh	$v0,0x48($sp)
-/*  f01a634:	3c0a8008 */ 	lui	$t2,%hi(g_FontHandelGothicLg1)
-/*  f01a638:	3c0c8008 */ 	lui	$t4,%hi(g_FontHandelGothicLg2)
-/*  f01a63c:	8d8cfb1c */ 	lw	$t4,%lo(g_FontHandelGothicLg2)($t4)
-/*  f01a640:	8d4afb20 */ 	lw	$t2,%lo(g_FontHandelGothicLg1)($t2)
+/*  f01a634:	3c0a8008 */ 	lui	$t2,%hi(g_CharsHandelGothicLg)
+/*  f01a638:	3c0c8008 */ 	lui	$t4,%hi(g_FontHandelGothicLg)
+/*  f01a63c:	8d8cfb1c */ 	lw	$t4,%lo(g_FontHandelGothicLg)($t4)
+/*  f01a640:	8d4afb20 */ 	lw	$t2,%lo(g_CharsHandelGothicLg)($t2)
 /*  f01a644:	87ae0048 */ 	lh	$t6,0x48($sp)
 /*  f01a648:	240dffff */ 	addiu	$t5,$zero,-1
 /*  f01a64c:	afad0018 */ 	sw	$t5,0x18($sp)
@@ -7133,11 +7133,11 @@ glabel titleRenderNoController
 .L0f01a680:
 /*  f01a680:	0fc5b9f1 */ 	jal	langGet
 /*  f01a684:	24045648 */ 	addiu	$a0,$zero,0x5648
-/*  f01a688:	3c0f8008 */ 	lui	$t7,%hi(g_FontHandelGothicLg2)
-/*  f01a68c:	8deffb1c */ 	lw	$t7,%lo(g_FontHandelGothicLg2)($t7)
-/*  f01a690:	3c078008 */ 	lui	$a3,%hi(g_FontHandelGothicLg1)
+/*  f01a688:	3c0f8008 */ 	lui	$t7,%hi(g_FontHandelGothicLg)
+/*  f01a68c:	8deffb1c */ 	lw	$t7,%lo(g_FontHandelGothicLg)($t7)
+/*  f01a690:	3c078008 */ 	lui	$a3,%hi(g_CharsHandelGothicLg)
 /*  f01a694:	afa20054 */ 	sw	$v0,0x54($sp)
-/*  f01a698:	8ce7fb20 */ 	lw	$a3,%lo(g_FontHandelGothicLg1)($a3)
+/*  f01a698:	8ce7fb20 */ 	lw	$a3,%lo(g_CharsHandelGothicLg)($a3)
 /*  f01a69c:	27a40064 */ 	addiu	$a0,$sp,0x64
 /*  f01a6a0:	27a50060 */ 	addiu	$a1,$sp,0x60
 /*  f01a6a4:	00403025 */ 	or	$a2,$v0,$zero
@@ -7168,10 +7168,10 @@ glabel titleRenderNoController
 /*  f01a704:	00000000 */ 	nop
 /*  f01a708:	0c002f06 */ 	jal	viGetHeight
 /*  f01a70c:	a7a20048 */ 	sh	$v0,0x48($sp)
-/*  f01a710:	3c088008 */ 	lui	$t0,%hi(g_FontHandelGothicLg1)
-/*  f01a714:	3c188008 */ 	lui	$t8,%hi(g_FontHandelGothicLg2)
-/*  f01a718:	8f18fb1c */ 	lw	$t8,%lo(g_FontHandelGothicLg2)($t8)
-/*  f01a71c:	8d08fb20 */ 	lw	$t0,%lo(g_FontHandelGothicLg1)($t0)
+/*  f01a710:	3c088008 */ 	lui	$t0,%hi(g_CharsHandelGothicLg)
+/*  f01a714:	3c188008 */ 	lui	$t8,%hi(g_FontHandelGothicLg)
+/*  f01a718:	8f18fb1c */ 	lw	$t8,%lo(g_FontHandelGothicLg)($t8)
+/*  f01a71c:	8d08fb20 */ 	lw	$t0,%lo(g_CharsHandelGothicLg)($t0)
 /*  f01a720:	87ac0048 */ 	lh	$t4,0x48($sp)
 /*  f01a724:	3c0b0080 */ 	lui	$t3,0x80
 /*  f01a728:	356b00ff */ 	ori	$t3,$t3,0xff
@@ -7196,10 +7196,10 @@ glabel titleRenderNoController
 /*  f01a770:	00000000 */ 	nop
 /*  f01a774:	0c002f06 */ 	jal	viGetHeight
 /*  f01a778:	a7a20048 */ 	sh	$v0,0x48($sp)
-/*  f01a77c:	3c0a8008 */ 	lui	$t2,%hi(g_FontHandelGothicLg1)
-/*  f01a780:	3c0d8008 */ 	lui	$t5,%hi(g_FontHandelGothicLg2)
-/*  f01a784:	8dadfb1c */ 	lw	$t5,%lo(g_FontHandelGothicLg2)($t5)
-/*  f01a788:	8d4afb20 */ 	lw	$t2,%lo(g_FontHandelGothicLg1)($t2)
+/*  f01a77c:	3c0a8008 */ 	lui	$t2,%hi(g_CharsHandelGothicLg)
+/*  f01a780:	3c0d8008 */ 	lui	$t5,%hi(g_FontHandelGothicLg)
+/*  f01a784:	8dadfb1c */ 	lw	$t5,%lo(g_FontHandelGothicLg)($t5)
+/*  f01a788:	8d4afb20 */ 	lw	$t2,%lo(g_CharsHandelGothicLg)($t2)
 /*  f01a78c:	87af0048 */ 	lh	$t7,0x48($sp)
 /*  f01a790:	240effff */ 	addiu	$t6,$zero,-1
 /*  f01a794:	afae0018 */ 	sw	$t6,0x18($sp)
@@ -7251,33 +7251,33 @@ glabel titleRenderNoController
 //
 //	// First line
 //	text = langGet(L_OPTIONS_071); // "- no controller in controller socket 1 -"
-//	textMeasure(&textheight, &textwidth, text, g_FontHandelGothicLg1, g_FontHandelGothicLg2, 0);
+//	textMeasure(&textheight, &textwidth, text, g_CharsHandelGothicLg, g_FontHandelGothicLg, 0);
 //
 //	x = 288 - (textwidth >> 1);
 //	y = ((var800624a0 / 2) - (textheight >> 1)) - 12;
 //
 //	if (g_Jpn) {
-//		gdl = textRender(gdl, &x, &y, text, g_FontHandelGothicLg1, g_FontHandelGothicLg2,
+//		gdl = textRender(gdl, &x, &y, text, g_CharsHandelGothicLg, g_FontHandelGothicLg,
 //				-1, 0x008000ff, viGetWidth(), viGetHeight(), 0, 0);
 //	} else {
-//		gdl = textRenderProjected(gdl, &x, &y, text, g_FontHandelGothicLg1, g_FontHandelGothicLg2,
+//		gdl = textRenderProjected(gdl, &x, &y, text, g_CharsHandelGothicLg, g_FontHandelGothicLg,
 //				-1, viGetWidth(), viGetHeight(), 0, 0);
 //	}
 //
 //	// Second line
 //	text = langGet(L_OPTIONS_072); // "please power off and attach a controller"
-//	textMeasure(&textheight, &textwidth, text, g_FontHandelGothicLg1, g_FontHandelGothicLg2, 0);
+//	textMeasure(&textheight, &textwidth, text, g_CharsHandelGothicLg, g_FontHandelGothicLg, 0);
 //
 //	x = 288 - (textwidth >> 1);
 //	y = ((var800624a0 / 2) - (textheight >> 1)) + 12;
 //
 //	if (g_Jpn) {
-//		gdl = textRender(gdl, &x, &y, text, g_FontHandelGothicLg1, g_FontHandelGothicLg2,
+//		gdl = textRender(gdl, &x, &y, text, g_CharsHandelGothicLg, g_FontHandelGothicLg,
 //				-1, 0x008000ff, viGetWidth(), viGetHeight(), 0, 0);
 //	} else {
 //		s16 a = viGetWidth();
 //		s16 b = viGetHeight();
-//		gdl = textRenderProjected(gdl, &x, &y, text, g_FontHandelGothicLg1, g_FontHandelGothicLg2,
+//		gdl = textRenderProjected(gdl, &x, &y, text, g_CharsHandelGothicLg, g_FontHandelGothicLg,
 //				-1, a, b, 0, 0);
 //	}
 //
diff --git a/src/game/training/menus.c b/src/game/training/menus.c
index b90a12674..d9fb7409e 100644
--- a/src/game/training/menus.c
+++ b/src/game/training/menus.c
@@ -222,10 +222,10 @@ glabel var7f1b9940
 /*  f1a35f8:	afa20044 */ 	sw	$v0,0x44($sp)
 /*  f1a35fc:	0c002f06 */ 	jal	viGetHeight
 /*  f1a3600:	a7a2003e */ 	sh	$v0,0x3e($sp)
-/*  f1a3604:	3c198008 */ 	lui	$t9,%hi(g_FontHandelGothicSm1)
-/*  f1a3608:	3c0e8008 */ 	lui	$t6,%hi(g_FontHandelGothicSm2)
-/*  f1a360c:	8dcefb0c */ 	lw	$t6,%lo(g_FontHandelGothicSm2)($t6)
-/*  f1a3610:	8f39fb10 */ 	lw	$t9,%lo(g_FontHandelGothicSm1)($t9)
+/*  f1a3604:	3c198008 */ 	lui	$t9,%hi(g_CharsHandelGothicSm)
+/*  f1a3608:	3c0e8008 */ 	lui	$t6,%hi(g_FontHandelGothicSm)
+/*  f1a360c:	8dcefb0c */ 	lw	$t6,%lo(g_FontHandelGothicSm)($t6)
+/*  f1a3610:	8f39fb10 */ 	lw	$t9,%lo(g_CharsHandelGothicSm)($t9)
 /*  f1a3614:	8fa80098 */ 	lw	$t0,0x98($sp)
 /*  f1a3618:	afae0014 */ 	sw	$t6,0x14($sp)
 /*  f1a361c:	afb90010 */ 	sw	$t9,0x10($sp)
@@ -1800,10 +1800,10 @@ glabel menuhandler001a44c0
 /*  f1a4d14:	afa2015c */ 	sw	$v0,0x15c($sp)
 /*  f1a4d18:	0c002f06 */ 	jal	viGetHeight
 /*  f1a4d1c:	a7a20044 */ 	sh	$v0,0x44($sp)
-/*  f1a4d20:	3c0d8008 */ 	lui	$t5,%hi(g_FontHandelGothicSm1)
-/*  f1a4d24:	3c198008 */ 	lui	$t9,%hi(g_FontHandelGothicSm2)
-/*  f1a4d28:	8f39fb0c */ 	lw	$t9,%lo(g_FontHandelGothicSm2)($t9)
-/*  f1a4d2c:	8dadfb10 */ 	lw	$t5,%lo(g_FontHandelGothicSm1)($t5)
+/*  f1a4d20:	3c0d8008 */ 	lui	$t5,%hi(g_CharsHandelGothicSm)
+/*  f1a4d24:	3c198008 */ 	lui	$t9,%hi(g_FontHandelGothicSm)
+/*  f1a4d28:	8f39fb0c */ 	lw	$t9,%lo(g_FontHandelGothicSm)($t9)
+/*  f1a4d2c:	8dadfb10 */ 	lw	$t5,%lo(g_CharsHandelGothicSm)($t5)
 /*  f1a4d30:	8fae00ac */ 	lw	$t6,0xac($sp)
 /*  f1a4d34:	87ac0044 */ 	lh	$t4,0x44($sp)
 /*  f1a4d38:	8fa4015c */ 	lw	$a0,0x15c($sp)
@@ -1841,10 +1841,10 @@ glabel menuhandler001a44c0
 /*  f1a4db8:	afa2015c */ 	sw	$v0,0x15c($sp)
 /*  f1a4dbc:	0c002f06 */ 	jal	viGetHeight
 /*  f1a4dc0:	a7a20044 */ 	sh	$v0,0x44($sp)
-/*  f1a4dc4:	3c0c8008 */ 	lui	$t4,%hi(g_FontHandelGothicSm1)
-/*  f1a4dc8:	3c188008 */ 	lui	$t8,%hi(g_FontHandelGothicSm2)
-/*  f1a4dcc:	8f18fb0c */ 	lw	$t8,%lo(g_FontHandelGothicSm2)($t8)
-/*  f1a4dd0:	8d8cfb10 */ 	lw	$t4,%lo(g_FontHandelGothicSm1)($t4)
+/*  f1a4dc4:	3c0c8008 */ 	lui	$t4,%hi(g_CharsHandelGothicSm)
+/*  f1a4dc8:	3c188008 */ 	lui	$t8,%hi(g_FontHandelGothicSm)
+/*  f1a4dcc:	8f18fb0c */ 	lw	$t8,%lo(g_FontHandelGothicSm)($t8)
+/*  f1a4dd0:	8d8cfb10 */ 	lw	$t4,%lo(g_CharsHandelGothicSm)($t4)
 /*  f1a4dd4:	8faf00ac */ 	lw	$t7,0xac($sp)
 /*  f1a4dd8:	87ad0044 */ 	lh	$t5,0x44($sp)
 /*  f1a4ddc:	8fa4015c */ 	lw	$a0,0x15c($sp)
@@ -1869,10 +1869,10 @@ glabel menuhandler001a44c0
 /*  f1a4e28:	01c67021 */ 	addu	$t6,$t6,$a2
 /*  f1a4e2c:	0c004dad */ 	jal	sprintf
 /*  f1a4e30:	000e3040 */ 	sll	$a2,$t6,0x1
-/*  f1a4e34:	3c0c8008 */ 	lui	$t4,%hi(g_FontHandelGothicSm2)
-/*  f1a4e38:	8d8cfb0c */ 	lw	$t4,%lo(g_FontHandelGothicSm2)($t4)
-/*  f1a4e3c:	3c078008 */ 	lui	$a3,%hi(g_FontHandelGothicSm1)
-/*  f1a4e40:	8ce7fb10 */ 	lw	$a3,%lo(g_FontHandelGothicSm1)($a3)
+/*  f1a4e34:	3c0c8008 */ 	lui	$t4,%hi(g_FontHandelGothicSm)
+/*  f1a4e38:	8d8cfb0c */ 	lw	$t4,%lo(g_FontHandelGothicSm)($t4)
+/*  f1a4e3c:	3c078008 */ 	lui	$a3,%hi(g_CharsHandelGothicSm)
+/*  f1a4e40:	8ce7fb10 */ 	lw	$a3,%lo(g_CharsHandelGothicSm)($a3)
 /*  f1a4e44:	27a4014c */ 	addiu	$a0,$sp,0x14c
 /*  f1a4e48:	27a50148 */ 	addiu	$a1,$sp,0x148
 /*  f1a4e4c:	27a600c0 */ 	addiu	$a2,$sp,0xc0
@@ -1898,10 +1898,10 @@ glabel menuhandler001a44c0
 /*  f1a4e9c:	afa2015c */ 	sw	$v0,0x15c($sp)
 /*  f1a4ea0:	0c002f06 */ 	jal	viGetHeight
 /*  f1a4ea4:	a7a20044 */ 	sh	$v0,0x44($sp)
-/*  f1a4ea8:	3c0f8008 */ 	lui	$t7,%hi(g_FontHandelGothicSm1)
-/*  f1a4eac:	3c0d8008 */ 	lui	$t5,%hi(g_FontHandelGothicSm2)
-/*  f1a4eb0:	8dadfb0c */ 	lw	$t5,%lo(g_FontHandelGothicSm2)($t5)
-/*  f1a4eb4:	8deffb10 */ 	lw	$t7,%lo(g_FontHandelGothicSm1)($t7)
+/*  f1a4ea8:	3c0f8008 */ 	lui	$t7,%hi(g_CharsHandelGothicSm)
+/*  f1a4eac:	3c0d8008 */ 	lui	$t5,%hi(g_FontHandelGothicSm)
+/*  f1a4eb0:	8dadfb0c */ 	lw	$t5,%lo(g_FontHandelGothicSm)($t5)
+/*  f1a4eb4:	8deffb10 */ 	lw	$t7,%lo(g_CharsHandelGothicSm)($t7)
 /*  f1a4eb8:	8fb900ac */ 	lw	$t9,0xac($sp)
 /*  f1a4ebc:	87ae0044 */ 	lh	$t6,0x44($sp)
 /*  f1a4ec0:	8fa4015c */ 	lw	$a0,0x15c($sp)
@@ -1940,10 +1940,10 @@ glabel menuhandler001a44c0
 /*  f1a4f44:	afa2015c */ 	sw	$v0,0x15c($sp)
 /*  f1a4f48:	0c002f06 */ 	jal	viGetHeight
 /*  f1a4f4c:	a7a20044 */ 	sh	$v0,0x44($sp)
-/*  f1a4f50:	3c0c8008 */ 	lui	$t4,%hi(g_FontHandelGothicSm1)
-/*  f1a4f54:	3c188008 */ 	lui	$t8,%hi(g_FontHandelGothicSm2)
-/*  f1a4f58:	8f18fb0c */ 	lw	$t8,%lo(g_FontHandelGothicSm2)($t8)
-/*  f1a4f5c:	8d8cfb10 */ 	lw	$t4,%lo(g_FontHandelGothicSm1)($t4)
+/*  f1a4f50:	3c0c8008 */ 	lui	$t4,%hi(g_CharsHandelGothicSm)
+/*  f1a4f54:	3c188008 */ 	lui	$t8,%hi(g_FontHandelGothicSm)
+/*  f1a4f58:	8f18fb0c */ 	lw	$t8,%lo(g_FontHandelGothicSm)($t8)
+/*  f1a4f5c:	8d8cfb10 */ 	lw	$t4,%lo(g_CharsHandelGothicSm)($t4)
 /*  f1a4f60:	8faf00ac */ 	lw	$t7,0xac($sp)
 /*  f1a4f64:	87ad0044 */ 	lh	$t5,0x44($sp)
 /*  f1a4f68:	8fa4015c */ 	lw	$a0,0x15c($sp)
@@ -1981,10 +1981,10 @@ glabel menuhandler001a44c0
 /*  f1a4fe8:	afa2015c */ 	sw	$v0,0x15c($sp)
 /*  f1a4fec:	0c002f06 */ 	jal	viGetHeight
 /*  f1a4ff0:	a7a20044 */ 	sh	$v0,0x44($sp)
-/*  f1a4ff4:	3c0d8008 */ 	lui	$t5,%hi(g_FontHandelGothicSm1)
-/*  f1a4ff8:	3c198008 */ 	lui	$t9,%hi(g_FontHandelGothicSm2)
-/*  f1a4ffc:	8f39fb0c */ 	lw	$t9,%lo(g_FontHandelGothicSm2)($t9)
-/*  f1a5000:	8dadfb10 */ 	lw	$t5,%lo(g_FontHandelGothicSm1)($t5)
+/*  f1a4ff4:	3c0d8008 */ 	lui	$t5,%hi(g_CharsHandelGothicSm)
+/*  f1a4ff8:	3c198008 */ 	lui	$t9,%hi(g_FontHandelGothicSm)
+/*  f1a4ffc:	8f39fb0c */ 	lw	$t9,%lo(g_FontHandelGothicSm)($t9)
+/*  f1a5000:	8dadfb10 */ 	lw	$t5,%lo(g_CharsHandelGothicSm)($t5)
 /*  f1a5004:	8fae00ac */ 	lw	$t6,0xac($sp)
 /*  f1a5008:	87ac0044 */ 	lh	$t4,0x44($sp)
 /*  f1a500c:	8fa4015c */ 	lw	$a0,0x15c($sp)
@@ -2009,10 +2009,10 @@ glabel menuhandler001a44c0
 /*  f1a5058:	01e67821 */ 	addu	$t7,$t7,$a2
 /*  f1a505c:	0c004dad */ 	jal	sprintf
 /*  f1a5060:	01e03025 */ 	or	$a2,$t7,$zero
-/*  f1a5064:	3c0d8008 */ 	lui	$t5,%hi(g_FontHandelGothicSm2)
-/*  f1a5068:	8dadfb0c */ 	lw	$t5,%lo(g_FontHandelGothicSm2)($t5)
-/*  f1a506c:	3c078008 */ 	lui	$a3,%hi(g_FontHandelGothicSm1)
-/*  f1a5070:	8ce7fb10 */ 	lw	$a3,%lo(g_FontHandelGothicSm1)($a3)
+/*  f1a5064:	3c0d8008 */ 	lui	$t5,%hi(g_FontHandelGothicSm)
+/*  f1a5068:	8dadfb0c */ 	lw	$t5,%lo(g_FontHandelGothicSm)($t5)
+/*  f1a506c:	3c078008 */ 	lui	$a3,%hi(g_CharsHandelGothicSm)
+/*  f1a5070:	8ce7fb10 */ 	lw	$a3,%lo(g_CharsHandelGothicSm)($a3)
 /*  f1a5074:	27a4014c */ 	addiu	$a0,$sp,0x14c
 /*  f1a5078:	27a50148 */ 	addiu	$a1,$sp,0x148
 /*  f1a507c:	27a600c0 */ 	addiu	$a2,$sp,0xc0
@@ -2038,10 +2038,10 @@ glabel menuhandler001a44c0
 /*  f1a50cc:	afa2015c */ 	sw	$v0,0x15c($sp)
 /*  f1a50d0:	0c002f06 */ 	jal	viGetHeight
 /*  f1a50d4:	a7a20044 */ 	sh	$v0,0x44($sp)
-/*  f1a50d8:	3c0e8008 */ 	lui	$t6,%hi(g_FontHandelGothicSm1)
-/*  f1a50dc:	3c0c8008 */ 	lui	$t4,%hi(g_FontHandelGothicSm2)
-/*  f1a50e0:	8d8cfb0c */ 	lw	$t4,%lo(g_FontHandelGothicSm2)($t4)
-/*  f1a50e4:	8dcefb10 */ 	lw	$t6,%lo(g_FontHandelGothicSm1)($t6)
+/*  f1a50d8:	3c0e8008 */ 	lui	$t6,%hi(g_CharsHandelGothicSm)
+/*  f1a50dc:	3c0c8008 */ 	lui	$t4,%hi(g_FontHandelGothicSm)
+/*  f1a50e0:	8d8cfb0c */ 	lw	$t4,%lo(g_FontHandelGothicSm)($t4)
+/*  f1a50e4:	8dcefb10 */ 	lw	$t6,%lo(g_CharsHandelGothicSm)($t6)
 /*  f1a50e8:	8fb800ac */ 	lw	$t8,0xac($sp)
 /*  f1a50ec:	87af0044 */ 	lh	$t7,0x44($sp)
 /*  f1a50f0:	8fa4015c */ 	lw	$a0,0x15c($sp)
@@ -2080,10 +2080,10 @@ glabel menuhandler001a44c0
 /*  f1a5174:	afa2015c */ 	sw	$v0,0x15c($sp)
 /*  f1a5178:	0c002f06 */ 	jal	viGetHeight
 /*  f1a517c:	a7a20044 */ 	sh	$v0,0x44($sp)
-/*  f1a5180:	3c0d8008 */ 	lui	$t5,%hi(g_FontHandelGothicSm1)
-/*  f1a5184:	3c198008 */ 	lui	$t9,%hi(g_FontHandelGothicSm2)
-/*  f1a5188:	8f39fb0c */ 	lw	$t9,%lo(g_FontHandelGothicSm2)($t9)
-/*  f1a518c:	8dadfb10 */ 	lw	$t5,%lo(g_FontHandelGothicSm1)($t5)
+/*  f1a5180:	3c0d8008 */ 	lui	$t5,%hi(g_CharsHandelGothicSm)
+/*  f1a5184:	3c198008 */ 	lui	$t9,%hi(g_FontHandelGothicSm)
+/*  f1a5188:	8f39fb0c */ 	lw	$t9,%lo(g_FontHandelGothicSm)($t9)
+/*  f1a518c:	8dadfb10 */ 	lw	$t5,%lo(g_CharsHandelGothicSm)($t5)
 /*  f1a5190:	8fae00ac */ 	lw	$t6,0xac($sp)
 /*  f1a5194:	87ac0044 */ 	lh	$t4,0x44($sp)
 /*  f1a5198:	8fa4015c */ 	lw	$a0,0x15c($sp)
@@ -2121,10 +2121,10 @@ glabel menuhandler001a44c0
 /*  f1a5218:	afa2015c */ 	sw	$v0,0x15c($sp)
 /*  f1a521c:	0c002f06 */ 	jal	viGetHeight
 /*  f1a5220:	a7a20044 */ 	sh	$v0,0x44($sp)
-/*  f1a5224:	3c0c8008 */ 	lui	$t4,%hi(g_FontHandelGothicSm1)
-/*  f1a5228:	3c188008 */ 	lui	$t8,%hi(g_FontHandelGothicSm2)
-/*  f1a522c:	8f18fb0c */ 	lw	$t8,%lo(g_FontHandelGothicSm2)($t8)
-/*  f1a5230:	8d8cfb10 */ 	lw	$t4,%lo(g_FontHandelGothicSm1)($t4)
+/*  f1a5224:	3c0c8008 */ 	lui	$t4,%hi(g_CharsHandelGothicSm)
+/*  f1a5228:	3c188008 */ 	lui	$t8,%hi(g_FontHandelGothicSm)
+/*  f1a522c:	8f18fb0c */ 	lw	$t8,%lo(g_FontHandelGothicSm)($t8)
+/*  f1a5230:	8d8cfb10 */ 	lw	$t4,%lo(g_CharsHandelGothicSm)($t4)
 /*  f1a5234:	8faf00ac */ 	lw	$t7,0xac($sp)
 /*  f1a5238:	87ad0044 */ 	lh	$t5,0x44($sp)
 /*  f1a523c:	8fa4015c */ 	lw	$a0,0x15c($sp)
@@ -2148,10 +2148,10 @@ glabel menuhandler001a44c0
 /*  f1a5284:	00067040 */ 	sll	$t6,$a2,0x1
 /*  f1a5288:	0c004dad */ 	jal	sprintf
 /*  f1a528c:	01c03025 */ 	or	$a2,$t6,$zero
-/*  f1a5290:	3c0c8008 */ 	lui	$t4,%hi(g_FontHandelGothicSm2)
-/*  f1a5294:	8d8cfb0c */ 	lw	$t4,%lo(g_FontHandelGothicSm2)($t4)
-/*  f1a5298:	3c078008 */ 	lui	$a3,%hi(g_FontHandelGothicSm1)
-/*  f1a529c:	8ce7fb10 */ 	lw	$a3,%lo(g_FontHandelGothicSm1)($a3)
+/*  f1a5290:	3c0c8008 */ 	lui	$t4,%hi(g_FontHandelGothicSm)
+/*  f1a5294:	8d8cfb0c */ 	lw	$t4,%lo(g_FontHandelGothicSm)($t4)
+/*  f1a5298:	3c078008 */ 	lui	$a3,%hi(g_CharsHandelGothicSm)
+/*  f1a529c:	8ce7fb10 */ 	lw	$a3,%lo(g_CharsHandelGothicSm)($a3)
 /*  f1a52a0:	27a4014c */ 	addiu	$a0,$sp,0x14c
 /*  f1a52a4:	27a50148 */ 	addiu	$a1,$sp,0x148
 /*  f1a52a8:	27a600c0 */ 	addiu	$a2,$sp,0xc0
@@ -2177,10 +2177,10 @@ glabel menuhandler001a44c0
 /*  f1a52f8:	afa2015c */ 	sw	$v0,0x15c($sp)
 /*  f1a52fc:	0c002f06 */ 	jal	viGetHeight
 /*  f1a5300:	a7a20044 */ 	sh	$v0,0x44($sp)
-/*  f1a5304:	3c0f8008 */ 	lui	$t7,%hi(g_FontHandelGothicSm1)
-/*  f1a5308:	3c0d8008 */ 	lui	$t5,%hi(g_FontHandelGothicSm2)
-/*  f1a530c:	8dadfb0c */ 	lw	$t5,%lo(g_FontHandelGothicSm2)($t5)
-/*  f1a5310:	8deffb10 */ 	lw	$t7,%lo(g_FontHandelGothicSm1)($t7)
+/*  f1a5304:	3c0f8008 */ 	lui	$t7,%hi(g_CharsHandelGothicSm)
+/*  f1a5308:	3c0d8008 */ 	lui	$t5,%hi(g_FontHandelGothicSm)
+/*  f1a530c:	8dadfb0c */ 	lw	$t5,%lo(g_FontHandelGothicSm)($t5)
+/*  f1a5310:	8deffb10 */ 	lw	$t7,%lo(g_CharsHandelGothicSm)($t7)
 /*  f1a5314:	8fb900ac */ 	lw	$t9,0xac($sp)
 /*  f1a5318:	87ae0044 */ 	lh	$t6,0x44($sp)
 /*  f1a531c:	8fa4015c */ 	lw	$a0,0x15c($sp)
@@ -2219,10 +2219,10 @@ glabel menuhandler001a44c0
 /*  f1a53a0:	afa2015c */ 	sw	$v0,0x15c($sp)
 /*  f1a53a4:	0c002f06 */ 	jal	viGetHeight
 /*  f1a53a8:	a7a20044 */ 	sh	$v0,0x44($sp)
-/*  f1a53ac:	3c0c8008 */ 	lui	$t4,%hi(g_FontHandelGothicSm1)
-/*  f1a53b0:	3c188008 */ 	lui	$t8,%hi(g_FontHandelGothicSm2)
-/*  f1a53b4:	8f18fb0c */ 	lw	$t8,%lo(g_FontHandelGothicSm2)($t8)
-/*  f1a53b8:	8d8cfb10 */ 	lw	$t4,%lo(g_FontHandelGothicSm1)($t4)
+/*  f1a53ac:	3c0c8008 */ 	lui	$t4,%hi(g_CharsHandelGothicSm)
+/*  f1a53b0:	3c188008 */ 	lui	$t8,%hi(g_FontHandelGothicSm)
+/*  f1a53b4:	8f18fb0c */ 	lw	$t8,%lo(g_FontHandelGothicSm)($t8)
+/*  f1a53b8:	8d8cfb10 */ 	lw	$t4,%lo(g_CharsHandelGothicSm)($t4)
 /*  f1a53bc:	8faf00ac */ 	lw	$t7,0xac($sp)
 /*  f1a53c0:	87ad0044 */ 	lh	$t5,0x44($sp)
 /*  f1a53c4:	8fa4015c */ 	lw	$a0,0x15c($sp)
@@ -2262,10 +2262,10 @@ glabel menuhandler001a44c0
 /*  f1a544c:	afa2015c */ 	sw	$v0,0x15c($sp)
 /*  f1a5450:	0c002f06 */ 	jal	viGetHeight
 /*  f1a5454:	a7a20044 */ 	sh	$v0,0x44($sp)
-/*  f1a5458:	3c198008 */ 	lui	$t9,%hi(g_FontHandelGothicSm1)
-/*  f1a545c:	3c0e8008 */ 	lui	$t6,%hi(g_FontHandelGothicSm2)
-/*  f1a5460:	8dcefb0c */ 	lw	$t6,%lo(g_FontHandelGothicSm2)($t6)
-/*  f1a5464:	8f39fb10 */ 	lw	$t9,%lo(g_FontHandelGothicSm1)($t9)
+/*  f1a5458:	3c198008 */ 	lui	$t9,%hi(g_CharsHandelGothicSm)
+/*  f1a545c:	3c0e8008 */ 	lui	$t6,%hi(g_FontHandelGothicSm)
+/*  f1a5460:	8dcefb0c */ 	lw	$t6,%lo(g_FontHandelGothicSm)($t6)
+/*  f1a5464:	8f39fb10 */ 	lw	$t9,%lo(g_CharsHandelGothicSm)($t9)
 /*  f1a5468:	8fac00ac */ 	lw	$t4,0xac($sp)
 /*  f1a546c:	87b80044 */ 	lh	$t8,0x44($sp)
 /*  f1a5470:	8fa4015c */ 	lw	$a0,0x15c($sp)
@@ -2287,10 +2287,10 @@ glabel menuhandler001a44c0
 /*  f1a54b0:	27a400c0 */ 	addiu	$a0,$sp,0xc0
 /*  f1a54b4:	0c004dad */ 	jal	sprintf
 /*  f1a54b8:	95e60462 */ 	lhu	$a2,0x462($t7)
-/*  f1a54bc:	3c0d8008 */ 	lui	$t5,%hi(g_FontHandelGothicSm2)
-/*  f1a54c0:	8dadfb0c */ 	lw	$t5,%lo(g_FontHandelGothicSm2)($t5)
-/*  f1a54c4:	3c078008 */ 	lui	$a3,%hi(g_FontHandelGothicSm1)
-/*  f1a54c8:	8ce7fb10 */ 	lw	$a3,%lo(g_FontHandelGothicSm1)($a3)
+/*  f1a54bc:	3c0d8008 */ 	lui	$t5,%hi(g_FontHandelGothicSm)
+/*  f1a54c0:	8dadfb0c */ 	lw	$t5,%lo(g_FontHandelGothicSm)($t5)
+/*  f1a54c4:	3c078008 */ 	lui	$a3,%hi(g_CharsHandelGothicSm)
+/*  f1a54c8:	8ce7fb10 */ 	lw	$a3,%lo(g_CharsHandelGothicSm)($a3)
 /*  f1a54cc:	27a4014c */ 	addiu	$a0,$sp,0x14c
 /*  f1a54d0:	27a50148 */ 	addiu	$a1,$sp,0x148
 /*  f1a54d4:	27a600c0 */ 	addiu	$a2,$sp,0xc0
@@ -2316,10 +2316,10 @@ glabel menuhandler001a44c0
 /*  f1a5524:	afa2015c */ 	sw	$v0,0x15c($sp)
 /*  f1a5528:	0c002f06 */ 	jal	viGetHeight
 /*  f1a552c:	a7a20044 */ 	sh	$v0,0x44($sp)
-/*  f1a5530:	3c0e8008 */ 	lui	$t6,%hi(g_FontHandelGothicSm1)
-/*  f1a5534:	3c0c8008 */ 	lui	$t4,%hi(g_FontHandelGothicSm2)
-/*  f1a5538:	8d8cfb0c */ 	lw	$t4,%lo(g_FontHandelGothicSm2)($t4)
-/*  f1a553c:	8dcefb10 */ 	lw	$t6,%lo(g_FontHandelGothicSm1)($t6)
+/*  f1a5530:	3c0e8008 */ 	lui	$t6,%hi(g_CharsHandelGothicSm)
+/*  f1a5534:	3c0c8008 */ 	lui	$t4,%hi(g_FontHandelGothicSm)
+/*  f1a5538:	8d8cfb0c */ 	lw	$t4,%lo(g_FontHandelGothicSm)($t4)
+/*  f1a553c:	8dcefb10 */ 	lw	$t6,%lo(g_CharsHandelGothicSm)($t6)
 /*  f1a5540:	8fb800ac */ 	lw	$t8,0xac($sp)
 /*  f1a5544:	87af0044 */ 	lh	$t7,0x44($sp)
 /*  f1a5548:	8fa4015c */ 	lw	$a0,0x15c($sp)
@@ -2357,10 +2357,10 @@ glabel menuhandler001a44c0
 /*  f1a55c8:	afa2015c */ 	sw	$v0,0x15c($sp)
 /*  f1a55cc:	0c002f06 */ 	jal	viGetHeight
 /*  f1a55d0:	a7a20044 */ 	sh	$v0,0x44($sp)
-/*  f1a55d4:	3c0f8008 */ 	lui	$t7,%hi(g_FontHandelGothicSm1)
-/*  f1a55d8:	3c0d8008 */ 	lui	$t5,%hi(g_FontHandelGothicSm2)
-/*  f1a55dc:	8dadfb0c */ 	lw	$t5,%lo(g_FontHandelGothicSm2)($t5)
-/*  f1a55e0:	8deffb10 */ 	lw	$t7,%lo(g_FontHandelGothicSm1)($t7)
+/*  f1a55d4:	3c0f8008 */ 	lui	$t7,%hi(g_CharsHandelGothicSm)
+/*  f1a55d8:	3c0d8008 */ 	lui	$t5,%hi(g_FontHandelGothicSm)
+/*  f1a55dc:	8dadfb0c */ 	lw	$t5,%lo(g_FontHandelGothicSm)($t5)
+/*  f1a55e0:	8deffb10 */ 	lw	$t7,%lo(g_CharsHandelGothicSm)($t7)
 /*  f1a55e4:	8fb900ac */ 	lw	$t9,0xac($sp)
 /*  f1a55e8:	87ae0044 */ 	lh	$t6,0x44($sp)
 /*  f1a55ec:	8fa4015c */ 	lw	$a0,0x15c($sp)
@@ -2388,10 +2388,10 @@ glabel menuhandler001a44c0
 /*  f1a5644:	27a400c0 */ 	addiu	$a0,$sp,0xc0
 /*  f1a5648:	0c004dad */ 	jal	sprintf
 /*  f1a564c:	01d83021 */ 	addu	$a2,$t6,$t8
-/*  f1a5650:	3c0f8008 */ 	lui	$t7,%hi(g_FontHandelGothicSm2)
-/*  f1a5654:	8deffb0c */ 	lw	$t7,%lo(g_FontHandelGothicSm2)($t7)
-/*  f1a5658:	3c078008 */ 	lui	$a3,%hi(g_FontHandelGothicSm1)
-/*  f1a565c:	8ce7fb10 */ 	lw	$a3,%lo(g_FontHandelGothicSm1)($a3)
+/*  f1a5650:	3c0f8008 */ 	lui	$t7,%hi(g_FontHandelGothicSm)
+/*  f1a5654:	8deffb0c */ 	lw	$t7,%lo(g_FontHandelGothicSm)($t7)
+/*  f1a5658:	3c078008 */ 	lui	$a3,%hi(g_CharsHandelGothicSm)
+/*  f1a565c:	8ce7fb10 */ 	lw	$a3,%lo(g_CharsHandelGothicSm)($a3)
 /*  f1a5660:	27a4014c */ 	addiu	$a0,$sp,0x14c
 /*  f1a5664:	27a50148 */ 	addiu	$a1,$sp,0x148
 /*  f1a5668:	27a600c0 */ 	addiu	$a2,$sp,0xc0
@@ -2417,10 +2417,10 @@ glabel menuhandler001a44c0
 /*  f1a56b8:	afa2015c */ 	sw	$v0,0x15c($sp)
 /*  f1a56bc:	0c002f06 */ 	jal	viGetHeight
 /*  f1a56c0:	a7a20044 */ 	sh	$v0,0x44($sp)
-/*  f1a56c4:	3c198008 */ 	lui	$t9,%hi(g_FontHandelGothicSm1)
-/*  f1a56c8:	3c0c8008 */ 	lui	$t4,%hi(g_FontHandelGothicSm2)
-/*  f1a56cc:	8d8cfb0c */ 	lw	$t4,%lo(g_FontHandelGothicSm2)($t4)
-/*  f1a56d0:	8f39fb10 */ 	lw	$t9,%lo(g_FontHandelGothicSm1)($t9)
+/*  f1a56c4:	3c198008 */ 	lui	$t9,%hi(g_CharsHandelGothicSm)
+/*  f1a56c8:	3c0c8008 */ 	lui	$t4,%hi(g_FontHandelGothicSm)
+/*  f1a56cc:	8d8cfb0c */ 	lw	$t4,%lo(g_FontHandelGothicSm)($t4)
+/*  f1a56d0:	8f39fb10 */ 	lw	$t9,%lo(g_CharsHandelGothicSm)($t9)
 /*  f1a56d4:	8fae00ac */ 	lw	$t6,0xac($sp)
 /*  f1a56d8:	87b80044 */ 	lh	$t8,0x44($sp)
 /*  f1a56dc:	8fa4015c */ 	lw	$a0,0x15c($sp)
@@ -2458,10 +2458,10 @@ glabel menuhandler001a44c0
 /*  f1a575c:	afa2015c */ 	sw	$v0,0x15c($sp)
 /*  f1a5760:	0c002f06 */ 	jal	viGetHeight
 /*  f1a5764:	a7a20044 */ 	sh	$v0,0x44($sp)
-/*  f1a5768:	3c188008 */ 	lui	$t8,%hi(g_FontHandelGothicSm1)
-/*  f1a576c:	3c0f8008 */ 	lui	$t7,%hi(g_FontHandelGothicSm2)
-/*  f1a5770:	8deffb0c */ 	lw	$t7,%lo(g_FontHandelGothicSm2)($t7)
-/*  f1a5774:	8f18fb10 */ 	lw	$t8,%lo(g_FontHandelGothicSm1)($t8)
+/*  f1a5768:	3c188008 */ 	lui	$t8,%hi(g_CharsHandelGothicSm)
+/*  f1a576c:	3c0f8008 */ 	lui	$t7,%hi(g_FontHandelGothicSm)
+/*  f1a5770:	8deffb0c */ 	lw	$t7,%lo(g_FontHandelGothicSm)($t7)
+/*  f1a5774:	8f18fb10 */ 	lw	$t8,%lo(g_CharsHandelGothicSm)($t8)
 /*  f1a5778:	8fad00ac */ 	lw	$t5,0xac($sp)
 /*  f1a577c:	87b90044 */ 	lh	$t9,0x44($sp)
 /*  f1a5780:	8fa4015c */ 	lw	$a0,0x15c($sp)
@@ -2499,10 +2499,10 @@ glabel menuhandler001a44c0
 /*  f1a5800:	afa2015c */ 	sw	$v0,0x15c($sp)
 /*  f1a5804:	0c002f06 */ 	jal	viGetHeight
 /*  f1a5808:	a7a20044 */ 	sh	$v0,0x44($sp)
-/*  f1a580c:	3c198008 */ 	lui	$t9,%hi(g_FontNumeric1)
-/*  f1a5810:	3c0c8008 */ 	lui	$t4,%hi(g_FontNumeric2)
-/*  f1a5814:	8d8cfafc */ 	lw	$t4,%lo(g_FontNumeric2)($t4)
-/*  f1a5818:	8f39fb00 */ 	lw	$t9,%lo(g_FontNumeric1)($t9)
+/*  f1a580c:	3c198008 */ 	lui	$t9,%hi(g_CharsNumeric)
+/*  f1a5810:	3c0c8008 */ 	lui	$t4,%hi(g_FontNumeric)
+/*  f1a5814:	8d8cfafc */ 	lw	$t4,%lo(g_FontNumeric)($t4)
+/*  f1a5818:	8f39fb00 */ 	lw	$t9,%lo(g_CharsNumeric)($t9)
 /*  f1a581c:	2401ff00 */ 	addiu	$at,$zero,-256
 /*  f1a5820:	afac0014 */ 	sw	$t4,0x14($sp)
 /*  f1a5824:	afb90010 */ 	sw	$t9,0x10($sp)
@@ -2546,10 +2546,10 @@ glabel menuhandler001a44c0
 /*  f1a58bc:	afa2015c */ 	sw	$v0,0x15c($sp)
 /*  f1a58c0:	0c002f06 */ 	jal	viGetHeight
 /*  f1a58c4:	a7a20044 */ 	sh	$v0,0x44($sp)
-/*  f1a58c8:	3c0c8008 */ 	lui	$t4,%hi(g_FontNumeric1)
-/*  f1a58cc:	3c0e8008 */ 	lui	$t6,%hi(g_FontNumeric2)
-/*  f1a58d0:	8dcefafc */ 	lw	$t6,%lo(g_FontNumeric2)($t6)
-/*  f1a58d4:	8d8cfb00 */ 	lw	$t4,%lo(g_FontNumeric1)($t4)
+/*  f1a58c8:	3c0c8008 */ 	lui	$t4,%hi(g_CharsNumeric)
+/*  f1a58cc:	3c0e8008 */ 	lui	$t6,%hi(g_FontNumeric)
+/*  f1a58d0:	8dcefafc */ 	lw	$t6,%lo(g_FontNumeric)($t6)
+/*  f1a58d4:	8d8cfb00 */ 	lw	$t4,%lo(g_CharsNumeric)($t4)
 /*  f1a58d8:	2401ff00 */ 	addiu	$at,$zero,-256
 /*  f1a58dc:	afae0014 */ 	sw	$t6,0x14($sp)
 /*  f1a58e0:	afac0010 */ 	sw	$t4,0x10($sp)
@@ -2593,10 +2593,10 @@ glabel menuhandler001a44c0
 /*  f1a5978:	afa2015c */ 	sw	$v0,0x15c($sp)
 /*  f1a597c:	0c002f06 */ 	jal	viGetHeight
 /*  f1a5980:	a7a20044 */ 	sh	$v0,0x44($sp)
-/*  f1a5984:	3c0e8008 */ 	lui	$t6,%hi(g_FontNumeric1)
-/*  f1a5988:	3c188008 */ 	lui	$t8,%hi(g_FontNumeric2)
-/*  f1a598c:	8f18fafc */ 	lw	$t8,%lo(g_FontNumeric2)($t8)
-/*  f1a5990:	8dcefb00 */ 	lw	$t6,%lo(g_FontNumeric1)($t6)
+/*  f1a5984:	3c0e8008 */ 	lui	$t6,%hi(g_CharsNumeric)
+/*  f1a5988:	3c188008 */ 	lui	$t8,%hi(g_FontNumeric)
+/*  f1a598c:	8f18fafc */ 	lw	$t8,%lo(g_FontNumeric)($t8)
+/*  f1a5990:	8dcefb00 */ 	lw	$t6,%lo(g_CharsNumeric)($t6)
 /*  f1a5994:	2401ff00 */ 	addiu	$at,$zero,-256
 /*  f1a5998:	afb80014 */ 	sw	$t8,0x14($sp)
 /*  f1a599c:	afae0010 */ 	sw	$t6,0x10($sp)
@@ -2640,10 +2640,10 @@ glabel menuhandler001a44c0
 /*  f1a5a34:	afa2015c */ 	sw	$v0,0x15c($sp)
 /*  f1a5a38:	0c002f06 */ 	jal	viGetHeight
 /*  f1a5a3c:	a7a20044 */ 	sh	$v0,0x44($sp)
-/*  f1a5a40:	3c188008 */ 	lui	$t8,%hi(g_FontNumeric1)
-/*  f1a5a44:	3c0f8008 */ 	lui	$t7,%hi(g_FontNumeric2)
-/*  f1a5a48:	8deffafc */ 	lw	$t7,%lo(g_FontNumeric2)($t7)
-/*  f1a5a4c:	8f18fb00 */ 	lw	$t8,%lo(g_FontNumeric1)($t8)
+/*  f1a5a40:	3c188008 */ 	lui	$t8,%hi(g_CharsNumeric)
+/*  f1a5a44:	3c0f8008 */ 	lui	$t7,%hi(g_FontNumeric)
+/*  f1a5a48:	8deffafc */ 	lw	$t7,%lo(g_FontNumeric)($t7)
+/*  f1a5a4c:	8f18fb00 */ 	lw	$t8,%lo(g_CharsNumeric)($t8)
 /*  f1a5a50:	2401ff00 */ 	addiu	$at,$zero,-256
 /*  f1a5a54:	afaf0014 */ 	sw	$t7,0x14($sp)
 /*  f1a5a58:	afb80010 */ 	sw	$t8,0x10($sp)
@@ -5628,11 +5628,11 @@ glabel menuhandler001a6ea4
 /*  f1a71b0:	afa200a4 */ 	sw	$v0,0xa4($sp)
 /*  f1a71b4:	0fc69b23 */ 	jal	bioMenuTextName
 /*  f1a71b8:	00002025 */ 	or	$a0,$zero,$zero
-/*  f1a71bc:	3c0a8008 */ 	lui	$t2,%hi(g_FontHandelGothicMd2)
-/*  f1a71c0:	8d4afb14 */ 	lw	$t2,%lo(g_FontHandelGothicMd2)($t2)
-/*  f1a71c4:	3c078008 */ 	lui	$a3,%hi(g_FontHandelGothicMd1)
+/*  f1a71bc:	3c0a8008 */ 	lui	$t2,%hi(g_FontHandelGothicMd)
+/*  f1a71c0:	8d4afb14 */ 	lw	$t2,%lo(g_FontHandelGothicMd)($t2)
+/*  f1a71c4:	3c078008 */ 	lui	$a3,%hi(g_CharsHandelGothicMd)
 /*  f1a71c8:	afa20090 */ 	sw	$v0,0x90($sp)
-/*  f1a71cc:	8ce7fb18 */ 	lw	$a3,%lo(g_FontHandelGothicMd1)($a3)
+/*  f1a71cc:	8ce7fb18 */ 	lw	$a3,%lo(g_CharsHandelGothicMd)($a3)
 /*  f1a71d0:	27a40098 */ 	addiu	$a0,$sp,0x98
 /*  f1a71d4:	27a5009c */ 	addiu	$a1,$sp,0x9c
 /*  f1a71d8:	00403025 */ 	or	$a2,$v0,$zero
@@ -5661,10 +5661,10 @@ glabel menuhandler001a6ea4
 /*  f1a722c:	afb80098 */ 	sw	$t8,0x98($sp)
 /*  f1a7230:	0c002f06 */ 	jal	viGetHeight
 /*  f1a7234:	a7a20044 */ 	sh	$v0,0x44($sp)
-/*  f1a7238:	3c0f8008 */ 	lui	$t7,%hi(g_FontHandelGothicMd1)
-/*  f1a723c:	3c198008 */ 	lui	$t9,%hi(g_FontHandelGothicMd2)
-/*  f1a7240:	8f39fb14 */ 	lw	$t9,%lo(g_FontHandelGothicMd2)($t9)
-/*  f1a7244:	8deffb18 */ 	lw	$t7,%lo(g_FontHandelGothicMd1)($t7)
+/*  f1a7238:	3c0f8008 */ 	lui	$t7,%hi(g_CharsHandelGothicMd)
+/*  f1a723c:	3c198008 */ 	lui	$t9,%hi(g_FontHandelGothicMd)
+/*  f1a7240:	8f39fb14 */ 	lw	$t9,%lo(g_FontHandelGothicMd)($t9)
+/*  f1a7244:	8deffb18 */ 	lw	$t7,%lo(g_CharsHandelGothicMd)($t7)
 /*  f1a7248:	87ae0044 */ 	lh	$t6,0x44($sp)
 /*  f1a724c:	afb90014 */ 	sw	$t9,0x14($sp)
 /*  f1a7250:	afaf0010 */ 	sw	$t7,0x10($sp)
@@ -5682,11 +5682,11 @@ glabel menuhandler001a6ea4
 /*  f1a7280:	afa200a4 */ 	sw	$v0,0xa4($sp)
 /*  f1a7284:	0fc69b31 */ 	jal	ciMenuTextHangarBioSubheading
 /*  f1a7288:	00002025 */ 	or	$a0,$zero,$zero
-/*  f1a728c:	3c0d8008 */ 	lui	$t5,%hi(g_FontHandelGothicSm2)
-/*  f1a7290:	8dadfb0c */ 	lw	$t5,%lo(g_FontHandelGothicSm2)($t5)
-/*  f1a7294:	3c078008 */ 	lui	$a3,%hi(g_FontHandelGothicSm1)
+/*  f1a728c:	3c0d8008 */ 	lui	$t5,%hi(g_FontHandelGothicSm)
+/*  f1a7290:	8dadfb0c */ 	lw	$t5,%lo(g_FontHandelGothicSm)($t5)
+/*  f1a7294:	3c078008 */ 	lui	$a3,%hi(g_CharsHandelGothicSm)
 /*  f1a7298:	afa20090 */ 	sw	$v0,0x90($sp)
-/*  f1a729c:	8ce7fb10 */ 	lw	$a3,%lo(g_FontHandelGothicSm1)($a3)
+/*  f1a729c:	8ce7fb10 */ 	lw	$a3,%lo(g_CharsHandelGothicSm)($a3)
 /*  f1a72a0:	27a40098 */ 	addiu	$a0,$sp,0x98
 /*  f1a72a4:	27a5009c */ 	addiu	$a1,$sp,0x9c
 /*  f1a72a8:	00403025 */ 	or	$a2,$v0,$zero
@@ -5715,10 +5715,10 @@ glabel menuhandler001a6ea4
 /*  f1a72fc:	afb80098 */ 	sw	$t8,0x98($sp)
 /*  f1a7300:	0c002f06 */ 	jal	viGetHeight
 /*  f1a7304:	a7a20044 */ 	sh	$v0,0x44($sp)
-/*  f1a7308:	3c0f8008 */ 	lui	$t7,%hi(g_FontHandelGothicSm1)
-/*  f1a730c:	3c198008 */ 	lui	$t9,%hi(g_FontHandelGothicSm2)
-/*  f1a7310:	8f39fb0c */ 	lw	$t9,%lo(g_FontHandelGothicSm2)($t9)
-/*  f1a7314:	8deffb10 */ 	lw	$t7,%lo(g_FontHandelGothicSm1)($t7)
+/*  f1a7308:	3c0f8008 */ 	lui	$t7,%hi(g_CharsHandelGothicSm)
+/*  f1a730c:	3c198008 */ 	lui	$t9,%hi(g_FontHandelGothicSm)
+/*  f1a7310:	8f39fb0c */ 	lw	$t9,%lo(g_FontHandelGothicSm)($t9)
+/*  f1a7314:	8deffb10 */ 	lw	$t7,%lo(g_CharsHandelGothicSm)($t7)
 /*  f1a7318:	87ab0044 */ 	lh	$t3,0x44($sp)
 /*  f1a731c:	afb90014 */ 	sw	$t9,0x14($sp)
 /*  f1a7320:	afaf0010 */ 	sw	$t7,0x10($sp)
diff --git a/src/game/training/training.c b/src/game/training/training.c
index 26e6db04f..49041ed4f 100644
--- a/src/game/training/training.c
+++ b/src/game/training/training.c
@@ -8236,24 +8236,24 @@ Gfx *frRenderHudElement(Gfx *gdl, s32 x, s32 y, char *string1, char *string2, u3
 	u32 halfalpha = alpha >> 1;
 	u32 fullcolour = (colour & 0xffffff00) | alpha;
 
-	textMeasure(&textheight, &textwidth, string1, g_FontHandelGothicMd1, g_FontHandelGothicMd2, 0);
+	textMeasure(&textheight, &textwidth, string1, g_CharsHandelGothicMd, g_FontHandelGothicMd, 0);
 
 	x2 = x - (textwidth >> 1);
 	y2 = y;
 	gdl = func0f153858(gdl, &x2, &y2, &textwidth, &textheight);
 
 	gdl = textRender(gdl, &x2, &y2, string1,
-			g_FontHandelGothicMd1, g_FontHandelGothicMd2, fullcolour, halfalpha, viGetWidth(), viGetHeight(), 0, 0);
+			g_CharsHandelGothicMd, g_FontHandelGothicMd, fullcolour, halfalpha, viGetWidth(), viGetHeight(), 0, 0);
 
 	if (string2) {
-		textMeasure(&textheight, &textwidth, string2, g_FontHandelGothicXs1, g_FontHandelGothicXs2, 0);
+		textMeasure(&textheight, &textwidth, string2, g_CharsHandelGothicXs, g_FontHandelGothicXs, 0);
 
 		x2 = x - (textwidth >> 1);
 		y2 = y + 17;
 		gdl = func0f153858(gdl, &x2, &y2, &textwidth, &textheight);
 
 		gdl = textRender(gdl, &x2, &y2, string2,
-			g_FontHandelGothicXs1, g_FontHandelGothicXs2, fullcolour, halfalpha, viGetWidth(), viGetHeight(), 0, 0);
+			g_CharsHandelGothicXs, g_FontHandelGothicXs, fullcolour, halfalpha, viGetWidth(), viGetHeight(), 0, 0);
 	}
 
 	return gdl;
diff --git a/src/include/data.h b/src/include/data.h
index fc64eeee0..da789bd2c 100644
--- a/src/include/data.h
+++ b/src/include/data.h
@@ -454,16 +454,16 @@ extern struct weatherdata *g_WeatherData;
 extern s32 g_NextShardNum;
 extern bool g_ShardsActive;
 extern s32 g_ScaleX;
-extern struct font *g_FontNumeric2;
-extern struct font2a4 *g_FontNumeric1;
-extern struct font *g_FontHandelGothicXs2;
-extern struct font2a4 *g_FontHandelGothicXs1;
-extern struct font *g_FontHandelGothicSm2;
-extern struct font2a4 *g_FontHandelGothicSm1;
-extern struct font *g_FontHandelGothicMd2;
-extern struct font2a4 *g_FontHandelGothicMd1;
-extern struct font *g_FontHandelGothicLg2;
-extern struct font2a4 *g_FontHandelGothicLg1;
+extern struct font *g_FontNumeric;
+extern struct fontchar *g_CharsNumeric;
+extern struct font *g_FontHandelGothicXs;
+extern struct fontchar *g_CharsHandelGothicXs;
+extern struct font *g_FontHandelGothicSm;
+extern struct fontchar *g_CharsHandelGothicSm;
+extern struct font *g_FontHandelGothicMd;
+extern struct fontchar *g_CharsHandelGothicMd;
+extern struct font *g_FontHandelGothicLg;
+extern struct fontchar *g_CharsHandelGothicLg;
 extern u32 var8007fb9c;
 extern s32 g_StageIndex;
 extern s16 var8007fc0c;
diff --git a/src/include/game/game_1531a0.h b/src/include/game/game_1531a0.h
index e9e7b33c9..22bf40739 100644
--- a/src/include/game/game_1531a0.h
+++ b/src/include/game/game_1531a0.h
@@ -7,7 +7,7 @@
 void func0f1531a0(void);
 u32 func0f1531b8(void);
 void func0f1531dc(bool arg0);
-void fontLoad(u8 *romstart, u8 *romend, struct font **font1, struct font2a4 **font2, bool monospace);
+void fontLoad(u8 *romstart, u8 *romend, struct font **fontptr, struct fontchar **charsptr, bool monospace);
 void fontsLoadForCurrentStage(void);
 Gfx *func0f153628(Gfx *gdl);
 Gfx *func0f153780(Gfx *gdl);
@@ -39,12 +39,12 @@ u32 func0f1552d4(void);
 u32 func0f15568c(void);
 u32 func0f156024(void);
 u32 func0f156030(void);
-Gfx *textRenderProjected(Gfx *gdl, s32 *x, s32 *y, char *text, struct font2a4 *font1, struct font *font2, s32 colour, s16 width, s16 height, s32 arg9, u32 arg10);
+Gfx *textRenderProjected(Gfx *gdl, s32 *x, s32 *y, char *text, struct fontchar *font1, struct font *font2, s32 colour, s16 width, s16 height, s32 arg9, u32 arg10);
 Gfx *func0f1566cc(Gfx *gdl, u32 arg1, u32 arg2);
 u32 func0f156790(void);
 u32 func0f156a24(void);
-Gfx *textRender(Gfx *gdl, s32 *x, s32 *y, char *text, struct font2a4 *font1, struct font *font2, u32 arg6, u32 colour, s16 arg8, s16 arg9, u32 arg10, u32 arg11);
-void textMeasure(s32 *textheight, s32 *textwidth, char *text, struct font2a4 *font1, struct font *font2, s32 lineheight);
-void textWrap(s32 width, char *in, char *out, struct font2a4 *font1, struct font *font2);
+Gfx *textRender(Gfx *gdl, s32 *x, s32 *y, char *text, struct fontchar *font1, struct font *font2, u32 arg6, u32 colour, s16 arg8, s16 arg9, u32 arg10, u32 arg11);
+void textMeasure(s32 *textheight, s32 *textwidth, char *text, struct fontchar *font1, struct font *font2, s32 lineheight);
+void textWrap(s32 width, char *in, char *out, struct fontchar *font1, struct font *font2);
 
 #endif
diff --git a/src/include/types.h b/src/include/types.h
index 0f3323ee2..6c8204965 100644
--- a/src/include/types.h
+++ b/src/include/types.h
@@ -6904,18 +6904,18 @@ struct escastepkeyframe {
 	struct coord pos;
 };
 
-struct font2a4 {
+struct fontchar {
 	u8 index;
 	s8 baseline;
 	u8 height;
 	u8 width;
 	u32 unk04;
-	u8 *data;
+	u8 *pixeldata;
 };
 
 struct font {
 	u32 unk000[169];
-	struct font2a4 unk2a4[94];
+	struct fontchar chars[94]; // can be 135 in PAL
 };
 
 typedef union {