diff --git a/src/game/game_0e0770.c b/src/game/game_0e0770.c
index e22174128..bcf17aff7 100644
--- a/src/game/game_0e0770.c
+++ b/src/game/game_0e0770.c
@@ -6,6 +6,7 @@
 #include "game/savebuffer.h"
 #include "game/game_0e0770.h"
 #include "game/game_1531a0.h"
+#include "game/gfxmemory.h"
 #include "game/file.h"
 #include "game/utils.h"
 #include "bss.h"
@@ -2733,104 +2734,56 @@ Gfx *func0f0e2498(Gfx *gdl)
 	return gdl;
 }
 
-GLOBAL_ASM(
-glabel func0f0e258c
-/*  f0e258c:	27bdffd0 */ 	addiu	$sp,$sp,-48
-/*  f0e2590:	afb00018 */ 	sw	$s0,0x18($sp)
-/*  f0e2594:	00808025 */ 	or	$s0,$a0,$zero
-/*  f0e2598:	afbf001c */ 	sw	$ra,0x1c($sp)
-/*  f0e259c:	afa50034 */ 	sw	$a1,0x34($sp)
-/*  f0e25a0:	afa60038 */ 	sw	$a2,0x38($sp)
-/*  f0e25a4:	afa7003c */ 	sw	$a3,0x3c($sp)
-/*  f0e25a8:	0fc59e73 */ 	jal	gfxAllocateColours
-/*  f0e25ac:	24040002 */ 	addiu	$a0,$zero,0x2
-/*  f0e25b0:	afa20028 */ 	sw	$v0,0x28($sp)
-/*  f0e25b4:	0fc59e59 */ 	jal	gfxAllocateVertices
-/*  f0e25b8:	24040004 */ 	addiu	$a0,$zero,0x4
-/*  f0e25bc:	8fae0034 */ 	lw	$t6,0x34($sp)
-/*  f0e25c0:	2407000a */ 	addiu	$a3,$zero,0xa
-/*  f0e25c4:	afa2002c */ 	sw	$v0,0x2c($sp)
-/*  f0e25c8:	01c70019 */ 	multu	$t6,$a3
-/*  f0e25cc:	2408fff6 */ 	addiu	$t0,$zero,-10
-/*  f0e25d0:	00001812 */ 	mflo	$v1
-/*  f0e25d4:	a4430000 */ 	sh	$v1,0x0($v0)
-/*  f0e25d8:	8faf0038 */ 	lw	$t7,0x38($sp)
-/*  f0e25dc:	a4480004 */ 	sh	$t0,0x4($v0)
-/*  f0e25e0:	01e70019 */ 	multu	$t7,$a3
-/*  f0e25e4:	00002012 */ 	mflo	$a0
-/*  f0e25e8:	a4440002 */ 	sh	$a0,0x2($v0)
-/*  f0e25ec:	8fb8003c */ 	lw	$t8,0x3c($sp)
-/*  f0e25f0:	a444000e */ 	sh	$a0,0xe($v0)
-/*  f0e25f4:	a4480010 */ 	sh	$t0,0x10($v0)
-/*  f0e25f8:	03070019 */ 	multu	$t8,$a3
-/*  f0e25fc:	00002812 */ 	mflo	$a1
-/*  f0e2600:	a445000c */ 	sh	$a1,0xc($v0)
-/*  f0e2604:	a4450018 */ 	sh	$a1,0x18($v0)
-/*  f0e2608:	8fb90040 */ 	lw	$t9,0x40($sp)
-/*  f0e260c:	a448001c */ 	sh	$t0,0x1c($v0)
-/*  f0e2610:	a4430024 */ 	sh	$v1,0x24($v0)
-/*  f0e2614:	03270019 */ 	multu	$t9,$a3
-/*  f0e2618:	a4480028 */ 	sh	$t0,0x28($v0)
-/*  f0e261c:	24030004 */ 	addiu	$v1,$zero,0x4
-/*  f0e2620:	00003012 */ 	mflo	$a2
-/*  f0e2624:	a446001a */ 	sh	$a2,0x1a($v0)
-/*  f0e2628:	a4460026 */ 	sh	$a2,0x26($v0)
-/*  f0e262c:	8fa9004c */ 	lw	$t1,0x4c($sp)
-/*  f0e2630:	55200008 */ 	bnezl	$t1,.L0f0e2654
-/*  f0e2634:	a0400007 */ 	sb	$zero,0x7($v0)
-/*  f0e2638:	24030004 */ 	addiu	$v1,$zero,0x4
-/*  f0e263c:	a0400007 */ 	sb	$zero,0x7($v0)
-/*  f0e2640:	a0430013 */ 	sb	$v1,0x13($v0)
-/*  f0e2644:	a043001f */ 	sb	$v1,0x1f($v0)
-/*  f0e2648:	10000005 */ 	b	.L0f0e2660
-/*  f0e264c:	a040002b */ 	sb	$zero,0x2b($v0)
-/*  f0e2650:	a0400007 */ 	sb	$zero,0x7($v0)
-.L0f0e2654:
-/*  f0e2654:	a0400013 */ 	sb	$zero,0x13($v0)
-/*  f0e2658:	a043001f */ 	sb	$v1,0x1f($v0)
-/*  f0e265c:	a043002b */ 	sb	$v1,0x2b($v0)
-.L0f0e2660:
-/*  f0e2660:	8fa40028 */ 	lw	$a0,0x28($sp)
-/*  f0e2664:	8faa0044 */ 	lw	$t2,0x44($sp)
-/*  f0e2668:	3c0c0704 */ 	lui	$t4,0x704
-/*  f0e266c:	358c0008 */ 	ori	$t4,$t4,0x8
-/*  f0e2670:	ac8a0000 */ 	sw	$t2,0x0($a0)
-/*  f0e2674:	8fab0048 */ 	lw	$t3,0x48($sp)
-/*  f0e2678:	02001825 */ 	or	$v1,$s0,$zero
-/*  f0e267c:	26100008 */ 	addiu	$s0,$s0,0x8
-/*  f0e2680:	ac8b0004 */ 	sw	$t3,0x4($a0)
-/*  f0e2684:	ac6c0000 */ 	sw	$t4,0x0($v1)
-/*  f0e2688:	0c012d20 */ 	jal	osVirtualToPhysical
-/*  f0e268c:	afa30024 */ 	sw	$v1,0x24($sp)
-/*  f0e2690:	8fa30024 */ 	lw	$v1,0x24($sp)
-/*  f0e2694:	3c0d0430 */ 	lui	$t5,0x430
-/*  f0e2698:	35ad0030 */ 	ori	$t5,$t5,0x30
-/*  f0e269c:	02002825 */ 	or	$a1,$s0,$zero
-/*  f0e26a0:	ac620004 */ 	sw	$v0,0x4($v1)
-/*  f0e26a4:	acad0000 */ 	sw	$t5,0x0($a1)
-/*  f0e26a8:	afa50020 */ 	sw	$a1,0x20($sp)
-/*  f0e26ac:	8fa4002c */ 	lw	$a0,0x2c($sp)
-/*  f0e26b0:	0c012d20 */ 	jal	osVirtualToPhysical
-/*  f0e26b4:	26100008 */ 	addiu	$s0,$s0,0x8
-/*  f0e26b8:	8fa50020 */ 	lw	$a1,0x20($sp)
-/*  f0e26bc:	02001825 */ 	or	$v1,$s0,$zero
-/*  f0e26c0:	3c0eb100 */ 	lui	$t6,0xb100
-/*  f0e26c4:	aca20004 */ 	sw	$v0,0x4($a1)
-/*  f0e26c8:	35ce0002 */ 	ori	$t6,$t6,0x2
-/*  f0e26cc:	240f3210 */ 	addiu	$t7,$zero,0x3210
-/*  f0e26d0:	ac6f0004 */ 	sw	$t7,0x4($v1)
-/*  f0e26d4:	ac6e0000 */ 	sw	$t6,0x0($v1)
-/*  f0e26d8:	8fbf001c */ 	lw	$ra,0x1c($sp)
-/*  f0e26dc:	26020008 */ 	addiu	$v0,$s0,0x8
-/*  f0e26e0:	8fb00018 */ 	lw	$s0,0x18($sp)
-/*  f0e26e4:	03e00008 */ 	jr	$ra
-/*  f0e26e8:	27bd0030 */ 	addiu	$sp,$sp,0x30
-);
+Gfx *gfxDrawTri2(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour1, u32 colour2, bool arg7)
+{
+	struct gfxvtx *vertices;
+	u32 *colours;
 
-Gfx *gfxDrawLine(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, s32 arg5, s32 arg6)
+	colours = gfxAllocateColours(2);
+	vertices = gfxAllocateVertices(4);
+
+	vertices[0].x = x1 * 10;
+	vertices[0].y = y1 * 10;
+	vertices[0].z = -10;
+
+	vertices[1].x = x2 * 10;
+	vertices[1].y = y1 * 10;
+	vertices[1].z = -10;
+
+	vertices[2].x = x2 * 10;
+	vertices[2].y = y2 * 10;
+	vertices[2].z = -10;
+
+	vertices[3].x = x1 * 10;
+	vertices[3].y = y2 * 10;
+	vertices[3].z = -10;
+
+	if (!arg7) {
+		vertices[0].s = 0;
+		vertices[1].s = 4;
+		vertices[2].s = 4;
+		vertices[3].s = 0;
+	} else {
+		vertices[0].s = 0;
+		vertices[1].s = 0;
+		vertices[2].s = 4;
+		vertices[3].s = 4;
+	}
+
+	colours[0] = colour1;
+	colours[1] = colour2;
+
+	gDPSetColorArray(gdl++, osVirtualToPhysical(colours), 2);
+	gDPSetVerticeArray(gdl++, osVirtualToPhysical(vertices), 4);
+	gDPTri2(gdl++, 0, 1, 2, 2, 3, 0);
+
+	return gdl;
+}
+
+Gfx *gfxDrawLine(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour1, u32 colour2)
 {
 	gdl = func0f0e2498(gdl);
-	gdl = func0f0e258c(gdl, x1, y1, x2, y2, arg5, arg6, 0);
+	gdl = gfxDrawTri2(gdl, x1, y1, x2, y2, colour1, colour2, false);
 
 	return gdl;
 }
