diff --git a/src/game/activemenu/activemenu.c b/src/game/activemenu/activemenu.c
index 638b31e48..9ef1dcb92 100644
--- a/src/game/activemenu/activemenu.c
+++ b/src/game/activemenu/activemenu.c
@@ -461,9 +461,9 @@ glabel var7f1b2cd8
 /*  f0fdbdc:	25ee0001 */ 	addiu	$t6,$t7,0x1
 /*  f0fdbe0:	0fc54d8a */ 	jal	func0f153628
 /*  f0fdbe4:	afae0088 */ 	sw	$t6,0x88($sp)
-/*  f0fdbe8:	0c002f02 */ 	jal	viGetX
+/*  f0fdbe8:	0c002f02 */ 	jal	viGetWidth
 /*  f0fdbec:	afa20094 */ 	sw	$v0,0x94($sp)
-/*  f0fdbf0:	0c002f06 */ 	jal	viGetY
+/*  f0fdbf0:	0c002f06 */ 	jal	viGetHeight
 /*  f0fdbf4:	a7a2005c */ 	sh	$v0,0x5c($sp)
 /*  f0fdbf8:	8fb80058 */ 	lw	$t8,0x58($sp)
 /*  f0fdbfc:	3c198008 */ 	lui	$t9,%hi(g_FontHandelGothicSm1)
diff --git a/src/game/bondview.c b/src/game/bondview.c
index b91ea716f..ddaf10176 100644
--- a/src/game/bondview.c
+++ b/src/game/bondview.c
@@ -37,7 +37,7 @@ Gfx *bviewRenderIrRect(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2)
 
 Gfx *func0f141864(Gfx *gdl, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5)
 {
-	s32 value = viGetX() * arg2 + arg4;
+	s32 value = viGetWidth() * arg2 + arg4;
 
 	gDPPipeSync(gdl++);
 	gDPSetTextureImage(gdl++, G_IM_FMT_I, G_IM_SIZ_8b, 320, value * 2 + arg1);
@@ -49,7 +49,7 @@ Gfx *func0f141864(Gfx *gdl, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5)
 
 Gfx *func0f141940(Gfx *gdl, s32 arg1, s32 arg2, s32 tile, s32 arg4, s32 width)
 {
-	s32 value = viGetX() * arg2 + arg4;
+	s32 value = viGetWidth() * arg2 + arg4;
 
 	gDPPipeSync(gdl++);
 	gDPSetTextureImage(gdl++, G_IM_FMT_RGBA, G_IM_SIZ_16b, width, value * 2 + arg1);
@@ -91,7 +91,7 @@ glabel bviewRenderLensRect
 .L0f141ae4:
 /*  f141ae4:	afa60070 */ 	sw	$a2,0x70($sp)
 /*  f141ae8:	afa6002c */ 	sw	$a2,0x2c($sp)
-/*  f141aec:	0c002f02 */ 	jal	viGetX
+/*  f141aec:	0c002f02 */ 	jal	viGetWidth
 /*  f141af0:	afa40080 */ 	sw	$a0,0x80($sp)
 /*  f141af4:	8fa40080 */ 	lw	$a0,0x80($sp)
 /*  f141af8:	3c0efd10 */ 	lui	$t6,0xfd10
@@ -184,7 +184,7 @@ glabel bviewRenderLensRect
 /*  f141c50:	00f83821 */ 	addu	$a3,$a3,$t8
 /*  f141c54:	afa70098 */ 	sw	$a3,0x98($sp)
 /*  f141c58:	afa90028 */ 	sw	$t1,0x28($sp)
-/*  f141c5c:	0c002f02 */ 	jal	viGetX
+/*  f141c5c:	0c002f02 */ 	jal	viGetWidth
 /*  f141c60:	afa40080 */ 	sw	$a0,0x80($sp)
 /*  f141c64:	8fa40080 */ 	lw	$a0,0x80($sp)
 /*  f141c68:	3c19fd10 */ 	lui	$t9,0xfd10
@@ -252,7 +252,7 @@ glabel bviewRenderLensRect
 /*  f141d5c:	10000058 */ 	b	.L0f141ec0
 /*  f141d60:	24840008 */ 	addiu	$a0,$a0,0x8
 .L0f141d64:
-/*  f141d64:	0c002f02 */ 	jal	viGetX
+/*  f141d64:	0c002f02 */ 	jal	viGetWidth
 /*  f141d68:	afa40080 */ 	sw	$a0,0x80($sp)
 /*  f141d6c:	8fa40080 */ 	lw	$a0,0x80($sp)
 /*  f141d70:	3c19fd10 */ 	lui	$t9,0xfd10
@@ -356,7 +356,7 @@ glabel bviewRenderLensRect
 //
 //		if (sp70);
 //
-//		gDPSetTextureImage(gdl++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 320, ((viGetX() * arg2 + left) * 2 + arg1));
+//		gDPSetTextureImage(gdl++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 320, ((viGetWidth() * arg2 + left) * 2 + arg1));
 //		gDPLoadBlock(gdl++, arg3, 0, 0, sp70 - 1, 0);
 //		gSPTextureRectangle(gdl++,
 //				left << 2,
@@ -371,7 +371,7 @@ glabel bviewRenderLensRect
 //
 //		left += sp70;
 //
-//		gDPSetTextureImage(gdl++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 320, ((viGetX() * arg2 + left) * 2 + arg1));
+//		gDPSetTextureImage(gdl++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 320, ((viGetWidth() * arg2 + left) * 2 + arg1));
 //		gDPLoadBlock(gdl++, arg3, 0, 0, sp70 - 1, 0);
 //		gSPTextureRectangle(gdl++,
 //				left << 2,
@@ -385,7 +385,7 @@ glabel bviewRenderLensRect
 //				1024);
 //
 //	} else {
-//		gDPSetTextureImage(gdl++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 320, ((viGetX() * arg2 + left) * 2 + arg1));
+//		gDPSetTextureImage(gdl++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 320, ((viGetWidth() * arg2 + left) * 2 + arg1));
 //		gDPLoadBlock(gdl++, arg3, 0, 0, width - 1, 0);
 //		gSPTextureRectangle(gdl++,
 //				left << 2,
@@ -2153,11 +2153,11 @@ glabel var7f1b5f58
 /*  f144444:	27a602e8 */ 	addiu	$a2,$sp,0x2e8
 /*  f144448:	0fc54e16 */ 	jal	func0f153858
 /*  f14444c:	27a702dc */ 	addiu	$a3,$sp,0x2dc
-/*  f144450:	0c002f02 */ 	jal	viGetX
+/*  f144450:	0c002f02 */ 	jal	viGetWidth
 /*  f144454:	0040a825 */ 	or	$s5,$v0,$zero
 /*  f144458:	00028400 */ 	sll	$s0,$v0,0x10
 /*  f14445c:	0010cc03 */ 	sra	$t9,$s0,0x10
-/*  f144460:	0c002f06 */ 	jal	viGetY
+/*  f144460:	0c002f06 */ 	jal	viGetHeight
 /*  f144464:	03208025 */ 	or	$s0,$t9,$zero
 /*  f144468:	3c0e8008 */ 	lui	$t6,%hi(g_FontHandelGothicXs1)
 /*  f14446c:	3c0f8008 */ 	lui	$t7,%hi(g_FontHandelGothicXs2)
@@ -2222,11 +2222,11 @@ glabel var7f1b5f58
 /*  f144558:	afb102e8 */ 	sw	$s1,0x2e8($sp)
 /*  f14455c:	0fc54e16 */ 	jal	func0f153858
 /*  f144560:	afa302ec */ 	sw	$v1,0x2ec($sp)
-/*  f144564:	0c002f02 */ 	jal	viGetX
+/*  f144564:	0c002f02 */ 	jal	viGetWidth
 /*  f144568:	0040a825 */ 	or	$s5,$v0,$zero
 /*  f14456c:	00028400 */ 	sll	$s0,$v0,0x10
 /*  f144570:	0010cc03 */ 	sra	$t9,$s0,0x10
-/*  f144574:	0c002f06 */ 	jal	viGetY
+/*  f144574:	0c002f06 */ 	jal	viGetHeight
 /*  f144578:	03208025 */ 	or	$s0,$t9,$zero
 /*  f14457c:	3c0e8008 */ 	lui	$t6,%hi(g_FontHandelGothicXs1)
 /*  f144580:	3c0f8008 */ 	lui	$t7,%hi(g_FontHandelGothicXs2)
@@ -2287,11 +2287,11 @@ glabel var7f1b5f58
 /*  f14465c:	afb102e8 */ 	sw	$s1,0x2e8($sp)
 /*  f144660:	0fc54e16 */ 	jal	func0f153858
 /*  f144664:	afa302ec */ 	sw	$v1,0x2ec($sp)
-/*  f144668:	0c002f02 */ 	jal	viGetX
+/*  f144668:	0c002f02 */ 	jal	viGetWidth
 /*  f14466c:	0040a825 */ 	or	$s5,$v0,$zero
 /*  f144670:	00028400 */ 	sll	$s0,$v0,0x10
 /*  f144674:	00107403 */ 	sra	$t6,$s0,0x10
-/*  f144678:	0c002f06 */ 	jal	viGetY
+/*  f144678:	0c002f06 */ 	jal	viGetHeight
 /*  f14467c:	01c08025 */ 	or	$s0,$t6,$zero
 /*  f144680:	3c0f8008 */ 	lui	$t7,%hi(g_FontHandelGothicXs1)
 /*  f144684:	3c188008 */ 	lui	$t8,%hi(g_FontHandelGothicXs2)
@@ -2352,11 +2352,11 @@ glabel var7f1b5f58
 /*  f144760:	afb102e8 */ 	sw	$s1,0x2e8($sp)
 /*  f144764:	0fc54e16 */ 	jal	func0f153858
 /*  f144768:	afa302ec */ 	sw	$v1,0x2ec($sp)
-/*  f14476c:	0c002f02 */ 	jal	viGetX
+/*  f14476c:	0c002f02 */ 	jal	viGetWidth
 /*  f144770:	0040a825 */ 	or	$s5,$v0,$zero
 /*  f144774:	00028400 */ 	sll	$s0,$v0,0x10
 /*  f144778:	00107c03 */ 	sra	$t7,$s0,0x10
-/*  f14477c:	0c002f06 */ 	jal	viGetY
+/*  f14477c:	0c002f06 */ 	jal	viGetHeight
 /*  f144780:	01e08025 */ 	or	$s0,$t7,$zero
 /*  f144784:	3c188008 */ 	lui	$t8,%hi(g_FontHandelGothicXs1)
 /*  f144788:	3c198008 */ 	lui	$t9,%hi(g_FontHandelGothicXs2)
@@ -2430,11 +2430,11 @@ glabel var7f1b5f58
 /*  f144888:	27a702dc */ 	addiu	$a3,$sp,0x2dc
 /*  f14488c:	0fc54e16 */ 	jal	func0f153858
 /*  f144890:	afa302ec */ 	sw	$v1,0x2ec($sp)
-/*  f144894:	0c002f02 */ 	jal	viGetX
+/*  f144894:	0c002f02 */ 	jal	viGetWidth
 /*  f144898:	0040a825 */ 	or	$s5,$v0,$zero
 /*  f14489c:	00028400 */ 	sll	$s0,$v0,0x10
 /*  f1448a0:	0010cc03 */ 	sra	$t9,$s0,0x10
-/*  f1448a4:	0c002f06 */ 	jal	viGetY
+/*  f1448a4:	0c002f06 */ 	jal	viGetHeight
 /*  f1448a8:	03208025 */ 	or	$s0,$t9,$zero
 /*  f1448ac:	3c0e8008 */ 	lui	$t6,%hi(g_FontHandelGothicXs1)
 /*  f1448b0:	3c0f8008 */ 	lui	$t7,%hi(g_FontHandelGothicXs2)
@@ -2538,11 +2538,11 @@ glabel var7f1b5f58
 /*  f144a1c:	27a702dc */ 	addiu	$a3,$sp,0x2dc
 /*  f144a20:	0fc54e16 */ 	jal	func0f153858
 /*  f144a24:	afa302ec */ 	sw	$v1,0x2ec($sp)
-/*  f144a28:	0c002f02 */ 	jal	viGetX
+/*  f144a28:	0c002f02 */ 	jal	viGetWidth
 /*  f144a2c:	0040a825 */ 	or	$s5,$v0,$zero
 /*  f144a30:	00028400 */ 	sll	$s0,$v0,0x10
 /*  f144a34:	00107403 */ 	sra	$t6,$s0,0x10
-/*  f144a38:	0c002f06 */ 	jal	viGetY
+/*  f144a38:	0c002f06 */ 	jal	viGetHeight
 /*  f144a3c:	01c08025 */ 	or	$s0,$t6,$zero
 /*  f144a40:	3c0f8008 */ 	lui	$t7,%hi(g_FontHandelGothicXs1)
 /*  f144a44:	3c188008 */ 	lui	$t8,%hi(g_FontHandelGothicXs2)
@@ -2621,11 +2621,11 @@ glabel var7f1b5f58
 /*  f144b60:	27a702dc */ 	addiu	$a3,$sp,0x2dc
 /*  f144b64:	0fc54e16 */ 	jal	func0f153858
 /*  f144b68:	afa302ec */ 	sw	$v1,0x2ec($sp)
-/*  f144b6c:	0c002f02 */ 	jal	viGetX
+/*  f144b6c:	0c002f02 */ 	jal	viGetWidth
 /*  f144b70:	0040a825 */ 	or	$s5,$v0,$zero
 /*  f144b74:	00028400 */ 	sll	$s0,$v0,0x10
 /*  f144b78:	0010c403 */ 	sra	$t8,$s0,0x10
-/*  f144b7c:	0c002f06 */ 	jal	viGetY
+/*  f144b7c:	0c002f06 */ 	jal	viGetHeight
 /*  f144b80:	03008025 */ 	or	$s0,$t8,$zero
 /*  f144b84:	3c198008 */ 	lui	$t9,%hi(g_FontHandelGothicXs1)
 /*  f144b88:	3c0f8008 */ 	lui	$t7,%hi(g_FontHandelGothicXs2)
@@ -2704,11 +2704,11 @@ glabel var7f1b5f58
 /*  f144ca0:	27a702dc */ 	addiu	$a3,$sp,0x2dc
 /*  f144ca4:	0fc54e16 */ 	jal	func0f153858
 /*  f144ca8:	afa302ec */ 	sw	$v1,0x2ec($sp)
-/*  f144cac:	0c002f02 */ 	jal	viGetX
+/*  f144cac:	0c002f02 */ 	jal	viGetWidth
 /*  f144cb0:	0040a825 */ 	or	$s5,$v0,$zero
 /*  f144cb4:	00028400 */ 	sll	$s0,$v0,0x10
 /*  f144cb8:	0010c403 */ 	sra	$t8,$s0,0x10
-/*  f144cbc:	0c002f06 */ 	jal	viGetY
+/*  f144cbc:	0c002f06 */ 	jal	viGetHeight
 /*  f144cc0:	03008025 */ 	or	$s0,$t8,$zero
 /*  f144cc4:	3c198008 */ 	lui	$t9,%hi(g_FontHandelGothicXs1)
 /*  f144cc8:	3c0e8008 */ 	lui	$t6,%hi(g_FontHandelGothicXs2)
@@ -2782,11 +2782,11 @@ glabel var7f1b5f58
 /*  f144dcc:	27a702dc */ 	addiu	$a3,$sp,0x2dc
 /*  f144dd0:	0fc54e16 */ 	jal	func0f153858
 /*  f144dd4:	afa302ec */ 	sw	$v1,0x2ec($sp)
-/*  f144dd8:	0c002f02 */ 	jal	viGetX
+/*  f144dd8:	0c002f02 */ 	jal	viGetWidth
 /*  f144ddc:	0040a825 */ 	or	$s5,$v0,$zero
 /*  f144de0:	00028400 */ 	sll	$s0,$v0,0x10
 /*  f144de4:	0010c403 */ 	sra	$t8,$s0,0x10
-/*  f144de8:	0c002f06 */ 	jal	viGetY
+/*  f144de8:	0c002f06 */ 	jal	viGetHeight
 /*  f144dec:	03008025 */ 	or	$s0,$t8,$zero
 /*  f144df0:	3c198008 */ 	lui	$t9,%hi(g_FontHandelGothicXs1)
 /*  f144df4:	3c0f8008 */ 	lui	$t7,%hi(g_FontHandelGothicXs2)
@@ -2896,11 +2896,11 @@ glabel var7f1b5f58
 /*  f144f74:	27a702dc */ 	addiu	$a3,$sp,0x2dc
 /*  f144f78:	0fc54e16 */ 	jal	func0f153858
 /*  f144f7c:	afa302ec */ 	sw	$v1,0x2ec($sp)
-/*  f144f80:	0c002f02 */ 	jal	viGetX
+/*  f144f80:	0c002f02 */ 	jal	viGetWidth
 /*  f144f84:	0040a825 */ 	or	$s5,$v0,$zero
 /*  f144f88:	00028400 */ 	sll	$s0,$v0,0x10
 /*  f144f8c:	0010cc03 */ 	sra	$t9,$s0,0x10
-/*  f144f90:	0c002f06 */ 	jal	viGetY
+/*  f144f90:	0c002f06 */ 	jal	viGetHeight
 /*  f144f94:	03208025 */ 	or	$s0,$t9,$zero
 /*  f144f98:	3c0e8008 */ 	lui	$t6,%hi(g_FontHandelGothicXs1)
 /*  f144f9c:	3c188008 */ 	lui	$t8,%hi(g_FontHandelGothicXs2)
@@ -3007,11 +3007,11 @@ glabel var7f1b5f58
 /*  f145118:	afa802e8 */ 	sw	$t0,0x2e8($sp)
 /*  f14511c:	0fc54e16 */ 	jal	func0f153858
 /*  f145120:	afa302ec */ 	sw	$v1,0x2ec($sp)
-/*  f145124:	0c002f02 */ 	jal	viGetX
+/*  f145124:	0c002f02 */ 	jal	viGetWidth
 /*  f145128:	0040a825 */ 	or	$s5,$v0,$zero
 /*  f14512c:	00028400 */ 	sll	$s0,$v0,0x10
 /*  f145130:	00107c03 */ 	sra	$t7,$s0,0x10
-/*  f145134:	0c002f06 */ 	jal	viGetY
+/*  f145134:	0c002f06 */ 	jal	viGetHeight
 /*  f145138:	01e08025 */ 	or	$s0,$t7,$zero
 /*  f14513c:	3c198008 */ 	lui	$t9,%hi(g_FontHandelGothicXs1)
 /*  f145140:	3c0e8008 */ 	lui	$t6,%hi(g_FontHandelGothicXs2)
@@ -5433,7 +5433,7 @@ glabel var7f1b5f58
 //	y2 = y + textheight;
 //	gdl = func0f153858(gdl, &x, &y, &x2, &y2);
 //	gdl = textRender(gdl, &x, &y, text, g_FontHandelGothicXs1, g_FontHandelGothicXs2,
-//			colourtextbright, colourglow, viGetX(), viGetY(), 0, 0);
+//			colourtextbright, colourglow, viGetWidth(), viGetHeight(), 0, 0);
 //
 //	// "H/M"
 //	// 44b4
@@ -5446,7 +5446,7 @@ glabel var7f1b5f58
 //	y2 = y + textheight;
 //	gdl = func0f153858(gdl, &x, &y, &x2, &y2);
 //	gdl = textRender(gdl, &x, &y, text, g_FontHandelGothicXs1, g_FontHandelGothicXs2,
-//			colourtextbright, colourglow, viGetX(), viGetY(), 0, 0);
+//			colourtextbright, colourglow, viGetWidth(), viGetHeight(), 0, 0);
 //
 //	// "Y/D"
 //	// 45c8
@@ -5459,7 +5459,7 @@ glabel var7f1b5f58
 //	y2 = y + textheight;
 //	gdl = func0f153858(gdl, &x, &y, &x2, &y2);
 //	gdl = textRender(gdl, &x, &y, text, g_FontHandelGothicXs1, g_FontHandelGothicXs2,
-//			colourtextbright, colourglow, viGetX(), viGetY(), 0, 0);
+//			colourtextbright, colourglow, viGetWidth(), viGetHeight(), 0, 0);
 //
 //	// "P/D"
 //	// 46cc
@@ -5472,7 +5472,7 @@ glabel var7f1b5f58
 //	y2 = y + textheight;
 //	gdl = func0f153858(gdl, &x, &y, &x2, &y2);
 //	gdl = textRender(gdl, &x, &y, text, g_FontHandelGothicXs1, g_FontHandelGothicXs2,
-//			colourtextbright, colourglow, viGetX(), viGetY(), 0, 0);
+//			colourtextbright, colourglow, viGetWidth(), viGetHeight(), 0, 0);
 //
 //	// "CI 2023"
 //	// 47d0
@@ -5485,7 +5485,7 @@ glabel var7f1b5f58
 //	y2 = y + textheight;
 //	gdl = func0f153858(gdl, &x, &y, &x2, &y2);
 //	gdl = textRender(gdl, &x, &y, text, g_FontHandelGothicXs1, g_FontHandelGothicXs2,
-//			colourtextdull, colourglow, viGetX(), viGetY(), 0, 0);
+//			colourtextdull, colourglow, viGetWidth(), viGetHeight(), 0, 0);
 //
 //	// 48f8
 //	if (g_Vars.currentplayer->eyespy->mode == EYESPYMODE_CAMSPY) {
@@ -5505,7 +5505,7 @@ glabel var7f1b5f58
 //	y2 = y + textheight;
 //	gdl = func0f153858(gdl, &x, &y, &x2, &y2);
 //	gdl = textRender(gdl, &x, &y, text, g_FontHandelGothicXs1, g_FontHandelGothicXs2,
-//			colourtextdull, colourglow, viGetX(), viGetY(), 0, 0);
+//			colourtextdull, colourglow, viGetWidth(), viGetHeight(), 0, 0);
 //
 //	// 4a8c
 //	if (g_Vars.currentplayer->eyespy->mode == EYESPYMODE_CAMSPY) {
@@ -5519,7 +5519,7 @@ glabel var7f1b5f58
 //		y2 = y + textheight;
 //		gdl = func0f153858(gdl, &x, &y, &x2, &y2);
 //		gdl = textRender(gdl, &x, &y, text, g_FontHandelGothicXs1, g_FontHandelGothicXs2,
-//				colourtextdull, colourglow, viGetX(), viGetY(), 0, 0);
+//				colourtextdull, colourglow, viGetWidth(), viGetHeight(), 0, 0);
 //	} else if (g_Vars.currentplayer->eyespy->mode == EYESPYMODE_DRUGSPY) {
 //		// "DRUGSPY"
 //		// 4be4
@@ -5532,7 +5532,7 @@ glabel var7f1b5f58
 //		y2 = y + textheight;
 //		gdl = func0f153858(gdl, &x, &y, &x2, &y2);
 //		gdl = textRender(gdl, &x, &y, text, g_FontHandelGothicXs1, g_FontHandelGothicXs2,
-//				colourtextdull, colourglow, viGetX(), viGetY(), 0, 0);
+//				colourtextdull, colourglow, viGetWidth(), viGetHeight(), 0, 0);
 //	} else {
 //		// "BOMBSPY"
 //		// 4d18
@@ -5545,7 +5545,7 @@ glabel var7f1b5f58
 //		y2 = y + textheight;
 //		gdl = func0f153858(gdl, &x, &y, &x2, &y2);
 //		gdl = textRender(gdl, &x, &y, text, g_FontHandelGothicXs1, g_FontHandelGothicXs2,
-//				colourtextdull, colourglow, viGetX(), viGetY(), 0, 0);
+//				colourtextdull, colourglow, viGetWidth(), viGetHeight(), 0, 0);
 //	}
 //
 //	// 4e3c
@@ -5565,7 +5565,7 @@ glabel var7f1b5f58
 //	y2 = y + textheight;
 //	gdl = func0f153858(gdl, &x, &y, &x2, &y2);
 //	gdl = textRender(gdl, &x, &y, text, g_FontHandelGothicXs1, g_FontHandelGothicXs2,
-//			colourtextdull, colourglow, viGetX(), viGetY(), 0, 0);
+//			colourtextdull, colourglow, viGetWidth(), viGetHeight(), 0, 0);
 //
 //	// 4fe4
 //	// Gyrostat/dartammo text
@@ -5583,7 +5583,7 @@ glabel var7f1b5f58
 //	y2 = y + textheight;
 //	gdl = func0f153858(gdl, &x, &y, &x2, &y2);
 //	gdl = textRender(gdl, &x, &y, text, g_FontHandelGothicXs1, g_FontHandelGothicXs2,
-//			colourtextdull, colourglow, viGetX(), viGetY(), 0, 0);
+//			colourtextdull, colourglow, viGetWidth(), viGetHeight(), 0, 0);
 //
 //	gdl = func0f153838(gdl);
 //
@@ -7182,7 +7182,7 @@ Gfx *bviewRenderHorizonScanner(Gfx *gdl)
 
 	y = lenstop - 7;
 	gdl = textRenderProjected(gdl, &x, &y, arrows,
-			g_FontHandelGothicXs1, g_FontHandelGothicXs2, 0xffffff7f, viGetX(), viGetY(), 0, 0);
+			g_FontHandelGothicXs1, g_FontHandelGothicXs2, 0xffffff7f, viGetWidth(), viGetHeight(), 0, 0);
 
 	// Product name
 	strcpy(nametext, " JMBC");
@@ -7194,13 +7194,13 @@ Gfx *bviewRenderHorizonScanner(Gfx *gdl)
 	strcat(nametext, " SCANNER\n");
 
 	gdl = textRenderProjected(gdl, &x, &y, nametext,
-			g_FontHandelGothicXs1, g_FontHandelGothicXs2, 0xffffff7f, viGetX(), viGetY(), 0, 0);
+			g_FontHandelGothicXs1, g_FontHandelGothicXs2, 0xffffff7f, viGetWidth(), viGetHeight(), 0, 0);
 
 	// Hertz
 	x = viewleft + 75 * scale;
 	y = lenstop + lensheight + 1;
 	gdl = textRenderProjected(gdl, &x, &y, hertztext,
-			g_FontHandelGothicXs1, g_FontHandelGothicXs2, 0xffffff7f, viGetX(), viGetY(), 0, 0);
+			g_FontHandelGothicXs1, g_FontHandelGothicXs2, 0xffffff7f, viGetWidth(), viGetHeight(), 0, 0);
 
 	// Zoom level
 	if (vsplit) {
@@ -7212,7 +7212,7 @@ Gfx *bviewRenderHorizonScanner(Gfx *gdl)
 	}
 
 	gdl = textRenderProjected(gdl, &x, &y, zoomtext,
-			g_FontHandelGothicXs1, g_FontHandelGothicXs2, 0xffffff7f, viGetX(), viGetY(), 0, 0);
+			g_FontHandelGothicXs1, g_FontHandelGothicXs2, 0xffffff7f, viGetWidth(), viGetHeight(), 0, 0);
 
 	// Direction
 	if (vsplit) {
@@ -7224,7 +7224,7 @@ Gfx *bviewRenderHorizonScanner(Gfx *gdl)
 	}
 
 	gdl = textRenderProjected(gdl, &x, &y, directiontext,
-			g_FontHandelGothicXs1, g_FontHandelGothicXs2, 0xffffff7f, viGetX(), viGetY(), 0, 0);
+			g_FontHandelGothicXs1, g_FontHandelGothicXs2, 0xffffff7f, viGetWidth(), viGetHeight(), 0, 0);
 	gdl = func0f153780(gdl);
 
 	gDPPipeSync(gdl++);
