From b4fee9d568abeda4ebd0bed5c1524c610b2f4a1b Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Fri, 8 Oct 2021 17:41:55 +1000
Subject: [PATCH] Rename vi functions to have vi prefix

---
 src/game/bg.c                    |  12 ++--
 src/game/bondgun.c               |  36 +++++-----
 src/game/credits.c               |  24 +++----
 src/game/debug2.c                |   8 +--
 src/game/endscreen.c             |   4 +-
 src/game/explosions/explosions.c |   4 +-
 src/game/explosions/reset.c      |   2 +-
 src/game/game_01bea0.c           |  16 ++---
 src/game/game_0b69d0.c           |  12 ++--
 src/game/game_0f09f0.c           |  24 +++----
 src/game/game_11f000.c           |  10 +--
 src/game/lv.c                    |  74 +++++++++----------
 src/game/mainmenu.c              |   2 +-
 src/game/savebuffer.c            |   2 +-
 src/game/title.c                 |  22 +++---
 src/include/data.h               |   2 +-
 src/include/lib/lib_09a80.h      |  52 +++++++-------
 src/lib/audiomgr.c               |   4 +-
 src/lib/lib_09a80.c              | 117 ++++++++++++++++---------------
 src/lib/main.c                   |  88 +++++++++++------------
 src/lib/sched.c                  |  22 +++---
 21 files changed, 270 insertions(+), 267 deletions(-)

diff --git a/src/game/bg.c b/src/game/bg.c
index e1792fa37..a4a82ae76 100644
--- a/src/game/bg.c
+++ b/src/game/bg.c
@@ -3009,7 +3009,7 @@ glabel func0f15a6f4
 .L0f15a950:
 /*  f15a950:	0fc599b2 */ 	jal	gfxConsiderDisableFog
 /*  f15a954:	02202025 */ 	or	$a0,$s1,$zero
-/*  f15a958:	0c002ade */ 	jal	func0000ab78
+/*  f15a958:	0c002ade */ 	jal	vi0000ab78
 /*  f15a95c:	00402025 */ 	or	$a0,$v0,$zero
 /*  f15a960:	861905e8 */ 	lh	$t9,0x5e8($s0)
 /*  f15a964:	00408825 */ 	or	$s1,$v0,$zero
@@ -3131,7 +3131,7 @@ glabel func0f15a6f4
 /*  f15aafc:	00402025 */ 	or	$a0,$v0,$zero
 /*  f15ab00:	0fc54de0 */ 	jal	func0f153780
 /*  f15ab04:	00402025 */ 	or	$a0,$v0,$zero
-/*  f15ab08:	0c002ade */ 	jal	func0000ab78
+/*  f15ab08:	0c002ade */ 	jal	vi0000ab78
 /*  f15ab0c:	00402025 */ 	or	$a0,$v0,$zero
 /*  f15ab10:	00408825 */ 	or	$s1,$v0,$zero
 .L0f15ab14:
@@ -3159,7 +3159,7 @@ glabel func0f15a6f4
 /*  f15ab5c:	35ad000e */ 	ori	$t5,$t5,0xe
 /*  f15ab60:	02208025 */ 	or	$s0,$s1,$zero
 /*  f15ab64:	ae0d0000 */ 	sw	$t5,0x0($s0)
-/*  f15ab68:	0c002adb */ 	jal	func0000ab6c
+/*  f15ab68:	0c002adb */ 	jal	vi0000ab6c
 /*  f15ab6c:	26310008 */ 	addiu	$s1,$s1,0x8
 /*  f15ab70:	ae020004 */ 	sw	$v0,0x4($s0)
 .L0f15ab74:
@@ -3719,7 +3719,7 @@ glabel func0f15a6f4
 .NB0f154fb0:
 /*  f154fb0:	0fc583b2 */ 	jal	gfxConsiderDisableFog
 /*  f154fb4:	02202025 */ 	or	$a0,$s1,$zero
-/*  f154fb8:	0c002b3e */ 	jal	func0000ab78
+/*  f154fb8:	0c002b3e */ 	jal	vi0000ab78
 /*  f154fbc:	00402025 */ 	or	$a0,$v0,$zero
 /*  f154fc0:	861905e8 */ 	lh	$t9,0x5e8($s0)
 /*  f154fc4:	00408825 */ 	or	$s1,$v0,$zero
@@ -3841,7 +3841,7 @@ glabel func0f15a6f4
 /*  f15515c:	00402025 */ 	or	$a0,$v0,$zero
 /*  f155160:	0fc537a0 */ 	jal	func0f153780
 /*  f155164:	00402025 */ 	or	$a0,$v0,$zero
-/*  f155168:	0c002b3e */ 	jal	func0000ab78
+/*  f155168:	0c002b3e */ 	jal	vi0000ab78
 /*  f15516c:	00402025 */ 	or	$a0,$v0,$zero
 /*  f155170:	00408825 */ 	or	$s1,$v0,$zero
 .NB0f155174:
@@ -3869,7 +3869,7 @@ glabel func0f15a6f4
 /*  f1551bc:	35ad000e */ 	ori	$t5,$t5,0xe
 /*  f1551c0:	02208025 */ 	or	$s0,$s1,$zero
 /*  f1551c4:	ae0d0000 */ 	sw	$t5,0x0($s0)
-/*  f1551c8:	0c002b3b */ 	jal	func0000ab6c
+/*  f1551c8:	0c002b3b */ 	jal	vi0000ab6c
 /*  f1551cc:	26310008 */ 	addiu	$s1,$s1,0x8
 /*  f1551d0:	ae020004 */ 	sw	$v0,0x4($s0)
 .NB0f1551d4:
diff --git a/src/game/bondgun.c b/src/game/bondgun.c
index b6df46ac7..a98d240e8 100644
--- a/src/game/bondgun.c
+++ b/src/game/bondgun.c
@@ -24678,10 +24678,10 @@ glabel var7f1aca90
 /*  f0a71ec:	0fc5d9ad */ 	jal	func0f1766b4
 /*  f0a71f0:	8fa4014c */ 	lw	$a0,0x14c($sp)
 /*  f0a71f4:	afa2014c */ 	sw	$v0,0x14c($sp)
-/*  f0a71f8:	0c002ca0 */ 	jal	func0000b280
+/*  f0a71f8:	0c002ca0 */ 	jal	vi0000b280
 /*  f0a71fc:	00402025 */ 	or	$a0,$v0,$zero
 /*  f0a7200:	afa2014c */ 	sw	$v0,0x14c($sp)
-/*  f0a7204:	0c002c74 */ 	jal	func0000b1d0
+/*  f0a7204:	0c002c74 */ 	jal	vi0000b1d0
 /*  f0a7208:	00402025 */ 	or	$a0,$v0,$zero
 /*  f0a720c:	244e0008 */ 	addiu	$t6,$v0,0x8
 /*  f0a7210:	afae014c */ 	sw	$t6,0x14c($sp)
@@ -24746,7 +24746,7 @@ glabel var7f1aca90
 /*  f0a72fc:	000f4b00 */ 	sll	$t1,$t7,0xc
 /*  f0a7300:	01894025 */ 	or	$t0,$t4,$t1
 /*  f0a7304:	aea80004 */ 	sw	$t0,0x4($s5)
-/*  f0a7308:	0c002b29 */ 	jal	func0000aca4
+/*  f0a7308:	0c002b29 */ 	jal	vi0000aca4
 /*  f0a730c:	8fa4014c */ 	lw	$a0,0x14c($sp)
 /*  f0a7310:	8e2a0284 */ 	lw	$t2,0x284($s1)
 /*  f0a7314:	afa2014c */ 	sw	$v0,0x14c($sp)
@@ -24772,7 +24772,7 @@ glabel var7f1aca90
 /*  f0a7360:	44061000 */ 	mfc1	$a2,$f2
 .L0f0a7364:
 /*  f0a7364:	8fa4014c */ 	lw	$a0,0x14c($sp)
-/*  f0a7368:	0c002c3a */ 	jal	func0000b0e8
+/*  f0a7368:	0c002c3a */ 	jal	vi0000b0e8
 /*  f0a736c:	3c054270 */ 	lui	$a1,0x4270
 /*  f0a7370:	afa2014c */ 	sw	$v0,0x14c($sp)
 /*  f0a7374:	8e2b006c */ 	lw	$t3,0x6c($s1)
@@ -25363,7 +25363,7 @@ glabel var7f1aca90
 /*  f0a7be0:	272f0008 */ 	addiu	$t7,$t9,0x8
 /*  f0a7be4:	afaf014c */ 	sw	$t7,0x14c($sp)
 /*  f0a7be8:	af290000 */ 	sw	$t1,0x0($t9)
-/*  f0a7bec:	0c002adb */ 	jal	func0000ab6c
+/*  f0a7bec:	0c002adb */ 	jal	vi0000ab6c
 /*  f0a7bf0:	afb90074 */ 	sw	$t9,0x74($sp)
 /*  f0a7bf4:	8fa30074 */ 	lw	$v1,0x74($sp)
 /*  f0a7bf8:	ac620004 */ 	sw	$v0,0x4($v1)
@@ -25380,7 +25380,7 @@ glabel var7f1aca90
 /*  f0a7c20:	0fc5d8ab */ 	jal	func0f1762ac
 /*  f0a7c24:	8fa4014c */ 	lw	$a0,0x14c($sp)
 /*  f0a7c28:	afa2014c */ 	sw	$v0,0x14c($sp)
-/*  f0a7c2c:	0c002c74 */ 	jal	func0000b1d0
+/*  f0a7c2c:	0c002c74 */ 	jal	vi0000b1d0
 /*  f0a7c30:	00402025 */ 	or	$a0,$v0,$zero
 /*  f0a7c34:	244e0008 */ 	addiu	$t6,$v0,0x8
 /*  f0a7c38:	afae014c */ 	sw	$t6,0x14c($sp)
@@ -25519,10 +25519,10 @@ glabel var7f1aca90
 /*  f0a71ec:	0fc5d9ad */ 	jal	func0f1766b4
 /*  f0a71f0:	8fa4014c */ 	lw	$a0,0x14c($sp)
 /*  f0a71f4:	afa2014c */ 	sw	$v0,0x14c($sp)
-/*  f0a71f8:	0c002ca0 */ 	jal	func0000b280
+/*  f0a71f8:	0c002ca0 */ 	jal	vi0000b280
 /*  f0a71fc:	00402025 */ 	or	$a0,$v0,$zero
 /*  f0a7200:	afa2014c */ 	sw	$v0,0x14c($sp)
-/*  f0a7204:	0c002c74 */ 	jal	func0000b1d0
+/*  f0a7204:	0c002c74 */ 	jal	vi0000b1d0
 /*  f0a7208:	00402025 */ 	or	$a0,$v0,$zero
 /*  f0a720c:	244e0008 */ 	addiu	$t6,$v0,0x8
 /*  f0a7210:	afae014c */ 	sw	$t6,0x14c($sp)
@@ -25587,7 +25587,7 @@ glabel var7f1aca90
 /*  f0a72fc:	000f4b00 */ 	sll	$t1,$t7,0xc
 /*  f0a7300:	01894025 */ 	or	$t0,$t4,$t1
 /*  f0a7304:	aea80004 */ 	sw	$t0,0x4($s5)
-/*  f0a7308:	0c002b29 */ 	jal	func0000aca4
+/*  f0a7308:	0c002b29 */ 	jal	vi0000aca4
 /*  f0a730c:	8fa4014c */ 	lw	$a0,0x14c($sp)
 /*  f0a7310:	8e2a0284 */ 	lw	$t2,0x284($s1)
 /*  f0a7314:	afa2014c */ 	sw	$v0,0x14c($sp)
@@ -25613,7 +25613,7 @@ glabel var7f1aca90
 /*  f0a7360:	44061000 */ 	mfc1	$a2,$f2
 .L0f0a7364:
 /*  f0a7364:	8fa4014c */ 	lw	$a0,0x14c($sp)
-/*  f0a7368:	0c002c3a */ 	jal	func0000b0e8
+/*  f0a7368:	0c002c3a */ 	jal	vi0000b0e8
 /*  f0a736c:	3c054270 */ 	lui	$a1,0x4270
 /*  f0a7370:	afa2014c */ 	sw	$v0,0x14c($sp)
 /*  f0a7374:	8e2b006c */ 	lw	$t3,0x6c($s1)
@@ -26204,7 +26204,7 @@ glabel var7f1aca90
 /*  f0a7be0:	272f0008 */ 	addiu	$t7,$t9,0x8
 /*  f0a7be4:	afaf014c */ 	sw	$t7,0x14c($sp)
 /*  f0a7be8:	af290000 */ 	sw	$t1,0x0($t9)
-/*  f0a7bec:	0c002adb */ 	jal	func0000ab6c
+/*  f0a7bec:	0c002adb */ 	jal	vi0000ab6c
 /*  f0a7bf0:	afb90074 */ 	sw	$t9,0x74($sp)
 /*  f0a7bf4:	8fa30074 */ 	lw	$v1,0x74($sp)
 /*  f0a7bf8:	ac620004 */ 	sw	$v0,0x4($v1)
@@ -26221,7 +26221,7 @@ glabel var7f1aca90
 /*  f0a7c20:	0fc5d8ab */ 	jal	func0f1762ac
 /*  f0a7c24:	8fa4014c */ 	lw	$a0,0x14c($sp)
 /*  f0a7c28:	afa2014c */ 	sw	$v0,0x14c($sp)
-/*  f0a7c2c:	0c002c74 */ 	jal	func0000b1d0
+/*  f0a7c2c:	0c002c74 */ 	jal	vi0000b1d0
 /*  f0a7c30:	00402025 */ 	or	$a0,$v0,$zero
 /*  f0a7c34:	244e0008 */ 	addiu	$t6,$v0,0x8
 /*  f0a7c38:	afae014c */ 	sw	$t6,0x14c($sp)
@@ -26360,10 +26360,10 @@ glabel var7f1aca90
 /*  f0a4f38:	0fc5c4d5 */ 	jal	func0f1766b4
 /*  f0a4f3c:	8fa40144 */ 	lw	$a0,0x144($sp)
 /*  f0a4f40:	afa20144 */ 	sw	$v0,0x144($sp)
-/*  f0a4f44:	0c002d00 */ 	jal	func0000b280
+/*  f0a4f44:	0c002d00 */ 	jal	vi0000b280
 /*  f0a4f48:	00402025 */ 	or	$a0,$v0,$zero
 /*  f0a4f4c:	afa20144 */ 	sw	$v0,0x144($sp)
