diff --git a/src/lib/lib_03050.c b/src/lib/lib_03050.c
index c572c66a3..9d5337c3a 100644
--- a/src/lib/lib_03050.c
+++ b/src/lib/lib_03050.c
@@ -94,7 +94,7 @@ glabel func00003050
 /*     313c:	24630230 */ 	addiu	$v1,$v1,%lo(var80090230)
 /*     3140:	24090001 */ 	addiu	$t1,$zero,0x1
 /*     3144:	254a0230 */ 	addiu	$t2,$t2,%lo(var80090230)
-/*     3148:	3c067000 */ 	lui	$a2,0x7000
+/*     3148:	3c067000 */ 	lui	$a2,%hi(func000031d0)
 /*     314c:	afa2002c */ 	sw	$v0,0x2c($sp)
 /*     3150:	ae090000 */ 	sw	$t1,0x0($s0)
 /*     3154:	ae040004 */ 	sw	$a0,0x4($s0)
@@ -103,7 +103,7 @@ glabel func00003050
 /*     3160:	ae000010 */ 	sw	$zero,0x10($s0)
 /*     3164:	ae000014 */ 	sw	$zero,0x14($s0)
 /*     3168:	ae000018 */ 	sw	$zero,0x18($s0)
-/*     316c:	24c631d0 */ 	addiu	$a2,$a2,0x31d0
+/*     316c:	24c631d0 */ 	addiu	$a2,$a2,%lo(func000031d0)
 /*     3170:	afaa0010 */ 	sw	$t2,0x10($sp)
 /*     3174:	00002825 */ 	or	$a1,$zero,$zero
 /*     3178:	02003825 */ 	or	$a3,$s0,$zero
@@ -129,6 +129,10 @@ glabel func00003050
 /*     31c4:	27bd0030 */ 	addiu	$sp,$sp,0x30
 /*     31c8:	03e00008 */ 	jr	$ra
 /*     31cc:	00000000 */ 	sll	$zero,$zero,0x0
+);
+
+GLOBAL_ASM(
+glabel func000031d0
 /*     31d0:	27bdffb0 */ 	addiu	$sp,$sp,-80
 /*     31d4:	afbf0034 */ 	sw	$ra,0x34($sp)
 /*     31d8:	afb70030 */ 	sw	$s7,0x30($sp)
@@ -302,7 +306,7 @@ glabel func00003360
 /*     3444:	258c9b50 */ 	addiu	$t4,$t4,-25776
 /*     3448:	25ad9c20 */ 	addiu	$t5,$t5,%lo(func00049c20)
 /*     344c:	25ce07c0 */ 	addiu	$t6,$t6,%lo(var800907c0)
-/*     3450:	3c067005 */ 	lui	$a2,0x7005
+/*     3450:	3c067005 */ 	lui	$a2,%hi(func00049e00)
 /*     3454:	afa2002c */ 	sw	$v0,0x2c($sp)
 /*     3458:	ae080000 */ 	sw	$t0,0x0($s0)
 /*     345c:	ae040004 */ 	sw	$a0,0x4($s0)
@@ -310,7 +314,7 @@ glabel func00003360
 /*     3464:	ae0b0010 */ 	sw	$t3,0x10($s0)
 /*     3468:	ae0c0014 */ 	sw	$t4,0x14($s0)
 /*     346c:	ae0d0018 */ 	sw	$t5,0x18($s0)
-/*     3470:	24c69e00 */ 	addiu	$a2,$a2,-25088
+/*     3470:	24c69e00 */ 	addiu	$a2,$a2,%lo(func00049e00)
 /*     3474:	afae0010 */ 	sw	$t6,0x10($sp)
 /*     3478:	00002825 */ 	or	$a1,$zero,$zero
 /*     347c:	02003825 */ 	or	$a3,$s0,$zero
diff --git a/src/lib/lib_034f0.c b/src/lib/lib_034f0.c
index a5f146a75..c0f737a2d 100644
--- a/src/lib/lib_034f0.c
+++ b/src/lib/lib_034f0.c
@@ -39,10 +39,14 @@ const u32 var700524ac[] = {0x00000000};
 
 GLOBAL_ASM(
 glabel func000034f0
-/*     34f0:	3c1a7000 */ 	lui	$k0,0x7000
-/*     34f4:	275a3500 */ 	addiu	$k0,$k0,0x3500
+/*     34f0:	3c1a7000 */ 	lui	$k0,%hi(func00003500)
+/*     34f4:	275a3500 */ 	addiu	$k0,$k0,%lo(func00003500)
 /*     34f8:	03400008 */ 	jr	$k0
 /*     34fc:	00000000 */ 	sll	$zero,$zero,0x0
+);
+
+GLOBAL_ASM(
+glabel func00003500
 /*     3500:	3c1a8009 */ 	lui	$k0,%hi(var800907f0)
 /*     3504:	275a07f0 */ 	addiu	$k0,$k0,%lo(var800907f0)
 /*     3508:	ff410020 */ 	sd	$at,0x20($k0)
@@ -722,9 +726,13 @@ glabel __osDispatchThread
 /*     3ec0:	00000000 */ 	sll	$zero,$zero,0x0
 /*     3ec4:	00000000 */ 	sll	$zero,$zero,0x0
 /*     3ec8:	42000018 */ 	eret
+);
+
+GLOBAL_ASM(
+glabel func00003ecc
 /*     3ecc:	0c012894 */ 	jal	func0004a250
 /*     3ed0:	00002025 */ 	or	$a0,$zero,$zero
 /*     3ed4:	00000000 */ 	sll	$zero,$zero,0x0
 /*     3ed8:	00000000 */ 	sll	$zero,$zero,0x0
 /*     3edc:	00000000 */ 	sll	$zero,$zero,0x0
-);
\ No newline at end of file
+);
diff --git a/src/lib/lib_03ee0.c b/src/lib/lib_03ee0.c
index 9b3e90367..d8a7cb747 100644
--- a/src/lib/lib_03ee0.c
+++ b/src/lib/lib_03ee0.c
@@ -25,8 +25,8 @@ glabel func00003ee0
 /*     3f08:	ac87003c */ 	sw	$a3,0x3c($a0)
 /*     3f0c:	ac8e0004 */ 	sw	$t6,0x4($a0)
 /*     3f10:	8faf0030 */ 	lw	$t7,0x30($sp)