diff --git a/src/game/chr/chr.c b/src/game/chr/chr.c
index 6e79bace7..b20b57788 100644
--- a/src/game/chr/chr.c
+++ b/src/game/chr/chr.c
@@ -13297,7 +13297,7 @@ glabel func0f02bdf8
 /*  f02c160:	00000000 */ 	nop
 /*  f02c164:	e7b400cc */ 	swc1	$f20,0xcc($sp)
 .L0f02c168:
-/*  f02c168:	0c002f02 */ 	jal	viGetX
+/*  f02c168:	0c002f02 */ 	jal	viGetWidth
 /*  f02c16c:	00000000 */ 	nop
 /*  f02c170:	44828000 */ 	mtc1	$v0,$f16
 /*  f02c174:	c7a400cc */ 	lwc1	$f4,0xcc($sp)
@@ -13306,7 +13306,7 @@ glabel func0f02bdf8
 /*  f02c180:	00000000 */ 	nop
 /*  f02c184:	45020008 */ 	bc1fl	.L0f02c1a8
 /*  f02c188:	c7a000d0 */ 	lwc1	$f0,0xd0($sp)
-/*  f02c18c:	0c002f02 */ 	jal	viGetX
+/*  f02c18c:	0c002f02 */ 	jal	viGetWidth
 /*  f02c190:	00000000 */ 	nop
 /*  f02c194:	44823000 */ 	mtc1	$v0,$f6
 /*  f02c198:	00000000 */ 	nop
@@ -13320,7 +13320,7 @@ glabel func0f02bdf8
 /*  f02c1b4:	00000000 */ 	nop
 /*  f02c1b8:	e7b400d0 */ 	swc1	$f20,0xd0($sp)
 .L0f02c1bc:
-/*  f02c1bc:	0c002f06 */ 	jal	viGetY
+/*  f02c1bc:	0c002f06 */ 	jal	viGetHeight
 /*  f02c1c0:	00000000 */ 	nop
 /*  f02c1c4:	44825000 */ 	mtc1	$v0,$f10
 /*  f02c1c8:	c7a000d0 */ 	lwc1	$f0,0xd0($sp)
@@ -13329,7 +13329,7 @@ glabel func0f02bdf8
 /*  f02c1d4:	00000000 */ 	nop
 /*  f02c1d8:	45020007 */ 	bc1fl	.L0f02c1f8
 /*  f02c1dc:	c7a400cc */ 	lwc1	$f4,0xcc($sp)
-/*  f02c1e0:	0c002f06 */ 	jal	viGetY
+/*  f02c1e0:	0c002f06 */ 	jal	viGetHeight
 /*  f02c1e4:	00000000 */ 	nop
 /*  f02c1e8:	44829000 */ 	mtc1	$v0,$f18
 /*  f02c1ec:	00000000 */ 	nop
@@ -13418,7 +13418,7 @@ glabel func0f02bdf8
 /*  f02c324:	02209025 */ 	or	$s2,$s1,$zero
 /*  f02c328:	ac6e0000 */ 	sw	$t6,0x0($v1)
 /*  f02c32c:	ac600004 */ 	sw	$zero,0x4($v1)
-/*  f02c330:	0c002f02 */ 	jal	viGetX
+/*  f02c330:	0c002f02 */ 	jal	viGetWidth
 /*  f02c334:	26310008 */ 	addiu	$s1,$s1,0x8
 /*  f02c338:	2459ffff */ 	addiu	$t9,$v0,-1
 /*  f02c33c:	332c0fff */ 	andi	$t4,$t9,0xfff
@@ -13587,11 +13587,11 @@ glabel func0f02bdf8
 /*  f02c5a0:	02209825 */ 	or	$s3,$s1,$zero
 /*  f02c5a4:	3c0eed00 */ 	lui	$t6,0xed00
 /*  f02c5a8:	ae6e0000 */ 	sw	$t6,0x0($s3)
-/*  f02c5ac:	0c002f02 */ 	jal	viGetX
+/*  f02c5ac:	0c002f02 */ 	jal	viGetWidth
 /*  f02c5b0:	26310008 */ 	addiu	$s1,$s1,0x8
 /*  f02c5b4:	00029400 */ 	sll	$s2,$v0,0x10
 /*  f02c5b8:	0012cc03 */ 	sra	$t9,$s2,0x10
-/*  f02c5bc:	0c002f06 */ 	jal	viGetY
+/*  f02c5bc:	0c002f06 */ 	jal	viGetHeight
 /*  f02c5c0:	03209025 */ 	or	$s2,$t9,$zero
 /*  f02c5c4:	44825000 */ 	mtc1	$v0,$f10
 /*  f02c5c8:	44923000 */ 	mtc1	$s2,$f6
diff --git a/src/game/core.c b/src/game/core.c
index 13134a21e..d4cb4fdd4 100644
--- a/src/game/core.c
+++ b/src/game/core.c
@@ -1561,7 +1561,7 @@ Gfx *coreRender(Gfx *gdl)
 		}
 	}
 
-	gDPSetScissor(gdl++, G_SC_NON_INTERLACE, 0, 0, viGetX(), viGetY());
+	gDPSetScissor(gdl++, G_SC_NON_INTERLACE, 0, 0, viGetWidth(), viGetHeight());
 
 	return gdl;
 }
diff --git a/src/game/credits.c b/src/game/credits.c
index e6b765d06..9d9b08035 100644
--- a/src/game/credits.c
+++ b/src/game/credits.c
@@ -629,7 +629,7 @@ Gfx *creditsClearFramebuffer(Gfx *gdl, u32 colour)
 
 	gdl = gfxSetPrimColour(gdl, colour);
 
-	gDPFillRectangle(gdl++, 0, 0, viGetX(), viGetY());
+	gDPFillRectangle(gdl++, 0, 0, viGetWidth(), viGetHeight());
 
 	gdl = func0f153838(gdl);
 
@@ -3377,9 +3377,9 @@ glabel var7f1b5948
 /*  f13b0b0:	35ef0078 */ 	ori	$t7,$t7,0x78
 /*  f13b0b4:	afa20048 */ 	sw	$v0,0x48($sp)
 /*  f13b0b8:	ac4f0000 */ 	sw	$t7,0x0($v0)
-/*  f13b0bc:	0c002f02 */ 	jal	viGetX
+/*  f13b0bc:	0c002f02 */ 	jal	viGetWidth
 /*  f13b0c0:	24500008 */ 	addiu	$s0,$v0,0x8
-/*  f13b0c4:	0c002f06 */ 	jal	viGetY
+/*  f13b0c4:	0c002f06 */ 	jal	viGetHeight
 /*  f13b0c8:	a7a20036 */ 	sh	$v0,0x36($sp)
 /*  f13b0cc:	2458ffe2 */ 	addiu	$t8,$v0,-30
 /*  f13b0d0:	44982000 */ 	mtc1	$t8,$f4
@@ -3664,7 +3664,7 @@ glabel var7f1b5948
 //	gdl = func0000b1d0(gdl);
 //	gdl = creditsClearFramebuffer(gdl, 0x000000ff);
 //
-//	gDPSetScissorFrac(gdl++, G_SC_NON_INTERLACE, 0, 120, viGetX() * 4.0f, (viGetY() - 30) * 4.0f);
+//	gDPSetScissorFrac(gdl++, G_SC_NON_INTERLACE, 0, 120, viGetWidth() * 4.0f, (viGetHeight() - 30) * 4.0f);
 //
 //	creditsTick();
 //
diff --git a/src/game/game_015470.c b/src/game/game_015470.c
index 1a1e9fa99..4fb90981a 100644
--- a/src/game/game_015470.c
+++ b/src/game/game_015470.c
@@ -88,7 +88,7 @@ glabel func0f0155f0
 /*  f015660:	ac590000 */ 	sw	$t9,0x0($v0)
 /*  f015664:	26100008 */ 	addiu	$s0,$s0,0x8
 /*  f015668:	afb000fc */ 	sw	$s0,0xfc($sp)
-/*  f01566c:	0c002f02 */ 	jal	viGetX
+/*  f01566c:	0c002f02 */ 	jal	viGetWidth
 /*  f015670:	26100008 */ 	addiu	$s0,$s0,0x8
 /*  f015674:	244fffff */ 	addiu	$t7,$v0,-1
 /*  f015678:	8fae00fc */ 	lw	$t6,0xfc($sp)
@@ -609,7 +609,7 @@ Gfx *func0f0155f0(Gfx *gdl, s32 arg1, u32 arg2);
 //		var80062494 = 0;
 //	} else {
 //		gDPSetCycleType(gdl++, G_CYC_FILL);
-//		gDPSetColorImage(gdl++, G_IM_FMT_RGBA, G_IM_SIZ_16b, viGetX(), osVirtualToPhysical(viGetUnk28()));
+//		gDPSetColorImage(gdl++, G_IM_FMT_RGBA, G_IM_SIZ_16b, viGetWidth(), osVirtualToPhysical(viGetUnk28()));
 //		gDPSetFillColor(gdl++, 0x00010001);
 //		gDPFillRectangle(gdl++, 200, 100, 439, 379);
 //	}
diff --git a/src/game/game_01afc0.c b/src/game/game_01afc0.c
index d394dbbab..4d903a4e2 100644
--- a/src/game/game_01afc0.c
+++ b/src/game/game_01afc0.c
@@ -8,9 +8,9 @@
 Gfx *func0f01afc0(Gfx *gdl)
 {
 	gDPSetCycleType(gdl++, G_CYC_FILL);
-	gDPSetColorImage(gdl++, G_IM_FMT_RGBA, G_IM_SIZ_16b, viGetX(), osVirtualToPhysical((void *)viGetUnk28()));
+	gDPSetColorImage(gdl++, G_IM_FMT_RGBA, G_IM_SIZ_16b, viGetWidth(), osVirtualToPhysical((void *)viGetUnk28()));
 	gDPSetFillColor(gdl++, 0x00010001);
-	gDPFillRectangle(gdl++, 0, 0, viGetX() - 1, viGetY() - 1);
+	gDPFillRectangle(gdl++, 0, 0, viGetWidth() - 1, viGetHeight() - 1);
 
 	return gdl;
 }
diff --git a/src/game/game_097ba0.c b/src/game/game_097ba0.c
index 6d355222f..ae449c781 100644
--- a/src/game/game_097ba0.c
+++ b/src/game/game_097ba0.c
@@ -11317,7 +11317,7 @@ glabel func0f0a0cb0
 .L0f0a0e60:
 /*  f0a0e60:	0fc2d5f6 */ 	jal	currentPlayerGetScreenWidth
 /*  f0a0e64:	e7a20034 */ 	swc1	$f2,0x34($sp)
-/*  f0a0e68:	0c002f06 */ 	jal	viGetY
+/*  f0a0e68:	0c002f06 */ 	jal	viGetHeight
 /*  f0a0e6c:	e7a0001c */ 	swc1	$f0,0x1c($sp)
 /*  f0a0e70:	0fc2d60a */ 	jal	currentPlayerGetPerspAspect
 /*  f0a0e74:	a7a20022 */ 	sh	$v0,0x22($sp)
@@ -11375,7 +11375,7 @@ glabel func0f0a0cb0
 .L0f0a0f38:
 /*  f0a0f38:	0fc2d5fa */ 	jal	currentPlayerGetScreenHeight
 /*  f0a0f3c:	e7a20034 */ 	swc1	$f2,0x34($sp)
-/*  f0a0f40:	0c002f06 */ 	jal	viGetY
+/*  f0a0f40:	0c002f06 */ 	jal	viGetHeight
 /*  f0a0f44:	e7a0001c */ 	swc1	$f0,0x1c($sp)
 /*  f0a0f48:	c7a20034 */ 	lwc1	$f2,0x34($sp)
 /*  f0a0f4c:	c7aa0038 */ 	lwc1	$f10,0x38($sp)
@@ -21174,11 +21174,11 @@ glabel func0f0a9b68
 /*  f0a9ca8:	8fa40060 */ 	lw	$a0,0x60($sp)
 /*  f0a9cac:	0fc54e16 */ 	jal	func0f153858
 /*  f0a9cb0:	afad0010 */ 	sw	$t5,0x10($sp)
-/*  f0a9cb4:	0c002f02 */ 	jal	viGetX
+/*  f0a9cb4:	0c002f02 */ 	jal	viGetWidth
 /*  f0a9cb8:	afa20060 */ 	sw	$v0,0x60($sp)
 /*  f0a9cbc:	00028400 */ 	sll	$s0,$v0,0x10
 /*  f0a9cc0:	00107403 */ 	sra	$t6,$s0,0x10
-/*  f0a9cc4:	0c002f06 */ 	jal	viGetY
+/*  f0a9cc4:	0c002f06 */ 	jal	viGetHeight
 /*  f0a9cc8:	01c08025 */ 	or	$s0,$t6,$zero
 /*  f0a9ccc:	3c0f8008 */ 	lui	$t7,%hi(g_FontNumeric1)
 /*  f0a9cd0:	3c188008 */ 	lui	$t8,%hi(g_FontNumeric2)
diff --git a/src/game/game_0b2150.c b/src/game/game_0b2150.c
index 2979943fc..4fca0bf15 100644
--- a/src/game/game_0b2150.c
+++ b/src/game/game_0b2150.c
@@ -208,10 +208,10 @@ glabel func0f0b2150
 /*  f0b23e8:	afaa0048 */ 	sw	$t2,0x48($sp)
 /*  f0b23ec:	afab0044 */ 	sw	$t3,0x44($sp)
 /*  f0b23f0:	afac0040 */ 	sw	$t4,0x40($sp)
-/*  f0b23f4:	0c002f02 */ 	jal	viGetX
+/*  f0b23f4:	0c002f02 */ 	jal	viGetWidth
 /*  f0b23f8:	afad003c */ 	sw	$t5,0x3c($sp)
 /*  f0b23fc:	00021880 */ 	sll	$v1,$v0,0x2
-/*  f0b2400:	0c002f06 */ 	jal	viGetY
+/*  f0b2400:	0c002f06 */ 	jal	viGetHeight
 /*  f0b2404:	afa30028 */ 	sw	$v1,0x28($sp)
 /*  f0b2408:	8fa30028 */ 	lw	$v1,0x28($sp)
 /*  f0b240c:	8fac0040 */ 	lw	$t4,0x40($sp)
diff --git a/src/game/game_0d4690.c b/src/game/game_0d4690.c
index 24ecd7857..4c7c7ef12 100644
--- a/src/game/game_0d4690.c
+++ b/src/game/game_0d4690.c
@@ -49,7 +49,7 @@ glabel func0f0d4690
 /*  f0d46b0:	44804000 */ 	mtc1	$zero,$f8
 /*  f0d46b4:	e7a4001c */ 	swc1	$f4,0x1c($sp)
 /*  f0d46b8:	e7a60020 */ 	swc1	$f6,0x20($sp)
-/*  f0d46bc:	0c002f02 */ 	jal	viGetX
+/*  f0d46bc:	0c002f02 */ 	jal	viGetWidth
 /*  f0d46c0:	e7a80024 */ 	swc1	$f8,0x24($sp)
 /*  f0d46c4:	44828000 */ 	mtc1	$v0,$f16
 /*  f0d46c8:	3c013f00 */ 	lui	$at,0x3f00
@@ -58,7 +58,7 @@ glabel func0f0d4690
 /*  f0d46d4:	44813000 */ 	mtc1	$at,$f6
 /*  f0d46d8:	46125101 */ 	sub.s	$f4,$f10,$f18
 /*  f0d46dc:	46062202 */ 	mul.s	$f8,$f4,$f6
-/*  f0d46e0:	0c002f06 */ 	jal	viGetY
+/*  f0d46e0:	0c002f06 */ 	jal	viGetHeight
 /*  f0d46e4:	e7a8001c */ 	swc1	$f8,0x1c($sp)
 /*  f0d46e8:	44828000 */ 	mtc1	$v0,$f16
 /*  f0d46ec:	3c013f00 */ 	lui	$at,0x3f00
@@ -132,13 +132,13 @@ glabel func0f0d479c
 /*  f0d47d8:	8fa50050 */ 	lw	$a1,0x50($sp)
 /*  f0d47dc:	0c00566c */ 	jal	func000159b0
 /*  f0d47e0:	02002025 */ 	or	$a0,$s0,$zero
-/*  f0d47e4:	0c002f02 */ 	jal	viGetX
+/*  f0d47e4:	0c002f02 */ 	jal	viGetWidth
 /*  f0d47e8:	00000000 */ 	nop
-/*  f0d47ec:	0c002f02 */ 	jal	viGetX
+/*  f0d47ec:	0c002f02 */ 	jal	viGetWidth
 /*  f0d47f0:	a7a20034 */ 	sh	$v0,0x34($sp)
-/*  f0d47f4:	0c002f06 */ 	jal	viGetY
+/*  f0d47f4:	0c002f06 */ 	jal	viGetHeight
 /*  f0d47f8:	a7a20036 */ 	sh	$v0,0x36($sp)
-/*  f0d47fc:	0c002f06 */ 	jal	viGetY
+/*  f0d47fc:	0c002f06 */ 	jal	viGetHeight
 /*  f0d4800:	a7a20038 */ 	sh	$v0,0x38($sp)
 /*  f0d4804:	87ae0034 */ 	lh	$t6,0x34($sp)
 /*  f0d4808:	87af0036 */ 	lh	$t7,0x36($sp)
@@ -209,11 +209,11 @@ glabel func0f0d479c
 /*  f0d490c:	00402025 */ 	or	$a0,$v0,$zero
 /*  f0d4910:	1040001c */ 	beqz	$v0,.L0f0d4984
 /*  f0d4914:	ae020000 */ 	sw	$v0,0x0($s0)
-/*  f0d4918:	0c002f02 */ 	jal	viGetX
+/*  f0d4918:	0c002f02 */ 	jal	viGetWidth
 /*  f0d491c:	00000000 */ 	nop
 /*  f0d4920:	8e0c0000 */ 	lw	$t4,0x0($s0)
 /*  f0d4924:	00025840 */ 	sll	$t3,$v0,0x1
-/*  f0d4928:	0c002f06 */ 	jal	viGetY
+/*  f0d4928:	0c002f06 */ 	jal	viGetHeight
 /*  f0d492c:	a58b0000 */ 	sh	$t3,0x0($t4)
 /*  f0d4930:	8e0e0000 */ 	lw	$t6,0x0($s0)
 /*  f0d4934:	00026840 */ 	sll	$t5,$v0,0x1
@@ -222,11 +222,11 @@ glabel func0f0d479c
 /*  f0d4940:	8e180000 */ 	lw	$t8,0x0($s0)
 /*  f0d4944:	a70f0004 */ 	sh	$t7,0x4($t8)
 /*  f0d4948:	8e190000 */ 	lw	$t9,0x0($s0)
-/*  f0d494c:	0c002f02 */ 	jal	viGetX
+/*  f0d494c:	0c002f02 */ 	jal	viGetWidth
 /*  f0d4950:	a7200006 */ 	sh	$zero,0x6($t9)
 /*  f0d4954:	8e090000 */ 	lw	$t1,0x0($s0)
 /*  f0d4958:	00024040 */ 	sll	$t0,$v0,0x1