-/*  f0a4f50:	0c002cd4 */ 	jal	func0000b1d0
+/*  f0a4f50:	0c002cd4 */ 	jal	vi0000b1d0
 /*  f0a4f54:	00402025 */ 	or	$a0,$v0,$zero
 /*  f0a4f58:	244e0008 */ 	addiu	$t6,$v0,0x8
 /*  f0a4f5c:	afae0144 */ 	sw	$t6,0x144($sp)
@@ -26428,7 +26428,7 @@ glabel var7f1aca90
 /*  f0a5048:	000f4b00 */ 	sll	$t1,$t7,0xc
 /*  f0a504c:	01894025 */ 	or	$t0,$t4,$t1
 /*  f0a5050:	aea80004 */ 	sw	$t0,0x4($s5)
-/*  f0a5054:	0c002b89 */ 	jal	func0000aca4
+/*  f0a5054:	0c002b89 */ 	jal	vi0000aca4
 /*  f0a5058:	8fa40144 */ 	lw	$a0,0x144($sp)
 /*  f0a505c:	8e2a0284 */ 	lw	$t2,0x284($s1)
 /*  f0a5060:	afa20144 */ 	sw	$v0,0x144($sp)
@@ -26454,7 +26454,7 @@ glabel var7f1aca90
 /*  f0a50ac:	44061000 */ 	mfc1	$a2,$f2
 .NB0f0a50b0:
 /*  f0a50b0:	8fa40144 */ 	lw	$a0,0x144($sp)
-/*  f0a50b4:	0c002c9a */ 	jal	func0000b0e8
+/*  f0a50b4:	0c002c9a */ 	jal	vi0000b0e8
 /*  f0a50b8:	3c054270 */ 	lui	$a1,0x4270
 /*  f0a50bc:	afa20144 */ 	sw	$v0,0x144($sp)
 /*  f0a50c0:	8e2b006c */ 	lw	$t3,0x6c($s1)
@@ -27036,7 +27036,7 @@ glabel var7f1aca90
 /*  f0a590c:	25b80008 */ 	addiu	$t8,$t5,0x8
 /*  f0a5910:	afb80144 */ 	sw	$t8,0x144($sp)
 /*  f0a5914:	adb90000 */ 	sw	$t9,0x0($t5)
-/*  f0a5918:	0c002b3b */ 	jal	func0000ab6c
+/*  f0a5918:	0c002b3b */ 	jal	vi0000ab6c
 /*  f0a591c:	afad0070 */ 	sw	$t5,0x70($sp)
 /*  f0a5920:	8fa30070 */ 	lw	$v1,0x70($sp)
 /*  f0a5924:	ac620004 */ 	sw	$v0,0x4($v1)
@@ -27053,7 +27053,7 @@ glabel var7f1aca90
 /*  f0a594c:	0fc5c3d3 */ 	jal	func0f1762ac
 /*  f0a5950:	8fa40144 */ 	lw	$a0,0x144($sp)
 /*  f0a5954:	afa20144 */ 	sw	$v0,0x144($sp)
-/*  f0a5958:	0c002cd4 */ 	jal	func0000b1d0
+/*  f0a5958:	0c002cd4 */ 	jal	vi0000b1d0
 /*  f0a595c:	00402025 */ 	or	$a0,$v0,$zero
 /*  f0a5960:	244f0008 */ 	addiu	$t7,$v0,0x8
 /*  f0a5964:	afaf0144 */ 	sw	$t7,0x144($sp)
diff --git a/src/game/credits.c b/src/game/credits.c
index e5875d31a..8a1d67e33 100644
--- a/src/game/credits.c
+++ b/src/game/credits.c
@@ -5054,9 +5054,9 @@ glabel var7f1b5948
 /*  f13bbe8:	240e0001 */ 	li	$t6,0x1
 /*  f13bbec:	3c018008 */ 	lui	$at,0x8008
 /*  f13bbf0:	ac2e0020 */ 	sw	$t6,0x20($at)
-/*  f13bbf4:	0c002bf1 */ 	jal	func0000b280
+/*  f13bbf4:	0c002bf1 */ 	jal	vi0000b280
 /*  f13bbf8:	02002025 */ 	move	$a0,$s0
-/*  f13bbfc:	0c002bc5 */ 	jal	func0000b1d0
+/*  f13bbfc:	0c002bc5 */ 	jal	vi0000b1d0
 /*  f13bc00:	00402025 */ 	move	$a0,$v0
 /*  f13bc04:	00402025 */ 	move	$a0,$v0
 /*  f13bc08:	0fc4e40d */ 	jal	creditsClearFramebuffer
@@ -5325,7 +5325,7 @@ glabel var7f1b5948
 /*  f13c000:	ac22a7ac */ 	sw	$v0,-0x5854($at)
 /*  f13c004:	0fc5b6fd */ 	jal	lvSetDifficulty
 /*  f13c008:	00002025 */ 	move	$a0,$zero
-/*  f13c00c:	0c002779 */ 	jal	func00009ec4
+/*  f13c00c:	0c002779 */ 	jal	viBlack
 /*  f13c010:	24040001 */ 	li	$a0,0x1
 .PF0f13c014:
 /*  f13c014:	8fbf001c */ 	lw	$ra,0x1c($sp)
@@ -5363,9 +5363,9 @@ glabel var7f1b5948
 /*  f13b084:	240e0001 */ 	addiu	$t6,$zero,0x1
 /*  f13b088:	3c018008 */ 	lui	$at,%hi(g_ScaleX)
 /*  f13b08c:	ac2efac0 */ 	sw	$t6,%lo(g_ScaleX)($at)
-/*  f13b090:	0c002ca0 */ 	jal	func0000b280
+/*  f13b090:	0c002ca0 */ 	jal	vi0000b280
 /*  f13b094:	02002025 */ 	or	$a0,$s0,$zero
-/*  f13b098:	0c002c74 */ 	jal	func0000b1d0
+/*  f13b098:	0c002c74 */ 	jal	vi0000b1d0
 /*  f13b09c:	00402025 */ 	or	$a0,$v0,$zero
 /*  f13b0a0:	00402025 */ 	or	$a0,$v0,$zero
 /*  f13b0a4:	0fc4e12d */ 	jal	creditsClearFramebuffer
@@ -5634,7 +5634,7 @@ glabel var7f1b5948
 /*  f13b49c:	ac22a25c */ 	sw	$v0,%lo(g_Vars+0x29c)($at)
 /*  f13b4a0:	0fc5b36a */ 	jal	lvSetDifficulty
 /*  f13b4a4:	00002025 */ 	or	$a0,$zero,$zero
-/*  f13b4a8:	0c0027b1 */ 	jal	func00009ec4
+/*  f13b4a8:	0c0027b1 */ 	jal	viBlack
 /*  f13b4ac:	24040001 */ 	addiu	$a0,$zero,0x1
 .L0f13b4b0:
 /*  f13b4b0:	8fbf001c */ 	lw	$ra,0x1c($sp)
@@ -5672,9 +5672,9 @@ glabel var7f1b5948
 /*     7f135b84:	240e0001 */ 	addiu	$t6,$zero,0x1
 /*     7f135b88:	3c018008 */ 	lui	$at,0x8008
 /*     7f135b8c:	ac2e2320 */ 	sw	$t6,0x2320($at)
-/*     7f135b90:	0c002d00 */ 	jal	func0000b280
+/*     7f135b90:	0c002d00 */ 	jal	vi0000b280
 /*     7f135b94:	02002025 */ 	or	$a0,$s0,$zero
-/*     7f135b98:	0c002cd4 */ 	jal	func0000b1d0
+/*     7f135b98:	0c002cd4 */ 	jal	vi0000b1d0
 /*     7f135b9c:	00402025 */ 	or	$a0,$v0,$zero
 /*     7f135ba0:	00402025 */ 	or	$a0,$v0,$zero
 /*     7f135ba4:	0fc4cc11 */ 	jal	creditsClearFramebuffer
@@ -5943,7 +5943,7 @@ glabel var7f1b5948
 /*     7f135f9c:	ac22e95c */ 	sw	$v0,-0x16a4($at)
 /*     7f135fa0:	0fc59ed6 */ 	jal	lvSetDifficulty
 /*     7f135fa4:	00002025 */ 	or	$a0,$zero,$zero
-/*     7f135fa8:	0c00281a */ 	jal	func00009ec4
+/*     7f135fa8:	0c00281a */ 	jal	viBlack
 /*     7f135fac:	24040001 */ 	addiu	$a0,$zero,0x1
 .NB7f135fb0:
 /*     7f135fb0:	8fbf001c */ 	lw	$ra,0x1c($sp)
@@ -5967,8 +5967,8 @@ glabel var7f1b5948
 //
 //	g_ScaleX = 1;
 //
-//	gdl = func0000b280(gdl);
-//	gdl = func0000b1d0(gdl);
+//	gdl = vi0000b280(gdl);
+//	gdl = vi0000b1d0(gdl);
 //	gdl = creditsClearFramebuffer(gdl, 0x000000ff);
 //
 //	gDPSetScissorFrac(gdl++, G_SC_NON_INTERLACE, 0, 120, viGetWidth() * 4.0f, (viGetHeight() - 30) * 4.0f);
@@ -6064,7 +6064,7 @@ glabel var7f1b5948
 //		g_Vars.antiplayernum = -1;
 //
 //		lvSetDifficulty(DIFF_A);
-//		func00009ec4(1);
+//		viBlack(true);
 //	}
 //
 //	return gdl;
diff --git a/src/game/debug2.c b/src/game/debug2.c
index ac738f587..e7741d9a1 100644
--- a/src/game/debug2.c
+++ b/src/game/debug2.c
@@ -482,11 +482,11 @@ glabel var7f1af4ecnb
 /*  f11949c:	244e0001 */ 	addiu	$t6,$v0,0x1
 /*  f1194a0:	14c20009 */ 	bne	$a2,$v0,.NB0f1194c8
 /*  f1194a4:	ac8e0000 */ 	sw	$t6,0x0($a0)
-/*  f1194a8:	0c00305e */ 	jal	func0000bfa4
+/*  f1194a8:	0c00305e */ 	jal	vi0000bfa4
 /*  f1194ac:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f1194b0:	3c048008 */ 	lui	$a0,0x8008
 /*  f1194b4:	24848814 */ 	addiu	$a0,$a0,-30700
-/*  f1194b8:	0c002b20 */ 	jal	func0000ab00
+/*  f1194b8:	0c002b20 */ 	jal	vi0000ab00
 /*  f1194bc:	ac800000 */ 	sw	$zero,0x0($a0)
 /*  f1194c0:	0c01282c */ 	jal	osViBlack
 /*  f1194c4:	00002025 */ 	or	$a0,$zero,$zero
@@ -499,11 +499,11 @@ glabel var7f1af4ecnb
 /*  f1194dc:	244f0001 */ 	addiu	$t7,$v0,0x1
 /*  f1194e0:	14c20009 */ 	bne	$a2,$v0,.NB0f119508
 /*  f1194e4:	ac8f0000 */ 	sw	$t7,0x0($a0)
-/*  f1194e8:	0c00305a */ 	jal	func0000bf94
+/*  f1194e8:	0c00305a */ 	jal	vi0000bf94
 /*  f1194ec:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f1194f0:	3c048008 */ 	lui	$a0,0x8008
 /*  f1194f4:	24848818 */ 	addiu	$a0,$a0,-30696
-/*  f1194f8:	0c002b20 */ 	jal	func0000ab00
+/*  f1194f8:	0c002b20 */ 	jal	vi0000ab00
 /*  f1194fc:	ac800000 */ 	sw	$zero,0x0($a0)
 /*  f119500:	0c01282c */ 	jal	osViBlack
 /*  f119504:	00002025 */ 	or	$a0,$zero,$zero
diff --git a/src/game/endscreen.c b/src/game/endscreen.c
index b7dff0bde..4f9121867 100644
--- a/src/game/endscreen.c
+++ b/src/game/endscreen.c
@@ -568,7 +568,7 @@ void endscreenHandleContinue(s32 context)
 						lvSetDifficulty(g_MissionConfig.difficulty);
 						titleSetNextMode(TITLEMODE_SKIP);
 						mainSetStageNum(g_MissionConfig.stagenum);