-/*     3f14:	3c0c7000 */ 	lui	$t4,0x7000
-/*     3f18:	258c3ecc */ 	addiu	$t4,$t4,0x3ecc
+/*     3f14:	3c0c7000 */ 	lui	$t4,%hi(func00003ecc)
+/*     3f18:	258c3ecc */ 	addiu	$t4,$t4,%lo(func00003ecc)
 /*     3f1c:	000f47c3 */ 	sra	$t0,$t7,0x1f
 /*     3f20:	2de10010 */ 	sltiu	$at,$t7,0x10
 /*     3f24:	01015023 */ 	subu	$t2,$t0,$at
diff --git a/src/lib/lib_08a20.c b/src/lib/lib_08a20.c
index dd5eabeac..e911e4025 100644
--- a/src/lib/lib_08a20.c
+++ b/src/lib/lib_08a20.c
@@ -57,9 +57,9 @@ glabel func00008a48
 /*     8a7c:	44814000 */ 	mtc1	$at,$f8
 /*     8a80:	468021a0 */ 	cvt.s.w	$f6,$f4
 /*     8a84:	8fa505c0 */ 	lw	$a1,0x5c0($sp)
-/*     8a88:	3c0e7001 */ 	lui	$t6,0x7001
+/*     8a88:	3c0e7001 */ 	lui	$t6,%hi(func00009844)
 /*     8a8c:	3c158009 */ 	lui	$s5,%hi(g_Is4Mb)
-/*     8a90:	25ce9844 */ 	addiu	$t6,$t6,-26556
+/*     8a90:	25ce9844 */ 	addiu	$t6,$t6,%lo(func00009844)
 /*     8a94:	26b50af0 */ 	addiu	$s5,$s5,%lo(g_Is4Mb)
 /*     8a98:	46083083 */ 	div.s	$f2,$f6,$f8
 /*     8a9c:	aca20018 */ 	sw	$v0,0x18($a1)
@@ -475,10 +475,10 @@ glabel func00008a48
 /*     9098:	3c088009 */ 	lui	$t0,%hi(var800918f0)
 /*     909c:	8d0818f0 */ 	lw	$t0,%lo(var800918f0)($t0)
 /*     90a0:	3c048009 */ 	lui	$a0,%hi(var800915e0)
-/*     90a4:	3c067001 */ 	lui	$a2,0x7001
+/*     90a4:	3c067001 */ 	lui	$a2,%hi(func00009154)
 /*     90a8:	24090014 */ 	addiu	$t1,$zero,0x14
 /*     90ac:	afa90014 */ 	sw	$t1,0x14($sp)
-/*     90b0:	24c69154 */ 	addiu	$a2,$a2,-28332
+/*     90b0:	24c69154 */ 	addiu	$a2,$a2,%lo(func00009154)
 /*     90b4:	248415e0 */ 	addiu	$a0,$a0,%lo(var800915e0)
 /*     90b8:	24050004 */ 	addiu	$a1,$zero,0x4
 /*     90bc:	00003825 */ 	or	$a3,$zero,$zero
@@ -532,6 +532,10 @@ glabel func00009124
 /*     9148:	27bd0018 */ 	addiu	$sp,$sp,0x18
 /*     914c:	03e00008 */ 	jr	$ra
 /*     9150:	00000000 */ 	sll	$zero,$zero,0x0