-/*  f0d495c:	0c002f06 */ 	jal	viGetY
+/*  f0d495c:	0c002f06 */ 	jal	viGetHeight
 /*  f0d4960:	a5280008 */ 	sh	$t0,0x8($t1)
 /*  f0d4964:	8e0b0000 */ 	lw	$t3,0x0($s0)
 /*  f0d4968:	00025040 */ 	sll	$t2,$v0,0x1
diff --git a/src/game/game_0e0770.c b/src/game/game_0e0770.c
index 5756292e6..d08c7c9df 100644
--- a/src/game/game_0e0770.c
+++ b/src/game/game_0e0770.c
@@ -73,7 +73,7 @@ glabel func0f0e0770
 /*  f0e0794:	afb1001c */ 	sw	$s1,0x1c($sp)
 /*  f0e0798:	0c002acb */ 	jal	vi2GetUnk28
 /*  f0e079c:	afb00018 */ 	sw	$s0,0x18($sp)
-/*  f0e07a0:	0c002f02 */ 	jal	viGetX
+/*  f0e07a0:	0c002f02 */ 	jal	viGetWidth
 /*  f0e07a4:	00408025 */ 	or	$s0,$v0,$zero
 /*  f0e07a8:	3c0e8007 */ 	lui	$t6,%hi(g_ViMode)
 /*  f0e07ac:	8dce06c8 */ 	lw	$t6,%lo(g_ViMode)($t6)
@@ -221,9 +221,9 @@ glabel func0f0e0998
 /*  f0e09b8:	afa60090 */ 	sw	$a2,0x90($sp)
 /*  f0e09bc:	15c10013 */ 	bne	$t6,$at,.L0f0e0a0c
 /*  f0e09c0:	afa70094 */ 	sw	$a3,0x94($sp)
-/*  f0e09c4:	0c002f02 */ 	jal	viGetX
+/*  f0e09c4:	0c002f02 */ 	jal	viGetWidth
 /*  f0e09c8:	00000000 */ 	nop
-/*  f0e09cc:	0c002f06 */ 	jal	viGetY
+/*  f0e09cc:	0c002f06 */ 	jal	viGetHeight
 /*  f0e09d0:	a7a20030 */ 	sh	$v0,0x30($sp)
 /*  f0e09d4:	240f00ff */ 	addiu	$t7,$zero,0xff
 /*  f0e09d8:	241800ff */ 	addiu	$t8,$zero,0xff
@@ -4067,7 +4067,7 @@ glabel func0f0e4190
 /*  f0e4594:	afb00028 */ 	sw	$s0,0x28($sp)
 /*  f0e4598:	3c01800a */ 	lui	$at,%hi(var8009de98)
 /*  f0e459c:	00808025 */ 	or	$s0,$a0,$zero
-/*  f0e45a0:	0c002f06 */ 	jal	viGetY
+/*  f0e45a0:	0c002f06 */ 	jal	viGetHeight
 /*  f0e45a4:	ac20de98 */ 	sw	$zero,%lo(var8009de98)($at)
 /*  f0e45a8:	04410003 */ 	bgez	$v0,.L0f0e45b8
 /*  f0e45ac:	00027043 */ 	sra	$t6,$v0,0x1
@@ -4089,9 +4089,9 @@ glabel func0f0e4190
 /*  f0e45e8:	350886a0 */ 	ori	$t0,$t0,0x86a0
 /*  f0e45ec:	3c01800a */ 	lui	$at,%hi(var8009de94)
 /*  f0e45f0:	00408025 */ 	or	$s0,$v0,$zero
-/*  f0e45f4:	0c002f06 */ 	jal	viGetY
+/*  f0e45f4:	0c002f06 */ 	jal	viGetHeight
 /*  f0e45f8:	ac28de94 */ 	sw	$t0,%lo(var8009de94)($at)
-/*  f0e45fc:	0c002f06 */ 	jal	viGetY
+/*  f0e45fc:	0c002f06 */ 	jal	viGetHeight
 /*  f0e4600:	a7a20034 */ 	sh	$v0,0x34($sp)
 /*  f0e4604:	87a60034 */ 	lh	$a2,0x34($sp)
 /*  f0e4608:	3c0300ff */ 	lui	$v1,0xff
@@ -4107,9 +4107,9 @@ glabel func0f0e4190
 /*  f0e4630:	240707d0 */ 	addiu	$a3,$zero,0x7d0
 /*  f0e4634:	0fc35343 */ 	jal	func0f0d4d0c
 /*  f0e4638:	24c6000a */ 	addiu	$a2,$a2,0xa
-/*  f0e463c:	0c002f06 */ 	jal	viGetY
+/*  f0e463c:	0c002f06 */ 	jal	viGetHeight
 /*  f0e4640:	00408025 */ 	or	$s0,$v0,$zero
-/*  f0e4644:	0c002f06 */ 	jal	viGetY
+/*  f0e4644:	0c002f06 */ 	jal	viGetHeight
 /*  f0e4648:	a7a20034 */ 	sh	$v0,0x34($sp)
 /*  f0e464c:	87a60034 */ 	lh	$a2,0x34($sp)
 /*  f0e4650:	3c03ffff */ 	lui	$v1,0xffff
@@ -5045,11 +5045,11 @@ glabel func0f0e5000
 /*  f0e5454:	afb3001c */ 	sw	$s3,0x1c($sp)
 /*  f0e5458:	0fc35343 */ 	jal	func0f0d4d0c
 /*  f0e545c:	afb20150 */ 	sw	$s2,0x150($sp)
-/*  f0e5460:	0c002f06 */ 	jal	viGetY
+/*  f0e5460:	0c002f06 */ 	jal	viGetHeight
 /*  f0e5464:	afa20150 */ 	sw	$v0,0x150($sp)
 /*  f0e5468:	00028400 */ 	sll	$s0,$v0,0x10
 /*  f0e546c:	00107403 */ 	sra	$t6,$s0,0x10
-/*  f0e5470:	0c002f06 */ 	jal	viGetY
+/*  f0e5470:	0c002f06 */ 	jal	viGetHeight
 /*  f0e5474:	01c08025 */ 	or	$s0,$t6,$zero
 /*  f0e5478:	3c039090 */ 	lui	$v1,0x9090
 /*  f0e547c:	3463907f */ 	ori	$v1,$v1,0x907f
@@ -5080,11 +5080,11 @@ glabel func0f0e5000
 /*  f0e54dc:	240707d0 */ 	addiu	$a3,$zero,0x7d0
 /*  f0e54e0:	0fc35343 */ 	jal	func0f0d4d0c
 /*  f0e54e4:	afb20150 */ 	sw	$s2,0x150($sp)
-/*  f0e54e8:	0c002f06 */ 	jal	viGetY
+/*  f0e54e8:	0c002f06 */ 	jal	viGetHeight
 /*  f0e54ec:	afa20150 */ 	sw	$v0,0x150($sp)
 /*  f0e54f0:	00028400 */ 	sll	$s0,$v0,0x10
 /*  f0e54f4:	00105c03 */ 	sra	$t3,$s0,0x10
-/*  f0e54f8:	0c002f06 */ 	jal	viGetY
+/*  f0e54f8:	0c002f06 */ 	jal	viGetHeight
 /*  f0e54fc:	01608025 */ 	or	$s0,$t3,$zero
 /*  f0e5500:	3c036200 */ 	lui	$v1,0x6200
 /*  f0e5504:	3463947f */ 	ori	$v1,$v1,0x947f
diff --git a/src/game/game_0f09f0.c b/src/game/game_0f09f0.c
index 9ad13091e..9386d398a 100644
--- a/src/game/game_0f09f0.c
+++ b/src/game/game_0f09f0.c
@@ -446,11 +446,11 @@ glabel func0f0f0ce8
 /*  f0f1064:	afa60084 */ 	sw	$a2,0x84($sp)
 /*  f0f1068:	0fc5b9f1 */ 	jal	langGet
 /*  f0f106c:	afa30044 */ 	sw	$v1,0x44($sp)
-/*  f0f1070:	0c002f02 */ 	jal	viGetX
+/*  f0f1070:	0c002f02 */ 	jal	viGetWidth
 /*  f0f1074:	afa2004c */ 	sw	$v0,0x4c($sp)
 /*  f0f1078:	00028400 */ 	sll	$s0,$v0,0x10
 /*  f0f107c:	00107403 */ 	sra	$t6,$s0,0x10
-/*  f0f1080:	0c002f02 */ 	jal	viGetX
+/*  f0f1080:	0c002f02 */ 	jal	viGetWidth
 /*  f0f1084:	01c08025 */ 	or	$s0,$t6,$zero
 /*  f0f1088:	8fb90064 */ 	lw	$t9,0x64($sp)
 /*  f0f108c:	8fb80060 */ 	lw	$t8,0x60($sp)
@@ -483,11 +483,11 @@ glabel func0f0f0ce8
 /*  f0f10f4:	afa60084 */ 	sw	$a2,0x84($sp)
 /*  f0f10f8:	0fc5b9f1 */ 	jal	langGet
 /*  f0f10fc:	240451ef */ 	addiu	$a0,$zero,0x51ef
-/*  f0f1100:	0c002f02 */ 	jal	viGetX
+/*  f0f1100:	0c002f02 */ 	jal	viGetWidth
 /*  f0f1104:	afa2004c */ 	sw	$v0,0x4c($sp)
 /*  f0f1108:	00028400 */ 	sll	$s0,$v0,0x10
 /*  f0f110c:	00107403 */ 	sra	$t6,$s0,0x10
-/*  f0f1110:	0c002f02 */ 	jal	viGetX
+/*  f0f1110:	0c002f02 */ 	jal	viGetWidth
 /*  f0f1114:	01c08025 */ 	or	$s0,$t6,$zero
 /*  f0f1118:	8fb90064 */ 	lw	$t9,0x64($sp)
 /*  f0f111c:	8fb80060 */ 	lw	$t8,0x60($sp)
@@ -519,11 +519,11 @@ glabel func0f0f0ce8
 /*  f0f1180:	95e40000 */ 	lhu	$a0,0x0($t7)
 /*  f0f1184:	0fc5b9f1 */ 	jal	langGet
 /*  f0f1188:	afa60084 */ 	sw	$a2,0x84($sp)
-/*  f0f118c:	0c002f02 */ 	jal	viGetX
+/*  f0f118c:	0c002f02 */ 	jal	viGetWidth
 /*  f0f1190:	afa2004c */ 	sw	$v0,0x4c($sp)
 /*  f0f1194:	00028400 */ 	sll	$s0,$v0,0x10
 /*  f0f1198:	00107403 */ 	sra	$t6,$s0,0x10
-/*  f0f119c:	0c002f02 */ 	jal	viGetX
+/*  f0f119c:	0c002f02 */ 	jal	viGetWidth
 /*  f0f11a0:	01c08025 */ 	or	$s0,$t6,$zero
 /*  f0f11a4:	8fb90064 */ 	lw	$t9,0x64($sp)
 /*  f0f11a8:	8fb80060 */ 	lw	$t8,0x60($sp)
@@ -556,11 +556,11 @@ glabel func0f0f0ce8
 /*  f0f1210:	afa60084 */ 	sw	$a2,0x84($sp)
 /*  f0f1214:	0fc5b9f1 */ 	jal	langGet
 /*  f0f1218:	240451ef */ 	addiu	$a0,$zero,0x51ef
-/*  f0f121c:	0c002f02 */ 	jal	viGetX
+/*  f0f121c:	0c002f02 */ 	jal	viGetWidth
 /*  f0f1220:	afa2004c */ 	sw	$v0,0x4c($sp)
 /*  f0f1224:	00028400 */ 	sll	$s0,$v0,0x10
 /*  f0f1228:	00107c03 */ 	sra	$t7,$s0,0x10
-/*  f0f122c:	0c002f02 */ 	jal	viGetX
+/*  f0f122c:	0c002f02 */ 	jal	viGetWidth
 /*  f0f1230:	01e08025 */ 	or	$s0,$t7,$zero
 /*  f0f1234:	8fae0064 */ 	lw	$t6,0x64($sp)
 /*  f0f1238:	8fb90060 */ 	lw	$t9,0x60($sp)
@@ -595,11 +595,11 @@ glabel func0f0f0ce8
 /*  f0f12a8:	01ac7821 */ 	addu	$t7,$t5,$t4
 /*  f0f12ac:	25eefff9 */ 	addiu	$t6,$t7,-7
 /*  f0f12b0:	afae0088 */ 	sw	$t6,0x88($sp)
-/*  f0f12b4:	0c002f02 */ 	jal	viGetX
+/*  f0f12b4:	0c002f02 */ 	jal	viGetWidth
 /*  f0f12b8:	afa60084 */ 	sw	$a2,0x84($sp)
 /*  f0f12bc:	00028400 */ 	sll	$s0,$v0,0x10
 /*  f0f12c0:	0010cc03 */ 	sra	$t9,$s0,0x10
-/*  f0f12c4:	0c002f02 */ 	jal	viGetX
+/*  f0f12c4:	0c002f02 */ 	jal	viGetWidth
 /*  f0f12c8:	03208025 */ 	or	$s0,$t9,$zero
 /*  f0f12cc:	3c188008 */ 	lui	$t8,%hi(g_FontHandelGothicXs1)
 /*  f0f12d0:	3c0b8008 */ 	lui	$t3,%hi(g_FontHandelGothicXs2)
@@ -2577,7 +2577,7 @@ glabel menuPushDialog
 /*  f0f305c:	028b3021 */ 	addu	$a2,$s4,$t3
 /*  f0f3060:	0fc3cb3d */ 	jal	menuOpenDialog
 /*  f0f3064:	00000000 */ 	nop
-/*  f0f3068:	0c002f02 */ 	jal	viGetX
+/*  f0f3068:	0c002f02 */ 	jal	viGetWidth
 /*  f0f306c:	00000000 */ 	nop
 /*  f0f3070:	8e0c001c */ 	lw	$t4,0x1c($s0)
 /*  f0f3074:	004c6823 */ 	subu	$t5,$v0,$t4
@@ -2586,7 +2586,7 @@ glabel menuPushDialog
 /*  f0f3080:	25a10001 */ 	addiu	$at,$t5,0x1
 /*  f0f3084:	00017043 */ 	sra	$t6,$at,0x1
 .L0f0f3088:
-/*  f0f3088:	0c002f06 */ 	jal	viGetY
+/*  f0f3088:	0c002f06 */ 	jal	viGetHeight
 /*  f0f308c:	ae0e002c */ 	sw	$t6,0x2c($s0)
 /*  f0f3090:	8e0f0020 */ 	lw	$t7,0x20($s0)
 /*  f0f3094:	004fc023 */ 	subu	$t8,$v0,$t7
@@ -2644,7 +2644,7 @@ glabel menuPushDialog
 /*  f0f315c:	0fc3cb3d */ 	jal	menuOpenDialog
 /*  f0f3160:	00000000 */ 	nop
 /*  f0f3164:	ae130014 */ 	sw	$s3,0x14($s0)
-/*  f0f3168:	0c002f06 */ 	jal	viGetY
+/*  f0f3168:	0c002f06 */ 	jal	viGetHeight
 /*  f0f316c:	ae13002c */ 	sw	$s3,0x2c($s0)
 /*  f0f3170:	8e180020 */ 	lw	$t8,0x20($s0)
 /*  f0f3174:	a200003c */ 	sb	$zero,0x3c($s0)
@@ -2722,8 +2722,8 @@ glabel menuPushDialog
 //
 //			menuOpenDialog(dialog, frame, &g_Menus[g_MpPlayerNum]);
 //
-//			frame->unk2c = (viGetX() - frame->unk1c) / 2;
-//			frame->unk30 = (viGetY() - frame->unk20) / 2;
+//			frame->unk2c = (viGetWidth() - frame->unk1c) / 2;
+//			frame->unk30 = (viGetHeight() - frame->unk20) / 2;
 //
 //			g_Menus[g_MpPlayerNum].unke40 |= 0x80;
 //			sibling = dialog->nextsibling;
@@ -2744,7 +2744,7 @@ glabel menuPushDialog
 //
 //					frame->unk14 = -320;
 //					frame->unk2c = -320;
-//					frame->unk18 = (viGetY() - frame->unk20) / 2;
+//					frame->unk18 = (viGetHeight() - frame->unk20) / 2;
 //					frame->unk30 = frame->unk18;
 //					frame->unk3c = 0;
 //
@@ -4467,7 +4467,7 @@ glabel var7f1b2948
 /*  f0f4c74:	c4680038 */ 	lwc1	$f8,0x38($v1)
 /*  f0f4c78:	0fc2d341 */ 	jal	func0f0b4d04
 /*  f0f4c7c:	e7a800d8 */ 	swc1	$f8,0xd8($sp)
-/*  f0f4c80:	0c002f02 */ 	jal	viGetX
+/*  f0f4c80:	0c002f02 */ 	jal	viGetWidth
 /*  f0f4c84:	00000000 */ 	nop
 /*  f0f4c88:	c7a400c8 */ 	lwc1	$f4,0xc8($sp)
 /*  f0f4c8c:	3c198008 */ 	lui	$t9,%hi(g_ScaleX)
@@ -4495,7 +4495,7 @@ glabel var7f1b2948
 /*  f0f4cd8:	3c01800a */ 	lui	$at,%hi(var8009de98)
 /*  f0f4cdc:	00005812 */ 	mflo	$t3
 /*  f0f4ce0:	ac2bde98 */ 	sw	$t3,%lo(var8009de98)($at)
-/*  f0f4ce4:	0c002f06 */ 	jal	viGetY
+/*  f0f4ce4:	0c002f06 */ 	jal	viGetHeight
 /*  f0f4ce8:	00000000 */ 	nop
 /*  f0f4cec:	c7aa00cc */ 	lwc1	$f10,0xcc($sp)
 /*  f0f4cf0:	4600520d */ 	trunc.w.s	$f8,$f10
@@ -5560,7 +5560,7 @@ glabel func0f0f5360
 /*  f0f5c34:	24630003 */ 	addiu	$v1,$v1,0x3
 /*  f0f5c38:	24a50003 */ 	addiu	$a1,$a1,0x3
 /*  f0f5c3c:	afa501cc */ 	sw	$a1,0x1cc($sp)
-/*  f0f5c40:	0c002f06 */ 	jal	viGetY
+/*  f0f5c40:	0c002f06 */ 	jal	viGetHeight
 /*  f0f5c44:	afa301d0 */ 	sw	$v1,0x1d0($sp)
 /*  f0f5c48:	8faf01bc */ 	lw	$t7,0x1bc($sp)
 /*  f0f5c4c:	3c118008 */ 	lui	$s1,%hi(g_FontHandelGothicSm1)
@@ -5585,7 +5585,7 @@ glabel func0f0f5360
 /*  f0f5c98:	afae001c */ 	sw	$t6,0x1c($sp)
 /*  f0f5c9c:	afa201e8 */ 	sw	$v0,0x1e8($sp)
 /*  f0f5ca0:	afb201d0 */ 	sw	$s2,0x1d0($sp)
-/*  f0f5ca4:	0c002f06 */ 	jal	viGetY
+/*  f0f5ca4:	0c002f06 */ 	jal	viGetHeight
 /*  f0f5ca8:	afb001cc */ 	sw	$s0,0x1cc($sp)
 /*  f0f5cac:	8e2b0000 */ 	lw	$t3,0x0($s1)
 /*  f0f5cb0:	8e6c0000 */ 	lw	$t4,0x0($s3)
@@ -5619,7 +5619,7 @@ glabel func0f0f5360
 /*  f0f5d1c:	8fa30088 */ 	lw	$v1,0x88($sp)
 /*  f0f5d20:	afb001cc */ 	sw	$s0,0x1cc($sp)
 /*  f0f5d24:	2463fff7 */ 	addiu	$v1,$v1,-9
-/*  f0f5d28:	0c002f06 */ 	jal	viGetY
+/*  f0f5d28:	0c002f06 */ 	jal	viGetHeight
 /*  f0f5d2c:	afa301d0 */ 	sw	$v1,0x1d0($sp)
 /*  f0f5d30:	3c0f8007 */ 	lui	$t7,%hi(g_MpPlayerNum)
 /*  f0f5d34:	8def1448 */ 	lw	$t7,%lo(g_MpPlayerNum)($t7)
@@ -7112,7 +7112,7 @@ glabel func0f0f5360
 /*  f0f7324:	afa301d0 */ 	sw	$v1,0x1d0($sp)
 /*  f0f7328:	afae01cc */ 	sw	$t6,0x1cc($sp)
 .L0f0f732c:
-/*  f0f732c:	0c002f06 */ 	jal	viGetY
+/*  f0f732c:	0c002f06 */ 	jal	viGetHeight
 /*  f0f7330:	00000000 */ 	nop
 /*  f0f7334:	8e4b0000 */ 	lw	$t3,0x0($s2)
 /*  f0f7338:	8e780000 */ 	lw	$t8,0x0($s3)
@@ -7173,7 +7173,7 @@ glabel func0f0f5360
 /*  f0f740c:	afa301d0 */ 	sw	$v1,0x1d0($sp)
 /*  f0f7410:	afad01cc */ 	sw	$t5,0x1cc($sp)
 .L0f0f7414:
-/*  f0f7414:	0c002f06 */ 	jal	viGetY
+/*  f0f7414:	0c002f06 */ 	jal	viGetHeight
 /*  f0f7418:	00000000 */ 	nop
 /*  f0f741c:	8e590000 */ 	lw	$t9,0x0($s2)
 /*  f0f7420:	8e6e0000 */ 	lw	$t6,0x0($s3)
@@ -8546,7 +8546,7 @@ glabel func0f0f86a8
 /*  f0f8710:	14410056 */ 	bne	$v0,$at,.L0f0f886c
 /*  f0f8714:	3c0d8007 */ 	lui	$t5,%hi(var800714e0)
 .L0f0f8718:
-/*  f0f8718:	0c002f02 */ 	jal	viGetX
+/*  f0f8718:	0c002f02 */ 	jal	viGetWidth
 /*  f0f871c:	00000000 */ 	nop
 /*  f0f8720:	3c0e8008 */ 	lui	$t6,%hi(g_ScaleX)
 /*  f0f8724:	8dcefac0 */ 	lw	$t6,%lo(g_ScaleX)($t6)
@@ -8586,7 +8586,7 @@ glabel func0f0f86a8
 .L0f0f87a4:
 /*  f0f87a4:	3c01800a */ 	lui	$at,%hi(var8009de98)
 /*  f0f87a8:	01b8c823 */ 	subu	$t9,$t5,$t8
-/*  f0f87ac:	0c002f06 */ 	jal	viGetY
+/*  f0f87ac:	0c002f06 */ 	jal	viGetHeight
 /*  f0f87b0:	ac39de98 */ 	sw	$t9,%lo(var8009de98)($at)
 /*  f0f87b4:	3c0b8007 */ 	lui	$t3,%hi(g_MpPlayerNum)
 /*  f0f87b8:	8d6b1448 */ 	lw	$t3,%lo(g_MpPlayerNum)($t3)
@@ -11997,9 +11997,9 @@ glabel var7f1b2af4
 /*  f0fb65c:	0fc54df7 */ 	jal	gfxSetPrimColour
 /*  f0fb660:	00000000 */ 	nop
 /*  f0fb664:	afa20070 */ 	sw	$v0,0x70($sp)
-/*  f0fb668:	0c002f02 */ 	jal	viGetX
+/*  f0fb668:	0c002f02 */ 	jal	viGetWidth
 /*  f0fb66c:	24500008 */ 	addiu	$s0,$v0,0x8