-						func00009ec4(true);
+						viBlack(true);
 					}
 				} else if (g_Vars.stagenum == STAGE_SKEDARRUINS) {
 					// Commit to starting credits
@@ -577,7 +577,7 @@ void endscreenHandleContinue(s32 context)
 					lvSetDifficulty(g_MissionConfig.difficulty);
 					titleSetNextMode(TITLEMODE_SKIP);
 					mainSetStageNum(g_MissionConfig.stagenum);
-					func00009ec4(true);
+					viBlack(true);
 				}
 			} else {
 				if (context == 1) {
diff --git a/src/game/explosions/explosions.c b/src/game/explosions/explosions.c
index a2803873b..05bd7123d 100644
--- a/src/game/explosions/explosions.c
+++ b/src/game/explosions/explosions.c
@@ -1197,7 +1197,7 @@ glabel var7f1b558c
 /*  f12ad2c:	15c00006 */ 	bnez	$t6,.L0f12ad48
 /*  f12ad30:	afa60070 */ 	sw	$a2,0x70($sp)
 /*  f12ad34:	44806000 */ 	mtc1	$zero,$f12
-/*  f12ad38:	0c002a94 */ 	jal	func0000aa50
+/*  f12ad38:	0c002a94 */ 	jal	vi0000aa50
 /*  f12ad3c:	00000000 */ 	nop
 /*  f12ad40:	1000007a */ 	b	.L0f12af2c
 /*  f12ad44:	8fbf004c */ 	lw	$ra,0x4c($sp)
@@ -1327,7 +1327,7 @@ glabel var7f1b558c
 /*  f12af14:	00000000 */ 	nop
 /*  f12af18:	468084a0 */ 	cvt.s.w	$f18,$f16
 /*  f12af1c:	46149302 */ 	mul.s	$f12,$f18,$f20
-/*  f12af20:	0c002a94 */ 	jal	func0000aa50
+/*  f12af20:	0c002a94 */ 	jal	vi0000aa50
 /*  f12af24:	00000000 */ 	nop
 /*  f12af28:	8fbf004c */ 	lw	$ra,0x4c($sp)
 .L0f12af2c:
diff --git a/src/game/explosions/reset.c b/src/game/explosions/reset.c
index 26a0771a1..78065028a 100644
--- a/src/game/explosions/reset.c
+++ b/src/game/explosions/reset.c
@@ -11,7 +11,7 @@ void explosionsReset(void)
 	s32 i;
 
 	var8007e4a0 = 0;
-	func0000aa50(0);
+	vi0000aa50(0);
 
 	if (g_Explosions) {
 		for (i = 0; i < 6; i++) {
diff --git a/src/game/game_01bea0.c b/src/game/game_01bea0.c
index 2389c15c4..b1a07297e 100644
--- a/src/game/game_01bea0.c
+++ b/src/game/game_01bea0.c
@@ -354,7 +354,7 @@ glabel var7f1a863c
 /*  f01c3ac:	1461005b */ 	bne	$v1,$at,.PF0f01c51c
 /*  f01c3b0:	00000000 */ 	nop
 .PF0f01c3b4:
-/*  f01c3b4:	0c002779 */ 	jal	func00009ec4
+/*  f01c3b4:	0c002779 */ 	jal	viBlack
 /*  f01c3b8:	00002025 */ 	move	$a0,$zero
 /*  f01c3bc:	8e78049c */ 	lw	$t8,0x49c($s3)
 /*  f01c3c0:	3c148007 */ 	lui	$s4,0x8007
@@ -458,7 +458,7 @@ glabel var7f1a863c
 /*  f01c520:	10000005 */ 	b	.PF0f01c538
 /*  f01c524:	ac2077b0 */ 	sw	$zero,0x77b0($at)
 .PF0f01c528:
-/*  f01c528:	0c002779 */ 	jal	func00009ec4
+/*  f01c528:	0c002779 */ 	jal	viBlack
 /*  f01c52c:	02c02025 */ 	move	$a0,$s6
 /*  f01c530:	3c018007 */ 	lui	$at,0x8007
 /*  f01c534:	ac200a30 */ 	sw	$zero,0xa30($at)
@@ -2131,7 +2131,7 @@ glabel var7f1a863c
 /*  f01c2dc:	1461005b */ 	bne	$v1,$at,.L0f01c44c
 /*  f01c2e0:	00000000 */ 	nop
 .L0f01c2e4:
-/*  f01c2e4:	0c0027b1 */ 	jal	func00009ec4
+/*  f01c2e4:	0c0027b1 */ 	jal	viBlack
 /*  f01c2e8:	00002025 */ 	or	$a0,$zero,$zero
 /*  f01c2ec:	8e6d049c */ 	lw	$t5,0x49c($s3)
 /*  f01c2f0:	3c148007 */ 	lui	$s4,%hi(var800714d8)
@@ -2235,7 +2235,7 @@ glabel var7f1a863c
 /*  f01c450:	10000005 */ 	b	.L0f01c468
 /*  f01c454:	ac207260 */ 	sw	$zero,%lo(var80087260)($at)
 .L0f01c458:
-/*  f01c458:	0c0027b1 */ 	jal	func00009ec4
+/*  f01c458:	0c0027b1 */ 	jal	viBlack
 /*  f01c45c:	02c02025 */ 	or	$a0,$s6,$zero
 /*  f01c460:	3c018007 */ 	lui	$at,%hi(g_PlayersWithControl)
 /*  f01c464:	ac200750 */ 	sw	$zero,%lo(g_PlayersWithControl)($at)
@@ -3908,7 +3908,7 @@ glabel var7f1a863c
 /*  f01bfdc:	14610056 */ 	bne	$v1,$at,.NB0f01c138
 /*  f01bfe0:	00000000 */ 	sll	$zero,$zero,0x0
 .NB0f01bfe4:
-/*  f01bfe4:	0c00281a */ 	jal	func00009ec4
+/*  f01bfe4:	0c00281a */ 	jal	viBlack
 /*  f01bfe8:	00002025 */ 	or	$a0,$zero,$zero
 /*  f01bfec:	8e6d049c */ 	lw	$t5,0x49c($s3)
 /*  f01bff0:	3c148007 */ 	lui	$s4,0x8007
@@ -4007,7 +4007,7 @@ glabel var7f1a863c
 /*  f01c13c:	10000005 */ 	beqz	$zero,.NB0f01c154
 /*  f01c140:	ac2099e0 */ 	sw	$zero,-0x6620($at)
 .NB0f01c144:
-/*  f01c144:	0c00281a */ 	jal	func00009ec4
+/*  f01c144:	0c00281a */ 	jal	viBlack
 /*  f01c148:	02c02025 */ 	or	$a0,$s6,$zero
 /*  f01c14c:	3c018007 */ 	lui	$at,0x8007
 /*  f01c150:	ac202e10 */ 	sw	$zero,0x2e10($at)
@@ -5548,7 +5548,7 @@ glabel var7f1a863c
 //		if (g_Vars.lvframenum >= 4) {
 //			// c2cc
 //			if (g_Vars.stagenum == STAGE_CITRAINING || g_Vars.stagenum == STAGE_4MBMENU) {
-//				func00009ec4(false);
+//				viBlack(false);
 //				var800714d8 = 0;
 //
 //				// c2f8
@@ -5597,7 +5597,7 @@ glabel var7f1a863c
 //
 //			var80087260 = 0;
 //		} else {
-//			func00009ec4(true);
+//			viBlack(true);
 //			g_PlayersWithControl[0] = false;
 //		}
 //	}
diff --git a/src/game/game_0b69d0.c b/src/game/game_0b69d0.c
index a70b1e3c5..f82411c68 100644
--- a/src/game/game_0b69d0.c
+++ b/src/game/game_0b69d0.c
@@ -5006,7 +5006,7 @@ void func0f0bd3c4(void)
 	if (g_Vars.currentplayer->isdead == false) {
 		func0f12acec(&g_Vars.currentplayer->bond2.unk10, &g_Vars.currentplayer->bond2.unk1c, &coord);
 	} else {
-		func0000aa50(0);
+		vi0000aa50(0);
 	}
 }
 
@@ -5113,7 +5113,7 @@ void currentPlayerConfigureVi(void)
 	currentPlayerSetViewSize(currentPlayerGetViewportWidth(), currentPlayerGetViewportHeight());
 	currentPlayerSetViewPosition(currentPlayerGetViewportLeft(), currentPlayerGetViewportTop());
 
-	func0000aab0(g_ViModes[g_ViMode].xscale);
+	vi0000aab0(g_ViModes[g_ViMode].xscale);
 
 	viSetFovAspectAndSize(60, ratio, currentPlayerGetViewportWidth(), currentPlayerGetViewportHeight());
 
@@ -5316,7 +5316,7 @@ glabel var7f1ad6ac
 /*  f0be0a4:	01ee7823 */ 	subu	$t7,$t7,$t6
 /*  f0be0a8:	000f7880 */ 	sll	$t7,$t7,0x2
 /*  f0be0ac:	008f2021 */ 	addu	$a0,$a0,$t7
-/*  f0be0b0:	0c0029fd */ 	jal	func0000aab0
+/*  f0be0b0:	0c0029fd */ 	jal	vi0000aab0
 /*  f0be0b4:	8c840960 */ 	lw	$a0,0x960($a0)
 /*  f0be0b8:	0fc2f2b4 */ 	jal	currentPlayerGetViewportWidth
 /*  f0be0bc:	00000000 */ 	nop
@@ -7717,7 +7717,7 @@ glabel var7f1ad6ac
 /*  f0bdb38:	030fc023 */ 	subu	$t8,$t8,$t7
 /*  f0bdb3c:	0018c080 */ 	sll	$t8,$t8,0x2
 /*  f0bdb40:	00982021 */ 	addu	$a0,$a0,$t8
-/*  f0bdb44:	0c002aac */ 	jal	func0000aab0
+/*  f0bdb44:	0c002aac */ 	jal	vi0000aab0
 /*  f0bdb48:	8c8405d0 */ 	lw	$a0,%lo(g_ViModes+0x10)($a0)
 /*  f0bdb4c:	0fc2f155 */ 	jal	currentPlayerGetViewportWidth
 /*  f0bdb50:	00000000 */ 	nop
@@ -10118,7 +10118,7 @@ glabel var7f1ad6ac
 /*  f0bb7a0:	030fc023 */ 	subu	$t8,$t8,$t7
 /*  f0bb7a4:	0018c080 */ 	sll	$t8,$t8,0x2
 /*  f0bb7a8:	00982021 */ 	addu	$a0,$a0,$t8
-/*  f0bb7ac:	0c002b0c */ 	jal	func0000aab0
+/*  f0bb7ac:	0c002b0c */ 	jal	vi0000aab0
 /*  f0bb7b0:	8c842c90 */ 	lw	$a0,0x2c90($a0)
 /*  f0bb7b4:	0fc2e865 */ 	jal	currentPlayerGetViewportWidth
 /*  f0bb7b8:	00000000 */ 	sll	$zero,$zero,0x0
@@ -12348,7 +12348,7 @@ glabel var7f1ad6ac
 //	currentPlayerSetViewPosition(currentPlayerGetViewportLeft(), currentPlayerGetViewportTop());
 //
 //	// db44
-//	func0000aab0(g_ViModes[g_ViMode].xscale);
+//	vi0000aab0(g_ViModes[g_ViMode].xscale);
 //	viSetFovAspectAndSize(60, aspectratio, currentPlayerGetViewportWidth(), currentPlayerGetViewportHeight());
 //	viSetViewPosition(currentPlayerGetViewportLeft(), currentPlayerGetViewportTop());
 //	viSetXY(viGetFbWidth(), viGetFbHeight());
diff --git a/src/game/game_0f09f0.c b/src/game/game_0f09f0.c
index 1246f253f..7b55f5b3b 100644
--- a/src/game/game_0f09f0.c
+++ b/src/game/game_0f09f0.c
@@ -5513,10 +5513,10 @@ glabel var7f1b3c40pf
 /*  f0f4488:	000a6280 */ 	sll	$t4,$t2,0xa
 /*  f0f448c:	05830018 */ 	bgezl	$t4,.PF0f0f44f0
 /*  f0f4490:	8faa0440 */ 	lw	$t2,0x440($sp)
-/*  f0f4494:	0c002bf1 */ 	jal	func0000b280
+/*  f0f4494:	0c002bf1 */ 	jal	vi0000b280
 /*  f0f4498:	8fa40440 */ 	lw	$a0,0x440($sp)
 /*  f0f449c:	afa20440 */ 	sw	$v0,0x440($sp)
-/*  f0f44a0:	0c002bc5 */ 	jal	func0000b1d0
+/*  f0f44a0:	0c002bc5 */ 	jal	vi0000b1d0
 /*  f0f44a4:	00402025 */ 	move	$a0,$v0
 /*  f0f44a8:	3c0f800a */ 	lui	$t7,0x800a
 /*  f0f44ac:	91ef2535 */ 	lbu	$t7,0x2535($t7)
@@ -6267,7 +6267,7 @@ glabel var7f1b3c40pf
 /*  f0f4fbc:	273925e8 */ 	addiu	$t9,$t9,0x25e8
 /*  f0f4fc0:	000c7940 */ 	sll	$t7,$t4,0x5
 /*  f0f4fc4:	01f92821 */ 	addu	$a1,$t7,$t9
-/*  f0f4fc8:	0c002b11 */ 	jal	func0000af00
+/*  f0f4fc8:	0c002b11 */ 	jal	vi0000af00
 /*  f0f4fcc:	8fa40440 */ 	lw	$a0,0x440($sp)
 /*  f0f4fd0:	3c0e8007 */ 	lui	$t6,0x8007
 /*  f0f4fd4:	8dce17a0 */ 	lw	$t6,0x17a0($t6)
@@ -6293,7 +6293,7 @@ glabel var7f1b3c40pf
 /*  f0f5020:	46044200 */ 	add.s	$f8,$f8,$f4
 .PF0f0f5024:
 /*  f0f5024:	44064000 */ 	mfc1	$a2,$f8
-/*  f0f5028:	0c002a7a */ 	jal	func0000aca4
+/*  f0f5028:	0c002a7a */ 	jal	vi0000aca4
 /*  f0f502c:	00000000 */ 	nop
 /*  f0f5030:	afa20440 */ 	sw	$v0,0x440($sp)
 .PF0f0f5034:
@@ -7115,10 +7115,10 @@ glabel var7f1b2948
 /*  f0f3d34:	00195a80 */ 	sll	$t3,$t9,0xa
 /*  f0f3d38:	05630018 */ 	bgezl	$t3,.L0f0f3d9c
 /*  f0f3d3c:	8faa0440 */ 	lw	$t2,0x440($sp)
-/*  f0f3d40:	0c002ca0 */ 	jal	func0000b280
+/*  f0f3d40:	0c002ca0 */ 	jal	vi0000b280
 /*  f0f3d44:	8fa40440 */ 	lw	$a0,0x440($sp)
 /*  f0f3d48:	afa20440 */ 	sw	$v0,0x440($sp)
-/*  f0f3d4c:	0c002c74 */ 	jal	func0000b1d0
+/*  f0f3d4c:	0c002c74 */ 	jal	vi0000b1d0
 /*  f0f3d50:	00402025 */ 	or	$a0,$v0,$zero
 /*  f0f3d54:	3c0e800a */ 	lui	$t6,%hi(g_MenuData+0x5d5)
 /*  f0f3d58:	91ce1f95 */ 	lbu	$t6,%lo(g_MenuData+0x5d5)($t6)
@@ -7880,7 +7880,7 @@ glabel var7f1b2948
 /*  f0f488c:	25ef2048 */ 	addiu	$t7,$t7,%lo(var800a2048)
 /*  f0f4890:	000d6140 */ 	sll	$t4,$t5,0x5
 /*  f0f4894:	018f2821 */ 	addu	$a1,$t4,$t7
-/*  f0f4898:	0c002bc0 */ 	jal	func0000af00
+/*  f0f4898:	0c002bc0 */ 	jal	vi0000af00
 /*  f0f489c:	8fa40440 */ 	lw	$a0,0x440($sp)
 /*  f0f48a0:	3c188007 */ 	lui	$t8,%hi(var800714c0)
 /*  f0f48a4:	8f1814c0 */ 	lw	$t8,%lo(var800714c0)($t8)
@@ -7906,7 +7906,7 @@ glabel var7f1b2948
 /*  f0f48f0:	46085280 */ 	add.s	$f10,$f10,$f8
 .L0f0f48f4:
 /*  f0f48f4:	44065000 */ 	mfc1	$a2,$f10
-/*  f0f48f8:	0c002b29 */ 	jal	func0000aca4
+/*  f0f48f8:	0c002b29 */ 	jal	vi0000aca4
 /*  f0f48fc:	00000000 */ 	nop
 /*  f0f4900:	afa20440 */ 	sw	$v0,0x440($sp)
 .L0f0f4904:
@@ -8724,10 +8724,10 @@ glabel var7f1b2948
 /*  f0f0878:	00195a80 */ 	sll	$t3,$t9,0xa
 /*  f0f087c:	05630018 */ 	bgezl	$t3,.NB0f0f08e0
 /*  f0f0880:	8faa0468 */ 	lw	$t2,0x468($sp)
-/*  f0f0884:	0c002d00 */ 	jal	func0000b280
+/*  f0f0884:	0c002d00 */ 	jal	vi0000b280
 /*  f0f0888:	8fa40468 */ 	lw	$a0,0x468($sp)
 /*  f0f088c:	afa20468 */ 	sw	$v0,0x468($sp)
-/*  f0f0890:	0c002cd4 */ 	jal	func0000b1d0
+/*  f0f0890:	0c002cd4 */ 	jal	vi0000b1d0
 /*  f0f0894:	00402025 */ 	or	$a0,$v0,$zero
 /*  f0f0898:	3c0e800a */ 	lui	$t6,0x800a
 /*  f0f089c:	91ce6485 */ 	lbu	$t6,0x6485($t6)
@@ -9514,7 +9514,7 @@ glabel var7f1b2948
 /*  f0f1430:	25ad6538 */ 	addiu	$t5,$t5,0x6538
 /*  f0f1434:	000a5940 */ 	sll	$t3,$t2,0x5
 /*  f0f1438:	016d2821 */ 	addu	$a1,$t3,$t5
-/*  f0f143c:	0c002c20 */ 	jal	func0000af00
+/*  f0f143c:	0c002c20 */ 	jal	vi0000af00
 /*  f0f1440:	8fa40468 */ 	lw	$a0,0x468($sp)
 /*  f0f1444:	3c0e8007 */ 	lui	$t6,0x8007
 /*  f0f1448:	8dce3b74 */ 	lw	$t6,0x3b74($t6)
@@ -9540,7 +9540,7 @@ glabel var7f1b2948
 /*  f0f1494:	46085280 */ 	add.s	$f10,$f10,$f8
 .NB0f0f1498:
 /*  f0f1498:	44065000 */ 	mfc1	$a2,$f10
-/*  f0f149c:	0c002b89 */ 	jal	func0000aca4
+/*  f0f149c:	0c002b89 */ 	jal	vi0000aca4
 /*  f0f14a0:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f0f14a4:	afa20468 */ 	sw	$v0,0x468($sp)
 .NB0f0f14a8:
diff --git a/src/game/game_11f000.c b/src/game/game_11f000.c
index 32e257be3..281848698 100644
--- a/src/game/game_11f000.c
+++ b/src/game/game_11f000.c
@@ -908,14 +908,14 @@ glabel var7f1b50c8
 /*  f11fa88:	54ab0007 */ 	bnel	$a1,$t3,.L0f11faa8
 /*  f11fa8c:	91050008 */ 	lbu	$a1,0x8($t0)
 /*  f11fa90:	8fa406b0 */ 	lw	$a0,0x6b0($sp)
-/*  f11fa94:	0c002fc1 */ 	jal	func0000bf04
+/*  f11fa94:	0c002fc1 */ 	jal	vi0000bf04
 /*  f11fa98:	00002825 */ 	or	$a1,$zero,$zero
 /*  f11fa9c:	10000007 */ 	b	.L0f11fabc
 /*  f11faa0:	00401825 */ 	or	$v1,$v0,$zero
 /*  f11faa4:	91050008 */ 	lbu	$a1,0x8($t0)
 .L0f11faa8:
 /*  f11faa8:	91060009 */ 	lbu	$a2,0x9($t0)
-/*  f11faac:	0c002fc1 */ 	jal	func0000bf04
+/*  f11faac:	0c002fc1 */ 	jal	vi0000bf04
 /*  f11fab0:	9107000a */ 	lbu	$a3,0xa($t0)
 /*  f11fab4:	afa206b0 */ 	sw	$v0,0x6b0($sp)
 /*  f11fab8:	00401825 */ 	or	$v1,$v0,$zero
@@ -985,14 +985,14 @@ glabel var7f1b50c8
 /*  f11fbb0:	54af0007 */ 	bnel	$a1,$t7,.L0f11fbd0
 /*  f11fbb4:	91050008 */ 	lbu	$a1,0x8($t0)
 /*  f11fbb8:	8fa406b0 */ 	lw	$a0,0x6b0($sp)
-/*  f11fbbc:	0c002fc1 */ 	jal	func0000bf04
+/*  f11fbbc:	0c002fc1 */ 	jal	vi0000bf04
 /*  f11fbc0:	00002825 */ 	or	$a1,$zero,$zero
 /*  f11fbc4:	10000006 */ 	b	.L0f11fbe0
 /*  f11fbc8:	afa206b0 */ 	sw	$v0,0x6b0($sp)
 /*  f11fbcc:	91050008 */ 	lbu	$a1,0x8($t0)
 .L0f11fbd0:
 /*  f11fbd0:	91060009 */ 	lbu	$a2,0x9($t0)
-/*  f11fbd4:	0c002fc1 */ 	jal	func0000bf04
+/*  f11fbd4:	0c002fc1 */ 	jal	vi0000bf04
 /*  f11fbd8:	9107000a */ 	lbu	$a3,0xa($t0)
 /*  f11fbdc:	afa206b0 */ 	sw	$v0,0x6b0($sp)
 .L0f11fbe0:
@@ -1045,7 +1045,7 @@ glabel var7f1b50c8
 /*  f11fc94:	91060009 */ 	lbu	$a2,0x9($t0)
 /*  f11fc98:	9107000a */ 	lbu	$a3,0xa($t0)
 /*  f11fc9c:	afa8042c */ 	sw	$t0,0x42c($sp)
-/*  f11fca0:	0c002fc1 */ 	jal	func0000bf04
+/*  f11fca0:	0c002fc1 */ 	jal	vi0000bf04
 /*  f11fca4:	8fa406b0 */ 	lw	$a0,0x6b0($sp)
 /*  f11fca8:	44806000 */ 	mtc1	$zero,$f12
 /*  f11fcac:	27b106a4 */ 	addiu	$s1,$sp,0x6a4
diff --git a/src/game/lv.c b/src/game/lv.c
index e425d79d6..15c3f669a 100644
--- a/src/game/lv.c
+++ b/src/game/lv.c
@@ -1837,9 +1837,9 @@ glabel var7f1b8e7cpf
 /*  f16a3c4:	ac4c0004 */ 	sw	$t4,0x4($v0)
 /*  f16a3c8:	26730008 */ 	addiu	$s3,$s3,0x8
 .PF0f16a3cc:
-/*  f16a3cc:	0c002bf1 */ 	jal	func0000b280
+/*  f16a3cc:	0c002bf1 */ 	jal	vi0000b280
 /*  f16a3d0:	02602025 */ 	move	$a0,$s3
-/*  f16a3d4:	0c002bc5 */ 	jal	func0000b1d0
+/*  f16a3d4:	0c002bc5 */ 	jal	vi0000b1d0
 /*  f16a3d8:	00402025 */ 	move	$a0,$v0
 /*  f16a3dc:	00408825 */ 	move	$s1,$v0
 /*  f16a3e0:	0c002e91 */ 	jal	viGetViewLeft
@@ -1963,9 +1963,9 @@ glabel var7f1b8e7cpf
 /*  f16a5b0:	44816000 */ 	mtc1	$at,$f12
 /*  f16a5b4:	0c005936 */ 	jal	func00016748
 /*  f16a5b8:	00000000 */ 	nop
-/*  f16a5bc:	0c002bc5 */ 	jal	func0000b1d0
+/*  f16a5bc:	0c002bc5 */ 	jal	vi0000b1d0
 /*  f16a5c0:	02602025 */ 	move	$a0,$s3
-/*  f16a5c4:	0c002c1d */ 	jal	func0000b330
+/*  f16a5c4:	0c002c1d */ 	jal	vi0000b330
 /*  f16a5c8:	00402025 */ 	move	$a0,$v0
 /*  f16a5cc:	0fc576bd */ 	jal	currentPlayerScissorToViewport
 /*  f16a5d0:	00402025 */ 	move	$a0,$v0
@@ -2017,7 +2017,7 @@ glabel var7f1b8e7cpf
 /*  f16a684:	26730008 */ 	addiu	$s3,$s3,0x8
 /*  f16a688:	0fc4a4ff */ 	jal	setCurrentPlayerNum
 /*  f16a68c:	00002025 */ 	move	$a0,$zero
-/*  f16a690:	0c0029fd */ 	jal	func0000aab0
+/*  f16a690:	0c0029fd */ 	jal	vi0000aab0
 /*  f16a694:	24040001 */ 	li	$a0,0x1
 /*  f16a698:	8e500284 */ 	lw	$s0,0x284($s2)
 /*  f16a69c:	86040634 */ 	lh	$a0,0x634($s0)
@@ -2060,7 +2060,7 @@ glabel var7f1b8e7cpf
 /*  f16a730:	44816000 */ 	mtc1	$at,$f12
 /*  f16a734:	0c005936 */ 	jal	func00016748
 /*  f16a738:	00000000 */ 	nop
-/*  f16a73c:	0c002bc5 */ 	jal	func0000b1d0
+/*  f16a73c:	0c002bc5 */ 	jal	vi0000b1d0
 /*  f16a740:	02602025 */ 	move	$a0,$s3
 /*  f16a744:	0fc576bd */ 	jal	currentPlayerScissorToViewport
 /*  f16a748:	00402025 */ 	move	$a0,$v0
@@ -2133,11 +2133,11 @@ glabel var7f1b8e7cpf
 /*  f16a850:	44816000 */ 	mtc1	$at,$f12
 /*  f16a854:	0c005936 */ 	jal	func00016748
 /*  f16a858:	00000000 */ 	nop
-/*  f16a85c:	0c002bbb */ 	jal	func0000b1a8
+/*  f16a85c:	0c002bbb */ 	jal	vi0000b1a8
 /*  f16a860:	02602025 */ 	move	$a0,$s3
-/*  f16a864:	0c002bc5 */ 	jal	func0000b1d0
+/*  f16a864:	0c002bc5 */ 	jal	vi0000b1d0
 /*  f16a868:	00402025 */ 	move	$a0,$v0
-/*  f16a86c:	0c002c1d */ 	jal	func0000b330
+/*  f16a86c:	0c002c1d */ 	jal	vi0000b330
 /*  f16a870:	00402025 */ 	move	$a0,$v0
 /*  f16a874:	0fc4eef2 */ 	jal	creditsRender
 /*  f16a878:	00402025 */ 	move	$a0,$v0
@@ -2347,9 +2347,9 @@ glabel var7f1b8e7cpf
 /*  f16ab64:	00000000 */ 	nop
 /*  f16ab68:	0fc5dcb2 */ 	jal	func0f176298
 /*  f16ab6c:	00000000 */ 	nop
-/*  f16ab70:	0c002bf1 */ 	jal	func0000b280
+/*  f16ab70:	0c002bf1 */ 	jal	vi0000b280
 /*  f16ab74:	02602025 */ 	move	$a0,$s3
-/*  f16ab78:	0c002bc5 */ 	jal	func0000b1d0
+/*  f16ab78:	0c002bc5 */ 	jal	vi0000b1d0
 /*  f16ab7c:	00402025 */ 	move	$a0,$v0
 /*  f16ab80:	0fc576bd */ 	jal	currentPlayerScissorToViewport
 /*  f16ab84:	00402025 */ 	move	$a0,$v0
@@ -2438,7 +2438,7 @@ glabel var7f1b8e7cpf
 /*  f16acb8:	3c0e8007 */ 	lui	$t6,0x8007
 /*  f16acbc:	11e00012 */ 	beqz	$t7,.PF0f16ad08
 /*  f16acc0:	00000000 */ 	nop
-/*  f16acc4:	0c002c1d */ 	jal	func0000b330
+/*  f16acc4:	0c002c1d */ 	jal	vi0000b330
 /*  f16acc8:	02602025 */ 	move	$a0,$s3
 /*  f16accc:	0fc576bd */ 	jal	currentPlayerScissorToViewport
 /*  f16acd0:	00402025 */ 	move	$a0,$v0
@@ -2464,7 +2464,7 @@ glabel var7f1b8e7cpf
 /*  f16ad1c:	02602025 */ 	move	$a0,$s3
 /*  f16ad20:	00409825 */ 	move	$s3,$v0
 .PF0f16ad24:
-/*  f16ad24:	0c002c1d */ 	jal	func0000b330
+/*  f16ad24:	0c002c1d */ 	jal	vi0000b330
 /*  f16ad28:	02602025 */ 	move	$a0,$s3
 /*  f16ad2c:	0fc48121 */ 	jal	func0f11f984
 /*  f16ad30:	00402025 */ 	move	$a0,$v0
@@ -3713,8 +3713,8 @@ Gfx *lvRender(Gfx *gdl)
 			gSPDisplayList(gdl++, &var80061380);
 		}
 
-		gdl = func0000b280(gdl);
-		gdl = func0000b1d0(gdl);
+		gdl = vi0000b280(gdl);
+		gdl = vi0000b1d0(gdl);
 
 		gDPSetScissorFrac(gdl++, 0,
 				viGetViewLeft() * 4.0f, viGetViewTop() * 4.0f,
@@ -3734,8 +3734,8 @@ Gfx *lvRender(Gfx *gdl)
 				g_Vars.currentplayer->viewwidth, g_Vars.currentplayer->viewheight);
 		func00016748(1);
 
-		gdl = func0000b1d0(gdl);
-		gdl = func0000b330(gdl);
+		gdl = vi0000b1d0(gdl);
+		gdl = vi0000b330(gdl);
 		gdl = currentPlayerScissorToViewport(gdl);
 		gdl = func0f0fbc30(gdl);
 	} else if (g_Vars.stagenum == STAGE_4MBMENU) {
@@ -3749,7 +3749,7 @@ Gfx *lvRender(Gfx *gdl)
 				g_Vars.currentplayer->viewwidth, g_Vars.currentplayer->viewheight);
 		func00016748(1);
 
-		gdl = func0000b1d0(gdl);
+		gdl = vi0000b1d0(gdl);
 		gdl = currentPlayerScissorToViewport(gdl);
 		gdl = func0f0fbc30(gdl);
 
@@ -3767,9 +3767,9 @@ Gfx *lvRender(Gfx *gdl)
 				g_Vars.currentplayer->viewwidth, g_Vars.currentplayer->viewheight);
 		func00016748(1);
 