+);
+
+GLOBAL_ASM(
+glabel func00009154
 /*     9154:	27bdff90 */ 	addiu	$sp,$sp,-112
 /*     9158:	3c078009 */ 	lui	$a3,%hi(g_Is4Mb)
 /*     915c:	90e70af0 */ 	lbu	$a3,%lo(g_Is4Mb)($a3)
@@ -878,4 +882,4 @@ glabel func00009614
 /*     9654:	00000000 */ 	sll	$zero,$zero,0x0
 /*     9658:	00000000 */ 	sll	$zero,$zero,0x0
 /*     965c:	00000000 */ 	sll	$zero,$zero,0x0
-);
\ No newline at end of file
+);
diff --git a/src/lib/lib_09660.c b/src/lib/lib_09660.c
index 25461f17f..01e65509e 100644
--- a/src/lib/lib_09660.c
+++ b/src/lib/lib_09660.c
@@ -50,6 +50,10 @@ glabel func00009660
 /*     9684:	27bd0018 */ 	addiu	$sp,$sp,0x18
 /*     9688:	03e00008 */ 	jr	$ra
 /*     968c:	00000000 */ 	sll	$zero,$zero,0x0
+);
+
+GLOBAL_ASM(
+glabel func00009690
 /*     9690:	27bdffc0 */ 	addiu	$sp,$sp,-64
 /*     9694:	3c088009 */ 	lui	$t0,%hi(var80091900)
 /*     9698:	25081900 */ 	addiu	$t0,$t0,%lo(var80091900)
@@ -167,6 +171,10 @@ glabel func00009660
 /*     9838:	8fb10028 */ 	lw	$s1,0x28($sp)
 /*     983c:	03e00008 */ 	jr	$ra
 /*     9840:	27bd0040 */ 	addiu	$sp,$sp,0x40
+);
+
+GLOBAL_ASM(
+glabel func00009844
 /*     9844:	27bdffc8 */ 	addiu	$sp,$sp,-56
 /*     9848:	3c0e8009 */ 	lui	$t6,%hi(g_Is4Mb)
 /*     984c:	91ce0af0 */ 	lbu	$t6,%lo(g_Is4Mb)($t6)
@@ -223,8 +231,8 @@ glabel func00009660
 /*     9908:	a0680000 */ 	sb	$t0,0x0($v1)
 .L0000990c:
 /*     990c:	8fa90038 */ 	lw	$t1,0x38($sp)
-/*     9910:	3c027001 */ 	lui	$v0,0x7001
-/*     9914:	24429690 */ 	addiu	$v0,$v0,-26992
+/*     9910:	3c027001 */ 	lui	$v0,%hi(func00009690)
+/*     9914:	24429690 */ 	addiu	$v0,$v0,%lo(func00009690)
 /*     9918:	ad230000 */ 	sw	$v1,0x0($t1)
 /*     991c:	8fbf0034 */ 	lw	$ra,0x34($sp)
 /*     9920:	8fb40030 */ 	lw	$s4,0x30($sp)
@@ -3045,4 +3053,4 @@ glabel func0000bf04
 /*     bfa4:	03e00008 */ 	jr	$ra
 /*     bfa8:	00000000 */ 	sll	$zero,$zero,0x0
 /*     bfac:	00000000 */ 	sll	$zero,$zero,0x0
-);
\ No newline at end of file
+);
diff --git a/src/lib/lib_0c000.c b/src/lib/lib_0c000.c
index 4c1ac08b8..a1ae2eca8 100644
--- a/src/lib/lib_0c000.c
+++ b/src/lib/lib_0c000.c
@@ -74,10 +74,10 @@ glabel func0000c000
 /*     c020:	3c0e8009 */ 	lui	$t6,%hi(var80092eb0)
 /*     c024:	25ce2eb0 */ 	addiu	$t6,$t6,%lo(var80092eb0)
 /*     c028:	3c048009 */ 	lui	$a0,%hi(var80092880)
-/*     c02c:	3c067001 */ 	lui	$a2,0x7001
+/*     c02c:	3c067001 */ 	lui	$a2,%hi(func0000c06c)
 /*     c030:	240f0028 */ 	addiu	$t7,$zero,0x28
 /*     c034:	afaf0014 */ 	sw	$t7,0x14($sp)
-/*     c038:	24c6c06c */ 	addiu	$a2,$a2,-16276
+/*     c038:	24c6c06c */ 	addiu	$a2,$a2,%lo(func0000c06c)
 /*     c03c:	24842880 */ 	addiu	$a0,$a0,%lo(var80092880)
 /*     c040:	afae0010 */ 	sw	$t6,0x10($sp)
 /*     c044:	24050005 */ 	addiu	$a1,$zero,0x5
@@ -90,6 +90,10 @@ glabel func0000c000
 /*     c060:	27bd0020 */ 	addiu	$sp,$sp,0x20
 /*     c064:	03e00008 */ 	jr	$ra
 /*     c068:	00000000 */ 	sll	$zero,$zero,0x0
