diff --git a/asm/non_matchings/unknown_005740/func_80004B40.s b/asm/non_matchings/unknown_005740/func_80004B40.s
index 7ab0bf38..f7ab0305 100644
--- a/asm/non_matchings/unknown_005740/func_80004B40.s
+++ b/asm/non_matchings/unknown_005740/func_80004B40.s
@@ -45,7 +45,7 @@ glabel func_80004B40
 /* 0057CC 80004BCC AFA2003C */  sw    $v0, 0x3c($sp)
 /* 0057D0 80004BD0 0019C880 */  sll   $t9, $t9, 2
 /* 0057D4 80004BD4 8C4F001C */  lw    $t7, 0x1c($v0)
-/* 0057D8 80004BD8 3C1200FF */  lui   $s2, %hi(D_00FF0018) # $s2, 0xff
+/* 0057D8 80004BD8 3C1200FF */  lui   $s2, %hi(0x00FF0018) # $s2, 0xff
 /* 0057DC 80004BDC 0338C823 */  subu  $t9, $t9, $t8
 /* 0057E0 80004BE0 3652FFFF */  ori   $s2, (0x00FFFFFF & 0xFFFF) # ori $s2, $s2, 0xffff
 /* 0057E4 80004BE4 0019C880 */  sll   $t9, $t9, 2
@@ -163,7 +163,7 @@ glabel func_80004B40
 /* 00599C 80004D9C A12F0004 */  sb    $t7, 4($t1)
 /* 0059A0 80004DA0 96790018 */  lhu   $t9, 0x18($s3)
 /* 0059A4 80004DA4 25850002 */  addiu $a1, $t4, 2
-/* 0059A8 80004DA8 A6590018 */  sh    $t9, %lo(D_00FF0018)($s2)
+/* 0059A8 80004DA8 A6590018 */  sh    $t9, %lo(0x00FF0018)($s2)
 /* 0059AC 80004DAC 914E000E */  lbu   $t6, 0xe($t2)
 /* 0059B0 80004DB0 25A40001 */  addiu $a0, $t5, 1
 /* 0059B4 80004DB4 A12E000E */  sb    $t6, 0xe($t1)
diff --git a/asm/non_matchings/unknown_05F690/func_80060EA8.s b/asm/non_matchings/unknown_05F690/func_80060EA8.s
index 3f9b6b0a..951c8721 100644
--- a/asm/non_matchings/unknown_05F690/func_80060EA8.s
+++ b/asm/non_matchings/unknown_05F690/func_80060EA8.s
@@ -241,7 +241,7 @@ glabel func_80060EA8
 /* 061E34 80061234 4480A000 */  mtc1  $zero, $f20
 /* 061E38 80061238 87040024 */  lh    $a0, 0x24($t8)
 /* 061E3C 8006123C AFBF00A4 */  sw    $ra, 0xa4($sp)
-/* 061E40 80061240 3C05FF7F */  lui   $a1, %hi(D_FF7F0001) # $a1, 0xff7f
+/* 061E40 80061240 3C05FF7F */  lui   $a1, %hi(0xFF7F0001) # $a1, 0xff7f
 /* 061E44 80061244 0004C840 */  sll   $t9, $a0, 1
 /* 061E48 80061248 2412000A */  li    $s2, 10
 /* 061E4C 8006124C 03202025 */  move  $a0, $t9
@@ -361,7 +361,7 @@ glabel func_80060EA8
 /* 061FEC 800613EC 04C0FFDF */  bltz  $a2, .L8006136C
 /* 061FF0 800613F0 00000000 */   nop   
 .L800613F4:
-/* 061FF4 800613F4 24A50001 */  addiu $a1, %lo(D_FF7F0001) # addiu $a1, $a1, 1
+/* 061FF4 800613F4 24A50001 */  addiu $a1, %lo(0xFF7F0001) # addiu $a1, $a1, 1
 /* 061FF8 800613F8 00057C00 */  sll   $t7, $a1, 0x10
 /* 061FFC 800613FC 000F2C03 */  sra   $a1, $t7, 0x10
 /* 062000 80061400 0225082A */  slt   $at, $s1, $a1
diff --git a/asm/non_matchings/unknown_072E50/func_80076C58.s b/asm/non_matchings/unknown_072E50/func_80076C58.s
index 551c3b2c..f6b8ce96 100644
--- a/asm/non_matchings/unknown_072E50/func_80076C58.s
+++ b/asm/non_matchings/unknown_072E50/func_80076C58.s
@@ -27,8 +27,8 @@ glabel func_80076C58
 /* 0778B8 80076CB8 10000009 */  b     .L80076CE0
 /* 0778BC 80076CBC 00001025 */   move  $v0, $zero
 .L80076CC0:
-/* 0778C0 80076CC0 3C19000F */  lui   $t9, %hi(D_000ECC30) # $t9, 0xf
-/* 0778C4 80076CC4 2739CC30 */  addiu $t9, %lo(D_000ECC30) # addiu $t9, $t9, -0x33d0
+/* 0778C0 80076CC0 3C19000F */  lui   $t9, %hi(__ASSETS_LUT_END) # $t9, 0xf
+/* 0778C4 80076CC4 2739CC30 */  addiu $t9, %lo(__ASSETS_LUT_END) # addiu $t9, $t9, -0x33d0
 /* 0778C8 80076CC8 8FA6001C */  lw    $a2, 0x1c($sp)
 /* 0778CC 80076CCC 00F92021 */  addu  $a0, $a3, $t9
 /* 0778D0 80076CD0 0C01DBDE */  jal   dmacopy
@@ -65,8 +65,8 @@ glabel func_80076C58
 /* 077940 80076D40 0C01C327 */  jal   func_80070C9C
 /* 077944 80076D44 AFA30030 */   sw    $v1, 0x30($sp)
 /* 077948 80076D48 8FA30030 */  lw    $v1, 0x30($sp)
-/* 07794C 80076D4C 3C08000F */  lui   $t0, %hi(D_000ECC30) # $t0, 0xf
-/* 077950 80076D50 2508CC30 */  addiu $t0, %lo(D_000ECC30) # addiu $t0, $t0, -0x33d0
+/* 07794C 80076D4C 3C08000F */  lui   $t0, %hi(__ASSETS_LUT_END) # $t0, 0xf
+/* 077950 80076D50 2508CC30 */  addiu $t0, %lo(__ASSETS_LUT_END) # addiu $t0, $t0, -0x33d0
 /* 077954 80076D54 00682021 */  addu  $a0, $v1, $t0
 /* 077958 80076D58 AFA20028 */  sw    $v0, 0x28($sp)
 /* 07795C 80076D5C AFA40020 */  sw    $a0, 0x20($sp)
@@ -128,8 +128,8 @@ glabel func_80076C58
 /* 077A2C 80076E2C 01E81021 */  addu  $v0, $t7, $t0
 /* 077A30 80076E30 8C430000 */  lw    $v1, ($v0)
 /* 077A34 80076E34 8C580004 */  lw    $t8, 4($v0)
-/* 077A38 80076E38 3C19000F */  lui   $t9, %hi(D_000ECC30) # $t9, 0xf
-/* 077A3C 80076E3C 2739CC30 */  addiu $t9, %lo(D_000ECC30) # addiu $t9, $t9, -0x33d0
+/* 077A38 80076E38 3C19000F */  lui   $t9, %hi(__ASSETS_LUT_END) # $t9, 0xf
+/* 077A3C 80076E3C 2739CC30 */  addiu $t9, %lo(__ASSETS_LUT_END) # addiu $t9, $t9, -0x33d0
 /* 077A40 80076E40 03033023 */  subu  $a2, $t8, $v1
 /* 077A44 80076E44 AFA60018 */  sw    $a2, 0x18($sp)
 /* 077A48 80076E48 0C01DBDE */  jal   dmacopy
diff --git a/asm/non_matchings/unknown_080500/func_80080580.s b/asm/non_matchings/unknown_080500/func_80080580.s
index 8dd1e4dd..53598c02 100644
--- a/asm/non_matchings/unknown_080500/func_80080580.s
+++ b/asm/non_matchings/unknown_080500/func_80080580.s
@@ -286,8 +286,10 @@ glabel func_80080580
 /* 0815E0 800809E0 3C0E0702 */  lui   $t6, (0x07020010 >> 16) # lui $t6, 0x702
 /* 0815E4 800809E4 244F0008 */  addiu $t7, $v0, 8
 /* 0815E8 800809E8 AEEF0000 */  sw    $t7, ($s7)
