diff --git a/src/boot/boot.c b/src/boot/boot.c
index 0a565d263..e1f0c3d11 100644
--- a/src/boot/boot.c
+++ b/src/boot/boot.c
@@ -882,14 +882,14 @@ void func00001b40(u32 arg0)
 {
 	if ((var8005ce68 && var8005ce64) || var8005ce60) {
 		func0000cf54(arg0);
-		var8005ce70 = func00048510();
+		var8005ce70 = osGetCount();
 	}
 }
 
 void func00001b98(u32 value)
 {
 	if ((value & 0xf) == 0 && ((var8005ce68 && var8005ce64) || var8005ce60)) {
-		if (func00048510() - var8005ce70 > var8005ce6c) {
+		if (osGetCount() - var8005ce70 > var8005ce6c) {
 			func0000cf54(var8009cac0);
 			func0000cf54(var8009cac4);
 		}
@@ -898,7 +898,7 @@ void func00001b98(u32 value)
 
 void func00001c28(void)
 {
-	var8005ce70 = func00048510();
+	var8005ce70 = osGetCount();
 }
 
 GLOBAL_ASM(
@@ -1234,7 +1234,7 @@ glabel func00002078
 /*     20f0:	2484de18 */ 	addiu	$a0,$a0,%lo(var8008de18)
 /*     20f4:	afac001c */ 	sw	$t4,0x1c($sp)
 /*     20f8:	24060000 */ 	addiu	$a2,$zero,0x0
-/*     20fc:	0c0122c8 */ 	jal	func00048b20
+/*     20fc:	0c0122c8 */ 	jal	osSetTimer
 /*     2100:	afa20018 */ 	sw	$v0,0x18($sp)
 /*     2104:	3c038006 */ 	lui	$v1,%hi(var8005ced0)
 /*     2108:	8063ced0 */ 	lb	$v1,%lo(var8005ced0)($v1)
diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c
index 17bd1f290..2ee55cfe0 100644
--- a/src/game/chr/chraicommands.c
+++ b/src/game/chr/chraicommands.c
@@ -11273,7 +11273,7 @@ GLOBAL_ASM(
 glabel ai01dd
 /*  f05ffa0:	27bdffe8 */ 	addiu	$sp,$sp,-24
 /*  f05ffa4:	afbf0014 */ 	sw	$ra,0x14($sp)
-/*  f05ffa8:	0c012144 */ 	jal	func00048510
+/*  f05ffa8:	0c012144 */ 	jal	osGetCount
 /*  f05ffac:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f05ffb0:	00402825 */ 	or	$a1,$v0,$zero
 /*  f05ffb4:	24040000 */ 	addiu	$a0,$zero,0x0
diff --git a/src/game/data/data_0160b0.c b/src/game/data/data_0160b0.c
index 011ee5de3..e3f11615a 100644
--- a/src/game/data/data_0160b0.c
+++ b/src/game/data/data_0160b0.c
@@ -343,7 +343,7 @@ u32 var80070598 = 0x00000000;
 u32 var8007059c = 0x00000000;
 u32 var800705a0 = 0x00000000;
 u32 var800705a4 = 0x00000000;
-s32 var800705a8 = 0x00000000;
+bool var800705a8 = false;
 u32 var800705ac = 0x00000000;
 u32 var800705b0 = 0x00000000;
 u32 var800705b4 = 0x00000000;
diff --git a/src/game/game_000920.c b/src/game/game_000920.c
index 693c77c3d..47053d5cc 100644
--- a/src/game/game_000920.c
+++ b/src/game/game_000920.c
@@ -1475,7 +1475,7 @@ glabel func0f001c0c
 /*  f001c28:	afb30024 */ 	sw	$s3,0x24($sp)
 /*  f001c2c:	afb20020 */ 	sw	$s2,0x20($sp)
 /*  f001c30:	afb1001c */ 	sw	$s1,0x1c($sp)
-/*  f001c34:	0c012144 */ 	jal	func00048510
+/*  f001c34:	0c012144 */ 	jal	osGetCount
 /*  f001c38:	afb00018 */ 	sw	$s0,0x18($sp)
 /*  f001c3c:	3c018006 */ 	lui	$at,0x8006
 /*  f001c40:	0fc008ee */ 	jal	func0f0023b8
@@ -1816,7 +1816,7 @@ glabel func0f001c0c
 /*  f00211c:	5420fff6 */ 	bnezl	$at,.L0f0020f8
 /*  f002120:	8e0e0000 */ 	lw	$t6,0x0($s0)
 .L0f002124:
-/*  f002124:	0c012144 */ 	jal	func00048510
+/*  f002124:	0c012144 */ 	jal	osGetCount
 /*  f002128:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f00212c:	8fbf003c */ 	lw	$ra,0x3c($sp)
 .L0f002130:
diff --git a/src/game/game_011110.c b/src/game/game_011110.c
index f00774a5f..53abceb8c 100644
--- a/src/game/game_011110.c
+++ b/src/game/game_011110.c
@@ -33,7 +33,7 @@ void func0f011110(void)
 	var800705a0 = 0;
 }
 
-void func0f011124(s32 value)
+void func0f011124(bool value)
 {
 	var800705a8 = value;
 }
diff --git a/src/game/game_1165d0.c b/src/game/game_1165d0.c
index a6b2b6d21..1033e7d31 100644
--- a/src/game/game_1165d0.c
+++ b/src/game/game_1165d0.c
@@ -356,7 +356,7 @@ glabel func0f11668c
 /*  f1166ec:	0041001b */ 	divu	$zero,$v0,$at
 /*  f1166f0:	00004010 */ 	mfhi	$t0
 /*  f1166f4:	25090010 */ 	addiu	$t1,$t0,0x10
-/*  f1166f8:	0c012144 */ 	jal	func00048510
+/*  f1166f8:	0c012144 */ 	jal	osGetCount
 /*  f1166fc:	afa90018 */ 	sw	$t1,0x18($sp)
 /*  f116700:	8faa001c */ 	lw	$t2,0x1c($sp)
 /*  f116704:	8fab0018 */ 	lw	$t3,0x18($sp)
diff --git a/src/game/game_131060.c b/src/game/game_131060.c
index 2d1d96171..4b479fdb2 100644
--- a/src/game/game_131060.c
+++ b/src/game/game_131060.c
@@ -2297,7 +2297,7 @@ glabel var7f1b5780
 /*  f132f2c:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f132f30:	afa00d80 */ 	sw	$zero,0xd80($sp)
 .L0f132f34:
-/*  f132f34:	0c012144 */ 	jal	func00048510
+/*  f132f34:	0c012144 */ 	jal	osGetCount
 /*  f132f38:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f132f3c:	27a30db0 */ 	addiu	$v1,$sp,0xdb0
 /*  f132f40:	27a20dd8 */ 	addiu	$v0,$sp,0xdd8
@@ -3217,7 +3217,7 @@ glabel var7f1b5780
 /*  f133c7c:	afae0de8 */ 	sw	$t6,0xde8($sp)
 /*  f133c80:	0c012d20 */ 	jal	osVirtualToPhysical
 /*  f133c84:	ae0b0000 */ 	sw	$t3,0x0($s0)
-/*  f133c88:	0c012144 */ 	jal	func00048510
+/*  f133c88:	0c012144 */ 	jal	osGetCount
 /*  f133c8c:	ae020004 */ 	sw	$v0,0x4($s0)
 /*  f133c90:	afa20d84 */ 	sw	$v0,0xd84($sp)
 /*  f133c94:	00001825 */ 	or	$v1,$zero,$zero
@@ -3230,7 +3230,7 @@ glabel var7f1b5780
 /*  f133cac:	31990003 */ 	andi	$t9,$t4,0x3
 /*  f133cb0:	5320023b */ 	beqzl	$t9,.L0f1345a0
 /*  f133cb4:	8fa30088 */ 	lw	$v1,0x88($sp)
-/*  f133cb8:	0c012144 */ 	jal	func00048510
+/*  f133cb8:	0c012144 */ 	jal	osGetCount
 /*  f133cbc:	afa30088 */ 	sw	$v1,0x88($sp)
 /*  f133cc0:	afa20da0 */ 	sw	$v0,0xda0($sp)
 /*  f133cc4:	c6440000 */ 	lwc1	$f4,0x0($s2)
@@ -3250,7 +3250,7 @@ glabel var7f1b5780
 /*  f133cfc:	e7a60110 */ 	swc1	$f6,0x110($sp)
 /*  f133d00:	50400227 */ 	beqzl	$v0,.L0f1345a0
 /*  f133d04:	8fa30088 */ 	lw	$v1,0x88($sp)
-/*  f133d08:	0c012144 */ 	jal	func00048510
+/*  f133d08:	0c012144 */ 	jal	osGetCount
 /*  f133d0c:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f133d10:	8fad0dcc */ 	lw	$t5,0xdcc($sp)
 /*  f133d14:	8faf0da0 */ 	lw	$t7,0xda0($sp)
@@ -3309,9 +3309,9 @@ glabel var7f1b5780
 /*  f133de0:	c6460008 */ 	lwc1	$f6,0x8($s2)
 /*  f133de4:	1420fff5 */ 	bnez	$at,.L0f133dbc
 /*  f133de8:	e446fffc */ 	swc1	$f6,-0x4($v0)
-/*  f133dec:	0c012144 */ 	jal	func00048510
+/*  f133dec:	0c012144 */ 	jal	osGetCount
 /*  f133df0:	00000000 */ 	sll	$zero,$zero,0x0
-/*  f133df4:	0c012144 */ 	jal	func00048510
+/*  f133df4:	0c012144 */ 	jal	osGetCount
 /*  f133df8:	afa20d88 */ 	sw	$v0,0xd88($sp)
 /*  f133dfc:	3c0f8008 */ 	lui	$t7,%hi(var8007f0f4)
 /*  f133e00:	8deff0f4 */ 	lw	$t7,%lo(var8007f0f4)($t7)
@@ -3410,7 +3410,7 @@ glabel var7f1b5780
 /*  f133f68:	e7ac0cb0 */ 	swc1	$f12,0xcb0($sp)
 /*  f133f6c:	e7a20ca4 */ 	swc1	$f2,0xca4($sp)
 .L0f133f70:
-/*  f133f70:	0c012144 */ 	jal	func00048510
+/*  f133f70:	0c012144 */ 	jal	osGetCount
 /*  f133f74:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f133f78:	8fb90708 */ 	lw	$t9,0x708($sp)
 /*  f133f7c:	afa20d90 */ 	sw	$v0,0xd90($sp)
@@ -3482,7 +3482,7 @@ glabel var7f1b5780
 /*  f134078:	5619ffc5 */ 	bnel	$s0,$t9,.L0f133f90
 /*  f13407c:	8e2d0000 */ 	lw	$t5,0x0($s1)
 .L0f134080:
-/*  f134080:	0c012144 */ 	jal	func00048510
+/*  f134080:	0c012144 */ 	jal	osGetCount
 /*  f134084:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f134088:	8fad0dbc */ 	lw	$t5,0xdbc($sp)
 /*  f13408c:	8fb80d90 */ 	lw	$t8,0xd90($sp)
@@ -3490,7 +3490,7 @@ glabel var7f1b5780
 /*  f134094:	01787823 */ 	subu	$t7,$t3,$t8
 /*  f134098:	afaf0dbc */ 	sw	$t7,0xdbc($sp)
 .L0f13409c:
-/*  f13409c:	0c012144 */ 	jal	func00048510
+/*  f13409c:	0c012144 */ 	jal	osGetCount
 /*  f1340a0:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f1340a4:	8fae0db8 */ 	lw	$t6,0xdb8($sp)
 /*  f1340a8:	8fb90d8c */ 	lw	$t9,0xd8c($sp)
@@ -3500,7 +3500,7 @@ glabel var7f1b5780
 /*  f1340b8:	12600138 */ 	beqz	$s3,.L0f13459c
 /*  f1340bc:	afad0db8 */ 	sw	$t5,0xdb8($sp)
 /*  f1340c0:	8fb8008c */ 	lw	$t8,0x8c($sp)
-/*  f1340c4:	0c012144 */ 	jal	func00048510
+/*  f1340c4:	0c012144 */ 	jal	osGetCount
 /*  f1340c8:	01789821 */ 	addu	$s3,$t3,$t8
 /*  f1340cc:	3c0f8008 */ 	lui	$t7,%hi(var8007f0f0)
 /*  f1340d0:	8deff0f0 */ 	lw	$t7,%lo(var8007f0f0)($t7)
@@ -3707,13 +3707,13 @@ glabel var7f1b5780
 /*  f1343dc:	1614ffba */ 	bne	$s0,$s4,.L0f1342c8
 /*  f1343e0:	26310004 */ 	addiu	$s1,$s1,0x4
 .L0f1343e4:
-/*  f1343e4:	0c012144 */ 	jal	func00048510
+/*  f1343e4:	0c012144 */ 	jal	osGetCount
 /*  f1343e8:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f1343ec:	8fb90dc0 */ 	lw	$t9,0xdc0($sp)
 /*  f1343f0:	8fab0d94 */ 	lw	$t3,0xd94($sp)
 /*  f1343f4:	03226821 */ 	addu	$t5,$t9,$v0
 /*  f1343f8:	01abc023 */ 	subu	$t8,$t5,$t3
-/*  f1343fc:	0c012144 */ 	jal	func00048510
+/*  f1343fc:	0c012144 */ 	jal	osGetCount
 /*  f134400:	afb80dc0 */ 	sw	$t8,0xdc0($sp)
 /*  f134404:	afa20d98 */ 	sw	$v0,0xd98($sp)
 /*  f134408:	24030100 */ 	addiu	$v1,$zero,0x100
@@ -3724,13 +3724,13 @@ glabel var7f1b5780
 /*  f13441c:	a660002e */ 	sh	$zero,0x2e($s3)
 /*  f134420:	a660002c */ 	sh	$zero,0x2c($s3)
 /*  f134424:	a6600022 */ 	sh	$zero,0x22($s3)
-/*  f134428:	0c012144 */ 	jal	func00048510
+/*  f134428:	0c012144 */ 	jal	osGetCount
 /*  f13442c:	a6600008 */ 	sh	$zero,0x8($s3)
 /*  f134430:	8faf0dc4 */ 	lw	$t7,0xdc4($sp)
 /*  f134434:	8fac0d98 */ 	lw	$t4,0xd98($sp)
 /*  f134438:	01e27021 */ 	addu	$t6,$t7,$v0
 /*  f13443c:	01ccc823 */ 	subu	$t9,$t6,$t4
-/*  f134440:	0c012144 */ 	jal	func00048510
+/*  f134440:	0c012144 */ 	jal	osGetCount
 /*  f134444:	afb90dc4 */ 	sw	$t9,0xdc4($sp)
 /*  f134448:	c7a60198 */ 	lwc1	$f6,0x198($sp)
 /*  f13444c:	afa20d9c */ 	sw	$v0,0xd9c($sp)
@@ -3806,13 +3806,13 @@ glabel var7f1b5780
 .L0f134564:
 /*  f134564:	afb90194 */ 	sw	$t9,0x194($sp)
 .L0f134568:
-/*  f134568:	0c012144 */ 	jal	func00048510
+/*  f134568:	0c012144 */ 	jal	osGetCount
 /*  f13456c:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f134570:	8fad0dc8 */ 	lw	$t5,0xdc8($sp)
 /*  f134574:	8fb80d9c */ 	lw	$t8,0xd9c($sp)
 /*  f134578:	01a25821 */ 	addu	$t3,$t5,$v0
 /*  f13457c:	01787823 */ 	subu	$t7,$t3,$t8
-/*  f134580:	0c012144 */ 	jal	func00048510
+/*  f134580:	0c012144 */ 	jal	osGetCount
 /*  f134584:	afaf0dc8 */ 	sw	$t7,0xdc8($sp)
 /*  f134588:	8fae0db4 */ 	lw	$t6,0xdb4($sp)
 /*  f13458c:	8fb90d88 */ 	lw	$t9,0xd88($sp)
@@ -3875,7 +3875,7 @@ glabel var7f1b5780
 /*  f134660:	af0e0000 */ 	sw	$t6,0x0($t8)
 /*  f134664:	af0c0004 */ 	sw	$t4,0x4($t8)
 .L0f134668:
-/*  f134668:	0c012144 */ 	jal	func00048510
+/*  f134668:	0c012144 */ 	jal	osGetCount
 /*  f13466c:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f134670:	8fbf006c */ 	lw	$ra,0x6c($sp)
 /*  f134674:	8fa20de8 */ 	lw	$v0,0xde8($sp)
@@ -4680,7 +4680,7 @@ glabel var7f1b5790
 /*  f135200:	332e0003 */ 	andi	$t6,$t9,0x3
 /*  f135204:	51c0024b */ 	beqzl	$t6,.L0f135b34
 /*  f135208:	27de0001 */ 	addiu	$s8,$s8,0x1
-/*  f13520c:	0c012144 */ 	jal	func00048510
+/*  f13520c:	0c012144 */ 	jal	osGetCount
 /*  f135210:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f135214:	afa21354 */ 	sw	$v0,0x1354($sp)
 /*  f135218:	c6040000 */ 	lwc1	$f4,0x0($s0)
@@ -4700,7 +4700,7 @@ glabel var7f1b5790
 /*  f135250:	e7aa012c */ 	swc1	$f10,0x12c($sp)
 /*  f135254:	50400237 */ 	beqzl	$v0,.L0f135b34
 /*  f135258:	27de0001 */ 	addiu	$s8,$s8,0x1
-/*  f13525c:	0c012144 */ 	jal	func00048510
+/*  f13525c:	0c012144 */ 	jal	osGetCount
 /*  f135260:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f135264:	8fb8137c */ 	lw	$t8,0x137c($sp)
 /*  f135268:	8fb91354 */ 	lw	$t9,0x1354($sp)
diff --git a/src/game/game_149c90.c b/src/game/game_149c90.c
index e86a7d6a2..6fe83e1b4 100644
--- a/src/game/game_149c90.c
+++ b/src/game/game_149c90.c
@@ -2187,7 +2187,7 @@ glabel var7f1b72f0
 /*  f14b594:	e4640050 */ 	swc1	$f4,0x50($v1)
 /*  f14b598:	e4660020 */ 	swc1	$f6,0x20($v1)
 /*  f14b59c:	e4680038 */ 	swc1	$f8,0x38($v1)
-/*  f14b5a0:	0c012144 */ 	jal	func00048510
+/*  f14b5a0:	0c012144 */ 	jal	osGetCount
 /*  f14b5a4:	afa3001c */ 	sw	$v1,0x1c($sp)
 /*  f14b5a8:	44828000 */ 	mtc1	$v0,$f16
 /*  f14b5ac:	3c014170 */ 	lui	$at,0x4170
diff --git a/src/game/game_16ce10.c b/src/game/game_16ce10.c
index 3947b3b50..704798d51 100644
--- a/src/game/game_16ce10.c
+++ b/src/game/game_16ce10.c
@@ -24,7 +24,7 @@ GLOBAL_ASM(
 glabel func0f16ce10
 /*  f16ce10:	27bdffe8 */ 	addiu	$sp,$sp,-24
 /*  f16ce14:	afbf0014 */ 	sw	$ra,0x14($sp)
-/*  f16ce18:	0c012144 */ 	jal	func00048510
+/*  f16ce18:	0c012144 */ 	jal	osGetCount
 /*  f16ce1c:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f16ce20:	8fbf0014 */ 	lw	$ra,0x14($sp)
 /*  f16ce24:	3c03800a */ 	lui	$v1,%hi(g_Vars)
@@ -81,7 +81,7 @@ glabel func0f16ce94
 /*  f16ced0:	3631ebc2 */ 	ori	$s1,$s1,0xebc2
 /*  f16ced4:	26109fc0 */ 	addiu	$s0,$s0,%lo(g_Vars)
 .L0f16ced8:
-/*  f16ced8:	0c012144 */ 	jal	func00048510
+/*  f16ced8:	0c012144 */ 	jal	osGetCount
 /*  f16cedc:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f16cee0:	8e0e0018 */ 	lw	$t6,0x18($s0)
 /*  f16cee4:	8e0f0020 */ 	lw	$t7,0x20($s0)
diff --git a/src/include/game/data/data_0160b0.h b/src/include/game/data/data_0160b0.h
index baab992ce..2b3ada064 100644
--- a/src/include/game/data/data_0160b0.h
+++ b/src/include/game/data/data_0160b0.h
@@ -48,7 +48,7 @@ extern u32 var80070580;
 extern u32 var80070584;
 extern u32 var800705a0;
 extern u32 var800705a4;
-extern s32 var800705a8;
+extern bool var800705a8;
 extern u32 var800705ac;
 extern u32 var800705b0;
 extern u32 var800705b4;
diff --git a/src/include/game/game_011110.h b/src/include/game/game_011110.h
index 44bdd7c6c..152d0cf5d 100644
--- a/src/include/game/game_011110.h
+++ b/src/include/game/game_011110.h
@@ -4,7 +4,7 @@
 #include "types.h"
 
 void func0f011110(void);
-void func0f011124(s32 value);
+void func0f011124(bool value);
 u32 func0f011130(void);
 u32 func0f011560(s32 weaponnum);
 void currentPlayerInitEyespy(void);
diff --git a/src/include/lib/lib_481e0.h b/src/include/lib/lib_481e0.h
index 19b57cd6a..299ffab3b 100644
--- a/src/include/lib/lib_481e0.h
+++ b/src/include/lib/lib_481e0.h
@@ -8,6 +8,6 @@ void osStartThread(OSThread *thread);
 void osCreateMesgQueue(OSMesgQueue *mq, OSMesg *msgBuf, s32 count);
 void func00048370(s32 arg0);
 void func00048430(s32 arg0, s32 arg1);
-u32 func00048510(void);
+u32 osGetCount(void);
 
 #endif
diff --git a/src/include/lib/lib_48b20.h b/src/include/lib/lib_48b20.h
index ff65e47fa..99a8eaa71 100644
--- a/src/include/lib/lib_48b20.h
+++ b/src/include/lib/lib_48b20.h
@@ -3,6 +3,6 @@
 #include <ultra64.h>
 #include "types.h"
 
-u32 func00048b20(void);
+u32 osSetTimer(OSTimer *, OSTime, u64, OSMesgQueue *, OSMesg);
 
 #endif
diff --git a/src/include/lib/lib_491b0.h b/src/include/lib/lib_491b0.h
index 5d0b9e611..1d3411016 100644
--- a/src/include/lib/lib_491b0.h
+++ b/src/include/lib/lib_491b0.h
@@ -5,8 +5,8 @@
 
 u32 func000491b0(void);
 u32 func0004923c(void);
-u32 func000493b4(void);
-u32 func00049428(void);
+u32 __osSetTimerIntr(void);
+u32 __osInsertTimer(void);
 u32 __osDisableInt(void);
 u32 __osRestoreInt(void);
 
diff --git a/src/include/lib/lib_4ba90.h b/src/include/lib/lib_4ba90.h
index cddd4d7c1..62748760a 100644
--- a/src/include/lib/lib_4ba90.h
+++ b/src/include/lib/lib_4ba90.h
@@ -6,8 +6,8 @@
 u32 __osPfsGetStatus(void);
 u32 __osPfsRequestOneChannel(void);
 u32 __osPfsGetOneChannelData(void);
-u32 func0004bcc0(void);
-u32 func0004be38(void);
-u32 func0004bee4(void);
+s32 osEepromWrite(OSMesgQueue *mq, u8 address, u8 *buffer);
+u32 __osPackEepWriteData(void);
+u32 __osEepStatus(void);
 
 #endif
diff --git a/src/include/lib/lib_51880.h b/src/include/lib/lib_51880.h
index cf156c4f1..3cfbc14a7 100644
--- a/src/include/lib/lib_51880.h
+++ b/src/include/lib/lib_51880.h
@@ -3,6 +3,6 @@
 #include <ultra64.h>
 #include "types.h"
 
-u32 func00051880(void);
+u32 __osSetCompare(void);
 
 #endif
diff --git a/src/lib/lib_03050.c b/src/lib/lib_03050.c
index 9d5337c3a..f1ec7860a 100644
--- a/src/lib/lib_03050.c
+++ b/src/lib/lib_03050.c
@@ -205,7 +205,7 @@ glabel func000031d0
 /*     32cc:	8e790000 */ 	lw	$t9,0x0($s3)
 /*     32d0:	8e500000 */ 	lw	$s0,0x0($s2)
 /*     32d4:	27280001 */ 	addiu	$t0,$t9,0x1
-/*     32d8:	0c012144 */ 	jal	func00048510
+/*     32d8:	0c012144 */ 	jal	osGetCount
 /*     32dc:	ae680000 */ 	sw	$t0,0x0($s3)
 /*     32e0:	8e2d0004 */ 	lw	$t5,0x4($s1)
 /*     32e4:	00508023 */ 	subu	$s0,$v0,$s0
diff --git a/src/lib/lib_06100.c b/src/lib/lib_06100.c
index 7a06f25e4..eb3b0bd07 100644
--- a/src/lib/lib_06100.c
+++ b/src/lib/lib_06100.c
@@ -140,7 +140,7 @@ glabel func00006100
 /*     62b0:	24840ab0 */ 	addiu	$a0,$a0,%lo(var80090ab0)
 /*     62b4:	afb90018 */ 	sw	$t9,0x18($sp)
 /*     62b8:	afa9001c */ 	sw	$t1,0x1c($sp)
-/*     62bc:	0c0122c8 */ 	jal	func00048b20
+/*     62bc:	0c0122c8 */ 	jal	osSetTimer
 /*     62c0:	24060000 */ 	addiu	$a2,$zero,0x0
 /*     62c4:	3c048009 */ 	lui	$a0,%hi(var80090ad0)
 /*     62c8:	24840ad0 */ 	addiu	$a0,$a0,%lo(var80090ad0)
diff --git a/src/lib/lib_06330.c b/src/lib/lib_06330.c
index ac04bb0c9..4fb3f7483 100644
--- a/src/lib/lib_06330.c
+++ b/src/lib/lib_06330.c
@@ -69,7 +69,7 @@ glabel func00006330
 /*     63f4:	afb00018 */ 	sw	$s0,0x18($sp)
 /*     63f8:	24840ab0 */ 	addiu	$a0,$a0,%lo(var80090ab0)
 /*     63fc:	24060000 */ 	addiu	$a2,$zero,0x0
-/*     6400:	0c0122c8 */ 	jal	func00048b20
+/*     6400:	0c0122c8 */ 	jal	osSetTimer
 /*     6404:	afa30058 */ 	sw	$v1,0x58($sp)
 /*     6408:	02002025 */ 	or	$a0,$s0,$zero
 /*     640c:	00002825 */ 	or	$a1,$zero,$zero
diff --git a/src/lib/lib_06440.c b/src/lib/lib_06440.c
index b45a565d9..3cdcbfca4 100644
--- a/src/lib/lib_06440.c
+++ b/src/lib/lib_06440.c
@@ -40,7 +40,7 @@ glabel osEepromLongWrite
 /*     649c:	02e02025 */ 	or	$a0,$s7,$zero
 .L000064a0:
 /*     64a0:	322500ff */ 	andi	$a1,$s1,0xff
-/*     64a4:	0c012f30 */ 	jal	func0004bcc0
+/*     64a4:	0c012f30 */ 	jal	osEepromWrite
 /*     64a8:	02403025 */ 	or	$a2,$s2,$zero
 /*     64ac:	10400003 */ 	beqz	$v0,.L000064bc
 /*     64b0:	0040b025 */ 	or	$s6,$v0,$zero
@@ -61,7 +61,7 @@ glabel osEepromLongWrite
 /*     64e8:	02802025 */ 	or	$a0,$s4,$zero
 /*     64ec:	24060000 */ 	addiu	$a2,$zero,0x0
 /*     64f0:	afb30018 */ 	sw	$s3,0x18($sp)
-/*     64f4:	0c0122c8 */ 	jal	func00048b20
+/*     64f4:	0c0122c8 */ 	jal	osSetTimer
 /*     64f8:	afb5001c */ 	sw	$s5,0x1c($sp)
 /*     64fc:	02602025 */ 	or	$a0,$s3,$zero
 /*     6500:	00002825 */ 	or	$a1,$zero,$zero
diff --git a/src/lib/lib_0d520.c b/src/lib/lib_0d520.c
index a21245970..6b8fc9c6e 100644
--- a/src/lib/lib_0d520.c
+++ b/src/lib/lib_0d520.c
@@ -223,7 +223,7 @@ glabel func0000d520
 /*     d5b0:	afae0010 */ 	sw	$t6,0x10($sp)
 /*     d5b4:	34e7868c */ 	ori	$a3,$a3,0x868c
 /*     d5b8:	27a414a8 */ 	addiu	$a0,$sp,0x14a8
-/*     d5bc:	0c0122c8 */ 	jal	func00048b20
+/*     d5bc:	0c0122c8 */ 	jal	osSetTimer
 /*     d5c0:	24060000 */ 	addiu	$a2,$zero,0x0
 /*     d5c4:	27a41490 */ 	addiu	$a0,$sp,0x1490
 /*     d5c8:	27a514cc */ 	addiu	$a1,$sp,0x14cc
@@ -700,7 +700,7 @@ glabel func0000db3c
 /*     dc98:	00000000 */ 	sll	$zero,$zero,0x0
 /*     dc9c:	ac580000 */ 	sw	$t8,0x0($v0)
 .L0000dca0:
-/*     dca0:	0c012144 */ 	jal	func00048510
+/*     dca0:	0c012144 */ 	jal	osGetCount
 /*     dca4:	24160001 */ 	addiu	$s6,$zero,0x1
 /*     dca8:	0c004b82 */ 	jal	func00012e08
 /*     dcac:	00402025 */ 	or	$a0,$v0,$zero
@@ -1093,7 +1093,7 @@ glabel func0000db3c
 /*     e224:	1000001a */ 	beqz	$zero,.L0000e290
 /*     e228:	8eeb0000 */ 	lw	$t3,0x0($s7)
 .L0000e22c:
-/*     e22c:	0c012144 */ 	jal	func00048510
+/*     e22c:	0c012144 */ 	jal	osGetCount
 /*     e230:	00000000 */ 	sll	$zero,$zero,0x0
 /*     e234:	8e580028 */ 	lw	$t8,0x28($s2)
 /*     e238:	3c01000b */ 	lui	$at,0xb
diff --git a/src/lib/lib_13900.c b/src/lib/lib_13900.c
index 24893b402..5aa18c9af 100644
--- a/src/lib/lib_13900.c
+++ b/src/lib/lib_13900.c
@@ -228,7 +228,7 @@ glabel func00013ab8
 /*    13b34:	ac2aeefc */ 	sw	$t2,-0x1104($at)
 /*    13b38:	3c018006 */ 	lui	$at,0x8006
 /*    13b3c:	afa70030 */ 	sw	$a3,0x30($sp)
-/*    13b40:	0c012144 */ 	jal	func00048510
+/*    13b40:	0c012144 */ 	jal	osGetCount
 /*    13b44:	ac2beef8 */ 	sw	$t3,-0x1108($at)
 /*    13b48:	3c0c8006 */ 	lui	$t4,%hi(var8005eef8)
 /*    13b4c:	8d8ceef8 */ 	lw	$t4,%lo(var8005eef8)($t4)
diff --git a/src/lib/lib_481e0.c b/src/lib/lib_481e0.c
index 336cd6bf7..a3ec64eef 100644
--- a/src/lib/lib_481e0.c
+++ b/src/lib/lib_481e0.c
@@ -251,7 +251,7 @@ glabel func00048430
 );
 
 GLOBAL_ASM(
-glabel func00048510
+glabel osGetCount
 /*    48510:	40024800 */ 	mfc0	$v0,$9
 /*    48514:	03e00008 */ 	jr	$ra
 /*    48518:	00000000 */ 	sll	$zero,$zero,0x0
diff --git a/src/lib/lib_488e0.c b/src/lib/lib_488e0.c
index 903d1fada..ebf053e80 100644
--- a/src/lib/lib_488e0.c
+++ b/src/lib/lib_488e0.c
@@ -161,7 +161,7 @@ glabel func00048a30
 /*    48ae4:	8de90000 */ 	lw	$t1,0x0($t7)
 /*    48ae8:	152f0003 */ 	bne	$t1,$t7,.L00048af8
 /*    48aec:	00000000 */ 	sll	$zero,$zero,0x0
-/*    48af0:	0c014620 */ 	jal	func00051880
+/*    48af0:	0c014620 */ 	jal	__osSetCompare
 /*    48af4:	00002025 */ 	or	$a0,$zero,$zero
 .L00048af8:
 /*    48af8:	0c012588 */ 	jal	__osRestoreInt
diff --git a/src/lib/lib_48b20.c b/src/lib/lib_48b20.c
index fa91c58b7..7f5908851 100644
--- a/src/lib/lib_48b20.c
+++ b/src/lib/lib_48b20.c
@@ -11,7 +11,7 @@
 #include "types.h"
 
 GLOBAL_ASM(
-glabel func00048b20
+glabel osSetTimer
 /*    48b20:	27bdffe0 */ 	addiu	$sp,$sp,-32
 /*    48b24:	afa40020 */ 	sw	$a0,0x20($sp)
 /*    48b28:	8fae0020 */ 	lw	$t6,0x20($sp)
@@ -50,7 +50,7 @@ glabel func00048b20
 /*    48ba0:	8fa80020 */ 	lw	$t0,0x20($sp)
 /*    48ba4:	8fb9003c */ 	lw	$t9,0x3c($sp)
 /*    48ba8:	ad19001c */ 	sw	$t9,0x1c($t0)
-/*    48bac:	0c01250a */ 	jal	func00049428
+/*    48bac:	0c01250a */ 	jal	__osInsertTimer
 /*    48bb0:	8fa40020 */ 	lw	$a0,0x20($sp)
 /*    48bb4:	3c0a8006 */ 	lui	$t2,%hi(var800608a0)
 /*    48bb8:	8d4a08a0 */ 	lw	$t2,%lo(var800608a0)($t2)
@@ -61,7 +61,7 @@ glabel func00048b20
 /*    48bcc:	15690004 */ 	bne	$t3,$t1,.L00048be0
 /*    48bd0:	00000000 */ 	sll	$zero,$zero,0x0
 /*    48bd4:	8fa40018 */ 	lw	$a0,0x18($sp)
-/*    48bd8:	0c0124ed */ 	jal	func000493b4
+/*    48bd8:	0c0124ed */ 	jal	__osSetTimerIntr
 /*    48bdc:	8fa5001c */ 	lw	$a1,0x1c($sp)
 .L00048be0:
 /*    48be0:	8fbf0014 */ 	lw	$ra,0x14($sp)
diff --git a/src/lib/lib_490b0.c b/src/lib/lib_490b0.c
index 84b5a3c63..b74fe440f 100644
--- a/src/lib/lib_490b0.c
+++ b/src/lib/lib_490b0.c
@@ -54,7 +54,7 @@ glabel func00049120
 /*    49124:	afbf001c */ 	sw	$ra,0x1c($sp)
 /*    49128:	0c01256c */ 	jal	__osDisableInt
 /*    4912c:	afb00018 */ 	sw	$s0,0x18($sp)
-/*    49130:	0c012144 */ 	jal	func00048510
+/*    49130:	0c012144 */ 	jal	osGetCount
 /*    49134:	00408025 */ 	or	$s0,$v0,$zero
 /*    49138:	afa20034 */ 	sw	$v0,0x34($sp)
 /*    4913c:	3c0f800a */ 	lui	$t7,%hi(var8009c788)
diff --git a/src/lib/lib_491b0.c b/src/lib/lib_491b0.c
index 240281b81..98ed901b6 100644
--- a/src/lib/lib_491b0.c
+++ b/src/lib/lib_491b0.c
@@ -67,13 +67,13 @@ glabel func0004923c
 /*    49260:	8f190000 */ 	lw	$t9,0x0($t8)
 /*    49264:	17380006 */ 	bne	$t9,$t8,.L00049280
 /*    49268:	afb90024 */ 	sw	$t9,0x24($sp)
-/*    4926c:	0c014620 */ 	jal	func00051880
+/*    4926c:	0c014620 */ 	jal	__osSetCompare
 /*    49270:	00002025 */ 	or	$a0,$zero,$zero
 /*    49274:	3c01800a */ 	lui	$at,0x800a
 /*    49278:	1000004a */ 	beqz	$zero,.L000493a4
 /*    4927c:	ac20c790 */ 	sw	$zero,-0x3870($at)
 .L00049280:
-/*    49280:	0c012144 */ 	jal	func00048510
+/*    49280:	0c012144 */ 	jal	osGetCount
 /*    49284:	00000000 */ 	sll	$zero,$zero,0x0
 /*    49288:	afa20020 */ 	sw	$v0,0x20($sp)
 /*    4928c:	3c09800a */ 	lui	$t1,%hi(var8009c790)
@@ -110,7 +110,7 @@ glabel func0004923c
 /*    49304:	af280010 */ 	sw	$t0,0x10($t9)
 /*    49308:	8fae0024 */ 	lw	$t6,0x24($sp)
 /*    4930c:	8dc40010 */ 	lw	$a0,0x10($t6)
-/*    49310:	0c0124ed */ 	jal	func000493b4
+/*    49310:	0c0124ed */ 	jal	__osSetTimerIntr
 /*    49314:	8dc50014 */ 	lw	$a1,0x14($t6)
 /*    49318:	10000022 */ 	beqz	$zero,.L000493a4
 /*    4931c:	00000000 */ 	sll	$zero,$zero,0x0
@@ -146,7 +146,7 @@ glabel func0004923c
 .L0004938c:
 /*    4938c:	adf80010 */ 	sw	$t8,0x10($t7)
 /*    49390:	adf90014 */ 	sw	$t9,0x14($t7)
-/*    49394:	0c01250a */ 	jal	func00049428
+/*    49394:	0c01250a */ 	jal	__osInsertTimer
 /*    49398:	8fa40024 */ 	lw	$a0,0x24($sp)
 /*    4939c:	1000ffae */ 	beqz	$zero,.L00049258
 /*    493a0:	00000000 */ 	sll	$zero,$zero,0x0
@@ -158,13 +158,13 @@ glabel func0004923c
 );
 
 GLOBAL_ASM(
-glabel func000493b4
+glabel __osSetTimerIntr
 /*    493b4:	27bdffd8 */ 	addiu	$sp,$sp,-40
 /*    493b8:	afbf0014 */ 	sw	$ra,0x14($sp)
 /*    493bc:	afa40028 */ 	sw	$a0,0x28($sp)
 /*    493c0:	0c01256c */ 	jal	__osDisableInt
 /*    493c4:	afa5002c */ 	sw	$a1,0x2c($sp)
-/*    493c8:	0c012144 */ 	jal	func00048510
+/*    493c8:	0c012144 */ 	jal	osGetCount
 /*    493cc:	afa2001c */ 	sw	$v0,0x1c($sp)
 /*    493d0:	3c01800a */ 	lui	$at,0x800a
 /*    493d4:	ac22c790 */ 	sw	$v0,-0x3870($at)
@@ -180,7 +180,7 @@ glabel func000493b4
 /*    493fc:	01485021 */ 	addu	$t2,$t2,$t0
 /*    49400:	afaa0020 */ 	sw	$t2,0x20($sp)
 /*    49404:	afab0024 */ 	sw	$t3,0x24($sp)
-/*    49408:	0c014620 */ 	jal	func00051880
+/*    49408:	0c014620 */ 	jal	__osSetCompare
 /*    4940c:	01602025 */ 	or	$a0,$t3,$zero
 /*    49410:	0c012588 */ 	jal	__osRestoreInt
 /*    49414:	8fa4001c */ 	lw	$a0,0x1c($sp)
@@ -191,7 +191,7 @@ glabel func000493b4
 );
 
 GLOBAL_ASM(
-glabel func00049428
+glabel __osInsertTimer
 /*    49428:	27bdffc8 */ 	addiu	$sp,$sp,-56
 /*    4942c:	afbf0014 */ 	sw	$ra,0x14($sp)
 /*    49430:	0c01256c */ 	jal	__osDisableInt
diff --git a/src/lib/lib_4a980.c b/src/lib/lib_4a980.c
index 5172dc315..2705d017d 100644
--- a/src/lib/lib_4a980.c
+++ b/src/lib/lib_4a980.c
@@ -64,7 +64,7 @@ glabel func0004a980
 /*    4aa2c:	afad0014 */ 	sw	$t5,0x14($sp)
 /*    4aa30:	afac0010 */ 	sw	$t4,0x10($sp)
 /*    4aa34:	27a40040 */ 	addiu	$a0,$sp,0x40
-/*    4aa38:	0c0122c8 */ 	jal	func00048b20
+/*    4aa38:	0c0122c8 */ 	jal	osSetTimer
 /*    4aa3c:	01693823 */ 	subu	$a3,$t3,$t1
 /*    4aa40:	27a40028 */ 	addiu	$a0,$sp,0x28
 /*    4aa44:	27a5006c */ 	addiu	$a1,$sp,0x6c
diff --git a/src/lib/lib_4ba90.c b/src/lib/lib_4ba90.c
index 4f73bce92..6eec3f36c 100644
--- a/src/lib/lib_4ba90.c
+++ b/src/lib/lib_4ba90.c
@@ -176,7 +176,7 @@ glabel __osPfsGetOneChannelData
 );
 
 GLOBAL_ASM(
-glabel func0004bcc0
+glabel osEepromWrite
 /*    4bcc0:	27bdffb8 */ 	addiu	$sp,$sp,-72
 /*    4bcc4:	afbf001c */ 	sw	$ra,0x1c($sp)
 /*    4bcc8:	afb10018 */ 	sw	$s1,0x18($sp)
@@ -187,7 +187,7 @@ glabel func0004bcc0
 /*    4bcdc:	afa60050 */ 	sw	$a2,0x50($sp)
 /*    4bce0:	27b0002c */ 	addiu	$s0,$sp,0x2c
 /*    4bce4:	02002825 */ 	or	$a1,$s0,$zero
-/*    4bce8:	0c012fb9 */ 	jal	func0004bee4
+/*    4bce8:	0c012fb9 */ 	jal	__osEepStatus
 /*    4bcec:	02202025 */ 	or	$a0,$s1,$zero
 /*    4bcf0:	14400015 */ 	bnez	$v0,.L0004bd48
 /*    4bcf4:	00401825 */ 	or	$v1,$v0,$zero
@@ -225,7 +225,7 @@ glabel func0004bcc0
 /*    4bd64:	11200007 */ 	beqz	$t1,.L0004bd84
 /*    4bd68:	02202025 */ 	or	$a0,$s1,$zero
 .L0004bd6c:
-/*    4bd6c:	0c012fb9 */ 	jal	func0004bee4
+/*    4bd6c:	0c012fb9 */ 	jal	__osEepStatus
 /*    4bd70:	02002825 */ 	or	$a1,$s0,$zero
 /*    4bd74:	93aa002e */ 	lbu	$t2,0x2e($sp)
 /*    4bd78:	314b0080 */ 	andi	$t3,$t2,0x80
@@ -233,7 +233,7 @@ glabel func0004bcc0
 /*    4bd80:	02202025 */ 	or	$a0,$s1,$zero
 .L0004bd84:
 /*    4bd84:	93a4004f */ 	lbu	$a0,0x4f($sp)
-/*    4bd88:	0c012f8e */ 	jal	func0004be38
+/*    4bd88:	0c012f8e */ 	jal	__osPackEepWriteData
 /*    4bd8c:	8fa50050 */ 	lw	$a1,0x50($sp)
 /*    4bd90:	3c05800a */ 	lui	$a1,%hi(var8009ca80)
 /*    4bd94:	24a5ca80 */ 	addiu	$a1,$a1,%lo(var8009ca80)
@@ -281,7 +281,7 @@ glabel func0004bcc0
 );
 
 GLOBAL_ASM(
-glabel func0004be38
+glabel __osPackEepWriteData
 /*    4be38:	27bdffe8 */ 	addiu	$sp,$sp,-24
 /*    4be3c:	3c07800a */ 	lui	$a3,%hi(var8009ca80)
 /*    4be40:	24e7ca80 */ 	addiu	$a3,$a3,%lo(var8009ca80)
@@ -329,7 +329,7 @@ glabel func0004be38
 );
 
 GLOBAL_ASM(
-glabel func0004bee4
+glabel __osEepStatus
 /*    4bee4:	27bdffd0 */ 	addiu	$sp,$sp,-48
 /*    4bee8:	3c02800a */ 	lui	$v0,%hi(var8009ca80)
 /*    4beec:	3c03800a */ 	lui	$v1,%hi(var8009cac0)
diff --git a/src/lib/lib_4c090.c b/src/lib/lib_4c090.c
index e1779ffdc..39de144a0 100644
--- a/src/lib/lib_4c090.c
+++ b/src/lib/lib_4c090.c
@@ -136,7 +136,7 @@ glabel func0004c200
 /*    4c22c:	00c0a025 */ 	or	$s4,$a2,$zero
 /*    4c230:	00a0b025 */ 	or	$s6,$a1,$zero
 /*    4c234:	00009825 */ 	or	$s3,$zero,$zero
-/*    4c238:	0c012144 */ 	jal	func00048510
+/*    4c238:	0c012144 */ 	jal	osGetCount
 /*    4c23c:	acce0000 */ 	sw	$t6,0x0($a2)
 /*    4c240:	ae820004 */ 	sw	$v0,0x4($s4)
 /*    4c244:	8ed9000c */ 	lw	$t9,0xc($s6)
diff --git a/src/lib/lib_50130.c b/src/lib/lib_50130.c
index fde37bea1..7152c108b 100644
--- a/src/lib/lib_50130.c
+++ b/src/lib/lib_50130.c
@@ -20,7 +20,7 @@ glabel func00050130
 /*    50138:	0c012a18 */ 	jal	__osSiGetAccess
 /*    5013c:	afa40030 */ 	sw	$a0,0x30($sp)
 /*    50140:	8fa40030 */ 	lw	$a0,0x30($sp)
-/*    50144:	0c012fb9 */ 	jal	func0004bee4
+/*    50144:	0c012fb9 */ 	jal	__osEepStatus
 /*    50148:	27a50024 */ 	addiu	$a1,$sp,0x24
 /*    5014c:	10400003 */ 	beqz	$v0,.L0005015c
 /*    50150:	97ae0024 */ 	lhu	$t6,0x24($sp)
@@ -62,7 +62,7 @@ glabel func000501a0
 /*    501c4:	0c012a18 */ 	jal	__osSiGetAccess
 /*    501c8:	2631ca80 */ 	addiu	$s1,$s1,%lo(var8009ca80)
 /*    501cc:	02402025 */ 	or	$a0,$s2,$zero
-/*    501d0:	0c012fb9 */ 	jal	func0004bee4
+/*    501d0:	0c012fb9 */ 	jal	__osEepStatus
 /*    501d4:	27a5003c */ 	addiu	$a1,$sp,0x3c
 /*    501d8:	14400015 */ 	bnez	$v0,.L00050230
 /*    501dc:	00402025 */ 	or	$a0,$v0,$zero
@@ -100,7 +100,7 @@ glabel func000501a0
 /*    5024c:	11200007 */ 	beqz	$t1,.L0005026c
 /*    50250:	02402025 */ 	or	$a0,$s2,$zero
 .L00050254:
-/*    50254:	0c012fb9 */ 	jal	func0004bee4
+/*    50254:	0c012fb9 */ 	jal	__osEepStatus
 /*    50258:	27a5003c */ 	addiu	$a1,$sp,0x3c
 /*    5025c:	93aa003e */ 	lbu	$t2,0x3e($sp)
 /*    50260:	314b0080 */ 	andi	$t3,$t2,0x80
diff --git a/src/lib/lib_51880.c b/src/lib/lib_51880.c
index 99cc438cc..e3f2b7a5b 100644
--- a/src/lib/lib_51880.c
+++ b/src/lib/lib_51880.c
@@ -10,7 +10,7 @@
 #include "types.h"
 
 GLOBAL_ASM(
-glabel func00051880
+glabel __osSetCompare
 /*    51880:	40845800 */ 	mtc0	$a0,$11
 /*    51884:	03e00008 */ 	jr	$ra
 /*    51888:	00000000 */ 	sll	$zero,$zero,0x0