+);
+
+GLOBAL_ASM(
+glabel func0000c06c
 /*     c06c:	27bdffa0 */ 	addiu	$sp,$sp,-96
 /*     c070:	afb1001c */ 	sw	$s1,0x1c($sp)
 /*     c074:	3c118009 */ 	lui	$s1,%hi(var80094ab0)
diff --git a/src/lib/lib_0e9d0.c b/src/lib/lib_0e9d0.c
index 5c45dd326..ece4ca3b8 100644
--- a/src/lib/lib_0e9d0.c
+++ b/src/lib/lib_0e9d0.c
@@ -1030,6 +1030,10 @@ glabel func0000f67c
 /*     f760:	27bd0040 */ 	addiu	$sp,$sp,0x40
 /*     f764:	03e00008 */ 	jr	$ra
 /*     f768:	00000000 */ 	sll	$zero,$zero,0x0
+);
+
+GLOBAL_ASM(
+glabel func0000f76c
 /*     f76c:	3c0e800a */ 	lui	$t6,%hi(var80099024)
 /*     f770:	25ce9024 */ 	addiu	$t6,$t6,%lo(var80099024)
 /*     f774:	008e082b */ 	sltu	$at,$a0,$t6
@@ -1050,6 +1054,10 @@ glabel func0000f67c
 .L0000f7b0:
 /*     f7b0:	03e00008 */ 	jr	$ra
 /*     f7b4:	00000000 */ 	sll	$zero,$zero,0x0
+);
+
+GLOBAL_ASM(
+glabel func0000f7b8
 /*     f7b8:	3c0e800a */ 	lui	$t6,%hi(var80099024)
 /*     f7bc:	25ce9024 */ 	addiu	$t6,$t6,%lo(var80099024)
 /*     f7c0:	008e082b */ 	sltu	$at,$a0,$t6
@@ -1299,12 +1307,12 @@ glabel func0000f804
 /*     fb54:	00000000 */ 	sll	$zero,$zero,0x0
 /*     fb58:	0c00c5fc */ 	jal	func000317f0
 /*     fb5c:	27a4007c */ 	addiu	$a0,$sp,0x7c
-/*     fb60:	3c047001 */ 	lui	$a0,0x7001
+/*     fb60:	3c047001 */ 	lui	$a0,%hi(func0000f76c)
 /*     fb64:	0c00ccde */ 	jal	func00033378
-/*     fb68:	2484f76c */ 	addiu	$a0,$a0,-2196
-/*     fb6c:	3c047001 */ 	lui	$a0,0x7001
+/*     fb68:	2484f76c */ 	addiu	$a0,$a0,%lo(func0000f76c)
+/*     fb6c:	3c047001 */ 	lui	$a0,%hi(func0000f7b8)
 /*     fb70:	0c00cd8d */ 	jal	func00033634
-/*     fb74:	2484f7b8 */ 	addiu	$a0,$a0,-2120
+/*     fb74:	2484f7b8 */ 	addiu	$a0,$a0,%lo(func0000f7b8)
 /*     fb78:	0c00243b */ 	jal	func000090ec
 /*     fb7c:	00000000 */ 	sll	$zero,$zero,0x0
 /*     fb80:	3c048006 */ 	lui	$a0,%hi(g_SoundMode)
@@ -3125,4 +3133,4 @@ glabel func0001111c
 /*    11414:	00000000 */ 	sll	$zero,$zero,0x0
 /*    11418:	00000000 */ 	sll	$zero,$zero,0x0
 /*    1141c:	00000000 */ 	sll	$zero,$zero,0x0
-);
\ No newline at end of file
+);
diff --git a/src/lib/lib_13130.c b/src/lib/lib_13130.c
index 0afb8f547..aee56a977 100644
--- a/src/lib/lib_13130.c
+++ b/src/lib/lib_13130.c
@@ -457,6 +457,10 @@ glabel func00013408
 /*    13684:	03e00008 */ 	jr	$ra
 /*    13688:	27bd0060 */ 	addiu	$sp,$sp,0x60
 /*    1368c:	00000000 */ 	sll	$zero,$zero,0x0
+);
+
+GLOBAL_ASM(
+glabel func00013690
 /*    13690:	27bdffe8 */ 	addiu	$sp,$sp,-24
 /*    13694:	afbf0014 */ 	sw	$ra,0x14($sp)
 /*    13698:	0c012978 */ 	jal	func0004a5e0
@@ -476,8 +480,8 @@ glabel sprintf
 /*    136c0:	afa50024 */ 	sw	$a1,0x24($sp)
 /*    136c4:	afa60028 */ 	sw	$a2,0x28($sp)
 /*    136c8:	afa7002c */ 	sw	$a3,0x2c($sp)
-/*    136cc:	3c047001 */ 	lui	$a0,0x7001
-/*    136d0:	24843690 */ 	addiu	$a0,$a0,0x3690
+/*    136cc:	3c047001 */ 	lui	$a0,%hi(func00013690)
+/*    136d0:	24843690 */ 	addiu	$a0,$a0,%lo(func00013690)
 /*    136d4:	27a70028 */ 	addiu	$a3,$sp,0x28
 /*    136d8:	8fa60024 */ 	lw	$a2,0x24($sp)
 /*    136dc:	0c013b40 */ 	jal	func0004ed00
@@ -494,4 +498,4 @@ glabel sprintf
 /*    13704:	00000000 */ 	sll	$zero,$zero,0x0
 /*    13708:	00000000 */ 	sll	$zero,$zero,0x0
 /*    1370c:	00000000 */ 	sll	$zero,$zero,0x0
-);
\ No newline at end of file
+);
diff --git a/src/lib/lib_2f490.c b/src/lib/lib_2f490.c
index acfd6399d..3430ff2ca 100644
--- a/src/lib/lib_2f490.c
+++ b/src/lib/lib_2f490.c
@@ -63,8 +63,8 @@ glabel func0002f490
 /*    2f548:	460d0840 */ 	add.s	$f1,$f1,$f13
 /*    2f54c:	460e1080 */ 	add.s	$f2,$f2,$f14
 .L0002f550:
-/*    2f550:	3c0d7003 */ 	lui	$t5,0x7003
-/*    2f554:	25adf5d8 */ 	addiu	$t5,$t5,-2600
+/*    2f550:	3c0d7003 */ 	lui	$t5,%hi(func0002f5d8)
+/*    2f554:	25adf5d8 */ 	addiu	$t5,$t5,%lo(func0002f5d8)
 /*    2f558:	01a00008 */ 	jr	$t5
 /*    2f55c:	00000000 */ 	sll	$zero,$zero,0x0
 );
@@ -102,6 +102,10 @@ glabel func0002f560
 /*    2f5d0:	460d0840 */ 	add.s	$f1,$f1,$f13
 /*    2f5d4:	460e1080 */ 	add.s	$f2,$f2,$f14
 .L0002f5d8:
+);
+
+GLOBAL_ASM(
+glabel func0002f5d8
 /*    2f5d8:	27bdffe0 */ 	addiu	$sp,$sp,-32
 /*    2f5dc:	e7b40000 */ 	swc1	$f20,0x0($sp)
 /*    2f5e0:	e7b50004 */ 	swc1	$f21,0x4($sp)
@@ -387,4 +391,4 @@ glabel func0002f8f4
 /*    2f9f4:	27bd0020 */ 	addiu	$sp,$sp,0x20
 /*    2f9f8:	00000000 */ 	sll	$zero,$zero,0x0
 /*    2f9fc:	00000000 */ 	sll	$zero,$zero,0x0
-);
\ No newline at end of file
+);
diff --git a/src/lib/lib_2fa00.c b/src/lib/lib_2fa00.c
index cd58926bf..d6ca6df84 100644
--- a/src/lib/lib_2fa00.c
+++ b/src/lib/lib_2fa00.c
@@ -35,6 +35,10 @@ glabel func0002fa08
 /*    2fa3c:	00000000 */ 	sll	$zero,$zero,0x0
 /*    2fa40:	03e00008 */ 	jr	$ra
 /*    2fa44:	00000000 */ 	sll	$zero,$zero,0x0
+);
+
+GLOBAL_ASM(
+glabel func0002fa48
 /*    2fa48:	27bdffd8 */ 	addiu	$sp,$sp,-40
 /*    2fa4c:	afb20020 */ 	sw	$s2,0x20($sp)
 /*    2fa50:	afb00018 */ 	sw	$s0,0x18($sp)
@@ -70,8 +74,8 @@ glabel func0002faa4
 /*    2fab0:	afa50024 */ 	sw	$a1,0x24($sp)
 /*    2fab4:	afa60028 */ 	sw	$a2,0x28($sp)
 /*    2fab8:	afa7002c */ 	sw	$a3,0x2c($sp)
-/*    2fabc:	3c047003 */ 	lui	$a0,0x7003
-/*    2fac0:	2484fa48 */ 	addiu	$a0,$a0,-1464
+/*    2fabc:	3c047003 */ 	lui	$a0,%hi(func0002fa48)
+/*    2fac0:	2484fa48 */ 	addiu	$a0,$a0,%lo(func0002fa48)
 /*    2fac4:	27a70024 */ 	addiu	$a3,$sp,0x24
 /*    2fac8:	8fa60020 */ 	lw	$a2,0x20($sp)
 /*    2facc:	0c013b40 */ 	jal	func0004ed00
@@ -83,4 +87,4 @@ glabel func0002faa4
 /*    2fae4:	00000000 */ 	sll	$zero,$zero,0x0
 /*    2fae8:	00000000 */ 	sll	$zero,$zero,0x0
 /*    2faec:	00000000 */ 	sll	$zero,$zero,0x0
-);
\ No newline at end of file
+);
diff --git a/src/lib/lib_2fc60.c b/src/lib/lib_2fc60.c
index 5a85fa7ed..fe90d0dd9 100644
--- a/src/lib/lib_2fc60.c
+++ b/src/lib/lib_2fc60.c
@@ -82,6 +82,10 @@ glabel func0002fc60
 .L0002fcd4:
 /*    2fcd4:	03e00008 */ 	jr	$ra
 /*    2fcd8:	27bd0008 */ 	addiu	$sp,$sp,0x8