-/* 0815EC 800809EC 3C18000E */  lui   $t8, %hi(D_000E1CB0) # $t8, 0xe
-/* 0815F0 800809F0 27181CB0 */  addiu $t8, %lo(D_000E1CB0) # addiu $t8, $t8, 0x1cb0
+                                             # D_800E1C70 - 0x7FFFFFC0 = 0xE1CB0
+/* 0815EC 800809EC 3C18000E */  lui   $t8, %hi(D_800E1C70 - 0x7FFFFFC0) # $t8, 0xe
+                                             # D_800E1C70 - 0x7FFFFFC0 = 0xE1CB0
+/* 0815F0 800809F0 27181CB0 */  addiu $t8, %lo(D_800E1C70 - 0x7FFFFFC0) # addiu $t8, $t8, 0x1cb0
 /* 0815F4 800809F4 35CE0010 */  ori   $t6, (0x07020010 & 0xFFFF) # ori $t6, $t6, 0x10
 /* 0815F8 800809F8 AC4E0000 */  sw    $t6, ($v0)
 /* 0815FC 800809FC AC580004 */  sw    $t8, 4($v0)
@@ -314,8 +316,10 @@ glabel func_80080580
 /* 08164C 80080A4C 3C0E0702 */  lui   $t6, (0x07020010 >> 16) # lui $t6, 0x702
 /* 081650 80080A50 244F0008 */  addiu $t7, $v0, 8
 /* 081654 80080A54 AEEF0000 */  sw    $t7, ($s7)
-/* 081658 80080A58 3C19000E */  lui   $t9, %hi(D_000E1CA0) # $t9, 0xe
-/* 08165C 80080A5C 27391CA0 */  addiu $t9, %lo(D_000E1CA0) # addiu $t9, $t9, 0x1ca0
+                                             # D_800E1C70 - 0x7FFFFFD0 = 0xE1CA0
+/* 081658 80080A58 3C19000E */  lui   $t9, %hi(D_800E1C70 - 0x7FFFFFD0) # $t9, 0xe
+                                             # D_800E1C70 - 0x7FFFFFD0 = 0xE1CA0
+/* 08165C 80080A5C 27391CA0 */  addiu $t9, %lo(D_800E1C70 - 0x7FFFFFD0) # addiu $t9, $t9, 0x1ca0
 /* 081660 80080A60 35CE0010 */  ori   $t6, (0x07020010 & 0xFFFF) # ori $t6, $t6, 0x10
 /* 081664 80080A64 0000F825 */  move  $ra, $zero
 /* 081668 80080A68 3C098000 */  lui   $t1, 0x8000
diff --git a/asm/non_matchings/unknown_080500/func_80080BC8.s b/asm/non_matchings/unknown_080500/func_80080BC8.s
index e5be398f..4f307d8f 100644
--- a/asm/non_matchings/unknown_080500/func_80080BC8.s
+++ b/asm/non_matchings/unknown_080500/func_80080BC8.s
@@ -23,16 +23,20 @@ glabel func_80080BC8
 /* 08181C 80080C1C 00006825 */  move  $t5, $zero
 /* 081820 80080C20 1920007E */  blez  $t1, .L80080E1C
 /* 081824 80080C24 00003825 */   move  $a3, $zero
-/* 081828 80080C28 3C16000E */  lui   $s6, %hi(D_000E1CA0) # $s6, 0xe
-/* 08182C 80080C2C 3C11000E */  lui   $s1, %hi(D_000E1CB0) # $s1, 0xe
+                                             # D_800E1C70 - 0x7FFFFFD0 = 0xE1CA0
+/* 081828 80080C28 3C16000E */  lui   $s6, %hi(D_800E1C70 - 0x7FFFFFD0) # $s6, 0xe
+                                             # D_800E1C70 - 0x7FFFFFC0 = 0xE1CB0
+/* 08182C 80080C2C 3C11000E */  lui   $s1, %hi(D_800E1C70 - 0x7FFFFFC0) # $s1, 0xe
 /* 081830 80080C30 3C1F0702 */  lui   $ra, (0x07020010 >> 16) # lui $ra, 0x702
 /* 081834 80080C34 3C0B8012 */  lui   $t3, %hi(D_80126C2C) # $t3, 0x8012
 /* 081838 80080C38 3C0A800E */  lui   $t2, %hi(D_800E1DB4) # $t2, 0x800e
 /* 08183C 80080C3C 254A1DB4 */  addiu $t2, %lo(D_800E1DB4) # addiu $t2, $t2, 0x1db4
 /* 081840 80080C40 256B6C2C */  addiu $t3, %lo(D_80126C2C) # addiu $t3, $t3, 0x6c2c
 /* 081844 80080C44 37FF0010 */  ori   $ra, (0x07020010 & 0xFFFF) # ori $ra, $ra, 0x10
-/* 081848 80080C48 26311CB0 */  addiu $s1, %lo(D_000E1CB0) # addiu $s1, $s1, 0x1cb0
-/* 08184C 80080C4C 26D61CA0 */  addiu $s6, %lo(D_000E1CA0) # addiu $s6, $s6, 0x1ca0
+                                             # D_800E1C70 - 0x7FFFFFC0 = 0xE1CB0
+/* 081848 80080C48 26311CB0 */  addiu $s1, %lo(D_800E1C70 - 0x7FFFFFC0) # addiu $s1, $s1, 0x1cb0
+                                             # D_800E1C70 - 0x7FFFFFD0 = 0xE1CA0
+/* 08184C 80080C4C 26D61CA0 */  addiu $s6, %lo(D_800E1C70 - 0x7FFFFFD0) # addiu $s6, $s6, 0x1ca0
 /* 081850 80080C50 3C150500 */  lui   $s5, 0x500
 /* 081854 80080C54 3C140400 */  lui   $s4, 0x400
 /* 081858 80080C58 3C13E700 */  lui   $s3, 0xe700
diff --git a/asm/non_matchings/unknown_080500/func_80080E90.s b/asm/non_matchings/unknown_080500/func_80080E90.s
index 2ea5c8c7..0886cc4d 100644
--- a/asm/non_matchings/unknown_080500/func_80080E90.s
+++ b/asm/non_matchings/unknown_080500/func_80080E90.s
@@ -19,12 +19,14 @@ glabel func_80080E90
 /* 081AD4 80080ED4 AC6F0000 */  sw    $t7, ($v1)
 /* 081AD8 80080ED8 AC780004 */  sw    $t8, 4($v1)
 /* 081ADC 80080EDC 8C830000 */  lw    $v1, ($a0)
-/* 081AE0 80080EE0 3C0F000E */  lui   $t7, %hi(D_000E1CC0) # $t7, 0xe
+                                             # D_800E1C70 - 0x7FFFFFB0 = 0xE1CC0
+/* 081AE0 80080EE0 3C0F000E */  lui   $t7, %hi(D_800E1C70 - 0x7FFFFFB0) # $t7, 0xe
 /* 081AE4 80080EE4 24790008 */  addiu $t9, $v1, 8
 /* 081AE8 80080EE8 AC990000 */  sw    $t9, ($a0)
 /* 081AEC 80080EEC 3C0E0702 */  lui   $t6, (0x07020010 >> 16) # lui $t6, 0x702
 /* 081AF0 80080EF0 35CE0010 */  ori   $t6, (0x07020010 & 0xFFFF) # ori $t6, $t6, 0x10
-/* 081AF4 80080EF4 25EF1CC0 */  addiu $t7, %lo(D_000E1CC0) # addiu $t7, $t7, 0x1cc0
+                                             # D_800E1C70 - 0x7FFFFFB0 = 0xE1CC0
+/* 081AF4 80080EF4 25EF1CC0 */  addiu $t7, %lo(D_800E1C70 - 0x7FFFFFB0) # addiu $t7, $t7, 0x1cc0
 /* 081AF8 80080EF8 AC6F0004 */  sw    $t7, 4($v1)
 /* 081AFC 80080EFC AC6E0000 */  sw    $t6, ($v1)
 /* 081B00 80080F00 8FB70058 */  lw    $s7, 0x58($sp)
