Rename most text functions

2026-08-20 13:44:53 -04:00 · 2022-07-06 19:22:01 +10:00
parent 0d65d02a3e
commit e82da009d2
32 changed files with 1091 additions and 1081 deletions
@@ -186,9 +186,9 @@ s32 amPickTargetMenuList(s32 operation, struct menuitem *item, union handlerdata
 			x = renderdata->x + 10;
 			y = renderdata->y + 1;

-			gdl = func0f153628(gdl);
+			gdl = text0f153628(gdl);
 			gdl = textRenderProjected(gdl, &x, &y, g_MpAllChrConfigPtrs[chrindex]->name, g_CharsHandelGothicSm, g_FontHandelGothicSm, colour, viGetWidth(), viGetHeight(), 0, 0);
-			gdl = func0f153780(gdl);
+			gdl = text0f153780(gdl);
 			return (s32)gdl;
 		}
 	case MENUOP_GETOPTIONHEIGHT:
@@ -1166,7 +1166,7 @@ Gfx *amRenderSlot(Gfx *gdl, char *text, s16 x, s16 y, s32 mode, s32 flags)
 		colour = 0x0000006f;
 	}

-	gdl = gfxSetPrimColour(gdl, colour);
+	gdl = textSetPrimColour(gdl, colour);

 	gDPFillRectangleScaled(gdl++,
 			x - g_AmMenus[g_AmIndex].slotwidth / 2 + 1,
@@ -1174,7 +1174,7 @@ Gfx *amRenderSlot(Gfx *gdl, char *text, s16 x, s16 y, s32 mode, s32 flags)
 			x + g_AmMenus[g_AmIndex].slotwidth / 2,
 			y + paddingbottom);

-	gdl = func0f153838(gdl);
+	gdl = text0f153838(gdl);

 	// Render borders
 	colour = obcol;
@@ -1193,7 +1193,7 @@ Gfx *amRenderSlot(Gfx *gdl, char *text, s16 x, s16 y, s32 mode, s32 flags)
 		colour = 0x4f4f4f7f;
 	}

-	gdl = gfxSetPrimColour(gdl, colour);
+	gdl = textSetPrimColour(gdl, colour);

 	// Top border
 	gDPFillRectangleScaled(gdl++,
@@ -1223,7 +1223,7 @@ Gfx *amRenderSlot(Gfx *gdl, char *text, s16 x, s16 y, s32 mode, s32 flags)
 			x + g_AmMenus[g_AmIndex].slotwidth / 2 + 1,
 			y + paddingbottom);

-	gdl = func0f153838(gdl);
+	gdl = text0f153838(gdl);

 	// Render text
 	colour = defcol;
@@ -1286,7 +1286,7 @@ glabel amRender
 /*  f101598:	912a0250 */ 	lbu	$t2,0x250($t1)
 /*  f10159c:	5140033d */ 	beqzl	$t2,.JF0f102294
 /*  f1015a0:	8fbf004c */ 	lw	$ra,0x4c($sp)
-/*  f1015a4:	0fc54b55 */ 	jal	func0f153628
+/*  f1015a4:	0fc54b55 */ 	jal	text0f153628
 /*  f1015a8:	8fa40148 */ 	lw	$a0,0x148($sp)
 /*  f1015ac:	8eeb0318 */ 	lw	$t3,0x318($s7)
 /*  f1015b0:	afa20148 */ 	sw	$v0,0x148($sp)
@@ -1869,7 +1869,7 @@ glabel amRender
 /*  f101e54:	3c144f4f */ 	lui	$s4,0x4f4f
 /*  f101e58:	36944f7f */ 	ori	$s4,$s4,0x4f7f
 .JF0f101e5c:
-/*  f101e5c:	0fc54bce */ 	jal	gfxSetPrimColour
+/*  f101e5c:	0fc54bce */ 	jal	textSetPrimColour
 /*  f101e60:	02802825 */ 	move	$a1,$s4
 /*  f101e64:	8fce0000 */ 	lw	$t6,0x0($s8)
 /*  f101e68:	3c18800a */ 	lui	$t8,0x800a
@@ -2139,11 +2139,11 @@ glabel amRender
 /*  f102268:	000a7380 */ 	sll	$t6,$t2,0xe
 /*  f10226c:	016e6825 */ 	or	$t5,$t3,$t6
 /*  f102270:	ac4d0004 */ 	sw	$t5,0x4($v0)
-/*  f102274:	0fc54be5 */ 	jal	func0f153838
+/*  f102274:	0fc54be5 */ 	jal	text0f153838
 /*  f102278:	8fa40148 */ 	lw	$a0,0x148($sp)
 /*  f10227c:	afa20148 */ 	sw	$v0,0x148($sp)
 .JF0f102280:
-/*  f102280:	0fc54bb7 */ 	jal	func0f153780
+/*  f102280:	0fc54bb7 */ 	jal	text0f153780
 /*  f102284:	8fa40148 */ 	lw	$a0,0x148($sp)
 /*  f102288:	afa20148 */ 	sw	$v0,0x148($sp)
 /*  f10228c:	24030001 */ 	li	$v1,0x1
@@ -2193,7 +2193,7 @@ glabel amRender
 /*  f1012ac:	90790250 */ 	lbu	$t9,0x250($v1)
 /*  f1012b0:	53200353 */ 	beqzl	$t9,.PF0f102000
 /*  f1012b4:	8c621c04 */ 	lw	$v0,0x1c04($v1)
-/*  f1012b8:	0fc550cf */ 	jal	func0f153628
+/*  f1012b8:	0fc550cf */ 	jal	text0f153628
 /*  f1012bc:	8fa401d8 */ 	lw	$a0,0x1d8($sp)
 /*  f1012c0:	3c08800a */ 	lui	$t0,0x800a
 /*  f1012c4:	2508a510 */ 	addiu	$t0,$t0,-23280
@@ -2814,7 +2814,7 @@ glabel amRender
 /*  f101bf0:	3c144f4f */ 	lui	$s4,0x4f4f
 /*  f101bf4:	36944f7f */ 	ori	$s4,$s4,0x4f7f
 .PF0f101bf8:
-/*  f101bf8:	0fc5513c */ 	jal	gfxSetPrimColour
+/*  f101bf8:	0fc5513c */ 	jal	textSetPrimColour
 /*  f101bfc:	02802825 */ 	move	$a1,$s4
 /*  f101c00:	3c0e800a */ 	lui	$t6,0x800a
 /*  f101c04:	8dce2758 */ 	lw	$t6,0x2758($t6)
@@ -3070,11 +3070,11 @@ glabel amRender
 /*  f101fc8:	00187880 */ 	sll	$t7,$t8,0x2
 /*  f101fcc:	01eec825 */ 	or	$t9,$t7,$t6
 /*  f101fd0:	ac590004 */ 	sw	$t9,0x4($v0)
-/*  f101fd4:	0fc55153 */ 	jal	func0f153838
+/*  f101fd4:	0fc55153 */ 	jal	text0f153838
 /*  f101fd8:	8fa401d8 */ 	lw	$a0,0x1d8($sp)
 /*  f101fdc:	afa201d8 */ 	sw	$v0,0x1d8($sp)
 .PF0f101fe0:
-/*  f101fe0:	0fc55125 */ 	jal	func0f153780
+/*  f101fe0:	0fc55125 */ 	jal	text0f153780
 /*  f101fe4:	8fa401d8 */ 	lw	$a0,0x1d8($sp)
 /*  f101fe8:	3c03800a */ 	lui	$v1,0x800a
 /*  f101fec:	3c0b800a */ 	lui	$t3,0x800a
@@ -3772,7 +3772,7 @@ glabel amRender
 /*  f1010cc:	90790250 */ 	lbu	$t9,0x250($v1)
 /*  f1010d0:	53200353 */ 	beqzl	$t9,.PB0f101e20
 /*  f1010d4:	8c621c04 */ 	lw	$v0,0x1c04($v1)
-/*  f1010d8:	0fc5528f */ 	jal	func0f153628
+/*  f1010d8:	0fc5528f */ 	jal	text0f153628
 /*  f1010dc:	8fa401d8 */ 	lw	$a0,0x1d8($sp)
 /*  f1010e0:	3c08800a */ 	lui	$t0,0x800a
 /*  f1010e4:	2508e4d0 */ 	addiu	$t0,$t0,-6960
@@ -4393,7 +4393,7 @@ glabel amRender
 /*  f101a10:	3c144f4f */ 	lui	$s4,0x4f4f
 /*  f101a14:	36944f7f */ 	ori	$s4,$s4,0x4f7f
 .PB0f101a18:
-/*  f101a18:	0fc552fc */ 	jal	gfxSetPrimColour
+/*  f101a18:	0fc552fc */ 	jal	textSetPrimColour
 /*  f101a1c:	02802825 */ 	move	$a1,$s4
 /*  f101a20:	3c0e800a */ 	lui	$t6,0x800a
 /*  f101a24:	8dce66e8 */ 	lw	$t6,0x66e8($t6)
@@ -4649,11 +4649,11 @@ glabel amRender
 /*  f101de8:	00187880 */ 	sll	$t7,$t8,0x2
 /*  f101dec:	01eec825 */ 	or	$t9,$t7,$t6
 /*  f101df0:	ac590004 */ 	sw	$t9,0x4($v0)
-/*  f101df4:	0fc55313 */ 	jal	func0f153838
+/*  f101df4:	0fc55313 */ 	jal	text0f153838
 /*  f101df8:	8fa401d8 */ 	lw	$a0,0x1d8($sp)
 /*  f101dfc:	afa201d8 */ 	sw	$v0,0x1d8($sp)
 .PB0f101e00:
-/*  f101e00:	0fc552e5 */ 	jal	func0f153780
+/*  f101e00:	0fc552e5 */ 	jal	text0f153780
 /*  f101e04:	8fa401d8 */ 	lw	$a0,0x1d8($sp)
 /*  f101e08:	3c03800a */ 	lui	$v1,0x800a
 /*  f101e0c:	3c0b800a */ 	lui	$t3,0x800a
@@ -5361,7 +5361,7 @@ glabel amRender
 /*  f100b4c:	906f0250 */ 	lbu	$t7,0x250($v1)
 /*  f100b50:	51e00353 */ 	beqzl	$t7,.L0f1018a0
 /*  f100b54:	8c621c04 */ 	lw	$v0,0x1c04($v1)
-/*  f100b58:	0fc54d8a */ 	jal	func0f153628
+/*  f100b58:	0fc54d8a */ 	jal	text0f153628
 /*  f100b5c:	8fa401d8 */ 	lw	$a0,0x1d8($sp)
 /*  f100b60:	3c08800a */ 	lui	$t0,%hi(g_Vars)
 /*  f100b64:	25089fc0 */ 	addiu	$t0,$t0,%lo(g_Vars)
@@ -5982,7 +5982,7 @@ glabel amRender
 /*  f101490:	3c144f4f */ 	lui	$s4,0x4f4f
 /*  f101494:	36944f7f */ 	ori	$s4,$s4,0x4f7f
 .L0f101498:
-/*  f101498:	0fc54df7 */ 	jal	gfxSetPrimColour
+/*  f101498:	0fc54df7 */ 	jal	textSetPrimColour
 /*  f10149c:	02802825 */ 	or	$a1,$s4,$zero
 /*  f1014a0:	3c18800a */ 	lui	$t8,%hi(g_AmIndex)
 /*  f1014a4:	8f1821b8 */ 	lw	$t8,%lo(g_AmIndex)($t8)
@@ -6238,11 +6238,11 @@ glabel amRender
 /*  f101868:	000ec880 */ 	sll	$t9,$t6,0x2
 /*  f10186c:	03387825 */ 	or	$t7,$t9,$t8
 /*  f101870:	ac4f0004 */ 	sw	$t7,0x4($v0)
-/*  f101874:	0fc54e0e */ 	jal	func0f153838
+/*  f101874:	0fc54e0e */ 	jal	text0f153838
 /*  f101878:	8fa401d8 */ 	lw	$a0,0x1d8($sp)
 /*  f10187c:	afa201d8 */ 	sw	$v0,0x1d8($sp)
 .L0f101880:
-/*  f101880:	0fc54de0 */ 	jal	func0f153780
+/*  f101880:	0fc54de0 */ 	jal	text0f153780
 /*  f101884:	8fa401d8 */ 	lw	$a0,0x1d8($sp)
 /*  f101888:	3c03800a */ 	lui	$v1,%hi(g_Vars+0x284)
 /*  f10188c:	3c0b800a */ 	lui	$t3,%hi(g_Vars)
@@ -6950,7 +6950,7 @@ glabel amRender
 /*  f0fccb0:	906f0250 */ 	lbu	$t7,0x250($v1)
 /*  f0fccb4:	51e0031f */ 	beqzl	$t7,.NB0f0fd934
 /*  f0fccb8:	8c621c04 */ 	lw	$v0,0x1c04($v1)
-/*  f0fccbc:	0fc5374a */ 	jal	func0f153628
+/*  f0fccbc:	0fc5374a */ 	jal	text0f153628
 /*  f0fccc0:	8fa401b0 */ 	lw	$a0,0x1b0($sp)
 /*  f0fccc4:	3c08800a */ 	lui	$t0,0x800a
 /*  f0fccc8:	2508e6c0 */ 	addiu	$t0,$t0,-6464
@@ -7573,7 +7573,7 @@ glabel amRender
 /*  f0fd5fc:	3c144f4f */ 	lui	$s4,0x4f4f
 /*  f0fd600:	36944f7f */ 	ori	$s4,$s4,0x4f7f
 .NB0f0fd604:
-/*  f0fd604:	0fc537b7 */ 	jal	gfxSetPrimColour
+/*  f0fd604:	0fc537b7 */ 	jal	textSetPrimColour
 /*  f0fd608:	02802825 */ 	or	$a1,$s4,$zero
 /*  f0fd60c:	3c0f800a */ 	lui	$t7,0x800a
 /*  f0fd610:	8def66a8 */ 	lw	$t7,0x66a8($t7)
@@ -7768,11 +7768,11 @@ glabel amRender
 /*  f0fd8fc:	00187880 */ 	sll	$t7,$t8,0x2
 /*  f0fd900:	01eec825 */ 	or	$t9,$t7,$t6
 /*  f0fd904:	ac590004 */ 	sw	$t9,0x4($v0)
-/*  f0fd908:	0fc537ce */ 	jal	func0f153838
+/*  f0fd908:	0fc537ce */ 	jal	text0f153838
 /*  f0fd90c:	8fa401b0 */ 	lw	$a0,0x1b0($sp)
 /*  f0fd910:	afa201b0 */ 	sw	$v0,0x1b0($sp)
 .NB0f0fd914:
-/*  f0fd914:	0fc537a0 */ 	jal	func0f153780
+/*  f0fd914:	0fc537a0 */ 	jal	text0f153780
 /*  f0fd918:	8fa401b0 */ 	lw	$a0,0x1b0($sp)
 /*  f0fd91c:	3c03800a */ 	lui	$v1,0x800a
 /*  f0fd920:	3c0a800a */ 	lui	$t2,0x800a
@@ -8357,7 +8357,7 @@ glabel amRender
 //
 //	if (g_Vars.currentplayer->activemenumode != AMMODE_CLOSED) {
 //		// Draw diamond
-//		gdl = func0f153628(gdl);
+//		gdl = text0f153628(gdl);
 //
 //		if (g_Vars.normmplayerisrunning
 //				&& g_AmMenus[g_AmIndex].screenindex >= 2) {
@@ -8552,7 +8552,7 @@ glabel amRender
 //				colour = 0x4f4f4f7f;
 //			}
 //
-//			gdl = gfxSetPrimColour(gdl, colour);
+//			gdl = textSetPrimColour(gdl, colour);
 //
 //			halfwidth = g_AmMenus[g_AmIndex].slotwidth / 2;
 //
@@ -8597,10 +8597,10 @@ glabel amRender
 //					g_AmMenus[g_AmIndex].selx + halfwidth + 1,
 //					g_AmMenus[g_AmIndex].sely + below);
 //
-//			gdl = func0f153838(gdl);
+//			gdl = text0f153838(gdl);
 //		}
 //
-//		gdl = func0f153780(gdl);
+//		gdl = text0f153780(gdl);
 //	}
 //
 //	// 18a4
@@ -2632,14 +2632,14 @@ Gfx *bgRenderScene(Gfx *gdl)
 					|| stagenum == STAGE_INFILTRATION
 					|| stagenum == STAGE_ESCAPE
 					|| stagenum == STAGE_ATTACKSHIP)) {
-			gdl = func0f153628(gdl);
+			gdl = text0f153628(gdl);

 			gSPMatrix(gdl++, osVirtualToPhysical(camGetUnk1758()), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION);

 			gdl = playerLoadMatrix(gdl);
 			gdl = envStopFog(gdl);
 			gdl = starsRender(gdl);
-			gdl = func0f153780(gdl);
+			gdl = text0f153780(gdl);
 			gdl = vi0000ab78(gdl);
 		}

@@ -3063,7 +3063,7 @@ glabel bgRenderScene
 /*  f155114:	56610018 */ 	bnel	$s3,$at,.NB0f155178
 /*  f155118:	2406ffff */ 	addiu	$a2,$zero,-1
 .NB0f15511c:
-/*  f15511c:	0fc5374a */ 	jal	func0f153628
+/*  f15511c:	0fc5374a */ 	jal	text0f153628
 /*  f155120:	02202025 */ 	or	$a0,$s1,$zero
 /*  f155124:	3c0f0103 */ 	lui	$t7,0x103
 /*  f155128:	35ef0040 */ 	ori	$t7,$t7,0x40
@@ -3080,7 +3080,7 @@ glabel bgRenderScene
 /*  f155154:	00402025 */ 	or	$a0,$v0,$zero
 /*  f155158:	0fc4c503 */ 	jal	starsRender
 /*  f15515c:	00402025 */ 	or	$a0,$v0,$zero
-/*  f155160:	0fc537a0 */ 	jal	func0f153780
+/*  f155160:	0fc537a0 */ 	jal	text0f153780
 /*  f155164:	00402025 */ 	or	$a0,$v0,$zero
 /*  f155168:	0c002b3e */ 	jal	vi0000ab78
 /*  f15516c:	00402025 */ 	or	$a0,$v0,$zero
@@ -23396,7 +23396,7 @@ Gfx *bgunRenderHudString(Gfx *gdl, char *text, s32 x, bool halign, s32 y, s32 va
 		y1 = y2 - textheight;
 	}

-	gdl = func0f153858(gdl, &x1, &y1, &x2, &y2);
+	gdl = text0f153858(gdl, &x1, &y1, &x2, &y2);
 	gdl = textRender(gdl, &x1, &y1, text, g_CharsNumeric, g_FontNumeric, colour, 0x000000a0, viGetWidth(), viGetHeight(), 0, 0);

 	return gdl;
@@ -23607,7 +23607,7 @@ glabel bgunRenderHudGauge
 /*  f0ab1cc:	00d2082a */ 	slt	$at,$a2,$s2
 /*  f0ab1d0:	1020003e */ 	beqz	$at,.JF0f0ab2cc
 /*  f0ab1d4:	00000000 */ 	nop
-/*  f0ab1d8:	0fc54bce */ 	jal	gfxSetPrimColour
+/*  f0ab1d8:	0fc54bce */ 	jal	textSetPrimColour
 /*  f0ab1dc:	afa600bc */ 	sw	$a2,0xbc($sp)
 /*  f0ab1e0:	8fae00f8 */ 	lw	$t6,0xf8($sp)
 /*  f0ab1e4:	8fa600bc */ 	lw	$a2,0xbc($sp)
@@ -23667,14 +23667,14 @@ glabel bgunRenderHudGauge
 /*  f0ab2b8:	01eec825 */ 	or	$t9,$t7,$t6
 /*  f0ab2bc:	ac590004 */ 	sw	$t9,0x4($v0)
 .JF0f0ab2c0:
-/*  f0ab2c0:	0fc54be5 */ 	jal	func0f153838
+/*  f0ab2c0:	0fc54be5 */ 	jal	text0f153838
 /*  f0ab2c4:	02202025 */ 	move	$a0,$s1
 /*  f0ab2c8:	00408825 */ 	move	$s1,$v0
 .JF0f0ab2cc:
 /*  f0ab2cc:	3c138008 */ 	lui	$s3,0x8008
 /*  f0ab2d0:	267300f4 */ 	addiu	$s3,$s3,0xf4
 /*  f0ab2d4:	02202025 */ 	move	$a0,$s1
-/*  f0ab2d8:	0fc54bce */ 	jal	gfxSetPrimColour
+/*  f0ab2d8:	0fc54bce */ 	jal	textSetPrimColour
 /*  f0ab2dc:	8fa500f4 */ 	lw	$a1,0xf4($sp)
 /*  f0ab2e0:	8fb800f8 */ 	lw	$t8,0xf8($sp)
 /*  f0ab2e4:	3c0af600 */ 	lui	$t2,0xf600
@@ -23732,7 +23732,7 @@ glabel bgunRenderHudGauge
 .JF0f0ab3b0:
 /*  f0ab3b0:	8fa500f0 */ 	lw	$a1,0xf0($sp)
 /*  f0ab3b4:	afa600bc */ 	sw	$a2,0xbc($sp)
-/*  f0ab3b8:	0fc54bce */ 	jal	gfxSetPrimColour
+/*  f0ab3b8:	0fc54bce */ 	jal	textSetPrimColour
 /*  f0ab3bc:	e7a000b8 */ 	swc1	$f0,0xb8($sp)
 /*  f0ab3c0:	8fb900b4 */ 	lw	$t9,0xb4($sp)
 /*  f0ab3c4:	8fa600bc */ 	lw	$a2,0xbc($sp)
@@ -24070,7 +24070,7 @@ glabel bgunRenderHudGauge
 /*  f0ab894:	03387025 */ 	or	$t6,$t9,$t8
 /*  f0ab898:	ac4e0004 */ 	sw	$t6,0x4($v0)
 .JF0f0ab89c:
-/*  f0ab89c:	0fc54be5 */ 	jal	func0f153838
+/*  f0ab89c:	0fc54be5 */ 	jal	text0f153838
 /*  f0ab8a0:	02202025 */ 	move	$a0,$s1
 /*  f0ab8a4:	3c0fb900 */ 	lui	$t7,0xb900
 /*  f0ab8a8:	3c190050 */ 	lui	$t9,0x50
@@ -24203,7 +24203,7 @@ glabel bgunRenderHudGauge
 /*  f0aa5a4:	00d2082a */ 	slt	$at,$a2,$s2
 /*  f0aa5a8:	1020003e */ 	beqz	$at,.PF0f0aa6a4
 /*  f0aa5ac:	00000000 */ 	nop
-/*  f0aa5b0:	0fc5513c */ 	jal	gfxSetPrimColour
+/*  f0aa5b0:	0fc5513c */ 	jal	textSetPrimColour
 /*  f0aa5b4:	afa600c4 */ 	sw	$a2,0xc4($sp)
 /*  f0aa5b8:	8fb90100 */ 	lw	$t9,0x100($sp)
 /*  f0aa5bc:	8fa600c4 */ 	lw	$a2,0xc4($sp)
@@ -24263,14 +24263,14 @@ glabel bgunRenderHudGauge
 /*  f0aa690:	01d96825 */ 	or	$t5,$t6,$t9
 /*  f0aa694:	ac4d0004 */ 	sw	$t5,0x4($v0)
 .PF0f0aa698:
-/*  f0aa698:	0fc55153 */ 	jal	func0f153838
+/*  f0aa698:	0fc55153 */ 	jal	text0f153838
 /*  f0aa69c:	02202025 */ 	move	$a0,$s1
 /*  f0aa6a0:	00408825 */ 	move	$s1,$v0
 .PF0f0aa6a4:
 /*  f0aa6a4:	3c138008 */ 	lui	$s3,0x8008
 /*  f0aa6a8:	26730020 */ 	addiu	$s3,$s3,0x20
 /*  f0aa6ac:	02202025 */ 	move	$a0,$s1
-/*  f0aa6b0:	0fc5513c */ 	jal	gfxSetPrimColour
+/*  f0aa6b0:	0fc5513c */ 	jal	textSetPrimColour
 /*  f0aa6b4:	8fa500fc */ 	lw	$a1,0xfc($sp)
 /*  f0aa6b8:	8fb80100 */ 	lw	$t8,0x100($sp)
 /*  f0aa6bc:	3c09f600 */ 	lui	$t1,0xf600
@@ -24328,7 +24328,7 @@ glabel bgunRenderHudGauge
 .PF0f0aa788:
 /*  f0aa788:	8fa500f8 */ 	lw	$a1,0xf8($sp)
 /*  f0aa78c:	afa600c4 */ 	sw	$a2,0xc4($sp)
-/*  f0aa790:	0fc5513c */ 	jal	gfxSetPrimColour
+/*  f0aa790:	0fc5513c */ 	jal	textSetPrimColour
 /*  f0aa794:	e7a000c0 */ 	swc1	$f0,0xc0($sp)
 /*  f0aa798:	8faf00bc */ 	lw	$t7,0xbc($sp)
 /*  f0aa79c:	8fa600c4 */ 	lw	$a2,0xc4($sp)
@@ -24693,7 +24693,7 @@ glabel bgunRenderHudGauge
 /*  f0aacd8:	01af7025 */ 	or	$t6,$t5,$t7
 /*  f0aacdc:	ac4e0004 */ 	sw	$t6,0x4($v0)
 .PF0f0aace0:
-/*  f0aace0:	0fc55153 */ 	jal	func0f153838
+/*  f0aace0:	0fc55153 */ 	jal	text0f153838
 /*  f0aace4:	02202025 */ 	move	$a0,$s1
 /*  f0aace8:	3c19b900 */ 	lui	$t9,0xb900
 /*  f0aacec:	3c180050 */ 	lui	$t8,0x50
@@ -24826,7 +24826,7 @@ glabel bgunRenderHudGauge
 /*  f0aa4f4:	00d2082a */ 	slt	$at,$a2,$s2
 /*  f0aa4f8:	1020003e */ 	beqz	$at,.PB0f0aa5f4
 /*  f0aa4fc:	00000000 */ 	nop
-/*  f0aa500:	0fc552fc */ 	jal	gfxSetPrimColour
+/*  f0aa500:	0fc552fc */ 	jal	textSetPrimColour
 /*  f0aa504:	afa600c4 */ 	sw	$a2,0xc4($sp)
 /*  f0aa508:	8fb90100 */ 	lw	$t9,0x100($sp)
 /*  f0aa50c:	8fa600c4 */ 	lw	$a2,0xc4($sp)
@@ -24886,14 +24886,14 @@ glabel bgunRenderHudGauge
 /*  f0aa5e0:	01d96825 */ 	or	$t5,$t6,$t9
 /*  f0aa5e4:	ac4d0004 */ 	sw	$t5,0x4($v0)
 .PB0f0aa5e8:
-/*  f0aa5e8:	0fc55313 */ 	jal	func0f153838
+/*  f0aa5e8:	0fc55313 */ 	jal	text0f153838
 /*  f0aa5ec:	02202025 */ 	move	$a0,$s1
 /*  f0aa5f0:	00408825 */ 	move	$s1,$v0
 .PB0f0aa5f4:
 /*  f0aa5f4:	3c138008 */ 	lui	$s3,0x8008
 /*  f0aa5f8:	26731f90 */ 	addiu	$s3,$s3,0x1f90
 /*  f0aa5fc:	02202025 */ 	move	$a0,$s1
-/*  f0aa600:	0fc552fc */ 	jal	gfxSetPrimColour
+/*  f0aa600:	0fc552fc */ 	jal	textSetPrimColour
 /*  f0aa604:	8fa500fc */ 	lw	$a1,0xfc($sp)
 /*  f0aa608:	8fb80100 */ 	lw	$t8,0x100($sp)
 /*  f0aa60c:	3c09f600 */ 	lui	$t1,0xf600
@@ -24951,7 +24951,7 @@ glabel bgunRenderHudGauge
 .PB0f0aa6d8:
 /*  f0aa6d8:	8fa500f8 */ 	lw	$a1,0xf8($sp)
 /*  f0aa6dc:	afa600c4 */ 	sw	$a2,0xc4($sp)
-/*  f0aa6e0:	0fc552fc */ 	jal	gfxSetPrimColour
+/*  f0aa6e0:	0fc552fc */ 	jal	textSetPrimColour
 /*  f0aa6e4:	e7a000c0 */ 	swc1	$f0,0xc0($sp)
 /*  f0aa6e8:	8faf00bc */ 	lw	$t7,0xbc($sp)
 /*  f0aa6ec:	8fa600c4 */ 	lw	$a2,0xc4($sp)
@@ -25316,7 +25316,7 @@ glabel bgunRenderHudGauge
 /*  f0aac28:	01af7025 */ 	or	$t6,$t5,$t7
 /*  f0aac2c:	ac4e0004 */ 	sw	$t6,0x4($v0)
 .PB0f0aac30:
-/*  f0aac30:	0fc55313 */ 	jal	func0f153838
+/*  f0aac30:	0fc55313 */ 	jal	text0f153838
 /*  f0aac34:	02202025 */ 	move	$a0,$s1
 /*  f0aac38:	3c19b900 */ 	lui	$t9,0xb900
 /*  f0aac3c:	3c180050 */ 	lui	$t8,0x50
@@ -25450,7 +25450,7 @@ glabel bgunRenderHudGauge
 /*  f0aa14c:	00d2082a */ 	slt	$at,$a2,$s2
 /*  f0aa150:	1020003f */ 	beqz	$at,.L0f0aa250
 /*  f0aa154:	00000000 */ 	nop
-/*  f0aa158:	0fc54df7 */ 	jal	gfxSetPrimColour
+/*  f0aa158:	0fc54df7 */ 	jal	textSetPrimColour
 /*  f0aa15c:	afa600bc */ 	sw	$a2,0xbc($sp)
 /*  f0aa160:	8faf00f8 */ 	lw	$t7,0xf8($sp)
 /*  f0aa164:	8fa600bc */ 	lw	$a2,0xbc($sp)
@@ -25511,14 +25511,14 @@ glabel bgunRenderHudGauge
 /*  f0aa23c:	030f7025 */ 	or	$t6,$t8,$t7
 /*  f0aa240:	ac4e0004 */ 	sw	$t6,0x4($v0)
 .L0f0aa244:
-/*  f0aa244:	0fc54e0e */ 	jal	func0f153838
+/*  f0aa244:	0fc54e0e */ 	jal	text0f153838
 /*  f0aa248:	02002025 */ 	or	$a0,$s0,$zero
 /*  f0aa24c:	00408025 */ 	or	$s0,$v0,$zero
 .L0f0aa250:
 /*  f0aa250:	3c138008 */ 	lui	$s3,%hi(g_ScaleX)
 /*  f0aa254:	2673fac0 */ 	addiu	$s3,$s3,%lo(g_ScaleX)
 /*  f0aa258:	02002025 */ 	or	$a0,$s0,$zero
-/*  f0aa25c:	0fc54df7 */ 	jal	gfxSetPrimColour
+/*  f0aa25c:	0fc54df7 */ 	jal	textSetPrimColour
 /*  f0aa260:	8fa500f4 */ 	lw	$a1,0xf4($sp)
 /*  f0aa264:	8fb900f8 */ 	lw	$t9,0xf8($sp)
 /*  f0aa268:	8fa900e0 */ 	lw	$t1,0xe0($sp)
@@ -25577,7 +25577,7 @@ glabel bgunRenderHudGauge
 .L0f0aa338:
 /*  f0aa338:	8fa500f0 */ 	lw	$a1,0xf0($sp)
 /*  f0aa33c:	afa600bc */ 	sw	$a2,0xbc($sp)
-/*  f0aa340:	0fc54df7 */ 	jal	gfxSetPrimColour
+/*  f0aa340:	0fc54df7 */ 	jal	textSetPrimColour
 /*  f0aa344:	e7a000b8 */ 	swc1	$f0,0xb8($sp)
 /*  f0aa348:	8fae00b4 */ 	lw	$t6,0xb4($sp)
 /*  f0aa34c:	8fa600bc */ 	lw	$a2,0xbc($sp)
@@ -25911,7 +25911,7 @@ glabel bgunRenderHudGauge
 /*  f0aa810:	01d97825 */ 	or	$t7,$t6,$t9
 /*  f0aa814:	ac4f0004 */ 	sw	$t7,0x4($v0)
 .L0f0aa818:
-/*  f0aa818:	0fc54e0e */ 	jal	func0f153838
+/*  f0aa818:	0fc54e0e */ 	jal	text0f153838
 /*  f0aa81c:	02002025 */ 	or	$a0,$s0,$zero
 /*  f0aa820:	3c18b900 */ 	lui	$t8,0xb900
 /*  f0aa824:	3c0e0050 */ 	lui	$t6,0x50
@@ -26026,7 +26026,7 @@ glabel bgunRenderHudGauge
 //		// 150
 //		if (partitiony > gaugetop) {
 //			// Render empty partition
-//			gdl = gfxSetPrimColour(gdl, emptycolour);
+//			gdl = textSetPrimColour(gdl, emptycolour);
 //
 //			if (flip) {
 //				gDPFillRectangleScaled(gdl++, x1, y2 - partitiony + y1, x2, gaugeheight + y1);
@@ -26034,12 +26034,12 @@ glabel bgunRenderHudGauge
 //				gDPFillRectangleScaled(gdl++, x1, gaugetop, x2, partitiony);
 //			}
 //
-//			gdl = func0f153838(gdl);
+//			gdl = text0f153838(gdl);
 //		}
 //
 //		// 25c
 //		// Render filled partition
-//		gdl = gfxSetPrimColour(gdl, filledcolour);
+//		gdl = textSetPrimColour(gdl, filledcolour);
 //
 //		// 278
 //		if (flip) {
@@ -26054,7 +26054,7 @@ glabel bgunRenderHudGauge
 //		s32 unittop;
 //		s32 unitbottom;
 //
-//		gdl = gfxSetPrimColour(gdl, emptycolour);
+//		gdl = textSetPrimColour(gdl, emptycolour);
 //
 //		unittop = gaugetop; // s5
 //		unitbottom = -1;
@@ -26199,7 +26199,7 @@ glabel bgunRenderHudGauge
 //		}
 //	}
 //
-//	gdl = func0f153838(gdl);
+//	gdl = text0f153838(gdl);
 //
 //	gDPSetRenderMode(gdl++, G_RM_AA_XLU_SURF, G_RM_AA_XLU_SURF2);
 //
@@ -26305,7 +26305,7 @@ glabel bgunRenderHud
 /*  f0aa9bc:	3c018008 */ 	lui	$at,%hi(g_ScaleX)
 /*  f0aa9c0:	ac22fac0 */ 	sw	$v0,%lo(g_ScaleX)($at)
 .L0f0aa9c4:
-/*  f0aa9c4:	0fc54d8a */ 	jal	func0f153628
+/*  f0aa9c4:	0fc54d8a */ 	jal	text0f153628
 /*  f0aa9c8:	8fa40130 */ 	lw	$a0,0x130($sp)
 /*  f0aa9cc:	8fb90060 */ 	lw	$t9,0x60($sp)
 /*  f0aa9d0:	afa20130 */ 	sw	$v0,0x130($sp)
@@ -26501,7 +26501,7 @@ glabel bgunRenderHud
 .L0f0aac7c:
 /*  f0aac7c:	8fa40130 */ 	lw	$a0,0x130($sp)
 /*  f0aac80:	8fa500f4 */ 	lw	$a1,0xf4($sp)
-/*  f0aac84:	0fc54df7 */ 	jal	gfxSetPrimColour
+/*  f0aac84:	0fc54df7 */ 	jal	textSetPrimColour
 /*  f0aac88:	afaa0058 */ 	sw	$t2,0x58($sp)
 /*  f0aac8c:	3c068008 */ 	lui	$a2,%hi(g_ScaleX)
 /*  f0aac90:	8faf0100 */ 	lw	$t7,0x100($sp)
@@ -26533,7 +26533,7 @@ glabel bgunRenderHud
 /*  f0aacf8:	000e7880 */ 	sll	$t7,$t6,0x2
 /*  f0aacfc:	030fc825 */ 	or	$t9,$t8,$t7
 /*  f0aad00:	ac590004 */ 	sw	$t9,0x4($v0)
-/*  f0aad04:	0fc54e0e */ 	jal	func0f153838
+/*  f0aad04:	0fc54e0e */ 	jal	text0f153838
 /*  f0aad08:	afa30060 */ 	sw	$v1,0x60($sp)
 /*  f0aad0c:	3c0e800a */ 	lui	$t6,%hi(g_Vars+0x288)
 /*  f0aad10:	8dcea248 */ 	lw	$t6,%lo(g_Vars+0x288)($t6)
@@ -26645,7 +26645,7 @@ glabel bgunRenderHud
 /*  f0aaea0:	afb800d0 */ 	sw	$t8,0xd0($sp)
 .L0f0aaea4:
 /*  f0aaea4:	8fa40130 */ 	lw	$a0,0x130($sp)
-/*  f0aaea8:	0fc54df7 */ 	jal	gfxSetPrimColour
+/*  f0aaea8:	0fc54df7 */ 	jal	textSetPrimColour
 /*  f0aaeac:	afaa0058 */ 	sw	$t2,0x58($sp)
 /*  f0aaeb0:	3c038008 */ 	lui	$v1,%hi(g_ScaleX)
 /*  f0aaeb4:	8fb90100 */ 	lw	$t9,0x100($sp)
@@ -26674,7 +26674,7 @@ glabel bgunRenderHud
 /*  f0aaf10:	332e03ff */ 	andi	$t6,$t9,0x3ff
 /*  f0aaf14:	000ec080 */ 	sll	$t8,$t6,0x2
 /*  f0aaf18:	01f8c825 */ 	or	$t9,$t7,$t8
-/*  f0aaf1c:	0fc54e0e */ 	jal	func0f153838
+/*  f0aaf1c:	0fc54e0e */ 	jal	text0f153838
 /*  f0aaf20:	ac590004 */ 	sw	$t9,0x4($v0)
 /*  f0aaf24:	3c018006 */ 	lui	$at,%hi(var80061630)
 /*  f0aaf28:	c4241630 */ 	lwc1	$f4,%lo(var80061630)($at)
@@ -26686,10 +26686,10 @@ glabel bgunRenderHud
 /*  f0aaf40:	24060032 */ 	addiu	$a2,$zero,0x32
 /*  f0aaf44:	4600428d */ 	trunc.w.s	$f10,$f8
 /*  f0aaf48:	44045000 */ 	mfc1	$a0,$f10
-/*  f0aaf4c:	0fc54f54 */ 	jal	func0f153d50
+/*  f0aaf4c:	0fc54f54 */ 	jal	textSetWaveBlend
 /*  f0aaf50:	00000000 */ 	nop
 /*  f0aaf54:	2404ffff */ 	addiu	$a0,$zero,-1
-/*  f0aaf58:	0fc54f8e */ 	jal	func0f153e38
+/*  f0aaf58:	0fc54f8e */ 	jal	textSetWaveColours
 /*  f0aaf5c:	2405ffff */ 	addiu	$a1,$zero,-1
 /*  f0aaf60:	3c0f8008 */ 	lui	$t7,%hi(g_CharsHandelGothicXs)
 /*  f0aaf64:	8deffb08 */ 	lw	$t7,%lo(g_CharsHandelGothicXs)($t7)
@@ -26710,7 +26710,7 @@ glabel bgunRenderHud
 /*  f0aafa0:	afb90018 */ 	sw	$t9,0x18($sp)
 /*  f0aafa4:	0fc5580f */ 	jal	textRenderProjected
 /*  f0aafa8:	afae001c */ 	sw	$t6,0x1c($sp)
-/*  f0aafac:	0fc54f93 */ 	jal	func0f153e4c
+/*  f0aafac:	0fc54f93 */ 	jal	textResetBlends
 /*  f0aafb0:	afa20130 */ 	sw	$v0,0x130($sp)
 /*  f0aafb4:	8faa0058 */ 	lw	$t2,0x58($sp)
 /*  f0aafb8:	8fa200bc */ 	lw	$v0,0xbc($sp)
@@ -26843,7 +26843,7 @@ glabel bgunRenderHud
 /*  f0ab190:	afb800d0 */ 	sw	$t8,0xd0($sp)
 .L0f0ab194:
 /*  f0ab194:	8fa40130 */ 	lw	$a0,0x130($sp)
-/*  f0ab198:	0fc54df7 */ 	jal	gfxSetPrimColour
+/*  f0ab198:	0fc54df7 */ 	jal	textSetPrimColour
 /*  f0ab19c:	afaa0058 */ 	sw	$t2,0x58($sp)
 /*  f0ab1a0:	3c038008 */ 	lui	$v1,%hi(g_ScaleX)
 /*  f0ab1a4:	2463fac0 */ 	addiu	$v1,$v1,%lo(g_ScaleX)
@@ -26874,7 +26874,7 @@ glabel bgunRenderHud
 /*  f0ab208:	331903ff */ 	andi	$t9,$t8,0x3ff
 /*  f0ab20c:	00197080 */ 	sll	$t6,$t9,0x2
 /*  f0ab210:	01eec025 */ 	or	$t8,$t7,$t6
-/*  f0ab214:	0fc54e0e */ 	jal	func0f153838
+/*  f0ab214:	0fc54e0e */ 	jal	text0f153838
 /*  f0ab218:	ac580004 */ 	sw	$t8,0x4($v0)
 /*  f0ab21c:	3c018006 */ 	lui	$at,%hi(var80061630)
 /*  f0ab220:	c4301630 */ 	lwc1	$f16,%lo(var80061630)($at)
@@ -26886,10 +26886,10 @@ glabel bgunRenderHud
 /*  f0ab238:	24060032 */ 	addiu	$a2,$zero,0x32
 /*  f0ab23c:	4600218d */ 	trunc.w.s	$f6,$f4
 /*  f0ab240:	44043000 */ 	mfc1	$a0,$f6
-/*  f0ab244:	0fc54f54 */ 	jal	func0f153d50
+/*  f0ab244:	0fc54f54 */ 	jal	textSetWaveBlend
 /*  f0ab248:	00000000 */ 	nop
 /*  f0ab24c:	2404ffff */ 	addiu	$a0,$zero,-1
-/*  f0ab250:	0fc54f8e */ 	jal	func0f153e38
+/*  f0ab250:	0fc54f8e */ 	jal	textSetWaveColours
 /*  f0ab254:	2405ffff */ 	addiu	$a1,$zero,-1
 /*  f0ab258:	3c0f8008 */ 	lui	$t7,%hi(g_CharsHandelGothicXs)
 /*  f0ab25c:	8deffb08 */ 	lw	$t7,%lo(g_CharsHandelGothicXs)($t7)
@@ -26910,7 +26910,7 @@ glabel bgunRenderHud
 /*  f0ab298:	afb80018 */ 	sw	$t8,0x18($sp)
 /*  f0ab29c:	0fc5580f */ 	jal	textRenderProjected
 /*  f0ab2a0:	afb9001c */ 	sw	$t9,0x1c($sp)
-/*  f0ab2a4:	0fc54f93 */ 	jal	func0f153e4c
+/*  f0ab2a4:	0fc54f93 */ 	jal	textResetBlends
 /*  f0ab2a8:	afa20130 */ 	sw	$v0,0x130($sp)
 /*  f0ab2ac:	8faa0058 */ 	lw	$t2,0x58($sp)
 .L0f0ab2b0:
@@ -26946,7 +26946,7 @@ glabel bgunRenderHud
 .L0f0ab31c:
 /*  f0ab31c:	55c30008 */ 	bnel	$t6,$v1,.L0f0ab340
 /*  f0ab320:	8fb90110 */ 	lw	$t9,0x110($sp)
-/*  f0ab324:	0fc54de0 */ 	jal	func0f153780
+/*  f0ab324:	0fc54de0 */ 	jal	text0f153780
 /*  f0ab328:	8fa40130 */ 	lw	$a0,0x130($sp)
 /*  f0ab32c:	24180001 */ 	addiu	$t8,$zero,0x1
 /*  f0ab330:	3c018008 */ 	lui	$at,%hi(g_ScaleX)
@@ -27463,7 +27463,7 @@ glabel bgunRenderHud
 /*  f0abaa4:	afb80010 */ 	sw	$t8,0x10($sp)
 /*  f0abaa8:	afa20130 */ 	sw	$v0,0x130($sp)
 .L0f0abaac:
-/*  f0abaac:	0fc54de0 */ 	jal	func0f153780
+/*  f0abaac:	0fc54de0 */ 	jal	text0f153780
 /*  f0abab0:	8fa40130 */ 	lw	$a0,0x130($sp)
 /*  f0abab4:	240e0001 */ 	addiu	$t6,$zero,0x1
 /*  f0abab8:	3c018008 */ 	lui	$at,%hi(g_ScaleX)
@@ -27564,7 +27564,7 @@ glabel bgunRenderHud
 .PF0f0aae68:
 /*  f0aae68:	3c018008 */ 	lui	$at,0x8008
 /*  f0aae6c:	ac2f0020 */ 	sw	$t7,0x20($at)
-/*  f0aae70:	0fc550cf */ 	jal	func0f153628
+/*  f0aae70:	0fc550cf */ 	jal	text0f153628
 /*  f0aae74:	8fa40130 */ 	lw	$a0,0x130($sp)
 /*  f0aae78:	8fb80060 */ 	lw	$t8,0x60($sp)
 /*  f0aae7c:	afa20130 */ 	sw	$v0,0x130($sp)
@@ -27765,7 +27765,7 @@ glabel bgunRenderHud
 .PF0f0ab13c:
 /*  f0ab13c:	8fa40130 */ 	lw	$a0,0x130($sp)
 /*  f0ab140:	8fa500f4 */ 	lw	$a1,0xf4($sp)
-/*  f0ab144:	0fc5513c */ 	jal	gfxSetPrimColour
+/*  f0ab144:	0fc5513c */ 	jal	textSetPrimColour
 /*  f0ab148:	afaa0058 */ 	sw	$t2,0x58($sp)
 /*  f0ab14c:	3c068008 */ 	lui	$a2,0x8008
 /*  f0ab150:	8fa70100 */ 	lw	$a3,0x100($sp)
@@ -27796,7 +27796,7 @@ glabel bgunRenderHud
 /*  f0ab1b4:	0018c880 */ 	sll	$t9,$t8,0x2
 /*  f0ab1b8:	01d97825 */ 	or	$t7,$t6,$t9
 /*  f0ab1bc:	ac4f0004 */ 	sw	$t7,0x4($v0)
-/*  f0ab1c0:	0fc55153 */ 	jal	func0f153838
+/*  f0ab1c0:	0fc55153 */ 	jal	text0f153838
 /*  f0ab1c4:	afa30060 */ 	sw	$v1,0x60($sp)
 /*  f0ab1c8:	3c18800a */ 	lui	$t8,0x800a
 /*  f0ab1cc:	8f18a798 */ 	lw	$t8,-0x5868($t8)
@@ -27908,7 +27908,7 @@ glabel bgunRenderHud
 /*  f0ab35c:	afae00d0 */ 	sw	$t6,0xd0($sp)
 .PF0f0ab360:
 /*  f0ab360:	8fa40130 */ 	lw	$a0,0x130($sp)
-/*  f0ab364:	0fc5513c */ 	jal	gfxSetPrimColour
+/*  f0ab364:	0fc5513c */ 	jal	textSetPrimColour
 /*  f0ab368:	afaa0058 */ 	sw	$t2,0x58($sp)
 /*  f0ab36c:	3c038008 */ 	lui	$v1,0x8008
 /*  f0ab370:	8faf0100 */ 	lw	$t7,0x100($sp)
@@ -27937,7 +27937,7 @@ glabel bgunRenderHud
 /*  f0ab3cc:	31f803ff */ 	andi	$t8,$t7,0x3ff
 /*  f0ab3d0:	00187080 */ 	sll	$t6,$t8,0x2
 /*  f0ab3d4:	032e7825 */ 	or	$t7,$t9,$t6
-/*  f0ab3d8:	0fc55153 */ 	jal	func0f153838
+/*  f0ab3d8:	0fc55153 */ 	jal	text0f153838
 /*  f0ab3dc:	ac4f0004 */ 	sw	$t7,0x4($v0)
 /*  f0ab3e0:	3c018006 */ 	lui	$at,0x8006
 /*  f0ab3e4:	c4241300 */ 	lwc1	$f4,0x1300($at)
@@ -27949,10 +27949,10 @@ glabel bgunRenderHud
 /*  f0ab3fc:	24060032 */ 	li	$a2,0x32
 /*  f0ab400:	4600428d */ 	trunc.w.s	$f10,$f8
 /*  f0ab404:	44045000 */ 	mfc1	$a0,$f10
-/*  f0ab408:	0fc55299 */ 	jal	func0f153d50
+/*  f0ab408:	0fc55299 */ 	jal	textSetWaveBlend
 /*  f0ab40c:	00000000 */ 	nop
 /*  f0ab410:	2404ffff */ 	li	$a0,-1
-/*  f0ab414:	0fc552d3 */ 	jal	func0f153e38
+/*  f0ab414:	0fc552d3 */ 	jal	textSetWaveColours
 /*  f0ab418:	2405ffff */ 	li	$a1,-1
 /*  f0ab41c:	3c198008 */ 	lui	$t9,0x8008
 /*  f0ab420:	8f390068 */ 	lw	$t9,0x68($t9)
@@ -27973,7 +27973,7 @@ glabel bgunRenderHud
 /*  f0ab45c:	afaf0018 */ 	sw	$t7,0x18($sp)
 /*  f0ab460:	0fc55c50 */ 	jal	textRenderProjected
 /*  f0ab464:	afb8001c */ 	sw	$t8,0x1c($sp)
-/*  f0ab468:	0fc552d8 */ 	jal	func0f153e4c
+/*  f0ab468:	0fc552d8 */ 	jal	textResetBlends
 /*  f0ab46c:	afa20130 */ 	sw	$v0,0x130($sp)
 /*  f0ab470:	8faa0058 */ 	lw	$t2,0x58($sp)
 /*  f0ab474:	8fa200bc */ 	lw	$v0,0xbc($sp)
@@ -28106,7 +28106,7 @@ glabel bgunRenderHud
 /*  f0ab64c:	afae00d0 */ 	sw	$t6,0xd0($sp)
 .PF0f0ab650:
 /*  f0ab650:	8fa40130 */ 	lw	$a0,0x130($sp)
-/*  f0ab654:	0fc5513c */ 	jal	gfxSetPrimColour
+/*  f0ab654:	0fc5513c */ 	jal	textSetPrimColour
 /*  f0ab658:	afaa0058 */ 	sw	$t2,0x58($sp)
 /*  f0ab65c:	3c038008 */ 	lui	$v1,0x8008
 /*  f0ab660:	24630020 */ 	addiu	$v1,$v1,0x20
@@ -28137,7 +28137,7 @@ glabel bgunRenderHud
 /*  f0ab6c4:	31cf03ff */ 	andi	$t7,$t6,0x3ff
 /*  f0ab6c8:	000fc080 */ 	sll	$t8,$t7,0x2
 /*  f0ab6cc:	03387025 */ 	or	$t6,$t9,$t8
-/*  f0ab6d0:	0fc55153 */ 	jal	func0f153838
+/*  f0ab6d0:	0fc55153 */ 	jal	text0f153838
 /*  f0ab6d4:	ac4e0004 */ 	sw	$t6,0x4($v0)
 /*  f0ab6d8:	3c018006 */ 	lui	$at,0x8006
 /*  f0ab6dc:	c4301300 */ 	lwc1	$f16,0x1300($at)
@@ -28149,10 +28149,10 @@ glabel bgunRenderHud
 /*  f0ab6f4:	24060032 */ 	li	$a2,0x32
 /*  f0ab6f8:	4600218d */ 	trunc.w.s	$f6,$f4
 /*  f0ab6fc:	44043000 */ 	mfc1	$a0,$f6
-/*  f0ab700:	0fc55299 */ 	jal	func0f153d50
+/*  f0ab700:	0fc55299 */ 	jal	textSetWaveBlend
 /*  f0ab704:	00000000 */ 	nop
 /*  f0ab708:	2404ffff */ 	li	$a0,-1
-/*  f0ab70c:	0fc552d3 */ 	jal	func0f153e38
+/*  f0ab70c:	0fc552d3 */ 	jal	textSetWaveColours
 /*  f0ab710:	2405ffff */ 	li	$a1,-1
 /*  f0ab714:	3c198008 */ 	lui	$t9,0x8008
 /*  f0ab718:	8f390068 */ 	lw	$t9,0x68($t9)
@@ -28173,7 +28173,7 @@ glabel bgunRenderHud
 /*  f0ab754:	afae0018 */ 	sw	$t6,0x18($sp)
 /*  f0ab758:	0fc55c50 */ 	jal	textRenderProjected
 /*  f0ab75c:	afaf001c */ 	sw	$t7,0x1c($sp)
-/*  f0ab760:	0fc552d8 */ 	jal	func0f153e4c
+/*  f0ab760:	0fc552d8 */ 	jal	textResetBlends
 /*  f0ab764:	afa20130 */ 	sw	$v0,0x130($sp)
 /*  f0ab768:	8faa0058 */ 	lw	$t2,0x58($sp)
 .PF0f0ab76c:
@@ -28209,7 +28209,7 @@ glabel bgunRenderHud
 .PF0f0ab7d8:
 /*  f0ab7d8:	57030008 */ 	bnel	$t8,$v1,.PF0f0ab7fc
 /*  f0ab7dc:	8faf0110 */ 	lw	$t7,0x110($sp)
-/*  f0ab7e0:	0fc55125 */ 	jal	func0f153780
+/*  f0ab7e0:	0fc55125 */ 	jal	text0f153780
 /*  f0ab7e4:	8fa40130 */ 	lw	$a0,0x130($sp)
 /*  f0ab7e8:	240e0001 */ 	li	$t6,0x1
 /*  f0ab7ec:	3c018008 */ 	lui	$at,0x8008
@@ -28726,7 +28726,7 @@ glabel bgunRenderHud
 /*  f0abf60:	afae0010 */ 	sw	$t6,0x10($sp)
 /*  f0abf64:	afa20130 */ 	sw	$v0,0x130($sp)
 .PF0f0abf68:
-/*  f0abf68:	0fc55125 */ 	jal	func0f153780
+/*  f0abf68:	0fc55125 */ 	jal	text0f153780
 /*  f0abf6c:	8fa40130 */ 	lw	$a0,0x130($sp)
 /*  f0abf70:	24180001 */ 	li	$t8,0x1
 /*  f0abf74:	3c018008 */ 	lui	$at,0x8008
@@ -28827,7 +28827,7 @@ glabel bgunRenderHud
 .PB0f0aadb8:
 /*  f0aadb8:	3c018008 */ 	lui	$at,0x8008
 /*  f0aadbc:	ac2f1f90 */ 	sw	$t7,0x1f90($at)
-/*  f0aadc0:	0fc5528f */ 	jal	func0f153628
+/*  f0aadc0:	0fc5528f */ 	jal	text0f153628
 /*  f0aadc4:	8fa40130 */ 	lw	$a0,0x130($sp)
 /*  f0aadc8:	8fb80060 */ 	lw	$t8,0x60($sp)
 /*  f0aadcc:	afa20130 */ 	sw	$v0,0x130($sp)
@@ -29028,7 +29028,7 @@ glabel bgunRenderHud
 .PB0f0ab08c:
 /*  f0ab08c:	8fa40130 */ 	lw	$a0,0x130($sp)
 /*  f0ab090:	8fa500f4 */ 	lw	$a1,0xf4($sp)
-/*  f0ab094:	0fc552fc */ 	jal	gfxSetPrimColour
+/*  f0ab094:	0fc552fc */ 	jal	textSetPrimColour
 /*  f0ab098:	afaa0058 */ 	sw	$t2,0x58($sp)
 /*  f0ab09c:	3c068008 */ 	lui	$a2,0x8008
 /*  f0ab0a0:	8fa70100 */ 	lw	$a3,0x100($sp)
@@ -29059,7 +29059,7 @@ glabel bgunRenderHud
 /*  f0ab104:	0018c880 */ 	sll	$t9,$t8,0x2
 /*  f0ab108:	01d97825 */ 	or	$t7,$t6,$t9
 /*  f0ab10c:	ac4f0004 */ 	sw	$t7,0x4($v0)
-/*  f0ab110:	0fc55313 */ 	jal	func0f153838
+/*  f0ab110:	0fc55313 */ 	jal	text0f153838
 /*  f0ab114:	afa30060 */ 	sw	$v1,0x60($sp)
 /*  f0ab118:	3c18800a */ 	lui	$t8,0x800a
 /*  f0ab11c:	8f18e758 */ 	lw	$t8,-0x18a8($t8)
@@ -29171,7 +29171,7 @@ glabel bgunRenderHud
 /*  f0ab2ac:	afae00d0 */ 	sw	$t6,0xd0($sp)
 .PB0f0ab2b0:
 /*  f0ab2b0:	8fa40130 */ 	lw	$a0,0x130($sp)
-/*  f0ab2b4:	0fc552fc */ 	jal	gfxSetPrimColour
+/*  f0ab2b4:	0fc552fc */ 	jal	textSetPrimColour
 /*  f0ab2b8:	afaa0058 */ 	sw	$t2,0x58($sp)
 /*  f0ab2bc:	3c038008 */ 	lui	$v1,0x8008
 /*  f0ab2c0:	8faf0100 */ 	lw	$t7,0x100($sp)
@@ -29200,7 +29200,7 @@ glabel bgunRenderHud
 /*  f0ab31c:	31f803ff */ 	andi	$t8,$t7,0x3ff
 /*  f0ab320:	00187080 */ 	sll	$t6,$t8,0x2
 /*  f0ab324:	032e7825 */ 	or	$t7,$t9,$t6
-/*  f0ab328:	0fc55313 */ 	jal	func0f153838
+/*  f0ab328:	0fc55313 */ 	jal	text0f153838
 /*  f0ab32c:	ac4f0004 */ 	sw	$t7,0x4($v0)
 /*  f0ab330:	3c018006 */ 	lui	$at,0x8006
 /*  f0ab334:	c4242cf0 */ 	lwc1	$f4,0x2cf0($at)
@@ -29212,10 +29212,10 @@ glabel bgunRenderHud
 /*  f0ab34c:	24060032 */ 	li	$a2,0x32
 /*  f0ab350:	4600428d */ 	trunc.w.s	$f10,$f8
 /*  f0ab354:	44045000 */ 	mfc1	$a0,$f10
-/*  f0ab358:	0fc55459 */ 	jal	func0f153d50
+/*  f0ab358:	0fc55459 */ 	jal	textSetWaveBlend
 /*  f0ab35c:	00000000 */ 	nop
 /*  f0ab360:	2404ffff */ 	li	$a0,-1
-/*  f0ab364:	0fc55493 */ 	jal	func0f153e38
+/*  f0ab364:	0fc55493 */ 	jal	textSetWaveColours
 /*  f0ab368:	2405ffff */ 	li	$a1,-1
 /*  f0ab36c:	3c198008 */ 	lui	$t9,0x8008
 /*  f0ab370:	8f391fd8 */ 	lw	$t9,0x1fd8($t9)
@@ -29236,7 +29236,7 @@ glabel bgunRenderHud
 /*  f0ab3ac:	afaf0018 */ 	sw	$t7,0x18($sp)
 /*  f0ab3b0:	0fc55e10 */ 	jal	textRenderProjected
 /*  f0ab3b4:	afb8001c */ 	sw	$t8,0x1c($sp)
-/*  f0ab3b8:	0fc55498 */ 	jal	func0f153e4c
+/*  f0ab3b8:	0fc55498 */ 	jal	textResetBlends
 /*  f0ab3bc:	afa20130 */ 	sw	$v0,0x130($sp)
 /*  f0ab3c0:	8faa0058 */ 	lw	$t2,0x58($sp)
 /*  f0ab3c4:	8fa200bc */ 	lw	$v0,0xbc($sp)
@@ -29369,7 +29369,7 @@ glabel bgunRenderHud
 /*  f0ab59c:	afae00d0 */ 	sw	$t6,0xd0($sp)
 .PB0f0ab5a0:
 /*  f0ab5a0:	8fa40130 */ 	lw	$a0,0x130($sp)
-/*  f0ab5a4:	0fc552fc */ 	jal	gfxSetPrimColour
+/*  f0ab5a4:	0fc552fc */ 	jal	textSetPrimColour
 /*  f0ab5a8:	afaa0058 */ 	sw	$t2,0x58($sp)
 /*  f0ab5ac:	3c038008 */ 	lui	$v1,0x8008
 /*  f0ab5b0:	24631f90 */ 	addiu	$v1,$v1,0x1f90
@@ -29400,7 +29400,7 @@ glabel bgunRenderHud
 /*  f0ab614:	31cf03ff */ 	andi	$t7,$t6,0x3ff
 /*  f0ab618:	000fc080 */ 	sll	$t8,$t7,0x2
 /*  f0ab61c:	03387025 */ 	or	$t6,$t9,$t8
-/*  f0ab620:	0fc55313 */ 	jal	func0f153838
+/*  f0ab620:	0fc55313 */ 	jal	text0f153838
 /*  f0ab624:	ac4e0004 */ 	sw	$t6,0x4($v0)
 /*  f0ab628:	3c018006 */ 	lui	$at,0x8006
 /*  f0ab62c:	c4302cf0 */ 	lwc1	$f16,0x2cf0($at)
@@ -29412,10 +29412,10 @@ glabel bgunRenderHud
 /*  f0ab644:	24060032 */ 	li	$a2,0x32
 /*  f0ab648:	4600218d */ 	trunc.w.s	$f6,$f4
 /*  f0ab64c:	44043000 */ 	mfc1	$a0,$f6
-/*  f0ab650:	0fc55459 */ 	jal	func0f153d50
+/*  f0ab650:	0fc55459 */ 	jal	textSetWaveBlend
 /*  f0ab654:	00000000 */ 	nop
 /*  f0ab658:	2404ffff */ 	li	$a0,-1
-/*  f0ab65c:	0fc55493 */ 	jal	func0f153e38
+/*  f0ab65c:	0fc55493 */ 	jal	textSetWaveColours
 /*  f0ab660:	2405ffff */ 	li	$a1,-1
 /*  f0ab664:	3c198008 */ 	lui	$t9,0x8008
 /*  f0ab668:	8f391fd8 */ 	lw	$t9,0x1fd8($t9)
@@ -29436,7 +29436,7 @@ glabel bgunRenderHud
 /*  f0ab6a4:	afae0018 */ 	sw	$t6,0x18($sp)
 /*  f0ab6a8:	0fc55e10 */ 	jal	textRenderProjected
 /*  f0ab6ac:	afaf001c */ 	sw	$t7,0x1c($sp)
-/*  f0ab6b0:	0fc55498 */ 	jal	func0f153e4c
+/*  f0ab6b0:	0fc55498 */ 	jal	textResetBlends
 /*  f0ab6b4:	afa20130 */ 	sw	$v0,0x130($sp)
 /*  f0ab6b8:	8faa0058 */ 	lw	$t2,0x58($sp)
 .PB0f0ab6bc:
@@ -29472,7 +29472,7 @@ glabel bgunRenderHud
 .PB0f0ab728:
 /*  f0ab728:	57030008 */ 	bnel	$t8,$v1,.PB0f0ab74c
 /*  f0ab72c:	8faf0110 */ 	lw	$t7,0x110($sp)
-/*  f0ab730:	0fc552e5 */ 	jal	func0f153780
+/*  f0ab730:	0fc552e5 */ 	jal	text0f153780
 /*  f0ab734:	8fa40130 */ 	lw	$a0,0x130($sp)
 /*  f0ab738:	240e0001 */ 	li	$t6,0x1
 /*  f0ab73c:	3c018008 */ 	lui	$at,0x8008
@@ -29989,7 +29989,7 @@ glabel bgunRenderHud
 /*  f0abeb0:	afae0010 */ 	sw	$t6,0x10($sp)
 /*  f0abeb4:	afa20130 */ 	sw	$v0,0x130($sp)
 .PB0f0abeb8:
-/*  f0abeb8:	0fc552e5 */ 	jal	func0f153780
+/*  f0abeb8:	0fc552e5 */ 	jal	text0f153780
 /*  f0abebc:	8fa40130 */ 	lw	$a0,0x130($sp)
 /*  f0abec0:	24180001 */ 	li	$t8,0x1
 /*  f0abec4:	3c018008 */ 	lui	$at,0x8008
@@ -30099,7 +30099,7 @@ glabel bgunRenderHud
 /*  f0aa9bc:	3c018008 */ 	lui	$at,%hi(g_ScaleX)
 /*  f0aa9c0:	ac22fac0 */ 	sw	$v0,%lo(g_ScaleX)($at)
 .L0f0aa9c4:
-/*  f0aa9c4:	0fc54d8a */ 	jal	func0f153628
+/*  f0aa9c4:	0fc54d8a */ 	jal	text0f153628
 /*  f0aa9c8:	8fa40130 */ 	lw	$a0,0x130($sp)
 /*  f0aa9cc:	8fb90060 */ 	lw	$t9,0x60($sp)
 /*  f0aa9d0:	afa20130 */ 	sw	$v0,0x130($sp)
@@ -30295,7 +30295,7 @@ glabel bgunRenderHud
 .L0f0aac7c:
 /*  f0aac7c:	8fa40130 */ 	lw	$a0,0x130($sp)
 /*  f0aac80:	8fa500f4 */ 	lw	$a1,0xf4($sp)
-/*  f0aac84:	0fc54df7 */ 	jal	gfxSetPrimColour
+/*  f0aac84:	0fc54df7 */ 	jal	textSetPrimColour
 /*  f0aac88:	afaa0058 */ 	sw	$t2,0x58($sp)
 /*  f0aac8c:	3c068008 */ 	lui	$a2,%hi(g_ScaleX)
 /*  f0aac90:	8faf0100 */ 	lw	$t7,0x100($sp)
@@ -30327,7 +30327,7 @@ glabel bgunRenderHud
 /*  f0aacf8:	000e7880 */ 	sll	$t7,$t6,0x2
 /*  f0aacfc:	030fc825 */ 	or	$t9,$t8,$t7
 /*  f0aad00:	ac590004 */ 	sw	$t9,0x4($v0)
-/*  f0aad04:	0fc54e0e */ 	jal	func0f153838
+/*  f0aad04:	0fc54e0e */ 	jal	text0f153838
 /*  f0aad08:	afa30060 */ 	sw	$v1,0x60($sp)
 /*  f0aad0c:	3c0e800a */ 	lui	$t6,%hi(g_Vars+0x288)
 /*  f0aad10:	8dcea248 */ 	lw	$t6,%lo(g_Vars+0x288)($t6)
@@ -30439,7 +30439,7 @@ glabel bgunRenderHud
 /*  f0aaea0:	afb800d0 */ 	sw	$t8,0xd0($sp)
 .L0f0aaea4:
 /*  f0aaea4:	8fa40130 */ 	lw	$a0,0x130($sp)
-/*  f0aaea8:	0fc54df7 */ 	jal	gfxSetPrimColour
+/*  f0aaea8:	0fc54df7 */ 	jal	textSetPrimColour
 /*  f0aaeac:	afaa0058 */ 	sw	$t2,0x58($sp)
 /*  f0aaeb0:	3c038008 */ 	lui	$v1,%hi(g_ScaleX)
 /*  f0aaeb4:	8fb90100 */ 	lw	$t9,0x100($sp)
@@ -30468,7 +30468,7 @@ glabel bgunRenderHud
 /*  f0aaf10:	332e03ff */ 	andi	$t6,$t9,0x3ff
 /*  f0aaf14:	000ec080 */ 	sll	$t8,$t6,0x2
 /*  f0aaf18:	01f8c825 */ 	or	$t9,$t7,$t8
-/*  f0aaf1c:	0fc54e0e */ 	jal	func0f153838
+/*  f0aaf1c:	0fc54e0e */ 	jal	text0f153838
 /*  f0aaf20:	ac590004 */ 	sw	$t9,0x4($v0)
 /*  f0aaf24:	3c018006 */ 	lui	$at,%hi(var80061630)
 /*  f0aaf28:	c4241630 */ 	lwc1	$f4,%lo(var80061630)($at)
@@ -30480,10 +30480,10 @@ glabel bgunRenderHud
 /*  f0aaf40:	24060032 */ 	addiu	$a2,$zero,0x32
 /*  f0aaf44:	4600428d */ 	trunc.w.s	$f10,$f8
 /*  f0aaf48:	44045000 */ 	mfc1	$a0,$f10
-/*  f0aaf4c:	0fc54f54 */ 	jal	func0f153d50
+/*  f0aaf4c:	0fc54f54 */ 	jal	textSetWaveBlend
 /*  f0aaf50:	00000000 */ 	nop
 /*  f0aaf54:	2404ffff */ 	addiu	$a0,$zero,-1
-/*  f0aaf58:	0fc54f8e */ 	jal	func0f153e38
+/*  f0aaf58:	0fc54f8e */ 	jal	textSetWaveColours
 /*  f0aaf5c:	2405ffff */ 	addiu	$a1,$zero,-1
 /*  f0aaf60:	3c0f8008 */ 	lui	$t7,%hi(g_CharsHandelGothicXs)
 /*  f0aaf64:	8deffb08 */ 	lw	$t7,%lo(g_CharsHandelGothicXs)($t7)
@@ -30504,7 +30504,7 @@ glabel bgunRenderHud
 /*  f0aafa0:	afb90018 */ 	sw	$t9,0x18($sp)
 /*  f0aafa4:	0fc5580f */ 	jal	textRenderProjected
 /*  f0aafa8:	afae001c */ 	sw	$t6,0x1c($sp)
-/*  f0aafac:	0fc54f93 */ 	jal	func0f153e4c
+/*  f0aafac:	0fc54f93 */ 	jal	textResetBlends
 /*  f0aafb0:	afa20130 */ 	sw	$v0,0x130($sp)
 /*  f0aafb4:	8faa0058 */ 	lw	$t2,0x58($sp)
 /*  f0aafb8:	8fa200bc */ 	lw	$v0,0xbc($sp)
@@ -30637,7 +30637,7 @@ glabel bgunRenderHud
 /*  f0ab190:	afb800d0 */ 	sw	$t8,0xd0($sp)
 .L0f0ab194:
 /*  f0ab194:	8fa40130 */ 	lw	$a0,0x130($sp)
-/*  f0ab198:	0fc54df7 */ 	jal	gfxSetPrimColour
+/*  f0ab198:	0fc54df7 */ 	jal	textSetPrimColour
 /*  f0ab19c:	afaa0058 */ 	sw	$t2,0x58($sp)
 /*  f0ab1a0:	3c038008 */ 	lui	$v1,%hi(g_ScaleX)
 /*  f0ab1a4:	2463fac0 */ 	addiu	$v1,$v1,%lo(g_ScaleX)
@@ -30668,7 +30668,7 @@ glabel bgunRenderHud
 /*  f0ab208:	331903ff */ 	andi	$t9,$t8,0x3ff
 /*  f0ab20c:	00197080 */ 	sll	$t6,$t9,0x2
 /*  f0ab210:	01eec025 */ 	or	$t8,$t7,$t6
-/*  f0ab214:	0fc54e0e */ 	jal	func0f153838
+/*  f0ab214:	0fc54e0e */ 	jal	text0f153838
 /*  f0ab218:	ac580004 */ 	sw	$t8,0x4($v0)
 /*  f0ab21c:	3c018006 */ 	lui	$at,%hi(var80061630)
 /*  f0ab220:	c4301630 */ 	lwc1	$f16,%lo(var80061630)($at)
@@ -30680,10 +30680,10 @@ glabel bgunRenderHud
 /*  f0ab238:	24060032 */ 	addiu	$a2,$zero,0x32
 /*  f0ab23c:	4600218d */ 	trunc.w.s	$f6,$f4
 /*  f0ab240:	44043000 */ 	mfc1	$a0,$f6
-/*  f0ab244:	0fc54f54 */ 	jal	func0f153d50
+/*  f0ab244:	0fc54f54 */ 	jal	textSetWaveBlend
 /*  f0ab248:	00000000 */ 	nop
 /*  f0ab24c:	2404ffff */ 	addiu	$a0,$zero,-1
-/*  f0ab250:	0fc54f8e */ 	jal	func0f153e38
+/*  f0ab250:	0fc54f8e */ 	jal	textSetWaveColours
 /*  f0ab254:	2405ffff */ 	addiu	$a1,$zero,-1
 /*  f0ab258:	3c0f8008 */ 	lui	$t7,%hi(g_CharsHandelGothicXs)
 /*  f0ab25c:	8deffb08 */ 	lw	$t7,%lo(g_CharsHandelGothicXs)($t7)
@@ -30704,7 +30704,7 @@ glabel bgunRenderHud
 /*  f0ab298:	afb80018 */ 	sw	$t8,0x18($sp)
 /*  f0ab29c:	0fc5580f */ 	jal	textRenderProjected
 /*  f0ab2a0:	afb9001c */ 	sw	$t9,0x1c($sp)
-/*  f0ab2a4:	0fc54f93 */ 	jal	func0f153e4c
+/*  f0ab2a4:	0fc54f93 */ 	jal	textResetBlends
 /*  f0ab2a8:	afa20130 */ 	sw	$v0,0x130($sp)
 /*  f0ab2ac:	8faa0058 */ 	lw	$t2,0x58($sp)
 .L0f0ab2b0:
@@ -30740,7 +30740,7 @@ glabel bgunRenderHud
 .L0f0ab31c:
 /*  f0ab31c:	55c30008 */ 	bnel	$t6,$v1,.L0f0ab340
 /*  f0ab320:	8fb90110 */ 	lw	$t9,0x110($sp)
-/*  f0ab324:	0fc54de0 */ 	jal	func0f153780
+/*  f0ab324:	0fc54de0 */ 	jal	text0f153780
 /*  f0ab328:	8fa40130 */ 	lw	$a0,0x130($sp)
 /*  f0ab32c:	24180001 */ 	addiu	$t8,$zero,0x1
 /*  f0ab330:	3c018008 */ 	lui	$at,%hi(g_ScaleX)
@@ -31257,7 +31257,7 @@ glabel bgunRenderHud
 /*  f0abaa4:	afb80010 */ 	sw	$t8,0x10($sp)
 /*  f0abaa8:	afa20130 */ 	sw	$v0,0x130($sp)
 .L0f0abaac:
-/*  f0abaac:	0fc54de0 */ 	jal	func0f153780
+/*  f0abaac:	0fc54de0 */ 	jal	text0f153780
 /*  f0abab0:	8fa40130 */ 	lw	$a0,0x130($sp)
 /*  f0abab4:	240e0001 */ 	addiu	$t6,$zero,0x1
 /*  f0abab8:	3c018008 */ 	lui	$at,%hi(g_ScaleX)
@@ -31367,7 +31367,7 @@ glabel bgunRenderHud
 /*  f0a875c:	3c018008 */ 	lui	$at,0x8008
 /*  f0a8760:	ac222320 */ 	sw	$v0,0x2320($at)
 .NB0f0a8764:
-/*  f0a8764:	0fc5374a */ 	jal	func0f153628
+/*  f0a8764:	0fc5374a */ 	jal	text0f153628
 /*  f0a8768:	8fa40120 */ 	lw	$a0,0x120($sp)
 /*  f0a876c:	8fb90060 */ 	lw	$t9,0x60($sp)
 /*  f0a8770:	afa20120 */ 	sw	$v0,0x120($sp)
@@ -31547,7 +31547,7 @@ glabel bgunRenderHud
 .NB0f0a89e0:
 /*  f0a89e0:	8fa40120 */ 	lw	$a0,0x120($sp)
 /*  f0a89e4:	8fa500e4 */ 	lw	$a1,0xe4($sp)
-/*  f0a89e8:	0fc537b7 */ 	jal	gfxSetPrimColour
+/*  f0a89e8:	0fc537b7 */ 	jal	textSetPrimColour
 /*  f0a89ec:	afaa0058 */ 	sw	$t2,0x58($sp)
 /*  f0a89f0:	3c068008 */ 	lui	$a2,0x8008
 /*  f0a89f4:	8fae00f0 */ 	lw	$t6,0xf0($sp)
@@ -31579,7 +31579,7 @@ glabel bgunRenderHud
 /*  f0a8a5c:	00197080 */ 	sll	$t6,$t9,0x2
 /*  f0a8a60:	01eec025 */ 	or	$t8,$t7,$t6
 /*  f0a8a64:	ac580004 */ 	sw	$t8,0x4($v0)
-/*  f0a8a68:	0fc537ce */ 	jal	func0f153838
+/*  f0a8a68:	0fc537ce */ 	jal	text0f153838
 /*  f0a8a6c:	afa30060 */ 	sw	$v1,0x60($sp)
 /*  f0a8a70:	3c19800a */ 	lui	$t9,0x800a
 /*  f0a8a74:	8f39e948 */ 	lw	$t9,-0x16b8($t9)
@@ -31691,7 +31691,7 @@ glabel bgunRenderHud
 /*  f0a8c04:	afb900d0 */ 	sw	$t9,0xd0($sp)
 .NB0f0a8c08:
 /*  f0a8c08:	8fa40120 */ 	lw	$a0,0x120($sp)
-/*  f0a8c0c:	0fc537b7 */ 	jal	gfxSetPrimColour
+/*  f0a8c0c:	0fc537b7 */ 	jal	textSetPrimColour
 /*  f0a8c10:	afaa0058 */ 	sw	$t2,0x58($sp)
 /*  f0a8c14:	3c038008 */ 	lui	$v1,0x8008
 /*  f0a8c18:	8fae00f0 */ 	lw	$t6,0xf0($sp)
@@ -31720,7 +31720,7 @@ glabel bgunRenderHud
 /*  f0a8c74:	31d803ff */ 	andi	$t8,$t6,0x3ff
 /*  f0a8c78:	0018c880 */ 	sll	$t9,$t8,0x2
 /*  f0a8c7c:	01f97025 */ 	or	$t6,$t7,$t9
-/*  f0a8c80:	0fc537ce */ 	jal	func0f153838
+/*  f0a8c80:	0fc537ce */ 	jal	text0f153838
 /*  f0a8c84:	ac4e0004 */ 	sw	$t6,0x4($v0)
 /*  f0a8c88:	3c018006 */ 	lui	$at,0x8006
 /*  f0a8c8c:	c4243b40 */ 	lwc1	$f4,0x3b40($at)
@@ -31732,10 +31732,10 @@ glabel bgunRenderHud
 /*  f0a8ca4:	24060032 */ 	addiu	$a2,$zero,0x32
 /*  f0a8ca8:	4600428d */ 	trunc.w.s	$f10,$f8
 /*  f0a8cac:	44045000 */ 	mfc1	$a0,$f10
-/*  f0a8cb0:	0fc538eb */ 	jal	func0f153d50
+/*  f0a8cb0:	0fc538eb */ 	jal	textSetWaveBlend
 /*  f0a8cb4:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f0a8cb8:	2404ffff */ 	addiu	$a0,$zero,-1
-/*  f0a8cbc:	0fc53925 */ 	jal	func0f153e38
+/*  f0a8cbc:	0fc53925 */ 	jal	textSetWaveColours
 /*  f0a8cc0:	2405ffff */ 	addiu	$a1,$zero,-1
 /*  f0a8cc4:	3c0f8008 */ 	lui	$t7,0x8008
 /*  f0a8cc8:	8def2368 */ 	lw	$t7,0x2368($t7)
@@ -31756,7 +31756,7 @@ glabel bgunRenderHud
 /*  f0a8d04:	afae0018 */ 	sw	$t6,0x18($sp)
 /*  f0a8d08:	0fc541a6 */ 	jal	textRenderProjected
 /*  f0a8d0c:	afb8001c */ 	sw	$t8,0x1c($sp)
-/*  f0a8d10:	0fc5392a */ 	jal	func0f153e4c
+/*  f0a8d10:	0fc5392a */ 	jal	textResetBlends
 /*  f0a8d14:	afa20120 */ 	sw	$v0,0x120($sp)
 /*  f0a8d18:	8faa0058 */ 	lw	$t2,0x58($sp)
 /*  f0a8d1c:	8fa200bc */ 	lw	$v0,0xbc($sp)
@@ -31888,7 +31888,7 @@ glabel bgunRenderHud
 /*  f0a8ef0:	afb800d0 */ 	sw	$t8,0xd0($sp)
 .NB0f0a8ef4:
 /*  f0a8ef4:	8fa40120 */ 	lw	$a0,0x120($sp)
-/*  f0a8ef8:	0fc537b7 */ 	jal	gfxSetPrimColour
+/*  f0a8ef8:	0fc537b7 */ 	jal	textSetPrimColour
 /*  f0a8efc:	afaa0058 */ 	sw	$t2,0x58($sp)
 /*  f0a8f00:	3c038008 */ 	lui	$v1,0x8008
 /*  f0a8f04:	24632320 */ 	addiu	$v1,$v1,0x2320
@@ -31919,7 +31919,7 @@ glabel bgunRenderHud
 /*  f0a8f68:	330f03ff */ 	andi	$t7,$t8,0x3ff
 /*  f0a8f6c:	000f7080 */ 	sll	$t6,$t7,0x2
 /*  f0a8f70:	032ec025 */ 	or	$t8,$t9,$t6
-/*  f0a8f74:	0fc537ce */ 	jal	func0f153838
+/*  f0a8f74:	0fc537ce */ 	jal	text0f153838
 /*  f0a8f78:	ac580004 */ 	sw	$t8,0x4($v0)
 /*  f0a8f7c:	3c018006 */ 	lui	$at,0x8006
 /*  f0a8f80:	c4303b40 */ 	lwc1	$f16,0x3b40($at)
@@ -31931,10 +31931,10 @@ glabel bgunRenderHud
 /*  f0a8f98:	24060032 */ 	addiu	$a2,$zero,0x32
 /*  f0a8f9c:	4600218d */ 	trunc.w.s	$f6,$f4
 /*  f0a8fa0:	44043000 */ 	mfc1	$a0,$f6
-/*  f0a8fa4:	0fc538eb */ 	jal	func0f153d50
+/*  f0a8fa4:	0fc538eb */ 	jal	textSetWaveBlend
 /*  f0a8fa8:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f0a8fac:	2404ffff */ 	addiu	$a0,$zero,-1
-/*  f0a8fb0:	0fc53925 */ 	jal	func0f153e38
+/*  f0a8fb0:	0fc53925 */ 	jal	textSetWaveColours
 /*  f0a8fb4:	2405ffff */ 	addiu	$a1,$zero,-1
 /*  f0a8fb8:	3c198008 */ 	lui	$t9,0x8008
 /*  f0a8fbc:	8f392368 */ 	lw	$t9,0x2368($t9)
@@ -31955,7 +31955,7 @@ glabel bgunRenderHud
 /*  f0a8ff8:	afb80018 */ 	sw	$t8,0x18($sp)
 /*  f0a8ffc:	0fc541a6 */ 	jal	textRenderProjected
 /*  f0a9000:	afaf001c */ 	sw	$t7,0x1c($sp)
-/*  f0a9004:	0fc5392a */ 	jal	func0f153e4c
+/*  f0a9004:	0fc5392a */ 	jal	textResetBlends
 /*  f0a9008:	afa20120 */ 	sw	$v0,0x120($sp)
 /*  f0a900c:	8faa0058 */ 	lw	$t2,0x58($sp)
 .NB0f0a9010:
@@ -31991,7 +31991,7 @@ glabel bgunRenderHud
 .NB0f0a907c:
 /*  f0a907c:	55c30008 */ 	bnel	$t6,$v1,.NB0f0a90a0
 /*  f0a9080:	8faf0100 */ 	lw	$t7,0x100($sp)
-/*  f0a9084:	0fc537a0 */ 	jal	func0f153780
+/*  f0a9084:	0fc537a0 */ 	jal	text0f153780
 /*  f0a9088:	8fa40120 */ 	lw	$a0,0x120($sp)
 /*  f0a908c:	24180001 */ 	addiu	$t8,$zero,0x1
 /*  f0a9090:	3c018008 */ 	lui	$at,0x8008
@@ -32508,7 +32508,7 @@ glabel bgunRenderHud
 /*  f0a9804:	afb80010 */ 	sw	$t8,0x10($sp)
 /*  f0a9808:	afa20120 */ 	sw	$v0,0x120($sp)
 .NB0f0a980c:
-/*  f0a980c:	0fc537a0 */ 	jal	func0f153780
+/*  f0a980c:	0fc537a0 */ 	jal	text0f153780
 /*  f0a9810:	8fa40120 */ 	lw	$a0,0x120($sp)
 /*  f0a9814:	240e0001 */ 	addiu	$t6,$zero,0x1
 /*  f0a9818:	3c018008 */ 	lui	$at,0x8008
@@ -32604,7 +32604,7 @@ const char var7f1ac19c[] = "%02d:%02d\n";
 //	}
 //#endif
 //
-//	gdl = func0f153628(gdl);
+//	gdl = text0f153628(gdl);
 //
 //	// 9d8
 //	if (playercount >= 2) {
@@ -32678,11 +32678,11 @@ const char var7f1ac19c[] = "%02d:%02d\n";
 //		fncolour = ((ctrl->fnfader * 2) - 256) << 16 | 0xff000040;
 //	}
 //
-//	gdl = gfxSetPrimColour(gdl, fncolour);
+//	gdl = textSetPrimColour(gdl, fncolour);
 //
 //	gDPFillRectangleScaled(gdl++, xpos - 13, bottom - 11, xpos - 2, bottom);
 //
-//	gdl = func0f153838(gdl);
+//	gdl = text0f153838(gdl);
 //
 //	// d20
 //	// Render weapon name and function name
@@ -32735,15 +32735,15 @@ const char var7f1ac19c[] = "%02d:%02d\n";
 //				colour = (colour & 0xfffffff00) | alpha;
 //			}
 //
-//			gdl = gfxSetPrimColour(gdl, 0);
+//			gdl = textSetPrimColour(gdl, 0);
 //
 //			gDPFillRectangleScaled(gdl++, x - 1, y - 1, xpos - 11, bottom);
 //
-//			gdl = func0f153838(gdl);
-//			func0f153d50(var80061630 * 50.0f, 0, 50);
-//			func0f153e38(0xffffffff, 0xffffffff);
+//			gdl = text0f153838(gdl);
+//			textSetWaveBlend(var80061630 * 50.0f, 0, 50);
+//			textSetWaveColours(0xffffffff, 0xffffffff);
 //			gdl = textRenderProjected(gdl, &x, &y, str, g_CharsHandelGothicXs, g_FontHandelGothicXs, colour, textwidth, 1000, 0, 0);
-//			func0f153e4c();
+//			textResetBlends();
 //		}
 //
 //		// fbc
@@ -32803,20 +32803,20 @@ const char var7f1ac19c[] = "%02d:%02d\n";
 //					colour = (colour & 0xffffff00) | alpha;
 //				}
 //
-//				gdl = gfxSetPrimColour(gdl, 0);
+//				gdl = textSetPrimColour(gdl, 0);
 //
 //				gDPFillRectangleScaled(gdl++, x - 1, y - 1, xpos - 11, bottom + 3);
 //
-//				gdl = func0f153838(gdl);
+//				gdl = text0f153838(gdl);
 //
-//				func0f153d50(var80061630 * 50.0f, 0, 50);
-//				func0f153e38(0xffffffff, 0xffffffff);
+//				textSetWaveBlend(var80061630 * 50.0f, 0, 50);
+//				textSetWaveColours(0xffffffff, 0xffffffff);
 //
 //				gdl = textRenderProjected(gdl, &x, &y, str,
 //						g_CharsHandelGothicXs, g_FontHandelGothicXs, colour, textwidth,
 //						1000, 0, 0);
 //
-//				func0f153e4c();
+//				textResetBlends();
 //			}
 //		}
 //	}
@@ -32832,7 +32832,7 @@ const char var7f1ac19c[] = "%02d:%02d\n";
 //		}
 //
 //		if (ammoindex == -1) {
-//			gdl = func0f153780(gdl);
+//			gdl = text0f153780(gdl);
 //			g_ScaleX = 1;
 //			return gdl;
 //		}
@@ -32950,7 +32950,7 @@ const char var7f1ac19c[] = "%02d:%02d\n";
 //	}
 //
 //	// aac
-//	gdl = func0f153780(gdl);
+//	gdl = text0f153780(gdl);
 //	g_ScaleX = 1;
 //
 //	return gdl;
@@ -1223,7 +1223,7 @@ glabel var7f1b6c2cjf
 /*  f143e90:	14600006 */ 	bnez	$v1,.JF0f143eac
 /*  f143e94:	3c0500ff */ 	lui	$a1,0xff
 /*  f143e98:	34a50028 */ 	ori	$a1,$a1,0x28
-/*  f143e9c:	0fc54bce */ 	jal	gfxSetPrimColour
+/*  f143e9c:	0fc54bce */ 	jal	textSetPrimColour
 /*  f143ea0:	02a02025 */ 	move	$a0,$s5
 /*  f143ea4:	1000000e */ 	b	.JF0f143ee0
 /*  f143ea8:	0040a825 */ 	move	$s5,$v0
@@ -1233,13 +1233,13 @@ glabel var7f1b6c2cjf
 /*  f143eb4:	02a02025 */ 	move	$a0,$s5
 /*  f143eb8:	3c052244 */ 	lui	$a1,0x2244
 /*  f143ebc:	34a5ffa0 */ 	ori	$a1,$a1,0xffa0
-/*  f143ec0:	0fc54bce */ 	jal	gfxSetPrimColour
+/*  f143ec0:	0fc54bce */ 	jal	textSetPrimColour
 /*  f143ec4:	02a02025 */ 	move	$a0,$s5
 /*  f143ec8:	10000005 */ 	b	.JF0f143ee0
 /*  f143ecc:	0040a825 */ 	move	$s5,$v0
 .JF0f143ed0:
 /*  f143ed0:	3c05ff33 */ 	lui	$a1,0xff33
-/*  f143ed4:	0fc54bce */ 	jal	gfxSetPrimColour
+/*  f143ed4:	0fc54bce */ 	jal	textSetPrimColour
 /*  f143ed8:	34a500a0 */ 	ori	$a1,$a1,0xa0
 /*  f143edc:	0040a825 */ 	move	$s5,$v0
 .JF0f143ee0:
@@ -1856,7 +1856,7 @@ glabel var7f1b6c2cjf
 /*  f14480c:	02a02025 */ 	move	$a0,$s5
 /*  f144810:	27a502f4 */ 	addiu	$a1,$sp,0x2f4
 /*  f144814:	27a602f0 */ 	addiu	$a2,$sp,0x2f0
-/*  f144818:	0fc54bed */ 	jal	func0f153858
+/*  f144818:	0fc54bed */ 	jal	text0f153858
 /*  f14481c:	27a702e4 */ 	addiu	$a3,$sp,0x2e4
 /*  f144820:	0c002eeb */ 	jal	viGetWidth
 /*  f144824:	0040a825 */ 	move	$s5,$v0
@@ -1925,7 +1925,7 @@ glabel var7f1b6c2cjf
 /*  f144920:	27a602f0 */ 	addiu	$a2,$sp,0x2f0
 /*  f144924:	27a702e4 */ 	addiu	$a3,$sp,0x2e4
 /*  f144928:	afb102f0 */ 	sw	$s1,0x2f0($sp)
-/*  f14492c:	0fc54bed */ 	jal	func0f153858
+/*  f14492c:	0fc54bed */ 	jal	text0f153858
 /*  f144930:	afa302f4 */ 	sw	$v1,0x2f4($sp)
 /*  f144934:	0c002eeb */ 	jal	viGetWidth
 /*  f144938:	0040a825 */ 	move	$s5,$v0
@@ -1990,7 +1990,7 @@ glabel var7f1b6c2cjf
 /*  f144a24:	27a602f0 */ 	addiu	$a2,$sp,0x2f0
 /*  f144a28:	27a702e4 */ 	addiu	$a3,$sp,0x2e4
 /*  f144a2c:	afb102f0 */ 	sw	$s1,0x2f0($sp)
-/*  f144a30:	0fc54bed */ 	jal	func0f153858
+/*  f144a30:	0fc54bed */ 	jal	text0f153858
 /*  f144a34:	afa302f4 */ 	sw	$v1,0x2f4($sp)
 /*  f144a38:	0c002eeb */ 	jal	viGetWidth
 /*  f144a3c:	0040a825 */ 	move	$s5,$v0
@@ -2055,7 +2055,7 @@ glabel var7f1b6c2cjf
 /*  f144b28:	27a602f0 */ 	addiu	$a2,$sp,0x2f0
 /*  f144b2c:	27a702e4 */ 	addiu	$a3,$sp,0x2e4
 /*  f144b30:	afb102f0 */ 	sw	$s1,0x2f0($sp)
-/*  f144b34:	0fc54bed */ 	jal	func0f153858
+/*  f144b34:	0fc54bed */ 	jal	text0f153858
 /*  f144b38:	afa302f4 */ 	sw	$v1,0x2f4($sp)
 /*  f144b3c:	0c002eeb */ 	jal	viGetWidth
 /*  f144b40:	0040a825 */ 	move	$s5,$v0
@@ -2133,7 +2133,7 @@ glabel var7f1b6c2cjf
 /*  f144c50:	27a502f4 */ 	addiu	$a1,$sp,0x2f4
 /*  f144c54:	27a602f0 */ 	addiu	$a2,$sp,0x2f0
 /*  f144c58:	27a702e4 */ 	addiu	$a3,$sp,0x2e4
-/*  f144c5c:	0fc54bed */ 	jal	func0f153858
+/*  f144c5c:	0fc54bed */ 	jal	text0f153858
 /*  f144c60:	afa302f4 */ 	sw	$v1,0x2f4($sp)
 /*  f144c64:	0c002eeb */ 	jal	viGetWidth
 /*  f144c68:	0040a825 */ 	move	$s5,$v0
@@ -2241,7 +2241,7 @@ glabel var7f1b6c2cjf
 /*  f144de4:	27a502f4 */ 	addiu	$a1,$sp,0x2f4
 /*  f144de8:	27a602f0 */ 	addiu	$a2,$sp,0x2f0
 /*  f144dec:	27a702e4 */ 	addiu	$a3,$sp,0x2e4
-/*  f144df0:	0fc54bed */ 	jal	func0f153858
+/*  f144df0:	0fc54bed */ 	jal	text0f153858
 /*  f144df4:	afa302f4 */ 	sw	$v1,0x2f4($sp)
 /*  f144df8:	0c002eeb */ 	jal	viGetWidth
 /*  f144dfc:	0040a825 */ 	move	$s5,$v0
@@ -2317,7 +2317,7 @@ glabel var7f1b6c2cjf
 /*  f144f0c:	27a502f4 */ 	addiu	$a1,$sp,0x2f4
 /*  f144f10:	27a602f0 */ 	addiu	$a2,$sp,0x2f0
 /*  f144f14:	27a702e4 */ 	addiu	$a3,$sp,0x2e4
-/*  f144f18:	0fc54bed */ 	jal	func0f153858
+/*  f144f18:	0fc54bed */ 	jal	text0f153858
 /*  f144f1c:	afa302f4 */ 	sw	$v1,0x2f4($sp)
 /*  f144f20:	0c002eeb */ 	jal	viGetWidth
 /*  f144f24:	0040a825 */ 	move	$s5,$v0
@@ -2393,7 +2393,7 @@ glabel var7f1b6c2cjf
 /*  f145030:	27a502f4 */ 	addiu	$a1,$sp,0x2f4
 /*  f145034:	27a602f0 */ 	addiu	$a2,$sp,0x2f0
 /*  f145038:	27a702e4 */ 	addiu	$a3,$sp,0x2e4
-/*  f14503c:	0fc54bed */ 	jal	func0f153858
+/*  f14503c:	0fc54bed */ 	jal	text0f153858
 /*  f145040:	afa302f4 */ 	sw	$v1,0x2f4($sp)
 /*  f145044:	0c002eeb */ 	jal	viGetWidth
 /*  f145048:	0040a825 */ 	move	$s5,$v0
@@ -2466,7 +2466,7 @@ glabel var7f1b6c2cjf
 /*  f145148:	27a502f4 */ 	addiu	$a1,$sp,0x2f4
 /*  f14514c:	27a602f0 */ 	addiu	$a2,$sp,0x2f0
 /*  f145150:	27a702e4 */ 	addiu	$a3,$sp,0x2e4
-/*  f145154:	0fc54bed */ 	jal	func0f153858
+/*  f145154:	0fc54bed */ 	jal	text0f153858
 /*  f145158:	afa302f4 */ 	sw	$v1,0x2f4($sp)
 /*  f14515c:	0c002eeb */ 	jal	viGetWidth
 /*  f145160:	0040a825 */ 	move	$s5,$v0
@@ -2575,7 +2575,7 @@ glabel var7f1b6c2cjf
 /*  f1452dc:	afb802e4 */ 	sw	$t8,0x2e4($sp)
 /*  f1452e0:	27a602f0 */ 	addiu	$a2,$sp,0x2f0
 /*  f1452e4:	27a702e4 */ 	addiu	$a3,$sp,0x2e4
-/*  f1452e8:	0fc54bed */ 	jal	func0f153858
+/*  f1452e8:	0fc54bed */ 	jal	text0f153858
 /*  f1452ec:	afa302f4 */ 	sw	$v1,0x2f4($sp)
 /*  f1452f0:	0c002eeb */ 	jal	viGetWidth
 /*  f1452f4:	0040a825 */ 	move	$s5,$v0
@@ -2665,7 +2665,7 @@ glabel var7f1b6c2cjf
 /*  f145430:	27a502f4 */ 	addiu	$a1,$sp,0x2f4
 /*  f145434:	27a602f0 */ 	addiu	$a2,$sp,0x2f0
 /*  f145438:	27a702e4 */ 	addiu	$a3,$sp,0x2e4
-/*  f14543c:	0fc54bed */ 	jal	func0f153858
+/*  f14543c:	0fc54bed */ 	jal	text0f153858
 /*  f145440:	afa302f4 */ 	sw	$v1,0x2f4($sp)
 /*  f145444:	0c002eeb */ 	jal	viGetWidth
 /*  f145448:	0040a825 */ 	move	$s5,$v0
@@ -2692,7 +2692,7 @@ glabel var7f1b6c2cjf
 /*  f14549c:	afb90018 */ 	sw	$t9,0x18($sp)
 /*  f1454a0:	0fc55d34 */ 	jal	func0f1574d0jf
 /*  f1454a4:	afaf001c */ 	sw	$t7,0x1c($sp)
-/*  f1454a8:	0fc54be5 */ 	jal	func0f153838
+/*  f1454a8:	0fc54be5 */ 	jal	text0f153838
 /*  f1454ac:	00402025 */ 	move	$a0,$v0
 /*  f1454b0:	8ed80288 */ 	lw	$t8,0x288($s6)
 /*  f1454b4:	0040a825 */ 	move	$s5,$v0
@@ -5248,7 +5248,7 @@ glabel var7f1b5f58
 /*  f14485c:	14600006 */ 	bnez	$v1,.PF0f144878
 /*  f144860:	3c0500ff */ 	lui	$a1,0xff
 /*  f144864:	34a50028 */ 	ori	$a1,$a1,0x28
-/*  f144868:	0fc5513c */ 	jal	gfxSetPrimColour
+/*  f144868:	0fc5513c */ 	jal	textSetPrimColour
 /*  f14486c:	02802025 */ 	move	$a0,$s4
 /*  f144870:	1000000e */ 	b	.PF0f1448ac
 /*  f144874:	0040a025 */ 	move	$s4,$v0
@@ -5258,13 +5258,13 @@ glabel var7f1b5f58
 /*  f144880:	02802025 */ 	move	$a0,$s4
 /*  f144884:	3c052244 */ 	lui	$a1,0x2244
 /*  f144888:	34a5ffa0 */ 	ori	$a1,$a1,0xffa0
-/*  f14488c:	0fc5513c */ 	jal	gfxSetPrimColour
+/*  f14488c:	0fc5513c */ 	jal	textSetPrimColour
 /*  f144890:	02802025 */ 	move	$a0,$s4
 /*  f144894:	10000005 */ 	b	.PF0f1448ac
 /*  f144898:	0040a025 */ 	move	$s4,$v0
 .PF0f14489c:
 /*  f14489c:	3c05ff33 */ 	lui	$a1,0xff33
-/*  f1448a0:	0fc5513c */ 	jal	gfxSetPrimColour
+/*  f1448a0:	0fc5513c */ 	jal	textSetPrimColour
 /*  f1448a4:	34a500a0 */ 	ori	$a1,$a1,0xa0
 /*  f1448a8:	0040a025 */ 	move	$s4,$v0
 .PF0f1448ac:
@@ -5872,7 +5872,7 @@ glabel var7f1b5f58
 /*  f1451b4:	27a502f4 */ 	addiu	$a1,$sp,0x2f4
 /*  f1451b8:	27a602f0 */ 	addiu	$a2,$sp,0x2f0
 /*  f1451bc:	27a702e4 */ 	addiu	$a3,$sp,0x2e4
-/*  f1451c0:	0fc5515b */ 	jal	func0f153858
+/*  f1451c0:	0fc5515b */ 	jal	text0f153858
 /*  f1451c4:	afb502f4 */ 	sw	$s5,0x2f4($sp)
 /*  f1451c8:	0c002e53 */ 	jal	viGetWidth
 /*  f1451cc:	0040a025 */ 	move	$s4,$v0
@@ -5941,7 +5941,7 @@ glabel var7f1b5f58
 /*  f1452c8:	27a602f0 */ 	addiu	$a2,$sp,0x2f0
 /*  f1452cc:	27a702e4 */ 	addiu	$a3,$sp,0x2e4
 /*  f1452d0:	afb502f4 */ 	sw	$s5,0x2f4($sp)
-/*  f1452d4:	0fc5515b */ 	jal	func0f153858
+/*  f1452d4:	0fc5515b */ 	jal	text0f153858
 /*  f1452d8:	afb102f0 */ 	sw	$s1,0x2f0($sp)
 /*  f1452dc:	0c002e53 */ 	jal	viGetWidth
 /*  f1452e0:	0040a025 */ 	move	$s4,$v0
@@ -6006,7 +6006,7 @@ glabel var7f1b5f58
 /*  f1453cc:	27a602f0 */ 	addiu	$a2,$sp,0x2f0
 /*  f1453d0:	27a702e4 */ 	addiu	$a3,$sp,0x2e4
 /*  f1453d4:	afb502f4 */ 	sw	$s5,0x2f4($sp)
-/*  f1453d8:	0fc5515b */ 	jal	func0f153858
+/*  f1453d8:	0fc5515b */ 	jal	text0f153858
 /*  f1453dc:	afb102f0 */ 	sw	$s1,0x2f0($sp)
 /*  f1453e0:	0c002e53 */ 	jal	viGetWidth
 /*  f1453e4:	0040a025 */ 	move	$s4,$v0
@@ -6071,7 +6071,7 @@ glabel var7f1b5f58
 /*  f1454d0:	27a602f0 */ 	addiu	$a2,$sp,0x2f0
 /*  f1454d4:	27a702e4 */ 	addiu	$a3,$sp,0x2e4
 /*  f1454d8:	afb502f4 */ 	sw	$s5,0x2f4($sp)
-/*  f1454dc:	0fc5515b */ 	jal	func0f153858
+/*  f1454dc:	0fc5515b */ 	jal	text0f153858
 /*  f1454e0:	afb102f0 */ 	sw	$s1,0x2f0($sp)
 /*  f1454e4:	0c002e53 */ 	jal	viGetWidth
 /*  f1454e8:	0040a025 */ 	move	$s4,$v0
@@ -6148,7 +6148,7 @@ glabel var7f1b5f58
 /*  f1455f4:	27a502f4 */ 	addiu	$a1,$sp,0x2f4
 /*  f1455f8:	27a602f0 */ 	addiu	$a2,$sp,0x2f0
 /*  f1455fc:	27a702e4 */ 	addiu	$a3,$sp,0x2e4
-/*  f145600:	0fc5515b */ 	jal	func0f153858
+/*  f145600:	0fc5515b */ 	jal	text0f153858
 /*  f145604:	afa302f4 */ 	sw	$v1,0x2f4($sp)
 /*  f145608:	0c002e53 */ 	jal	viGetWidth
 /*  f14560c:	0040a025 */ 	move	$s4,$v0
@@ -6254,7 +6254,7 @@ glabel var7f1b5f58
 /*  f145780:	27a502f4 */ 	addiu	$a1,$sp,0x2f4
 /*  f145784:	27a602f0 */ 	addiu	$a2,$sp,0x2f0
 /*  f145788:	27a702e4 */ 	addiu	$a3,$sp,0x2e4
-/*  f14578c:	0fc5515b */ 	jal	func0f153858
+/*  f14578c:	0fc5515b */ 	jal	text0f153858
 /*  f145790:	afa302f4 */ 	sw	$v1,0x2f4($sp)
 /*  f145794:	0c002e53 */ 	jal	viGetWidth
 /*  f145798:	0040a025 */ 	move	$s4,$v0
@@ -6330,7 +6330,7 @@ glabel var7f1b5f58
 /*  f1458a8:	27a502f4 */ 	addiu	$a1,$sp,0x2f4
 /*  f1458ac:	27a602f0 */ 	addiu	$a2,$sp,0x2f0
 /*  f1458b0:	27a702e4 */ 	addiu	$a3,$sp,0x2e4
-/*  f1458b4:	0fc5515b */ 	jal	func0f153858
+/*  f1458b4:	0fc5515b */ 	jal	text0f153858
 /*  f1458b8:	afa302f4 */ 	sw	$v1,0x2f4($sp)
 /*  f1458bc:	0c002e53 */ 	jal	viGetWidth
 /*  f1458c0:	0040a025 */ 	move	$s4,$v0
@@ -6406,7 +6406,7 @@ glabel var7f1b5f58
 /*  f1459cc:	27a502f4 */ 	addiu	$a1,$sp,0x2f4
 /*  f1459d0:	27a602f0 */ 	addiu	$a2,$sp,0x2f0
 /*  f1459d4:	27a702e4 */ 	addiu	$a3,$sp,0x2e4
-/*  f1459d8:	0fc5515b */ 	jal	func0f153858
+/*  f1459d8:	0fc5515b */ 	jal	text0f153858
 /*  f1459dc:	afa302f4 */ 	sw	$v1,0x2f4($sp)
 /*  f1459e0:	0c002e53 */ 	jal	viGetWidth
 /*  f1459e4:	0040a025 */ 	move	$s4,$v0
@@ -6479,7 +6479,7 @@ glabel var7f1b5f58
 /*  f145ae4:	27a502f4 */ 	addiu	$a1,$sp,0x2f4
 /*  f145ae8:	27a602f0 */ 	addiu	$a2,$sp,0x2f0
 /*  f145aec:	27a702e4 */ 	addiu	$a3,$sp,0x2e4
-/*  f145af0:	0fc5515b */ 	jal	func0f153858
+/*  f145af0:	0fc5515b */ 	jal	text0f153858
 /*  f145af4:	afa302f4 */ 	sw	$v1,0x2f4($sp)
 /*  f145af8:	0c002e53 */ 	jal	viGetWidth
 /*  f145afc:	0040a025 */ 	move	$s4,$v0
@@ -6588,7 +6588,7 @@ glabel var7f1b5f58
 /*  f145c78:	afb902e4 */ 	sw	$t9,0x2e4($sp)
 /*  f145c7c:	27a602f0 */ 	addiu	$a2,$sp,0x2f0
 /*  f145c80:	27a702e4 */ 	addiu	$a3,$sp,0x2e4
-/*  f145c84:	0fc5515b */ 	jal	func0f153858
+/*  f145c84:	0fc5515b */ 	jal	text0f153858
 /*  f145c88:	afa302f4 */ 	sw	$v1,0x2f4($sp)
 /*  f145c8c:	0c002e53 */ 	jal	viGetWidth
 /*  f145c90:	0040a025 */ 	move	$s4,$v0
@@ -6678,7 +6678,7 @@ glabel var7f1b5f58
 /*  f145dcc:	27a502f4 */ 	addiu	$a1,$sp,0x2f4
 /*  f145dd0:	27a602f0 */ 	addiu	$a2,$sp,0x2f0
 /*  f145dd4:	27a702e4 */ 	addiu	$a3,$sp,0x2e4
-/*  f145dd8:	0fc5515b */ 	jal	func0f153858
+/*  f145dd8:	0fc5515b */ 	jal	text0f153858
 /*  f145ddc:	afa302f4 */ 	sw	$v1,0x2f4($sp)
 /*  f145de0:	0c002e53 */ 	jal	viGetWidth
 /*  f145de4:	0040a025 */ 	move	$s4,$v0
@@ -6705,7 +6705,7 @@ glabel var7f1b5f58
 /*  f145e38:	afaf0018 */ 	sw	$t7,0x18($sp)
 /*  f145e3c:	0fc55fa0 */ 	jal	textRender
 /*  f145e40:	afb8001c */ 	sw	$t8,0x1c($sp)
-/*  f145e44:	0fc55153 */ 	jal	func0f153838
+/*  f145e44:	0fc55153 */ 	jal	text0f153838
 /*  f145e48:	00402025 */ 	move	$a0,$v0
 /*  f145e4c:	8ed90288 */ 	lw	$t9,0x288($s6)
 /*  f145e50:	0040a025 */ 	move	$s4,$v0
@@ -9201,7 +9201,7 @@ glabel var7f1b5f58
 /*  f145124:	14600006 */ 	bnez	$v1,.PB0f145140
 /*  f145128:	3c0500ff */ 	lui	$a1,0xff
 /*  f14512c:	34a50028 */ 	ori	$a1,$a1,0x28
-/*  f145130:	0fc552fc */ 	jal	gfxSetPrimColour
+/*  f145130:	0fc552fc */ 	jal	textSetPrimColour
 /*  f145134:	02a02025 */ 	move	$a0,$s5
 /*  f145138:	1000000e */ 	b	.PB0f145174
 /*  f14513c:	0040a825 */ 	move	$s5,$v0
@@ -9211,13 +9211,13 @@ glabel var7f1b5f58
 /*  f145148:	02a02025 */ 	move	$a0,$s5
 /*  f14514c:	3c052244 */ 	lui	$a1,0x2244
 /*  f145150:	34a5ffa0 */ 	ori	$a1,$a1,0xffa0
-/*  f145154:	0fc552fc */ 	jal	gfxSetPrimColour
+/*  f145154:	0fc552fc */ 	jal	textSetPrimColour
 /*  f145158:	02a02025 */ 	move	$a0,$s5
 /*  f14515c:	10000005 */ 	b	.PB0f145174
 /*  f145160:	0040a825 */ 	move	$s5,$v0
 .PB0f145164:
 /*  f145164:	3c05ff33 */ 	lui	$a1,0xff33
-/*  f145168:	0fc552fc */ 	jal	gfxSetPrimColour
+/*  f145168:	0fc552fc */ 	jal	textSetPrimColour
 /*  f14516c:	34a500a0 */ 	ori	$a1,$a1,0xa0
 /*  f145170:	0040a825 */ 	move	$s5,$v0
 .PB0f145174:
@@ -9825,7 +9825,7 @@ glabel var7f1b5f58
 /*  f145a7c:	27a502ec */ 	addiu	$a1,$sp,0x2ec
 /*  f145a80:	27a602e8 */ 	addiu	$a2,$sp,0x2e8
 /*  f145a84:	27a702dc */ 	addiu	$a3,$sp,0x2dc
-/*  f145a88:	0fc5531b */ 	jal	func0f153858
+/*  f145a88:	0fc5531b */ 	jal	text0f153858
 /*  f145a8c:	afb402ec */ 	sw	$s4,0x2ec($sp)
 /*  f145a90:	0c002e4d */ 	jal	viGetWidth
 /*  f145a94:	0040a825 */ 	move	$s5,$v0
@@ -9894,7 +9894,7 @@ glabel var7f1b5f58
 /*  f145b90:	27a602e8 */ 	addiu	$a2,$sp,0x2e8
 /*  f145b94:	27a702dc */ 	addiu	$a3,$sp,0x2dc
 /*  f145b98:	afb402ec */ 	sw	$s4,0x2ec($sp)
-/*  f145b9c:	0fc5531b */ 	jal	func0f153858
+/*  f145b9c:	0fc5531b */ 	jal	text0f153858
 /*  f145ba0:	afb102e8 */ 	sw	$s1,0x2e8($sp)
 /*  f145ba4:	0c002e4d */ 	jal	viGetWidth
 /*  f145ba8:	0040a825 */ 	move	$s5,$v0
@@ -9959,7 +9959,7 @@ glabel var7f1b5f58
 /*  f145c94:	27a602e8 */ 	addiu	$a2,$sp,0x2e8
 /*  f145c98:	27a702dc */ 	addiu	$a3,$sp,0x2dc
 /*  f145c9c:	afb402ec */ 	sw	$s4,0x2ec($sp)
-/*  f145ca0:	0fc5531b */ 	jal	func0f153858
+/*  f145ca0:	0fc5531b */ 	jal	text0f153858
 /*  f145ca4:	afb102e8 */ 	sw	$s1,0x2e8($sp)
 /*  f145ca8:	0c002e4d */ 	jal	viGetWidth
 /*  f145cac:	0040a825 */ 	move	$s5,$v0
@@ -10024,7 +10024,7 @@ glabel var7f1b5f58
 /*  f145d98:	27a602e8 */ 	addiu	$a2,$sp,0x2e8
 /*  f145d9c:	27a702dc */ 	addiu	$a3,$sp,0x2dc
 /*  f145da0:	afb402ec */ 	sw	$s4,0x2ec($sp)
-/*  f145da4:	0fc5531b */ 	jal	func0f153858
+/*  f145da4:	0fc5531b */ 	jal	text0f153858
 /*  f145da8:	afb102e8 */ 	sw	$s1,0x2e8($sp)
 /*  f145dac:	0c002e4d */ 	jal	viGetWidth
 /*  f145db0:	0040a825 */ 	move	$s5,$v0
@@ -10101,7 +10101,7 @@ glabel var7f1b5f58
 /*  f145ebc:	27a502ec */ 	addiu	$a1,$sp,0x2ec
 /*  f145ec0:	27a602e8 */ 	addiu	$a2,$sp,0x2e8
 /*  f145ec4:	27a702dc */ 	addiu	$a3,$sp,0x2dc
-/*  f145ec8:	0fc5531b */ 	jal	func0f153858
+/*  f145ec8:	0fc5531b */ 	jal	text0f153858
 /*  f145ecc:	afa302ec */ 	sw	$v1,0x2ec($sp)
 /*  f145ed0:	0c002e4d */ 	jal	viGetWidth
 /*  f145ed4:	0040a825 */ 	move	$s5,$v0
@@ -10207,7 +10207,7 @@ glabel var7f1b5f58
 /*  f146048:	27a502ec */ 	addiu	$a1,$sp,0x2ec
 /*  f14604c:	27a602e8 */ 	addiu	$a2,$sp,0x2e8
 /*  f146050:	27a702dc */ 	addiu	$a3,$sp,0x2dc
-/*  f146054:	0fc5531b */ 	jal	func0f153858
+/*  f146054:	0fc5531b */ 	jal	text0f153858
 /*  f146058:	afa302ec */ 	sw	$v1,0x2ec($sp)
 /*  f14605c:	0c002e4d */ 	jal	viGetWidth
 /*  f146060:	0040a825 */ 	move	$s5,$v0
@@ -10282,7 +10282,7 @@ glabel var7f1b5f58
 /*  f14616c:	27a502ec */ 	addiu	$a1,$sp,0x2ec
 /*  f146170:	27a602e8 */ 	addiu	$a2,$sp,0x2e8
 /*  f146174:	27a702dc */ 	addiu	$a3,$sp,0x2dc
-/*  f146178:	0fc5531b */ 	jal	func0f153858
+/*  f146178:	0fc5531b */ 	jal	text0f153858
 /*  f14617c:	afa302ec */ 	sw	$v1,0x2ec($sp)
 /*  f146180:	0c002e4d */ 	jal	viGetWidth
 /*  f146184:	0040a825 */ 	move	$s5,$v0
@@ -10357,7 +10357,7 @@ glabel var7f1b5f58
 /*  f14628c:	27a502ec */ 	addiu	$a1,$sp,0x2ec
 /*  f146290:	27a602e8 */ 	addiu	$a2,$sp,0x2e8
 /*  f146294:	27a702dc */ 	addiu	$a3,$sp,0x2dc
-/*  f146298:	0fc5531b */ 	jal	func0f153858
+/*  f146298:	0fc5531b */ 	jal	text0f153858
 /*  f14629c:	afa302ec */ 	sw	$v1,0x2ec($sp)
 /*  f1462a0:	0c002e4d */ 	jal	viGetWidth
 /*  f1462a4:	0040a825 */ 	move	$s5,$v0
@@ -10429,7 +10429,7 @@ glabel var7f1b5f58
 /*  f1463a0:	27a502ec */ 	addiu	$a1,$sp,0x2ec
 /*  f1463a4:	27a602e8 */ 	addiu	$a2,$sp,0x2e8
 /*  f1463a8:	27a702dc */ 	addiu	$a3,$sp,0x2dc
-/*  f1463ac:	0fc5531b */ 	jal	func0f153858
+/*  f1463ac:	0fc5531b */ 	jal	text0f153858
 /*  f1463b0:	afa302ec */ 	sw	$v1,0x2ec($sp)
 /*  f1463b4:	0c002e4d */ 	jal	viGetWidth
 /*  f1463b8:	0040a825 */ 	move	$s5,$v0
@@ -10536,7 +10536,7 @@ glabel var7f1b5f58
 /*  f14652c:	27a502ec */ 	addiu	$a1,$sp,0x2ec
 /*  f146530:	27a602e8 */ 	addiu	$a2,$sp,0x2e8
 /*  f146534:	27a702dc */ 	addiu	$a3,$sp,0x2dc
-/*  f146538:	0fc5531b */ 	jal	func0f153858
+/*  f146538:	0fc5531b */ 	jal	text0f153858
 /*  f14653c:	afa302ec */ 	sw	$v1,0x2ec($sp)
 /*  f146540:	0c002e4d */ 	jal	viGetWidth
 /*  f146544:	0040a825 */ 	move	$s5,$v0
@@ -10642,7 +10642,7 @@ glabel var7f1b5f58
 /*  f1466bc:	afae0010 */ 	sw	$t6,0x10($sp)
 /*  f1466c0:	afaf02dc */ 	sw	$t7,0x2dc($sp)
 /*  f1466c4:	afa802e8 */ 	sw	$t0,0x2e8($sp)
-/*  f1466c8:	0fc5531b */ 	jal	func0f153858
+/*  f1466c8:	0fc5531b */ 	jal	text0f153858
 /*  f1466cc:	afa302ec */ 	sw	$v1,0x2ec($sp)
 /*  f1466d0:	0c002e4d */ 	jal	viGetWidth
 /*  f1466d4:	0040a825 */ 	move	$s5,$v0
@@ -10669,7 +10669,7 @@ glabel var7f1b5f58
 /*  f146728:	afae0018 */ 	sw	$t6,0x18($sp)
 /*  f14672c:	0fc56160 */ 	jal	textRender
 /*  f146730:	afaf001c */ 	sw	$t7,0x1c($sp)
-/*  f146734:	0fc55313 */ 	jal	func0f153838
+/*  f146734:	0fc55313 */ 	jal	text0f153838
 /*  f146738:	00402025 */ 	move	$a0,$v0
 /*  f14673c:	8ed80288 */ 	lw	$t8,0x288($s6)
 /*  f146740:	0040a825 */ 	move	$s5,$v0
@@ -12902,11 +12902,11 @@ Gfx *bviewDrawEyespyMetrics(Gfx *gdl)
 	}

 	if (g_Vars.currentplayer->eyespy->mode == EYESPYMODE_CAMSPY) {
-		gdl = gfxSetPrimColour(gdl, 0x00ff0028);
+		gdl = textSetPrimColour(gdl, 0x00ff0028);
 	} else if (g_Vars.currentplayer->eyespy->mode == EYESPYMODE_DRUGSPY) {
-		gdl = gfxSetPrimColour(gdl, 0x2244ffa0);
+		gdl = textSetPrimColour(gdl, 0x2244ffa0);
 	} else {
-		gdl = gfxSetPrimColour(gdl, 0xff3300a0);
+		gdl = textSetPrimColour(gdl, 0xff3300a0);
 	}

 	if (!vsplit) {
@@ -12960,7 +12960,7 @@ Gfx *bviewDrawEyespyMetrics(Gfx *gdl)
 	y = savedy;
 	x2 = x + textwidth; \
 	y2 = y + textheight; \
-	gdl = func0f153858(gdl, &x, &y, &x2, &y2);
+	gdl = text0f153858(gdl, &x, &y, &x2, &y2);
 	gdl = textRender(gdl, &x, &y, text, g_CharsHandelGothicXs, g_FontHandelGothicXs,
 			colourtextbright, colourglow, viGetWidth(), viGetHeight(), 0, 0);

@@ -12972,7 +12972,7 @@ Gfx *bviewDrawEyespyMetrics(Gfx *gdl)
 	y = savedy;
 	x2 = x + textwidth; \
 	y2 = y + textheight; \
-	gdl = func0f153858(gdl, &x, &y, &x2, &y2);
+	gdl = text0f153858(gdl, &x, &y, &x2, &y2);
 	gdl = textRender(gdl, &x, &y, text, g_CharsHandelGothicXs, g_FontHandelGothicXs,
 			colourtextbright, colourglow, viGetWidth(), viGetHeight(), 0, 0);

@@ -12984,7 +12984,7 @@ Gfx *bviewDrawEyespyMetrics(Gfx *gdl)
 	y = savedy;
 	x2 = x + textwidth; \
 	y2 = y + textheight; \
-	gdl = func0f153858(gdl, &x, &y, &x2, &y2);
+	gdl = text0f153858(gdl, &x, &y, &x2, &y2);
 	gdl = textRender(gdl, &x, &y, text, g_CharsHandelGothicXs, g_FontHandelGothicXs,
 			colourtextbright, colourglow, viGetWidth(), viGetHeight(), 0, 0);

@@ -12996,7 +12996,7 @@ Gfx *bviewDrawEyespyMetrics(Gfx *gdl)
 	y = savedy;
 	x2 = x + textwidth; \
 	y2 = y + textheight; \
-	gdl = func0f153858(gdl, &x, &y, &x2, &y2);
+	gdl = text0f153858(gdl, &x, &y, &x2, &y2);
 	gdl = textRender(gdl, &x, &y, text, g_CharsHandelGothicXs, g_FontHandelGothicXs,
 			colourtextbright, colourglow, viGetWidth(), viGetHeight(), 0, 0);

@@ -13008,7 +13008,7 @@ Gfx *bviewDrawEyespyMetrics(Gfx *gdl)
 	y = (vsplit ? 18 : 0) + viewbottom - 41;
 	x2 = x + textwidth; \
 	y2 = y + textheight; \
-	gdl = func0f153858(gdl, &x, &y, &x2, &y2);
+	gdl = text0f153858(gdl, &x, &y, &x2, &y2);
 	gdl = textRender(gdl, &x, &y, text, g_CharsHandelGothicXs, g_FontHandelGothicXs,
 			colourtextdull, colourglow, viGetWidth(), viGetHeight(), 0, 0);

@@ -13024,7 +13024,7 @@ Gfx *bviewDrawEyespyMetrics(Gfx *gdl)

 	x = viewleft + 25 * scale + (vsplit ? -3 : 0) + 5;
 	y = viewbottom + (vsplit ? 20 : 0) - 34;
-	x2 = x + textwidth; y2 = y + textheight; gdl = func0f153858(gdl, &x, &y, &x2, &y2);
+	x2 = x + textwidth; y2 = y + textheight; gdl = text0f153858(gdl, &x, &y, &x2, &y2);
 	gdl = textRender(gdl, &x, &y, text, g_CharsHandelGothicXs, g_FontHandelGothicXs,
 			colourtextdull, colourglow, viGetWidth(), viGetHeight(), 0, 0);

@@ -13037,7 +13037,7 @@ Gfx *bviewDrawEyespyMetrics(Gfx *gdl)
 		y = (vsplit ? -13 : 0) + viewtop + 27;
 		x2 = x + textwidth; \
 		y2 = y + textheight; \
-		gdl = func0f153858(gdl, &x, &y, &x2, &y2);
+		gdl = text0f153858(gdl, &x, &y, &x2, &y2);
 		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) {
@@ -13049,7 +13049,7 @@ Gfx *bviewDrawEyespyMetrics(Gfx *gdl)
 		y = (vsplit ? -13 : 0) + viewtop + 27;
 		x2 = x + textwidth; \
 		y2 = y + textheight; \
-		gdl = func0f153858(gdl, &x, &y, &x2, &y2);
+		gdl = text0f153858(gdl, &x, &y, &x2, &y2);
 		gdl = textRender(gdl, &x, &y, text, g_CharsHandelGothicXs, g_FontHandelGothicXs,
 				colourtextdull, colourglow, viGetWidth(), viGetHeight(), 0, 0);
 	} else {
@@ -13061,7 +13061,7 @@ Gfx *bviewDrawEyespyMetrics(Gfx *gdl)
 		y = (vsplit ? -13 : 0) + viewtop + 27;
 		x2 = x + textwidth; \
 		y2 = y + textheight; \
-		gdl = func0f153858(gdl, &x, &y, &x2, &y2);
+		gdl = text0f153858(gdl, &x, &y, &x2, &y2);
 		gdl = textRender(gdl, &x, &y, text, g_CharsHandelGothicXs, g_FontHandelGothicXs,
 				colourtextdull, colourglow, viGetWidth(), viGetHeight(), 0, 0);
 	}
@@ -13080,7 +13080,7 @@ Gfx *bviewDrawEyespyMetrics(Gfx *gdl)
 	y = (vsplit ? -11 : 0) + viewtop + 34;
 	x2 = x + textwidth; \
 	y2 = y + textheight; \
-	gdl = func0f153858(gdl, &x, &y, &x2, &y2);
+	gdl = text0f153858(gdl, &x, &y, &x2, &y2);
 	gdl = textRender(gdl, &x, &y, text, g_CharsHandelGothicXs, g_FontHandelGothicXs,
 			colourtextdull, colourglow, viGetWidth(), viGetHeight(), 0, 0);

@@ -13098,11 +13098,11 @@ Gfx *bviewDrawEyespyMetrics(Gfx *gdl)
 	if (1);
 	x2 = x + textwidth; \
 	y2 = y + textheight; \
-	gdl = func0f153858(gdl, &x, &y, &x2, &y2);
+	gdl = text0f153858(gdl, &x, &y, &x2, &y2);
 	gdl = textRender(gdl, &x, &y, text, g_CharsHandelGothicXs, g_FontHandelGothicXs,
 			colourtextdull, colourglow, viGetWidth(), viGetHeight(), 0, 0);

-	gdl = func0f153838(gdl);
+	gdl = text0f153838(gdl);

 	{
 		s8 contpadnum = optionsGetContpadNum1(g_Vars.currentplayerstats->mpindex);
@@ -13903,7 +13903,7 @@ glabel var7f1b5f58
 /*  f13e54c:	14600006 */ 	bnez	$v1,.NB0f13e568
 /*  f13e550:	3c0500ff */ 	lui	$a1,0xff
 /*  f13e554:	34a50028 */ 	ori	$a1,$a1,0x28
-/*  f13e558:	0fc537b7 */ 	jal	gfxSetPrimColour
+/*  f13e558:	0fc537b7 */ 	jal	textSetPrimColour
 /*  f13e55c:	02a02025 */ 	or	$a0,$s5,$zero
 /*  f13e560:	1000000e */ 	beqz	$zero,.NB0f13e59c
 /*  f13e564:	44903000 */ 	mtc1	$s0,$f6
@@ -13913,13 +13913,13 @@ glabel var7f1b5f58
 /*  f13e570:	02a02025 */ 	or	$a0,$s5,$zero
 /*  f13e574:	3c052244 */ 	lui	$a1,0x2244
 /*  f13e578:	34a5ffa0 */ 	ori	$a1,$a1,0xffa0
-/*  f13e57c:	0fc537b7 */ 	jal	gfxSetPrimColour
+/*  f13e57c:	0fc537b7 */ 	jal	textSetPrimColour
 /*  f13e580:	02a02025 */ 	or	$a0,$s5,$zero
 /*  f13e584:	10000005 */ 	beqz	$zero,.NB0f13e59c
 /*  f13e588:	44903000 */ 	mtc1	$s0,$f6
 .NB0f13e58c:
 /*  f13e58c:	3c05ff33 */ 	lui	$a1,0xff33
-/*  f13e590:	0fc537b7 */ 	jal	gfxSetPrimColour
+/*  f13e590:	0fc537b7 */ 	jal	textSetPrimColour
 /*  f13e594:	34a500a0 */ 	ori	$a1,$a1,0xa0
 /*  f13e598:	44903000 */ 	mtc1	$s0,$f6
 .NB0f13e59c:
@@ -14516,7 +14516,7 @@ glabel var7f1b5f58
 /*  f13ee7c:	02a02025 */ 	or	$a0,$s5,$zero
 /*  f13ee80:	27a502d4 */ 	addiu	$a1,$sp,0x2d4
 /*  f13ee84:	27a602d0 */ 	addiu	$a2,$sp,0x2d0
-/*  f13ee88:	0fc537d6 */ 	jal	func0f153858
+/*  f13ee88:	0fc537d6 */ 	jal	text0f153858
 /*  f13ee8c:	27a702c4 */ 	addiu	$a3,$sp,0x2c4
 /*  f13ee90:	0c002f77 */ 	jal	viGetWidth
 /*  f13ee94:	0040a825 */ 	or	$s5,$v0,$zero
@@ -14585,7 +14585,7 @@ glabel var7f1b5f58
 /*  f13ef90:	27a602d0 */ 	addiu	$a2,$sp,0x2d0
 /*  f13ef94:	27a702c4 */ 	addiu	$a3,$sp,0x2c4
 /*  f13ef98:	afb102d0 */ 	sw	$s1,0x2d0($sp)
-/*  f13ef9c:	0fc537d6 */ 	jal	func0f153858
+/*  f13ef9c:	0fc537d6 */ 	jal	text0f153858
 /*  f13efa0:	afa302d4 */ 	sw	$v1,0x2d4($sp)
 /*  f13efa4:	0c002f77 */ 	jal	viGetWidth
 /*  f13efa8:	0040a825 */ 	or	$s5,$v0,$zero
@@ -14650,7 +14650,7 @@ glabel var7f1b5f58
 /*  f13f094:	27a602d0 */ 	addiu	$a2,$sp,0x2d0
 /*  f13f098:	27a702c4 */ 	addiu	$a3,$sp,0x2c4
 /*  f13f09c:	afb102d0 */ 	sw	$s1,0x2d0($sp)
-/*  f13f0a0:	0fc537d6 */ 	jal	func0f153858
+/*  f13f0a0:	0fc537d6 */ 	jal	text0f153858
 /*  f13f0a4:	afa302d4 */ 	sw	$v1,0x2d4($sp)
 /*  f13f0a8:	0c002f77 */ 	jal	viGetWidth
 /*  f13f0ac:	0040a825 */ 	or	$s5,$v0,$zero
@@ -14715,7 +14715,7 @@ glabel var7f1b5f58
 /*  f13f198:	27a602d0 */ 	addiu	$a2,$sp,0x2d0
 /*  f13f19c:	27a702c4 */ 	addiu	$a3,$sp,0x2c4
 /*  f13f1a0:	afb102d0 */ 	sw	$s1,0x2d0($sp)
-/*  f13f1a4:	0fc537d6 */ 	jal	func0f153858
+/*  f13f1a4:	0fc537d6 */ 	jal	text0f153858
 /*  f13f1a8:	afa302d4 */ 	sw	$v1,0x2d4($sp)
 /*  f13f1ac:	0c002f77 */ 	jal	viGetWidth
 /*  f13f1b0:	0040a825 */ 	or	$s5,$v0,$zero
@@ -14776,7 +14776,7 @@ glabel var7f1b5f58
 /*  f13f28c:	02a02025 */ 	or	$a0,$s5,$zero
 /*  f13f290:	27a502d4 */ 	addiu	$a1,$sp,0x2d4
 /*  f13f294:	27a602d0 */ 	addiu	$a2,$sp,0x2d0
-/*  f13f298:	0fc537d6 */ 	jal	func0f153858
+/*  f13f298:	0fc537d6 */ 	jal	text0f153858
 /*  f13f29c:	27a702c4 */ 	addiu	$a3,$sp,0x2c4
 /*  f13f2a0:	0c002f77 */ 	jal	viGetWidth
 /*  f13f2a4:	0040a825 */ 	or	$s5,$v0,$zero
@@ -14865,7 +14865,7 @@ glabel var7f1b5f58
 /*  f13f3e4:	27a502d4 */ 	addiu	$a1,$sp,0x2d4
 /*  f13f3e8:	27a602d0 */ 	addiu	$a2,$sp,0x2d0
 /*  f13f3ec:	27a702c4 */ 	addiu	$a3,$sp,0x2c4
-/*  f13f3f0:	0fc537d6 */ 	jal	func0f153858
+/*  f13f3f0:	0fc537d6 */ 	jal	text0f153858
 /*  f13f3f4:	afb102d4 */ 	sw	$s1,0x2d4($sp)
 /*  f13f3f8:	0c002f77 */ 	jal	viGetWidth
 /*  f13f3fc:	0040a825 */ 	or	$s5,$v0,$zero
@@ -14940,7 +14940,7 @@ glabel var7f1b5f58
 /*  f13f510:	02a02025 */ 	or	$a0,$s5,$zero
 /*  f13f514:	27a502d4 */ 	addiu	$a1,$sp,0x2d4
 /*  f13f518:	27a602d0 */ 	addiu	$a2,$sp,0x2d0
-/*  f13f51c:	0fc537d6 */ 	jal	func0f153858
+/*  f13f51c:	0fc537d6 */ 	jal	text0f153858
 /*  f13f520:	27a702c4 */ 	addiu	$a3,$sp,0x2c4
 /*  f13f524:	0c002f77 */ 	jal	viGetWidth
 /*  f13f528:	0040a825 */ 	or	$s5,$v0,$zero
@@ -15015,7 +15015,7 @@ glabel var7f1b5f58
 /*  f13f638:	02a02025 */ 	or	$a0,$s5,$zero
 /*  f13f63c:	27a502d4 */ 	addiu	$a1,$sp,0x2d4
 /*  f13f640:	27a602d0 */ 	addiu	$a2,$sp,0x2d0
-/*  f13f644:	0fc537d6 */ 	jal	func0f153858
+/*  f13f644:	0fc537d6 */ 	jal	text0f153858
 /*  f13f648:	27a702c4 */ 	addiu	$a3,$sp,0x2c4
 /*  f13f64c:	0c002f77 */ 	jal	viGetWidth
 /*  f13f650:	0040a825 */ 	or	$s5,$v0,$zero
@@ -15085,7 +15085,7 @@ glabel var7f1b5f58
 /*  f13f74c:	02a02025 */ 	or	$a0,$s5,$zero
 /*  f13f750:	27a502d4 */ 	addiu	$a1,$sp,0x2d4
 /*  f13f754:	27a602d0 */ 	addiu	$a2,$sp,0x2d0
-/*  f13f758:	0fc537d6 */ 	jal	func0f153858
+/*  f13f758:	0fc537d6 */ 	jal	text0f153858
 /*  f13f75c:	27a702c4 */ 	addiu	$a3,$sp,0x2c4
 /*  f13f760:	0c002f77 */ 	jal	viGetWidth
 /*  f13f764:	0040a825 */ 	or	$s5,$v0,$zero
@@ -15184,7 +15184,7 @@ glabel var7f1b5f58
 /*  f13f8c8:	02a02025 */ 	or	$a0,$s5,$zero
 /*  f13f8cc:	27a502d4 */ 	addiu	$a1,$sp,0x2d4
 /*  f13f8d0:	27a602d0 */ 	addiu	$a2,$sp,0x2d0
-/*  f13f8d4:	0fc537d6 */ 	jal	func0f153858
+/*  f13f8d4:	0fc537d6 */ 	jal	text0f153858
 /*  f13f8d8:	27a702c4 */ 	addiu	$a3,$sp,0x2c4
 /*  f13f8dc:	0c002f77 */ 	jal	viGetWidth
 /*  f13f8e0:	0040a825 */ 	or	$s5,$v0,$zero
@@ -15278,7 +15278,7 @@ glabel var7f1b5f58
 /*  f13fa34:	27b802c0 */ 	addiu	$t8,$sp,0x2c0
 /*  f13fa38:	afb80010 */ 	sw	$t8,0x10($sp)
 /*  f13fa3c:	afaf02c4 */ 	sw	$t7,0x2c4($sp)
-/*  f13fa40:	0fc537d6 */ 	jal	func0f153858
+/*  f13fa40:	0fc537d6 */ 	jal	text0f153858
 /*  f13fa44:	afa302d4 */ 	sw	$v1,0x2d4($sp)
 /*  f13fa48:	0c002f77 */ 	jal	viGetWidth
 /*  f13fa4c:	0040a825 */ 	or	$s5,$v0,$zero
@@ -15305,7 +15305,7 @@ glabel var7f1b5f58
 /*  f13faa0:	afb80018 */ 	sw	$t8,0x18($sp)
 /*  f13faa4:	0fc54529 */ 	jal	textRender
 /*  f13faa8:	afaf001c */ 	sw	$t7,0x1c($sp)
-/*  f13faac:	0fc537ce */ 	jal	func0f153838
+/*  f13faac:	0fc537ce */ 	jal	text0f153838
 /*  f13fab0:	00402025 */ 	or	$a0,$v0,$zero
 /*  f13fab4:	8ece0288 */ 	lw	$t6,0x288($s6)
 /*  f13fab8:	0040a825 */ 	or	$s5,$v0,$zero
@@ -18659,12 +18659,12 @@ Gfx *bviewDrawHorizonScanner(Gfx *gdl)
 	lenstop = viewtop + (viewheight / 2) - (lensheight / 2);

 	// Black out areas above and below lens
-	gdl = gfxSetPrimColour(gdl, 0x000000ff);
+	gdl = textSetPrimColour(gdl, 0x000000ff);

 	gDPFillRectangle(gdl++, viewleft, viewtop, viewleft + viewwidth, lenstop);
 	gDPFillRectangle(gdl++, viewleft, lenstop + lensheight, viewleft + viewwidth, viewtop + viewheight);

-	gdl = func0f153838(gdl);
+	gdl = text0f153838(gdl);

 	// Prepare text buffers
 	sprintf(directiontext, "%s %s:%03d", arrows, &directions[(turnangle + 22) / 45], turnangle);
@@ -18680,7 +18680,7 @@ Gfx *bviewDrawHorizonScanner(Gfx *gdl)

 	sprintf(zoomtext, "%s %s%s%4.2fX", arrows, "", "", fovy);

-	gdl = func0f153628(gdl);
+	gdl = text0f153628(gdl);

 	// Arrows left of product name
 	if (vsplit) {
@@ -18734,7 +18734,7 @@ Gfx *bviewDrawHorizonScanner(Gfx *gdl)

 	gdl = textRenderProjected(gdl, &x, &y, directiontext,
 			g_CharsHandelGothicXs, g_FontHandelGothicXs, 0xffffff7f, viGetWidth(), viGetHeight(), 0, 0);
-	gdl = func0f153780(gdl);
+	gdl = text0f153780(gdl);

 	gDPPipeSync(gdl++);

@@ -18998,7 +18998,7 @@ glabel var7f1b04c8nb
 /*  f142894:	014b9823 */ 	subu	$s3,$t2,$t3
 /*  f142898:	afb300b4 */ 	sw	$s3,0xb4($sp)
 /*  f14289c:	02402025 */ 	or	$a0,$s2,$zero
-/*  f1428a0:	0fc537b7 */ 	jal	gfxSetPrimColour
+/*  f1428a0:	0fc537b7 */ 	jal	textSetPrimColour
 /*  f1428a4:	240500ff */ 	addiu	$a1,$zero,0xff
 /*  f1428a8:	8fa7014c */ 	lw	$a3,0x14c($sp)
 /*  f1428ac:	8fac0150 */ 	lw	$t4,0x150($sp)
@@ -19032,7 +19032,7 @@ glabel var7f1b04c8nb
 /*  f14291c:	ac4c000c */ 	sw	$t4,0xc($v0)
 /*  f142920:	ac490008 */ 	sw	$t1,0x8($v0)
 /*  f142924:	afa60068 */ 	sw	$a2,0x68($sp)
-/*  f142928:	0fc537ce */ 	jal	func0f153838
+/*  f142928:	0fc537ce */ 	jal	text0f153838
 /*  f14292c:	24440010 */ 	addiu	$a0,$v0,0x10
 /*  f142930:	8fa300cc */ 	lw	$v1,0xcc($sp)
 /*  f142934:	2401002d */ 	addiu	$at,$zero,0x2d
@@ -19107,7 +19107,7 @@ glabel var7f1b04c8nb
 /*  f142a3c:	afa80010 */ 	sw	$t0,0x10($sp)
 /*  f142a40:	0c004fc1 */ 	jal	sprintf
 /*  f142a44:	f7b00018 */ 	sdc1	$f16,0x18($sp)
-/*  f142a48:	0fc5374a */ 	jal	func0f153628
+/*  f142a48:	0fc5374a */ 	jal	text0f153628
 /*  f142a4c:	02402025 */ 	or	$a0,$s2,$zero
 /*  f142a50:	8fa900a4 */ 	lw	$t1,0xa4($sp)
 /*  f142a54:	00409025 */ 	or	$s2,$v0,$zero
@@ -19308,7 +19308,7 @@ glabel var7f1b04c8nb
 /*  f142d48:	afa80014 */ 	sw	$t0,0x14($sp)
 /*  f142d4c:	0fc541a6 */ 	jal	textRenderProjected
 /*  f142d50:	afaf0010 */ 	sw	$t7,0x10($sp)
-/*  f142d54:	0fc537a0 */ 	jal	func0f153780
+/*  f142d54:	0fc537a0 */ 	jal	text0f153780
 /*  f142d58:	00402025 */ 	or	$a0,$v0,$zero
 /*  f142d5c:	3c0ae700 */ 	lui	$t2,0xe700
 /*  f142d60:	ac4a0000 */ 	sw	$t2,0x0($v0)
@@ -26225,7 +26225,7 @@ Gfx *chrsRenderChrStats(Gfx *gdl, s16 *rooms)
 	s32 i;
 	s32 numchrs = chrsGetNumSlots();

-	gdl = func0f153628(gdl);
+	gdl = text0f153628(gdl);

 	for (i = 0; i < numchrs; i++) {
 		struct chrdata *chr = &g_ChrSlots[i];
@@ -26260,7 +26260,7 @@ Gfx *chrsRenderChrStats(Gfx *gdl, s16 *rooms)
 				x2 = x + textwidth;
 				y2 = y + textheight;

-				gdl = func0f153858(gdl, &x, &y, &x2, &y2);
+				gdl = text0f153858(gdl, &x, &y, &x2, &y2);
 				gdl = textRender(gdl, &x, &y, fullbuffer,
 						g_CharsHandelGothicXs, g_FontHandelGothicXs,
 						0xff8800aa, 0x00000088, viGetWidth(), viGetHeight(), 0, 0);
@@ -26268,7 +26268,7 @@ Gfx *chrsRenderChrStats(Gfx *gdl, s16 *rooms)
 		}
 	}

-	gdl = func0f153780(gdl);
+	gdl = text0f153780(gdl);

 	return gdl;
 }
@@ -568,11 +568,11 @@ Gfx *creditsFillFramebuffer(Gfx *gdl, u32 colour)
 {
 	gSPDisplayList(gdl++, &var800613a0);

-	gdl = gfxSetPrimColour(gdl, colour);
+	gdl = textSetPrimColour(gdl, colour);

 	gDPFillRectangle(gdl++, 0, 0, viGetWidth(), viGetHeight());

-	gdl = func0f153838(gdl);
+	gdl = text0f153838(gdl);

 	return gdl;
 }
@@ -1009,7 +1009,7 @@ Gfx *creditsDrawBackgroundText(Gfx *gdl, s32 x, s32 y, char *text, struct fontch
 			f32 value = (i * 0.3f * (spread + 0.5f)) + 1.0f;
 			u32 stack[2];

-			gdl = func0f1552d4(gdl, x + sinf(f24) * mult, y + cosf(f24) * mult, f26, value, text, chars, font, colour3, 0, 1);
+			gdl = text0f1552d4(gdl, x + sinf(f24) * mult, y + cosf(f24) * mult, f26, value, text, chars, font, colour3, 0, 1);
 		}
 	}

@@ -1058,7 +1058,7 @@ Gfx *creditsDrawForegroundText(Gfx *gdl, s32 x, s32 y, char *text, struct fontch

 	colour = 0xffffff00 | (u32) (255.0f * opacityfrac);

-	gdl = func0f1552d4(gdl, x, y, widthscale, heightscale, text, chars, font, colour, hdir, vdir);
+	gdl = text0f1552d4(gdl, x, y, widthscale, heightscale, text, chars, font, colour, hdir, vdir);

 	return gdl;
 }
@@ -1510,7 +1510,7 @@ Gfx *creditsDrawSlide(Gfx *gdl)
 #endif
 	}

-	gdl = func0f153628(gdl);
+	gdl = text0f153628(gdl);

 	// Draw text repetitions
 	for (i = 0; i < g_CreditsData->numthisslide * 2; i++) {
@@ -1663,7 +1663,7 @@ Gfx *creditsDrawSlide(Gfx *gdl)
 		}
 	}

-	gdl = func0f153780(gdl);
+	gdl = text0f153780(gdl);

 	return gdl;
 }
@@ -1763,7 +1763,7 @@ Gfx *creditsDraw(Gfx *gdl)

 	static u32 scrolltimer240 = 0;

-	func0f1531dc(false);
+	text0f1531dc(false);

 #if VERSION >= VERSION_JPN_FINAL
 	var800800f0jf = 0;
@@ -1795,7 +1795,7 @@ s32 filemgrFileToCopyOrDeleteListMenuHandler(s32 operation, struct menuitem *ite
 				x = renderdata->x + 2;
 				y = renderdata->y + 2;

-				gdl = func0f153628(gdl);
+				gdl = text0f153628(gdl);

 				if (file) {
 					filemgrGetSelectName(text, file, g_Menus[g_MpPlayerNum].fm.filetypeplusone - 1);
@@ -1805,7 +1805,7 @@ s32 filemgrFileToCopyOrDeleteListMenuHandler(s32 operation, struct menuitem *ite
 					x = renderdata->x + 2;
 				}

-				gdl = func0f153780(gdl);
+				gdl = text0f153780(gdl);
 			}

 			return (u32)gdl;
@@ -2400,7 +2400,7 @@ s32 filemgrChooseAgentListMenuHandler(s32 operation, struct menuitem *item, unio

 		x = renderdata->x + 62;
 		y = renderdata->y + (VERSION == VERSION_JPN_FINAL ? 3 : 4);
-		gdl = func0f153628(gdl);
+		gdl = text0f153628(gdl);

 		if (data->list.unk04 == g_FileLists[0]->numfiles) {
 			// "New Agent..."
@@ -2461,7 +2461,7 @@ s32 filemgrChooseAgentListMenuHandler(s32 operation, struct menuitem *item, unio
 			gdl = textRenderProjected(gdl, &x, &y, buffer,
 					g_CharsHandelGothicXs, g_FontHandelGothicXs, renderdata->colour, viGetWidth(), viGetHeight(), 0, 0);
 		}
-		gdl = func0f153780(gdl);
+		gdl = text0f153780(gdl);
 		return (u32) gdl;
 	case MENUOP_GETOPTIONHEIGHT:
 		data->list.value = 40;
@@ -530,9 +530,9 @@ Gfx *healthbarDraw(Gfx *gdl, struct chrdata *chr, s32 offyarg, f32 heightfracarg
 		traumacolours++;
 	}

-	gdl = func0f153628(gdl);
-	gdl = func0f153a34(gdl, underleft, undertop, underright, underbottom, undercol);
-	gdl = func0f153780(gdl);
+	gdl = text0f153628(gdl);
+	gdl = text0f153a34(gdl, underleft, undertop, underright, underbottom, undercol);
+	gdl = text0f153780(gdl);

 	gDPSetRenderMode(gdl++, G_RM_AA_XLU_SURF, G_RM_AA_XLU_SURF2);
 	gDPSetCombineMode(gdl++, G_CC_SHADE, G_CC_SHADE);
@@ -514,7 +514,7 @@ Gfx *hudmsgRenderZoomRange(Gfx *gdl, u32 alpha)
 	x2 = x + textwidth;
 	y2 = y + textheight;

-	gdl = func0f1538e4(gdl, &x, &y, &x2, &y2);
+	gdl = text0f1538e4(gdl, &x, &y, &x2, &y2);
 	gdl = textRender(gdl, &x, &y, text, g_CharsNumeric, g_FontNumeric, colour, 0x000000a0, viGetWidth(), viGetHeight(), 0, 0);

 	// Divider
@@ -526,7 +526,7 @@ Gfx *hudmsgRenderZoomRange(Gfx *gdl, u32 alpha)
 	x2 = x + textwidth;
 	y2 = y + textheight;

-	gdl = func0f1538e4(gdl, &x, &y, &x2, &y2);
+	gdl = text0f1538e4(gdl, &x, &y, &x2, &y2);
 	gdl = textRender(gdl, &x, &y, text, g_CharsNumeric, g_FontNumeric, colour, 0x000000a0, viGetWidth(), viGetHeight(), 0, 0);

 	// Right side - max zoom level
@@ -538,7 +538,7 @@ Gfx *hudmsgRenderZoomRange(Gfx *gdl, u32 alpha)
 	x2 = x + textwidth;
 	y2 = y + textheight;

-	gdl = func0f1538e4(gdl, &x, &y, &x2, &y2);
+	gdl = text0f1538e4(gdl, &x, &y, &x2, &y2);
 	gdl = textRender(gdl, &x, &y, text, g_CharsNumeric, g_FontNumeric, colour, 0x000000a0, viGetWidth(), viGetHeight(), 0, 0);

 	return gdl;
@@ -578,7 +578,7 @@ Gfx *hudmsgRenderBox(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, f32 bgopacity, u3
 		f32 width = (x1 + x2) * 0.5f;
 		f32 height = (y1 + y2) * 0.5f;

-		gdl = func0f153a34(gdl,
+		gdl = text0f153a34(gdl,
 				(s32)((width - f22) + 1.0f) * g_ScaleX,
 				(height - f20) + 1.0f,
 				(s32)(width + f22) * g_ScaleX,
@@ -1768,7 +1768,7 @@ glabel var7f1adee0
 /*  f0e08d0:	3c018008 */ 	lui	$at,0x8008
 /*  f0e08d4:	ac2200f4 */ 	sw	$v0,0xf4($at)
 .JF0f0e08d8:
-/*  f0e08d8:	0fc54b55 */ 	jal	func0f153628
+/*  f0e08d8:	0fc54b55 */ 	jal	text0f153628
 /*  f0e08dc:	02402025 */ 	move	$a0,$s2
 /*  f0e08e0:	3c19800a */ 	lui	$t9,0x800a
 /*  f0e08e4:	8f39a8c8 */ 	lw	$t9,-0x5738($t9)
@@ -2079,7 +2079,7 @@ glabel var7f1adee0
 /*  f0e0d50:	44801000 */ 	mtc1	$zero,$f2
 /*  f0e0d54:	00000000 */ 	nop
 .JF0f0e0d58:
-/*  f0e0d58:	0fc54ce3 */ 	jal	func0f153c20
+/*  f0e0d58:	0fc54ce3 */ 	jal	textSetDiagonalBlend
 /*  f0e0d5c:	e7a200c0 */ 	swc1	$f2,0xc0($sp)
 /*  f0e0d60:	920d0001 */ 	lbu	$t5,0x1($s0)
 /*  f0e0d64:	c7a200c0 */ 	lwc1	$f2,0xc0($sp)
@@ -2131,7 +2131,7 @@ glabel var7f1adee0
 /*  f0e0e18:	afa00014 */ 	sw	$zero,0x14($sp)
 /*  f0e0e1c:	0326c021 */ 	addu	$t8,$t9,$a2
 /*  f0e0e20:	afb80010 */ 	sw	$t8,0x10($sp)
-/*  f0e0e24:	0fc54c68 */ 	jal	func0f153a34
+/*  f0e0e24:	0fc54c68 */ 	jal	text0f153a34
 /*  f0e0e28:	01c53821 */ 	addu	$a3,$t6,$a1
 /*  f0e0e2c:	0c002eeb */ 	jal	viGetWidth
 /*  f0e0e30:	00409025 */ 	move	$s2,$v0
@@ -2162,7 +2162,7 @@ glabel var7f1adee0
 /*  f0e0e90:	00000000 */ 	nop
 /*  f0e0e94:	afa000e0 */ 	sw	$zero,0xe0($sp)
 .JF0f0e0e98:
-/*  f0e0e98:	0fc54d6e */ 	jal	func0f153e4c
+/*  f0e0e98:	0fc54d6e */ 	jal	textResetBlends
 /*  f0e0e9c:	00000000 */ 	nop
 /*  f0e0ea0:	100000fe */ 	b	.JF0f0e129c
 /*  f0e0ea4:	8e0801b4 */ 	lw	$t0,0x1b4($s0)
@@ -2236,7 +2236,7 @@ glabel var7f1adee0
 /*  f0e0fa8:	afab0010 */ 	sw	$t3,0x10($sp)
 /*  f0e0fac:	afa00014 */ 	sw	$zero,0x14($sp)
 /*  f0e0fb0:	02402025 */ 	move	$a0,$s2
-/*  f0e0fb4:	0fc54c68 */ 	jal	func0f153a34
+/*  f0e0fb4:	0fc54c68 */ 	jal	text0f153a34
 /*  f0e0fb8:	01253821 */ 	addu	$a3,$t1,$a1
 /*  f0e0fbc:	0c002eeb */ 	jal	viGetWidth
 /*  f0e0fc0:	00409025 */ 	move	$s2,$v0
@@ -2324,7 +2324,7 @@ glabel var7f1adee0
 /*  f0e10f8:	032f2021 */ 	addu	$a0,$t9,$t7
 /*  f0e10fc:	01382821 */ 	addu	$a1,$t1,$t8
 /*  f0e1100:	44060000 */ 	mfc1	$a2,$f0
-/*  f0e1104:	0fc54ce3 */ 	jal	func0f153c20
+/*  f0e1104:	0fc54ce3 */ 	jal	textSetDiagonalBlend
 /*  f0e1108:	00000000 */ 	nop
 /*  f0e110c:	c7a200a8 */ 	lwc1	$f2,0xa8($sp)
 /*  f0e1110:	3c014f80 */ 	lui	$at,0x4f80
@@ -2398,7 +2398,7 @@ glabel var7f1adee0
 /*  f0e1210:	afa00014 */ 	sw	$zero,0x14($sp)
 /*  f0e1214:	01a66021 */ 	addu	$t4,$t5,$a2
 /*  f0e1218:	afac0010 */ 	sw	$t4,0x10($sp)
-/*  f0e121c:	0fc54c68 */ 	jal	func0f153a34
+/*  f0e121c:	0fc54c68 */ 	jal	text0f153a34
 /*  f0e1220:	01653821 */ 	addu	$a3,$t3,$a1
 /*  f0e1224:	0c002eeb */ 	jal	viGetWidth
 /*  f0e1228:	00409025 */ 	move	$s2,$v0
@@ -2429,7 +2429,7 @@ glabel var7f1adee0
 /*  f0e1288:	00000000 */ 	nop
 /*  f0e128c:	afa000e0 */ 	sw	$zero,0xe0($sp)
 .JF0f0e1290:
-/*  f0e1290:	0fc54d6e */ 	jal	func0f153e4c
+/*  f0e1290:	0fc54d6e */ 	jal	textResetBlends
 /*  f0e1294:	00000000 */ 	nop
 .JF0f0e1298:
 /*  f0e1298:	8e0801b4 */ 	lw	$t0,0x1b4($s0)
@@ -2554,7 +2554,7 @@ glabel var7f1adee0
 /*  f0e145c:	02402025 */ 	move	$a0,$s2
 /*  f0e1460:	00409025 */ 	move	$s2,$v0
 .JF0f0e1464:
-/*  f0e1464:	0fc54bb7 */ 	jal	func0f153780
+/*  f0e1464:	0fc54bb7 */ 	jal	text0f153780
 /*  f0e1468:	02402025 */ 	move	$a0,$s2
 /*  f0e146c:	8fbf007c */ 	lw	$ra,0x7c($sp)
 /*  f0e1470:	240a0001 */ 	li	$t2,0x1
@@ -2618,7 +2618,7 @@ glabel var7f1af1e0
 /*  f0e0174:	f7b40038 */ 	sdc1	$f20,0x38($sp)
 /*  f0e0178:	afae00e0 */ 	sw	$t6,0xe0($sp)
 /*  f0e017c:	afaf00dc */ 	sw	$t7,0xdc($sp)
-/*  f0e0180:	0fc550cf */ 	jal	func0f153628
+/*  f0e0180:	0fc550cf */ 	jal	text0f153628
 /*  f0e0184:	ac380020 */ 	sw	$t8,0x20($at)
 /*  f0e0188:	3c19800a */ 	lui	$t9,0x800a
 /*  f0e018c:	8f39a7a8 */ 	lw	$t9,-0x5858($t9)
@@ -2929,7 +2929,7 @@ glabel var7f1af1e0
 /*  f0e05f8:	44801000 */ 	mtc1	$zero,$f2
 /*  f0e05fc:	00000000 */ 	nop
 .PF0f0e0600:
-/*  f0e0600:	0fc5524d */ 	jal	func0f153c20
+/*  f0e0600:	0fc5524d */ 	jal	textSetDiagonalBlend
 /*  f0e0604:	e7a200c0 */ 	swc1	$f2,0xc0($sp)
 /*  f0e0608:	920d0001 */ 	lbu	$t5,0x1($s0)
 /*  f0e060c:	c7a200c0 */ 	lwc1	$f2,0xc0($sp)
@@ -2981,7 +2981,7 @@ glabel var7f1af1e0
 /*  f0e06c0:	afa00014 */ 	sw	$zero,0x14($sp)
 /*  f0e06c4:	0326c021 */ 	addu	$t8,$t9,$a2
 /*  f0e06c8:	afb80010 */ 	sw	$t8,0x10($sp)
-/*  f0e06cc:	0fc551d2 */ 	jal	func0f153a34
+/*  f0e06cc:	0fc551d2 */ 	jal	text0f153a34
 /*  f0e06d0:	01c53821 */ 	addu	$a3,$t6,$a1
 /*  f0e06d4:	0c002e53 */ 	jal	viGetWidth
 /*  f0e06d8:	00409025 */ 	move	$s2,$v0
@@ -3012,7 +3012,7 @@ glabel var7f1af1e0
 /*  f0e0738:	00000000 */ 	nop
 /*  f0e073c:	afa000e0 */ 	sw	$zero,0xe0($sp)
 .PF0f0e0740:
-/*  f0e0740:	0fc552d8 */ 	jal	func0f153e4c
+/*  f0e0740:	0fc552d8 */ 	jal	textResetBlends
 /*  f0e0744:	00000000 */ 	nop
 /*  f0e0748:	100000fe */ 	b	.PF0f0e0b44
 /*  f0e074c:	8e0801b4 */ 	lw	$t0,0x1b4($s0)
@@ -3086,7 +3086,7 @@ glabel var7f1af1e0
 /*  f0e0850:	afab0010 */ 	sw	$t3,0x10($sp)
 /*  f0e0854:	afa00014 */ 	sw	$zero,0x14($sp)
 /*  f0e0858:	02402025 */ 	move	$a0,$s2
-/*  f0e085c:	0fc551d2 */ 	jal	func0f153a34
+/*  f0e085c:	0fc551d2 */ 	jal	text0f153a34
 /*  f0e0860:	01253821 */ 	addu	$a3,$t1,$a1
 /*  f0e0864:	0c002e53 */ 	jal	viGetWidth
 /*  f0e0868:	00409025 */ 	move	$s2,$v0
@@ -3174,7 +3174,7 @@ glabel var7f1af1e0
 /*  f0e09a0:	032f2021 */ 	addu	$a0,$t9,$t7
 /*  f0e09a4:	01382821 */ 	addu	$a1,$t1,$t8
 /*  f0e09a8:	44060000 */ 	mfc1	$a2,$f0
-/*  f0e09ac:	0fc5524d */ 	jal	func0f153c20
+/*  f0e09ac:	0fc5524d */ 	jal	textSetDiagonalBlend
 /*  f0e09b0:	00000000 */ 	nop
 /*  f0e09b4:	c7a200a8 */ 	lwc1	$f2,0xa8($sp)
 /*  f0e09b8:	3c014f80 */ 	lui	$at,0x4f80
@@ -3248,7 +3248,7 @@ glabel var7f1af1e0
 /*  f0e0ab8:	afa00014 */ 	sw	$zero,0x14($sp)
 /*  f0e0abc:	01a66021 */ 	addu	$t4,$t5,$a2
 /*  f0e0ac0:	afac0010 */ 	sw	$t4,0x10($sp)
-/*  f0e0ac4:	0fc551d2 */ 	jal	func0f153a34
+/*  f0e0ac4:	0fc551d2 */ 	jal	text0f153a34
 /*  f0e0ac8:	01653821 */ 	addu	$a3,$t3,$a1
 /*  f0e0acc:	0c002e53 */ 	jal	viGetWidth
 /*  f0e0ad0:	00409025 */ 	move	$s2,$v0
@@ -3279,7 +3279,7 @@ glabel var7f1af1e0
 /*  f0e0b30:	00000000 */ 	nop
 /*  f0e0b34:	afa000e0 */ 	sw	$zero,0xe0($sp)
 .PF0f0e0b38:
-/*  f0e0b38:	0fc552d8 */ 	jal	func0f153e4c
+/*  f0e0b38:	0fc552d8 */ 	jal	textResetBlends
 /*  f0e0b3c:	00000000 */ 	nop
 .PF0f0e0b40:
 /*  f0e0b40:	8e0801b4 */ 	lw	$t0,0x1b4($s0)
@@ -3404,7 +3404,7 @@ glabel var7f1af1e0
 /*  f0e0d04:	02402025 */ 	move	$a0,$s2
 /*  f0e0d08:	00409025 */ 	move	$s2,$v0
 .PF0f0e0d0c:
-/*  f0e0d0c:	0fc55125 */ 	jal	func0f153780
+/*  f0e0d0c:	0fc55125 */ 	jal	text0f153780
 /*  f0e0d10:	02402025 */ 	move	$a0,$s2
 /*  f0e0d14:	8fbf007c */ 	lw	$ra,0x7c($sp)
 /*  f0e0d18:	240a0001 */ 	li	$t2,0x1
@@ -3463,7 +3463,7 @@ glabel var7f1af1cc
 /*  f0dffb0:	f7b40038 */ 	sdc1	$f20,0x38($sp)
 /*  f0dffb4:	afae00e0 */ 	sw	$t6,0xe0($sp)
 /*  f0dffb8:	afaf00dc */ 	sw	$t7,0xdc($sp)
-/*  f0dffbc:	0fc5528f */ 	jal	func0f153628
+/*  f0dffbc:	0fc5528f */ 	jal	text0f153628
 /*  f0dffc0:	ac381f90 */ 	sw	$t8,0x1f90($at)
 /*  f0dffc4:	3c19800a */ 	lui	$t9,0x800a
 /*  f0dffc8:	8f39e768 */ 	lw	$t9,-0x1898($t9)
@@ -3774,7 +3774,7 @@ glabel var7f1af1cc
 /*  f0e0434:	44801000 */ 	mtc1	$zero,$f2
 /*  f0e0438:	00000000 */ 	nop
 .PB0f0e043c:
-/*  f0e043c:	0fc5540d */ 	jal	func0f153c20
+/*  f0e043c:	0fc5540d */ 	jal	textSetDiagonalBlend
 /*  f0e0440:	e7a200c0 */ 	swc1	$f2,0xc0($sp)
 /*  f0e0444:	920d0001 */ 	lbu	$t5,0x1($s0)
 /*  f0e0448:	c7a200c0 */ 	lwc1	$f2,0xc0($sp)
@@ -3826,7 +3826,7 @@ glabel var7f1af1cc
 /*  f0e04fc:	afa00014 */ 	sw	$zero,0x14($sp)
 /*  f0e0500:	0326c021 */ 	addu	$t8,$t9,$a2
 /*  f0e0504:	afb80010 */ 	sw	$t8,0x10($sp)
-/*  f0e0508:	0fc55392 */ 	jal	func0f153a34
+/*  f0e0508:	0fc55392 */ 	jal	text0f153a34
 /*  f0e050c:	01c53821 */ 	addu	$a3,$t6,$a1
 /*  f0e0510:	0c002e4d */ 	jal	viGetWidth
 /*  f0e0514:	00409025 */ 	move	$s2,$v0
@@ -3857,7 +3857,7 @@ glabel var7f1af1cc
 /*  f0e0574:	00000000 */ 	nop
 /*  f0e0578:	afa000e0 */ 	sw	$zero,0xe0($sp)
 .PB0f0e057c:
-/*  f0e057c:	0fc55498 */ 	jal	func0f153e4c
+/*  f0e057c:	0fc55498 */ 	jal	textResetBlends
 /*  f0e0580:	00000000 */ 	nop
 /*  f0e0584:	100000fe */ 	b	.PB0f0e0980
 /*  f0e0588:	8e0801b4 */ 	lw	$t0,0x1b4($s0)
@@ -3931,7 +3931,7 @@ glabel var7f1af1cc
 /*  f0e068c:	afab0010 */ 	sw	$t3,0x10($sp)
 /*  f0e0690:	afa00014 */ 	sw	$zero,0x14($sp)
 /*  f0e0694:	02402025 */ 	move	$a0,$s2
-/*  f0e0698:	0fc55392 */ 	jal	func0f153a34
+/*  f0e0698:	0fc55392 */ 	jal	text0f153a34
 /*  f0e069c:	01253821 */ 	addu	$a3,$t1,$a1
 /*  f0e06a0:	0c002e4d */ 	jal	viGetWidth
 /*  f0e06a4:	00409025 */ 	move	$s2,$v0
@@ -4019,7 +4019,7 @@ glabel var7f1af1cc
 /*  f0e07dc:	032f2021 */ 	addu	$a0,$t9,$t7
 /*  f0e07e0:	01382821 */ 	addu	$a1,$t1,$t8
 /*  f0e07e4:	44060000 */ 	mfc1	$a2,$f0
-/*  f0e07e8:	0fc5540d */ 	jal	func0f153c20
+/*  f0e07e8:	0fc5540d */ 	jal	textSetDiagonalBlend
 /*  f0e07ec:	00000000 */ 	nop
 /*  f0e07f0:	c7a200a8 */ 	lwc1	$f2,0xa8($sp)
 /*  f0e07f4:	3c014f80 */ 	lui	$at,0x4f80
@@ -4093,7 +4093,7 @@ glabel var7f1af1cc
 /*  f0e08f4:	afa00014 */ 	sw	$zero,0x14($sp)
 /*  f0e08f8:	01a66021 */ 	addu	$t4,$t5,$a2
 /*  f0e08fc:	afac0010 */ 	sw	$t4,0x10($sp)
-/*  f0e0900:	0fc55392 */ 	jal	func0f153a34
+/*  f0e0900:	0fc55392 */ 	jal	text0f153a34
 /*  f0e0904:	01653821 */ 	addu	$a3,$t3,$a1
 /*  f0e0908:	0c002e4d */ 	jal	viGetWidth
 /*  f0e090c:	00409025 */ 	move	$s2,$v0
@@ -4124,7 +4124,7 @@ glabel var7f1af1cc
 /*  f0e096c:	00000000 */ 	nop
 /*  f0e0970:	afa000e0 */ 	sw	$zero,0xe0($sp)
 .PB0f0e0974:
-/*  f0e0974:	0fc55498 */ 	jal	func0f153e4c
+/*  f0e0974:	0fc55498 */ 	jal	textResetBlends
 /*  f0e0978:	00000000 */ 	nop
 .PB0f0e097c:
 /*  f0e097c:	8e0801b4 */ 	lw	$t0,0x1b4($s0)
@@ -4249,7 +4249,7 @@ glabel var7f1af1cc
 /*  f0e0b40:	02402025 */ 	move	$a0,$s2
 /*  f0e0b44:	00409025 */ 	move	$s2,$v0
 .PB0f0e0b48:
-/*  f0e0b48:	0fc552e5 */ 	jal	func0f153780
+/*  f0e0b48:	0fc552e5 */ 	jal	text0f153780
 /*  f0e0b4c:	02402025 */ 	move	$a0,$s2
 /*  f0e0b50:	8fbf007c */ 	lw	$ra,0x7c($sp)
 /*  f0e0b54:	240a0001 */ 	li	$t2,0x1
@@ -4321,7 +4321,7 @@ glabel var7f1adef4
 /*  f0dfb3c:	3c018008 */ 	lui	$at,%hi(g_ScaleX)
 /*  f0dfb40:	ac22fac0 */ 	sw	$v0,%lo(g_ScaleX)($at)
 .L0f0dfb44:
-/*  f0dfb44:	0fc54d8a */ 	jal	func0f153628
+/*  f0dfb44:	0fc54d8a */ 	jal	text0f153628
 /*  f0dfb48:	02402025 */ 	or	$a0,$s2,$zero
 /*  f0dfb4c:	3c19800a */ 	lui	$t9,%hi(g_Vars+0x298)
 /*  f0dfb50:	8f39a258 */ 	lw	$t9,%lo(g_Vars+0x298)($t9)
@@ -4632,7 +4632,7 @@ glabel var7f1adef4
 /*  f0dffbc:	44801000 */ 	mtc1	$zero,$f2
 /*  f0dffc0:	00000000 */ 	nop
 .L0f0dffc4:
-/*  f0dffc4:	0fc54f08 */ 	jal	func0f153c20
+/*  f0dffc4:	0fc54f08 */ 	jal	textSetDiagonalBlend
 /*  f0dffc8:	e7a200c0 */ 	swc1	$f2,0xc0($sp)
 /*  f0dffcc:	920d0001 */ 	lbu	$t5,0x1($s0)
 /*  f0dffd0:	c7a200c0 */ 	lwc1	$f2,0xc0($sp)
@@ -4684,7 +4684,7 @@ glabel var7f1adef4
 /*  f0e0084:	afa00014 */ 	sw	$zero,0x14($sp)
 /*  f0e0088:	0326c021 */ 	addu	$t8,$t9,$a2
 /*  f0e008c:	afb80010 */ 	sw	$t8,0x10($sp)
-/*  f0e0090:	0fc54e8d */ 	jal	func0f153a34
+/*  f0e0090:	0fc54e8d */ 	jal	text0f153a34
 /*  f0e0094:	01c53821 */ 	addu	$a3,$t6,$a1
 /*  f0e0098:	0c002f02 */ 	jal	viGetWidth
 /*  f0e009c:	00409025 */ 	or	$s2,$v0,$zero
@@ -4715,7 +4715,7 @@ glabel var7f1adef4
 /*  f0e00fc:	00000000 */ 	nop
 /*  f0e0100:	afa000e0 */ 	sw	$zero,0xe0($sp)
 .L0f0e0104:
-/*  f0e0104:	0fc54f93 */ 	jal	func0f153e4c
+/*  f0e0104:	0fc54f93 */ 	jal	textResetBlends
 /*  f0e0108:	00000000 */ 	nop
 /*  f0e010c:	100000fe */ 	b	.L0f0e0508
 /*  f0e0110:	8e0801b4 */ 	lw	$t0,0x1b4($s0)
@@ -4789,7 +4789,7 @@ glabel var7f1adef4
 /*  f0e0214:	afab0010 */ 	sw	$t3,0x10($sp)
 /*  f0e0218:	afa00014 */ 	sw	$zero,0x14($sp)
 /*  f0e021c:	02402025 */ 	or	$a0,$s2,$zero
-/*  f0e0220:	0fc54e8d */ 	jal	func0f153a34
+/*  f0e0220:	0fc54e8d */ 	jal	text0f153a34
 /*  f0e0224:	01253821 */ 	addu	$a3,$t1,$a1
 /*  f0e0228:	0c002f02 */ 	jal	viGetWidth
 /*  f0e022c:	00409025 */ 	or	$s2,$v0,$zero
@@ -4877,7 +4877,7 @@ glabel var7f1adef4
 /*  f0e0364:	032f2021 */ 	addu	$a0,$t9,$t7
 /*  f0e0368:	01382821 */ 	addu	$a1,$t1,$t8
 /*  f0e036c:	44060000 */ 	mfc1	$a2,$f0
-/*  f0e0370:	0fc54f08 */ 	jal	func0f153c20
+/*  f0e0370:	0fc54f08 */ 	jal	textSetDiagonalBlend
 /*  f0e0374:	00000000 */ 	nop
 /*  f0e0378:	c7a200a8 */ 	lwc1	$f2,0xa8($sp)
 /*  f0e037c:	3c014f80 */ 	lui	$at,0x4f80
@@ -4951,7 +4951,7 @@ glabel var7f1adef4
 /*  f0e047c:	afa00014 */ 	sw	$zero,0x14($sp)
 /*  f0e0480:	01a66021 */ 	addu	$t4,$t5,$a2
 /*  f0e0484:	afac0010 */ 	sw	$t4,0x10($sp)
-/*  f0e0488:	0fc54e8d */ 	jal	func0f153a34
+/*  f0e0488:	0fc54e8d */ 	jal	text0f153a34
 /*  f0e048c:	01653821 */ 	addu	$a3,$t3,$a1
 /*  f0e0490:	0c002f02 */ 	jal	viGetWidth
 /*  f0e0494:	00409025 */ 	or	$s2,$v0,$zero
@@ -4982,7 +4982,7 @@ glabel var7f1adef4
 /*  f0e04f4:	00000000 */ 	nop
 /*  f0e04f8:	afa000e0 */ 	sw	$zero,0xe0($sp)
 .L0f0e04fc:
-/*  f0e04fc:	0fc54f93 */ 	jal	func0f153e4c
+/*  f0e04fc:	0fc54f93 */ 	jal	textResetBlends
 /*  f0e0500:	00000000 */ 	nop
 .L0f0e0504:
 /*  f0e0504:	8e0801b4 */ 	lw	$t0,0x1b4($s0)
@@ -5107,7 +5107,7 @@ glabel var7f1adef4
 /*  f0e06c8:	02402025 */ 	or	$a0,$s2,$zero
 /*  f0e06cc:	00409025 */ 	or	$s2,$v0,$zero
 .L0f0e06d0:
-/*  f0e06d0:	0fc54de0 */ 	jal	func0f153780
+/*  f0e06d0:	0fc54de0 */ 	jal	text0f153780
 /*  f0e06d4:	02402025 */ 	or	$a0,$s2,$zero
 /*  f0e06d8:	8fbf007c */ 	lw	$ra,0x7c($sp)
 /*  f0e06dc:	240a0001 */ 	addiu	$t2,$zero,0x1
@@ -5179,7 +5179,7 @@ glabel var7f1adef4
 /*  f0dcf1c:	3c018008 */ 	lui	$at,0x8008
 /*  f0dcf20:	ac222320 */ 	sw	$v0,0x2320($at)
 .NB0f0dcf24:
-/*  f0dcf24:	0fc5374a */ 	jal	func0f153628
+/*  f0dcf24:	0fc5374a */ 	jal	text0f153628
 /*  f0dcf28:	02402025 */ 	or	$a0,$s2,$zero
 /*  f0dcf2c:	3c19800a */ 	lui	$t9,0x800a
 /*  f0dcf30:	8f39e958 */ 	lw	$t9,-0x16a8($t9)
@@ -5500,7 +5500,7 @@ glabel var7f1adef4
 /*  f0dd3c4:	44801000 */ 	mtc1	$zero,$f2
 /*  f0dd3c8:	00000000 */ 	sll	$zero,$zero,0x0
 .NB0f0dd3cc:
-/*  f0dd3cc:	0fc5389f */ 	jal	func0f153c20
+/*  f0dd3cc:	0fc5389f */ 	jal	textSetDiagonalBlend
 /*  f0dd3d0:	e7a200c0 */ 	swc1	$f2,0xc0($sp)
 /*  f0dd3d4:	920d0001 */ 	lbu	$t5,0x1($s0)
 /*  f0dd3d8:	c7a200c0 */ 	lwc1	$f2,0xc0($sp)
@@ -5552,7 +5552,7 @@ glabel var7f1adef4
 /*  f0dd48c:	afa00014 */ 	sw	$zero,0x14($sp)
 /*  f0dd490:	01267821 */ 	addu	$t7,$t1,$a2
 /*  f0dd494:	afaf0010 */ 	sw	$t7,0x10($sp)
-/*  f0dd498:	0fc53824 */ 	jal	func0f153a34
+/*  f0dd498:	0fc53824 */ 	jal	text0f153a34
 /*  f0dd49c:	03053821 */ 	addu	$a3,$t8,$a1
 /*  f0dd4a0:	0c002f77 */ 	jal	viGetWidth
 /*  f0dd4a4:	00409025 */ 	or	$s2,$v0,$zero
@@ -5583,7 +5583,7 @@ glabel var7f1adef4
 /*  f0dd504:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f0dd508:	afa000e0 */ 	sw	$zero,0xe0($sp)
 .NB0f0dd50c:
-/*  f0dd50c:	0fc5392a */ 	jal	func0f153e4c
+/*  f0dd50c:	0fc5392a */ 	jal	textResetBlends
 /*  f0dd510:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f0dd514:	100000fe */ 	beqz	$zero,.NB0f0dd910
 /*  f0dd518:	8e0c01b4 */ 	lw	$t4,0x1b4($s0)
@@ -5657,7 +5657,7 @@ glabel var7f1adef4
 /*  f0dd61c:	afaa0010 */ 	sw	$t2,0x10($sp)
 /*  f0dd620:	afa00014 */ 	sw	$zero,0x14($sp)
 /*  f0dd624:	02402025 */ 	or	$a0,$s2,$zero
-/*  f0dd628:	0fc53824 */ 	jal	func0f153a34
+/*  f0dd628:	0fc53824 */ 	jal	text0f153a34
 /*  f0dd62c:	01653821 */ 	addu	$a3,$t3,$a1
 /*  f0dd630:	0c002f77 */ 	jal	viGetWidth
 /*  f0dd634:	00409025 */ 	or	$s2,$v0,$zero
@@ -5745,7 +5745,7 @@ glabel var7f1adef4
 /*  f0dd76c:	01392021 */ 	addu	$a0,$t1,$t9
 /*  f0dd770:	016f2821 */ 	addu	$a1,$t3,$t7
 /*  f0dd774:	44060000 */ 	mfc1	$a2,$f0
-/*  f0dd778:	0fc5389f */ 	jal	func0f153c20
+/*  f0dd778:	0fc5389f */ 	jal	textSetDiagonalBlend
 /*  f0dd77c:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f0dd780:	c7a200a8 */ 	lwc1	$f2,0xa8($sp)
 /*  f0dd784:	3c014f80 */ 	lui	$at,0x4f80
@@ -5819,7 +5819,7 @@ glabel var7f1adef4
 /*  f0dd884:	afa00014 */ 	sw	$zero,0x14($sp)
 /*  f0dd888:	01a64021 */ 	addu	$t0,$t5,$a2
 /*  f0dd88c:	afa80010 */ 	sw	$t0,0x10($sp)
-/*  f0dd890:	0fc53824 */ 	jal	func0f153a34
+/*  f0dd890:	0fc53824 */ 	jal	text0f153a34
 /*  f0dd894:	01453821 */ 	addu	$a3,$t2,$a1
 /*  f0dd898:	0c002f77 */ 	jal	viGetWidth
 /*  f0dd89c:	00409025 */ 	or	$s2,$v0,$zero
@@ -5850,7 +5850,7 @@ glabel var7f1adef4
 /*  f0dd8fc:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f0dd900:	afa000e0 */ 	sw	$zero,0xe0($sp)
 .NB0f0dd904:
-/*  f0dd904:	0fc5392a */ 	jal	func0f153e4c
+/*  f0dd904:	0fc5392a */ 	jal	textResetBlends
 /*  f0dd908:	00000000 */ 	sll	$zero,$zero,0x0
 .NB0f0dd90c:
 /*  f0dd90c:	8e0c01b4 */ 	lw	$t4,0x1b4($s0)
@@ -5975,7 +5975,7 @@ glabel var7f1adef4
 /*  f0ddad0:	02402025 */ 	or	$a0,$s2,$zero
 /*  f0ddad4:	00409025 */ 	or	$s2,$v0,$zero
 .NB0f0ddad8:
-/*  f0ddad8:	0fc537a0 */ 	jal	func0f153780
+/*  f0ddad8:	0fc537a0 */ 	jal	text0f153780
 /*  f0ddadc:	02402025 */ 	or	$a0,$s2,$zero
 /*  f0ddae0:	8fbf007c */ 	lw	$ra,0x7c($sp)
 /*  f0ddae4:	240e0001 */ 	addiu	$t6,$zero,0x1
@@ -6020,7 +6020,7 @@ glabel var7f1adef4
 //	}
 //
 //	// b44
-//	gdl = func0f153628(gdl);
+//	gdl = text0f153628(gdl);
 //
 //	// b4c
 //	if ((g_Vars.coopplayernum >= 0 || g_Vars.antiplayernum >= 0)
@@ -6129,7 +6129,7 @@ glabel var7f1adef4
 //
 //				tmp = msg->timer * 7.0f;
 //
-//				func0f153c20(x, y, tmp, 0);
+//				textSetDiagonalBlend(x, y, tmp, DIAGMODE_FADEIN);
 //
 //				// fd8
 //				if (msg->boxed) {
@@ -6139,7 +6139,7 @@ glabel var7f1adef4
 //					gdl = textRenderProjected(gdl, &x, &y, msg->text, msg->font1, msg->font2, textcolour, viGetWidth(), viGetHeight(), 0, 0);
 //				} else {
 //					// 078
-//					gdl = func0f153a34(gdl, x, y, x + msg->width, y + msg->height, 0);
+//					gdl = text0f153a34(gdl, x, y, x + msg->width, y + msg->height, 0);
 //					// 0e4
 //					gdl = textRender(gdl, &x, &y, msg->text, msg->font1, msg->font2, textcolour, glowcolour, viGetWidth(), viGetHeight(), 0, 0);
 //				}
@@ -6148,7 +6148,7 @@ glabel var7f1adef4
 //					timerthing = 0;
 //				}
 //
-//				func0f153e4c();
+//				textResetBlends();
 //			}
 //			break;
 //		case HUDMSGSTATE_ONSCREEN: // f0e0114
@@ -6166,7 +6166,7 @@ glabel var7f1adef4
 //				gdl = textRenderProjected(gdl, &x, &y, msg->text, msg->font1, msg->font2, textcolour, viGetWidth(), viGetHeight(), 0, 0);
 //			} else {
 //				// 200
-//				gdl = func0f153a34(gdl, x, y, x + msg->width, y + msg->height, 0);
+//				gdl = text0f153a34(gdl, x, y, x + msg->width, y + msg->height, 0);
 //				// 274
 //				gdl = textRender(gdl, &x, &y, msg->text, msg->font1, msg->font2, textcolour, glowcolour, viGetWidth(), viGetHeight(), 0, 0);
 //			}
@@ -6191,7 +6191,7 @@ glabel var7f1adef4
 //				tmp = (spa8 - msg->timer) * 7.0f;
 //
 //				// 370
-//				func0f153c20(x + msg->width, y + msg->height, tmp, 2);
+//				textSetDiagonalBlend(x + msg->width, y + msg->height, tmp, DIAGMODE_FADEOUT);
 //
 //				// 394
 //				if (spa8 > 30.0f) {
@@ -6213,7 +6213,7 @@ glabel var7f1adef4
 //					gdl = textRenderProjected(gdl, &x, &y, msg->text, msg->font1, msg->font2, textcolour, viGetWidth(), viGetHeight(), 0, 0);
 //				} else {
 //					// 474
-//					gdl = func0f153a34(gdl, x, y, x + msg->width, y + msg->height, 0);
+//					gdl = text0f153a34(gdl, x, y, x + msg->width, y + msg->height, 0);
 //					// 4dc
 //					gdl = textRender(gdl, &x, &y, msg->text, msg->font1, msg->font2, textcolour, glowcolour, viGetWidth(), viGetHeight(), 0, 0);
 //				}
@@ -6222,7 +6222,7 @@ glabel var7f1adef4
 //					timerthing = 0;
 //				}
 //
-//				func0f153e4c();
+//				textResetBlends();
 //			}
 //			break;
 //		}
@@ -6251,7 +6251,7 @@ glabel var7f1adef4
 //		gdl = countdownTimerRender(gdl);
 //	}
 //
-//	gdl = func0f153780(gdl);
+//	gdl = text0f153780(gdl);
 //
 //	g_ScaleX = 1;
 //
@@ -291,7 +291,7 @@ void lvReset(s32 stagenum)
 	func0f011124(true);
 	surfaceReset();
 	texReset();
-	fontsReset();
+	textReset();
 	hudmsgsReset();

 	if (stagenum == STAGE_TEST_OLD) {
@@ -549,7 +549,7 @@ Gfx *lvRenderFade(Gfx *gdl)
 			viGetViewLeft() + viGetViewWidth() + 1,
 			viGetViewTop() + viGetViewHeight() - inset + 2);

-	return func0f153838(gdl);
+	return text0f153838(gdl);
 }

 bool lvIsFadeActive(void)
@@ -689,8 +689,8 @@ Gfx *lvRenderManPosIfEnabled(Gfx *gdl)
 		x = viGetViewLeft() + 17;
 		y = viGetViewTop() + 17;
 		y2 = y + 10;
-		gdl = func0f153628(gdl);
-		gdl = func0f153a34(gdl, 0, y - 1, viGetWidth(), y2 + 1, 0x00000064);
+		gdl = text0f153628(gdl);
+		gdl = text0f153a34(gdl, 0, y - 1, viGetWidth(), y2 + 1, 0x00000064);

 		gdl = textRenderProjected(gdl, &x, &y, bufroom, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0xffffffff, viGetWidth(), viGetHeight(), 0, 0);

@@ -706,7 +706,7 @@ Gfx *lvRenderManPosIfEnabled(Gfx *gdl)
 		x = viGetViewLeft() + 249;
 		gdl = textRenderProjected(gdl, &x, &y, bufdir, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0xffffffff, viGetWidth(), viGetHeight(), 0, 0);

-		gdl = func0f153780(gdl);
+		gdl = text0f153780(gdl);
 	}

 	return gdl;
@@ -1362,7 +1362,7 @@ Gfx *lvRender(Gfx *gdl)
 									viGetViewLeft() + viGetViewWidth(),
 									viGetViewTop() + viGetViewHeight());

-								gdl = func0f153838(gdl);
+								gdl = text0f153838(gdl);
 							}
 						}
 #endif
@@ -1569,12 +1569,12 @@ Gfx *lvRender(Gfx *gdl)
 						}

 						if (alpha) {
-							gdl = func0f153628(gdl);
-							gdl = func0f153a34(gdl,
+							gdl = text0f153628(gdl);
+							gdl = text0f153a34(gdl,
 									viGetViewLeft(), viGetViewTop(),
 									viGetViewLeft() + viGetViewWidth(),
 									viGetViewTop() + viGetViewHeight(), 0xffffff00 | alpha);
-							gdl = func0f153780(gdl);
+							gdl = text0f153780(gdl);
 						}
 					}
 				}
@@ -2422,7 +2422,7 @@ glabel jtbl_var7f1b2d9c
 /*  f10543c:	8d4f0004 */ 	lw	$t7,0x4($t2)
 /*  f105440:	afaa0134 */ 	sw	$t2,0x134($sp)
 /*  f105444:	25ee0003 */ 	addiu	$t6,$t7,0x3
-/*  f105448:	0fc54d8a */ 	jal	func0f153628
+/*  f105448:	0fc54d8a */ 	jal	text0f153628
 /*  f10544c:	afae012c */ 	sw	$t6,0x12c($sp)
 /*  f105450:	8fb90050 */ 	lw	$t9,0x50($sp)
 /*  f105454:	3c188007 */ 	lui	$t8,%hi(g_StageNames)
@@ -2495,7 +2495,7 @@ glabel jtbl_var7f1b2d9c
 /*  f105560:	0fc5580f */ 	jal	textRenderProjected
 /*  f105564:	afaf0018 */ 	sw	$t7,0x18($sp)
 /*  f105568:	afa20138 */ 	sw	$v0,0x138($sp)
-/*  f10556c:	0fc54de0 */ 	jal	func0f153780
+/*  f10556c:	0fc54de0 */ 	jal	text0f153780
 /*  f105570:	00402025 */ 	or	$a0,$v0,$zero
 /*  f105574:	10000005 */ 	b	.L0f10558c
 /*  f105578:	8fbf003c */ 	lw	$ra,0x3c($sp)
@@ -3367,7 +3367,7 @@ glabel jtbl_var7f1ad09cnb
 /*  f10118c:	8d4f0004 */ 	lw	$t7,0x4($t2)
 /*  f101190:	afaa012c */ 	sw	$t2,0x12c($sp)
 /*  f101194:	25f80003 */ 	addiu	$t8,$t7,0x3
-/*  f101198:	0fc5374a */ 	jal	func0f153628
+/*  f101198:	0fc5374a */ 	jal	text0f153628
 /*  f10119c:	afb80124 */ 	sw	$t8,0x124($sp)
 /*  f1011a0:	8fb9004c */ 	lw	$t9,0x4c($sp)
 /*  f1011a4:	3c0e8007 */ 	lui	$t6,0x8007
@@ -3440,7 +3440,7 @@ glabel jtbl_var7f1ad09cnb
 /*  f1012b0:	0fc541a6 */ 	jal	textRenderProjected
 /*  f1012b4:	afaf0018 */ 	sw	$t7,0x18($sp)
 /*  f1012b8:	afa20130 */ 	sw	$v0,0x130($sp)
-/*  f1012bc:	0fc537a0 */ 	jal	func0f153780
+/*  f1012bc:	0fc537a0 */ 	jal	text0f153780
 /*  f1012c0:	00402025 */ 	or	$a0,$v0,$zero
 /*  f1012c4:	10000005 */ 	beqz	$zero,.NB0f1012dc
 /*  f1012c8:	8fbf003c */ 	lw	$ra,0x3c($sp)
@@ -3748,7 +3748,7 @@ struct optiongroup missions[] = {
 //		x = renderdata->x + 62;
 //		y = renderdata->y + 3;
 //
-//		gdl = func0f153628(gdl);
+//		gdl = text0f153628(gdl);
 //
 //		// Draw first part of name
 //		strcpy(text, langGet(g_StageNames[stageindex].name1));
@@ -3763,7 +3763,7 @@ struct optiongroup missions[] = {
 //		gdl = textRenderProjected(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm,
 //				renderdata->colour, viGetWidth(), viGetHeight(), 0, 0);
 //
-//		gdl = func0f153780(gdl);
+//		gdl = text0f153780(gdl);
 //
 //		return (s32)gdl;
 //	case MENUOP_GETOPTIONHEIGHT:
@@ -335,7 +335,7 @@ glabel menuRenderBanner
 /*  f0f1b54:	afb8006c */ 	sw	$t8,0x6c($sp)
 /*  f0f1b58:	afaa0068 */ 	sw	$t2,0x68($sp)
 /*  f0f1b5c:	afa60084 */ 	sw	$a2,0x84($sp)
-/*  f0f1b60:	0fc54bce */ 	jal	gfxSetPrimColour
+/*  f0f1b60:	0fc54bce */ 	jal	textSetPrimColour
 /*  f0f1b64:	2405007f */ 	li	$a1,0x7f
 /*  f0f1b68:	3c038008 */ 	lui	$v1,0x8008
 /*  f0f1b6c:	246300f4 */ 	addiu	$v1,$v1,0xf4
@@ -363,11 +363,11 @@ glabel menuRenderBanner
 /*  f0f1bc4:	31cf03ff */ 	andi	$t7,$t6,0x3ff
 /*  f0f1bc8:	000fcb80 */ 	sll	$t9,$t7,0xe
 /*  f0f1bcc:	032a5825 */ 	or	$t3,$t9,$t2
-/*  f0f1bd0:	0fc54be5 */ 	jal	func0f153838
+/*  f0f1bd0:	0fc54be5 */ 	jal	text0f153838
 /*  f0f1bd4:	ac4b0004 */ 	sw	$t3,0x4($v0)
 /*  f0f1bd8:	3c10f600 */ 	lui	$s0,0xf600
 /*  f0f1bdc:	00402025 */ 	move	$a0,$v0
-/*  f0f1be0:	0fc54bce */ 	jal	gfxSetPrimColour
+/*  f0f1be0:	0fc54bce */ 	jal	textSetPrimColour
 /*  f0f1be4:	24057f7f */ 	li	$a1,0x7f7f
 /*  f0f1be8:	3c038008 */ 	lui	$v1,0x8008
 /*  f0f1bec:	246300f4 */ 	addiu	$v1,$v1,0xf4
@@ -394,11 +394,11 @@ glabel menuRenderBanner
 /*  f0f1c40:	31e903ff */ 	andi	$t1,$t7,0x3ff
 /*  f0f1c44:	0009cb80 */ 	sll	$t9,$t1,0xe
 /*  f0f1c48:	032b6025 */ 	or	$t4,$t9,$t3
-/*  f0f1c4c:	0fc54be5 */ 	jal	func0f153838
+/*  f0f1c4c:	0fc54be5 */ 	jal	text0f153838
 /*  f0f1c50:	ac4c0004 */ 	sw	$t4,0x4($v0)
 /*  f0f1c54:	3c057f7f */ 	lui	$a1,0x7f7f
 /*  f0f1c58:	34a5ff7f */ 	ori	$a1,$a1,0xff7f
-/*  f0f1c5c:	0fc54bce */ 	jal	gfxSetPrimColour
+/*  f0f1c5c:	0fc54bce */ 	jal	textSetPrimColour
 /*  f0f1c60:	00402025 */ 	move	$a0,$v0
 /*  f0f1c64:	3c038008 */ 	lui	$v1,0x8008
 /*  f0f1c68:	246300f4 */ 	addiu	$v1,$v1,0xf4
@@ -452,9 +452,9 @@ glabel menuRenderBanner
 /*  f0f1d28:	330b03ff */ 	andi	$t3,$t8,0x3ff
 /*  f0f1d2c:	000b7380 */ 	sll	$t6,$t3,0xe
 /*  f0f1d30:	01cac825 */ 	or	$t9,$t6,$t2
-/*  f0f1d34:	0fc54be5 */ 	jal	func0f153838
+/*  f0f1d34:	0fc54be5 */ 	jal	text0f153838
 /*  f0f1d38:	ac59000c */ 	sw	$t9,0xc($v0)
-/*  f0f1d3c:	0fc54b55 */ 	jal	func0f153628
+/*  f0f1d3c:	0fc54b55 */ 	jal	text0f153628
 /*  f0f1d40:	00402025 */ 	move	$a0,$v0
 /*  f0f1d44:	8fac0094 */ 	lw	$t4,0x94($sp)
 /*  f0f1d48:	8fb800ac */ 	lw	$t8,0xac($sp)
@@ -614,7 +614,7 @@ glabel menuRenderBanner
 /*  f0f1f9c:	afaf0014 */ 	sw	$t7,0x14($sp)
 /*  f0f1fa0:	0fc55886 */ 	jal	textRenderProjected
 /*  f0f1fa4:	afa9001c */ 	sw	$t1,0x1c($sp)
-/*  f0f1fa8:	0fc54bb7 */ 	jal	func0f153780
+/*  f0f1fa8:	0fc54bb7 */ 	jal	text0f153780
 /*  f0f1fac:	00402025 */ 	move	$a0,$v0
 /*  f0f1fb0:	8fbf003c */ 	lw	$ra,0x3c($sp)
 /*  f0f1fb4:	8fb00038 */ 	lw	$s0,0x38($sp)
@@ -713,7 +713,7 @@ glabel menuRenderBanner
 /*  f0f1548:	afa60080 */ 	sw	$a2,0x80($sp)
 /*  f0f154c:	afab006c */ 	sw	$t3,0x6c($sp)
 /*  f0f1550:	afae0068 */ 	sw	$t6,0x68($sp)
-/*  f0f1554:	0fc5513c */ 	jal	gfxSetPrimColour
+/*  f0f1554:	0fc5513c */ 	jal	textSetPrimColour
 /*  f0f1558:	afa60084 */ 	sw	$a2,0x84($sp)
 /*  f0f155c:	3c038008 */ 	lui	$v1,0x8008
 /*  f0f1560:	24630020 */ 	addiu	$v1,$v1,0x20
@@ -742,10 +742,10 @@ glabel menuRenderBanner
 /*  f0f15bc:	312a03ff */ 	andi	$t2,$t1,0x3ff
 /*  f0f15c0:	000a6380 */ 	sll	$t4,$t2,0xe
 /*  f0f15c4:	018e7825 */ 	or	$t7,$t4,$t6
-/*  f0f15c8:	0fc55153 */ 	jal	func0f153838
+/*  f0f15c8:	0fc55153 */ 	jal	text0f153838
 /*  f0f15cc:	ac4f0004 */ 	sw	$t7,0x4($v0)
 /*  f0f15d0:	00402025 */ 	move	$a0,$v0
-/*  f0f15d4:	0fc5513c */ 	jal	gfxSetPrimColour
+/*  f0f15d4:	0fc5513c */ 	jal	textSetPrimColour
 /*  f0f15d8:	24057f7f */ 	li	$a1,0x7f7f
 /*  f0f15dc:	3c038008 */ 	lui	$v1,0x8008
 /*  f0f15e0:	24630020 */ 	addiu	$v1,$v1,0x20
@@ -771,11 +771,11 @@ glabel menuRenderBanner
 /*  f0f1630:	314d03ff */ 	andi	$t5,$t2,0x3ff
 /*  f0f1634:	000d6380 */ 	sll	$t4,$t5,0xe
 /*  f0f1638:	018b7825 */ 	or	$t7,$t4,$t3
-/*  f0f163c:	0fc55153 */ 	jal	func0f153838
+/*  f0f163c:	0fc55153 */ 	jal	text0f153838
 /*  f0f1640:	ac4f0004 */ 	sw	$t7,0x4($v0)
 /*  f0f1644:	3c057f7f */ 	lui	$a1,0x7f7f
 /*  f0f1648:	34a5ff7f */ 	ori	$a1,$a1,0xff7f
-/*  f0f164c:	0fc5513c */ 	jal	gfxSetPrimColour
+/*  f0f164c:	0fc5513c */ 	jal	textSetPrimColour
 /*  f0f1650:	00402025 */ 	move	$a0,$v0
 /*  f0f1654:	3c038008 */ 	lui	$v1,0x8008
 /*  f0f1658:	24630020 */ 	addiu	$v1,$v1,0x20
@@ -827,9 +827,9 @@ glabel menuRenderBanner
 /*  f0f1710:	31ee03ff */ 	andi	$t6,$t7,0x3ff
 /*  f0f1714:	000e5b80 */ 	sll	$t3,$t6,0xe
 /*  f0f1718:	01695025 */ 	or	$t2,$t3,$t1
-/*  f0f171c:	0fc55153 */ 	jal	func0f153838
+/*  f0f171c:	0fc55153 */ 	jal	text0f153838
 /*  f0f1720:	ac4a000c */ 	sw	$t2,0xc($v0)
-/*  f0f1724:	0fc550cf */ 	jal	func0f153628
+/*  f0f1724:	0fc550cf */ 	jal	text0f153628
 /*  f0f1728:	00402025 */ 	move	$a0,$v0
 /*  f0f172c:	8fad0094 */ 	lw	$t5,0x94($sp)
 /*  f0f1730:	8fac00ac */ 	lw	$t4,0xac($sp)
@@ -1037,7 +1037,7 @@ glabel menuRenderBanner
 /*  f0f1a40:	afb80010 */ 	sw	$t8,0x10($sp)
 /*  f0f1a44:	00408825 */ 	move	$s1,$v0
 .PF0f0f1a48:
-/*  f0f1a48:	0fc55125 */ 	jal	func0f153780
+/*  f0f1a48:	0fc55125 */ 	jal	text0f153780
 /*  f0f1a4c:	02202025 */ 	move	$a0,$s1
 /*  f0f1a50:	8fbf003c */ 	lw	$ra,0x3c($sp)
 /*  f0f1a54:	8fb00034 */ 	lw	$s0,0x34($sp)
@@ -1136,7 +1136,7 @@ glabel menuRenderBanner
 /*  f0f1388:	afa60080 */ 	sw	$a2,0x80($sp)
 /*  f0f138c:	afab006c */ 	sw	$t3,0x6c($sp)
 /*  f0f1390:	afae0068 */ 	sw	$t6,0x68($sp)
-/*  f0f1394:	0fc552fc */ 	jal	gfxSetPrimColour
+/*  f0f1394:	0fc552fc */ 	jal	textSetPrimColour
 /*  f0f1398:	afa60084 */ 	sw	$a2,0x84($sp)
 /*  f0f139c:	3c038008 */ 	lui	$v1,0x8008
 /*  f0f13a0:	24631f90 */ 	addiu	$v1,$v1,0x1f90
@@ -1165,10 +1165,10 @@ glabel menuRenderBanner
 /*  f0f13fc:	312a03ff */ 	andi	$t2,$t1,0x3ff
 /*  f0f1400:	000a6380 */ 	sll	$t4,$t2,0xe
 /*  f0f1404:	018e7825 */ 	or	$t7,$t4,$t6
-/*  f0f1408:	0fc55313 */ 	jal	func0f153838
+/*  f0f1408:	0fc55313 */ 	jal	text0f153838
 /*  f0f140c:	ac4f0004 */ 	sw	$t7,0x4($v0)
 /*  f0f1410:	00402025 */ 	move	$a0,$v0
-/*  f0f1414:	0fc552fc */ 	jal	gfxSetPrimColour
+/*  f0f1414:	0fc552fc */ 	jal	textSetPrimColour
 /*  f0f1418:	24057f7f */ 	li	$a1,0x7f7f
 /*  f0f141c:	3c038008 */ 	lui	$v1,0x8008
 /*  f0f1420:	24631f90 */ 	addiu	$v1,$v1,0x1f90
@@ -1194,11 +1194,11 @@ glabel menuRenderBanner
 /*  f0f1470:	314d03ff */ 	andi	$t5,$t2,0x3ff
 /*  f0f1474:	000d6380 */ 	sll	$t4,$t5,0xe
 /*  f0f1478:	018b7825 */ 	or	$t7,$t4,$t3
-/*  f0f147c:	0fc55313 */ 	jal	func0f153838
+/*  f0f147c:	0fc55313 */ 	jal	text0f153838
 /*  f0f1480:	ac4f0004 */ 	sw	$t7,0x4($v0)
 /*  f0f1484:	3c057f7f */ 	lui	$a1,0x7f7f
 /*  f0f1488:	34a5ff7f */ 	ori	$a1,$a1,0xff7f
-/*  f0f148c:	0fc552fc */ 	jal	gfxSetPrimColour
+/*  f0f148c:	0fc552fc */ 	jal	textSetPrimColour
 /*  f0f1490:	00402025 */ 	move	$a0,$v0
 /*  f0f1494:	3c038008 */ 	lui	$v1,0x8008
 /*  f0f1498:	24631f90 */ 	addiu	$v1,$v1,0x1f90
@@ -1250,9 +1250,9 @@ glabel menuRenderBanner
 /*  f0f1550:	31ee03ff */ 	andi	$t6,$t7,0x3ff
 /*  f0f1554:	000e5b80 */ 	sll	$t3,$t6,0xe
 /*  f0f1558:	01695025 */ 	or	$t2,$t3,$t1
-/*  f0f155c:	0fc55313 */ 	jal	func0f153838
+/*  f0f155c:	0fc55313 */ 	jal	text0f153838
 /*  f0f1560:	ac4a000c */ 	sw	$t2,0xc($v0)
-/*  f0f1564:	0fc5528f */ 	jal	func0f153628
+/*  f0f1564:	0fc5528f */ 	jal	text0f153628
 /*  f0f1568:	00402025 */ 	move	$a0,$v0
 /*  f0f156c:	8fad0094 */ 	lw	$t5,0x94($sp)
 /*  f0f1570:	8fac00ac */ 	lw	$t4,0xac($sp)
@@ -1460,7 +1460,7 @@ glabel menuRenderBanner
 /*  f0f1880:	afb80010 */ 	sw	$t8,0x10($sp)
 /*  f0f1884:	00408825 */ 	move	$s1,$v0
 .PB0f0f1888:
-/*  f0f1888:	0fc552e5 */ 	jal	func0f153780
+/*  f0f1888:	0fc552e5 */ 	jal	text0f153780
 /*  f0f188c:	02202025 */ 	move	$a0,$s1
 /*  f0f1890:	8fbf003c */ 	lw	$ra,0x3c($sp)
 /*  f0f1894:	8fb00034 */ 	lw	$s0,0x34($sp)
@@ -1555,7 +1555,7 @@ glabel menuRenderBanner
 /*  f0f0e1c:	afa60080 */ 	sw	$a2,0x80($sp)
 /*  f0f0e20:	afab006c */ 	sw	$t3,0x6c($sp)
 /*  f0f0e24:	afae0068 */ 	sw	$t6,0x68($sp)
-/*  f0f0e28:	0fc54df7 */ 	jal	gfxSetPrimColour
+/*  f0f0e28:	0fc54df7 */ 	jal	textSetPrimColour
 /*  f0f0e2c:	afa60084 */ 	sw	$a2,0x84($sp)
 /*  f0f0e30:	3c038008 */ 	lui	$v1,%hi(g_ScaleX)
 /*  f0f0e34:	2463fac0 */ 	addiu	$v1,$v1,%lo(g_ScaleX)
@@ -1584,10 +1584,10 @@ glabel menuRenderBanner
 /*  f0f0e90:	312a03ff */ 	andi	$t2,$t1,0x3ff
 /*  f0f0e94:	000a6380 */ 	sll	$t4,$t2,0xe
 /*  f0f0e98:	018e7825 */ 	or	$t7,$t4,$t6
-/*  f0f0e9c:	0fc54e0e */ 	jal	func0f153838
+/*  f0f0e9c:	0fc54e0e */ 	jal	text0f153838
 /*  f0f0ea0:	ac4f0004 */ 	sw	$t7,0x4($v0)
 /*  f0f0ea4:	00402025 */ 	or	$a0,$v0,$zero
-/*  f0f0ea8:	0fc54df7 */ 	jal	gfxSetPrimColour
+/*  f0f0ea8:	0fc54df7 */ 	jal	textSetPrimColour
 /*  f0f0eac:	24057f7f */ 	addiu	$a1,$zero,0x7f7f
 /*  f0f0eb0:	3c038008 */ 	lui	$v1,%hi(g_ScaleX)
 /*  f0f0eb4:	2463fac0 */ 	addiu	$v1,$v1,%lo(g_ScaleX)
@@ -1613,11 +1613,11 @@ glabel menuRenderBanner
 /*  f0f0f04:	314d03ff */ 	andi	$t5,$t2,0x3ff
 /*  f0f0f08:	000d6380 */ 	sll	$t4,$t5,0xe
 /*  f0f0f0c:	018b7825 */ 	or	$t7,$t4,$t3
-/*  f0f0f10:	0fc54e0e */ 	jal	func0f153838
+/*  f0f0f10:	0fc54e0e */ 	jal	text0f153838
 /*  f0f0f14:	ac4f0004 */ 	sw	$t7,0x4($v0)
 /*  f0f0f18:	3c057f7f */ 	lui	$a1,0x7f7f
 /*  f0f0f1c:	34a5ff7f */ 	ori	$a1,$a1,0xff7f
-/*  f0f0f20:	0fc54df7 */ 	jal	gfxSetPrimColour
+/*  f0f0f20:	0fc54df7 */ 	jal	textSetPrimColour
 /*  f0f0f24:	00402025 */ 	or	$a0,$v0,$zero
 /*  f0f0f28:	3c038008 */ 	lui	$v1,%hi(g_ScaleX)
 /*  f0f0f2c:	2463fac0 */ 	addiu	$v1,$v1,%lo(g_ScaleX)
@@ -1669,9 +1669,9 @@ glabel menuRenderBanner
 /*  f0f0fe4:	31ee03ff */ 	andi	$t6,$t7,0x3ff
 /*  f0f0fe8:	000e5b80 */ 	sll	$t3,$t6,0xe
 /*  f0f0fec:	01695025 */ 	or	$t2,$t3,$t1
-/*  f0f0ff0:	0fc54e0e */ 	jal	func0f153838
+/*  f0f0ff0:	0fc54e0e */ 	jal	text0f153838
 /*  f0f0ff4:	ac4a000c */ 	sw	$t2,0xc($v0)
-/*  f0f0ff8:	0fc54d8a */ 	jal	func0f153628
+/*  f0f0ff8:	0fc54d8a */ 	jal	text0f153628
 /*  f0f0ffc:	00402025 */ 	or	$a0,$v0,$zero
 /*  f0f1000:	8fad0094 */ 	lw	$t5,0x94($sp)
 /*  f0f1004:	8fac00ac */ 	lw	$t4,0xac($sp)
@@ -1879,7 +1879,7 @@ glabel menuRenderBanner
 /*  f0f1314:	afb80010 */ 	sw	$t8,0x10($sp)
 /*  f0f1318:	00408825 */ 	or	$s1,$v0,$zero
 .L0f0f131c:
-/*  f0f131c:	0fc54de0 */ 	jal	func0f153780
+/*  f0f131c:	0fc54de0 */ 	jal	text0f153780
 /*  f0f1320:	02202025 */ 	or	$a0,$s1,$zero
 /*  f0f1324:	8fbf003c */ 	lw	$ra,0x3c($sp)
 /*  f0f1328:	8fb00034 */ 	lw	$s0,0x34($sp)
@@ -1963,7 +1963,7 @@ glabel menuRenderBanner
 /*  f0edaf8:	afad0074 */ 	sw	$t5,0x74($sp)
 /*  f0edafc:	afb80070 */ 	sw	$t8,0x70($sp)
 /*  f0edb00:	afa6008c */ 	sw	$a2,0x8c($sp)
-/*  f0edb04:	0fc537b7 */ 	jal	gfxSetPrimColour
+/*  f0edb04:	0fc537b7 */ 	jal	textSetPrimColour
 /*  f0edb08:	2405007f */ 	addiu	$a1,$zero,0x7f
 /*  f0edb0c:	3c038008 */ 	lui	$v1,0x8008
 /*  f0edb10:	24632320 */ 	addiu	$v1,$v1,0x2320
@@ -1992,10 +1992,10 @@ glabel menuRenderBanner
 /*  f0edb6c:	312a03ff */ 	andi	$t2,$t1,0x3ff
 /*  f0edb70:	000a5b80 */ 	sll	$t3,$t2,0xe
 /*  f0edb74:	016c7825 */ 	or	$t7,$t3,$t4
-/*  f0edb78:	0fc537ce */ 	jal	func0f153838
+/*  f0edb78:	0fc537ce */ 	jal	text0f153838
 /*  f0edb7c:	ac4f0004 */ 	sw	$t7,0x4($v0)
 /*  f0edb80:	00402025 */ 	or	$a0,$v0,$zero
-/*  f0edb84:	0fc537b7 */ 	jal	gfxSetPrimColour
+/*  f0edb84:	0fc537b7 */ 	jal	textSetPrimColour
 /*  f0edb88:	24057f7f */ 	addiu	$a1,$zero,0x7f7f
 /*  f0edb8c:	3c038008 */ 	lui	$v1,0x8008
 /*  f0edb90:	24632320 */ 	addiu	$v1,$v1,0x2320
@@ -2021,11 +2021,11 @@ glabel menuRenderBanner
 /*  f0edbe0:	310903ff */ 	andi	$t1,$t0,0x3ff
 /*  f0edbe4:	00095380 */ 	sll	$t2,$t1,0xe
 /*  f0edbe8:	014b6825 */ 	or	$t5,$t2,$t3
-/*  f0edbec:	0fc537ce */ 	jal	func0f153838
+/*  f0edbec:	0fc537ce */ 	jal	text0f153838
 /*  f0edbf0:	ac4d0004 */ 	sw	$t5,0x4($v0)
 /*  f0edbf4:	3c057f7f */ 	lui	$a1,0x7f7f
 /*  f0edbf8:	34a5ff7f */ 	ori	$a1,$a1,0xff7f
-/*  f0edbfc:	0fc537b7 */ 	jal	gfxSetPrimColour
+/*  f0edbfc:	0fc537b7 */ 	jal	textSetPrimColour
 /*  f0edc00:	00402025 */ 	or	$a0,$v0,$zero
 /*  f0edc04:	3c038008 */ 	lui	$v1,0x8008
 /*  f0edc08:	24632320 */ 	addiu	$v1,$v1,0x2320
@@ -2077,9 +2077,9 @@ glabel menuRenderBanner
 /*  f0edcc0:	332803ff */ 	andi	$t0,$t9,0x3ff
 /*  f0edcc4:	00085380 */ 	sll	$t2,$t0,0xe
 /*  f0edcc8:	014b6825 */ 	or	$t5,$t2,$t3
-/*  f0edccc:	0fc537ce */ 	jal	func0f153838
+/*  f0edccc:	0fc537ce */ 	jal	text0f153838
 /*  f0edcd0:	ac4d000c */ 	sw	$t5,0xc($v0)
-/*  f0edcd4:	0fc5374a */ 	jal	func0f153628
+/*  f0edcd4:	0fc5374a */ 	jal	text0f153628
 /*  f0edcd8:	00402025 */ 	or	$a0,$v0,$zero
 /*  f0edcdc:	8fac009c */ 	lw	$t4,0x9c($sp)
 /*  f0edce0:	8faf00a4 */ 	lw	$t7,0xa4($sp)
@@ -2231,7 +2231,7 @@ glabel menuRenderBanner
 /*  f0edf14:	afa00024 */ 	sw	$zero,0x24($sp)
 /*  f0edf18:	0fc541a6 */ 	jal	textRenderProjected
 /*  f0edf1c:	afa00028 */ 	sw	$zero,0x28($sp)
-/*  f0edf20:	0fc537a0 */ 	jal	func0f153780
+/*  f0edf20:	0fc537a0 */ 	jal	text0f153780
 /*  f0edf24:	00402025 */ 	or	$a0,$v0,$zero
 /*  f0edf28:	8fbf0044 */ 	lw	$ra,0x44($sp)
 /*  f0edf2c:	8fb00034 */ 	lw	$s0,0x34($sp)
@@ -2335,22 +2335,22 @@ const char var7f1b23e8[] = "TM";
 //	y = texttop;
 //
 //	// Black fill
-//	gdl = gfxSetPrimColour(gdl, 0x0000007f);
+//	gdl = textSetPrimColour(gdl, 0x0000007f);
 //	gDPFillRectangleScaled(gdl++, x1, y1, x2, y2);
-//	gdl = func0f153838(gdl);
+//	gdl = text0f153838(gdl);
 //
 //	// Dark blue fill
-//	gdl = gfxSetPrimColour(gdl, 0x00007f7f);
+//	gdl = textSetPrimColour(gdl, 0x00007f7f);
 //	gDPFillRectangleScaled(gdl++, x1, bannertop, x2, bannerbottom);
-//	gdl = func0f153838(gdl);
+//	gdl = text0f153838(gdl);
 //
 //	// Top and bottom borders (light blue)
-//	gdl = gfxSetPrimColour(gdl, 0x7f7fff7f);
+//	gdl = textSetPrimColour(gdl, 0x7f7fff7f);
 //	gDPFillRectangleScaled(gdl++, x1, bannerbottom + 2, x2, bannerbottom + 4);
 //	gDPFillRectangleScaled(gdl++, x1, bannertop - 4, x2, bannertop - 2);
-//	gdl = func0f153838(gdl);
+//	gdl = text0f153838(gdl);
 //
-//	gdl = func0f153628(gdl);
+//	gdl = text0f153628(gdl);
 //
 //	// Render the selected message's shadow
 //	x = tmp - textwidth / 2 + 2;
@@ -2386,7 +2386,7 @@ const char var7f1b23e8[] = "TM";
 //	}
 //#endif
 //
-//	gdl = func0f153780(gdl);
+//	gdl = text0f153780(gdl);
 //
 //	return gdl;
 //}
@@ -12795,7 +12795,7 @@ glabel dialogRender
 /*  f0f6128:	afb001ec */ 	sw	$s0,0x1ec($sp)
 /*  f0f612c:	afa201bc */ 	sw	$v0,0x1bc($sp)
 .JF0f0f6130:
-/*  f0f6130:	0fc55883 */ 	jal	func0f156030
+/*  f0f6130:	0fc55883 */ 	jal	text0f156030
 /*  f0f6134:	8fa401bc */ 	lw	$a0,0x1bc($sp)
 /*  f0f6138:	3c0f8007 */ 	lui	$t7,0x8007
 /*  f0f613c:	8def1998 */ 	lw	$t7,0x1998($t7)
@@ -13240,7 +13240,7 @@ glabel dialogRender
 /*  f0f67c8:	26520002 */ 	addiu	$s2,$s2,0x2
 /*  f0f67cc:	26100002 */ 	addiu	$s0,$s0,0x2
 /*  f0f67d0:	afb001cc */ 	sw	$s0,0x1cc($sp)
-/*  f0f67d4:	0fc54b55 */ 	jal	func0f153628
+/*  f0f67d4:	0fc54b55 */ 	jal	text0f153628
 /*  f0f67d8:	afb201d0 */ 	sw	$s2,0x1d0($sp)
 /*  f0f67dc:	8fad01f4 */ 	lw	$t5,0x1f4($sp)
 /*  f0f67e0:	afa201e8 */ 	sw	$v0,0x1e8($sp)
@@ -13304,7 +13304,7 @@ glabel dialogRender
 /*  f0f68bc:	00822021 */ 	addu	$a0,$a0,$v0
 /*  f0f68c0:	00a22821 */ 	addu	$a1,$a1,$v0
 /*  f0f68c4:	8ca52e54 */ 	lw	$a1,0x2e54($a1)
-/*  f0f68c8:	0fc54d69 */ 	jal	func0f153e38
+/*  f0f68c8:	0fc54d69 */ 	jal	textSetWaveColours
 /*  f0f68cc:	8c842fbc */ 	lw	$a0,0x2fbc($a0)
 /*  f0f68d0:	8fa301e0 */ 	lw	$v1,0x1e0($sp)
 /*  f0f68d4:	8fa501dc */ 	lw	$a1,0x1dc($sp)
@@ -13394,7 +13394,7 @@ glabel dialogRender
 /*  f0f6a20:	afb9001c */ 	sw	$t9,0x1c($sp)
 /*  f0f6a24:	afa201e8 */ 	sw	$v0,0x1e8($sp)
 .JF0f0f6a28:
-/*  f0f6a28:	0fc54bb7 */ 	jal	func0f153780
+/*  f0f6a28:	0fc54bb7 */ 	jal	text0f153780
 /*  f0f6a2c:	8fa401e8 */ 	lw	$a0,0x1e8($sp)
 /*  f0f6a30:	afa201e8 */ 	sw	$v0,0x1e8($sp)
 .JF0f0f6a34:
@@ -13419,14 +13419,14 @@ glabel dialogRender
 /*  f0f6a7c:	44060000 */ 	mfc1	$a2,$f0
 /*  f0f6a80:	8c440014 */ 	lw	$a0,0x14($v0)
 /*  f0f6a84:	8c450018 */ 	lw	$a1,0x18($v0)
-/*  f0f6a88:	0fc54ce3 */ 	jal	func0f153c20
+/*  f0f6a88:	0fc54ce3 */ 	jal	textSetDiagonalBlend
 /*  f0f6a8c:	24070001 */ 	li	$a3,0x1
 /*  f0f6a90:	10000006 */ 	b	.JF0f0f6aac
 /*  f0f6a94:	240e0001 */ 	li	$t6,0x1
 /*  f0f6a98:	44060000 */ 	mfc1	$a2,$f0
 .JF0f0f6a9c:
 /*  f0f6a9c:	8c440014 */ 	lw	$a0,0x14($v0)
-/*  f0f6aa0:	0fc54ce3 */ 	jal	func0f153c20
+/*  f0f6aa0:	0fc54ce3 */ 	jal	textSetDiagonalBlend
 /*  f0f6aa4:	8c450018 */ 	lw	$a1,0x18($v0)
 /*  f0f6aa8:	240e0001 */ 	li	$t6,0x1
 .JF0f0f6aac:
@@ -13439,7 +13439,7 @@ glabel dialogRender
 /*  f0f6ac0:	24010003 */ 	li	$at,0x3
 /*  f0f6ac4:	55610005 */ 	bnel	$t3,$at,.JF0f0f6adc
 /*  f0f6ac8:	8fac0084 */ 	lw	$t4,0x84($sp)
-/*  f0f6acc:	0fc54d3d */ 	jal	func0f153d88
+/*  f0f6acc:	0fc54d3d */ 	jal	textSetMenuBlend
 /*  f0f6ad0:	c44c0050 */ 	lwc1	$f12,0x50($v0)
 /*  f0f6ad4:	8fa201ec */ 	lw	$v0,0x1ec($sp)
 .JF0f0f6ad8:
@@ -14135,7 +14135,7 @@ glabel dialogRender
 /*  f0f74e8:	0fc01a60 */ 	jal	colourBlend
 /*  f0f74ec:	2406007f */ 	li	$a2,0x7f
 /*  f0f74f0:	8fa401e8 */ 	lw	$a0,0x1e8($sp)
-/*  f0f74f4:	0fc54bce */ 	jal	gfxSetPrimColour
+/*  f0f74f4:	0fc54bce */ 	jal	textSetPrimColour
 /*  f0f74f8:	00402825 */ 	move	$a1,$v0
 /*  f0f74fc:	3c038008 */ 	lui	$v1,0x8008
 /*  f0f7500:	246300f4 */ 	addiu	$v1,$v1,0xf4
@@ -14159,7 +14159,7 @@ glabel dialogRender
 /*  f0f7548:	316d03ff */ 	andi	$t5,$t3,0x3ff
 /*  f0f754c:	000dc380 */ 	sll	$t8,$t5,0xe
 /*  f0f7550:	030e6025 */ 	or	$t4,$t8,$t6
-/*  f0f7554:	0fc54be5 */ 	jal	func0f153838
+/*  f0f7554:	0fc54be5 */ 	jal	text0f153838
 /*  f0f7558:	ac4c0004 */ 	sw	$t4,0x4($v0)
 /*  f0f755c:	afa201e8 */ 	sw	$v0,0x1e8($sp)
 .JF0f0f7560:
@@ -14201,7 +14201,7 @@ glabel dialogRender
 /*  f0f75e0:	51c00006 */ 	beqzl	$t6,.JF0f0f75fc
 /*  f0f75e4:	24010004 */ 	li	$at,0x4
 .JF0f0f75e8:
-/*  f0f75e8:	0fc55880 */ 	jal	func0f156024
+/*  f0f75e8:	0fc55880 */ 	jal	text0f156024
 /*  f0f75ec:	24040001 */ 	li	$a0,0x1
 /*  f0f75f0:	8fac0118 */ 	lw	$t4,0x118($sp)
 /*  f0f75f4:	91820000 */ 	lbu	$v0,0x0($t4)
@@ -14381,7 +14381,7 @@ glabel dialogRender
 .JF0f0f7898:
 /*  f0f7898:	51e00004 */ 	beqzl	$t7,.JF0f0f78ac
 /*  f0f789c:	8fae007c */ 	lw	$t6,0x7c($sp)
-/*  f0f78a0:	0fc55880 */ 	jal	func0f156024
+/*  f0f78a0:	0fc55880 */ 	jal	text0f156024
 /*  f0f78a4:	00002025 */ 	move	$a0,$zero
 /*  f0f78a8:	8fae007c */ 	lw	$t6,0x7c($sp)
 .JF0f0f78ac:
@@ -14416,7 +14416,7 @@ glabel dialogRender
 /*  f0f7914:	15a00061 */ 	bnez	$t5,.JF0f0f7a9c
 /*  f0f7918:	8faf01e0 */ 	lw	$t7,0x1e0($sp)
 /*  f0f791c:	afaf0194 */ 	sw	$t7,0x194($sp)
-/*  f0f7920:	0fc54bce */ 	jal	gfxSetPrimColour
+/*  f0f7920:	0fc54bce */ 	jal	textSetPrimColour
 /*  f0f7924:	afa001e4 */ 	sw	$zero,0x1e4($sp)
 /*  f0f7928:	8fae01ec */ 	lw	$t6,0x1ec($sp)
 /*  f0f792c:	afa201e8 */ 	sw	$v0,0x1e8($sp)
@@ -14512,7 +14512,7 @@ glabel dialogRender
 /*  f0f7a84:	1420ffad */ 	bnez	$at,.JF0f0f793c
 /*  f0f7a88:	afab0194 */ 	sw	$t3,0x194($sp)
 .JF0f0f7a8c:
-/*  f0f7a8c:	0fc54be5 */ 	jal	func0f153838
+/*  f0f7a8c:	0fc54be5 */ 	jal	text0f153838
 /*  f0f7a90:	8fa401e8 */ 	lw	$a0,0x1e8($sp)
 /*  f0f7a94:	afa201e8 */ 	sw	$v0,0x1e8($sp)
 /*  f0f7a98:	00402025 */ 	move	$a0,$v0
@@ -14809,11 +14809,11 @@ glabel dialogRender
 /*  f0f7efc:	54610086 */ 	bnel	$v1,$at,.JF0f0f8118
 /*  f0f7f00:	8fa201e8 */ 	lw	$v0,0x1e8($sp)
 .JF0f0f7f04:
-/*  f0f7f04:	0fc54d6e */ 	jal	func0f153e4c
+/*  f0f7f04:	0fc54d6e */ 	jal	textResetBlends
 /*  f0f7f08:	00000000 */ 	nop
 /*  f0f7f0c:	0fc54a1a */ 	jal	textSetRotation90
 /*  f0f7f10:	24040001 */ 	li	$a0,0x1
-/*  f0f7f14:	0fc54b55 */ 	jal	func0f153628
+/*  f0f7f14:	0fc54b55 */ 	jal	text0f153628
 /*  f0f7f18:	8fa401e8 */ 	lw	$a0,0x1e8($sp)
 /*  f0f7f1c:	afa201e8 */ 	sw	$v0,0x1e8($sp)
 /*  f0f7f20:	82230015 */ 	lb	$v1,0x15($s1)
@@ -14942,7 +14942,7 @@ glabel dialogRender
 /*  f0f80f4:	afae0014 */ 	sw	$t6,0x14($sp)
 /*  f0f80f8:	0fc55886 */ 	jal	textRenderProjected
 /*  f0f80fc:	afb8001c */ 	sw	$t8,0x1c($sp)
-/*  f0f8100:	0fc54bb7 */ 	jal	func0f153780
+/*  f0f8100:	0fc54bb7 */ 	jal	text0f153780
 /*  f0f8104:	00402025 */ 	move	$a0,$v0
 /*  f0f8108:	afa201e8 */ 	sw	$v0,0x1e8($sp)
 /*  f0f810c:	0fc54a1a */ 	jal	textSetRotation90
@@ -15047,7 +15047,7 @@ glabel dialogRender
 /*  f0f5484:	afb001ec */ 	sw	$s0,0x1ec($sp)
 /*  f0f5488:	afa201bc */ 	sw	$v0,0x1bc($sp)
 .L0f0f548c:
-/*  f0f548c:	0fc5580c */ 	jal	func0f156030
+/*  f0f548c:	0fc5580c */ 	jal	text0f156030
 /*  f0f5490:	8fa401bc */ 	lw	$a0,0x1bc($sp)
 /*  f0f5494:	3c0f8007 */ 	lui	$t7,%hi(g_MpPlayerNum)
 /*  f0f5498:	8def1448 */ 	lw	$t7,%lo(g_MpPlayerNum)($t7)
@@ -15492,7 +15492,7 @@ glabel dialogRender
 /*  f0f5b24:	26520002 */ 	addiu	$s2,$s2,0x2
 /*  f0f5b28:	26100002 */ 	addiu	$s0,$s0,0x2
 /*  f0f5b2c:	afb001cc */ 	sw	$s0,0x1cc($sp)
-/*  f0f5b30:	0fc54d8a */ 	jal	func0f153628
+/*  f0f5b30:	0fc54d8a */ 	jal	text0f153628
 /*  f0f5b34:	afb201d0 */ 	sw	$s2,0x1d0($sp)
 /*  f0f5b38:	8fad01f4 */ 	lw	$t5,0x1f4($sp)
 /*  f0f5b3c:	afa201e8 */ 	sw	$v0,0x1e8($sp)
@@ -15556,7 +15556,7 @@ glabel dialogRender
 /*  f0f5c18:	00822021 */ 	addu	$a0,$a0,$v0
 /*  f0f5c1c:	00a22821 */ 	addu	$a1,$a1,$v0
 /*  f0f5c20:	8ca52124 */ 	lw	$a1,%lo(g_MenuColourPalettes2+0xc)($a1)
-/*  f0f5c24:	0fc54f8e */ 	jal	func0f153e38
+/*  f0f5c24:	0fc54f8e */ 	jal	textSetWaveColours
 /*  f0f5c28:	8c84228c */ 	lw	$a0,%lo(g_MenuColourPalettes3+0xc)($a0)
 /*  f0f5c2c:	8fa301e0 */ 	lw	$v1,0x1e0($sp)
 /*  f0f5c30:	8fa501dc */ 	lw	$a1,0x1dc($sp)
@@ -15646,7 +15646,7 @@ glabel dialogRender
 /*  f0f5d7c:	afb9001c */ 	sw	$t9,0x1c($sp)
 /*  f0f5d80:	afa201e8 */ 	sw	$v0,0x1e8($sp)
 .L0f0f5d84:
-/*  f0f5d84:	0fc54de0 */ 	jal	func0f153780
+/*  f0f5d84:	0fc54de0 */ 	jal	text0f153780
 /*  f0f5d88:	8fa401e8 */ 	lw	$a0,0x1e8($sp)
 /*  f0f5d8c:	afa201e8 */ 	sw	$v0,0x1e8($sp)
 .L0f0f5d90:
@@ -15671,14 +15671,14 @@ glabel dialogRender
 /*  f0f5dd8:	44060000 */ 	mfc1	$a2,$f0
 /*  f0f5ddc:	8c440014 */ 	lw	$a0,0x14($v0)
 /*  f0f5de0:	8c450018 */ 	lw	$a1,0x18($v0)
-/*  f0f5de4:	0fc54f08 */ 	jal	func0f153c20
+/*  f0f5de4:	0fc54f08 */ 	jal	textSetDiagonalBlend
 /*  f0f5de8:	24070001 */ 	addiu	$a3,$zero,0x1
 /*  f0f5dec:	10000006 */ 	b	.L0f0f5e08
 /*  f0f5df0:	240e0001 */ 	addiu	$t6,$zero,0x1
 /*  f0f5df4:	44060000 */ 	mfc1	$a2,$f0
 .L0f0f5df8:
 /*  f0f5df8:	8c440014 */ 	lw	$a0,0x14($v0)
-/*  f0f5dfc:	0fc54f08 */ 	jal	func0f153c20
+/*  f0f5dfc:	0fc54f08 */ 	jal	textSetDiagonalBlend
 /*  f0f5e00:	8c450018 */ 	lw	$a1,0x18($v0)
 /*  f0f5e04:	240e0001 */ 	addiu	$t6,$zero,0x1
 .L0f0f5e08:
@@ -15691,7 +15691,7 @@ glabel dialogRender
 /*  f0f5e1c:	24010003 */ 	addiu	$at,$zero,0x3
 /*  f0f5e20:	55610005 */ 	bnel	$t3,$at,.L0f0f5e38
 /*  f0f5e24:	8fac0084 */ 	lw	$t4,0x84($sp)
-/*  f0f5e28:	0fc54f62 */ 	jal	func0f153d88
+/*  f0f5e28:	0fc54f62 */ 	jal	textSetMenuBlend
 /*  f0f5e2c:	c44c0050 */ 	lwc1	$f12,0x50($v0)
 /*  f0f5e30:	8fa201ec */ 	lw	$v0,0x1ec($sp)
 .L0f0f5e34:
@@ -16387,7 +16387,7 @@ glabel dialogRender
 /*  f0f6844:	0fc01a40 */ 	jal	colourBlend
 /*  f0f6848:	2406007f */ 	addiu	$a2,$zero,0x7f
 /*  f0f684c:	8fa401e8 */ 	lw	$a0,0x1e8($sp)
-/*  f0f6850:	0fc54df7 */ 	jal	gfxSetPrimColour
+/*  f0f6850:	0fc54df7 */ 	jal	textSetPrimColour
 /*  f0f6854:	00402825 */ 	or	$a1,$v0,$zero
 /*  f0f6858:	3c038008 */ 	lui	$v1,%hi(g_ScaleX)
 /*  f0f685c:	2463fac0 */ 	addiu	$v1,$v1,%lo(g_ScaleX)
@@ -16411,7 +16411,7 @@ glabel dialogRender
 /*  f0f68a4:	316d03ff */ 	andi	$t5,$t3,0x3ff
 /*  f0f68a8:	000dc380 */ 	sll	$t8,$t5,0xe
 /*  f0f68ac:	030e6025 */ 	or	$t4,$t8,$t6
-/*  f0f68b0:	0fc54e0e */ 	jal	func0f153838
+/*  f0f68b0:	0fc54e0e */ 	jal	text0f153838
 /*  f0f68b4:	ac4c0004 */ 	sw	$t4,0x4($v0)
 /*  f0f68b8:	afa201e8 */ 	sw	$v0,0x1e8($sp)
 .L0f0f68bc:
@@ -16453,7 +16453,7 @@ glabel dialogRender
 /*  f0f693c:	51c00006 */ 	beqzl	$t6,.L0f0f6958
 /*  f0f6940:	24010004 */ 	addiu	$at,$zero,0x4
 .L0f0f6944:
-/*  f0f6944:	0fc55809 */ 	jal	func0f156024
+/*  f0f6944:	0fc55809 */ 	jal	text0f156024
 /*  f0f6948:	24040001 */ 	addiu	$a0,$zero,0x1
 /*  f0f694c:	8fac0118 */ 	lw	$t4,0x118($sp)
 /*  f0f6950:	91820000 */ 	lbu	$v0,0x0($t4)
@@ -16633,7 +16633,7 @@ glabel dialogRender
 .L0f0f6bf4:
 /*  f0f6bf4:	51e00004 */ 	beqzl	$t7,.L0f0f6c08
 /*  f0f6bf8:	8fae007c */ 	lw	$t6,0x7c($sp)
-/*  f0f6bfc:	0fc55809 */ 	jal	func0f156024
+/*  f0f6bfc:	0fc55809 */ 	jal	text0f156024
 /*  f0f6c00:	00002025 */ 	or	$a0,$zero,$zero
 /*  f0f6c04:	8fae007c */ 	lw	$t6,0x7c($sp)
 .L0f0f6c08:
@@ -16668,7 +16668,7 @@ glabel dialogRender
 /*  f0f6c70:	15a00061 */ 	bnez	$t5,.L0f0f6df8
 /*  f0f6c74:	8faf01e0 */ 	lw	$t7,0x1e0($sp)
 /*  f0f6c78:	afaf0194 */ 	sw	$t7,0x194($sp)
-/*  f0f6c7c:	0fc54df7 */ 	jal	gfxSetPrimColour
+/*  f0f6c7c:	0fc54df7 */ 	jal	textSetPrimColour
 /*  f0f6c80:	afa001e4 */ 	sw	$zero,0x1e4($sp)
 /*  f0f6c84:	8fae01ec */ 	lw	$t6,0x1ec($sp)
 /*  f0f6c88:	afa201e8 */ 	sw	$v0,0x1e8($sp)
@@ -16764,7 +16764,7 @@ glabel dialogRender
 /*  f0f6de0:	1420ffad */ 	bnez	$at,.L0f0f6c98
 /*  f0f6de4:	afab0194 */ 	sw	$t3,0x194($sp)
 .L0f0f6de8:
-/*  f0f6de8:	0fc54e0e */ 	jal	func0f153838
+/*  f0f6de8:	0fc54e0e */ 	jal	text0f153838
 /*  f0f6dec:	8fa401e8 */ 	lw	$a0,0x1e8($sp)
 /*  f0f6df0:	afa201e8 */ 	sw	$v0,0x1e8($sp)
 /*  f0f6df4:	00402025 */ 	or	$a0,$v0,$zero
@@ -17061,11 +17061,11 @@ glabel dialogRender
 /*  f0f7258:	54610086 */ 	bnel	$v1,$at,.L0f0f7474
 /*  f0f725c:	8fa201e8 */ 	lw	$v0,0x1e8($sp)
 .L0f0f7260:
-/*  f0f7260:	0fc54f93 */ 	jal	func0f153e4c
+/*  f0f7260:	0fc54f93 */ 	jal	textResetBlends
 /*  f0f7264:	00000000 */ 	nop
 /*  f0f7268:	0fc54c6e */ 	jal	textSetRotation90
 /*  f0f726c:	24040001 */ 	addiu	$a0,$zero,0x1
-/*  f0f7270:	0fc54d8a */ 	jal	func0f153628
+/*  f0f7270:	0fc54d8a */ 	jal	text0f153628
 /*  f0f7274:	8fa401e8 */ 	lw	$a0,0x1e8($sp)
 /*  f0f7278:	afa201e8 */ 	sw	$v0,0x1e8($sp)
 /*  f0f727c:	82230015 */ 	lb	$v1,0x15($s1)
@@ -17194,7 +17194,7 @@ glabel dialogRender
 /*  f0f7450:	afae0014 */ 	sw	$t6,0x14($sp)
 /*  f0f7454:	0fc5580f */ 	jal	textRenderProjected
 /*  f0f7458:	afb8001c */ 	sw	$t8,0x1c($sp)
-/*  f0f745c:	0fc54de0 */ 	jal	func0f153780
+/*  f0f745c:	0fc54de0 */ 	jal	text0f153780
 /*  f0f7460:	00402025 */ 	or	$a0,$v0,$zero
 /*  f0f7464:	afa201e8 */ 	sw	$v0,0x1e8($sp)
 /*  f0f7468:	0fc54c6e */ 	jal	textSetRotation90
@@ -17276,7 +17276,7 @@ glabel dialogRender
 /*  f0f1e68:	afa201bc */ 	sw	$v0,0x1bc($sp)
 .NB0f0f1e6c:
 /*  f0f1e6c:	8fb001ec */ 	lw	$s0,0x1ec($sp)
-/*  f0f1e70:	0fc541a3 */ 	jal	func0f156030
+/*  f0f1e70:	0fc541a3 */ 	jal	text0f156030
 /*  f0f1e74:	8fa401bc */ 	lw	$a0,0x1bc($sp)
 /*  f0f1e78:	3c0c8007 */ 	lui	$t4,0x8007
 /*  f0f1e7c:	8d8c3af0 */ 	lw	$t4,0x3af0($t4)
@@ -17703,7 +17703,7 @@ glabel dialogRender
 /*  f0f24cc:	26520002 */ 	addiu	$s2,$s2,0x2
 /*  f0f24d0:	26100002 */ 	addiu	$s0,$s0,0x2
 /*  f0f24d4:	afb001cc */ 	sw	$s0,0x1cc($sp)
-/*  f0f24d8:	0fc5374a */ 	jal	func0f153628
+/*  f0f24d8:	0fc5374a */ 	jal	text0f153628
 /*  f0f24dc:	afb201d0 */ 	sw	$s2,0x1d0($sp)
 /*  f0f24e0:	8fac01f4 */ 	lw	$t4,0x1f4($sp)
 /*  f0f24e4:	afa201e8 */ 	sw	$v0,0x1e8($sp)
@@ -17767,7 +17767,7 @@ glabel dialogRender
 /*  f0f25c0:	00822021 */ 	addu	$a0,$a0,$v0
 /*  f0f25c4:	00a22821 */ 	addu	$a1,$a1,$v0
 /*  f0f25c8:	8ca5c454 */ 	lw	$a1,-0x3bac($a1)
-/*  f0f25cc:	0fc53925 */ 	jal	func0f153e38
+/*  f0f25cc:	0fc53925 */ 	jal	textSetWaveColours
 /*  f0f25d0:	8c84c5bc */ 	lw	$a0,-0x3a44($a0)
 /*  f0f25d4:	8fa301e0 */ 	lw	$v1,0x1e0($sp)
 /*  f0f25d8:	8fa501dc */ 	lw	$a1,0x1dc($sp)
@@ -17857,7 +17857,7 @@ glabel dialogRender
 /*  f0f2724:	afad001c */ 	sw	$t5,0x1c($sp)
 /*  f0f2728:	afa201e8 */ 	sw	$v0,0x1e8($sp)
 .NB0f0f272c:
-/*  f0f272c:	0fc537a0 */ 	jal	func0f153780
+/*  f0f272c:	0fc537a0 */ 	jal	text0f153780
 /*  f0f2730:	8fa401e8 */ 	lw	$a0,0x1e8($sp)
 /*  f0f2734:	3c097f1b */ 	lui	$t1,0x7f1b
 /*  f0f2738:	2529c2e0 */ 	addiu	$t1,$t1,-15648
@@ -17885,14 +17885,14 @@ glabel dialogRender
 /*  f0f278c:	44060000 */ 	mfc1	$a2,$f0
 /*  f0f2790:	8c440014 */ 	lw	$a0,0x14($v0)
 /*  f0f2794:	8c450018 */ 	lw	$a1,0x18($v0)
-/*  f0f2798:	0fc5389f */ 	jal	func0f153c20
+/*  f0f2798:	0fc5389f */ 	jal	textSetDiagonalBlend
 /*  f0f279c:	24070001 */ 	addiu	$a3,$zero,0x1
 /*  f0f27a0:	10000006 */ 	beqz	$zero,.NB0f0f27bc
 /*  f0f27a4:	240f0001 */ 	addiu	$t7,$zero,0x1
 /*  f0f27a8:	44060000 */ 	mfc1	$a2,$f0
 .NB0f0f27ac:
 /*  f0f27ac:	8c440014 */ 	lw	$a0,0x14($v0)
-/*  f0f27b0:	0fc5389f */ 	jal	func0f153c20
+/*  f0f27b0:	0fc5389f */ 	jal	textSetDiagonalBlend
 /*  f0f27b4:	8c450018 */ 	lw	$a1,0x18($v0)
 /*  f0f27b8:	240f0001 */ 	addiu	$t7,$zero,0x1
 .NB0f0f27bc:
@@ -17908,7 +17908,7 @@ glabel dialogRender
 /*  f0f27dc:	24010003 */ 	addiu	$at,$zero,0x3
 /*  f0f27e0:	55c10008 */ 	bnel	$t6,$at,.NB0f0f2804
 /*  f0f27e4:	03d5082a */ 	slt	$at,$s8,$s5
-/*  f0f27e8:	0fc538f9 */ 	jal	func0f153d88
+/*  f0f27e8:	0fc538f9 */ 	jal	textSetMenuBlend
 /*  f0f27ec:	c44c0050 */ 	lwc1	$f12,0x50($v0)
 /*  f0f27f0:	3c097f1b */ 	lui	$t1,0x7f1b
 /*  f0f27f4:	2529c2e0 */ 	addiu	$t1,$t1,-15648
@@ -18602,7 +18602,7 @@ glabel dialogRender
 /*  f0f31fc:	0fc01990 */ 	jal	colourBlend
 /*  f0f3200:	2406007f */ 	addiu	$a2,$zero,0x7f
 /*  f0f3204:	8fa401e8 */ 	lw	$a0,0x1e8($sp)
-/*  f0f3208:	0fc537b7 */ 	jal	gfxSetPrimColour
+/*  f0f3208:	0fc537b7 */ 	jal	textSetPrimColour
 /*  f0f320c:	00402825 */ 	or	$a1,$v0,$zero
 /*  f0f3210:	3c038008 */ 	lui	$v1,0x8008
 /*  f0f3214:	24632320 */ 	addiu	$v1,$v1,0x2320
@@ -18626,7 +18626,7 @@ glabel dialogRender
 /*  f0f325c:	330c03ff */ 	andi	$t4,$t8,0x3ff
 /*  f0f3260:	000c7380 */ 	sll	$t6,$t4,0xe
 /*  f0f3264:	01cfc825 */ 	or	$t9,$t6,$t7
-/*  f0f3268:	0fc537ce */ 	jal	func0f153838
+/*  f0f3268:	0fc537ce */ 	jal	text0f153838
 /*  f0f326c:	ac590004 */ 	sw	$t9,0x4($v0)
 /*  f0f3270:	afa201e8 */ 	sw	$v0,0x1e8($sp)
 .NB0f0f3274:
@@ -18650,7 +18650,7 @@ glabel dialogRender
 /*  f0f32b4:	54410006 */ 	bnel	$v0,$at,.NB0f0f32d0
 /*  f0f32b8:	24010004 */ 	addiu	$at,$zero,0x4
 .NB0f0f32bc:
-/*  f0f32bc:	0fc541a0 */ 	jal	func0f156024
+/*  f0f32bc:	0fc541a0 */ 	jal	text0f156024
 /*  f0f32c0:	24040001 */ 	addiu	$a0,$zero,0x1
 /*  f0f32c4:	8fac0118 */ 	lw	$t4,0x118($sp)
 /*  f0f32c8:	91820000 */ 	lbu	$v0,0x0($t4)
@@ -18830,7 +18830,7 @@ glabel dialogRender
 .NB0f0f356c:
 /*  f0f356c:	53200004 */ 	beqzl	$t9,.NB0f0f3580
 /*  f0f3570:	8fb8007c */ 	lw	$t8,0x7c($sp)
-/*  f0f3574:	0fc541a0 */ 	jal	func0f156024
+/*  f0f3574:	0fc541a0 */ 	jal	text0f156024
 /*  f0f3578:	00002025 */ 	or	$a0,$zero,$zero
 /*  f0f357c:	8fb8007c */ 	lw	$t8,0x7c($sp)
 .NB0f0f3580:
@@ -18865,7 +18865,7 @@ glabel dialogRender
 /*  f0f35e8:	15c00061 */ 	bnez	$t6,.NB0f0f3770
 /*  f0f35ec:	8fab01e0 */ 	lw	$t3,0x1e0($sp)
 /*  f0f35f0:	afab0194 */ 	sw	$t3,0x194($sp)
-/*  f0f35f4:	0fc537b7 */ 	jal	gfxSetPrimColour
+/*  f0f35f4:	0fc537b7 */ 	jal	textSetPrimColour
 /*  f0f35f8:	afa001e4 */ 	sw	$zero,0x1e4($sp)
 /*  f0f35fc:	8faf01ec */ 	lw	$t7,0x1ec($sp)
 /*  f0f3600:	afa201e8 */ 	sw	$v0,0x1e8($sp)
@@ -18961,7 +18961,7 @@ glabel dialogRender
 /*  f0f3758:	1420ffb0 */ 	bnez	$at,.NB0f0f361c
 /*  f0f375c:	afb80194 */ 	sw	$t8,0x194($sp)
 .NB0f0f3760:
-/*  f0f3760:	0fc537ce */ 	jal	func0f153838
+/*  f0f3760:	0fc537ce */ 	jal	text0f153838
 /*  f0f3764:	8fa401e8 */ 	lw	$a0,0x1e8($sp)
 /*  f0f3768:	afa201e8 */ 	sw	$v0,0x1e8($sp)
 /*  f0f376c:	00402025 */ 	or	$a0,$v0,$zero
@@ -19258,11 +19258,11 @@ glabel dialogRender
 /*  f0f3bd0:	54610086 */ 	bnel	$v1,$at,.NB0f0f3dec
 /*  f0f3bd4:	8fa201e8 */ 	lw	$v0,0x1e8($sp)
 .NB0f0f3bd8:
-/*  f0f3bd8:	0fc5392a */ 	jal	func0f153e4c
+/*  f0f3bd8:	0fc5392a */ 	jal	textResetBlends
 /*  f0f3bdc:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f0f3be0:	0fc5362e */ 	jal	textSetRotation90
 /*  f0f3be4:	24040001 */ 	addiu	$a0,$zero,0x1
-/*  f0f3be8:	0fc5374a */ 	jal	func0f153628
+/*  f0f3be8:	0fc5374a */ 	jal	text0f153628
 /*  f0f3bec:	8fa401e8 */ 	lw	$a0,0x1e8($sp)
 /*  f0f3bf0:	afa201e8 */ 	sw	$v0,0x1e8($sp)
 /*  f0f3bf4:	82230015 */ 	lb	$v1,0x15($s1)
@@ -19391,7 +19391,7 @@ glabel dialogRender
 /*  f0f3dc8:	afaf0014 */ 	sw	$t7,0x14($sp)
 /*  f0f3dcc:	0fc541a6 */ 	jal	textRenderProjected
 /*  f0f3dd0:	afb9001c */ 	sw	$t9,0x1c($sp)
-/*  f0f3dd4:	0fc537a0 */ 	jal	func0f153780
+/*  f0f3dd4:	0fc537a0 */ 	jal	text0f153780
 /*  f0f3dd8:	00402025 */ 	or	$a0,$v0,$zero
 /*  f0f3ddc:	afa201e8 */ 	sw	$v0,0x1e8($sp)
 /*  f0f3de0:	0fc5362e */ 	jal	textSetRotation90
@@ -19476,7 +19476,7 @@ u32 var800714d4 = (u32)&var7f1b2664;
 //
 //	colour1 = MIXCOLOUR(dialog, unk28);
 //
-//	func0f156030(colour1);
+//	text0f156030(colour1);
 //
 //	var8007fb9c = 0;
 //
@@ -19571,7 +19571,7 @@ u32 var800714d4 = (u32)&var7f1b2664;
 //		x = dialogleft + 2;
 //		y = dialogtop + 2;
 //
-//		gdl = func0f153628(gdl);
+//		gdl = text0f153628(gdl);
 //
 //		context.unk18 = false;
 //
@@ -19591,7 +19591,7 @@ u32 var800714d4 = (u32)&var7f1b2664;
 //
 //			colour1 = MIXCOLOUR(dialog, unk0c);
 //
-//			func0f153e38(g_MenuColourPalettes3[dialog->type].unk0c, g_MenuColourPalettes2[dialog->type].unk0c);
+//			textSetWaveColours(g_MenuColourPalettes3[dialog->type].unk0c, g_MenuColourPalettes2[dialog->type].unk0c);
 //
 //			// Title shadow
 //			x = dialogleft + 3;
@@ -19617,22 +19617,22 @@ u32 var800714d4 = (u32)&var7f1b2664;
 //			}
 //		}
 //
-//		gdl = func0f153780(gdl);
+//		gdl = text0f153780(gdl);
 //	}
 //
 //	// Configure things for the redraw effect
 //	if (!(dialog->redrawtimer < 0.0f)) {
 //		if (g_MenuData.root != MENUROOT_MPPAUSE) {
 //			if (dialog->state >= MENUDIALOGSTATE_POPULATED) {
-//				func0f153c20(dialog->x, dialog->y, dialog->redrawtimer, 1);
+//				textSetDiagonalBlend(dialog->x, dialog->y, dialog->redrawtimer, DIAGMODE_REDRAW);
 //			} else {
-//				func0f153c20(dialog->x, dialog->y, dialog->redrawtimer, 0);
+//				textSetDiagonalBlend(dialog->x, dialog->y, dialog->redrawtimer, DIAGMODE_FADEIN);
 //			}
 //
 //			var8007fb9c = 1;
 //		}
 //	} else if (dialog->state == MENUDIALOGSTATE_POPULATED) {
-//		func0f153d88(dialog->statefrac);
+//		textSetMenuBlend(dialog->statefrac);
 //	}
 //
 //	if (dialogbottom < dialogtop + 11) {
@@ -19841,9 +19841,9 @@ u32 var800714d4 = (u32)&var7f1b2664;
 //							colour2 = MIXCOLOUR(dialog, unk28);
 //							colour = colourBlend(colour2, colour2 & 0xffffff00, 127);
 //
-//							gdl = gfxSetPrimColour(gdl, colour);
+//							gdl = textSetPrimColour(gdl, colour);
 //							gDPFillRectangleScaled(gdl++, x1, y1, x2, y2);
-//							gdl = func0f153838(gdl);
+//							gdl = text0f153838(gdl);
 //						}
 //
 //						if (focused) {
@@ -19856,10 +19856,10 @@ u32 var800714d4 = (u32)&var7f1b2664;
 //#if VERSION >= VERSION_NTSC_1_0
 //								if (!(dialog->transitionfrac >= 0.0f && dialog->type2 == 0)
 //										&& !(dialog->transitionfrac < 0.0f && dialog->type == 0)) {
-//									func0f156024(1);
+//									text0f156024(1);
 //								}
 //#else
-//								func0f156024(1);
+//								text0f156024(1);
 //#endif
 //							}
 //
@@ -19903,7 +19903,7 @@ u32 var800714d4 = (u32)&var7f1b2664;
 //						}
 //
 //						if (focused) {
-//							func0f156024(0);
+//							text0f156024(0);
 //						}
 //					}
 //
@@ -19915,7 +19915,7 @@ u32 var800714d4 = (u32)&var7f1b2664;
 //
 //			// Render overlays, such as dropdown menus
 //			if (!lightweight) {
-//				gdl = gfxSetPrimColour(gdl, 0x00000000);
+//				gdl = textSetPrimColour(gdl, 0x00000000);
 //
 //				curx = dialogleft;
 //
@@ -19943,7 +19943,7 @@ u32 var800714d4 = (u32)&var7f1b2664;
 //					curx += menu->cols[colindex].width;
 //				}
 //
-//				gdl = func0f153838(gdl);
+//				gdl = text0f153838(gdl);
 //			}
 //
 //			gDPSetScissor(gdl++, G_SC_NON_INTERLACE, viGetViewLeft(), viGetViewTop(),
@@ -19980,10 +19980,10 @@ u32 var800714d4 = (u32)&var7f1b2664;
 //				s32 textwidth; // ac
 //				char *title;
 //
-//				func0f153e4c();
+//				textResetBlends();
 //				textSetRotation90(true);
 //
-//				gdl = func0f153628(gdl);
+//				gdl = text0f153628(gdl);
 //
 //				// Left/previous title
 //				previndex = layer->cursibling - 1;
@@ -20026,7 +20026,7 @@ u32 var800714d4 = (u32)&var7f1b2664;
 //				}
 //
 //				gdl = textRenderProjected(gdl, &y, &x, title, g_CharsHandelGothicXs, g_FontHandelGothicXs, -1, dialogwidth, viGetHeight(), 0, 0);
-//				gdl = func0f153780(gdl);
+//				gdl = text0f153780(gdl);
 //
 //				textSetRotation90(false);
 //			}
@@ -21098,11 +21098,11 @@ Gfx *menuRenderDialog(Gfx *gdl, struct menudialog *dialog, struct menu *menu, bo
 {
 	mainOverrideVariable("cthresh", &g_MenuCThresh);

-	func0f153d50(dialog->unk54, dialog->unk58, g_MenuCThresh);
+	textSetWaveBlend(dialog->unk54, dialog->unk58, g_MenuCThresh);

 	gdl = dialogRender(gdl, dialog, menu, lightweight);

-	func0f153e4c();
+	textResetBlends();

 	return gdl;
 }
@@ -27772,18 +27772,18 @@ Gfx *menuRenderBackgroundLayer1(Gfx *gdl, u8 bg, f32 frac)
 		{
 			u32 colour = 255 * frac;
 			gSPDisplayList(gdl++, var800613a0);
-			gdl = gfxSetPrimColour(gdl, colour);
+			gdl = textSetPrimColour(gdl, colour);
 			gDPFillRectangle(gdl++, 0, 0, viGetWidth(), viGetHeight());
-			gdl = func0f153838(gdl);
+			gdl = text0f153838(gdl);
 		}
 		break;
 	case MENUBG_SUCCESS:
 		{
 			// Fill with black
 			gSPDisplayList(gdl++, var800613a0);
-			gdl = gfxSetPrimColour(gdl, 0x000000ff);
+			gdl = textSetPrimColour(gdl, 0x000000ff);
 			gDPFillRectangle(gdl++, 0, 0, viGetWidth(), viGetHeight());
-			gdl = func0f153838(gdl);
+			gdl = text0f153838(gdl);

 			// Render the success BG
 			gdl = menugfxRenderBgSuccess(gdl);
@@ -27794,9 +27794,9 @@ Gfx *menuRenderBackgroundLayer1(Gfx *gdl, u8 bg, f32 frac)

 				if (alpha) {
 					gSPDisplayList(gdl++, var800613a0);
-					gdl = gfxSetPrimColour(gdl, alpha);
+					gdl = textSetPrimColour(gdl, alpha);
 					gDPFillRectangle(gdl++, 0, 0, viGetWidth(), viGetHeight());
-					gdl = func0f153838(gdl);
+					gdl = text0f153838(gdl);
 				}
 			}
 		}
@@ -27807,9 +27807,9 @@ Gfx *menuRenderBackgroundLayer1(Gfx *gdl, u8 bg, f32 frac)
 			u32 stack;
 			u32 channel = (1.0f - frac) * 255;
 			gSPDisplayList(gdl++, var800613a0);
-			gdl = gfxSetPrimColour(gdl, channel << 24 | channel << 16 | channel << 8 | 0xff);
+			gdl = textSetPrimColour(gdl, channel << 24 | channel << 16 | channel << 8 | 0xff);
 			gDPFillRectangle(gdl++, 0, 0, viGetWidth(), viGetHeight());
-			gdl = func0f153838(gdl);
+			gdl = text0f153838(gdl);

 			// Render the failure BG
 			gdl = menugfxRenderBgFailure(gdl);
@@ -27833,9 +27833,9 @@ Gfx *menuRenderBackgroundLayer1(Gfx *gdl, u8 bg, f32 frac)

 				gSPDisplayList(gdl++, var800613a0);
 				alpha = (1.0f - frac) * 255;
-				gdl = gfxSetPrimColour(gdl, 0xff000000 | alpha);
+				gdl = textSetPrimColour(gdl, 0xff000000 | alpha);
 				gDPFillRectangle(gdl++, 0, 0, viGetWidth(), viGetHeight());
-				gdl = func0f153838(gdl);
+				gdl = text0f153838(gdl);
 			}
 		}
 		break;
@@ -28237,7 +28237,7 @@ glabel var7f1b381cjf
 .JF0f0fce2c:
 /*  f0fce2c:	5b20017c */ 	blezl	$t9,.JF0f0fd420
 /*  f0fce30:	82ef001b */ 	lb	$t7,0x1b($s7)
-/*  f0fce34:	0fc54c87 */ 	jal	func0f153ab0
+/*  f0fce34:	0fc54c87 */ 	jal	text0f153ab0
 /*  f0fce38:	02a02025 */ 	move	$a0,$s5
 /*  f0fce3c:	8ee30004 */ 	lw	$v1,0x4($s7)
 /*  f0fce40:	24010004 */ 	li	$at,0x4
@@ -28277,7 +28277,7 @@ glabel var7f1b381cjf
 /*  f0fcebc:	3c0d0600 */ 	lui	$t5,0x600
 /*  f0fcec0:	ac6d0000 */ 	sw	$t5,0x0($v1)
 /*  f0fcec4:	ac730004 */ 	sw	$s3,0x4($v1)
-/*  f0fcec8:	0fc54cab */ 	jal	func0f153b40
+/*  f0fcec8:	0fc54cab */ 	jal	text0f153b40
 /*  f0fcecc:	26b50008 */ 	addiu	$s5,$s5,0x8
 /*  f0fced0:	8ee30004 */ 	lw	$v1,0x4($s7)
 /*  f0fced4:	24010003 */ 	li	$at,0x3
@@ -28341,7 +28341,7 @@ glabel var7f1b381cjf
 /*  f0fcfa8:	0050c021 */ 	addu	$t8,$v0,$s0
 /*  f0fcfac:	2719fffc */ 	addiu	$t9,$t8,-4
 /*  f0fcfb0:	afb900e4 */ 	sw	$t9,0xe4($sp)
-/*  f0fcfb4:	0fc54b55 */ 	jal	func0f153628
+/*  f0fcfb4:	0fc54b55 */ 	jal	text0f153628
 /*  f0fcfb8:	02a02025 */ 	move	$a0,$s5
 /*  f0fcfbc:	3c13800a */ 	lui	$s3,0x800a
 /*  f0fcfc0:	0040a825 */ 	move	$s5,$v0
@@ -28636,7 +28636,7 @@ glabel var7f1b381cjf
 /*  f0fd3ec:	24010004 */ 	li	$at,0x4
 /*  f0fd3f0:	5641fef8 */ 	bnel	$s2,$at,.JF0f0fcfd4
 /*  f0fd3f4:	8ec20490 */ 	lw	$v0,0x490($s6)
-/*  f0fd3f8:	0fc54bb7 */ 	jal	func0f153780
+/*  f0fd3f8:	0fc54bb7 */ 	jal	text0f153780
 /*  f0fd3fc:	02a02025 */ 	move	$a0,$s5
 /*  f0fd400:	0040a825 */ 	move	$s5,$v0
 /*  f0fd404:	02a01025 */ 	move	$v0,$s5
@@ -28988,7 +28988,7 @@ Gfx *menuRender(Gfx *gdl)

 	if (g_MenuData.count > 0) {
 		// Render dialogs
-		gdl = func0f153ab0(gdl);
+		gdl = text0f153ab0(gdl);

 		if (g_MenuData.root == MENUROOT_MPPAUSE || g_MenuData.root == MENUROOT_MPENDSCREEN) {
 			g_MpPlayerNum = g_Vars.currentplayerstats->mpindex;
@@ -29007,7 +29007,7 @@ Gfx *menuRender(Gfx *gdl)
 		gSPMatrix(gdl++, osVirtualToPhysical(camGetUnk1750()), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION);
 		gSPDisplayList(gdl++, var800613a0);

-		func0f153b40();
+		text0f153b40();

 		// Render corner texts in combat simulator
 		if (g_MenuData.root == MENUROOT_MPSETUP || g_MenuData.root == MENUROOT_4MBMAINMENU) {
@@ -29027,7 +29027,7 @@ Gfx *menuRender(Gfx *gdl)
 			s32 y;
 			s32 colour;

-			gdl = func0f153628(gdl);
+			gdl = text0f153628(gdl);

 			for (i = 0; i < 4; i++) {
 				// Figure out what text will be displayed. The text calculated
@@ -29132,7 +29132,7 @@ Gfx *menuRender(Gfx *gdl)
 				}
 			}

-			gdl = func0f153780(gdl);
+			gdl = text0f153780(gdl);
 		}

 		gSPSetGeometryMode(gdl++, G_ZBUFFER);
@@ -1539,11 +1539,11 @@ Gfx *menugfxRenderDialogBackground(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, str
 	u32 rightcolour;

 	// Render the dialog's background fill
-	gdl = gfxSetPrimColour(gdl, colour1);
+	gdl = textSetPrimColour(gdl, colour1);

 	gDPFillRectangleScaled(gdl++, x1, y1, x2, y2);

-	gdl = func0f153838(gdl);
+	gdl = text0f153838(gdl);

 	if (dialog->transitionfrac < 0.0f) {
 		leftcolour = g_MenuColourPalettes[dialog->type].unk00;
@@ -2290,13 +2290,13 @@ glabel menugfx0f0e1668
 .L0f0e1878:
 /*  f0e1878:	01c02025 */ 	or	$a0,$t6,$zero
 /*  f0e187c:	afae003c */ 	sw	$t6,0x3c($sp)
-/*  f0e1880:	0fc550eb */ 	jal	func0f1543ac
+/*  f0e1880:	0fc550eb */ 	jal	text0f1543ac
 /*  f0e1884:	afa70034 */ 	sw	$a3,0x34($sp)
 /*  f0e1888:	304300ff */ 	andi	$v1,$v0,0xff
 /*  f0e188c:	8fa4003c */ 	lw	$a0,0x3c($sp)
 /*  f0e1890:	8fa50034 */ 	lw	$a1,0x34($sp)
 /*  f0e1894:	afa3006c */ 	sw	$v1,0x6c($sp)
-/*  f0e1898:	0fc550eb */ 	jal	func0f1543ac
+/*  f0e1898:	0fc550eb */ 	jal	text0f1543ac
 /*  f0e189c:	2406ff7f */ 	addiu	$a2,$zero,-129
 /*  f0e18a0:	8fa3006c */ 	lw	$v1,0x6c($sp)
 /*  f0e18a4:	305800ff */ 	andi	$t8,$v0,0xff
@@ -2409,8 +2409,8 @@ Gfx *menugfxDrawListGroupHeader(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, s32 x3
 	alpha1 = alpha;
 	alpha2 = alpha;
 #else
-	alpha1 = func0f1543ac((x2 + x1) / 2, (y2 + y1) / 2, 0xffffffff) & 0xff;
-	alpha2 = func0f1543ac((x2 + x1) / 2, (y2 + y1) / 2, 0xffffff7f) & 0xff;
+	alpha1 = text0f1543ac((x2 + x1) / 2, (y2 + y1) / 2, 0xffffffff) & 0xff;
+	alpha2 = text0f1543ac((x2 + x1) / 2, (y2 + y1) / 2, 0xffffff7f) & 0xff;
 #endif

 	colours[0] = 0x00006f00 | alpha1;
@@ -2591,12 +2591,12 @@ glabel menugfxDrawListGroupHeader
 /*  f0defe8:	afaf0050 */ 	sw	$t7,0x50($sp)
 /*  f0defec:	afb20044 */ 	sw	$s2,0x44($sp)
 /*  f0deff0:	02402825 */ 	or	$a1,$s2,$zero
-/*  f0deff4:	0fc53a82 */ 	jal	func0f1543ac
+/*  f0deff4:	0fc53a82 */ 	jal	text0f1543ac
 /*  f0deff8:	2406ffff */ 	addiu	$a2,$zero,-1
 /*  f0deffc:	8fa40050 */ 	lw	$a0,0x50($sp)
 /*  f0df000:	305200ff */ 	andi	$s2,$v0,0xff
 /*  f0df004:	8fa50044 */ 	lw	$a1,0x44($sp)
-/*  f0df008:	0fc53a82 */ 	jal	func0f1543ac
+/*  f0df008:	0fc53a82 */ 	jal	text0f1543ac
 /*  f0df00c:	2406ff7f */ 	addiu	$a2,$zero,-129
 /*  f0df010:	2406ff00 */ 	addiu	$a2,$zero,-256
 /*  f0df014:	36586f00 */ 	ori	$t8,$s2,0x6f00
@@ -3127,7 +3127,7 @@ glabel menugfxDrawTessellatedRect
 /*  f0e2770:	afb1002c */ 	sw	$s1,0x2c($sp)
 /*  f0e2774:	afb00028 */ 	sw	$s0,0x28($sp)
 /*  f0e2778:	afa40098 */ 	sw	$a0,0x98($sp)
-/*  f0e277c:	0fc54f96 */ 	jal	func0f153e58
+/*  f0e277c:	0fc54f96 */ 	jal	textHasDiagonalBlend
 /*  f0e2780:	afa5009c */ 	sw	$a1,0x9c($sp)
 /*  f0e2784:	104000ae */ 	beqz	$v0,.L0f0e2a40
 /*  f0e2788:	8fb500b0 */ 	lw	$s5,0xb0($sp)
@@ -3145,7 +3145,7 @@ glabel menugfxDrawTessellatedRect
 /*  f0e27b8:	afb60080 */ 	sw	$s6,0x80($sp)
 /*  f0e27bc:	02c02825 */ 	or	$a1,$s6,$zero
 /*  f0e27c0:	8fa600ac */ 	lw	$a2,0xac($sp)
-/*  f0e27c4:	0fc54fa5 */ 	jal	func0f153e94
+/*  f0e27c4:	0fc54fa5 */ 	jal	text0f153e94
 /*  f0e27c8:	afa30050 */ 	sw	$v1,0x50($sp)
 /*  f0e27cc:	afa2008c */ 	sw	$v0,0x8c($sp)
 /*  f0e27d0:	1a000038 */ 	blez	$s0,.L0f0e28b4
@@ -3160,7 +3160,7 @@ glabel menugfxDrawTessellatedRect
 /*  f0e27f0:	02e09025 */ 	or	$s2,$s7,$zero
 /*  f0e27f4:	03c02025 */ 	or	$a0,$s8,$zero
 /*  f0e27f8:	02e02825 */ 	or	$a1,$s7,$zero
-/*  f0e27fc:	0fc54fa5 */ 	jal	func0f153e94
+/*  f0e27fc:	0fc54fa5 */ 	jal	text0f153e94
 /*  f0e2800:	02a03025 */ 	or	$a2,$s5,$zero
 /*  f0e2804:	10000019 */ 	b	.L0f0e286c
 /*  f0e2808:	00408025 */ 	or	$s0,$v0,$zero
@@ -3188,7 +3188,7 @@ glabel menugfxDrawTessellatedRect
 /*  f0e2854:	00000000 */ 	nop
 /*  f0e2858:	02c02025 */ 	or	$a0,$s6,$zero
 /*  f0e285c:	02202825 */ 	or	$a1,$s1,$zero
-/*  f0e2860:	0fc54fa5 */ 	jal	func0f153e94
+/*  f0e2860:	0fc54fa5 */ 	jal	text0f153e94
 /*  f0e2864:	00403025 */ 	or	$a2,$v0,$zero
 /*  f0e2868:	00408025 */ 	or	$s0,$v0,$zero
 .L0f0e286c:
@@ -3213,7 +3213,7 @@ glabel menugfxDrawTessellatedRect
 .L0f0e28b4:
 /*  f0e28b4:	8fa600b0 */ 	lw	$a2,0xb0($sp)
 /*  f0e28b8:	03c02025 */ 	or	$a0,$s8,$zero
-/*  f0e28bc:	0fc54fa5 */ 	jal	func0f153e94
+/*  f0e28bc:	0fc54fa5 */ 	jal	text0f153e94
 /*  f0e28c0:	02e02825 */ 	or	$a1,$s7,$zero
 /*  f0e28c4:	8fa9008c */ 	lw	$t1,0x8c($sp)
 /*  f0e28c8:	8fa40098 */ 	lw	$a0,0x98($sp)
@@ -3234,7 +3234,7 @@ glabel menugfxDrawTessellatedRect
 /*  f0e2900:	afb00074 */ 	sw	$s0,0x74($sp)
 /*  f0e2904:	afa40060 */ 	sw	$a0,0x60($sp)
 /*  f0e2908:	8fa600ac */ 	lw	$a2,0xac($sp)
-/*  f0e290c:	0fc54fa5 */ 	jal	func0f153e94
+/*  f0e290c:	0fc54fa5 */ 	jal	text0f153e94
 /*  f0e2910:	afa20054 */ 	sw	$v0,0x54($sp)
 /*  f0e2914:	afa2006c */ 	sw	$v0,0x6c($sp)
 /*  f0e2918:	1a000039 */ 	blez	$s0,.L0f0e2a00
@@ -3249,7 +3249,7 @@ glabel menugfxDrawTessellatedRect
 /*  f0e2938:	03c09025 */ 	or	$s2,$s8,$zero
 /*  f0e293c:	03c02025 */ 	or	$a0,$s8,$zero
 /*  f0e2940:	02e02825 */ 	or	$a1,$s7,$zero
-/*  f0e2944:	0fc54fa5 */ 	jal	func0f153e94
+/*  f0e2944:	0fc54fa5 */ 	jal	text0f153e94
 /*  f0e2948:	02a03025 */ 	or	$a2,$s5,$zero
 /*  f0e294c:	1000001a */ 	b	.L0f0e29b8
 /*  f0e2950:	00408025 */ 	or	$s0,$v0,$zero
@@ -3278,7 +3278,7 @@ glabel menugfxDrawTessellatedRect
 /*  f0e29a0:	00000000 */ 	nop
 /*  f0e29a4:	02202025 */ 	or	$a0,$s1,$zero
 /*  f0e29a8:	02c02825 */ 	or	$a1,$s6,$zero
-/*  f0e29ac:	0fc54fa5 */ 	jal	func0f153e94
+/*  f0e29ac:	0fc54fa5 */ 	jal	text0f153e94
 /*  f0e29b0:	00403025 */ 	or	$a2,$v0,$zero
 /*  f0e29b4:	00408025 */ 	or	$s0,$v0,$zero
 .L0f0e29b8:
@@ -3303,7 +3303,7 @@ glabel menugfxDrawTessellatedRect
 .L0f0e2a00:
 /*  f0e2a00:	8fa600b0 */ 	lw	$a2,0xb0($sp)
 /*  f0e2a04:	03c02025 */ 	or	$a0,$s8,$zero
-/*  f0e2a08:	0fc54fa5 */ 	jal	func0f153e94
+/*  f0e2a08:	0fc54fa5 */ 	jal	text0f153e94
 /*  f0e2a0c:	02e02825 */ 	or	$a1,$s7,$zero
 /*  f0e2a10:	8fb8006c */ 	lw	$t8,0x6c($sp)
 /*  f0e2a14:	8fa40098 */ 	lw	$a0,0x98($sp)
@@ -3349,7 +3349,7 @@ glabel menugfxDrawTessellatedRect
 // Mismatch: Uses callee-save registers differently
 //Gfx *menugfxDrawTessellatedRect(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour1, u32 colour2)
 //{
-//	if (func0f153e58()) {
+//	if (textHasDiagonalBlend()) {
 //		if (y2 - y1 > x2 - x1) {
 //			// Portrait
 //			s32 numfullparts; // 94
@@ -3361,7 +3361,7 @@ glabel menugfxDrawTessellatedRect
 //			u32 stack[2];
 //
 //			numfullparts = (y2 - y1) / 15;
-//			thiscolour = func0f153e94(x1, y1, colour1);
+//			thiscolour = text0f153e94(x1, y1, colour1);
 //			thisy = y1;
 //
 //			for (i = 0; i < numfullparts; i++) {
@@ -3369,11 +3369,11 @@ glabel menugfxDrawTessellatedRect
 //
 //				if (y2 - nexty < 3) {
 //					nexty = y2;
-//					nextcolour = func0f153e94(x2, y2, colour2);
+//					nextcolour = text0f153e94(x2, y2, colour2);
 //				} else {
 //					nextcolour = colourBlend(colour2, colour1, (nexty - y1) * 255 / (y2 - y1));
 //					// @bug? Should y1 be x1?
-//					nextcolour = func0f153e94(y1, thisy, nextcolour);
+//					nextcolour = text0f153e94(y1, thisy, nextcolour);
 //				}
 //
 //				gdl = menugfxDrawTri2(gdl, x1, thisy, x2, nexty, thiscolour, nextcolour, false);
@@ -3382,7 +3382,7 @@ glabel menugfxDrawTessellatedRect
 //				thiscolour = nextcolour;
 //			}
 //
-//			nextcolour = func0f153e94(x2, y2, colour2);
+//			nextcolour = text0f153e94(x2, y2, colour2);
 //			gdl = menugfxDrawTri2(gdl, x1, thisy, x2, y2, thiscolour, nextcolour, false);
 //		} else {
 //			// Landscape
@@ -3396,7 +3396,7 @@ glabel menugfxDrawTessellatedRect
 //			u32 stack[1];
 //
 //			numfullparts = (x2 - x1) / 15;
-//			thiscolour = func0f153e94(x1, y1, colour1);
+//			thiscolour = text0f153e94(x1, y1, colour1);
 //			thisx = x1;
 //
 //			for (i = 0; i < numfullparts; i++) {
@@ -3404,10 +3404,10 @@ glabel menugfxDrawTessellatedRect
 //
 //				if (x2 - nextx < 3) {
 //					nextx = x2;
-//					nextcolour = func0f153e94(x2, y2, colour2);
+//					nextcolour = text0f153e94(x2, y2, colour2);
 //				} else {
 //					nextcolour = colourBlend(colour2, colour1, (nextx - x1) * 255 / (x2 - x1));
-//					nextcolour = func0f153e94(thisx, y1, nextcolour);
+//					nextcolour = text0f153e94(thisx, y1, nextcolour);
 //				}
 //
 //				gdl = menugfxDrawTri2(gdl, thisx, y1, nextx, y2, thiscolour, nextcolour, false);
@@ -3416,7 +3416,7 @@ glabel menugfxDrawTessellatedRect
 //				thiscolour = nextcolour;
 //			}
 //
-//			nextcolour = func0f153e94(x2, y2, colour2);
+//			nextcolour = text0f153e94(x2, y2, colour2);
 //			gdl = menugfxDrawTri2(gdl, thisx, y1, x2, y2, thiscolour, nextcolour, false);
 //		}
 //	} else {
@@ -3744,19 +3744,19 @@ Gfx *menugfxDrawDialogChevron(Gfx *gdl, s32 x, s32 y, s32 size, s32 direction, u
 Gfx *menugfxDrawCheckbox(Gfx *gdl, s32 x, s32 y, s32 size, bool fill, u32 bordercolour, u32 fillcolour)
 {
 	if (fill) {
-		gdl = gfxSetPrimColour(gdl, fillcolour);
+		gdl = textSetPrimColour(gdl, fillcolour);
 		gDPFillRectangleScaled(gdl++, x, y, x + size, y + size);
-		gdl = func0f153838(gdl);
+		gdl = text0f153838(gdl);
 	}

-	gdl = gfxSetPrimColour(gdl, bordercolour);
+	gdl = textSetPrimColour(gdl, bordercolour);

 	gDPFillRectangleScaled(gdl++, x, y, x + size + 1, y + 1);
 	gDPFillRectangleScaled(gdl++, x, y + size, x + size + 1, y + size + 1);
 	gDPFillRectangleScaled(gdl++, x, y + 1, x + 1, y + size);
 	gDPFillRectangleScaled(gdl++, x + size, y + 1, x + size + 1, y + size);

-	gdl = func0f153838(gdl);
+	gdl = text0f153838(gdl);

 	return gdl;
 }
@@ -167,13 +167,13 @@ Gfx *menuitemListRenderHeader(Gfx *gdl, s16 x1, s16 y1, s16 width, s16 arg4, s16
 		colour = (colourBlend(colour, 0, 0x2c) & 0xffffff00) | (colour & 0xff);
 	}

-	gdl = func0f153780(gdl);
+	gdl = text0f153780(gdl);
 #if VERSION >= VERSION_NTSC_1_0
 	gdl = menugfxDrawListGroupHeader(gdl, x1, y1, x1 + width, y1 + height, x1 + arg4, colour & 0xff);
 #else
 	gdl = menugfxDrawListGroupHeader(gdl, x1, y1, x1 + width, y1 + height, x1 + arg4);
 #endif
-	gdl = func0f153628(gdl);
+	gdl = text0f153628(gdl);

 	x = x1 + 3;
 	y = y1 + 2;
@@ -184,7 +184,7 @@ Gfx *menuitemListRenderHeader(Gfx *gdl, s16 x1, s16 y1, s16 width, s16 arg4, s16
 		colour = (colourBlend(colour, 0, 0x2c) & 0xffffff00) | (colour & 0xff);
 	}

-	func0f153e38(g_MenuColourPalettes3[dialog->type].unk30, g_MenuColourPalettes2[dialog->type].unk30);
+	textSetWaveColours(g_MenuColourPalettes3[dialog->type].unk30, g_MenuColourPalettes2[dialog->type].unk30);

 	gdl = textRenderProjected(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, colour, width, height, 0, 0);

@@ -555,7 +555,7 @@ glabel menuitemListRender
 /*  f0e7604:	0040a825 */ 	move	$s5,$v0
 /*  f0e7608:	02402025 */ 	move	$a0,$s2
 /*  f0e760c:	01506821 */ 	addu	$t5,$t2,$s0
-/*  f0e7610:	0fc54b55 */ 	jal	func0f153628
+/*  f0e7610:	0fc54b55 */ 	jal	text0f153628
 /*  f0e7614:	afad012c */ 	sw	$t5,0x12c($sp)
 /*  f0e7618:	00152400 */ 	sll	$a0,$s5,0x10
 /*  f0e761c:	afa00160 */ 	sw	$zero,0x160($sp)
@@ -743,7 +743,7 @@ glabel menuitemListRender
 /*  f0e78c0:	00822021 */ 	addu	$a0,$a0,$v0
 /*  f0e78c4:	00a22821 */ 	addu	$a1,$a1,$v0
 /*  f0e78c8:	8ca52e60 */ 	lw	$a1,0x2e60($a1)
-/*  f0e78cc:	0fc54d69 */ 	jal	func0f153e38
+/*  f0e78cc:	0fc54d69 */ 	jal	textSetWaveColours
 /*  f0e78d0:	8c842fc8 */ 	lw	$a0,0x2fc8($a0)
 /*  f0e78d4:	8fb800fc */ 	lw	$t8,0xfc($sp)
 /*  f0e78d8:	8faa0108 */ 	lw	$t2,0x108($sp)
@@ -934,7 +934,7 @@ glabel menuitemListRender
 /*  f0e7b90:	51800006 */ 	beqzl	$t4,.JF0f0e7bac
 /*  f0e7b94:	8e2e0008 */ 	lw	$t6,0x8($s1)
 .JF0f0e7b98:
-/*  f0e7b98:	0fc55880 */ 	jal	func0f156024
+/*  f0e7b98:	0fc55880 */ 	jal	text0f156024
 /*  f0e7b9c:	24040001 */ 	li	$a0,0x1
 /*  f0e7ba0:	24190001 */ 	li	$t9,0x1
 /*  f0e7ba4:	afb900b4 */ 	sw	$t9,0xb4($sp)
@@ -1342,7 +1342,7 @@ glabel menuitemListRender
 /*  f0e8168:	8faa00b4 */ 	lw	$t2,0xb4($sp)
 /*  f0e816c:	51400004 */ 	beqzl	$t2,.JF0f0e8180
 /*  f0e8170:	8fb80108 */ 	lw	$t8,0x108($sp)
-/*  f0e8174:	0fc55880 */ 	jal	func0f156024
+/*  f0e8174:	0fc55880 */ 	jal	text0f156024
 /*  f0e8178:	00002025 */ 	move	$a0,$zero
 /*  f0e817c:	8fb80108 */ 	lw	$t8,0x108($sp)
 .JF0f0e8180:
@@ -1455,7 +1455,7 @@ glabel menuitemListRender
 /*  f0e830c:	afa80024 */ 	sw	$t0,0x24($sp)
 /*  f0e8310:	00409025 */ 	move	$s2,$v0
 .JF0f0e8314:
-/*  f0e8314:	0fc54bb7 */ 	jal	func0f153780
+/*  f0e8314:	0fc54bb7 */ 	jal	text0f153780
 /*  f0e8318:	02402025 */ 	move	$a0,$s2
 .JF0f0e831c:
 /*  f0e831c:	8fbf005c */ 	lw	$ra,0x5c($sp)
@@ -1829,7 +1829,7 @@ glabel menuitemListRender
 /*  f0e6858:	0040a825 */ 	or	$s5,$v0,$zero
 /*  f0e685c:	02402025 */ 	or	$a0,$s2,$zero
 /*  f0e6860:	01506821 */ 	addu	$t5,$t2,$s0
-/*  f0e6864:	0fc54d8a */ 	jal	func0f153628
+/*  f0e6864:	0fc54d8a */ 	jal	text0f153628
 /*  f0e6868:	afad012c */ 	sw	$t5,0x12c($sp)
 /*  f0e686c:	00152400 */ 	sll	$a0,$s5,0x10
 /*  f0e6870:	afa00160 */ 	sw	$zero,0x160($sp)
@@ -2017,7 +2017,7 @@ glabel menuitemListRender
 /*  f0e6b14:	00822021 */ 	addu	$a0,$a0,$v0
 /*  f0e6b18:	00a22821 */ 	addu	$a1,$a1,$v0
 /*  f0e6b1c:	8ca52130 */ 	lw	$a1,%lo(g_MenuColourPalettes2+0x18)($a1)
-/*  f0e6b20:	0fc54f8e */ 	jal	func0f153e38
+/*  f0e6b20:	0fc54f8e */ 	jal	textSetWaveColours
 /*  f0e6b24:	8c842298 */ 	lw	$a0,%lo(g_MenuColourPalettes3+0x18)($a0)
 /*  f0e6b28:	8fb800fc */ 	lw	$t8,0xfc($sp)
 /*  f0e6b2c:	8faa0108 */ 	lw	$t2,0x108($sp)
@@ -2208,7 +2208,7 @@ glabel menuitemListRender
 /*  f0e6de4:	51800006 */ 	beqzl	$t4,.L0f0e6e00
 /*  f0e6de8:	8e2e0008 */ 	lw	$t6,0x8($s1)
 .L0f0e6dec:
-/*  f0e6dec:	0fc55809 */ 	jal	func0f156024
+/*  f0e6dec:	0fc55809 */ 	jal	text0f156024
 /*  f0e6df0:	24040001 */ 	addiu	$a0,$zero,0x1
 /*  f0e6df4:	24190001 */ 	addiu	$t9,$zero,0x1
 /*  f0e6df8:	afb900b4 */ 	sw	$t9,0xb4($sp)
@@ -2616,7 +2616,7 @@ glabel menuitemListRender
 /*  f0e73bc:	8faa00b4 */ 	lw	$t2,0xb4($sp)
 /*  f0e73c0:	51400004 */ 	beqzl	$t2,.L0f0e73d4
 /*  f0e73c4:	8fb80108 */ 	lw	$t8,0x108($sp)
-/*  f0e73c8:	0fc55809 */ 	jal	func0f156024
+/*  f0e73c8:	0fc55809 */ 	jal	text0f156024
 /*  f0e73cc:	00002025 */ 	or	$a0,$zero,$zero
 /*  f0e73d0:	8fb80108 */ 	lw	$t8,0x108($sp)
 .L0f0e73d4:
@@ -2729,7 +2729,7 @@ glabel menuitemListRender
 /*  f0e7560:	afa80024 */ 	sw	$t0,0x24($sp)
 /*  f0e7564:	00409025 */ 	or	$s2,$v0,$zero
 .L0f0e7568:
-/*  f0e7568:	0fc54de0 */ 	jal	func0f153780
+/*  f0e7568:	0fc54de0 */ 	jal	text0f153780
 /*  f0e756c:	02402025 */ 	or	$a0,$s2,$zero
 .L0f0e7570:
 /*  f0e7570:	8fbf005c */ 	lw	$ra,0x5c($sp)
@@ -3022,7 +3022,7 @@ glabel menuitemListRender
 /*  f0e3bb4:	00409825 */ 	or	$s3,$v0,$zero
 /*  f0e3bb8:	02802025 */ 	or	$a0,$s4,$zero
 /*  f0e3bbc:	01f0c021 */ 	addu	$t8,$t7,$s0
-/*  f0e3bc0:	0fc5374a */ 	jal	func0f153628
+/*  f0e3bc0:	0fc5374a */ 	jal	text0f153628
 /*  f0e3bc4:	afb8012c */ 	sw	$t8,0x12c($sp)
 /*  f0e3bc8:	00132400 */ 	sll	$a0,$s3,0x10
 /*  f0e3bcc:	afa00160 */ 	sw	$zero,0x160($sp)
@@ -3207,7 +3207,7 @@ glabel menuitemListRender
 /*  f0e3e64:	00822021 */ 	addu	$a0,$a0,$v0
 /*  f0e3e68:	00a22821 */ 	addu	$a1,$a1,$v0
 /*  f0e3e6c:	8ca5c460 */ 	lw	$a1,-0x3ba0($a1)
-/*  f0e3e70:	0fc53925 */ 	jal	func0f153e38
+/*  f0e3e70:	0fc53925 */ 	jal	textSetWaveColours
 /*  f0e3e74:	8c84c5c8 */ 	lw	$a0,-0x3a38($a0)
 /*  f0e3e78:	8fad00fc */ 	lw	$t5,0xfc($sp)
 /*  f0e3e7c:	8faf0108 */ 	lw	$t7,0x108($sp)
@@ -3376,7 +3376,7 @@ glabel menuitemListRender
 /*  f0e40e0:	0fc01990 */ 	jal	colourBlend
 /*  f0e40e4:	02403025 */ 	or	$a2,$s2,$zero
 /*  f0e40e8:	00408025 */ 	or	$s0,$v0,$zero
-/*  f0e40ec:	0fc541a0 */ 	jal	func0f156024
+/*  f0e40ec:	0fc541a0 */ 	jal	text0f156024
 /*  f0e40f0:	24040001 */ 	addiu	$a0,$zero,0x1
 /*  f0e40f4:	240f0001 */ 	addiu	$t7,$zero,0x1
 /*  f0e40f8:	afaf00b4 */ 	sw	$t7,0xb4($sp)
@@ -3683,7 +3683,7 @@ glabel menuitemListRender
 /*  f0e4550:	8fab00b4 */ 	lw	$t3,0xb4($sp)
 /*  f0e4554:	51600004 */ 	beqzl	$t3,.NB0f0e4568
 /*  f0e4558:	8fad0108 */ 	lw	$t5,0x108($sp)
-/*  f0e455c:	0fc541a0 */ 	jal	func0f156024
+/*  f0e455c:	0fc541a0 */ 	jal	text0f156024
 /*  f0e4560:	00002025 */ 	or	$a0,$zero,$zero
 /*  f0e4564:	8fad0108 */ 	lw	$t5,0x108($sp)
 .NB0f0e4568:
@@ -3796,7 +3796,7 @@ glabel menuitemListRender
 /*  f0e46f4:	afb20024 */ 	sw	$s2,0x24($sp)
 /*  f0e46f8:	0040a025 */ 	or	$s4,$v0,$zero
 .NB0f0e46fc:
-/*  f0e46fc:	0fc537a0 */ 	jal	func0f153780
+/*  f0e46fc:	0fc537a0 */ 	jal	text0f153780
 /*  f0e4700:	02802025 */ 	or	$a0,$s4,$zero
 .NB0f0e4704:
 /*  f0e4704:	8fbf0064 */ 	lw	$ra,0x64($sp)
@@ -4025,9 +4025,9 @@ Gfx *menuitemDropdownRender(Gfx *gdl, struct menurendercontext *context)
 			colour = colourBlend(colour, tmpcolour, weight);
 		}

-		func0f153e38(g_MenuColourPalettes3[context->dialog->type].focused, g_MenuColourPalettes2[context->dialog->type].focused);
+		textSetWaveColours(g_MenuColourPalettes3[context->dialog->type].focused, g_MenuColourPalettes2[context->dialog->type].focused);
 	} else {
-		func0f153e38(g_MenuColourPalettes3[context->dialog->type].unfocused, g_MenuColourPalettes2[context->dialog->type].unfocused);
+		textSetWaveColours(g_MenuColourPalettes3[context->dialog->type].unfocused, g_MenuColourPalettes2[context->dialog->type].unfocused);
 	}

 	if (menuIsItemDisabled(context->item, context->dialog)) {
@@ -4037,10 +4037,10 @@ Gfx *menuitemDropdownRender(Gfx *gdl, struct menurendercontext *context)
 			colour = (colourBlend(colour, 0, 0x7f) & 0xffffff00) | (colour & 0xff);
 		}

-		func0f153e38(g_MenuColourPalettes3[context->dialog->type].disabled, g_MenuColourPalettes2[context->dialog->type].disabled);
+		textSetWaveColours(g_MenuColourPalettes3[context->dialog->type].disabled, g_MenuColourPalettes2[context->dialog->type].disabled);
 	}

-	gdl = func0f153628(gdl);
+	gdl = text0f153628(gdl);

 	x = context->x + 10;
 	y = context->y + 2;
@@ -4074,7 +4074,7 @@ Gfx *menuitemDropdownRender(Gfx *gdl, struct menurendercontext *context)
 		gdl = textRenderProjected(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, colour, context->width, context->height, 0, 0);
 	}

-	gdl = func0f153780(gdl);
+	gdl = text0f153780(gdl);

 	return gdl;
 }
@@ -4265,12 +4265,12 @@ Gfx *menuitemKeyboardRender(Gfx *gdl, struct menurendercontext *context)
 	label[1] = '\n';
 	label[2] = '\0';

-	func0f153e38(
+	textSetWaveColours(
 			g_MenuColourPalettes3[context->dialog->type].unfocused,
 			g_MenuColourPalettes2[context->dialog->type].unfocused);

 	// Draw input field background
-	gdl = gfxSetPrimColour(gdl, 0x0000ff7f);
+	gdl = textSetPrimColour(gdl, 0x0000ff7f);

 	if (context->item->param3 == 0) {
 		// Half width
@@ -4285,14 +4285,14 @@ Gfx *menuitemKeyboardRender(Gfx *gdl, struct menurendercontext *context)
 	}

 	// Render text value
-	gdl = func0f153838(gdl);
+	gdl = text0f153838(gdl);

 	x = context->x + 4;
 	y = context->y + 2;

-	gdl = func0f153628(gdl);
+	gdl = text0f153628(gdl);
 	gdl = textRenderProjected(gdl, &x, &y, data->string, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0xffffffff, context->width, context->height, 0, 0);
-	gdl = func0f153780(gdl);
+	gdl = text0f153780(gdl);

 	// Render cursor
 	alpha = func0f006b08(40) * 255;
@@ -4308,11 +4308,11 @@ Gfx *menuitemKeyboardRender(Gfx *gdl, struct menurendercontext *context)

 	cursorcolour = colourBlend(colourBlend(0x0000ffff, 0x000000ff, 127), cursorcolour, alpha);

-	gdl = gfxSetPrimColour(gdl, cursorcolour);
+	gdl = textSetPrimColour(gdl, cursorcolour);

 	gDPFillRectangleScaled(gdl++, x + 1, context->y + 2, x + 3, context->y + 9);

-	gdl = func0f153838(gdl);
+	gdl = text0f153838(gdl);

 	// Render horizontal grid lines
 	for (row = 0; row < 6; row++) {
@@ -4332,7 +4332,7 @@ Gfx *menuitemKeyboardRender(Gfx *gdl, struct menurendercontext *context)
 				context->x + col * 12 + 5, context->y + rowspan * 11 + 14, 0x00ffff7f, 0x00ffff7f);
 	}

-	gdl = func0f153628(gdl);
+	gdl = text0f153628(gdl);

 	x = context->x + 10;
 	y = context->y + 2;
@@ -4428,7 +4428,7 @@ Gfx *menuitemKeyboardRender(Gfx *gdl, struct menurendercontext *context)
 							textcolour = colourBlend(textcolour, 0, 127) & 0xffffff00 | textcolour & 0xff;
 						}

-						func0f153e38(
+						textSetWaveColours(
 								g_MenuColourPalettes3[context->dialog->type].disabled,
 								g_MenuColourPalettes2[context->dialog->type].disabled);
 					}
@@ -4436,7 +4436,7 @@ Gfx *menuitemKeyboardRender(Gfx *gdl, struct menurendercontext *context)
 					gdl = textRenderProjected(gdl, &x, &y, langGet(labels[index]), g_CharsHandelGothicXs, g_FontHandelGothicXs, textcolour, context->width, context->height, 0, 0);

 					if (index == 3 && menuitemKeyboardIsStringEmptyOrSpaces(data->string)) {
-						func0f153e38(
+						textSetWaveColours(
 								g_MenuColourPalettes3[context->dialog->type].unfocused,
 								g_MenuColourPalettes2[context->dialog->type].unfocused);
 					}
@@ -4457,7 +4457,7 @@ Gfx *menuitemKeyboardRender(Gfx *gdl, struct menurendercontext *context)
 		}
 	}

-	gdl = func0f153780(gdl);
+	gdl = text0f153780(gdl);

 	// Highlight border of focused button
 	{
@@ -4840,10 +4840,10 @@ glabel menuitemObjectivesRenderOne
 /*  f0ea78c:	00822021 */ 	addu	$a0,$a0,$v0
 /*  f0ea790:	00a22821 */ 	addu	$a1,$a1,$v0
 /*  f0ea794:	8ca52e60 */ 	lw	$a1,0x2e60($a1)
-/*  f0ea798:	0fc54d69 */ 	jal	func0f153e38
+/*  f0ea798:	0fc54d69 */ 	jal	textSetWaveColours
 /*  f0ea79c:	8c842fc8 */ 	lw	$a0,0x2fc8($a0)
 /*  f0ea7a0:	a3a000d0 */ 	sb	$zero,0xd0($sp)
-/*  f0ea7a4:	0fc54b55 */ 	jal	func0f153628
+/*  f0ea7a4:	0fc54b55 */ 	jal	text0f153628
 /*  f0ea7a8:	8fa40130 */ 	lw	$a0,0x130($sp)
 /*  f0ea7ac:	27b000d0 */ 	addiu	$s0,$sp,0xd0
 /*  f0ea7b0:	3c057f1b */ 	lui	$a1,0x7f1b
@@ -5058,7 +5058,7 @@ glabel menuitemObjectivesRenderOne
 /*  f0eaad4:	24c6fff3 */ 	addiu	$a2,$a2,-13
 /*  f0eaad8:	25080009 */ 	addiu	$t0,$t0,0x9
 /*  f0eaadc:	afa80124 */ 	sw	$t0,0x124($sp)
-/*  f0eaae0:	0fc54bb7 */ 	jal	func0f153780
+/*  f0eaae0:	0fc54bb7 */ 	jal	text0f153780
 /*  f0eaae4:	afa60128 */ 	sw	$a2,0x128($sp)
 /*  f0eaae8:	87a50142 */ 	lh	$a1,0x142($sp)
 /*  f0eaaec:	8fa60128 */ 	lw	$a2,0x128($sp)
@@ -5281,7 +5281,7 @@ glabel menuitemObjectivesRenderOne
 /*  f0eae48:	25ab0019 */ 	addiu	$t3,$t5,0x19
 /*  f0eae4c:	2549fffe */ 	addiu	$t1,$t2,-2
 /*  f0eae50:	afa90074 */ 	sw	$t1,0x74($sp)
-/*  f0eae54:	0fc54bb7 */ 	jal	func0f153780
+/*  f0eae54:	0fc54bb7 */ 	jal	text0f153780
 /*  f0eae58:	afab006c */ 	sw	$t3,0x6c($sp)
 /*  f0eae5c:	0fc38c93 */ 	jal	menugfx0f0e2498
 /*  f0eae60:	00402025 */ 	move	$a0,$v0
@@ -5469,10 +5469,10 @@ glabel menuitemObjectivesRenderOne
 /*  f0e99e4:	00822021 */ 	addu	$a0,$a0,$v0
 /*  f0e99e8:	00a22821 */ 	addu	$a1,$a1,$v0
 /*  f0e99ec:	8ca52130 */ 	lw	$a1,%lo(g_MenuColourPalettes2+0x18)($a1)
-/*  f0e99f0:	0fc54f8e */ 	jal	func0f153e38
+/*  f0e99f0:	0fc54f8e */ 	jal	textSetWaveColours
 /*  f0e99f4:	8c842298 */ 	lw	$a0,%lo(g_MenuColourPalettes3+0x18)($a0)
 /*  f0e99f8:	a3a000d0 */ 	sb	$zero,0xd0($sp)
-/*  f0e99fc:	0fc54d8a */ 	jal	func0f153628
+/*  f0e99fc:	0fc54d8a */ 	jal	text0f153628
 /*  f0e9a00:	8fa40130 */ 	lw	$a0,0x130($sp)
 /*  f0e9a04:	27b000d0 */ 	addiu	$s0,$sp,0xd0
 /*  f0e9a08:	3c057f1b */ 	lui	$a1,%hi(var7f1adfa8)
@@ -5715,7 +5715,7 @@ glabel menuitemObjectivesRenderOne
 /*  f0e9d9c:	24c6fff3 */ 	addiu	$a2,$a2,-13
 /*  f0e9da0:	27290009 */ 	addiu	$t1,$t9,0x9
 /*  f0e9da4:	afa90124 */ 	sw	$t1,0x124($sp)
-/*  f0e9da8:	0fc54de0 */ 	jal	func0f153780
+/*  f0e9da8:	0fc54de0 */ 	jal	text0f153780
 /*  f0e9dac:	afa60128 */ 	sw	$a2,0x128($sp)
 /*  f0e9db0:	87a50142 */ 	lh	$a1,0x142($sp)
 /*  f0e9db4:	87ae0146 */ 	lh	$t6,0x146($sp)
@@ -5934,7 +5934,7 @@ glabel menuitemObjectivesRenderOne
 /*  f0ea100:	8fa40130 */ 	lw	$a0,0x130($sp)
 /*  f0ea104:	01cd7821 */ 	addu	$t7,$t6,$t5
 /*  f0ea108:	25f90019 */ 	addiu	$t9,$t7,0x19
-/*  f0ea10c:	0fc54de0 */ 	jal	func0f153780
+/*  f0ea10c:	0fc54de0 */ 	jal	text0f153780
 /*  f0ea110:	afb9006c */ 	sw	$t9,0x6c($sp)
 /*  f0ea114:	0fc38926 */ 	jal	menugfx0f0e2498
 /*  f0ea118:	00402025 */ 	or	$a0,$v0,$zero
@@ -6122,10 +6122,10 @@ glabel menuitemObjectivesRenderOne
 /*  f0e99e4:	00822021 */ 	addu	$a0,$a0,$v0
 /*  f0e99e8:	00a22821 */ 	addu	$a1,$a1,$v0
 /*  f0e99ec:	8ca52130 */ 	lw	$a1,%lo(g_MenuColourPalettes2+0x18)($a1)
-/*  f0e99f0:	0fc54f8e */ 	jal	func0f153e38
+/*  f0e99f0:	0fc54f8e */ 	jal	textSetWaveColours
 /*  f0e99f4:	8c842298 */ 	lw	$a0,%lo(g_MenuColourPalettes3+0x18)($a0)
 /*  f0e99f8:	a3a000d0 */ 	sb	$zero,0xd0($sp)
-/*  f0e99fc:	0fc54d8a */ 	jal	func0f153628
+/*  f0e99fc:	0fc54d8a */ 	jal	text0f153628
 /*  f0e9a00:	8fa40130 */ 	lw	$a0,0x130($sp)
 /*  f0e9a04:	27b000d0 */ 	addiu	$s0,$sp,0xd0
 /*  f0e9a08:	3c057f1b */ 	lui	$a1,%hi(var7f1adfa8)
@@ -6368,7 +6368,7 @@ glabel menuitemObjectivesRenderOne
 /*  f0e9d9c:	24c6fff3 */ 	addiu	$a2,$a2,-13
 /*  f0e9da0:	27290009 */ 	addiu	$t1,$t9,0x9
 /*  f0e9da4:	afa90124 */ 	sw	$t1,0x124($sp)
-/*  f0e9da8:	0fc54de0 */ 	jal	func0f153780
+/*  f0e9da8:	0fc54de0 */ 	jal	text0f153780
 /*  f0e9dac:	afa60128 */ 	sw	$a2,0x128($sp)
 /*  f0e9db0:	87a50142 */ 	lh	$a1,0x142($sp)
 /*  f0e9db4:	87ae0146 */ 	lh	$t6,0x146($sp)
@@ -6587,7 +6587,7 @@ glabel menuitemObjectivesRenderOne
 /*  f0ea100:	8fa40130 */ 	lw	$a0,0x130($sp)
 /*  f0ea104:	01cd7821 */ 	addu	$t7,$t6,$t5
 /*  f0ea108:	25f90019 */ 	addiu	$t9,$t7,0x19
-/*  f0ea10c:	0fc54de0 */ 	jal	func0f153780
+/*  f0ea10c:	0fc54de0 */ 	jal	text0f153780
 /*  f0ea110:	afb9006c */ 	sw	$t9,0x6c($sp)
 /*  f0ea114:	0fc38926 */ 	jal	menugfx0f0e2498
 /*  f0ea118:	00402025 */ 	or	$a0,$v0,$zero
@@ -6775,10 +6775,10 @@ glabel menuitemObjectivesRenderOne
 /*  f0e6b58:	00822021 */ 	addu	$a0,$a0,$v0
 /*  f0e6b5c:	00a22821 */ 	addu	$a1,$a1,$v0
 /*  f0e6b60:	8ca5c460 */ 	lw	$a1,-0x3ba0($a1)
-/*  f0e6b64:	0fc53925 */ 	jal	func0f153e38
+/*  f0e6b64:	0fc53925 */ 	jal	textSetWaveColours
 /*  f0e6b68:	8c84c5c8 */ 	lw	$a0,-0x3a38($a0)
 /*  f0e6b6c:	a3a000d0 */ 	sb	$zero,0xd0($sp)
-/*  f0e6b70:	0fc5374a */ 	jal	func0f153628
+/*  f0e6b70:	0fc5374a */ 	jal	text0f153628
 /*  f0e6b74:	8fa40130 */ 	lw	$a0,0x130($sp)
 /*  f0e6b78:	27b000d0 */ 	addiu	$s0,$sp,0xd0
 /*  f0e6b7c:	3c057f1b */ 	lui	$a1,0x7f1b
@@ -7021,7 +7021,7 @@ glabel menuitemObjectivesRenderOne
 /*  f0e6f10:	24c6fff3 */ 	addiu	$a2,$a2,-13
 /*  f0e6f14:	27290009 */ 	addiu	$t1,$t9,0x9
 /*  f0e6f18:	afa90124 */ 	sw	$t1,0x124($sp)
-/*  f0e6f1c:	0fc537a0 */ 	jal	func0f153780
+/*  f0e6f1c:	0fc537a0 */ 	jal	text0f153780
 /*  f0e6f20:	afa60128 */ 	sw	$a2,0x128($sp)
 /*  f0e6f24:	87a50142 */ 	lh	$a1,0x142($sp)
 /*  f0e6f28:	87ae0146 */ 	lh	$t6,0x146($sp)
@@ -7240,7 +7240,7 @@ glabel menuitemObjectivesRenderOne
 /*  f0e7274:	8fa40130 */ 	lw	$a0,0x130($sp)
 /*  f0e7278:	01cd7821 */ 	addu	$t7,$t6,$t5
 /*  f0e727c:	25f90019 */ 	addiu	$t9,$t7,0x19
-/*  f0e7280:	0fc537a0 */ 	jal	func0f153780
+/*  f0e7280:	0fc537a0 */ 	jal	text0f153780
 /*  f0e7284:	afb9006c */ 	sw	$t9,0x6c($sp)
 /*  f0e7288:	0fc37e4b */ 	jal	menugfx0f0e2498
 /*  f0e728c:	00402025 */ 	or	$a0,$v0,$zero
@@ -7395,11 +7395,11 @@ const char var7f1adfb0[] = "%s";
 //		sp12c = (colourBlend(sp12c, 0, 0x2c) & 0xffffff00) | (sp12c & 0xff);
 //	}
 //
-//	func0f153e38(g_MenuColourPalettes3[dialog->type].unfocused, g_MenuColourPalettes2[dialog->type].unfocused);
+//	textSetWaveColours(g_MenuColourPalettes3[dialog->type].unfocused, g_MenuColourPalettes2[dialog->type].unfocused);
 //	buffer[0] = '\0';
 //
 //	// Render objective number
-//	gdl = func0f153628(gdl);
+//	gdl = text0f153628(gdl);
 //	sprintf(buffer, "%d: ", position);
 //	textMeasure(&textheight, &textwidth, buffer, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0);
 //	x = objx - textwidth + 25;
@@ -7454,7 +7454,7 @@ const char var7f1adfb0[] = "%s";
 //		x = objx + width - textwidth - 13;
 //		y = objy + 9;
 //
-//		gdl = func0f153780(gdl);
+//		gdl = text0f153780(gdl);
 //
 //		spb4 = objx + 22;
 //		spb0 = objy - 2;
@@ -7497,7 +7497,7 @@ const char var7f1adfb0[] = "%s";
 //		sp6c = objx + textwidth + 25;
 //		sp58 = (objx * 3 + objx + 66) / 4 - 1;
 //
-//		gdl = func0f153780(gdl);
+//		gdl = text0f153780(gdl);
 //		gdl = menugfx0f0e2498(gdl);
 //
 //		gdl = menugfxDrawTessellatedRect(gdl, objx, sp7c, sp80, sp7c + 1, sp12c & 0xffffff00, (sp12c & 0xffffff00) | 0x3f);
@@ -7641,7 +7641,7 @@ Gfx *menuitemLabelRender(Gfx *gdl, struct menurendercontext *context)
 			colour1 = (colourBlend(colour1, 0, 127) & 0xffffff00) | (colour1 & 0xff);
 		}

-		func0f153e38(
+		textSetWaveColours(
 				g_MenuColourPalettes3[context->dialog->type].checkedunfocused,
 				g_MenuColourPalettes2[context->dialog->type].checkedunfocused);
 	} else {
@@ -7658,7 +7658,7 @@ Gfx *menuitemLabelRender(Gfx *gdl, struct menurendercontext *context)
 			colour1 = (colourBlend(colour1, 0, 127) & 0xffffff00) | (colour1 & 0xff);
 		}

-		func0f153e38(
+		textSetWaveColours(
 				g_MenuColourPalettes3[context->dialog->type].unfocused,
 				g_MenuColourPalettes2[context->dialog->type].unfocused);
 	}
@@ -7677,7 +7677,7 @@ Gfx *menuitemLabelRender(Gfx *gdl, struct menurendercontext *context)
 			colour1 = (colourBlend(colour1, 0, 127) & 0xffffff00) | (colour1 & 0xff);
 		}

-		func0f153e38(
+		textSetWaveColours(
 				g_MenuColourPalettes3[context->dialog->type].disabled,
 				g_MenuColourPalettes2[context->dialog->type].disabled);
 	}
@@ -7689,8 +7689,8 @@ Gfx *menuitemLabelRender(Gfx *gdl, struct menurendercontext *context)
 			return gdl;
 		}

-		func0f153c50();
-		func0f153c20(x, y, menudfc->unk04 * 300, 0);
+		textBackupDiagonalBlendSettings();
+		textSetDiagonalBlend(x, y, menudfc->unk04 * 300, 0);
 		var8007fb9c = 1;
 	}

@@ -7712,7 +7712,7 @@ Gfx *menuitemLabelRender(Gfx *gdl, struct menurendercontext *context)
 		colour1 = data.label.colour1;
 	}

-	gdl = func0f153628(gdl);
+	gdl = text0f153628(gdl);
 	gdl = textRenderProjected(gdl, &x, &y, text,
 			font1, font2, colour1, context->width, context->height, 0, 0);

@@ -7745,7 +7745,7 @@ Gfx *menuitemLabelRender(Gfx *gdl, struct menurendercontext *context)
 		}
 	}

-	gdl = func0f153780(gdl);
+	gdl = text0f153780(gdl);

 	if (menudfc) {
 		if (context->width + 200 < menudfc->unk04 * 300 && context->dialog->redrawtimer < 0) {
@@ -7754,7 +7754,7 @@ Gfx *menuitemLabelRender(Gfx *gdl, struct menurendercontext *context)

 		var8007fb9c = savedvalue;

-		func0f153c88();
+		textRestoreDiagonalBlendSettings();
 	}

 	if (context->item->flags & MENUITEMFLAG_00200000) {
@@ -7814,23 +7814,23 @@ Gfx *menuitemMeterRender(Gfx *gdl, struct menurendercontext *context)
 	x2 = x1 + a;
 	x3 = x2 + 6;

-	gdl = gfxSetPrimColour(gdl, colour1);
+	gdl = textSetPrimColour(gdl, colour1);
 	gDPFillRectangleScaled(gdl++, x1, context->y, x2, context->y + 5);
-	gdl = func0f153838(gdl);
+	gdl = text0f153838(gdl);

-	gdl = gfxSetPrimColour(gdl, colour2);
+	gdl = textSetPrimColour(gdl, colour2);
 	gDPFillRectangleScaled(gdl++, x2, context->y, x3, context->y + 5);
-	gdl = func0f153838(gdl);
+	gdl = text0f153838(gdl);

 	text = menuResolveParam2Text(context->item);

 	if (text) {
-		gdl = func0f153628(gdl);
+		gdl = text0f153628(gdl);
 		x = context->x;
 		y = context->y - 1;
 		gdl = textRenderProjected(gdl, &x, &y, text, g_CharsHandelGothicXs, g_FontHandelGothicXs,
 				colour2 & 0xffffff7f, context->width, context->height, 0, 0);
-		gdl = func0f153780(gdl);
+		gdl = text0f153780(gdl);
 	}

 	return gdl;
@@ -7890,11 +7890,11 @@ Gfx *menuitemSelectableRender(Gfx *gdl, struct menurendercontext *context)

 		leftcolour = colourBlend(colourBlend(leftcolour, leftcolour & 0x000000ff, 127), colour2, weight);

-		func0f153e38(
+		textSetWaveColours(
 				g_MenuColourPalettes3[context->dialog->type].focused,
 				g_MenuColourPalettes2[context->dialog->type].focused);
 	} else {
-		func0f153e38(
+		textSetWaveColours(
 				g_MenuColourPalettes3[context->dialog->type].unfocused,
 				g_MenuColourPalettes2[context->dialog->type].unfocused);
 	}
@@ -7915,7 +7915,7 @@ Gfx *menuitemSelectableRender(Gfx *gdl, struct menurendercontext *context)

 		rightcolour = leftcolour;

-		func0f153e38(
+		textSetWaveColours(
 				g_MenuColourPalettes3[context->dialog->type].disabled,
 				g_MenuColourPalettes2[context->dialog->type].disabled);
 	}
@@ -7933,7 +7933,7 @@ Gfx *menuitemSelectableRender(Gfx *gdl, struct menurendercontext *context)
 		y += 6;
 	}

-	gdl = func0f153628(gdl);
+	gdl = text0f153628(gdl);
 	gdl = textRenderProjected(gdl, &x, &y, text, font1, font2,
 			leftcolour, context->width, context->height, 0, 0);

@@ -7955,7 +7955,7 @@ Gfx *menuitemSelectableRender(Gfx *gdl, struct menurendercontext *context)
 		}
 	}

-	return func0f153780(gdl);
+	return text0f153780(gdl);
 }

 bool menuitemSelectableTick(struct menuitem *item, struct menuinputs *inputs, u32 tickflags)
@@ -8036,9 +8036,9 @@ Gfx *menuitemSliderRender(Gfx *gdl, struct menurendercontext *context)
 			colour = colourBlend(colour, tmpcolour, weight) | 0xff;
 		}

-		func0f153e38(g_MenuColourPalettes3[context->dialog->type].focused, g_MenuColourPalettes2[context->dialog->type].focused);
+		textSetWaveColours(g_MenuColourPalettes3[context->dialog->type].focused, g_MenuColourPalettes2[context->dialog->type].focused);
 	} else {
-		func0f153e38(g_MenuColourPalettes3[context->dialog->type].unfocused, g_MenuColourPalettes2[context->dialog->type].unfocused);
+		textSetWaveColours(g_MenuColourPalettes3[context->dialog->type].unfocused, g_MenuColourPalettes2[context->dialog->type].unfocused);
 	}

 	gdl = menugfxRenderSlider(gdl, context->x + context->width - 82, context->y + extray + 5, context->x + context->width - 7, context->y + extray + 11, markerx, colour);
@@ -8066,12 +8066,12 @@ Gfx *menuitemSliderRender(Gfx *gdl, struct menurendercontext *context)
 			colour = colourBlend(colour, tmpcolour, weight);
 		}

-		func0f153e38(g_MenuColourPalettes3[context->dialog->type].focused, g_MenuColourPalettes2[context->dialog->type].focused);
+		textSetWaveColours(g_MenuColourPalettes3[context->dialog->type].focused, g_MenuColourPalettes2[context->dialog->type].focused);
 	} else {
-		func0f153e38(g_MenuColourPalettes3[context->dialog->type].unfocused, g_MenuColourPalettes2[context->dialog->type].unfocused);
+		textSetWaveColours(g_MenuColourPalettes3[context->dialog->type].unfocused, g_MenuColourPalettes2[context->dialog->type].unfocused);
 	}

-	gdl = func0f153628(gdl);
+	gdl = text0f153628(gdl);
 	gdl = textRenderProjected(gdl, &x, &y, label, g_CharsHandelGothicSm, g_FontHandelGothicSm, colour, context->width, context->height, 0, 0);

 	if ((context->item->flags & MENUITEMFLAG_00002000) == 0) {
@@ -8096,13 +8096,13 @@ Gfx *menuitemSliderRender(Gfx *gdl, struct menurendercontext *context)
 			colour = (colourBlend(colour, 0, 0x7f) & 0xffffff00) | (colour & 0xff);
 		}

-		func0f153e38(g_MenuColourPalettes3[context->dialog->type].unfocused, g_MenuColourPalettes2[context->dialog->type].unfocused);
+		textSetWaveColours(g_MenuColourPalettes3[context->dialog->type].unfocused, g_MenuColourPalettes2[context->dialog->type].unfocused);

 		colour = (colour & 0xffffff00) | ((colour & 0xff) >> 1);
 		gdl = textRenderProjected(gdl, &x, &y, buffer, g_CharsHandelGothicSm, g_FontHandelGothicSm, colour, context->width, context->height, 0, 0);
 	}

-	gdl = func0f153780(gdl);
+	gdl = text0f153780(gdl);

 	return gdl;
 }
@@ -8365,7 +8365,7 @@ Gfx *menuitemCheckboxRender(Gfx *gdl, struct menurendercontext *context)
 			maincolour = colourBlend(maincolour, 0, 127) & 0xffffff00 | maincolour & 0xff;
 		}

-		func0f153e38(
+		textSetWaveColours(
 				g_MenuColourPalettes3[context->dialog->type].checkedunfocused,
 				g_MenuColourPalettes2[context->dialog->type].checkedunfocused);
 	} else {
@@ -8382,12 +8382,12 @@ Gfx *menuitemCheckboxRender(Gfx *gdl, struct menurendercontext *context)
 			maincolour = colourBlend(maincolour, 0, 127) & 0xffffff00 | maincolour & 0xff;
 		}

-		func0f153e38(
+		textSetWaveColours(
 				g_MenuColourPalettes3[context->dialog->type].unfocused,
 				g_MenuColourPalettes2[context->dialog->type].unfocused);
 	}

-	gdl = func0f153628(gdl);
+	gdl = text0f153628(gdl);

 	if (context->focused) {
 		// Mismatch: The addiu and lui at ec8fc and ec900 are swapped. The addiu
@@ -8407,7 +8407,7 @@ Gfx *menuitemCheckboxRender(Gfx *gdl, struct menurendercontext *context)

 		maincolour = colourBlend(colourBlend(maincolour, maincolour & 0xff, 127), focuscolour, weight);

-		func0f153e38(
+		textSetWaveColours(
 				g_MenuColourPalettes3[context->dialog->type].focused,
 				g_MenuColourPalettes2[context->dialog->type].focused);
 	}
@@ -8426,7 +8426,7 @@ Gfx *menuitemCheckboxRender(Gfx *gdl, struct menurendercontext *context)
 			maincolour = colourBlend(maincolour, 0, 127) & 0xffffff00 | maincolour & 0xff;
 		}

-		func0f153e38(
+		textSetWaveColours(
 				g_MenuColourPalettes3[context->dialog->type].disabled,
 				g_MenuColourPalettes2[context->dialog->type].disabled);

@@ -8444,7 +8444,7 @@ Gfx *menuitemCheckboxRender(Gfx *gdl, struct menurendercontext *context)
 	gdl = textRenderProjected(gdl, &x, &y, text, font1, font2,
 			maincolour, context->width, context->height, 0, 0);

-	return func0f153780(gdl);
+	return text0f153780(gdl);
 }

 bool menuitemCheckboxTick(struct menuitem *item, struct menuinputs *inputs, u32 tickflags)
@@ -8587,11 +8587,11 @@ Gfx *menuitemScrollableRender(Gfx *gdl, struct menurendercontext *context)
 		colour = colourBlend(colour, 0, 0x7f) & 0xffffff00 | colour & 0xff;
 	}

-	func0f153e38(
+	textSetWaveColours(
 			g_MenuColourPalettes3[context->dialog->type].unfocused,
 			g_MenuColourPalettes2[context->dialog->type].unfocused);

-	gdl = func0f153628(gdl);
+	gdl = text0f153628(gdl);

 	// Heading text shadow
 	x = context->x + 3;
@@ -8612,7 +8612,7 @@ Gfx *menuitemScrollableRender(Gfx *gdl, struct menurendercontext *context)
 	gdl = textRenderProjected(gdl, &x, &y, bodytext, g_CharsHandelGothicSm, g_FontHandelGothicSm,
 			colour, context->width - 4, context->height - 1, -data->unk00, 0);

-	return func0f153780(gdl);
+	return text0f153780(gdl);
 }

 bool menuitemScrollableTick(struct menuitem *item, struct menudialog *dialog, struct menuinputs *inputs, u32 tickflags, union menuitemdata *data)
@@ -9020,7 +9020,7 @@ glabel menuitemMarqueeRender
 /*  f0ee694:	330b0fff */ 	andi	$t3,$t8,0xfff
 /*  f0ee698:	01eb6025 */ 	or	$t4,$t7,$t3
 /*  f0ee69c:	ac4c0004 */ 	sw	$t4,0x4($v0)
-/*  f0ee6a0:	0fc54d24 */ 	jal	func0f153d24
+/*  f0ee6a0:	0fc54d24 */ 	jal	textBackupAndResetBlends
 /*  f0ee6a4:	afa50088 */ 	sw	$a1,0x88($sp)
 /*  f0ee6a8:	8e2e0008 */ 	lw	$t6,0x8($s1)
 /*  f0ee6ac:	8dcd0004 */ 	lw	$t5,0x4($t6)
@@ -9030,17 +9030,17 @@ glabel menuitemMarqueeRender
 /*  f0ee6bc:	86240000 */ 	lh	$a0,0x0($s1)
 /*  f0ee6c0:	86390004 */ 	lh	$t9,0x4($s1)
 /*  f0ee6c4:	2406001c */ 	li	$a2,0x1c
-/*  f0ee6c8:	0fc54d15 */ 	jal	func0f153ce8
+/*  f0ee6c8:	0fc54d15 */ 	jal	textSetHorizontalBlend
 /*  f0ee6cc:	00992821 */ 	addu	$a1,$a0,$t9
 /*  f0ee6d0:	10000005 */ 	b	.JF0f0ee6e8
 /*  f0ee6d4:	00000000 */ 	nop
 /*  f0ee6d8:	86240000 */ 	lh	$a0,0x0($s1)
 .JF0f0ee6dc:
 /*  f0ee6dc:	2406000e */ 	li	$a2,0xe
-/*  f0ee6e0:	0fc54d15 */ 	jal	func0f153ce8
+/*  f0ee6e0:	0fc54d15 */ 	jal	textSetHorizontalBlend
 /*  f0ee6e4:	00802825 */ 	move	$a1,$a0
 .JF0f0ee6e8:
-/*  f0ee6e8:	0fc54b55 */ 	jal	func0f153628
+/*  f0ee6e8:	0fc54b55 */ 	jal	text0f153628
 /*  f0ee6ec:	8fa40088 */ 	lw	$a0,0x88($sp)
 /*  f0ee6f0:	8faa0058 */ 	lw	$t2,0x58($sp)
 /*  f0ee6f4:	8fa9005c */ 	lw	$t1,0x5c($sp)
@@ -9063,11 +9063,11 @@ glabel menuitemMarqueeRender
 /*  f0ee738:	02003825 */ 	move	$a3,$s0
 /*  f0ee73c:	0fc55886 */ 	jal	textRenderProjected
 /*  f0ee740:	afa80020 */ 	sw	$t0,0x20($sp)
-/*  f0ee744:	0fc54bb7 */ 	jal	func0f153780
+/*  f0ee744:	0fc54bb7 */ 	jal	text0f153780
 /*  f0ee748:	00402025 */ 	move	$a0,$v0
 /*  f0ee74c:	0fc3d768 */ 	jal	menuApplyScissor
 /*  f0ee750:	00402025 */ 	move	$a0,$v0
-/*  f0ee754:	0fc54d2a */ 	jal	func0f153d3c
+/*  f0ee754:	0fc54d2a */ 	jal	textRestoreBlends
 /*  f0ee758:	afa20088 */ 	sw	$v0,0x88($sp)
 /*  f0ee75c:	86390004 */ 	lh	$t9,0x4($s1)
 /*  f0ee760:	8faa0084 */ 	lw	$t2,0x84($sp)
@@ -9369,7 +9369,7 @@ glabel menuitemMarqueeRender
 /*  f0ed948:	31c80fff */ 	andi	$t0,$t6,0xfff
 /*  f0ed94c:	01e84825 */ 	or	$t1,$t7,$t0
 /*  f0ed950:	ac490004 */ 	sw	$t1,0x4($v0)
-/*  f0ed954:	0fc54f49 */ 	jal	func0f153d24
+/*  f0ed954:	0fc54f49 */ 	jal	textBackupAndResetBlends
 /*  f0ed958:	afa50088 */ 	sw	$a1,0x88($sp)
 /*  f0ed95c:	8e2b0008 */ 	lw	$t3,0x8($s1)
 /*  f0ed960:	8d6a0004 */ 	lw	$t2,0x4($t3)
@@ -9379,17 +9379,17 @@ glabel menuitemMarqueeRender
 /*  f0ed970:	86240000 */ 	lh	$a0,0x0($s1)
 /*  f0ed974:	862d0004 */ 	lh	$t5,0x4($s1)
 /*  f0ed978:	2406000e */ 	addiu	$a2,$zero,0xe
-/*  f0ed97c:	0fc54f3a */ 	jal	func0f153ce8
+/*  f0ed97c:	0fc54f3a */ 	jal	textSetHorizontalBlend
 /*  f0ed980:	008d2821 */ 	addu	$a1,$a0,$t5
 /*  f0ed984:	10000005 */ 	b	.L0f0ed99c
 /*  f0ed988:	00000000 */ 	nop
 /*  f0ed98c:	86240000 */ 	lh	$a0,0x0($s1)
 .L0f0ed990:
 /*  f0ed990:	2406000e */ 	addiu	$a2,$zero,0xe
-/*  f0ed994:	0fc54f3a */ 	jal	func0f153ce8
+/*  f0ed994:	0fc54f3a */ 	jal	textSetHorizontalBlend
 /*  f0ed998:	00802825 */ 	or	$a1,$a0,$zero
 .L0f0ed99c:
-/*  f0ed99c:	0fc54d8a */ 	jal	func0f153628
+/*  f0ed99c:	0fc54d8a */ 	jal	text0f153628
 /*  f0ed9a0:	8fa40088 */ 	lw	$a0,0x88($sp)
 /*  f0ed9a4:	8fb80058 */ 	lw	$t8,0x58($sp)
 /*  f0ed9a8:	8fb9005c */ 	lw	$t9,0x5c($sp)
@@ -9412,11 +9412,11 @@ glabel menuitemMarqueeRender
 /*  f0ed9ec:	02003825 */ 	or	$a3,$s0,$zero
 /*  f0ed9f0:	0fc5580f */ 	jal	textRenderProjected
 /*  f0ed9f4:	afac0020 */ 	sw	$t4,0x20($sp)
-/*  f0ed9f8:	0fc54de0 */ 	jal	func0f153780
+/*  f0ed9f8:	0fc54de0 */ 	jal	text0f153780
 /*  f0ed9fc:	00402025 */ 	or	$a0,$v0,$zero
 /*  f0eda00:	0fc3d43f */ 	jal	menuApplyScissor
 /*  f0eda04:	00402025 */ 	or	$a0,$v0,$zero
-/*  f0eda08:	0fc54f4f */ 	jal	func0f153d3c
+/*  f0eda08:	0fc54f4f */ 	jal	textRestoreBlends
 /*  f0eda0c:	afa20088 */ 	sw	$v0,0x88($sp)
 /*  f0eda10:	862d0004 */ 	lh	$t5,0x4($s1)
 /*  f0eda14:	8fb80084 */ 	lw	$t8,0x84($sp)
@@ -9625,7 +9625,7 @@ glabel menuitemMarqueeRender
 /*  f0ea964:	330f0fff */ 	andi	$t7,$t8,0xfff
 /*  f0ea968:	014f4025 */ 	or	$t0,$t2,$t7
 /*  f0ea96c:	ac480004 */ 	sw	$t0,0x4($v0)
-/*  f0ea970:	0fc538e0 */ 	jal	func0f153d24
+/*  f0ea970:	0fc538e0 */ 	jal	textBackupAndResetBlends
 /*  f0ea974:	afa40098 */ 	sw	$a0,0x98($sp)
 /*  f0ea978:	8e390008 */ 	lw	$t9,0x8($s1)
 /*  f0ea97c:	8f290004 */ 	lw	$t1,0x4($t9)
@@ -9635,17 +9635,17 @@ glabel menuitemMarqueeRender
 /*  f0ea98c:	86240000 */ 	lh	$a0,0x0($s1)
 /*  f0ea990:	862c0004 */ 	lh	$t4,0x4($s1)
 /*  f0ea994:	2406000e */ 	addiu	$a2,$zero,0xe
-/*  f0ea998:	0fc538d1 */ 	jal	func0f153ce8
+/*  f0ea998:	0fc538d1 */ 	jal	textSetHorizontalBlend
 /*  f0ea99c:	008c2821 */ 	addu	$a1,$a0,$t4
 /*  f0ea9a0:	10000005 */ 	beqz	$zero,.NB0f0ea9b8
 /*  f0ea9a4:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f0ea9a8:	86240000 */ 	lh	$a0,0x0($s1)
 .NB0f0ea9ac:
 /*  f0ea9ac:	2406000e */ 	addiu	$a2,$zero,0xe
-/*  f0ea9b0:	0fc538d1 */ 	jal	func0f153ce8
+/*  f0ea9b0:	0fc538d1 */ 	jal	textSetHorizontalBlend
 /*  f0ea9b4:	00802825 */ 	or	$a1,$a0,$zero
 .NB0f0ea9b8:
-/*  f0ea9b8:	0fc5374a */ 	jal	func0f153628
+/*  f0ea9b8:	0fc5374a */ 	jal	text0f153628
 /*  f0ea9bc:	8fa40098 */ 	lw	$a0,0x98($sp)
 /*  f0ea9c0:	8fae0084 */ 	lw	$t6,0x84($sp)
 /*  f0ea9c4:	afb70010 */ 	sw	$s7,0x10($sp)
@@ -9666,11 +9666,11 @@ glabel menuitemMarqueeRender
 /*  f0eaa00:	02003825 */ 	or	$a3,$s0,$zero
 /*  f0eaa04:	0fc541a6 */ 	jal	textRenderProjected
 /*  f0eaa08:	afb90020 */ 	sw	$t9,0x20($sp)
-/*  f0eaa0c:	0fc537a0 */ 	jal	func0f153780
+/*  f0eaa0c:	0fc537a0 */ 	jal	text0f153780
 /*  f0eaa10:	00402025 */ 	or	$a0,$v0,$zero
 /*  f0eaa14:	0fc3c728 */ 	jal	menuApplyScissor
 /*  f0eaa18:	00402025 */ 	or	$a0,$v0,$zero
-/*  f0eaa1c:	0fc538e6 */ 	jal	func0f153d3c
+/*  f0eaa1c:	0fc538e6 */ 	jal	textRestoreBlends
 /*  f0eaa20:	afa20098 */ 	sw	$v0,0x98($sp)
 /*  f0eaa24:	86290004 */ 	lh	$t1,0x4($s1)
 /*  f0eaa28:	8fab0094 */ 	lw	$t3,0x94($sp)
@@ -9805,21 +9805,21 @@ u32 var800711ec = 0x20000000;
 //
 //	gDPSetScissor(gdl++, G_SC_NON_INTERLACE, g_ScissorX1, g_ScissorY1, g_ScissorX2, g_ScissorY2);
 //
-//	func0f153d24();
+//	textBackupAndResetBlends();
 //
 //	if (context->item->flags & MENUITEMFLAG_00000800) {
-//		func0f153ce8(context->x, context->x + context->width, 0xe);
+//		textSetHorizontalBlend(context->x, context->x + context->width, 0xe);
 //	} else {
-//		func0f153ce8(context->x, context->x, 0xe);
+//		textSetHorizontalBlend(context->x, context->x, 0xe);
 //	}
 //
-//	gdl = func0f153628(gdl);
+//	gdl = text0f153628(gdl);
 //	gdl = textRenderProjected(gdl, &x, &y, &text[i], font1, font2,
 //			colour, context->width + context->x - x, context->height, 0, 0);
-//	gdl = func0f153780(gdl);
+//	gdl = text0f153780(gdl);
 //	gdl = menuApplyScissor(gdl);
 //
-//	func0f153d3c();
+//	textRestoreBlends();
 //
 //	unk14[2] = context->width;
 //
@@ -9922,7 +9922,7 @@ Gfx *menuitemRankingRender(Gfx *gdl, struct menurendercontext *context)
 		numrows = mpGetPlayerRankings(rankings);
 	}

-	gdl = func0f153628(gdl);
+	gdl = text0f153628(gdl);

 	// Gap from last item to bottom of dialog + header height
 #if VERSION >= VERSION_JPN_FINAL
@@ -9967,7 +9967,7 @@ Gfx *menuitemRankingRender(Gfx *gdl, struct menurendercontext *context)
 	y = context->y + 1;
 	gdl = textRenderProjected(gdl, &x, &y, langGet(L_MPMENU_278), g_CharsHandelGothicXs, g_FontHandelGothicXs,
 			textcolour, context->width, context->height, 0, 0);
-	gdl = func0f153780(gdl);
+	gdl = text0f153780(gdl);

 	dialog = context->dialog;

@@ -9997,8 +9997,8 @@ Gfx *menuitemRankingRender(Gfx *gdl, struct menurendercontext *context)
 		linecolour2 = colourBlend(linecolour2, 0, 44) & 0xffffff00 | linecolour2 & 0xff;
 	}

-	linecolour1 = func0f153e94(context->x, context->y + 2, -129) & 0xff | linecolour1 & 0xffffff00;
-	linecolour2 = func0f153e94(context->x + context->width, context->y + 2, -129) & 0xff | linecolour2 & 0xffffff00;
+	linecolour1 = text0f153e94(context->x, context->y + 2, -129) & 0xff | linecolour1 & 0xffffff00;
+	linecolour2 = text0f153e94(context->x + context->width, context->y + 2, -129) & 0xff | linecolour2 & 0xffffff00;

 	// Horizontal line between header and body
 #if VERSION == VERSION_JPN_FINAL
@@ -10064,7 +10064,7 @@ Gfx *menuitemRankingRender(Gfx *gdl, struct menurendercontext *context)
 			context->y + context->height - 1);
 #endif

-	gdl = func0f153628(gdl);
+	gdl = text0f153628(gdl);

 	for (i = 0; i < numrows; i++) {
 		struct ranking *ranking = &rankings[i];
@@ -10124,7 +10124,7 @@ Gfx *menuitemRankingRender(Gfx *gdl, struct menurendercontext *context)
 				textcolour, context->width, context->height, 0, 0);
 	}

-	return func0f153780(gdl);
+	return text0f153780(gdl);
 }

 bool menuitemRankingTick(struct menuinputs *inputs, u32 tickflags, union menuitemdata *data)
@@ -10187,7 +10187,7 @@ Gfx *menuitemPlayerStatsRender(Gfx *gdl, struct menurendercontext *context)

 	mpchr = MPCHR(playernum);

-	gdl = func0f153628(gdl);
+	gdl = text0f153628(gdl);

 	// Write selected player's name
 	weight = func0f006b08(40) * 255;
@@ -10419,7 +10419,7 @@ Gfx *menuitemPlayerStatsRender(Gfx *gdl, struct menurendercontext *context)
 		}
 	}

-	return func0f153780(gdl);
+	return text0f153780(gdl);
 }

 bool menuitemPlayerStatsTick(struct menuitem *item, struct menudialog *dialog, struct menuinputs *inputs, u32 tickflags, union menuitemdata *data)
@@ -10964,7 +10964,7 @@ Gfx *menuitemControllerRenderText(Gfx *gdl, s32 curmode, struct menurendercontex

 	s32 i;

-	gdl = func0f153628(gdl);
+	gdl = text0f153628(gdl);

 	for (i = 0; i < ARRAYCOUNT(labels); i++) {
 #if VERSION == VERSION_JPN_FINAL
@@ -11021,7 +11021,7 @@ Gfx *menuitemControllerRenderText(Gfx *gdl, s32 curmode, struct menurendercontex
 				g_CharsHandelGothicXs, g_FontHandelGothicXs, colour, viGetWidth(), viGetHeight(), 0, 0);
 	}

-	return func0f153780(gdl);
+	return text0f153780(gdl);
 }

 Gfx *menuitemControllerRenderPad(Gfx *gdl, struct menurendercontext *context, s32 padx, s32 pady, s32 curmode, u32 alpha, u32 colour1, u32 colour2, s8 prevmode)
@@ -11064,7 +11064,7 @@ Gfx *menuitemControllerRender(Gfx *gdl, struct menurendercontext *context)
 	u32 contalpha;
 	u32 textalpha;

-	func0f153d24();
+	textBackupAndResetBlends();

 	// If changing modes within the same group (eg. within 1.x)
 	if (data->curmode != (g_Menus[g_MpPlayerNum].main.controlmode & 0xff)) {
@@ -11112,7 +11112,7 @@ Gfx *menuitemControllerRender(Gfx *gdl, struct menurendercontext *context)

 	textalpha = data->textfadetimer;
 	contalpha = data->contfadetimer;
-	gdl = func0f153628(gdl);
+	gdl = text0f153628(gdl);

 	if (dialog->transitionfrac < 0) {
 		colour = g_MenuColourPalettes[dialog->type].unfocused;
@@ -11127,7 +11127,7 @@ Gfx *menuitemControllerRender(Gfx *gdl, struct menurendercontext *context)
 		colour = colourBlend(colour, 0, 44) & 0xffffff00 | colour & 0xff;
 	}

-	func0f153e38(
+	textSetWaveColours(
 			g_MenuColourPalettes3[dialog->type].unfocused,
 			g_MenuColourPalettes2[dialog->type].unfocused);

@@ -11145,7 +11145,7 @@ Gfx *menuitemControllerRender(Gfx *gdl, struct menurendercontext *context)
 	y = context->y + 2;
 	gdl = textRenderProjected(gdl, &x, &y, text,
 			g_CharsHandelGothicSm, g_FontHandelGothicSm, colour, viGetWidth(), viGetHeight(), 0, 0);
-	gdl = func0f153780(gdl);
+	gdl = text0f153780(gdl);

 	textcolour = colourBlend(colour, colour & 0xffffff00, textalpha);
 	colour = colourBlend(colour, colour & 0xffffff00, contalpha);
@@ -11169,13 +11169,13 @@ Gfx *menuitemControllerRender(Gfx *gdl, struct menurendercontext *context)
 		y += 34;
 #endif

-		gdl = func0f153628(gdl);
+		gdl = text0f153628(gdl);
 		gdl = textRenderProjected(gdl, &x, &y, langGet(L_MPWEAPONS_216), // "Hold weapon button for ..."
 				g_CharsHandelGothicSm, g_FontHandelGothicSm, colour, viGetWidth(), viGetHeight(), 0, 0);
-		gdl = func0f153780(gdl);
+		gdl = text0f153780(gdl);
 	}

-	func0f153d3c();
+	textRestoreBlends();

 	return gdl;
 }
@@ -1212,7 +1212,7 @@ Gfx *mpRenderModalText(Gfx *gdl)
 		s32 red = (s32) ((1.0f - var80061630) * 20.0f * 255.0f) % 255;
 		s32 stack2;

-		gdl = func0f153628(gdl);
+		gdl = text0f153628(gdl);

 		strcpy(text, langGet(L_MPWEAPONS_040)); // "Paused"

@@ -1251,7 +1251,7 @@ Gfx *mpRenderModalText(Gfx *gdl)
 		gdl = textRender(gdl, &x, &y, text, g_CharsHandelGothicMd, g_FontHandelGothicMd, (red << 24) | 0x00ff00ff, 0x000000ff, viGetWidth(), viGetWidth(), 0, 0);
 #endif

-		gdl = func0f153780(gdl);
+		gdl = text0f153780(gdl);
 	} else if (!g_MainIsEndscreen
 			&& g_MpSetup.paused == MPPAUSEMODE_UNPAUSED
 			&& g_Vars.currentplayer->isdead
@@ -1261,7 +1261,7 @@ Gfx *mpRenderModalText(Gfx *gdl)
 			&& !(g_Vars.antiplayernum >= 0 && ((g_Vars.currentplayer != g_Vars.anti || g_InCutscene)))
 			&& g_NumReasonsToEndMpMatch == 0) {
 		// Render "Press START" text
-		gdl = func0f153628(gdl);
+		gdl = text0f153628(gdl);

 		strcpy(text, langGet(L_MPWEAPONS_039));

@@ -1303,7 +1303,7 @@ Gfx *mpRenderModalText(Gfx *gdl)
 #endif
 		}

-		gdl = func0f153780(gdl);
+		gdl = text0f153780(gdl);

 		g_Menus[g_Vars.currentplayerstats->mpindex].openinhibit = 10;
 	}
@@ -508,13 +508,13 @@ Gfx *htmRenderHud(Gfx *gdl)
 		barright = t6 + a1 / 2;
 		s1 = barleft + (s32) (a1 * (dltime / TICKS(4800.0f)));

-		gdl = func0f153628(gdl);
-		gdl = gfxSetPrimColour(gdl, 0x60000060);
+		gdl = text0f153628(gdl);
+		gdl = textSetPrimColour(gdl, 0x60000060);

 		gDPFillRectangle(gdl++, barleft, viewtop + 8, barright, viewtop + 16);

-		gdl = func0f153838(gdl);
-		gdl = gfxSetPrimColour(gdl, 0xc00000d0);
+		gdl = text0f153838(gdl);
+		gdl = textSetPrimColour(gdl, 0xc00000d0);

 		v1 = barleft + 1;
 		a0 = barleft;
@@ -525,8 +525,8 @@ Gfx *htmRenderHud(Gfx *gdl)
 			a0 += 2;
 		}

-		gdl = func0f153838(gdl);
-		gdl = func0f153780(gdl);
+		gdl = text0f153838(gdl);
+		gdl = text0f153780(gdl);
 	}

 	return gdl;
@@ -332,7 +332,7 @@ Gfx *htbRenderHud(Gfx *gdl)
 		sprintf(text, "%d:%02d", mins, secs);
 #endif

-		gdl = func0f153628(gdl);
+		gdl = text0f153628(gdl);
 		textMeasure(&textheight, &textwidth, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, 0);

 		x -= textwidth / 2;
@@ -340,14 +340,14 @@ Gfx *htbRenderHud(Gfx *gdl)
 		textheight += y;

 #if VERSION >= VERSION_NTSC_1_0
-		gdl = func0f153990(gdl, x, y, textwidth, textheight);
+		gdl = text0f153990(gdl, x, y, textwidth, textheight);
 		gdl = textRender(gdl, &x, &y, text, g_CharsNumeric, g_FontNumeric, 0x00ff00a0, 0xa0, viGetWidth(), viGetHeight(), 0, 0);
 #else
-		gdl = func0f153858(gdl, &x, &y, &textwidth, &textheight);
+		gdl = text0f153858(gdl, &x, &y, &textwidth, &textheight);
 		gdl = textRender(gdl, &x, &y, text, g_CharsNumeric, g_FontNumeric, 0x00ff00a0, 0x88, viGetWidth(), viGetHeight(), 0, 0);
 #endif

-		gdl = func0f153780(gdl);
+		gdl = text0f153780(gdl);
 	}

 	return gdl;
@@ -489,7 +489,7 @@ Gfx *kohRenderHud(Gfx *gdl)
 			sprintf(text, "%02d", secs);
 		}

-		gdl = func0f153628(gdl);
+		gdl = text0f153628(gdl);
 		textMeasure(&textheight, &textwidth, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, 0);

 		x -= textwidth / 2;
@@ -497,13 +497,13 @@ Gfx *kohRenderHud(Gfx *gdl)
 		textheight += y;

 #if VERSION >= VERSION_NTSC_1_0
-		gdl = func0f153990(gdl, x, y, textwidth, textheight);
+		gdl = text0f153990(gdl, x, y, textwidth, textheight);
 		gdl = textRender(gdl, &x, &y, text, g_CharsNumeric, g_FontNumeric, 0x00ff00a0, 0xa0, viGetWidth(), viGetHeight(), 0, 0);
 #else
-		gdl = func0f153858(gdl, &x, &y, &textwidth, &textheight);
+		gdl = text0f153858(gdl, &x, &y, &textwidth, &textheight);
 		gdl = textRender(gdl, &x, &y, text, g_CharsNumeric, g_FontNumeric, 0x00ff00a0, 0x88, viGetWidth(), viGetHeight(), 0, 0);
 #endif
-		gdl = func0f153780(gdl);
+		gdl = text0f153780(gdl);
 	}

 	return gdl;
@@ -227,7 +227,7 @@ Gfx *pacRenderHud(Gfx *gdl)
 		secs = (time240 + (TICKS(240) - 1)) / TICKS(240);
 		sprintf(text, "%d:%02d", mins, secs);

-		gdl = func0f153628(gdl);
+		gdl = text0f153628(gdl);
 		textMeasure(&textheight, &textwidth, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, 0);

 		x -= textwidth / 2;
@@ -235,13 +235,13 @@ Gfx *pacRenderHud(Gfx *gdl)
 		textheight += y;

 #if VERSION >= VERSION_NTSC_1_0
-		gdl = func0f153990(gdl, x, y, textwidth, textheight);
+		gdl = text0f153990(gdl, x, y, textwidth, textheight);
 		gdl = textRender(gdl, &x, &y, text, g_CharsNumeric, g_FontNumeric, 0x00ff00a0, 0xa0, viGetWidth(), viGetHeight(), 0, 0);
 #else
-		gdl = func0f153858(gdl, &x, &y, &textwidth, &textheight);
+		gdl = text0f153858(gdl, &x, &y, &textwidth, &textheight);
 		gdl = textRender(gdl, &x, &y, text, g_CharsNumeric, g_FontNumeric, 0x00ff00a0, 0x88, viGetWidth(), viGetHeight(), 0, 0);
 #endif
-		gdl = func0f153780(gdl);
+		gdl = text0f153780(gdl);
 	}

 	return gdl;
@@ -679,7 +679,7 @@ s32 mpChallengesListHandler(s32 operation, struct menuitem *item, union handlerd
 		x = renderdata->x + 10;
 		y = renderdata->y + 1;

-		gdl = func0f153628(gdl);
+		gdl = text0f153628(gdl);

 		name = xhallengeGetName(g_MpPlayerNum, challengeindex);

@@ -687,7 +687,7 @@ s32 mpChallengesListHandler(s32 operation, struct menuitem *item, union handlerd
 				g_CharsHandelGothicSm, g_FontHandelGothicSm, renderdata->colour,
 				viGetWidth(), viGetHeight(), 0, 0);

-		gdl = func0f153780(gdl);
+		gdl = text0f153780(gdl);

 		gDPPipeSync(gdl++);
 		gDPSetTexturePersp(gdl++, G_TP_NONE);
@@ -3061,9 +3061,9 @@ s32 mpChallengesListMenuHandler(s32 operation, struct menuitem *item, union hand
 		x = renderdata->x + 10;
 		y = renderdata->y + 1;

-		gdl = func0f153628(gdl);
+		gdl = text0f153628(gdl);
 		gdl = textRenderProjected(gdl, &x, &y, challengeGetNameBySlot(data->type19.unk04), g_CharsHandelGothicSm, g_FontHandelGothicSm, renderdata->colour, viGetWidth(), viGetHeight(), 0, 0);
-		gdl = func0f153780(gdl);
+		gdl = text0f153780(gdl);

 		gDPPipeSync(gdl++);
 		gDPSetTexturePersp(gdl++, G_TP_NONE);
@@ -3676,7 +3676,7 @@ void playerConfigureVi(void)
 	f32 ratio = player0f0bd358();
 	g_ViRes = VIRES_LO;

-	func0f1531dc(false);
+	text0f1531dc(false);

 #if VERSION >= VERSION_JPN_FINAL
 	var800800f0jf = 0;
@@ -3708,12 +3708,12 @@ void playerTick(bool arg0)
 	}

 #if PAL
-	func0f1531dc(false);
+	text0f1531dc(false);
 #else
 	if (g_ViRes == VIRES_HI) {
-		func0f1531dc(true);
+		text0f1531dc(true);
 	} else {
-		func0f1531dc(false);
+		text0f1531dc(false);
 	}
 #endif

@@ -5305,9 +5305,9 @@ Gfx *playerRenderHud(Gfx *gdl)
 		s32 c = viGetViewLeft() + viGetViewWidth();
 		s32 d = viGetViewTop() + viGetViewHeight();

-		gdl = func0f153628(gdl);
-		gdl = func0f153a34(gdl, a, b, c, d, 0x000000a0);
-		gdl = func0f153780(gdl);
+		gdl = text0f153628(gdl);
+		gdl = text0f153a34(gdl, a, b, c, d, 0x000000a0);
+		gdl = text0f153780(gdl);
 	}

 	if (g_Vars.currentplayer->cameramode != CAMERAMODE_EYESPY
@@ -5555,9 +5555,9 @@ Gfx *playerRenderHud(Gfx *gdl)
 			s32 c = viGetViewLeft() + viGetViewWidth();
 			s32 d = viGetViewTop() + viGetViewHeight();

-			gdl = func0f153628(gdl);
-			gdl = func0f153a34(gdl, a, b, c, d, 0x000000a0);
-			gdl = func0f153780(gdl);
+			gdl = text0f153628(gdl);
+			gdl = text0f153a34(gdl, a, b, c, d, 0x000000a0);
+			gdl = text0f153780(gdl);
 		}

 		gdl = hudmsgsRender(gdl);
@@ -63675,7 +63675,7 @@ Gfx *countdownTimerRender(Gfx *gdl)
 		secs = (s32)floorf(value60 * (1.0f / 60.0f)) - mins * 60;
 		ms = (s32)floorf(value60 * 1.6666666269302f) - mins * 6000 - secs * 100;

-		gdl = func0f153628(gdl);
+		gdl = text0f153628(gdl);
 		gdl = bgunRenderHudInteger(gdl, (mins % 100) / 10, viewright - 18, HUDHALIGN_MIDDLE, y, HUDVALIGN_MIDDLE, 0x00ff00a0);
 		gdl = bgunRenderHudInteger(gdl, mins % 10, viewright - 14, HUDHALIGN_MIDDLE, y, HUDVALIGN_MIDDLE, 0x00ff00a0);
 		gdl = bgunRenderHudString(gdl, fmt, viewright - 8, HUDHALIGN_MIDDLE, y, HUDVALIGN_MIDDLE, 0x00ff00a0);
@@ -63684,7 +63684,7 @@ Gfx *countdownTimerRender(Gfx *gdl)
 		gdl = bgunRenderHudString(gdl, fmt, viewright + 8, HUDHALIGN_MIDDLE, y, HUDVALIGN_MIDDLE, 0x00ff00a0);
 		gdl = bgunRenderHudInteger(gdl, (ms % 100) / 10, viewright + 14, HUDHALIGN_MIDDLE, y, HUDVALIGN_MIDDLE, 0x00ff00a0);
 		gdl = bgunRenderHudInteger(gdl, ms % 10, viewright + 18, HUDHALIGN_MIDDLE, y, HUDVALIGN_MIDDLE, 0x00ff00a0);
-		gdl = func0f153780(gdl);
+		gdl = text0f153780(gdl);
 	}

 	return gdl;
@@ -144,94 +144,94 @@ Gfx *radarDrawDot(Gfx *gdl, struct prop *prop, struct coord *dist, u32 colour1,
 	if (swapcolours) {
 		if (prop == g_Vars.currentplayer->prop) {
 			// Box
-			gdl = gfxSetPrimColour(gdl, (0xff >> shiftamount) + colour1);
+			gdl = textSetPrimColour(gdl, (0xff >> shiftamount) + colour1);
 			gDPFillRectangleScaled(gdl++, x - 2, y + 2, x + 1, y + 3);
 			gDPFillRectangleScaled(gdl++, x - 3, y - 1, x + 2, y + 2);
 			gDPFillRectangleScaled(gdl++, x - 2, y - 2, x + 1, y - 1);
-			gdl = func0f153838(gdl);
+			gdl = text0f153838(gdl);

-			gdl = gfxSetPrimColour(gdl, (0xff >> shiftamount) + colour2);
+			gdl = textSetPrimColour(gdl, (0xff >> shiftamount) + colour2);
 			gDPFillRectangleScaled(gdl++, x - 1, y + 1, x + 0, y + 2);
 			gDPFillRectangleScaled(gdl++, x - 2, y + 0, x + 1, y + 1);
 			gDPFillRectangleScaled(gdl++, x - 1, y - 1, x + 0, y + 0);
-			gdl = func0f153838(gdl);
+			gdl = text0f153838(gdl);
 		} else if (g_RadarYIndicatorsEnabled && dist->y > 250) {
 			// Up triangle
-			gdl = gfxSetPrimColour(gdl, (0xff >> shiftamount) + colour1);
+			gdl = textSetPrimColour(gdl, (0xff >> shiftamount) + colour1);
 			gDPFillRectangleScaled(gdl++, x - 3, y - 1, x + 2, y + 2);
 			gDPFillRectangleScaled(gdl++, x - 2, y - 2, x + 1, y - 1);
-			gdl = func0f153838(gdl);
+			gdl = text0f153838(gdl);

-			gdl = gfxSetPrimColour(gdl, (0xff >> shiftamount) + colour2);
+			gdl = textSetPrimColour(gdl, (0xff >> shiftamount) + colour2);
 			gDPFillRectangleScaled(gdl++, x - 2, y + 0, x + 1, y + 1);
 			gDPFillRectangleScaled(gdl++, x - 1, y - 1, x + 0, y + 0);
-			gdl = func0f153838(gdl);
+			gdl = text0f153838(gdl);
 		} else if (g_RadarYIndicatorsEnabled && dist->y < -250) {
 			// Down triangle
-			gdl = gfxSetPrimColour(gdl, (0xff >> shiftamount) + colour1);
+			gdl = textSetPrimColour(gdl, (0xff >> shiftamount) + colour1);
 			gDPFillRectangleScaled(gdl++, x - 3, y - 2, x + 2, y + 1);
 			gDPFillRectangleScaled(gdl++, x - 2, y + 1, x + 1, y + 2);
-			gdl = func0f153838(gdl);
+			gdl = text0f153838(gdl);

-			gdl = gfxSetPrimColour(gdl, (0xff >> shiftamount) + colour2);
+			gdl = textSetPrimColour(gdl, (0xff >> shiftamount) + colour2);
 			gDPFillRectangleScaled(gdl++, x - 2, y - 1, x + 1, y + 0);
 			gDPFillRectangleScaled(gdl++, x - 1, y + 0, x + 0, y + 1);
-			gdl = func0f153838(gdl);
+			gdl = text0f153838(gdl);
 		} else {
 			// Dot
-			gdl = gfxSetPrimColour(gdl, (0xff >> shiftamount) + colour1);
+			gdl = textSetPrimColour(gdl, (0xff >> shiftamount) + colour1);
 			gDPFillRectangleScaled(gdl++, x - 2, y - 2, x + 2, y + 2);
-			gdl = func0f153838(gdl);
+			gdl = text0f153838(gdl);

-			gdl = gfxSetPrimColour(gdl, (0xff >> shiftamount) + colour2);
+			gdl = textSetPrimColour(gdl, (0xff >> shiftamount) + colour2);
 			gDPFillRectangleScaled(gdl++, x - 1, y - 1, x + 1, y + 1);
-			gdl = func0f153838(gdl);
+			gdl = text0f153838(gdl);
 		}
 	} else {
 		if (prop == g_Vars.currentplayer->prop) {
 			// Box
-			gdl = gfxSetPrimColour(gdl, (0xff >> shiftamount) + colour2);
+			gdl = textSetPrimColour(gdl, (0xff >> shiftamount) + colour2);
 			gDPFillRectangleScaled(gdl++, x - 2, y + 2, x + 1, y + 3);
 			gDPFillRectangleScaled(gdl++, x - 3, y - 1, x + 2, y + 2);
 			gDPFillRectangleScaled(gdl++, x - 2, y - 2, x + 1, y - 1);
-			gdl = func0f153838(gdl);
+			gdl = text0f153838(gdl);

-			gdl = gfxSetPrimColour(gdl, (0xff >> shiftamount) + colour1);
+			gdl = textSetPrimColour(gdl, (0xff >> shiftamount) + colour1);
 			gDPFillRectangleScaled(gdl++, x - 1, y + 1, x + 0, y + 2);
 			gDPFillRectangleScaled(gdl++, x - 2, y + 0, x + 1, y + 1);
 			gDPFillRectangleScaled(gdl++, x - 1, y - 1, x + 0, y + 0);
-			gdl = func0f153838(gdl);
+			gdl = text0f153838(gdl);
 		} else if (g_RadarYIndicatorsEnabled && dist->y > 250) {
 			// Up triangle
-			gdl = gfxSetPrimColour(gdl, (0xff >> shiftamount) + colour2);
+			gdl = textSetPrimColour(gdl, (0xff >> shiftamount) + colour2);
 			gDPFillRectangleScaled(gdl++, x - 3, y - 1, x + 2, y + 2);
 			gDPFillRectangleScaled(gdl++, x - 2, y - 2, x + 1, y - 1);
-			gdl = func0f153838(gdl);
+			gdl = text0f153838(gdl);

-			gdl = gfxSetPrimColour(gdl, (0xff >> shiftamount) + colour1);
+			gdl = textSetPrimColour(gdl, (0xff >> shiftamount) + colour1);
 			gDPFillRectangleScaled(gdl++, x - 2, y + 0, x + 1, y + 1);
 			gDPFillRectangleScaled(gdl++, x - 1, y - 1, x + 0, y + 0);
-			gdl = func0f153838(gdl);
+			gdl = text0f153838(gdl);
 		} else if (g_RadarYIndicatorsEnabled && dist->y < -250) {
 			// Down triangle
-			gdl = gfxSetPrimColour(gdl, (0xff >> shiftamount) + colour2);
+			gdl = textSetPrimColour(gdl, (0xff >> shiftamount) + colour2);
 			gDPFillRectangleScaled(gdl++, x - 3, y - 2, x + 2, y + 1);
 			gDPFillRectangleScaled(gdl++, x - 2, y + 1, x + 1, y + 2);
-			gdl = func0f153838(gdl);
+			gdl = text0f153838(gdl);

-			gdl = gfxSetPrimColour(gdl, (0xff >> shiftamount) + colour1);
+			gdl = textSetPrimColour(gdl, (0xff >> shiftamount) + colour1);
 			gDPFillRectangleScaled(gdl++, x - 2, y - 1, x + 1, y + 0);
 			gDPFillRectangleScaled(gdl++, x - 1, y + 0, x + 0, y + 1);
-			gdl = func0f153838(gdl);
+			gdl = text0f153838(gdl);
 		} else {
 			// Dot
-			gdl = gfxSetPrimColour(gdl, (0xff >> shiftamount) + colour2);
+			gdl = textSetPrimColour(gdl, (0xff >> shiftamount) + colour2);
 			gDPFillRectangleScaled(gdl++, x - 2, y - 2, x + 2, y + 2);
-			gdl = func0f153838(gdl);
+			gdl = text0f153838(gdl);

-			gdl = gfxSetPrimColour(gdl, (0xff >> shiftamount) + colour1);
+			gdl = textSetPrimColour(gdl, (0xff >> shiftamount) + colour1);
 			gDPFillRectangleScaled(gdl++, x - 1, y - 1, x + 1, y + 1);
-			gdl = func0f153838(gdl);
+			gdl = text0f153838(gdl);
 		}
 	}

@@ -370,7 +370,7 @@ Gfx *sightDrawTargetBox(Gfx *gdl, struct trackedprop *trackedprop, s32 textid, s
 	if (trackedprop->prop) {
 		colour = sightIsPropFriendly(trackedprop->prop) ? 0x000ff60 : 0xff000060;

-		gdl = gfxSetPrimColour(gdl, colour);
+		gdl = textSetPrimColour(gdl, colour);

 		// Left
 		if (boxleft >= viewleft && boxleft <= viewright && boxtop <= viewbottom && boxbottom >= viewtop) {
@@ -404,7 +404,7 @@ Gfx *sightDrawTargetBox(Gfx *gdl, struct trackedprop *trackedprop, s32 textid, s
 					(boxright < viewright ? boxright : viewright) + 1, boxbottom + 1);
 		}

-		gdl = func0f153838(gdl);
+		gdl = text0f153838(gdl);

 		if (textid != 0 && textonscreen) {
 			s32 x = boxright + 3;
@@ -440,7 +440,7 @@ Gfx *sightDrawAimer(Gfx *gdl, s32 x, s32 y, s32 radius, s32 cornergap, u32 colou
 	s32 viewright = viewleft + viewwidth - 1;
 	s32 viewbottom = viewtop + viewheight - 1;

-	gdl = gfxSetPrimColour(gdl, 0x00ff0028);
+	gdl = textSetPrimColour(gdl, 0x00ff0028);

 	// Draw the lines that span most of the viewport
 	if (PLAYERCOUNT() == 1) {
@@ -455,8 +455,8 @@ Gfx *sightDrawAimer(Gfx *gdl, s32 x, s32 y, s32 radius, s32 cornergap, u32 colou
 		gDPFillRectangleScaled(gdl++, x, y + radius - 2, x + 1, viewbottom + 1);
 	}

-	gdl = func0f153838(gdl);
-	gdl = gfxSetPrimColour(gdl, colour);
+	gdl = text0f153838(gdl);
+	gdl = textSetPrimColour(gdl, colour);

 	// Draw the box
 	gDPFillRectangleScaled(gdl++, x - radius, y - radius, x - radius + 1, y + radius + 1);
@@ -474,7 +474,7 @@ Gfx *sightDrawAimer(Gfx *gdl, s32 x, s32 y, s32 radius, s32 cornergap, u32 colou
 	gDPFillRectangleScaled(gdl++, x - radius, y + radius, x - cornergap + 1, y + radius + 1);
 	gDPFillRectangleScaled(gdl++, x + cornergap, y + radius, x + radius + 1, y + radius + 1);

-	gdl = func0f153838(gdl);
+	gdl = text0f153838(gdl);

 	return gdl;
 }
@@ -586,16 +586,16 @@ Gfx *sightDrawDelayedAimer(Gfx *gdl, s32 x, s32 y, s32 radius, s32 cornergap, u3
 	boxx = xpos;
 	boxy = ypos;

-	gdl = gfxSetPrimColour(gdl, 0x00ff0028);
+	gdl = textSetPrimColour(gdl, 0x00ff0028);

 	// Fill a 3x3 box at the live crosshair
 	gDPFillRectangleScaled(gdl++, x - 1, y - 1, x + 2, y);
 	gDPFillRectangleScaled(gdl++, x - 1, y, x + 2, y + 1);
 	gDPFillRectangleScaled(gdl++, x - 1, y + 1, x + 2, y + 2);

-	gdl = func0f153838(gdl);
+	gdl = text0f153838(gdl);

-	gdl = gfxSetPrimColour(gdl, colour);
+	gdl = textSetPrimColour(gdl, colour);

 	// Draw the box
 	gDPFillRectangleScaled(gdl++, boxx - radius, boxy - radius, boxx - radius + 1, boxy + radius + 1);
@@ -613,7 +613,7 @@ Gfx *sightDrawDelayedAimer(Gfx *gdl, s32 x, s32 y, s32 radius, s32 cornergap, u3
 	gDPFillRectangleScaled(gdl++, boxx - radius, boxy + radius, boxx - cornergap + 1, boxy + radius + 1);
 	gDPFillRectangleScaled(gdl++, boxx + cornergap, boxy + radius, boxx + radius + 1, boxy + radius + 1);

-	gdl = func0f153838(gdl);
+	gdl = text0f153838(gdl);

 	return gdl;
 }
@@ -709,7 +709,7 @@ glabel var7f1ade50
 .L0f0d8ff0:
 /*  f0d8ff0:	4600428d */ 	trunc.w.s	$f10,$f8
 /*  f0d8ff4:	440c5000 */ 	mfc1	$t4,$f10
-/*  f0d8ff8:	0fc54d8a */ 	jal	func0f153628
+/*  f0d8ff8:	0fc54d8a */ 	jal	text0f153628
 /*  f0d8ffc:	afac0084 */ 	sw	$t4,0x84($sp)
 /*  f0d9000:	3c0a800a */ 	lui	$t2,%hi(g_Vars)
 /*  f0d9004:	254a9fc0 */ 	addiu	$t2,$t2,%lo(g_Vars)
@@ -1070,7 +1070,7 @@ glabel var7f1ade50
 /*  f0d9518:	afb00014 */ 	sw	$s0,0x14($sp)
 /*  f0d951c:	00409825 */ 	or	$s3,$v0,$zero
 .L0f0d9520:
-/*  f0d9520:	0fc54de0 */ 	jal	func0f153780
+/*  f0d9520:	0fc54de0 */ 	jal	text0f153780
 /*  f0d9524:	02602025 */ 	or	$a0,$s3,$zero
 /*  f0d9528:	8fbf0044 */ 	lw	$ra,0x44($sp)
 /*  f0d952c:	8fb00034 */ 	lw	$s0,0x34($sp)
@@ -1171,7 +1171,7 @@ glabel var7f1ade50
 .L0f0d8ff0:
 /*  f0d8ff0:	4600428d */ 	trunc.w.s	$f10,$f8
 /*  f0d8ff4:	440c5000 */ 	mfc1	$t4,$f10
-/*  f0d8ff8:	0fc54d8a */ 	jal	func0f153628
+/*  f0d8ff8:	0fc54d8a */ 	jal	text0f153628
 /*  f0d8ffc:	afac0084 */ 	sw	$t4,0x84($sp)
 /*  f0d9000:	3c0a800a */ 	lui	$t2,%hi(g_Vars)
 /*  f0d9004:	254a9fc0 */ 	addiu	$t2,$t2,%lo(g_Vars)
@@ -1532,7 +1532,7 @@ glabel var7f1ade50
 /*  f0d9518:	afb00014 */ 	sw	$s0,0x14($sp)
 /*  f0d951c:	00409825 */ 	or	$s3,$v0,$zero
 .L0f0d9520:
-/*  f0d9520:	0fc54de0 */ 	jal	func0f153780
+/*  f0d9520:	0fc54de0 */ 	jal	text0f153780
 /*  f0d9524:	02602025 */ 	or	$a0,$s3,$zero
 /*  f0d9528:	8fbf0044 */ 	lw	$ra,0x44($sp)
 /*  f0d952c:	8fb00034 */ 	lw	$s0,0x34($sp)
@@ -1609,7 +1609,7 @@ glabel jtbl_var7f1ade04
 .L0f0d8ff0:
 /*  f0d8ff0:	4600428d */ 	trunc.w.s	$f10,$f8
 /*  f0d8ff4:	440c5000 */ 	mfc1	$t4,$f10
-/*  f0d8ff8:	0fc54d8a */ 	jal	func0f153628
+/*  f0d8ff8:	0fc54d8a */ 	jal	text0f153628
 /*  f0d8ffc:	afac0084 */ 	sw	$t4,0x84($sp)
 /*  f0d9000:	3c0a800a */ 	lui	$t2,%hi(g_Vars)
 /*  f0d9004:	254a9fc0 */ 	addiu	$t2,$t2,%lo(g_Vars)
@@ -1981,7 +1981,7 @@ glabel jtbl_var7f1ade04
 /*  f0d9518:	afb00014 */ 	sw	$s0,0x14($sp)
 /*  f0d951c:	00409825 */ 	or	$s3,$v0,$zero
 .L0f0d9520:
-/*  f0d9520:	0fc54de0 */ 	jal	func0f153780
+/*  f0d9520:	0fc54de0 */ 	jal	text0f153780
 /*  f0d9524:	02602025 */ 	or	$a0,$s3,$zero
 /*  f0d9528:	8fbf0044 */ 	lw	$ra,0x44($sp)
 /*  f0d952c:	8fb00034 */ 	lw	$s0,0x34($sp)
@@ -2009,7 +2009,7 @@ s32 var80070f98 = 0;
 //
 //	static s32 var80070f98 = 0;
 //
-//	gdl = func0f153628(gdl);
+//	gdl = text0f153628(gdl);
 //
 //	switch (g_Vars.currentplayer->target) {
 //	case SIGHTTARGET_NONE: // f0d9034
@@ -2190,7 +2190,7 @@ s32 var80070f98 = 0;
 //		break;
 //	}
 //
-//	gdl = func0f153780(gdl);
+//	gdl = text0f153780(gdl);
 //
 //	return gdl;
 //}
@@ -2655,11 +2655,11 @@ glabel var7f1ade54
 .L0f0da490:
 /*  f0da490:	10400730 */ 	beqz	$v0,.L0f0dc154
 /*  f0da494:	00c02025 */ 	or	$a0,$a2,$zero
-/*  f0da498:	0fc54d8a */ 	jal	func0f153628
+/*  f0da498:	0fc54d8a */ 	jal	text0f153628
 /*  f0da49c:	afad00b4 */ 	sw	$t5,0xb4($sp)
 /*  f0da4a0:	3c0500ff */ 	lui	$a1,0xff
 /*  f0da4a4:	34a50028 */ 	ori	$a1,$a1,0x28
-/*  f0da4a8:	0fc54df7 */ 	jal	gfxSetPrimColour
+/*  f0da4a8:	0fc54df7 */ 	jal	textSetPrimColour
 /*  f0da4ac:	00402025 */ 	or	$a0,$v0,$zero
 /*  f0da4b0:	3c017f1b */ 	lui	$at,%hi(var7f1ade54)
 /*  f0da4b4:	c420de54 */ 	lwc1	$f0,%lo(var7f1ade54)($at)
@@ -4620,9 +4620,9 @@ glabel var7f1ade54
 /*  f0dc134:	00197b80 */ 	sll	$t7,$t9,0xe
 /*  f0dc138:	44d8f800 */ 	ctc1	$t8,$31
 /*  f0dc13c:	01eac025 */ 	or	$t8,$t7,$t2
-/*  f0dc140:	0fc54e0e */ 	jal	func0f153838
+/*  f0dc140:	0fc54e0e */ 	jal	text0f153838
 /*  f0dc144:	ac580004 */ 	sw	$t8,0x4($v0)
-/*  f0dc148:	0fc54de0 */ 	jal	func0f153780
+/*  f0dc148:	0fc54de0 */ 	jal	text0f153780
 /*  f0dc14c:	00402025 */ 	or	$a0,$v0,$zero
 /*  f0dc150:	00403025 */ 	or	$a2,$v0,$zero
 .L0f0dc154:
@@ -4696,8 +4696,8 @@ glabel var7f1ade54
 //	}
 //
 //	if (showzoomrange) {
-//		gdl = func0f153628(gdl);
-//		gdl = gfxSetPrimColour(gdl, 0x00ff0028);
+//		gdl = text0f153628(gdl);
+//		gdl = textSetPrimColour(gdl, 0x00ff0028);
 //
 //		if (frac < 0.2f) {
 //			outerwidth *= 0.2f;
@@ -4772,8 +4772,8 @@ glabel var7f1ade54
 //		gDPFillRectangleScaled(gdl++, boxright - innerwidth, boxbottom, boxright + 1, boxbottom + 1);
 //		gDPFillRectangleScaled(gdl++, boxright, boxbottom - innerheight, boxright + 1, boxbottom + 1);
 //
-//		gdl = func0f153838(gdl);
-//		gdl = func0f153780(gdl);
+//		gdl = text0f153838(gdl);
+//		gdl = text0f153780(gdl);
 //	}
 //
 //	gdl = sightDrawDefault(gdl, sighton);
@@ -4865,7 +4865,7 @@ Gfx *sightDrawMaian(Gfx *gdl, bool sighton)
 	gDPTri4(gdl++, 0, 4, 5, 5, 3, 6, 7, 6, 1, 4, 7, 2);

 	gdl = func0f0d49c8(gdl);
-	gdl = gfxSetPrimColour(gdl, 0x00ff0028);
+	gdl = textSetPrimColour(gdl, 0x00ff0028);

 	// Draw border over inner points
 	gDPFillRectangleScaled(gdl++, x - 4, y - 4, x - 3, y + 5); // left
@@ -4873,7 +4873,7 @@ Gfx *sightDrawMaian(Gfx *gdl, bool sighton)
 	gDPFillRectangleScaled(gdl++, x - 4, y - 4, x + 5, y - 3); // top
 	gDPFillRectangleScaled(gdl++, x - 4, y + 4, x + 5, y + 5); // bottom

-	gdl = func0f153838(gdl);
+	gdl = text0f153838(gdl);

 	return gdl;
 }
@@ -4889,7 +4889,7 @@ Gfx *sightDrawTarget(Gfx *gdl)
 	mainOverrideVariable("sout", &var80070f9c);
 	mainOverrideVariable("sin", &var80070fa0);

-	gdl = gfxSetPrimColour(gdl, 0x00ff0028);
+	gdl = textSetPrimColour(gdl, 0x00ff0028);

 	gDPFillRectangleScaled(gdl++, x + 2, y + 0, x + 7, y + 1);
 	gDPFillRectangleScaled(gdl++, x + 2, y + 0, x + 5, y + 1);
@@ -4900,7 +4900,7 @@ Gfx *sightDrawTarget(Gfx *gdl)
 	gDPFillRectangleScaled(gdl++, x + 0, y - 6, x + 1, y - 1);
 	gDPFillRectangleScaled(gdl++, x + 0, y - 4, x + 1, y - 1);

-	gdl = func0f153838(gdl);
+	gdl = text0f153838(gdl);

 	return gdl;
 }
@@ -815,7 +815,7 @@ Gfx *starsRender(Gfx *gdl)
 	sp148.f[1] = g_Vars.currentplayer->cam_look.f[1];
 	sp148.f[2] = g_Vars.currentplayer->cam_look.f[2];

-	gdl = gfxSetPrimColour(gdl, 0xffffffff);
+	gdl = textSetPrimColour(gdl, 0xffffffff);

 	gDPSetRenderMode(gdl++, G_RM_CLD_SURF, G_RM_CLD_SURF2);

@@ -883,7 +883,7 @@ Gfx *starsRender(Gfx *gdl)
 		}
 	}

-	gdl = func0f153838(gdl);
+	gdl = text0f153838(gdl);

 	return gdl;
 }
@@ -353,7 +353,7 @@ Gfx *titleRenderLegal(Gfx *gdl)
 #if VERSION == VERSION_JPN_FINAL
 		gdl = func0f0d479c(gdl);
 #endif
-		gdl = func0f153628(gdl);
+		gdl = text0f153628(gdl);

 		elem = g_LegalElements;
 		end = &g_LegalElements[ARRAYCOUNT(g_LegalElements)];
@@ -403,15 +403,15 @@ Gfx *titleRenderLegal(Gfx *gdl)
 			}

 			if (elem->type == LEGALELEMENTTYPE_LINE) {
-				gdl = func0f153780(gdl);
+				gdl = text0f153780(gdl);
 #if VERSION == VERSION_JPN_FINAL
-				gdl = func0f153a34(gdl, elem->x, elem->y - 1, viGetWidth(), elem->y + 1, 0x7f7fff7f);
+				gdl = text0f153a34(gdl, elem->x, elem->y - 1, viGetWidth(), elem->y + 1, 0x7f7fff7f);
 #else
-				gdl = func0f153a34(gdl, elem->x, elem->y, viGetWidth(), elem->y + 2, 0x7f7fff7f);
+				gdl = text0f153a34(gdl, elem->x, elem->y, viGetWidth(), elem->y + 2, 0x7f7fff7f);
 #endif
-				gdl = func0f153628(gdl);
+				gdl = text0f153628(gdl);
 			} else if (elem->type == LEGALELEMENTTYPE_DOLBYLOGO) {
-				gdl = func0f153780(gdl);
+				gdl = text0f153780(gdl);

 				gDPPipeSync(gdl++);
 				gDPSetTexturePersp(gdl++, G_TP_NONE);
@@ -432,9 +432,9 @@ Gfx *titleRenderLegal(Gfx *gdl)
 						(elem->y + 24) << 2,
 						G_TX_RENDERTILE, 0, 0x0300, 0x0400, -0x0400);

-				gdl = func0f153628(gdl);
+				gdl = text0f153628(gdl);
 			} else if (elem->type == LEGALELEMENTTYPE_RARELOGO) {
-				gdl = func0f153780(gdl);
+				gdl = text0f153780(gdl);

 				gDPPipeSync(gdl++);
 				gDPSetTexturePersp(gdl++, G_TP_NONE);
@@ -455,7 +455,7 @@ Gfx *titleRenderLegal(Gfx *gdl)
 						(elem->y + 42) << 2,
 						G_TX_RENDERTILE, 0, 0x0540, 0x0400, -0x0400);

-				gdl = func0f153628(gdl);
+				gdl = text0f153628(gdl);
 			} else {
 #if VERSION == VERSION_JPN_FINAL
 				u32 stack;
@@ -511,7 +511,7 @@ Gfx *titleRenderLegal(Gfx *gdl)
 			}
 		}

-		gdl = func0f153780(gdl);
+		gdl = text0f153780(gdl);
 	}

 	return gdl;
@@ -8000,7 +8000,7 @@ Gfx *titleRenderRarePresents(Gfx *gdl)
 	s32 colourcomponent = 255;

 	gdl = titleClear(gdl);
-	gdl = func0f153628(gdl);
+	gdl = text0f153628(gdl);

 	x = viGetViewLeft() + 50;
 	y = viGetViewTop() + viGetViewHeight() - 80;
@@ -8019,7 +8019,7 @@ Gfx *titleRenderRarePresents(Gfx *gdl)
 		gdl = titleRenderTypewriterText(gdl, &x, &y, L_OPTIONS_007, g_TitleTimer - 35, &colourcomponent); // "rare presents"
 	}

-	gdl = func0f153780(gdl);
+	gdl = text0f153780(gdl);

 	if (g_TitleTypewriterFinishing) {
 		if (g_TitleAudioHandle == NULL) {
@@ -8035,7 +8035,7 @@ Gfx *titleRenderRarePresents(Gfx *gdl)

 	if (((s32)(var80061630 * 80.0f) % 2) == 0) {
 		u32 colour = (colourcomponent << 8) | 0x7f7fffff | (colourcomponent << 16);
-		gdl = func0f153a34(gdl, x + 2, y, x + 12, y + 20, colour);
+		gdl = text0f153a34(gdl, x + 2, y, x + 12, y + 20, colour);
 	}

 	gdl = bviewDrawIntroText(gdl);
@@ -8044,7 +8044,7 @@ Gfx *titleRenderRarePresents(Gfx *gdl)
 		f32 alpha = ((g_TitleTimer - TICKS(222.0f)) / TICKS(78.0f));
 		u32 stack;

-		gdl = func0f153a34(gdl, viGetViewLeft(), viGetViewTop(),
+		gdl = text0f153a34(gdl, viGetViewLeft(), viGetViewTop(),
 				viGetViewLeft() + viGetViewWidth(),
 				viGetViewTop() + viGetViewHeight(),
 				255.0f * alpha);
@@ -8561,7 +8561,7 @@ Gfx *titleRenderNoController(Gfx *gdl)
 	joyGetConnectedControllers();

 	gdl = titleClear(gdl);
-	gdl = func0f153628(gdl);
+	gdl = text0f153628(gdl);

 #if VERSION >= VERSION_JPN_FINAL
 	y = g_TitleViewHeight / 2 - 50;
@@ -8635,7 +8635,7 @@ Gfx *titleRenderNoController(Gfx *gdl)
 	}
 #endif

-	gdl = func0f153780(gdl);
+	gdl = text0f153780(gdl);

 	return gdl;
 }
@@ -8685,7 +8685,7 @@ Gfx *titleRenderNoExpansion(Gfx *gdl)
 	joyGetConnectedControllers();

 	gdl = titleClear(gdl);
-	gdl = func0f153628(gdl);
+	gdl = text0f153628(gdl);

 	x = 50;
 	y = g_TitleViewHeight / 2 - 36;
@@ -8717,7 +8717,7 @@ Gfx *titleRenderNoExpansion(Gfx *gdl)
 	var8007fad0 = 1;
 	var80080108jf = 1;

-	gdl = func0f153780(gdl);
+	gdl = text0f153780(gdl);

 	return gdl;
 }
@@ -3667,7 +3667,7 @@ glabel frRenderHudElement
 /*  f1a37f4:	27a5006c */ 	addiu	$a1,$sp,0x6c
 /*  f1a37f8:	27a60068 */ 	addiu	$a2,$sp,0x68
 /*  f1a37fc:	27a70070 */ 	addiu	$a3,$sp,0x70
-/*  f1a3800:	0fc54bed */ 	jal	func0f153858
+/*  f1a3800:	0fc54bed */ 	jal	text0f153858
 /*  f1a3804:	afa30068 */ 	sw	$v1,0x68($sp)
 /*  f1a3808:	0c002eeb */ 	jal	viGetWidth
 /*  f1a380c:	00408025 */ 	move	$s0,$v0
@@ -3741,7 +3741,7 @@ glabel frRenderHudElement
 /*  f1a391c:	27a5006c */ 	addiu	$a1,$sp,0x6c
 /*  f1a3920:	27a60068 */ 	addiu	$a2,$sp,0x68
 /*  f1a3924:	27a70070 */ 	addiu	$a3,$sp,0x70
-/*  f1a3928:	0fc54bed */ 	jal	func0f153858
+/*  f1a3928:	0fc54bed */ 	jal	text0f153858
 /*  f1a392c:	afaa0074 */ 	sw	$t2,0x74($sp)
 /*  f1a3930:	0c002eeb */ 	jal	viGetWidth
 /*  f1a3934:	00408025 */ 	move	$s0,$v0
@@ -3823,7 +3823,7 @@ glabel frRenderHudElement
 //
 //	x2 = x - (textwidth >> 1);
 //	y2 = y;
-//	gdl = func0f153858(gdl, &x2, &y2, &textwidth, &textheight);
+//	gdl = text0f153858(gdl, &x2, &y2, &textwidth, &textheight);
 //
 //	gdl = textRender(gdl, &x2, &y2, string1,
 //			g_CharsHandelGothicMd, g_FontHandelGothicMd, fullcolour, halfalpha, viGetWidth(), viGetHeight(), 0, 0);
@@ -3842,7 +3842,7 @@ glabel frRenderHudElement
 //		x2 = x - (textwidth >> 1);
 //		y2 = y + 17;
 //
-//		gdl = func0f153858(gdl, &x2, &y2, &textwidth, &textheight);
+//		gdl = text0f153858(gdl, &x2, &y2, &textwidth, &textheight);
 //
 //		gdl = func0f1574d0jf(gdl, &x2, &y2, string2,
 //			g_CharsHandelGothicXs, g_FontHandelGothicXs, fullcolour, halfalpha, viGetWidth(), viGetHeight(), 0, 0);
@@ -3871,7 +3871,7 @@ Gfx *frRenderHudElement(Gfx *gdl, s32 x, s32 y, char *string1, char *string2, u3

 	x2 = x - (textwidth >> 1);
 	y2 = y;
-	gdl = func0f153858(gdl, &x2, &y2, &textwidth, &textheight);
+	gdl = text0f153858(gdl, &x2, &y2, &textwidth, &textheight);

 	gdl = textRender(gdl, &x2, &y2, string1,
 			g_CharsHandelGothicMd, g_FontHandelGothicMd, fullcolour, halfalpha, viGetWidth(), viGetHeight(), 0, 0);
@@ -3881,7 +3881,7 @@ Gfx *frRenderHudElement(Gfx *gdl, s32 x, s32 y, char *string1, char *string2, u3

 		x2 = x - (textwidth >> 1);
 		y2 = y + 17;
-		gdl = func0f153858(gdl, &x2, &y2, &textwidth, &textheight);
+		gdl = text0f153858(gdl, &x2, &y2, &textwidth, &textheight);

 		gdl = textRender(gdl, &x2, &y2, string2,
 			g_CharsHandelGothicXs, g_FontHandelGothicXs, fullcolour, halfalpha, viGetWidth(), viGetHeight(), 0, 0);
@@ -3916,7 +3916,7 @@ Gfx *frRenderHud(Gfx *gdl)
 		alpha = (f32)(g_FrData.menucountdown * 160) / TICKS(60.0f);
 	}

-	gdl = func0f153628(gdl);
+	gdl = text0f153628(gdl);

 	// Time
 	red = frFormatTime(string1);
@@ -3960,7 +3960,7 @@ Gfx *frRenderHud(Gfx *gdl)
 				string1, string2, string3, 0x00ff00a0, alpha);
 	}

-	return func0f153780(gdl);
+	return text0f153780(gdl);
 }
 #else
 Gfx *frRenderHud(Gfx *gdl)
@@ -3986,7 +3986,7 @@ Gfx *frRenderHud(Gfx *gdl)
 		alpha = (f32)(g_FrData.menucountdown * 160) / TICKS(60.0f);
 	}

-	gdl = func0f153628(gdl);
+	gdl = text0f153628(gdl);

 	// Time
 	red = frFormatTime(string1);
@@ -4028,6 +4028,6 @@ Gfx *frRenderHud(Gfx *gdl)
 				string1, string2, 0x00ff00a0, alpha);
 	}

-	return func0f153780(gdl);
+	return text0f153780(gdl);
 }
 #endif
@@ -152,9 +152,9 @@ s32 frWeaponListMenuHandler(s32 operation, struct menuitem *item, union handlerd
 		y++;
 #endif

-		gdl = func0f153628(gdl);
+		gdl = text0f153628(gdl);
 		gdl = textRenderProjected(gdl, &x, &y, bgunGetName(weaponnum2), g_CharsHandelGothicSm, g_FontHandelGothicSm, renderdata->colour, viGetWidth(), viGetHeight(), 0, 0);
-		gdl = func0f153780(gdl);
+		gdl = text0f153780(gdl);

 		// Prepare the star texture for the difficulties
 		gDPPipeSync(gdl++);
@@ -668,10 +668,10 @@ s32 frScoringMenuHandler(s32 operation, struct menuitem *item, union handlerdata
 				G_TX_RENDERTILE, 16, 1024, -1024 / g_ScaleX, 1024);

 #if VERSION >= VERSION_NTSC_1_0
-		gdl = gfxSetPrimColour(gdl, (failed ? 0xff000055 : 0x00ff0055) & 0xffffff00 | ((failed ? 0xff000055 : 0x00ff0055) & 0xff) * (renderdata->colour & 0xff) >> 8);
+		gdl = textSetPrimColour(gdl, (failed ? 0xff000055 : 0x00ff0055) & 0xffffff00 | ((failed ? 0xff000055 : 0x00ff0055) & 0xff) * (renderdata->colour & 0xff) >> 8);
 		colour = (failed ? 0xff6969aa : renderdata->colour) & 0xffffff00 | (((failed ? 0xff6969aa : renderdata->colour) & 0xff) * (renderdata->colour & 0xff)) >> 8;
 #else
-		gdl = gfxSetPrimColour(gdl, failed ? 0xff000055 : 0x00ff0055);
+		gdl = textSetPrimColour(gdl, failed ? 0xff000055 : 0x00ff0055);
 #endif

 		// NTSC beta uses a static alpha channel, while newer versions take the
@@ -691,14 +691,14 @@ s32 frScoringMenuHandler(s32 operation, struct menuitem *item, union handlerdata
 		sprintf(text, "%d\n", frdata->numhitsbullseye);
 		x = renderdata->x + 93;
 		y = renderdata->y + (VERSION == VERSION_JPN_FINAL ? 15 : 14);
-		gdl = func0f153858(gdl, &x, &y, &textheight, &textwidth);
+		gdl = text0f153858(gdl, &x, &y, &textheight, &textwidth);
 		gdl = textRenderProjected(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, COLOUR(), viGetWidth(), viGetHeight(), 0, 0);

 		// "Bull's-eye"
 		sprintf(text, langGet(L_MPMENU_461));
 		x = renderdata->x + 122;
 		y = renderdata->y + 14;
-		gdl = func0f153858(gdl, &x, &y, &textheight, &textwidth);
+		gdl = text0f153858(gdl, &x, &y, &textheight, &textwidth);
 		gdl = textRenderProjected(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, COLOUR(), viGetWidth(), viGetHeight(), 0, 0);

 		// Bull's-eye score
@@ -706,21 +706,21 @@ s32 frScoringMenuHandler(s32 operation, struct menuitem *item, union handlerdata
 		textMeasure(&textheight, &textwidth, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0);
 		x = renderdata->x - textheight + (VERSION == VERSION_JPN_FINAL ? 192 : 182);
 		y = renderdata->y + (VERSION == VERSION_JPN_FINAL ? 15 : 14);
-		gdl = func0f153858(gdl, &x, &y, &textheight, &textwidth);
+		gdl = text0f153858(gdl, &x, &y, &textheight, &textwidth);
 		gdl = textRenderProjected(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, COLOUR(), viGetWidth(), viGetHeight(), 0, 0);

 		// Zone 1 count
 		sprintf(text, "%d\n", frdata->numhitsring1);
 		x = renderdata->x + 93;
 		y = renderdata->y + (VERSION == VERSION_JPN_FINAL ? 27 : 25);
-		gdl = func0f153858(gdl, &x, &y, &textheight, &textwidth);
+		gdl = text0f153858(gdl, &x, &y, &textheight, &textwidth);
 		gdl = textRenderProjected(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, COLOUR(), viGetWidth(), viGetHeight(), 0, 0);

 		// "Zone 1"
 		sprintf(text, langGet(L_MPMENU_462));
 		x = renderdata->x + 122;
 		y = renderdata->y + (VERSION == VERSION_JPN_FINAL ? 26 : 25);
-		gdl = func0f153858(gdl, &x, &y, &textheight, &textwidth);
+		gdl = text0f153858(gdl, &x, &y, &textheight, &textwidth);
 		gdl = textRenderProjected(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, COLOUR(), viGetWidth(), viGetHeight(), 0, 0);

 		// Zone 1 score
@@ -728,21 +728,21 @@ s32 frScoringMenuHandler(s32 operation, struct menuitem *item, union handlerdata
 		textMeasure(&textheight, &textwidth, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0);
 		x = renderdata->x - textheight + (VERSION == VERSION_JPN_FINAL ? 192 : 182);
 		y = renderdata->y + (VERSION == VERSION_JPN_FINAL ? 27 : 25);
-		gdl = func0f153858(gdl, &x, &y, &textheight, &textwidth);
+		gdl = text0f153858(gdl, &x, &y, &textheight, &textwidth);
 		gdl = textRenderProjected(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, COLOUR(), viGetWidth(), viGetHeight(), 0, 0);

 		// Zone 2 count
 		sprintf(text, "%d\n", frdata->numhitsring2);
 		x = renderdata->x + 93;
 		y = renderdata->y + (VERSION == VERSION_JPN_FINAL ? 39 : 36);
-		gdl = func0f153858(gdl, &x, &y, &textheight, &textwidth);
+		gdl = text0f153858(gdl, &x, &y, &textheight, &textwidth);
 		gdl = textRenderProjected(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, COLOUR(), viGetWidth(), viGetHeight(), 0, 0);

 		// "Zone 2"
 		sprintf(text, langGet(L_MPMENU_463));
 		x = renderdata->x + 122;
 		y = renderdata->y + (VERSION == VERSION_JPN_FINAL ? 38 : 36);
-		gdl = func0f153858(gdl, &x, &y, &textheight, &textwidth);
+		gdl = text0f153858(gdl, &x, &y, &textheight, &textwidth);
 		gdl = textRenderProjected(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, COLOUR(), viGetWidth(), viGetHeight(), 0, 0);

 		// Zone 2 score
@@ -750,14 +750,14 @@ s32 frScoringMenuHandler(s32 operation, struct menuitem *item, union handlerdata
 		textMeasure(&textheight, &textwidth, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0);
 		x = renderdata->x - textheight + (VERSION == VERSION_JPN_FINAL ? 192 : 182);
 		y = renderdata->y + (VERSION == VERSION_JPN_FINAL ? 39 : 36);
-		gdl = func0f153858(gdl, &x, &y, &textheight, &textwidth);
+		gdl = text0f153858(gdl, &x, &y, &textheight, &textwidth);
 		gdl = textRenderProjected(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, COLOUR(), viGetWidth(), viGetHeight(), 0, 0);

 		// Zone 3 count
 		sprintf(text, "%d\n", frdata->numhitsring3);
 		x = renderdata->x + 93;
 		y = renderdata->y + (VERSION == VERSION_JPN_FINAL ? 51 : 47);
-		gdl = func0f153858(gdl, &x, &y, &textheight, &textwidth);
+		gdl = text0f153858(gdl, &x, &y, &textheight, &textwidth);
 		gdl = textRenderProjected(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, COLOUR(), viGetWidth(), viGetHeight(), 0, 0);

 		// "Zone 3"
@@ -765,7 +765,7 @@ s32 frScoringMenuHandler(s32 operation, struct menuitem *item, union handlerdata
 		sprintf(text, langGet(L_MPMENU_464), frdata->numhitsring3);
 		x = renderdata->x + 122;
 		y = renderdata->y + (VERSION == VERSION_JPN_FINAL ? 50 : 47);
-		gdl = func0f153858(gdl, &x, &y, &textheight, &textwidth);
+		gdl = text0f153858(gdl, &x, &y, &textheight, &textwidth);
 		gdl = textRenderProjected(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, COLOUR(), viGetWidth(), viGetHeight(), 0, 0);

 		// Zone 3 score
@@ -773,7 +773,7 @@ s32 frScoringMenuHandler(s32 operation, struct menuitem *item, union handlerdata
 		textMeasure(&textheight, &textwidth, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0);
 		x = renderdata->x - textheight + (VERSION == VERSION_JPN_FINAL ? 192 : 182);
 		y = renderdata->y + (VERSION == VERSION_JPN_FINAL ? 51 : 47);
-		gdl = func0f153858(gdl, &x, &y, &textheight, &textwidth);
+		gdl = text0f153858(gdl, &x, &y, &textheight, &textwidth);
 		gdl = textRenderProjected(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, COLOUR(), viGetWidth(), viGetHeight(), 0, 0);

 		// "Hit total"
@@ -786,7 +786,7 @@ s32 frScoringMenuHandler(s32 operation, struct menuitem *item, union handlerdata
 		y += 3;
 #endif

-		gdl = func0f153858(gdl, &x, &y, &textheight, &textwidth);
+		gdl = text0f153858(gdl, &x, &y, &textheight, &textwidth);
 		gdl = textRenderProjected(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, COLOUR(), viGetWidth(), viGetHeight(), 0, 0);

 		// Hit total count
@@ -800,45 +800,45 @@ s32 frScoringMenuHandler(s32 operation, struct menuitem *item, union handlerdata
 		y += 3;
 #endif

-		gdl = func0f153858(gdl, &x, &y, &textheight, &textwidth);
+		gdl = text0f153858(gdl, &x, &y, &textheight, &textwidth);
 		gdl = textRenderProjected(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, COLOUR(), viGetWidth(), viGetHeight(), 0, 0);

 		// "Scoring"
 		sprintf(text, langGet(L_MPMENU_466));
 		x = renderdata->x + 83;
 		y = renderdata->y + 1;
-		gdl = func0f153858(gdl, &x, &y, &textheight, &textwidth);
+		gdl = text0f153858(gdl, &x, &y, &textheight, &textwidth);
 		gdl = textRenderProjected(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, COLOUR(), viGetWidth(), viGetHeight(), 0, 0);

 		// "10"
 		sprintf(text, langGet(L_MPMENU_467));
 		x = renderdata->x + 38;
 		y = renderdata->y + 35;
-		gdl = func0f153858(gdl, &x, &y, &textheight, &textwidth);
+		gdl = text0f153858(gdl, &x, &y, &textheight, &textwidth);
 		gdl = textRenderProjected(gdl, &x, &y, text, g_CharsNumeric, g_FontNumeric, COLOURWHITE(), viGetWidth(), viGetHeight(), 0, 0);

 		// "5"
 		sprintf(text, langGet(L_MPMENU_468));
 		x = renderdata->x + 32;
 		y = renderdata->y + 26;
-		gdl = func0f153858(gdl, &x, &y, &textheight, &textwidth);
+		gdl = text0f153858(gdl, &x, &y, &textheight, &textwidth);
 		gdl = textRenderProjected(gdl, &x, &y, text, g_CharsNumeric, g_FontNumeric, COLOURWHITE(), viGetWidth(), viGetHeight(), 0, 0);

 		// "2"
 		sprintf(text, langGet(L_MPMENU_469));
 		x = renderdata->x + 24;
 		y = renderdata->y + 16;
-		gdl = func0f153858(gdl, &x, &y, &textheight, &textwidth);
+		gdl = text0f153858(gdl, &x, &y, &textheight, &textwidth);
 		gdl = textRenderProjected(gdl, &x, &y, text, g_CharsNumeric, g_FontNumeric, COLOURWHITE(), viGetWidth(), viGetHeight(), 0, 0);

 		// "1"
 		sprintf(text, langGet(L_MPMENU_470));
 		x = renderdata->x + 14;
 		y = renderdata->y + 4;
-		gdl = func0f153858(gdl, &x, &y, &textheight, &textwidth);
+		gdl = text0f153858(gdl, &x, &y, &textheight, &textwidth);
 		gdl = textRenderProjected(gdl, &x, &y, text, g_CharsNumeric, g_FontNumeric, COLOURWHITE(), viGetWidth(), viGetHeight(), 0, 0);

-		gdl = func0f153838(gdl);
+		gdl = text0f153838(gdl);

 		// Render lines between the score table and the target texture

@@ -1880,7 +1880,7 @@ s32 ciHangarTitleMenuHandler(s32 operation, struct menuitem *item, union handler
 			leftmargin = item->param2 / 2;
 		}

-		gdl = func0f153628(gdl);
+		gdl = text0f153628(gdl);

 		// Render title
 		text = bioMenuTextName(NULL);
@@ -1908,7 +1908,7 @@ s32 ciHangarTitleMenuHandler(s32 operation, struct menuitem *item, union handler
 		textheight = renderdata->y + 25;
 		gdl = textRenderProjected(gdl, &textwidth, &textheight, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, renderdata->colour, viGetWidth(), viGetHeight(), 0, 0);

-		gdl = func0f153780(gdl);
+		gdl = text0f153780(gdl);

 		return (s32)gdl;
 	}
@@ -4,46 +4,50 @@
 #include "data.h"
 #include "types.h"

-void fontsInit(void);
+#define DIAGMODE_FADEIN  0
+#define DIAGMODE_REDRAW  1
+#define DIAGMODE_FADEOUT 2
+
+void textInit(void);
 void textSetRotation90(bool rotated);
 void textSetWrapIndent(s32 count);
-void func0f1531d0(s32 arg0);
-void func0f1531dc(bool arg0);
-void fontLoad(u8 *romstart, u8 *romend, struct font **fontptr, struct fontchar **charsptr, bool monospace);
-void fontsReset(void);
-Gfx *func0f153628(Gfx *gdl);
-Gfx *func0f153780(Gfx *gdl);
-Gfx *gfxSetPrimColour(Gfx *gdl, u32 colour);
-Gfx *func0f153838(Gfx *gdl);
-Gfx *func0f153858(Gfx *gdl, s32 *x1, s32 *y1, s32 *x2, s32 *y2);
-Gfx *func0f1538e4(Gfx *gdl, s32 *x1, s32 *y1, s32 *x2, s32 *y2);
-Gfx *func0f153990(Gfx *gdl, s32 left, s32 top, s32 width, s32 height);
-Gfx *func0f153a34(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour);
-Gfx *func0f153ab0(Gfx *gdl);
-void func0f153b40(void);
-void func0f153b6c(s32 arg0);
-void func0f153c20(s32 x, s32 y, f32 redrawtimer, u8 populated);
-void func0f153c50(void);
-void func0f153c88(void);
-void func0f153ce8(s32 x1, s32 x2, u32 arg2);
-void func0f153d24(void);
-void func0f153d3c(void);
-void func0f153d50(s32 arg0, s32 arg1, s32 cthresh);
-void func0f153d88(f32 arg0);
-void func0f153e38(u32 colour1, u32 colour2);
-void func0f153e4c(void);
-bool func0f153e58(void);
-u32 func0f153e94(s32 x, s32 y, u32 colour);
-u32 func0f1543ac(s32 x, s32 y, u32 colour);
-Gfx *func0f154ecc(Gfx *gdl, u32 arg1, u32 arg2);
-Gfx *func0f154f38(Gfx *gdl, s32 *arg1, struct fontchar *curchar, struct fontchar *prevchar, struct font *font, f32 widthscale, f32 heightscale, f32 x, f32 y);
-Gfx *func0f1552d4(Gfx *gdl, f32 x, f32 y, f32 widthscale, f32 heightscale, char *text, struct fontchar *chars, struct font *font, u32 colour, s32 hdir, s32 vdir);
-Gfx *func0f15568c(Gfx *gdl, s32 *x, s32 *y, struct fontchar *curchar, struct fontchar *prevchar, struct font *font, s32 savedx, s32 savedy, s32 width, s32 height, s32 arg10);
-void func0f156024(s32 arg0);
-void func0f156030(u32 colour);
+void text0f1531d0(s32 arg0);
+void text0f1531dc(bool arg0);
+void textLoadFont(u8 *romstart, u8 *romend, struct font **fontptr, struct fontchar **charsptr, bool monospace);
+void textReset(void);
+Gfx *text0f153628(Gfx *gdl);
+Gfx *text0f153780(Gfx *gdl);
+Gfx *textSetPrimColour(Gfx *gdl, u32 colour);
+Gfx *text0f153838(Gfx *gdl);
+Gfx *text0f153858(Gfx *gdl, s32 *x1, s32 *y1, s32 *x2, s32 *y2);
+Gfx *text0f1538e4(Gfx *gdl, s32 *x1, s32 *y1, s32 *x2, s32 *y2);
+Gfx *text0f153990(Gfx *gdl, s32 left, s32 top, s32 width, s32 height);
+Gfx *text0f153a34(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour);
+Gfx *text0f153ab0(Gfx *gdl);
+void text0f153b40(void);
+void text0f153b6c(s32 arg0);
+void textSetDiagonalBlend(s32 x, s32 y, f32 redrawtimer, u8 populated);
+void textBackupDiagonalBlendSettings(void);
+void textRestoreDiagonalBlendSettings(void);
+void textSetHorizontalBlend(s32 x1, s32 x2, u32 arg2);
+void textBackupAndResetBlends(void);
+void textRestoreBlends(void);
+void textSetWaveBlend(s32 arg0, s32 arg1, s32 cthresh);
+void textSetMenuBlend(f32 arg0);
+void textSetWaveColours(u32 colour1, u32 colour2);
+void textResetBlends(void);
+bool textHasDiagonalBlend(void);
+u32 text0f153e94(s32 x, s32 y, u32 colour);
+u32 text0f1543ac(s32 x, s32 y, u32 colour);
+Gfx *text0f154ecc(Gfx *gdl, u32 arg1, u32 arg2);
+Gfx *text0f154f38(Gfx *gdl, s32 *arg1, struct fontchar *curchar, struct fontchar *prevchar, struct font *font, f32 widthscale, f32 heightscale, f32 x, f32 y);
+Gfx *text0f1552d4(Gfx *gdl, f32 x, f32 y, f32 widthscale, f32 heightscale, char *text, struct fontchar *chars, struct font *font, u32 colour, s32 hdir, s32 vdir);
+Gfx *text0f15568c(Gfx *gdl, s32 *x, s32 *y, struct fontchar *curchar, struct fontchar *prevchar, struct font *font, s32 savedx, s32 savedy, s32 width, s32 height, s32 arg10);
+void text0f156024(s32 arg0);
+void text0f156030(u32 colour);
 Gfx *textRenderProjected(Gfx *gdl, s32 *x, s32 *y, char *text, struct fontchar *chars, struct font *font, s32 colour, s32 width, s32 height, s32 arg9, s32 lineheight);
-Gfx *func0f1566cc(Gfx *gdl, u32 arg1, u32 arg2);
-Gfx *func0f156a24(Gfx *gdl, s32 x, s32 y, struct fontchar *char1, s32 arg4, s32 arg5, s32 arg6, s32 arg7);
+Gfx *text0f1566cc(Gfx *gdl, u32 arg1, u32 arg2);
+Gfx *text0f156a24(Gfx *gdl, s32 x, s32 y, struct fontchar *char1, s32 arg4, s32 arg5, s32 arg6, s32 arg7);
 Gfx *textRender(Gfx *gdl, s32 *x, s32 *y, char *text, struct fontchar *font1, struct font *font2, u32 arg6, u32 colour, s32 arg8, s32 arg9, u32 arg10, s32 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);
@@ -5544,36 +5544,6 @@ struct menucolourpalette {
 	/*0x38*/ u32 unk38;
 };

-struct var800a45d0 {
-	/*0x00*/ u8 unk00;
-	/*0x04*/ u32 colour04;
-	/*0x08*/ u32 colour08;
-	/*0x0c*/ s32 unk0c;
-	/*0x10*/ s32 unk10;
-	/*0x14*/ f32 unk14;
-	/*0x18*/ u8 unk18;
-	/*0x1c*/ u32 unk1c;
-	/*0x20*/ u32 unk20;
-	/*0x24*/ f32 unk24;
-	/*0x28*/ u8 unk28;
-	/*0x29*/ u8 unk29;
-	/*0x2a*/ u8 unk2a;
-	/*0x2c*/ s32 unk2c;
-	/*0x30*/ s32 unk30;
-	/*0x34*/ s32 unk34;
-	/*0x38*/ s32 x1;
-	/*0x3c*/ s32 x2;
-	/*0x40*/ s32 unk40;
-	/*0x44*/ u32 colour44;
-	/*0x48*/ u32 colour48;
-	/*0x4c*/ u32 unk4c;
-	/*0x50*/ u32 unk50;
-	/*0x54*/ s32 cthresh;
-	/*0x58*/ u32 colour58;
-	/*0x5c*/ u32 colour5c;
-	/*0x60*/ u32 unk60;
-};
-
 struct bytelist {
 	u8 b0;
 	u8 b1;
@@ -631,7 +631,7 @@ glabel mainInit
 /*  d99c:	00000000 */ 	nop
 /*  d9a0:	0c003a58 */ 	jal	func0000e9c0
 /*  d9a4:	00000000 */ 	nop
-/*  d9a8:	0fc54a14 */ 	jal	fontsInit
+/*  d9a8:	0fc54a14 */ 	jal	textInit
 /*  d9ac:	00000000 */ 	nop
 /*  d9b0:	0c004dcc */ 	jal	dhudInit
 /*  d9b4:	00000000 */ 	nop
@@ -1026,7 +1026,7 @@ glabel mainInit
 /*     d730:	00000000 */ 	nop
 /*     d734:	0c0039c8 */ 	jal	func0000e9c0
 /*     d738:	00000000 */ 	nop
-/*     d73c:	0fc54f94 */ 	jal	fontsInit
+/*     d73c:	0fc54f94 */ 	jal	textInit
 /*     d740:	00000000 */ 	nop
 /*     d744:	0c004d48 */ 	jal	dhudInit
 /*     d748:	00000000 */ 	nop
@@ -1451,7 +1451,7 @@ glabel mainInit
 /*  d7d0:	00000000 */ 	nop
 /*  d7d4:	0c003a7d */ 	jal	func0000e9c0
 /*  d7d8:	00000000 */ 	nop
-/*  d7dc:	0fc55154 */ 	jal	fontsInit
+/*  d7dc:	0fc55154 */ 	jal	textInit
 /*  d7e0:	00000000 */ 	nop
 /*  d7e4:	0c004e5e */ 	jal	dhudInit
 /*  d7e8:	00000000 */ 	nop
@@ -1854,7 +1854,7 @@ glabel mainInit
 /*     d9f4:	00000000 */ 	nop
 /*     d9f8:	0c003a70 */ 	jal	func0000e9c0
 /*     d9fc:	00000000 */ 	nop
-/*     da00:	0fc54c68 */ 	jal	fontsInit
+/*     da00:	0fc54c68 */ 	jal	textInit
 /*     da04:	00000000 */ 	nop
 /*     da08:	0c004de4 */ 	jal	dhudInit
 /*     da0c:	00000000 */ 	nop
@@ -2227,7 +2227,7 @@ glabel mainInit
 /*     df04:	00000000 */ 	sll	$zero,$zero,0x0
 /*     df08:	0c003c68 */ 	jal	func0000e9c0
 /*     df0c:	00000000 */ 	sll	$zero,$zero,0x0
-/*     df10:	0fc53628 */ 	jal	fontsInit
+/*     df10:	0fc53628 */ 	jal	textInit
 /*     df14:	00000000 */ 	sll	$zero,$zero,0x0
 /*     df18:	0c005002 */ 	jal	dhudInit
 /*     df1c:	00000000 */ 	sll	$zero,$zero,0x0
@@ -2472,7 +2472,7 @@ const char var70053aa0[] = "          -ml0 -me0 -mgfx100 -mvtx50 -mt700 -ma400";
 //	lvInit();
 //	cheatsInit();
 //	func0000e9c0();
-//	fontsInit();
+//	textInit();
 //	dhudInit();
 //	playermgrInit();
 //	frametimeInit();