+);
+
+GLOBAL_ASM(
+glabel func0002fcdc
 /*    2fcdc:	27bdffc0 */ 	addiu	$sp,$sp,-64
 /*    2fce0:	afbf002c */ 	sw	$ra,0x2c($sp)
 /*    2fce4:	afa40040 */ 	sw	$a0,0x40($sp)
@@ -210,6 +214,10 @@ glabel func0002fc60
 /*    2feb0:	27bd0040 */ 	addiu	$sp,$sp,0x40
 /*    2feb4:	03e00008 */ 	jr	$ra
 /*    2feb8:	00000000 */ 	sll	$zero,$zero,0x0
+);
+
+GLOBAL_ASM(
+glabel func0002febc
 /*    2febc:	27bdffd0 */ 	addiu	$sp,$sp,-48
 /*    2fec0:	afbf001c */ 	sw	$ra,0x1c($sp)
 /*    2fec4:	afa40030 */ 	sw	$a0,0x30($sp)
@@ -382,6 +390,10 @@ glabel func0002fc60
 /*    30128:	27bd0030 */ 	addiu	$sp,$sp,0x30
 /*    3012c:	03e00008 */ 	jr	$ra
 /*    30130:	00000000 */ 	sll	$zero,$zero,0x0
+);
+
+GLOBAL_ASM(
+glabel func00030134
 /*    30134:	27bdffe0 */ 	addiu	$sp,$sp,-32
 /*    30138:	afbf0014 */ 	sw	$ra,0x14($sp)
 /*    3013c:	afa40020 */ 	sw	$a0,0x20($sp)
@@ -1183,14 +1195,14 @@ glabel func00030bfc
 
 GLOBAL_ASM(
 glabel func00030c98
-/*    30c98:	3c0e7003 */ 	lui	$t6,0x7003
-/*    30c9c:	25cefcdc */ 	addiu	$t6,$t6,-804
+/*    30c98:	3c0e7003 */ 	lui	$t6,%hi(func0002fcdc)
+/*    30c9c:	25cefcdc */ 	addiu	$t6,$t6,%lo(func0002fcdc)
 /*    30ca0:	ac8e0010 */ 	sw	$t6,0x10($a0)
-/*    30ca4:	3c0f7003 */ 	lui	$t7,0x7003
-/*    30ca8:	25effebc */ 	addiu	$t7,$t7,-324
+/*    30ca4:	3c0f7003 */ 	lui	$t7,%hi(func0002febc)
+/*    30ca8:	25effebc */ 	addiu	$t7,$t7,%lo(func0002febc)
 /*    30cac:	ac8f0014 */ 	sw	$t7,0x14($a0)
-/*    30cb0:	3c187003 */ 	lui	$t8,0x7003
-/*    30cb4:	27180134 */ 	addiu	$t8,$t8,0x134
+/*    30cb0:	3c187003 */ 	lui	$t8,%hi(func00030134)
+/*    30cb4:	27180134 */ 	addiu	$t8,$t8,%lo(func00030134)
 /*    30cb8:	ac980018 */ 	sw	$t8,0x18($a0)
 /*    30cbc:	03e00008 */ 	jr	$ra
 /*    30cc0:	00000000 */ 	sll	$zero,$zero,0x0
@@ -1201,4 +1213,4 @@ glabel func00030c98
 /*    30cd4:	00000000 */ 	sll	$zero,$zero,0x0
 /*    30cd8:	00000000 */ 	sll	$zero,$zero,0x0
 /*    30cdc:	00000000 */ 	sll	$zero,$zero,0x0
-);
\ No newline at end of file
+);
diff --git a/src/lib/lib_317f0.c b/src/lib/lib_317f0.c
index 2965e60a5..99ea4e2f8 100644
--- a/src/lib/lib_317f0.c
+++ b/src/lib/lib_317f0.c
@@ -368,8 +368,8 @@ glabel func000317f0
 /*    319dc:	af200000 */ 	sw	$zero,0x0($t9)
 /*    319e0:	3c098006 */ 	lui	$t1,%hi(var8005f12c)
 /*    319e4:	8d29f12c */ 	lw	$t1,%lo(var8005f12c)($t1)
-/*    319e8:	3c0a7003 */ 	lui	$t2,0x7003
-/*    319ec:	254a1a68 */ 	addiu	$t2,$t2,0x1a68
+/*    319e8:	3c0a7003 */ 	lui	$t2,%hi(func00031a68)
+/*    319ec:	254a1a68 */ 	addiu	$t2,$t2,%lo(func00031a68)
 /*    319f0:	ad2a0008 */ 	sw	$t2,0x8($t1)
 /*    319f4:	3c0c8006 */ 	lui	$t4,%hi(var8005f12c)
 /*    319f8:	8d8cf12c */ 	lw	$t4,%lo(var8005f12c)($t4)
@@ -401,6 +401,10 @@ glabel func000317f0
 /*    31a5c:	27bd0040 */ 	addiu	$sp,$sp,0x40
 /*    31a60:	03e00008 */ 	jr	$ra
 /*    31a64:	00000000 */ 	sll	$zero,$zero,0x0