@@ -2924,7 +2877,7 @@ glabel func0f0e2744
 /*  f0e2880:	afb20010 */ 	sw	$s2,0x10($sp)
 /*  f0e2884:	afb00018 */ 	sw	$s0,0x18($sp)
 /*  f0e2888:	afa0001c */ 	sw	$zero,0x1c($sp)
-/*  f0e288c:	0fc38963 */ 	jal	func0f0e258c
+/*  f0e288c:	0fc38963 */ 	jal	gfxDrawTri2
 /*  f0e2890:	afb90014 */ 	sw	$t9,0x14($sp)
 /*  f0e2894:	8fa80094 */ 	lw	$t0,0x94($sp)
 /*  f0e2898:	26940001 */ 	addiu	$s4,$s4,0x1
@@ -2947,7 +2900,7 @@ glabel func0f0e2744
 /*  f0e28d8:	afb70010 */ 	sw	$s7,0x10($sp)
 /*  f0e28dc:	afa20018 */ 	sw	$v0,0x18($sp)
 /*  f0e28e0:	afa0001c */ 	sw	$zero,0x1c($sp)
-/*  f0e28e4:	0fc38963 */ 	jal	func0f0e258c
+/*  f0e28e4:	0fc38963 */ 	jal	gfxDrawTri2
 /*  f0e28e8:	afa90014 */ 	sw	$t1,0x14($sp)
 /*  f0e28ec:	10000060 */ 	b	.L0f0e2a70
 /*  f0e28f0:	afa20098 */ 	sw	$v0,0x98($sp)