-/*  f0fb670:	0c002f06 */ 	jal	viGetY
+/*  f0fb670:	0c002f06 */ 	jal	viGetHeight
 /*  f0fb674:	a7a2003a */ 	sh	$v0,0x3a($sp)
 /*  f0fb678:	87ae003a */ 	lh	$t6,0x3a($sp)
 /*  f0fb67c:	304b03ff */ 	andi	$t3,$v0,0x3ff
@@ -12028,9 +12028,9 @@ glabel var7f1b2af4
 /*  f0fb6d8:	0fc54df7 */ 	jal	gfxSetPrimColour
 /*  f0fb6dc:	240500ff */ 	addiu	$a1,$zero,0xff
 /*  f0fb6e0:	afa20068 */ 	sw	$v0,0x68($sp)
-/*  f0fb6e4:	0c002f02 */ 	jal	viGetX
+/*  f0fb6e4:	0c002f02 */ 	jal	viGetWidth
 /*  f0fb6e8:	24500008 */ 	addiu	$s0,$v0,0x8
-/*  f0fb6ec:	0c002f06 */ 	jal	viGetY
+/*  f0fb6ec:	0c002f06 */ 	jal	viGetHeight
 /*  f0fb6f0:	a7a2003a */ 	sh	$v0,0x3a($sp)
 /*  f0fb6f4:	87ac003a */ 	lh	$t4,0x3a($sp)
 /*  f0fb6f8:	304903ff */ 	andi	$t1,$v0,0x3ff
@@ -12102,9 +12102,9 @@ glabel var7f1b2af4
 /*  f0fb7f4:	0fc54df7 */ 	jal	gfxSetPrimColour
 /*  f0fb7f8:	ac480004 */ 	sw	$t0,0x4($v0)
 /*  f0fb7fc:	afa2005c */ 	sw	$v0,0x5c($sp)
-/*  f0fb800:	0c002f02 */ 	jal	viGetX
+/*  f0fb800:	0c002f02 */ 	jal	viGetWidth
 /*  f0fb804:	24500008 */ 	addiu	$s0,$v0,0x8
-/*  f0fb808:	0c002f06 */ 	jal	viGetY
+/*  f0fb808:	0c002f06 */ 	jal	viGetHeight
 /*  f0fb80c:	a7a2003a */ 	sh	$v0,0x3a($sp)
 /*  f0fb810:	87ae003a */ 	lh	$t6,0x3a($sp)
 /*  f0fb814:	304903ff */ 	andi	$t1,$v0,0x3ff
@@ -12178,9 +12178,9 @@ glabel var7f1b2af4
 /*  f0fb918:	0fc54df7 */ 	jal	gfxSetPrimColour
 /*  f0fb91c:	01802825 */ 	or	$a1,$t4,$zero
 /*  f0fb920:	afa2004c */ 	sw	$v0,0x4c($sp)
-/*  f0fb924:	0c002f02 */ 	jal	viGetX
+/*  f0fb924:	0c002f02 */ 	jal	viGetWidth
 /*  f0fb928:	24500008 */ 	addiu	$s0,$v0,0x8
-/*  f0fb92c:	0c002f06 */ 	jal	viGetY
+/*  f0fb92c:	0c002f06 */ 	jal	viGetHeight
 /*  f0fb930:	a7a2003a */ 	sh	$v0,0x3a($sp)
 /*  f0fb934:	87b9003a */ 	lh	$t9,0x3a($sp)
 /*  f0fb938:	304f03ff */ 	andi	$t7,$v0,0x3ff
@@ -12279,9 +12279,9 @@ glabel var7f1b2af4
 /*  f0fba9c:	0fc54df7 */ 	jal	gfxSetPrimColour
 /*  f0fbaa0:	03202825 */ 	or	$a1,$t9,$zero
 /*  f0fbaa4:	afa2003c */ 	sw	$v0,0x3c($sp)
-/*  f0fbaa8:	0c002f02 */ 	jal	viGetX
+/*  f0fbaa8:	0c002f02 */ 	jal	viGetWidth
 /*  f0fbaac:	24500008 */ 	addiu	$s0,$v0,0x8
-/*  f0fbab0:	0c002f06 */ 	jal	viGetY
+/*  f0fbab0:	0c002f06 */ 	jal	viGetHeight
 /*  f0fbab4:	a7a2003a */ 	sh	$v0,0x3a($sp)
 /*  f0fbab8:	87aa003a */ 	lh	$t2,0x3a($sp)
 /*  f0fbabc:	304803ff */ 	andi	$t0,$v0,0x3ff
@@ -12298,9 +12298,9 @@ glabel var7f1b2af4
 /*  f0fbae8:	ac600004 */ 	sw	$zero,0x4($v1)
 /*  f0fbaec:	10000026 */ 	b	.L0f0fbb88
 /*  f0fbaf0:	00408025 */ 	or	$s0,$v0,$zero
-/*  f0fbaf4:	0c002f02 */ 	jal	viGetX
+/*  f0fbaf4:	0c002f02 */ 	jal	viGetWidth
 /*  f0fbaf8:	00000000 */ 	nop
-/*  f0fbafc:	0c002f06 */ 	jal	viGetY
+/*  f0fbafc:	0c002f06 */ 	jal	viGetHeight
 /*  f0fbb00:	a7a20038 */ 	sh	$v0,0x38($sp)
 /*  f0fbb04:	3c198f00 */ 	lui	$t9,0x8f00
 /*  f0fbb08:	373900ff */ 	ori	$t9,$t9,0xff
@@ -12317,9 +12317,9 @@ glabel var7f1b2af4
 /*  f0fbb34:	afa20010 */ 	sw	$v0,0x10($sp)
 /*  f0fbb38:	10000013 */ 	b	.L0f0fbb88
 /*  f0fbb3c:	00408025 */ 	or	$s0,$v0,$zero
-/*  f0fbb40:	0c002f02 */ 	jal	viGetX
+/*  f0fbb40:	0c002f02 */ 	jal	viGetWidth
 /*  f0fbb44:	00000000 */ 	nop
-/*  f0fbb48:	0c002f06 */ 	jal	viGetY
+/*  f0fbb48:	0c002f06 */ 	jal	viGetHeight
 /*  f0fbb4c:	a7a20038 */ 	sh	$v0,0x38($sp)
 /*  f0fbb50:	3c033f3f */ 	lui	$v1,0x3f3f
 /*  f0fbb54:	3c087f00 */ 	lui	$t0,0x7f00
@@ -13038,11 +13038,11 @@ glabel var7f1b2afc
 /*  f0fc5a4:	25f80002 */ 	addiu	$t8,$t7,0x2
 /*  f0fc5a8:	afb800ac */ 	sw	$t8,0xac($sp)
 .L0f0fc5ac:
-/*  f0fc5ac:	0c002f02 */ 	jal	viGetX
+/*  f0fc5ac:	0c002f02 */ 	jal	viGetWidth
 /*  f0fc5b0:	00000000 */ 	nop
 /*  f0fc5b4:	00028400 */ 	sll	$s0,$v0,0x10
 /*  f0fc5b8:	0010cc03 */ 	sra	$t9,$s0,0x10
-/*  f0fc5bc:	0c002f06 */ 	jal	viGetY
+/*  f0fc5bc:	0c002f06 */ 	jal	viGetHeight
 /*  f0fc5c0:	03208025 */ 	or	$s0,$t9,$zero
 /*  f0fc5c4:	922b0017 */ 	lbu	$t3,0x17($s1)
 /*  f0fc5c8:	3c0c8008 */ 	lui	$t4,%hi(g_FontHandelGothicSm1)
@@ -13097,11 +13097,11 @@ glabel var7f1b2afc
 /*  f0fc688:	922c0017 */ 	lbu	$t4,0x17($s1)
 /*  f0fc68c:	01821825 */ 	or	$v1,$t4,$v0
 .L0f0fc690:
-/*  f0fc690:	0c002f02 */ 	jal	viGetX
+/*  f0fc690:	0c002f02 */ 	jal	viGetWidth
 /*  f0fc694:	afa300a4 */ 	sw	$v1,0xa4($sp)
 /*  f0fc698:	00028400 */ 	sll	$s0,$v0,0x10
 /*  f0fc69c:	00105403 */ 	sra	$t2,$s0,0x10
-/*  f0fc6a0:	0c002f06 */ 	jal	viGetY
+/*  f0fc6a0:	0c002f06 */ 	jal	viGetHeight
 /*  f0fc6a4:	01408025 */ 	or	$s0,$t2,$zero
 /*  f0fc6a8:	3c0b8008 */ 	lui	$t3,%hi(g_FontHandelGothicSm1)
 /*  f0fc6ac:	3c0d8008 */ 	lui	$t5,%hi(g_FontHandelGothicSm2)
@@ -13928,8 +13928,8 @@ void func0f0fd494(struct coord *pos)
 	func00015b68(matrix, pos, &coord);
 	func0f0b4d04(&coord, xy);
 
-	g_MenuData.unk670 = (s32)xy[0] - viGetX() / 2;
-	g_MenuData.unk674 = (s32)xy[1] - viGetY() / 2;
+	g_MenuData.unk670 = (s32)xy[0] - viGetWidth() / 2;
+	g_MenuData.unk674 = (s32)xy[1] - viGetHeight() / 2;
 
 	g_MenuData.unk5d5_05 = false;
 }
diff --git a/src/game/game_102240.c b/src/game/game_102240.c
index 59138ae20..0c6998843 100644
--- a/src/game/game_102240.c
+++ b/src/game/game_102240.c
@@ -2566,11 +2566,11 @@ glabel var7f1b2dfc
 /*  f105480:	24a52d50 */ 	addiu	$a1,$a1,%lo(var7f1b2d50)
 /*  f105484:	0c004c89 */ 	jal	strcat
 /*  f105488:	27a400f0 */ 	addiu	$a0,$sp,0xf0
-/*  f10548c:	0c002f02 */ 	jal	viGetX
+/*  f10548c:	0c002f02 */ 	jal	viGetWidth
 /*  f105490:	00000000 */ 	nop
 /*  f105494:	00028400 */ 	sll	$s0,$v0,0x10
 /*  f105498:	00107c03 */ 	sra	$t7,$s0,0x10
-/*  f10549c:	0c002f06 */ 	jal	viGetY
+/*  f10549c:	0c002f06 */ 	jal	viGetHeight
 /*  f1054a0:	01e08025 */ 	or	$s0,$t7,$zero
 /*  f1054a4:	3c0e8008 */ 	lui	$t6,%hi(g_FontHandelGothicMd1)
 /*  f1054a8:	3c198008 */ 	lui	$t9,%hi(g_FontHandelGothicMd2)
@@ -2597,11 +2597,11 @@ glabel var7f1b2dfc
 /*  f1054fc:	27a400f0 */ 	addiu	$a0,$sp,0xf0
 /*  f105500:	0c004c4c */ 	jal	strcpy
 /*  f105504:	00402825 */ 	or	$a1,$v0,$zero
-/*  f105508:	0c002f02 */ 	jal	viGetX
+/*  f105508:	0c002f02 */ 	jal	viGetWidth
 /*  f10550c:	00000000 */ 	nop
 /*  f105510:	00028400 */ 	sll	$s0,$v0,0x10
 /*  f105514:	00107403 */ 	sra	$t6,$s0,0x10
-/*  f105518:	0c002f06 */ 	jal	viGetY
+/*  f105518:	0c002f06 */ 	jal	viGetHeight
 /*  f10551c:	01c08025 */ 	or	$s0,$t6,$zero
 /*  f105520:	3c198008 */ 	lui	$t9,%hi(g_FontHandelGothicSm1)
 /*  f105524:	3c188008 */ 	lui	$t8,%hi(g_FontHandelGothicSm2)
diff --git a/src/game/game_107fb0.c b/src/game/game_107fb0.c
index 1637c9373..62f38393d 100644
--- a/src/game/game_107fb0.c
+++ b/src/game/game_107fb0.c
@@ -1576,7 +1576,7 @@ s32 filemgrFileToCopyOrDeleteListMenuHandler(s32 operation, struct menuitem *ite
 				if (location000) {
 					filemgrGetFileName(text, location000, g_Menus[g_MpPlayerNum].data.filemgr.filetypeplusone - 1);
 					gdl = textRenderProjected(gdl, &x, &y, text, g_FontHandelGothicSm1, g_FontHandelGothicSm2,
-							colour, viGetX(), viGetY(), 0, 1);
+							colour, viGetWidth(), viGetHeight(), 0, 1);
 					y = renderdata->y + 12;
 					x = renderdata->x + 2;
 				}
@@ -1740,7 +1740,7 @@ s32 pakGameNoteListMenuHandler(s32 operation, struct menuitem *item, union handl
 		x = renderdata->x + 4;
 		y = renderdata->y + 1;
 		gdl = textRenderProjected(gdl, &x, &y, generalbuffer, g_FontHandelGothicSm1, g_FontHandelGothicSm2,
-				renderdata->colour, viGetX(), viGetY(), 0, 1);
+				renderdata->colour, viGetWidth(), viGetHeight(), 0, 1);
 
 		// Prepare buffers for remaining text
 		if (g_EditingPak->notesinuse[data->list.unk04] == 1) {
@@ -1762,13 +1762,13 @@ s32 pakGameNoteListMenuHandler(s32 operation, struct menuitem *item, union handl
 		x = renderdata->x + 20;
 		y = renderdata->y + 1;
 		gdl = textRenderProjected(gdl, &x, &y, generalbuffer, g_FontHandelGothicSm1, g_FontHandelGothicSm2,
-				renderdata->colour, viGetX(), viGetY(), 0, 1);
+				renderdata->colour, viGetWidth(), viGetHeight(), 0, 1);
 
 		// Render ext character (for when a game has multiple notes)
 		x = renderdata->x + 190;
 		y = renderdata->y + 1;
 		gdl = textRenderProjected(gdl, &x, &y, extbuffer, g_FontHandelGothicSm1, g_FontHandelGothicSm2,
-				renderdata->colour, viGetX(), viGetY(), 0, 1);
+				renderdata->colour, viGetWidth(), viGetHeight(), 0, 1);
 
 		// Render number of pages
 		textMeasure(&textheight, &textwidth, pagesbuffer, g_FontHandelGothicSm1, g_FontHandelGothicSm2, 0);
@@ -1776,7 +1776,7 @@ s32 pakGameNoteListMenuHandler(s32 operation, struct menuitem *item, union handl
 		x = renderdata->x + renderdata->width - textwidth - 6;
 		y = renderdata->y + 1;
 		gdl = textRenderProjected(gdl, &x, &y, pagesbuffer, g_FontHandelGothicSm1, g_FontHandelGothicSm2,
-				renderdata->colour, viGetX(), viGetY(), 0, 1);
+				renderdata->colour, viGetWidth(), viGetHeight(), 0, 1);
 
 		return (u32)gdl;
 	case MENUOP_GETOPTIONHEIGHT:
@@ -2109,12 +2109,12 @@ s32 filemgrChooseAgentListMenuHandler(s32 operation, struct menuitem *item, unio
 		if (data->list.unk04 == g_FileLists[0]->numfiles) {
 			// "New Agent..."
 			gdl = textRenderProjected(gdl, &x, &y, langGet(L_OPTIONS(403)),
-					g_FontHandelGothicMd1, g_FontHandelGothicMd2, renderdata->colour, viGetX(), viGetY(), 0, 0);
+					g_FontHandelGothicMd1, g_FontHandelGothicMd2, renderdata->colour, viGetWidth(), viGetHeight(), 0, 0);
 		} else {
 			if (location000) {
 				// Render file name
 				gdl = textRenderProjected(gdl, &x, &y, name,
-						g_FontHandelGothicMd1, g_FontHandelGothicMd2, renderdata->colour, viGetX(), viGetY(), 0, 1);
+						g_FontHandelGothicMd1, g_FontHandelGothicMd2, renderdata->colour, viGetWidth(), viGetHeight(), 0, 1);
 
 				// Prepare and render stage name
 				y = renderdata->y + 18;
@@ -2131,7 +2131,7 @@ s32 filemgrChooseAgentListMenuHandler(s32 operation, struct menuitem *item, unio
 
 				strcat(buffer, "\n");
 				gdl = textRenderProjected(gdl, &x, &y, buffer,
-						g_FontHandelGothicSm1, g_FontHandelGothicSm2, renderdata->colour, viGetX(), viGetY(), 0, 0);
+						g_FontHandelGothicSm1, g_FontHandelGothicSm2, renderdata->colour, viGetWidth(), viGetHeight(), 0, 0);
 
 				// Prepare and render mission time
 				x = renderdata->x + 62;
@@ -2149,14 +2149,14 @@ s32 filemgrChooseAgentListMenuHandler(s32 operation, struct menuitem *item, unio
 				textMeasure(&textheight, &textwidth, buffer, g_FontHandelGothicSm1, g_FontHandelGothicSm2, 0);
 
 				gdl = textRenderProjected(gdl, &x, &y, buffer,
-						g_FontHandelGothicSm1, g_FontHandelGothicSm2, renderdata->colour, viGetX(), viGetY(), 0, 0);
+						g_FontHandelGothicSm1, g_FontHandelGothicSm2, renderdata->colour, viGetWidth(), viGetHeight(), 0, 0);
 
 				// Render seconds part of mission time (uses a smaller font)
 				y++;
 				x++;
 				sprintf(buffer, ".%02d", seconds);
 				gdl = textRenderProjected(gdl, &x, &y, buffer,
-						g_FontHandelGothicXs1, g_FontHandelGothicXs2, renderdata->colour, viGetX(), viGetY(), 0, 0);
+						g_FontHandelGothicXs1, g_FontHandelGothicXs2, renderdata->colour, viGetWidth(), viGetHeight(), 0, 0);
 			}
 		}
 		gdl = func0f153780(gdl);
diff --git a/src/game/game_13c510.c b/src/game/game_13c510.c
index c3c83c033..cb02cc800 100644
--- a/src/game/game_13c510.c
+++ b/src/game/game_13c510.c
@@ -1025,7 +1025,7 @@ glabel func0f13c780
 /*  f13d2e4:	0fc4f15d */ 	jal	func0f13c574
 /*  f13d2e8:	4600b306 */ 	mov.s	$f12,$f22
 /*  f13d2ec:	00025883 */ 	sra	$t3,$v0,0x2
-/*  f13d2f0:	0c002f02 */ 	jal	viGetX
+/*  f13d2f0:	0c002f02 */ 	jal	viGetWidth
 /*  f13d2f4:	a60b0004 */ 	sh	$t3,0x4($s0)
 /*  f13d2f8:	00540019 */ 	multu	$v0,$s4
 /*  f13d2fc:	8fce0000 */ 	lw	$t6,0x0($s8)
diff --git a/src/game/game_1531a0.c b/src/game/game_1531a0.c
index 46244f931..db0537dca 100644
--- a/src/game/game_1531a0.c
+++ b/src/game/game_1531a0.c
@@ -2205,14 +2205,14 @@ glabel func0f15568c
 /*  f155764:	8e590000 */ 	lw	$t9,0x0($s2)
 /*  f155768:	5b200221 */ 	blezl	$t9,.L0f155ff0
 /*  f15576c:	92380003 */ 	lbu	$t8,0x3($s1)
-/*  f155770:	0c002f02 */ 	jal	viGetX
+/*  f155770:	0c002f02 */ 	jal	viGetWidth
 /*  f155774:	afaa0090 */ 	sw	$t2,0x90($sp)
 /*  f155778:	8e4e0000 */ 	lw	$t6,0x0($s2)
 /*  f15577c:	8faa0090 */ 	lw	$t2,0x90($sp)
 /*  f155780:	004e082a */ 	slt	$at,$v0,$t6
 /*  f155784:	5420021a */ 	bnezl	$at,.L0f155ff0
 /*  f155788:	92380003 */ 	lbu	$t8,0x3($s1)
-/*  f15578c:	0c002f06 */ 	jal	viGetY
+/*  f15578c:	0c002f06 */ 	jal	viGetHeight
 /*  f155790:	afaa0090 */ 	sw	$t2,0x90($sp)
 /*  f155794:	8faa0090 */ 	lw	$t2,0x90($sp)
 /*  f155798:	822f0001 */ 	lb	$t7,0x1($s1)
@@ -3314,13 +3314,13 @@ glabel func0f156790
 /*  f15681c:	01986823 */ 	subu	$t5,$t4,$t8
 /*  f156820:	19a00071 */ 	blez	$t5,.L0f1569e8
 /*  f156824:	acad0000 */ 	sw	$t5,0x0($a1)
-/*  f156828:	0c002f02 */ 	jal	viGetX
+/*  f156828:	0c002f02 */ 	jal	viGetWidth
 /*  f15682c:	00000000 */ 	nop
 /*  f156830:	8e2b0000 */ 	lw	$t3,0x0($s1)
 /*  f156834:	004b082a */ 	slt	$at,$v0,$t3
 /*  f156838:	1420006b */ 	bnez	$at,.L0f1569e8
 /*  f15683c:	00000000 */ 	nop
-/*  f156840:	0c002f06 */ 	jal	viGetY
+/*  f156840:	0c002f06 */ 	jal	viGetHeight
 /*  f156844:	00000000 */ 	nop
 /*  f156848:	8faf0038 */ 	lw	$t7,0x38($sp)
 /*  f15684c:	82590001 */ 	lb	$t9,0x1($s2)
diff --git a/src/game/game_176080.c b/src/game/game_176080.c
index 603a90e66..0605e8ff3 100644
--- a/src/game/game_176080.c
+++ b/src/game/game_176080.c
@@ -122,7 +122,7 @@ Gfx *func0f1763f4(Gfx *gdl)
 
 	gDPPipeSync(gdl++);
 	gDPSetRenderMode(gdl++, G_RM_NOOP, G_RM_NOOP2);
-	gDPSetColorImage(gdl++, G_IM_FMT_RGBA, G_IM_SIZ_16b, viGetX(), OS_PHYSICAL_TO_K0(var800844f4));
+	gDPSetColorImage(gdl++, G_IM_FMT_RGBA, G_IM_SIZ_16b, viGetWidth(), OS_PHYSICAL_TO_K0(var800844f4));
 	gDPSetCycleType(gdl++, G_CYC_FILL);
 	gDPSetFillColor(gdl++, 0xfffcfffc);
 	gDPSetScissorFrac(gdl++, G_SC_NON_INTERLACE, 0, 0, viGetFbWidth() * 4.0f, viGetFbHeight() * 4.0f);
@@ -356,7 +356,7 @@ glabel func0f1766b4
 /*  f176998:	8fae0044 */ 	lw	$t6,0x44($sp)
 /*  f17699c:	1180004a */ 	beqz	$t4,.L0f176ac8
 /*  f1769a0:	00146840 */ 	sll	$t5,$s4,0x1
-/*  f1769a4:	0c002f02 */ 	jal	viGetX
+/*  f1769a4:	0c002f02 */ 	jal	viGetWidth
 /*  f1769a8:	01ae9021 */ 	addu	$s2,$t5,$t6
 /*  f1769ac:	962f000c */ 	lhu	$t7,0xc($s1)
 /*  f1769b0:	8fa8004c */ 	lw	$t0,0x4c($sp)
@@ -379,13 +379,13 @@ glabel func0f1766b4
 /*  f1769f4:	acb70000 */ 	sw	$s7,0x0($a1)
 /*  f1769f8:	3c09f300 */ 	lui	$t1,0xf300
 /*  f1769fc:	ae690000 */ 	sw	$t1,0x0($s3)