-		gdl = func0000b1a8(gdl);
-		gdl = func0000b1d0(gdl);
-		gdl = func0000b330(gdl);
+		gdl = vi0000b1a8(gdl);
+		gdl = vi0000b1d0(gdl);
+		gdl = vi0000b330(gdl);
 		gdl = creditsRender(gdl);
 	} else {
 		// Normal stages
@@ -3844,8 +3844,8 @@ Gfx *lvRender(Gfx *gdl)
 			func00016748(g_Vars.currentplayerstats->scale_bg2gfx);
 			func0f1657f8();
 			func0f176298();
-			gdl = func0000b280(gdl);
-			gdl = func0000b1d0(gdl);
+			gdl = vi0000b280(gdl);
+			gdl = vi0000b1d0(gdl);
 			gdl = currentPlayerScissorToViewport(gdl);
 			func0f13c510();
 
@@ -3870,7 +3870,7 @@ Gfx *lvRender(Gfx *gdl)
 				gdl = bviewRenderMotionBlur(gdl, 0xffffffff, 255);
 				g_Vars.lockscreen--;
 			} else if (var8009dfc0) {
-				gdl = func0000b330(gdl);
+				gdl = vi0000b330(gdl);
 				gdl = currentPlayerScissorToViewport(gdl);
 				func00016748(1);
 
@@ -3882,7 +3882,7 @@ Gfx *lvRender(Gfx *gdl)
 					gdl = currentPlayerUpdateShootRot(gdl);
 				}
 