diff --git a/asm/non_matchings/unknown_080500/func_80081C04.s b/asm/non_matchings/unknown_080500/func_80081C04.s
index e10df426..dcda4470 100644
--- a/asm/non_matchings/unknown_080500/func_80081C04.s
+++ b/asm/non_matchings/unknown_080500/func_80081C04.s
@@ -5,7 +5,7 @@ glabel func_80081C04
 /* 082810 80081C10 00A0A025 */  move  $s4, $a1
 /* 082814 80081C14 AFB30024 */  sw    $s3, 0x24($sp)
 /* 082818 80081C18 AFB1001C */  sw    $s1, 0x1c($sp)
-/* 08281C 80081C1C 3C103B9A */  lui   $s0, %hi(D_3B9A0001) # $s0, 0x3b9a
+/* 08281C 80081C1C 3C103B9A */  lui   $s0, %hi(0x3B9A0001) # $s0, 0x3b9a
 /* 082820 80081C20 00808825 */  move  $s1, $a0
 /* 082824 80081C24 AFBF002C */  sw    $ra, 0x2c($sp)
 /* 082828 80081C28 AFB20020 */  sw    $s2, 0x20($sp)
@@ -135,7 +135,7 @@ glabel func_80081C04
 /* 0829E0 80081DE0 92290000 */  lbu   $t1, ($s1)
 /* 0829E4 80081DE4 0C027298 */  jal   func_8009CA60
 /* 0829E8 80081DE8 A5490018 */   sh    $t1, 0x18($t2)
-/* 0829EC 80081DEC 26100001 */  addiu $s0, %lo(D_3B9A0001) # addiu $s0, $s0, 1
+/* 0829EC 80081DEC 26100001 */  addiu $s0, %lo(0x3B9A0001) # addiu $s0, $s0, 1
 /* 0829F0 80081DF0 26310001 */  addiu $s1, $s1, 1
 /* 0829F4 80081DF4 1613FFF4 */  bne   $s0, $s3, .L80081DC8
 /* 0829F8 80081DF8 2694000C */   addiu $s4, $s4, 0xc
diff --git a/asm/non_matchings/unknown_080500/func_8008AD44.s b/asm/non_matchings/unknown_080500/func_8008AD44.s
index 0828fffa..90710aba 100644
--- a/asm/non_matchings/unknown_080500/func_8008AD44.s
+++ b/asm/non_matchings/unknown_080500/func_8008AD44.s
@@ -9,8 +9,8 @@ glabel func_8008AD44
 /* 08B960 8008AD60 AFB1001C */  sw    $s1, 0x1c($sp)
 /* 08B964 8008AD64 15C0003B */  bnez  $t6, .L8008AE54
 /* 08B968 8008AD68 AFB00018 */   sw    $s0, 0x18($sp)
-/* 08B96C 8008AD6C 3C1000AD */  lui   $s0, %hi(D_00AC9630) # $s0, 0xad
-/* 08B970 8008AD70 26109630 */  addiu $s0, %lo(D_00AC9630) # addiu $s0, $s0, -0x69d0
+/* 08B96C 8008AD6C 3C1000AD */  lui   $s0, %hi(__ROM_END) # $s0, 0xad
+/* 08B970 8008AD70 26109630 */  addiu $s0, %lo(__ROM_END) # addiu $s0, $s0, -0x69d0
 /* 08B974 8008AD74 2610F000 */  addiu $s0, $s0, -0x1000
 /* 08B978 8008AD78 24131000 */  li    $s3, 4096
 /* 08B97C 8008AD7C 02009025 */  move  $s2, $s0
@@ -75,8 +75,8 @@ glabel func_8008AD44
 /* 08BA4C 8008AE4C 3C01800E */  lui   $at, %hi(D_800E1E18) # $at, 0x800e
 /* 08BA50 8008AE50 AC2A1E18 */  sw    $t2, %lo(D_800E1E18)($at)
 .L8008AE54:
-/* 08BA54 8008AE54 3C1000AD */  lui   $s0, %hi(D_00AC9630) # $s0, 0xad
-/* 08BA58 8008AE58 26109630 */  addiu $s0, %lo(D_00AC9630) # addiu $s0, $s0, -0x69d0
+/* 08BA54 8008AE54 3C1000AD */  lui   $s0, %hi(__ROM_END) # $s0, 0xad
+/* 08BA58 8008AE58 26109630 */  addiu $s0, %lo(__ROM_END) # addiu $s0, $s0, -0x69d0
 /* 08BA5C 8008AE5C 00002025 */  move  $a0, $zero
 /* 08BA60 8008AE60 00002825 */  move  $a1, $zero
 /* 08BA64 8008AE64 00003025 */  move  $a2, $zero
diff --git a/asm/non_matchings/unknown_0B8920/func_800B82B4.s b/asm/non_matchings/unknown_0B8920/func_800B82B4.s
index ddd79fb5..6408d34a 100644
--- a/asm/non_matchings/unknown_0B8920/func_800B82B4.s
+++ b/asm/non_matchings/unknown_0B8920/func_800B82B4.s
@@ -238,7 +238,7 @@ glabel func_800B82B4
 .L800B8618:
 /* 0B9218 800B8618 0C01BE46 */  jal   save_rng_seed
 /* 0B921C 800B861C 00000000 */   nop   
-/* 0B9220 800B8620 3C045741 */  lui   $a0, %hi(D_57410001) # $a0, 0x5741
+/* 0B9220 800B8620 3C045741 */  lui   $a0, %hi(0x57410001) # $a0, 0x5741
 /* 0B9224 800B8624 0C01BE43 */  jal   set_rng_seed
 /* 0B9228 800B8628 34845646 */   ori   $a0, (0x57415646 & 0xFFFF) # ori $a0, $a0, 0x5646
 /* 0B922C 800B862C 8E830004 */  lw    $v1, 4($s4)
@@ -318,7 +318,7 @@ glabel func_800B82B4
 /* 0B932C 800B872C 8C4E0000 */  lw    $t6, ($v0)
 /* 0B9330 800B8730 460A1402 */  mul.s $f16, $f2, $f10
 /* 0B9334 800B8734 01C37821 */  addu  $t7, $t6, $v1
-/* 0B9338 800B8738 24840001 */  addiu $a0, %lo(D_57410001) # addiu $a0, $a0, 1
+/* 0B9338 800B8738 24840001 */  addiu $a0, %lo(0x57410001) # addiu $a0, $a0, 1
 /* 0B933C 800B873C 460084A1 */  cvt.d.s $f18, $f16
 /* 0B9340 800B8740 46209180 */  add.d $f6, $f18, $f0
 /* 0B9344 800B8744 444CF800 */  cfc1  $t4, $31
diff --git a/asm/non_matchings/unknown_0B8920/func_800C1130.s b/asm/non_matchings/unknown_0B8920/func_800C1130.s
index e7c777d0..c2bc4259 100644
--- a/asm/non_matchings/unknown_0B8920/func_800C1130.s
+++ b/asm/non_matchings/unknown_0B8920/func_800C1130.s
@@ -3,7 +3,7 @@ glabel func_800C1130
 /* 0C1D34 800C1134 24E731B0 */  addiu $a3, %lo(D_800E31B0) # addiu $a3, $a3, 0x31b0
 /* 0C1D38 800C1138 44842000 */  mtc1  $a0, $f4
 /* 0C1D3C 800C113C 94E20000 */  lhu   $v0, ($a3)
-/* 0C1D40 800C1140 3C03800E */  lui   $v1, %hi(D_800E0001) # $v1, 0x800e
+/* 0C1D40 800C1140 3C03800E */  lui   $v1, 0x800e
 /* 0C1D44 800C1144 1840009B */  blez  $v0, .L800C13B4
 /* 0C1D48 800C1148 46802020 */   cvt.s.w $f0, $f4
 /* 0C1D4C 800C114C 0082082A */  slt   $at, $a0, $v0
@@ -26,7 +26,7 @@ glabel func_800C1130
 /* 0C1D8C 800C118C 01C23021 */  addu  $a2, $t6, $v0
 /* 0C1D90 800C1190 46080282 */  mul.s $f10, $f0, $f8
 /* 0C1D94 800C1194 C4C60000 */  lwc1  $f6, ($a2)
-/* 0C1D98 800C1198 24630001 */  addiu $v1, %lo(D_800E0001) # addiu $v1, $v1, 1
+/* 0C1D98 800C1198 24630001 */  addiu $v1, $v1, 1
 /* 0C1D9C 800C119C 460A3400 */  add.s $f16, $f6, $f10
 /* 0C1DA0 800C11A0 E4D00000 */  swc1  $f16, ($a2)
 /* 0C1DA4 800C11A4 8D4B0000 */  lw    $t3, ($t2)