-/*  f176a00:	0c002f02 */ 	jal	viGetX
+/*  f176a00:	0c002f02 */ 	jal	viGetWidth
 /*  f176a04:	26100008 */ 	addiu	$s0,$s0,0x8
 /*  f176a08:	244affff */ 	addiu	$t2,$v0,-1
 /*  f176a0c:	294107ff */ 	slti	$at,$t2,0x7ff
 /*  f176a10:	10200005 */ 	beqz	$at,.L0f176a28
 /*  f176a14:	240507ff */ 	addiu	$a1,$zero,0x7ff
-/*  f176a18:	0c002f02 */ 	jal	viGetX
+/*  f176a18:	0c002f02 */ 	jal	viGetWidth
 /*  f176a1c:	00000000 */ 	nop
 /*  f176a20:	10000001 */ 	b	.L0f176a28
 /*  f176a24:	2445ffff */ 	addiu	$a1,$v0,-1
@@ -463,11 +463,11 @@ glabel func0f1766b4
 /*  f176b3c:	02009025 */ 	or	$s2,$s0,$zero
 /*  f176b40:	3c18ed00 */ 	lui	$t8,0xed00
 /*  f176b44:	ae580000 */ 	sw	$t8,0x0($s2)
-/*  f176b48:	0c002f02 */ 	jal	viGetX
+/*  f176b48:	0c002f02 */ 	jal	viGetWidth
 /*  f176b4c:	26100008 */ 	addiu	$s0,$s0,0x8
 /*  f176b50:	00028c00 */ 	sll	$s1,$v0,0x10
 /*  f176b54:	0011cc03 */ 	sra	$t9,$s1,0x10
-/*  f176b58:	0c002f06 */ 	jal	viGetY
+/*  f176b58:	0c002f06 */ 	jal	viGetHeight
 /*  f176b5c:	03208825 */ 	or	$s1,$t9,$zero
 /*  f176b60:	44822000 */ 	mtc1	$v0,$f4
 /*  f176b64:	44918000 */ 	mtc1	$s1,$f16
@@ -567,12 +567,12 @@ glabel func0f1766b4
 //
 //	for (i = 0; i < 120; i++) {
 //		if (thing->unk00[i].unk00) {
-//			u32 tmp = viGetX() * thing->unk00[i].unk0c.u16_1 * 2 + sp4c;
+//			u32 tmp = viGetWidth() * thing->unk00[i].unk0c.u16_1 * 2 + sp4c;
 //
 //			gDPPipeSync(gdl++);
 //			gDPSetTextureImage(gdl++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 320, tmp);
 //			gDPLoadSync(gdl++);
-//			gDPLoadBlock(gdl++, 5, 0, 0, viGetX() - 1, 0);
+//			gDPLoadBlock(gdl++, 5, 0, 0, viGetWidth() - 1, 0);
 //			gDPPipeSync(gdl++);
 //
 //			gSPTextureRectangle(gdl++,
@@ -591,7 +591,7 @@ glabel func0f1766b4
 //	gDPLoadSync(gdl++);
 //	gDPTileSync(gdl++);
 //	gDPSetColorImage(gdl++, G_IM_FMT_RGBA, G_IM_SIZ_16b, viGetBufX(), OS_PHYSICAL_TO_K0(viGetUnk28()));
-//	gDPSetScissorFrac(gdl++, G_SC_NON_INTERLACE, 0, 0, viGetX() * 4.0f, viGetY() * 4.0f);
+//	gDPSetScissorFrac(gdl++, G_SC_NON_INTERLACE, 0, 0, viGetWidth() * 4.0f, viGetHeight() * 4.0f);
 //	gSPSetGeometryMode(gdl++, G_ZBUFFER);
 //	gDPSetTextureFilter(gdl++, G_TF_BILERP);
 //	gDPSetTexturePersp(gdl++, G_TP_PERSP);
diff --git a/src/game/hudmsg.c b/src/game/hudmsg.c
index 61a04a335..759b9a6d4 100644
--- a/src/game/hudmsg.c
+++ b/src/game/hudmsg.c
@@ -325,9 +325,9 @@ glabel hudRenderMissionTimer
 /*  f0dd230:	03195821 */ 	addu	$t3,$t8,$t9
 /*  f0dd234:	256c0003 */ 	addiu	$t4,$t3,0x3
 /*  f0dd238:	afac008c */ 	sw	$t4,0x8c($sp)
-/*  f0dd23c:	0c002f02 */ 	jal	viGetX
+/*  f0dd23c:	0c002f02 */ 	jal	viGetWidth
 /*  f0dd240:	afa70088 */ 	sw	$a3,0x88($sp)
-/*  f0dd244:	0c002f06 */ 	jal	viGetY
+/*  f0dd244:	0c002f06 */ 	jal	viGetHeight
 /*  f0dd248:	a7a20042 */ 	sh	$v0,0x42($sp)
 /*  f0dd24c:	3c0d8008 */ 	lui	$t5,%hi(g_FontNumeric1)
 /*  f0dd250:	3c0e8008 */ 	lui	$t6,%hi(g_FontNumeric2)
@@ -432,7 +432,7 @@ glabel hudRenderMissionTimer
 //	// 208
 //	formatTime(buffer, getMissionTime(), 4);
 //
-//	return textRender(gdl, &sp8c, &sp88, buffer, g_FontNumeric1, g_FontNumeric2, textcolour, 0x000000a0, viGetX(), viGetY(), 0, 0);
+//	return textRender(gdl, &sp8c, &sp88, buffer, g_FontNumeric1, g_FontNumeric2, textcolour, 0x000000a0, viGetWidth(), viGetHeight(), 0, 0);
 //}
 
 #if VERSION >= VERSION_NTSC_FINAL
@@ -659,9 +659,9 @@ glabel hudRenderZoomRange
 /*  f0dd5c4:	27a60074 */ 	addiu	$a2,$sp,0x74
 /*  f0dd5c8:	0fc54e39 */ 	jal	func0f1538e4
 /*  f0dd5cc:	27a70068 */ 	addiu	$a3,$sp,0x68
-/*  f0dd5d0:	0c002f02 */ 	jal	viGetX
+/*  f0dd5d0:	0c002f02 */ 	jal	viGetWidth
 /*  f0dd5d4:	afa200c0 */ 	sw	$v0,0xc0($sp)
-/*  f0dd5d8:	0c002f06 */ 	jal	viGetY
+/*  f0dd5d8:	0c002f06 */ 	jal	viGetHeight
 /*  f0dd5dc:	a7a2004c */ 	sh	$v0,0x4c($sp)
 /*  f0dd5e0:	8fa300c4 */ 	lw	$v1,0xc4($sp)
 /*  f0dd5e4:	240100ff */ 	addiu	$at,$zero,0xff
@@ -725,9 +725,9 @@ glabel hudRenderZoomRange
 /*  f0dd6cc:	27a60074 */ 	addiu	$a2,$sp,0x74
 /*  f0dd6d0:	0fc54e39 */ 	jal	func0f1538e4
 /*  f0dd6d4:	27a70068 */ 	addiu	$a3,$sp,0x68
-/*  f0dd6d8:	0c002f02 */ 	jal	viGetX
+/*  f0dd6d8:	0c002f02 */ 	jal	viGetWidth
 /*  f0dd6dc:	afa200c0 */ 	sw	$v0,0xc0($sp)
-/*  f0dd6e0:	0c002f06 */ 	jal	viGetY
+/*  f0dd6e0:	0c002f06 */ 	jal	viGetHeight
 /*  f0dd6e4:	a7a2004c */ 	sh	$v0,0x4c($sp)
 /*  f0dd6e8:	3c098008 */ 	lui	$t1,%hi(g_FontNumeric1)
 /*  f0dd6ec:	3c0a8008 */ 	lui	$t2,%hi(g_FontNumeric2)
@@ -788,9 +788,9 @@ glabel hudRenderZoomRange
 /*  f0dd7c8:	27a60074 */ 	addiu	$a2,$sp,0x74
 /*  f0dd7cc:	0fc54e39 */ 	jal	func0f1538e4
 /*  f0dd7d0:	27a70068 */ 	addiu	$a3,$sp,0x68
-/*  f0dd7d4:	0c002f02 */ 	jal	viGetX
+/*  f0dd7d4:	0c002f02 */ 	jal	viGetWidth
 /*  f0dd7d8:	afa200c0 */ 	sw	$v0,0xc0($sp)
-/*  f0dd7dc:	0c002f06 */ 	jal	viGetY
+/*  f0dd7dc:	0c002f06 */ 	jal	viGetHeight
 /*  f0dd7e0:	a7a2004c */ 	sh	$v0,0x4c($sp)
 /*  f0dd7e4:	3c0a8008 */ 	lui	$t2,%hi(g_FontNumeric1)
 /*  f0dd7e8:	3c0b8008 */ 	lui	$t3,%hi(g_FontNumeric2)
@@ -4032,11 +4032,11 @@ glabel var7f1adef4
 /*  f0e0014:	2706fffd */ 	addiu	$a2,$t8,-3
 /*  f0e0018:	0fc37612 */ 	jal	hudRenderMessageBox
 /*  f0e001c:	25c5fffd */ 	addiu	$a1,$t6,-3
-/*  f0e0020:	0c002f02 */ 	jal	viGetX
+/*  f0e0020:	0c002f02 */ 	jal	viGetWidth
 /*  f0e0024:	00409025 */ 	or	$s2,$v0,$zero
 /*  f0e0028:	00028c00 */ 	sll	$s1,$v0,0x10
 /*  f0e002c:	00115403 */ 	sra	$t2,$s1,0x10
-/*  f0e0030:	0c002f06 */ 	jal	viGetY
+/*  f0e0030:	0c002f06 */ 	jal	viGetHeight
 /*  f0e0034:	01408825 */ 	or	$s1,$t2,$zero
 /*  f0e0038:	8e080008 */ 	lw	$t0,0x8($s0)
 /*  f0e003c:	02402025 */ 	or	$a0,$s2,$zero
@@ -4063,11 +4063,11 @@ glabel var7f1adef4
 /*  f0e008c:	afb80010 */ 	sw	$t8,0x10($sp)
 /*  f0e0090:	0fc54e8d */ 	jal	func0f153a34
 /*  f0e0094:	01c53821 */ 	addu	$a3,$t6,$a1
-/*  f0e0098:	0c002f02 */ 	jal	viGetX
+/*  f0e0098:	0c002f02 */ 	jal	viGetWidth
 /*  f0e009c:	00409025 */ 	or	$s2,$v0,$zero
 /*  f0e00a0:	00028c00 */ 	sll	$s1,$v0,0x10
 /*  f0e00a4:	00114c03 */ 	sra	$t1,$s1,0x10
-/*  f0e00a8:	0c002f06 */ 	jal	viGetY
+/*  f0e00a8:	0c002f06 */ 	jal	viGetHeight
 /*  f0e00ac:	01208825 */ 	or	$s1,$t1,$zero
 /*  f0e00b0:	8e0b0008 */ 	lw	$t3,0x8($s0)
 /*  f0e00b4:	02402025 */ 	or	$a0,$s2,$zero
@@ -4135,11 +4135,11 @@ glabel var7f1adef4
 /*  f0e019c:	02402025 */ 	or	$a0,$s2,$zero
 /*  f0e01a0:	0fc37612 */ 	jal	hudRenderMessageBox
 /*  f0e01a4:	2566fffd */ 	addiu	$a2,$t3,-3
-/*  f0e01a8:	0c002f02 */ 	jal	viGetX
+/*  f0e01a8:	0c002f02 */ 	jal	viGetWidth
 /*  f0e01ac:	00409025 */ 	or	$s2,$v0,$zero
 /*  f0e01b0:	00028c00 */ 	sll	$s1,$v0,0x10
 /*  f0e01b4:	00116c03 */ 	sra	$t5,$s1,0x10
-/*  f0e01b8:	0c002f06 */ 	jal	viGetY
+/*  f0e01b8:	0c002f06 */ 	jal	viGetHeight
 /*  f0e01bc:	01a08825 */ 	or	$s1,$t5,$zero
 /*  f0e01c0:	8e190008 */ 	lw	$t9,0x8($s0)
 /*  f0e01c4:	02402025 */ 	or	$a0,$s2,$zero
@@ -4168,11 +4168,11 @@ glabel var7f1adef4
 /*  f0e021c:	02402025 */ 	or	$a0,$s2,$zero
 /*  f0e0220:	0fc54e8d */ 	jal	func0f153a34
 /*  f0e0224:	01253821 */ 	addu	$a3,$t1,$a1
-/*  f0e0228:	0c002f02 */ 	jal	viGetX
+/*  f0e0228:	0c002f02 */ 	jal	viGetWidth
 /*  f0e022c:	00409025 */ 	or	$s2,$v0,$zero
 /*  f0e0230:	00028c00 */ 	sll	$s1,$v0,0x10
 /*  f0e0234:	00116403 */ 	sra	$t4,$s1,0x10
-/*  f0e0238:	0c002f06 */ 	jal	viGetY
+/*  f0e0238:	0c002f06 */ 	jal	viGetHeight
 /*  f0e023c:	01808825 */ 	or	$s1,$t4,$zero
 /*  f0e0240:	8e0e0008 */ 	lw	$t6,0x8($s0)
 /*  f0e0244:	02402025 */ 	or	$a0,$s2,$zero
@@ -4300,11 +4300,11 @@ glabel var7f1adef4
 /*  f0e0410:	2565fffd */ 	addiu	$a1,$t3,-3
 /*  f0e0414:	0fc37612 */ 	jal	hudRenderMessageBox
 /*  f0e0418:	2586fffd */ 	addiu	$a2,$t4,-3
-/*  f0e041c:	0c002f02 */ 	jal	viGetX
+/*  f0e041c:	0c002f02 */ 	jal	viGetWidth
 /*  f0e0420:	00409025 */ 	or	$s2,$v0,$zero
 /*  f0e0424:	00028c00 */ 	sll	$s1,$v0,0x10
 /*  f0e0428:	00114c03 */ 	sra	$t1,$s1,0x10
-/*  f0e042c:	0c002f06 */ 	jal	viGetY
+/*  f0e042c:	0c002f06 */ 	jal	viGetHeight
 /*  f0e0430:	01208825 */ 	or	$s1,$t1,$zero
 /*  f0e0434:	8e180008 */ 	lw	$t8,0x8($s0)
 /*  f0e0438:	02402025 */ 	or	$a0,$s2,$zero
@@ -4330,11 +4330,11 @@ glabel var7f1adef4
 /*  f0e0484:	afac0010 */ 	sw	$t4,0x10($sp)
 /*  f0e0488:	0fc54e8d */ 	jal	func0f153a34
 /*  f0e048c:	01653821 */ 	addu	$a3,$t3,$a1
-/*  f0e0490:	0c002f02 */ 	jal	viGetX
+/*  f0e0490:	0c002f02 */ 	jal	viGetWidth
 /*  f0e0494:	00409025 */ 	or	$s2,$v0,$zero
 /*  f0e0498:	00028c00 */ 	sll	$s1,$v0,0x10
 /*  f0e049c:	0011cc03 */ 	sra	$t9,$s1,0x10
-/*  f0e04a0:	0c002f06 */ 	jal	viGetY
+/*  f0e04a0:	0c002f06 */ 	jal	viGetHeight
 /*  f0e04a4:	03208825 */ 	or	$s1,$t9,$zero
 /*  f0e04a8:	8e0f0008 */ 	lw	$t7,0x8($s0)
 /*  f0e04ac:	02402025 */ 	or	$a0,$s2,$zero
@@ -4644,12 +4644,12 @@ glabel var7f1adef4
 //					// fe0
 //					gdl = hudRenderMessageBox(gdl, x - 3, y - 3, x + msg->width + 2, y + msg->height + 2, 1.0f, bordercolour, spc0);
 //					// 020
-//					gdl = textRenderProjected(gdl, &x, &y, msg->text, msg->font1, msg->font2, textcolour, viGetX(), viGetY(), 0, 0);
+//					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);
 //					// 0e4
-//					gdl = textRender(gdl, &x, &y, msg->text, msg->font1, msg->font2, textcolour, glowcolour, viGetX(), viGetY(), 0, 0);
+//					gdl = textRender(gdl, &x, &y, msg->text, msg->font1, msg->font2, textcolour, glowcolour, viGetWidth(), viGetHeight(), 0, 0);
 //				}
 //
 //				if (msg->alignv == 6) {
@@ -4671,12 +4671,12 @@ glabel var7f1adef4
 //				// 1a0
 //				gdl = hudRenderMessageBox(gdl, x - 3, y - 3, x + msg->width + 2, y + msg->height + 2, 1.0f, bordercolour, 1.0f);
 //				// 1f0
-//				gdl = textRenderProjected(gdl, &x, &y, msg->text, msg->font1, msg->font2, textcolour, viGetX(), viGetY(), 0, 0);
+//				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);
 //				// 274
-//				gdl = textRender(gdl, &x, &y, msg->text, msg->font1, msg->font2, textcolour, glowcolour, viGetX(), viGetY(), 0, 0);
+//				gdl = textRender(gdl, &x, &y, msg->text, msg->font1, msg->font2, textcolour, glowcolour, viGetWidth(), viGetHeight(), 0, 0);
 //			}
 //			if (msg->alignv == 6) {
 //				timerthing = 0;
@@ -4718,12 +4718,12 @@ glabel var7f1adef4
 //					// 414
 //					gdl = hudRenderMessageBox(gdl, x - 3, y - 3, x + msg->width + 2, y + msg->height + 2, 1.0f, bordercolour, 1.0f - spa8);
 //					// 464
-//					gdl = textRenderProjected(gdl, &x, &y, msg->text, msg->font1, msg->font2, textcolour, viGetX(), viGetY(), 0, 0);
+//					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);
 //					// 4dc
-//					gdl = textRender(gdl, &x, &y, msg->text, msg->font1, msg->font2, textcolour, glowcolour, viGetX(), viGetY(), 0, 0);
+//					gdl = textRender(gdl, &x, &y, msg->text, msg->font1, msg->font2, textcolour, glowcolour, viGetWidth(), viGetHeight(), 0, 0);
 //				}
 //
 //				if (msg->alignv == 6) {
diff --git a/src/game/menu/items.c b/src/game/menu/items.c
index f02c044e1..2f7b1ca46 100644
--- a/src/game/menu/items.c
+++ b/src/game/menu/items.c
@@ -1249,7 +1249,7 @@ glabel menuRenderItemList
 /*  f0e6ecc:	afa40094 */ 	sw	$a0,0x94($sp)
 .L0f0e6ed0:
 /*  f0e6ed0:	afa50090 */ 	sw	$a1,0x90($sp)
-/*  f0e6ed4:	0c002f02 */ 	jal	viGetX
+/*  f0e6ed4:	0c002f02 */ 	jal	viGetWidth
 /*  f0e6ed8:	afa7008c */ 	sw	$a3,0x8c($sp)
 /*  f0e6edc:	3c0a8008 */ 	lui	$t2,%hi(g_ScaleX)
 /*  f0e6ee0:	8d4afac0 */ 	lw	$t2,%lo(g_ScaleX)($t2)
@@ -1273,7 +1273,7 @@ glabel menuRenderItemList
 /*  f0e6f20:	50200014 */ 	beqzl	$at,.L0f0e6f74
 /*  f0e6f24:	afa40094 */ 	sw	$a0,0x94($sp)
 /*  f0e6f28:	afa50090 */ 	sw	$a1,0x90($sp)
-/*  f0e6f2c:	0c002f02 */ 	jal	viGetX
+/*  f0e6f2c:	0c002f02 */ 	jal	viGetWidth
 /*  f0e6f30:	afa7008c */ 	sw	$a3,0x8c($sp)
 /*  f0e6f34:	3c198008 */ 	lui	$t9,%hi(g_ScaleX)
 /*  f0e6f38:	8f39fac0 */ 	lw	$t9,%lo(g_ScaleX)($t9)
@@ -1295,7 +1295,7 @@ glabel menuRenderItemList
 /*  f0e6f70:	afa40094 */ 	sw	$a0,0x94($sp)
 .L0f0e6f74:
 /*  f0e6f74:	afa50090 */ 	sw	$a1,0x90($sp)
-/*  f0e6f78:	0c002f02 */ 	jal	viGetX
+/*  f0e6f78:	0c002f02 */ 	jal	viGetWidth
 /*  f0e6f7c:	afa7008c */ 	sw	$a3,0x8c($sp)
 /*  f0e6f80:	3c0b8008 */ 	lui	$t3,%hi(g_ScaleX)
 /*  f0e6f84:	8d6bfac0 */ 	lw	$t3,%lo(g_ScaleX)($t3)
@@ -1319,7 +1319,7 @@ glabel menuRenderItemList
 /*  f0e6fc4:	50200014 */ 	beqzl	$at,.L0f0e7018
 /*  f0e6fc8:	02401025 */ 	or	$v0,$s2,$zero
 /*  f0e6fcc:	afa40094 */ 	sw	$a0,0x94($sp)
-/*  f0e6fd0:	0c002f02 */ 	jal	viGetX
+/*  f0e6fd0:	0c002f02 */ 	jal	viGetWidth
 /*  f0e6fd4:	afa50090 */ 	sw	$a1,0x90($sp)
 /*  f0e6fd8:	3c0e8008 */ 	lui	$t6,%hi(g_ScaleX)
 /*  f0e6fdc:	8dcefac0 */ 	lw	$t6,%lo(g_ScaleX)($t6)
@@ -1682,7 +1682,7 @@ glabel menuRenderItemList
 /*  f0e7500:	01ee5021 */ 	addu	$t2,$t7,$t6
 /*  f0e7504:	0fc5b9f1 */ 	jal	langGet
 /*  f0e7508:	afaa012c */ 	sw	$t2,0x12c($sp)
-/*  f0e750c:	0c002f06 */ 	jal	viGetY
+/*  f0e750c:	0c002f06 */ 	jal	viGetHeight
 /*  f0e7510:	00409825 */ 	or	$s3,$v0,$zero
 /*  f0e7514:	8fad00e8 */ 	lw	$t5,0xe8($sp)
 /*  f0e7518:	8fb800f4 */ 	lw	$t8,0xf4($sp)
@@ -7897,7 +7897,7 @@ Gfx *menuRenderControllerText(Gfx *gdl, s32 curmode, struct menurendercontext *c
 			// Rendering a label such as "L/R BUTTONS:"
 			rx = context->x + x + 76;
 			gdl = textRenderProjected(gdl, &rx, &ry, langGet(labels[i]),
-					g_FontHandelGothicXs1, g_FontHandelGothicXs2, labelcolour, viGetX(), viGetY(), 0, 0);
+					g_FontHandelGothicXs1, g_FontHandelGothicXs2, labelcolour, viGetWidth(), viGetHeight(), 0, 0);
 		}
 
 		textnum = menuControllerGetButtonAction(curmode, i);
@@ -7932,7 +7932,7 @@ Gfx *menuRenderControllerText(Gfx *gdl, s32 curmode, struct menurendercontext *c
 		}
 
 		gdl = textRenderProjected(gdl, &rx, &ry, langGet(textnum),
-				g_FontHandelGothicXs1, g_FontHandelGothicXs2, colour, viGetX(), viGetY(), 0, 0);
+				g_FontHandelGothicXs1, g_FontHandelGothicXs2, colour, viGetWidth(), viGetHeight(), 0, 0);
 	}
 
 	return func0f153780(gdl);