@@ -3014,7 +2967,7 @@ glabel func0f0e2744
 /*  f0e29cc:	afb70010 */ 	sw	$s7,0x10($sp)
 /*  f0e29d0:	afb00018 */ 	sw	$s0,0x18($sp)
 /*  f0e29d4:	afa0001c */ 	sw	$zero,0x1c($sp)
-/*  f0e29d8:	0fc38963 */ 	jal	func0f0e258c
+/*  f0e29d8:	0fc38963 */ 	jal	gfxDrawTri2
 /*  f0e29dc:	afae0014 */ 	sw	$t6,0x14($sp)
 /*  f0e29e0:	8faf0074 */ 	lw	$t7,0x74($sp)
 /*  f0e29e4:	26940001 */ 	addiu	$s4,$s4,0x1
@@ -3037,7 +2990,7 @@ glabel func0f0e2744
 /*  f0e2a24:	afb70010 */ 	sw	$s7,0x10($sp)
 /*  f0e2a28:	afa20018 */ 	sw	$v0,0x18($sp)
 /*  f0e2a2c:	afa0001c */ 	sw	$zero,0x1c($sp)
-/*  f0e2a30:	0fc38963 */ 	jal	func0f0e258c
+/*  f0e2a30:	0fc38963 */ 	jal	gfxDrawTri2
 /*  f0e2a34:	afb80014 */ 	sw	$t8,0x14($sp)
 /*  f0e2a38:	1000000d */ 	b	.L0f0e2a70
 /*  f0e2a3c:	afa20098 */ 	sw	$v0,0x98($sp)