diff --git a/asm/non_matchings/unknown_0B8920/func_800C3C00.s b/asm/non_matchings/unknown_0B8920/func_800C3C00.s
index 038c5dfc..d62f7168 100644
--- a/asm/non_matchings/unknown_0B8920/func_800C3C00.s
+++ b/asm/non_matchings/unknown_0B8920/func_800C3C00.s
@@ -26,7 +26,7 @@ glabel func_800C3C00
 /* 0C485C 800C3C5C 1420FFF8 */  bnez  $at, .L800C3C40
 /* 0C4860 800C3C60 00000000 */   nop   
 .L800C3C64:
-/* 0C4864 800C3C64 3C05FFFF */  lui   $a1, %hi(D_FFFF0028) # $a1, 0xffff
+/* 0C4864 800C3C64 3C05FFFF */  lui   $a1, %hi(0xFFFF0028) # $a1, 0xffff
 /* 0C4868 800C3C68 34A500FF */  ori   $a1, (0xFFFF00FF & 0xFFFF) # ori $a1, $a1, 0xff
 /* 0C486C 800C3C6C 0C01C327 */  jal   func_80070C9C
 /* 0C4870 800C3C70 24040940 */   li    $a0, 2368
@@ -156,7 +156,7 @@ glabel func_800C3C00
 /* 0C4A54 800C3E54 8CCB0000 */  lw    $t3, ($a2)
 /* 0C4A58 800C3E58 00000000 */  nop   
 /* 0C4A5C 800C3E5C 01656021 */  addu  $t4, $t3, $a1
-/* 0C4A60 800C3E60 24A50028 */  addiu $a1, %lo(D_FFFF0028) # addiu $a1, $a1, 0x28
+/* 0C4A60 800C3E60 24A50028 */  addiu $a1, %lo(0xFFFF0028) # addiu $a1, $a1, 0x28
 /* 0C4A64 800C3E64 28A10140 */  slti  $at, $a1, 0x140
 /* 0C4A68 800C3E68 1420FF90 */  bnez  $at, .L800C3CAC
 /* 0C4A6C 800C3E6C AD800024 */   sw    $zero, 0x24($t4)
diff --git a/asm/non_matchings/unknown_0B8920/func_800C45A4.s b/asm/non_matchings/unknown_0B8920/func_800C45A4.s
index 0c0c54fe..d284a76d 100644
--- a/asm/non_matchings/unknown_0B8920/func_800C45A4.s
+++ b/asm/non_matchings/unknown_0B8920/func_800C45A4.s
@@ -201,8 +201,9 @@ glabel func_800C45A4
 /* 0C5494 800C4894 24790008 */  addiu $t9, $v1, 8
 /* 0C5498 800C4898 AE390000 */  sw    $t9, ($s1)
 /* 0C549C 800C489C 3C180702 */  lui   $t8, (0x07020010 >> 16) # lui $t8, 0x702
-/* 0C54A0 800C48A0 3C0E000E */  lui   $t6, %hi(D_000E36D8) # $t6, 0xe
-/* 0C54A4 800C48A4 25CE36D8 */  addiu $t6, %lo(D_000E36D8) # addiu $t6, $t6, 0x36d8
+                                             # D_800E3690 - 0x7FFFFFB8 = 0xE36D8
+/* 0C54A0 800C48A0 3C0E000E */  lui   $t6, %hi(D_800E3690 - 0x7FFFFFB8) # $t6, 0xe
+/* 0C54A4 800C48A4 25CE36D8 */  addiu $t6, %lo(D_800E3690 - 0x7FFFFFB8) # addiu $t6, $t6, 0x36d8
 /* 0C54A8 800C48A8 37180010 */  ori   $t8, (0x07020010 & 0xFFFF) # ori $t8, $t8, 0x10
 /* 0C54AC 800C48AC AC780000 */  sw    $t8, ($v1)
 /* 0C54B0 800C48B0 AC6E0004 */  sw    $t6, 4($v1)
@@ -271,12 +272,14 @@ glabel func_800C45A4
 /* 0C55A8 800C49A8 032FC025 */  or    $t8, $t9, $t7
 /* 0C55AC 800C49AC AC780004 */  sw    $t8, 4($v1)
 /* 0C55B0 800C49B0 8E230000 */  lw    $v1, ($s1)
-/* 0C55B4 800C49B4 3C0F000E */  lui   $t7, %hi(D_000E36C8) # $t7, 0xe
+                                             # D_800E3690 - 0x7FFFFFC8 = 0xE36C8
+/* 0C55B4 800C49B4 3C0F000E */  lui   $t7, %hi(D_800E3690 - 0x7FFFFFC8) # $t7, 0xe
 /* 0C55B8 800C49B8 246E0008 */  addiu $t6, $v1, 8
 /* 0C55BC 800C49BC AE2E0000 */  sw    $t6, ($s1)
 /* 0C55C0 800C49C0 3C190702 */  lui   $t9, (0x07020010 >> 16) # lui $t9, 0x702
 /* 0C55C4 800C49C4 37390010 */  ori   $t9, (0x07020010 & 0xFFFF) # ori $t9, $t9, 0x10
-/* 0C55C8 800C49C8 25EF36C8 */  addiu $t7, %lo(D_000E36C8) # addiu $t7, $t7, 0x36c8
+                                             # D_800E3690 - 0x7FFFFFC8 = 0xE36C8
+/* 0C55C8 800C49C8 25EF36C8 */  addiu $t7, %lo(D_800E3690 - 0x7FFFFFC8) # addiu $t7, $t7, 0x36c8
 /* 0C55CC 800C49CC AC6F0004 */  sw    $t7, 4($v1)
 /* 0C55D0 800C49D0 AC790000 */  sw    $t9, ($v1)
 /* 0C55D4 800C49D4 8E230000 */  lw    $v1, ($s1)
diff --git a/asm/non_matchings/unknown_0B8920/func_800C5B58.s b/asm/non_matchings/unknown_0B8920/func_800C5B58.s
index 1bfbb0c2..018214fe 100644
--- a/asm/non_matchings/unknown_0B8920/func_800C5B58.s
+++ b/asm/non_matchings/unknown_0B8920/func_800C5B58.s
@@ -30,8 +30,10 @@ glabel func_800C5B58
 /* 0C67C8 800C5BC8 3C0D0702 */  lui   $t5, (0x07020010 >> 16) # lui $t5, 0x702
 /* 0C67CC 800C5BCC 244C0008 */  addiu $t4, $v0, 8
 /* 0C67D0 800C5BD0 AE6C0000 */  sw    $t4, ($s3)
-/* 0C67D4 800C5BD4 3C0E000E */  lui   $t6, %hi(D_000E36D8) # $t6, 0xe
-/* 0C67D8 800C5BD8 25CE36D8 */  addiu $t6, %lo(D_000E36D8) # addiu $t6, $t6, 0x36d8
+                                             # D_800E3690 - 0x7FFFFFB8 = 0xE36D8
+/* 0C67D4 800C5BD4 3C0E000E */  lui   $t6, %hi(D_800E3690 - 0x7FFFFFB8) # $t6, 0xe
+                                             # D_800E3690 - 0x7FFFFFB8 = 0xE36D8
+/* 0C67D8 800C5BD8 25CE36D8 */  addiu $t6, %lo(D_800E3690 - 0x7FFFFFB8) # addiu $t6, $t6, 0x36d8
 /* 0C67DC 800C5BDC 35AD0010 */  ori   $t5, (0x07020010 & 0xFFFF) # ori $t5, $t5, 0x10
 /* 0C67E0 800C5BE0 AC4D0000 */  sw    $t5, ($v0)
 /* 0C67E4 800C5BE4 AC4E0004 */  sw    $t6, 4($v0)
diff --git a/asm/unknown_031D30/func_80031130.s b/asm/unknown_031D30/func_80031130.s
index 3db8cfdf..16215e95 100644
--- a/asm/unknown_031D30/func_80031130.s
+++ b/asm/unknown_031D30/func_80031130.s
@@ -1,7 +1,7 @@
 glabel func_80031130
 /* 031D30 80031130 27BDFF90 */  addiu $sp, $sp, -0x70
 /* 031D34 80031134 3C080001 */  lui   $t0, (0x000186A0 >> 16) # lui $t0, 1