@@ -8050,7 +8050,7 @@ Gfx *menuRenderItemController(Gfx *gdl, struct menurendercontext *context)
 	x = context->x + 2;
 	y = context->y + 2;
 	gdl = textRenderProjected(gdl, &x, &y, text,
-			g_FontHandelGothicSm1, g_FontHandelGothicSm2, colour, viGetX(), viGetY(), 0, 0);
+			g_FontHandelGothicSm1, g_FontHandelGothicSm2, colour, viGetWidth(), viGetHeight(), 0, 0);
 	gdl = func0f153780(gdl);
 
 	textcolour = colourBlend(colour, colour & 0xffffff00, textalpha);
@@ -8072,7 +8072,7 @@ Gfx *menuRenderItemController(Gfx *gdl, struct menurendercontext *context)
 		y = context->y + 92;
 		gdl = func0f153628(gdl);
 		gdl = textRenderProjected(gdl, &x, &y, langGet(L_MPWEAPONS(216)), // "Hold weapon button for ..."
-				g_FontHandelGothicSm1, g_FontHandelGothicSm2, colour, viGetX(), viGetY(), 0, 0);
+				g_FontHandelGothicSm1, g_FontHandelGothicSm2, colour, viGetWidth(), viGetHeight(), 0, 0);
 		gdl = func0f153780(gdl);
 	}
 
diff --git a/src/game/mplayer/mplayer.c b/src/game/mplayer/mplayer.c
index 111f2ea3b..bb1b1b651 100644
--- a/src/game/mplayer/mplayer.c
+++ b/src/game/mplayer/mplayer.c
@@ -1685,9 +1685,9 @@ glabel mpRenderModalText
 /*  f1898a8:	00015843 */ 	sra	$t3,$at,0x1
 .L0f1898ac:
 /*  f1898ac:	012b6023 */ 	subu	$t4,$t1,$t3
-/*  f1898b0:	0c002f02 */ 	jal	viGetX
+/*  f1898b0:	0c002f02 */ 	jal	viGetWidth
 /*  f1898b4:	afac0094 */ 	sw	$t4,0x94($sp)
-/*  f1898b8:	0c002f02 */ 	jal	viGetX
+/*  f1898b8:	0c002f02 */ 	jal	viGetWidth
 /*  f1898bc:	a7a20040 */ 	sh	$v0,0x40($sp)
 /*  f1898c0:	8faf0054 */ 	lw	$t7,0x54($sp)
 /*  f1898c4:	3c0d8008 */ 	lui	$t5,%hi(g_FontHandelGothicMd1)
@@ -1819,9 +1819,9 @@ glabel mpRenderModalText
 /*  f189aa4:	00017043 */ 	sra	$t6,$at,0x1
 .L0f189aa8:
 /*  f189aa8:	018e7823 */ 	subu	$t7,$t4,$t6
-/*  f189aac:	0c002f02 */ 	jal	viGetX
+/*  f189aac:	0c002f02 */ 	jal	viGetWidth
 /*  f189ab0:	afaf0094 */ 	sw	$t7,0x94($sp)
-/*  f189ab4:	0c002f02 */ 	jal	viGetX
+/*  f189ab4:	0c002f02 */ 	jal	viGetWidth
 /*  f189ab8:	a7a20040 */ 	sh	$v0,0x40($sp)
 /*  f189abc:	3c188008 */ 	lui	$t8,%hi(g_FontHandelGothicSm1)
 /*  f189ac0:	3c198008 */ 	lui	$t9,%hi(g_FontHandelGothicSm2)
@@ -1907,9 +1907,9 @@ glabel mpRenderModalText
 .L0f189bf8:
 /*  f189bf8:	01f94023 */ 	subu	$t0,$t7,$t9
 /*  f189bfc:	afa80094 */ 	sw	$t0,0x94($sp)
-/*  f189c00:	0c002f02 */ 	jal	viGetX
+/*  f189c00:	0c002f02 */ 	jal	viGetWidth
 /*  f189c04:	afaa0090 */ 	sw	$t2,0x90($sp)
-/*  f189c08:	0c002f02 */ 	jal	viGetX
+/*  f189c08:	0c002f02 */ 	jal	viGetWidth
 /*  f189c0c:	a7a20040 */ 	sh	$v0,0x40($sp)
 /*  f189c10:	3c098008 */ 	lui	$t1,%hi(g_FontHandelGothicSm1)
 /*  f189c14:	3c0b8008 */ 	lui	$t3,%hi(g_FontHandelGothicSm2)
diff --git a/src/game/mplayer/scenarios.c b/src/game/mplayer/scenarios.c
index 078bd0e9f..8f955abdf 100644
--- a/src/game/mplayer/scenarios.c
+++ b/src/game/mplayer/scenarios.c
@@ -752,9 +752,9 @@ glabel scenarioHtbCallback18
 /*  f1808d0:	afa50090 */ 	sw	$a1,0x90($sp)
 /*  f1808d4:	0fc54e64 */ 	jal	func0f153990
 /*  f1808d8:	02002025 */ 	or	$a0,$s0,$zero
-/*  f1808dc:	0c002f02 */ 	jal	viGetX
+/*  f1808dc:	0c002f02 */ 	jal	viGetWidth
 /*  f1808e0:	00408025 */ 	or	$s0,$v0,$zero
-/*  f1808e4:	0c002f06 */ 	jal	viGetY
+/*  f1808e4:	0c002f06 */ 	jal	viGetHeight
 /*  f1808e8:	a7a20048 */ 	sh	$v0,0x48($sp)
 /*  f1808ec:	3c0f8008 */ 	lui	$t7,%hi(g_FontNumeric1)
 /*  f1808f0:	3c188008 */ 	lui	$t8,%hi(g_FontNumeric2)
@@ -2541,9 +2541,9 @@ glabel scenarioKohCallback18
 /*  f182878:	afa50098 */ 	sw	$a1,0x98($sp)
 /*  f18287c:	0fc54e64 */ 	jal	func0f153990
 /*  f182880:	02002025 */ 	or	$a0,$s0,$zero
-/*  f182884:	0c002f02 */ 	jal	viGetX
+/*  f182884:	0c002f02 */ 	jal	viGetWidth
 /*  f182888:	00408025 */ 	or	$s0,$v0,$zero
-/*  f18288c:	0c002f06 */ 	jal	viGetY
+/*  f18288c:	0c002f06 */ 	jal	viGetHeight
 /*  f182890:	a7a2004c */ 	sh	$v0,0x4c($sp)
 /*  f182894:	3c0d8008 */ 	lui	$t5,%hi(g_FontNumeric1)
 /*  f182898:	3c0e8008 */ 	lui	$t6,%hi(g_FontNumeric2)
@@ -4812,9 +4812,9 @@ glabel scenarioPacCallback18
 /*  f184b88:	afa5008c */ 	sw	$a1,0x8c($sp)
 /*  f184b8c:	0fc54e64 */ 	jal	func0f153990
 /*  f184b90:	02002025 */ 	or	$a0,$s0,$zero
-/*  f184b94:	0c002f02 */ 	jal	viGetX
+/*  f184b94:	0c002f02 */ 	jal	viGetWidth
 /*  f184b98:	00408025 */ 	or	$s0,$v0,$zero
-/*  f184b9c:	0c002f06 */ 	jal	viGetY
+/*  f184b9c:	0c002f06 */ 	jal	viGetHeight
 /*  f184ba0:	a7a20044 */ 	sh	$v0,0x44($sp)
 /*  f184ba4:	3c0b8008 */ 	lui	$t3,%hi(g_FontNumeric1)
 /*  f184ba8:	3c0d8008 */ 	lui	$t5,%hi(g_FontNumeric2)
diff --git a/src/game/mplayer/setup.c b/src/game/mplayer/setup.c
index f5ec6a054..82e21c14c 100644
--- a/src/game/mplayer/setup.c
+++ b/src/game/mplayer/setup.c
@@ -953,7 +953,7 @@ s32 mpChallengesListHandler(s32 operation, struct menuitem *item, union handlerd
 
 		gdl = textRenderProjected(gdl, &x, &y, name,
 				g_FontHandelGothicSm1, g_FontHandelGothicSm2, renderdata->colour,
-				viGetX(), viGetY(), 0, 0);
+				viGetWidth(), viGetHeight(), 0, 0);
 
 		gdl = func0f153780(gdl);
 
@@ -4412,11 +4412,11 @@ glabel var7f1b8288
 /*  f17e660:	afa200b4 */ 	sw	$v0,0xb4($sp)
 /*  f17e664:	0fc66dbe */ 	jal	mpGetChallengeNameBySlot
 /*  f17e668:	8ec40004 */ 	lw	$a0,0x4($s6)
-/*  f17e66c:	0c002f02 */ 	jal	viGetX
+/*  f17e66c:	0c002f02 */ 	jal	viGetWidth
 /*  f17e670:	00408825 */ 	or	$s1,$v0,$zero
 /*  f17e674:	00029400 */ 	sll	$s2,$v0,0x10
 /*  f17e678:	0012c403 */ 	sra	$t8,$s2,0x10
-/*  f17e67c:	0c002f06 */ 	jal	viGetY
+/*  f17e67c:	0c002f06 */ 	jal	viGetHeight
 /*  f17e680:	03009025 */ 	or	$s2,$t8,$zero
 /*  f17e684:	3c198008 */ 	lui	$t9,%hi(g_FontHandelGothicSm1)
 /*  f17e688:	3c0c8008 */ 	lui	$t4,%hi(g_FontHandelGothicSm2)
diff --git a/src/game/room.c b/src/game/room.c
index c282eaef7..41a935742 100644
--- a/src/game/room.c
+++ b/src/game/room.c
@@ -13186,7 +13186,7 @@ glabel func0f162d9c
 /*  f162dc8:	afb20028 */ 	sw	$s2,0x28($sp)
 /*  f162dcc:	afb10024 */ 	sw	$s1,0x24($sp)
 /*  f162dd0:	f7b40018 */ 	sdc1	$f20,0x18($sp)
-/*  f162dd4:	0fc591d2 */ 	jal	func0f164748
+/*  f162dd4:	0fc591d2 */ 	jal	currentPlayerCalculateScreenProperties
 /*  f162dd8:	8e160284 */ 	lw	$s6,0x284($s0)
 /*  f162ddc:	3c038008 */ 	lui	$v1,%hi(var8007fc34)
 /*  f162de0:	2463fc34 */ 	addiu	$v1,$v1,%lo(var8007fc34)
@@ -14221,7 +14221,7 @@ glabel func0f163e34
 /*  f163e44:	afbf0024 */ 	sw	$ra,0x24($sp)
 /*  f163e48:	afb00018 */ 	sw	$s0,0x18($sp)
 /*  f163e4c:	afb1001c */ 	sw	$s1,0x1c($sp)
-/*  f163e50:	0fc591d2 */ 	jal	func0f164748
+/*  f163e50:	0fc591d2 */ 	jal	currentPlayerCalculateScreenProperties
 /*  f163e54:	8e500284 */ 	lw	$s0,0x284($s2)
 /*  f163e58:	c6041794 */ 	lwc1	$f4,0x1794($s0)
 /*  f163e5c:	3c04800a */ 	lui	$a0,%hi(var800a4cf0+0x8)
@@ -14443,7 +14443,7 @@ glabel func0f163e34
 //	struct screenbox box;
 //	struct player *player = g_Vars.currentplayer;
 //
-//	func0f164748();
+//	currentPlayerCalculateScreenProperties();
 //
 //	box.xmin = player->screenxminf;
 //	box.ymin = player->screenyminf;
@@ -14853,114 +14853,54 @@ bool roomsAreNeighbours(s32 roomnum1, s32 roomnum2)
 	return false;
 }
 
-GLOBAL_ASM(
-glabel func0f164748
-/*  f164748:	27bdffc8 */ 	addiu	$sp,$sp,-56
-/*  f16474c:	afb00018 */ 	sw	$s0,0x18($sp)
-/*  f164750:	afbf001c */ 	sw	$ra,0x1c($sp)
-/*  f164754:	3c10800a */ 	lui	$s0,%hi(g_Vars+0x284)
-/*  f164758:	0c002f02 */ 	jal	viGetX
-/*  f16475c:	8e10a244 */ 	lw	$s0,%lo(g_Vars+0x284)($s0)
-/*  f164760:	44822000 */ 	mtc1	$v0,$f4
-/*  f164764:	00000000 */ 	nop
-/*  f164768:	468021a0 */ 	cvt.s.w	$f6,$f4
-/*  f16476c:	0c002f06 */ 	jal	viGetY
-/*  f164770:	e7a60030 */ 	swc1	$f6,0x30($sp)
-/*  f164774:	44824000 */ 	mtc1	$v0,$f8
-/*  f164778:	00000000 */ 	nop
-/*  f16477c:	468042a0 */ 	cvt.s.w	$f10,$f8
-/*  f164780:	0c002f40 */ 	jal	viGetViewLeft
-/*  f164784:	e7aa0028 */ 	swc1	$f10,0x28($sp)
-/*  f164788:	44828000 */ 	mtc1	$v0,$f16
-/*  f16478c:	44801000 */ 	mtc1	$zero,$f2
-/*  f164790:	46808020 */ 	cvt.s.w	$f0,$f16
-/*  f164794:	4602003c */ 	c.lt.s	$f0,$f2
-/*  f164798:	e6001794 */ 	swc1	$f0,0x1794($s0)
-/*  f16479c:	45020003 */ 	bc1fl	.L0f1647ac
-/*  f1647a0:	c7a00030 */ 	lwc1	$f0,0x30($sp)
-/*  f1647a4:	e6021794 */ 	swc1	$f2,0x1794($s0)
-/*  f1647a8:	c7a00030 */ 	lwc1	$f0,0x30($sp)
-.L0f1647ac:
-/*  f1647ac:	c6121794 */ 	lwc1	$f18,0x1794($s0)
-/*  f1647b0:	4612003c */ 	c.lt.s	$f0,$f18
-/*  f1647b4:	00000000 */ 	nop
-/*  f1647b8:	45000002 */ 	bc1f	.L0f1647c4
-/*  f1647bc:	00000000 */ 	nop
-/*  f1647c0:	e6001794 */ 	swc1	$f0,0x1794($s0)
-.L0f1647c4:
-/*  f1647c4:	0c002f44 */ 	jal	viGetViewTop
-/*  f1647c8:	00000000 */ 	nop
-/*  f1647cc:	44822000 */ 	mtc1	$v0,$f4
-/*  f1647d0:	44801000 */ 	mtc1	$zero,$f2
-/*  f1647d4:	46802020 */ 	cvt.s.w	$f0,$f4
-/*  f1647d8:	4602003c */ 	c.lt.s	$f0,$f2
-/*  f1647dc:	e6001798 */ 	swc1	$f0,0x1798($s0)
-/*  f1647e0:	45020003 */ 	bc1fl	.L0f1647f0
-/*  f1647e4:	c7a00028 */ 	lwc1	$f0,0x28($sp)
-/*  f1647e8:	e6021798 */ 	swc1	$f2,0x1798($s0)
-/*  f1647ec:	c7a00028 */ 	lwc1	$f0,0x28($sp)
-.L0f1647f0:
-/*  f1647f0:	c6061798 */ 	lwc1	$f6,0x1798($s0)
-/*  f1647f4:	4606003c */ 	c.lt.s	$f0,$f6
-/*  f1647f8:	00000000 */ 	nop
-/*  f1647fc:	45000002 */ 	bc1f	.L0f164808
-/*  f164800:	00000000 */ 	nop
-/*  f164804:	e6001798 */ 	swc1	$f0,0x1798($s0)
-.L0f164808:
-/*  f164808:	0c002f40 */ 	jal	viGetViewLeft
-/*  f16480c:	00000000 */ 	nop
-/*  f164810:	0c002f22 */ 	jal	viGetViewWidth
-/*  f164814:	a7a20022 */ 	sh	$v0,0x22($sp)
-/*  f164818:	87ae0022 */ 	lh	$t6,0x22($sp)
-/*  f16481c:	44801000 */ 	mtc1	$zero,$f2
-/*  f164820:	004e7821 */ 	addu	$t7,$v0,$t6
-/*  f164824:	448f4000 */ 	mtc1	$t7,$f8
-/*  f164828:	00000000 */ 	nop
-/*  f16482c:	46804020 */ 	cvt.s.w	$f0,$f8
-/*  f164830:	4602003c */ 	c.lt.s	$f0,$f2
-/*  f164834:	e600179c */ 	swc1	$f0,0x179c($s0)
-/*  f164838:	45020003 */ 	bc1fl	.L0f164848
-/*  f16483c:	c7aa0030 */ 	lwc1	$f10,0x30($sp)
-/*  f164840:	e602179c */ 	swc1	$f2,0x179c($s0)
-/*  f164844:	c7aa0030 */ 	lwc1	$f10,0x30($sp)
-.L0f164848:
-/*  f164848:	c610179c */ 	lwc1	$f16,0x179c($s0)
-/*  f16484c:	4610503c */ 	c.lt.s	$f10,$f16
-/*  f164850:	00000000 */ 	nop
-/*  f164854:	45000002 */ 	bc1f	.L0f164860
-/*  f164858:	00000000 */ 	nop
-/*  f16485c:	e60a179c */ 	swc1	$f10,0x179c($s0)
-.L0f164860:
-/*  f164860:	0c002f44 */ 	jal	viGetViewTop
-/*  f164864:	00000000 */ 	nop
-/*  f164868:	0c002f26 */ 	jal	viGetViewHeight
-/*  f16486c:	a7a20022 */ 	sh	$v0,0x22($sp)
-/*  f164870:	87b80022 */ 	lh	$t8,0x22($sp)
-/*  f164874:	44801000 */ 	mtc1	$zero,$f2
-/*  f164878:	0058c821 */ 	addu	$t9,$v0,$t8
-/*  f16487c:	44999000 */ 	mtc1	$t9,$f18
-/*  f164880:	00000000 */ 	nop
-/*  f164884:	46809020 */ 	cvt.s.w	$f0,$f18
-/*  f164888:	4602003c */ 	c.lt.s	$f0,$f2
-/*  f16488c:	e60017a0 */ 	swc1	$f0,0x17a0($s0)
-/*  f164890:	45020003 */ 	bc1fl	.L0f1648a0
-/*  f164894:	c7a40028 */ 	lwc1	$f4,0x28($sp)
-/*  f164898:	e60217a0 */ 	swc1	$f2,0x17a0($s0)
-/*  f16489c:	c7a40028 */ 	lwc1	$f4,0x28($sp)
-.L0f1648a0:
-/*  f1648a0:	c60617a0 */ 	lwc1	$f6,0x17a0($s0)
-/*  f1648a4:	4606203c */ 	c.lt.s	$f4,$f6
-/*  f1648a8:	00000000 */ 	nop
-/*  f1648ac:	45020003 */ 	bc1fl	.L0f1648bc
-/*  f1648b0:	8fbf001c */ 	lw	$ra,0x1c($sp)
-/*  f1648b4:	e60417a0 */ 	swc1	$f4,0x17a0($s0)
-/*  f1648b8:	8fbf001c */ 	lw	$ra,0x1c($sp)
-.L0f1648bc:
-/*  f1648bc:	8fb00018 */ 	lw	$s0,0x18($sp)
-/*  f1648c0:	27bd0038 */ 	addiu	$sp,$sp,0x38
-/*  f1648c4:	03e00008 */ 	jr	$ra
-/*  f1648c8:	00000000 */ 	nop
-);
+void currentPlayerCalculateScreenProperties(void)
+{
+	struct player *player = g_Vars.currentplayer;
+	f32 width = viGetWidth();
+	u32 stack;
+	f32 height = viGetHeight();
+	u32 stack2;
+
+	player->screenxminf = viGetViewLeft();
+
+	if (player->screenxminf < 0) {
+		player->screenxminf = 0;
+	}
+
+	if (player->screenxminf > width) {
+		player->screenxminf = width;
+	}
+
+	player->screenyminf = viGetViewTop();
+
+	if (player->screenyminf < 0) {
+		player->screenyminf = 0;
+	}
+
+	if (player->screenyminf > height) {
+		player->screenyminf = height;
+	}
+
+	player->screenxmaxf = viGetViewLeft() + viGetViewWidth();
+
+	if (player->screenxmaxf < 0) {
+		player->screenxmaxf = 0;
+	}
+
+	if (player->screenxmaxf > width) {
+		player->screenxmaxf = width;
+	}
+
+	player->screenymaxf = viGetViewTop() + viGetViewHeight();
+
+	if (player->screenymaxf < 0) {
+		player->screenymaxf = 0;
+	}
+
+	if (player->screenymaxf > height) {
+		player->screenymaxf = height;
+	}
+}
 
 GLOBAL_ASM(
 glabel func0f1648cc
diff --git a/src/game/sight.c b/src/game/sight.c
index bd4ddebe1..fcfc2613b 100644
--- a/src/game/sight.c
+++ b/src/game/sight.c
@@ -711,9 +711,9 @@ glabel sightRenderTargetBox
 /*  f0d7e58:	27af004c */ 	addiu	$t7,$sp,0x4c
 /*  f0d7e5c:	2498002f */ 	addiu	$t8,$a0,0x2f
 /*  f0d7e60:	b9e10002 */ 	swr	$at,0x2($t7)
-/*  f0d7e64:	0c002f02 */ 	jal	viGetX
+/*  f0d7e64:	0c002f02 */ 	jal	viGetWidth
 /*  f0d7e68:	a3b8004c */ 	sb	$t8,0x4c($sp)
-/*  f0d7e6c:	0c002f06 */ 	jal	viGetY
+/*  f0d7e6c:	0c002f06 */ 	jal	viGetHeight
 /*  f0d7e70:	a7a20040 */ 	sh	$v0,0x40($sp)
 /*  f0d7e74:	3c0f8008 */ 	lui	$t7,%hi(g_FontNumeric1)
 /*  f0d7e78:	8deffb00 */ 	lw	$t7,%lo(g_FontNumeric1)($t7)
@@ -741,9 +741,9 @@ glabel sightRenderTargetBox
 .L0f0d7ed0:
 /*  f0d7ed0:	0fc5b9f1 */ 	jal	langGet
 /*  f0d7ed4:	00000000 */ 	nop
-/*  f0d7ed8:	0c002f02 */ 	jal	viGetX
+/*  f0d7ed8:	0c002f02 */ 	jal	viGetWidth
 /*  f0d7edc:	afa20048 */ 	sw	$v0,0x48($sp)
-/*  f0d7ee0:	0c002f06 */ 	jal	viGetY
+/*  f0d7ee0:	0c002f06 */ 	jal	viGetHeight
 /*  f0d7ee4:	a7a20040 */ 	sh	$v0,0x40($sp)
 /*  f0d7ee8:	3c198008 */ 	lui	$t9,%hi(g_FontHandelGothicXs1)
 /*  f0d7eec:	8f39fb08 */ 	lw	$t9,%lo(g_FontHandelGothicXs1)($t9)
@@ -2072,9 +2072,9 @@ glabel var7f1ade50
 /*  f0d91c0:	240459b7 */ 	addiu	$a0,$zero,0x59b7
 /*  f0d91c4:	0fc5b9f1 */ 	jal	langGet
 /*  f0d91c8:	afa30090 */ 	sw	$v1,0x90($sp)
-/*  f0d91cc:	0c002f02 */ 	jal	viGetX
+/*  f0d91cc:	0c002f02 */ 	jal	viGetWidth
 /*  f0d91d0:	00409025 */ 	or	$s2,$v0,$zero
-/*  f0d91d4:	0c002f06 */ 	jal	viGetY
+/*  f0d91d4:	0c002f06 */ 	jal	viGetHeight
 /*  f0d91d8:	a7a20060 */ 	sh	$v0,0x60($sp)
 /*  f0d91dc:	3c0c8008 */ 	lui	$t4,%hi(g_FontHandelGothicXs1)
 /*  f0d91e0:	3c0d8008 */ 	lui	$t5,%hi(g_FontHandelGothicXs2)
@@ -2388,7 +2388,7 @@ glabel var7f1ade50
 //				// "Identify"
 //				gdl = textRender(gdl, &textx, &texty, langGet(L_MISC(439)),
 //						g_FontHandelGothicXs1, g_FontHandelGothicXs2, 0x00ff00a0, 0x000000a0,
-//						viGetX(), viGetY(), 0, 0);
+//						viGetWidth(), viGetHeight(), 0, 0);
 //			}
 //
 //			gdl = func0f0d7f54(gdl, x, y, s1, sp90, colour);
diff --git a/src/game/title.c b/src/game/title.c
index 60f7f02e5..22ed2fc6f 100644
--- a/src/game/title.c
+++ b/src/game/title.c
@@ -507,9 +507,9 @@ glabel func0f0165f0
 /*  f016684:	00017043 */ 	sra	$t6,$at,0x1
 .L0f016688:
 /*  f016688:	01eec023 */ 	subu	$t8,$t7,$t6
-/*  f01668c:	0c002f02 */ 	jal	viGetX
+/*  f01668c:	0c002f02 */ 	jal	viGetWidth
 /*  f016690:	afb80040 */ 	sw	$t8,0x40($sp)
-/*  f016694:	0c002f06 */ 	jal	viGetY
+/*  f016694:	0c002f06 */ 	jal	viGetHeight
 /*  f016698:	a7a2003c */ 	sh	$v0,0x3c($sp)
 /*  f01669c:	8fb90068 */ 	lw	$t9,0x68($sp)
 /*  f0166a0:	8fa9006c */ 	lw	$t1,0x6c($sp)
@@ -660,7 +660,7 @@ glabel var7f1a83e4
 /*  f01687c:	24010004 */ 	addiu	$at,$zero,0x4
 /*  f016880:	0fc54de0 */ 	jal	func0f153780
 /*  f016884:	8fa40128 */ 	lw	$a0,0x128($sp)
-/*  f016888:	0c002f02 */ 	jal	viGetX
+/*  f016888:	0c002f02 */ 	jal	viGetWidth
 /*  f01688c:	afa20128 */ 	sw	$v0,0x128($sp)
 /*  f016890:	86060002 */ 	lh	$a2,0x2($s0)
 /*  f016894:	3c0c7f7f */ 	lui	$t4,0x7f7f
@@ -922,11 +922,11 @@ glabel var7f1a83e4
 /*  f016c88:	afad00d8 */ 	sw	$t5,0xd8($sp)
 /*  f016c8c:	0fc5b9f1 */ 	jal	langGet
 /*  f016c90:	9604000a */ 	lhu	$a0,0xa($s0)
-/*  f016c94:	0c002f02 */ 	jal	viGetX
+/*  f016c94:	0c002f02 */ 	jal	viGetWidth
 /*  f016c98:	00409825 */ 	or	$s3,$v0,$zero
 /*  f016c9c:	0002a400 */ 	sll	$s4,$v0,0x10
 /*  f016ca0:	0014c403 */ 	sra	$t8,$s4,0x10
-/*  f016ca4:	0c002f06 */ 	jal	viGetY
+/*  f016ca4:	0c002f06 */ 	jal	viGetHeight
 /*  f016ca8:	0300a025 */ 	or	$s4,$t8,$zero
 /*  f016cac:	8fa40128 */ 	lw	$a0,0x128($sp)
 /*  f016cb0:	27a500dc */ 	addiu	$a1,$sp,0xdc
@@ -3384,11 +3384,11 @@ glabel func0f018ebc
 /*  f018fc4:	0006000d */ 	break	0x6
 .L0f018fc8:
 /*  f018fc8:	a3aa0080 */ 	sb	$t2,0x80($sp)
-/*  f018fcc:	0c002f02 */ 	jal	viGetX
+/*  f018fcc:	0c002f02 */ 	jal	viGetWidth
 /*  f018fd0:	00000000 */ 	nop
 /*  f018fd4:	00029c00 */ 	sll	$s3,$v0,0x10
 /*  f018fd8:	00135c03 */ 	sra	$t3,$s3,0x10
-/*  f018fdc:	0c002f06 */ 	jal	viGetY
+/*  f018fdc:	0c002f06 */ 	jal	viGetHeight
 /*  f018fe0:	01609825 */ 	or	$s3,$t3,$zero
 /*  f018fe4:	3c017f7f */ 	lui	$at,0x7f7f
 /*  f018fe8:	3421ffff */ 	ori	$at,$at,0xffff
@@ -4519,9 +4519,9 @@ glabel titleRenderNoController
 /*  f01a5ac:	25aefff4 */ 	addiu	$t6,$t5,-12
 /*  f01a5b0:	11e0001c */ 	beqz	$t7,.L0f01a624
 /*  f01a5b4:	afae0058 */ 	sw	$t6,0x58($sp)
-/*  f01a5b8:	0c002f02 */ 	jal	viGetX
+/*  f01a5b8:	0c002f02 */ 	jal	viGetWidth
 /*  f01a5bc:	00000000 */ 	nop
-/*  f01a5c0:	0c002f06 */ 	jal	viGetY
+/*  f01a5c0:	0c002f06 */ 	jal	viGetHeight
 /*  f01a5c4:	a7a20048 */ 	sh	$v0,0x48($sp)
 /*  f01a5c8:	3c198008 */ 	lui	$t9,%hi(g_FontHandelGothicLg1)
 /*  f01a5cc:	3c188008 */ 	lui	$t8,%hi(g_FontHandelGothicLg2)
@@ -4547,9 +4547,9 @@ glabel titleRenderNoController
 /*  f01a61c:	10000018 */ 	b	.L0f01a680
 /*  f01a620:	00408025 */ 	or	$s0,$v0,$zero
 .L0f01a624:
-/*  f01a624:	0c002f02 */ 	jal	viGetX
+/*  f01a624:	0c002f02 */ 	jal	viGetWidth
 /*  f01a628:	00000000 */ 	nop
-/*  f01a62c:	0c002f06 */ 	jal	viGetY
+/*  f01a62c:	0c002f06 */ 	jal	viGetHeight
 /*  f01a630:	a7a20048 */ 	sh	$v0,0x48($sp)
 /*  f01a634:	3c0a8008 */ 	lui	$t2,%hi(g_FontHandelGothicLg1)
 /*  f01a638:	3c0c8008 */ 	lui	$t4,%hi(g_FontHandelGothicLg2)
@@ -4604,9 +4604,9 @@ glabel titleRenderNoController
 /*  f01a6f4:	25cf000c */ 	addiu	$t7,$t6,0xc
 /*  f01a6f8:	1320001c */ 	beqz	$t9,.L0f01a76c
 /*  f01a6fc:	afaf0058 */ 	sw	$t7,0x58($sp)
-/*  f01a700:	0c002f02 */ 	jal	viGetX
+/*  f01a700:	0c002f02 */ 	jal	viGetWidth
 /*  f01a704:	00000000 */ 	nop
-/*  f01a708:	0c002f06 */ 	jal	viGetY
+/*  f01a708:	0c002f06 */ 	jal	viGetHeight
 /*  f01a70c:	a7a20048 */ 	sh	$v0,0x48($sp)
 /*  f01a710:	3c088008 */ 	lui	$t0,%hi(g_FontHandelGothicLg1)
 /*  f01a714:	3c188008 */ 	lui	$t8,%hi(g_FontHandelGothicLg2)
@@ -4632,9 +4632,9 @@ glabel titleRenderNoController
 /*  f01a764:	10000018 */ 	b	.L0f01a7c8
 /*  f01a768:	00408025 */ 	or	$s0,$v0,$zero
 .L0f01a76c:
-/*  f01a76c:	0c002f02 */ 	jal	viGetX
+/*  f01a76c:	0c002f02 */ 	jal	viGetWidth
 /*  f01a770:	00000000 */ 	nop
-/*  f01a774:	0c002f06 */ 	jal	viGetY
+/*  f01a774:	0c002f06 */ 	jal	viGetHeight
 /*  f01a778:	a7a20048 */ 	sh	$v0,0x48($sp)
 /*  f01a77c:	3c0a8008 */ 	lui	$t2,%hi(g_FontHandelGothicLg1)
 /*  f01a780:	3c0d8008 */ 	lui	$t5,%hi(g_FontHandelGothicLg2)
@@ -4665,7 +4665,7 @@ glabel titleRenderNoController
 /*  f01a7e0:	00000000 */ 	nop
 );
 