@@ -3051,7 +3004,7 @@ glabel func0f0e2744
 /*  f0e2a58:	afb50018 */ 	sw	$s5,0x18($sp)
 /*  f0e2a5c:	afa0001c */ 	sw	$zero,0x1c($sp)
 /*  f0e2a60:	afb70010 */ 	sw	$s7,0x10($sp)
-/*  f0e2a64:	0fc38963 */ 	jal	func0f0e258c
+/*  f0e2a64:	0fc38963 */ 	jal	gfxDrawTri2
 /*  f0e2a68:	afb90014 */ 	sw	$t9,0x14($sp)
 /*  f0e2a6c:	afa20098 */ 	sw	$v0,0x98($sp)
 .L0f0e2a70:
@@ -3212,7 +3165,7 @@ glabel func0f0e2aa4
 /*  f0e2ca4:	31cf00ff */ 	andi	$t7,$t6,0xff
 /*  f0e2ca8:	2401ff00 */ 	addiu	$at,$zero,-256
 /*  f0e2cac:	01e1c025 */ 	or	$t8,$t7,$at
-/*  f0e2cb0:	0fc38963 */ 	jal	func0f0e258c
+/*  f0e2cb0:	0fc38963 */ 	jal	gfxDrawTri2
 /*  f0e2cb4:	afb80018 */ 	sw	$t8,0x18($sp)
 /*  f0e2cb8:	10000086 */ 	b	.L0f0e2ed4
 /*  f0e2cbc:	00408025 */ 	or	$s0,$v0,$zero
@@ -3236,7 +3189,7 @@ glabel func0f0e2aa4
 /*  f0e2d00:	330d00ff */ 	andi	$t5,$t8,0xff
 /*  f0e2d04:	2401ff00 */ 	addiu	$at,$zero,-256
 /*  f0e2d08:	01a1c825 */ 	or	$t9,$t5,$at
-/*  f0e2d0c:	0fc38963 */ 	jal	func0f0e258c
+/*  f0e2d0c:	0fc38963 */ 	jal	gfxDrawTri2
 /*  f0e2d10:	afb90014 */ 	sw	$t9,0x14($sp)
 /*  f0e2d14:	1000006f */ 	b	.L0f0e2ed4
 /*  f0e2d18:	00408025 */ 	or	$s0,$v0,$zero
@@ -3330,7 +3283,7 @@ glabel func0f0e2aa4
 /*  f0e2e58:	31b900ff */ 	andi	$t9,$t5,0xff
 /*  f0e2e5c:	2401ff00 */ 	addiu	$at,$zero,-256
 /*  f0e2e60:	03217025 */ 	or	$t6,$t9,$at
-/*  f0e2e64:	0fc38963 */ 	jal	func0f0e258c
+/*  f0e2e64:	0fc38963 */ 	jal	gfxDrawTri2
 /*  f0e2e68:	afae0018 */ 	sw	$t6,0x18($sp)
 /*  f0e2e6c:	10000019 */ 	b	.L0f0e2ed4
 /*  f0e2e70:	00408025 */ 	or	$s0,$v0,$zero
@@ -3356,7 +3309,7 @@ glabel func0f0e2aa4
 /*  f0e2ebc:	03016825 */ 	or	$t5,$t8,$at
 /*  f0e2ec0:	240e0001 */ 	addiu	$t6,$zero,0x1
 /*  f0e2ec4:	afae001c */ 	sw	$t6,0x1c($sp)
