diff --git a/src/game/game_097ba0.c b/src/game/game_097ba0.c
index abe6760dd..0baac8c97 100644
--- a/src/game/game_097ba0.c
+++ b/src/game/game_097ba0.c
@@ -14707,11 +14707,11 @@ glabel var7f1ac8b8
 /*  f0a3ad0:	3c04800a */ 	lui	$a0,%hi(g_Vars)
 /*  f0a3ad4:	24849fc0 */ 	addiu	$a0,$a0,%lo(g_Vars)
 /*  f0a3ad8:	4602003e */ 	c.le.s	$f0,$f2
-/*  f0a3adc:	3c017f1b */ 	lui	$at,%hi(var7f1ac87c)
+/*  f0a3adc:	3c017f1b */ 	lui	$at,%hi(var7f1ac880)
 /*  f0a3ae0:	45020017 */ 	bc1fl	.L0f0a3b40
 /*  f0a3ae4:	c4900044 */ 	lwc1	$f16,0x44($a0)
 /*  f0a3ae8:	44806000 */ 	mtc1	$zero,$f12
-/*  f0a3aec:	3c017f1b */ 	lui	$at,0x7f1b
+/*  f0a3aec:	3c017f1b */ 	lui	$at,%hi(var7f1ac87c)
 /*  f0a3af0:	460c103c */ 	c.lt.s	$f2,$f12
 /*  f0a3af4:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f0a3af8:	4500000e */ 	bc1f	.L0f0a3b34
@@ -14734,7 +14734,7 @@ glabel var7f1ac8b8
 /*  f0a3b38:	e6020244 */ 	swc1	$f2,0x244($s0)
 /*  f0a3b3c:	c4900044 */ 	lwc1	$f16,0x44($a0)
 .L0f0a3b40:
-/*  f0a3b40:	d424c880 */ 	ldc1	$f4,-0x3780($at)
+/*  f0a3b40:	d424c880 */ 	ldc1	$f4,%lo(var7f1ac880)($at)
 /*  f0a3b44:	3c017f1b */ 	lui	$at,%hi(var7f1ac888)
 /*  f0a3b48:	460084a1 */ 	cvt.d.s	$f18,$f16
 /*  f0a3b4c:	c428c888 */ 	lwc1	$f8,%lo(var7f1ac888)($at)
@@ -16234,11 +16234,11 @@ glabel var7f1ac934
 .L0f0a4fc0:
 /*  f0a4fc0:	3c012f80 */ 	lui	$at,0x2f80
 /*  f0a4fc4:	44814000 */ 	mtc1	$at,$f8
-/*  f0a4fc8:	3c017f1b */ 	lui	$at,%hi(var7f1ac930)
-/*  f0a4fcc:	d430c920 */ 	ldc1	$f16,-0x36e0($at)
+/*  f0a4fc8:	3c017f1b */ 	lui	$at,%hi(var7f1ac920)
+/*  f0a4fcc:	d430c920 */ 	ldc1	$f16,%lo(var7f1ac920)($at)
 /*  f0a4fd0:	46082182 */ 	mul.s	$f6,$f4,$f8
-/*  f0a4fd4:	3c017f1b */ 	lui	$at,%hi(var7f1ac934)
-/*  f0a4fd8:	d424c928 */ 	ldc1	$f4,-0x36d8($at)
+/*  f0a4fd4:	3c017f1b */ 	lui	$at,%hi(var7f1ac928)
+/*  f0a4fd8:	d424c928 */ 	ldc1	$f4,%lo(var7f1ac928)($at)
 /*  f0a4fdc:	02e02825 */ 	or	$a1,$s7,$zero
 /*  f0a4fe0:	460032a1 */ 	cvt.d.s	$f10,$f6
 /*  f0a4fe4:	46305482 */ 	mul.d	$f18,$f10,$f16
@@ -16319,7 +16319,7 @@ glabel var7f1ac934
 /*  f0a50f0:	24010013 */ 	addiu	$at,$zero,0x13
 /*  f0a50f4:	12e10072 */ 	beq	$s7,$at,.L0f0a52c0
 /*  f0a50f8:	c7aa00b4 */ 	lwc1	$f10,0xb4($sp)
-/*  f0a50fc:	3c017f1b */ 	lui	$at,0x7f1b
+/*  f0a50fc:	3c017f1b */ 	lui	$at,%hi(var7f1ac930)
 /*  f0a5100:	c426c930 */ 	lwc1	$f6,%lo(var7f1ac930)($at)
 /*  f0a5104:	8c500004 */ 	lw	$s0,0x4($v0)
 /*  f0a5108:	00002825 */ 	or	$a1,$zero,$zero
@@ -16384,7 +16384,7 @@ glabel var7f1ac934
 .L0f0a51f4:
 /*  f0a51f4:	3c012f80 */ 	lui	$at,0x2f80
 /*  f0a51f8:	44818000 */ 	mtc1	$at,$f16