-// Mismatch because goal uses an implicit stack address for viGetX's
+// Mismatch because goal uses an implicit stack address for viGetWidth's
 // return value while mine uses s0, or multiple stack addresses.
 //
 // Each time func000bc08 is called, goal puts the result in sp72 to preserve it
@@ -4698,10 +4698,10 @@ glabel titleRenderNoController
 //
 //	if (g_LanguageId != LANGUAGE_ENGLISH) {
 //		gdl = textRender(gdl, &x, &y, text, g_FontHandelGothicLg1, g_FontHandelGothicLg2,
-//				-1, 0x008000ff, viGetX(), viGetY(), 0, 0);
+//				-1, 0x008000ff, viGetWidth(), viGetHeight(), 0, 0);
 //	} else {
 //		gdl = textRenderProjected(gdl, &x, &y, text, g_FontHandelGothicLg1, g_FontHandelGothicLg2,
-//				-1, viGetX(), viGetY(), 0, 0);
+//				-1, viGetWidth(), viGetHeight(), 0, 0);
 //	}
 //
 //	// Second line
@@ -4713,10 +4713,10 @@ glabel titleRenderNoController
 //
 //	if (g_LanguageId != LANGUAGE_ENGLISH) {
 //		gdl = textRender(gdl, &x, &y, text, g_FontHandelGothicLg1, g_FontHandelGothicLg2,
-//				-1, 0x008000ff, viGetX(), viGetY(), 0, 0);
+//				-1, 0x008000ff, viGetWidth(), viGetHeight(), 0, 0);
 //	} else {
-//		s16 a = viGetX();
-//		s16 b = viGetY();
+//		s16 a = viGetWidth();
+//		s16 b = viGetHeight();
 //		gdl = textRenderProjected(gdl, &x, &y, text, g_FontHandelGothicLg1, g_FontHandelGothicLg2,
 //				-1, a, b, 0, 0);
 //	}
diff --git a/src/game/training/menus.c b/src/game/training/menus.c
index 0a5c76ebd..3bf158d76 100644
--- a/src/game/training/menus.c
+++ b/src/game/training/menus.c
@@ -217,9 +217,9 @@ glabel var7f1b9940
 /*  f1a35e8:	afa2009c */ 	sw	$v0,0x9c($sp)
 /*  f1a35ec:	0fc28857 */ 	jal	weaponGetName
 /*  f1a35f0:	8fa40090 */ 	lw	$a0,0x90($sp)
-/*  f1a35f4:	0c002f02 */ 	jal	viGetX
+/*  f1a35f4:	0c002f02 */ 	jal	viGetWidth
 /*  f1a35f8:	afa20044 */ 	sw	$v0,0x44($sp)
-/*  f1a35fc:	0c002f06 */ 	jal	viGetY
+/*  f1a35fc:	0c002f06 */ 	jal	viGetHeight
 /*  f1a3600:	a7a2003e */ 	sh	$v0,0x3e($sp)
 /*  f1a3604:	3c198008 */ 	lui	$t9,%hi(g_FontHandelGothicSm1)
 /*  f1a3608:	3c0e8008 */ 	lui	$t6,%hi(g_FontHandelGothicSm2)
@@ -1387,9 +1387,9 @@ glabel menuhandler001a44c0
 /*  f1a4d04:	27a60150 */ 	addiu	$a2,$sp,0x150
 /*  f1a4d08:	0fc54e16 */ 	jal	func0f153858
 /*  f1a4d0c:	27a7014c */ 	addiu	$a3,$sp,0x14c
-/*  f1a4d10:	0c002f02 */ 	jal	viGetX
+/*  f1a4d10:	0c002f02 */ 	jal	viGetWidth
 /*  f1a4d14:	afa2015c */ 	sw	$v0,0x15c($sp)
-/*  f1a4d18:	0c002f06 */ 	jal	viGetY
+/*  f1a4d18:	0c002f06 */ 	jal	viGetHeight
 /*  f1a4d1c:	a7a20044 */ 	sh	$v0,0x44($sp)
 /*  f1a4d20:	3c0d8008 */ 	lui	$t5,%hi(g_FontHandelGothicSm1)
 /*  f1a4d24:	3c198008 */ 	lui	$t9,%hi(g_FontHandelGothicSm2)
@@ -1428,9 +1428,9 @@ glabel menuhandler001a44c0
 /*  f1a4da8:	27a60150 */ 	addiu	$a2,$sp,0x150
 /*  f1a4dac:	0fc54e16 */ 	jal	func0f153858
 /*  f1a4db0:	27a7014c */ 	addiu	$a3,$sp,0x14c
-/*  f1a4db4:	0c002f02 */ 	jal	viGetX
+/*  f1a4db4:	0c002f02 */ 	jal	viGetWidth
 /*  f1a4db8:	afa2015c */ 	sw	$v0,0x15c($sp)
-/*  f1a4dbc:	0c002f06 */ 	jal	viGetY
+/*  f1a4dbc:	0c002f06 */ 	jal	viGetHeight
 /*  f1a4dc0:	a7a20044 */ 	sh	$v0,0x44($sp)
 /*  f1a4dc4:	3c0c8008 */ 	lui	$t4,%hi(g_FontHandelGothicSm1)
 /*  f1a4dc8:	3c188008 */ 	lui	$t8,%hi(g_FontHandelGothicSm2)
@@ -1485,9 +1485,9 @@ glabel menuhandler001a44c0
 /*  f1a4e8c:	27a60150 */ 	addiu	$a2,$sp,0x150
 /*  f1a4e90:	0fc54e16 */ 	jal	func0f153858
 /*  f1a4e94:	27a7014c */ 	addiu	$a3,$sp,0x14c
-/*  f1a4e98:	0c002f02 */ 	jal	viGetX
+/*  f1a4e98:	0c002f02 */ 	jal	viGetWidth
 /*  f1a4e9c:	afa2015c */ 	sw	$v0,0x15c($sp)
-/*  f1a4ea0:	0c002f06 */ 	jal	viGetY
+/*  f1a4ea0:	0c002f06 */ 	jal	viGetHeight
 /*  f1a4ea4:	a7a20044 */ 	sh	$v0,0x44($sp)
 /*  f1a4ea8:	3c0f8008 */ 	lui	$t7,%hi(g_FontHandelGothicSm1)
 /*  f1a4eac:	3c0d8008 */ 	lui	$t5,%hi(g_FontHandelGothicSm2)
@@ -1527,9 +1527,9 @@ glabel menuhandler001a44c0
 /*  f1a4f34:	27a60150 */ 	addiu	$a2,$sp,0x150
 /*  f1a4f38:	0fc54e16 */ 	jal	func0f153858
 /*  f1a4f3c:	27a7014c */ 	addiu	$a3,$sp,0x14c
-/*  f1a4f40:	0c002f02 */ 	jal	viGetX
+/*  f1a4f40:	0c002f02 */ 	jal	viGetWidth
 /*  f1a4f44:	afa2015c */ 	sw	$v0,0x15c($sp)
-/*  f1a4f48:	0c002f06 */ 	jal	viGetY
+/*  f1a4f48:	0c002f06 */ 	jal	viGetHeight
 /*  f1a4f4c:	a7a20044 */ 	sh	$v0,0x44($sp)
 /*  f1a4f50:	3c0c8008 */ 	lui	$t4,%hi(g_FontHandelGothicSm1)
 /*  f1a4f54:	3c188008 */ 	lui	$t8,%hi(g_FontHandelGothicSm2)
@@ -1568,9 +1568,9 @@ glabel menuhandler001a44c0
 /*  f1a4fd8:	27a60150 */ 	addiu	$a2,$sp,0x150
 /*  f1a4fdc:	0fc54e16 */ 	jal	func0f153858
 /*  f1a4fe0:	27a7014c */ 	addiu	$a3,$sp,0x14c
-/*  f1a4fe4:	0c002f02 */ 	jal	viGetX
+/*  f1a4fe4:	0c002f02 */ 	jal	viGetWidth
 /*  f1a4fe8:	afa2015c */ 	sw	$v0,0x15c($sp)
-/*  f1a4fec:	0c002f06 */ 	jal	viGetY
+/*  f1a4fec:	0c002f06 */ 	jal	viGetHeight
 /*  f1a4ff0:	a7a20044 */ 	sh	$v0,0x44($sp)
 /*  f1a4ff4:	3c0d8008 */ 	lui	$t5,%hi(g_FontHandelGothicSm1)
 /*  f1a4ff8:	3c198008 */ 	lui	$t9,%hi(g_FontHandelGothicSm2)
@@ -1625,9 +1625,9 @@ glabel menuhandler001a44c0
 /*  f1a50bc:	27a60150 */ 	addiu	$a2,$sp,0x150
 /*  f1a50c0:	0fc54e16 */ 	jal	func0f153858
 /*  f1a50c4:	27a7014c */ 	addiu	$a3,$sp,0x14c
-/*  f1a50c8:	0c002f02 */ 	jal	viGetX
+/*  f1a50c8:	0c002f02 */ 	jal	viGetWidth
 /*  f1a50cc:	afa2015c */ 	sw	$v0,0x15c($sp)
-/*  f1a50d0:	0c002f06 */ 	jal	viGetY
+/*  f1a50d0:	0c002f06 */ 	jal	viGetHeight
 /*  f1a50d4:	a7a20044 */ 	sh	$v0,0x44($sp)
 /*  f1a50d8:	3c0e8008 */ 	lui	$t6,%hi(g_FontHandelGothicSm1)
 /*  f1a50dc:	3c0c8008 */ 	lui	$t4,%hi(g_FontHandelGothicSm2)
@@ -1667,9 +1667,9 @@ glabel menuhandler001a44c0
 /*  f1a5164:	27a60150 */ 	addiu	$a2,$sp,0x150
 /*  f1a5168:	0fc54e16 */ 	jal	func0f153858
 /*  f1a516c:	27a7014c */ 	addiu	$a3,$sp,0x14c
-/*  f1a5170:	0c002f02 */ 	jal	viGetX
+/*  f1a5170:	0c002f02 */ 	jal	viGetWidth
 /*  f1a5174:	afa2015c */ 	sw	$v0,0x15c($sp)
-/*  f1a5178:	0c002f06 */ 	jal	viGetY
+/*  f1a5178:	0c002f06 */ 	jal	viGetHeight
 /*  f1a517c:	a7a20044 */ 	sh	$v0,0x44($sp)
 /*  f1a5180:	3c0d8008 */ 	lui	$t5,%hi(g_FontHandelGothicSm1)
 /*  f1a5184:	3c198008 */ 	lui	$t9,%hi(g_FontHandelGothicSm2)
@@ -1708,9 +1708,9 @@ glabel menuhandler001a44c0
 /*  f1a5208:	27a60150 */ 	addiu	$a2,$sp,0x150
 /*  f1a520c:	0fc54e16 */ 	jal	func0f153858
 /*  f1a5210:	27a7014c */ 	addiu	$a3,$sp,0x14c
-/*  f1a5214:	0c002f02 */ 	jal	viGetX
+/*  f1a5214:	0c002f02 */ 	jal	viGetWidth
 /*  f1a5218:	afa2015c */ 	sw	$v0,0x15c($sp)
-/*  f1a521c:	0c002f06 */ 	jal	viGetY
+/*  f1a521c:	0c002f06 */ 	jal	viGetHeight
 /*  f1a5220:	a7a20044 */ 	sh	$v0,0x44($sp)
 /*  f1a5224:	3c0c8008 */ 	lui	$t4,%hi(g_FontHandelGothicSm1)
 /*  f1a5228:	3c188008 */ 	lui	$t8,%hi(g_FontHandelGothicSm2)
@@ -1764,9 +1764,9 @@ glabel menuhandler001a44c0
 /*  f1a52e8:	27a60150 */ 	addiu	$a2,$sp,0x150
 /*  f1a52ec:	0fc54e16 */ 	jal	func0f153858
 /*  f1a52f0:	27a7014c */ 	addiu	$a3,$sp,0x14c
-/*  f1a52f4:	0c002f02 */ 	jal	viGetX
+/*  f1a52f4:	0c002f02 */ 	jal	viGetWidth
 /*  f1a52f8:	afa2015c */ 	sw	$v0,0x15c($sp)
-/*  f1a52fc:	0c002f06 */ 	jal	viGetY
+/*  f1a52fc:	0c002f06 */ 	jal	viGetHeight
 /*  f1a5300:	a7a20044 */ 	sh	$v0,0x44($sp)
 /*  f1a5304:	3c0f8008 */ 	lui	$t7,%hi(g_FontHandelGothicSm1)
 /*  f1a5308:	3c0d8008 */ 	lui	$t5,%hi(g_FontHandelGothicSm2)
@@ -1806,9 +1806,9 @@ glabel menuhandler001a44c0
 /*  f1a5390:	27a60150 */ 	addiu	$a2,$sp,0x150
 /*  f1a5394:	0fc54e16 */ 	jal	func0f153858
 /*  f1a5398:	27a7014c */ 	addiu	$a3,$sp,0x14c
-/*  f1a539c:	0c002f02 */ 	jal	viGetX
+/*  f1a539c:	0c002f02 */ 	jal	viGetWidth
 /*  f1a53a0:	afa2015c */ 	sw	$v0,0x15c($sp)
-/*  f1a53a4:	0c002f06 */ 	jal	viGetY
+/*  f1a53a4:	0c002f06 */ 	jal	viGetHeight
 /*  f1a53a8:	a7a20044 */ 	sh	$v0,0x44($sp)
 /*  f1a53ac:	3c0c8008 */ 	lui	$t4,%hi(g_FontHandelGothicSm1)
 /*  f1a53b0:	3c188008 */ 	lui	$t8,%hi(g_FontHandelGothicSm2)
@@ -1849,9 +1849,9 @@ glabel menuhandler001a44c0
 /*  f1a543c:	27a60150 */ 	addiu	$a2,$sp,0x150
 /*  f1a5440:	0fc54e16 */ 	jal	func0f153858
 /*  f1a5444:	27a7014c */ 	addiu	$a3,$sp,0x14c
-/*  f1a5448:	0c002f02 */ 	jal	viGetX
+/*  f1a5448:	0c002f02 */ 	jal	viGetWidth
 /*  f1a544c:	afa2015c */ 	sw	$v0,0x15c($sp)
-/*  f1a5450:	0c002f06 */ 	jal	viGetY
+/*  f1a5450:	0c002f06 */ 	jal	viGetHeight
 /*  f1a5454:	a7a20044 */ 	sh	$v0,0x44($sp)
 /*  f1a5458:	3c198008 */ 	lui	$t9,%hi(g_FontHandelGothicSm1)
 /*  f1a545c:	3c0e8008 */ 	lui	$t6,%hi(g_FontHandelGothicSm2)
@@ -1903,9 +1903,9 @@ glabel menuhandler001a44c0
 /*  f1a5514:	27a60150 */ 	addiu	$a2,$sp,0x150
 /*  f1a5518:	0fc54e16 */ 	jal	func0f153858
 /*  f1a551c:	27a7014c */ 	addiu	$a3,$sp,0x14c