-/*  f0e2ec8:	0fc38963 */ 	jal	func0f0e258c
+/*  f0e2ec8:	0fc38963 */ 	jal	gfxDrawTri2
 /*  f0e2ecc:	afad0014 */ 	sw	$t5,0x14($sp)
 /*  f0e2ed0:	00408025 */ 	or	$s0,$v0,$zero
 .L0f0e2ed4:
diff --git a/src/game/game_0f09f0.c b/src/game/game_0f09f0.c
index d6b8b1219..e6c724821 100644
--- a/src/game/game_0f09f0.c
+++ b/src/game/game_0f09f0.c
@@ -12854,7 +12854,7 @@ glabel func0f0f5360
 /*  f0f69f4:	afb00010 */ 	sw	$s0,0x10($sp)
 /*  f0f69f8:	afa0001c */ 	sw	$zero,0x1c($sp)
 /*  f0f69fc:	afa30014 */ 	sw	$v1,0x14($sp)
-/*  f0f6a00:	0fc38963 */ 	jal	func0f0e258c
+/*  f0f6a00:	0fc38963 */ 	jal	gfxDrawTri2
 /*  f0f6a04:	afa30018 */ 	sw	$v1,0x18($sp)
 /*  f0f6a08:	8fac0120 */ 	lw	$t4,0x120($sp)
 /*  f0f6a0c:	240bffff */ 	addiu	$t3,$zero,-1
@@ -12865,7 +12865,7 @@ glabel func0f0f5360
 /*  f0f6a20:	02203825 */ 	or	$a3,$s1,$zero
 /*  f0f6a24:	afb00010 */ 	sw	$s0,0x10($sp)
 /*  f0f6a28:	afa0001c */ 	sw	$zero,0x1c($sp)
-/*  f0f6a2c:	0fc38963 */ 	jal	func0f0e258c
+/*  f0f6a2c:	0fc38963 */ 	jal	gfxDrawTri2
 /*  f0f6a30:	afac0014 */ 	sw	$t4,0x14($sp)
 /*  f0f6a34:	8fa30120 */ 	lw	$v1,0x120($sp)
 /*  f0f6a38:	26130001 */ 	addiu	$s3,$s0,0x1
@@ -12877,7 +12877,7 @@ glabel func0f0f5360
 /*  f0f6a50:	02403825 */ 	or	$a3,$s2,$zero
 /*  f0f6a54:	afa0001c */ 	sw	$zero,0x1c($sp)
 /*  f0f6a58:	afa30014 */ 	sw	$v1,0x14($sp)
-/*  f0f6a5c:	0fc38963 */ 	jal	func0f0e258c
+/*  f0f6a5c:	0fc38963 */ 	jal	gfxDrawTri2
 /*  f0f6a60:	afa30018 */ 	sw	$v1,0x18($sp)
 /*  f0f6a64:	8fb90120 */ 	lw	$t9,0x120($sp)
 /*  f0f6a68:	240dffff */ 	addiu	$t5,$zero,-1
@@ -12888,7 +12888,7 @@ glabel func0f0f5360
 /*  f0f6a7c:	02203825 */ 	or	$a3,$s1,$zero
 /*  f0f6a80:	afb60010 */ 	sw	$s6,0x10($sp)
 /*  f0f6a84:	afa0001c */ 	sw	$zero,0x1c($sp)
-/*  f0f6a88:	0fc38963 */ 	jal	func0f0e258c
+/*  f0f6a88:	0fc38963 */ 	jal	gfxDrawTri2
 /*  f0f6a8c:	afb90014 */ 	sw	$t9,0x14($sp)
 /*  f0f6a90:	8faf0078 */ 	lw	$t7,0x78($sp)
 /*  f0f6a94:	00402025 */ 	or	$a0,$v0,$zero
@@ -12898,7 +12898,7 @@ glabel func0f0f5360
 /*  f0f6aa4:	afb30010 */ 	sw	$s3,0x10($sp)
 /*  f0f6aa8:	afb70018 */ 	sw	$s7,0x18($sp)
 /*  f0f6aac:	afa0001c */ 	sw	$zero,0x1c($sp)
-/*  f0f6ab0:	0fc38963 */ 	jal	func0f0e258c
+/*  f0f6ab0:	0fc38963 */ 	jal	gfxDrawTri2
 /*  f0f6ab4:	afaf0014 */ 	sw	$t7,0x14($sp)
 /*  f0f6ab8:	8fb80118 */ 	lw	$t8,0x118($sp)
 /*  f0f6abc:	afa201e8 */ 	sw	$v0,0x1e8($sp)