-/* 031D38 80031138 3C09FFFE */  lui   $t1, %hi(D_FFFDFFFB) # $t1, 0xfffe
+/* 031D38 80031138 3C09FFFE */  lui   $t1, %hi(0xFFFDFFFB) # $t1, 0xfffe
 /* 031D3C 8003113C AFB6002C */  sw    $s6, 0x2c($sp)
 /* 031D40 80031140 AFB50028 */  sw    $s5, 0x28($sp)
 /* 031D44 80031144 AFB40024 */  sw    $s4, 0x24($sp)
@@ -121,7 +121,7 @@ glabel func_80031130
 /* 031ED8 800312D8 25080005 */  addiu $t0, $t0, 5
 /* 031EDC 800312DC 0113082A */  slt   $at, $t0, $s3
 /* 031EE0 800312E0 14200010 */  bnez  $at, .L80031324
-/* 031EE4 800312E4 2529FFFB */   addiu $t1, %lo(D_FFFDFFFB) # addiu $t1, $t1, -5
+/* 031EE4 800312E4 2529FFFB */   addiu $t1, %lo(0xFFFDFFFB) # addiu $t1, $t1, -5
 /* 031EE8 800312E8 0249082A */  slt   $at, $s2, $t1
 /* 031EEC 800312EC 5420000E */  bnezl $at, .L80031328
 /* 031EF0 800312F0 25EFFFFF */   addiu $t7, $t7, -1
diff --git a/asm/unknown_031D30/func_80031600.s b/asm/unknown_031D30/func_80031600.s
index e3081a99..0d1aadda 100644
--- a/asm/unknown_031D30/func_80031600.s
+++ b/asm/unknown_031D30/func_80031600.s
@@ -21,10 +21,10 @@ glabel func_80031600
 /* 032240 80031640 8D2A0000 */  lw    $t2, ($t1)
 /* 032244 80031644 59400006 */  blezl $t2, .L80031660
 /* 032248 80031648 95420000 */   lhu   $v0, ($t2)
-/* 03224C 8003164C 3C0B8000 */  lui   $t3, %hi(D_80000018) # $t3, 0x8000
+/* 03224C 8003164C 3C0B8000 */  lui   $t3, 0x8000
 /* 032250 80031650 016A5825 */  or    $t3, $t3, $t2
 /* 032254 80031654 0800C651 */  j     .L80031944
-/* 032258 80031658 8D6B0018 */   lw    $t3, %lo(D_80000018)($t3)
+/* 032258 80031658 8D6B0018 */   lw    $t3, 0x18($t3)
 
 /* 03225C 8003165C 95420000 */  lhu   $v0, ($t2)
 .L80031660:
@@ -257,10 +257,10 @@ glabel func_80031954
 /* 0325A0 800319A0 8D2A0000 */  lw    $t2, ($t1)
 /* 0325A4 800319A4 59400006 */  blezl $t2, .L800319C0
 /* 0325A8 800319A8 95420000 */   lhu   $v0, ($t2)
-/* 0325AC 800319AC 3C0B8000 */  lui   $t3, %hi(D_80000018) # $t3, 0x8000
+/* 0325AC 800319AC 3C0B8000 */  lui   $t3, 0x8000
 /* 0325B0 800319B0 016A5825 */  or    $t3, $t3, $t2
 /* 0325B4 800319B4 0800C6C6 */  j     .L80031B18
-/* 0325B8 800319B8 8D6B0018 */   lw    $t3, %lo(D_80000018)($t3)
+/* 0325B8 800319B8 8D6B0018 */   lw    $t3, 0x18($t3)
 
 /* 0325BC 800319BC 95420000 */  lhu   $v0, ($t2)
 .L800319C0:
diff --git a/bss.txt b/bss.txt
deleted file mode 100644
index 131d7195..00000000
--- a/bss.txt
+++ /dev/null
@@ -1,108 +0,0 @@
-unknown_001050
-
-unknown_003260
-
-unknown_005740
-
-unknown_00BC20
-
-unknown_0255E0
-
-unknown_032760
-
-unknown_0348C0
-
-unknown_043920
-
-unknown_05CEF0
-
-unknown_05DCD0
-
-unknown_05F0C0
-
-unknown_05F690
-
-unknown_0667D0
-
-unknown_066AA0
-
-unknown_06B2B0
-
-unknown_071730
-
-unknown_072E50
-
-unknown_0777A0
-
-unknown_078050
-
-unknown_079F50
-
-unknown_07AF10
-
-unknown_07B870
-
-unknown_080500
-
-unknown_09F8F0
-
-unknown_0AEE70
-
-unknown_0C4800
-
-unknown_0C7F50
-D_8012AAF0;
-D_8012ACA0;
-D_8012ACB8;
-
-
-osViMgr
-viThreadStack;
-D_8012CCC0;
-__osEventStateTab;
-
-
-unknown_0CD820
-D_8012CD50;
-D_8012CD8C;
-D_8012CD90;
-__osMaxControllers;
-D_8012CDB8;
-D_8012CDD0;
-__osPfsPifRam;
-D_8012CE1C;
-
-
-unknown_0CE200
-D_8012CE20;
-D_8012CE28;
-D_8012CE40;
-D_8012CE7C;
-
-
-osViMgr
-viThread;
-viEventQueue;
-viEventBuf;
-viRetraceMsg;
-viCounterMsg;
-D_8012D190;
-
-
-unknown_0D29F0
-D_8012D1A0;
-
-
-unknown_0D3020
-D_8012D1E0;
-piAccessQueue;
-__osCurrentTime;
-D_8012D224;
-__osBaseCounter;
-D_8012D22C;
-D_8012D230;
-D_8012D240;
-
-
-unknown_071730
-D_8012D3F0;
\ No newline at end of file
diff --git a/lib/asm/non_matchings/osViMgr_0D2590/viMgrMain.s b/lib/asm/non_matchings/osViMgr_0D2590/viMgrMain.s
index 7c902d6c..9f605f94 100644
--- a/lib/asm/non_matchings/osViMgr_0D2590/viMgrMain.s
+++ b/lib/asm/non_matchings/osViMgr_0D2590/viMgrMain.s
@@ -46,10 +46,10 @@ glabel viMgrMain
 .L800D1BAC:
 /* 0D27AC 800D1BAC 0C035824 */  jal   __osViSwapContext
 /* 0D27B0 800D1BB0 00000000 */   nop   
-/* 0D27B4 800D1BB4 3C038013 */  lui   $v1, %hi(D_8012FFFF) # $v1, 0x8013
+/* 0D27B4 800D1BB4 3C038013 */  lui   $v1, %hi(D_8012D190) # $v1, 0x8013
 /* 0D27B8 800D1BB8 9463D190 */  lhu   $v1, %lo(D_8012D190)($v1)
 /* 0D27BC 800D1BBC 3C018013 */  lui   $at, %hi(D_8012D190) # $at, 0x8013
-/* 0D27C0 800D1BC0 2463FFFF */  addiu $v1, %lo(D_8012FFFF) # addiu $v1, $v1, -1
+/* 0D27C0 800D1BC0 2463FFFF */  addiu $v1, $v1, -1
 /* 0D27C4 800D1BC4 306FFFFF */  andi  $t7, $v1, 0xffff
 /* 0D27C8 800D1BC8 15E0000E */  bnez  $t7, .L800D1C04
 /* 0D27CC 800D1BCC A42FD190 */   sh    $t7, %lo(D_8012D190)($at)
diff --git a/lib/asm/non_matchings/unknown_0CA9A0/alResamplePull.s b/lib/asm/non_matchings/unknown_0CA9A0/alResamplePull.s
index 913eafb3..c6586ff6 100644
--- a/lib/asm/non_matchings/unknown_0CA9A0/alResamplePull.s
+++ b/lib/asm/non_matchings/unknown_0CA9A0/alResamplePull.s
@@ -55,8 +55,8 @@ glabel alResamplePull
 /* 0CCE2C 800CC22C 4626203C */  c.lt.d $f4, $f6
 /* 0CCE30 800CC230 00000000 */  nop   
 /* 0CCE34 800CC234 45020005 */  bc1fl .L800CC24C
-/* 0CCE38 800CC238 3C014700 */   lui   $at, %hi(D_46FF9630) # $at, 0x4700
-/* 0CCE3C 800CC23C C4289630 */  lwc1  $f8, %lo(D_46FF9630)($at)
+/* 0CCE38 800CC238 3C014700 */   lui   $at, %hi(0x46FF9630) # $at, 0x4700
+/* 0CCE3C 800CC23C C4289630 */  lwc1  $f8, %lo(0x46FF9630)($at)
 /* 0CCE40 800CC240 E5080018 */  swc1  $f8, 0x18($t0)
 /* 0CCE44 800CC244 C5020018 */  lwc1  $f2, 0x18($t0)
 /* 0CCE48 800CC248 3C014700 */  li    $at, 0x47000000 # 32768.000000