+);
+
+GLOBAL_ASM(
+glabel func00031a68
 /*    31a68:	27bdffd0 */ 	addiu	$sp,$sp,-48
 /*    31a6c:	afbf0014 */ 	sw	$ra,0x14($sp)
 /*    31a70:	afa40030 */ 	sw	$a0,0x30($sp)
@@ -3399,8 +3403,8 @@ glabel func00034240
 /*    34470:	8fab0038 */ 	lw	$t3,0x38($sp)
 /*    34474:	ad600000 */ 	sw	$zero,0x0($t3)
 /*    34478:	8fae0038 */ 	lw	$t6,0x38($sp)
-/*    3447c:	3c0c7003 */ 	lui	$t4,0x7003
-/*    34480:	258c44b0 */ 	addiu	$t4,$t4,0x44b0
+/*    3447c:	3c0c7003 */ 	lui	$t4,%hi(func000344b0)
+/*    34480:	258c44b0 */ 	addiu	$t4,$t4,%lo(func000344b0)
 /*    34484:	adcc0008 */ 	sw	$t4,0x8($t6)
 /*    34488:	8fad0038 */ 	lw	$t5,0x38($sp)
 /*    3448c:	adad0004 */ 	sw	$t5,0x4($t5)
@@ -3413,6 +3417,10 @@ glabel func00034240
 /*    344a4:	27bd0038 */ 	addiu	$sp,$sp,0x38
 /*    344a8:	03e00008 */ 	jr	$ra
 /*    344ac:	00000000 */ 	sll	$zero,$zero,0x0
+);
+
+GLOBAL_ASM(
+glabel func000344b0
 /*    344b0:	27bdff88 */ 	addiu	$sp,$sp,-120
 /*    344b4:	afbf002c */ 	sw	$ra,0x2c($sp)
 /*    344b8:	afa40078 */ 	sw	$a0,0x78($sp)
@@ -6794,4 +6802,4 @@ glabel func0003759c
 /*    37644:	03e00008 */ 	jr	$ra
 /*    37648:	00000000 */ 	sll	$zero,$zero,0x0
 /*    3764c:	00000000 */ 	sll	$zero,$zero,0x0
-);
\ No newline at end of file
+);
diff --git a/src/lib/lib_37b00.c b/src/lib/lib_37b00.c
index 341a08cc1..6f5b4e05b 100644
--- a/src/lib/lib_37b00.c
+++ b/src/lib/lib_37b00.c
@@ -173,9 +173,9 @@ glabel func00037b00
 /*    37d5c:	3c01800a */ 	lui	$at,0x800a
 /*    37d60:	a420c3a6 */ 	sh	$zero,-0x3c5a($at)
 .L00037d64:
-/*    37d64:	3c047004 */ 	lui	$a0,0x7004
+/*    37d64:	3c047004 */ 	lui	$a0,%hi(func00038ba8)
 /*    37d68:	0c00e2e4 */ 	jal	func00038b90
-/*    37d6c:	24848ba8 */ 	addiu	$a0,$a0,-29784
+/*    37d6c:	24848ba8 */ 	addiu	$a0,$a0,%lo(func00038ba8)
 /*    37d70:	10000001 */ 	beqz	$zero,.L00037d78
 /*    37d74:	00000000 */ 	sll	$zero,$zero,0x0
 .L00037d78:
@@ -1177,6 +1177,10 @@ glabel func00038b90
 /*    38b9c:	00000000 */ 	sll	$zero,$zero,0x0
 /*    38ba0:	03e00008 */ 	jr	$ra
 /*    38ba4:	00000000 */ 	sll	$zero,$zero,0x0
+);
+
+GLOBAL_ASM(
+glabel func00038ba8
 /*    38ba8:	27bdffe0 */ 	addiu	$sp,$sp,-32
 /*    38bac:	afbf0014 */ 	sw	$ra,0x14($sp)
 /*    38bb0:	afa40020 */ 	sw	$a0,0x20($sp)
@@ -1275,4 +1279,4 @@ glabel func00038cac
 /*    38d04:	03e00008 */ 	jr	$ra
 /*    38d08:	00000000 */ 	sll	$zero,$zero,0x0
 /*    38d0c:	00000000 */ 	sll	$zero,$zero,0x0
-);
\ No newline at end of file
+);
diff --git a/src/lib/lib_3e730.c b/src/lib/lib_3e730.c
index 33ad57ef0..64c46bc5d 100644
--- a/src/lib/lib_3e730.c
+++ b/src/lib/lib_3e730.c
@@ -10309,6 +10309,10 @@ glabel func00042990
 .L00042e30:
 /*    42e30:	03e00008 */ 	jr	$ra
 /*    42e34:	27bd0010 */ 	addiu	$sp,$sp,0x10