@@ -12921,7 +12921,7 @@ glabel func0f0f5360
 /*  f0f6b00:	afb00010 */ 	sw	$s0,0x10($sp)
 /*  f0f6b04:	afa80014 */ 	sw	$t0,0x14($sp)
 /*  f0f6b08:	afa80018 */ 	sw	$t0,0x18($sp)
-/*  f0f6b0c:	0fc38963 */ 	jal	func0f0e258c
+/*  f0f6b0c:	0fc38963 */ 	jal	gfxDrawTri2
 /*  f0f6b10:	afa0001c */ 	sw	$zero,0x1c($sp)
 /*  f0f6b14:	8fad0120 */ 	lw	$t5,0x120($sp)
 /*  f0f6b18:	26320003 */ 	addiu	$s2,$s1,0x3
@@ -12933,7 +12933,7 @@ glabel func0f0f5360
 /*  f0f6b30:	02a03025 */ 	or	$a2,$s5,$zero
 /*  f0f6b34:	afb00010 */ 	sw	$s0,0x10($sp)
 /*  f0f6b38:	afa0001c */ 	sw	$zero,0x1c($sp)
-/*  f0f6b3c:	0fc38963 */ 	jal	func0f0e258c
+/*  f0f6b3c:	0fc38963 */ 	jal	gfxDrawTri2
 /*  f0f6b40:	afad0018 */ 	sw	$t5,0x18($sp)
 /*  f0f6b44:	8faf0120 */ 	lw	$t7,0x120($sp)
 /*  f0f6b48:	00402025 */ 	or	$a0,$v0,$zero
@@ -12943,7 +12943,7 @@ glabel func0f0f5360
 /*  f0f6b58:	afb60010 */ 	sw	$s6,0x10($sp)
 /*  f0f6b5c:	afa0001c */ 	sw	$zero,0x1c($sp)
 /*  f0f6b60:	afaf0014 */ 	sw	$t7,0x14($sp)
-/*  f0f6b64:	0fc38963 */ 	jal	func0f0e258c
+/*  f0f6b64:	0fc38963 */ 	jal	gfxDrawTri2
 /*  f0f6b68:	afaf0018 */ 	sw	$t7,0x18($sp)
 /*  f0f6b6c:	8fae0120 */ 	lw	$t6,0x120($sp)
 /*  f0f6b70:	2418ffff */ 	addiu	$t8,$zero,-1
@@ -12954,7 +12954,7 @@ glabel func0f0f5360
 /*  f0f6b84:	02403825 */ 	or	$a3,$s2,$zero
 /*  f0f6b88:	afb60010 */ 	sw	$s6,0x10($sp)
 /*  f0f6b8c:	afa0001c */ 	sw	$zero,0x1c($sp)
-/*  f0f6b90:	0fc38963 */ 	jal	func0f0e258c
+/*  f0f6b90:	0fc38963 */ 	jal	gfxDrawTri2
 /*  f0f6b94:	afae0018 */ 	sw	$t6,0x18($sp)
 /*  f0f6b98:	8fac0078 */ 	lw	$t4,0x78($sp)
 /*  f0f6b9c:	00402025 */ 	or	$a0,$v0,$zero
@@ -12964,7 +12964,7 @@ glabel func0f0f5360
 /*  f0f6bac:	afb30010 */ 	sw	$s3,0x10($sp)
 /*  f0f6bb0:	afb70014 */ 	sw	$s7,0x14($sp)
 /*  f0f6bb4:	afa0001c */ 	sw	$zero,0x1c($sp)
-/*  f0f6bb8:	0fc38963 */ 	jal	func0f0e258c
+/*  f0f6bb8:	0fc38963 */ 	jal	gfxDrawTri2
 /*  f0f6bbc:	afac0018 */ 	sw	$t4,0x18($sp)
 /*  f0f6bc0:	afa201e8 */ 	sw	$v0,0x1e8($sp)
 .L0f0f6bc4:
@@ -15051,7 +15051,7 @@ glabel func0f0f5360
 /*  f0f336c:	afb00010 */ 	sw	$s0,0x10($sp)
 /*  f0f3370:	afa0001c */ 	sw	$zero,0x1c($sp)
 /*  f0f3374:	afa30014 */ 	sw	$v1,0x14($sp)