-				gdl = func0000b330(gdl);
+				gdl = vi0000b330(gdl);
 				gdl = func0f11f984(gdl);
 				roomsTick();
 				func0f004314();
@@ -4439,9 +4439,9 @@ glabel var7f1b1fd4nb
 /*  f164110:	ac4c0004 */ 	sw	$t4,0x4($v0)
 /*  f164114:	26730008 */ 	addiu	$s3,$s3,0x8
 .NB0f164118:
-/*  f164118:	0c002d00 */ 	jal	func0000b280
+/*  f164118:	0c002d00 */ 	jal	vi0000b280
 /*  f16411c:	02602025 */ 	or	$a0,$s3,$zero
-/*  f164120:	0c002cd4 */ 	jal	func0000b1d0
+/*  f164120:	0c002cd4 */ 	jal	vi0000b1d0
 /*  f164124:	00402025 */ 	or	$a0,$v0,$zero
 /*  f164128:	0040a025 */ 	or	$s4,$v0,$zero
 /*  f16412c:	0c002fb5 */ 	jal	viGetViewLeft
@@ -4566,9 +4566,9 @@ glabel var7f1b1fd4nb
 /*  f164300:	44816000 */ 	mtc1	$at,$f12
 /*  f164304:	0c005db6 */ 	jal	func00016748
 /*  f164308:	00000000 */ 	sll	$zero,$zero,0x0
-/*  f16430c:	0c002cd4 */ 	jal	func0000b1d0
+/*  f16430c:	0c002cd4 */ 	jal	vi0000b1d0
 /*  f164310:	02602025 */ 	or	$a0,$s3,$zero
-/*  f164314:	0c002d2c */ 	jal	func0000b330
+/*  f164314:	0c002d2c */ 	jal	vi0000b330
 /*  f164318:	00402025 */ 	or	$a0,$v0,$zero
 /*  f16431c:	0fc55c96 */ 	jal	currentPlayerScissorToViewport
 /*  f164320:	00402025 */ 	or	$a0,$v0,$zero
@@ -4634,7 +4634,7 @@ glabel var7f1b1fd4nb
 /*  f16440c:	44816000 */ 	mtc1	$at,$f12
 /*  f164410:	0c005db6 */ 	jal	func00016748
 /*  f164414:	00000000 */ 	sll	$zero,$zero,0x0
-/*  f164418:	0c002cd4 */ 	jal	func0000b1d0
+/*  f164418:	0c002cd4 */ 	jal	vi0000b1d0
 /*  f16441c:	02602025 */ 	or	$a0,$s3,$zero
 /*  f164420:	0fc55c96 */ 	jal	currentPlayerScissorToViewport
 /*  f164424:	00402025 */ 	or	$a0,$v0,$zero
@@ -4707,11 +4707,11 @@ glabel var7f1b1fd4nb
 /*  f16452c:	44816000 */ 	mtc1	$at,$f12
 /*  f164530:	0c005db6 */ 	jal	func00016748
 /*  f164534:	00000000 */ 	sll	$zero,$zero,0x0
-/*  f164538:	0c002cca */ 	jal	func0000b1a8
+/*  f164538:	0c002cca */ 	jal	vi0000b1a8
 /*  f16453c:	02602025 */ 	or	$a0,$s3,$zero
-/*  f164540:	0c002cd4 */ 	jal	func0000b1d0
+/*  f164540:	0c002cd4 */ 	jal	vi0000b1d0
 /*  f164544:	00402025 */ 	or	$a0,$v0,$zero
-/*  f164548:	0c002d2c */ 	jal	func0000b330
+/*  f164548:	0c002d2c */ 	jal	vi0000b330
 /*  f16454c:	00402025 */ 	or	$a0,$v0,$zero
 /*  f164550:	0fc4d6d9 */ 	jal	creditsRender
 /*  f164554:	00402025 */ 	or	$a0,$v0,$zero
@@ -4932,9 +4932,9 @@ glabel var7f1b1fd4nb
 /*  f164868:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f16486c:	0fc5c3ce */ 	jal	func0f176298
 /*  f164870:	00000000 */ 	sll	$zero,$zero,0x0
-/*  f164874:	0c002d00 */ 	jal	func0000b280
+/*  f164874:	0c002d00 */ 	jal	vi0000b280
 /*  f164878:	02602025 */ 	or	$a0,$s3,$zero
-/*  f16487c:	0c002cd4 */ 	jal	func0000b1d0
+/*  f16487c:	0c002cd4 */ 	jal	vi0000b1d0
 /*  f164880:	00402025 */ 	or	$a0,$v0,$zero
 /*  f164884:	0fc55c96 */ 	jal	currentPlayerScissorToViewport
 /*  f164888:	00402025 */ 	or	$a0,$v0,$zero
@@ -5024,7 +5024,7 @@ glabel var7f1b1fd4nb
 /*  f1649c0:	3c0b8008 */ 	lui	$t3,0x8008
 /*  f1649c4:	11e00012 */ 	beqz	$t7,.NB0f164a10
 /*  f1649c8:	00000000 */ 	sll	$zero,$zero,0x0
-/*  f1649cc:	0c002d2c */ 	jal	func0000b330
+/*  f1649cc:	0c002d2c */ 	jal	vi0000b330
 /*  f1649d0:	02602025 */ 	or	$a0,$s3,$zero
 /*  f1649d4:	0fc55c96 */ 	jal	currentPlayerScissorToViewport
 /*  f1649d8:	00402025 */ 	or	$a0,$v0,$zero
@@ -5050,7 +5050,7 @@ glabel var7f1b1fd4nb
 /*  f164a24:	02602025 */ 	or	$a0,$s3,$zero
 /*  f164a28:	00409825 */ 	or	$s3,$v0,$zero
 .NB0f164a2c:
-/*  f164a2c:	0c002d2c */ 	jal	func0000b330
+/*  f164a2c:	0c002d2c */ 	jal	vi0000b330
 /*  f164a30:	02602025 */ 	or	$a0,$s3,$zero
 /*  f164a34:	0fc46971 */ 	jal	func0f11f984
 /*  f164a38:	00402025 */ 	or	$a0,$v0,$zero
diff --git a/src/game/mainmenu.c b/src/game/mainmenu.c
index 4c8cadbfe..d2781e912 100644
--- a/src/game/mainmenu.c
+++ b/src/game/mainmenu.c
@@ -774,7 +774,7 @@ s32 menuhandlerAcceptMission(s32 operation, struct menuitem *item, union handler
 		mainSetStageNum(g_MissionConfig.stagenum);
 
 #if VERSION >= VERSION_NTSC_1_0
-		func00009ec4(1);
+		viBlack(true);
 #endif
 	}
 
diff --git a/src/game/savebuffer.c b/src/game/savebuffer.c
index 64416e231..aef63851f 100644
--- a/src/game/savebuffer.c
+++ b/src/game/savebuffer.c
@@ -139,7 +139,7 @@ Gfx *func0f0d479c(Gfx *gdl)
 
 Gfx *func0f0d49c8(Gfx *gdl)
 {
-	gSPViewport(gdl++, OS_K0_TO_PHYSICAL(func0000ab4c()));
+	gSPViewport(gdl++, OS_K0_TO_PHYSICAL(vi0000ab4c()));
 	gSPMatrix(gdl++, osVirtualToPhysical(currentPlayerGetUnk1750()), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION);
 
 	return gdl;
diff --git a/src/game/title.c b/src/game/title.c
index 6fed21acc..8f40c8bf0 100644
--- a/src/game/title.c
+++ b/src/game/title.c
@@ -447,15 +447,15 @@ void titleTickLegal(void)
 void titleInitCheckControllers(void)
 {
 	g_TitleTimer = 0;
-	func00009ec4(true);
+	viBlack(true);
 }
 
 void titleExitCheckControllers(void)
 {
 	var800624e8 = 0;
-	func00009ab0();
-	func0000aab0(2);
-	func00009ec4(false);
+	vi00009ab0();
+	vi0000aab0(2);
+	viBlack(false);
 }
 
 void titleTickCheckControllers(void)
@@ -1822,7 +1822,7 @@ void titleTickPdLogo(void)
 			g_Vars.antiplayernum = -1;
 
 			lvSetDifficulty(DIFF_A);
-			func00009ec4(true);
+			viBlack(true);
 		} else {
 			titleSetNextMode(TITLEMODE_SKIP);
 		}
@@ -3114,7 +3114,7 @@ glabel var7f1a8468
 .PF0f018490:
 /*  f018490:	8fa40330 */ 	lw	$a0,0x330($sp)
 .PF0f018494:
-/*  f018494:	0c002f12 */ 	jal	func0000bf04
+/*  f018494:	0c002f12 */ 	jal	vi0000bf04
 /*  f018498:	00002825 */ 	move	$a1,$zero
 /*  f01849c:	0c002c02 */ 	jal	func0000b2c4
 /*  f0184a0:	00402025 */ 	move	$a0,$v0
@@ -4445,7 +4445,7 @@ glabel var7f1a8468
 .L0f0183ac:
 /*  f0183ac:	8fa40330 */ 	lw	$a0,0x330($sp)
 .L0f0183b0:
-/*  f0183b0:	0c002fc1 */ 	jal	func0000bf04
+/*  f0183b0:	0c002fc1 */ 	jal	vi0000bf04
 /*  f0183b4:	00002825 */ 	or	$a1,$zero,$zero
 /*  f0183b8:	0c002cb1 */ 	jal	func0000b2c4
 /*  f0183bc:	00402025 */ 	or	$a0,$v0,$zero
@@ -7011,7 +7011,7 @@ void titleInitSkip(void)
 	g_Vars.antiplayernum = -1;
 
 	lvSetDifficulty(DIFF_A);
-	func00009ec4(true);
+	viBlack(true);
 }
 
 void titleInitNoController(void)
@@ -7338,7 +7338,7 @@ void titleTick(void)
 		}
 
 		if (g_TitleMode != TITLEMODE_CHECKCONTROLLERS) {
-			func00009ec4(true);
+			viBlack(true);
 		}
 
 		g_TitleNextMode = -1;
@@ -7389,7 +7389,7 @@ void titleTick(void)
 		}
 
 		if (g_TitleMode != TITLEMODE_CHECKCONTROLLERS && g_TitleMode != TITLEMODE_SKIP) {
-			func00009ec4(false);
+			viBlack(false);
 		}
 	}
 