diff --git a/lib/asm/non_matchings/unknown_0CCF90/osInitialize.s b/lib/asm/non_matchings/unknown_0CCF90/osInitialize.s
index 49e78744..764b8d57 100644
--- a/lib/asm/non_matchings/unknown_0CCF90/osInitialize.s
+++ b/lib/asm/non_matchings/unknown_0CCF90/osInitialize.s
@@ -49,53 +49,53 @@ glabel osInitialize
 /* 0CD24C 800CC64C 3C08800D */  lui   $t0, %hi(__osExceptionPreamble) # $t0, 0x800d
 /* 0CD250 800CC650 25082CB0 */  addiu $t0, %lo(__osExceptionPreamble) # addiu $t0, $t0, 0x2cb0
 /* 0CD254 800CC654 8D010000 */  lw    $at, ($t0)
-/* 0CD258 800CC658 3C198000 */  lui   $t9, %hi(D_8000000C) # $t9, 0x8000
+/* 0CD258 800CC658 3C198000 */  lui   $t9, 0x8000
 /* 0CD25C 800CC65C 3C0D800D */  lui   $t5, %hi(__osExceptionPreamble) # $t5, 0x800d
 /* 0CD260 800CC660 AF210000 */  sw    $at, ($t9)
 /* 0CD264 800CC664 8D0B0004 */  lw    $t3, 4($t0)
 /* 0CD268 800CC668 25AD2CB0 */  addiu $t5, %lo(__osExceptionPreamble) # addiu $t5, $t5, 0x2cb0
-/* 0CD26C 800CC66C 3C0C8000 */  lui   $t4, %hi(D_8000000C) # $t4, 0x8000
-/* 0CD270 800CC670 AF2B0004 */  sw    $t3, %lo(D_80000004)($t9)
+/* 0CD26C 800CC66C 3C0C8000 */  lui   $t4, 0x8000
+/* 0CD270 800CC670 AF2B0004 */  sw    $t3, 4($t9)
 /* 0CD274 800CC674 8D010008 */  lw    $at, 8($t0)
 /* 0CD278 800CC678 358C0080 */  ori   $t4, (0x80000080 & 0xFFFF) # ori $t4, $t4, 0x80
 /* 0CD27C 800CC67C 3C09800D */  lui   $t1, %hi(__osExceptionPreamble) # $t1, 0x800d
-/* 0CD280 800CC680 AF210008 */  sw    $at, %lo(D_80000008)($t9)
+/* 0CD280 800CC680 AF210008 */  sw    $at, 8($t9)
 /* 0CD284 800CC684 8D0B000C */  lw    $t3, 0xc($t0)
 /* 0CD288 800CC688 25292CB0 */  addiu $t1, %lo(__osExceptionPreamble) # addiu $t1, $t1, 0x2cb0
-/* 0CD28C 800CC68C 3C0A8000 */  lui   $t2, %hi(D_8000000C) # $t2, 0x8000
-/* 0CD290 800CC690 AF2B000C */  sw    $t3, %lo(D_8000000C)($t9)
+/* 0CD28C 800CC68C 3C0A8000 */  lui   $t2, 0x8000
+/* 0CD290 800CC690 AF2B000C */  sw    $t3, 0xc($t9)
 /* 0CD294 800CC694 8DA10000 */  lw    $at, ($t5)
 /* 0CD298 800CC698 354A0100 */  ori   $t2, (0x80000100 & 0xFFFF) # ori $t2, $t2, 0x100
 /* 0CD29C 800CC69C 3C0E800D */  lui   $t6, %hi(__osExceptionPreamble) # $t6, 0x800d
 /* 0CD2A0 800CC6A0 AD810000 */  sw    $at, ($t4)
 /* 0CD2A4 800CC6A4 8DB80004 */  lw    $t8, 4($t5)
 /* 0CD2A8 800CC6A8 25CE2CB0 */  addiu $t6, %lo(__osExceptionPreamble) # addiu $t6, $t6, 0x2cb0
-/* 0CD2AC 800CC6AC 3C0F8000 */  lui   $t7, %hi(D_8000000C) # $t7, 0x8000
-/* 0CD2B0 800CC6B0 AD980004 */  sw    $t8, %lo(D_80000004)($t4)
+/* 0CD2AC 800CC6AC 3C0F8000 */  lui   $t7, 0x8000
+/* 0CD2B0 800CC6B0 AD980004 */  sw    $t8, 4($t4)
 /* 0CD2B4 800CC6B4 8DA10008 */  lw    $at, 8($t5)
 /* 0CD2B8 800CC6B8 35EF0180 */  ori   $t7, (0x80000180 & 0xFFFF) # ori $t7, $t7, 0x180
 /* 0CD2BC 800CC6BC 3C048000 */  lui   $a0, 0x8000
-/* 0CD2C0 800CC6C0 AD810008 */  sw    $at, %lo(D_80000008)($t4)
+/* 0CD2C0 800CC6C0 AD810008 */  sw    $at, 8($t4)
 /* 0CD2C4 800CC6C4 8DB8000C */  lw    $t8, 0xc($t5)
 /* 0CD2C8 800CC6C8 24050190 */  li    $a1, 400
-/* 0CD2CC 800CC6CC AD98000C */  sw    $t8, %lo(D_8000000C)($t4)
+/* 0CD2CC 800CC6CC AD98000C */  sw    $t8, 0xc($t4)
 /* 0CD2D0 800CC6D0 8D210000 */  lw    $at, ($t1)
 /* 0CD2D4 800CC6D4 AD410000 */  sw    $at, ($t2)
 /* 0CD2D8 800CC6D8 8D2B0004 */  lw    $t3, 4($t1)
-/* 0CD2DC 800CC6DC AD4B0004 */  sw    $t3, %lo(D_80000004)($t2)
+/* 0CD2DC 800CC6DC AD4B0004 */  sw    $t3, 4($t2)
 /* 0CD2E0 800CC6E0 8D210008 */  lw    $at, 8($t1)
-/* 0CD2E4 800CC6E4 AD410008 */  sw    $at, %lo(D_80000008)($t2)
+/* 0CD2E4 800CC6E4 AD410008 */  sw    $at, 8($t2)
 /* 0CD2E8 800CC6E8 8D2B000C */  lw    $t3, 0xc($t1)
-/* 0CD2EC 800CC6EC AD4B000C */  sw    $t3, %lo(D_8000000C)($t2)
+/* 0CD2EC 800CC6EC AD4B000C */  sw    $t3, 0xc($t2)
 /* 0CD2F0 800CC6F0 8DC10000 */  lw    $at, ($t6)
 /* 0CD2F4 800CC6F4 ADE10000 */  sw    $at, ($t7)
 /* 0CD2F8 800CC6F8 8DD80004 */  lw    $t8, 4($t6)
-/* 0CD2FC 800CC6FC ADF80004 */  sw    $t8, %lo(D_80000004)($t7)
+/* 0CD2FC 800CC6FC ADF80004 */  sw    $t8, 4($t7)
 /* 0CD300 800CC700 8DC10008 */  lw    $at, 8($t6)
-/* 0CD304 800CC704 ADE10008 */  sw    $at, %lo(D_80000008)($t7)
+/* 0CD304 800CC704 ADE10008 */  sw    $at, 8($t7)
 /* 0CD308 800CC708 8DD8000C */  lw    $t8, 0xc($t6)
 /* 0CD30C 800CC70C 0C03518C */  jal   osWritebackDCache
-/* 0CD310 800CC710 ADF8000C */   sw    $t8, %lo(D_8000000C)($t7)
+/* 0CD310 800CC710 ADF8000C */   sw    $t8, 0xC($t7)
 /* 0CD314 800CC714 3C048000 */  lui   $a0, 0x8000
 /* 0CD318 800CC718 0C0351AC */  jal   osInvalICache
 /* 0CD31C 800CC71C 24050190 */   li    $a1, 400