-/*  f0f3378:	0fc37e88 */ 	jal	func0f0e258c
+/*  f0f3378:	0fc37e88 */ 	jal	gfxDrawTri2
 /*  f0f337c:	afa30018 */ 	sw	$v1,0x18($sp)
 /*  f0f3380:	8fac0120 */ 	lw	$t4,0x120($sp)
 /*  f0f3384:	240effff */ 	addiu	$t6,$zero,-1
@@ -15062,7 +15062,7 @@ glabel func0f0f5360
 /*  f0f3398:	02203825 */ 	or	$a3,$s1,$zero
 /*  f0f339c:	afb00010 */ 	sw	$s0,0x10($sp)
 /*  f0f33a0:	afa0001c */ 	sw	$zero,0x1c($sp)
-/*  f0f33a4:	0fc37e88 */ 	jal	func0f0e258c
+/*  f0f33a4:	0fc37e88 */ 	jal	gfxDrawTri2
 /*  f0f33a8:	afac0014 */ 	sw	$t4,0x14($sp)
 /*  f0f33ac:	8fa30120 */ 	lw	$v1,0x120($sp)
 /*  f0f33b0:	26130001 */ 	addiu	$s3,$s0,0x1
@@ -15074,7 +15074,7 @@ glabel func0f0f5360
 /*  f0f33c8:	02403825 */ 	or	$a3,$s2,$zero
 /*  f0f33cc:	afa0001c */ 	sw	$zero,0x1c($sp)
 /*  f0f33d0:	afa30014 */ 	sw	$v1,0x14($sp)
-/*  f0f33d4:	0fc37e88 */ 	jal	func0f0e258c
+/*  f0f33d4:	0fc37e88 */ 	jal	gfxDrawTri2
 /*  f0f33d8:	afa30018 */ 	sw	$v1,0x18($sp)
 /*  f0f33dc:	8fab0120 */ 	lw	$t3,0x120($sp)
 /*  f0f33e0:	240fffff */ 	addiu	$t7,$zero,-1
@@ -15085,7 +15085,7 @@ glabel func0f0f5360
 /*  f0f33f4:	02203825 */ 	or	$a3,$s1,$zero
 /*  f0f33f8:	afb60010 */ 	sw	$s6,0x10($sp)
 /*  f0f33fc:	afa0001c */ 	sw	$zero,0x1c($sp)
-/*  f0f3400:	0fc37e88 */ 	jal	func0f0e258c
+/*  f0f3400:	0fc37e88 */ 	jal	gfxDrawTri2
 /*  f0f3404:	afab0014 */ 	sw	$t3,0x14($sp)
 /*  f0f3408:	8fb90078 */ 	lw	$t9,0x78($sp)
 /*  f0f340c:	00402025 */ 	or	$a0,$v0,$zero
@@ -15095,7 +15095,7 @@ glabel func0f0f5360
 /*  f0f341c:	afb30010 */ 	sw	$s3,0x10($sp)
 /*  f0f3420:	afb70018 */ 	sw	$s7,0x18($sp)
 /*  f0f3424:	afa0001c */ 	sw	$zero,0x1c($sp)
-/*  f0f3428:	0fc37e88 */ 	jal	func0f0e258c
+/*  f0f3428:	0fc37e88 */ 	jal	gfxDrawTri2
 /*  f0f342c:	afb90014 */ 	sw	$t9,0x14($sp)
 /*  f0f3430:	8fad0118 */ 	lw	$t5,0x118($sp)
 /*  f0f3434:	afa201e8 */ 	sw	$v0,0x1e8($sp)
@@ -15118,7 +15118,7 @@ glabel func0f0f5360
 /*  f0f3478:	afb00010 */ 	sw	$s0,0x10($sp)
 /*  f0f347c:	afa80014 */ 	sw	$t0,0x14($sp)
 /*  f0f3480:	afa80018 */ 	sw	$t0,0x18($sp)
-/*  f0f3484:	0fc37e88 */ 	jal	func0f0e258c
+/*  f0f3484:	0fc37e88 */ 	jal	gfxDrawTri2
 /*  f0f3488:	afa0001c */ 	sw	$zero,0x1c($sp)
 /*  f0f348c:	8faf0120 */ 	lw	$t7,0x120($sp)
 /*  f0f3490:	26320003 */ 	addiu	$s2,$s1,0x3