-/*  f0a51fc:	3c017f1b */ 	lui	$at,0x7f1b
+/*  f0a51fc:	3c017f1b */ 	lui	$at,%hi(var7f1ac934)
 /*  f0a5200:	c428c934 */ 	lwc1	$f8,%lo(var7f1ac934)($at)
 /*  f0a5204:	46105102 */ 	mul.s	$f4,$f10,$f16
 /*  f0a5208:	c7b00064 */ 	lwc1	$f16,0x64($sp)
diff --git a/src/game/game_0cf150.c b/src/game/game_0cf150.c
index 5735dabe7..954197c0d 100644
--- a/src/game/game_0cf150.c
+++ b/src/game/game_0cf150.c
@@ -1051,8 +1051,8 @@ glabel var7f1ada94
 /*  f0cff94:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f0cff98:	46245280 */ 	add.d	$f10,$f10,$f4
 .L0f0cff9c:
-/*  f0cff9c:	3c017f1b */ 	lui	$at,%hi(var7f1ada90)
-/*  f0cffa0:	d426da88 */ 	ldc1	$f6,-0x2578($at)
+/*  f0cff9c:	3c017f1b */ 	lui	$at,%hi(var7f1ada88)
+/*  f0cffa0:	d426da88 */ 	ldc1	$f6,%lo(var7f1ada88)($at)
 /*  f0cffa4:	3c0b8007 */ 	lui	$t3,%hi(var80070edc)
 /*  f0cffa8:	8d6b0edc */ 	lw	$t3,%lo(var80070edc)($t3)
 /*  f0cffac:	46265202 */ 	mul.d	$f8,$f10,$f6
@@ -1066,7 +1066,7 @@ glabel var7f1ada94
 /*  f0cffcc:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f0cffd0:	46065280 */ 	add.s	$f10,$f10,$f6
 .L0f0cffd4:
-/*  f0cffd4:	3c017f1b */ 	lui	$at,0x7f1b
+/*  f0cffd4:	3c017f1b */ 	lui	$at,%hi(var7f1ada90)
 /*  f0cffd8:	c428da90 */ 	lwc1	$f8,%lo(var7f1ada90)($at)
 /*  f0cffdc:	8fac0088 */ 	lw	$t4,0x88($sp)
 /*  f0cffe0:	00002025 */ 	or	$a0,$zero,$zero
diff --git a/src/game/game_0f09f0.c b/src/game/game_0f09f0.c
index 08951d1a4..966a4f0b9 100644
--- a/src/game/game_0f09f0.c
+++ b/src/game/game_0f09f0.c
@@ -13294,8 +13294,8 @@ glabel var7f1b2afc
 .L0f0fbdc4:
 /*  f0fbdc4:	3c012f80 */ 	lui	$at,0x2f80
 /*  f0fbdc8:	44812000 */ 	mtc1	$at,$f4
-/*  f0fbdcc:	3c017f1b */ 	lui	$at,0x7f1b
-/*  f0fbdd0:	d42a2af0 */ 	ldc1	$f10,0x2af0($at)
+/*  f0fbdcc:	3c017f1b */ 	lui	$at,%hi(var7f1b2af0)
+/*  f0fbdd0:	d42a2af0 */ 	ldc1	$f10,%lo(var7f1b2af0)($at)
 /*  f0fbdd4:	46048182 */ 	mul.s	$f6,$f16,$f4
 /*  f0fbdd8:	46003221 */ 	cvt.d.s	$f8,$f6
 /*  f0fbddc:	462a403c */ 	c.lt.d	$f8,$f10
diff --git a/src/game/game_148b80.c b/src/game/game_148b80.c
index b0cad4822..4ddf91e04 100644
--- a/src/game/game_148b80.c
+++ b/src/game/game_148b80.c
@@ -747,7 +747,7 @@ glabel func0f149274
 /*  f14959c:	8fb904ec */ 	lw	$t9,0x4ec($sp)
 .L0f1495a0:
 /*  f1495a0:	27a400bc */ 	addiu	$a0,$sp,0xbc
-/*  f1495a4:	3c017f1b */ 	lui	$at,0x7f1b
+/*  f1495a4:	3c017f1b */ 	lui	$at,%hi(var7f1b6030)
 /*  f1495a8:	13200019 */ 	beqz	$t9,.L0f149610
 /*  f1495ac:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f1495b0:	0fc5dd18 */ 	jal	func0f177460
@@ -776,7 +776,7 @@ glabel func0f149274
 /*  f149608:	10000002 */ 	beqz	$zero,.L0f149614
 /*  f14960c:	afa004ec */ 	sw	$zero,0x4ec($sp)
 .L0f149610:
-/*  f149610:	c42c6030 */ 	lwc1	$f12,0x6030($at)
+/*  f149610:	c42c6030 */ 	lwc1	$f12,%lo(var7f1b6030)($at)
 .L0f149614:
 /*  f149614:	8faf05fc */ 	lw	$t7,0x5fc($sp)
 /*  f149618:	3c018008 */ 	lui	$at,0x8008