+);
+
+GLOBAL_ASM(
+glabel func00042e38
 /*    42e38:	27bdffc8 */ 	addiu	$sp,$sp,-56
 /*    42e3c:	afbf0014 */ 	sw	$ra,0x14($sp)
 /*    42e40:	afa40038 */ 	sw	$a0,0x38($sp)
@@ -10916,6 +10920,10 @@ glabel func00042990
 /*    43710:	27bd0038 */ 	addiu	$sp,$sp,0x38
 /*    43714:	03e00008 */ 	jr	$ra
 /*    43718:	00000000 */ 	sll	$zero,$zero,0x0
+);
+
+GLOBAL_ASM(
+glabel func0004371c
 /*    4371c:	27bdf6a8 */ 	addiu	$sp,$sp,-2392
 /*    43720:	afbf001c */ 	sw	$ra,0x1c($sp)
 /*    43724:	afa40958 */ 	sw	$a0,0x958($sp)
@@ -11371,4 +11379,4 @@ glabel func00042990
 /*    43dc4:	03e00008 */ 	jr	$ra
 /*    43dc8:	00000000 */ 	sll	$zero,$zero,0x0
 /*    43dcc:	00000000 */ 	sll	$zero,$zero,0x0
-);
\ No newline at end of file
+);
diff --git a/src/lib/lib_43dd0.c b/src/lib/lib_43dd0.c
index 2edbb6adc..b3d897fb3 100644
--- a/src/lib/lib_43dd0.c
+++ b/src/lib/lib_43dd0.c
@@ -392,13 +392,13 @@ glabel func00043ef8
 /*    44348:	1561000c */ 	bne	$t3,$at,.L0004437c
 /*    4434c:	00000000 */ 	sll	$zero,$zero,0x0
 /*    44350:	8fae0028 */ 	lw	$t6,0x28($sp)
-/*    44354:	3c0c7004 */ 	lui	$t4,0x7004
-/*    44358:	258c371c */ 	addiu	$t4,$t4,0x371c
+/*    44354:	3c0c7004 */ 	lui	$t4,%hi(func0004371c)
+/*    44358:	258c371c */ 	addiu	$t4,$t4,%lo(func0004371c)
 /*    4435c:	25c17fff */ 	addiu	$at,$t6,0x7fff
 /*    44360:	ac2c0479 */ 	sw	$t4,0x479($at)
 /*    44364:	8fad0028 */ 	lw	$t5,0x28($sp)
-/*    44368:	3c0a7004 */ 	lui	$t2,0x7004
-/*    4436c:	254a2e38 */ 	addiu	$t2,$t2,0x2e38
+/*    44368:	3c0a7004 */ 	lui	$t2,%hi(func00042e38)
+/*    4436c:	254a2e38 */ 	addiu	$t2,$t2,%lo(func00042e38)
 /*    44370:	25a17fff */ 	addiu	$at,$t5,0x7fff
 /*    44374:	10000011 */ 	beqz	$zero,.L000443bc
 /*    44378:	ac2a047d */ 	sw	$t2,0x47d($at)
diff --git a/src/lib/lib_49a90.c b/src/lib/lib_49a90.c
index 75a96c02b..f705f5d5a 100644
--- a/src/lib/lib_49a90.c
+++ b/src/lib/lib_49a90.c
@@ -74,6 +74,10 @@ glabel func00049b24
 /*    49b48:	03e00008 */ 	jr	$ra
 /*    49b4c:	00000000 */ 	sll	$zero,$zero,0x0
 /*    49b50:	27bdffe8 */ 	addiu	$sp,$sp,-24
+);
+
+GLOBAL_ASM(
+glabel func00049b54
 /*    49b54:	3c03a460 */ 	lui	$v1,0xa460
 /*    49b58:	34630010 */ 	ori	$v1,$v1,0x10
 /*    49b5c:	afbf0014 */ 	sw	$ra,0x14($sp)
@@ -131,4 +135,4 @@ glabel func00049b24
 /*    49c14:	00000000 */ 	sll	$zero,$zero,0x0
 /*    49c18:	00000000 */ 	sll	$zero,$zero,0x0
 /*    49c1c:	00000000 */ 	sll	$zero,$zero,0x0
-);
\ No newline at end of file
+);
diff --git a/src/lib/lib_49c20.c b/src/lib/lib_49c20.c
index bef2ac34f..0f9b4c793 100644
--- a/src/lib/lib_49c20.c
+++ b/src/lib/lib_49c20.c
@@ -157,6 +157,10 @@ glabel func00049c20
 /*    49df4:	27bd0020 */ 	addiu	$sp,$sp,0x20
 /*    49df8:	03e00008 */ 	jr	$ra
 /*    49dfc:	00000000 */ 	sll	$zero,$zero,0x0
+);
+
+GLOBAL_ASM(
+glabel func00049e00
 /*    49e00:	27bdff88 */ 	addiu	$sp,$sp,-120
 /*    49e04:	afb3002c */ 	sw	$s3,0x2c($sp)
 /*    49e08:	afbe0040 */ 	sw	$s8,0x40($sp)
@@ -532,4 +536,4 @@ glabel func0004a250
 /*    4a354:	00000000 */ 	sll	$zero,$zero,0x0
 /*    4a358:	00000000 */ 	sll	$zero,$zero,0x0
 /*    4a35c:	00000000 */ 	sll	$zero,$zero,0x0
-);
\ No newline at end of file
+);