@@ -15130,7 +15130,7 @@ glabel func0f0f5360
 /*  f0f34a8:	02a03025 */ 	or	$a2,$s5,$zero
 /*  f0f34ac:	afb00010 */ 	sw	$s0,0x10($sp)
 /*  f0f34b0:	afa0001c */ 	sw	$zero,0x1c($sp)
-/*  f0f34b4:	0fc37e88 */ 	jal	func0f0e258c
+/*  f0f34b4:	0fc37e88 */ 	jal	gfxDrawTri2
 /*  f0f34b8:	afaf0018 */ 	sw	$t7,0x18($sp)
 /*  f0f34bc:	8fb90120 */ 	lw	$t9,0x120($sp)
 /*  f0f34c0:	00402025 */ 	or	$a0,$v0,$zero
@@ -15140,7 +15140,7 @@ glabel func0f0f5360
 /*  f0f34d0:	afb60010 */ 	sw	$s6,0x10($sp)
 /*  f0f34d4:	afa0001c */ 	sw	$zero,0x1c($sp)
 /*  f0f34d8:	afb90014 */ 	sw	$t9,0x14($sp)
-/*  f0f34dc:	0fc37e88 */ 	jal	func0f0e258c
+/*  f0f34dc:	0fc37e88 */ 	jal	gfxDrawTri2
 /*  f0f34e0:	afb90018 */ 	sw	$t9,0x18($sp)
 /*  f0f34e4:	8fb80120 */ 	lw	$t8,0x120($sp)
 /*  f0f34e8:	240dffff */ 	addiu	$t5,$zero,-1
@@ -15151,7 +15151,7 @@ glabel func0f0f5360
 /*  f0f34fc:	02403825 */ 	or	$a3,$s2,$zero
 /*  f0f3500:	afb60010 */ 	sw	$s6,0x10($sp)
 /*  f0f3504:	afa0001c */ 	sw	$zero,0x1c($sp)
-/*  f0f3508:	0fc37e88 */ 	jal	func0f0e258c
+/*  f0f3508:	0fc37e88 */ 	jal	gfxDrawTri2
 /*  f0f350c:	afb80018 */ 	sw	$t8,0x18($sp)
 /*  f0f3510:	8fac0078 */ 	lw	$t4,0x78($sp)
 /*  f0f3514:	00402025 */ 	or	$a0,$v0,$zero
@@ -15161,7 +15161,7 @@ glabel func0f0f5360
 /*  f0f3524:	afb30010 */ 	sw	$s3,0x10($sp)
 /*  f0f3528:	afb70014 */ 	sw	$s7,0x14($sp)
 /*  f0f352c:	afa0001c */ 	sw	$zero,0x1c($sp)
-/*  f0f3530:	0fc37e88 */ 	jal	func0f0e258c
+/*  f0f3530:	0fc37e88 */ 	jal	gfxDrawTri2
 /*  f0f3534:	afac0018 */ 	sw	$t4,0x18($sp)
 /*  f0f3538:	afa201e8 */ 	sw	$v0,0x1e8($sp)
 .NB0f0f353c:
diff --git a/src/include/game/game_0e0770.h b/src/include/game/game_0e0770.h
index 14e480ed6..858a782ce 100644
--- a/src/include/game/game_0e0770.h
+++ b/src/include/game/game_0e0770.h
@@ -13,8 +13,8 @@ u32 func0f0e1ce8(void);
 u32 func0f0e1fac(void);
 Gfx *func0f0e2348(Gfx *gdl);
 Gfx *func0f0e2498(Gfx *gdl);
-Gfx *func0f0e258c(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, s32 arg5, s32 arg6, s32 arg7);
-Gfx *gfxDrawLine(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, s32 arg5, s32 arg6);
+Gfx *gfxDrawTri2(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour1, u32 colour2, bool arg7);
+Gfx *gfxDrawLine(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour1, u32 colour2);
 Gfx *func0f0e2744(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour1, u32 colour2);
 Gfx *func0f0e2aa4(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colourleft, u32 arg6, u32 arg7, u32 arg8);
 Gfx *func0f0e2ee8(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour1, u32 colour2);