diff --git a/lib/asm/non_matchings/unknown_0D23F0/osInvalDCache.s b/lib/asm/non_matchings/unknown_0D23F0/osInvalDCache.s
index 19ea5b4e..24dffdac 100644
--- a/lib/asm/non_matchings/unknown_0D23F0/osInvalDCache.s
+++ b/lib/asm/non_matchings/unknown_0D23F0/osInvalDCache.s
@@ -38,14 +38,14 @@ glabel osInvalDCache
 /* 0D2474 800D1874 00000000 */   nop   
 
 .L800D1878:
-/* 0D2478 800D1878 3C088000 */  lui   $t0, %hi(D_80000010) # $t0, 0x8000
+/* 0D2478 800D1878 3C088000 */  lui   $t0, 0x8000
 /* 0D247C 800D187C 010B4821 */  addu  $t1, $t0, $t3
 /* 0D2480 800D1880 2529FFF0 */  addiu $t1, $t1, -0x10
 .L800D1884:
 /* 0D2484 800D1884 BD010000 */  cache 1, ($t0)
 /* 0D2488 800D1888 0109082B */  sltu  $at, $t0, $t1
 /* 0D248C 800D188C 1420FFFD */  bnez  $at, .L800D1884
-/* 0D2490 800D1890 25080010 */   addiu $t0, %lo(D_80000010) # addiu $t0, $t0, 0x10
+/* 0D2490 800D1890 25080010 */   addiu $t0, $t0, 0x10
 /* 0D2494 800D1894 03E00008 */  jr    $ra
 /* 0D2498 800D1898 00000000 */   nop   
 
diff --git a/lib/asm/non_matchings/unknown_0D24A0/osWritebackDCacheAll.s b/lib/asm/non_matchings/unknown_0D24A0/osWritebackDCacheAll.s
index 4ec747ea..e89e3996 100644
--- a/lib/asm/non_matchings/unknown_0D24A0/osWritebackDCacheAll.s
+++ b/lib/asm/non_matchings/unknown_0D24A0/osWritebackDCacheAll.s
@@ -1,5 +1,5 @@
 glabel osWritebackDCacheAll
-/* 0D24A0 800D18A0 3C088000 */  lui   $t0, %hi(D_80000010) # $t0, 0x8000
+/* 0D24A0 800D18A0 3C088000 */  lui   $t0, 0x8000
 /* 0D24A4 800D18A4 240A2000 */  li    $t2, 8192
 /* 0D24A8 800D18A8 010A4821 */  addu  $t1, $t0, $t2
 /* 0D24AC 800D18AC 2529FFF0 */  addiu $t1, $t1, -0x10
@@ -7,7 +7,7 @@ glabel osWritebackDCacheAll
 /* 0D24B0 800D18B0 BD010000 */  cache 1, ($t0)
 /* 0D24B4 800D18B4 0109082B */  sltu  $at, $t0, $t1
 /* 0D24B8 800D18B8 1420FFFD */  bnez  $at, .L800D18B0
-/* 0D24BC 800D18BC 25080010 */   addiu $t0, %lo(D_80000010) # addiu $t0, $t0, 0x10
+/* 0D24BC 800D18BC 25080010 */   addiu $t0, $t0, 0x10
 /* 0D24C0 800D18C0 03E00008 */  jr    $ra
 /* 0D24C4 800D18C4 00000000 */   nop   
 
diff --git a/lib/asm/osInvalICache.s b/lib/asm/osInvalICache.s
index dec7d2dd..4e23d32e 100644
--- a/lib/asm/osInvalICache.s
+++ b/lib/asm/osInvalICache.s
@@ -33,14 +33,14 @@ glabel osInvalICache
 /* 0D52FC 800D46FC 00000000 */   nop   
 
 .L800D4700:
-/* 0D5300 800D4700 3C088000 */  lui   $t0, %hi(D_80000020) # $t0, 0x8000
+/* 0D5300 800D4700 3C088000 */  lui   $t0, 0x8000
 /* 0D5304 800D4704 010B4821 */  addu  $t1, $t0, $t3
 /* 0D5308 800D4708 2529FFE0 */  addiu $t1, $t1, -0x20
 .L800D470C:
 /* 0D530C 800D470C BD000000 */  cache 0, ($t0)
 /* 0D5310 800D4710 0109082B */  sltu  $at, $t0, $t1
 /* 0D5314 800D4714 1420FFFD */  bnez  $at, .L800D470C
-/* 0D5318 800D4718 25080020 */   addiu $t0, %lo(D_80000020) # addiu $t0, $t0, 0x20
+/* 0D5318 800D4718 25080020 */   addiu $t0, $t0, 0x20
 /* 0D531C 800D471C 03E00008 */  jr    $ra
 /* 0D5320 800D4720 00000000 */   nop   
 
diff --git a/lib/asm/osWritebackDCache.s b/lib/asm/osWritebackDCache.s
index db6ff14f..5b9a25fc 100644
--- a/lib/asm/osWritebackDCache.s
+++ b/lib/asm/osWritebackDCache.s
@@ -34,14 +34,14 @@ glabel osWritebackDCache
 /* 0D527C 800D467C 00000000 */   nop   
 
 .L800D4680:
-/* 0D5280 800D4680 3C088000 */  lui   $t0, %hi(D_80000010) # $t0, 0x8000
+/* 0D5280 800D4680 3C088000 */  lui   $t0, 0x8000
 /* 0D5284 800D4684 010B4821 */  addu  $t1, $t0, $t3
 /* 0D5288 800D4688 2529FFF0 */  addiu $t1, $t1, -0x10
 .L800D468C:
 /* 0D528C 800D468C BD010000 */  cache 1, ($t0)
 /* 0D5290 800D4690 0109082B */  sltu  $at, $t0, $t1
 /* 0D5294 800D4694 1420FFFD */  bnez  $at, .L800D468C
-/* 0D5298 800D4698 25080010 */   addiu $t0, %lo(D_80000010) # addiu $t0, $t0, 0x10
+/* 0D5298 800D4698 25080010 */   addiu $t0, $t0, 0x10
 /* 0D529C 800D469C 03E00008 */  jr    $ra
 /* 0D52A0 800D46A0 00000000 */   nop   
 
diff --git a/lib/src/osSetEventMesg.c b/lib/src/osSetEventMesg.c
index 347200fa..82424c45 100644
--- a/lib/src/osSetEventMesg.c
+++ b/lib/src/osSetEventMesg.c
@@ -10,7 +10,7 @@ typedef struct __OSEventState
 } __OSEventState;
 
 