@@ -7516,7 +7516,7 @@ bool func0f01ad5c(void)
 
 void func0f01adb8(void)
 {
-	func0000aab0(2);
+	vi0000aab0(2);
 	viSetXY(576, var800624a0);
 	viSetBuf(576, var800624a0);
 	currentPlayerSetViewSize(576, var800624a0);
diff --git a/src/include/data.h b/src/include/data.h
index 48634cc80..ddc0279e6 100644
--- a/src/include/data.h
+++ b/src/include/data.h
@@ -19,7 +19,7 @@ extern s32 var8005ce74;
 extern f32 var8005ce78[2];
 extern f32 var8005ce80[2];
 extern u32 var8005ce88[2];
-extern s32 var8005ce90;
+extern s32 g_ViUnblackTimer;
 extern u32 var8005ce94;
 extern u32 var8005ce98;
 extern u32 var8005ce9c;
diff --git a/src/include/lib/lib_09a80.h b/src/include/lib/lib_09a80.h
index a78672655..8ad969e37 100644
--- a/src/include/lib/lib_09a80.h
+++ b/src/include/lib/lib_09a80.h
@@ -4,35 +4,35 @@
 #include "data.h"
 #include "types.h"
 
-void func00009a80(void);
-void func00009a88(void);
-void func00009a90(void);
-void func00009a98(void);
-void func00009aa0(u32 arg0);
-Gfx *debugRenderSomething(Gfx *gdl);
-void func00009ab0(void);
-void func00009b50(void *fb);
-void func00009bf8(void);
+void vi00009a80(void);
+void vi00009a88(void);
+void vi00009a90(void);
+void vi00009a98(void);
+void vi00009aa0(u32 arg0);
+Gfx *viRenderDebug(Gfx *gdl);
+void vi00009ab0(void);
+void vi00009b50(void *fb);
+void vi00009bf8(void);
 void viAllocateFbs(s32 stagenum);
-void func00009ec4(s32 arg0);
-u32 func00009ed4(void);
-void func0000a044(void);
-void func0000aa50(f32 arg0);
-void func0000aab0(s32 arg0);
+void viBlack(bool black);
+u32 vi00009ed4(void);
+void vi0000a044(void);
+void vi0000aa50(f32 arg0);
+void vi0000aab0(s32 arg0);
 void *viGetUnk28(void);
 void *vi2GetUnk28(void);
-Vp *func0000ab4c(void);
-u32 func0000ab6c(void);
-u32 func0000ab78(void);
-u32 func0000aca4(void);
-u32 func0000ad5c(void);
-u32 func0000af00(void);
-u32 func0000b0e8(void);
-Gfx *func0000b1a8(Gfx *gdl);
-Gfx *func0000b1d0(Gfx *gdl);
-Gfx *func0000b280(Gfx *gdl);
+Vp *vi0000ab4c(void);
+u32 vi0000ab6c(void);
+u32 vi0000ab78(void);
+u32 vi0000aca4(void);
+u32 vi0000ad5c(void);
+u32 vi0000af00(void);
+u32 vi0000b0e8(void);
+Gfx *vi0000b1a8(Gfx *gdl);
+Gfx *vi0000b1d0(Gfx *gdl);
+Gfx *vi0000b280(Gfx *gdl);
 Gfx *func0000b2c4(Gfx *gdl);
-Gfx *func0000b330(Gfx *gdl);
+Gfx *vi0000b330(Gfx *gdl);
 void viSetBuf(s16 x, s16 y);
 s16 viGetBufX(void);
 s16 viGetBufY(void);
@@ -53,6 +53,6 @@ void viSetFovAspectAndSize(f32 fovy, f32 aspect, s16 width, s16 height);
 f32 viGetFovY(void);
 void viSetZRange(f32 arg0, f32 arg1);
 void viGetZRange(struct zrange *zrange);
-u32 func0000bf04(void);
+u32 vi0000bf04(void);
 
 #endif
diff --git a/src/lib/audiomgr.c b/src/lib/audiomgr.c
index 719a08da1..7173782c2 100644
--- a/src/lib/audiomgr.c
+++ b/src/lib/audiomgr.c
@@ -1354,12 +1354,12 @@ void amgrMain(void *arg)
 		switch (*msg) {
 		case 4:
 			var80091588 = osGetTime();
-			func00009aa0(0x30000);
+			vi00009aa0(0x30000);
 			amgrHandleFrameMsg(g_AudioManager.audioInfo[var80092828 % 3], info);
 			func00009a08();
 
 			count++;
-			func00009aa0(0x60000);
+			vi00009aa0(0x60000);
 
 			var80091590 = osGetTime();
 			var80091570 = var80091590 - var80091588;
diff --git a/src/lib/lib_09a80.c b/src/lib/lib_09a80.c
index 254adbf42..bce45f422 100644
--- a/src/lib/lib_09a80.c
+++ b/src/lib/lib_09a80.c
@@ -71,44 +71,40 @@ struct rend_vidat *g_ViData = &var8005d530;
 bool var8005d598 = true;
 s32 var8005d59c = 0;
 u32 var8005d5a0 = 0x00000000;
-u32 var8005d5a4 = 0x00000000;
-u32 var8005d5a8 = 0x00000000;
-u32 var8005d5ac = 0x00000000;
 
-
-void func00009a80(void)
+void vi00009a80(void)
 {
 	// empty
 }
 
-void func00009a88(void)
+void vi00009a88(void)
 {
 	// empty
 }
 
-void func00009a90(void)
+void vi00009a90(void)
 {
 	// empty
 }
 
-void func00009a98(void)
+void vi00009a98(void)
 {
 	// empty
 }
 
-void func00009aa0(u32 value)
+void vi00009aa0(u32 value)
 {
 	// empty
 }
 
-Gfx *debugRenderSomething(Gfx *gdl)
+Gfx *viRenderDebug(Gfx *gdl)
 {
 	return gdl;
 }
 
 #if VERSION >= VERSION_PAL_FINAL
 GLOBAL_ASM(
-glabel func00009ab0
+glabel vi00009ab0
 /*     99a0:	2405002c */ 	li	$a1,0x2c
 /*     99a4:	300f00ff */ 	andi	$t7,$zero,0xff
 /*     99a8:	01e50019 */ 	multu	$t7,$a1
@@ -159,7 +155,7 @@ glabel func00009ab0
 );
 #else
 GLOBAL_ASM(
-glabel func00009ab0
+glabel vi00009ab0
 /*     9ab0:	2405002c */ 	addiu	$a1,$zero,0x2c
 /*     9ab4:	300f00ff */ 	andi	$t7,$zero,0xff
 /*     9ab8:	01e50019 */ 	multu	$t7,$a1
@@ -206,7 +202,7 @@ glabel func00009ab0
 
 #if VERSION >= VERSION_NTSC_1_0
 GLOBAL_ASM(
-glabel func00009b50
+glabel vi00009b50
 /*     9b50:	3c03800a */ 	lui	$v1,%hi(var8009cac0)
 /*     9b54:	3c058006 */ 	lui	$a1,%hi(var8005d530)
 /*     9b58:	3c078006 */ 	lui	$a3,%hi(var8005d588)
@@ -253,7 +249,7 @@ glabel func00009b50
 );
 #else
 GLOBAL_ASM(
-glabel func00009b50
+glabel vi00009b50
 /*     9cf0:	3c03800a */ 	lui	$v1,0x800a
 /*     9cf4:	3c058006 */ 	lui	$a1,0x8006
 /*     9cf8:	3c088006 */ 	lui	$t0,0x8006
@@ -303,7 +299,7 @@ glabel func00009b50
 
 #if VERSION >= VERSION_PAL_FINAL
 GLOBAL_ASM(
-glabel func00009bf8
+glabel vi00009bf8
 /*     9b00:	27bdffe8 */ 	addiu	$sp,$sp,-24
 /*     9b04:	3c028006 */ 	lui	$v0,0x8006
 /*     9b08:	3c058006 */ 	lui	$a1,0x8006
@@ -331,7 +327,7 @@ glabel func00009bf8
 );
 #else
 GLOBAL_ASM(
-glabel func00009bf8
+glabel vi00009bf8
 /*     9bf8:	3c038006 */ 	lui	$v1,%hi(var8005d530)
 /*     9bfc:	3c058006 */ 	lui	$a1,%hi(var8005d588)
 /*     9c00:	24a5d588 */ 	addiu	$a1,$a1,%lo(var8005d588)
@@ -383,14 +379,14 @@ void viAllocateFbs(s32 stagenum)
 
 	if (stagenum == STAGE_TITLE || stagenum == STAGE_TEST_OLD) {
 		if (IS4MB()) {
-			func0000aab0(2);
+			vi0000aab0(2);
 			fbsize = 640 * 440 * 2;
 		} else {
-			func0000aab0(2);
+			vi0000aab0(2);
 			fbsize = var700526d0[2] * var700526d8[2] * 2;
 		}
 	} else {
-		func0000aab0(1);
+		vi0000aab0(1);
 
 		if (1);
 
@@ -429,15 +425,22 @@ void viAllocateFbs(s32 stagenum)
 	var8005d59c = 1;
 }
 
-void func00009ec4(s32 arg0)
+/**
+ * If black is true, set the video output to black indefinitely.
+ * g_ViUnblackTimer is set to 3 which causes the timer to be paused.
+ *
+ * If black is false, set the timer to 2. This causes it to tick down once per
+ * frame and unblack once it reaches 0.
+ */
+void viBlack(bool black)
 {
-	arg0 += 2;
-	var8005ce90 = arg0;
+	black += 2;
+	g_ViUnblackTimer = black;
 }
 
 #if VERSION >= VERSION_NTSC_1_0
 GLOBAL_ASM(
-glabel func00009ed4
+glabel vi00009ed4
 /*     9ed4:	3c038006 */ 	lui	$v1,%hi(var8005ce9c)
 /*     9ed8:	2463ce9c */ 	addiu	$v1,$v1,%lo(var8005ce9c)
 /*     9edc:	8c620000 */ 	lw	$v0,0x0($v1)
@@ -506,9 +509,9 @@ glabel func00009ed4
 /*     9fd4:	00992021 */ 	addu	$a0,$a0,$t9
 /*     9fd8:	0c012354 */ 	jal	osViSetMode
 /*     9fdc:	8c84dd64 */ 	lw	$a0,%lo(var8008dd60+0x4)($a0)
-/*     9fe0:	3c048006 */ 	lui	$a0,%hi(var8005ce90+0x3)
+/*     9fe0:	3c048006 */ 	lui	$a0,%hi(g_ViUnblackTimer+0x3)
 /*     9fe4:	0c012338 */ 	jal	osViBlack
-/*     9fe8:	9084ce93 */ 	lbu	$a0,%lo(var8005ce90+0x3)($a0)
+/*     9fe8:	9084ce93 */ 	lbu	$a0,%lo(g_ViUnblackTimer+0x3)($a0)
 /*     9fec:	3c0a8006 */ 	lui	$t2,%hi(var8005ce74)
 /*     9ff0:	8d4ace74 */ 	lw	$t2,%lo(var8005ce74)($t2)
 /*     9ff4:	3c018006 */ 	lui	$at,%hi(var8005ce78+0x4)
@@ -534,7 +537,7 @@ glabel func00009ed4
 );
 #else
 GLOBAL_ASM(
-glabel func00009ed4
+glabel vi00009ed4
 /*     a078:	3c038006 */ 	lui	$v1,0x8006
 /*     a07c:	2463e61c */ 	addiu	$v1,$v1,-6628
 /*     a080:	8c620000 */ 	lw	$v0,0x0($v1)
@@ -624,7 +627,7 @@ glabel func00009ed4
 
 #if VERSION >= VERSION_PAL_FINAL
 GLOBAL_ASM(
-glabel func0000a044
+glabel vi0000a044
 /*     9f64:	3c098006 */ 	lui	$t1,0x8006
 /*     9f68:	3c0e8006 */ 	lui	$t6,0x8006
 /*     9f6c:	8dced230 */ 	lw	$t6,-0x2dd0($t6)
@@ -1189,7 +1192,7 @@ glabel func0000a044
 /*     a770:	53000005 */ 	beqzl	$t8,.PF0000a788
 /*     a774:	8fbf0014 */ 	lw	$ra,0x14($sp)
 /*     a778:	ac400000 */ 	sw	$zero,0x0($v0)
-/*     a77c:	0c002779 */ 	jal	func00009ec4
+/*     a77c:	0c002779 */ 	jal	viBlack
 /*     a780:	00002025 */ 	move	$a0,$zero
 /*     a784:	8fbf0014 */ 	lw	$ra,0x14($sp)
 .PF0000a788:
@@ -1199,7 +1202,7 @@ glabel func0000a044
 );
 #else
 GLOBAL_ASM(
-glabel func0000a044
+glabel vi0000a044
 /*     a044:	3c098006 */ 	lui	$t1,%hi(g_ViData)
 /*     a048:	3c0e8006 */ 	lui	$t6,%hi(var8005d590)
 /*     a04c:	8dced590 */ 	lw	$t6,%lo(var8005d590)($t6)
@@ -1896,7 +1899,7 @@ glabel func0000a044
 /*     aa2c:	53200005 */ 	beqzl	$t9,.L0000aa44
 /*     aa30:	8fbf0014 */ 	lw	$ra,0x14($sp)
 /*     aa34:	ac400000 */ 	sw	$zero,0x0($v0)
-/*     aa38:	0c0027b1 */ 	jal	func00009ec4
+/*     aa38:	0c0027b1 */ 	jal	viBlack
 /*     aa3c:	00002025 */ 	or	$a0,$zero,$zero
 /*     aa40:	8fbf0014 */ 	lw	$ra,0x14($sp)
 .L0000aa44:
@@ -1907,7 +1910,7 @@ glabel func0000a044
 #endif
 
 GLOBAL_ASM(
-glabel func0000aa50
+glabel vi0000aa50
 /*     aa50:	3c014160 */ 	lui	$at,0x4160
 /*     aa54:	44810000 */ 	mtc1	$at,$f0
 /*     aa58:	00000000 */ 	nop
@@ -1936,7 +1939,7 @@ glabel func0000aa50
 /*     aaac:	ac38ce9c */ 	sw	$t8,%lo(var8005ce9c)($at)
 );
 
-void func0000aab0(s32 mode)
+void vi0000aab0(s32 mode)
 {
 	g_ViData->mode = mode;
 
@@ -1944,12 +1947,12 @@ void func0000aab0(s32 mode)
 	g_ViData->y = g_ViData->bufy = var700526d8[mode];
 }
 
-void func0000ab00(void)
+void vi0000ab00(void)
 {
 	var8005d598 = true;
 }
 
-void func0000ab10(void)
+void vi0000ab10(void)
 {
 	var8005d598 = false;
 }
@@ -1970,7 +1973,7 @@ void viSetUnk28(void *arg0)
 }
 
 GLOBAL_ASM(
-glabel func0000ab4c
+glabel vi0000ab4c
 /*     ab4c:	3c0f8009 */ 	lui	$t7,%hi(var80092874+0x3)
 /*     ab50:	91ef2877 */ 	lbu	$t7,%lo(var80092874+0x3)($t7)
 /*     ab54:	3c0e800a */ 	lui	$t6,%hi(g_Vars+0x284)
@@ -1982,14 +1985,14 @@ glabel func0000ab4c
 );
 
 GLOBAL_ASM(
-glabel func0000ab6c
+glabel vi0000ab6c
 /*     ab6c:	3c028009 */ 	lui	$v0,%hi(var80092874)
 /*     ab70:	03e00008 */ 	jr	$ra
 /*     ab74:	94422874 */ 	lhu	$v0,%lo(var80092874)($v0)
 );
 
 GLOBAL_ASM(
-glabel func0000ab78
+glabel vi0000ab78
 /*     ab78:	3c028006 */ 	lui	$v0,%hi(g_ViData)
 /*     ab7c:	8c42d594 */ 	lw	$v0,%lo(g_ViData)($v0)
 /*     ab80:	27bdfeb0 */ 	addiu	$sp,$sp,-336
@@ -2068,7 +2071,7 @@ glabel func0000ab78
 );
 
 GLOBAL_ASM(
-glabel func0000aca4
+glabel vi0000aca4
 /*     aca4:	27bdff78 */ 	addiu	$sp,$sp,-136
 /*     aca8:	afbf002c */ 	sw	$ra,0x2c($sp)
 /*     acac:	afb00028 */ 	sw	$s0,0x28($sp)
@@ -2118,7 +2121,7 @@ glabel func0000aca4
 );
 
 GLOBAL_ASM(
-glabel func0000ad5c
+glabel vi0000ad5c
 /*     ad5c:	3c088006 */ 	lui	$t0,%hi(g_ViData)
 /*     ad60:	2508d594 */ 	addiu	$t0,$t0,%lo(g_ViData)
 /*     ad64:	8d0e0000 */ 	lw	$t6,0x0($t0)
@@ -2227,7 +2230,7 @@ glabel func0000ad5c
 );
 
 GLOBAL_ASM(
-glabel func0000af00
+glabel vi0000af00
 /*     af00:	3c088006 */ 	lui	$t0,%hi(g_ViData)
 /*     af04:	2508d594 */ 	addiu	$t0,$t0,%lo(g_ViData)
 /*     af08:	8d0e0000 */ 	lw	$t6,0x0($t0)
@@ -2353,7 +2356,7 @@ glabel func0000af00
 );
 
 GLOBAL_ASM(
-glabel func0000b0e8
+glabel vi0000b0e8
 /*     b0e8:	27bdff80 */ 	addiu	$sp,$sp,-128
 /*     b0ec:	afbf002c */ 	sw	$ra,0x2c($sp)
 /*     b0f0:	afb00028 */ 	sw	$s0,0x28($sp)
@@ -2405,12 +2408,12 @@ glabel func0000b0e8
 );
 
 GLOBAL_ASM(
-glabel func0000b1a8
+glabel vi0000b1a8
 /*     b1a8:	3c05800a */ 	lui	$a1,%hi(g_Vars+0x284)
 /*     b1ac:	8ca5a244 */ 	lw	$a1,%lo(g_Vars+0x284)($a1)
 /*     b1b0:	27bdffe8 */ 	addiu	$sp,$sp,-24
 /*     b1b4:	afbf0014 */ 	sw	$ra,0x14($sp)
-/*     b1b8:	0c002b57 */ 	jal	func0000ad5c
+/*     b1b8:	0c002b57 */ 	jal	vi0000ad5c
 /*     b1bc:	24a50610 */ 	addiu	$a1,$a1,1552
 /*     b1c0:	8fbf0014 */ 	lw	$ra,0x14($sp)
 /*     b1c4:	27bd0018 */ 	addiu	$sp,$sp,0x18
@@ -2419,10 +2422,10 @@ glabel func0000b1a8
 );
 
 GLOBAL_ASM(
-glabel func0000b1d0
+glabel vi0000b1d0
 /*     b1d0:	27bdffe8 */ 	addiu	$sp,$sp,-24
 /*     b1d4:	afbf0014 */ 	sw	$ra,0x14($sp)
-/*     b1d8:	0c002c6a */ 	jal	func0000b1a8
+/*     b1d8:	0c002c6a */ 	jal	vi0000b1a8
 /*     b1dc:	00000000 */ 	nop
 /*     b1e0:	3c0e8006 */ 	lui	$t6,%hi(var8005d598)
 /*     b1e4:	8dced598 */ 	lw	$t6,%lo(var8005d598)($t6)
@@ -2469,7 +2472,7 @@ glabel func0000b1d0
 );
 
 GLOBAL_ASM(
-glabel func0000b280
+glabel vi0000b280
 /*     b280:	3c0e8006 */ 	lui	$t6,%hi(g_ViData)
 /*     b284:	8dced594 */ 	lw	$t6,%lo(g_ViData)($t6)
 /*     b288:	27bdffe8 */ 	addiu	$sp,$sp,-24
@@ -2501,7 +2504,7 @@ Gfx *func0000b2c4(Gfx *gdl)
 
 #if VERSION >= VERSION_NTSC_1_0
 GLOBAL_ASM(
-glabel func0000b330
+glabel vi0000b330
 /*     b330:	27bdff58 */ 	addiu	$sp,$sp,-168
 /*     b334:	afbf0014 */ 	sw	$ra,0x14($sp)
 /*     b338:	3c0eba00 */ 	lui	$t6,0xba00
@@ -3094,7 +3097,7 @@ glabel func0000b330
 );
 #else
 GLOBAL_ASM(
-glabel func0000b330
+glabel vi0000b330
 /*     b4b0:	27bdff58 */ 	addiu	$sp,$sp,-168
 /*     b4b4:	afbf0014 */ 	sw	$ra,0x14($sp)
 /*     b4b8:	3c0eba00 */ 	lui	$t6,0xba00
@@ -3700,28 +3703,28 @@ glabel func0000b330
 
 #if VERSION < VERSION_NTSC_1_0
 GLOBAL_ASM(
-glabel func0000bd44nb
+glabel vi0000bd44nb
 /*     bd44:	3c018006 */ 	lui	$at,0x8006
 /*     bd48:	03e00008 */ 	jr	$ra
 /*     bd4c:	ac24ed2c */ 	sw	$a0,-0x12d4($at)
 );
 
 GLOBAL_ASM(
-glabel func0000bd50nb
+glabel vi0000bd50nb
 /*     bd50:	3c028006 */ 	lui	$v0,0x8006
 /*     bd54:	03e00008 */ 	jr	$ra
 /*     bd58:	8c42ed2c */ 	lw	$v0,-0x12d4($v0)
 );
 
 GLOBAL_ASM(
-glabel func0000bd5cnb
+glabel vi0000bd5cnb
 /*     bd5c:	3c018006 */ 	lui	$at,0x8006
 /*     bd60:	03e00008 */ 	jr	$ra
 /*     bd64:	ac24ed28 */ 	sw	$a0,-0x12d8($at)
 );
 
 GLOBAL_ASM(
-glabel func0000bd68nb
+glabel vi0000bd68nb
 /*     bd68:	3c028006 */ 	lui	$v0,0x8006
 /*     bd6c:	03e00008 */ 	jr	$ra
 /*     bd70:	8c42ed28 */ 	lw	$v0,-0x12d8($v0)
@@ -3856,7 +3859,7 @@ void viGetZRange(struct zrange *zrange)
 }
 
 GLOBAL_ASM(
-glabel func0000bf04
+glabel vi0000bf04
 /*     bf04:	3c0e8006 */ 	lui	$t6,%hi(var8005d598)
 /*     bf08:	8dced598 */ 	lw	$t6,%lo(var8005d598)($t6)
 /*     bf0c:	00801025 */ 	or	$v0,$a0,$zero
@@ -3894,22 +3897,22 @@ glabel func0000bf04
 /*     bf88:	00801025 */ 	or	$v0,$a0,$zero
 );
 
-void func0000bf8c(void)
+void vi0000bf8c(void)
 {
 	// empty
 }
 
-void func0000bf94(void)
+void vi0000bf94(void)
 {
 	// empty
 }
 
-void func0000bf9c(void)
+void vi0000bf9c(void)
 {
 	// empty
 }
 
-void func0000bfa4(void)
+void vi0000bfa4(void)
 {
 	// empty
 }
diff --git a/src/lib/main.c b/src/lib/main.c
index 57a2760e1..2eb19bc96 100644
--- a/src/lib/main.c
+++ b/src/lib/main.c
@@ -311,7 +311,7 @@ glabel mainInit
 /*     d294:	00000000 */ 	nop
 /*     d298:	0c004d3a */ 	jal	func00013758
 /*     d29c:	00000000 */ 	nop
-/*     d2a0:	0c002668 */ 	jal	func00009ab0
+/*     d2a0:	0c002668 */ 	jal	vi00009ab0
 /*     d2a4:	00000000 */ 	nop
 /*     d2a8:	0c00bcc2 */ 	jal	rmonIsDisabled
 /*     d2ac:	00000000 */ 	nop
@@ -517,9 +517,9 @@ glabel mainInit
 /*     d594:	14c9fff3 */ 	bne	$a2,$t1,.PF0000d564
 /*     d598:	24e70240 */ 	addiu	$a3,$a3,0x240
 .PF0000d59c:
-/*     d59c:	0c0029fd */ 	jal	func0000aab0
+/*     d59c:	0c0029fd */ 	jal	vi0000aab0
 /*     d5a0:	24040002 */ 	li	$a0,0x2
-/*     d5a4:	0c002696 */ 	jal	func00009b50
+/*     d5a4:	0c002696 */ 	jal	vi00009b50
 /*     d5a8:	02002025 */ 	move	$a0,$s0
 /*     d5ac:	8faa0048 */ 	lw	$t2,0x48($sp)
 /*     d5b0:	3c018006 */ 	lui	$at,0x8006
@@ -557,7 +557,7 @@ glabel mainInit
 /*     d624:	27b01458 */ 	addiu	$s0,$sp,0x1458
 /*     d628:	5561000d */ 	bnel	$t3,$at,.PF0000d660
 /*     d62c:	28610006 */ 	slti	$at,$v1,0x6
-/*     d630:	0c0027d9 */ 	jal	func0000a044
+/*     d630:	0c0027d9 */ 	jal	vi0000a044
 /*     d634:	afa31490 */ 	sw	$v1,0x1490($sp)
 /*     d638:	3c048006 */ 	lui	$a0,0x8006
 /*     d63c:	3c058006 */ 	lui	$a1,0x8006
@@ -638,7 +638,7 @@ glabel mainInit
 /*     d758:	00000000 */ 	nop
 /*     d75c:	0fc02c84 */ 	jal	stub0f00b200
 /*     d760:	00000000 */ 	nop
-/*     d764:	0c00265c */ 	jal	func00009a80
+/*     d764:	0c00265c */ 	jal	vi00009a80
 /*     d768:	00000000 */ 	nop
 /*     d76c:	0fc0021c */ 	jal	stub0f000870
 /*     d770:	00000000 */ 	nop
@@ -676,9 +676,9 @@ glabel mainInit
 /*     d7f0:	00000000 */ 	nop
 /*     d7f4:	0fc00024 */ 	jal	func0f000090
 /*     d7f8:	00000000 */ 	nop
-/*     d7fc:	0c0026c0 */ 	jal	func00009bf8
+/*     d7fc:	0c0026c0 */ 	jal	vi00009bf8
 /*     d800:	00000000 */ 	nop
-/*     d804:	0c002779 */ 	jal	func00009ec4
+/*     d804:	0c002779 */ 	jal	viBlack
 /*     d808:	24040001 */ 	li	$a0,0x1
 /*     d80c:	3c0f8006 */ 	lui	$t7,0x8006
 /*     d810:	8defd674 */ 	lw	$t7,-0x298c($t7)
@@ -714,7 +714,7 @@ glabel mainInit
 /*     d554:	00000000 */ 	nop
 /*     d558:	0c004dd6 */ 	jal	func00013758
 /*     d55c:	00000000 */ 	nop
-/*     d560:	0c0026ac */ 	jal	func00009ab0
+/*     d560:	0c0026ac */ 	jal	vi00009ab0
 /*     d564:	00000000 */ 	nop
 /*     d568:	0c00be82 */ 	jal	rmonIsDisabled
 /*     d56c:	00000000 */ 	nop
@@ -920,9 +920,9 @@ glabel mainInit
 /*     d858:	14c9fff3 */ 	bne	$a2,$t1,.L0000d828
 /*     d85c:	24e70240 */ 	addiu	$a3,$a3,0x240
 .L0000d860:
-/*     d860:	0c002aac */ 	jal	func0000aab0
+/*     d860:	0c002aac */ 	jal	vi0000aab0
 /*     d864:	24040002 */ 	addiu	$a0,$zero,0x2
-/*     d868:	0c0026d4 */ 	jal	func00009b50
+/*     d868:	0c0026d4 */ 	jal	vi00009b50
 /*     d86c:	02002025 */ 	or	$a0,$s0,$zero
 /*     d870:	8faa0048 */ 	lw	$t2,0x48($sp)
 /*     d874:	3c018006 */ 	lui	$at,%hi(g_RdpOutBufferStart)
@@ -960,7 +960,7 @@ glabel mainInit
 /*     d8e8:	27b01450 */ 	addiu	$s0,$sp,0x1450
 /*     d8ec:	5561000d */ 	bnel	$t3,$at,.L0000d924
 /*     d8f0:	28610006 */ 	slti	$at,$v1,0x6
-/*     d8f4:	0c002811 */ 	jal	func0000a044
+/*     d8f4:	0c002811 */ 	jal	vi0000a044
 /*     d8f8:	afa31488 */ 	sw	$v1,0x1488($sp)
 /*     d8fc:	3c048006 */ 	lui	$a0,%hi(var8005dcc8)
 /*     d900:	3c058006 */ 	lui	$a1,%hi(var8005dcf0)
@@ -1041,7 +1041,7 @@ glabel mainInit
 /*     da1c:	00000000 */ 	nop
 /*     da20:	0fc02c80 */ 	jal	stub0f00b200
 /*     da24:	00000000 */ 	nop
-/*     da28:	0c0026a0 */ 	jal	func00009a80
+/*     da28:	0c0026a0 */ 	jal	vi00009a80
 /*     da2c:	00000000 */ 	nop
 /*     da30:	0fc0021c */ 	jal	stub0f000870
 /*     da34:	00000000 */ 	nop
@@ -1079,9 +1079,9 @@ glabel mainInit
 /*     dab4:	00000000 */ 	nop
 /*     dab8:	0fc00024 */ 	jal	func0f000090
 /*     dabc:	00000000 */ 	nop
-/*     dac0:	0c0026fe */ 	jal	func00009bf8
+/*     dac0:	0c0026fe */ 	jal	vi00009bf8
 /*     dac4:	00000000 */ 	nop
-/*     dac8:	0c0027b1 */ 	jal	func00009ec4
+/*     dac8:	0c0027b1 */ 	jal	viBlack
 /*     dacc:	24040001 */ 	addiu	$a0,$zero,0x1
 /*     dad0:	8fbf002c */ 	lw	$ra,0x2c($sp)
 /*     dad4:	3c018006 */ 	lui	$at,%hi(var8005dd18)
@@ -1111,7 +1111,7 @@ glabel mainInit
 /*     dabc:	00000000 */ 	sll	$zero,$zero,0x0
 /*     dac0:	0c004fea */ 	jal	func00013758
 /*     dac4:	00000000 */ 	sll	$zero,$zero,0x0
-/*     dac8:	0c002714 */ 	jal	func00009ab0
+/*     dac8:	0c002714 */ 	jal	vi00009ab0
 /*     dacc:	00000000 */ 	sll	$zero,$zero,0x0
 /*     dad0:	0c00c456 */ 	jal	rmonIsDisabled
 /*     dad4:	00000000 */ 	sll	$zero,$zero,0x0
@@ -1298,9 +1298,9 @@ glabel mainInit
 /*     dd78:	28c15f10 */ 	slti	$at,$a2,0x5f10
 /*     dd7c:	1420fff2 */ 	bnez	$at,.NB0000dd48
 /*     dd80:	24e70240 */ 	addiu	$a3,$a3,0x240
-/*     dd84:	0c002b0c */ 	jal	func0000aab0
+/*     dd84:	0c002b0c */ 	jal	vi0000aab0
 /*     dd88:	24040002 */ 	addiu	$a0,$zero,0x2
-/*     dd8c:	0c00273c */ 	jal	func00009b50
+/*     dd8c:	0c00273c */ 	jal	vi00009b50
 /*     dd90:	02202025 */ 	or	$a0,$s1,$zero
 /*     dd94:	3c018006 */ 	lui	$at,0x8006
 /*     dd98:	3c118009 */ 	lui	$s1,0x8009
@@ -1336,7 +1336,7 @@ glabel mainInit
 /*     de04:	854b0000 */ 	lh	$t3,0x0($t2)
 /*     de08:	5561000b */ 	bnel	$t3,$at,.NB0000de38
 /*     de0c:	2a010006 */ 	slti	$at,$s0,0x6
-/*     de10:	0c002871 */ 	jal	func0000a044
+/*     de10:	0c002871 */ 	jal	vi0000a044
 /*     de14:	afae0054 */ 	sw	$t6,0x54($sp)
 /*     de18:	3c058006 */ 	lui	$a1,0x8006
 /*     de1c:	24a5f610 */ 	addiu	$a1,$a1,-2544
@@ -1414,7 +1414,7 @@ glabel mainInit
 /*     df2c:	00000000 */ 	sll	$zero,$zero,0x0
 /*     df30:	0fc02bac */ 	jal	stub0f00b200
 /*     df34:	00000000 */ 	sll	$zero,$zero,0x0
-/*     df38:	0c002708 */ 	jal	func00009a80
+/*     df38:	0c002708 */ 	jal	vi00009a80
 /*     df3c:	00000000 */ 	sll	$zero,$zero,0x0
 /*     df40:	0fc0021c */ 	jal	stub0f000870
 /*     df44:	00000000 */ 	sll	$zero,$zero,0x0
@@ -1452,9 +1452,9 @@ glabel mainInit
 /*     dfc4:	00000000 */ 	sll	$zero,$zero,0x0
 /*     dfc8:	0fc00024 */ 	jal	func0f000090
 /*     dfcc:	00000000 */ 	sll	$zero,$zero,0x0
-/*     dfd0:	0c002767 */ 	jal	func00009bf8
+/*     dfd0:	0c002767 */ 	jal	vi00009bf8
 /*     dfd4:	00000000 */ 	sll	$zero,$zero,0x0
-/*     dfd8:	0c00281a */ 	jal	func00009ec4
+/*     dfd8:	0c00281a */ 	jal	viBlack
 /*     dfdc:	24040001 */ 	addiu	$a0,$zero,0x1
 /*     dfe0:	8fbf0034 */ 	lw	$ra,0x34($sp)
 /*     dfe4:	3c018006 */ 	lui	$at,0x8006
@@ -1501,7 +1501,7 @@ const char var70053aa0[] = "          -ml0 -me0 -mgfx100 -mvtx50 -mt700 -ma400";
 //	func000121e0();
 //	func00012a0c();
 //	func00013758();
-//	func00009ab0();
+//	vi00009ab0();
 //	var8005d9b0 = rmonIsDisabled();
 //	joySystemInit();
 //	osCreateMesgQueue(&queue, &msg, 1);
@@ -1588,8 +1588,8 @@ const char var70053aa0[] = "          -ml0 -me0 -mgfx100 -mvtx50 -mt700 -ma400";
 //			}
 //		}
 //
-//		func0000aab0(2);
-//		func00009b50(fb);
+//		vi0000aab0(2);
+//		vi00009b50(fb);
 //
 //		g_RdpOutBufferStart = texture;
 //		g_RdpOutBufferEnd = texture + 0x400; // 0x800 bytes, because texture is u16
@@ -1606,7 +1606,7 @@ const char var70053aa0[] = "          -ml0 -me0 -mgfx100 -mvtx50 -mt700 -ma400";
 //			osRecvMesg(&var8008db30, &sp1470, OS_MESG_BLOCK);
 //
 //			if (*(s16 *)sp1470 == 1) {
-//				func0000a044();
+//				vi0000a044();
 //				rdpCreateTask(var8005dcc8, var8005dcf0, 0, sp1450);
 //				j++;
 //			}
@@ -1654,7 +1654,7 @@ const char var70053aa0[] = "          -ml0 -me0 -mgfx100 -mvtx50 -mt700 -ma400";
 //	func0f127910();
 //	frametimeInit();
 //	stub0f00b200();
-//	func00009a80();
+//	vi00009a80();
 //	stub0f000870();
 //	func0f000880();
 //	stub0f0008e0();
@@ -1673,8 +1673,8 @@ const char var70053aa0[] = "          -ml0 -me0 -mgfx100 -mvtx50 -mt700 -ma400";
 //	stub0f000850();
 //	stub0f000860();
 //	func0f000090();
-//	func00009bf8();
-//	func00009ec4(1);
+//	vi00009bf8();
+//	viBlack(true);
 //
 //	var8005dd18 = 0;
 //}
@@ -1935,7 +1935,7 @@ void mainLoop(void)
 		lvInit(g_StageNum);
 		viAllocateFbs(g_StageNum);
 		frametimeCalculate();
-		func00009a90();
+		vi00009a90();
 
 		while (osRecvMesg(&var8008db30, &msg, OS_MESG_NOBLOCK) != -1) {
 			// empty
@@ -1971,7 +1971,7 @@ void mainLoop(void)
 		memDisablePool(MEMPOOL_STAGE);
 		memDisablePool(MEMPOOL_7);
 		func0f1672f0(4);
-		func00009ec4(1);
+		viBlack(true);
 		pak0f116994();
 
 		g_StageNum = g_MainStageNum;
@@ -2473,7 +2473,7 @@ glabel mainLoop
 /*     e740:	8c84f2d4 */ 	lw	$a0,-0xd2c($a0)
 /*     e744:	0fc59f11 */ 	jal	frametimeCalculate
 /*     e748:	00000000 */ 	sll	$zero,$zero,0x0
-/*     e74c:	0c00270c */ 	jal	func00009a90
+/*     e74c:	0c00270c */ 	jal	vi00009a90
 /*     e750:	00000000 */ 	sll	$zero,$zero,0x0
 /*     e754:	02602025 */ 	or	$a0,$s3,$zero
 /*     e758:	02802825 */ 	or	$a1,$s4,$zero
@@ -2565,7 +2565,7 @@ glabel mainLoop
 /*     e888:	24040007 */ 	addiu	$a0,$zero,0x7
 /*     e88c:	0fc58709 */ 	jal	func0f1672f0
 /*     e890:	24040004 */ 	addiu	$a0,$zero,0x4
-/*     e894:	0c00281a */ 	jal	func00009ec4
+/*     e894:	0c00281a */ 	jal	viBlack
 /*     e898:	02e02025 */ 	or	$a0,$s7,$zero
 /*     e89c:	8fcf0000 */ 	lw	$t7,0x0($s8)
 /*     e8a0:	8fa800e4 */ 	lw	$t0,0xe4($sp)
@@ -2600,9 +2600,9 @@ void mainTick(void)
 
 	if (g_MainStageNum < 0 && var8005d9cc < 2) {
 		frametimeCalculate();
-		func00009a98();
-		func00009a90();
-		func00009aa0(0x20000);
+		vi00009a98();
+		vi00009a90();
+		vi00009aa0(0x20000);
 		func000034d8();
 		joyDebugJoy();
 		func00001b28(0);
@@ -2635,7 +2635,7 @@ void mainTick(void)
 			func000034e0(&gdl);
 
 			if (debug0f11ed70() >= 2) {
-				gdl = debugRenderSomething(gdl);
+				gdl = viRenderDebug(gdl);
 			}
 
 			gDPFullSync(gdl++);
@@ -2644,14 +2644,14 @@ void mainTick(void)
 
 		if (var8005d9c8) {
 			gfxSwapBuffers();
-			func0000a044();
+			vi0000a044();
 		}
 
 		rdpCreateTask(gdlstart, gdl, 0, array);
 		var8005d9cc++;
 		func00012a8c();
 		func0f16cf94();
-		func00009aa0(0x10000);
+		vi00009aa0(0x10000);
 	}
 }
 #else
@@ -2691,11 +2691,11 @@ glabel mainTick
 /*     e968:	8fbf001c */ 	lw	$ra,0x1c($sp)
 /*     e96c:	0fc59f11 */ 	jal	frametimeCalculate
 /*     e970:	00000000 */ 	sll	$zero,$zero,0x0
-/*     e974:	0c00270e */ 	jal	func00009a98
+/*     e974:	0c00270e */ 	jal	vi00009a98
 /*     e978:	00000000 */ 	sll	$zero,$zero,0x0
-/*     e97c:	0c00270c */ 	jal	func00009a90
+/*     e97c:	0c00270c */ 	jal	vi00009a90
 /*     e980:	00000000 */ 	sll	$zero,$zero,0x0
-/*     e984:	0c002710 */ 	jal	func00009aa0
+/*     e984:	0c002710 */ 	jal	vi00009aa0
 /*     e988:	3c040002 */ 	lui	$a0,0x2
 /*     e98c:	0c000dbe */ 	jal	func000034d8
 /*     e990:	00000000 */ 	sll	$zero,$zero,0x0
@@ -2981,7 +2981,7 @@ glabel mainTick
 /*     edac:	28410002 */ 	slti	$at,$v0,0x2
 /*     edb0:	14200004 */ 	bnez	$at,.NB0000edc4
 /*     edb4:	00000000 */ 	sll	$zero,$zero,0x0
-/*     edb8:	0c002712 */ 	jal	debugRenderSomething
+/*     edb8:	0c002712 */ 	jal	viRenderDebug
 /*     edbc:	8fa40094 */ 	lw	$a0,0x94($sp)
 /*     edc0:	afa20094 */ 	sw	$v0,0x94($sp)
 .NB0000edc4:
@@ -3014,7 +3014,7 @@ glabel mainTick
 /*     ee24:	8fa40090 */ 	lw	$a0,0x90($sp)
 /*     ee28:	0fc588d6 */ 	jal	gfxSwapBuffers
 /*     ee2c:	00000000 */ 	sll	$zero,$zero,0x0
-/*     ee30:	0c002871 */ 	jal	func0000a044
+/*     ee30:	0c002871 */ 	jal	vi0000a044
 /*     ee34:	00000000 */ 	sll	$zero,$zero,0x0
 /*     ee38:	8fa40090 */ 	lw	$a0,0x90($sp)
 .NB0000ee3c:
@@ -3030,7 +3030,7 @@ glabel mainTick
 /*     ee60:	ac490000 */ 	sw	$t1,0x0($v0)
 /*     ee64:	0fc59f51 */ 	jal	func0f16cf94
 /*     ee68:	00000000 */ 	sll	$zero,$zero,0x0
-/*     ee6c:	0c002710 */ 	jal	func00009aa0
+/*     ee6c:	0c002710 */ 	jal	vi00009aa0
 /*     ee70:	3c040001 */ 	lui	$a0,0x1
 /*     ee74:	8fbf001c */ 	lw	$ra,0x1c($sp)
 .NB0000ee78:
diff --git a/src/lib/sched.c b/src/lib/sched.c
index bdb77bc62..34f570004 100644
--- a/src/lib/sched.c
+++ b/src/lib/sched.c
@@ -45,7 +45,7 @@ s32 var8005ce74 = 0;
 f32 var8005ce78[2] = {1, 1};
 f32 var8005ce80[2] = {1, 1};
 u32 var8005ce88[2] = {0};
-s32 var8005ce90 = 3;
+s32 g_ViUnblackTimer = 3;
 u32 var8005ce94 = 0x00000001;
 u32 var8005ce98 = 0x00000000;
 u32 var8005ce9c = 0x00000000;
@@ -281,7 +281,7 @@ void func00002078(OSSched *sc)
 #endif
 
 	if (!g_Resetting) {
-		func00009ed4();
+		vi00009ed4();
 	}
 
 	joysTick();
@@ -297,7 +297,7 @@ void __scHandleRetrace(OSSched *sc)
 	OSScTask    *sp = 0;
 	OSScTask    *dp = 0;
 
-	func00009a88();
+	vi00009a88();
 
 	while (osRecvMesg(&sc->cmdQ, (OSMesg*)&rspTask, OS_MESG_NOBLOCK) != -1) {
 		__scAppendList(sc, rspTask);
@@ -351,7 +351,7 @@ void __scHandleRSP(OSSched *sc)
 		t = sc->curRSPTask;
 		sc->curRSPTask = 0;
 
-		func00009aa0(0x10001);
+		vi00009aa0(0x10001);
 
 		if ((t->state & OS_SC_YIELD) && osSpTaskYielded(&t->list)) {
 			t->state |= OS_SC_YIELDED;
@@ -477,7 +477,7 @@ void __scHandleRDP(OSSched *sc)
 			func00002d90();
 		}
 
-		func00009aa0(0x10002);
+		vi00009aa0(0x10002);
 		osDpGetCounters(&var8008de38);
 
 		t = sc->curRDPTask;
@@ -539,7 +539,7 @@ s32 __scTaskComplete(OSSched *sc, OSScTask *t)
 					osSetIntMask(mask);
 
 					osViSetMode(var8008dd60[1 - var8005ce74]);
-					osViBlack(var8005ce90);
+					osViBlack(g_ViUnblackTimer);
 					osViSetXScale(var8005ce78[1 - var8005ce74]);
 					osViSetYScale(var8005ce80[1 - var8005ce74]);
 					osViSetSpecialFeatures(0x42);
@@ -548,8 +548,8 @@ s32 __scTaskComplete(OSSched *sc, OSScTask *t)
 				var8005ce88[1 - var8005ce74] = 0;
 			}
 
-			if (var8005ce90 != 0 && var8005ce90 < 3) {
-				var8005ce90--;
+			if (g_ViUnblackTimer != 0 && g_ViUnblackTimer < 3) {
+				g_ViUnblackTimer--;
 			}
 
 			func00001b40(t->framebuffer);
@@ -603,10 +603,10 @@ void __scExec(OSSched *sc, OSScTask *sp, OSScTask *dp)
 		}
 
 		if (sp->list.t.type == M_AUDTASK) {
-			func00009aa0(0x30001);
+			vi00009aa0(0x30001);
 		} else {
-			func00009aa0(0x40001);
-			func00009aa0(0x20002);
+			vi00009aa0(0x40001);
+			vi00009aa0(0x20002);
 		}
 
 		sp->state &= ~(OS_SC_YIELD | OS_SC_YIELDED);