-/*  f1a5520:	0c002f02 */ 	jal	viGetX
+/*  f1a5520:	0c002f02 */ 	jal	viGetWidth
 /*  f1a5524:	afa2015c */ 	sw	$v0,0x15c($sp)
-/*  f1a5528:	0c002f06 */ 	jal	viGetY
+/*  f1a5528:	0c002f06 */ 	jal	viGetHeight
 /*  f1a552c:	a7a20044 */ 	sh	$v0,0x44($sp)
 /*  f1a5530:	3c0e8008 */ 	lui	$t6,%hi(g_FontHandelGothicSm1)
 /*  f1a5534:	3c0c8008 */ 	lui	$t4,%hi(g_FontHandelGothicSm2)
@@ -1944,9 +1944,9 @@ glabel menuhandler001a44c0
 /*  f1a55b8:	27a60150 */ 	addiu	$a2,$sp,0x150
 /*  f1a55bc:	0fc54e16 */ 	jal	func0f153858
 /*  f1a55c0:	27a7014c */ 	addiu	$a3,$sp,0x14c
-/*  f1a55c4:	0c002f02 */ 	jal	viGetX
+/*  f1a55c4:	0c002f02 */ 	jal	viGetWidth
 /*  f1a55c8:	afa2015c */ 	sw	$v0,0x15c($sp)
-/*  f1a55cc:	0c002f06 */ 	jal	viGetY
+/*  f1a55cc:	0c002f06 */ 	jal	viGetHeight
 /*  f1a55d0:	a7a20044 */ 	sh	$v0,0x44($sp)
 /*  f1a55d4:	3c0f8008 */ 	lui	$t7,%hi(g_FontHandelGothicSm1)
 /*  f1a55d8:	3c0d8008 */ 	lui	$t5,%hi(g_FontHandelGothicSm2)
@@ -2004,9 +2004,9 @@ glabel menuhandler001a44c0
 /*  f1a56a8:	27a60150 */ 	addiu	$a2,$sp,0x150
 /*  f1a56ac:	0fc54e16 */ 	jal	func0f153858
 /*  f1a56b0:	27a7014c */ 	addiu	$a3,$sp,0x14c
-/*  f1a56b4:	0c002f02 */ 	jal	viGetX
+/*  f1a56b4:	0c002f02 */ 	jal	viGetWidth
 /*  f1a56b8:	afa2015c */ 	sw	$v0,0x15c($sp)
-/*  f1a56bc:	0c002f06 */ 	jal	viGetY
+/*  f1a56bc:	0c002f06 */ 	jal	viGetHeight
 /*  f1a56c0:	a7a20044 */ 	sh	$v0,0x44($sp)
 /*  f1a56c4:	3c198008 */ 	lui	$t9,%hi(g_FontHandelGothicSm1)
 /*  f1a56c8:	3c0c8008 */ 	lui	$t4,%hi(g_FontHandelGothicSm2)
@@ -2045,9 +2045,9 @@ glabel menuhandler001a44c0
 /*  f1a574c:	27a60150 */ 	addiu	$a2,$sp,0x150
 /*  f1a5750:	0fc54e16 */ 	jal	func0f153858
 /*  f1a5754:	27a7014c */ 	addiu	$a3,$sp,0x14c
-/*  f1a5758:	0c002f02 */ 	jal	viGetX
+/*  f1a5758:	0c002f02 */ 	jal	viGetWidth
 /*  f1a575c:	afa2015c */ 	sw	$v0,0x15c($sp)
-/*  f1a5760:	0c002f06 */ 	jal	viGetY
+/*  f1a5760:	0c002f06 */ 	jal	viGetHeight
 /*  f1a5764:	a7a20044 */ 	sh	$v0,0x44($sp)
 /*  f1a5768:	3c188008 */ 	lui	$t8,%hi(g_FontHandelGothicSm1)
 /*  f1a576c:	3c0f8008 */ 	lui	$t7,%hi(g_FontHandelGothicSm2)
@@ -2086,9 +2086,9 @@ glabel menuhandler001a44c0
 /*  f1a57f0:	27a60150 */ 	addiu	$a2,$sp,0x150
 /*  f1a57f4:	0fc54e16 */ 	jal	func0f153858
 /*  f1a57f8:	27a7014c */ 	addiu	$a3,$sp,0x14c
-/*  f1a57fc:	0c002f02 */ 	jal	viGetX
+/*  f1a57fc:	0c002f02 */ 	jal	viGetWidth
 /*  f1a5800:	afa2015c */ 	sw	$v0,0x15c($sp)
-/*  f1a5804:	0c002f06 */ 	jal	viGetY
+/*  f1a5804:	0c002f06 */ 	jal	viGetHeight
 /*  f1a5808:	a7a20044 */ 	sh	$v0,0x44($sp)
 /*  f1a580c:	3c198008 */ 	lui	$t9,%hi(g_FontNumeric1)
 /*  f1a5810:	3c0c8008 */ 	lui	$t4,%hi(g_FontNumeric2)
@@ -2133,9 +2133,9 @@ glabel menuhandler001a44c0
 /*  f1a58ac:	27a60150 */ 	addiu	$a2,$sp,0x150
 /*  f1a58b0:	0fc54e16 */ 	jal	func0f153858
 /*  f1a58b4:	27a7014c */ 	addiu	$a3,$sp,0x14c
-/*  f1a58b8:	0c002f02 */ 	jal	viGetX
+/*  f1a58b8:	0c002f02 */ 	jal	viGetWidth
 /*  f1a58bc:	afa2015c */ 	sw	$v0,0x15c($sp)
-/*  f1a58c0:	0c002f06 */ 	jal	viGetY
+/*  f1a58c0:	0c002f06 */ 	jal	viGetHeight
 /*  f1a58c4:	a7a20044 */ 	sh	$v0,0x44($sp)
 /*  f1a58c8:	3c0c8008 */ 	lui	$t4,%hi(g_FontNumeric1)
 /*  f1a58cc:	3c0e8008 */ 	lui	$t6,%hi(g_FontNumeric2)
@@ -2180,9 +2180,9 @@ glabel menuhandler001a44c0
 /*  f1a5968:	27a60150 */ 	addiu	$a2,$sp,0x150
 /*  f1a596c:	0fc54e16 */ 	jal	func0f153858
 /*  f1a5970:	27a7014c */ 	addiu	$a3,$sp,0x14c
-/*  f1a5974:	0c002f02 */ 	jal	viGetX
+/*  f1a5974:	0c002f02 */ 	jal	viGetWidth
 /*  f1a5978:	afa2015c */ 	sw	$v0,0x15c($sp)
-/*  f1a597c:	0c002f06 */ 	jal	viGetY
+/*  f1a597c:	0c002f06 */ 	jal	viGetHeight
 /*  f1a5980:	a7a20044 */ 	sh	$v0,0x44($sp)
 /*  f1a5984:	3c0e8008 */ 	lui	$t6,%hi(g_FontNumeric1)
 /*  f1a5988:	3c188008 */ 	lui	$t8,%hi(g_FontNumeric2)
@@ -2227,9 +2227,9 @@ glabel menuhandler001a44c0
 /*  f1a5a24:	27a60150 */ 	addiu	$a2,$sp,0x150
 /*  f1a5a28:	0fc54e16 */ 	jal	func0f153858
 /*  f1a5a2c:	27a7014c */ 	addiu	$a3,$sp,0x14c
-/*  f1a5a30:	0c002f02 */ 	jal	viGetX
+/*  f1a5a30:	0c002f02 */ 	jal	viGetWidth
 /*  f1a5a34:	afa2015c */ 	sw	$v0,0x15c($sp)
-/*  f1a5a38:	0c002f06 */ 	jal	viGetY
+/*  f1a5a38:	0c002f06 */ 	jal	viGetHeight
 /*  f1a5a3c:	a7a20044 */ 	sh	$v0,0x44($sp)
 /*  f1a5a40:	3c188008 */ 	lui	$t8,%hi(g_FontNumeric1)
 /*  f1a5a44:	3c0f8008 */ 	lui	$t7,%hi(g_FontNumeric2)
@@ -3560,9 +3560,9 @@ glabel menuhandler001a6ea4
 .L0f1a7220:
 /*  f1a7220:	8e0a0004 */ 	lw	$t2,0x4($s0)
 /*  f1a7224:	25580008 */ 	addiu	$t8,$t2,0x8
-/*  f1a7228:	0c002f02 */ 	jal	viGetX
+/*  f1a7228:	0c002f02 */ 	jal	viGetWidth
 /*  f1a722c:	afb80098 */ 	sw	$t8,0x98($sp)
-/*  f1a7230:	0c002f06 */ 	jal	viGetY
+/*  f1a7230:	0c002f06 */ 	jal	viGetHeight
 /*  f1a7234:	a7a20044 */ 	sh	$v0,0x44($sp)
 /*  f1a7238:	3c0f8008 */ 	lui	$t7,%hi(g_FontHandelGothicMd1)
 /*  f1a723c:	3c198008 */ 	lui	$t9,%hi(g_FontHandelGothicMd2)
@@ -3614,9 +3614,9 @@ glabel menuhandler001a6ea4
 .L0f1a72f0:
 /*  f1a72f0:	8e0a0004 */ 	lw	$t2,0x4($s0)
 /*  f1a72f4:	25580019 */ 	addiu	$t8,$t2,0x19
-/*  f1a72f8:	0c002f02 */ 	jal	viGetX
+/*  f1a72f8:	0c002f02 */ 	jal	viGetWidth
 /*  f1a72fc:	afb80098 */ 	sw	$t8,0x98($sp)
-/*  f1a7300:	0c002f06 */ 	jal	viGetY
+/*  f1a7300:	0c002f06 */ 	jal	viGetHeight
 /*  f1a7304:	a7a20044 */ 	sh	$v0,0x44($sp)
 /*  f1a7308:	3c0f8008 */ 	lui	$t7,%hi(g_FontHandelGothicSm1)
 /*  f1a730c:	3c198008 */ 	lui	$t9,%hi(g_FontHandelGothicSm2)
diff --git a/src/game/training/training.c b/src/game/training/training.c
index bd9c33b23..c36548e68 100644
--- a/src/game/training/training.c
+++ b/src/game/training/training.c
@@ -5264,7 +5264,7 @@ Gfx *frRenderHudElement(Gfx *gdl, s32 x, s32 y, char *string1, char *string2, u3
 	gdl = func0f153858(gdl, &x2, &y2, &textwidth, &textheight);
 
 	gdl = textRender(gdl, &x2, &y2, string1,
-			g_FontHandelGothicMd1, g_FontHandelGothicMd2, fullcolour, halfalpha, viGetX(), viGetY(), 0, 0);
+			g_FontHandelGothicMd1, g_FontHandelGothicMd2, fullcolour, halfalpha, viGetWidth(), viGetHeight(), 0, 0);
 
 	if (string2) {
 		textMeasure(&textheight, &textwidth, string2, g_FontHandelGothicXs1, g_FontHandelGothicXs2, 0);
@@ -5274,7 +5274,7 @@ Gfx *frRenderHudElement(Gfx *gdl, s32 x, s32 y, char *string1, char *string2, u3
 		gdl = func0f153858(gdl, &x2, &y2, &textwidth, &textheight);
 
 		gdl = textRender(gdl, &x2, &y2, string2,
-			g_FontHandelGothicXs1, g_FontHandelGothicXs2, fullcolour, halfalpha, viGetX(), viGetY(), 0, 0);
+			g_FontHandelGothicXs1, g_FontHandelGothicXs2, fullcolour, halfalpha, viGetWidth(), viGetHeight(), 0, 0);
 	}
 
 	return gdl;
diff --git a/src/include/game/room.h b/src/include/game/room.h
index 2bf15154c..1ec38815c 100644
--- a/src/include/game/room.h
+++ b/src/include/game/room.h
@@ -92,7 +92,7 @@ Gfx *func0f164150(Gfx *gdl);
 s32 roomsGetActive(s16 *rooms, s32 len);
 s32 roomGetNeighbours(s32 room, s16 *rooms, s32 len);
 bool roomsAreNeighbours(s32 roomnum1, s32 roomnum2);
-u32 func0f164748(void);
+void currentPlayerCalculateScreenProperties(void);
 u32 func0f1648cc(void);
 void portalSwapRooms(u32 portal);
 u32 func0f164ab8(void);
diff --git a/src/include/lib/lib_09660.h b/src/include/lib/lib_09660.h
index d053e46cf..0d1288017 100644
--- a/src/include/lib/lib_09660.h
+++ b/src/include/lib/lib_09660.h
@@ -40,8 +40,8 @@ void viSetBuf(s16 x, s16 y);
 s16 viGetBufX(void);
 s16 viGetBufY(void);
 void viSetXY(s16 x, s16 y);
-s16 viGetX(void);
-s16 viGetY(void);
+s16 viGetWidth(void);
+s16 viGetHeight(void);
 void viSetViewSize(s16 x, s16 y);
 s16 viGetViewWidth(void);
 s16 viGetViewHeight(void);
diff --git a/src/lib/lib_09660.c b/src/lib/lib_09660.c
index 5e3972d15..bfb787d87 100644
--- a/src/lib/lib_09660.c
+++ b/src/lib/lib_09660.c
@@ -2129,9 +2129,9 @@ glabel func0000b330
 /*     b354:	ac780000 */ 	sw	$t8,0x0($v1)
 /*     b358:	24660008 */ 	addiu	$a2,$v1,0x8
 /*     b35c:	afa600a8 */ 	sw	$a2,0xa8($sp)
-/*     b360:	0c002f02 */ 	jal	viGetX
+/*     b360:	0c002f02 */ 	jal	viGetWidth
 /*     b364:	afa300a0 */ 	sw	$v1,0xa0($sp)
-/*     b368:	0c002f06 */ 	jal	viGetY
+/*     b368:	0c002f06 */ 	jal	viGetHeight
 /*     b36c:	a7a20056 */ 	sh	$v0,0x56($sp)
 /*     b370:	44822000 */ 	mtc1	$v0,$f4
 /*     b374:	87af0056 */ 	lh	$t7,0x56($sp)
@@ -2219,7 +2219,7 @@ glabel func0000b330
 /*     b4a4:	8fa600a8 */ 	lw	$a2,0xa8($sp)
 /*     b4a8:	afa60098 */ 	sw	$a2,0x98($sp)
 /*     b4ac:	24c60008 */ 	addiu	$a2,$a2,0x8
-/*     b4b0:	0c002f02 */ 	jal	viGetX
+/*     b4b0:	0c002f02 */ 	jal	viGetWidth
 /*     b4b4:	afa600a8 */ 	sw	$a2,0xa8($sp)
 /*     b4b8:	0c002f44 */ 	jal	viGetViewTop
 /*     b4bc:	a7a20056 */ 	sh	$v0,0x56($sp)
@@ -2247,7 +2247,7 @@ glabel func0000b330
 /*     b510:	afa600a8 */ 	sw	$a2,0xa8($sp)
 /*     b514:	0c002f44 */ 	jal	viGetViewTop
 /*     b518:	a7a20042 */ 	sh	$v0,0x42($sp)
-/*     b51c:	0c002f06 */ 	jal	viGetY
+/*     b51c:	0c002f06 */ 	jal	viGetHeight
 /*     b520:	a7a20056 */ 	sh	$v0,0x56($sp)
 /*     b524:	87b80056 */ 	lh	$t8,0x56($sp)
 /*     b528:	87ad0042 */ 	lh	$t5,0x42($sp)
@@ -2258,9 +2258,9 @@ glabel func0000b330
 /*     b53c:	8fbf0014 */ 	lw	$ra,0x14($sp)
 /*     b540:	afa60090 */ 	sw	$a2,0x90($sp)
 /*     b544:	24c60008 */ 	addiu	$a2,$a2,0x8
-/*     b548:	0c002f02 */ 	jal	viGetX
+/*     b548:	0c002f02 */ 	jal	viGetWidth
 /*     b54c:	afa600a8 */ 	sw	$a2,0xa8($sp)
-/*     b550:	0c002f06 */ 	jal	viGetY
+/*     b550:	0c002f06 */ 	jal	viGetHeight
 /*     b554:	a7a20056 */ 	sh	$v0,0x56($sp)
 /*     b558:	87b90056 */ 	lh	$t9,0x56($sp)
 /*     b55c:	244effff */ 	addiu	$t6,$v0,-1
@@ -2372,7 +2372,7 @@ glabel func0000b330
 /*     b6d0:	24c60008 */ 	addiu	$a2,$a2,0x8
 /*     b6d4:	afa600a8 */ 	sw	$a2,0xa8($sp)
 /*     b6d8:	afa4007c */ 	sw	$a0,0x7c($sp)
-/*     b6dc:	0c002f02 */ 	jal	viGetX
+/*     b6dc:	0c002f02 */ 	jal	viGetWidth
 /*     b6e0:	afac0084 */ 	sw	$t4,0x84($sp)
 /*     b6e4:	3c18800a */ 	lui	$t8,%hi(g_Vars+0x64)
 /*     b6e8:	8f18a024 */ 	lw	$t8,%lo(g_Vars+0x64)($t8)
@@ -2398,7 +2398,7 @@ glabel func0000b330
 /*     b738:	24c60008 */ 	addiu	$a2,$a2,0x8
 .L0000b73c:
 /*     b73c:	afa600a8 */ 	sw	$a2,0xa8($sp)
-/*     b740:	0c002f06 */ 	jal	viGetY
+/*     b740:	0c002f06 */ 	jal	viGetHeight
 /*     b744:	afac0084 */ 	sw	$t4,0x84($sp)
 /*     b748:	8fac0084 */ 	lw	$t4,0x84($sp)
 /*     b74c:	3c0b800a */ 	lui	$t3,%hi(g_Vars)
@@ -2416,9 +2416,9 @@ glabel func0000b330
 /*     b77c:	afa60074 */ 	sw	$a2,0x74($sp)
 /*     b780:	24c60008 */ 	addiu	$a2,$a2,0x8
 /*     b784:	afa600a8 */ 	sw	$a2,0xa8($sp)
-/*     b788:	0c002f02 */ 	jal	viGetX
+/*     b788:	0c002f02 */ 	jal	viGetWidth
 /*     b78c:	afa5002c */ 	sw	$a1,0x2c($sp)
-/*     b790:	0c002f06 */ 	jal	viGetY
+/*     b790:	0c002f06 */ 	jal	viGetHeight
 /*     b794:	a7a20056 */ 	sh	$v0,0x56($sp)
 /*     b798:	87ad0056 */ 	lh	$t5,0x56($sp)
 /*     b79c:	2459ffff */ 	addiu	$t9,$v0,-1
@@ -2450,7 +2450,7 @@ glabel func0000b330
 .L0000b804:
 /*     b804:	24c60008 */ 	addiu	$a2,$a2,0x8
 /*     b808:	afa600a8 */ 	sw	$a2,0xa8($sp)
-/*     b80c:	0c002f02 */ 	jal	viGetX
+/*     b80c:	0c002f02 */ 	jal	viGetWidth
 /*     b810:	afa4006c */ 	sw	$a0,0x6c($sp)
 /*     b814:	8fae0080 */ 	lw	$t6,0x80($sp)
 /*     b818:	3c0b800a */ 	lui	$t3,%hi(g_Vars)
@@ -2596,7 +2596,7 @@ glabel func0000b330
 /*     ba00:	24c60008 */ 	addiu	$a2,$a2,0x8
 /*     ba04:	afa600a8 */ 	sw	$a2,0xa8($sp)
 /*     ba08:	afa50064 */ 	sw	$a1,0x64($sp)
-/*     ba0c:	0c002f06 */ 	jal	viGetY
+/*     ba0c:	0c002f06 */ 	jal	viGetHeight
 /*     ba10:	afac001c */ 	sw	$t4,0x1c($sp)
 /*     ba14:	8fac001c */ 	lw	$t4,0x1c($sp)
 /*     ba18:	8fa50064 */ 	lw	$a1,0x64($sp)
@@ -2664,9 +2664,9 @@ glabel func0000b330
 /*     baf4:	afa6005c */ 	sw	$a2,0x5c($sp)
 /*     baf8:	24c60008 */ 	addiu	$a2,$a2,0x8
 /*     bafc:	afa600a8 */ 	sw	$a2,0xa8($sp)
-/*     bb00:	0c002f02 */ 	jal	viGetX
+/*     bb00:	0c002f02 */ 	jal	viGetWidth
 /*     bb04:	afac001c */ 	sw	$t4,0x1c($sp)
-/*     bb08:	0c002f06 */ 	jal	viGetY
+/*     bb08:	0c002f06 */ 	jal	viGetHeight
 /*     bb0c:	a7a20056 */ 	sh	$v0,0x56($sp)
 /*     bb10:	87b80056 */ 	lh	$t8,0x56($sp)
 /*     bb14:	244effff */ 	addiu	$t6,$v0,-1
@@ -2730,12 +2730,12 @@ void viSetXY(s16 x, s16 y)
 	g_ViData->y = y;
 }
 
-s16 viGetX(void)
+s16 viGetWidth(void)
 {
 	return g_ViData->x;
 }
 
-s16 viGetY(void)
+s16 viGetHeight(void)
 {
 	return g_ViData->y;
 }
diff --git a/src/lib/lib_0c000.c b/src/lib/lib_0c000.c
index 466a08afd..4b46577b7 100644
--- a/src/lib/lib_0c000.c
+++ b/src/lib/lib_0c000.c
@@ -1396,7 +1396,7 @@ glabel func0000cdc8
 /*     cdcc:	afbf0014 */ 	sw	$ra,0x14($sp)
 /*     cdd0:	afa40018 */ 	sw	$a0,0x18($sp)
 /*     cdd4:	afa5001c */ 	sw	$a1,0x1c($sp)
-/*     cdd8:	0c002f02 */ 	jal	viGetX
+/*     cdd8:	0c002f02 */ 	jal	viGetWidth
 /*     cddc:	afa60020 */ 	sw	$a2,0x20($sp)
 /*     cde0:	93a30023 */ 	lbu	$v1,0x23($sp)
 /*     cde4:	8fa50018 */ 	lw	$a1,0x18($sp)
@@ -1526,7 +1526,7 @@ glabel func0000cf54
 /*     cf80:	afb20020 */ 	sw	$s2,0x20($sp)
 /*     cf84:	afb1001c */ 	sw	$s1,0x1c($sp)
 /*     cf88:	afb00018 */ 	sw	$s0,0x18($sp)
-/*     cf8c:	0c002f02 */ 	jal	viGetX
+/*     cf8c:	0c002f02 */ 	jal	viGetWidth
 /*     cf90:	ac2ed998 */ 	sw	$t6,%lo(var8005d998)($at)
 /*     cf94:	2450fff3 */ 	addiu	$s0,$v0,-13
 /*     cf98:	06010003 */ 	bgez	$s0,.L0000cfa8
@@ -1534,7 +1534,7 @@ glabel func0000cf54
 /*     cfa0:	26010003 */ 	addiu	$at,$s0,0x3
 /*     cfa4:	00017883 */ 	sra	$t7,$at,0x2
 .L0000cfa8:
-/*     cfa8:	0c002f06 */ 	jal	viGetY
+/*     cfa8:	0c002f06 */ 	jal	viGetHeight
 /*     cfac:	01e08025 */ 	or	$s0,$t7,$zero
 /*     cfb0:	2443fff6 */ 	addiu	$v1,$v0,-10
 /*     cfb4:	24010007 */ 	addiu	$at,$zero,0x7