-__OSEventState __osEventStateTab[OS_NUM_EVENTS];//__osEventStateTab[OS_NUM_EVENTS];
+__OSEventState __osEventStateTab[15]; // __osEventStateTab[OS_NUM_EVENTS];
 void osSetEventMesg(OSEvent event, OSMesgQueue *mq, OSMesg msg)
 {
 	register u32 saveMask = __osDisableInt();
diff --git a/lib/src/osViMgr.c b/lib/src/osViMgr.c
index 36b45803..ae2185dc 100644
--- a/lib/src/osViMgr.c
+++ b/lib/src/osViMgr.c
@@ -5,7 +5,6 @@
 #include "macros.h"
 #include "libultra_internal.h"
 
-#define OS_VIM_STACKSIZE 4096
 
 extern OSTime __osCurrentTime;
 extern u32 __osBaseCounter;
@@ -13,7 +12,11 @@ extern u32 D_8012D22C; //__osViIntrCount
 
 OSDevMgr __osViDevMgr = {0};
 
-extern u8 viThreadStack[OS_VIM_STACKSIZE];
+#define OS_VIM_STACKSIZE 4096
+u8 viThreadStack[2960]; // viThreadStack[OS_VIM_STACKSIZE];
+
+s32 D_8012CCC0;
+
 extern OSThread viThread;
 extern OSMesgQueue viEventQueue;
 extern OSMesg viEventBuf[5]; //viEventBuf;
diff --git a/lib/src/unknown_0C9A20.c b/lib/src/unknown_0C9A20.c
index c63fb58a..3d802000 100644
--- a/lib/src/unknown_0C9A20.c
+++ b/lib/src/unknown_0C9A20.c
@@ -6,7 +6,7 @@
 
 // This probably does not belong here. Please move it to the appropriate place!
 #define EQPOWER_LENGTH 128
-static s16 eqpower[ EQPOWER_LENGTH ] = {
+s16 eqpower[ EQPOWER_LENGTH ] = {
     32767,  32764,  32757,  32744,  32727,  32704,
     32677,  32644,  32607,  32564,  32517,  32464,
     32407,  32344,  32277,  32205,  32127,  32045,
diff --git a/lib/src/unknown_0CD820.c b/lib/src/unknown_0CD820.c
index 4adbd683..d09539a8 100644
--- a/lib/src/unknown_0CD820.c
+++ b/lib/src/unknown_0CD820.c
@@ -6,6 +6,24 @@
 
 s32 D_800E38C0 = 0;
 
+s32 D_8012CD50[15];
+s32 D_8012CD8C;
+s8 D_8012CD90;
+s8 __osMaxControllers; // 8012CD91
+s32 D_8012CD94;
+s32 D_8012CD98[6];
+s32 D_8012CDB0;
+s32 D_8012CDB4;
+s32 D_8012CDB8;
+s32 D_8012CDBC;
+s32 D_8012CDC0[4];
+s32 D_8012CDD0[4];
+s32 __osPfsPifRam; // 8012CDE0
+s32 D_8012CDE4;
+s32 D_8012CDE8[12];
+s32 D_8012CE18;
+s32 D_8012CE1C;
+
 GLOBAL_ASM("lib/asm/non_matchings/unknown_0CD820/func_800CCC20.s")
 GLOBAL_ASM("lib/asm/non_matchings/unknown_0CD820/func_800CCE18.s")
 GLOBAL_ASM("lib/asm/non_matchings/unknown_0CD820/func_800CCEE8.s")
diff --git a/lib/src/unknown_0CE200.c b/lib/src/unknown_0CE200.c
index 23bcf4eb..757a3e77 100644
--- a/lib/src/unknown_0CE200.c
+++ b/lib/src/unknown_0CE200.c
@@ -6,6 +6,31 @@
 
 s32 D_800E38D0 = 0;
 
+// Ok, so I completely gave up on the rest of these bss variables.
+// This is probably not the right place for them, but we can always 
+// fix that later. ¯\_(ツ)_/¯
+
+s32 D_8012CE20[2];
+s32 D_8012CE28[6];
+s32 D_8012CE40[15];     
+s32 D_8012CE7C;     
+s32 viThread[172];    
+s32 viEventQueue[6];   
+s32 viEventBuf[6]; 
+s32 viRetraceMsg[6];
+s32 viCounterMsg[6];
+s32 D_8012D190[4];     
+s32 D_8012D1A0[16];     
+s32 D_8012D1E0[2];     
+s32 piAccessQueue[14];  
+s32 __osCurrentTime;
+s32 D_8012D224;     
+s32 __osBaseCounter;
+s32 D_8012D22C;     
+s32 D_8012D230[4];     
+s32 D_8012D240[108];     
+s32 D_8012D3F0;    
+
 GLOBAL_ASM("lib/asm/non_matchings/unknown_0CE200/__osSiCreateAccessQueue.s")
 GLOBAL_ASM("lib/asm/non_matchings/unknown_0CE200/__osSiGetAccess.s")
 GLOBAL_ASM("lib/asm/non_matchings/unknown_0CE200/__osSiRelAccess.s")
diff --git a/src/unknown_0C7F50.c b/src/unknown_0C7F50.c
index abd22408..3662e251 100644
--- a/src/unknown_0C7F50.c
+++ b/src/unknown_0C7F50.c
@@ -20,6 +20,7 @@ s32 D_8012AAE0[4];
 OSThread D_8012AAF0;
 OSMesgQueue D_8012ACA0;
 OSMesg D_8012ACB8;
+s32 D_8012ACC0[1306];
 
 extern void *D_8012CCC0;
 
diff --git a/tools/python/generate_ld.py b/tools/python/generate_ld.py
index 4c67e61a..568a1df7 100644
--- a/tools/python/generate_ld.py
+++ b/tools/python/generate_ld.py
@@ -26,6 +26,13 @@ LATE_DATA_FILES = [
     BUILD_DIR + '/lib/src/unknown_0D3020.o'
 ]
 
+BSS_LIB_ORDER_FILES = [
+    BUILD_DIR + '/lib/src/osViMgr.o',
+    BUILD_DIR + '/lib/src/osSetEventMesg.o',
+    BUILD_DIR + '/lib/src/unknown_0CD820.o',
+    BUILD_DIR + '/lib/src/unknown_0CE200.o'
+]
+
 class GenerateLD:
     def __init__(self, file):
         print('Generating linker file...')
@@ -53,6 +60,8 @@ class GenerateLD:
         self.gen_ucode_data_section()
         self.gen_bss_section()
         self.gen_assets_section()
+        self.gen_line('__ROM_END = romPos;')
+        self.gen_newline()
         self.gen_discard()
         self.gen_close_block()
     
@@ -130,9 +139,9 @@ class GenerateLD:
         self.gen_line('.bss.noload . (NOLOAD): SUBALIGN(4)')
         self.gen_open_block()
         for file in self.files:
-            if file[0] not in LATE_DATA_FILES:
+            if file[0] not in BSS_LIB_ORDER_FILES:
                 self.gen_line(file[0] + '(.bss);')
-        for file in LATE_DATA_FILES:
+        for file in BSS_LIB_ORDER_FILES:
             self.gen_line(file + '(.bss);')
         self.gen_close_block()
         self.gen_newline()
diff --git a/undefined_syms.txt b/undefined_syms.txt
index 27b204b3..528174a5 100755
--- a/undefined_syms.txt
+++ b/undefined_syms.txt
@@ -1,66 +1,9 @@
-D_000E1CA0 = 0x000E1CA0;
-D_000E1CB0 = 0x000E1CB0;
-D_000E1CC0 = 0x000E1CC0;
-D_000E36C8 = 0x000E36C8;
-D_000E36D8 = 0x000E36D8;
-D_000ECC30 = 0x000ECC30;
-D_00AC9630 = 0x00AC9630;
-D_00FF0018 = 0x00FF0018;
-D_3B9A0001 = 0x3B9A0001;
-D_46FF9630 = 0x46FF9630;
-D_57410001 = 0x57410001;
-
-D_80000004 = 0x80000004;
-D_80000008 = 0x80000008;
-D_8000000C = 0x8000000C;
-D_80000010 = 0x80000010;
-D_80000018 = 0x80000018;
-D_80000020 = 0x80000020;
 osTvType = 0x80000300;
 osRomBase = 0x80000308;
 osResetType = 0x8000030C;
 osCicId = 0x80000310;
 osAppNMIBuffer = 0x8000031C;
 
-D_800E0001 = 0x800E0001;
-eqpower = 0x800E37A0;
-
-
-viThreadStack = 0x8012C130;
-
-D_8012CCC0 = 0x8012CCC0;
-
-__osEventStateTab = 0x8012CCD0;
-D_8012CD50 = 0x8012CD50;
-D_8012CD8C = 0x8012CD8C;
-D_8012CD90 = 0x8012CD90;
-__osMaxControllers = 0x8012CD91;
-D_8012CDB8 = 0x8012CDB8;
-D_8012CDD0 = 0x8012CDD0;
-__osPfsPifRam = 0x8012CDE0;
-D_8012CE1C = 0x8012CE1C;
-D_8012CE20 = 0x8012CE20;
-D_8012CE28 = 0x8012CE28;
-D_8012CE40 = 0x8012CE40;
-D_8012CE7C = 0x8012CE7C;
-viThread = 0x8012CE80;
-viEventQueue = 0x8012D130;
-viEventBuf = 0x8012D148;
-viRetraceMsg = 0x8012D160;
-viCounterMsg = 0x8012D178;
-D_8012D190 = 0x8012D190;
-D_8012D1A0 = 0x8012D1A0;
-D_8012D1E0 = 0x8012D1E0;
-piAccessQueue = 0x8012D1E8;
-__osCurrentTime = 0x8012D220;
-D_8012D224 = 0x8012D224;
-__osBaseCounter = 0x8012D228;
-D_8012D22C = 0x8012D22C;
-D_8012D230 = 0x8012D230;
-D_8012D240 = 0x8012D240;
-D_8012D3F0 = 0x8012D3F0;
-D_8012FFFF = 0x8012FFFF;
-
 D_A0000200 = 0xA0000200;
 D_A0000284 = 0xA0000284;
 SP_IMEM = 0xA4001000;
@@ -101,7 +44,3 @@ D_A5000508 = 0xA5000508;
 
 D_B0000574 = 0xB0000574;
 D_B0000578 = 0xB0000578;
-
-D_FF7F0001 = 0xFF7F0001;
-D_FFFDFFFB = 0xFFFDFFFB;
-D_FFFF0028 = 0xFFFF0028;
\ No newline at end of file