diff --git a/asm/nonmatchings/code_1370_len_7d0/func_80026164.s b/asm/nonmatchings/code_1370_len_7d0/func_80026164.s
index 117d235ced..3a16c1f1d2 100644
--- a/asm/nonmatchings/code_1370_len_7d0/func_80026164.s
+++ b/asm/nonmatchings/code_1370_len_7d0/func_80026164.s
@@ -3,13 +3,13 @@
 
 glabel func_80026164
 /* 1564 80026164 27BDFFC0 */  addiu     $sp, $sp, -0x40
-/* 1568 80026168 3C048007 */  lui       $a0, 0x8007
-/* 156C 8002616C 8C8441F4 */  lw        $a0, 0x41f4($a0)
-/* 1570 80026170 3C058016 */  lui       $a1, 0x8016
-/* 1574 80026174 24A54000 */  addiu     $a1, $a1, 0x4000
+/* 1568 80026168 3C048007 */  lui       $a0, %hi(D_800741F4)
+/* 156C 8002616C 8C8441F4 */  lw        $a0, %lo(D_800741F4)($a0)
+/* 1570 80026170 3C058016 */  lui       $a1, %hi(D_80164000)
+/* 1574 80026174 24A54000 */  addiu     $a1, $a1, %lo(D_80164000)
 /* 1578 80026178 AFB20020 */  sw        $s2, 0x20($sp)
-/* 157C 8002617C 3C12800A */  lui       $s2, 0x800a
-/* 1580 80026180 2652A66C */  addiu     $s2, $s2, -0x5994
+/* 157C 8002617C 3C12800A */  lui       $s2, %hi(D_8009A66C)
+/* 1580 80026180 2652A66C */  addiu     $s2, $s2, %lo(D_8009A66C)
 /* 1584 80026184 AFBF003C */  sw        $ra, 0x3c($sp)
 /* 1588 80026188 AFBE0038 */  sw        $fp, 0x38($sp)
 /* 158C 8002618C AFB70034 */  sw        $s7, 0x34($sp)
@@ -19,8 +19,8 @@ glabel func_80026164
 /* 159C 8002619C AFB30024 */  sw        $s3, 0x24($sp)
 /* 15A0 800261A0 AFB1001C */  sw        $s1, 0x1c($sp)
 /* 15A4 800261A4 AFB00018 */  sw        $s0, 0x18($sp)
-/* 15A8 800261A8 3C018007 */  lui       $at, 0x8007
-/* 15AC 800261AC A42041F0 */  sh        $zero, 0x41f0($at)
+/* 15A8 800261A8 3C018007 */  lui       $at, %hi(D_800741F0)
+/* 15AC 800261AC A42041F0 */  sh        $zero, %lo(D_800741F0)($at)
 /* 15B0 800261B0 00041040 */  sll       $v0, $a0, 1
 /* 15B4 800261B4 00441021 */  addu      $v0, $v0, $a0
 /* 15B8 800261B8 000210C0 */  sll       $v0, $v0, 3
@@ -31,12 +31,12 @@ glabel func_80026164
 /* 15CC 800261CC 00441023 */  subu      $v0, $v0, $a0
 /* 15D0 800261D0 00021100 */  sll       $v0, $v0, 4
 /* 15D4 800261D4 00451021 */  addu      $v0, $v0, $a1
-/* 15D8 800261D8 3C01800A */  lui       $at, 0x800a
-/* 15DC 800261DC AC22A674 */  sw        $v0, -0x598c($at)
+/* 15D8 800261D8 3C01800A */  lui       $at, %hi(D_8009A674)
+/* 15DC 800261DC AC22A674 */  sw        $v0, %lo(D_8009A674)($at)
 /* 15E0 800261E0 24420230 */  addiu     $v0, $v0, 0x230
 /* 15E4 800261E4 AE420000 */  sw        $v0, ($s2)
-/* 15E8 800261E8 3C118007 */  lui       $s1, 0x8007
-/* 15EC 800261EC 8E313E04 */  lw        $s1, 0x3e04($s1)
+/* 15E8 800261E8 3C118007 */  lui       $s1, %hi(D_80073E04)
+/* 15EC 800261EC 8E313E04 */  lw        $s1, %lo(D_80073E04)($s1)
 /* 15F0 800261F0 0C009C68 */  jal       func_800271A0
 /* 15F4 800261F4 3C13070F */   lui      $s3, 0x70f
 /* 15F8 800261F8 3C06FF10 */  lui       $a2, 0xff10
@@ -136,14 +136,14 @@ glabel func_80026164
 /* 1770 80026370 24620048 */  addiu     $v0, $v1, 0x48
 /* 1774 80026374 AC6E0038 */  sw        $t6, 0x38($v1)
 /* 1778 80026378 AE420000 */  sw        $v0, ($s2)
-/* 177C 8002637C 3C02F900 */  lui       $v0, 0xf900
+/* 177C 8002637C 3C02F900 */  lui       $v0, %hi(D_F9003E10)
 /* 1780 80026380 AC620040 */  sw        $v0, 0x40($v1)
 /* 1784 80026384 2402007F */  addiu     $v0, $zero, 0x7f
 /* 1788 80026388 AC620044 */  sw        $v0, 0x44($v1)
 /* 178C 8002638C 24620050 */  addiu     $v0, $v1, 0x50
 /* 1790 80026390 AE420000 */  sw        $v0, ($s2)
-/* 1794 80026394 3C028007 */  lui       $v0, 0x8007
-/* 1798 80026398 24423E10 */  addiu     $v0, $v0, 0x3e10
+/* 1794 80026394 3C028007 */  lui       $v0, %hi(D_80073E10)
+/* 1798 80026398 24423E10 */  addiu     $v0, $v0, %lo(D_F9003E10)
 /* 179C 8002639C AC6F0048 */  sw        $t7, 0x48($v1)
 /* 17A0 800263A0 AC62004C */  sw        $v0, 0x4c($v1)
 /* 17A4 800263A4 24620058 */  addiu     $v0, $v1, 0x58
@@ -206,8 +206,8 @@ glabel func_80026164
 /* 1880 80026480 00431023 */  subu      $v0, $v0, $v1
 /* 1884 80026484 00021FC2 */  srl       $v1, $v0, 0x1f
 /* 1888 80026488 00431021 */  addu      $v0, $v0, $v1
-/* 188C 8002648C 3C038007 */  lui       $v1, 0x8007
-/* 1890 80026490 94634010 */  lhu       $v1, 0x4010($v1)
+/* 188C 8002648C 3C038007 */  lui       $v1, %hi(D_80074010)
+/* 1890 80026490 94634010 */  lhu       $v1, %lo(D_80074010)($v1)
 /* 1894 80026494 00021043 */  sra       $v0, $v0, 1
 /* 1898 80026498 2463FFF1 */  addiu     $v1, $v1, -0xf
 /* 189C 8002649C 00431023 */  subu      $v0, $v0, $v1
@@ -322,13 +322,13 @@ glabel func_80026164
 /* 1A48 80026648 28420014 */  slti      $v0, $v0, 0x14
 /* 1A4C 8002664C 1440FF73 */  bnez      $v0, .L8002641C
 /* 1A50 80026650 0000702D */   daddu    $t6, $zero, $zero
-/* 1A54 80026654 3C06800A */  lui       $a2, 0x800a
-/* 1A58 80026658 24C6A66C */  addiu     $a2, $a2, -0x5994
-/* 1A5C 8002665C 3C038007 */  lui       $v1, 0x8007
-/* 1A60 80026660 24634010 */  addiu     $v1, $v1, 0x4010
+/* 1A54 80026654 3C06800A */  lui       $a2, %hi(D_8009A66C)
+/* 1A58 80026658 24C6A66C */  addiu     $a2, $a2, %lo(D_8009A66C)
+/* 1A5C 8002665C 3C038007 */  lui       $v1, %hi(D_80074010)
+/* 1A60 80026660 24634010 */  addiu     $v1, $v1, %lo(D_80074010)
 /* 1A64 80026664 8CC50000 */  lw        $a1, ($a2)
-/* 1A68 80026668 3C08800A */  lui       $t0, 0x800a
-/* 1A6C 8002666C 8D08A674 */  lw        $t0, -0x598c($t0)
+/* 1A68 80026668 3C08800A */  lui       $t0, %hi(D_8009A674)
+/* 1A6C 8002666C 8D08A674 */  lw        $t0, %lo(D_8009A674)($t0)
 /* 1A70 80026670 94620000 */  lhu       $v0, ($v1)
 /* 1A74 80026674 00A0382D */  daddu     $a3, $a1, $zero
 /* 1A78 80026678 24A50008 */  addiu     $a1, $a1, 8
@@ -351,8 +351,8 @@ glabel func_80026164
 /* 1ABC 800266BC 0000302D */  daddu     $a2, $zero, $zero
 /* 1AC0 800266C0 0C00B331 */  jal       nuGfxTaskStart
 /* 1AC4 800266C4 3C070004 */   lui      $a3, 4
-/* 1AC8 800266C8 3C038007 */  lui       $v1, 0x8007
-/* 1ACC 800266CC 246341F4 */  addiu     $v1, $v1, 0x41f4
+/* 1AC8 800266C8 3C038007 */  lui       $v1, %hi(D_800741F4)
+/* 1ACC 800266CC 246341F4 */  addiu     $v1, $v1, %lo(D_800741F4)
 /* 1AD0 800266D0 8C620000 */  lw        $v0, ($v1)
 /* 1AD4 800266D4 38420001 */  xori      $v0, $v0, 1
 /* 1AD8 800266D8 AC620000 */  sw        $v0, ($v1)
diff --git a/asm/nonmatchings/code_1370_len_7d0/gfxPreNMI_Callback.s b/asm/nonmatchings/code_1370_len_7d0/gfxPreNMI_Callback.s
index 8df0ebfe67..a2c087f4a3 100644
--- a/asm/nonmatchings/code_1370_len_7d0/gfxPreNMI_Callback.s
+++ b/asm/nonmatchings/code_1370_len_7d0/gfxPreNMI_Callback.s
@@ -5,8 +5,8 @@ glabel gfxPreNMI_Callback
 /* 1B0C 8002670C 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 1B10 80026710 24020001 */  addiu     $v0, $zero, 1
 /* 1B14 80026714 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 1B18 80026718 3C018007 */  lui       $at, 0x8007
-/* 1B1C 8002671C AC223E00 */  sw        $v0, 0x3e00($at)
+/* 1B18 80026718 3C018007 */  lui       $at, %hi(D_80073E00)
+/* 1B1C 8002671C AC223E00 */  sw        $v0, %lo(D_80073E00)($at)
 /* 1B20 80026720 0C018028 */  jal       nuContRmbForceStop
 /* 1B24 80026724 00000000 */   nop      
 /* 1B28 80026728 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/code_1370_len_7d0/gfxRetrace_Callback.s b/asm/nonmatchings/code_1370_len_7d0/gfxRetrace_Callback.s
index cfb736f641..74c0183ce1 100644
--- a/asm/nonmatchings/code_1370_len_7d0/gfxRetrace_Callback.s
+++ b/asm/nonmatchings/code_1370_len_7d0/gfxRetrace_Callback.s
@@ -4,8 +4,8 @@
 glabel gfxRetrace_Callback
 /* 145C 8002605C 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* 1460 80026060 AFB10014 */  sw        $s1, 0x14($sp)
-/* 1464 80026064 3C118007 */  lui       $s1, 0x8007
-/* 1468 80026068 26313E00 */  addiu     $s1, $s1, 0x3e00
+/* 1464 80026064 3C118007 */  lui       $s1, %hi(D_80073E00)
+/* 1468 80026068 26313E00 */  addiu     $s1, $s1, %lo(D_80073E00)
 /* 146C 8002606C AFBF0018 */  sw        $ra, 0x18($sp)
 /* 1470 80026070 AFB00010 */  sw        $s0, 0x10($sp)
 /* 1474 80026074 8E230000 */  lw        $v1, ($s1)
@@ -20,14 +20,14 @@ glabel gfxRetrace_Callback
 /* 1498 80026098 00000000 */   nop      
 /* 149C 8002609C 0C019A6C */  jal       osViGetCurrentFramebuffer
 /* 14A0 800260A0 00000000 */   nop      
-/* 14A4 800260A4 3C10800A */  lui       $s0, 0x800a
-/* 14A8 800260A8 2610A680 */  addiu     $s0, $s0, -0x5980
+/* 14A4 800260A4 3C10800A */  lui       $s0, %hi(D_8009A680)
+/* 14A8 800260A8 2610A680 */  addiu     $s0, $s0, %lo(D_8009A680)
 /* 14AC 800260AC 0200202D */  daddu     $a0, $s0, $zero
 /* 14B0 800260B0 AE020008 */  sw        $v0, 8($s0)
 /* 14B4 800260B4 AE020004 */  sw        $v0, 4($s0)
 /* 14B8 800260B8 AE020000 */  sw        $v0, ($s0)
-/* 14BC 800260BC 3C018007 */  lui       $at, 0x8007
-/* 14C0 800260C0 AC223E04 */  sw        $v0, 0x3e04($at)
+/* 14BC 800260BC 3C018007 */  lui       $at, %hi(D_80073E04)
+/* 14C0 800260C0 AC223E04 */  sw        $v0, %lo(D_80073E04)($at)
 /* 14C4 800260C4 0C017CBC */  jal       nuGfxSetCfb
 /* 14C8 800260C8 24050003 */   addiu    $a1, $zero, 3
 /* 14CC 800260CC 8E040000 */  lw        $a0, ($s0)
@@ -36,8 +36,8 @@ glabel gfxRetrace_Callback
 /* 14D8 800260D8 24020002 */  addiu     $v0, $zero, 2
 /* 14DC 800260DC AE220000 */  sw        $v0, ($s1)
 .L800260E0:
-/* 14E0 800260E0 3C038007 */  lui       $v1, 0x8007
-/* 14E4 800260E4 8C633E00 */  lw        $v1, 0x3e00($v1)
+/* 14E0 800260E0 3C038007 */  lui       $v1, %hi(D_80073E00)
+/* 14E4 800260E4 8C633E00 */  lw        $v1, %lo(D_80073E00)($v1)
 /* 14E8 800260E8 24020002 */  addiu     $v0, $zero, 2
 /* 14EC 800260EC 14620018 */  bne       $v1, $v0, .L80026150
 /* 14F0 800260F0 00000000 */   nop      
@@ -46,16 +46,16 @@ glabel gfxRetrace_Callback
 /* 14FC 800260FC 08009854 */  j         .L80026150
 /* 1500 80026100 00000000 */   nop      
 .L80026104:
-/* 1504 80026104 3C038007 */  lui       $v1, 0x8007
-/* 1508 80026108 24633E0A */  addiu     $v1, $v1, 0x3e0a
+/* 1504 80026104 3C038007 */  lui       $v1, %hi(D_80073E0A)
+/* 1508 80026108 24633E0A */  addiu     $v1, $v1, %lo(D_80073E0A)
 /* 150C 8002610C 94620000 */  lhu       $v0, ($v1)
 /* 1510 80026110 38420001 */  xori      $v0, $v0, 1
 /* 1514 80026114 1440000E */  bnez      $v0, .L80026150
 /* 1518 80026118 A4620000 */   sh       $v0, ($v1)
 /* 151C 8002611C 0C0099D0 */  jal       step_game_loop
 /* 1520 80026120 00000000 */   nop      
-/* 1524 80026124 3C038007 */  lui       $v1, 0x8007
-/* 1528 80026128 24633E08 */  addiu     $v1, $v1, 0x3e08
+/* 1524 80026124 3C038007 */  lui       $v1, %hi(D_80073E08)
+/* 1528 80026128 24633E08 */  addiu     $v1, $v1, %lo(D_80073E08)
 /* 152C 8002612C 24020001 */  addiu     $v0, $zero, 1
 /* 1530 80026130 A4620000 */  sh        $v0, ($v1)
 /* 1534 80026134 2A020003 */  slti      $v0, $s0, 3
diff --git a/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240000_BDD1B0.s b/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240000_BDD1B0.s
index e2f258a80a..c55934cf14 100644
--- a/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240000_BDD1B0.s
+++ b/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240000_BDD1B0.s
@@ -20,8 +20,8 @@ glabel func_80240000_BDD1B0
 /* BDD1EC 8024003C 0040882D */  daddu     $s1, $v0, $zero
 /* BDD1F0 80240040 3C03800B */  lui       $v1, %hi(gCameras)
 /* BDD1F4 80240044 24631D80 */  addiu     $v1, $v1, %lo(gCameras)
-/* BDD1F8 80240048 3C02800A */  lui       $v0, 0x800a
-/* BDD1FC 8024004C 8442A634 */  lh        $v0, -0x59cc($v0)
+/* BDD1F8 80240048 3C02800A */  lui       $v0, %hi(D_8009A634)
+/* BDD1FC 8024004C 8442A634 */  lh        $v0, %lo(D_8009A634)($v0)
 /* BDD200 80240050 0000282D */  daddu     $a1, $zero, $zero
 /* BDD204 80240054 00028080 */  sll       $s0, $v0, 2
 /* BDD208 80240058 02028021 */  addu      $s0, $s0, $v0
@@ -38,8 +38,8 @@ glabel func_80240000_BDD1B0
 /* BDD234 80240084 0002802B */   sltu     $s0, $zero, $v0
 /* BDD238 80240088 0C00A6C9 */  jal       clamp_angle
 /* BDD23C 8024008C 46000306 */   mov.s    $f12, $f0
-/* BDD240 80240090 3C018024 */  lui       $at, 0x8024
-/* BDD244 80240094 D4221AE0 */  ldc1      $f2, 0x1ae0($at)
+/* BDD240 80240090 3C018024 */  lui       $at, %hi(D_80241AE0)
+/* BDD244 80240094 D4221AE0 */  ldc1      $f2, %lo(D_80241AE0)($at)
 /* BDD248 80240098 46000021 */  cvt.d.s   $f0, $f0
 /* BDD24C 8024009C 4622003C */  c.lt.d    $f0, $f2
 /* BDD250 802400A0 00000000 */  nop       
@@ -60,8 +60,8 @@ glabel func_80240000_BDD1B0
 /* BDD288 802400D8 0C00A70A */  jal       get_clamped_angle_diff
 /* BDD28C 802400DC 46000386 */   mov.s    $f14, $f0
 /* BDD290 802400E0 46000005 */  abs.s     $f0, $f0
-/* BDD294 802400E4 3C018024 */  lui       $at, 0x8024
-/* BDD298 802400E8 D4221AE8 */  ldc1      $f2, 0x1ae8($at)
+/* BDD294 802400E4 3C018024 */  lui       $at, %hi(D_80241AE8)
+/* BDD298 802400E8 D4221AE8 */  ldc1      $f2, %lo(D_80241AE8)($at)
 /* BDD29C 802400EC 46000021 */  cvt.d.s   $f0, $f0
 /* BDD2A0 802400F0 4620103C */  c.lt.d    $f2, $f0
 /* BDD2A4 802400F4 00000000 */  nop       
@@ -80,8 +80,8 @@ glabel func_80240000_BDD1B0
 /* BDD2D4 80240124 45030001 */  bc1tl     .L8024012C
 /* BDD2D8 80240128 0000802D */   daddu    $s0, $zero, $zero
 .L8024012C:
-/* BDD2DC 8024012C 3C038011 */  lui       $v1, 0x8011
-/* BDD2E0 80240130 8063EBB3 */  lb        $v1, -0x144d($v1)
+/* BDD2DC 8024012C 3C038011 */  lui       $v1, %hi(D_8010EBB3)
+/* BDD2E0 80240130 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
 /* BDD2E4 80240134 24020009 */  addiu     $v0, $zero, 9
 /* BDD2E8 80240138 50620001 */  beql      $v1, $v0, .L80240140
 /* BDD2EC 8024013C 0000802D */   daddu    $s0, $zero, $zero
diff --git a/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_802401D4_BDD384.s b/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_802401D4_BDD384.s
index e7e57a0bb9..40e3c54d9e 100644
--- a/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_802401D4_BDD384.s
+++ b/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_802401D4_BDD384.s
@@ -21,8 +21,8 @@ glabel func_802401D4_BDD384
 /* BDD3C4 80240214 8E420014 */  lw        $v0, 0x14($s2)
 /* BDD3C8 80240218 AE620074 */  sw        $v0, 0x74($s3)
 /* BDD3CC 8024021C C640000C */  lwc1      $f0, 0xc($s2)
-/* BDD3D0 80240220 3C018024 */  lui       $at, 0x8024
-/* BDD3D4 80240224 D4221AF0 */  ldc1      $f2, 0x1af0($at)
+/* BDD3D0 80240220 3C018024 */  lui       $at, %hi(D_80241AF0)
+/* BDD3D4 80240224 D4221AF0 */  ldc1      $f2, %lo(D_80241AF0)($at)
 /* BDD3D8 80240228 46000021 */  cvt.d.s   $f0, $f0
 /* BDD3DC 8024022C 46220002 */  mul.d     $f0, $f0, $f2
 /* BDD3E0 80240230 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240694_BDD844.s b/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240694_BDD844.s
index 3f6953e769..534235290f 100644
--- a/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240694_BDD844.s
+++ b/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240694_BDD844.s
@@ -83,8 +83,8 @@ glabel func_80240694_BDD844
 /* BDD978 802407C8 8C470030 */   lw       $a3, 0x30($v0)
 /* BDD97C 802407CC C6020018 */  lwc1      $f2, 0x18($s0)
 /* BDD980 802407D0 46020003 */  div.s     $f0, $f0, $f2
-/* BDD984 802407D4 3C018024 */  lui       $at, 0x8024
-/* BDD988 802407D8 D4221AF8 */  ldc1      $f2, 0x1af8($at)
+/* BDD984 802407D4 3C018024 */  lui       $at, %hi(D_80241AF8)
+/* BDD988 802407D8 D4221AF8 */  ldc1      $f2, %lo(D_80241AF8)($at)
 /* BDD98C 802407DC 46000021 */  cvt.d.s   $f0, $f0
 /* BDD990 802407E0 46220000 */  add.d     $f0, $f0, $f2
 /* BDD994 802407E4 4620010D */  trunc.w.d $f4, $f0
diff --git a/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240984_BDDB34.s b/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240984_BDDB34.s
index 2e8db50bd4..d11f0f9479 100644
--- a/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240984_BDDB34.s
+++ b/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240984_BDDB34.s
@@ -30,8 +30,8 @@ glabel func_80240984_BDDB34
 /* BDDB98 802409E8 08090284 */  j         .L80240A10
 /* BDDB9C 802409EC E4600018 */   swc1     $f0, 0x18($v1)
 .L802409F0:
-/* BDDBA0 802409F0 3C018024 */  lui       $at, 0x8024
-/* BDDBA4 802409F4 D4221B00 */  ldc1      $f2, 0x1b00($at)
+/* BDDBA0 802409F0 3C018024 */  lui       $at, %hi(D_80241B00)
+/* BDDBA4 802409F4 D4221B00 */  ldc1      $f2, %lo(D_80241B00)($at)
 /* BDDBA8 802409F8 44820000 */  mtc1      $v0, $f0
 /* BDDBAC 802409FC 00000000 */  nop       
 /* BDDBB0 80240A00 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240C90_BDDE40.s b/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240C90_BDDE40.s
index a700f84246..e8ac008c07 100644
--- a/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240C90_BDDE40.s
+++ b/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240C90_BDDE40.s
@@ -95,9 +95,9 @@ glabel func_80240C90_BDDE40
 /* BDDF94 80240DE4 2C620035 */  sltiu     $v0, $v1, 0x35
 /* BDDF98 80240DE8 10400073 */  beqz      $v0, .L80240FB8
 /* BDDF9C 80240DEC 00031080 */   sll      $v0, $v1, 2
-/* BDDFA0 80240DF0 3C018024 */  lui       $at, 0x8024
+/* BDDFA0 80240DF0 3C018024 */  lui       $at, %hi(D_80241B08)
 /* BDDFA4 80240DF4 00220821 */  addu      $at, $at, $v0
-/* BDDFA8 80240DF8 8C221B08 */  lw        $v0, 0x1b08($at)
+/* BDDFA8 80240DF8 8C221B08 */  lw        $v0, %lo(D_80241B08)($at)
 /* BDDFAC 80240DFC 00400008 */  jr        $v0
 /* BDDFB0 80240E00 00000000 */   nop      
 /* BDDFB4 80240E04 0260202D */  daddu     $a0, $s3, $zero
diff --git a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240000_BDED90.s b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240000_BDED90.s
index 8c08207943..95b8b32033 100644
--- a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240000_BDED90.s
+++ b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240000_BDED90.s
@@ -69,8 +69,8 @@ glabel func_80240000_BDED90
 /* BDEE84 802400F4 08090047 */  j         .L8024011C
 /* BDEE88 802400F8 E6800018 */   swc1     $f0, 0x18($s4)
 .L802400FC:
-/* BDEE8C 802400FC 3C018024 */  lui       $at, 0x8024
-/* BDEE90 80240100 D4224860 */  ldc1      $f2, 0x4860($at)
+/* BDEE8C 802400FC 3C018024 */  lui       $at, %hi(D_80244860)
+/* BDEE90 80240100 D4224860 */  ldc1      $f2, %lo(D_80244860)($at)
 /* BDEE94 80240104 44820000 */  mtc1      $v0, $f0
 /* BDEE98 80240108 00000000 */  nop       
 /* BDEE9C 8024010C 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_8024067C_BDF40C.s b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_8024067C_BDF40C.s
index 85bf04de01..656b69eeac 100644
--- a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_8024067C_BDF40C.s
+++ b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_8024067C_BDF40C.s
@@ -33,8 +33,8 @@ glabel func_8024067C_BDF40C
 /* BDF478 802406E8 080901C4 */  j         .L80240710
 /* BDF47C 802406EC E4A00018 */   swc1     $f0, 0x18($a1)
 .L802406F0:
-/* BDF480 802406F0 3C018024 */  lui       $at, 0x8024
-/* BDF484 802406F4 D4224868 */  ldc1      $f2, 0x4868($at)
+/* BDF480 802406F0 3C018024 */  lui       $at, %hi(D_80244868)
+/* BDF484 802406F4 D4224868 */  ldc1      $f2, %lo(D_80244868)($at)
 /* BDF488 802406F8 44820000 */  mtc1      $v0, $f0
 /* BDF48C 802406FC 00000000 */  nop       
 /* BDF490 80240700 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240B94_BDF924.s b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240B94_BDF924.s
index 7d61ab0823..b94ed02820 100644
--- a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240B94_BDF924.s
+++ b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240B94_BDF924.s
@@ -124,9 +124,9 @@ glabel func_80240B94_BDF924
 /* BDFAE8 80240D58 2C620064 */  sltiu     $v0, $v1, 0x64
 /* BDFAEC 80240D5C 10400042 */  beqz      $v0, .L80240E68
 /* BDFAF0 80240D60 00031080 */   sll      $v0, $v1, 2
-/* BDFAF4 80240D64 3C018024 */  lui       $at, 0x8024
+/* BDFAF4 80240D64 3C018024 */  lui       $at, %hi(D_80244870)
 /* BDFAF8 80240D68 00220821 */  addu      $at, $at, $v0
-/* BDFAFC 80240D6C 8C224870 */  lw        $v0, 0x4870($at)
+/* BDFAFC 80240D6C 8C224870 */  lw        $v0, %lo(D_80244870)($at)
 /* BDFB00 80240D70 00400008 */  jr        $v0
 /* BDFB04 80240D74 00000000 */   nop      
 /* BDFB08 80240D78 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_8024113C_BDFECC.s b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_8024113C_BDFECC.s
index 6c0502cec8..2bde777dee 100644
--- a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_8024113C_BDFECC.s
+++ b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_8024113C_BDFECC.s
@@ -54,9 +54,9 @@ glabel func_8024113C_BDFECC
 /* BDFF8C 802411FC 2C620005 */  sltiu     $v0, $v1, 5
 /* BDFF90 80241200 1040001E */  beqz      $v0, .L8024127C
 /* BDFF94 80241204 00031080 */   sll      $v0, $v1, 2
-/* BDFF98 80241208 3C018024 */  lui       $at, 0x8024
+/* BDFF98 80241208 3C018024 */  lui       $at, %hi(D_80244A00)
 /* BDFF9C 8024120C 00220821 */  addu      $at, $at, $v0
-/* BDFFA0 80241210 8C224A00 */  lw        $v0, 0x4a00($at)
+/* BDFFA0 80241210 8C224A00 */  lw        $v0, %lo(D_80244A00)($at)
 /* BDFFA4 80241214 00400008 */  jr        $v0
 /* BDFFA8 80241218 00000000 */   nop      
 /* BDFFAC 8024121C 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_802412B0_BE0040.s b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_802412B0_BE0040.s
index 2bad8cfa74..c16942ac58 100644
--- a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_802412B0_BE0040.s
+++ b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_802412B0_BE0040.s
@@ -4,8 +4,8 @@
 glabel func_802412B0_BE0040
 /* BE0040 802412B0 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* BE0044 802412B4 AFB00010 */  sw        $s0, 0x10($sp)
-/* BE0048 802412B8 3C108024 */  lui       $s0, 0x8024
-/* BE004C 802412BC 26101C68 */  addiu     $s0, $s0, 0x1c68
+/* BE0048 802412B8 3C108024 */  lui       $s0, %hi(D_80241C68)
+/* BE004C 802412BC 26101C68 */  addiu     $s0, $s0, %lo(D_80241C68)
 /* BE0050 802412C0 AFBF0018 */  sw        $ra, 0x18($sp)
 /* BE0054 802412C4 AFB10014 */  sw        $s1, 0x14($sp)
 /* BE0058 802412C8 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_802412B0_BE0040
 /* BE00BC 8024132C 28620010 */  slti      $v0, $v1, 0x10
 /* BE00C0 80241330 1440FFFA */  bnez      $v0, .L8024131C
 /* BE00C4 80241334 24840004 */   addiu    $a0, $a0, 4
-/* BE00C8 80241338 3C108024 */  lui       $s0, 0x8024
-/* BE00CC 8024133C 26101C68 */  addiu     $s0, $s0, 0x1c68
+/* BE00C8 80241338 3C108024 */  lui       $s0, %hi(D_80241C68)
+/* BE00CC 8024133C 26101C68 */  addiu     $s0, $s0, %lo(D_80241C68)
 /* BE00D0 80241340 0C00AB4B */  jal       heap_free
 /* BE00D4 80241344 8E040000 */   lw       $a0, ($s0)
 /* BE00D8 80241348 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_802415F4_BE0384.s b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_802415F4_BE0384.s
index d9c5671f2b..ebd49d32b9 100644
--- a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_802415F4_BE0384.s
+++ b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_802415F4_BE0384.s
@@ -6,11 +6,11 @@ glabel func_802415F4_BE0384
 /* BE0388 802415F8 AFBF0010 */  sw        $ra, 0x10($sp)
 /* BE038C 802415FC 10A00003 */  beqz      $a1, .L8024160C
 /* BE0390 80241600 8C86000C */   lw       $a2, 0xc($a0)
-/* BE0394 80241604 3C018024 */  lui       $at, 0x8024
-/* BE0398 80241608 AC201CCC */  sw        $zero, 0x1ccc($at)
+/* BE0394 80241604 3C018024 */  lui       $at, %hi(D_80241CCC)
+/* BE0398 80241608 AC201CCC */  sw        $zero, %lo(D_80241CCC)($at)
 .L8024160C:
-/* BE039C 8024160C 3C038024 */  lui       $v1, 0x8024
-/* BE03A0 80241610 24631CCC */  addiu     $v1, $v1, 0x1ccc
+/* BE039C 8024160C 3C038024 */  lui       $v1, %hi(D_80241CCC)
+/* BE03A0 80241610 24631CCC */  addiu     $v1, $v1, %lo(D_80241CCC)
 /* BE03A4 80241614 8C620000 */  lw        $v0, ($v1)
 /* BE03A8 80241618 54400003 */  bnel      $v0, $zero, .L80241628
 /* BE03AC 8024161C AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_802415F4_BE0384
 /* BE03B4 80241624 0000102D */   daddu    $v0, $zero, $zero
 .L80241628:
 /* BE03B8 80241628 8CC50000 */  lw        $a1, ($a2)
-/* BE03BC 8024162C 3C068024 */  lui       $a2, 0x8024
+/* BE03BC 8024162C 3C068024 */  lui       $a2, %hi(D_80241CD0)
 /* BE03C0 80241630 0C0B2026 */  jal       set_variable
-/* BE03C4 80241634 8CC61CD0 */   lw       $a2, 0x1cd0($a2)
+/* BE03C4 80241634 8CC61CD0 */   lw       $a2, %lo(D_80241CD0)($a2)
 /* BE03C8 80241638 24020002 */  addiu     $v0, $zero, 2
 .L8024163C:
 /* BE03CC 8024163C 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80241648_BE03D8.s b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80241648_BE03D8.s
index 7d7276e49f..c558da2041 100644
--- a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80241648_BE03D8.s
+++ b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80241648_BE03D8.s
@@ -7,12 +7,12 @@ glabel func_80241648_BE03D8
 /* BE03E0 80241650 8C82000C */  lw        $v0, 0xc($a0)
 /* BE03E4 80241654 0C0B1EAF */  jal       get_variable
 /* BE03E8 80241658 8C450000 */   lw       $a1, ($v0)
-/* BE03EC 8024165C 3C018024 */  lui       $at, 0x8024
-/* BE03F0 80241660 AC221CD0 */  sw        $v0, 0x1cd0($at)
+/* BE03EC 8024165C 3C018024 */  lui       $at, %hi(D_80241CD0)
+/* BE03F0 80241660 AC221CD0 */  sw        $v0, %lo(D_80241CD0)($at)
 /* BE03F4 80241664 24020002 */  addiu     $v0, $zero, 2
 /* BE03F8 80241668 8FBF0010 */  lw        $ra, 0x10($sp)
 /* BE03FC 8024166C 24030001 */  addiu     $v1, $zero, 1
-/* BE0400 80241670 3C018024 */  lui       $at, 0x8024
-/* BE0404 80241674 AC231CCC */  sw        $v1, 0x1ccc($at)
+/* BE0400 80241670 3C018024 */  lui       $at, %hi(D_80241CCC)
+/* BE0404 80241674 AC231CCC */  sw        $v1, %lo(D_80241CCC)($at)
 /* BE0408 80241678 03E00008 */  jr        $ra
 /* BE040C 8024167C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80241680_BE0410.s b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80241680_BE0410.s
index bc4568857d..8e5aa005d3 100644
--- a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80241680_BE0410.s
+++ b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80241680_BE0410.s
@@ -13,8 +13,8 @@ glabel func_80241680_BE0410
 /* BE0430 802416A0 8C620000 */  lw        $v0, ($v1)
 /* BE0434 802416A4 5040000A */  beql      $v0, $zero, .L802416D0
 /* BE0438 802416A8 00041080 */   sll      $v0, $a0, 2
-/* BE043C 802416AC 3C058024 */  lui       $a1, 0x8024
-/* BE0440 802416B0 24A54A20 */  addiu     $a1, $a1, 0x4a20
+/* BE043C 802416AC 3C058024 */  lui       $a1, %hi(D_80244A20)
+/* BE0440 802416B0 24A54A20 */  addiu     $a1, $a1, %lo(D_80244A20)
 .L802416B4:
 /* BE0444 802416B4 24630004 */  addiu     $v1, $v1, 4
 /* BE0448 802416B8 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_80241680_BE0410
 /* BE0458 802416C8 24A50004 */   addiu    $a1, $a1, 4
 /* BE045C 802416CC 00041080 */  sll       $v0, $a0, 2
 .L802416D0:
-/* BE0460 802416D0 3C018024 */  lui       $at, 0x8024
+/* BE0460 802416D0 3C018024 */  lui       $at, %hi(D_80244A20)
 /* BE0464 802416D4 00220821 */  addu      $at, $at, $v0
-/* BE0468 802416D8 AC204A20 */  sw        $zero, 0x4a20($at)
+/* BE0468 802416D8 AC204A20 */  sw        $zero, %lo(D_80244A20)($at)
 /* BE046C 802416DC 080905C3 */  j         .L8024170C
 /* BE0470 802416E0 00000000 */   nop      
 .L802416E4:
-/* BE0474 802416E4 3C038024 */  lui       $v1, 0x8024
-/* BE0478 802416E8 24634A20 */  addiu     $v1, $v1, 0x4a20
+/* BE0474 802416E4 3C038024 */  lui       $v1, %hi(D_80244A20)
+/* BE0478 802416E8 24634A20 */  addiu     $v1, $v1, %lo(D_80244A20)
 /* BE047C 802416EC 0060282D */  daddu     $a1, $v1, $zero
 .L802416F0:
 /* BE0480 802416F0 24820010 */  addiu     $v0, $a0, 0x10
diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240000_BE37B0.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240000_BE37B0.s
index a6b42fa542..d1caa8970d 100644
--- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240000_BE37B0.s
+++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240000_BE37B0.s
@@ -69,8 +69,8 @@ glabel func_80240000_BE37B0
 /* BE38A4 802400F4 08090047 */  j         .L8024011C
 /* BE38A8 802400F8 E6800018 */   swc1     $f0, 0x18($s4)
 .L802400FC:
-/* BE38AC 802400FC 3C018024 */  lui       $at, 0x8024
-/* BE38B0 80240100 D4224130 */  ldc1      $f2, 0x4130($at)
+/* BE38AC 802400FC 3C018024 */  lui       $at, %hi(D_80244130)
+/* BE38B0 80240100 D4224130 */  ldc1      $f2, %lo(D_80244130)($at)
 /* BE38B4 80240104 44820000 */  mtc1      $v0, $f0
 /* BE38B8 80240108 00000000 */  nop       
 /* BE38BC 8024010C 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024067C_BE3E2C.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024067C_BE3E2C.s
index 3ac7359e2c..c8bf70a545 100644
--- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024067C_BE3E2C.s
+++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024067C_BE3E2C.s
@@ -33,8 +33,8 @@ glabel func_8024067C_BE3E2C
 /* BE3E98 802406E8 080901C4 */  j         .L80240710
 /* BE3E9C 802406EC E4A00018 */   swc1     $f0, 0x18($a1)
 .L802406F0:
-/* BE3EA0 802406F0 3C018024 */  lui       $at, 0x8024
-/* BE3EA4 802406F4 D4224138 */  ldc1      $f2, 0x4138($at)
+/* BE3EA0 802406F0 3C018024 */  lui       $at, %hi(D_80244138)
+/* BE3EA4 802406F4 D4224138 */  ldc1      $f2, %lo(D_80244138)($at)
 /* BE3EA8 802406F8 44820000 */  mtc1      $v0, $f0
 /* BE3EAC 802406FC 00000000 */  nop       
 /* BE3EB0 80240700 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240B94_BE4344.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240B94_BE4344.s
index 0e6ec81db0..8faba6fc95 100644
--- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240B94_BE4344.s
+++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240B94_BE4344.s
@@ -124,9 +124,9 @@ glabel func_80240B94_BE4344
 /* BE4508 80240D58 2C620064 */  sltiu     $v0, $v1, 0x64
 /* BE450C 80240D5C 10400042 */  beqz      $v0, .L80240E68
 /* BE4510 80240D60 00031080 */   sll      $v0, $v1, 2
-/* BE4514 80240D64 3C018024 */  lui       $at, 0x8024
+/* BE4514 80240D64 3C018024 */  lui       $at, %hi(D_80244140)
 /* BE4518 80240D68 00220821 */  addu      $at, $at, $v0
-/* BE451C 80240D6C 8C224140 */  lw        $v0, 0x4140($at)
+/* BE451C 80240D6C 8C224140 */  lw        $v0, %lo(D_80244140)($at)
 /* BE4520 80240D70 00400008 */  jr        $v0
 /* BE4524 80240D74 00000000 */   nop      
 /* BE4528 80240D78 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240E90_BE4640.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240E90_BE4640.s
index 1a7054a081..9ecdd28c63 100644
--- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240E90_BE4640.s
+++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240E90_BE4640.s
@@ -87,8 +87,8 @@ glabel func_80240E90_BE4640
 /* BE4780 80240FD0 080903FE */  j         .L80240FF8
 /* BE4784 80240FD4 E6000018 */   swc1     $f0, 0x18($s0)
 .L80240FD8:
-/* BE4788 80240FD8 3C018024 */  lui       $at, 0x8024
-/* BE478C 80240FDC D42242D0 */  ldc1      $f2, 0x42d0($at)
+/* BE4788 80240FD8 3C018024 */  lui       $at, %hi(D_802442D0)
+/* BE478C 80240FDC D42242D0 */  ldc1      $f2, %lo(D_802442D0)($at)
 /* BE4790 80240FE0 44820000 */  mtc1      $v0, $f0
 /* BE4794 80240FE4 00000000 */  nop       
 /* BE4798 80240FE8 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80241040_BE47F0.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80241040_BE47F0.s
index 40041abec7..4257104756 100644
--- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80241040_BE47F0.s
+++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80241040_BE47F0.s
@@ -104,8 +104,8 @@ glabel func_80241040_BE47F0
 /* BE4974 802411C4 1040000A */  beqz      $v0, .L802411F0
 /* BE4978 802411C8 4600C106 */   mov.s    $f4, $f24
 /* BE497C 802411CC 4614C081 */  sub.s     $f2, $f24, $f20
-/* BE4980 802411D0 3C018024 */  lui       $at, 0x8024
-/* BE4984 802411D4 D42042D8 */  ldc1      $f0, 0x42d8($at)
+/* BE4980 802411D0 3C018024 */  lui       $at, %hi(D_802442D8)
+/* BE4984 802411D4 D42042D8 */  ldc1      $f0, %lo(D_802442D8)($at)
 /* BE4988 802411D8 460010A1 */  cvt.d.s   $f2, $f2
 /* BE498C 802411DC 46201082 */  mul.d     $f2, $f2, $f0
 /* BE4990 802411E0 00000000 */  nop       
@@ -131,8 +131,8 @@ glabel func_80241040_BE47F0
 /* BE49DC 8024122C C7A4002C */  lwc1      $f4, 0x2c($sp)
 /* BE49E0 80241230 461A2100 */  add.s     $f4, $f4, $f26
 /* BE49E4 80241234 46142081 */  sub.s     $f2, $f4, $f20
-/* BE49E8 80241238 3C018024 */  lui       $at, 0x8024
-/* BE49EC 8024123C D42042E0 */  ldc1      $f0, 0x42e0($at)
+/* BE49E8 80241238 3C018024 */  lui       $at, %hi(D_802442E0)
+/* BE49EC 8024123C D42042E0 */  ldc1      $f0, %lo(D_802442E0)($at)
 /* BE49F0 80241240 460010A1 */  cvt.d.s   $f2, $f2
 /* BE49F4 80241244 46201082 */  mul.d     $f2, $f2, $f0
 /* BE49F8 80241248 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80241AE4_BE5294.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80241AE4_BE5294.s
index 30ac9e2e57..a78660bc06 100644
--- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80241AE4_BE5294.s
+++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80241AE4_BE5294.s
@@ -15,9 +15,9 @@ glabel func_80241AE4_BE5294
 /* BE52BC 80241B0C 00031C00 */  sll       $v1, $v1, 0x10
 /* BE52C0 80241B10 00031B83 */  sra       $v1, $v1, 0xe
 /* BE52C4 80241B14 A444008E */  sh        $a0, 0x8e($v0)
-/* BE52C8 80241B18 3C018024 */  lui       $at, 0x8024
+/* BE52C8 80241B18 3C018024 */  lui       $at, %hi(D_802436DC)
 /* BE52CC 80241B1C 00230821 */  addu      $at, $at, $v1
-/* BE52D0 80241B20 C42236DC */  lwc1      $f2, 0x36dc($at)
+/* BE52D0 80241B20 C42236DC */  lwc1      $f2, %lo(D_802436DC)($at)
 /* BE52D4 80241B24 8443008E */  lh        $v1, 0x8e($v0)
 /* BE52D8 80241B28 46020000 */  add.s     $f0, $f0, $f2
 /* BE52DC 80241B2C 28630005 */  slti      $v1, $v1, 5
diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024219C_BE594C.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024219C_BE594C.s
index 596a05708a..61ab67cf40 100644
--- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024219C_BE594C.s
+++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024219C_BE594C.s
@@ -66,9 +66,9 @@ glabel func_8024219C_BE594C
 /* BE5A38 80242288 2C62000F */  sltiu     $v0, $v1, 0xf
 /* BE5A3C 8024228C 10400034 */  beqz      $v0, .L80242360
 /* BE5A40 80242290 00031080 */   sll      $v0, $v1, 2
-/* BE5A44 80242294 3C018024 */  lui       $at, 0x8024
+/* BE5A44 80242294 3C018024 */  lui       $at, %hi(D_802442E8)
 /* BE5A48 80242298 00220821 */  addu      $at, $at, $v0
-/* BE5A4C 8024229C 8C2242E8 */  lw        $v0, 0x42e8($at)
+/* BE5A4C 8024229C 8C2242E8 */  lw        $v0, %lo(D_802442E8)($at)
 /* BE5A50 802422A0 00400008 */  jr        $v0
 /* BE5A54 802422A4 00000000 */   nop      
 /* BE5A58 802422A8 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242388_BE5B38.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242388_BE5B38.s
index 250ee63511..6f17aeffd6 100644
--- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242388_BE5B38.s
+++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242388_BE5B38.s
@@ -20,8 +20,8 @@ glabel func_80242388_BE5B38
 /* BE5B74 802423C4 0040882D */  daddu     $s1, $v0, $zero
 /* BE5B78 802423C8 3C03800B */  lui       $v1, %hi(gCameras)
 /* BE5B7C 802423CC 24631D80 */  addiu     $v1, $v1, %lo(gCameras)
-/* BE5B80 802423D0 3C02800A */  lui       $v0, 0x800a
-/* BE5B84 802423D4 8442A634 */  lh        $v0, -0x59cc($v0)
+/* BE5B80 802423D0 3C02800A */  lui       $v0, %hi(D_8009A634)
+/* BE5B84 802423D4 8442A634 */  lh        $v0, %lo(D_8009A634)($v0)
 /* BE5B88 802423D8 0000282D */  daddu     $a1, $zero, $zero
 /* BE5B8C 802423DC 00028080 */  sll       $s0, $v0, 2
 /* BE5B90 802423E0 02028021 */  addu      $s0, $s0, $v0
@@ -38,8 +38,8 @@ glabel func_80242388_BE5B38
 /* BE5BBC 8024240C 0002802B */   sltu     $s0, $zero, $v0
 /* BE5BC0 80242410 0C00A6C9 */  jal       clamp_angle
 /* BE5BC4 80242414 46000306 */   mov.s    $f12, $f0
-/* BE5BC8 80242418 3C018024 */  lui       $at, 0x8024
-/* BE5BCC 8024241C D4224328 */  ldc1      $f2, 0x4328($at)
+/* BE5BC8 80242418 3C018024 */  lui       $at, %hi(D_80244328)
+/* BE5BCC 8024241C D4224328 */  ldc1      $f2, %lo(D_80244328)($at)
 /* BE5BD0 80242420 46000021 */  cvt.d.s   $f0, $f0
 /* BE5BD4 80242424 4622003C */  c.lt.d    $f0, $f2
 /* BE5BD8 80242428 00000000 */  nop       
@@ -60,8 +60,8 @@ glabel func_80242388_BE5B38
 /* BE5C10 80242460 0C00A70A */  jal       get_clamped_angle_diff
 /* BE5C14 80242464 46000386 */   mov.s    $f14, $f0
 /* BE5C18 80242468 46000005 */  abs.s     $f0, $f0
-/* BE5C1C 8024246C 3C018024 */  lui       $at, 0x8024
-/* BE5C20 80242470 D4224330 */  ldc1      $f2, 0x4330($at)
+/* BE5C1C 8024246C 3C018024 */  lui       $at, %hi(D_80244330)
+/* BE5C20 80242470 D4224330 */  ldc1      $f2, %lo(D_80244330)($at)
 /* BE5C24 80242474 46000021 */  cvt.d.s   $f0, $f0
 /* BE5C28 80242478 4620103C */  c.lt.d    $f2, $f0
 /* BE5C2C 8024247C 00000000 */  nop       
@@ -80,8 +80,8 @@ glabel func_80242388_BE5B38
 /* BE5C5C 802424AC 45030001 */  bc1tl     .L802424B4
 /* BE5C60 802424B0 0000802D */   daddu    $s0, $zero, $zero
 .L802424B4:
-/* BE5C64 802424B4 3C038011 */  lui       $v1, 0x8011
-/* BE5C68 802424B8 8063EBB3 */  lb        $v1, -0x144d($v1)
+/* BE5C64 802424B4 3C038011 */  lui       $v1, %hi(D_8010EBB3)
+/* BE5C68 802424B8 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
 /* BE5C6C 802424BC 24020009 */  addiu     $v0, $zero, 9
 /* BE5C70 802424C0 50620001 */  beql      $v1, $v0, .L802424C8
 /* BE5C74 802424C4 0000802D */   daddu    $s0, $zero, $zero
diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024255C_BE5D0C.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024255C_BE5D0C.s
index 1d03b9a96b..12f69e78c6 100644
--- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024255C_BE5D0C.s
+++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024255C_BE5D0C.s
@@ -21,8 +21,8 @@ glabel func_8024255C_BE5D0C
 /* BE5D4C 8024259C 8E420014 */  lw        $v0, 0x14($s2)
 /* BE5D50 802425A0 AE620074 */  sw        $v0, 0x74($s3)
 /* BE5D54 802425A4 C640000C */  lwc1      $f0, 0xc($s2)
-/* BE5D58 802425A8 3C018024 */  lui       $at, 0x8024
-/* BE5D5C 802425AC D4224338 */  ldc1      $f2, 0x4338($at)
+/* BE5D58 802425A8 3C018024 */  lui       $at, %hi(D_80244338)
+/* BE5D5C 802425AC D4224338 */  ldc1      $f2, %lo(D_80244338)($at)
 /* BE5D60 802425B0 46000021 */  cvt.d.s   $f0, $f0
 /* BE5D64 802425B4 46220002 */  mul.d     $f0, $f0, $f2
 /* BE5D68 802425B8 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242A1C_BE61CC.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242A1C_BE61CC.s
index 201384e368..7a9a540ae9 100644
--- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242A1C_BE61CC.s
+++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242A1C_BE61CC.s
@@ -83,8 +83,8 @@ glabel func_80242A1C_BE61CC
 /* BE6300 80242B50 8C470030 */   lw       $a3, 0x30($v0)
 /* BE6304 80242B54 C6020018 */  lwc1      $f2, 0x18($s0)
 /* BE6308 80242B58 46020003 */  div.s     $f0, $f0, $f2
-/* BE630C 80242B5C 3C018024 */  lui       $at, 0x8024
-/* BE6310 80242B60 D4224340 */  ldc1      $f2, 0x4340($at)
+/* BE630C 80242B5C 3C018024 */  lui       $at, %hi(D_80244340)
+/* BE6310 80242B60 D4224340 */  ldc1      $f2, %lo(D_80244340)($at)
 /* BE6314 80242B64 46000021 */  cvt.d.s   $f0, $f0
 /* BE6318 80242B68 46220000 */  add.d     $f0, $f0, $f2
 /* BE631C 80242B6C 4620010D */  trunc.w.d $f4, $f0
diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242D0C_BE64BC.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242D0C_BE64BC.s
index 758925d05d..7ce030dd89 100644
--- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242D0C_BE64BC.s
+++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242D0C_BE64BC.s
@@ -30,8 +30,8 @@ glabel func_80242D0C_BE64BC
 /* BE6520 80242D70 08090B66 */  j         .L80242D98
 /* BE6524 80242D74 E4600018 */   swc1     $f0, 0x18($v1)
 .L80242D78:
-/* BE6528 80242D78 3C018024 */  lui       $at, 0x8024
-/* BE652C 80242D7C D4224348 */  ldc1      $f2, 0x4348($at)
+/* BE6528 80242D78 3C018024 */  lui       $at, %hi(D_80244348)
+/* BE652C 80242D7C D4224348 */  ldc1      $f2, %lo(D_80244348)($at)
 /* BE6530 80242D80 44820000 */  mtc1      $v0, $f0
 /* BE6534 80242D84 00000000 */  nop       
 /* BE6538 80242D88 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80243018_BE67C8.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80243018_BE67C8.s
index ece2264f05..98e80f1a0a 100644
--- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80243018_BE67C8.s
+++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80243018_BE67C8.s
@@ -95,9 +95,9 @@ glabel func_80243018_BE67C8
 /* BE691C 8024316C 2C620035 */  sltiu     $v0, $v1, 0x35
 /* BE6920 80243170 10400073 */  beqz      $v0, .L80243340
 /* BE6924 80243174 00031080 */   sll      $v0, $v1, 2
-/* BE6928 80243178 3C018024 */  lui       $at, 0x8024
+/* BE6928 80243178 3C018024 */  lui       $at, %hi(D_80244350)
 /* BE692C 8024317C 00220821 */  addu      $at, $at, $v0
-/* BE6930 80243180 8C224350 */  lw        $v0, 0x4350($at)
+/* BE6930 80243180 8C224350 */  lw        $v0, %lo(D_80244350)($at)
 /* BE6934 80243184 00400008 */  jr        $v0
 /* BE6938 80243188 00000000 */   nop      
 /* BE693C 8024318C 0260202D */  daddu     $a0, $s3, $zero
diff --git a/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240000_BE7BE0.s b/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240000_BE7BE0.s
index f3161ecc51..4fb69c1885 100644
--- a/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240000_BE7BE0.s
+++ b/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240000_BE7BE0.s
@@ -69,8 +69,8 @@ glabel func_80240000_BE7BE0
 /* BE7CD4 802400F4 08090047 */  j         .L8024011C
 /* BE7CD8 802400F8 E6800018 */   swc1     $f0, 0x18($s4)
 .L802400FC:
-/* BE7CDC 802400FC 3C018024 */  lui       $at, 0x8024
-/* BE7CE0 80240100 D4225050 */  ldc1      $f2, 0x5050($at)
+/* BE7CDC 802400FC 3C018024 */  lui       $at, %hi(D_80245050)
+/* BE7CE0 80240100 D4225050 */  ldc1      $f2, %lo(D_80245050)($at)
 /* BE7CE4 80240104 44820000 */  mtc1      $v0, $f0
 /* BE7CE8 80240108 00000000 */  nop       
 /* BE7CEC 8024010C 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_8024067C_BE825C.s b/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_8024067C_BE825C.s
index dfb573a810..a10afcbeb6 100644
--- a/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_8024067C_BE825C.s
+++ b/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_8024067C_BE825C.s
@@ -33,8 +33,8 @@ glabel func_8024067C_BE825C
 /* BE82C8 802406E8 080901C4 */  j         .L80240710
 /* BE82CC 802406EC E4A00018 */   swc1     $f0, 0x18($a1)
 .L802406F0:
-/* BE82D0 802406F0 3C018024 */  lui       $at, 0x8024
-/* BE82D4 802406F4 D4225058 */  ldc1      $f2, 0x5058($at)
+/* BE82D0 802406F0 3C018024 */  lui       $at, %hi(D_80245058)
+/* BE82D4 802406F4 D4225058 */  ldc1      $f2, %lo(D_80245058)($at)
 /* BE82D8 802406F8 44820000 */  mtc1      $v0, $f0
 /* BE82DC 802406FC 00000000 */  nop       
 /* BE82E0 80240700 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240B94_BE8774.s b/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240B94_BE8774.s
index 67e0f9e0a3..2017187368 100644
--- a/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240B94_BE8774.s
+++ b/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240B94_BE8774.s
@@ -124,9 +124,9 @@ glabel func_80240B94_BE8774
 /* BE8938 80240D58 2C620064 */  sltiu     $v0, $v1, 0x64
 /* BE893C 80240D5C 10400042 */  beqz      $v0, .L80240E68
 /* BE8940 80240D60 00031080 */   sll      $v0, $v1, 2
-/* BE8944 80240D64 3C018024 */  lui       $at, 0x8024
+/* BE8944 80240D64 3C018024 */  lui       $at, %hi(D_80245060)
 /* BE8948 80240D68 00220821 */  addu      $at, $at, $v0
-/* BE894C 80240D6C 8C225060 */  lw        $v0, 0x5060($at)
+/* BE894C 80240D6C 8C225060 */  lw        $v0, %lo(D_80245060)($at)
 /* BE8950 80240D70 00400008 */  jr        $v0
 /* BE8954 80240D74 00000000 */   nop      
 /* BE8958 80240D78 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_8024113C_BE8D1C.s b/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_8024113C_BE8D1C.s
index bb5e24aa51..fdd3a21359 100644
--- a/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_8024113C_BE8D1C.s
+++ b/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_8024113C_BE8D1C.s
@@ -54,9 +54,9 @@ glabel func_8024113C_BE8D1C
 /* BE8DDC 802411FC 2C620005 */  sltiu     $v0, $v1, 5
 /* BE8DE0 80241200 1040001E */  beqz      $v0, .L8024127C
 /* BE8DE4 80241204 00031080 */   sll      $v0, $v1, 2
-/* BE8DE8 80241208 3C018024 */  lui       $at, 0x8024
+/* BE8DE8 80241208 3C018024 */  lui       $at, %hi(D_802451F0)
 /* BE8DEC 8024120C 00220821 */  addu      $at, $at, $v0
-/* BE8DF0 80241210 8C2251F0 */  lw        $v0, 0x51f0($at)
+/* BE8DF0 80241210 8C2251F0 */  lw        $v0, %lo(D_802451F0)($at)
 /* BE8DF4 80241214 00400008 */  jr        $v0
 /* BE8DF8 80241218 00000000 */   nop      
 /* BE8DFC 8024121C 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_arn/arn_07/BECDF0/func_802401AC_BECF9C.s b/asm/nonmatchings/world/area_arn/arn_07/BECDF0/func_802401AC_BECF9C.s
index 9cf1c4fb9c..4dc0e99c7a 100644
--- a/asm/nonmatchings/world/area_arn/arn_07/BECDF0/func_802401AC_BECF9C.s
+++ b/asm/nonmatchings/world/area_arn/arn_07/BECDF0/func_802401AC_BECF9C.s
@@ -13,9 +13,9 @@ glabel func_802401AC_BECF9C
 /* BECFBC 802401CC 2C620005 */  sltiu     $v0, $v1, 5
 /* BECFC0 802401D0 1040008A */  beqz      $v0, .L802403FC
 /* BECFC4 802401D4 00031080 */   sll      $v0, $v1, 2
-/* BECFC8 802401D8 3C018024 */  lui       $at, 0x8024
+/* BECFC8 802401D8 3C018024 */  lui       $at, %hi(D_80247900)
 /* BECFCC 802401DC 00220821 */  addu      $at, $at, $v0
-/* BECFD0 802401E0 8C227900 */  lw        $v0, 0x7900($at)
+/* BECFD0 802401E0 8C227900 */  lw        $v0, %lo(D_80247900)($at)
 /* BECFD4 802401E4 00400008 */  jr        $v0
 /* BECFD8 802401E8 00000000 */   nop      
 /* BECFDC 802401EC 8E22003C */  lw        $v0, 0x3c($s1)
diff --git a/asm/nonmatchings/world/area_arn/arn_07/BED5F0/func_80240800_BED5F0.s b/asm/nonmatchings/world/area_arn/arn_07/BED5F0/func_80240800_BED5F0.s
index 4983e96ce6..db7c71ce41 100644
--- a/asm/nonmatchings/world/area_arn/arn_07/BED5F0/func_80240800_BED5F0.s
+++ b/asm/nonmatchings/world/area_arn/arn_07/BED5F0/func_80240800_BED5F0.s
@@ -10,8 +10,8 @@ glabel func_80240800_BED5F0
 /* BED604 80240814 0C0B210B */  jal       get_float_variable
 /* BED608 80240818 34A53C80 */   ori      $a1, $a1, 0x3c80
 /* BED60C 8024081C 46000086 */  mov.s     $f2, $f0
-/* BED610 80240820 3C018024 */  lui       $at, 0x8024
-/* BED614 80240824 D4247940 */  ldc1      $f4, 0x7940($at)
+/* BED610 80240820 3C018024 */  lui       $at, %hi(D_80247940)
+/* BED614 80240824 D4247940 */  ldc1      $f4, %lo(D_80247940)($at)
 /* BED618 80240828 46001021 */  cvt.d.s   $f0, $f2
 /* BED61C 8024082C 4620203E */  c.le.d    $f4, $f0
 /* BED620 80240830 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80240950_BED740.s b/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80240950_BED740.s
index 301db5d436..2fb9e2d31d 100644
--- a/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80240950_BED740.s
+++ b/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80240950_BED740.s
@@ -87,8 +87,8 @@ glabel func_80240950_BED740
 /* BED880 80240A90 080902AE */  j         .L80240AB8
 /* BED884 80240A94 E6000018 */   swc1     $f0, 0x18($s0)
 .L80240A98:
-/* BED888 80240A98 3C018024 */  lui       $at, 0x8024
-/* BED88C 80240A9C D4227950 */  ldc1      $f2, 0x7950($at)
+/* BED888 80240A98 3C018024 */  lui       $at, %hi(D_80247950)
+/* BED88C 80240A9C D4227950 */  ldc1      $f2, %lo(D_80247950)($at)
 /* BED890 80240AA0 44820000 */  mtc1      $v0, $f0
 /* BED894 80240AA4 00000000 */  nop       
 /* BED898 80240AA8 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80240B00_BED8F0.s b/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80240B00_BED8F0.s
index 97fd3b2b29..418f8efd7a 100644
--- a/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80240B00_BED8F0.s
+++ b/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80240B00_BED8F0.s
@@ -104,8 +104,8 @@ glabel func_80240B00_BED8F0
 /* BEDA74 80240C84 1040000A */  beqz      $v0, .L80240CB0
 /* BEDA78 80240C88 4600C106 */   mov.s    $f4, $f24
 /* BEDA7C 80240C8C 4614C081 */  sub.s     $f2, $f24, $f20
-/* BEDA80 80240C90 3C018024 */  lui       $at, 0x8024
-/* BEDA84 80240C94 D4207958 */  ldc1      $f0, 0x7958($at)
+/* BEDA80 80240C90 3C018024 */  lui       $at, %hi(D_80247958)
+/* BEDA84 80240C94 D4207958 */  ldc1      $f0, %lo(D_80247958)($at)
 /* BEDA88 80240C98 460010A1 */  cvt.d.s   $f2, $f2
 /* BEDA8C 80240C9C 46201082 */  mul.d     $f2, $f2, $f0
 /* BEDA90 80240CA0 00000000 */  nop       
@@ -131,8 +131,8 @@ glabel func_80240B00_BED8F0
 /* BEDADC 80240CEC C7A4002C */  lwc1      $f4, 0x2c($sp)
 /* BEDAE0 80240CF0 461A2100 */  add.s     $f4, $f4, $f26
 /* BEDAE4 80240CF4 46142081 */  sub.s     $f2, $f4, $f20
-/* BEDAE8 80240CF8 3C018024 */  lui       $at, 0x8024
-/* BEDAEC 80240CFC D4207960 */  ldc1      $f0, 0x7960($at)
+/* BEDAE8 80240CF8 3C018024 */  lui       $at, %hi(D_80247960)
+/* BEDAEC 80240CFC D4207960 */  ldc1      $f0, %lo(D_80247960)($at)
 /* BEDAF0 80240D00 460010A1 */  cvt.d.s   $f2, $f2
 /* BEDAF4 80240D04 46201082 */  mul.d     $f2, $f2, $f0
 /* BEDAF8 80240D08 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_arn/arn_07/BED740/func_802415A4_BEE394.s b/asm/nonmatchings/world/area_arn/arn_07/BED740/func_802415A4_BEE394.s
index 481e385765..e3b3b794f5 100644
--- a/asm/nonmatchings/world/area_arn/arn_07/BED740/func_802415A4_BEE394.s
+++ b/asm/nonmatchings/world/area_arn/arn_07/BED740/func_802415A4_BEE394.s
@@ -15,9 +15,9 @@ glabel func_802415A4_BEE394
 /* BEE3BC 802415CC 00031C00 */  sll       $v1, $v1, 0x10
 /* BEE3C0 802415D0 00031B83 */  sra       $v1, $v1, 0xe
 /* BEE3C4 802415D4 A444008E */  sh        $a0, 0x8e($v0)
-/* BEE3C8 802415D8 3C018024 */  lui       $at, 0x8024
+/* BEE3C8 802415D8 3C018024 */  lui       $at, %hi(D_80243BC0)
 /* BEE3CC 802415DC 00230821 */  addu      $at, $at, $v1
-/* BEE3D0 802415E0 C4223BC0 */  lwc1      $f2, 0x3bc0($at)
+/* BEE3D0 802415E0 C4223BC0 */  lwc1      $f2, %lo(D_80243BC0)($at)
 /* BEE3D4 802415E4 8443008E */  lh        $v1, 0x8e($v0)
 /* BEE3D8 802415E8 46020000 */  add.s     $f0, $f0, $f2
 /* BEE3DC 802415EC 28630005 */  slti      $v1, $v1, 5
diff --git a/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241C5C_BEEA4C.s b/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241C5C_BEEA4C.s
index 7368a0f8b2..324a29a371 100644
--- a/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241C5C_BEEA4C.s
+++ b/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241C5C_BEEA4C.s
@@ -66,9 +66,9 @@ glabel func_80241C5C_BEEA4C
 /* BEEB38 80241D48 2C62000F */  sltiu     $v0, $v1, 0xf
 /* BEEB3C 80241D4C 10400034 */  beqz      $v0, .L80241E20
 /* BEEB40 80241D50 00031080 */   sll      $v0, $v1, 2
-/* BEEB44 80241D54 3C018024 */  lui       $at, 0x8024
+/* BEEB44 80241D54 3C018024 */  lui       $at, %hi(D_80247968)
 /* BEEB48 80241D58 00220821 */  addu      $at, $at, $v0
-/* BEEB4C 80241D5C 8C227968 */  lw        $v0, 0x7968($at)
+/* BEEB4C 80241D5C 8C227968 */  lw        $v0, %lo(D_80247968)($at)
 /* BEEB50 80241D60 00400008 */  jr        $v0
 /* BEEB54 80241D64 00000000 */   nop      
 /* BEEB58 80241D68 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_arn/arn_08/BF4860/func_8024019C_BF493C.s b/asm/nonmatchings/world/area_arn/arn_08/BF4860/func_8024019C_BF493C.s
index a0a992e650..8356516cd2 100644
--- a/asm/nonmatchings/world/area_arn/arn_08/BF4860/func_8024019C_BF493C.s
+++ b/asm/nonmatchings/world/area_arn/arn_08/BF4860/func_8024019C_BF493C.s
@@ -3,8 +3,8 @@
 
 glabel func_8024019C_BF493C
 /* BF493C 8024019C 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* BF4940 802401A0 3C048024 */  lui       $a0, 0x8024
-/* BF4944 802401A4 24841188 */  addiu     $a0, $a0, 0x1188
+/* BF4940 802401A0 3C048024 */  lui       $a0, %hi(D_80241188)
+/* BF4944 802401A4 24841188 */  addiu     $a0, $a0, %lo(D_80241188)
 /* BF4948 802401A8 AFBF0018 */  sw        $ra, 0x18($sp)
 /* BF494C 802401AC AFB10014 */  sw        $s1, 0x14($sp)
 /* BF4950 802401B0 AFB00010 */  sw        $s0, 0x10($sp)
@@ -34,8 +34,8 @@ glabel func_8024019C_BF493C
 /* BF49A4 80240204 0809009C */  j         .L80240270
 /* BF49A8 80240208 AC820000 */   sw       $v0, ($a0)
 .L8024020C:
-/* BF49AC 8024020C 3C108011 */  lui       $s0, 0x8011
-/* BF49B0 80240210 2610C930 */  addiu     $s0, $s0, -0x36d0
+/* BF49AC 8024020C 3C108011 */  lui       $s0, %hi(D_8010C930)
+/* BF49B0 80240210 2610C930 */  addiu     $s0, $s0, %lo(D_8010C930)
 /* BF49B4 80240214 0C03BD17 */  jal       clear_partner_move_history
 /* BF49B8 80240218 8E040000 */   lw       $a0, ($s0)
 /* BF49BC 8024021C C6200028 */  lwc1      $f0, 0x28($s1)
diff --git a/asm/nonmatchings/world/area_dgb/dgb_00/BFA0A0/func_80240000_BFA0A0.s b/asm/nonmatchings/world/area_dgb/dgb_00/BFA0A0/func_80240000_BFA0A0.s
index a73a366141..c2cb77dcd8 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_00/BFA0A0/func_80240000_BFA0A0.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_00/BFA0A0/func_80240000_BFA0A0.s
@@ -3,23 +3,23 @@
 
 glabel func_80240000_BFA0A0
 /* BFA0A0 80240000 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* BFA0A4 80240004 3C04800E */  lui       $a0, 0x800e
-/* BFA0A8 80240008 24849230 */  addiu     $a0, $a0, -0x6dd0
-/* BFA0AC 8024000C 3C058024 */  lui       $a1, 0x8024
-/* BFA0B0 80240010 24A537A0 */  addiu     $a1, $a1, 0x37a0
+/* BFA0A4 80240004 3C04800E */  lui       $a0, %hi(D_800D9230)
+/* BFA0A8 80240008 24849230 */  addiu     $a0, $a0, %lo(D_800D9230)
+/* BFA0AC 8024000C 3C058024 */  lui       $a1, %hi(D_802437A0)
+/* BFA0B0 80240010 24A537A0 */  addiu     $a1, $a1, %lo(D_802437A0)
 /* BFA0B4 80240014 AFBF0010 */  sw        $ra, 0x10($sp)
 /* BFA0B8 80240018 0C01953C */  jal       sprintf
 /* BFA0BC 8024001C 00000000 */   nop      
-/* BFA0C0 80240020 3C04800E */  lui       $a0, 0x800e
-/* BFA0C4 80240024 248491E0 */  addiu     $a0, $a0, -0x6e20
-/* BFA0C8 80240028 3C058024 */  lui       $a1, 0x8024
+/* BFA0C0 80240020 3C04800E */  lui       $a0, %hi(D_800D91E0)
+/* BFA0C4 80240024 248491E0 */  addiu     $a0, $a0, %lo(D_800D91E0)
+/* BFA0C8 80240028 3C058024 */  lui       $a1, %hi(D_802437B0)
 /* BFA0CC 8024002C 0C01953C */  jal       sprintf
-/* BFA0D0 80240030 24A537B0 */   addiu    $a1, $a1, 0x37b0
-/* BFA0D4 80240034 3C04800B */  lui       $a0, 0x800b
-/* BFA0D8 80240038 24840CF0 */  addiu     $a0, $a0, 0xcf0
-/* BFA0DC 8024003C 3C058024 */  lui       $a1, 0x8024
+/* BFA0D0 80240030 24A537B0 */   addiu    $a1, $a1, %lo(D_802437B0)
+/* BFA0D4 80240034 3C04800B */  lui       $a0, %hi(D_800B0CF0)
+/* BFA0D8 80240038 24840CF0 */  addiu     $a0, $a0, %lo(D_800B0CF0)
+/* BFA0DC 8024003C 3C058024 */  lui       $a1, %hi(D_802437BC)
 /* BFA0E0 80240040 0C01953C */  jal       sprintf
-/* BFA0E4 80240044 24A537BC */   addiu    $a1, $a1, 0x37bc
+/* BFA0E4 80240044 24A537BC */   addiu    $a1, $a1, %lo(D_802437BC)
 /* BFA0E8 80240048 8FBF0010 */  lw        $ra, 0x10($sp)
 /* BFA0EC 8024004C 0000102D */  daddu     $v0, $zero, $zero
 /* BFA0F0 80240050 03E00008 */  jr        $ra
diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80240120_BFD9A0.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80240120_BFD9A0.s
index cbf9cbf7f9..c78ba1b267 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80240120_BFD9A0.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80240120_BFD9A0.s
@@ -87,8 +87,8 @@ glabel func_80240120_BFD9A0
 /* BFDAE0 80240260 080900A2 */  j         .L80240288
 /* BFDAE4 80240264 E6000018 */   swc1     $f0, 0x18($s0)
 .L80240268:
-/* BFDAE8 80240268 3C018026 */  lui       $at, 0x8026
-/* BFDAEC 8024026C D4223420 */  ldc1      $f2, 0x3420($at)
+/* BFDAE8 80240268 3C018026 */  lui       $at, %hi(D_80263420)
+/* BFDAEC 8024026C D4223420 */  ldc1      $f2, %lo(D_80263420)($at)
 /* BFDAF0 80240270 44820000 */  mtc1      $v0, $f0
 /* BFDAF4 80240274 00000000 */  nop       
 /* BFDAF8 80240278 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802402D0_BFDB50.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802402D0_BFDB50.s
index 67ac53345f..54dd5dfedd 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802402D0_BFDB50.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802402D0_BFDB50.s
@@ -104,8 +104,8 @@ glabel func_802402D0_BFDB50
 /* BFDCD4 80240454 1040000A */  beqz      $v0, .L80240480
 /* BFDCD8 80240458 4600C106 */   mov.s    $f4, $f24
 /* BFDCDC 8024045C 4614C081 */  sub.s     $f2, $f24, $f20
-/* BFDCE0 80240460 3C018026 */  lui       $at, 0x8026
-/* BFDCE4 80240464 D4203428 */  ldc1      $f0, 0x3428($at)
+/* BFDCE0 80240460 3C018026 */  lui       $at, %hi(D_80263428)
+/* BFDCE4 80240464 D4203428 */  ldc1      $f0, %lo(D_80263428)($at)
 /* BFDCE8 80240468 460010A1 */  cvt.d.s   $f2, $f2
 /* BFDCEC 8024046C 46201082 */  mul.d     $f2, $f2, $f0
 /* BFDCF0 80240470 00000000 */  nop       
@@ -131,8 +131,8 @@ glabel func_802402D0_BFDB50
 /* BFDD3C 802404BC C7A4002C */  lwc1      $f4, 0x2c($sp)
 /* BFDD40 802404C0 461A2100 */  add.s     $f4, $f4, $f26
 /* BFDD44 802404C4 46142081 */  sub.s     $f2, $f4, $f20
-/* BFDD48 802404C8 3C018026 */  lui       $at, 0x8026
-/* BFDD4C 802404CC D4203430 */  ldc1      $f0, 0x3430($at)
+/* BFDD48 802404C8 3C018026 */  lui       $at, %hi(D_80263430)
+/* BFDD4C 802404CC D4203430 */  ldc1      $f0, %lo(D_80263430)($at)
 /* BFDD50 802404D0 460010A1 */  cvt.d.s   $f2, $f2
 /* BFDD54 802404D4 46201082 */  mul.d     $f2, $f2, $f0
 /* BFDD58 802404D8 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80240D74_BFE5F4.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80240D74_BFE5F4.s
index 13a39916eb..3d99853cbb 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80240D74_BFE5F4.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80240D74_BFE5F4.s
@@ -15,9 +15,9 @@ glabel func_80240D74_BFE5F4
 /* BFE61C 80240D9C 00031C00 */  sll       $v1, $v1, 0x10
 /* BFE620 80240DA0 00031B83 */  sra       $v1, $v1, 0xe
 /* BFE624 80240DA4 A444008E */  sh        $a0, 0x8e($v0)
-/* BFE628 80240DA8 3C018024 */  lui       $at, 0x8024
+/* BFE628 80240DA8 3C018024 */  lui       $at, %hi(D_80244CD0)
 /* BFE62C 80240DAC 00230821 */  addu      $at, $at, $v1
-/* BFE630 80240DB0 C4224CD0 */  lwc1      $f2, 0x4cd0($at)
+/* BFE630 80240DB0 C4224CD0 */  lwc1      $f2, %lo(D_80244CD0)($at)
 /* BFE634 80240DB4 8443008E */  lh        $v1, 0x8e($v0)
 /* BFE638 80240DB8 46020000 */  add.s     $f0, $f0, $f2
 /* BFE63C 80240DBC 28630005 */  slti      $v1, $v1, 5
diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024142C_BFECAC.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024142C_BFECAC.s
index bb1ea83b94..d99cbd31b0 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024142C_BFECAC.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024142C_BFECAC.s
@@ -66,9 +66,9 @@ glabel func_8024142C_BFECAC
 /* BFED98 80241518 2C62000F */  sltiu     $v0, $v1, 0xf
 /* BFED9C 8024151C 10400034 */  beqz      $v0, .L802415F0
 /* BFEDA0 80241520 00031080 */   sll      $v0, $v1, 2
-/* BFEDA4 80241524 3C018026 */  lui       $at, 0x8026
+/* BFEDA4 80241524 3C018026 */  lui       $at, %hi(D_80263438)
 /* BFEDA8 80241528 00220821 */  addu      $at, $at, $v0
-/* BFEDAC 8024152C 8C223438 */  lw        $v0, 0x3438($at)
+/* BFEDAC 8024152C 8C223438 */  lw        $v0, %lo(D_80263438)($at)
 /* BFEDB0 80241530 00400008 */  jr        $v0
 /* BFEDB4 80241534 00000000 */   nop      
 /* BFEDB8 80241538 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241954_BFF1D4.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241954_BFF1D4.s
index 01af8709b6..4a161afb8f 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241954_BFF1D4.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241954_BFF1D4.s
@@ -57,8 +57,8 @@ glabel func_80241954_BFF1D4
 /* BFF2A0 80241A20 E6420038 */  swc1      $f2, 0x38($s2)
 /* BFF2A4 80241A24 C4420030 */  lwc1      $f2, 0x30($v0)
 /* BFF2A8 80241A28 46001080 */  add.s     $f2, $f2, $f0
-/* BFF2AC 80241A2C 3C018026 */  lui       $at, 0x8026
-/* BFF2B0 80241A30 D4263478 */  ldc1      $f6, 0x3478($at)
+/* BFF2AC 80241A2C 3C018026 */  lui       $at, %hi(D_80263478)
+/* BFF2B0 80241A30 D4263478 */  ldc1      $f6, %lo(D_80263478)($at)
 /* BFF2B4 80241A34 46002021 */  cvt.d.s   $f0, $f4
 /* BFF2B8 80241A38 4620303C */  c.lt.d    $f6, $f0
 /* BFF2BC 80241A3C E6440048 */  swc1      $f4, 0x48($s2)
@@ -137,8 +137,8 @@ glabel func_80241954_BFF1D4
 /* BFF3DC 80241B5C 00000000 */  nop       
 /* BFF3E0 80241B60 45000008 */  bc1f      .L80241B84
 /* BFF3E4 80241B64 3C03FFDF */   lui      $v1, 0xffdf
-/* BFF3E8 80241B68 3C018026 */  lui       $at, 0x8026
-/* BFF3EC 80241B6C D4223480 */  ldc1      $f2, 0x3480($at)
+/* BFF3E8 80241B68 3C018026 */  lui       $at, %hi(D_80263480)
+/* BFF3EC 80241B6C D4223480 */  ldc1      $f2, %lo(D_80263480)($at)
 /* BFF3F0 80241B70 46002021 */  cvt.d.s   $f0, $f4
 /* BFF3F4 80241B74 46220001 */  sub.d     $f0, $f0, $f2
 /* BFF3F8 80241B78 46200020 */  cvt.s.d   $f0, $f0
@@ -150,8 +150,8 @@ glabel func_80241954_BFF1D4
 /* BFF40C 80241B8C AE400048 */  sw        $zero, 0x48($s2)
 /* BFF410 80241B90 00431024 */  and       $v0, $v0, $v1
 /* BFF414 80241B94 AE420000 */  sw        $v0, ($s2)
-/* BFF418 80241B98 3C038011 */  lui       $v1, 0x8011
-/* BFF41C 80241B9C 8063EBB3 */  lb        $v1, -0x144d($v1)
+/* BFF418 80241B98 3C038011 */  lui       $v1, %hi(D_8010EBB3)
+/* BFF41C 80241B9C 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
 /* BFF420 80241BA0 24020009 */  addiu     $v0, $zero, 9
 /* BFF424 80241BA4 10620009 */  beq       $v1, $v0, .L80241BCC
 /* BFF428 80241BA8 24020010 */   addiu    $v0, $zero, 0x10
diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241E70_BFF6F0.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241E70_BFF6F0.s
index c486c2754b..b2967de2f4 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241E70_BFF6F0.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241E70_BFF6F0.s
@@ -18,8 +18,8 @@ glabel func_80241E70_BFF6F0
 /* BFF724 80241EA4 28420003 */  slti      $v0, $v0, 3
 /* BFF728 80241EA8 1440000D */  bnez      $v0, .L80241EE0
 /* BFF72C 80241EAC 24020009 */   addiu    $v0, $zero, 9
-/* BFF730 80241EB0 3C038011 */  lui       $v1, 0x8011
-/* BFF734 80241EB4 8063EBB3 */  lb        $v1, -0x144d($v1)
+/* BFF730 80241EB0 3C038011 */  lui       $v1, %hi(D_8010EBB3)
+/* BFF734 80241EB4 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
 /* BFF738 80241EB8 10620003 */  beq       $v1, $v0, .L80241EC8
 /* BFF73C 80241EBC 24020064 */   addiu    $v0, $zero, 0x64
 /* BFF740 80241EC0 080907B7 */  j         .L80241EDC
diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802422B0_BFFB30.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802422B0_BFFB30.s
index beaa9dfad7..aaec185df0 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802422B0_BFFB30.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802422B0_BFFB30.s
@@ -54,9 +54,9 @@ glabel func_802422B0_BFFB30
 /* BFFBF0 80242370 2C620020 */  sltiu     $v0, $v1, 0x20
 /* BFFBF4 80242374 10400060 */  beqz      $v0, .L802424F8
 /* BFFBF8 80242378 00031080 */   sll      $v0, $v1, 2
-/* BFFBFC 8024237C 3C018026 */  lui       $at, 0x8026
+/* BFFBFC 8024237C 3C018026 */  lui       $at, %hi(D_80263488)
 /* BFFC00 80242380 00220821 */  addu      $at, $at, $v0
-/* BFFC04 80242384 8C223488 */  lw        $v0, 0x3488($at)
+/* BFFC04 80242384 8C223488 */  lw        $v0, %lo(D_80263488)($at)
 /* BFFC08 80242388 00400008 */  jr        $v0
 /* BFFC0C 8024238C 00000000 */   nop      
 /* BFFC10 80242390 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024252C_BFFDAC.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024252C_BFFDAC.s
index 8407852a24..098e285b19 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024252C_BFFDAC.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024252C_BFFDAC.s
@@ -69,8 +69,8 @@ glabel func_8024252C_BFFDAC
 /* BFFEA0 80242620 08090992 */  j         .L80242648
 /* BFFEA4 80242624 E6800018 */   swc1     $f0, 0x18($s4)
 .L80242628:
-/* BFFEA8 80242628 3C018026 */  lui       $at, 0x8026
-/* BFFEAC 8024262C D4223510 */  ldc1      $f2, 0x3510($at)
+/* BFFEA8 80242628 3C018026 */  lui       $at, %hi(D_80263510)
+/* BFFEAC 8024262C D4223510 */  ldc1      $f2, %lo(D_80263510)($at)
 /* BFFEB0 80242630 44820000 */  mtc1      $v0, $f0
 /* BFFEB4 80242634 00000000 */  nop       
 /* BFFEB8 80242638 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242BA8_C00428.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242BA8_C00428.s
index 13c6335571..80a736377e 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242BA8_C00428.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242BA8_C00428.s
@@ -33,8 +33,8 @@ glabel func_80242BA8_C00428
 /* C00494 80242C14 08090B0F */  j         .L80242C3C
 /* C00498 80242C18 E4A00018 */   swc1     $f0, 0x18($a1)
 .L80242C1C:
-/* C0049C 80242C1C 3C018026 */  lui       $at, 0x8026
-/* C004A0 80242C20 D4223518 */  ldc1      $f2, 0x3518($at)
+/* C0049C 80242C1C 3C018026 */  lui       $at, %hi(D_80263518)
+/* C004A0 80242C20 D4223518 */  ldc1      $f2, %lo(D_80263518)($at)
 /* C004A4 80242C24 44820000 */  mtc1      $v0, $f0
 /* C004A8 80242C28 00000000 */  nop       
 /* C004AC 80242C2C 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802430C0_C00940.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802430C0_C00940.s
index 56188ecfed..937b01350d 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802430C0_C00940.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802430C0_C00940.s
@@ -124,9 +124,9 @@ glabel func_802430C0_C00940
 /* C00B04 80243284 2C620064 */  sltiu     $v0, $v1, 0x64
 /* C00B08 80243288 10400042 */  beqz      $v0, .L80243394
 /* C00B0C 8024328C 00031080 */   sll      $v0, $v1, 2
-/* C00B10 80243290 3C018026 */  lui       $at, 0x8026
+/* C00B10 80243290 3C018026 */  lui       $at, %hi(D_80263520)
 /* C00B14 80243294 00220821 */  addu      $at, $at, $v0
-/* C00B18 80243298 8C223520 */  lw        $v0, 0x3520($at)
+/* C00B18 80243298 8C223520 */  lw        $v0, %lo(D_80263520)($at)
 /* C00B1C 8024329C 00400008 */  jr        $v0
 /* C00B20 802432A0 00000000 */   nop      
 /* C00B24 802432A4 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240208_C2EDA8.s b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240208_C2EDA8.s
index c9f5bef4fc..6de7d44b55 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240208_C2EDA8.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240208_C2EDA8.s
@@ -18,8 +18,8 @@ glabel func_80240208_C2EDA8
 /* C2EDDC 8024023C 0040802D */  daddu     $s0, $v0, $zero
 /* C2EDE0 80240240 3C05800B */  lui       $a1, %hi(gCameras)
 /* C2EDE4 80240244 24A51D80 */  addiu     $a1, $a1, %lo(gCameras)
-/* C2EDE8 80240248 3C03800A */  lui       $v1, 0x800a
-/* C2EDEC 8024024C 8463A634 */  lh        $v1, -0x59cc($v1)
+/* C2EDE8 80240248 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* C2EDEC 8024024C 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* C2EDF0 80240250 00912021 */  addu      $a0, $a0, $s1
 /* C2EDF4 80240254 00031080 */  sll       $v0, $v1, 2
 /* C2EDF8 80240258 00431021 */  addu      $v0, $v0, $v1
@@ -54,8 +54,8 @@ glabel func_80240208_C2EDA8
 /* C2EE68 802402C8 00000000 */   nop      
 /* C2EE6C 802402CC 0C00A6C9 */  jal       clamp_angle
 /* C2EE70 802402D0 46000306 */   mov.s    $f12, $f0
-/* C2EE74 802402D4 3C018024 */  lui       $at, 0x8024
-/* C2EE78 802402D8 D4222610 */  ldc1      $f2, 0x2610($at)
+/* C2EE74 802402D4 3C018024 */  lui       $at, %hi(D_80242610)
+/* C2EE78 802402D8 D4222610 */  ldc1      $f2, %lo(D_80242610)($at)
 /* C2EE7C 802402DC 46000021 */  cvt.d.s   $f0, $f0
 /* C2EE80 802402E0 4622003C */  c.lt.d    $f0, $f2
 /* C2EE84 802402E4 00000000 */  nop       
@@ -97,8 +97,8 @@ glabel func_80240208_C2EDA8
 /* C2EF0C 8024036C 45030001 */  bc1tl     .L80240374
 /* C2EF10 80240370 0000882D */   daddu    $s1, $zero, $zero
 .L80240374:
-/* C2EF14 80240374 3C038011 */  lui       $v1, 0x8011
-/* C2EF18 80240378 8063EBB3 */  lb        $v1, -0x144d($v1)
+/* C2EF14 80240374 3C038011 */  lui       $v1, %hi(D_8010EBB3)
+/* C2EF18 80240378 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
 /* C2EF1C 8024037C 24020009 */  addiu     $v0, $zero, 9
 /* C2EF20 80240380 50620001 */  beql      $v1, $v0, .L80240388
 /* C2EF24 80240384 0000882D */   daddu    $s1, $zero, $zero
diff --git a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_8024061C_C2F1BC.s b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_8024061C_C2F1BC.s
index bc27248672..8786df0b1b 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_8024061C_C2F1BC.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_8024061C_C2F1BC.s
@@ -100,9 +100,9 @@ glabel func_8024061C_C2F1BC
 /* C2F320 80240780 2C620064 */  sltiu     $v0, $v1, 0x64
 /* C2F324 80240784 10400048 */  beqz      $v0, .L802408A8
 /* C2F328 80240788 00031080 */   sll      $v0, $v1, 2
-/* C2F32C 8024078C 3C018024 */  lui       $at, 0x8024
+/* C2F32C 8024078C 3C018024 */  lui       $at, %hi(D_80242618)
 /* C2F330 80240790 00220821 */  addu      $at, $at, $v0
-/* C2F334 80240794 8C222618 */  lw        $v0, 0x2618($at)
+/* C2F334 80240794 8C222618 */  lw        $v0, %lo(D_80242618)($at)
 /* C2F338 80240798 00400008 */  jr        $v0
 /* C2F33C 8024079C 00000000 */   nop      
 /* C2F340 802407A0 0240202D */  daddu     $a0, $s2, $zero
diff --git a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240958_C2F4F8.s b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240958_C2F4F8.s
index f7922f7d5d..2925a34262 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240958_C2F4F8.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240958_C2F4F8.s
@@ -89,8 +89,8 @@ glabel func_80240958_C2F4F8
 /* C2F62C 80240A8C E7A00028 */  swc1      $f0, 0x28($sp)
 /* C2F630 80240A90 0C00A7E7 */  jal       add_vec2D_polar
 /* C2F634 80240A94 E7A2002C */   swc1     $f2, 0x2c($sp)
-/* C2F638 80240A98 3C028011 */  lui       $v0, 0x8011
-/* C2F63C 80240A9C 8C42C930 */  lw        $v0, -0x36d0($v0)
+/* C2F638 80240A98 3C028011 */  lui       $v0, %hi(D_8010C930)
+/* C2F63C 80240A9C 8C42C930 */  lw        $v0, %lo(D_8010C930)($v0)
 /* C2F640 80240AA0 C7AC0028 */  lwc1      $f12, 0x28($sp)
 /* C2F644 80240AA4 C7AE002C */  lwc1      $f14, 0x2c($sp)
 /* C2F648 80240AA8 8C460038 */  lw        $a2, 0x38($v0)
diff --git a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240E54_C2F9F4.s b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240E54_C2F9F4.s
index bf49377b07..00745eb240 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240E54_C2F9F4.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240E54_C2F9F4.s
@@ -30,8 +30,8 @@ glabel func_80240E54_C2F9F4
 /* C2FA58 80240EB8 080903B8 */  j         .L80240EE0
 /* C2FA5C 80240EBC E4600018 */   swc1     $f0, 0x18($v1)
 .L80240EC0:
-/* C2FA60 80240EC0 3C018024 */  lui       $at, 0x8024
-/* C2FA64 80240EC4 D42227A8 */  ldc1      $f2, 0x27a8($at)
+/* C2FA60 80240EC0 3C018024 */  lui       $at, %hi(D_802427A8)
+/* C2FA64 80240EC4 D42227A8 */  ldc1      $f2, %lo(D_802427A8)($at)
 /* C2FA68 80240EC8 44820000 */  mtc1      $v0, $f0
 /* C2FA6C 80240ECC 00000000 */  nop       
 /* C2FA70 80240ED0 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802410D4_C2FC74.s b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802410D4_C2FC74.s
index 72449c522a..550c259510 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802410D4_C2FC74.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802410D4_C2FC74.s
@@ -108,9 +108,9 @@ glabel func_802410D4_C2FC74
 /* C2FDF8 80241258 2C620064 */  sltiu     $v0, $v1, 0x64
 /* C2FDFC 8024125C 10400067 */  beqz      $v0, .L802413FC
 /* C2FE00 80241260 00031080 */   sll      $v0, $v1, 2
-/* C2FE04 80241264 3C018024 */  lui       $at, 0x8024
+/* C2FE04 80241264 3C018024 */  lui       $at, %hi(D_802427B0)
 /* C2FE08 80241268 00220821 */  addu      $at, $at, $v0
-/* C2FE0C 8024126C 8C2227B0 */  lw        $v0, 0x27b0($at)
+/* C2FE0C 8024126C 8C2227B0 */  lw        $v0, %lo(D_802427B0)($at)
 /* C2FE10 80241270 00400008 */  jr        $v0
 /* C2FE14 80241274 00000000 */   nop      
 /* C2FE18 80241278 0240202D */  daddu     $a0, $s2, $zero
diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80240458_C31938.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80240458_C31938.s
index e1efe4ddd8..d9b2fc972a 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80240458_C31938.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80240458_C31938.s
@@ -18,8 +18,8 @@ glabel func_80240458_C31938
 /* C3196C 8024048C 0040802D */  daddu     $s0, $v0, $zero
 /* C31970 80240490 3C05800B */  lui       $a1, %hi(gCameras)
 /* C31974 80240494 24A51D80 */  addiu     $a1, $a1, %lo(gCameras)
-/* C31978 80240498 3C03800A */  lui       $v1, 0x800a
-/* C3197C 8024049C 8463A634 */  lh        $v1, -0x59cc($v1)
+/* C31978 80240498 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* C3197C 8024049C 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* C31980 802404A0 00912021 */  addu      $a0, $a0, $s1
 /* C31984 802404A4 00031080 */  sll       $v0, $v1, 2
 /* C31988 802404A8 00431021 */  addu      $v0, $v0, $v1
@@ -54,8 +54,8 @@ glabel func_80240458_C31938
 /* C319F8 80240518 00000000 */   nop      
 /* C319FC 8024051C 0C00A6C9 */  jal       clamp_angle
 /* C31A00 80240520 46000306 */   mov.s    $f12, $f0
-/* C31A04 80240524 3C018024 */  lui       $at, 0x8024
-/* C31A08 80240528 D42249F0 */  ldc1      $f2, 0x49f0($at)
+/* C31A04 80240524 3C018024 */  lui       $at, %hi(D_802449F0)
+/* C31A08 80240528 D42249F0 */  ldc1      $f2, %lo(D_802449F0)($at)
 /* C31A0C 8024052C 46000021 */  cvt.d.s   $f0, $f0
 /* C31A10 80240530 4622003C */  c.lt.d    $f0, $f2
 /* C31A14 80240534 00000000 */  nop       
@@ -97,8 +97,8 @@ glabel func_80240458_C31938
 /* C31A9C 802405BC 45030001 */  bc1tl     .L802405C4
 /* C31AA0 802405C0 0000882D */   daddu    $s1, $zero, $zero
 .L802405C4:
-/* C31AA4 802405C4 3C038011 */  lui       $v1, 0x8011
-/* C31AA8 802405C8 8063EBB3 */  lb        $v1, -0x144d($v1)
+/* C31AA4 802405C4 3C038011 */  lui       $v1, %hi(D_8010EBB3)
+/* C31AA8 802405C8 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
 /* C31AAC 802405CC 24020009 */  addiu     $v0, $zero, 9
 /* C31AB0 802405D0 50620001 */  beql      $v1, $v0, .L802405D8
 /* C31AB4 802405D4 0000882D */   daddu    $s1, $zero, $zero
diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024086C_C31D4C.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024086C_C31D4C.s
index f724777e58..b8893c7b3f 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024086C_C31D4C.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024086C_C31D4C.s
@@ -100,9 +100,9 @@ glabel func_8024086C_C31D4C
 /* C31EB0 802409D0 2C620064 */  sltiu     $v0, $v1, 0x64
 /* C31EB4 802409D4 10400048 */  beqz      $v0, .L80240AF8
 /* C31EB8 802409D8 00031080 */   sll      $v0, $v1, 2
-/* C31EBC 802409DC 3C018024 */  lui       $at, 0x8024
+/* C31EBC 802409DC 3C018024 */  lui       $at, %hi(D_802449F8)
 /* C31EC0 802409E0 00220821 */  addu      $at, $at, $v0
-/* C31EC4 802409E4 8C2249F8 */  lw        $v0, 0x49f8($at)
+/* C31EC4 802409E4 8C2249F8 */  lw        $v0, %lo(D_802449F8)($at)
 /* C31EC8 802409E8 00400008 */  jr        $v0
 /* C31ECC 802409EC 00000000 */   nop      
 /* C31ED0 802409F0 0240202D */  daddu     $a0, $s2, $zero
diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80240B20_C32000.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80240B20_C32000.s
index 4758622568..aef791cce5 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80240B20_C32000.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80240B20_C32000.s
@@ -69,8 +69,8 @@ glabel func_80240B20_C32000
 /* C320F4 80240C14 0809030F */  j         .L80240C3C
 /* C320F8 80240C18 E6800018 */   swc1     $f0, 0x18($s4)
 .L80240C1C:
-/* C320FC 80240C1C 3C018024 */  lui       $at, 0x8024
-/* C32100 80240C20 D4224B88 */  ldc1      $f2, 0x4b88($at)
+/* C320FC 80240C1C 3C018024 */  lui       $at, %hi(D_80244B88)
+/* C32100 80240C20 D4224B88 */  ldc1      $f2, %lo(D_80244B88)($at)
 /* C32104 80240C24 44820000 */  mtc1      $v0, $f0
 /* C32108 80240C28 00000000 */  nop       
 /* C3210C 80240C2C 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802419B0_C32E90.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802419B0_C32E90.s
index f1db6fa194..ac0b8ccd15 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802419B0_C32E90.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802419B0_C32E90.s
@@ -100,9 +100,9 @@ glabel func_802419B0_C32E90
 /* C32FF4 80241B14 2C620064 */  sltiu     $v0, $v1, 0x64
 /* C32FF8 80241B18 1040004E */  beqz      $v0, .L80241C54
 /* C32FFC 80241B1C 00031080 */   sll      $v0, $v1, 2
-/* C33000 80241B20 3C018024 */  lui       $at, 0x8024
+/* C33000 80241B20 3C018024 */  lui       $at, %hi(D_80244D28)
 /* C33004 80241B24 00220821 */  addu      $at, $at, $v0
-/* C33008 80241B28 8C224D28 */  lw        $v0, 0x4d28($at)
+/* C33008 80241B28 8C224D28 */  lw        $v0, %lo(D_80244D28)($at)
 /* C3300C 80241B2C 00400008 */  jr        $v0
 /* C33010 80241B30 00000000 */   nop      
 /* C33014 80241B34 0240202D */  daddu     $a0, $s2, $zero
diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80241D04_C331E4.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80241D04_C331E4.s
index 7ce2df726d..a5f80c2149 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80241D04_C331E4.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80241D04_C331E4.s
@@ -89,8 +89,8 @@ glabel func_80241D04_C331E4
 /* C33318 80241E38 E7A00028 */  swc1      $f0, 0x28($sp)
 /* C3331C 80241E3C 0C00A7E7 */  jal       add_vec2D_polar
 /* C33320 80241E40 E7A2002C */   swc1     $f2, 0x2c($sp)
-/* C33324 80241E44 3C028011 */  lui       $v0, 0x8011
-/* C33328 80241E48 8C42C930 */  lw        $v0, -0x36d0($v0)
+/* C33324 80241E44 3C028011 */  lui       $v0, %hi(D_8010C930)
+/* C33328 80241E48 8C42C930 */  lw        $v0, %lo(D_8010C930)($v0)
 /* C3332C 80241E4C C7AC0028 */  lwc1      $f12, 0x28($sp)
 /* C33330 80241E50 C7AE002C */  lwc1      $f14, 0x2c($sp)
 /* C33334 80241E54 8C460038 */  lw        $a2, 0x38($v0)
diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242200_C336E0.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242200_C336E0.s
index a60c218540..0ee798d792 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242200_C336E0.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242200_C336E0.s
@@ -30,8 +30,8 @@ glabel func_80242200_C336E0
 /* C33744 80242264 080908A3 */  j         .L8024228C
 /* C33748 80242268 E4600018 */   swc1     $f0, 0x18($v1)
 .L8024226C:
-/* C3374C 8024226C 3C018024 */  lui       $at, 0x8024
-/* C33750 80242270 D4224EB8 */  ldc1      $f2, 0x4eb8($at)
+/* C3374C 8024226C 3C018024 */  lui       $at, %hi(D_80244EB8)
+/* C33750 80242270 D4224EB8 */  ldc1      $f2, %lo(D_80244EB8)($at)
 /* C33754 80242274 44820000 */  mtc1      $v0, $f0
 /* C33758 80242278 00000000 */  nop       
 /* C3375C 8024227C 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242480_C33960.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242480_C33960.s
index c2cf9ec7ce..5fb30e3f73 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242480_C33960.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242480_C33960.s
@@ -108,9 +108,9 @@ glabel func_80242480_C33960
 /* C33AE4 80242604 2C620064 */  sltiu     $v0, $v1, 0x64
 /* C33AE8 80242608 10400067 */  beqz      $v0, .L802427A8
 /* C33AEC 8024260C 00031080 */   sll      $v0, $v1, 2
-/* C33AF0 80242610 3C018024 */  lui       $at, 0x8024
+/* C33AF0 80242610 3C018024 */  lui       $at, %hi(D_80244EC0)
 /* C33AF4 80242614 00220821 */  addu      $at, $at, $v0
-/* C33AF8 80242618 8C224EC0 */  lw        $v0, 0x4ec0($at)
+/* C33AF8 80242618 8C224EC0 */  lw        $v0, %lo(D_80244EC0)($at)
 /* C33AFC 8024261C 00400008 */  jr        $v0
 /* C33B00 80242620 00000000 */   nop      
 /* C33B04 80242624 0240202D */  daddu     $a0, $s2, $zero
diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80240000_C36530.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80240000_C36530.s
index 0705462b1f..93afcc46ae 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80240000_C36530.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80240000_C36530.s
@@ -87,8 +87,8 @@ glabel func_80240000_C36530
 /* C36670 80240140 0809005A */  j         .L80240168
 /* C36674 80240144 E6000018 */   swc1     $f0, 0x18($s0)
 .L80240148:
-/* C36678 80240148 3C018024 */  lui       $at, 0x8024
-/* C3667C 8024014C D42243F0 */  ldc1      $f2, 0x43f0($at)
+/* C36678 80240148 3C018024 */  lui       $at, %hi(D_802443F0)
+/* C3667C 8024014C D42243F0 */  ldc1      $f2, %lo(D_802443F0)($at)
 /* C36680 80240150 44820000 */  mtc1      $v0, $f0
 /* C36684 80240154 00000000 */  nop       
 /* C36688 80240158 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802401B0_C366E0.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802401B0_C366E0.s
index 47e39d70bc..70415171d3 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802401B0_C366E0.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802401B0_C366E0.s
@@ -104,8 +104,8 @@ glabel func_802401B0_C366E0
 /* C36864 80240334 1040000A */  beqz      $v0, .L80240360
 /* C36868 80240338 4600C106 */   mov.s    $f4, $f24
 /* C3686C 8024033C 4614C081 */  sub.s     $f2, $f24, $f20
-/* C36870 80240340 3C018024 */  lui       $at, 0x8024
-/* C36874 80240344 D42043F8 */  ldc1      $f0, 0x43f8($at)
+/* C36870 80240340 3C018024 */  lui       $at, %hi(D_802443F8)
+/* C36874 80240344 D42043F8 */  ldc1      $f0, %lo(D_802443F8)($at)
 /* C36878 80240348 460010A1 */  cvt.d.s   $f2, $f2
 /* C3687C 8024034C 46201082 */  mul.d     $f2, $f2, $f0
 /* C36880 80240350 00000000 */  nop       
@@ -131,8 +131,8 @@ glabel func_802401B0_C366E0
 /* C368CC 8024039C C7A4002C */  lwc1      $f4, 0x2c($sp)
 /* C368D0 802403A0 461A2100 */  add.s     $f4, $f4, $f26
 /* C368D4 802403A4 46142081 */  sub.s     $f2, $f4, $f20
-/* C368D8 802403A8 3C018024 */  lui       $at, 0x8024
-/* C368DC 802403AC D4204400 */  ldc1      $f0, 0x4400($at)
+/* C368D8 802403A8 3C018024 */  lui       $at, %hi(D_80244400)
+/* C368DC 802403AC D4204400 */  ldc1      $f0, %lo(D_80244400)($at)
 /* C368E0 802403B0 460010A1 */  cvt.d.s   $f2, $f2
 /* C368E4 802403B4 46201082 */  mul.d     $f2, $f2, $f0
 /* C368E8 802403B8 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80240C54_C37184.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80240C54_C37184.s
index eba7604bdf..76fe6e0733 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80240C54_C37184.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80240C54_C37184.s
@@ -15,9 +15,9 @@ glabel func_80240C54_C37184
 /* C371AC 80240C7C 00031C00 */  sll       $v1, $v1, 0x10
 /* C371B0 80240C80 00031B83 */  sra       $v1, $v1, 0xe
 /* C371B4 80240C84 A444008E */  sh        $a0, 0x8e($v0)
-/* C371B8 80240C88 3C018024 */  lui       $at, 0x8024
+/* C371B8 80240C88 3C018024 */  lui       $at, %hi(D_80243560)
 /* C371BC 80240C8C 00230821 */  addu      $at, $at, $v1
-/* C371C0 80240C90 C4223560 */  lwc1      $f2, 0x3560($at)
+/* C371C0 80240C90 C4223560 */  lwc1      $f2, %lo(D_80243560)($at)
 /* C371C4 80240C94 8443008E */  lh        $v1, 0x8e($v0)
 /* C371C8 80240C98 46020000 */  add.s     $f0, $f0, $f2
 /* C371CC 80240C9C 28630005 */  slti      $v1, $v1, 5
diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_8024130C_C3783C.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_8024130C_C3783C.s
index 8d55a1b440..4e1ab5534f 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_8024130C_C3783C.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_8024130C_C3783C.s
@@ -66,9 +66,9 @@ glabel func_8024130C_C3783C
 /* C37928 802413F8 2C62000F */  sltiu     $v0, $v1, 0xf
 /* C3792C 802413FC 10400034 */  beqz      $v0, .L802414D0
 /* C37930 80241400 00031080 */   sll      $v0, $v1, 2
-/* C37934 80241404 3C018024 */  lui       $at, 0x8024
+/* C37934 80241404 3C018024 */  lui       $at, %hi(D_80244408)
 /* C37938 80241408 00220821 */  addu      $at, $at, $v0
-/* C3793C 8024140C 8C224408 */  lw        $v0, 0x4408($at)
+/* C3793C 8024140C 8C224408 */  lw        $v0, %lo(D_80244408)($at)
 /* C37940 80241410 00400008 */  jr        $v0
 /* C37944 80241414 00000000 */   nop      
 /* C37948 80241418 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802417F8_C37D28.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802417F8_C37D28.s
index 19077f0d78..5710b49d24 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802417F8_C37D28.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802417F8_C37D28.s
@@ -57,8 +57,8 @@ glabel func_802417F8_C37D28
 /* C37DF4 802418C4 E6420038 */  swc1      $f2, 0x38($s2)
 /* C37DF8 802418C8 C4420030 */  lwc1      $f2, 0x30($v0)
 /* C37DFC 802418CC 46001080 */  add.s     $f2, $f2, $f0
-/* C37E00 802418D0 3C018024 */  lui       $at, 0x8024
-/* C37E04 802418D4 D4264448 */  ldc1      $f6, 0x4448($at)
+/* C37E00 802418D0 3C018024 */  lui       $at, %hi(D_80244448)
+/* C37E04 802418D4 D4264448 */  ldc1      $f6, %lo(D_80244448)($at)
 /* C37E08 802418D8 46002021 */  cvt.d.s   $f0, $f4
 /* C37E0C 802418DC 4620303C */  c.lt.d    $f6, $f0
 /* C37E10 802418E0 E6440048 */  swc1      $f4, 0x48($s2)
@@ -137,8 +137,8 @@ glabel func_802417F8_C37D28
 /* C37F30 80241A00 00000000 */  nop       
 /* C37F34 80241A04 45000008 */  bc1f      .L80241A28
 /* C37F38 80241A08 3C03FFDF */   lui      $v1, 0xffdf
-/* C37F3C 80241A0C 3C018024 */  lui       $at, 0x8024
-/* C37F40 80241A10 D4224450 */  ldc1      $f2, 0x4450($at)
+/* C37F3C 80241A0C 3C018024 */  lui       $at, %hi(D_80244450)
+/* C37F40 80241A10 D4224450 */  ldc1      $f2, %lo(D_80244450)($at)
 /* C37F44 80241A14 46002021 */  cvt.d.s   $f0, $f4
 /* C37F48 80241A18 46220001 */  sub.d     $f0, $f0, $f2
 /* C37F4C 80241A1C 46200020 */  cvt.s.d   $f0, $f0
@@ -150,8 +150,8 @@ glabel func_802417F8_C37D28
 /* C37F60 80241A30 AE400048 */  sw        $zero, 0x48($s2)
 /* C37F64 80241A34 00431024 */  and       $v0, $v0, $v1
 /* C37F68 80241A38 AE420000 */  sw        $v0, ($s2)
-/* C37F6C 80241A3C 3C038011 */  lui       $v1, 0x8011
-/* C37F70 80241A40 8063EBB3 */  lb        $v1, -0x144d($v1)
+/* C37F6C 80241A3C 3C038011 */  lui       $v1, %hi(D_8010EBB3)
+/* C37F70 80241A40 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
 /* C37F74 80241A44 24020009 */  addiu     $v0, $zero, 9
 /* C37F78 80241A48 10620009 */  beq       $v1, $v0, .L80241A70
 /* C37F7C 80241A4C 24020010 */   addiu    $v0, $zero, 0x10
diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241D14_C38244.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241D14_C38244.s
index 81d408df42..8e623f7ee0 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241D14_C38244.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241D14_C38244.s
@@ -18,8 +18,8 @@ glabel func_80241D14_C38244
 /* C38278 80241D48 28420003 */  slti      $v0, $v0, 3
 /* C3827C 80241D4C 1440000D */  bnez      $v0, .L80241D84
 /* C38280 80241D50 24020009 */   addiu    $v0, $zero, 9
-/* C38284 80241D54 3C038011 */  lui       $v1, 0x8011
-/* C38288 80241D58 8063EBB3 */  lb        $v1, -0x144d($v1)
+/* C38284 80241D54 3C038011 */  lui       $v1, %hi(D_8010EBB3)
+/* C38288 80241D58 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
 /* C3828C 80241D5C 10620003 */  beq       $v1, $v0, .L80241D6C
 /* C38290 80241D60 24020064 */   addiu    $v0, $zero, 0x64
 /* C38294 80241D64 08090760 */  j         .L80241D80
diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242154_C38684.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242154_C38684.s
index 00c5eb4d1d..ae700f1b25 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242154_C38684.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242154_C38684.s
@@ -54,9 +54,9 @@ glabel func_80242154_C38684
 /* C38744 80242214 2C620020 */  sltiu     $v0, $v1, 0x20
 /* C38748 80242218 10400060 */  beqz      $v0, .L8024239C
 /* C3874C 8024221C 00031080 */   sll      $v0, $v1, 2
-/* C38750 80242220 3C018024 */  lui       $at, 0x8024
+/* C38750 80242220 3C018024 */  lui       $at, %hi(D_80244458)
 /* C38754 80242224 00220821 */  addu      $at, $at, $v0
-/* C38758 80242228 8C224458 */  lw        $v0, 0x4458($at)
+/* C38758 80242228 8C224458 */  lw        $v0, %lo(D_80244458)($at)
 /* C3875C 8024222C 00400008 */  jr        $v0
 /* C38760 80242230 00000000 */   nop      
 /* C38764 80242234 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_8024259C_C38ACC.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_8024259C_C38ACC.s
index 1aa3527624..870237a31b 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_8024259C_C38ACC.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_8024259C_C38ACC.s
@@ -22,12 +22,12 @@ glabel func_8024259C_C38ACC
 /* C38B10 802425E0 0040982D */  daddu     $s3, $v0, $zero
 /* C38B14 802425E4 0000B02D */  daddu     $s6, $zero, $zero
 /* C38B18 802425E8 02C0902D */  daddu     $s2, $s6, $zero
-/* C38B1C 802425EC 3C148024 */  lui       $s4, 0x8024
-/* C38B20 802425F0 26943D38 */  addiu     $s4, $s4, 0x3d38
+/* C38B1C 802425EC 3C148024 */  lui       $s4, %hi(D_80243D38)
+/* C38B20 802425F0 26943D38 */  addiu     $s4, $s4, %lo(D_80243D38)
 /* C38B24 802425F4 0260882D */  daddu     $s1, $s3, $zero
 /* C38B28 802425F8 8EA200B4 */  lw        $v0, 0xb4($s5)
-/* C38B2C 802425FC 3C038024 */  lui       $v1, 0x8024
-/* C38B30 80242600 24633D30 */  addiu     $v1, $v1, 0x3d30
+/* C38B2C 802425FC 3C038024 */  lui       $v1, %hi(D_80243D30)
+/* C38B30 80242600 24633D30 */  addiu     $v1, $v1, %lo(D_80243D30)
 /* C38B34 80242604 AEB30078 */  sw        $s3, 0x78($s5)
 /* C38B38 80242608 00021027 */  nor       $v0, $zero, $v0
 /* C38B3C 8024260C 0002BFC2 */  srl       $s7, $v0, 0x1f
@@ -42,8 +42,8 @@ glabel func_8024259C_C38ACC
 /* C38B5C 8024262C 5040002E */  beql      $v0, $zero, .L802426E8
 /* C38B60 80242630 26520001 */   addiu    $s2, $s2, 1
 /* C38B64 80242634 00101100 */  sll       $v0, $s0, 4
-/* C38B68 80242638 3C068009 */  lui       $a2, 0x8009
-/* C38B6C 8024263C 24C6EF20 */  addiu     $a2, $a2, -0x10e0
+/* C38B68 80242638 3C068009 */  lui       $a2, %hi(D_8008EF20)
+/* C38B6C 8024263C 24C6EF20 */  addiu     $a2, $a2, %lo(D_8008EF20)
 /* C38B70 80242640 00461021 */  addu      $v0, $v0, $a2
 /* C38B74 80242644 0200202D */  daddu     $a0, $s0, $zero
 /* C38B78 80242648 AE300108 */  sw        $s0, 0x108($s1)
@@ -54,15 +54,15 @@ glabel func_8024259C_C38ACC
 /* C38B8C 8024265C 0040202D */  daddu     $a0, $v0, $zero
 /* C38B90 80242660 04800011 */  bltz      $a0, .L802426A8
 /* C38B94 80242664 00101080 */   sll      $v0, $s0, 2
-/* C38B98 80242668 3C06800F */  lui       $a2, 0x800f
-/* C38B9C 8024266C 24C67F00 */  addiu     $a2, $a2, 0x7f00
+/* C38B98 80242668 3C06800F */  lui       $a2, %hi(D_800F7F00)
+/* C38B9C 8024266C 24C67F00 */  addiu     $a2, $a2, %lo(D_800F7F00)
 /* C38BA0 80242670 00461021 */  addu      $v0, $v0, $a2
 /* C38BA4 80242674 8C430000 */  lw        $v1, ($v0)
 /* C38BA8 80242678 24020001 */  addiu     $v0, $zero, 1
 /* C38BAC 8024267C AE22018C */  sw        $v0, 0x18c($s1)
 /* C38BB0 80242680 00041080 */  sll       $v0, $a0, 2
-/* C38BB4 80242684 3C068024 */  lui       $a2, 0x8024
-/* C38BB8 80242688 24C63D48 */  addiu     $a2, $a2, 0x3d48
+/* C38BB4 80242684 3C068024 */  lui       $a2, %hi(D_80243D48)
+/* C38BB8 80242688 24C63D48 */  addiu     $a2, $a2, %lo(D_80243D48)
 /* C38BBC 8024268C AE230000 */  sw        $v1, ($s1)
 /* C38BC0 80242690 001218C0 */  sll       $v1, $s2, 3
 /* C38BC4 80242694 00431021 */  addu      $v0, $v0, $v1
@@ -71,8 +71,8 @@ glabel func_8024259C_C38ACC
 /* C38BD0 802426A0 080909B3 */  j         .L802426CC
 /* C38BD4 802426A4 AE220294 */   sw       $v0, 0x294($s1)
 .L802426A8:
-/* C38BD8 802426A8 3C06800F */  lui       $a2, 0x800f
-/* C38BDC 802426AC 24C67F40 */  addiu     $a2, $a2, 0x7f40
+/* C38BD8 802426A8 3C06800F */  lui       $a2, %hi(D_800F7F40)
+/* C38BDC 802426AC 24C67F40 */  addiu     $a2, $a2, %lo(D_800F7F40)
 /* C38BE0 802426B0 00461021 */  addu      $v0, $v0, $a2
 /* C38BE4 802426B4 8C420000 */  lw        $v0, ($v0)
 /* C38BE8 802426B8 AE20018C */  sw        $zero, 0x18c($s1)
@@ -130,9 +130,9 @@ glabel func_8024259C_C38ACC
 /* C38CA0 80242770 02621021 */  addu      $v0, $s3, $v0
 /* C38CA4 80242774 8C420108 */  lw        $v0, 0x108($v0)
 /* C38CA8 80242778 00021100 */  sll       $v0, $v0, 4
-/* C38CAC 8024277C 3C038009 */  lui       $v1, 0x8009
+/* C38CAC 8024277C 3C038009 */  lui       $v1, %hi(D_8008EF20)
 /* C38CB0 80242780 00621821 */  addu      $v1, $v1, $v0
-/* C38CB4 80242784 8C63EF20 */  lw        $v1, -0x10e0($v1)
+/* C38CB4 80242784 8C63EF20 */  lw        $v1, %lo(D_8008EF20)($v1)
 /* C38CB8 80242788 8EA20074 */  lw        $v0, 0x74($s5)
 /* C38CBC 8024278C 2442FFFF */  addiu     $v0, $v0, -1
 /* C38CC0 80242790 00021080 */  sll       $v0, $v0, 2
diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242818_C38D48.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242818_C38D48.s
index 474b20ce22..37cadd81dc 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242818_C38D48.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242818_C38D48.s
@@ -7,9 +7,9 @@ glabel func_80242818_C38D48
 /* C38D50 80242820 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* C38D54 80242824 AFBF0010 */  sw        $ra, 0x10($sp)
 /* C38D58 80242828 00021100 */  sll       $v0, $v0, 4
-/* C38D5C 8024282C 3C048009 */  lui       $a0, 0x8009
+/* C38D5C 8024282C 3C048009 */  lui       $a0, %hi(D_8008EF20)
 /* C38D60 80242830 00822021 */  addu      $a0, $a0, $v0
-/* C38D64 80242834 8C84EF20 */  lw        $a0, -0x10e0($a0)
+/* C38D64 80242834 8C84EF20 */  lw        $a0, %lo(D_8008EF20)($a0)
 /* C38D68 80242838 0C0496CF */  jal       set_message_string
 /* C38D6C 8024283C 0000282D */   daddu    $a1, $zero, $zero
 /* C38D70 80242840 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802429D0_C38F00.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802429D0_C38F00.s
index 4607e52a60..5ee5d502d9 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802429D0_C38F00.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802429D0_C38F00.s
@@ -30,9 +30,9 @@ glabel func_802429D0_C38F00
 /* C38F64 80242A34 000320C0 */  sll       $a0, $v1, 3
 /* C38F68 80242A38 00641821 */  addu      $v1, $v1, $a0
 /* C38F6C 80242A3C 000318C0 */  sll       $v1, $v1, 3
-/* C38F70 80242A40 3C01800B */  lui       $at, 0x800b
+/* C38F70 80242A40 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* C38F74 80242A44 00230821 */  addu      $at, $at, $v1
-/* C38F78 80242A48 C42C1DEC */  lwc1      $f12, 0x1dec($at)
+/* C38F78 80242A48 C42C1DEC */  lwc1      $f12, %lo(D_800B1DEC)($at)
 /* C38F7C 80242A4C 0C00A88D */  jal       sin_cos_deg
 /* C38F80 80242A50 0040A82D */   daddu    $s5, $v0, $zero
 /* C38F84 80242A54 1200005D */  beqz      $s0, .L80242BCC
@@ -79,8 +79,8 @@ glabel func_802429D0_C38F00
 /* C39024 80242AF4 26100004 */   addiu    $s0, $s0, 4
 /* C39028 80242AF8 0000882D */  daddu     $s1, $zero, $zero
 /* C3902C 80242AFC 0240802D */  daddu     $s0, $s2, $zero
-/* C39030 80242B00 3C148024 */  lui       $s4, 0x8024
-/* C39034 80242B04 26943D88 */  addiu     $s4, $s4, 0x3d88
+/* C39030 80242B00 3C148024 */  lui       $s4, %hi(D_80243D88)
+/* C39034 80242B04 26943D88 */  addiu     $s4, $s4, %lo(D_80243D88)
 /* C39038 80242B08 3C014248 */  lui       $at, 0x4248
 /* C3903C 80242B0C 4481A000 */  mtc1      $at, $f20
 /* C39040 80242B10 24130044 */  addiu     $s3, $zero, 0x44
@@ -150,8 +150,8 @@ glabel func_802429D0_C38F00
 /* C39134 80242C04 00000000 */   nop      
 .L80242C08:
 /* C39138 80242C08 0000882D */  daddu     $s1, $zero, $zero
-/* C3913C 80242C0C 3C148024 */  lui       $s4, 0x8024
-/* C39140 80242C10 26943D88 */  addiu     $s4, $s4, 0x3d88
+/* C3913C 80242C0C 3C148024 */  lui       $s4, %hi(D_80243D88)
+/* C39140 80242C10 26943D88 */  addiu     $s4, $s4, %lo(D_80243D88)
 /* C39144 80242C14 24130020 */  addiu     $s3, $zero, 0x20
 /* C39148 80242C18 3C064248 */  lui       $a2, 0x4248
 /* C3914C 80242C1C 44800000 */  mtc1      $zero, $f0
@@ -197,8 +197,8 @@ glabel func_802429D0_C38F00
 /* C391E8 80242CB8 AE400060 */   sw       $zero, 0x60($s2)
 .L80242CBC:
 /* C391EC 80242CBC 0000882D */  daddu     $s1, $zero, $zero
-/* C391F0 80242CC0 3C148024 */  lui       $s4, 0x8024
-/* C391F4 80242CC4 26943D88 */  addiu     $s4, $s4, 0x3d88
+/* C391F0 80242CC0 3C148024 */  lui       $s4, %hi(D_80243D88)
+/* C391F4 80242CC4 26943D88 */  addiu     $s4, $s4, %lo(D_80243D88)
 /* C391F8 80242CC8 24130020 */  addiu     $s3, $zero, 0x20
 /* C391FC 80242CCC 0240802D */  daddu     $s0, $s2, $zero
 /* C39200 80242CD0 3C014248 */  lui       $at, 0x4248
diff --git a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240268_C3AC78.s b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240268_C3AC78.s
index 3d6afe762c..4cb5af5d3b 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240268_C3AC78.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240268_C3AC78.s
@@ -18,8 +18,8 @@ glabel func_80240268_C3AC78
 /* C3ACAC 8024029C 0040802D */  daddu     $s0, $v0, $zero
 /* C3ACB0 802402A0 3C05800B */  lui       $a1, %hi(gCameras)
 /* C3ACB4 802402A4 24A51D80 */  addiu     $a1, $a1, %lo(gCameras)
-/* C3ACB8 802402A8 3C03800A */  lui       $v1, 0x800a
-/* C3ACBC 802402AC 8463A634 */  lh        $v1, -0x59cc($v1)
+/* C3ACB8 802402A8 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* C3ACBC 802402AC 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* C3ACC0 802402B0 00912021 */  addu      $a0, $a0, $s1
 /* C3ACC4 802402B4 00031080 */  sll       $v0, $v1, 2
 /* C3ACC8 802402B8 00431021 */  addu      $v0, $v0, $v1
@@ -54,8 +54,8 @@ glabel func_80240268_C3AC78
 /* C3AD38 80240328 00000000 */   nop      
 /* C3AD3C 8024032C 0C00A6C9 */  jal       clamp_angle
 /* C3AD40 80240330 46000306 */   mov.s    $f12, $f0
-/* C3AD44 80240334 3C018024 */  lui       $at, 0x8024
-/* C3AD48 80240338 D4222340 */  ldc1      $f2, 0x2340($at)
+/* C3AD44 80240334 3C018024 */  lui       $at, %hi(D_80242340)
+/* C3AD48 80240338 D4222340 */  ldc1      $f2, %lo(D_80242340)($at)
 /* C3AD4C 8024033C 46000021 */  cvt.d.s   $f0, $f0
 /* C3AD50 80240340 4622003C */  c.lt.d    $f0, $f2
 /* C3AD54 80240344 00000000 */  nop       
@@ -97,8 +97,8 @@ glabel func_80240268_C3AC78
 /* C3ADDC 802403CC 45030001 */  bc1tl     .L802403D4
 /* C3ADE0 802403D0 0000882D */   daddu    $s1, $zero, $zero
 .L802403D4:
-/* C3ADE4 802403D4 3C038011 */  lui       $v1, 0x8011
-/* C3ADE8 802403D8 8063EBB3 */  lb        $v1, -0x144d($v1)
+/* C3ADE4 802403D4 3C038011 */  lui       $v1, %hi(D_8010EBB3)
+/* C3ADE8 802403D8 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
 /* C3ADEC 802403DC 24020009 */  addiu     $v0, $zero, 9
 /* C3ADF0 802403E0 50620001 */  beql      $v1, $v0, .L802403E8
 /* C3ADF4 802403E4 0000882D */   daddu    $s1, $zero, $zero
diff --git a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240704_C3B114.s b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240704_C3B114.s
index e026d53f8a..5bdf7262b7 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240704_C3B114.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240704_C3B114.s
@@ -89,8 +89,8 @@ glabel func_80240704_C3B114
 /* C3B248 80240838 E7A00028 */  swc1      $f0, 0x28($sp)
 /* C3B24C 8024083C 0C00A7E7 */  jal       add_vec2D_polar
 /* C3B250 80240840 E7A2002C */   swc1     $f2, 0x2c($sp)
-/* C3B254 80240844 3C028011 */  lui       $v0, 0x8011
-/* C3B258 80240848 8C42C930 */  lw        $v0, -0x36d0($v0)
+/* C3B254 80240844 3C028011 */  lui       $v0, %hi(D_8010C930)
+/* C3B258 80240848 8C42C930 */  lw        $v0, %lo(D_8010C930)($v0)
 /* C3B25C 8024084C C7AC0028 */  lwc1      $f12, 0x28($sp)
 /* C3B260 80240850 C7AE002C */  lwc1      $f14, 0x2c($sp)
 /* C3B264 80240854 8C460038 */  lw        $a2, 0x38($v0)
diff --git a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240C00_C3B610.s b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240C00_C3B610.s
index bdfed82c80..830c4e105f 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240C00_C3B610.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240C00_C3B610.s
@@ -30,8 +30,8 @@ glabel func_80240C00_C3B610
 /* C3B674 80240C64 08090323 */  j         .L80240C8C
 /* C3B678 80240C68 E4600018 */   swc1     $f0, 0x18($v1)
 .L80240C6C:
-/* C3B67C 80240C6C 3C018024 */  lui       $at, 0x8024
-/* C3B680 80240C70 D4222348 */  ldc1      $f2, 0x2348($at)
+/* C3B67C 80240C6C 3C018024 */  lui       $at, %hi(D_80242348)
+/* C3B680 80240C70 D4222348 */  ldc1      $f2, %lo(D_80242348)($at)
 /* C3B684 80240C74 44820000 */  mtc1      $v0, $f0
 /* C3B688 80240C78 00000000 */  nop       
 /* C3B68C 80240C7C 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240E80_C3B890.s b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240E80_C3B890.s
index 834c7140e6..5f8a00800b 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240E80_C3B890.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240E80_C3B890.s
@@ -108,9 +108,9 @@ glabel func_80240E80_C3B890
 /* C3BA14 80241004 2C620064 */  sltiu     $v0, $v1, 0x64
 /* C3BA18 80241008 10400067 */  beqz      $v0, .L802411A8
 /* C3BA1C 8024100C 00031080 */   sll      $v0, $v1, 2
-/* C3BA20 80241010 3C018024 */  lui       $at, 0x8024
+/* C3BA20 80241010 3C018024 */  lui       $at, %hi(D_80242350)
 /* C3BA24 80241014 00220821 */  addu      $at, $at, $v0
-/* C3BA28 80241018 8C222350 */  lw        $v0, 0x2350($at)
+/* C3BA28 80241018 8C222350 */  lw        $v0, %lo(D_80242350)($at)
 /* C3BA2C 8024101C 00400008 */  jr        $v0
 /* C3BA30 80241020 00000000 */   nop      
 /* C3BA34 80241024 0240202D */  daddu     $a0, $s2, $zero
diff --git a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802411D0_C3BBE0.s b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802411D0_C3BBE0.s
index 7bfce9fb1e..9f3ed63726 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802411D0_C3BBE0.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802411D0_C3BBE0.s
@@ -100,9 +100,9 @@ glabel func_802411D0_C3BBE0
 /* C3BD44 80241334 2C620064 */  sltiu     $v0, $v1, 0x64
 /* C3BD48 80241338 10400048 */  beqz      $v0, .L8024145C
 /* C3BD4C 8024133C 00031080 */   sll      $v0, $v1, 2
-/* C3BD50 80241340 3C018024 */  lui       $at, 0x8024
+/* C3BD50 80241340 3C018024 */  lui       $at, %hi(D_802424E0)
 /* C3BD54 80241344 00220821 */  addu      $at, $at, $v0
-/* C3BD58 80241348 8C2224E0 */  lw        $v0, 0x24e0($at)
+/* C3BD58 80241348 8C2224E0 */  lw        $v0, %lo(D_802424E0)($at)
 /* C3BD5C 8024134C 00400008 */  jr        $v0
 /* C3BD60 80241350 00000000 */   nop      
 /* C3BD64 80241354 0240202D */  daddu     $a0, $s2, $zero
diff --git a/asm/nonmatchings/world/area_dgb/dgb_06/C3D080/func_80240000_C3D080.s b/asm/nonmatchings/world/area_dgb/dgb_06/C3D080/func_80240000_C3D080.s
index 650f0a33e3..2f6e79b36c 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_06/C3D080/func_80240000_C3D080.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_06/C3D080/func_80240000_C3D080.s
@@ -4,8 +4,8 @@
 glabel func_80240000_C3D080
 /* C3D080 80240000 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* C3D084 80240004 AFB00010 */  sw        $s0, 0x10($sp)
-/* C3D088 80240008 3C108024 */  lui       $s0, 0x8024
-/* C3D08C 8024000C 26100620 */  addiu     $s0, $s0, 0x620
+/* C3D088 80240008 3C108024 */  lui       $s0, %hi(D_80240620)
+/* C3D08C 8024000C 26100620 */  addiu     $s0, $s0, %lo(D_80240620)
 /* C3D090 80240010 AFBF0018 */  sw        $ra, 0x18($sp)
 /* C3D094 80240014 AFB10014 */  sw        $s1, 0x14($sp)
 /* C3D098 80240018 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_80240000_C3D080
 /* C3D0FC 8024007C 28620010 */  slti      $v0, $v1, 0x10
 /* C3D100 80240080 1440FFFA */  bnez      $v0, .L8024006C
 /* C3D104 80240084 24840004 */   addiu    $a0, $a0, 4
-/* C3D108 80240088 3C108024 */  lui       $s0, 0x8024
-/* C3D10C 8024008C 26100620 */  addiu     $s0, $s0, 0x620
+/* C3D108 80240088 3C108024 */  lui       $s0, %hi(D_80240620)
+/* C3D10C 8024008C 26100620 */  addiu     $s0, $s0, %lo(D_80240620)
 /* C3D110 80240090 0C00AB4B */  jal       heap_free
 /* C3D114 80240094 8E040000 */   lw       $a0, ($s0)
 /* C3D118 80240098 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240208_C3DDF8.s b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240208_C3DDF8.s
index 65ebc584ee..f3ffac3957 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240208_C3DDF8.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240208_C3DDF8.s
@@ -18,8 +18,8 @@ glabel func_80240208_C3DDF8
 /* C3DE2C 8024023C 0040802D */  daddu     $s0, $v0, $zero
 /* C3DE30 80240240 3C05800B */  lui       $a1, %hi(gCameras)
 /* C3DE34 80240244 24A51D80 */  addiu     $a1, $a1, %lo(gCameras)
-/* C3DE38 80240248 3C03800A */  lui       $v1, 0x800a
-/* C3DE3C 8024024C 8463A634 */  lh        $v1, -0x59cc($v1)
+/* C3DE38 80240248 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* C3DE3C 8024024C 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* C3DE40 80240250 00912021 */  addu      $a0, $a0, $s1
 /* C3DE44 80240254 00031080 */  sll       $v0, $v1, 2
 /* C3DE48 80240258 00431021 */  addu      $v0, $v0, $v1
@@ -54,8 +54,8 @@ glabel func_80240208_C3DDF8
 /* C3DEB8 802402C8 00000000 */   nop      
 /* C3DEBC 802402CC 0C00A6C9 */  jal       clamp_angle
 /* C3DEC0 802402D0 46000306 */   mov.s    $f12, $f0
-/* C3DEC4 802402D4 3C018024 */  lui       $at, 0x8024
-/* C3DEC8 802402D8 D4221E90 */  ldc1      $f2, 0x1e90($at)
+/* C3DEC4 802402D4 3C018024 */  lui       $at, %hi(D_80241E90)
+/* C3DEC8 802402D8 D4221E90 */  ldc1      $f2, %lo(D_80241E90)($at)
 /* C3DECC 802402DC 46000021 */  cvt.d.s   $f0, $f0
 /* C3DED0 802402E0 4622003C */  c.lt.d    $f0, $f2
 /* C3DED4 802402E4 00000000 */  nop       
@@ -97,8 +97,8 @@ glabel func_80240208_C3DDF8
 /* C3DF5C 8024036C 45030001 */  bc1tl     .L80240374
 /* C3DF60 80240370 0000882D */   daddu    $s1, $zero, $zero
 .L80240374:
-/* C3DF64 80240374 3C038011 */  lui       $v1, 0x8011
-/* C3DF68 80240378 8063EBB3 */  lb        $v1, -0x144d($v1)
+/* C3DF64 80240374 3C038011 */  lui       $v1, %hi(D_8010EBB3)
+/* C3DF68 80240378 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
 /* C3DF6C 8024037C 24020009 */  addiu     $v0, $zero, 9
 /* C3DF70 80240380 50620001 */  beql      $v1, $v0, .L80240388
 /* C3DF74 80240384 0000882D */   daddu    $s1, $zero, $zero
diff --git a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_802406A4_C3E294.s b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_802406A4_C3E294.s
index 121fed2797..87d9b1c782 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_802406A4_C3E294.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_802406A4_C3E294.s
@@ -89,8 +89,8 @@ glabel func_802406A4_C3E294
 /* C3E3C8 802407D8 E7A00028 */  swc1      $f0, 0x28($sp)
 /* C3E3CC 802407DC 0C00A7E7 */  jal       add_vec2D_polar
 /* C3E3D0 802407E0 E7A2002C */   swc1     $f2, 0x2c($sp)
-/* C3E3D4 802407E4 3C028011 */  lui       $v0, 0x8011
-/* C3E3D8 802407E8 8C42C930 */  lw        $v0, -0x36d0($v0)
+/* C3E3D4 802407E4 3C028011 */  lui       $v0, %hi(D_8010C930)
+/* C3E3D8 802407E8 8C42C930 */  lw        $v0, %lo(D_8010C930)($v0)
 /* C3E3DC 802407EC C7AC0028 */  lwc1      $f12, 0x28($sp)
 /* C3E3E0 802407F0 C7AE002C */  lwc1      $f14, 0x2c($sp)
 /* C3E3E4 802407F4 8C460038 */  lw        $a2, 0x38($v0)
diff --git a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240BA0_C3E790.s b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240BA0_C3E790.s
index afac790394..5e34a66399 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240BA0_C3E790.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240BA0_C3E790.s
@@ -30,8 +30,8 @@ glabel func_80240BA0_C3E790
 /* C3E7F4 80240C04 0809030B */  j         .L80240C2C
 /* C3E7F8 80240C08 E4600018 */   swc1     $f0, 0x18($v1)
 .L80240C0C:
-/* C3E7FC 80240C0C 3C018024 */  lui       $at, 0x8024
-/* C3E800 80240C10 D4221E98 */  ldc1      $f2, 0x1e98($at)
+/* C3E7FC 80240C0C 3C018024 */  lui       $at, %hi(D_80241E98)
+/* C3E800 80240C10 D4221E98 */  ldc1      $f2, %lo(D_80241E98)($at)
 /* C3E804 80240C14 44820000 */  mtc1      $v0, $f0
 /* C3E808 80240C18 00000000 */  nop       
 /* C3E80C 80240C1C 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240E20_C3EA10.s b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240E20_C3EA10.s
index 2609eb775c..93dc2cb6ec 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240E20_C3EA10.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240E20_C3EA10.s
@@ -108,9 +108,9 @@ glabel func_80240E20_C3EA10
 /* C3EB94 80240FA4 2C620064 */  sltiu     $v0, $v1, 0x64
 /* C3EB98 80240FA8 10400067 */  beqz      $v0, .L80241148
 /* C3EB9C 80240FAC 00031080 */   sll      $v0, $v1, 2
-/* C3EBA0 80240FB0 3C018024 */  lui       $at, 0x8024
+/* C3EBA0 80240FB0 3C018024 */  lui       $at, %hi(D_80241EA0)
 /* C3EBA4 80240FB4 00220821 */  addu      $at, $at, $v0
-/* C3EBA8 80240FB8 8C221EA0 */  lw        $v0, 0x1ea0($at)
+/* C3EBA8 80240FB8 8C221EA0 */  lw        $v0, %lo(D_80241EA0)($at)
 /* C3EBAC 80240FBC 00400008 */  jr        $v0
 /* C3EBB0 80240FC0 00000000 */   nop      
 /* C3EBB4 80240FC4 0240202D */  daddu     $a0, $s2, $zero
diff --git a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80241170_C3ED60.s b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80241170_C3ED60.s
index 8ed02af49c..ca60a8473f 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80241170_C3ED60.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80241170_C3ED60.s
@@ -100,9 +100,9 @@ glabel func_80241170_C3ED60
 /* C3EEC4 802412D4 2C620064 */  sltiu     $v0, $v1, 0x64
 /* C3EEC8 802412D8 10400048 */  beqz      $v0, .L802413FC
 /* C3EECC 802412DC 00031080 */   sll      $v0, $v1, 2
-/* C3EED0 802412E0 3C018024 */  lui       $at, 0x8024
+/* C3EED0 802412E0 3C018024 */  lui       $at, %hi(D_80242030)
 /* C3EED4 802412E4 00220821 */  addu      $at, $at, $v0
-/* C3EED8 802412E8 8C222030 */  lw        $v0, 0x2030($at)
+/* C3EED8 802412E8 8C222030 */  lw        $v0, %lo(D_80242030)($at)
 /* C3EEDC 802412EC 00400008 */  jr        $v0
 /* C3EEE0 802412F0 00000000 */   nop      
 /* C3EEE4 802412F4 0240202D */  daddu     $a0, $s2, $zero
diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240000_C3FDB0.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240000_C3FDB0.s
index dae09ffee4..cba120c0c8 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240000_C3FDB0.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240000_C3FDB0.s
@@ -69,8 +69,8 @@ glabel func_80240000_C3FDB0
 /* C3FEA4 802400F4 08090047 */  j         .L8024011C
 /* C3FEA8 802400F8 E6800018 */   swc1     $f0, 0x18($s4)
 .L802400FC:
-/* C3FEAC 802400FC 3C018024 */  lui       $at, 0x8024
-/* C3FEB0 80240100 D4226A00 */  ldc1      $f2, 0x6a00($at)
+/* C3FEAC 802400FC 3C018024 */  lui       $at, %hi(D_80246A00)
+/* C3FEB0 80240100 D4226A00 */  ldc1      $f2, %lo(D_80246A00)($at)
 /* C3FEB4 80240104 44820000 */  mtc1      $v0, $f0
 /* C3FEB8 80240108 00000000 */  nop       
 /* C3FEBC 8024010C 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_8024067C_C4042C.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_8024067C_C4042C.s
index e8e5f6f2c0..b2e5fcbd3f 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_8024067C_C4042C.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_8024067C_C4042C.s
@@ -33,8 +33,8 @@ glabel func_8024067C_C4042C
 /* C40498 802406E8 080901C4 */  j         .L80240710
 /* C4049C 802406EC E4A00018 */   swc1     $f0, 0x18($a1)
 .L802406F0:
-/* C404A0 802406F0 3C018024 */  lui       $at, 0x8024
-/* C404A4 802406F4 D4226A08 */  ldc1      $f2, 0x6a08($at)
+/* C404A0 802406F0 3C018024 */  lui       $at, %hi(D_80246A08)
+/* C404A4 802406F4 D4226A08 */  ldc1      $f2, %lo(D_80246A08)($at)
 /* C404A8 802406F8 44820000 */  mtc1      $v0, $f0
 /* C404AC 802406FC 00000000 */  nop       
 /* C404B0 80240700 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240B94_C40944.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240B94_C40944.s
index 5c091d492e..1aa6ba07a4 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240B94_C40944.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240B94_C40944.s
@@ -124,9 +124,9 @@ glabel func_80240B94_C40944
 /* C40B08 80240D58 2C620064 */  sltiu     $v0, $v1, 0x64
 /* C40B0C 80240D5C 10400042 */  beqz      $v0, .L80240E68
 /* C40B10 80240D60 00031080 */   sll      $v0, $v1, 2
-/* C40B14 80240D64 3C018024 */  lui       $at, 0x8024
+/* C40B14 80240D64 3C018024 */  lui       $at, %hi(D_80246A10)
 /* C40B18 80240D68 00220821 */  addu      $at, $at, $v0
-/* C40B1C 80240D6C 8C226A10 */  lw        $v0, 0x6a10($at)
+/* C40B1C 80240D6C 8C226A10 */  lw        $v0, %lo(D_80246A10)($at)
 /* C40B20 80240D70 00400008 */  jr        $v0
 /* C40B24 80240D74 00000000 */   nop      
 /* C40B28 80240D78 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80241098_C40E48.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80241098_C40E48.s
index ec362bac70..9ab037f5be 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80241098_C40E48.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80241098_C40E48.s
@@ -18,8 +18,8 @@ glabel func_80241098_C40E48
 /* C40E7C 802410CC 0040802D */  daddu     $s0, $v0, $zero
 /* C40E80 802410D0 3C05800B */  lui       $a1, %hi(gCameras)
 /* C40E84 802410D4 24A51D80 */  addiu     $a1, $a1, %lo(gCameras)
-/* C40E88 802410D8 3C03800A */  lui       $v1, 0x800a
-/* C40E8C 802410DC 8463A634 */  lh        $v1, -0x59cc($v1)
+/* C40E88 802410D8 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* C40E8C 802410DC 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* C40E90 802410E0 00912021 */  addu      $a0, $a0, $s1
 /* C40E94 802410E4 00031080 */  sll       $v0, $v1, 2
 /* C40E98 802410E8 00431021 */  addu      $v0, $v0, $v1
@@ -54,8 +54,8 @@ glabel func_80241098_C40E48
 /* C40F08 80241158 00000000 */   nop      
 /* C40F0C 8024115C 0C00A6C9 */  jal       clamp_angle
 /* C40F10 80241160 46000306 */   mov.s    $f12, $f0
-/* C40F14 80241164 3C018024 */  lui       $at, 0x8024
-/* C40F18 80241168 D4226BA0 */  ldc1      $f2, 0x6ba0($at)
+/* C40F14 80241164 3C018024 */  lui       $at, %hi(D_80246BA0)
+/* C40F18 80241168 D4226BA0 */  ldc1      $f2, %lo(D_80246BA0)($at)
 /* C40F1C 8024116C 46000021 */  cvt.d.s   $f0, $f0
 /* C40F20 80241170 4622003C */  c.lt.d    $f0, $f2
 /* C40F24 80241174 00000000 */  nop       
@@ -97,8 +97,8 @@ glabel func_80241098_C40E48
 /* C40FAC 802411FC 45030001 */  bc1tl     .L80241204
 /* C40FB0 80241200 0000882D */   daddu    $s1, $zero, $zero
 .L80241204:
-/* C40FB4 80241204 3C038011 */  lui       $v1, 0x8011
-/* C40FB8 80241208 8063EBB3 */  lb        $v1, -0x144d($v1)
+/* C40FB4 80241204 3C038011 */  lui       $v1, %hi(D_8010EBB3)
+/* C40FB8 80241208 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
 /* C40FBC 8024120C 24020009 */  addiu     $v0, $zero, 9
 /* C40FC0 80241210 50620001 */  beql      $v1, $v0, .L80241218
 /* C40FC4 80241214 0000882D */   daddu    $s1, $zero, $zero
diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802414AC_C4125C.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802414AC_C4125C.s
index 039be36005..0afc693ae1 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802414AC_C4125C.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802414AC_C4125C.s
@@ -100,9 +100,9 @@ glabel func_802414AC_C4125C
 /* C413C0 80241610 2C620064 */  sltiu     $v0, $v1, 0x64
 /* C413C4 80241614 10400048 */  beqz      $v0, .L80241738
 /* C413C8 80241618 00031080 */   sll      $v0, $v1, 2
-/* C413CC 8024161C 3C018024 */  lui       $at, 0x8024
+/* C413CC 8024161C 3C018024 */  lui       $at, %hi(D_80246BA8)
 /* C413D0 80241620 00220821 */  addu      $at, $at, $v0
-/* C413D4 80241624 8C226BA8 */  lw        $v0, 0x6ba8($at)
+/* C413D4 80241624 8C226BA8 */  lw        $v0, %lo(D_80246BA8)($at)
 /* C413D8 80241628 00400008 */  jr        $v0
 /* C413DC 8024162C 00000000 */   nop      
 /* C413E0 80241630 0240202D */  daddu     $a0, $s2, $zero
diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80241760_C41510.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80241760_C41510.s
index 306920020c..90ffcb0f37 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80241760_C41510.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80241760_C41510.s
@@ -87,8 +87,8 @@ glabel func_80241760_C41510
 /* C41650 802418A0 08090632 */  j         .L802418C8
 /* C41654 802418A4 E6000018 */   swc1     $f0, 0x18($s0)
 .L802418A8:
-/* C41658 802418A8 3C018024 */  lui       $at, 0x8024
-/* C4165C 802418AC D4226D38 */  ldc1      $f2, 0x6d38($at)
+/* C41658 802418A8 3C018024 */  lui       $at, %hi(D_80246D38)
+/* C4165C 802418AC D4226D38 */  ldc1      $f2, %lo(D_80246D38)($at)
 /* C41660 802418B0 44820000 */  mtc1      $v0, $f0
 /* C41664 802418B4 00000000 */  nop       
 /* C41668 802418B8 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80241910_C416C0.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80241910_C416C0.s
index b814fbffa2..31b3f7c06d 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80241910_C416C0.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80241910_C416C0.s
@@ -104,8 +104,8 @@ glabel func_80241910_C416C0
 /* C41844 80241A94 1040000A */  beqz      $v0, .L80241AC0
 /* C41848 80241A98 4600C106 */   mov.s    $f4, $f24
 /* C4184C 80241A9C 4614C081 */  sub.s     $f2, $f24, $f20
-/* C41850 80241AA0 3C018024 */  lui       $at, 0x8024
-/* C41854 80241AA4 D4206D40 */  ldc1      $f0, 0x6d40($at)
+/* C41850 80241AA0 3C018024 */  lui       $at, %hi(D_80246D40)
+/* C41854 80241AA4 D4206D40 */  ldc1      $f0, %lo(D_80246D40)($at)
 /* C41858 80241AA8 460010A1 */  cvt.d.s   $f2, $f2
 /* C4185C 80241AAC 46201082 */  mul.d     $f2, $f2, $f0
 /* C41860 80241AB0 00000000 */  nop       
@@ -131,8 +131,8 @@ glabel func_80241910_C416C0
 /* C418AC 80241AFC C7A4002C */  lwc1      $f4, 0x2c($sp)
 /* C418B0 80241B00 461A2100 */  add.s     $f4, $f4, $f26
 /* C418B4 80241B04 46142081 */  sub.s     $f2, $f4, $f20
-/* C418B8 80241B08 3C018024 */  lui       $at, 0x8024
-/* C418BC 80241B0C D4206D48 */  ldc1      $f0, 0x6d48($at)
+/* C418B8 80241B08 3C018024 */  lui       $at, %hi(D_80246D48)
+/* C418BC 80241B0C D4206D48 */  ldc1      $f0, %lo(D_80246D48)($at)
 /* C418C0 80241B10 460010A1 */  cvt.d.s   $f2, $f2
 /* C418C4 80241B14 46201082 */  mul.d     $f2, $f2, $f0
 /* C418C8 80241B18 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802423B4_C42164.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802423B4_C42164.s
index 0f995ab5b8..7a2d34446e 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802423B4_C42164.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802423B4_C42164.s
@@ -15,9 +15,9 @@ glabel func_802423B4_C42164
 /* C4218C 802423DC 00031C00 */  sll       $v1, $v1, 0x10
 /* C42190 802423E0 00031B83 */  sra       $v1, $v1, 0xe
 /* C42194 802423E4 A444008E */  sh        $a0, 0x8e($v0)
-/* C42198 802423E8 3C018024 */  lui       $at, 0x8024
+/* C42198 802423E8 3C018024 */  lui       $at, %hi(D_80244460)
 /* C4219C 802423EC 00230821 */  addu      $at, $at, $v1
-/* C421A0 802423F0 C4224460 */  lwc1      $f2, 0x4460($at)
+/* C421A0 802423F0 C4224460 */  lwc1      $f2, %lo(D_80244460)($at)
 /* C421A4 802423F4 8443008E */  lh        $v1, 0x8e($v0)
 /* C421A8 802423F8 46020000 */  add.s     $f0, $f0, $f2
 /* C421AC 802423FC 28630005 */  slti      $v1, $v1, 5
diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242A6C_C4281C.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242A6C_C4281C.s
index 0614bf0d27..0a41cb5dd5 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242A6C_C4281C.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242A6C_C4281C.s
@@ -66,9 +66,9 @@ glabel func_80242A6C_C4281C
 /* C42908 80242B58 2C62000F */  sltiu     $v0, $v1, 0xf
 /* C4290C 80242B5C 10400034 */  beqz      $v0, .L80242C30
 /* C42910 80242B60 00031080 */   sll      $v0, $v1, 2
-/* C42914 80242B64 3C018024 */  lui       $at, 0x8024
+/* C42914 80242B64 3C018024 */  lui       $at, %hi(D_80246D50)
 /* C42918 80242B68 00220821 */  addu      $at, $at, $v0
-/* C4291C 80242B6C 8C226D50 */  lw        $v0, 0x6d50($at)
+/* C4291C 80242B6C 8C226D50 */  lw        $v0, %lo(D_80246D50)($at)
 /* C42920 80242B70 00400008 */  jr        $v0
 /* C42924 80242B74 00000000 */   nop      
 /* C42928 80242B78 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242F94_C42D44.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242F94_C42D44.s
index a44ea33a62..31b2561e8b 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242F94_C42D44.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242F94_C42D44.s
@@ -57,8 +57,8 @@ glabel func_80242F94_C42D44
 /* C42E10 80243060 E6420038 */  swc1      $f2, 0x38($s2)
 /* C42E14 80243064 C4420030 */  lwc1      $f2, 0x30($v0)
 /* C42E18 80243068 46001080 */  add.s     $f2, $f2, $f0
-/* C42E1C 8024306C 3C018024 */  lui       $at, 0x8024
-/* C42E20 80243070 D4266D90 */  ldc1      $f6, 0x6d90($at)
+/* C42E1C 8024306C 3C018024 */  lui       $at, %hi(D_80246D90)
+/* C42E20 80243070 D4266D90 */  ldc1      $f6, %lo(D_80246D90)($at)
 /* C42E24 80243074 46002021 */  cvt.d.s   $f0, $f4
 /* C42E28 80243078 4620303C */  c.lt.d    $f6, $f0
 /* C42E2C 8024307C E6440048 */  swc1      $f4, 0x48($s2)
@@ -137,8 +137,8 @@ glabel func_80242F94_C42D44
 /* C42F4C 8024319C 00000000 */  nop       
 /* C42F50 802431A0 45000008 */  bc1f      .L802431C4
 /* C42F54 802431A4 3C03FFDF */   lui      $v1, 0xffdf
-/* C42F58 802431A8 3C018024 */  lui       $at, 0x8024
-/* C42F5C 802431AC D4226D98 */  ldc1      $f2, 0x6d98($at)
+/* C42F58 802431A8 3C018024 */  lui       $at, %hi(D_80246D98)
+/* C42F5C 802431AC D4226D98 */  ldc1      $f2, %lo(D_80246D98)($at)
 /* C42F60 802431B0 46002021 */  cvt.d.s   $f0, $f4
 /* C42F64 802431B4 46220001 */  sub.d     $f0, $f0, $f2
 /* C42F68 802431B8 46200020 */  cvt.s.d   $f0, $f0
@@ -150,8 +150,8 @@ glabel func_80242F94_C42D44
 /* C42F7C 802431CC AE400048 */  sw        $zero, 0x48($s2)
 /* C42F80 802431D0 00431024 */  and       $v0, $v0, $v1
 /* C42F84 802431D4 AE420000 */  sw        $v0, ($s2)
-/* C42F88 802431D8 3C038011 */  lui       $v1, 0x8011
-/* C42F8C 802431DC 8063EBB3 */  lb        $v1, -0x144d($v1)
+/* C42F88 802431D8 3C038011 */  lui       $v1, %hi(D_8010EBB3)
+/* C42F8C 802431DC 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
 /* C42F90 802431E0 24020009 */  addiu     $v0, $zero, 9
 /* C42F94 802431E4 10620009 */  beq       $v1, $v0, .L8024320C
 /* C42F98 802431E8 24020010 */   addiu    $v0, $zero, 0x10
diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802434B0_C43260.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802434B0_C43260.s
index 11ff105eac..087f2657dc 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802434B0_C43260.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802434B0_C43260.s
@@ -18,8 +18,8 @@ glabel func_802434B0_C43260
 /* C43294 802434E4 28420003 */  slti      $v0, $v0, 3
 /* C43298 802434E8 1440000D */  bnez      $v0, .L80243520
 /* C4329C 802434EC 24020009 */   addiu    $v0, $zero, 9
-/* C432A0 802434F0 3C038011 */  lui       $v1, 0x8011
-/* C432A4 802434F4 8063EBB3 */  lb        $v1, -0x144d($v1)
+/* C432A0 802434F0 3C038011 */  lui       $v1, %hi(D_8010EBB3)
+/* C432A4 802434F4 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
 /* C432A8 802434F8 10620003 */  beq       $v1, $v0, .L80243508
 /* C432AC 802434FC 24020064 */   addiu    $v0, $zero, 0x64
 /* C432B0 80243500 08090D47 */  j         .L8024351C
diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802438F0_C436A0.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802438F0_C436A0.s
index f7c58ed253..0873c74d4e 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802438F0_C436A0.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802438F0_C436A0.s
@@ -54,9 +54,9 @@ glabel func_802438F0_C436A0
 /* C43760 802439B0 2C620020 */  sltiu     $v0, $v1, 0x20
 /* C43764 802439B4 10400060 */  beqz      $v0, .L80243B38
 /* C43768 802439B8 00031080 */   sll      $v0, $v1, 2
-/* C4376C 802439BC 3C018024 */  lui       $at, 0x8024
+/* C4376C 802439BC 3C018024 */  lui       $at, %hi(D_80246DA0)
 /* C43770 802439C0 00220821 */  addu      $at, $at, $v0
-/* C43774 802439C4 8C226DA0 */  lw        $v0, 0x6da0($at)
+/* C43774 802439C4 8C226DA0 */  lw        $v0, %lo(D_80246DA0)($at)
 /* C43778 802439C8 00400008 */  jr        $v0
 /* C4377C 802439CC 00000000 */   nop      
 /* C43780 802439D0 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240208_C46DE8.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240208_C46DE8.s
index 02d2c662d3..f94a77ce70 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240208_C46DE8.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240208_C46DE8.s
@@ -18,8 +18,8 @@ glabel func_80240208_C46DE8
 /* C46E1C 8024023C 0040802D */  daddu     $s0, $v0, $zero
 /* C46E20 80240240 3C05800B */  lui       $a1, %hi(gCameras)
 /* C46E24 80240244 24A51D80 */  addiu     $a1, $a1, %lo(gCameras)
-/* C46E28 80240248 3C03800A */  lui       $v1, 0x800a
-/* C46E2C 8024024C 8463A634 */  lh        $v1, -0x59cc($v1)
+/* C46E28 80240248 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* C46E2C 8024024C 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* C46E30 80240250 00912021 */  addu      $a0, $a0, $s1
 /* C46E34 80240254 00031080 */  sll       $v0, $v1, 2
 /* C46E38 80240258 00431021 */  addu      $v0, $v0, $v1
@@ -54,8 +54,8 @@ glabel func_80240208_C46DE8
 /* C46EA8 802402C8 00000000 */   nop      
 /* C46EAC 802402CC 0C00A6C9 */  jal       clamp_angle
 /* C46EB0 802402D0 46000306 */   mov.s    $f12, $f0
-/* C46EB4 802402D4 3C018024 */  lui       $at, 0x8024
-/* C46EB8 802402D8 D4225390 */  ldc1      $f2, 0x5390($at)
+/* C46EB4 802402D4 3C018024 */  lui       $at, %hi(D_80245390)
+/* C46EB8 802402D8 D4225390 */  ldc1      $f2, %lo(D_80245390)($at)
 /* C46EBC 802402DC 46000021 */  cvt.d.s   $f0, $f0
 /* C46EC0 802402E0 4622003C */  c.lt.d    $f0, $f2
 /* C46EC4 802402E4 00000000 */  nop       
@@ -97,8 +97,8 @@ glabel func_80240208_C46DE8
 /* C46F4C 8024036C 45030001 */  bc1tl     .L80240374
 /* C46F50 80240370 0000882D */   daddu    $s1, $zero, $zero
 .L80240374:
-/* C46F54 80240374 3C038011 */  lui       $v1, 0x8011
-/* C46F58 80240378 8063EBB3 */  lb        $v1, -0x144d($v1)
+/* C46F54 80240374 3C038011 */  lui       $v1, %hi(D_8010EBB3)
+/* C46F58 80240378 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
 /* C46F5C 8024037C 24020009 */  addiu     $v0, $zero, 9
 /* C46F60 80240380 50620001 */  beql      $v1, $v0, .L80240388
 /* C46F64 80240384 0000882D */   daddu    $s1, $zero, $zero
diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024061C_C471FC.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024061C_C471FC.s
index 0652ccff4e..22f7b9630f 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024061C_C471FC.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024061C_C471FC.s
@@ -100,9 +100,9 @@ glabel func_8024061C_C471FC
 /* C47360 80240780 2C620064 */  sltiu     $v0, $v1, 0x64
 /* C47364 80240784 10400048 */  beqz      $v0, .L802408A8
 /* C47368 80240788 00031080 */   sll      $v0, $v1, 2
-/* C4736C 8024078C 3C018024 */  lui       $at, 0x8024
+/* C4736C 8024078C 3C018024 */  lui       $at, %hi(D_80245398)
 /* C47370 80240790 00220821 */  addu      $at, $at, $v0
-/* C47374 80240794 8C225398 */  lw        $v0, 0x5398($at)
+/* C47374 80240794 8C225398 */  lw        $v0, %lo(D_80245398)($at)
 /* C47378 80240798 00400008 */  jr        $v0
 /* C4737C 8024079C 00000000 */   nop      
 /* C47380 802407A0 0240202D */  daddu     $a0, $s2, $zero
diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240958_C47538.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240958_C47538.s
index 0c5d6aa6ea..5af333cadd 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240958_C47538.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240958_C47538.s
@@ -89,8 +89,8 @@ glabel func_80240958_C47538
 /* C4766C 80240A8C E7A00028 */  swc1      $f0, 0x28($sp)
 /* C47670 80240A90 0C00A7E7 */  jal       add_vec2D_polar
 /* C47674 80240A94 E7A2002C */   swc1     $f2, 0x2c($sp)
-/* C47678 80240A98 3C028011 */  lui       $v0, 0x8011
-/* C4767C 80240A9C 8C42C930 */  lw        $v0, -0x36d0($v0)
+/* C47678 80240A98 3C028011 */  lui       $v0, %hi(D_8010C930)
+/* C4767C 80240A9C 8C42C930 */  lw        $v0, %lo(D_8010C930)($v0)
 /* C47680 80240AA0 C7AC0028 */  lwc1      $f12, 0x28($sp)
 /* C47684 80240AA4 C7AE002C */  lwc1      $f14, 0x2c($sp)
 /* C47688 80240AA8 8C460038 */  lw        $a2, 0x38($v0)
diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240E54_C47A34.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240E54_C47A34.s
index 8cb9b7a8a4..1b9640aadc 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240E54_C47A34.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240E54_C47A34.s
@@ -30,8 +30,8 @@ glabel func_80240E54_C47A34
 /* C47A98 80240EB8 080903B8 */  j         .L80240EE0
 /* C47A9C 80240EBC E4600018 */   swc1     $f0, 0x18($v1)
 .L80240EC0:
-/* C47AA0 80240EC0 3C018024 */  lui       $at, 0x8024
-/* C47AA4 80240EC4 D4225528 */  ldc1      $f2, 0x5528($at)
+/* C47AA0 80240EC0 3C018024 */  lui       $at, %hi(D_80245528)
+/* C47AA4 80240EC4 D4225528 */  ldc1      $f2, %lo(D_80245528)($at)
 /* C47AA8 80240EC8 44820000 */  mtc1      $v0, $f0
 /* C47AAC 80240ECC 00000000 */  nop       
 /* C47AB0 80240ED0 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802410D4_C47CB4.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802410D4_C47CB4.s
index 4fdbbc7520..281a5d41b6 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802410D4_C47CB4.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802410D4_C47CB4.s
@@ -108,9 +108,9 @@ glabel func_802410D4_C47CB4
 /* C47E38 80241258 2C620064 */  sltiu     $v0, $v1, 0x64
 /* C47E3C 8024125C 10400067 */  beqz      $v0, .L802413FC
 /* C47E40 80241260 00031080 */   sll      $v0, $v1, 2
-/* C47E44 80241264 3C018024 */  lui       $at, 0x8024
+/* C47E44 80241264 3C018024 */  lui       $at, %hi(D_80245530)
 /* C47E48 80241268 00220821 */  addu      $at, $at, $v0
-/* C47E4C 8024126C 8C225530 */  lw        $v0, 0x5530($at)
+/* C47E4C 8024126C 8C225530 */  lw        $v0, %lo(D_80245530)($at)
 /* C47E50 80241270 00400008 */  jr        $v0
 /* C47E54 80241274 00000000 */   nop      
 /* C47E58 80241278 0240202D */  daddu     $a0, $s2, $zero
diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80241424_C48004.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80241424_C48004.s
index 534306964b..a00f86d39e 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80241424_C48004.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80241424_C48004.s
@@ -87,8 +87,8 @@ glabel func_80241424_C48004
 /* C48144 80241564 08090563 */  j         .L8024158C
 /* C48148 80241568 E6000018 */   swc1     $f0, 0x18($s0)
 .L8024156C:
-/* C4814C 8024156C 3C018024 */  lui       $at, 0x8024
-/* C48150 80241570 D42256C0 */  ldc1      $f2, 0x56c0($at)
+/* C4814C 8024156C 3C018024 */  lui       $at, %hi(D_802456C0)
+/* C48150 80241570 D42256C0 */  ldc1      $f2, %lo(D_802456C0)($at)
 /* C48154 80241574 44820000 */  mtc1      $v0, $f0
 /* C48158 80241578 00000000 */  nop       
 /* C4815C 8024157C 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802415D4_C481B4.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802415D4_C481B4.s
index 75b9f1f0d1..066bd84a16 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802415D4_C481B4.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802415D4_C481B4.s
@@ -104,8 +104,8 @@ glabel func_802415D4_C481B4
 /* C48338 80241758 1040000A */  beqz      $v0, .L80241784
 /* C4833C 8024175C 4600C106 */   mov.s    $f4, $f24
 /* C48340 80241760 4614C081 */  sub.s     $f2, $f24, $f20
-/* C48344 80241764 3C018024 */  lui       $at, 0x8024
-/* C48348 80241768 D42056C8 */  ldc1      $f0, 0x56c8($at)
+/* C48344 80241764 3C018024 */  lui       $at, %hi(D_802456C8)
+/* C48348 80241768 D42056C8 */  ldc1      $f0, %lo(D_802456C8)($at)
 /* C4834C 8024176C 460010A1 */  cvt.d.s   $f2, $f2
 /* C48350 80241770 46201082 */  mul.d     $f2, $f2, $f0
 /* C48354 80241774 00000000 */  nop       
@@ -131,8 +131,8 @@ glabel func_802415D4_C481B4
 /* C483A0 802417C0 C7A4002C */  lwc1      $f4, 0x2c($sp)
 /* C483A4 802417C4 461A2100 */  add.s     $f4, $f4, $f26
 /* C483A8 802417C8 46142081 */  sub.s     $f2, $f4, $f20
-/* C483AC 802417CC 3C018024 */  lui       $at, 0x8024
-/* C483B0 802417D0 D42056D0 */  ldc1      $f0, 0x56d0($at)
+/* C483AC 802417CC 3C018024 */  lui       $at, %hi(D_802456D0)
+/* C483B0 802417D0 D42056D0 */  ldc1      $f0, %lo(D_802456D0)($at)
 /* C483B4 802417D4 460010A1 */  cvt.d.s   $f2, $f2
 /* C483B8 802417D8 46201082 */  mul.d     $f2, $f2, $f0
 /* C483BC 802417DC 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242078_C48C58.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242078_C48C58.s
index d2c07b3016..d19b83535b 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242078_C48C58.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242078_C48C58.s
@@ -15,9 +15,9 @@ glabel func_80242078_C48C58
 /* C48C80 802420A0 00031C00 */  sll       $v1, $v1, 0x10
 /* C48C84 802420A4 00031B83 */  sra       $v1, $v1, 0xe
 /* C48C88 802420A8 A444008E */  sh        $a0, 0x8e($v0)
-/* C48C8C 802420AC 3C018024 */  lui       $at, 0x8024
+/* C48C8C 802420AC 3C018024 */  lui       $at, %hi(D_80244358)
 /* C48C90 802420B0 00230821 */  addu      $at, $at, $v1
-/* C48C94 802420B4 C4224358 */  lwc1      $f2, 0x4358($at)
+/* C48C94 802420B4 C4224358 */  lwc1      $f2, %lo(D_80244358)($at)
 /* C48C98 802420B8 8443008E */  lh        $v1, 0x8e($v0)
 /* C48C9C 802420BC 46020000 */  add.s     $f0, $f0, $f2
 /* C48CA0 802420C0 28630005 */  slti      $v1, $v1, 5
diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242C1C_C497FC.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242C1C_C497FC.s
index 4e9b8a1ae8..58d9302881 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242C1C_C497FC.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242C1C_C497FC.s
@@ -57,8 +57,8 @@ glabel func_80242C1C_C497FC
 /* C498C8 80242CE8 E6420038 */  swc1      $f2, 0x38($s2)
 /* C498CC 80242CEC C4420030 */  lwc1      $f2, 0x30($v0)
 /* C498D0 80242CF0 46001080 */  add.s     $f2, $f2, $f0
-/* C498D4 80242CF4 3C018024 */  lui       $at, 0x8024
-/* C498D8 80242CF8 D4265718 */  ldc1      $f6, 0x5718($at)
+/* C498D4 80242CF4 3C018024 */  lui       $at, %hi(D_80245718)
+/* C498D8 80242CF8 D4265718 */  ldc1      $f6, %lo(D_80245718)($at)
 /* C498DC 80242CFC 46002021 */  cvt.d.s   $f0, $f4
 /* C498E0 80242D00 4620303C */  c.lt.d    $f6, $f0
 /* C498E4 80242D04 E6440048 */  swc1      $f4, 0x48($s2)
@@ -137,8 +137,8 @@ glabel func_80242C1C_C497FC
 /* C49A04 80242E24 00000000 */  nop       
 /* C49A08 80242E28 45000008 */  bc1f      .L80242E4C
 /* C49A0C 80242E2C 3C03FFDF */   lui      $v1, 0xffdf
-/* C49A10 80242E30 3C018024 */  lui       $at, 0x8024
-/* C49A14 80242E34 D4225720 */  ldc1      $f2, 0x5720($at)
+/* C49A10 80242E30 3C018024 */  lui       $at, %hi(D_80245720)
+/* C49A14 80242E34 D4225720 */  ldc1      $f2, %lo(D_80245720)($at)
 /* C49A18 80242E38 46002021 */  cvt.d.s   $f0, $f4
 /* C49A1C 80242E3C 46220001 */  sub.d     $f0, $f0, $f2
 /* C49A20 80242E40 46200020 */  cvt.s.d   $f0, $f0
@@ -150,8 +150,8 @@ glabel func_80242C1C_C497FC
 /* C49A34 80242E54 AE400048 */  sw        $zero, 0x48($s2)
 /* C49A38 80242E58 00431024 */  and       $v0, $v0, $v1
 /* C49A3C 80242E5C AE420000 */  sw        $v0, ($s2)
-/* C49A40 80242E60 3C038011 */  lui       $v1, 0x8011
-/* C49A44 80242E64 8063EBB3 */  lb        $v1, -0x144d($v1)
+/* C49A40 80242E60 3C038011 */  lui       $v1, %hi(D_8010EBB3)
+/* C49A44 80242E64 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
 /* C49A48 80242E68 24020009 */  addiu     $v0, $zero, 9
 /* C49A4C 80242E6C 10620009 */  beq       $v1, $v0, .L80242E94
 /* C49A50 80242E70 24020010 */   addiu    $v0, $zero, 0x10
diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80243138_C49D18.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80243138_C49D18.s
index 03f8318529..4149d83fd3 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80243138_C49D18.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80243138_C49D18.s
@@ -18,8 +18,8 @@ glabel func_80243138_C49D18
 /* C49D4C 8024316C 28420003 */  slti      $v0, $v0, 3
 /* C49D50 80243170 1440000D */  bnez      $v0, .L802431A8
 /* C49D54 80243174 24020009 */   addiu    $v0, $zero, 9
-/* C49D58 80243178 3C038011 */  lui       $v1, 0x8011
-/* C49D5C 8024317C 8063EBB3 */  lb        $v1, -0x144d($v1)
+/* C49D58 80243178 3C038011 */  lui       $v1, %hi(D_8010EBB3)
+/* C49D5C 8024317C 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
 /* C49D60 80243180 10620003 */  beq       $v1, $v0, .L80243190
 /* C49D64 80243184 24020064 */   addiu    $v0, $zero, 0x64
 /* C49D68 80243188 08090C69 */  j         .L802431A4
diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80243578_C4A158.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80243578_C4A158.s
index 92a943956a..a8ac9d62f7 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80243578_C4A158.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80243578_C4A158.s
@@ -54,9 +54,9 @@ glabel func_80243578_C4A158
 /* C4A218 80243638 2C620020 */  sltiu     $v0, $v1, 0x20
 /* C4A21C 8024363C 10400060 */  beqz      $v0, .L802437C0
 /* C4A220 80243640 00031080 */   sll      $v0, $v1, 2
-/* C4A224 80243644 3C018024 */  lui       $at, 0x8024
+/* C4A224 80243644 3C018024 */  lui       $at, %hi(D_80245728)
 /* C4A228 80243648 00220821 */  addu      $at, $at, $v0
-/* C4A22C 8024364C 8C225728 */  lw        $v0, 0x5728($at)
+/* C4A22C 8024364C 8C225728 */  lw        $v0, %lo(D_80245728)($at)
 /* C4A230 80243650 00400008 */  jr        $v0
 /* C4A234 80243654 00000000 */   nop      
 /* C4A238 80243658 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_dgb/dgb_12/C4DEF0/func_80240000_C4DEF0.s b/asm/nonmatchings/world/area_dgb/dgb_12/C4DEF0/func_80240000_C4DEF0.s
index 53b62b9ecc..09d46455de 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_12/C4DEF0/func_80240000_C4DEF0.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_12/C4DEF0/func_80240000_C4DEF0.s
@@ -4,8 +4,8 @@
 glabel func_80240000_C4DEF0
 /* C4DEF0 80240000 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* C4DEF4 80240004 AFB00010 */  sw        $s0, 0x10($sp)
-/* C4DEF8 80240008 3C108024 */  lui       $s0, 0x8024
-/* C4DEFC 8024000C 26100870 */  addiu     $s0, $s0, 0x870
+/* C4DEF8 80240008 3C108024 */  lui       $s0, %hi(D_80240870)
+/* C4DEFC 8024000C 26100870 */  addiu     $s0, $s0, %lo(D_80240870)
 /* C4DF00 80240010 AFBF0018 */  sw        $ra, 0x18($sp)
 /* C4DF04 80240014 AFB10014 */  sw        $s1, 0x14($sp)
 /* C4DF08 80240018 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_80240000_C4DEF0
 /* C4DF6C 8024007C 28620010 */  slti      $v0, $v1, 0x10
 /* C4DF70 80240080 1440FFFA */  bnez      $v0, .L8024006C
 /* C4DF74 80240084 24840004 */   addiu    $a0, $a0, 4
-/* C4DF78 80240088 3C108024 */  lui       $s0, 0x8024
-/* C4DF7C 8024008C 26100870 */  addiu     $s0, $s0, 0x870
+/* C4DF78 80240088 3C108024 */  lui       $s0, %hi(D_80240870)
+/* C4DF7C 8024008C 26100870 */  addiu     $s0, $s0, %lo(D_80240870)
 /* C4DF80 80240090 0C00AB4B */  jal       heap_free
 /* C4DF84 80240094 8E040000 */   lw       $a0, ($s0)
 /* C4DF88 80240098 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80240208_C4F718.s b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80240208_C4F718.s
index f4c17ac8cc..69682c7bcc 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80240208_C4F718.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80240208_C4F718.s
@@ -18,8 +18,8 @@ glabel func_80240208_C4F718
 /* C4F74C 8024023C 0040802D */  daddu     $s0, $v0, $zero
 /* C4F750 80240240 3C05800B */  lui       $a1, %hi(gCameras)
 /* C4F754 80240244 24A51D80 */  addiu     $a1, $a1, %lo(gCameras)
-/* C4F758 80240248 3C03800A */  lui       $v1, 0x800a
-/* C4F75C 8024024C 8463A634 */  lh        $v1, -0x59cc($v1)
+/* C4F758 80240248 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* C4F75C 8024024C 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* C4F760 80240250 00912021 */  addu      $a0, $a0, $s1
 /* C4F764 80240254 00031080 */  sll       $v0, $v1, 2
 /* C4F768 80240258 00431021 */  addu      $v0, $v0, $v1
@@ -54,8 +54,8 @@ glabel func_80240208_C4F718
 /* C4F7D8 802402C8 00000000 */   nop      
 /* C4F7DC 802402CC 0C00A6C9 */  jal       clamp_angle
 /* C4F7E0 802402D0 46000306 */   mov.s    $f12, $f0
-/* C4F7E4 802402D4 3C018024 */  lui       $at, 0x8024
-/* C4F7E8 802402D8 D4222CF0 */  ldc1      $f2, 0x2cf0($at)
+/* C4F7E4 802402D4 3C018024 */  lui       $at, %hi(D_80242CF0)
+/* C4F7E8 802402D8 D4222CF0 */  ldc1      $f2, %lo(D_80242CF0)($at)
 /* C4F7EC 802402DC 46000021 */  cvt.d.s   $f0, $f0
 /* C4F7F0 802402E0 4622003C */  c.lt.d    $f0, $f2
 /* C4F7F4 802402E4 00000000 */  nop       
@@ -97,8 +97,8 @@ glabel func_80240208_C4F718
 /* C4F87C 8024036C 45030001 */  bc1tl     .L80240374
 /* C4F880 80240370 0000882D */   daddu    $s1, $zero, $zero
 .L80240374:
-/* C4F884 80240374 3C038011 */  lui       $v1, 0x8011
-/* C4F888 80240378 8063EBB3 */  lb        $v1, -0x144d($v1)
+/* C4F884 80240374 3C038011 */  lui       $v1, %hi(D_8010EBB3)
+/* C4F888 80240378 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
 /* C4F88C 8024037C 24020009 */  addiu     $v0, $zero, 9
 /* C4F890 80240380 50620001 */  beql      $v1, $v0, .L80240388
 /* C4F894 80240384 0000882D */   daddu    $s1, $zero, $zero
diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024061C_C4FB2C.s b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024061C_C4FB2C.s
index bc4ef18b33..382d8a4461 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024061C_C4FB2C.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024061C_C4FB2C.s
@@ -100,9 +100,9 @@ glabel func_8024061C_C4FB2C
 /* C4FC90 80240780 2C620064 */  sltiu     $v0, $v1, 0x64
 /* C4FC94 80240784 10400048 */  beqz      $v0, .L802408A8
 /* C4FC98 80240788 00031080 */   sll      $v0, $v1, 2
-/* C4FC9C 8024078C 3C018024 */  lui       $at, 0x8024
+/* C4FC9C 8024078C 3C018024 */  lui       $at, %hi(D_80242CF8)
 /* C4FCA0 80240790 00220821 */  addu      $at, $at, $v0
-/* C4FCA4 80240794 8C222CF8 */  lw        $v0, 0x2cf8($at)
+/* C4FCA4 80240794 8C222CF8 */  lw        $v0, %lo(D_80242CF8)($at)
 /* C4FCA8 80240798 00400008 */  jr        $v0
 /* C4FCAC 8024079C 00000000 */   nop      
 /* C4FCB0 802407A0 0240202D */  daddu     $a0, $s2, $zero
diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_802408D0_C4FDE0.s b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_802408D0_C4FDE0.s
index 3d0147cb7a..0d6131e08e 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_802408D0_C4FDE0.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_802408D0_C4FDE0.s
@@ -69,8 +69,8 @@ glabel func_802408D0_C4FDE0
 /* C4FED4 802409C4 0809027B */  j         .L802409EC
 /* C4FED8 802409C8 E6800018 */   swc1     $f0, 0x18($s4)
 .L802409CC:
-/* C4FEDC 802409CC 3C018024 */  lui       $at, 0x8024
-/* C4FEE0 802409D0 D4222E88 */  ldc1      $f2, 0x2e88($at)
+/* C4FEDC 802409CC 3C018024 */  lui       $at, %hi(D_80242E88)
+/* C4FEE0 802409D0 D4222E88 */  ldc1      $f2, %lo(D_80242E88)($at)
 /* C4FEE4 802409D4 44820000 */  mtc1      $v0, $f0
 /* C4FEE8 802409D8 00000000 */  nop       
 /* C4FEEC 802409DC 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80240F4C_C5045C.s b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80240F4C_C5045C.s
index 2ea3cc8a20..37f31ff003 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80240F4C_C5045C.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80240F4C_C5045C.s
@@ -33,8 +33,8 @@ glabel func_80240F4C_C5045C
 /* C504C8 80240FB8 080903F8 */  j         .L80240FE0
 /* C504CC 80240FBC E4A00018 */   swc1     $f0, 0x18($a1)
 .L80240FC0:
-/* C504D0 80240FC0 3C018024 */  lui       $at, 0x8024
-/* C504D4 80240FC4 D4222E90 */  ldc1      $f2, 0x2e90($at)
+/* C504D0 80240FC0 3C018024 */  lui       $at, %hi(D_80242E90)
+/* C504D4 80240FC4 D4222E90 */  ldc1      $f2, %lo(D_80242E90)($at)
 /* C504D8 80240FC8 44820000 */  mtc1      $v0, $f0
 /* C504DC 80240FCC 00000000 */  nop       
 /* C504E0 80240FD0 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80241464_C50974.s b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80241464_C50974.s
index 3fbc07a9a7..0187b19557 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80241464_C50974.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80241464_C50974.s
@@ -124,9 +124,9 @@ glabel func_80241464_C50974
 /* C50B38 80241628 2C620064 */  sltiu     $v0, $v1, 0x64
 /* C50B3C 8024162C 10400042 */  beqz      $v0, .L80241738
 /* C50B40 80241630 00031080 */   sll      $v0, $v1, 2
-/* C50B44 80241634 3C018024 */  lui       $at, 0x8024
+/* C50B44 80241634 3C018024 */  lui       $at, %hi(D_80242E98)
 /* C50B48 80241638 00220821 */  addu      $at, $at, $v0
-/* C50B4C 8024163C 8C222E98 */  lw        $v0, 0x2e98($at)
+/* C50B4C 8024163C 8C222E98 */  lw        $v0, %lo(D_80242E98)($at)
 /* C50B50 80241640 00400008 */  jr        $v0
 /* C50B54 80241644 00000000 */   nop      
 /* C50B58 80241648 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240208_C52748.s b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240208_C52748.s
index f85f8bc734..ead10bba27 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240208_C52748.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240208_C52748.s
@@ -18,8 +18,8 @@ glabel func_80240208_C52748
 /* C5277C 8024023C 0040802D */  daddu     $s0, $v0, $zero
 /* C52780 80240240 3C05800B */  lui       $a1, %hi(gCameras)
 /* C52784 80240244 24A51D80 */  addiu     $a1, $a1, %lo(gCameras)
-/* C52788 80240248 3C03800A */  lui       $v1, 0x800a
-/* C5278C 8024024C 8463A634 */  lh        $v1, -0x59cc($v1)
+/* C52788 80240248 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* C5278C 8024024C 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* C52790 80240250 00912021 */  addu      $a0, $a0, $s1
 /* C52794 80240254 00031080 */  sll       $v0, $v1, 2
 /* C52798 80240258 00431021 */  addu      $v0, $v0, $v1
@@ -54,8 +54,8 @@ glabel func_80240208_C52748
 /* C52808 802402C8 00000000 */   nop      
 /* C5280C 802402CC 0C00A6C9 */  jal       clamp_angle
 /* C52810 802402D0 46000306 */   mov.s    $f12, $f0
-/* C52814 802402D4 3C018024 */  lui       $at, 0x8024
-/* C52818 802402D8 D42231F0 */  ldc1      $f2, 0x31f0($at)
+/* C52814 802402D4 3C018024 */  lui       $at, %hi(D_802431F0)
+/* C52818 802402D8 D42231F0 */  ldc1      $f2, %lo(D_802431F0)($at)
 /* C5281C 802402DC 46000021 */  cvt.d.s   $f0, $f0
 /* C52820 802402E0 4622003C */  c.lt.d    $f0, $f2
 /* C52824 802402E4 00000000 */  nop       
@@ -97,8 +97,8 @@ glabel func_80240208_C52748
 /* C528AC 8024036C 45030001 */  bc1tl     .L80240374
 /* C528B0 80240370 0000882D */   daddu    $s1, $zero, $zero
 .L80240374:
-/* C528B4 80240374 3C038011 */  lui       $v1, 0x8011
-/* C528B8 80240378 8063EBB3 */  lb        $v1, -0x144d($v1)
+/* C528B4 80240374 3C038011 */  lui       $v1, %hi(D_8010EBB3)
+/* C528B8 80240378 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
 /* C528BC 8024037C 24020009 */  addiu     $v0, $zero, 9
 /* C528C0 80240380 50620001 */  beql      $v1, $v0, .L80240388
 /* C528C4 80240384 0000882D */   daddu    $s1, $zero, $zero
diff --git a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_802406A4_C52BE4.s b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_802406A4_C52BE4.s
index ec2fc82c83..17680b3256 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_802406A4_C52BE4.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_802406A4_C52BE4.s
@@ -89,8 +89,8 @@ glabel func_802406A4_C52BE4
 /* C52D18 802407D8 E7A00028 */  swc1      $f0, 0x28($sp)
 /* C52D1C 802407DC 0C00A7E7 */  jal       add_vec2D_polar
 /* C52D20 802407E0 E7A2002C */   swc1     $f2, 0x2c($sp)
-/* C52D24 802407E4 3C028011 */  lui       $v0, 0x8011
-/* C52D28 802407E8 8C42C930 */  lw        $v0, -0x36d0($v0)
+/* C52D24 802407E4 3C028011 */  lui       $v0, %hi(D_8010C930)
+/* C52D28 802407E8 8C42C930 */  lw        $v0, %lo(D_8010C930)($v0)
 /* C52D2C 802407EC C7AC0028 */  lwc1      $f12, 0x28($sp)
 /* C52D30 802407F0 C7AE002C */  lwc1      $f14, 0x2c($sp)
 /* C52D34 802407F4 8C460038 */  lw        $a2, 0x38($v0)
diff --git a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240BA0_C530E0.s b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240BA0_C530E0.s
index e23ba8df6c..79513a79ec 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240BA0_C530E0.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240BA0_C530E0.s
@@ -30,8 +30,8 @@ glabel func_80240BA0_C530E0
 /* C53144 80240C04 0809030B */  j         .L80240C2C
 /* C53148 80240C08 E4600018 */   swc1     $f0, 0x18($v1)
 .L80240C0C:
-/* C5314C 80240C0C 3C018024 */  lui       $at, 0x8024
-/* C53150 80240C10 D42231F8 */  ldc1      $f2, 0x31f8($at)
+/* C5314C 80240C0C 3C018024 */  lui       $at, %hi(D_802431F8)
+/* C53150 80240C10 D42231F8 */  ldc1      $f2, %lo(D_802431F8)($at)
 /* C53154 80240C14 44820000 */  mtc1      $v0, $f0
 /* C53158 80240C18 00000000 */  nop       
 /* C5315C 80240C1C 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240E20_C53360.s b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240E20_C53360.s
index 1213cd8c89..0f3252dca2 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240E20_C53360.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240E20_C53360.s
@@ -108,9 +108,9 @@ glabel func_80240E20_C53360
 /* C534E4 80240FA4 2C620064 */  sltiu     $v0, $v1, 0x64
 /* C534E8 80240FA8 10400067 */  beqz      $v0, .L80241148
 /* C534EC 80240FAC 00031080 */   sll      $v0, $v1, 2
-/* C534F0 80240FB0 3C018024 */  lui       $at, 0x8024
+/* C534F0 80240FB0 3C018024 */  lui       $at, %hi(D_80243200)
 /* C534F4 80240FB4 00220821 */  addu      $at, $at, $v0
-/* C534F8 80240FB8 8C223200 */  lw        $v0, 0x3200($at)
+/* C534F8 80240FB8 8C223200 */  lw        $v0, %lo(D_80243200)($at)
 /* C534FC 80240FBC 00400008 */  jr        $v0
 /* C53500 80240FC0 00000000 */   nop      
 /* C53504 80240FC4 0240202D */  daddu     $a0, $s2, $zero
diff --git a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80241170_C536B0.s b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80241170_C536B0.s
index 693086c4f6..26ba22486b 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80241170_C536B0.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80241170_C536B0.s
@@ -100,9 +100,9 @@ glabel func_80241170_C536B0
 /* C53814 802412D4 2C620064 */  sltiu     $v0, $v1, 0x64
 /* C53818 802412D8 10400048 */  beqz      $v0, .L802413FC
 /* C5381C 802412DC 00031080 */   sll      $v0, $v1, 2
-/* C53820 802412E0 3C018024 */  lui       $at, 0x8024
+/* C53820 802412E0 3C018024 */  lui       $at, %hi(D_80243390)
 /* C53824 802412E4 00220821 */  addu      $at, $at, $v0
-/* C53828 802412E8 8C223390 */  lw        $v0, 0x3390($at)
+/* C53828 802412E8 8C223390 */  lw        $v0, %lo(D_80243390)($at)
 /* C5382C 802412EC 00400008 */  jr        $v0
 /* C53830 802412F0 00000000 */   nop      
 /* C53834 802412F4 0240202D */  daddu     $a0, $s2, $zero
diff --git a/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240000_C55F40.s b/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240000_C55F40.s
index df67d813e8..c1373768e9 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240000_C55F40.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240000_C55F40.s
@@ -69,8 +69,8 @@ glabel func_80240000_C55F40
 /* C56034 802400F4 08090047 */  j         .L8024011C
 /* C56038 802400F8 E6800018 */   swc1     $f0, 0x18($s4)
 .L802400FC:
-/* C5603C 802400FC 3C018024 */  lui       $at, 0x8024
-/* C56040 80240100 D42238E0 */  ldc1      $f2, 0x38e0($at)
+/* C5603C 802400FC 3C018024 */  lui       $at, %hi(D_802438E0)
+/* C56040 80240100 D42238E0 */  ldc1      $f2, %lo(D_802438E0)($at)
 /* C56044 80240104 44820000 */  mtc1      $v0, $f0
 /* C56048 80240108 00000000 */  nop       
 /* C5604C 8024010C 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_8024067C_C565BC.s b/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_8024067C_C565BC.s
index 2ac543d912..9211e07b66 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_8024067C_C565BC.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_8024067C_C565BC.s
@@ -33,8 +33,8 @@ glabel func_8024067C_C565BC
 /* C56628 802406E8 080901C4 */  j         .L80240710
 /* C5662C 802406EC E4A00018 */   swc1     $f0, 0x18($a1)
 .L802406F0:
-/* C56630 802406F0 3C018024 */  lui       $at, 0x8024
-/* C56634 802406F4 D42238E8 */  ldc1      $f2, 0x38e8($at)
+/* C56630 802406F0 3C018024 */  lui       $at, %hi(D_802438E8)
+/* C56634 802406F4 D42238E8 */  ldc1      $f2, %lo(D_802438E8)($at)
 /* C56638 802406F8 44820000 */  mtc1      $v0, $f0
 /* C5663C 802406FC 00000000 */  nop       
 /* C56640 80240700 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240B94_C56AD4.s b/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240B94_C56AD4.s
index 285089f100..9581ad7679 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240B94_C56AD4.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240B94_C56AD4.s
@@ -124,9 +124,9 @@ glabel func_80240B94_C56AD4
 /* C56C98 80240D58 2C620064 */  sltiu     $v0, $v1, 0x64
 /* C56C9C 80240D5C 10400042 */  beqz      $v0, .L80240E68
 /* C56CA0 80240D60 00031080 */   sll      $v0, $v1, 2
-/* C56CA4 80240D64 3C018024 */  lui       $at, 0x8024
+/* C56CA4 80240D64 3C018024 */  lui       $at, %hi(D_802438F0)
 /* C56CA8 80240D68 00220821 */  addu      $at, $at, $v0
-/* C56CAC 80240D6C 8C2238F0 */  lw        $v0, 0x38f0($at)
+/* C56CAC 80240D6C 8C2238F0 */  lw        $v0, %lo(D_802438F0)($at)
 /* C56CB0 80240D70 00400008 */  jr        $v0
 /* C56CB4 80240D74 00000000 */   nop      
 /* C56CB8 80240D78 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_dgb/dgb_18/C56EF0/func_80240FB0_C56EF0.s b/asm/nonmatchings/world/area_dgb/dgb_18/C56EF0/func_80240FB0_C56EF0.s
index 3cc00b4104..d81144a00b 100644
--- a/asm/nonmatchings/world/area_dgb/dgb_18/C56EF0/func_80240FB0_C56EF0.s
+++ b/asm/nonmatchings/world/area_dgb/dgb_18/C56EF0/func_80240FB0_C56EF0.s
@@ -4,8 +4,8 @@
 glabel func_80240FB0_C56EF0
 /* C56EF0 80240FB0 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* C56EF4 80240FB4 AFB00010 */  sw        $s0, 0x10($sp)
-/* C56EF8 80240FB8 3C108024 */  lui       $s0, 0x8024
-/* C56EFC 80240FBC 261036E0 */  addiu     $s0, $s0, 0x36e0
+/* C56EF8 80240FB8 3C108024 */  lui       $s0, %hi(D_802436E0)
+/* C56EFC 80240FBC 261036E0 */  addiu     $s0, $s0, %lo(D_802436E0)
 /* C56F00 80240FC0 AFBF0018 */  sw        $ra, 0x18($sp)
 /* C56F04 80240FC4 AFB10014 */  sw        $s1, 0x14($sp)
 /* C56F08 80240FC8 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_80240FB0_C56EF0
 /* C56F6C 8024102C 28620010 */  slti      $v0, $v1, 0x10
 /* C56F70 80241030 1440FFFA */  bnez      $v0, .L8024101C
 /* C56F74 80241034 24840004 */   addiu    $a0, $a0, 4
-/* C56F78 80241038 3C108024 */  lui       $s0, 0x8024
-/* C56F7C 8024103C 261036E0 */  addiu     $s0, $s0, 0x36e0
+/* C56F78 80241038 3C108024 */  lui       $s0, %hi(D_802436E0)
+/* C56F7C 8024103C 261036E0 */  addiu     $s0, $s0, %lo(D_802436E0)
 /* C56F80 80241040 0C00AB4B */  jal       heap_free
 /* C56F84 80241044 8E040000 */   lw       $a0, ($s0)
 /* C56F88 80241048 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B200/func_802402E0_95B4E0.s b/asm/nonmatchings/world/area_dro/dro_01/95B200/func_802402E0_95B4E0.s
index a7ea913395..37fc1ceec1 100644
--- a/asm/nonmatchings/world/area_dro/dro_01/95B200/func_802402E0_95B4E0.s
+++ b/asm/nonmatchings/world/area_dro/dro_01/95B200/func_802402E0_95B4E0.s
@@ -71,8 +71,8 @@ glabel func_802402E0_95B4E0
 /* 95B5D4 802403D4 080900ED */  j         .L802403B4
 /* 95B5D8 802403D8 00000000 */   nop      
 .L802403DC:
-/* 95B5DC 802403DC 3C028015 */  lui       $v0, 0x8015
-/* 95B5E0 802403E0 8C4212F0 */  lw        $v0, 0x12f0($v0)
+/* 95B5DC 802403DC 3C028015 */  lui       $v0, %hi(D_801512F0)
+/* 95B5E0 802403E0 8C4212F0 */  lw        $v0, %lo(D_801512F0)($v0)
 /* 95B5E4 802403E4 A0510000 */  sb        $s1, ($v0)
 .L802403E8:
 /* 95B5E8 802403E8 24020002 */  addiu     $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802405E0_95B7E0.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802405E0_95B7E0.s
index e300042e5f..84485f19c8 100644
--- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802405E0_95B7E0.s
+++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802405E0_95B7E0.s
@@ -69,8 +69,8 @@ glabel func_802405E0_95B7E0
 /* 95B8D4 802406D4 080901BF */  j         .L802406FC
 /* 95B8D8 802406D8 E6800018 */   swc1     $f0, 0x18($s4)
 .L802406DC:
-/* 95B8DC 802406DC 3C018025 */  lui       $at, 0x8025
-/* 95B8E0 802406E0 D422DDE0 */  ldc1      $f2, -0x2220($at)
+/* 95B8DC 802406DC 3C018025 */  lui       $at, %hi(D_8024DDE0)
+/* 95B8E0 802406E0 D422DDE0 */  ldc1      $f2, %lo(D_8024DDE0)($at)
 /* 95B8E4 802406E4 44820000 */  mtc1      $v0, $f0
 /* 95B8E8 802406E8 00000000 */  nop       
 /* 95B8EC 802406EC 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240C5C_95BE5C.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240C5C_95BE5C.s
index b6191327f7..f2d2aa7928 100644
--- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240C5C_95BE5C.s
+++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240C5C_95BE5C.s
@@ -33,8 +33,8 @@ glabel func_80240C5C_95BE5C
 /* 95BEC8 80240CC8 0809033C */  j         .L80240CF0
 /* 95BECC 80240CCC E4A00018 */   swc1     $f0, 0x18($a1)
 .L80240CD0:
-/* 95BED0 80240CD0 3C018025 */  lui       $at, 0x8025
-/* 95BED4 80240CD4 D422DDE8 */  ldc1      $f2, -0x2218($at)
+/* 95BED0 80240CD0 3C018025 */  lui       $at, %hi(D_8024DDE8)
+/* 95BED4 80240CD4 D422DDE8 */  ldc1      $f2, %lo(D_8024DDE8)($at)
 /* 95BED8 80240CD8 44820000 */  mtc1      $v0, $f0
 /* 95BEDC 80240CDC 00000000 */  nop       
 /* 95BEE0 80240CE0 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241174_95C374.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241174_95C374.s
index 675473ab89..d4d5ac4ce7 100644
--- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241174_95C374.s
+++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241174_95C374.s
@@ -124,9 +124,9 @@ glabel func_80241174_95C374
 /* 95C538 80241338 2C620064 */  sltiu     $v0, $v1, 0x64
 /* 95C53C 8024133C 10400042 */  beqz      $v0, .L80241448
 /* 95C540 80241340 00031080 */   sll      $v0, $v1, 2
-/* 95C544 80241344 3C018025 */  lui       $at, 0x8025
+/* 95C544 80241344 3C018025 */  lui       $at, %hi(D_8024DDF0)
 /* 95C548 80241348 00220821 */  addu      $at, $at, $v0
-/* 95C54C 8024134C 8C22DDF0 */  lw        $v0, -0x2210($at)
+/* 95C54C 8024134C 8C22DDF0 */  lw        $v0, %lo(D_8024DDF0)($at)
 /* 95C550 80241350 00400008 */  jr        $v0
 /* 95C554 80241354 00000000 */   nop      
 /* 95C558 80241358 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241470_95C670.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241470_95C670.s
index caf01cdc72..094238df30 100644
--- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241470_95C670.s
+++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241470_95C670.s
@@ -4,8 +4,8 @@
 glabel func_80241470_95C670
 /* 95C670 80241470 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* 95C674 80241474 AFB00010 */  sw        $s0, 0x10($sp)
-/* 95C678 80241478 3C108024 */  lui       $s0, 0x8024
-/* 95C67C 8024147C 261051B8 */  addiu     $s0, $s0, 0x51b8
+/* 95C678 80241478 3C108024 */  lui       $s0, %hi(D_802451B8)
+/* 95C67C 8024147C 261051B8 */  addiu     $s0, $s0, %lo(D_802451B8)
 /* 95C680 80241480 AFBF0018 */  sw        $ra, 0x18($sp)
 /* 95C684 80241484 AFB10014 */  sw        $s1, 0x14($sp)
 /* 95C688 80241488 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_80241470_95C670
 /* 95C6EC 802414EC 28620010 */  slti      $v0, $v1, 0x10
 /* 95C6F0 802414F0 1440FFFA */  bnez      $v0, .L802414DC
 /* 95C6F4 802414F4 24840004 */   addiu    $a0, $a0, 4
-/* 95C6F8 802414F8 3C108024 */  lui       $s0, 0x8024
-/* 95C6FC 802414FC 261051B8 */  addiu     $s0, $s0, 0x51b8
+/* 95C6F8 802414F8 3C108024 */  lui       $s0, %hi(D_802451B8)
+/* 95C6FC 802414FC 261051B8 */  addiu     $s0, $s0, %lo(D_802451B8)
 /* 95C700 80241500 0C00AB4B */  jal       heap_free
 /* 95C704 80241504 8E040000 */   lw       $a0, ($s0)
 /* 95C708 80241508 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802415AC_95C7AC.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802415AC_95C7AC.s
index da125d8494..46ff1aac36 100644
--- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802415AC_95C7AC.s
+++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802415AC_95C7AC.s
@@ -90,8 +90,8 @@ glabel func_802415AC_95C7AC
 /* 95C8F8 802416F8 0040802D */   daddu    $s0, $v0, $zero
 /* 95C8FC 802416FC 0040282D */  daddu     $a1, $v0, $zero
 /* 95C900 80241700 0000182D */  daddu     $v1, $zero, $zero
-/* 95C904 80241704 3C068024 */  lui       $a2, 0x8024
-/* 95C908 80241708 24C6525C */  addiu     $a2, $a2, 0x525c
+/* 95C904 80241704 3C068024 */  lui       $a2, %hi(D_8024525C)
+/* 95C908 80241708 24C6525C */  addiu     $a2, $a2, %lo(D_8024525C)
 /* 95C90C 8024170C 00C0202D */  daddu     $a0, $a2, $zero
 .L80241710:
 /* 95C910 80241710 8C820000 */  lw        $v0, ($a0)
diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802417D0_95C9D0.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802417D0_95C9D0.s
index 03d320caf8..235fedfeee 100644
--- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802417D0_95C9D0.s
+++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802417D0_95C9D0.s
@@ -9,8 +9,8 @@ glabel func_802417D0_95C9D0
 /* 95C9E0 802417E0 8C84014C */   lw       $a0, 0x14c($a0)
 /* 95C9E4 802417E4 24040008 */  addiu     $a0, $zero, 8
 /* 95C9E8 802417E8 0040802D */  daddu     $s0, $v0, $zero
-/* 95C9EC 802417EC 3C028024 */  lui       $v0, 0x8024
-/* 95C9F0 802417F0 2442183C */  addiu     $v0, $v0, 0x183c
+/* 95C9EC 802417EC 3C028024 */  lui       $v0, %hi(D_8024183C)
+/* 95C9F0 802417F0 2442183C */  addiu     $v0, $v0, %lo(D_8024183C)
 /* 95C9F4 802417F4 0C00AB39 */  jal       heap_malloc
 /* 95C9F8 802417F8 AE020008 */   sw       $v0, 8($s0)
 /* 95C9FC 802417FC 0040182D */  daddu     $v1, $v0, $zero
diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024183C_95CA3C.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024183C_95CA3C.s
index 2cc9a874bc..df5ca1f6aa 100644
--- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024183C_95CA3C.s
+++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024183C_95CA3C.s
@@ -3,8 +3,8 @@
 
 glabel func_8024183C_95CA3C
 /* 95CA3C 8024183C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 95CA40 80241840 3C03800A */  lui       $v1, 0x800a
-/* 95CA44 80241844 8463A634 */  lh        $v1, -0x59cc($v1)
+/* 95CA40 80241840 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* 95CA44 80241844 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* 95CA48 80241848 3C05800B */  lui       $a1, %hi(gCameras)
 /* 95CA4C 8024184C 24A51D80 */  addiu     $a1, $a1, %lo(gCameras)
 /* 95CA50 80241850 AFBF0010 */  sw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024189C_95CA9C.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024189C_95CA9C.s
index e6bff98043..f03b1ce6f2 100644
--- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024189C_95CA9C.s
+++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024189C_95CA9C.s
@@ -21,8 +21,8 @@ glabel func_8024189C_95CA9C
 /* 95CADC 802418DC 2414FFFC */  addiu     $s4, $zero, -4
 /* 95CAE0 802418E0 2413000A */  addiu     $s3, $zero, 0xa
 /* 95CAE4 802418E4 3C120080 */  lui       $s2, 0x80
-/* 95CAE8 802418E8 3C038015 */  lui       $v1, 0x8015
-/* 95CAEC 802418EC 8C6312F0 */  lw        $v1, 0x12f0($v1)
+/* 95CAE8 802418E8 3C038015 */  lui       $v1, %hi(D_801512F0)
+/* 95CAEC 802418EC 8C6312F0 */  lw        $v1, %lo(D_801512F0)($v1)
 /* 95CAF0 802418F0 24020001 */  addiu     $v0, $zero, 1
 /* 95CAF4 802418F4 0C046F97 */  jal       set_background_color_blend
 /* 95CAF8 802418F8 A0620000 */   sb       $v0, ($v1)
diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802419E8_95CBE8.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802419E8_95CBE8.s
index b7cded7b4c..22eea16142 100644
--- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802419E8_95CBE8.s
+++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802419E8_95CBE8.s
@@ -49,8 +49,8 @@ glabel func_802419E8_95CBE8
 /* 95CC8C 80241A8C 2413FFFC */  addiu     $s3, $zero, -4
 /* 95CC90 80241A90 2412000A */  addiu     $s2, $zero, 0xa
 /* 95CC94 80241A94 3C11FF7F */  lui       $s1, 0xff7f
-/* 95CC98 80241A98 3C028015 */  lui       $v0, 0x8015
-/* 95CC9C 80241A9C 8C4212F0 */  lw        $v0, 0x12f0($v0)
+/* 95CC98 80241A98 3C028015 */  lui       $v0, %hi(D_801512F0)
+/* 95CC9C 80241A9C 8C4212F0 */  lw        $v0, %lo(D_801512F0)($v0)
 /* 95CCA0 80241AA0 3631FFFF */  ori       $s1, $s1, 0xffff
 /* 95CCA4 80241AA4 A0400000 */  sb        $zero, ($v0)
 .L80241AA8:
diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241B5C_95CD5C.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241B5C_95CD5C.s
index 6f8f15738f..0e26fbdc7f 100644
--- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241B5C_95CD5C.s
+++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241B5C_95CD5C.s
@@ -19,9 +19,9 @@ glabel func_80241B5C_95CD5C
 /* 95CD90 80241B90 34A502E0 */  ori       $a1, $a1, 0x2e0
 /* 95CD94 80241B94 0C0B1EAF */  jal       get_variable
 /* 95CD98 80241B98 0000202D */   daddu    $a0, $zero, $zero
-/* 95CD9C 80241B9C 3C038024 */  lui       $v1, 0x8024
+/* 95CD9C 80241B9C 3C038024 */  lui       $v1, %hi(D_8024521C)
 /* 95CDA0 80241BA0 00621821 */  addu      $v1, $v1, $v0
-/* 95CDA4 80241BA4 9063521C */  lbu       $v1, 0x521c($v1)
+/* 95CDA4 80241BA4 9063521C */  lbu       $v1, %lo(D_8024521C)($v1)
 /* 95CDA8 80241BA8 8E220084 */  lw        $v0, 0x84($s1)
 /* 95CDAC 80241BAC 54430006 */  bnel      $v0, $v1, .L80241BC8
 /* 95CDB0 80241BB0 AE200084 */   sw       $zero, 0x84($s1)
diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241BE0_95CDE0.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241BE0_95CDE0.s
index 04941505fc..61b4e419d5 100644
--- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241BE0_95CDE0.s
+++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241BE0_95CDE0.s
@@ -38,8 +38,8 @@ glabel func_80241BE0_95CDE0
 /* 95CE64 80241C64 0220202D */  daddu     $a0, $s1, $zero
 /* 95CE68 80241C68 3C05F4AC */  lui       $a1, 0xf4ac
 /* 95CE6C 80241C6C 34A5D481 */  ori       $a1, $a1, 0xd481
-/* 95CE70 80241C70 3C108025 */  lui       $s0, 0x8025
-/* 95CE74 80241C74 2610DFE0 */  addiu     $s0, $s0, -0x2020
+/* 95CE70 80241C70 3C108025 */  lui       $s0, %hi(D_8024DFE0)
+/* 95CE74 80241C74 2610DFE0 */  addiu     $s0, $s0, %lo(D_8024DFE0)
 /* 95CE78 80241C78 0C0B1EAF */  jal       get_variable
 /* 95CE7C 80241C7C AE020000 */   sw       $v0, ($s0)
 /* 95CE80 80241C80 0220202D */  daddu     $a0, $s1, $zero
@@ -66,8 +66,8 @@ glabel func_80241BE0_95CDE0
 /* 95CED4 80241CD4 0000202D */   daddu    $a0, $zero, $zero
 /* 95CED8 80241CD8 0220202D */  daddu     $a0, $s1, $zero
 /* 95CEDC 80241CDC 3C05F4AC */  lui       $a1, 0xf4ac
-/* 95CEE0 80241CE0 3C018025 */  lui       $at, 0x8025
-/* 95CEE4 80241CE4 AC22DFE4 */  sw        $v0, -0x201c($at)
+/* 95CEE0 80241CE0 3C018025 */  lui       $at, %hi(D_8024DFE4)
+/* 95CEE4 80241CE4 AC22DFE4 */  sw        $v0, %lo(D_8024DFE4)($at)
 /* 95CEE8 80241CE8 0C0B1EAF */  jal       get_variable
 /* 95CEEC 80241CEC 34A5D481 */   ori      $a1, $a1, 0xd481
 /* 95CEF0 80241CF0 0220202D */  daddu     $a0, $s1, $zero
@@ -98,16 +98,16 @@ glabel func_80241BE0_95CDE0
 /* 95CF54 80241D54 E7A00010 */   swc1     $f0, 0x10($sp)
 /* 95CF58 80241D58 8E030000 */  lw        $v1, ($s0)
 /* 95CF5C 80241D5C 8C64000C */  lw        $a0, 0xc($v1)
-/* 95CF60 80241D60 3C018025 */  lui       $at, 0x8025
-/* 95CF64 80241D64 AC22DFE8 */  sw        $v0, -0x2018($at)
+/* 95CF60 80241D60 3C018025 */  lui       $at, %hi(D_8024DFE8)
+/* 95CF64 80241D64 AC22DFE8 */  sw        $v0, %lo(D_8024DFE8)($at)
 /* 95CF68 80241D68 AC800018 */  sw        $zero, 0x18($a0)
 /* 95CF6C 80241D6C AC800020 */  sw        $zero, 0x20($a0)
 /* 95CF70 80241D70 AC800024 */  sw        $zero, 0x24($a0)
 /* 95CF74 80241D74 AC800028 */  sw        $zero, 0x28($a0)
 /* 95CF78 80241D78 AC80001C */  sw        $zero, 0x1c($a0)
 .L80241D7C:
-/* 95CF7C 80241D7C 3C028025 */  lui       $v0, 0x8025
-/* 95CF80 80241D80 8C42DFE0 */  lw        $v0, -0x2020($v0)
+/* 95CF7C 80241D7C 3C028025 */  lui       $v0, %hi(D_8024DFE0)
+/* 95CF80 80241D80 8C42DFE0 */  lw        $v0, %lo(D_8024DFE0)($v0)
 /* 95CF84 80241D84 8C44000C */  lw        $a0, 0xc($v0)
 /* 95CF88 80241D88 8C820020 */  lw        $v0, 0x20($a0)
 /* 95CF8C 80241D8C 8C830028 */  lw        $v1, 0x28($a0)
diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241DF8_95CFF8.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241DF8_95CFF8.s
index e590df735a..487584f563 100644
--- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241DF8_95CFF8.s
+++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241DF8_95CFF8.s
@@ -5,19 +5,19 @@ glabel func_80241DF8_95CFF8
 /* 95CFF8 80241DF8 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 95CFFC 80241DFC 10A0000B */  beqz      $a1, .L80241E2C
 /* 95D000 80241E00 AFBF0010 */   sw       $ra, 0x10($sp)
-/* 95D004 80241E04 3C038025 */  lui       $v1, 0x8025
-/* 95D008 80241E08 8C63DFE4 */  lw        $v1, -0x201c($v1)
+/* 95D004 80241E04 3C038025 */  lui       $v1, %hi(D_8024DFE4)
+/* 95D008 80241E08 8C63DFE4 */  lw        $v1, %lo(D_8024DFE4)($v1)
 /* 95D00C 80241E0C 8C620000 */  lw        $v0, ($v1)
-/* 95D010 80241E10 3C048025 */  lui       $a0, 0x8025
-/* 95D014 80241E14 8C84DFE8 */  lw        $a0, -0x2018($a0)
+/* 95D010 80241E10 3C048025 */  lui       $a0, %hi(D_8024DFE8)
+/* 95D014 80241E14 8C84DFE8 */  lw        $a0, %lo(D_8024DFE8)($a0)
 /* 95D018 80241E18 34420010 */  ori       $v0, $v0, 0x10
 /* 95D01C 80241E1C AC620000 */  sw        $v0, ($v1)
 /* 95D020 80241E20 8C820000 */  lw        $v0, ($a0)
 /* 95D024 80241E24 34420010 */  ori       $v0, $v0, 0x10
 /* 95D028 80241E28 AC820000 */  sw        $v0, ($a0)
 .L80241E2C:
-/* 95D02C 80241E2C 3C048025 */  lui       $a0, 0x8025
-/* 95D030 80241E30 8C84DFE0 */  lw        $a0, -0x2020($a0)
+/* 95D02C 80241E2C 3C048025 */  lui       $a0, %hi(D_8024DFE0)
+/* 95D030 80241E30 8C84DFE0 */  lw        $a0, %lo(D_8024DFE0)($a0)
 /* 95D034 80241E34 8C85000C */  lw        $a1, 0xc($a0)
 /* 95D038 80241E38 8CA20018 */  lw        $v0, 0x18($a1)
 /* 95D03C 80241E3C 8CA30020 */  lw        $v1, 0x20($a1)
@@ -41,8 +41,8 @@ glabel func_80241DF8_95CFF8
 .L80241E84:
 /* 95D084 80241E84 0C016914 */  jal       remove_effect
 /* 95D088 80241E88 ACA00018 */   sw       $zero, 0x18($a1)
-/* 95D08C 80241E8C 3C048025 */  lui       $a0, 0x8025
-/* 95D090 80241E90 8C84DFC0 */  lw        $a0, -0x2040($a0)
+/* 95D08C 80241E8C 3C048025 */  lui       $a0, %hi(D_8024DFC0)
+/* 95D090 80241E90 8C84DFC0 */  lw        $a0, %lo(D_8024DFC0)($a0)
 /* 95D094 80241E94 0C048D70 */  jal       func_801235C0
 /* 95D098 80241E98 00000000 */   nop      
 /* 95D09C 80241E9C 24020002 */  addiu     $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241EAC_95D0AC.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241EAC_95D0AC.s
index 28dca7491d..293ed21090 100644
--- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241EAC_95D0AC.s
+++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241EAC_95D0AC.s
@@ -7,8 +7,8 @@ glabel func_80241EAC_95D0AC
 /* 95D0B4 80241EB4 8C82000C */  lw        $v0, 0xc($a0)
 /* 95D0B8 80241EB8 0C0B1EAF */  jal       get_variable
 /* 95D0BC 80241EBC 8C450000 */   lw       $a1, ($v0)
-/* 95D0C0 80241EC0 3C038025 */  lui       $v1, 0x8025
-/* 95D0C4 80241EC4 8C63DFE0 */  lw        $v1, -0x2020($v1)
+/* 95D0C0 80241EC0 3C038025 */  lui       $v1, %hi(D_8024DFE0)
+/* 95D0C4 80241EC4 8C63DFE0 */  lw        $v1, %lo(D_8024DFE0)($v1)
 /* 95D0C8 80241EC8 8C63000C */  lw        $v1, 0xc($v1)
 /* 95D0CC 80241ECC AC620034 */  sw        $v0, 0x34($v1)
 /* 95D0D0 80241ED0 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241EE0_95D0E0.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241EE0_95D0E0.s
index 27cdc7298d..ef8d4ad201 100644
--- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241EE0_95D0E0.s
+++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241EE0_95D0E0.s
@@ -8,8 +8,8 @@ glabel func_80241EE0_95D0E0
 /* 95D0EC 80241EEC 0C0B1EAF */  jal       get_variable
 /* 95D0F0 80241EF0 8C450000 */   lw       $a1, ($v0)
 /* 95D0F4 80241EF4 0040202D */  daddu     $a0, $v0, $zero
-/* 95D0F8 80241EF8 3C028025 */  lui       $v0, 0x8025
-/* 95D0FC 80241EFC 8C42DFE0 */  lw        $v0, -0x2020($v0)
+/* 95D0F8 80241EF8 3C028025 */  lui       $v0, %hi(D_8024DFE0)
+/* 95D0FC 80241EFC 8C42DFE0 */  lw        $v0, %lo(D_8024DFE0)($v0)
 /* 95D100 80241F00 24030001 */  addiu     $v1, $zero, 1
 /* 95D104 80241F04 8C45000C */  lw        $a1, 0xc($v0)
 /* 95D108 80241F08 1083000D */  beq       $a0, $v1, .L80241F40
diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241F60_95D160.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241F60_95D160.s
index efbae1ba43..32a9c48be1 100644
--- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241F60_95D160.s
+++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241F60_95D160.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80241F60_95D160
-/* 95D160 80241F60 3C028025 */  lui       $v0, 0x8025
-/* 95D164 80241F64 8C42DFE8 */  lw        $v0, -0x2018($v0)
+/* 95D160 80241F60 3C028025 */  lui       $v0, %hi(D_8024DFE8)
+/* 95D164 80241F64 8C42DFE8 */  lw        $v0, %lo(D_8024DFE8)($v0)
 /* 95D168 80241F68 8C42000C */  lw        $v0, 0xc($v0)
 /* 95D16C 80241F6C AC40001C */  sw        $zero, 0x1c($v0)
 /* 95D170 80241F70 03E00008 */  jr        $ra
diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241F78_95D178.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241F78_95D178.s
index 110bc2f96d..d2f3975d20 100644
--- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241F78_95D178.s
+++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241F78_95D178.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80241F78_95D178
-/* 95D178 80241F78 3C028025 */  lui       $v0, 0x8025
-/* 95D17C 80241F7C 8C42DFE8 */  lw        $v0, -0x2018($v0)
+/* 95D178 80241F78 3C028025 */  lui       $v0, %hi(D_8024DFE8)
+/* 95D17C 80241F7C 8C42DFE8 */  lw        $v0, %lo(D_8024DFE8)($v0)
 /* 95D180 80241F80 8C43000C */  lw        $v1, 0xc($v0)
 /* 95D184 80241F84 24020001 */  addiu     $v0, $zero, 1
 /* 95D188 80241F88 AC62001C */  sw        $v0, 0x1c($v1)
diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241F94_95D194.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241F94_95D194.s
index bb8cb62be9..947bc87317 100644
--- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241F94_95D194.s
+++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241F94_95D194.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80241F94_95D194
-/* 95D194 80241F94 3C028025 */  lui       $v0, 0x8025
-/* 95D198 80241F98 8C42DFE8 */  lw        $v0, -0x2018($v0)
+/* 95D194 80241F94 3C028025 */  lui       $v0, %hi(D_8024DFE8)
+/* 95D198 80241F98 8C42DFE8 */  lw        $v0, %lo(D_8024DFE8)($v0)
 /* 95D19C 80241F9C 8C43000C */  lw        $v1, 0xc($v0)
 /* 95D1A0 80241FA0 24020002 */  addiu     $v0, $zero, 2
 /* 95D1A4 80241FA4 03E00008 */  jr        $ra
diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242468_95D668.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242468_95D668.s
index cd54d603de..5661c5c5e6 100644
--- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242468_95D668.s
+++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242468_95D668.s
@@ -3,8 +3,8 @@
 
 glabel func_80242468_95D668
 /* 95D668 80242468 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 95D66C 8024246C 3C058025 */  lui       $a1, 0x8025
-/* 95D670 80242470 8CA5DFD8 */  lw        $a1, -0x2028($a1)
+/* 95D66C 8024246C 3C058025 */  lui       $a1, %hi(D_8024DFD8)
+/* 95D670 80242470 8CA5DFD8 */  lw        $a1, %lo(D_8024DFD8)($a1)
 /* 95D674 80242474 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 95D678 80242478 0C0B1EAF */  jal       get_variable
 /* 95D67C 8024247C 0000202D */   daddu    $a0, $zero, $zero
diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802424D4_95D6D4.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802424D4_95D6D4.s
index cd214bac8c..bed90ed655 100644
--- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802424D4_95D6D4.s
+++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802424D4_95D6D4.s
@@ -3,14 +3,14 @@
 
 glabel func_802424D4_95D6D4
 /* 95D6D4 802424D4 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 95D6D8 802424D8 3C058024 */  lui       $a1, 0x8024
-/* 95D6DC 802424DC 24A52468 */  addiu     $a1, $a1, 0x2468
+/* 95D6D8 802424D8 3C058024 */  lui       $a1, %hi(D_80242468)
+/* 95D6DC 802424DC 24A52468 */  addiu     $a1, $a1, %lo(D_80242468)
 /* 95D6E0 802424E0 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 95D6E4 802424E4 0C048C8F */  jal       bind_dynamic_entity_7
 /* 95D6E8 802424E8 0000202D */   daddu    $a0, $zero, $zero
 /* 95D6EC 802424EC 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 95D6F0 802424F0 3C018025 */  lui       $at, 0x8025
-/* 95D6F4 802424F4 AC22DFC0 */  sw        $v0, -0x2040($at)
+/* 95D6F0 802424F0 3C018025 */  lui       $at, %hi(D_8024DFC0)
+/* 95D6F4 802424F4 AC22DFC0 */  sw        $v0, %lo(D_8024DFC0)($at)
 /* 95D6F8 802424F8 24020002 */  addiu     $v0, $zero, 2
 /* 95D6FC 802424FC 03E00008 */  jr        $ra
 /* 95D700 80242500 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242730_95D930.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242730_95D930.s
index 1909ef008d..9404e2621c 100644
--- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242730_95D930.s
+++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242730_95D930.s
@@ -6,11 +6,11 @@ glabel func_80242730_95D930
 /* 95D934 80242734 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 95D938 80242738 10A00003 */  beqz      $a1, .L80242748
 /* 95D93C 8024273C 8C86000C */   lw       $a2, 0xc($a0)
-/* 95D940 80242740 3C018024 */  lui       $at, 0x8024
-/* 95D944 80242744 AC2077E0 */  sw        $zero, 0x77e0($at)
+/* 95D940 80242740 3C018024 */  lui       $at, %hi(D_802477E0)
+/* 95D944 80242744 AC2077E0 */  sw        $zero, %lo(D_802477E0)($at)
 .L80242748:
-/* 95D948 80242748 3C038024 */  lui       $v1, 0x8024
-/* 95D94C 8024274C 246377E0 */  addiu     $v1, $v1, 0x77e0
+/* 95D948 80242748 3C038024 */  lui       $v1, %hi(D_802477E0)
+/* 95D94C 8024274C 246377E0 */  addiu     $v1, $v1, %lo(D_802477E0)
 /* 95D950 80242750 8C620000 */  lw        $v0, ($v1)
 /* 95D954 80242754 54400003 */  bnel      $v0, $zero, .L80242764
 /* 95D958 80242758 AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_80242730_95D930
 /* 95D960 80242760 0000102D */   daddu    $v0, $zero, $zero
 .L80242764:
 /* 95D964 80242764 8CC50000 */  lw        $a1, ($a2)
-/* 95D968 80242768 3C068024 */  lui       $a2, 0x8024
+/* 95D968 80242768 3C068024 */  lui       $a2, %hi(D_802477E4)
 /* 95D96C 8024276C 0C0B2026 */  jal       set_variable
-/* 95D970 80242770 8CC677E4 */   lw       $a2, 0x77e4($a2)
+/* 95D970 80242770 8CC677E4 */   lw       $a2, %lo(D_802477E4)($a2)
 /* 95D974 80242774 24020002 */  addiu     $v0, $zero, 2
 .L80242778:
 /* 95D978 80242778 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242784_95D984.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242784_95D984.s
index 14194ee283..763352a2e7 100644
--- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242784_95D984.s
+++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242784_95D984.s
@@ -7,12 +7,12 @@ glabel func_80242784_95D984
 /* 95D98C 8024278C 8C82000C */  lw        $v0, 0xc($a0)
 /* 95D990 80242790 0C0B1EAF */  jal       get_variable
 /* 95D994 80242794 8C450000 */   lw       $a1, ($v0)
-/* 95D998 80242798 3C018024 */  lui       $at, 0x8024
-/* 95D99C 8024279C AC2277E4 */  sw        $v0, 0x77e4($at)
+/* 95D998 80242798 3C018024 */  lui       $at, %hi(D_802477E4)
+/* 95D99C 8024279C AC2277E4 */  sw        $v0, %lo(D_802477E4)($at)
 /* 95D9A0 802427A0 24020002 */  addiu     $v0, $zero, 2
 /* 95D9A4 802427A4 8FBF0010 */  lw        $ra, 0x10($sp)
 /* 95D9A8 802427A8 24030001 */  addiu     $v1, $zero, 1
-/* 95D9AC 802427AC 3C018024 */  lui       $at, 0x8024
-/* 95D9B0 802427B0 AC2377E0 */  sw        $v1, 0x77e0($at)
+/* 95D9AC 802427AC 3C018024 */  lui       $at, %hi(D_802477E0)
+/* 95D9B0 802427B0 AC2377E0 */  sw        $v1, %lo(D_802477E0)($at)
 /* 95D9B4 802427B4 03E00008 */  jr        $ra
 /* 95D9B8 802427B8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802427BC_95D9BC.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802427BC_95D9BC.s
index 6513000dd9..0957f3286e 100644
--- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802427BC_95D9BC.s
+++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802427BC_95D9BC.s
@@ -13,8 +13,8 @@ glabel func_802427BC_95D9BC
 /* 95D9DC 802427DC 8C620000 */  lw        $v0, ($v1)
 /* 95D9E0 802427E0 5040000A */  beql      $v0, $zero, .L8024280C
 /* 95D9E4 802427E4 00041080 */   sll      $v0, $a0, 2
-/* 95D9E8 802427E8 3C058025 */  lui       $a1, 0x8025
-/* 95D9EC 802427EC 24A5DFF0 */  addiu     $a1, $a1, -0x2010
+/* 95D9E8 802427E8 3C058025 */  lui       $a1, %hi(D_8024DFF0)
+/* 95D9EC 802427EC 24A5DFF0 */  addiu     $a1, $a1, %lo(D_8024DFF0)
 .L802427F0:
 /* 95D9F0 802427F0 24630004 */  addiu     $v1, $v1, 4
 /* 95D9F4 802427F4 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_802427BC_95D9BC
 /* 95DA04 80242804 24A50004 */   addiu    $a1, $a1, 4
 /* 95DA08 80242808 00041080 */  sll       $v0, $a0, 2
 .L8024280C:
-/* 95DA0C 8024280C 3C018025 */  lui       $at, 0x8025
+/* 95DA0C 8024280C 3C018025 */  lui       $at, %hi(D_8024DFF0)
 /* 95DA10 80242810 00220821 */  addu      $at, $at, $v0
-/* 95DA14 80242814 AC20DFF0 */  sw        $zero, -0x2010($at)
+/* 95DA14 80242814 AC20DFF0 */  sw        $zero, %lo(D_8024DFF0)($at)
 /* 95DA18 80242818 08090A12 */  j         .L80242848
 /* 95DA1C 8024281C 00000000 */   nop      
 .L80242820:
-/* 95DA20 80242820 3C038025 */  lui       $v1, 0x8025
-/* 95DA24 80242824 2463DFF0 */  addiu     $v1, $v1, -0x2010
+/* 95DA20 80242820 3C038025 */  lui       $v1, %hi(D_8024DFF0)
+/* 95DA24 80242824 2463DFF0 */  addiu     $v1, $v1, %lo(D_8024DFF0)
 /* 95DA28 80242828 0060282D */  daddu     $a1, $v1, $zero
 .L8024282C:
 /* 95DA2C 8024282C 24820010 */  addiu     $v0, $a0, 0x10
diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242858_95DA58.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242858_95DA58.s
index df16c387d1..9f73f189b3 100644
--- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242858_95DA58.s
+++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242858_95DA58.s
@@ -49,9 +49,9 @@ glabel func_80242858_95DA58
 /* 95DB04 80242904 2C620005 */  sltiu     $v0, $v1, 5
 /* 95DB08 80242908 10400116 */  beqz      $v0, .L80242D64
 /* 95DB0C 8024290C 00031080 */   sll      $v0, $v1, 2
-/* 95DB10 80242910 3C018025 */  lui       $at, 0x8025
+/* 95DB10 80242910 3C018025 */  lui       $at, %hi(D_8024DF80)
 /* 95DB14 80242914 00220821 */  addu      $at, $at, $v0
-/* 95DB18 80242918 8C22DF80 */  lw        $v0, -0x2080($at)
+/* 95DB18 80242918 8C22DF80 */  lw        $v0, %lo(D_8024DF80)($at)
 /* 95DB1C 8024291C 00400008 */  jr        $v0
 /* 95DB20 80242920 00000000 */   nop      
 /* 95DB24 80242924 C60C0000 */  lwc1      $f12, ($s0)
diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80243014_95E214.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80243014_95E214.s
index 1d30825e33..cbd25301df 100644
--- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80243014_95E214.s
+++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80243014_95E214.s
@@ -15,7 +15,7 @@ glabel func_80243014_95E214
 /* 95E23C 8024303C 8FBF0014 */  lw        $ra, 0x14($sp)
 /* 95E240 80243040 8FB00010 */  lw        $s0, 0x10($sp)
 /* 95E244 80243044 24020002 */  addiu     $v0, $zero, 2
-/* 95E248 80243048 3C018025 */  lui       $at, 0x8025
-/* 95E24C 8024304C AC23E1B4 */  sw        $v1, -0x1e4c($at)
+/* 95E248 80243048 3C018025 */  lui       $at, %hi(D_8024E1B4)
+/* 95E24C 8024304C AC23E1B4 */  sw        $v1, %lo(D_8024E1B4)($at)
 /* 95E250 80243050 03E00008 */  jr        $ra
 /* 95E254 80243054 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80243058_95E258.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80243058_95E258.s
index 57fb6840b6..3aea0e3b8c 100644
--- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80243058_95E258.s
+++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80243058_95E258.s
@@ -6,8 +6,8 @@ glabel func_80243058_95E258
 /* 95E25C 8024305C AFBF0010 */  sw        $ra, 0x10($sp)
 /* 95E260 80243060 0C00EABB */  jal       get_npc_unsafe
 /* 95E264 80243064 8C84008C */   lw       $a0, 0x8c($a0)
-/* 95E268 80243068 3C038025 */  lui       $v1, 0x8025
-/* 95E26C 8024306C 8C63E1B4 */  lw        $v1, -0x1e4c($v1)
+/* 95E268 80243068 3C038025 */  lui       $v1, %hi(D_8024E1B4)
+/* 95E26C 8024306C 8C63E1B4 */  lw        $v1, %lo(D_8024E1B4)($v1)
 /* 95E270 80243070 AC430028 */  sw        $v1, 0x28($v0)
 /* 95E274 80243074 8FBF0010 */  lw        $ra, 0x10($sp)
 /* 95E278 80243078 24020002 */  addiu     $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802430C8_95E2C8.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802430C8_95E2C8.s
index 701cd35922..a8931ae66b 100644
--- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802430C8_95E2C8.s
+++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802430C8_95E2C8.s
@@ -14,9 +14,9 @@ glabel func_802430C8_95E2C8
 /* 95E2EC 802430EC 1040002A */  beqz      $v0, .L80243198
 /* 95E2F0 802430F0 0080882D */   daddu    $s1, $a0, $zero
 /* 95E2F4 802430F4 00051080 */  sll       $v0, $a1, 2
-/* 95E2F8 802430F8 3C018025 */  lui       $at, 0x8025
+/* 95E2F8 802430F8 3C018025 */  lui       $at, %hi(D_8024DF98)
 /* 95E2FC 802430FC 00220821 */  addu      $at, $at, $v0
-/* 95E300 80243100 8C22DF98 */  lw        $v0, -0x2068($at)
+/* 95E300 80243100 8C22DF98 */  lw        $v0, %lo(D_8024DF98)($at)
 /* 95E304 80243104 00400008 */  jr        $v0
 /* 95E308 80243108 00000000 */   nop      
 /* 95E30C 8024310C 8E22001C */  lw        $v0, 0x1c($s1)
@@ -48,8 +48,8 @@ glabel func_802430C8_95E2C8
 /* 95E374 80243174 00000000 */  nop       
 /* 95E378 80243178 45000007 */  bc1f      .L80243198
 /* 95E37C 8024317C 0000302D */   daddu    $a2, $zero, $zero
-/* 95E380 80243180 3C048025 */  lui       $a0, 0x8025
-/* 95E384 80243184 24848504 */  addiu     $a0, $a0, -0x7afc
+/* 95E380 80243180 3C048025 */  lui       $a0, %hi(D_80248504)
+/* 95E384 80243184 24848504 */  addiu     $a0, $a0, %lo(D_80248504)
 /* 95E388 80243188 0C0B0CF8 */  jal       start_script
 /* 95E38C 8024318C 24050001 */   addiu    $a1, $zero, 1
 /* 95E390 80243190 24020004 */  addiu     $v0, $zero, 4
diff --git a/asm/nonmatchings/world/area_dro/dro_01/95E660/func_80243460_95E660.s b/asm/nonmatchings/world/area_dro/dro_01/95E660/func_80243460_95E660.s
index 042693f2b1..01ddec8488 100644
--- a/asm/nonmatchings/world/area_dro/dro_01/95E660/func_80243460_95E660.s
+++ b/asm/nonmatchings/world/area_dro/dro_01/95E660/func_80243460_95E660.s
@@ -4,8 +4,8 @@
 glabel func_80243460_95E660
 /* 95E660 80243460 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* 95E664 80243464 AFB00010 */  sw        $s0, 0x10($sp)
-/* 95E668 80243468 3C108025 */  lui       $s0, 0x8025
-/* 95E66C 8024346C 2610B5B0 */  addiu     $s0, $s0, -0x4a50
+/* 95E668 80243468 3C108025 */  lui       $s0, %hi(D_8024B5B0)
+/* 95E66C 8024346C 2610B5B0 */  addiu     $s0, $s0, %lo(D_8024B5B0)
 /* 95E670 80243470 AFBF0018 */  sw        $ra, 0x18($sp)
 /* 95E674 80243474 AFB10014 */  sw        $s1, 0x14($sp)
 /* 95E678 80243478 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_80243460_95E660
 /* 95E6DC 802434DC 28620010 */  slti      $v0, $v1, 0x10
 /* 95E6E0 802434E0 1440FFFA */  bnez      $v0, .L802434CC
 /* 95E6E4 802434E4 24840004 */   addiu    $a0, $a0, 4
-/* 95E6E8 802434E8 3C108025 */  lui       $s0, 0x8025
-/* 95E6EC 802434EC 2610B5B0 */  addiu     $s0, $s0, -0x4a50
+/* 95E6E8 802434E8 3C108025 */  lui       $s0, %hi(D_8024B5B0)
+/* 95E6EC 802434EC 2610B5B0 */  addiu     $s0, $s0, %lo(D_8024B5B0)
 /* 95E6F0 802434F0 0C00AB4B */  jal       heap_free
 /* 95E6F4 802434F4 8E040000 */   lw       $a0, ($s0)
 /* 95E6F8 802434F8 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_dro/dro_02/9691C0/func_80240000_9691C0.s b/asm/nonmatchings/world/area_dro/dro_02/9691C0/func_80240000_9691C0.s
index e25342769b..0d09e69da8 100644
--- a/asm/nonmatchings/world/area_dro/dro_02/9691C0/func_80240000_9691C0.s
+++ b/asm/nonmatchings/world/area_dro/dro_02/9691C0/func_80240000_9691C0.s
@@ -71,8 +71,8 @@ glabel func_80240000_9691C0
 /* 9692B4 802400F4 08090035 */  j         .L802400D4
 /* 9692B8 802400F8 00000000 */   nop      
 .L802400FC:
-/* 9692BC 802400FC 3C028015 */  lui       $v0, 0x8015
-/* 9692C0 80240100 8C4212F0 */  lw        $v0, 0x12f0($v0)
+/* 9692BC 802400FC 3C028015 */  lui       $v0, %hi(D_801512F0)
+/* 9692C0 80240100 8C4212F0 */  lw        $v0, %lo(D_801512F0)($v0)
 /* 9692C4 80240104 A0510000 */  sb        $s1, ($v0)
 .L80240108:
 /* 9692C8 80240108 24020002 */  addiu     $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240300_9694C0.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240300_9694C0.s
index 06889b3548..db88412219 100644
--- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240300_9694C0.s
+++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240300_9694C0.s
@@ -4,8 +4,8 @@
 glabel func_80240300_9694C0
 /* 9694C0 80240300 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* 9694C4 80240304 AFB00010 */  sw        $s0, 0x10($sp)
-/* 9694C8 80240308 3C108024 */  lui       $s0, 0x8024
-/* 9694CC 8024030C 26104DE0 */  addiu     $s0, $s0, 0x4de0
+/* 9694C8 80240308 3C108024 */  lui       $s0, %hi(D_80244DE0)
+/* 9694CC 8024030C 26104DE0 */  addiu     $s0, $s0, %lo(D_80244DE0)
 /* 9694D0 80240310 AFBF0018 */  sw        $ra, 0x18($sp)
 /* 9694D4 80240314 AFB10014 */  sw        $s1, 0x14($sp)
 /* 9694D8 80240318 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_80240300_9694C0
 /* 96953C 8024037C 28620010 */  slti      $v0, $v1, 0x10
 /* 969540 80240380 1440FFFA */  bnez      $v0, .L8024036C
 /* 969544 80240384 24840004 */   addiu    $a0, $a0, 4
-/* 969548 80240388 3C108024 */  lui       $s0, 0x8024
-/* 96954C 8024038C 26104DE0 */  addiu     $s0, $s0, 0x4de0
+/* 969548 80240388 3C108024 */  lui       $s0, %hi(D_80244DE0)
+/* 96954C 8024038C 26104DE0 */  addiu     $s0, $s0, %lo(D_80244DE0)
 /* 969550 80240390 0C00AB4B */  jal       heap_free
 /* 969554 80240394 8E040000 */   lw       $a0, ($s0)
 /* 969558 80240398 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024043C_9695FC.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024043C_9695FC.s
index 54a407138c..50da4603af 100644
--- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024043C_9695FC.s
+++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024043C_9695FC.s
@@ -90,8 +90,8 @@ glabel func_8024043C_9695FC
 /* 969748 80240588 0040802D */   daddu    $s0, $v0, $zero
 /* 96974C 8024058C 0040282D */  daddu     $a1, $v0, $zero
 /* 969750 80240590 0000182D */  daddu     $v1, $zero, $zero
-/* 969754 80240594 3C068024 */  lui       $a2, 0x8024
-/* 969758 80240598 24C64E84 */  addiu     $a2, $a2, 0x4e84
+/* 969754 80240594 3C068024 */  lui       $a2, %hi(D_80244E84)
+/* 969758 80240598 24C64E84 */  addiu     $a2, $a2, %lo(D_80244E84)
 /* 96975C 8024059C 00C0202D */  daddu     $a0, $a2, $zero
 .L802405A0:
 /* 969760 802405A0 8C820000 */  lw        $v0, ($a0)
diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240660_969820.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240660_969820.s
index e4724502ee..ae8accf4cc 100644
--- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240660_969820.s
+++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240660_969820.s
@@ -9,8 +9,8 @@ glabel func_80240660_969820
 /* 969830 80240670 8C84014C */   lw       $a0, 0x14c($a0)
 /* 969834 80240674 24040008 */  addiu     $a0, $zero, 8
 /* 969838 80240678 0040802D */  daddu     $s0, $v0, $zero
-/* 96983C 8024067C 3C028024 */  lui       $v0, 0x8024
-/* 969840 80240680 244206CC */  addiu     $v0, $v0, 0x6cc
+/* 96983C 8024067C 3C028024 */  lui       $v0, %hi(D_802406CC)
+/* 969840 80240680 244206CC */  addiu     $v0, $v0, %lo(D_802406CC)
 /* 969844 80240684 0C00AB39 */  jal       heap_malloc
 /* 969848 80240688 AE020008 */   sw       $v0, 8($s0)
 /* 96984C 8024068C 0040182D */  daddu     $v1, $v0, $zero
diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802406CC_96988C.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802406CC_96988C.s
index 6d5fc8e0e5..970c3d75ed 100644
--- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802406CC_96988C.s
+++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802406CC_96988C.s
@@ -3,8 +3,8 @@
 
 glabel func_802406CC_96988C
 /* 96988C 802406CC 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 969890 802406D0 3C03800A */  lui       $v1, 0x800a
-/* 969894 802406D4 8463A634 */  lh        $v1, -0x59cc($v1)
+/* 969890 802406D0 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* 969894 802406D4 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* 969898 802406D8 3C05800B */  lui       $a1, %hi(gCameras)
 /* 96989C 802406DC 24A51D80 */  addiu     $a1, $a1, %lo(gCameras)
 /* 9698A0 802406E0 AFBF0010 */  sw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024072C_9698EC.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024072C_9698EC.s
index 85264e64d5..06c2688b99 100644
--- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024072C_9698EC.s
+++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024072C_9698EC.s
@@ -21,8 +21,8 @@ glabel func_8024072C_9698EC
 /* 96992C 8024076C 2414FFFC */  addiu     $s4, $zero, -4
 /* 969930 80240770 2413000A */  addiu     $s3, $zero, 0xa
 /* 969934 80240774 3C120080 */  lui       $s2, 0x80
-/* 969938 80240778 3C038015 */  lui       $v1, 0x8015
-/* 96993C 8024077C 8C6312F0 */  lw        $v1, 0x12f0($v1)
+/* 969938 80240778 3C038015 */  lui       $v1, %hi(D_801512F0)
+/* 96993C 8024077C 8C6312F0 */  lw        $v1, %lo(D_801512F0)($v1)
 /* 969940 80240780 24020001 */  addiu     $v0, $zero, 1
 /* 969944 80240784 0C046F97 */  jal       set_background_color_blend
 /* 969948 80240788 A0620000 */   sb       $v0, ($v1)
diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240878_969A38.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240878_969A38.s
index 22bcb8a1eb..69e13c8380 100644
--- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240878_969A38.s
+++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240878_969A38.s
@@ -49,8 +49,8 @@ glabel func_80240878_969A38
 /* 969ADC 8024091C 2413FFFC */  addiu     $s3, $zero, -4
 /* 969AE0 80240920 2412000A */  addiu     $s2, $zero, 0xa
 /* 969AE4 80240924 3C11FF7F */  lui       $s1, 0xff7f
-/* 969AE8 80240928 3C028015 */  lui       $v0, 0x8015
-/* 969AEC 8024092C 8C4212F0 */  lw        $v0, 0x12f0($v0)
+/* 969AE8 80240928 3C028015 */  lui       $v0, %hi(D_801512F0)
+/* 969AEC 8024092C 8C4212F0 */  lw        $v0, %lo(D_801512F0)($v0)
 /* 969AF0 80240930 3631FFFF */  ori       $s1, $s1, 0xffff
 /* 969AF4 80240934 A0400000 */  sb        $zero, ($v0)
 .L80240938:
diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802409EC_969BAC.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802409EC_969BAC.s
index 731d32967d..bfec2def9a 100644
--- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802409EC_969BAC.s
+++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802409EC_969BAC.s
@@ -19,9 +19,9 @@ glabel func_802409EC_969BAC
 /* 969BE0 80240A20 34A502E0 */  ori       $a1, $a1, 0x2e0
 /* 969BE4 80240A24 0C0B1EAF */  jal       get_variable
 /* 969BE8 80240A28 0000202D */   daddu    $a0, $zero, $zero
-/* 969BEC 80240A2C 3C038024 */  lui       $v1, 0x8024
+/* 969BEC 80240A2C 3C038024 */  lui       $v1, %hi(D_80244E44)
 /* 969BF0 80240A30 00621821 */  addu      $v1, $v1, $v0
-/* 969BF4 80240A34 90634E44 */  lbu       $v1, 0x4e44($v1)
+/* 969BF4 80240A34 90634E44 */  lbu       $v1, %lo(D_80244E44)($v1)
 /* 969BF8 80240A38 8E220084 */  lw        $v0, 0x84($s1)
 /* 969BFC 80240A3C 54430006 */  bnel      $v0, $v1, .L80240A58
 /* 969C00 80240A40 AE200084 */   sw       $zero, 0x84($s1)
diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240A70_969C30.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240A70_969C30.s
index 0c9c4bd015..e01f108bdc 100644
--- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240A70_969C30.s
+++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240A70_969C30.s
@@ -38,8 +38,8 @@ glabel func_80240A70_969C30
 /* 969CB4 80240AF4 0220202D */  daddu     $a0, $s1, $zero
 /* 969CB8 80240AF8 3C05F4AC */  lui       $a1, 0xf4ac
 /* 969CBC 80240AFC 34A5D481 */  ori       $a1, $a1, 0xd481
-/* 969CC0 80240B00 3C108025 */  lui       $s0, 0x8025
-/* 969CC4 80240B04 2610EFC0 */  addiu     $s0, $s0, -0x1040
+/* 969CC0 80240B00 3C108025 */  lui       $s0, %hi(D_8024EFC0)
+/* 969CC4 80240B04 2610EFC0 */  addiu     $s0, $s0, %lo(D_8024EFC0)
 /* 969CC8 80240B08 0C0B1EAF */  jal       get_variable
 /* 969CCC 80240B0C AE020000 */   sw       $v0, ($s0)
 /* 969CD0 80240B10 0220202D */  daddu     $a0, $s1, $zero
@@ -66,8 +66,8 @@ glabel func_80240A70_969C30
 /* 969D24 80240B64 0000202D */   daddu    $a0, $zero, $zero
 /* 969D28 80240B68 0220202D */  daddu     $a0, $s1, $zero
 /* 969D2C 80240B6C 3C05F4AC */  lui       $a1, 0xf4ac
-/* 969D30 80240B70 3C018025 */  lui       $at, 0x8025
-/* 969D34 80240B74 AC22EFC4 */  sw        $v0, -0x103c($at)
+/* 969D30 80240B70 3C018025 */  lui       $at, %hi(D_8024EFC4)
+/* 969D34 80240B74 AC22EFC4 */  sw        $v0, %lo(D_8024EFC4)($at)
 /* 969D38 80240B78 0C0B1EAF */  jal       get_variable
 /* 969D3C 80240B7C 34A5D481 */   ori      $a1, $a1, 0xd481
 /* 969D40 80240B80 0220202D */  daddu     $a0, $s1, $zero
@@ -98,16 +98,16 @@ glabel func_80240A70_969C30
 /* 969DA4 80240BE4 E7A00010 */   swc1     $f0, 0x10($sp)
 /* 969DA8 80240BE8 8E030000 */  lw        $v1, ($s0)
 /* 969DAC 80240BEC 8C64000C */  lw        $a0, 0xc($v1)
-/* 969DB0 80240BF0 3C018025 */  lui       $at, 0x8025
-/* 969DB4 80240BF4 AC22EFC8 */  sw        $v0, -0x1038($at)
+/* 969DB0 80240BF0 3C018025 */  lui       $at, %hi(D_8024EFC8)
+/* 969DB4 80240BF4 AC22EFC8 */  sw        $v0, %lo(D_8024EFC8)($at)
 /* 969DB8 80240BF8 AC800018 */  sw        $zero, 0x18($a0)
 /* 969DBC 80240BFC AC800020 */  sw        $zero, 0x20($a0)
 /* 969DC0 80240C00 AC800024 */  sw        $zero, 0x24($a0)
 /* 969DC4 80240C04 AC800028 */  sw        $zero, 0x28($a0)
 /* 969DC8 80240C08 AC80001C */  sw        $zero, 0x1c($a0)
 .L80240C0C:
-/* 969DCC 80240C0C 3C028025 */  lui       $v0, 0x8025
-/* 969DD0 80240C10 8C42EFC0 */  lw        $v0, -0x1040($v0)
+/* 969DCC 80240C0C 3C028025 */  lui       $v0, %hi(D_8024EFC0)
+/* 969DD0 80240C10 8C42EFC0 */  lw        $v0, %lo(D_8024EFC0)($v0)
 /* 969DD4 80240C14 8C44000C */  lw        $a0, 0xc($v0)
 /* 969DD8 80240C18 8C820020 */  lw        $v0, 0x20($a0)
 /* 969DDC 80240C1C 8C830028 */  lw        $v1, 0x28($a0)
diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240C88_969E48.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240C88_969E48.s
index 773104b695..b64c6f9d9b 100644
--- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240C88_969E48.s
+++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240C88_969E48.s
@@ -5,19 +5,19 @@ glabel func_80240C88_969E48
 /* 969E48 80240C88 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 969E4C 80240C8C 10A0000B */  beqz      $a1, .L80240CBC
 /* 969E50 80240C90 AFBF0010 */   sw       $ra, 0x10($sp)
-/* 969E54 80240C94 3C038025 */  lui       $v1, 0x8025
-/* 969E58 80240C98 8C63EFC4 */  lw        $v1, -0x103c($v1)
+/* 969E54 80240C94 3C038025 */  lui       $v1, %hi(D_8024EFC4)
+/* 969E58 80240C98 8C63EFC4 */  lw        $v1, %lo(D_8024EFC4)($v1)
 /* 969E5C 80240C9C 8C620000 */  lw        $v0, ($v1)
-/* 969E60 80240CA0 3C048025 */  lui       $a0, 0x8025
-/* 969E64 80240CA4 8C84EFC8 */  lw        $a0, -0x1038($a0)
+/* 969E60 80240CA0 3C048025 */  lui       $a0, %hi(D_8024EFC8)
+/* 969E64 80240CA4 8C84EFC8 */  lw        $a0, %lo(D_8024EFC8)($a0)
 /* 969E68 80240CA8 34420010 */  ori       $v0, $v0, 0x10
 /* 969E6C 80240CAC AC620000 */  sw        $v0, ($v1)
 /* 969E70 80240CB0 8C820000 */  lw        $v0, ($a0)
 /* 969E74 80240CB4 34420010 */  ori       $v0, $v0, 0x10
 /* 969E78 80240CB8 AC820000 */  sw        $v0, ($a0)
 .L80240CBC:
-/* 969E7C 80240CBC 3C048025 */  lui       $a0, 0x8025
-/* 969E80 80240CC0 8C84EFC0 */  lw        $a0, -0x1040($a0)
+/* 969E7C 80240CBC 3C048025 */  lui       $a0, %hi(D_8024EFC0)
+/* 969E80 80240CC0 8C84EFC0 */  lw        $a0, %lo(D_8024EFC0)($a0)
 /* 969E84 80240CC4 8C85000C */  lw        $a1, 0xc($a0)
 /* 969E88 80240CC8 8CA20018 */  lw        $v0, 0x18($a1)
 /* 969E8C 80240CCC 8CA30020 */  lw        $v1, 0x20($a1)
diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240D3C_969EFC.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240D3C_969EFC.s
index 73011eae1d..2faa6445ff 100644
--- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240D3C_969EFC.s
+++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240D3C_969EFC.s
@@ -7,8 +7,8 @@ glabel func_80240D3C_969EFC
 /* 969F04 80240D44 8C82000C */  lw        $v0, 0xc($a0)
 /* 969F08 80240D48 0C0B1EAF */  jal       get_variable
 /* 969F0C 80240D4C 8C450000 */   lw       $a1, ($v0)
-/* 969F10 80240D50 3C038025 */  lui       $v1, 0x8025
-/* 969F14 80240D54 8C63EFC0 */  lw        $v1, -0x1040($v1)
+/* 969F10 80240D50 3C038025 */  lui       $v1, %hi(D_8024EFC0)
+/* 969F14 80240D54 8C63EFC0 */  lw        $v1, %lo(D_8024EFC0)($v1)
 /* 969F18 80240D58 8C63000C */  lw        $v1, 0xc($v1)
 /* 969F1C 80240D5C AC620034 */  sw        $v0, 0x34($v1)
 /* 969F20 80240D60 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240D70_969F30.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240D70_969F30.s
index c87c6e9ad4..b079b99e64 100644
--- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240D70_969F30.s
+++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240D70_969F30.s
@@ -8,8 +8,8 @@ glabel func_80240D70_969F30
 /* 969F3C 80240D7C 0C0B1EAF */  jal       get_variable
 /* 969F40 80240D80 8C450000 */   lw       $a1, ($v0)
 /* 969F44 80240D84 0040202D */  daddu     $a0, $v0, $zero
-/* 969F48 80240D88 3C028025 */  lui       $v0, 0x8025
-/* 969F4C 80240D8C 8C42EFC0 */  lw        $v0, -0x1040($v0)
+/* 969F48 80240D88 3C028025 */  lui       $v0, %hi(D_8024EFC0)
+/* 969F4C 80240D8C 8C42EFC0 */  lw        $v0, %lo(D_8024EFC0)($v0)
 /* 969F50 80240D90 24030001 */  addiu     $v1, $zero, 1
 /* 969F54 80240D94 8C45000C */  lw        $a1, 0xc($v0)
 /* 969F58 80240D98 1083000D */  beq       $a0, $v1, .L80240DD0
diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240DF0_969FB0.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240DF0_969FB0.s
index 316c997580..847f5ed63e 100644
--- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240DF0_969FB0.s
+++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240DF0_969FB0.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80240DF0_969FB0
-/* 969FB0 80240DF0 3C028025 */  lui       $v0, 0x8025
-/* 969FB4 80240DF4 8C42EFC8 */  lw        $v0, -0x1038($v0)
+/* 969FB0 80240DF0 3C028025 */  lui       $v0, %hi(D_8024EFC8)
+/* 969FB4 80240DF4 8C42EFC8 */  lw        $v0, %lo(D_8024EFC8)($v0)
 /* 969FB8 80240DF8 8C42000C */  lw        $v0, 0xc($v0)
 /* 969FBC 80240DFC AC40001C */  sw        $zero, 0x1c($v0)
 /* 969FC0 80240E00 03E00008 */  jr        $ra
diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240E08_969FC8.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240E08_969FC8.s
index 5509157204..fbbe5129d1 100644
--- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240E08_969FC8.s
+++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240E08_969FC8.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80240E08_969FC8
-/* 969FC8 80240E08 3C028025 */  lui       $v0, 0x8025
-/* 969FCC 80240E0C 8C42EFC8 */  lw        $v0, -0x1038($v0)
+/* 969FC8 80240E08 3C028025 */  lui       $v0, %hi(D_8024EFC8)
+/* 969FCC 80240E0C 8C42EFC8 */  lw        $v0, %lo(D_8024EFC8)($v0)
 /* 969FD0 80240E10 8C43000C */  lw        $v1, 0xc($v0)
 /* 969FD4 80240E14 24020001 */  addiu     $v0, $zero, 1
 /* 969FD8 80240E18 AC62001C */  sw        $v0, 0x1c($v1)
diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240E24_969FE4.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240E24_969FE4.s
index 712b5a181b..194fff4726 100644
--- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240E24_969FE4.s
+++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240E24_969FE4.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80240E24_969FE4
-/* 969FE4 80240E24 3C028025 */  lui       $v0, 0x8025
-/* 969FE8 80240E28 8C42EFC8 */  lw        $v0, -0x1038($v0)
+/* 969FE4 80240E24 3C028025 */  lui       $v0, %hi(D_8024EFC8)
+/* 969FE8 80240E28 8C42EFC8 */  lw        $v0, %lo(D_8024EFC8)($v0)
 /* 969FEC 80240E2C 8C43000C */  lw        $v1, 0xc($v0)
 /* 969FF0 80240E30 24020002 */  addiu     $v0, $zero, 2
 /* 969FF4 80240E34 03E00008 */  jr        $ra
diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802412F8_96A4B8.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802412F8_96A4B8.s
index e8f3e6e374..e61891742c 100644
--- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802412F8_96A4B8.s
+++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802412F8_96A4B8.s
@@ -3,8 +3,8 @@
 
 glabel func_802412F8_96A4B8
 /* 96A4B8 802412F8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 96A4BC 802412FC 3C058025 */  lui       $a1, 0x8025
-/* 96A4C0 80241300 8CA5EFB8 */  lw        $a1, -0x1048($a1)
+/* 96A4BC 802412FC 3C058025 */  lui       $a1, %hi(D_8024EFB8)
+/* 96A4C0 80241300 8CA5EFB8 */  lw        $a1, %lo(D_8024EFB8)($a1)
 /* 96A4C4 80241304 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 96A4C8 80241308 0C0B1EAF */  jal       get_variable
 /* 96A4CC 8024130C 0000202D */   daddu    $a0, $zero, $zero
diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80241364_96A524.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80241364_96A524.s
index f6624d8174..b7511e5af5 100644
--- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80241364_96A524.s
+++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80241364_96A524.s
@@ -3,8 +3,8 @@
 
 glabel func_80241364_96A524
 /* 96A524 80241364 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 96A528 80241368 3C058024 */  lui       $a1, 0x8024
-/* 96A52C 8024136C 24A512F8 */  addiu     $a1, $a1, 0x12f8
+/* 96A528 80241368 3C058024 */  lui       $a1, %hi(D_802412F8)
+/* 96A52C 8024136C 24A512F8 */  addiu     $a1, $a1, %lo(D_802412F8)
 /* 96A530 80241370 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 96A534 80241374 0C048C8F */  jal       bind_dynamic_entity_7
 /* 96A538 80241378 0000202D */   daddu    $a0, $zero, $zero
diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80241394_96A554.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80241394_96A554.s
index cb809c3109..3a6796d5b8 100644
--- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80241394_96A554.s
+++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80241394_96A554.s
@@ -14,14 +14,14 @@ glabel func_80241394_96A554
 /* 96A578 802413B8 26100004 */   addiu    $s0, $s0, 4
 /* 96A57C 802413BC 3C118011 */  lui       $s1, %hi(gPlayerData)
 /* 96A580 802413C0 2631F290 */  addiu     $s1, $s1, %lo(gPlayerData)
-/* 96A584 802413C4 3C058024 */  lui       $a1, 0x8024
+/* 96A584 802413C4 3C058024 */  lui       $a1, %hi(D_802475E0)
 /* 96A588 802413C8 00A22821 */  addu      $a1, $a1, $v0
-/* 96A58C 802413CC 90A575E0 */  lbu       $a1, 0x75e0($a1)
+/* 96A58C 802413CC 90A575E0 */  lbu       $a1, %lo(D_802475E0)($a1)
 /* 96A590 802413D0 8623000C */  lh        $v1, 0xc($s1)
 /* 96A594 802413D4 8E100000 */  lw        $s0, ($s0)
-/* 96A598 802413D8 3C068024 */  lui       $a2, 0x8024
+/* 96A598 802413D8 3C068024 */  lui       $a2, %hi(D_802475DC)
 /* 96A59C 802413DC 00C23021 */  addu      $a2, $a2, $v0
-/* 96A5A0 802413E0 90C675DC */  lbu       $a2, 0x75dc($a2)
+/* 96A5A0 802413E0 90C675DC */  lbu       $a2, %lo(D_802475DC)($a2)
 /* 96A5A4 802413E4 9624000C */  lhu       $a0, 0xc($s1)
 /* 96A5A8 802413E8 0065182A */  slt       $v1, $v1, $a1
 /* 96A5AC 802413EC 10600005 */  beqz      $v1, .L80241404
diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802414C0_96A680.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802414C0_96A680.s
index 00b3bdca5c..50f26d8530 100644
--- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802414C0_96A680.s
+++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802414C0_96A680.s
@@ -21,8 +21,8 @@ glabel func_802414C0_96A680
 /* 96A6C0 80241500 2414FFFC */  addiu     $s4, $zero, -4
 /* 96A6C4 80241504 24130004 */  addiu     $s3, $zero, 4
 /* 96A6C8 80241508 3C120080 */  lui       $s2, 0x80
-/* 96A6CC 8024150C 3C038015 */  lui       $v1, 0x8015
-/* 96A6D0 80241510 8C6312F0 */  lw        $v1, 0x12f0($v1)
+/* 96A6CC 8024150C 3C038015 */  lui       $v1, %hi(D_801512F0)
+/* 96A6D0 80241510 8C6312F0 */  lw        $v1, %lo(D_801512F0)($v1)
 /* 96A6D4 80241514 24020001 */  addiu     $v0, $zero, 1
 /* 96A6D8 80241518 0C046F97 */  jal       set_background_color_blend
 /* 96A6DC 8024151C A0620000 */   sb       $v0, ($v1)
diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802415CC_96A78C.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802415CC_96A78C.s
index e8c226edf2..96de3b8af9 100644
--- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802415CC_96A78C.s
+++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802415CC_96A78C.s
@@ -49,8 +49,8 @@ glabel func_802415CC_96A78C
 /* 96A830 80241670 2413FFFC */  addiu     $s3, $zero, -4
 /* 96A834 80241674 24120004 */  addiu     $s2, $zero, 4
 /* 96A838 80241678 3C11FF7F */  lui       $s1, 0xff7f
-/* 96A83C 8024167C 3C028015 */  lui       $v0, 0x8015
-/* 96A840 80241680 8C4212F0 */  lw        $v0, 0x12f0($v0)
+/* 96A83C 8024167C 3C028015 */  lui       $v0, %hi(D_801512F0)
+/* 96A840 80241680 8C4212F0 */  lw        $v0, %lo(D_801512F0)($v0)
 /* 96A844 80241684 3631FFFF */  ori       $s1, $s1, 0xffff
 /* 96A848 80241688 A0400000 */  sb        $zero, ($v0)
 .L8024168C:
diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802416FC_96A8BC.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802416FC_96A8BC.s
index 6c6011589f..6063e1b1b9 100644
--- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802416FC_96A8BC.s
+++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802416FC_96A8BC.s
@@ -9,8 +9,8 @@ glabel func_802416FC_96A8BC
 /* 96A8CC 8024170C AFB3002C */  sw        $s3, 0x2c($sp)
 /* 96A8D0 80241710 AFB10024 */  sw        $s1, 0x24($sp)
 /* 96A8D4 80241714 AFB00020 */  sw        $s0, 0x20($sp)
-/* 96A8D8 80241718 3C018025 */  lui       $at, 0x8025
-/* 96A8DC 8024171C AC32EFCC */  sw        $s2, -0x1034($at)
+/* 96A8D8 80241718 3C018025 */  lui       $at, %hi(D_8024EFCC)
+/* 96A8DC 8024171C AC32EFCC */  sw        $s2, %lo(D_8024EFCC)($at)
 /* 96A8E0 80241720 0C04E9C1 */  jal       func_8013A704
 /* 96A8E4 80241724 24040001 */   addiu    $a0, $zero, 1
 /* 96A8E8 80241728 0040982D */  daddu     $s3, $v0, $zero
@@ -73,14 +73,14 @@ glabel func_802416FC_96A8BC
 /* 96A9CC 8024180C 0C04EAA7 */  jal       func_8013AA9C
 /* 96A9D0 80241810 AFB00018 */   sw       $s0, 0x18($sp)
 /* 96A9D4 80241814 0240202D */  daddu     $a0, $s2, $zero
-/* 96A9D8 80241818 3C05F4AC */  lui       $a1, 0xf4ac
+/* 96A9D8 80241818 3C05F4AC */  lui       $a1, %hi(D_F4AC2EAC)
 /* 96A9DC 8024181C 34A5D483 */  ori       $a1, $a1, 0xd483
 /* 96A9E0 80241820 0C0B2026 */  jal       set_variable
 /* 96A9E4 80241824 0260302D */   daddu    $a2, $s3, $zero
-/* 96A9E8 80241828 3C048024 */  lui       $a0, 0x8024
-/* 96A9EC 8024182C 2484240C */  addiu     $a0, $a0, 0x240c
-/* 96A9F0 80241830 3C058024 */  lui       $a1, 0x8024
-/* 96A9F4 80241834 24A52EAC */  addiu     $a1, $a1, 0x2eac
+/* 96A9E8 80241828 3C048024 */  lui       $a0, %hi(D_8024240C)
+/* 96A9EC 8024182C 2484240C */  addiu     $a0, $a0, %lo(D_8024240C)
+/* 96A9F0 80241830 3C058024 */  lui       $a1, %hi(D_80242EAC)
+/* 96A9F4 80241834 24A52EAC */  addiu     $a1, $a1, %lo(D_F4AC2EAC)
 /* 96A9F8 80241838 0C048C56 */  jal       bind_dynamic_entity_3
 /* 96A9FC 8024183C 00000000 */   nop      
 /* 96AA00 80241840 0240202D */  daddu     $a0, $s2, $zero
diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024190C_96AACC.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024190C_96AACC.s
index 73a197ef4c..c88a49e2ba 100644
--- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024190C_96AACC.s
+++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024190C_96AACC.s
@@ -20,15 +20,15 @@ glabel func_8024190C_96AACC
 /* 96AB08 80241948 8C820000 */  lw        $v0, ($a0)
 /* 96AB0C 8024194C 10400184 */  beqz      $v0, .L80241F60
 /* 96AB10 80241950 3C02DE00 */   lui      $v0, 0xde00
-/* 96AB14 80241954 3C1E800A */  lui       $fp, 0x800a
-/* 96AB18 80241958 27DEA66C */  addiu     $fp, $fp, -0x5994
+/* 96AB14 80241954 3C1E800A */  lui       $fp, %hi(D_8009A66C)
+/* 96AB18 80241958 27DEA66C */  addiu     $fp, $fp, %lo(D_8009A66C)
 /* 96AB1C 8024195C 8FC80000 */  lw        $t0, ($fp)
 /* 96AB20 80241960 0100182D */  daddu     $v1, $t0, $zero
 /* 96AB24 80241964 25080008 */  addiu     $t0, $t0, 8
 /* 96AB28 80241968 AFC80000 */  sw        $t0, ($fp)
 /* 96AB2C 8024196C AC620000 */  sw        $v0, ($v1)
-/* 96AB30 80241970 3C028024 */  lui       $v0, 0x8024
-/* 96AB34 80241974 244278C8 */  addiu     $v0, $v0, 0x78c8
+/* 96AB30 80241970 3C028024 */  lui       $v0, %hi(D_802478C8)
+/* 96AB34 80241974 244278C8 */  addiu     $v0, $v0, %lo(D_802478C8)
 /* 96AB38 80241978 AC620004 */  sw        $v0, 4($v1)
 /* 96AB3C 8024197C 8FAD0100 */  lw        $t5, 0x100($sp)
 /* 96AB40 80241980 8DA30000 */  lw        $v1, ($t5)
@@ -79,10 +79,10 @@ glabel func_8024190C_96AACC
 /* 96ABF0 80241A30 0C019D80 */  jal       guMtxCatF
 /* 96ABF4 80241A34 00A0302D */   daddu    $a2, $a1, $zero
 /* 96ABF8 80241A38 27A40018 */  addiu     $a0, $sp, 0x18
-/* 96ABFC 80241A3C 3C108007 */  lui       $s0, 0x8007
-/* 96AC00 80241A40 261041F0 */  addiu     $s0, $s0, 0x41f0
-/* 96AC04 80241A44 3C11800A */  lui       $s1, 0x800a
-/* 96AC08 80241A48 2631A674 */  addiu     $s1, $s1, -0x598c
+/* 96ABFC 80241A3C 3C108007 */  lui       $s0, %hi(D_800741F0)
+/* 96AC00 80241A40 261041F0 */  addiu     $s0, $s0, %lo(D_800741F0)
+/* 96AC04 80241A44 3C11800A */  lui       $s1, %hi(D_8009A674)
+/* 96AC08 80241A48 2631A674 */  addiu     $s1, $s1, %lo(D_8009A674)
 /* 96AC0C 80241A4C 96050000 */  lhu       $a1, ($s0)
 /* 96AC10 80241A50 8E220000 */  lw        $v0, ($s1)
 /* 96AC14 80241A54 00052980 */  sll       $a1, $a1, 6
@@ -90,8 +90,8 @@ glabel func_8024190C_96AACC
 /* 96AC1C 80241A5C 0C019D40 */  jal       guMtxF2L
 /* 96AC20 80241A60 00452821 */   addu     $a1, $v0, $a1
 /* 96AC24 80241A64 3C03DA38 */  lui       $v1, 0xda38
-/* 96AC28 80241A68 3C06800A */  lui       $a2, 0x800a
-/* 96AC2C 80241A6C 24C6A66C */  addiu     $a2, $a2, -0x5994
+/* 96AC28 80241A68 3C06800A */  lui       $a2, %hi(D_8009A66C)
+/* 96AC2C 80241A6C 24C6A66C */  addiu     $a2, $a2, %lo(D_8009A66C)
 /* 96AC30 80241A70 34630002 */  ori       $v1, $v1, 2
 /* 96AC34 80241A74 8CC50000 */  lw        $a1, ($a2)
 /* 96AC38 80241A78 96020000 */  lhu       $v0, ($s0)
@@ -119,10 +119,10 @@ glabel func_8024190C_96AACC
 .L80241AD0:
 /* 96AC90 80241AD0 24A20008 */  addiu     $v0, $a1, 8
 /* 96AC94 80241AD4 ACC20000 */  sw        $v0, ($a2)
-/* 96AC98 80241AD8 3C02DE00 */  lui       $v0, 0xde00
+/* 96AC98 80241AD8 3C02DE00 */  lui       $v0, %hi(D_DE0079B8)
 /* 96AC9C 80241ADC ACA20000 */  sw        $v0, ($a1)
-/* 96ACA0 80241AE0 3C028024 */  lui       $v0, 0x8024
-/* 96ACA4 80241AE4 244279B8 */  addiu     $v0, $v0, 0x79b8
+/* 96ACA0 80241AE0 3C028024 */  lui       $v0, %hi(D_802479B8)
+/* 96ACA4 80241AE4 244279B8 */  addiu     $v0, $v0, %lo(D_DE0079B8)
 /* 96ACA8 80241AE8 ACA20004 */  sw        $v0, 4($a1)
 /* 96ACAC 80241AEC 8FAD0100 */  lw        $t5, 0x100($sp)
 /* 96ACB0 80241AF0 8DA30000 */  lw        $v1, ($t5)
@@ -151,8 +151,8 @@ glabel func_8024190C_96AACC
 /* 96AD04 80241B44 3C0C000A */  lui       $t4, 0xa
 /* 96AD08 80241B48 358C0280 */  ori       $t4, $t4, 0x280
 /* 96AD0C 80241B4C 27A40018 */  addiu     $a0, $sp, 0x18
-/* 96AD10 80241B50 3C10800A */  lui       $s0, 0x800a
-/* 96AD14 80241B54 2610A66C */  addiu     $s0, $s0, -0x5994
+/* 96AD10 80241B50 3C10800A */  lui       $s0, %hi(D_8009A66C)
+/* 96AD14 80241B54 2610A66C */  addiu     $s0, $s0, %lo(D_8009A66C)
 /* 96AD18 80241B58 3C0A0700 */  lui       $t2, 0x700
 /* 96AD1C 80241B5C 8E050000 */  lw        $a1, ($s0)
 /* 96AD20 80241B60 44800000 */  mtc1      $zero, $f0
@@ -282,10 +282,10 @@ glabel func_8024190C_96AACC
 /* 96AF10 80241D50 0C019E40 */  jal       guTranslateF
 /* 96AF14 80241D54 00C0382D */   daddu    $a3, $a2, $zero
 /* 96AF18 80241D58 27A40018 */  addiu     $a0, $sp, 0x18
-/* 96AF1C 80241D5C 3C118007 */  lui       $s1, 0x8007
-/* 96AF20 80241D60 263141F0 */  addiu     $s1, $s1, 0x41f0
-/* 96AF24 80241D64 3C12800A */  lui       $s2, 0x800a
-/* 96AF28 80241D68 2652A674 */  addiu     $s2, $s2, -0x598c
+/* 96AF1C 80241D5C 3C118007 */  lui       $s1, %hi(D_800741F0)
+/* 96AF20 80241D60 263141F0 */  addiu     $s1, $s1, %lo(D_800741F0)
+/* 96AF24 80241D64 3C12800A */  lui       $s2, %hi(D_8009A674)
+/* 96AF28 80241D68 2652A674 */  addiu     $s2, $s2, %lo(D_8009A674)
 /* 96AF2C 80241D6C 96250000 */  lhu       $a1, ($s1)
 /* 96AF30 80241D70 8E420000 */  lw        $v0, ($s2)
 /* 96AF34 80241D74 00052980 */  sll       $a1, $a1, 6
@@ -313,10 +313,10 @@ glabel func_8024190C_96AACC
 /* 96AF8C 80241DCC 24820008 */  addiu     $v0, $a0, 8
 /* 96AF90 80241DD0 ACA30004 */  sw        $v1, 4($a1)
 /* 96AF94 80241DD4 AE020000 */  sw        $v0, ($s0)
-/* 96AF98 80241DD8 3C02DE00 */  lui       $v0, 0xde00
+/* 96AF98 80241DD8 3C02DE00 */  lui       $v0, %hi(D_DE007A38)
 /* 96AF9C 80241DDC AC820000 */  sw        $v0, ($a0)
-/* 96AFA0 80241DE0 3C028024 */  lui       $v0, 0x8024
-/* 96AFA4 80241DE4 24427A38 */  addiu     $v0, $v0, 0x7a38
+/* 96AFA0 80241DE0 3C028024 */  lui       $v0, %hi(D_80247A38)
+/* 96AFA4 80241DE4 24427A38 */  addiu     $v0, $v0, %lo(D_DE007A38)
 /* 96AFA8 80241DE8 AC820004 */  sw        $v0, 4($a0)
 /* 96AFAC 80241DEC 24820010 */  addiu     $v0, $a0, 0x10
 /* 96AFB0 80241DF0 AE020000 */  sw        $v0, ($s0)
@@ -326,8 +326,8 @@ glabel func_8024190C_96AACC
 /* 96AFC0 80241E00 3C06D838 */  lui       $a2, 0xd838
 .L80241E04:
 /* 96AFC4 80241E04 34C60002 */  ori       $a2, $a2, 2
-/* 96AFC8 80241E08 3C04800A */  lui       $a0, 0x800a
-/* 96AFCC 80241E0C 2484A66C */  addiu     $a0, $a0, -0x5994
+/* 96AFC8 80241E08 3C04800A */  lui       $a0, %hi(D_8009A66C)
+/* 96AFCC 80241E0C 2484A66C */  addiu     $a0, $a0, %lo(D_8009A66C)
 /* 96AFD0 80241E10 8C830000 */  lw        $v1, ($a0)
 /* 96AFD4 80241E14 24020001 */  addiu     $v0, $zero, 1
 /* 96AFD8 80241E18 0060282D */  daddu     $a1, $v1, $zero
@@ -349,8 +349,8 @@ glabel func_8024190C_96AACC
 /* 96B014 80241E54 3C120001 */  lui       $s2, 1
 /* 96B018 80241E58 36521630 */  ori       $s2, $s2, 0x1630
 /* 96B01C 80241E5C AD020004 */  sw        $v0, 4($t0)
-/* 96B020 80241E60 3C028025 */  lui       $v0, 0x8025
-/* 96B024 80241E64 2442F010 */  addiu     $v0, $v0, -0xff0
+/* 96B020 80241E60 3C028025 */  lui       $v0, %hi(D_8024F010)
+/* 96B024 80241E64 2442F010 */  addiu     $v0, $v0, %lo(D_8024F010)
 /* 96B028 80241E68 AD030000 */  sw        $v1, ($t0)
 /* 96B02C 80241E6C 8C450004 */  lw        $a1, 4($v0)
 /* 96B030 80241E70 8C460008 */  lw        $a2, 8($v0)
@@ -363,10 +363,10 @@ glabel func_8024190C_96AACC
 /* 96B04C 80241E8C 0C019D80 */  jal       guMtxCatF
 /* 96B050 80241E90 27A60018 */   addiu    $a2, $sp, 0x18
 /* 96B054 80241E94 27A40018 */  addiu     $a0, $sp, 0x18
-/* 96B058 80241E98 3C108007 */  lui       $s0, 0x8007
-/* 96B05C 80241E9C 261041F0 */  addiu     $s0, $s0, 0x41f0
-/* 96B060 80241EA0 3C11800A */  lui       $s1, 0x800a
-/* 96B064 80241EA4 2631A674 */  addiu     $s1, $s1, -0x598c
+/* 96B058 80241E98 3C108007 */  lui       $s0, %hi(D_800741F0)
+/* 96B05C 80241E9C 261041F0 */  addiu     $s0, $s0, %lo(D_800741F0)
+/* 96B060 80241EA0 3C11800A */  lui       $s1, %hi(D_8009A674)
+/* 96B064 80241EA4 2631A674 */  addiu     $s1, $s1, %lo(D_8009A674)
 /* 96B068 80241EA8 96050000 */  lhu       $a1, ($s0)
 /* 96B06C 80241EAC 8E220000 */  lw        $v0, ($s1)
 /* 96B070 80241EB0 00052980 */  sll       $a1, $a1, 6
@@ -378,8 +378,8 @@ glabel func_8024190C_96AACC
 /* 96B088 80241EC8 3C05F4AC */  lui       $a1, 0xf4ac
 /* 96B08C 80241ECC 34A5D480 */  ori       $a1, $a1, 0xd480
 /* 96B090 80241ED0 8FC30000 */  lw        $v1, ($fp)
-/* 96B094 80241ED4 3C048025 */  lui       $a0, 0x8025
-/* 96B098 80241ED8 8C84EFCC */  lw        $a0, -0x1034($a0)
+/* 96B094 80241ED4 3C048025 */  lui       $a0, %hi(D_8024EFCC)
+/* 96B098 80241ED8 8C84EFCC */  lw        $a0, %lo(D_8024EFCC)($a0)
 /* 96B09C 80241EDC 96020000 */  lhu       $v0, ($s0)
 /* 96B0A0 80241EE0 0060302D */  daddu     $a2, $v1, $zero
 /* 96B0A4 80241EE4 24630008 */  addiu     $v1, $v1, 8
@@ -429,8 +429,8 @@ glabel func_8024190C_96AACC
 /* 96B148 80241F88 36F70002 */  ori       $s7, $s7, 2
 /* 96B14C 80241F8C 3C0DD838 */  lui       $t5, 0xd838
 /* 96B150 80241F90 35AD0002 */  ori       $t5, $t5, 2
-/* 96B154 80241F94 3C108025 */  lui       $s0, 0x8025
-/* 96B158 80241F98 2610F010 */  addiu     $s0, $s0, -0xff0
+/* 96B154 80241F94 3C108025 */  lui       $s0, %hi(D_8024F010)
+/* 96B158 80241F98 2610F010 */  addiu     $s0, $s0, %lo(D_8024F010)
 /* 96B15C 80241F9C AFAD00C0 */  sw        $t5, 0xc0($sp)
 /* 96B160 80241FA0 AD030000 */  sw        $v1, ($t0)
 /* 96B164 80241FA4 AD020004 */  sw        $v0, 4($t0)
@@ -445,10 +445,10 @@ glabel func_8024190C_96AACC
 /* 96B188 80241FC8 0C019D80 */  jal       guMtxCatF
 /* 96B18C 80241FCC 27A60018 */   addiu    $a2, $sp, 0x18
 /* 96B190 80241FD0 27A40018 */  addiu     $a0, $sp, 0x18
-/* 96B194 80241FD4 3C118007 */  lui       $s1, 0x8007
-/* 96B198 80241FD8 263141F0 */  addiu     $s1, $s1, 0x41f0
-/* 96B19C 80241FDC 3C12800A */  lui       $s2, 0x800a
-/* 96B1A0 80241FE0 2652A674 */  addiu     $s2, $s2, -0x598c
+/* 96B194 80241FD4 3C118007 */  lui       $s1, %hi(D_800741F0)
+/* 96B198 80241FD8 263141F0 */  addiu     $s1, $s1, %lo(D_800741F0)
+/* 96B19C 80241FDC 3C12800A */  lui       $s2, %hi(D_8009A674)
+/* 96B1A0 80241FE0 2652A674 */  addiu     $s2, $s2, %lo(D_8009A674)
 /* 96B1A4 80241FE4 96250000 */  lhu       $a1, ($s1)
 /* 96B1A8 80241FE8 8E420000 */  lw        $v0, ($s2)
 /* 96B1AC 80241FEC 00052980 */  sll       $a1, $a1, 6
@@ -457,8 +457,8 @@ glabel func_8024190C_96AACC
 /* 96B1B8 80241FF8 00452821 */   addu     $a1, $v0, $a1
 /* 96B1BC 80241FFC 3C05F4AC */  lui       $a1, 0xf4ac
 /* 96B1C0 80242000 34A5D481 */  ori       $a1, $a1, 0xd481
-/* 96B1C4 80242004 3C158025 */  lui       $s5, 0x8025
-/* 96B1C8 80242008 26B5EFCC */  addiu     $s5, $s5, -0x1034
+/* 96B1C4 80242004 3C158025 */  lui       $s5, %hi(D_8024EFCC)
+/* 96B1C8 80242008 26B5EFCC */  addiu     $s5, $s5, %lo(D_8024EFCC)
 /* 96B1CC 8024200C 3C0D8000 */  lui       $t5, 0x8000
 /* 96B1D0 80242010 8FC30000 */  lw        $v1, ($fp)
 /* 96B1D4 80242014 8EA40000 */  lw        $a0, ($s5)
diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80242214_96B3D4.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80242214_96B3D4.s
index 3aa8092222..5e060f247f 100644
--- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80242214_96B3D4.s
+++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80242214_96B3D4.s
@@ -13,8 +13,8 @@ glabel func_80242214_96B3D4
 /* 96B3F4 80242234 00E0B02D */  daddu     $s6, $a3, $zero
 /* 96B3F8 80242238 3C05F4AC */  lui       $a1, 0xf4ac
 /* 96B3FC 8024223C AFB000E0 */  sw        $s0, 0xe0($sp)
-/* 96B400 80242240 3C108025 */  lui       $s0, 0x8025
-/* 96B404 80242244 2610EFCC */  addiu     $s0, $s0, -0x1034
+/* 96B400 80242240 3C108025 */  lui       $s0, %hi(D_8024EFCC)
+/* 96B404 80242244 2610EFCC */  addiu     $s0, $s0, %lo(D_8024EFCC)
 /* 96B408 80242248 AFBF00FC */  sw        $ra, 0xfc($sp)
 /* 96B40C 8024224C AFB400F0 */  sw        $s4, 0xf0($sp)
 /* 96B410 80242250 AFB200E8 */  sw        $s2, 0xe8($sp)
@@ -55,9 +55,9 @@ glabel func_80242214_96B3D4
 /* 96B49C 802422DC 000320C0 */  sll       $a0, $v1, 3
 /* 96B4A0 802422E0 00641821 */  addu      $v1, $v1, $a0
 /* 96B4A4 802422E4 000318C0 */  sll       $v1, $v1, 3
-/* 96B4A8 802422E8 3C01800B */  lui       $at, 0x800b
+/* 96B4A8 802422E8 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* 96B4AC 802422EC 00230821 */  addu      $at, $at, $v1
-/* 96B4B0 802422F0 C4221DEC */  lwc1      $f2, 0x1dec($at)
+/* 96B4B0 802422F0 C4221DEC */  lwc1      $f2, %lo(D_800B1DEC)($at)
 /* 96B4B4 802422F4 0240202D */  daddu     $a0, $s2, $zero
 /* 96B4B8 802422F8 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 96B4BC 802422FC 46001087 */  neg.s     $f2, $f2
@@ -69,8 +69,8 @@ glabel func_80242214_96B3D4
 /* 96B4D4 80242314 E7B40018 */  swc1      $f20, 0x18($sp)
 /* 96B4D8 80242318 0C018FC4 */  jal       guPositionF
 /* 96B4DC 8024231C E7A0001C */   swc1     $f0, 0x1c($sp)
-/* 96B4E0 80242320 3C028025 */  lui       $v0, 0x8025
-/* 96B4E4 80242324 2442F010 */  addiu     $v0, $v0, -0xff0
+/* 96B4E0 80242320 3C028025 */  lui       $v0, %hi(D_8024F010)
+/* 96B4E4 80242324 2442F010 */  addiu     $v0, $v0, %lo(D_8024F010)
 /* 96B4E8 80242328 001180C0 */  sll       $s0, $s1, 3
 /* 96B4EC 8024232C 02118021 */  addu      $s0, $s0, $s1
 /* 96B4F0 80242330 00108080 */  sll       $s0, $s0, 2
diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024240C_96B5CC.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024240C_96B5CC.s
index e1544ce496..ad400eb7dd 100644
--- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024240C_96B5CC.s
+++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024240C_96B5CC.s
@@ -4,8 +4,8 @@
 glabel func_8024240C_96B5CC
 /* 96B5CC 8024240C 27BDFF70 */  addiu     $sp, $sp, -0x90
 /* 96B5D0 80242410 3C05F4AC */  lui       $a1, 0xf4ac
-/* 96B5D4 80242414 3C048025 */  lui       $a0, 0x8025
-/* 96B5D8 80242418 8C84EFCC */  lw        $a0, -0x1034($a0)
+/* 96B5D4 80242414 3C048025 */  lui       $a0, %hi(D_8024EFCC)
+/* 96B5D8 80242418 8C84EFCC */  lw        $a0, %lo(D_8024EFCC)($a0)
 /* 96B5DC 8024241C AFBF0080 */  sw        $ra, 0x80($sp)
 /* 96B5E0 80242420 AFB1007C */  sw        $s1, 0x7c($sp)
 /* 96B5E4 80242424 AFB00078 */  sw        $s0, 0x78($sp)
@@ -16,21 +16,21 @@ glabel func_8024240C_96B5CC
 /* 96B5F8 80242438 2C62000E */  sltiu     $v0, $v1, 0xe
 /* 96B5FC 8024243C 10400295 */  beqz      $v0, .L80242E94
 /* 96B600 80242440 00031080 */   sll      $v0, $v1, 2
-/* 96B604 80242444 3C018025 */  lui       $at, 0x8025
+/* 96B604 80242444 3C018025 */  lui       $at, %hi(D_8024EF20)
 /* 96B608 80242448 00220821 */  addu      $at, $at, $v0
-/* 96B60C 8024244C 8C22EF20 */  lw        $v0, -0x10e0($at)
+/* 96B60C 8024244C 8C22EF20 */  lw        $v0, %lo(D_8024EF20)($at)
 /* 96B610 80242450 00400008 */  jr        $v0
 /* 96B614 80242454 00000000 */   nop      
 /* 96B618 80242458 3C05F4AC */  lui       $a1, 0xf4ac
 /* 96B61C 8024245C 34A5D489 */  ori       $a1, $a1, 0xd489
-/* 96B620 80242460 3C048025 */  lui       $a0, 0x8025
-/* 96B624 80242464 8C84EFCC */  lw        $a0, -0x1034($a0)
-/* 96B628 80242468 3C018025 */  lui       $at, 0x8025
-/* 96B62C 8024246C AC20EF88 */  sw        $zero, -0x1078($at)
+/* 96B620 80242460 3C048025 */  lui       $a0, %hi(D_8024EFCC)
+/* 96B624 80242464 8C84EFCC */  lw        $a0, %lo(D_8024EFCC)($a0)
+/* 96B628 80242468 3C018025 */  lui       $at, %hi(D_8024EF88)
+/* 96B62C 8024246C AC20EF88 */  sw        $zero, %lo(D_8024EF88)($at)
 /* 96B630 80242470 0C0B2026 */  jal       set_variable
 /* 96B634 80242474 24060001 */   addiu    $a2, $zero, 1
-/* 96B638 80242478 3C028025 */  lui       $v0, 0x8025
-/* 96B63C 8024247C 2442F010 */  addiu     $v0, $v0, -0xff0
+/* 96B638 80242478 3C028025 */  lui       $v0, %hi(D_8024F010)
+/* 96B63C 8024247C 2442F010 */  addiu     $v0, $v0, %lo(D_8024F010)
 /* 96B640 80242480 24040001 */  addiu     $a0, $zero, 1
 /* 96B644 80242484 3C01C348 */  lui       $at, 0xc348
 /* 96B648 80242488 44811000 */  mtc1      $at, $f2
@@ -74,10 +74,10 @@ glabel func_8024240C_96B5CC
 /* 96B6E0 80242520 E4400050 */  swc1      $f0, 0x50($v0)
 /* 96B6E4 80242524 08090BA5 */  j         .L80242E94
 /* 96B6E8 80242528 E4460054 */   swc1     $f6, 0x54($v0)
-/* 96B6EC 8024252C 3C028025 */  lui       $v0, 0x8025
-/* 96B6F0 80242530 2442F010 */  addiu     $v0, $v0, -0xff0
-/* 96B6F4 80242534 3C108025 */  lui       $s0, 0x8025
-/* 96B6F8 80242538 2610EF88 */  addiu     $s0, $s0, -0x1078
+/* 96B6EC 8024252C 3C028025 */  lui       $v0, %hi(D_8024F010)
+/* 96B6F0 80242530 2442F010 */  addiu     $v0, $v0, %lo(D_8024F010)
+/* 96B6F4 80242534 3C108025 */  lui       $s0, %hi(D_8024EF88)
+/* 96B6F8 80242538 2610EF88 */  addiu     $s0, $s0, %lo(D_8024EF88)
 /* 96B6FC 8024253C C4440004 */  lwc1      $f4, 4($v0)
 /* 96B700 80242540 3C014120 */  lui       $at, 0x4120
 /* 96B704 80242544 44810000 */  mtc1      $at, $f0
@@ -97,11 +97,11 @@ glabel func_8024240C_96B5CC
 /* 96B73C 8024257C 24020012 */  addiu     $v0, $zero, 0x12
 /* 96B740 80242580 14620006 */  bne       $v1, $v0, .L8024259C
 /* 96B744 80242584 00000000 */   nop      
-/* 96B748 80242588 3C01C47A */  lui       $at, 0xc47a
+/* 96B748 80242588 3C01C47A */  lui       $at, %hi(D_C479EFF4)
 /* 96B74C 8024258C 44810000 */  mtc1      $at, $f0
 /* 96B750 80242590 00000000 */  nop       
 /* 96B754 80242594 3C018011 */  lui       $at, %hi(gPlayerStatus+0x2C)
-/* 96B758 80242598 E420EFF4 */  swc1      $f0, %lo(gPlayerStatus+0x2C)($at)
+/* 96B758 80242598 E420EFF4 */  swc1      $f0, %lo(D_C479EFF4)($at)
 .L8024259C:
 /* 96B75C 8024259C 8E030000 */  lw        $v1, ($s0)
 /* 96B760 802425A0 24020014 */  addiu     $v0, $zero, 0x14
@@ -109,14 +109,14 @@ glabel func_8024240C_96B5CC
 /* 96B768 802425A8 00000000 */   nop      
 /* 96B76C 802425AC 3C05F4AC */  lui       $a1, 0xf4ac
 /* 96B770 802425B0 34A5D489 */  ori       $a1, $a1, 0xd489
-/* 96B774 802425B4 3C048025 */  lui       $a0, 0x8025
-/* 96B778 802425B8 8C84EFCC */  lw        $a0, -0x1034($a0)
+/* 96B774 802425B4 3C048025 */  lui       $a0, %hi(D_8024EFCC)
+/* 96B778 802425B8 8C84EFCC */  lw        $a0, %lo(D_8024EFCC)($a0)
 /* 96B77C 802425BC 0C0B2026 */  jal       set_variable
 /* 96B780 802425C0 24060002 */   addiu    $a2, $zero, 2
 /* 96B784 802425C4 08090BA5 */  j         .L80242E94
 /* 96B788 802425C8 AE000000 */   sw       $zero, ($s0)
-/* 96B78C 802425CC 3C028025 */  lui       $v0, 0x8025
-/* 96B790 802425D0 2442F010 */  addiu     $v0, $v0, -0xff0
+/* 96B78C 802425CC 3C028025 */  lui       $v0, %hi(D_8024F010)
+/* 96B790 802425D0 2442F010 */  addiu     $v0, $v0, %lo(D_8024F010)
 /* 96B794 802425D4 24030002 */  addiu     $v1, $zero, 2
 /* 96B798 802425D8 AC430000 */  sw        $v1, ($v0)
 /* 96B79C 802425DC AC400024 */  sw        $zero, 0x24($v0)
@@ -125,14 +125,14 @@ glabel func_8024240C_96B5CC
 /* 96B7A8 802425E8 AC400008 */  sw        $zero, 8($v0)
 /* 96B7AC 802425EC 08090BA5 */  j         .L80242E94
 /* 96B7B0 802425F0 AC40000C */   sw       $zero, 0xc($v0)
-/* 96B7B4 802425F4 3C038025 */  lui       $v1, 0x8025
-/* 96B7B8 802425F8 2463F010 */  addiu     $v1, $v1, -0xff0
+/* 96B7B4 802425F4 3C038025 */  lui       $v1, %hi(D_8024F010)
+/* 96B7B8 802425F8 2463F010 */  addiu     $v1, $v1, %lo(D_8024F010)
 /* 96B7BC 802425FC 24020001 */  addiu     $v0, $zero, 1
 /* 96B7C0 80242600 C4620004 */  lwc1      $f2, 4($v1)
 /* 96B7C4 80242604 3C014120 */  lui       $at, 0x4120
 /* 96B7C8 80242608 44812000 */  mtc1      $at, $f4
-/* 96B7CC 8024260C 3C078025 */  lui       $a3, 0x8025
-/* 96B7D0 80242610 24E7EF88 */  addiu     $a3, $a3, -0x1078
+/* 96B7CC 8024260C 3C078025 */  lui       $a3, %hi(D_8024EF88)
+/* 96B7D0 80242610 24E7EF88 */  addiu     $a3, $a3, %lo(D_8024EF88)
 /* 96B7D4 80242614 AC620000 */  sw        $v0, ($v1)
 /* 96B7D8 80242618 AC620024 */  sw        $v0, 0x24($v1)
 /* 96B7DC 8024261C AC620048 */  sw        $v0, 0x48($v1)
@@ -148,12 +148,12 @@ glabel func_8024240C_96B5CC
 /* 96B804 80242644 E4600028 */   swc1     $f0, 0x28($v1)
 /* 96B808 80242648 3C05F4AC */  lui       $a1, 0xf4ac
 /* 96B80C 8024264C 34A5D489 */  ori       $a1, $a1, 0xd489
-/* 96B810 80242650 3C048025 */  lui       $a0, 0x8025
-/* 96B814 80242654 8C84EFCC */  lw        $a0, -0x1034($a0)
+/* 96B810 80242650 3C048025 */  lui       $a0, %hi(D_8024EFCC)
+/* 96B814 80242654 8C84EFCC */  lw        $a0, %lo(D_8024EFCC)($a0)
 /* 96B818 80242658 08090A91 */  j         .L80242A44
 /* 96B81C 8024265C 24060004 */   addiu    $a2, $zero, 4
-/* 96B820 80242660 3C078025 */  lui       $a3, 0x8025
-/* 96B824 80242664 24E7EF88 */  addiu     $a3, $a3, -0x1078
+/* 96B820 80242660 3C078025 */  lui       $a3, %hi(D_8024EF88)
+/* 96B824 80242664 24E7EF88 */  addiu     $a3, $a3, %lo(D_8024EF88)
 /* 96B828 80242668 3C01C2C8 */  lui       $at, 0xc2c8
 /* 96B82C 8024266C 44810000 */  mtc1      $at, $f0
 /* 96B830 80242670 3C0142C8 */  lui       $at, 0x42c8
@@ -163,8 +163,8 @@ glabel func_8024240C_96B5CC
 /* 96B840 80242680 3C014000 */  lui       $at, 0x4000
 /* 96B844 80242684 44813000 */  mtc1      $at, $f6
 /* 96B848 80242688 8CE30000 */  lw        $v1, ($a3)
-/* 96B84C 8024268C 3C028025 */  lui       $v0, 0x8025
-/* 96B850 80242690 2442F010 */  addiu     $v0, $v0, -0xff0
+/* 96B84C 8024268C 3C028025 */  lui       $v0, %hi(D_8024F010)
+/* 96B850 80242690 2442F010 */  addiu     $v0, $v0, %lo(D_8024F010)
 /* 96B854 80242694 AC400008 */  sw        $zero, 8($v0)
 /* 96B858 80242698 AC40000C */  sw        $zero, 0xc($v0)
 /* 96B85C 8024269C AC40002C */  sw        $zero, 0x2c($v0)
@@ -180,8 +180,8 @@ glabel func_8024240C_96B5CC
 /* 96B884 802426C4 ACE30000 */   sw       $v1, ($a3)
 /* 96B888 802426C8 3C05F4AC */  lui       $a1, 0xf4ac
 /* 96B88C 802426CC 34A5D489 */  ori       $a1, $a1, 0xd489
-/* 96B890 802426D0 3C048025 */  lui       $a0, 0x8025
-/* 96B894 802426D4 8C84EFCC */  lw        $a0, -0x1034($a0)
+/* 96B890 802426D0 3C048025 */  lui       $a0, %hi(D_8024EFCC)
+/* 96B894 802426D4 8C84EFCC */  lw        $a0, %lo(D_8024EFCC)($a0)
 /* 96B898 802426D8 24060005 */  addiu     $a2, $zero, 5
 /* 96B89C 802426DC 0C0B2026 */  jal       set_variable
 /* 96B8A0 802426E0 ACE00000 */   sw       $zero, ($a3)
@@ -189,13 +189,13 @@ glabel func_8024240C_96B5CC
 /* 96B8A8 802426E8 0000282D */  daddu     $a1, $zero, $zero
 /* 96B8AC 802426EC 08090A26 */  j         .L80242898
 /* 96B8B0 802426F0 24060018 */   addiu    $a2, $zero, 0x18
-/* 96B8B4 802426F4 3C028025 */  lui       $v0, 0x8025
-/* 96B8B8 802426F8 2442F010 */  addiu     $v0, $v0, -0xff0
+/* 96B8B4 802426F4 3C028025 */  lui       $v0, %hi(D_8024F010)
+/* 96B8B8 802426F8 2442F010 */  addiu     $v0, $v0, %lo(D_8024F010)
 /* 96B8BC 802426FC C4400010 */  lwc1      $f0, 0x10($v0)
 /* 96B8C0 80242700 3C014190 */  lui       $at, 0x4190
 /* 96B8C4 80242704 44811000 */  mtc1      $at, $f2
-/* 96B8C8 80242708 3C108025 */  lui       $s0, 0x8025
-/* 96B8CC 8024270C 2610EF88 */  addiu     $s0, $s0, -0x1078
+/* 96B8C8 80242708 3C108025 */  lui       $s0, %hi(D_8024EF88)
+/* 96B8CC 8024270C 2610EF88 */  addiu     $s0, $s0, %lo(D_8024EF88)
 /* 96B8D0 80242710 AC400034 */  sw        $zero, 0x34($v0)
 /* 96B8D4 80242714 AC400058 */  sw        $zero, 0x58($v0)
 /* 96B8D8 80242718 8E030000 */  lw        $v1, ($s0)
@@ -234,21 +234,21 @@ glabel func_8024240C_96B5CC
 /* 96B958 80242798 24060006 */   addiu    $a2, $zero, 6
 /* 96B95C 8024279C 3C05F4AC */  lui       $a1, 0xf4ac
 /* 96B960 802427A0 34A5D489 */  ori       $a1, $a1, 0xd489
-/* 96B964 802427A4 3C048025 */  lui       $a0, 0x8025
-/* 96B968 802427A8 8C84EFCC */  lw        $a0, -0x1034($a0)
+/* 96B964 802427A4 3C048025 */  lui       $a0, %hi(D_8024EFCC)
+/* 96B968 802427A8 8C84EFCC */  lw        $a0, %lo(D_8024EFCC)($a0)
 /* 96B96C 802427AC 0C0B2026 */  jal       set_variable
 /* 96B970 802427B0 AE000000 */   sw       $zero, ($s0)
 /* 96B974 802427B4 24040203 */  addiu     $a0, $zero, 0x203
 /* 96B978 802427B8 0000282D */  daddu     $a1, $zero, $zero
 /* 96B97C 802427BC 08090A26 */  j         .L80242898
 /* 96B980 802427C0 24060040 */   addiu    $a2, $zero, 0x40
-/* 96B984 802427C4 3C028025 */  lui       $v0, 0x8025
-/* 96B988 802427C8 2442F010 */  addiu     $v0, $v0, -0xff0
+/* 96B984 802427C4 3C028025 */  lui       $v0, %hi(D_8024F010)
+/* 96B988 802427C8 2442F010 */  addiu     $v0, $v0, %lo(D_8024F010)
 /* 96B98C 802427CC C4420010 */  lwc1      $f2, 0x10($v0)
 /* 96B990 802427D0 3C014190 */  lui       $at, 0x4190
 /* 96B994 802427D4 44812000 */  mtc1      $at, $f4
-/* 96B998 802427D8 3C108025 */  lui       $s0, 0x8025
-/* 96B99C 802427DC 2610EF88 */  addiu     $s0, $s0, -0x1078
+/* 96B998 802427D8 3C108025 */  lui       $s0, %hi(D_8024EF88)
+/* 96B99C 802427DC 2610EF88 */  addiu     $s0, $s0, %lo(D_8024EF88)
 /* 96B9A0 802427E0 AC400034 */  sw        $zero, 0x34($v0)
 /* 96B9A4 802427E4 8E030000 */  lw        $v1, ($s0)
 /* 96B9A8 802427E8 46041080 */  add.s     $f2, $f2, $f4
@@ -289,8 +289,8 @@ glabel func_8024240C_96B5CC
 /* 96BA30 80242870 24060007 */   addiu    $a2, $zero, 7
 /* 96BA34 80242874 3C05F4AC */  lui       $a1, 0xf4ac
 /* 96BA38 80242878 34A5D489 */  ori       $a1, $a1, 0xd489
-/* 96BA3C 8024287C 3C048025 */  lui       $a0, 0x8025
-/* 96BA40 80242880 8C84EFCC */  lw        $a0, -0x1034($a0)
+/* 96BA3C 8024287C 3C048025 */  lui       $a0, %hi(D_8024EFCC)
+/* 96BA40 80242880 8C84EFCC */  lw        $a0, %lo(D_8024EFCC)($a0)
 /* 96BA44 80242884 0C0B2026 */  jal       set_variable
 /* 96BA48 80242888 AE000000 */   sw       $zero, ($s0)
 /* 96BA4C 8024288C 24040203 */  addiu     $a0, $zero, 0x203
@@ -301,13 +301,13 @@ glabel func_8024240C_96B5CC
 /* 96BA5C 8024289C 00A0382D */   daddu    $a3, $a1, $zero
 /* 96BA60 802428A0 08090BA5 */  j         .L80242E94
 /* 96BA64 802428A4 00000000 */   nop      
-/* 96BA68 802428A8 3C028025 */  lui       $v0, 0x8025
-/* 96BA6C 802428AC 2442F010 */  addiu     $v0, $v0, -0xff0
+/* 96BA68 802428A8 3C028025 */  lui       $v0, %hi(D_8024F010)
+/* 96BA6C 802428AC 2442F010 */  addiu     $v0, $v0, %lo(D_8024F010)
 /* 96BA70 802428B0 C4420034 */  lwc1      $f2, 0x34($v0)
 /* 96BA74 802428B4 3C014190 */  lui       $at, 0x4190
 /* 96BA78 802428B8 44812000 */  mtc1      $at, $f4
-/* 96BA7C 802428BC 3C108025 */  lui       $s0, 0x8025
-/* 96BA80 802428C0 2610EF88 */  addiu     $s0, $s0, -0x1078
+/* 96BA7C 802428BC 3C108025 */  lui       $s0, %hi(D_8024EF88)
+/* 96BA80 802428C0 2610EF88 */  addiu     $s0, $s0, %lo(D_8024EF88)
 /* 96BA84 802428C4 AC400010 */  sw        $zero, 0x10($v0)
 /* 96BA88 802428C8 8E030000 */  lw        $v1, ($s0)
 /* 96BA8C 802428CC 46041080 */  add.s     $f2, $f2, $f4
@@ -348,19 +348,19 @@ glabel func_8024240C_96B5CC
 /* 96BB14 80242954 24060008 */   addiu    $a2, $zero, 8
 /* 96BB18 80242958 3C05F4AC */  lui       $a1, 0xf4ac
 /* 96BB1C 8024295C 34A5D489 */  ori       $a1, $a1, 0xd489
-/* 96BB20 80242960 3C048025 */  lui       $a0, 0x8025
-/* 96BB24 80242964 8C84EFCC */  lw        $a0, -0x1034($a0)
+/* 96BB20 80242960 3C048025 */  lui       $a0, %hi(D_8024EFCC)
+/* 96BB24 80242964 8C84EFCC */  lw        $a0, %lo(D_8024EFCC)($a0)
 /* 96BB28 80242968 0C0B2026 */  jal       set_variable
 /* 96BB2C 8024296C AE000000 */   sw       $zero, ($s0)
 /* 96BB30 80242970 08090BA5 */  j         .L80242E94
 /* 96BB34 80242974 00000000 */   nop      
-/* 96BB38 80242978 3C028025 */  lui       $v0, 0x8025
-/* 96BB3C 8024297C 2442F010 */  addiu     $v0, $v0, -0xff0
+/* 96BB38 80242978 3C028025 */  lui       $v0, %hi(D_8024F010)
+/* 96BB3C 8024297C 2442F010 */  addiu     $v0, $v0, %lo(D_8024F010)
 /* 96BB40 80242980 C4400034 */  lwc1      $f0, 0x34($v0)
 /* 96BB44 80242984 3C014190 */  lui       $at, 0x4190
 /* 96BB48 80242988 44811000 */  mtc1      $at, $f2
-/* 96BB4C 8024298C 3C078025 */  lui       $a3, 0x8025
-/* 96BB50 80242990 24E7EF88 */  addiu     $a3, $a3, -0x1078
+/* 96BB4C 8024298C 3C078025 */  lui       $a3, %hi(D_8024EF88)
+/* 96BB50 80242990 24E7EF88 */  addiu     $a3, $a3, %lo(D_8024EF88)
 /* 96BB54 80242994 AC400010 */  sw        $zero, 0x10($v0)
 /* 96BB58 80242998 AC400058 */  sw        $zero, 0x58($v0)
 /* 96BB5C 8024299C 8CE30000 */  lw        $v1, ($a3)
@@ -372,17 +372,17 @@ glabel func_8024240C_96B5CC
 /* 96BB74 802429B4 14620137 */  bne       $v1, $v0, .L80242E94
 /* 96BB78 802429B8 24060009 */   addiu    $a2, $zero, 9
 /* 96BB7C 802429BC 3C05F4AC */  lui       $a1, 0xf4ac
-/* 96BB80 802429C0 3C048025 */  lui       $a0, 0x8025
-/* 96BB84 802429C4 8C84EFCC */  lw        $a0, -0x1034($a0)
+/* 96BB80 802429C0 3C048025 */  lui       $a0, %hi(D_8024EFCC)
+/* 96BB84 802429C4 8C84EFCC */  lw        $a0, %lo(D_8024EFCC)($a0)
 /* 96BB88 802429C8 08090A91 */  j         .L80242A44
 /* 96BB8C 802429CC 34A5D489 */   ori      $a1, $a1, 0xd489
-/* 96BB90 802429D0 3C028025 */  lui       $v0, 0x8025
-/* 96BB94 802429D4 2442F010 */  addiu     $v0, $v0, -0xff0
+/* 96BB90 802429D0 3C028025 */  lui       $v0, %hi(D_8024F010)
+/* 96BB94 802429D4 2442F010 */  addiu     $v0, $v0, %lo(D_8024F010)
 /* 96BB98 802429D8 C4420004 */  lwc1      $f2, 4($v0)
 /* 96BB9C 802429DC 3C014120 */  lui       $at, 0x4120
 /* 96BBA0 802429E0 44812000 */  mtc1      $at, $f4
-/* 96BBA4 802429E4 3C078025 */  lui       $a3, 0x8025
-/* 96BBA8 802429E8 24E7EF88 */  addiu     $a3, $a3, -0x1078
+/* 96BBA4 802429E4 3C078025 */  lui       $a3, %hi(D_8024EF88)
+/* 96BBA8 802429E8 24E7EF88 */  addiu     $a3, $a3, %lo(D_8024EF88)
 /* 96BBAC 802429EC AC400008 */  sw        $zero, 8($v0)
 /* 96BBB0 802429F0 AC400010 */  sw        $zero, 0x10($v0)
 /* 96BBB4 802429F4 AC40002C */  sw        $zero, 0x2c($v0)
@@ -403,15 +403,15 @@ glabel func_8024240C_96B5CC
 /* 96BBF0 80242A30 0040302D */   daddu    $a2, $v0, $zero
 /* 96BBF4 80242A34 3C05F4AC */  lui       $a1, 0xf4ac
 /* 96BBF8 80242A38 34A5D489 */  ori       $a1, $a1, 0xd489
-/* 96BBFC 80242A3C 3C048025 */  lui       $a0, 0x8025
-/* 96BC00 80242A40 8C84EFCC */  lw        $a0, -0x1034($a0)
+/* 96BBFC 80242A3C 3C048025 */  lui       $a0, %hi(D_8024EFCC)
+/* 96BC00 80242A40 8C84EFCC */  lw        $a0, %lo(D_8024EFCC)($a0)
 .L80242A44:
 /* 96BC04 80242A44 0C0B2026 */  jal       set_variable
 /* 96BC08 80242A48 ACE00000 */   sw       $zero, ($a3)
 /* 96BC0C 80242A4C 08090BA5 */  j         .L80242E94
 /* 96BC10 80242A50 00000000 */   nop      
-/* 96BC14 80242A54 3C038025 */  lui       $v1, 0x8025
-/* 96BC18 80242A58 2463F010 */  addiu     $v1, $v1, -0xff0
+/* 96BC14 80242A54 3C038025 */  lui       $v1, %hi(D_8024F010)
+/* 96BC18 80242A58 2463F010 */  addiu     $v1, $v1, %lo(D_8024F010)
 /* 96BC1C 80242A5C 24020003 */  addiu     $v0, $zero, 3
 /* 96BC20 80242A60 AC620000 */  sw        $v0, ($v1)
 /* 96BC24 80242A64 24020008 */  addiu     $v0, $zero, 8
@@ -424,15 +424,15 @@ glabel func_8024240C_96B5CC
 /* 96BC40 80242A80 3C05F4AC */  lui       $a1, 0xf4ac
 /* 96BC44 80242A84 34A5D489 */  ori       $a1, $a1, 0xd489
 /* 96BC48 80242A88 2406000C */  addiu     $a2, $zero, 0xc
-/* 96BC4C 80242A8C 3C118025 */  lui       $s1, 0x8025
-/* 96BC50 80242A90 2631EF90 */  addiu     $s1, $s1, -0x1070
+/* 96BC4C 80242A8C 3C118025 */  lui       $s1, %hi(D_8024EF90)
+/* 96BC50 80242A90 2631EF90 */  addiu     $s1, $s1, %lo(D_8024EF90)
 /* 96BC54 80242A94 0220802D */  daddu     $s0, $s1, $zero
-/* 96BC58 80242A98 3C028025 */  lui       $v0, 0x8025
-/* 96BC5C 80242A9C 2442F010 */  addiu     $v0, $v0, -0xff0
-/* 96BC60 80242AA0 3C048025 */  lui       $a0, 0x8025
-/* 96BC64 80242AA4 8C84EFCC */  lw        $a0, -0x1034($a0)
-/* 96BC68 80242AA8 3C018025 */  lui       $at, 0x8025
-/* 96BC6C 80242AAC D434EF58 */  ldc1      $f20, -0x10a8($at)
+/* 96BC58 80242A98 3C028025 */  lui       $v0, %hi(D_8024F010)
+/* 96BC5C 80242A9C 2442F010 */  addiu     $v0, $v0, %lo(D_8024F010)
+/* 96BC60 80242AA0 3C048025 */  lui       $a0, %hi(D_8024EFCC)
+/* 96BC64 80242AA4 8C84EFCC */  lw        $a0, %lo(D_8024EFCC)($a0)
+/* 96BC68 80242AA8 3C018025 */  lui       $at, %hi(D_8024EF58)
+/* 96BC6C 80242AAC D434EF58 */  ldc1      $f20, %lo(D_8024EF58)($at)
 /* 96BC70 80242AB0 3C014288 */  lui       $at, 0x4288
 /* 96BC74 80242AB4 44810000 */  mtc1      $at, $f0
 /* 96BC78 80242AB8 3C014334 */  lui       $at, 0x4334
@@ -450,8 +450,8 @@ glabel func_8024240C_96B5CC
 /* 96BCA8 80242AE8 AC400030 */  sw        $zero, 0x30($v0)
 /* 96BCAC 80242AEC AC430040 */  sw        $v1, 0x40($v0)
 /* 96BCB0 80242AF0 AC400044 */  sw        $zero, 0x44($v0)
-/* 96BCB4 80242AF4 3C018025 */  lui       $at, 0x8025
-/* 96BCB8 80242AF8 AC20EF88 */  sw        $zero, -0x1078($at)
+/* 96BCB4 80242AF4 3C018025 */  lui       $at, %hi(D_8024EF88)
+/* 96BCB8 80242AF8 AC20EF88 */  sw        $zero, %lo(D_8024EF88)($at)
 /* 96BCBC 80242AFC E4400008 */  swc1      $f0, 8($v0)
 /* 96BCC0 80242B00 E4420010 */  swc1      $f2, 0x10($v0)
 /* 96BCC4 80242B04 E440002C */  swc1      $f0, 0x2c($v0)
@@ -466,8 +466,8 @@ glabel func_8024240C_96B5CC
 /* 96BCE8 80242B28 3C018025 */  lui       $at, %hi(gPauseMenuTabs)
 /* 96BCEC 80242B2C AC20EF80 */  sw        $zero, %lo(gPauseMenuTabs)($at)
 /* 96BCF0 80242B30 AFA20010 */  sw        $v0, 0x10($sp)
-/* 96BCF4 80242B34 3C018025 */  lui       $at, 0x8025
-/* 96BCF8 80242B38 E420EF84 */  swc1      $f0, -0x107c($at)
+/* 96BCF4 80242B34 3C018025 */  lui       $at, %hi(D_8024EF84)
+/* 96BCF8 80242B38 E420EF84 */  swc1      $f0, %lo(D_8024EF84)($at)
 /* 96BCFC 80242B3C 0C090885 */  jal       func_80242214_96B3D4
 /* 96BD00 80242B40 27A70050 */   addiu    $a3, $sp, 0x50
 .L80242B44:
@@ -538,8 +538,8 @@ glabel func_8024240C_96B5CC
 /* 96BDFC 80242C3C 27A20064 */  addiu     $v0, $sp, 0x64
 /* 96BE00 80242C40 0C090885 */  jal       func_80242214_96B3D4
 /* 96BE04 80242C44 AFA20010 */   sw       $v0, 0x10($sp)
-/* 96BE08 80242C48 3C028025 */  lui       $v0, 0x8025
-/* 96BE0C 80242C4C 2442EF90 */  addiu     $v0, $v0, -0x1070
+/* 96BE08 80242C48 3C028025 */  lui       $v0, %hi(D_8024EF90)
+/* 96BE0C 80242C4C 2442EF90 */  addiu     $v0, $v0, %lo(D_8024EF90)
 /* 96BE10 80242C50 0040282D */  daddu     $a1, $v0, $zero
 /* 96BE14 80242C54 24A70010 */  addiu     $a3, $a1, 0x10
 /* 96BE18 80242C58 C7AA0058 */  lwc1      $f10, 0x58($sp)
@@ -609,14 +609,14 @@ glabel func_8024240C_96B5CC
 /* 96BF08 80242D48 00A7102A */  slt       $v0, $a1, $a3
 /* 96BF0C 80242D4C 1440FFCF */  bnez      $v0, .L80242C8C
 /* 96BF10 80242D50 00000000 */   nop      
-/* 96BF14 80242D54 3C108025 */  lui       $s0, 0x8025
-/* 96BF18 80242D58 2610F010 */  addiu     $s0, $s0, -0xff0
+/* 96BF14 80242D54 3C108025 */  lui       $s0, %hi(D_8024F010)
+/* 96BF18 80242D58 2610F010 */  addiu     $s0, $s0, %lo(D_8024F010)
 /* 96BF1C 80242D5C 3C048025 */  lui       $a0, %hi(gPauseMenuTabs)
 /* 96BF20 80242D60 2484EF80 */  addiu     $a0, $a0, %lo(gPauseMenuTabs)
-/* 96BF24 80242D64 3C038025 */  lui       $v1, 0x8025
-/* 96BF28 80242D68 2463EF84 */  addiu     $v1, $v1, -0x107c
-/* 96BF2C 80242D6C 3C078025 */  lui       $a3, 0x8025
-/* 96BF30 80242D70 24E7EF88 */  addiu     $a3, $a3, -0x1078
+/* 96BF24 80242D64 3C038025 */  lui       $v1, %hi(D_8024EF84)
+/* 96BF28 80242D68 2463EF84 */  addiu     $v1, $v1, %lo(D_8024EF84)
+/* 96BF2C 80242D6C 3C078025 */  lui       $a3, %hi(D_8024EF88)
+/* 96BF30 80242D70 24E7EF88 */  addiu     $a3, $a3, %lo(D_8024EF88)
 /* 96BF34 80242D74 C6060008 */  lwc1      $f6, 8($s0)
 /* 96BF38 80242D78 C4820000 */  lwc1      $f2, ($a0)
 /* 96BF3C 80242D7C C604002C */  lwc1      $f4, 0x2c($s0)
@@ -630,12 +630,12 @@ glabel func_8024240C_96B5CC
 /* 96BF5C 80242D9C ACE20000 */  sw        $v0, ($a3)
 /* 96BF60 80242DA0 4608203C */  c.lt.s    $f4, $f8
 /* 96BF64 80242DA4 E604002C */  swc1      $f4, 0x2c($s0)
-/* 96BF68 80242DA8 3C018025 */  lui       $at, 0x8025
-/* 96BF6C 80242DAC D424EF70 */  ldc1      $f4, -0x1090($at)
+/* 96BF68 80242DA8 3C018025 */  lui       $at, %hi(D_8024EF70)
+/* 96BF6C 80242DAC D424EF70 */  ldc1      $f4, %lo(D_8024EF70)($at)
 /* 96BF70 80242DB0 460010A1 */  cvt.d.s   $f2, $f2
 /* 96BF74 80242DB4 46241080 */  add.d     $f2, $f2, $f4
-/* 96BF78 80242DB8 3C018025 */  lui       $at, 0x8025
-/* 96BF7C 80242DBC D424EF78 */  ldc1      $f4, -0x1088($at)
+/* 96BF78 80242DB8 3C018025 */  lui       $at, %hi(D_8024EF78)
+/* 96BF7C 80242DBC D424EF78 */  ldc1      $f4, %lo(D_8024EF78)($at)
 /* 96BF80 80242DC0 46000021 */  cvt.d.s   $f0, $f0
 /* 96BF84 80242DC4 E6060008 */  swc1      $f6, 8($s0)
 /* 96BF88 80242DC8 46240001 */  sub.d     $f0, $f0, $f4
@@ -646,8 +646,8 @@ glabel func_8024240C_96B5CC
 /* 96BF9C 80242DDC E4600000 */   swc1     $f0, ($v1)
 /* 96BFA0 80242DE0 3C05F4AC */  lui       $a1, 0xf4ac
 /* 96BFA4 80242DE4 34A5D489 */  ori       $a1, $a1, 0xd489
-/* 96BFA8 80242DE8 3C048025 */  lui       $a0, 0x8025
-/* 96BFAC 80242DEC 8C84EFCC */  lw        $a0, -0x1034($a0)
+/* 96BFA8 80242DE8 3C048025 */  lui       $a0, %hi(D_8024EFCC)
+/* 96BFAC 80242DEC 8C84EFCC */  lw        $a0, %lo(D_8024EFCC)($a0)
 /* 96BFB0 80242DF0 2406000D */  addiu     $a2, $zero, 0xd
 /* 96BFB4 80242DF4 E608002C */  swc1      $f8, 0x2c($s0)
 /* 96BFB8 80242DF8 0C0B2026 */  jal       set_variable
@@ -679,8 +679,8 @@ glabel func_8024240C_96B5CC
 /* 96C020 80242E60 0C05272D */  jal       play_sound
 /* 96C024 80242E64 24040206 */   addiu    $a0, $zero, 0x206
 /* 96C028 80242E68 0000282D */  daddu     $a1, $zero, $zero
-/* 96C02C 80242E6C 3C048025 */  lui       $a0, 0x8025
-/* 96C030 80242E70 2484EF90 */  addiu     $a0, $a0, -0x1070
+/* 96C02C 80242E6C 3C048025 */  lui       $a0, %hi(D_8024EF90)
+/* 96C030 80242E70 2484EF90 */  addiu     $a0, $a0, %lo(D_8024EF90)
 .L80242E74:
 /* 96C034 80242E74 8C820000 */  lw        $v0, ($a0)
 /* 96C038 80242E78 8C430000 */  lw        $v1, ($v0)
diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80242EAC_96C06C.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80242EAC_96C06C.s
index 0873d7090b..89c6cd235b 100644
--- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80242EAC_96C06C.s
+++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80242EAC_96C06C.s
@@ -5,8 +5,8 @@ glabel func_80242EAC_96C06C
 /* 96C06C 80242EAC 27BDFF80 */  addiu     $sp, $sp, -0x80
 /* 96C070 80242EB0 3C05F4AC */  lui       $a1, 0xf4ac
 /* 96C074 80242EB4 AFB20068 */  sw        $s2, 0x68($sp)
-/* 96C078 80242EB8 3C128025 */  lui       $s2, 0x8025
-/* 96C07C 80242EBC 2652EFCC */  addiu     $s2, $s2, -0x1034
+/* 96C078 80242EB8 3C128025 */  lui       $s2, %hi(D_8024EFCC)
+/* 96C07C 80242EBC 2652EFCC */  addiu     $s2, $s2, %lo(D_8024EFCC)
 /* 96C080 80242EC0 AFBF006C */  sw        $ra, 0x6c($sp)
 /* 96C084 80242EC4 AFB10064 */  sw        $s1, 0x64($sp)
 /* 96C088 80242EC8 AFB00060 */  sw        $s0, 0x60($sp)
@@ -40,9 +40,9 @@ glabel func_80242EAC_96C06C
 /* 96C0F8 80242F38 00641821 */  addu      $v1, $v1, $a0
 /* 96C0FC 80242F3C 000318C0 */  sll       $v1, $v1, 3
 /* 96C100 80242F40 44050000 */  mfc1      $a1, $f0
-/* 96C104 80242F44 3C01800B */  lui       $at, 0x800b
+/* 96C104 80242F44 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* 96C108 80242F48 00230821 */  addu      $at, $at, $v1
-/* 96C10C 80242F4C C4221DEC */  lwc1      $f2, 0x1dec($at)
+/* 96C10C 80242F4C C4221DEC */  lwc1      $f2, %lo(D_800B1DEC)($at)
 /* 96C110 80242F50 3C013F36 */  lui       $at, 0x3f36
 /* 96C114 80242F54 3421DB6E */  ori       $at, $at, 0xdb6e
 /* 96C118 80242F58 44810000 */  mtc1      $at, $f0
@@ -58,8 +58,8 @@ glabel func_80242EAC_96C06C
 /* 96C140 80242F80 00A0382D */  daddu     $a3, $a1, $zero
 /* 96C144 80242F84 0C018FC4 */  jal       guPositionF
 /* 96C148 80242F88 E7A0001C */   swc1     $f0, 0x1c($sp)
-/* 96C14C 80242F8C 3C108025 */  lui       $s0, 0x8025
-/* 96C150 80242F90 2610F010 */  addiu     $s0, $s0, -0xff0
+/* 96C14C 80242F8C 3C108025 */  lui       $s0, %hi(D_8024F010)
+/* 96C150 80242F90 2610F010 */  addiu     $s0, $s0, %lo(D_8024F010)
 /* 96C154 80242F94 0200202D */  daddu     $a0, $s0, $zero
 /* 96C158 80242F98 0C090643 */  jal       func_8024190C_96AACC
 /* 96C15C 80242F9C 27A50020 */   addiu    $a1, $sp, 0x20
@@ -82,16 +82,16 @@ glabel func_80242EAC_96C06C
 /* 96C1A0 80242FE0 0C0B2026 */  jal       set_variable
 /* 96C1A4 80242FE4 24060003 */   addiu    $a2, $zero, 3
 .L80242FE8:
-/* 96C1A8 80242FE8 3C038025 */  lui       $v1, 0x8025
-/* 96C1AC 80242FEC 8C63F010 */  lw        $v1, -0xff0($v1)
+/* 96C1A8 80242FE8 3C038025 */  lui       $v1, %hi(D_8024F010)
+/* 96C1AC 80242FEC 8C63F010 */  lw        $v1, %lo(D_8024F010)($v1)
 /* 96C1B0 80242FF0 24020003 */  addiu     $v0, $zero, 3
 /* 96C1B4 80242FF4 14620009 */  bne       $v1, $v0, .L8024301C
 /* 96C1B8 80242FF8 2622FFFF */   addiu    $v0, $s1, -1
 /* 96C1BC 80242FFC 2C420002 */  sltiu     $v0, $v0, 2
 /* 96C1C0 80243000 10400006 */  beqz      $v0, .L8024301C
 /* 96C1C4 80243004 3C05F4AC */   lui      $a1, 0xf4ac
-/* 96C1C8 80243008 3C048025 */  lui       $a0, 0x8025
-/* 96C1CC 8024300C 8C84EFCC */  lw        $a0, -0x1034($a0)
+/* 96C1C8 80243008 3C048025 */  lui       $a0, %hi(D_8024EFCC)
+/* 96C1CC 8024300C 8C84EFCC */  lw        $a0, %lo(D_8024EFCC)($a0)
 /* 96C1D0 80243010 34A5D489 */  ori       $a1, $a1, 0xd489
 /* 96C1D4 80243014 0C0B2026 */  jal       set_variable
 /* 96C1D8 80243018 2406000B */   addiu    $a2, $zero, 0xb
diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802432C0_96C480.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802432C0_96C480.s
index 765b209198..cbd58d4797 100644
--- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802432C0_96C480.s
+++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802432C0_96C480.s
@@ -6,11 +6,11 @@ glabel func_802432C0_96C480
 /* 96C484 802432C4 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 96C488 802432C8 10A00003 */  beqz      $a1, .L802432D8
 /* 96C48C 802432CC 8C86000C */   lw       $a2, 0xc($a0)
-/* 96C490 802432D0 3C018025 */  lui       $at, 0x8025
-/* 96C494 802432D4 AC208780 */  sw        $zero, -0x7880($at)
+/* 96C490 802432D0 3C018025 */  lui       $at, %hi(D_80248780)
+/* 96C494 802432D4 AC208780 */  sw        $zero, %lo(D_80248780)($at)
 .L802432D8:
-/* 96C498 802432D8 3C038025 */  lui       $v1, 0x8025
-/* 96C49C 802432DC 24638780 */  addiu     $v1, $v1, -0x7880
+/* 96C498 802432D8 3C038025 */  lui       $v1, %hi(D_80248780)
+/* 96C49C 802432DC 24638780 */  addiu     $v1, $v1, %lo(D_80248780)
 /* 96C4A0 802432E0 8C620000 */  lw        $v0, ($v1)
 /* 96C4A4 802432E4 54400003 */  bnel      $v0, $zero, .L802432F4
 /* 96C4A8 802432E8 AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_802432C0_96C480
 /* 96C4B0 802432F0 0000102D */   daddu    $v0, $zero, $zero
 .L802432F4:
 /* 96C4B4 802432F4 8CC50000 */  lw        $a1, ($a2)
-/* 96C4B8 802432F8 3C068025 */  lui       $a2, 0x8025
+/* 96C4B8 802432F8 3C068025 */  lui       $a2, %hi(D_80248784)
 /* 96C4BC 802432FC 0C0B2026 */  jal       set_variable
-/* 96C4C0 80243300 8CC68784 */   lw       $a2, -0x787c($a2)
+/* 96C4C0 80243300 8CC68784 */   lw       $a2, %lo(D_80248784)($a2)
 /* 96C4C4 80243304 24020002 */  addiu     $v0, $zero, 2
 .L80243308:
 /* 96C4C8 80243308 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243314_96C4D4.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243314_96C4D4.s
index 877dbacdd7..bc2e369e0b 100644
--- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243314_96C4D4.s
+++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243314_96C4D4.s
@@ -7,12 +7,12 @@ glabel func_80243314_96C4D4
 /* 96C4DC 8024331C 8C82000C */  lw        $v0, 0xc($a0)
 /* 96C4E0 80243320 0C0B1EAF */  jal       get_variable
 /* 96C4E4 80243324 8C450000 */   lw       $a1, ($v0)
-/* 96C4E8 80243328 3C018025 */  lui       $at, 0x8025
-/* 96C4EC 8024332C AC228784 */  sw        $v0, -0x787c($at)
+/* 96C4E8 80243328 3C018025 */  lui       $at, %hi(D_80248784)
+/* 96C4EC 8024332C AC228784 */  sw        $v0, %lo(D_80248784)($at)
 /* 96C4F0 80243330 24020002 */  addiu     $v0, $zero, 2
 /* 96C4F4 80243334 8FBF0010 */  lw        $ra, 0x10($sp)
 /* 96C4F8 80243338 24030001 */  addiu     $v1, $zero, 1
-/* 96C4FC 8024333C 3C018025 */  lui       $at, 0x8025
-/* 96C500 80243340 AC238780 */  sw        $v1, -0x7880($at)
+/* 96C4FC 8024333C 3C018025 */  lui       $at, %hi(D_80248780)
+/* 96C500 80243340 AC238780 */  sw        $v1, %lo(D_80248780)($at)
 /* 96C504 80243344 03E00008 */  jr        $ra
 /* 96C508 80243348 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024334C_96C50C.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024334C_96C50C.s
index 4e2ff9dd71..dc5f9b0f84 100644
--- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024334C_96C50C.s
+++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024334C_96C50C.s
@@ -13,8 +13,8 @@ glabel func_8024334C_96C50C
 /* 96C52C 8024336C 8C620000 */  lw        $v0, ($v1)
 /* 96C530 80243370 5040000A */  beql      $v0, $zero, .L8024339C
 /* 96C534 80243374 00041080 */   sll      $v0, $a0, 2
-/* 96C538 80243378 3C058025 */  lui       $a1, 0x8025
-/* 96C53C 8024337C 24A5F080 */  addiu     $a1, $a1, -0xf80
+/* 96C538 80243378 3C058025 */  lui       $a1, %hi(D_8024F080)
+/* 96C53C 8024337C 24A5F080 */  addiu     $a1, $a1, %lo(D_8024F080)
 .L80243380:
 /* 96C540 80243380 24630004 */  addiu     $v1, $v1, 4
 /* 96C544 80243384 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_8024334C_96C50C
 /* 96C554 80243394 24A50004 */   addiu    $a1, $a1, 4
 /* 96C558 80243398 00041080 */  sll       $v0, $a0, 2
 .L8024339C:
-/* 96C55C 8024339C 3C018025 */  lui       $at, 0x8025
+/* 96C55C 8024339C 3C018025 */  lui       $at, %hi(D_8024F080)
 /* 96C560 802433A0 00220821 */  addu      $at, $at, $v0
-/* 96C564 802433A4 AC20F080 */  sw        $zero, -0xf80($at)
+/* 96C564 802433A4 AC20F080 */  sw        $zero, %lo(D_8024F080)($at)
 /* 96C568 802433A8 08090CF6 */  j         .L802433D8
 /* 96C56C 802433AC 00000000 */   nop      
 .L802433B0:
-/* 96C570 802433B0 3C038025 */  lui       $v1, 0x8025
-/* 96C574 802433B4 2463F080 */  addiu     $v1, $v1, -0xf80
+/* 96C570 802433B0 3C038025 */  lui       $v1, %hi(D_8024F080)
+/* 96C574 802433B4 2463F080 */  addiu     $v1, $v1, %lo(D_8024F080)
 /* 96C578 802433B8 0060282D */  daddu     $a1, $v1, $zero
 .L802433BC:
 /* 96C57C 802433BC 24820010 */  addiu     $v0, $a0, 0x10
diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802433E8_96C5A8.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802433E8_96C5A8.s
index 08889f3393..fcd6c2edd9 100644
--- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802433E8_96C5A8.s
+++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802433E8_96C5A8.s
@@ -13,8 +13,8 @@ glabel func_802433E8_96C5A8
 /* 96C5C8 80243408 8C620000 */  lw        $v0, ($v1)
 /* 96C5CC 8024340C 5040000A */  beql      $v0, $zero, .L80243438
 /* 96C5D0 80243410 00041080 */   sll      $v0, $a0, 2
-/* 96C5D4 80243414 3C058025 */  lui       $a1, 0x8025
-/* 96C5D8 80243418 24A5F248 */  addiu     $a1, $a1, -0xdb8
+/* 96C5D4 80243414 3C058025 */  lui       $a1, %hi(D_8024F248)
+/* 96C5D8 80243418 24A5F248 */  addiu     $a1, $a1, %lo(D_8024F248)
 .L8024341C:
 /* 96C5DC 8024341C 24630004 */  addiu     $v1, $v1, 4
 /* 96C5E0 80243420 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_802433E8_96C5A8
 /* 96C5F0 80243430 24A50004 */   addiu    $a1, $a1, 4
 /* 96C5F4 80243434 00041080 */  sll       $v0, $a0, 2
 .L80243438:
-/* 96C5F8 80243438 3C018025 */  lui       $at, 0x8025
+/* 96C5F8 80243438 3C018025 */  lui       $at, %hi(D_8024F248)
 /* 96C5FC 8024343C 00220821 */  addu      $at, $at, $v0
-/* 96C600 80243440 AC20F248 */  sw        $zero, -0xdb8($at)
+/* 96C600 80243440 AC20F248 */  sw        $zero, %lo(D_8024F248)($at)
 /* 96C604 80243444 08090D1D */  j         .L80243474
 /* 96C608 80243448 00000000 */   nop      
 .L8024344C:
-/* 96C60C 8024344C 3C038025 */  lui       $v1, 0x8025
-/* 96C610 80243450 2463F248 */  addiu     $v1, $v1, -0xdb8
+/* 96C60C 8024344C 3C038025 */  lui       $v1, %hi(D_8024F248)
+/* 96C610 80243450 2463F248 */  addiu     $v1, $v1, %lo(D_8024F248)
 /* 96C614 80243454 0060282D */  daddu     $a1, $v1, $zero
 .L80243458:
 /* 96C618 80243458 24820080 */  addiu     $v0, $a0, 0x80
diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243548_96C708.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243548_96C708.s
index 38e0f02397..e8f582a6e8 100644
--- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243548_96C708.s
+++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243548_96C708.s
@@ -26,9 +26,9 @@ glabel func_80243548_96C708
 /* 96C75C 8024359C 000320C0 */  sll       $a0, $v1, 3
 /* 96C760 802435A0 00641821 */  addu      $v1, $v1, $a0
 /* 96C764 802435A4 000318C0 */  sll       $v1, $v1, 3
-/* 96C768 802435A8 3C01800B */  lui       $at, 0x800b
+/* 96C768 802435A8 3C01800B */  lui       $at, %hi(D_800B1D98)
 /* 96C76C 802435AC 00230821 */  addu      $at, $at, $v1
-/* 96C770 802435B0 E4201D98 */  swc1      $f0, 0x1d98($at)
+/* 96C770 802435B0 E4201D98 */  swc1      $f0, %lo(D_800B1D98)($at)
 /* 96C774 802435B4 8FBF0018 */  lw        $ra, 0x18($sp)
 /* 96C778 802435B8 8FB10014 */  lw        $s1, 0x14($sp)
 /* 96C77C 802435BC 8FB00010 */  lw        $s0, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802439FC_96CBBC.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802439FC_96CBBC.s
index c721829e4e..4c3e9ee4be 100644
--- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802439FC_96CBBC.s
+++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802439FC_96CBBC.s
@@ -15,7 +15,7 @@ glabel func_802439FC_96CBBC
 /* 96CBE4 80243A24 8FBF0014 */  lw        $ra, 0x14($sp)
 /* 96CBE8 80243A28 8FB00010 */  lw        $s0, 0x10($sp)
 /* 96CBEC 80243A2C 24020002 */  addiu     $v0, $zero, 2
-/* 96CBF0 80243A30 3C018025 */  lui       $at, 0x8025
-/* 96CBF4 80243A34 AC23F3B8 */  sw        $v1, -0xc48($at)
+/* 96CBF0 80243A30 3C018025 */  lui       $at, %hi(D_8024F3B8)
+/* 96CBF4 80243A34 AC23F3B8 */  sw        $v1, %lo(D_8024F3B8)($at)
 /* 96CBF8 80243A38 03E00008 */  jr        $ra
 /* 96CBFC 80243A3C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243A40_96CC00.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243A40_96CC00.s
index 10964d2e87..b467f77d22 100644
--- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243A40_96CC00.s
+++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243A40_96CC00.s
@@ -6,8 +6,8 @@ glabel func_80243A40_96CC00
 /* 96CC04 80243A44 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 96CC08 80243A48 0C00EABB */  jal       get_npc_unsafe
 /* 96CC0C 80243A4C 8C84008C */   lw       $a0, 0x8c($a0)
-/* 96CC10 80243A50 3C038025 */  lui       $v1, 0x8025
-/* 96CC14 80243A54 8C63F3B8 */  lw        $v1, -0xc48($v1)
+/* 96CC10 80243A50 3C038025 */  lui       $v1, %hi(D_8024F3B8)
+/* 96CC14 80243A54 8C63F3B8 */  lw        $v1, %lo(D_8024F3B8)($v1)
 /* 96CC18 80243A58 AC430028 */  sw        $v1, 0x28($v0)
 /* 96CC1C 80243A5C 8FBF0010 */  lw        $ra, 0x10($sp)
 /* 96CC20 80243A60 24020002 */  addiu     $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80240020_DF6A20.s b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80240020_DF6A20.s
index 8d4446207b..2aa5a69831 100644
--- a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80240020_DF6A20.s
+++ b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80240020_DF6A20.s
@@ -73,10 +73,10 @@ glabel func_80240020_DF6A20
 /* DF6B2C 8024012C 0C019E40 */  jal       guTranslateF
 /* DF6B30 80240130 0200202D */   daddu    $a0, $s0, $zero
 /* DF6B34 80240134 0200202D */  daddu     $a0, $s0, $zero
-/* DF6B38 80240138 3C128007 */  lui       $s2, 0x8007
-/* DF6B3C 8024013C 265241F0 */  addiu     $s2, $s2, 0x41f0
-/* DF6B40 80240140 3C13800A */  lui       $s3, 0x800a
-/* DF6B44 80240144 2673A674 */  addiu     $s3, $s3, -0x598c
+/* DF6B38 80240138 3C128007 */  lui       $s2, %hi(D_800741F0)
+/* DF6B3C 8024013C 265241F0 */  addiu     $s2, $s2, %lo(D_800741F0)
+/* DF6B40 80240140 3C13800A */  lui       $s3, %hi(D_8009A674)
+/* DF6B44 80240144 2673A674 */  addiu     $s3, $s3, %lo(D_8009A674)
 /* DF6B48 80240148 96450000 */  lhu       $a1, ($s2)
 /* DF6B4C 8024014C 8E620000 */  lw        $v0, ($s3)
 /* DF6B50 80240150 00052980 */  sll       $a1, $a1, 6
@@ -89,8 +89,8 @@ glabel func_80240020_DF6A20
 /* DF6B6C 8024016C 27A50020 */  addiu     $a1, $sp, 0x20
 /* DF6B70 80240170 3C060005 */  lui       $a2, 5
 /* DF6B74 80240174 34C60040 */  ori       $a2, $a2, 0x40
-/* DF6B78 80240178 3C11800A */  lui       $s1, 0x800a
-/* DF6B7C 8024017C 2631A66C */  addiu     $s1, $s1, -0x5994
+/* DF6B78 80240178 3C11800A */  lui       $s1, %hi(D_8009A66C)
+/* DF6B7C 8024017C 2631A66C */  addiu     $s1, $s1, %lo(D_8009A66C)
 /* DF6B80 80240180 0200382D */  daddu     $a3, $s0, $zero
 /* DF6B84 80240184 8E220000 */  lw        $v0, ($s1)
 /* DF6B88 80240188 96480000 */  lhu       $t0, ($s2)
diff --git a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80240270_DF6C70.s b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80240270_DF6C70.s
index 7fa27e8dcd..f50925b902 100644
--- a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80240270_DF6C70.s
+++ b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80240270_DF6C70.s
@@ -110,10 +110,10 @@ glabel func_80240270_DF6C70
 /* DF6DFC 802403FC 0C019E40 */  jal       guTranslateF
 /* DF6E00 80240400 0000382D */   daddu    $a3, $zero, $zero
 /* DF6E04 80240404 0260202D */  daddu     $a0, $s3, $zero
-/* DF6E08 80240408 3C108007 */  lui       $s0, 0x8007
-/* DF6E0C 8024040C 261041F0 */  addiu     $s0, $s0, 0x41f0
-/* DF6E10 80240410 3C12800A */  lui       $s2, 0x800a
-/* DF6E14 80240414 2652A674 */  addiu     $s2, $s2, -0x598c
+/* DF6E08 80240408 3C108007 */  lui       $s0, %hi(D_800741F0)
+/* DF6E0C 8024040C 261041F0 */  addiu     $s0, $s0, %lo(D_800741F0)
+/* DF6E10 80240410 3C12800A */  lui       $s2, %hi(D_8009A674)
+/* DF6E14 80240414 2652A674 */  addiu     $s2, $s2, %lo(D_8009A674)
 /* DF6E18 80240418 96050000 */  lhu       $a1, ($s0)
 /* DF6E1C 8024041C 8E420000 */  lw        $v0, ($s2)
 /* DF6E20 80240420 00052980 */  sll       $a1, $a1, 6
@@ -122,8 +122,8 @@ glabel func_80240270_DF6C70
 /* DF6E2C 8024042C 00452821 */   addu     $a1, $v0, $a1
 /* DF6E30 80240430 3C02DA38 */  lui       $v0, 0xda38
 /* DF6E34 80240434 34420002 */  ori       $v0, $v0, 2
-/* DF6E38 80240438 3C11800A */  lui       $s1, 0x800a
-/* DF6E3C 8024043C 2631A66C */  addiu     $s1, $s1, -0x5994
+/* DF6E38 80240438 3C11800A */  lui       $s1, %hi(D_8009A66C)
+/* DF6E3C 8024043C 2631A66C */  addiu     $s1, $s1, %lo(D_8009A66C)
 /* DF6E40 80240440 8E240000 */  lw        $a0, ($s1)
 /* DF6E44 80240444 96050000 */  lhu       $a1, ($s0)
 /* DF6E48 80240448 0080302D */  daddu     $a2, $a0, $zero
diff --git a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80240540_DF6F40.s b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80240540_DF6F40.s
index 8ab6f9a32e..bfb868c945 100644
--- a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80240540_DF6F40.s
+++ b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80240540_DF6F40.s
@@ -110,10 +110,10 @@ glabel func_80240540_DF6F40
 .L802406DC:
 /* DF70DC 802406DC 36731630 */  ori       $s3, $s3, 0x1630
 /* DF70E0 802406E0 0280202D */  daddu     $a0, $s4, $zero
-/* DF70E4 802406E4 3C118007 */  lui       $s1, 0x8007
-/* DF70E8 802406E8 263141F0 */  addiu     $s1, $s1, 0x41f0
-/* DF70EC 802406EC 3C12800A */  lui       $s2, 0x800a
-/* DF70F0 802406F0 2652A674 */  addiu     $s2, $s2, -0x598c
+/* DF70E4 802406E4 3C118007 */  lui       $s1, %hi(D_800741F0)
+/* DF70E8 802406E8 263141F0 */  addiu     $s1, $s1, %lo(D_800741F0)
+/* DF70EC 802406EC 3C12800A */  lui       $s2, %hi(D_8009A674)
+/* DF70F0 802406F0 2652A674 */  addiu     $s2, $s2, %lo(D_8009A674)
 /* DF70F4 802406F4 96250000 */  lhu       $a1, ($s1)
 /* DF70F8 802406F8 8E420000 */  lw        $v0, ($s2)
 /* DF70FC 802406FC 00052980 */  sll       $a1, $a1, 6
@@ -125,8 +125,8 @@ glabel func_80240540_DF6F40
 /* DF7114 80240714 0000202D */  daddu     $a0, $zero, $zero
 /* DF7118 80240718 27A50020 */  addiu     $a1, $sp, 0x20
 /* DF711C 8024071C 24060040 */  addiu     $a2, $zero, 0x40
-/* DF7120 80240720 3C10800A */  lui       $s0, 0x800a
-/* DF7124 80240724 2610A66C */  addiu     $s0, $s0, -0x5994
+/* DF7120 80240720 3C10800A */  lui       $s0, %hi(D_8009A66C)
+/* DF7124 80240724 2610A66C */  addiu     $s0, $s0, %lo(D_8009A66C)
 /* DF7128 80240728 0280382D */  daddu     $a3, $s4, $zero
 /* DF712C 8024072C 8E020000 */  lw        $v0, ($s0)
 /* DF7130 80240730 96280000 */  lhu       $t0, ($s1)
diff --git a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_8024081C_DF721C.s b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_8024081C_DF721C.s
index 43217d860f..1460707928 100644
--- a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_8024081C_DF721C.s
+++ b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_8024081C_DF721C.s
@@ -105,10 +105,10 @@ glabel func_8024081C_DF721C
 .L802409A4:
 /* DF73A4 802409A4 36731630 */  ori       $s3, $s3, 0x1630
 /* DF73A8 802409A8 0280202D */  daddu     $a0, $s4, $zero
-/* DF73AC 802409AC 3C118007 */  lui       $s1, 0x8007
-/* DF73B0 802409B0 263141F0 */  addiu     $s1, $s1, 0x41f0
-/* DF73B4 802409B4 3C12800A */  lui       $s2, 0x800a
-/* DF73B8 802409B8 2652A674 */  addiu     $s2, $s2, -0x598c
+/* DF73AC 802409AC 3C118007 */  lui       $s1, %hi(D_800741F0)
+/* DF73B0 802409B0 263141F0 */  addiu     $s1, $s1, %lo(D_800741F0)
+/* DF73B4 802409B4 3C12800A */  lui       $s2, %hi(D_8009A674)
+/* DF73B8 802409B8 2652A674 */  addiu     $s2, $s2, %lo(D_8009A674)
 /* DF73BC 802409BC 96250000 */  lhu       $a1, ($s1)
 /* DF73C0 802409C0 8E420000 */  lw        $v0, ($s2)
 /* DF73C4 802409C4 00052980 */  sll       $a1, $a1, 6
@@ -121,8 +121,8 @@ glabel func_8024081C_DF721C
 /* DF73E0 802409E0 27A50020 */  addiu     $a1, $sp, 0x20
 /* DF73E4 802409E4 3C060001 */  lui       $a2, 1
 /* DF73E8 802409E8 34C60040 */  ori       $a2, $a2, 0x40
-/* DF73EC 802409EC 3C10800A */  lui       $s0, 0x800a
-/* DF73F0 802409F0 2610A66C */  addiu     $s0, $s0, -0x5994
+/* DF73EC 802409EC 3C10800A */  lui       $s0, %hi(D_8009A66C)
+/* DF73F0 802409F0 2610A66C */  addiu     $s0, $s0, %lo(D_8009A66C)
 /* DF73F4 802409F4 0280382D */  daddu     $a3, $s4, $zero
 /* DF73F8 802409F8 8E020000 */  lw        $v0, ($s0)
 /* DF73FC 802409FC 96280000 */  lhu       $t0, ($s1)
diff --git a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80240AE8_DF74E8.s b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80240AE8_DF74E8.s
index 081a476c5e..9071d16612 100644
--- a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80240AE8_DF74E8.s
+++ b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80240AE8_DF74E8.s
@@ -169,10 +169,10 @@ glabel func_80240AE8_DF74E8
 /* DF7764 80240D64 0C019D80 */  jal       guMtxCatF
 /* DF7768 80240D68 0220302D */   daddu    $a2, $s1, $zero
 /* DF776C 80240D6C 0220202D */  daddu     $a0, $s1, $zero
-/* DF7770 80240D70 3C108007 */  lui       $s0, 0x8007
-/* DF7774 80240D74 261041F0 */  addiu     $s0, $s0, 0x41f0
-/* DF7778 80240D78 3C13800A */  lui       $s3, 0x800a
-/* DF777C 80240D7C 2673A674 */  addiu     $s3, $s3, -0x598c
+/* DF7770 80240D70 3C108007 */  lui       $s0, %hi(D_800741F0)
+/* DF7774 80240D74 261041F0 */  addiu     $s0, $s0, %lo(D_800741F0)
+/* DF7778 80240D78 3C13800A */  lui       $s3, %hi(D_8009A674)
+/* DF777C 80240D7C 2673A674 */  addiu     $s3, $s3, %lo(D_8009A674)
 /* DF7780 80240D80 96050000 */  lhu       $a1, ($s0)
 /* DF7784 80240D84 8E620000 */  lw        $v0, ($s3)
 /* DF7788 80240D88 00052980 */  sll       $a1, $a1, 6
@@ -181,8 +181,8 @@ glabel func_80240AE8_DF74E8
 /* DF7794 80240D94 00452821 */   addu     $a1, $v0, $a1
 /* DF7798 80240D98 3C02DA38 */  lui       $v0, 0xda38
 /* DF779C 80240D9C 34420002 */  ori       $v0, $v0, 2
-/* DF77A0 80240DA0 3C12800A */  lui       $s2, 0x800a
-/* DF77A4 80240DA4 2652A66C */  addiu     $s2, $s2, -0x5994
+/* DF77A0 80240DA0 3C12800A */  lui       $s2, %hi(D_8009A66C)
+/* DF77A4 80240DA4 2652A66C */  addiu     $s2, $s2, %lo(D_8009A66C)
 /* DF77A8 80240DA8 8E440000 */  lw        $a0, ($s2)
 /* DF77AC 80240DAC 96050000 */  lhu       $a1, ($s0)
 /* DF77B0 80240DB0 0080302D */  daddu     $a2, $a0, $zero
diff --git a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80240FEC_DF79EC.s b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80240FEC_DF79EC.s
index 213533d1bf..aaa00fba80 100644
--- a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80240FEC_DF79EC.s
+++ b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80240FEC_DF79EC.s
@@ -35,10 +35,10 @@ glabel func_80240FEC_DF79EC
 /* DF7A64 80241064 0C019E40 */  jal       guTranslateF
 /* DF7A68 80241068 36B51630 */   ori      $s5, $s5, 0x1630
 /* DF7A6C 8024106C 0280202D */  daddu     $a0, $s4, $zero
-/* DF7A70 80241070 3C118007 */  lui       $s1, 0x8007
-/* DF7A74 80241074 263141F0 */  addiu     $s1, $s1, 0x41f0
-/* DF7A78 80241078 3C12800A */  lui       $s2, 0x800a
-/* DF7A7C 8024107C 2652A674 */  addiu     $s2, $s2, -0x598c
+/* DF7A70 80241070 3C118007 */  lui       $s1, %hi(D_800741F0)
+/* DF7A74 80241074 263141F0 */  addiu     $s1, $s1, %lo(D_800741F0)
+/* DF7A78 80241078 3C12800A */  lui       $s2, %hi(D_8009A674)
+/* DF7A7C 8024107C 2652A674 */  addiu     $s2, $s2, %lo(D_8009A674)
 /* DF7A80 80241080 96250000 */  lhu       $a1, ($s1)
 /* DF7A84 80241084 8E420000 */  lw        $v0, ($s2)
 /* DF7A88 80241088 00052980 */  sll       $a1, $a1, 6
@@ -47,8 +47,8 @@ glabel func_80240FEC_DF79EC
 /* DF7A94 80241094 00452821 */   addu     $a1, $v0, $a1
 /* DF7A98 80241098 3C02DA38 */  lui       $v0, 0xda38
 /* DF7A9C 8024109C 34420002 */  ori       $v0, $v0, 2
-/* DF7AA0 802410A0 3C13800A */  lui       $s3, 0x800a
-/* DF7AA4 802410A4 2673A66C */  addiu     $s3, $s3, -0x5994
+/* DF7AA0 802410A0 3C13800A */  lui       $s3, %hi(D_8009A66C)
+/* DF7AA4 802410A4 2673A66C */  addiu     $s3, $s3, %lo(D_8009A66C)
 /* DF7AA8 802410A8 8E680000 */  lw        $t0, ($s3)
 /* DF7AAC 802410AC 96290000 */  lhu       $t1, ($s1)
 /* DF7AB0 802410B0 0100202D */  daddu     $a0, $t0, $zero
diff --git a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80241294_DF7C94.s b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80241294_DF7C94.s
index ba990571c8..725bab9b33 100644
--- a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80241294_DF7C94.s
+++ b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80241294_DF7C94.s
@@ -66,10 +66,10 @@ glabel func_80241294_DF7C94
 /* DF7D88 80241388 0C019E40 */  jal       guTranslateF
 /* DF7D8C 8024138C 0200202D */   daddu    $a0, $s0, $zero
 /* DF7D90 80241390 0200202D */  daddu     $a0, $s0, $zero
-/* DF7D94 80241394 3C128007 */  lui       $s2, 0x8007
-/* DF7D98 80241398 265241F0 */  addiu     $s2, $s2, 0x41f0
-/* DF7D9C 8024139C 3C13800A */  lui       $s3, 0x800a
-/* DF7DA0 802413A0 2673A674 */  addiu     $s3, $s3, -0x598c
+/* DF7D94 80241394 3C128007 */  lui       $s2, %hi(D_800741F0)
+/* DF7D98 80241398 265241F0 */  addiu     $s2, $s2, %lo(D_800741F0)
+/* DF7D9C 8024139C 3C13800A */  lui       $s3, %hi(D_8009A674)
+/* DF7DA0 802413A0 2673A674 */  addiu     $s3, $s3, %lo(D_8009A674)
 /* DF7DA4 802413A4 96450000 */  lhu       $a1, ($s2)
 /* DF7DA8 802413A8 8E620000 */  lw        $v0, ($s3)
 /* DF7DAC 802413AC 00052980 */  sll       $a1, $a1, 6
@@ -82,8 +82,8 @@ glabel func_80241294_DF7C94
 /* DF7DC8 802413C8 27A50020 */  addiu     $a1, $sp, 0x20
 /* DF7DCC 802413CC 3C060001 */  lui       $a2, 1
 /* DF7DD0 802413D0 34C60040 */  ori       $a2, $a2, 0x40
-/* DF7DD4 802413D4 3C11800A */  lui       $s1, 0x800a
-/* DF7DD8 802413D8 2631A66C */  addiu     $s1, $s1, -0x5994
+/* DF7DD4 802413D4 3C11800A */  lui       $s1, %hi(D_8009A66C)
+/* DF7DD8 802413D8 2631A66C */  addiu     $s1, $s1, %lo(D_8009A66C)
 /* DF7DDC 802413DC 0200382D */  daddu     $a3, $s0, $zero
 /* DF7DE0 802413E0 8E220000 */  lw        $v0, ($s1)
 /* DF7DE4 802413E4 96480000 */  lhu       $t0, ($s2)
diff --git a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_802414CC_DF7ECC.s b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_802414CC_DF7ECC.s
index 2f9abbc7fe..305d105ac9 100644
--- a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_802414CC_DF7ECC.s
+++ b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_802414CC_DF7ECC.s
@@ -90,10 +90,10 @@ glabel func_802414CC_DF7ECC
 /* DF8020 80241620 0C019D80 */  jal       guMtxCatF
 /* DF8024 80241624 0220302D */   daddu    $a2, $s1, $zero
 /* DF8028 80241628 0220202D */  daddu     $a0, $s1, $zero
-/* DF802C 8024162C 3C128007 */  lui       $s2, 0x8007
-/* DF8030 80241630 265241F0 */  addiu     $s2, $s2, 0x41f0
-/* DF8034 80241634 3C13800A */  lui       $s3, 0x800a
-/* DF8038 80241638 2673A674 */  addiu     $s3, $s3, -0x598c
+/* DF802C 8024162C 3C128007 */  lui       $s2, %hi(D_800741F0)
+/* DF8030 80241630 265241F0 */  addiu     $s2, $s2, %lo(D_800741F0)
+/* DF8034 80241634 3C13800A */  lui       $s3, %hi(D_8009A674)
+/* DF8038 80241638 2673A674 */  addiu     $s3, $s3, %lo(D_8009A674)
 /* DF803C 8024163C 96450000 */  lhu       $a1, ($s2)
 /* DF8040 80241640 8E620000 */  lw        $v0, ($s3)
 /* DF8044 80241644 00052980 */  sll       $a1, $a1, 6
@@ -105,8 +105,8 @@ glabel func_802414CC_DF7ECC
 /* DF805C 8024165C 0000202D */  daddu     $a0, $zero, $zero
 /* DF8060 80241660 27A50020 */  addiu     $a1, $sp, 0x20
 /* DF8064 80241664 24060040 */  addiu     $a2, $zero, 0x40
-/* DF8068 80241668 3C10800A */  lui       $s0, 0x800a
-/* DF806C 8024166C 2610A66C */  addiu     $s0, $s0, -0x5994
+/* DF8068 80241668 3C10800A */  lui       $s0, %hi(D_8009A66C)
+/* DF806C 8024166C 2610A66C */  addiu     $s0, $s0, %lo(D_8009A66C)
 /* DF8070 80241670 0220382D */  daddu     $a3, $s1, $zero
 /* DF8074 80241674 8E020000 */  lw        $v0, ($s0)
 /* DF8078 80241678 96480000 */  lhu       $t0, ($s2)
diff --git a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80241768_DF8168.s b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80241768_DF8168.s
index 4cb09cfa03..f9cee2281b 100644
--- a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80241768_DF8168.s
+++ b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80241768_DF8168.s
@@ -87,10 +87,10 @@ glabel func_80241768_DF8168
 /* DF82B0 802418B0 0C019D80 */  jal       guMtxCatF
 /* DF82B4 802418B4 0220302D */   daddu    $a2, $s1, $zero
 /* DF82B8 802418B8 0220202D */  daddu     $a0, $s1, $zero
-/* DF82BC 802418BC 3C128007 */  lui       $s2, 0x8007
-/* DF82C0 802418C0 265241F0 */  addiu     $s2, $s2, 0x41f0
-/* DF82C4 802418C4 3C13800A */  lui       $s3, 0x800a
-/* DF82C8 802418C8 2673A674 */  addiu     $s3, $s3, -0x598c
+/* DF82BC 802418BC 3C128007 */  lui       $s2, %hi(D_800741F0)
+/* DF82C0 802418C0 265241F0 */  addiu     $s2, $s2, %lo(D_800741F0)
+/* DF82C4 802418C4 3C13800A */  lui       $s3, %hi(D_8009A674)
+/* DF82C8 802418C8 2673A674 */  addiu     $s3, $s3, %lo(D_8009A674)
 /* DF82CC 802418CC 96450000 */  lhu       $a1, ($s2)
 /* DF82D0 802418D0 8E620000 */  lw        $v0, ($s3)
 /* DF82D4 802418D4 00052980 */  sll       $a1, $a1, 6
@@ -103,8 +103,8 @@ glabel func_80241768_DF8168
 /* DF82F0 802418F0 27A50020 */  addiu     $a1, $sp, 0x20
 /* DF82F4 802418F4 3C060001 */  lui       $a2, 1
 /* DF82F8 802418F8 34C60040 */  ori       $a2, $a2, 0x40
-/* DF82FC 802418FC 3C10800A */  lui       $s0, 0x800a
-/* DF8300 80241900 2610A66C */  addiu     $s0, $s0, -0x5994
+/* DF82FC 802418FC 3C10800A */  lui       $s0, %hi(D_8009A66C)
+/* DF8300 80241900 2610A66C */  addiu     $s0, $s0, %lo(D_8009A66C)
 /* DF8304 80241904 0220382D */  daddu     $a3, $s1, $zero
 /* DF8308 80241908 8E020000 */  lw        $v0, ($s0)
 /* DF830C 8024190C 96480000 */  lhu       $t0, ($s2)
diff --git a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80241B34_DF8534.s b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80241B34_DF8534.s
index e7858f0073..8de53650a2 100644
--- a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80241B34_DF8534.s
+++ b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80241B34_DF8534.s
@@ -51,8 +51,8 @@ glabel func_80241B34_DF8534
 /* DF85E4 80241BE4 10600017 */  beqz      $v1, .L80241C44
 /* DF85E8 80241BE8 0000B02D */   daddu    $s6, $zero, $zero
 /* DF85EC 80241BEC 00041080 */  sll       $v0, $a0, 2
-/* DF85F0 80241BF0 3C098025 */  lui       $t1, 0x8025
-/* DF85F4 80241BF4 2529E8C0 */  addiu     $t1, $t1, -0x1740
+/* DF85F0 80241BF0 3C098025 */  lui       $t1, %hi(D_8024E8C0)
+/* DF85F4 80241BF4 2529E8C0 */  addiu     $t1, $t1, %lo(D_8024E8C0)
 /* DF85F8 80241BF8 00491021 */  addu      $v0, $v0, $t1
 /* DF85FC 80241BFC 8C420000 */  lw        $v0, ($v0)
 /* DF8600 80241C00 00400008 */  jr        $v0
@@ -90,13 +90,13 @@ glabel func_80241B34_DF8534
 /* DF867C 80241C7C 2C420002 */  sltiu     $v0, $v0, 2
 /* DF8680 80241C80 10400022 */  beqz      $v0, .L80241D0C
 /* DF8684 80241C84 AFA30044 */   sw       $v1, 0x44($sp)
-/* DF8688 80241C88 3C058024 */  lui       $a1, 0x8024
-/* DF868C 80241C8C 24A52CD8 */  addiu     $a1, $a1, 0x2cd8
+/* DF8688 80241C88 3C058024 */  lui       $a1, %hi(D_80242CD8)
+/* DF868C 80241C8C 24A52CD8 */  addiu     $a1, $a1, %lo(D_80242CD8)
 /* DF8690 80241C90 24090004 */  addiu     $t1, $zero, 4
 /* DF8694 80241C94 14890003 */  bne       $a0, $t1, .L80241CA4
 /* DF8698 80241C98 00000000 */   nop      
-/* DF869C 80241C9C 3C058024 */  lui       $a1, 0x8024
-/* DF86A0 80241CA0 24A52C70 */  addiu     $a1, $a1, 0x2c70
+/* DF869C 80241C9C 3C058024 */  lui       $a1, %hi(D_80242C70)
+/* DF86A0 80241CA0 24A52C70 */  addiu     $a1, $a1, %lo(D_80242C70)
 .L80241CA4:
 /* DF86A4 80241CA4 14890007 */  bne       $a0, $t1, .L80241CC4
 /* DF86A8 80241CA8 0000302D */   daddu    $a2, $zero, $zero
@@ -179,9 +179,9 @@ glabel func_80241B34_DF8534
 /* DF87B8 80241DB8 2C830010 */  sltiu     $v1, $a0, 0x10
 /* DF87BC 80241DBC 10600016 */  beqz      $v1, .L80241E18
 /* DF87C0 80241DC0 00041080 */   sll      $v0, $a0, 2
-/* DF87C4 80241DC4 3C018025 */  lui       $at, 0x8025
+/* DF87C4 80241DC4 3C018025 */  lui       $at, %hi(D_8024E900)
 /* DF87C8 80241DC8 00220821 */  addu      $at, $at, $v0
-/* DF87CC 80241DCC 8C22E900 */  lw        $v0, -0x1700($at)
+/* DF87CC 80241DCC 8C22E900 */  lw        $v0, %lo(D_8024E900)($at)
 /* DF87D0 80241DD0 00400008 */  jr        $v0
 /* DF87D4 80241DD4 00000000 */   nop      
 /* DF87D8 80241DD8 2682FF0D */  addiu     $v0, $s4, -0xf3
@@ -248,9 +248,9 @@ glabel func_80241B34_DF8534
 /* DF88B8 80241EB8 2C620006 */  sltiu     $v0, $v1, 6
 /* DF88BC 80241EBC 1040005B */  beqz      $v0, .L8024202C
 /* DF88C0 80241EC0 00031080 */   sll      $v0, $v1, 2
-/* DF88C4 80241EC4 3C018025 */  lui       $at, 0x8025
+/* DF88C4 80241EC4 3C018025 */  lui       $at, %hi(D_8024E940)
 /* DF88C8 80241EC8 00220821 */  addu      $at, $at, $v0
-/* DF88CC 80241ECC 8C22E940 */  lw        $v0, -0x16c0($at)
+/* DF88CC 80241ECC 8C22E940 */  lw        $v0, %lo(D_8024E940)($at)
 /* DF88D0 80241ED0 00400008 */  jr        $v0
 /* DF88D4 80241ED4 00000000 */   nop      
 /* DF88D8 80241ED8 0260202D */  daddu     $a0, $s3, $zero
@@ -368,13 +368,13 @@ glabel func_80241B34_DF8534
 /* DF8A64 80242064 2C420002 */  sltiu     $v0, $v0, 2
 /* DF8A68 80242068 10400020 */  beqz      $v0, .L802420EC
 /* DF8A6C 8024206C 00000000 */   nop      
-/* DF8A70 80242070 3C058024 */  lui       $a1, 0x8024
-/* DF8A74 80242074 24A52CD8 */  addiu     $a1, $a1, 0x2cd8
+/* DF8A70 80242070 3C058024 */  lui       $a1, %hi(D_80242CD8)
+/* DF8A74 80242074 24A52CD8 */  addiu     $a1, $a1, %lo(D_80242CD8)
 /* DF8A78 80242078 24090004 */  addiu     $t1, $zero, 4
 /* DF8A7C 8024207C 14890003 */  bne       $a0, $t1, .L8024208C
 /* DF8A80 80242080 00000000 */   nop      
-/* DF8A84 80242084 3C058024 */  lui       $a1, 0x8024
-/* DF8A88 80242088 24A52C70 */  addiu     $a1, $a1, 0x2c70
+/* DF8A84 80242084 3C058024 */  lui       $a1, %hi(D_80242C70)
+/* DF8A88 80242088 24A52C70 */  addiu     $a1, $a1, %lo(D_80242C70)
 .L8024208C:
 /* DF8A8C 8024208C 14890007 */  bne       $a0, $t1, .L802420AC
 /* DF8A90 80242090 0000302D */   daddu    $a2, $zero, $zero
diff --git a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_802421D8_DF8BD8.s b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_802421D8_DF8BD8.s
index e96592f1a1..08ec8e4b6f 100644
--- a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_802421D8_DF8BD8.s
+++ b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_802421D8_DF8BD8.s
@@ -8,21 +8,21 @@ glabel func_802421D8_DF8BD8
 /* DF8BE4 802421E4 AFB40030 */  sw        $s4, 0x30($sp)
 /* DF8BE8 802421E8 0000A02D */  daddu     $s4, $zero, $zero
 /* DF8BEC 802421EC AFB10024 */  sw        $s1, 0x24($sp)
-/* DF8BF0 802421F0 3C11800A */  lui       $s1, 0x800a
-/* DF8BF4 802421F4 2631A66C */  addiu     $s1, $s1, -0x5994
+/* DF8BF0 802421F0 3C11800A */  lui       $s1, %hi(D_8009A66C)
+/* DF8BF4 802421F4 2631A66C */  addiu     $s1, $s1, %lo(D_8009A66C)
 /* DF8BF8 802421F8 AFB3002C */  sw        $s3, 0x2c($sp)
 /* DF8BFC 802421FC 24130004 */  addiu     $s3, $zero, 4
-/* DF8C00 80242200 3C028025 */  lui       $v0, 0x8025
-/* DF8C04 80242204 24420EF0 */  addiu     $v0, $v0, 0xef0
+/* DF8C00 80242200 3C028025 */  lui       $v0, %hi(D_80250EF0)
+/* DF8C04 80242204 24420EF0 */  addiu     $v0, $v0, %lo(D_80250EF0)
 /* DF8C08 80242208 AFBF0038 */  sw        $ra, 0x38($sp)
 /* DF8C0C 8024220C AFB50034 */  sw        $s5, 0x34($sp)
 /* DF8C10 80242210 AFB20028 */  sw        $s2, 0x28($sp)
 /* DF8C14 80242214 AFB00020 */  sw        $s0, 0x20($sp)
 /* DF8C18 80242218 8E230000 */  lw        $v1, ($s1)
-/* DF8C1C 8024221C 3C108007 */  lui       $s0, 0x8007
-/* DF8C20 80242220 8E1041F4 */  lw        $s0, 0x41f4($s0)
-/* DF8C24 80242224 3C158025 */  lui       $s5, 0x8025
-/* DF8C28 80242228 8EB5F7E4 */  lw        $s5, -0x81c($s5)
+/* DF8C1C 8024221C 3C108007 */  lui       $s0, %hi(D_800741F4)
+/* DF8C20 80242220 8E1041F4 */  lw        $s0, %lo(D_800741F4)($s0)
+/* DF8C24 80242224 3C158025 */  lui       $s5, %hi(D_8024F7E4)
+/* DF8C28 80242228 8EB5F7E4 */  lw        $s5, %lo(D_8024F7E4)($s5)
 /* DF8C2C 8024222C 44800000 */  mtc1      $zero, $f0
 /* DF8C30 80242230 3C01C2C8 */  lui       $at, 0xc2c8
 /* DF8C34 80242234 44811000 */  mtc1      $at, $f2
@@ -41,8 +41,8 @@ glabel func_802421D8_DF8BD8
 /* DF8C68 80242268 AE230000 */  sw        $v1, ($s1)
 /* DF8C6C 8024226C AD050000 */  sw        $a1, ($t0)
 /* DF8C70 80242270 44050000 */  mfc1      $a1, $f0
-/* DF8C74 80242274 3C028024 */  lui       $v0, 0x8024
-/* DF8C78 80242278 24422D60 */  addiu     $v0, $v0, 0x2d60
+/* DF8C74 80242274 3C028024 */  lui       $v0, %hi(D_80242D60)
+/* DF8C78 80242278 24422D60 */  addiu     $v0, $v0, %lo(D_80242D60)
 /* DF8C7C 8024227C AD020004 */  sw        $v0, 4($t0)
 /* DF8C80 80242280 E7A20014 */  swc1      $f2, 0x14($sp)
 /* DF8C84 80242284 E7A40018 */  swc1      $f4, 0x18($sp)
diff --git a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242358_DF8D58.s b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242358_DF8D58.s
index 1d76ed0521..55ad23b1da 100644
--- a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242358_DF8D58.s
+++ b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242358_DF8D58.s
@@ -6,8 +6,8 @@ glabel func_80242358_DF8D58
 /* DF8D5C 8024235C AFB20030 */  sw        $s2, 0x30($sp)
 /* DF8D60 80242360 0080902D */  daddu     $s2, $a0, $zero
 /* DF8D64 80242364 0000182D */  daddu     $v1, $zero, $zero
-/* DF8D68 80242368 3C068025 */  lui       $a2, 0x8025
-/* DF8D6C 8024236C 8CC6F7E4 */  lw        $a2, -0x81c($a2)
+/* DF8D68 80242368 3C068025 */  lui       $a2, %hi(D_8024F7E4)
+/* DF8D6C 8024236C 8CC6F7E4 */  lw        $a2, %lo(D_8024F7E4)($a2)
 /* DF8D70 80242370 24040020 */  addiu     $a0, $zero, 0x20
 /* DF8D74 80242374 AFBF0038 */  sw        $ra, 0x38($sp)
 /* DF8D78 80242378 AFB30034 */  sw        $s3, 0x34($sp)
@@ -35,11 +35,11 @@ glabel func_80242358_DF8D58
 /* DF8DC8 802423C8 00C28821 */   addu     $s1, $a2, $v0
 /* DF8DCC 802423CC 04820014 */  bltzl     $a0, .L80242420
 /* DF8DD0 802423D0 AE240000 */   sw       $a0, ($s1)
-/* DF8DD4 802423D4 3C138024 */  lui       $s3, 0x8024
-/* DF8DD8 802423D8 26732D70 */  addiu     $s3, $s3, 0x2d70
+/* DF8DD4 802423D4 3C138024 */  lui       $s3, %hi(D_80242D70)
+/* DF8DD8 802423D8 26732D70 */  addiu     $s3, $s3, %lo(D_80242D70)
 /* DF8DDC 802423DC 8E650000 */  lw        $a1, ($s3)
-/* DF8DE0 802423E0 3C108025 */  lui       $s0, 0x8025
-/* DF8DE4 802423E4 2610F7F0 */  addiu     $s0, $s0, -0x810
+/* DF8DE0 802423E0 3C108025 */  lui       $s0, %hi(D_8024F7F0)
+/* DF8DE4 802423E4 2610F7F0 */  addiu     $s0, $s0, %lo(D_8024F7F0)
 /* DF8DE8 802423E8 00052A00 */  sll       $a1, $a1, 8
 /* DF8DEC 802423EC 0C049601 */  jal       dma_load_string
 /* DF8DF0 802423F0 00B02821 */   addu     $a1, $a1, $s0
diff --git a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242500_DF8F00.s b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242500_DF8F00.s
index 4537b12e5d..2e5ee364e5 100644
--- a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242500_DF8F00.s
+++ b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242500_DF8F00.s
@@ -4,13 +4,13 @@
 glabel func_80242500_DF8F00
 /* DF8F00 80242500 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* DF8F04 80242504 AFB00010 */  sw        $s0, 0x10($sp)
-/* DF8F08 80242508 3C108025 */  lui       $s0, 0x8025
-/* DF8F0C 8024250C 2610E960 */  addiu     $s0, $s0, -0x16a0
-/* DF8F10 80242510 3C058024 */  lui       $a1, 0x8024
-/* DF8F14 80242514 24A521D8 */  addiu     $a1, $a1, 0x21d8
+/* DF8F08 80242508 3C108025 */  lui       $s0, %hi(D_8024E960)
+/* DF8F0C 8024250C 2610E960 */  addiu     $s0, $s0, %lo(D_8024E960)
+/* DF8F10 80242510 3C058024 */  lui       $a1, %hi(D_802421D8)
+/* DF8F14 80242514 24A521D8 */  addiu     $a1, $a1, %lo(D_802421D8)
 /* DF8F18 80242518 AFBF0014 */  sw        $ra, 0x14($sp)
-/* DF8F1C 8024251C 3C018025 */  lui       $at, 0x8025
-/* DF8F20 80242520 AC30F7E4 */  sw        $s0, -0x81c($at)
+/* DF8F1C 8024251C 3C018025 */  lui       $at, %hi(D_8024F7E4)
+/* DF8F20 80242520 AC30F7E4 */  sw        $s0, %lo(D_8024F7E4)($at)
 /* DF8F24 80242524 0C048C8F */  jal       bind_dynamic_entity_7
 /* DF8F28 80242528 0000202D */   daddu    $a0, $zero, $zero
 /* DF8F2C 8024252C 2404001F */  addiu     $a0, $zero, 0x1f
diff --git a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242680_DF9080.s b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242680_DF9080.s
index 12c867923f..5467fbadfc 100644
--- a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242680_DF9080.s
+++ b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242680_DF9080.s
@@ -11,8 +11,8 @@ glabel func_80242680_DF9080
 /* DF9098 80242698 8C450000 */   lw       $a1, ($v0)
 /* DF909C 8024269C 24030100 */  addiu     $v1, $zero, 0x100
 /* DF90A0 802426A0 0040882D */  daddu     $s1, $v0, $zero
-/* DF90A4 802426A4 3C028024 */  lui       $v0, 0x8024
-/* DF90A8 802426A8 24424D74 */  addiu     $v0, $v0, 0x4d74
+/* DF90A4 802426A4 3C028024 */  lui       $v0, %hi(D_80244D74)
+/* DF90A8 802426A8 24424D74 */  addiu     $v0, $v0, %lo(D_80244D74)
 /* DF90AC 802426AC 00118040 */  sll       $s0, $s1, 1
 /* DF90B0 802426B0 02118021 */  addu      $s0, $s0, $s1
 /* DF90B4 802426B4 001080C0 */  sll       $s0, $s0, 3
@@ -24,8 +24,8 @@ glabel func_80242680_DF9080
 /* DF90CC 802426CC AFA20014 */  sw        $v0, 0x14($sp)
 /* DF90D0 802426D0 8E050004 */  lw        $a1, 4($s0)
 /* DF90D4 802426D4 24020001 */  addiu     $v0, $zero, 1
-/* DF90D8 802426D8 3C01802E */  lui       $at, 0x802e
-/* DF90DC 802426DC AC22F524 */  sw        $v0, -0xadc($at)
+/* DF90D8 802426D8 3C01802E */  lui       $at, %hi(D_802DF524)
+/* DF90DC 802426DC AC22F524 */  sw        $v0, %lo(D_802DF524)($at)
 /* DF90E0 802426E0 0C00E219 */  jal       create_standard_npc
 /* DF90E4 802426E4 27A40010 */   addiu    $a0, $sp, 0x10
 /* DF90E8 802426E8 0C00E2B7 */  jal       get_npc_by_index
diff --git a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242744_DF9144.s b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242744_DF9144.s
index d539ca5ad7..44b8cb4d3a 100644
--- a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242744_DF9144.s
+++ b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242744_DF9144.s
@@ -11,8 +11,8 @@ glabel func_80242744_DF9144
 /* DF915C 8024275C 8E050000 */  lw        $a1, ($s0)
 /* DF9160 80242760 0C0B1EAF */  jal       get_variable
 /* DF9164 80242764 26100004 */   addiu    $s0, $s0, 4
-/* DF9168 80242768 3C048035 */  lui       $a0, 0x8035
-/* DF916C 8024276C 2484F800 */  addiu     $a0, $a0, -0x800
+/* DF9168 80242768 3C048035 */  lui       $a0, %hi(D_8034F800)
+/* DF916C 8024276C 2484F800 */  addiu     $a0, $a0, %lo(D_8034F800)
 /* DF9170 80242770 8E100000 */  lw        $s0, ($s0)
 /* DF9174 80242774 0C00A41B */  jal       _heap_malloc
 /* DF9178 80242778 0040282D */   daddu    $a1, $v0, $zero
diff --git a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_802427A4_DF91A4.s b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_802427A4_DF91A4.s
index 4558745999..0ece0308eb 100644
--- a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_802427A4_DF91A4.s
+++ b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_802427A4_DF91A4.s
@@ -7,8 +7,8 @@ glabel func_802427A4_DF91A4
 /* DF91AC 802427AC 8C82000C */  lw        $v0, 0xc($a0)
 /* DF91B0 802427B0 0C0B1EAF */  jal       get_variable
 /* DF91B4 802427B4 8C450000 */   lw       $a1, ($v0)
-/* DF91B8 802427B8 3C048035 */  lui       $a0, 0x8035
-/* DF91BC 802427BC 2484F800 */  addiu     $a0, $a0, -0x800
+/* DF91B8 802427B8 3C048035 */  lui       $a0, %hi(D_8034F800)
+/* DF91BC 802427BC 2484F800 */  addiu     $a0, $a0, %lo(D_8034F800)
 /* DF91C0 802427C0 0C00A487 */  jal       _heap_free
 /* DF91C4 802427C4 0040282D */   daddu    $a1, $v0, $zero
 /* DF91C8 802427C8 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_end/end_00/DF9510/func_80242B10_DF9510.s b/asm/nonmatchings/world/area_end/end_00/DF9510/func_80242B10_DF9510.s
index d5e687f5be..a5059966ca 100644
--- a/asm/nonmatchings/world/area_end/end_00/DF9510/func_80242B10_DF9510.s
+++ b/asm/nonmatchings/world/area_end/end_00/DF9510/func_80242B10_DF9510.s
@@ -8,8 +8,8 @@ glabel func_80242B10_DF9510
 /* DF951C 80242B1C 0C0B1EAF */  jal       get_variable
 /* DF9520 80242B20 8C450000 */   lw       $a1, ($v0)
 /* DF9524 80242B24 8FBF0010 */  lw        $ra, 0x10($sp)
-/* DF9528 80242B28 3C018025 */  lui       $at, 0x8025
-/* DF952C 80242B2C AC229D60 */  sw        $v0, -0x62a0($at)
+/* DF9528 80242B28 3C018025 */  lui       $at, %hi(D_80249D60)
+/* DF952C 80242B2C AC229D60 */  sw        $v0, %lo(D_80249D60)($at)
 /* DF9530 80242B30 24020002 */  addiu     $v0, $zero, 2
 /* DF9534 80242B34 03E00008 */  jr        $ra
 /* DF9538 80242B38 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_end/end_01/E05370/func_80240010_E05370.s b/asm/nonmatchings/world/area_end/end_01/E05370/func_80240010_E05370.s
index fa2262d9a7..463680ed78 100644
--- a/asm/nonmatchings/world/area_end/end_01/E05370/func_80240010_E05370.s
+++ b/asm/nonmatchings/world/area_end/end_01/E05370/func_80240010_E05370.s
@@ -5,8 +5,8 @@ glabel func_80240010_E05370
 /* E05370 80240010 3C01420C */  lui       $at, 0x420c
 /* E05374 80240014 44810000 */  mtc1      $at, $f0
 /* E05378 80240018 00000000 */  nop       
-/* E0537C 8024001C 3C01800B */  lui       $at, 0x800b
-/* E05380 80240020 E4201D98 */  swc1      $f0, 0x1d98($at)
+/* E0537C 8024001C 3C01800B */  lui       $at, %hi(D_800B1D98)
+/* E05380 80240020 E4201D98 */  swc1      $f0, %lo(D_800B1D98)($at)
 /* E05384 80240024 03E00008 */  jr        $ra
 /* E05388 80240028 24020002 */   addiu    $v0, $zero, 2
 /* E0538C 8024002C 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_80240030_E05390.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_80240030_E05390.s
index ab52763ac8..54c54a7e0b 100644
--- a/asm/nonmatchings/world/area_end/end_01/E05390/func_80240030_E05390.s
+++ b/asm/nonmatchings/world/area_end/end_01/E05390/func_80240030_E05390.s
@@ -73,10 +73,10 @@ glabel func_80240030_E05390
 /* E0549C 8024013C 0C019E40 */  jal       guTranslateF
 /* E054A0 80240140 0200202D */   daddu    $a0, $s0, $zero
 /* E054A4 80240144 0200202D */  daddu     $a0, $s0, $zero
-/* E054A8 80240148 3C128007 */  lui       $s2, 0x8007
-/* E054AC 8024014C 265241F0 */  addiu     $s2, $s2, 0x41f0
-/* E054B0 80240150 3C13800A */  lui       $s3, 0x800a
-/* E054B4 80240154 2673A674 */  addiu     $s3, $s3, -0x598c
+/* E054A8 80240148 3C128007 */  lui       $s2, %hi(D_800741F0)
+/* E054AC 8024014C 265241F0 */  addiu     $s2, $s2, %lo(D_800741F0)
+/* E054B0 80240150 3C13800A */  lui       $s3, %hi(D_8009A674)
+/* E054B4 80240154 2673A674 */  addiu     $s3, $s3, %lo(D_8009A674)
 /* E054B8 80240158 96450000 */  lhu       $a1, ($s2)
 /* E054BC 8024015C 8E620000 */  lw        $v0, ($s3)
 /* E054C0 80240160 00052980 */  sll       $a1, $a1, 6
@@ -89,8 +89,8 @@ glabel func_80240030_E05390
 /* E054DC 8024017C 27A50020 */  addiu     $a1, $sp, 0x20
 /* E054E0 80240180 3C060005 */  lui       $a2, 5
 /* E054E4 80240184 34C60040 */  ori       $a2, $a2, 0x40
-/* E054E8 80240188 3C11800A */  lui       $s1, 0x800a
-/* E054EC 8024018C 2631A66C */  addiu     $s1, $s1, -0x5994
+/* E054E8 80240188 3C11800A */  lui       $s1, %hi(D_8009A66C)
+/* E054EC 8024018C 2631A66C */  addiu     $s1, $s1, %lo(D_8009A66C)
 /* E054F0 80240190 0200382D */  daddu     $a3, $s0, $zero
 /* E054F4 80240194 8E220000 */  lw        $v0, ($s1)
 /* E054F8 80240198 96480000 */  lhu       $t0, ($s2)
diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_80240280_E055E0.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_80240280_E055E0.s
index c40523671d..931a165d1a 100644
--- a/asm/nonmatchings/world/area_end/end_01/E05390/func_80240280_E055E0.s
+++ b/asm/nonmatchings/world/area_end/end_01/E05390/func_80240280_E055E0.s
@@ -110,10 +110,10 @@ glabel func_80240280_E055E0
 /* E0576C 8024040C 0C019E40 */  jal       guTranslateF
 /* E05770 80240410 0000382D */   daddu    $a3, $zero, $zero
 /* E05774 80240414 0260202D */  daddu     $a0, $s3, $zero
-/* E05778 80240418 3C108007 */  lui       $s0, 0x8007
-/* E0577C 8024041C 261041F0 */  addiu     $s0, $s0, 0x41f0
-/* E05780 80240420 3C12800A */  lui       $s2, 0x800a
-/* E05784 80240424 2652A674 */  addiu     $s2, $s2, -0x598c
+/* E05778 80240418 3C108007 */  lui       $s0, %hi(D_800741F0)
+/* E0577C 8024041C 261041F0 */  addiu     $s0, $s0, %lo(D_800741F0)
+/* E05780 80240420 3C12800A */  lui       $s2, %hi(D_8009A674)
+/* E05784 80240424 2652A674 */  addiu     $s2, $s2, %lo(D_8009A674)
 /* E05788 80240428 96050000 */  lhu       $a1, ($s0)
 /* E0578C 8024042C 8E420000 */  lw        $v0, ($s2)
 /* E05790 80240430 00052980 */  sll       $a1, $a1, 6
@@ -122,8 +122,8 @@ glabel func_80240280_E055E0
 /* E0579C 8024043C 00452821 */   addu     $a1, $v0, $a1
 /* E057A0 80240440 3C02DA38 */  lui       $v0, 0xda38
 /* E057A4 80240444 34420002 */  ori       $v0, $v0, 2
-/* E057A8 80240448 3C11800A */  lui       $s1, 0x800a
-/* E057AC 8024044C 2631A66C */  addiu     $s1, $s1, -0x5994
+/* E057A8 80240448 3C11800A */  lui       $s1, %hi(D_8009A66C)
+/* E057AC 8024044C 2631A66C */  addiu     $s1, $s1, %lo(D_8009A66C)
 /* E057B0 80240450 8E240000 */  lw        $a0, ($s1)
 /* E057B4 80240454 96050000 */  lhu       $a1, ($s0)
 /* E057B8 80240458 0080302D */  daddu     $a2, $a0, $zero
diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_80240550_E058B0.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_80240550_E058B0.s
index d3ce747db6..18d2f8c53d 100644
--- a/asm/nonmatchings/world/area_end/end_01/E05390/func_80240550_E058B0.s
+++ b/asm/nonmatchings/world/area_end/end_01/E05390/func_80240550_E058B0.s
@@ -110,10 +110,10 @@ glabel func_80240550_E058B0
 .L802406EC:
 /* E05A4C 802406EC 36731630 */  ori       $s3, $s3, 0x1630
 /* E05A50 802406F0 0280202D */  daddu     $a0, $s4, $zero
-/* E05A54 802406F4 3C118007 */  lui       $s1, 0x8007
-/* E05A58 802406F8 263141F0 */  addiu     $s1, $s1, 0x41f0
-/* E05A5C 802406FC 3C12800A */  lui       $s2, 0x800a
-/* E05A60 80240700 2652A674 */  addiu     $s2, $s2, -0x598c
+/* E05A54 802406F4 3C118007 */  lui       $s1, %hi(D_800741F0)
+/* E05A58 802406F8 263141F0 */  addiu     $s1, $s1, %lo(D_800741F0)
+/* E05A5C 802406FC 3C12800A */  lui       $s2, %hi(D_8009A674)
+/* E05A60 80240700 2652A674 */  addiu     $s2, $s2, %lo(D_8009A674)
 /* E05A64 80240704 96250000 */  lhu       $a1, ($s1)
 /* E05A68 80240708 8E420000 */  lw        $v0, ($s2)
 /* E05A6C 8024070C 00052980 */  sll       $a1, $a1, 6
@@ -125,8 +125,8 @@ glabel func_80240550_E058B0
 /* E05A84 80240724 0000202D */  daddu     $a0, $zero, $zero
 /* E05A88 80240728 27A50020 */  addiu     $a1, $sp, 0x20
 /* E05A8C 8024072C 24060040 */  addiu     $a2, $zero, 0x40
-/* E05A90 80240730 3C10800A */  lui       $s0, 0x800a
-/* E05A94 80240734 2610A66C */  addiu     $s0, $s0, -0x5994
+/* E05A90 80240730 3C10800A */  lui       $s0, %hi(D_8009A66C)
+/* E05A94 80240734 2610A66C */  addiu     $s0, $s0, %lo(D_8009A66C)
 /* E05A98 80240738 0280382D */  daddu     $a3, $s4, $zero
 /* E05A9C 8024073C 8E020000 */  lw        $v0, ($s0)
 /* E05AA0 80240740 96280000 */  lhu       $t0, ($s1)
diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_8024082C_E05B8C.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_8024082C_E05B8C.s
index 673e2edd83..f4270ba2f5 100644
--- a/asm/nonmatchings/world/area_end/end_01/E05390/func_8024082C_E05B8C.s
+++ b/asm/nonmatchings/world/area_end/end_01/E05390/func_8024082C_E05B8C.s
@@ -105,10 +105,10 @@ glabel func_8024082C_E05B8C
 .L802409B4:
 /* E05D14 802409B4 36731630 */  ori       $s3, $s3, 0x1630
 /* E05D18 802409B8 0280202D */  daddu     $a0, $s4, $zero
-/* E05D1C 802409BC 3C118007 */  lui       $s1, 0x8007
-/* E05D20 802409C0 263141F0 */  addiu     $s1, $s1, 0x41f0
-/* E05D24 802409C4 3C12800A */  lui       $s2, 0x800a
-/* E05D28 802409C8 2652A674 */  addiu     $s2, $s2, -0x598c
+/* E05D1C 802409BC 3C118007 */  lui       $s1, %hi(D_800741F0)
+/* E05D20 802409C0 263141F0 */  addiu     $s1, $s1, %lo(D_800741F0)
+/* E05D24 802409C4 3C12800A */  lui       $s2, %hi(D_8009A674)
+/* E05D28 802409C8 2652A674 */  addiu     $s2, $s2, %lo(D_8009A674)
 /* E05D2C 802409CC 96250000 */  lhu       $a1, ($s1)
 /* E05D30 802409D0 8E420000 */  lw        $v0, ($s2)
 /* E05D34 802409D4 00052980 */  sll       $a1, $a1, 6
@@ -121,8 +121,8 @@ glabel func_8024082C_E05B8C
 /* E05D50 802409F0 27A50020 */  addiu     $a1, $sp, 0x20
 /* E05D54 802409F4 3C060001 */  lui       $a2, 1
 /* E05D58 802409F8 34C60040 */  ori       $a2, $a2, 0x40
-/* E05D5C 802409FC 3C10800A */  lui       $s0, 0x800a
-/* E05D60 80240A00 2610A66C */  addiu     $s0, $s0, -0x5994
+/* E05D5C 802409FC 3C10800A */  lui       $s0, %hi(D_8009A66C)
+/* E05D60 80240A00 2610A66C */  addiu     $s0, $s0, %lo(D_8009A66C)
 /* E05D64 80240A04 0280382D */  daddu     $a3, $s4, $zero
 /* E05D68 80240A08 8E020000 */  lw        $v0, ($s0)
 /* E05D6C 80240A0C 96280000 */  lhu       $t0, ($s1)
diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_80240AF8_E05E58.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_80240AF8_E05E58.s
index 9f9998e63a..32d654dc01 100644
--- a/asm/nonmatchings/world/area_end/end_01/E05390/func_80240AF8_E05E58.s
+++ b/asm/nonmatchings/world/area_end/end_01/E05390/func_80240AF8_E05E58.s
@@ -169,10 +169,10 @@ glabel func_80240AF8_E05E58
 /* E060D4 80240D74 0C019D80 */  jal       guMtxCatF
 /* E060D8 80240D78 0220302D */   daddu    $a2, $s1, $zero
 /* E060DC 80240D7C 0220202D */  daddu     $a0, $s1, $zero
-/* E060E0 80240D80 3C108007 */  lui       $s0, 0x8007
-/* E060E4 80240D84 261041F0 */  addiu     $s0, $s0, 0x41f0
-/* E060E8 80240D88 3C13800A */  lui       $s3, 0x800a
-/* E060EC 80240D8C 2673A674 */  addiu     $s3, $s3, -0x598c
+/* E060E0 80240D80 3C108007 */  lui       $s0, %hi(D_800741F0)
+/* E060E4 80240D84 261041F0 */  addiu     $s0, $s0, %lo(D_800741F0)
+/* E060E8 80240D88 3C13800A */  lui       $s3, %hi(D_8009A674)
+/* E060EC 80240D8C 2673A674 */  addiu     $s3, $s3, %lo(D_8009A674)
 /* E060F0 80240D90 96050000 */  lhu       $a1, ($s0)
 /* E060F4 80240D94 8E620000 */  lw        $v0, ($s3)
 /* E060F8 80240D98 00052980 */  sll       $a1, $a1, 6
@@ -181,8 +181,8 @@ glabel func_80240AF8_E05E58
 /* E06104 80240DA4 00452821 */   addu     $a1, $v0, $a1
 /* E06108 80240DA8 3C02DA38 */  lui       $v0, 0xda38
 /* E0610C 80240DAC 34420002 */  ori       $v0, $v0, 2
-/* E06110 80240DB0 3C12800A */  lui       $s2, 0x800a
-/* E06114 80240DB4 2652A66C */  addiu     $s2, $s2, -0x5994
+/* E06110 80240DB0 3C12800A */  lui       $s2, %hi(D_8009A66C)
+/* E06114 80240DB4 2652A66C */  addiu     $s2, $s2, %lo(D_8009A66C)
 /* E06118 80240DB8 8E440000 */  lw        $a0, ($s2)
 /* E0611C 80240DBC 96050000 */  lhu       $a1, ($s0)
 /* E06120 80240DC0 0080302D */  daddu     $a2, $a0, $zero
diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_80240FFC_E0635C.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_80240FFC_E0635C.s
index 8675ead701..57f5a3b053 100644
--- a/asm/nonmatchings/world/area_end/end_01/E05390/func_80240FFC_E0635C.s
+++ b/asm/nonmatchings/world/area_end/end_01/E05390/func_80240FFC_E0635C.s
@@ -35,10 +35,10 @@ glabel func_80240FFC_E0635C
 /* E063D4 80241074 0C019E40 */  jal       guTranslateF
 /* E063D8 80241078 36B51630 */   ori      $s5, $s5, 0x1630
 /* E063DC 8024107C 0280202D */  daddu     $a0, $s4, $zero
-/* E063E0 80241080 3C118007 */  lui       $s1, 0x8007
-/* E063E4 80241084 263141F0 */  addiu     $s1, $s1, 0x41f0
-/* E063E8 80241088 3C12800A */  lui       $s2, 0x800a
-/* E063EC 8024108C 2652A674 */  addiu     $s2, $s2, -0x598c
+/* E063E0 80241080 3C118007 */  lui       $s1, %hi(D_800741F0)
+/* E063E4 80241084 263141F0 */  addiu     $s1, $s1, %lo(D_800741F0)
+/* E063E8 80241088 3C12800A */  lui       $s2, %hi(D_8009A674)
+/* E063EC 8024108C 2652A674 */  addiu     $s2, $s2, %lo(D_8009A674)
 /* E063F0 80241090 96250000 */  lhu       $a1, ($s1)
 /* E063F4 80241094 8E420000 */  lw        $v0, ($s2)
 /* E063F8 80241098 00052980 */  sll       $a1, $a1, 6
@@ -47,8 +47,8 @@ glabel func_80240FFC_E0635C
 /* E06404 802410A4 00452821 */   addu     $a1, $v0, $a1
 /* E06408 802410A8 3C02DA38 */  lui       $v0, 0xda38
 /* E0640C 802410AC 34420002 */  ori       $v0, $v0, 2
-/* E06410 802410B0 3C13800A */  lui       $s3, 0x800a
-/* E06414 802410B4 2673A66C */  addiu     $s3, $s3, -0x5994
+/* E06410 802410B0 3C13800A */  lui       $s3, %hi(D_8009A66C)
+/* E06414 802410B4 2673A66C */  addiu     $s3, $s3, %lo(D_8009A66C)
 /* E06418 802410B8 8E680000 */  lw        $t0, ($s3)
 /* E0641C 802410BC 96290000 */  lhu       $t1, ($s1)
 /* E06420 802410C0 0100202D */  daddu     $a0, $t0, $zero
diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_802412A4_E06604.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_802412A4_E06604.s
index cd6916402d..605424985e 100644
--- a/asm/nonmatchings/world/area_end/end_01/E05390/func_802412A4_E06604.s
+++ b/asm/nonmatchings/world/area_end/end_01/E05390/func_802412A4_E06604.s
@@ -66,10 +66,10 @@ glabel func_802412A4_E06604
 /* E066F8 80241398 0C019E40 */  jal       guTranslateF
 /* E066FC 8024139C 0200202D */   daddu    $a0, $s0, $zero
 /* E06700 802413A0 0200202D */  daddu     $a0, $s0, $zero
-/* E06704 802413A4 3C128007 */  lui       $s2, 0x8007
-/* E06708 802413A8 265241F0 */  addiu     $s2, $s2, 0x41f0
-/* E0670C 802413AC 3C13800A */  lui       $s3, 0x800a
-/* E06710 802413B0 2673A674 */  addiu     $s3, $s3, -0x598c
+/* E06704 802413A4 3C128007 */  lui       $s2, %hi(D_800741F0)
+/* E06708 802413A8 265241F0 */  addiu     $s2, $s2, %lo(D_800741F0)
+/* E0670C 802413AC 3C13800A */  lui       $s3, %hi(D_8009A674)
+/* E06710 802413B0 2673A674 */  addiu     $s3, $s3, %lo(D_8009A674)
 /* E06714 802413B4 96450000 */  lhu       $a1, ($s2)
 /* E06718 802413B8 8E620000 */  lw        $v0, ($s3)
 /* E0671C 802413BC 00052980 */  sll       $a1, $a1, 6
@@ -82,8 +82,8 @@ glabel func_802412A4_E06604
 /* E06738 802413D8 27A50020 */  addiu     $a1, $sp, 0x20
 /* E0673C 802413DC 3C060001 */  lui       $a2, 1
 /* E06740 802413E0 34C60040 */  ori       $a2, $a2, 0x40
-/* E06744 802413E4 3C11800A */  lui       $s1, 0x800a
-/* E06748 802413E8 2631A66C */  addiu     $s1, $s1, -0x5994
+/* E06744 802413E4 3C11800A */  lui       $s1, %hi(D_8009A66C)
+/* E06748 802413E8 2631A66C */  addiu     $s1, $s1, %lo(D_8009A66C)
 /* E0674C 802413EC 0200382D */  daddu     $a3, $s0, $zero
 /* E06750 802413F0 8E220000 */  lw        $v0, ($s1)
 /* E06754 802413F4 96480000 */  lhu       $t0, ($s2)
diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_802414DC_E0683C.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_802414DC_E0683C.s
index a97bc69905..f07075c447 100644
--- a/asm/nonmatchings/world/area_end/end_01/E05390/func_802414DC_E0683C.s
+++ b/asm/nonmatchings/world/area_end/end_01/E05390/func_802414DC_E0683C.s
@@ -90,10 +90,10 @@ glabel func_802414DC_E0683C
 /* E06990 80241630 0C019D80 */  jal       guMtxCatF
 /* E06994 80241634 0220302D */   daddu    $a2, $s1, $zero
 /* E06998 80241638 0220202D */  daddu     $a0, $s1, $zero
-/* E0699C 8024163C 3C128007 */  lui       $s2, 0x8007
-/* E069A0 80241640 265241F0 */  addiu     $s2, $s2, 0x41f0
-/* E069A4 80241644 3C13800A */  lui       $s3, 0x800a
-/* E069A8 80241648 2673A674 */  addiu     $s3, $s3, -0x598c
+/* E0699C 8024163C 3C128007 */  lui       $s2, %hi(D_800741F0)
+/* E069A0 80241640 265241F0 */  addiu     $s2, $s2, %lo(D_800741F0)
+/* E069A4 80241644 3C13800A */  lui       $s3, %hi(D_8009A674)
+/* E069A8 80241648 2673A674 */  addiu     $s3, $s3, %lo(D_8009A674)
 /* E069AC 8024164C 96450000 */  lhu       $a1, ($s2)
 /* E069B0 80241650 8E620000 */  lw        $v0, ($s3)
 /* E069B4 80241654 00052980 */  sll       $a1, $a1, 6
@@ -105,8 +105,8 @@ glabel func_802414DC_E0683C
 /* E069CC 8024166C 0000202D */  daddu     $a0, $zero, $zero
 /* E069D0 80241670 27A50020 */  addiu     $a1, $sp, 0x20
 /* E069D4 80241674 24060040 */  addiu     $a2, $zero, 0x40
-/* E069D8 80241678 3C10800A */  lui       $s0, 0x800a
-/* E069DC 8024167C 2610A66C */  addiu     $s0, $s0, -0x5994
+/* E069D8 80241678 3C10800A */  lui       $s0, %hi(D_8009A66C)
+/* E069DC 8024167C 2610A66C */  addiu     $s0, $s0, %lo(D_8009A66C)
 /* E069E0 80241680 0220382D */  daddu     $a3, $s1, $zero
 /* E069E4 80241684 8E020000 */  lw        $v0, ($s0)
 /* E069E8 80241688 96480000 */  lhu       $t0, ($s2)
diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_80241778_E06AD8.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_80241778_E06AD8.s
index 29d93cf420..5494e7fdf4 100644
--- a/asm/nonmatchings/world/area_end/end_01/E05390/func_80241778_E06AD8.s
+++ b/asm/nonmatchings/world/area_end/end_01/E05390/func_80241778_E06AD8.s
@@ -87,10 +87,10 @@ glabel func_80241778_E06AD8
 /* E06C20 802418C0 0C019D80 */  jal       guMtxCatF
 /* E06C24 802418C4 0220302D */   daddu    $a2, $s1, $zero
 /* E06C28 802418C8 0220202D */  daddu     $a0, $s1, $zero
-/* E06C2C 802418CC 3C128007 */  lui       $s2, 0x8007
-/* E06C30 802418D0 265241F0 */  addiu     $s2, $s2, 0x41f0
-/* E06C34 802418D4 3C13800A */  lui       $s3, 0x800a
-/* E06C38 802418D8 2673A674 */  addiu     $s3, $s3, -0x598c
+/* E06C2C 802418CC 3C128007 */  lui       $s2, %hi(D_800741F0)
+/* E06C30 802418D0 265241F0 */  addiu     $s2, $s2, %lo(D_800741F0)
+/* E06C34 802418D4 3C13800A */  lui       $s3, %hi(D_8009A674)
+/* E06C38 802418D8 2673A674 */  addiu     $s3, $s3, %lo(D_8009A674)
 /* E06C3C 802418DC 96450000 */  lhu       $a1, ($s2)
 /* E06C40 802418E0 8E620000 */  lw        $v0, ($s3)
 /* E06C44 802418E4 00052980 */  sll       $a1, $a1, 6
@@ -103,8 +103,8 @@ glabel func_80241778_E06AD8
 /* E06C60 80241900 27A50020 */  addiu     $a1, $sp, 0x20
 /* E06C64 80241904 3C060001 */  lui       $a2, 1
 /* E06C68 80241908 34C60040 */  ori       $a2, $a2, 0x40
-/* E06C6C 8024190C 3C10800A */  lui       $s0, 0x800a
-/* E06C70 80241910 2610A66C */  addiu     $s0, $s0, -0x5994
+/* E06C6C 8024190C 3C10800A */  lui       $s0, %hi(D_8009A66C)
+/* E06C70 80241910 2610A66C */  addiu     $s0, $s0, %lo(D_8009A66C)
 /* E06C74 80241914 0220382D */  daddu     $a3, $s1, $zero
 /* E06C78 80241918 8E020000 */  lw        $v0, ($s0)
 /* E06C7C 8024191C 96480000 */  lhu       $t0, ($s2)
diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_80241B44_E06EA4.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_80241B44_E06EA4.s
index 3c408bdd13..06a749bcc0 100644
--- a/asm/nonmatchings/world/area_end/end_01/E05390/func_80241B44_E06EA4.s
+++ b/asm/nonmatchings/world/area_end/end_01/E05390/func_80241B44_E06EA4.s
@@ -51,8 +51,8 @@ glabel func_80241B44_E06EA4
 /* E06F54 80241BF4 10600017 */  beqz      $v1, .L80241C54
 /* E06F58 80241BF8 0000B02D */   daddu    $s6, $zero, $zero
 /* E06F5C 80241BFC 00041080 */  sll       $v0, $a0, 2
-/* E06F60 80241C00 3C098025 */  lui       $t1, 0x8025
-/* E06F64 80241C04 252993A0 */  addiu     $t1, $t1, -0x6c60
+/* E06F60 80241C00 3C098025 */  lui       $t1, %hi(D_802493A0)
+/* E06F64 80241C04 252993A0 */  addiu     $t1, $t1, %lo(D_802493A0)
 /* E06F68 80241C08 00491021 */  addu      $v0, $v0, $t1
 /* E06F6C 80241C0C 8C420000 */  lw        $v0, ($v0)
 /* E06F70 80241C10 00400008 */  jr        $v0
@@ -90,13 +90,13 @@ glabel func_80241B44_E06EA4
 /* E06FEC 80241C8C 2C420002 */  sltiu     $v0, $v0, 2
 /* E06FF0 80241C90 10400022 */  beqz      $v0, .L80241D1C
 /* E06FF4 80241C94 AFA30044 */   sw       $v1, 0x44($sp)
-/* E06FF8 80241C98 3C058024 */  lui       $a1, 0x8024
-/* E06FFC 80241C9C 24A53178 */  addiu     $a1, $a1, 0x3178
+/* E06FF8 80241C98 3C058024 */  lui       $a1, %hi(D_80243178)
+/* E06FFC 80241C9C 24A53178 */  addiu     $a1, $a1, %lo(D_80243178)
 /* E07000 80241CA0 24090004 */  addiu     $t1, $zero, 4
 /* E07004 80241CA4 14890003 */  bne       $a0, $t1, .L80241CB4
 /* E07008 80241CA8 00000000 */   nop      
-/* E0700C 80241CAC 3C058024 */  lui       $a1, 0x8024
-/* E07010 80241CB0 24A53110 */  addiu     $a1, $a1, 0x3110
+/* E0700C 80241CAC 3C058024 */  lui       $a1, %hi(D_80243110)
+/* E07010 80241CB0 24A53110 */  addiu     $a1, $a1, %lo(D_80243110)
 .L80241CB4:
 /* E07014 80241CB4 14890007 */  bne       $a0, $t1, .L80241CD4
 /* E07018 80241CB8 0000302D */   daddu    $a2, $zero, $zero
@@ -179,9 +179,9 @@ glabel func_80241B44_E06EA4
 /* E07128 80241DC8 2C830010 */  sltiu     $v1, $a0, 0x10
 /* E0712C 80241DCC 10600016 */  beqz      $v1, .L80241E28
 /* E07130 80241DD0 00041080 */   sll      $v0, $a0, 2
-/* E07134 80241DD4 3C018025 */  lui       $at, 0x8025
+/* E07134 80241DD4 3C018025 */  lui       $at, %hi(D_802493E0)
 /* E07138 80241DD8 00220821 */  addu      $at, $at, $v0
-/* E0713C 80241DDC 8C2293E0 */  lw        $v0, -0x6c20($at)
+/* E0713C 80241DDC 8C2293E0 */  lw        $v0, %lo(D_802493E0)($at)
 /* E07140 80241DE0 00400008 */  jr        $v0
 /* E07144 80241DE4 00000000 */   nop      
 /* E07148 80241DE8 2682FF0D */  addiu     $v0, $s4, -0xf3
@@ -248,9 +248,9 @@ glabel func_80241B44_E06EA4
 /* E07228 80241EC8 2C620006 */  sltiu     $v0, $v1, 6
 /* E0722C 80241ECC 1040005B */  beqz      $v0, .L8024203C
 /* E07230 80241ED0 00031080 */   sll      $v0, $v1, 2
-/* E07234 80241ED4 3C018025 */  lui       $at, 0x8025
+/* E07234 80241ED4 3C018025 */  lui       $at, %hi(D_80249420)
 /* E07238 80241ED8 00220821 */  addu      $at, $at, $v0
-/* E0723C 80241EDC 8C229420 */  lw        $v0, -0x6be0($at)
+/* E0723C 80241EDC 8C229420 */  lw        $v0, %lo(D_80249420)($at)
 /* E07240 80241EE0 00400008 */  jr        $v0
 /* E07244 80241EE4 00000000 */   nop      
 /* E07248 80241EE8 0260202D */  daddu     $a0, $s3, $zero
@@ -368,13 +368,13 @@ glabel func_80241B44_E06EA4
 /* E073D4 80242074 2C420002 */  sltiu     $v0, $v0, 2
 /* E073D8 80242078 10400020 */  beqz      $v0, .L802420FC
 /* E073DC 8024207C 00000000 */   nop      
-/* E073E0 80242080 3C058024 */  lui       $a1, 0x8024
-/* E073E4 80242084 24A53178 */  addiu     $a1, $a1, 0x3178
+/* E073E0 80242080 3C058024 */  lui       $a1, %hi(D_80243178)
+/* E073E4 80242084 24A53178 */  addiu     $a1, $a1, %lo(D_80243178)
 /* E073E8 80242088 24090004 */  addiu     $t1, $zero, 4
 /* E073EC 8024208C 14890003 */  bne       $a0, $t1, .L8024209C
 /* E073F0 80242090 00000000 */   nop      
-/* E073F4 80242094 3C058024 */  lui       $a1, 0x8024
-/* E073F8 80242098 24A53110 */  addiu     $a1, $a1, 0x3110
+/* E073F4 80242094 3C058024 */  lui       $a1, %hi(D_80243110)
+/* E073F8 80242098 24A53110 */  addiu     $a1, $a1, %lo(D_80243110)
 .L8024209C:
 /* E073FC 8024209C 14890007 */  bne       $a0, $t1, .L802420BC
 /* E07400 802420A0 0000302D */   daddu    $a2, $zero, $zero
diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_802421E8_E07548.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_802421E8_E07548.s
index a88678f6af..565780d2af 100644
--- a/asm/nonmatchings/world/area_end/end_01/E05390/func_802421E8_E07548.s
+++ b/asm/nonmatchings/world/area_end/end_01/E05390/func_802421E8_E07548.s
@@ -8,21 +8,21 @@ glabel func_802421E8_E07548
 /* E07554 802421F4 AFB40030 */  sw        $s4, 0x30($sp)
 /* E07558 802421F8 0000A02D */  daddu     $s4, $zero, $zero
 /* E0755C 802421FC AFB10024 */  sw        $s1, 0x24($sp)
-/* E07560 80242200 3C11800A */  lui       $s1, 0x800a
-/* E07564 80242204 2631A66C */  addiu     $s1, $s1, -0x5994
+/* E07560 80242200 3C11800A */  lui       $s1, %hi(D_8009A66C)
+/* E07564 80242204 2631A66C */  addiu     $s1, $s1, %lo(D_8009A66C)
 /* E07568 80242208 AFB3002C */  sw        $s3, 0x2c($sp)
 /* E0756C 8024220C 24130004 */  addiu     $s3, $zero, 4
-/* E07570 80242210 3C028025 */  lui       $v0, 0x8025
-/* E07574 80242214 2442B9D0 */  addiu     $v0, $v0, -0x4630
+/* E07570 80242210 3C028025 */  lui       $v0, %hi(D_8024B9D0)
+/* E07574 80242214 2442B9D0 */  addiu     $v0, $v0, %lo(D_8024B9D0)
 /* E07578 80242218 AFBF0038 */  sw        $ra, 0x38($sp)
 /* E0757C 8024221C AFB50034 */  sw        $s5, 0x34($sp)
 /* E07580 80242220 AFB20028 */  sw        $s2, 0x28($sp)
 /* E07584 80242224 AFB00020 */  sw        $s0, 0x20($sp)
 /* E07588 80242228 8E230000 */  lw        $v1, ($s1)
-/* E0758C 8024222C 3C108007 */  lui       $s0, 0x8007
-/* E07590 80242230 8E1041F4 */  lw        $s0, 0x41f4($s0)
-/* E07594 80242234 3C158025 */  lui       $s5, 0x8025
-/* E07598 80242238 8EB5A2C4 */  lw        $s5, -0x5d3c($s5)
+/* E0758C 8024222C 3C108007 */  lui       $s0, %hi(D_800741F4)
+/* E07590 80242230 8E1041F4 */  lw        $s0, %lo(D_800741F4)($s0)
+/* E07594 80242234 3C158025 */  lui       $s5, %hi(D_8024A2C4)
+/* E07598 80242238 8EB5A2C4 */  lw        $s5, %lo(D_8024A2C4)($s5)
 /* E0759C 8024223C 44800000 */  mtc1      $zero, $f0
 /* E075A0 80242240 3C01C2C8 */  lui       $at, 0xc2c8
 /* E075A4 80242244 44811000 */  mtc1      $at, $f2
@@ -41,8 +41,8 @@ glabel func_802421E8_E07548
 /* E075D8 80242278 AE230000 */  sw        $v1, ($s1)
 /* E075DC 8024227C AD050000 */  sw        $a1, ($t0)
 /* E075E0 80242280 44050000 */  mfc1      $a1, $f0
-/* E075E4 80242284 3C028024 */  lui       $v0, 0x8024
-/* E075E8 80242288 24423200 */  addiu     $v0, $v0, 0x3200
+/* E075E4 80242284 3C028024 */  lui       $v0, %hi(D_80243200)
+/* E075E8 80242288 24423200 */  addiu     $v0, $v0, %lo(D_80243200)
 /* E075EC 8024228C AD020004 */  sw        $v0, 4($t0)
 /* E075F0 80242290 E7A20014 */  swc1      $f2, 0x14($sp)
 /* E075F4 80242294 E7A40018 */  swc1      $f4, 0x18($sp)
diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_80242368_E076C8.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_80242368_E076C8.s
index 5cc6770b1c..ca99b844da 100644
--- a/asm/nonmatchings/world/area_end/end_01/E05390/func_80242368_E076C8.s
+++ b/asm/nonmatchings/world/area_end/end_01/E05390/func_80242368_E076C8.s
@@ -6,8 +6,8 @@ glabel func_80242368_E076C8
 /* E076CC 8024236C AFB20030 */  sw        $s2, 0x30($sp)
 /* E076D0 80242370 0080902D */  daddu     $s2, $a0, $zero
 /* E076D4 80242374 0000182D */  daddu     $v1, $zero, $zero
-/* E076D8 80242378 3C068025 */  lui       $a2, 0x8025
-/* E076DC 8024237C 8CC6A2C4 */  lw        $a2, -0x5d3c($a2)
+/* E076D8 80242378 3C068025 */  lui       $a2, %hi(D_8024A2C4)
+/* E076DC 8024237C 8CC6A2C4 */  lw        $a2, %lo(D_8024A2C4)($a2)
 /* E076E0 80242380 24040020 */  addiu     $a0, $zero, 0x20
 /* E076E4 80242384 AFBF0038 */  sw        $ra, 0x38($sp)
 /* E076E8 80242388 AFB30034 */  sw        $s3, 0x34($sp)
@@ -35,11 +35,11 @@ glabel func_80242368_E076C8
 /* E07738 802423D8 00C28821 */   addu     $s1, $a2, $v0
 /* E0773C 802423DC 04820014 */  bltzl     $a0, .L80242430
 /* E07740 802423E0 AE240000 */   sw       $a0, ($s1)
-/* E07744 802423E4 3C138024 */  lui       $s3, 0x8024
-/* E07748 802423E8 26733210 */  addiu     $s3, $s3, 0x3210
+/* E07744 802423E4 3C138024 */  lui       $s3, %hi(D_80243210)
+/* E07748 802423E8 26733210 */  addiu     $s3, $s3, %lo(D_80243210)
 /* E0774C 802423EC 8E650000 */  lw        $a1, ($s3)
-/* E07750 802423F0 3C108025 */  lui       $s0, 0x8025
-/* E07754 802423F4 2610A2D0 */  addiu     $s0, $s0, -0x5d30
+/* E07750 802423F0 3C108025 */  lui       $s0, %hi(D_8024A2D0)
+/* E07754 802423F4 2610A2D0 */  addiu     $s0, $s0, %lo(D_8024A2D0)
 /* E07758 802423F8 00052A00 */  sll       $a1, $a1, 8
 /* E0775C 802423FC 0C049601 */  jal       dma_load_string
 /* E07760 80242400 00B02821 */   addu     $a1, $a1, $s0
diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_80242510_E07870.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_80242510_E07870.s
index 8bc602f70d..691e4f0cd0 100644
--- a/asm/nonmatchings/world/area_end/end_01/E05390/func_80242510_E07870.s
+++ b/asm/nonmatchings/world/area_end/end_01/E05390/func_80242510_E07870.s
@@ -4,13 +4,13 @@
 glabel func_80242510_E07870
 /* E07870 80242510 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* E07874 80242514 AFB00010 */  sw        $s0, 0x10($sp)
-/* E07878 80242518 3C108025 */  lui       $s0, 0x8025
-/* E0787C 8024251C 26109440 */  addiu     $s0, $s0, -0x6bc0
-/* E07880 80242520 3C058024 */  lui       $a1, 0x8024
-/* E07884 80242524 24A521E8 */  addiu     $a1, $a1, 0x21e8
+/* E07878 80242518 3C108025 */  lui       $s0, %hi(D_80249440)
+/* E0787C 8024251C 26109440 */  addiu     $s0, $s0, %lo(D_80249440)
+/* E07880 80242520 3C058024 */  lui       $a1, %hi(D_802421E8)
+/* E07884 80242524 24A521E8 */  addiu     $a1, $a1, %lo(D_802421E8)
 /* E07888 80242528 AFBF0014 */  sw        $ra, 0x14($sp)
-/* E0788C 8024252C 3C018025 */  lui       $at, 0x8025
-/* E07890 80242530 AC30A2C4 */  sw        $s0, -0x5d3c($at)
+/* E0788C 8024252C 3C018025 */  lui       $at, %hi(D_8024A2C4)
+/* E07890 80242530 AC30A2C4 */  sw        $s0, %lo(D_8024A2C4)($at)
 /* E07894 80242534 0C048C8F */  jal       bind_dynamic_entity_7
 /* E07898 80242538 0000202D */   daddu    $a0, $zero, $zero
 /* E0789C 8024253C 2404001F */  addiu     $a0, $zero, 0x1f
diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_80242690_E079F0.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_80242690_E079F0.s
index 438a754d6b..5b744dcb8c 100644
--- a/asm/nonmatchings/world/area_end/end_01/E05390/func_80242690_E079F0.s
+++ b/asm/nonmatchings/world/area_end/end_01/E05390/func_80242690_E079F0.s
@@ -11,8 +11,8 @@ glabel func_80242690_E079F0
 /* E07A08 802426A8 8C450000 */   lw       $a1, ($v0)
 /* E07A0C 802426AC 24030100 */  addiu     $v1, $zero, 0x100
 /* E07A10 802426B0 0040882D */  daddu     $s1, $v0, $zero
-/* E07A14 802426B4 3C028024 */  lui       $v0, 0x8024
-/* E07A18 802426B8 244241F0 */  addiu     $v0, $v0, 0x41f0
+/* E07A14 802426B4 3C028024 */  lui       $v0, %hi(D_802441F0)
+/* E07A18 802426B8 244241F0 */  addiu     $v0, $v0, %lo(D_802441F0)
 /* E07A1C 802426BC 00118040 */  sll       $s0, $s1, 1
 /* E07A20 802426C0 02118021 */  addu      $s0, $s0, $s1
 /* E07A24 802426C4 001080C0 */  sll       $s0, $s0, 3
@@ -24,8 +24,8 @@ glabel func_80242690_E079F0
 /* E07A3C 802426DC AFA20014 */  sw        $v0, 0x14($sp)
 /* E07A40 802426E0 8E050004 */  lw        $a1, 4($s0)
 /* E07A44 802426E4 24020001 */  addiu     $v0, $zero, 1
-/* E07A48 802426E8 3C01802E */  lui       $at, 0x802e
-/* E07A4C 802426EC AC22F524 */  sw        $v0, -0xadc($at)
+/* E07A48 802426E8 3C01802E */  lui       $at, %hi(D_802DF524)
+/* E07A4C 802426EC AC22F524 */  sw        $v0, %lo(D_802DF524)($at)
 /* E07A50 802426F0 0C00E219 */  jal       create_standard_npc
 /* E07A54 802426F4 27A40010 */   addiu    $a0, $sp, 0x10
 /* E07A58 802426F8 0C00E2B7 */  jal       get_npc_by_index
diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_80242754_E07AB4.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_80242754_E07AB4.s
index dacab1c174..0c7b2eca76 100644
--- a/asm/nonmatchings/world/area_end/end_01/E05390/func_80242754_E07AB4.s
+++ b/asm/nonmatchings/world/area_end/end_01/E05390/func_80242754_E07AB4.s
@@ -11,8 +11,8 @@ glabel func_80242754_E07AB4
 /* E07ACC 8024276C 8E050000 */  lw        $a1, ($s0)
 /* E07AD0 80242770 0C0B1EAF */  jal       get_variable
 /* E07AD4 80242774 26100004 */   addiu    $s0, $s0, 4
-/* E07AD8 80242778 3C048035 */  lui       $a0, 0x8035
-/* E07ADC 8024277C 2484F800 */  addiu     $a0, $a0, -0x800
+/* E07AD8 80242778 3C048035 */  lui       $a0, %hi(D_8034F800)
+/* E07ADC 8024277C 2484F800 */  addiu     $a0, $a0, %lo(D_8034F800)
 /* E07AE0 80242780 8E100000 */  lw        $s0, ($s0)
 /* E07AE4 80242784 0C00A41B */  jal       _heap_malloc
 /* E07AE8 80242788 0040282D */   daddu    $a1, $v0, $zero
diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_802427B4_E07B14.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_802427B4_E07B14.s
index 8789b2cce8..2b90efa194 100644
--- a/asm/nonmatchings/world/area_end/end_01/E05390/func_802427B4_E07B14.s
+++ b/asm/nonmatchings/world/area_end/end_01/E05390/func_802427B4_E07B14.s
@@ -7,8 +7,8 @@ glabel func_802427B4_E07B14
 /* E07B1C 802427BC 8C82000C */  lw        $v0, 0xc($a0)
 /* E07B20 802427C0 0C0B1EAF */  jal       get_variable
 /* E07B24 802427C4 8C450000 */   lw       $a1, ($v0)
-/* E07B28 802427C8 3C048035 */  lui       $a0, 0x8035
-/* E07B2C 802427CC 2484F800 */  addiu     $a0, $a0, -0x800
+/* E07B28 802427C8 3C048035 */  lui       $a0, %hi(D_8034F800)
+/* E07B2C 802427CC 2484F800 */  addiu     $a0, $a0, %lo(D_8034F800)
 /* E07B30 802427D0 0C00A487 */  jal       _heap_free
 /* E07B34 802427D4 0040282D */   daddu    $a1, $v0, $zero
 /* E07B38 802427D8 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_end/end_01/E07C20/func_80242C68_E07FC8.s b/asm/nonmatchings/world/area_end/end_01/E07C20/func_80242C68_E07FC8.s
index cc8a7a58d1..7b68c9a0fe 100644
--- a/asm/nonmatchings/world/area_end/end_01/E07C20/func_80242C68_E07FC8.s
+++ b/asm/nonmatchings/world/area_end/end_01/E07C20/func_80242C68_E07FC8.s
@@ -8,8 +8,8 @@ glabel func_80242C68_E07FC8
 /* E07FD4 80242C74 0C0B1EAF */  jal       get_variable
 /* E07FD8 80242C78 8C450000 */   lw       $a1, ($v0)
 /* E07FDC 80242C7C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* E07FE0 80242C80 3C018024 */  lui       $at, 0x8024
-/* E07FE4 80242C84 AC225D34 */  sw        $v0, 0x5d34($at)
+/* E07FE0 80242C80 3C018024 */  lui       $at, %hi(D_80245D34)
+/* E07FE4 80242C84 AC225D34 */  sw        $v0, %lo(D_80245D34)($at)
 /* E07FE8 80242C88 24020002 */  addiu     $v0, $zero, 2
 /* E07FEC 80242C8C 03E00008 */  jr        $ra
 /* E07FF0 80242C90 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_end/end_01/E07C20/func_80242C94_E07FF4.s b/asm/nonmatchings/world/area_end/end_01/E07C20/func_80242C94_E07FF4.s
index b21718ceab..33405160a8 100644
--- a/asm/nonmatchings/world/area_end/end_01/E07C20/func_80242C94_E07FF4.s
+++ b/asm/nonmatchings/world/area_end/end_01/E07C20/func_80242C94_E07FF4.s
@@ -5,8 +5,8 @@ glabel func_80242C94_E07FF4
 /* E07FF4 80242C94 3C06FC12 */  lui       $a2, 0xfc12
 /* E07FF8 80242C98 34C64624 */  ori       $a2, $a2, 0x4624
 /* E07FFC 80242C9C 3C05FF8F */  lui       $a1, 0xff8f
-/* E08000 80242CA0 3C04800A */  lui       $a0, 0x800a
-/* E08004 80242CA4 2484A66C */  addiu     $a0, $a0, -0x5994
+/* E08000 80242CA0 3C04800A */  lui       $a0, %hi(D_8009A66C)
+/* E08004 80242CA4 2484A66C */  addiu     $a0, $a0, %lo(D_8009A66C)
 /* E08008 80242CA8 8C820000 */  lw        $v0, ($a0)
 /* E0800C 80242CAC 34A5FFFF */  ori       $a1, $a1, 0xffff
 /* E08010 80242CB0 0040182D */  daddu     $v1, $v0, $zero
@@ -16,8 +16,8 @@ glabel func_80242C94_E07FF4
 /* E08020 80242CC0 AC650004 */  sw        $a1, 4($v1)
 /* E08024 80242CC4 24430008 */  addiu     $v1, $v0, 8
 /* E08028 80242CC8 AC830000 */  sw        $v1, ($a0)
-/* E0802C 80242CCC 3C048024 */  lui       $a0, 0x8024
-/* E08030 80242CD0 90845D37 */  lbu       $a0, 0x5d37($a0)
+/* E0802C 80242CCC 3C048024 */  lui       $a0, %hi(D_80245D37)
+/* E08030 80242CD0 90845D37 */  lbu       $a0, %lo(D_80245D37)($a0)
 /* E08034 80242CD4 3C03FA00 */  lui       $v1, 0xfa00
 /* E08038 80242CD8 AC430000 */  sw        $v1, ($v0)
 /* E0803C 80242CDC 03E00008 */  jr        $ra
diff --git a/asm/nonmatchings/world/area_end/end_01/E08050/func_80242CF0_E08050.s b/asm/nonmatchings/world/area_end/end_01/E08050/func_80242CF0_E08050.s
index 5540e10cf3..459f4ed9b6 100644
--- a/asm/nonmatchings/world/area_end/end_01/E08050/func_80242CF0_E08050.s
+++ b/asm/nonmatchings/world/area_end/end_01/E08050/func_80242CF0_E08050.s
@@ -71,8 +71,8 @@ glabel func_80242CF0_E08050
 /* E08144 80242DE4 08090B71 */  j         .L80242DC4
 /* E08148 80242DE8 00000000 */   nop      
 .L80242DEC:
-/* E0814C 80242DEC 3C028015 */  lui       $v0, 0x8015
-/* E08150 80242DF0 8C4212F0 */  lw        $v0, 0x12f0($v0)
+/* E0814C 80242DEC 3C028015 */  lui       $v0, %hi(D_801512F0)
+/* E08150 80242DF0 8C4212F0 */  lw        $v0, %lo(D_801512F0)($v0)
 /* E08154 80242DF4 A0510000 */  sb        $s1, ($v0)
 .L80242DF8:
 /* E08158 80242DF8 24020002 */  addiu     $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240040_C9DF60.s b/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240040_C9DF60.s
index 4f93c5a0b9..7ee55a7644 100644
--- a/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240040_C9DF60.s
+++ b/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240040_C9DF60.s
@@ -69,8 +69,8 @@ glabel func_80240040_C9DF60
 /* C9E054 80240134 08090057 */  j         .L8024015C
 /* C9E058 80240138 E6800018 */   swc1     $f0, 0x18($s4)
 .L8024013C:
-/* C9E05C 8024013C 3C018025 */  lui       $at, 0x8025
-/* C9E060 80240140 D42291C0 */  ldc1      $f2, -0x6e40($at)
+/* C9E05C 8024013C 3C018025 */  lui       $at, %hi(D_802491C0)
+/* C9E060 80240140 D42291C0 */  ldc1      $f2, %lo(D_802491C0)($at)
 /* C9E064 80240144 44820000 */  mtc1      $v0, $f0
 /* C9E068 80240148 00000000 */  nop       
 /* C9E06C 8024014C 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_802406BC_C9E5DC.s b/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_802406BC_C9E5DC.s
index 45b2e9d2a2..e024a3f76a 100644
--- a/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_802406BC_C9E5DC.s
+++ b/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_802406BC_C9E5DC.s
@@ -33,8 +33,8 @@ glabel func_802406BC_C9E5DC
 /* C9E648 80240728 080901D4 */  j         .L80240750
 /* C9E64C 8024072C E4A00018 */   swc1     $f0, 0x18($a1)
 .L80240730:
-/* C9E650 80240730 3C018025 */  lui       $at, 0x8025
-/* C9E654 80240734 D42291C8 */  ldc1      $f2, -0x6e38($at)
+/* C9E650 80240730 3C018025 */  lui       $at, %hi(D_802491C8)
+/* C9E654 80240734 D42291C8 */  ldc1      $f2, %lo(D_802491C8)($at)
 /* C9E658 80240738 44820000 */  mtc1      $v0, $f0
 /* C9E65C 8024073C 00000000 */  nop       
 /* C9E660 80240740 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240BD4_C9EAF4.s b/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240BD4_C9EAF4.s
index f5ee25f370..16f1f0b319 100644
--- a/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240BD4_C9EAF4.s
+++ b/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240BD4_C9EAF4.s
@@ -124,9 +124,9 @@ glabel func_80240BD4_C9EAF4
 /* C9ECB8 80240D98 2C620064 */  sltiu     $v0, $v1, 0x64
 /* C9ECBC 80240D9C 10400042 */  beqz      $v0, .L80240EA8
 /* C9ECC0 80240DA0 00031080 */   sll      $v0, $v1, 2
-/* C9ECC4 80240DA4 3C018025 */  lui       $at, 0x8025
+/* C9ECC4 80240DA4 3C018025 */  lui       $at, %hi(D_802491D0)
 /* C9ECC8 80240DA8 00220821 */  addu      $at, $at, $v0
-/* C9ECCC 80240DAC 8C2291D0 */  lw        $v0, -0x6e30($at)
+/* C9ECCC 80240DAC 8C2291D0 */  lw        $v0, %lo(D_802491D0)($at)
 /* C9ECD0 80240DB0 00400008 */  jr        $v0
 /* C9ECD4 80240DB4 00000000 */   nop      
 /* C9ECD8 80240DB8 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_flo/flo_03/CA72E0/func_80240040_CA72E0.s b/asm/nonmatchings/world/area_flo/flo_03/CA72E0/func_80240040_CA72E0.s
index 7141302d04..2c0a5ac9da 100644
--- a/asm/nonmatchings/world/area_flo/flo_03/CA72E0/func_80240040_CA72E0.s
+++ b/asm/nonmatchings/world/area_flo/flo_03/CA72E0/func_80240040_CA72E0.s
@@ -4,8 +4,8 @@
 glabel func_80240040_CA72E0
 /* CA72E0 80240040 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* CA72E4 80240044 AFB00010 */  sw        $s0, 0x10($sp)
-/* CA72E8 80240048 3C108024 */  lui       $s0, 0x8024
-/* CA72EC 8024004C 26100F08 */  addiu     $s0, $s0, 0xf08
+/* CA72E8 80240048 3C108024 */  lui       $s0, %hi(D_80240F08)
+/* CA72EC 8024004C 26100F08 */  addiu     $s0, $s0, %lo(D_80240F08)
 /* CA72F0 80240050 AFBF0018 */  sw        $ra, 0x18($sp)
 /* CA72F4 80240054 AFB10014 */  sw        $s1, 0x14($sp)
 /* CA72F8 80240058 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_80240040_CA72E0
 /* CA735C 802400BC 28620010 */  slti      $v0, $v1, 0x10
 /* CA7360 802400C0 1440FFFA */  bnez      $v0, .L802400AC
 /* CA7364 802400C4 24840004 */   addiu    $a0, $a0, 4
-/* CA7368 802400C8 3C108024 */  lui       $s0, 0x8024
-/* CA736C 802400CC 26100F08 */  addiu     $s0, $s0, 0xf08
+/* CA7368 802400C8 3C108024 */  lui       $s0, %hi(D_80240F08)
+/* CA736C 802400CC 26100F08 */  addiu     $s0, $s0, %lo(D_80240F08)
 /* CA7370 802400D0 0C00AB4B */  jal       heap_free
 /* CA7374 802400D4 8E040000 */   lw       $a0, ($s0)
 /* CA7378 802400D8 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_flo/flo_03/CA72E0/func_80240158_CA73F8.s b/asm/nonmatchings/world/area_flo/flo_03/CA72E0/func_80240158_CA73F8.s
index 0ce770d2a9..d6537ff607 100644
--- a/asm/nonmatchings/world/area_flo/flo_03/CA72E0/func_80240158_CA73F8.s
+++ b/asm/nonmatchings/world/area_flo/flo_03/CA72E0/func_80240158_CA73F8.s
@@ -138,8 +138,8 @@ glabel func_80240158_CA73F8
 /* CA75F4 80240354 080900F2 */  j         .L802403C8
 /* CA75F8 80240358 00000000 */   nop      
 .L8024035C:
-/* CA75FC 8024035C 3C018024 */  lui       $at, 0x8024
-/* CA7600 80240360 D4204F48 */  ldc1      $f0, 0x4f48($at)
+/* CA75FC 8024035C 3C018024 */  lui       $at, %hi(D_80244F48)
+/* CA7600 80240360 D4204F48 */  ldc1      $f0, %lo(D_80244F48)($at)
 /* CA7604 80240364 4624003C */  c.lt.d    $f0, $f4
 /* CA7608 80240368 00000000 */  nop       
 /* CA760C 8024036C 4500000F */  bc1f      .L802403AC
diff --git a/asm/nonmatchings/world/area_flo/flo_07/CAC5D0/func_8024061C_CAC80C.s b/asm/nonmatchings/world/area_flo/flo_07/CAC5D0/func_8024061C_CAC80C.s
index 62829aff0a..868b5a3359 100644
--- a/asm/nonmatchings/world/area_flo/flo_07/CAC5D0/func_8024061C_CAC80C.s
+++ b/asm/nonmatchings/world/area_flo/flo_07/CAC5D0/func_8024061C_CAC80C.s
@@ -4,8 +4,8 @@
 glabel func_8024061C_CAC80C
 /* CAC80C 8024061C 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* CAC810 80240620 AFB00010 */  sw        $s0, 0x10($sp)
-/* CAC814 80240624 3C108024 */  lui       $s0, 0x8024
-/* CAC818 80240628 26101BB0 */  addiu     $s0, $s0, 0x1bb0
+/* CAC814 80240624 3C108024 */  lui       $s0, %hi(D_80241BB0)
+/* CAC818 80240628 26101BB0 */  addiu     $s0, $s0, %lo(D_80241BB0)
 /* CAC81C 8024062C AFBF0018 */  sw        $ra, 0x18($sp)
 /* CAC820 80240630 AFB10014 */  sw        $s1, 0x14($sp)
 /* CAC824 80240634 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_8024061C_CAC80C
 /* CAC888 80240698 28620010 */  slti      $v0, $v1, 0x10
 /* CAC88C 8024069C 1440FFFA */  bnez      $v0, .L80240688
 /* CAC890 802406A0 24840004 */   addiu    $a0, $a0, 4
-/* CAC894 802406A4 3C108024 */  lui       $s0, 0x8024
-/* CAC898 802406A8 26101BB0 */  addiu     $s0, $s0, 0x1bb0
+/* CAC894 802406A4 3C108024 */  lui       $s0, %hi(D_80241BB0)
+/* CAC898 802406A8 26101BB0 */  addiu     $s0, $s0, %lo(D_80241BB0)
 /* CAC89C 802406AC 0C00AB4B */  jal       heap_free
 /* CAC8A0 802406B0 8E040000 */   lw       $a0, ($s0)
 /* CAC8A4 802406B4 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_802401CC_CAEF0C.s b/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_802401CC_CAEF0C.s
index 33bf54de18..ae764ce68b 100644
--- a/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_802401CC_CAEF0C.s
+++ b/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_802401CC_CAEF0C.s
@@ -22,12 +22,12 @@ glabel func_802401CC_CAEF0C
 /* CAEF50 80240210 0040982D */  daddu     $s3, $v0, $zero
 /* CAEF54 80240214 0000B02D */  daddu     $s6, $zero, $zero
 /* CAEF58 80240218 02C0902D */  daddu     $s2, $s6, $zero
-/* CAEF5C 8024021C 3C148024 */  lui       $s4, 0x8024
-/* CAEF60 80240220 26941FB8 */  addiu     $s4, $s4, 0x1fb8
+/* CAEF5C 8024021C 3C148024 */  lui       $s4, %hi(D_80241FB8)
+/* CAEF60 80240220 26941FB8 */  addiu     $s4, $s4, %lo(D_80241FB8)
 /* CAEF64 80240224 0260882D */  daddu     $s1, $s3, $zero
 /* CAEF68 80240228 8EA200B4 */  lw        $v0, 0xb4($s5)
-/* CAEF6C 8024022C 3C038024 */  lui       $v1, 0x8024
-/* CAEF70 80240230 24631FB0 */  addiu     $v1, $v1, 0x1fb0
+/* CAEF6C 8024022C 3C038024 */  lui       $v1, %hi(D_80241FB0)
+/* CAEF70 80240230 24631FB0 */  addiu     $v1, $v1, %lo(D_80241FB0)
 /* CAEF74 80240234 AEB30078 */  sw        $s3, 0x78($s5)
 /* CAEF78 80240238 00021027 */  nor       $v0, $zero, $v0
 /* CAEF7C 8024023C 0002BFC2 */  srl       $s7, $v0, 0x1f
@@ -42,8 +42,8 @@ glabel func_802401CC_CAEF0C
 /* CAEF9C 8024025C 5040002E */  beql      $v0, $zero, .L80240318
 /* CAEFA0 80240260 26520001 */   addiu    $s2, $s2, 1
 /* CAEFA4 80240264 00101100 */  sll       $v0, $s0, 4
-/* CAEFA8 80240268 3C068009 */  lui       $a2, 0x8009
-/* CAEFAC 8024026C 24C6EF20 */  addiu     $a2, $a2, -0x10e0
+/* CAEFA8 80240268 3C068009 */  lui       $a2, %hi(D_8008EF20)
+/* CAEFAC 8024026C 24C6EF20 */  addiu     $a2, $a2, %lo(D_8008EF20)
 /* CAEFB0 80240270 00461021 */  addu      $v0, $v0, $a2
 /* CAEFB4 80240274 0200202D */  daddu     $a0, $s0, $zero
 /* CAEFB8 80240278 AE300108 */  sw        $s0, 0x108($s1)
@@ -54,15 +54,15 @@ glabel func_802401CC_CAEF0C
 /* CAEFCC 8024028C 0040202D */  daddu     $a0, $v0, $zero
 /* CAEFD0 80240290 04800011 */  bltz      $a0, .L802402D8
 /* CAEFD4 80240294 00101080 */   sll      $v0, $s0, 2
-/* CAEFD8 80240298 3C06800F */  lui       $a2, 0x800f
-/* CAEFDC 8024029C 24C67F00 */  addiu     $a2, $a2, 0x7f00
+/* CAEFD8 80240298 3C06800F */  lui       $a2, %hi(D_800F7F00)
+/* CAEFDC 8024029C 24C67F00 */  addiu     $a2, $a2, %lo(D_800F7F00)
 /* CAEFE0 802402A0 00461021 */  addu      $v0, $v0, $a2
 /* CAEFE4 802402A4 8C430000 */  lw        $v1, ($v0)
 /* CAEFE8 802402A8 24020001 */  addiu     $v0, $zero, 1
 /* CAEFEC 802402AC AE22018C */  sw        $v0, 0x18c($s1)
 /* CAEFF0 802402B0 00041080 */  sll       $v0, $a0, 2
-/* CAEFF4 802402B4 3C068024 */  lui       $a2, 0x8024
-/* CAEFF8 802402B8 24C61FC8 */  addiu     $a2, $a2, 0x1fc8
+/* CAEFF4 802402B4 3C068024 */  lui       $a2, %hi(D_80241FC8)
+/* CAEFF8 802402B8 24C61FC8 */  addiu     $a2, $a2, %lo(D_80241FC8)
 /* CAEFFC 802402BC AE230000 */  sw        $v1, ($s1)
 /* CAF000 802402C0 001218C0 */  sll       $v1, $s2, 3
 /* CAF004 802402C4 00431021 */  addu      $v0, $v0, $v1
@@ -71,8 +71,8 @@ glabel func_802401CC_CAEF0C
 /* CAF010 802402D0 080900BF */  j         .L802402FC
 /* CAF014 802402D4 AE220294 */   sw       $v0, 0x294($s1)
 .L802402D8:
-/* CAF018 802402D8 3C06800F */  lui       $a2, 0x800f
-/* CAF01C 802402DC 24C67F40 */  addiu     $a2, $a2, 0x7f40
+/* CAF018 802402D8 3C06800F */  lui       $a2, %hi(D_800F7F40)
+/* CAF01C 802402DC 24C67F40 */  addiu     $a2, $a2, %lo(D_800F7F40)
 /* CAF020 802402E0 00461021 */  addu      $v0, $v0, $a2
 /* CAF024 802402E4 8C420000 */  lw        $v0, ($v0)
 /* CAF028 802402E8 AE20018C */  sw        $zero, 0x18c($s1)
@@ -130,9 +130,9 @@ glabel func_802401CC_CAEF0C
 /* CAF0E0 802403A0 02621021 */  addu      $v0, $s3, $v0
 /* CAF0E4 802403A4 8C420108 */  lw        $v0, 0x108($v0)
 /* CAF0E8 802403A8 00021100 */  sll       $v0, $v0, 4
-/* CAF0EC 802403AC 3C038009 */  lui       $v1, 0x8009
+/* CAF0EC 802403AC 3C038009 */  lui       $v1, %hi(D_8008EF20)
 /* CAF0F0 802403B0 00621821 */  addu      $v1, $v1, $v0
-/* CAF0F4 802403B4 8C63EF20 */  lw        $v1, -0x10e0($v1)
+/* CAF0F4 802403B4 8C63EF20 */  lw        $v1, %lo(D_8008EF20)($v1)
 /* CAF0F8 802403B8 8EA20074 */  lw        $v0, 0x74($s5)
 /* CAF0FC 802403BC 2442FFFF */  addiu     $v0, $v0, -1
 /* CAF100 802403C0 00021080 */  sll       $v0, $v0, 2
diff --git a/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240448_CAF188.s b/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240448_CAF188.s
index a19c129a53..1eba109901 100644
--- a/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240448_CAF188.s
+++ b/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240448_CAF188.s
@@ -7,9 +7,9 @@ glabel func_80240448_CAF188
 /* CAF190 80240450 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* CAF194 80240454 AFBF0010 */  sw        $ra, 0x10($sp)
 /* CAF198 80240458 00021100 */  sll       $v0, $v0, 4
-/* CAF19C 8024045C 3C048009 */  lui       $a0, 0x8009
+/* CAF19C 8024045C 3C048009 */  lui       $a0, %hi(D_8008EF20)
 /* CAF1A0 80240460 00822021 */  addu      $a0, $a0, $v0
-/* CAF1A4 80240464 8C84EF20 */  lw        $a0, -0x10e0($a0)
+/* CAF1A4 80240464 8C84EF20 */  lw        $a0, %lo(D_8008EF20)($a0)
 /* CAF1A8 80240468 0C0496CF */  jal       set_message_string
 /* CAF1AC 8024046C 0000282D */   daddu    $a1, $zero, $zero
 /* CAF1B0 80240470 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240600_CAF340.s b/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240600_CAF340.s
index b0fe73e0a5..20e8c55110 100644
--- a/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240600_CAF340.s
+++ b/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240600_CAF340.s
@@ -30,9 +30,9 @@ glabel func_80240600_CAF340
 /* CAF3A4 80240664 000320C0 */  sll       $a0, $v1, 3
 /* CAF3A8 80240668 00641821 */  addu      $v1, $v1, $a0
 /* CAF3AC 8024066C 000318C0 */  sll       $v1, $v1, 3
-/* CAF3B0 80240670 3C01800B */  lui       $at, 0x800b
+/* CAF3B0 80240670 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* CAF3B4 80240674 00230821 */  addu      $at, $at, $v1
-/* CAF3B8 80240678 C42C1DEC */  lwc1      $f12, 0x1dec($at)
+/* CAF3B8 80240678 C42C1DEC */  lwc1      $f12, %lo(D_800B1DEC)($at)
 /* CAF3BC 8024067C 0C00A88D */  jal       sin_cos_deg
 /* CAF3C0 80240680 0040A82D */   daddu    $s5, $v0, $zero
 /* CAF3C4 80240684 1200005D */  beqz      $s0, .L802407FC
@@ -79,8 +79,8 @@ glabel func_80240600_CAF340
 /* CAF464 80240724 26100004 */   addiu    $s0, $s0, 4
 /* CAF468 80240728 0000882D */  daddu     $s1, $zero, $zero
 /* CAF46C 8024072C 0240802D */  daddu     $s0, $s2, $zero
-/* CAF470 80240730 3C148024 */  lui       $s4, 0x8024
-/* CAF474 80240734 26942008 */  addiu     $s4, $s4, 0x2008
+/* CAF470 80240730 3C148024 */  lui       $s4, %hi(D_80242008)
+/* CAF474 80240734 26942008 */  addiu     $s4, $s4, %lo(D_80242008)
 /* CAF478 80240738 3C014248 */  lui       $at, 0x4248
 /* CAF47C 8024073C 4481A000 */  mtc1      $at, $f20
 /* CAF480 80240740 24130044 */  addiu     $s3, $zero, 0x44
@@ -150,8 +150,8 @@ glabel func_80240600_CAF340
 /* CAF574 80240834 00000000 */   nop      
 .L80240838:
 /* CAF578 80240838 0000882D */  daddu     $s1, $zero, $zero
-/* CAF57C 8024083C 3C148024 */  lui       $s4, 0x8024
-/* CAF580 80240840 26942008 */  addiu     $s4, $s4, 0x2008
+/* CAF57C 8024083C 3C148024 */  lui       $s4, %hi(D_80242008)
+/* CAF580 80240840 26942008 */  addiu     $s4, $s4, %lo(D_80242008)
 /* CAF584 80240844 24130020 */  addiu     $s3, $zero, 0x20
 /* CAF588 80240848 3C064248 */  lui       $a2, 0x4248
 /* CAF58C 8024084C 44800000 */  mtc1      $zero, $f0
@@ -197,8 +197,8 @@ glabel func_80240600_CAF340
 /* CAF628 802408E8 AE400060 */   sw       $zero, 0x60($s2)
 .L802408EC:
 /* CAF62C 802408EC 0000882D */  daddu     $s1, $zero, $zero
-/* CAF630 802408F0 3C148024 */  lui       $s4, 0x8024
-/* CAF634 802408F4 26942008 */  addiu     $s4, $s4, 0x2008
+/* CAF630 802408F0 3C148024 */  lui       $s4, %hi(D_80242008)
+/* CAF634 802408F4 26942008 */  addiu     $s4, $s4, %lo(D_80242008)
 /* CAF638 802408F8 24130020 */  addiu     $s3, $zero, 0x20
 /* CAF63C 802408FC 0240802D */  daddu     $s0, $s2, $zero
 /* CAF640 80240900 3C014248 */  lui       $at, 0x4248
diff --git a/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_8024150C_CB024C.s b/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_8024150C_CB024C.s
index 33328bd759..f92537a01e 100644
--- a/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_8024150C_CB024C.s
+++ b/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_8024150C_CB024C.s
@@ -85,9 +85,9 @@ glabel func_8024150C_CB024C
 /* CB037C 8024163C 2C620064 */  sltiu     $v0, $v1, 0x64
 /* CB0380 80241640 10400036 */  beqz      $v0, .L8024171C
 /* CB0384 80241644 00031080 */   sll      $v0, $v1, 2
-/* CB0388 80241648 3C018024 */  lui       $at, 0x8024
+/* CB0388 80241648 3C018024 */  lui       $at, %hi(D_80246130)
 /* CB038C 8024164C 00220821 */  addu      $at, $at, $v0
-/* CB0390 80241650 8C226130 */  lw        $v0, 0x6130($at)
+/* CB0390 80241650 8C226130 */  lw        $v0, %lo(D_80246130)($at)
 /* CB0394 80241654 00400008 */  jr        $v0
 /* CB0398 80241658 00000000 */   nop      
 /* CB039C 8024165C 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_80241970_CB06B0.s b/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_80241970_CB06B0.s
index 9671bfc811..344bf34ef0 100644
--- a/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_80241970_CB06B0.s
+++ b/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_80241970_CB06B0.s
@@ -6,11 +6,11 @@ glabel func_80241970_CB06B0
 /* CB06B4 80241974 AFBF0010 */  sw        $ra, 0x10($sp)
 /* CB06B8 80241978 10A00003 */  beqz      $a1, .L80241988
 /* CB06BC 8024197C 8C86000C */   lw       $a2, 0xc($a0)
-/* CB06C0 80241980 3C018024 */  lui       $at, 0x8024
-/* CB06C4 80241984 AC203088 */  sw        $zero, 0x3088($at)
+/* CB06C0 80241980 3C018024 */  lui       $at, %hi(D_80243088)
+/* CB06C4 80241984 AC203088 */  sw        $zero, %lo(D_80243088)($at)
 .L80241988:
-/* CB06C8 80241988 3C038024 */  lui       $v1, 0x8024
-/* CB06CC 8024198C 24633088 */  addiu     $v1, $v1, 0x3088
+/* CB06C8 80241988 3C038024 */  lui       $v1, %hi(D_80243088)
+/* CB06CC 8024198C 24633088 */  addiu     $v1, $v1, %lo(D_80243088)
 /* CB06D0 80241990 8C620000 */  lw        $v0, ($v1)
 /* CB06D4 80241994 54400003 */  bnel      $v0, $zero, .L802419A4
 /* CB06D8 80241998 AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_80241970_CB06B0
 /* CB06E0 802419A0 0000102D */   daddu    $v0, $zero, $zero
 .L802419A4:
 /* CB06E4 802419A4 8CC50000 */  lw        $a1, ($a2)
-/* CB06E8 802419A8 3C068024 */  lui       $a2, 0x8024
+/* CB06E8 802419A8 3C068024 */  lui       $a2, %hi(D_8024308C)
 /* CB06EC 802419AC 0C0B2026 */  jal       set_variable
-/* CB06F0 802419B0 8CC6308C */   lw       $a2, 0x308c($a2)
+/* CB06F0 802419B0 8CC6308C */   lw       $a2, %lo(D_8024308C)($a2)
 /* CB06F4 802419B4 24020002 */  addiu     $v0, $zero, 2
 .L802419B8:
 /* CB06F8 802419B8 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_802419C4_CB0704.s b/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_802419C4_CB0704.s
index 835e5021c3..4acb4408d9 100644
--- a/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_802419C4_CB0704.s
+++ b/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_802419C4_CB0704.s
@@ -7,12 +7,12 @@ glabel func_802419C4_CB0704
 /* CB070C 802419CC 8C82000C */  lw        $v0, 0xc($a0)
 /* CB0710 802419D0 0C0B1EAF */  jal       get_variable
 /* CB0714 802419D4 8C450000 */   lw       $a1, ($v0)
-/* CB0718 802419D8 3C018024 */  lui       $at, 0x8024
-/* CB071C 802419DC AC22308C */  sw        $v0, 0x308c($at)
+/* CB0718 802419D8 3C018024 */  lui       $at, %hi(D_8024308C)
+/* CB071C 802419DC AC22308C */  sw        $v0, %lo(D_8024308C)($at)
 /* CB0720 802419E0 24020002 */  addiu     $v0, $zero, 2
 /* CB0724 802419E4 8FBF0010 */  lw        $ra, 0x10($sp)
 /* CB0728 802419E8 24030001 */  addiu     $v1, $zero, 1
-/* CB072C 802419EC 3C018024 */  lui       $at, 0x8024
-/* CB0730 802419F0 AC233088 */  sw        $v1, 0x3088($at)
+/* CB072C 802419EC 3C018024 */  lui       $at, %hi(D_80243088)
+/* CB0730 802419F0 AC233088 */  sw        $v1, %lo(D_80243088)($at)
 /* CB0734 802419F4 03E00008 */  jr        $ra
 /* CB0738 802419F8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_802419FC_CB073C.s b/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_802419FC_CB073C.s
index e4154284e0..3f5cf9020e 100644
--- a/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_802419FC_CB073C.s
+++ b/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_802419FC_CB073C.s
@@ -13,8 +13,8 @@ glabel func_802419FC_CB073C
 /* CB075C 80241A1C 8C620000 */  lw        $v0, ($v1)
 /* CB0760 80241A20 5040000A */  beql      $v0, $zero, .L80241A4C
 /* CB0764 80241A24 00041080 */   sll      $v0, $a0, 2
-/* CB0768 80241A28 3C058024 */  lui       $a1, 0x8024
-/* CB076C 80241A2C 24A562C0 */  addiu     $a1, $a1, 0x62c0
+/* CB0768 80241A28 3C058024 */  lui       $a1, %hi(D_802462C0)
+/* CB076C 80241A2C 24A562C0 */  addiu     $a1, $a1, %lo(D_802462C0)
 .L80241A30:
 /* CB0770 80241A30 24630004 */  addiu     $v1, $v1, 4
 /* CB0774 80241A34 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_802419FC_CB073C
 /* CB0784 80241A44 24A50004 */   addiu    $a1, $a1, 4
 /* CB0788 80241A48 00041080 */  sll       $v0, $a0, 2
 .L80241A4C:
-/* CB078C 80241A4C 3C018024 */  lui       $at, 0x8024
+/* CB078C 80241A4C 3C018024 */  lui       $at, %hi(D_802462C0)
 /* CB0790 80241A50 00220821 */  addu      $at, $at, $v0
-/* CB0794 80241A54 AC2062C0 */  sw        $zero, 0x62c0($at)
+/* CB0794 80241A54 AC2062C0 */  sw        $zero, %lo(D_802462C0)($at)
 /* CB0798 80241A58 080906A2 */  j         .L80241A88
 /* CB079C 80241A5C 00000000 */   nop      
 .L80241A60:
-/* CB07A0 80241A60 3C038024 */  lui       $v1, 0x8024
-/* CB07A4 80241A64 246362C0 */  addiu     $v1, $v1, 0x62c0
+/* CB07A0 80241A60 3C038024 */  lui       $v1, %hi(D_802462C0)
+/* CB07A4 80241A64 246362C0 */  addiu     $v1, $v1, %lo(D_802462C0)
 /* CB07A8 80241A68 0060282D */  daddu     $a1, $v1, $zero
 .L80241A6C:
 /* CB07AC 80241A6C 24820080 */  addiu     $v0, $a0, 0x80
diff --git a/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_80241BCC_CB090C.s b/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_80241BCC_CB090C.s
index 83b34842a4..60e48d00fa 100644
--- a/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_80241BCC_CB090C.s
+++ b/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_80241BCC_CB090C.s
@@ -3,8 +3,8 @@
 
 glabel func_80241BCC_CB090C
 /* CB090C 80241BCC 2404005A */  addiu     $a0, $zero, 0x5a
-/* CB0910 80241BD0 3C038024 */  lui       $v1, 0x8024
-/* CB0914 80241BD4 24636598 */  addiu     $v1, $v1, 0x6598
+/* CB0910 80241BD0 3C038024 */  lui       $v1, %hi(D_80246598)
+/* CB0914 80241BD4 24636598 */  addiu     $v1, $v1, %lo(D_80246598)
 /* CB0918 80241BD8 240200DA */  addiu     $v0, $zero, 0xda
 .L80241BDC:
 /* CB091C 80241BDC AC620000 */  sw        $v0, ($v1)
@@ -12,7 +12,7 @@ glabel func_80241BCC_CB090C
 /* CB0924 80241BE4 2484FFFF */  addiu     $a0, $a0, -1
 /* CB0928 80241BE8 0481FFFC */  bgez      $a0, .L80241BDC
 /* CB092C 80241BEC 2442FFFF */   addiu    $v0, $v0, -1
-/* CB0930 80241BF0 3C018024 */  lui       $at, 0x8024
-/* CB0934 80241BF4 AC20659C */  sw        $zero, 0x659c($at)
+/* CB0930 80241BF0 3C018024 */  lui       $at, %hi(D_8024659C)
+/* CB0934 80241BF4 AC20659C */  sw        $zero, %lo(D_8024659C)($at)
 /* CB0938 80241BF8 03E00008 */  jr        $ra
 /* CB093C 80241BFC 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80240320_CB5320.s b/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80240320_CB5320.s
index 51a02ad115..755714ecf8 100644
--- a/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80240320_CB5320.s
+++ b/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80240320_CB5320.s
@@ -87,8 +87,8 @@ glabel func_80240320_CB5320
 /* CB5460 80240460 08090122 */  j         .L80240488
 /* CB5464 80240464 E6000018 */   swc1     $f0, 0x18($s0)
 .L80240468:
-/* CB5468 80240468 3C018024 */  lui       $at, 0x8024
-/* CB546C 8024046C D42241A0 */  ldc1      $f2, 0x41a0($at)
+/* CB5468 80240468 3C018024 */  lui       $at, %hi(D_802441A0)
+/* CB546C 8024046C D42241A0 */  ldc1      $f2, %lo(D_802441A0)($at)
 /* CB5470 80240470 44820000 */  mtc1      $v0, $f0
 /* CB5474 80240474 00000000 */  nop       
 /* CB5478 80240478 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_802404D0_CB54D0.s b/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_802404D0_CB54D0.s
index fcc14bafa7..e082458ba2 100644
--- a/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_802404D0_CB54D0.s
+++ b/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_802404D0_CB54D0.s
@@ -104,8 +104,8 @@ glabel func_802404D0_CB54D0
 /* CB5654 80240654 1040000A */  beqz      $v0, .L80240680
 /* CB5658 80240658 4600C106 */   mov.s    $f4, $f24
 /* CB565C 8024065C 4614C081 */  sub.s     $f2, $f24, $f20
-/* CB5660 80240660 3C018024 */  lui       $at, 0x8024
-/* CB5664 80240664 D42041A8 */  ldc1      $f0, 0x41a8($at)
+/* CB5660 80240660 3C018024 */  lui       $at, %hi(D_802441A8)
+/* CB5664 80240664 D42041A8 */  ldc1      $f0, %lo(D_802441A8)($at)
 /* CB5668 80240668 460010A1 */  cvt.d.s   $f2, $f2
 /* CB566C 8024066C 46201082 */  mul.d     $f2, $f2, $f0
 /* CB5670 80240670 00000000 */  nop       
@@ -131,8 +131,8 @@ glabel func_802404D0_CB54D0
 /* CB56BC 802406BC C7A4002C */  lwc1      $f4, 0x2c($sp)
 /* CB56C0 802406C0 461A2100 */  add.s     $f4, $f4, $f26
 /* CB56C4 802406C4 46142081 */  sub.s     $f2, $f4, $f20
-/* CB56C8 802406C8 3C018024 */  lui       $at, 0x8024
-/* CB56CC 802406CC D42041B0 */  ldc1      $f0, 0x41b0($at)
+/* CB56C8 802406C8 3C018024 */  lui       $at, %hi(D_802441B0)
+/* CB56CC 802406CC D42041B0 */  ldc1      $f0, %lo(D_802441B0)($at)
 /* CB56D0 802406D0 460010A1 */  cvt.d.s   $f2, $f2
 /* CB56D4 802406D4 46201082 */  mul.d     $f2, $f2, $f0
 /* CB56D8 802406D8 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80240F74_CB5F74.s b/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80240F74_CB5F74.s
index 031db17cdb..e7db2c5bcc 100644
--- a/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80240F74_CB5F74.s
+++ b/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80240F74_CB5F74.s
@@ -15,9 +15,9 @@ glabel func_80240F74_CB5F74
 /* CB5F9C 80240F9C 00031C00 */  sll       $v1, $v1, 0x10
 /* CB5FA0 80240FA0 00031B83 */  sra       $v1, $v1, 0xe
 /* CB5FA4 80240FA4 A444008E */  sh        $a0, 0x8e($v0)
-/* CB5FA8 80240FA8 3C018024 */  lui       $at, 0x8024
+/* CB5FA8 80240FA8 3C018024 */  lui       $at, %hi(D_8024362C)
 /* CB5FAC 80240FAC 00230821 */  addu      $at, $at, $v1
-/* CB5FB0 80240FB0 C422362C */  lwc1      $f2, 0x362c($at)
+/* CB5FB0 80240FB0 C422362C */  lwc1      $f2, %lo(D_8024362C)($at)
 /* CB5FB4 80240FB4 8443008E */  lh        $v1, 0x8e($v0)
 /* CB5FB8 80240FB8 46020000 */  add.s     $f0, $f0, $f2
 /* CB5FBC 80240FBC 28630005 */  slti      $v1, $v1, 5
diff --git a/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_8024162C_CB662C.s b/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_8024162C_CB662C.s
index 4eae08a448..9e62e20c46 100644
--- a/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_8024162C_CB662C.s
+++ b/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_8024162C_CB662C.s
@@ -66,9 +66,9 @@ glabel func_8024162C_CB662C
 /* CB6718 80241718 2C62000F */  sltiu     $v0, $v1, 0xf
 /* CB671C 8024171C 10400034 */  beqz      $v0, .L802417F0
 /* CB6720 80241720 00031080 */   sll      $v0, $v1, 2
-/* CB6724 80241724 3C018024 */  lui       $at, 0x8024
+/* CB6724 80241724 3C018024 */  lui       $at, %hi(D_802441B8)
 /* CB6728 80241728 00220821 */  addu      $at, $at, $v0
-/* CB672C 8024172C 8C2241B8 */  lw        $v0, 0x41b8($at)
+/* CB672C 8024172C 8C2241B8 */  lw        $v0, %lo(D_802441B8)($at)
 /* CB6730 80241730 00400008 */  jr        $v0
 /* CB6734 80241734 00000000 */   nop      
 /* CB6738 80241738 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_flo/flo_10/CB9280/func_80240080_CB9280.s b/asm/nonmatchings/world/area_flo/flo_10/CB9280/func_80240080_CB9280.s
index 51e89066c9..9a936b868e 100644
--- a/asm/nonmatchings/world/area_flo/flo_10/CB9280/func_80240080_CB9280.s
+++ b/asm/nonmatchings/world/area_flo/flo_10/CB9280/func_80240080_CB9280.s
@@ -4,8 +4,8 @@
 glabel func_80240080_CB9280
 /* CB9280 80240080 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* CB9284 80240084 AFB00010 */  sw        $s0, 0x10($sp)
-/* CB9288 80240088 3C108024 */  lui       $s0, 0x8024
-/* CB928C 8024008C 26101CB0 */  addiu     $s0, $s0, 0x1cb0
+/* CB9288 80240088 3C108024 */  lui       $s0, %hi(D_80241CB0)
+/* CB928C 8024008C 26101CB0 */  addiu     $s0, $s0, %lo(D_80241CB0)
 /* CB9290 80240090 AFBF0018 */  sw        $ra, 0x18($sp)
 /* CB9294 80240094 AFB10014 */  sw        $s1, 0x14($sp)
 /* CB9298 80240098 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_80240080_CB9280
 /* CB92FC 802400FC 28620010 */  slti      $v0, $v1, 0x10
 /* CB9300 80240100 1440FFFA */  bnez      $v0, .L802400EC
 /* CB9304 80240104 24840004 */   addiu    $a0, $a0, 4
-/* CB9308 80240108 3C108024 */  lui       $s0, 0x8024
-/* CB930C 8024010C 26101CB0 */  addiu     $s0, $s0, 0x1cb0
+/* CB9308 80240108 3C108024 */  lui       $s0, %hi(D_80241CB0)
+/* CB930C 8024010C 26101CB0 */  addiu     $s0, $s0, %lo(D_80241CB0)
 /* CB9310 80240110 0C00AB4B */  jal       heap_free
 /* CB9314 80240114 8E040000 */   lw       $a0, ($s0)
 /* CB9318 80240118 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_flo/flo_10/CB96B0/func_802404B0_CB96B0.s b/asm/nonmatchings/world/area_flo/flo_10/CB96B0/func_802404B0_CB96B0.s
index f934889cb9..1016a9ee53 100644
--- a/asm/nonmatchings/world/area_flo/flo_10/CB96B0/func_802404B0_CB96B0.s
+++ b/asm/nonmatchings/world/area_flo/flo_10/CB96B0/func_802404B0_CB96B0.s
@@ -5,8 +5,8 @@ glabel func_802404B0_CB96B0
 /* CB96B0 802404B0 27BDFFB0 */  addiu     $sp, $sp, -0x50
 /* CB96B4 802404B4 AFB60040 */  sw        $s6, 0x40($sp)
 /* CB96B8 802404B8 0080B02D */  daddu     $s6, $a0, $zero
-/* CB96BC 802404BC 3C028024 */  lui       $v0, 0x8024
-/* CB96C0 802404C0 24424070 */  addiu     $v0, $v0, 0x4070
+/* CB96BC 802404BC 3C028024 */  lui       $v0, %hi(D_80244070)
+/* CB96C0 802404C0 24424070 */  addiu     $v0, $v0, %lo(D_80244070)
 /* CB96C4 802404C4 AFBF004C */  sw        $ra, 0x4c($sp)
 /* CB96C8 802404C8 AFBE0048 */  sw        $fp, 0x48($sp)
 /* CB96CC 802404CC AFB70044 */  sw        $s7, 0x44($sp)
@@ -90,16 +90,16 @@ glabel func_802404B0_CB96B0
 /* CB97DC 802405DC 004A1021 */  addu      $v0, $v0, $t2
 /* CB97E0 802405E0 AFAA0014 */  sw        $t2, 0x14($sp)
 /* CB97E4 802405E4 AFAA0010 */  sw        $t2, 0x10($sp)
-/* CB97E8 802405E8 3C0A800A */  lui       $t2, 0x800a
-/* CB97EC 802405EC 8D4AA64C */  lw        $t2, -0x59b4($t2)
+/* CB97E8 802405E8 3C0A800A */  lui       $t2, %hi(D_8009A64C)
+/* CB97EC 802405EC 8D4AA64C */  lw        $t2, %lo(D_8009A64C)($t2)
 /* CB97F0 802405F0 00021040 */  sll       $v0, $v0, 1
 /* CB97F4 802405F4 AFAA0018 */  sw        $t2, 0x18($sp)
 /* CB97F8 802405F8 8FAA0010 */  lw        $t2, 0x10($sp)
 /* CB97FC 802405FC 00621823 */  subu      $v1, $v1, $v0
 /* CB9800 80240600 19400097 */  blez      $t2, .L80240860
 /* CB9804 80240604 AFA30014 */   sw       $v1, 0x14($sp)
-/* CB9808 80240608 3C13800A */  lui       $s3, 0x800a
-/* CB980C 8024060C 2673A66C */  addiu     $s3, $s3, -0x5994
+/* CB9808 80240608 3C13800A */  lui       $s3, %hi(D_8009A66C)
+/* CB980C 8024060C 2673A66C */  addiu     $s3, $s3, %lo(D_8009A66C)
 /* CB9810 80240610 02961023 */  subu      $v0, $s4, $s6
 /* CB9814 80240614 00021040 */  sll       $v0, $v0, 1
 /* CB9818 80240618 24420007 */  addiu     $v0, $v0, 7
@@ -218,8 +218,8 @@ glabel func_802404B0_CB96B0
 /* CB99D4 802407D4 26220040 */  addiu     $v0, $s1, 0x40
 /* CB99D8 802407D8 AE230034 */  sw        $v1, 0x34($s1)
 /* CB99DC 802407DC AE620000 */  sw        $v0, ($s3)
-/* CB99E0 802407E0 3C038024 */  lui       $v1, 0x8024
-/* CB99E4 802407E4 8C634070 */  lw        $v1, 0x4070($v1)
+/* CB99E0 802407E0 3C038024 */  lui       $v1, %hi(D_80244070)
+/* CB99E4 802407E4 8C634070 */  lw        $v1, %lo(D_80244070)($v1)
 /* CB99E8 802407E8 3C02F100 */  lui       $v0, 0xf100
 /* CB99EC 802407EC AE220038 */  sw        $v0, 0x38($s1)
 /* CB99F0 802407F0 8FAA0020 */  lw        $t2, 0x20($sp)
@@ -268,8 +268,8 @@ glabel func_802404B0_CB96B0
 .L80240894:
 /* CB9A94 80240894 3C05FD10 */  lui       $a1, 0xfd10
 /* CB9A98 80240898 34A5013F */  ori       $a1, $a1, 0x13f
-/* CB9A9C 8024089C 3C11800A */  lui       $s1, 0x800a
-/* CB9AA0 802408A0 2631A66C */  addiu     $s1, $s1, -0x5994
+/* CB9A9C 8024089C 3C11800A */  lui       $s1, %hi(D_8009A66C)
+/* CB9AA0 802408A0 2631A66C */  addiu     $s1, $s1, %lo(D_8009A66C)
 /* CB9AA4 802408A4 3C02FA00 */  lui       $v0, 0xfa00
 /* CB9AA8 802408A8 8E300000 */  lw        $s0, ($s1)
 /* CB9AAC 802408AC 8FA40018 */  lw        $a0, 0x18($sp)
diff --git a/asm/nonmatchings/world/area_flo/flo_10/CB96B0/func_80240A98_CB9C98.s b/asm/nonmatchings/world/area_flo/flo_10/CB96B0/func_80240A98_CB9C98.s
index c961ded9c8..0d15951aad 100644
--- a/asm/nonmatchings/world/area_flo/flo_10/CB96B0/func_80240A98_CB9C98.s
+++ b/asm/nonmatchings/world/area_flo/flo_10/CB96B0/func_80240A98_CB9C98.s
@@ -319,8 +319,8 @@ glabel func_80240A98_CB9C98
 /* CBA13C 80240F3C 00000000 */  nop       
 /* CBA140 80240F40 3C04800A */  lui       $a0, %hi(nuGfxZBuffer)
 /* CBA144 80240F44 8C84A5DC */  lw        $a0, %lo(nuGfxZBuffer)($a0)
-/* CBA148 80240F48 3C12800A */  lui       $s2, 0x800a
-/* CBA14C 80240F4C 2652A66C */  addiu     $s2, $s2, -0x5994
+/* CBA148 80240F48 3C12800A */  lui       $s2, %hi(D_8009A66C)
+/* CBA14C 80240F4C 2652A66C */  addiu     $s2, $s2, %lo(D_8009A66C)
 /* CBA150 80240F50 AFB8003C */  sw        $t8, 0x3c($sp)
 /* CBA154 80240F54 8E510000 */  lw        $s1, ($s2)
 /* CBA158 80240F58 4604B002 */  mul.s     $f0, $f22, $f4
@@ -360,8 +360,8 @@ glabel func_80240A98_CB9C98
 /* CBA1E0 80240FE0 34A5F000 */  ori       $a1, $a1, 0xf000
 /* CBA1E4 80240FE4 AE22000C */  sw        $v0, 0xc($s1)
 /* CBA1E8 80240FE8 3C11E700 */  lui       $s1, 0xe700
-/* CBA1EC 80240FEC 3C04800A */  lui       $a0, 0x800a
-/* CBA1F0 80240FF0 8C84A64C */  lw        $a0, -0x59b4($a0)
+/* CBA1EC 80240FEC 3C04800A */  lui       $a0, %hi(D_8009A64C)
+/* CBA1F0 80240FF0 8C84A64C */  lw        $a0, %lo(D_8009A64C)($a0)
 /* CBA1F4 80240FF4 0200102D */  daddu     $v0, $s0, $zero
 /* CBA1F8 80240FF8 26100008 */  addiu     $s0, $s0, 8
 /* CBA1FC 80240FFC AE500000 */  sw        $s0, ($s2)
diff --git a/asm/nonmatchings/world/area_flo/flo_12/CC0E70/func_8024027C_CC10AC.s b/asm/nonmatchings/world/area_flo/flo_12/CC0E70/func_8024027C_CC10AC.s
index 800d9bb3e0..611de98e82 100644
--- a/asm/nonmatchings/world/area_flo/flo_12/CC0E70/func_8024027C_CC10AC.s
+++ b/asm/nonmatchings/world/area_flo/flo_12/CC0E70/func_8024027C_CC10AC.s
@@ -4,8 +4,8 @@
 glabel func_8024027C_CC10AC
 /* CC10AC 8024027C 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* CC10B0 80240280 AFB00010 */  sw        $s0, 0x10($sp)
-/* CC10B4 80240284 3C108024 */  lui       $s0, 0x8024
-/* CC10B8 80240288 261017EC */  addiu     $s0, $s0, 0x17ec
+/* CC10B4 80240284 3C108024 */  lui       $s0, %hi(D_802417EC)
+/* CC10B8 80240288 261017EC */  addiu     $s0, $s0, %lo(D_802417EC)
 /* CC10BC 8024028C AFBF0018 */  sw        $ra, 0x18($sp)
 /* CC10C0 80240290 AFB10014 */  sw        $s1, 0x14($sp)
 /* CC10C4 80240294 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_8024027C_CC10AC
 /* CC1128 802402F8 28620010 */  slti      $v0, $v1, 0x10
 /* CC112C 802402FC 1440FFFA */  bnez      $v0, .L802402E8
 /* CC1130 80240300 24840004 */   addiu    $a0, $a0, 4
-/* CC1134 80240304 3C108024 */  lui       $s0, 0x8024
-/* CC1138 80240308 261017EC */  addiu     $s0, $s0, 0x17ec
+/* CC1134 80240304 3C108024 */  lui       $s0, %hi(D_802417EC)
+/* CC1138 80240308 261017EC */  addiu     $s0, $s0, %lo(D_802417EC)
 /* CC113C 8024030C 0C00AB4B */  jal       heap_free
 /* CC1140 80240310 8E040000 */   lw       $a0, ($s0)
 /* CC1144 80240314 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_flo/flo_12/CC0E70/func_802405C0_CC13F0.s b/asm/nonmatchings/world/area_flo/flo_12/CC0E70/func_802405C0_CC13F0.s
index 5065b072cb..b7510a165a 100644
--- a/asm/nonmatchings/world/area_flo/flo_12/CC0E70/func_802405C0_CC13F0.s
+++ b/asm/nonmatchings/world/area_flo/flo_12/CC0E70/func_802405C0_CC13F0.s
@@ -6,11 +6,11 @@ glabel func_802405C0_CC13F0
 /* CC13F4 802405C4 AFBF0010 */  sw        $ra, 0x10($sp)
 /* CC13F8 802405C8 10A00003 */  beqz      $a1, .L802405D8
 /* CC13FC 802405CC 8C86000C */   lw       $a2, 0xc($a0)
-/* CC1400 802405D0 3C018024 */  lui       $at, 0x8024
-/* CC1404 802405D4 AC201850 */  sw        $zero, 0x1850($at)
+/* CC1400 802405D0 3C018024 */  lui       $at, %hi(D_80241850)
+/* CC1404 802405D4 AC201850 */  sw        $zero, %lo(D_80241850)($at)
 .L802405D8:
-/* CC1408 802405D8 3C038024 */  lui       $v1, 0x8024
-/* CC140C 802405DC 24631850 */  addiu     $v1, $v1, 0x1850
+/* CC1408 802405D8 3C038024 */  lui       $v1, %hi(D_80241850)
+/* CC140C 802405DC 24631850 */  addiu     $v1, $v1, %lo(D_80241850)
 /* CC1410 802405E0 8C620000 */  lw        $v0, ($v1)
 /* CC1414 802405E4 54400003 */  bnel      $v0, $zero, .L802405F4
 /* CC1418 802405E8 AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_802405C0_CC13F0
 /* CC1420 802405F0 0000102D */   daddu    $v0, $zero, $zero
 .L802405F4:
 /* CC1424 802405F4 8CC50000 */  lw        $a1, ($a2)
-/* CC1428 802405F8 3C068024 */  lui       $a2, 0x8024
+/* CC1428 802405F8 3C068024 */  lui       $a2, %hi(D_80241854)
 /* CC142C 802405FC 0C0B2026 */  jal       set_variable
-/* CC1430 80240600 8CC61854 */   lw       $a2, 0x1854($a2)
+/* CC1430 80240600 8CC61854 */   lw       $a2, %lo(D_80241854)($a2)
 /* CC1434 80240604 24020002 */  addiu     $v0, $zero, 2
 .L80240608:
 /* CC1438 80240608 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_flo/flo_12/CC0E70/func_80240614_CC1444.s b/asm/nonmatchings/world/area_flo/flo_12/CC0E70/func_80240614_CC1444.s
index 77c93834eb..567a4caea6 100644
--- a/asm/nonmatchings/world/area_flo/flo_12/CC0E70/func_80240614_CC1444.s
+++ b/asm/nonmatchings/world/area_flo/flo_12/CC0E70/func_80240614_CC1444.s
@@ -7,12 +7,12 @@ glabel func_80240614_CC1444
 /* CC144C 8024061C 8C82000C */  lw        $v0, 0xc($a0)
 /* CC1450 80240620 0C0B1EAF */  jal       get_variable
 /* CC1454 80240624 8C450000 */   lw       $a1, ($v0)
-/* CC1458 80240628 3C018024 */  lui       $at, 0x8024
-/* CC145C 8024062C AC221854 */  sw        $v0, 0x1854($at)
+/* CC1458 80240628 3C018024 */  lui       $at, %hi(D_80241854)
+/* CC145C 8024062C AC221854 */  sw        $v0, %lo(D_80241854)($at)
 /* CC1460 80240630 24020002 */  addiu     $v0, $zero, 2
 /* CC1464 80240634 8FBF0010 */  lw        $ra, 0x10($sp)
 /* CC1468 80240638 24030001 */  addiu     $v1, $zero, 1
-/* CC146C 8024063C 3C018024 */  lui       $at, 0x8024
-/* CC1470 80240640 AC231850 */  sw        $v1, 0x1850($at)
+/* CC146C 8024063C 3C018024 */  lui       $at, %hi(D_80241850)
+/* CC1470 80240640 AC231850 */  sw        $v1, %lo(D_80241850)($at)
 /* CC1474 80240644 03E00008 */  jr        $ra
 /* CC1478 80240648 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_flo/flo_12/CC0E70/func_8024064C_CC147C.s b/asm/nonmatchings/world/area_flo/flo_12/CC0E70/func_8024064C_CC147C.s
index c9c744edb6..cabd3121b4 100644
--- a/asm/nonmatchings/world/area_flo/flo_12/CC0E70/func_8024064C_CC147C.s
+++ b/asm/nonmatchings/world/area_flo/flo_12/CC0E70/func_8024064C_CC147C.s
@@ -13,8 +13,8 @@ glabel func_8024064C_CC147C
 /* CC149C 8024066C 8C620000 */  lw        $v0, ($v1)
 /* CC14A0 80240670 5040000A */  beql      $v0, $zero, .L8024069C
 /* CC14A4 80240674 00041080 */   sll      $v0, $a0, 2
-/* CC14A8 80240678 3C058024 */  lui       $a1, 0x8024
-/* CC14AC 8024067C 24A529E0 */  addiu     $a1, $a1, 0x29e0
+/* CC14A8 80240678 3C058024 */  lui       $a1, %hi(D_802429E0)
+/* CC14AC 8024067C 24A529E0 */  addiu     $a1, $a1, %lo(D_802429E0)
 .L80240680:
 /* CC14B0 80240680 24630004 */  addiu     $v1, $v1, 4
 /* CC14B4 80240684 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_8024064C_CC147C
 /* CC14C4 80240694 24A50004 */   addiu    $a1, $a1, 4
 /* CC14C8 80240698 00041080 */  sll       $v0, $a0, 2
 .L8024069C:
-/* CC14CC 8024069C 3C018024 */  lui       $at, 0x8024
+/* CC14CC 8024069C 3C018024 */  lui       $at, %hi(D_802429E0)
 /* CC14D0 802406A0 00220821 */  addu      $at, $at, $v0
-/* CC14D4 802406A4 AC2029E0 */  sw        $zero, 0x29e0($at)
+/* CC14D4 802406A4 AC2029E0 */  sw        $zero, %lo(D_802429E0)($at)
 /* CC14D8 802406A8 080901B6 */  j         .L802406D8
 /* CC14DC 802406AC 00000000 */   nop      
 .L802406B0:
-/* CC14E0 802406B0 3C038024 */  lui       $v1, 0x8024
-/* CC14E4 802406B4 246329E0 */  addiu     $v1, $v1, 0x29e0
+/* CC14E0 802406B0 3C038024 */  lui       $v1, %hi(D_802429E0)
+/* CC14E4 802406B4 246329E0 */  addiu     $v1, $v1, %lo(D_802429E0)
 /* CC14E8 802406B8 0060282D */  daddu     $a1, $v1, $zero
 .L802406BC:
 /* CC14EC 802406BC 24820010 */  addiu     $v0, $a0, 0x10
diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802401C4_CC39D4.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802401C4_CC39D4.s
index 60cd3fb8dc..4e4371943e 100644
--- a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802401C4_CC39D4.s
+++ b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802401C4_CC39D4.s
@@ -87,8 +87,8 @@ glabel func_802401C4_CC39D4
 /* CC3B14 80240304 080900CB */  j         .L8024032C
 /* CC3B18 80240308 E6000018 */   swc1     $f0, 0x18($s0)
 .L8024030C:
-/* CC3B1C 8024030C 3C018024 */  lui       $at, 0x8024
-/* CC3B20 80240310 D4227A30 */  ldc1      $f2, 0x7a30($at)
+/* CC3B1C 8024030C 3C018024 */  lui       $at, %hi(D_80247A30)
+/* CC3B20 80240310 D4227A30 */  ldc1      $f2, %lo(D_80247A30)($at)
 /* CC3B24 80240314 44820000 */  mtc1      $v0, $f0
 /* CC3B28 80240318 00000000 */  nop       
 /* CC3B2C 8024031C 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80240374_CC3B84.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80240374_CC3B84.s
index dd9457b7db..a97dfb1dab 100644
--- a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80240374_CC3B84.s
+++ b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80240374_CC3B84.s
@@ -104,8 +104,8 @@ glabel func_80240374_CC3B84
 /* CC3D08 802404F8 1040000A */  beqz      $v0, .L80240524
 /* CC3D0C 802404FC 4600C106 */   mov.s    $f4, $f24
 /* CC3D10 80240500 4614C081 */  sub.s     $f2, $f24, $f20
-/* CC3D14 80240504 3C018024 */  lui       $at, 0x8024
-/* CC3D18 80240508 D4207A38 */  ldc1      $f0, 0x7a38($at)
+/* CC3D14 80240504 3C018024 */  lui       $at, %hi(D_80247A38)
+/* CC3D18 80240508 D4207A38 */  ldc1      $f0, %lo(D_80247A38)($at)
 /* CC3D1C 8024050C 460010A1 */  cvt.d.s   $f2, $f2
 /* CC3D20 80240510 46201082 */  mul.d     $f2, $f2, $f0
 /* CC3D24 80240514 00000000 */  nop       
@@ -131,8 +131,8 @@ glabel func_80240374_CC3B84
 /* CC3D70 80240560 C7A4002C */  lwc1      $f4, 0x2c($sp)
 /* CC3D74 80240564 461A2100 */  add.s     $f4, $f4, $f26
 /* CC3D78 80240568 46142081 */  sub.s     $f2, $f4, $f20
-/* CC3D7C 8024056C 3C018024 */  lui       $at, 0x8024
-/* CC3D80 80240570 D4207A40 */  ldc1      $f0, 0x7a40($at)
+/* CC3D7C 8024056C 3C018024 */  lui       $at, %hi(D_80247A40)
+/* CC3D80 80240570 D4207A40 */  ldc1      $f0, %lo(D_80247A40)($at)
 /* CC3D84 80240574 460010A1 */  cvt.d.s   $f2, $f2
 /* CC3D88 80240578 46201082 */  mul.d     $f2, $f2, $f0
 /* CC3D8C 8024057C 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80240E18_CC4628.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80240E18_CC4628.s
index 69e3b9a527..de4341bdf0 100644
--- a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80240E18_CC4628.s
+++ b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80240E18_CC4628.s
@@ -15,9 +15,9 @@ glabel func_80240E18_CC4628
 /* CC4650 80240E40 00031C00 */  sll       $v1, $v1, 0x10
 /* CC4654 80240E44 00031B83 */  sra       $v1, $v1, 0xe
 /* CC4658 80240E48 A444008E */  sh        $a0, 0x8e($v0)
-/* CC465C 80240E4C 3C018024 */  lui       $at, 0x8024
+/* CC465C 80240E4C 3C018024 */  lui       $at, %hi(D_8024412C)
 /* CC4660 80240E50 00230821 */  addu      $at, $at, $v1
-/* CC4664 80240E54 C422412C */  lwc1      $f2, 0x412c($at)
+/* CC4664 80240E54 C422412C */  lwc1      $f2, %lo(D_8024412C)($at)
 /* CC4668 80240E58 8443008E */  lh        $v1, 0x8e($v0)
 /* CC466C 80240E5C 46020000 */  add.s     $f0, $f0, $f2
 /* CC4670 80240E60 28630005 */  slti      $v1, $v1, 5
diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802414D0_CC4CE0.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802414D0_CC4CE0.s
index 3ed6c211b6..ed85fcea2a 100644
--- a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802414D0_CC4CE0.s
+++ b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802414D0_CC4CE0.s
@@ -66,9 +66,9 @@ glabel func_802414D0_CC4CE0
 /* CC4DCC 802415BC 2C62000F */  sltiu     $v0, $v1, 0xf
 /* CC4DD0 802415C0 10400034 */  beqz      $v0, .L80241694
 /* CC4DD4 802415C4 00031080 */   sll      $v0, $v1, 2
-/* CC4DD8 802415C8 3C018024 */  lui       $at, 0x8024
+/* CC4DD8 802415C8 3C018024 */  lui       $at, %hi(D_80247A48)
 /* CC4DDC 802415CC 00220821 */  addu      $at, $at, $v0
-/* CC4DE0 802415D0 8C227A48 */  lw        $v0, 0x7a48($at)
+/* CC4DE0 802415D0 8C227A48 */  lw        $v0, %lo(D_80247A48)($at)
 /* CC4DE4 802415D4 00400008 */  jr        $v0
 /* CC4DE8 802415D8 00000000 */   nop      
 /* CC4DEC 802415DC 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80242314_CC5B24.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80242314_CC5B24.s
index 6debec3dca..ca176cdc13 100644
--- a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80242314_CC5B24.s
+++ b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80242314_CC5B24.s
@@ -55,8 +55,8 @@ glabel func_80242314_CC5B24
 /* CC5BE0 802423D0 8C470030 */   lw       $a3, 0x30($v0)
 /* CC5BE4 802423D4 C6020018 */  lwc1      $f2, 0x18($s0)
 /* CC5BE8 802423D8 46020003 */  div.s     $f0, $f0, $f2
-/* CC5BEC 802423DC 3C018024 */  lui       $at, 0x8024
-/* CC5BF0 802423E0 D4227A88 */  ldc1      $f2, 0x7a88($at)
+/* CC5BEC 802423DC 3C018024 */  lui       $at, %hi(D_80247A88)
+/* CC5BF0 802423E0 D4227A88 */  ldc1      $f2, %lo(D_80247A88)($at)
 /* CC5BF4 802423E4 46000021 */  cvt.d.s   $f0, $f0
 /* CC5BF8 802423E8 46220000 */  add.d     $f0, $f0, $f2
 /* CC5BFC 802423EC 4620010D */  trunc.w.d $f4, $f0
diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_8024262C_CC5E3C.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_8024262C_CC5E3C.s
index 9ac77804ce..cb8458387c 100644
--- a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_8024262C_CC5E3C.s
+++ b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_8024262C_CC5E3C.s
@@ -279,9 +279,9 @@ glabel func_8024262C_CC5E3C
 /* CC6228 80242A18 2C620015 */  sltiu     $v0, $v1, 0x15
 /* CC622C 80242A1C 10400009 */  beqz      $v0, .L80242A44
 /* CC6230 80242A20 00031080 */   sll      $v0, $v1, 2
-/* CC6234 80242A24 3C018024 */  lui       $at, 0x8024
+/* CC6234 80242A24 3C018024 */  lui       $at, %hi(D_80247A90)
 /* CC6238 80242A28 00220821 */  addu      $at, $at, $v0
-/* CC623C 80242A2C 8C227A90 */  lw        $v0, 0x7a90($at)
+/* CC623C 80242A2C 8C227A90 */  lw        $v0, %lo(D_80247A90)($at)
 /* CC6240 80242A30 00400008 */  jr        $v0
 /* CC6244 80242A34 00000000 */   nop      
 /* CC6248 80242A38 8E420028 */  lw        $v0, 0x28($s2)
diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80242A6C_CC627C.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80242A6C_CC627C.s
index 0be490956f..6ea839f96c 100644
--- a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80242A6C_CC627C.s
+++ b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80242A6C_CC627C.s
@@ -301,8 +301,8 @@ glabel func_80242A6C_CC627C
 /* CC66C0 80242EB0 0C00EABB */  jal       get_npc_unsafe
 /* CC66C4 80242EB4 84440008 */   lh       $a0, 8($v0)
 /* CC66C8 80242EB8 C440000C */  lwc1      $f0, 0xc($v0)
-/* CC66CC 80242EBC 3C018024 */  lui       $at, 0x8024
-/* CC66D0 80242EC0 D4227AE8 */  ldc1      $f2, 0x7ae8($at)
+/* CC66CC 80242EBC 3C018024 */  lui       $at, %hi(D_80247AE8)
+/* CC66D0 80242EC0 D4227AE8 */  ldc1      $f2, %lo(D_80247AE8)($at)
 /* CC66D4 80242EC4 46000021 */  cvt.d.s   $f0, $f0
 /* CC66D8 80242EC8 4622003C */  c.lt.d    $f0, $f2
 /* CC66DC 80242ECC 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC6DE0/func_802435D0_CC6DE0.s b/asm/nonmatchings/world/area_flo/flo_13/CC6DE0/func_802435D0_CC6DE0.s
index 578794f90a..795f0a504c 100644
--- a/asm/nonmatchings/world/area_flo/flo_13/CC6DE0/func_802435D0_CC6DE0.s
+++ b/asm/nonmatchings/world/area_flo/flo_13/CC6DE0/func_802435D0_CC6DE0.s
@@ -3,8 +3,8 @@
 
 glabel func_802435D0_CC6DE0
 /* CC6DE0 802435D0 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* CC6DE4 802435D4 3C048024 */  lui       $a0, 0x8024
-/* CC6DE8 802435D8 24847AF0 */  addiu     $a0, $a0, 0x7af0
+/* CC6DE4 802435D4 3C048024 */  lui       $a0, %hi(D_80247AF0)
+/* CC6DE8 802435D8 24847AF0 */  addiu     $a0, $a0, %lo(D_80247AF0)
 /* CC6DEC 802435DC 27A50010 */  addiu     $a1, $sp, 0x10
 /* CC6DF0 802435E0 AFBF0020 */  sw        $ra, 0x20($sp)
 /* CC6DF4 802435E4 AFB1001C */  sw        $s1, 0x1c($sp)
@@ -12,16 +12,16 @@ glabel func_802435D0_CC6DE0
 /* CC6DFC 802435EC AFB00018 */   sw       $s0, 0x18($sp)
 /* CC6E00 802435F0 0040802D */  daddu     $s0, $v0, $zero
 /* CC6E04 802435F4 0200202D */  daddu     $a0, $s0, $zero
-/* CC6E08 802435F8 3C118024 */  lui       $s1, 0x8024
-/* CC6E0C 802435FC 26317B00 */  addiu     $s1, $s1, 0x7b00
+/* CC6E08 802435F8 3C118024 */  lui       $s1, %hi(D_80247B00)
+/* CC6E0C 802435FC 26317B00 */  addiu     $s1, $s1, %lo(D_80247B00)
 /* CC6E10 80243600 0C01BB7C */  jal       decode_yay0
 /* CC6E14 80243604 0220282D */   daddu    $a1, $s1, $zero
 /* CC6E18 80243608 0C00AB1E */  jal       general_heap_free
 /* CC6E1C 8024360C 0200202D */   daddu    $a0, $s0, $zero
-/* CC6E20 80243610 3C048025 */  lui       $a0, 0x8025
-/* CC6E24 80243614 2484BA90 */  addiu     $a0, $a0, -0x4570
-/* CC6E28 80243618 3C028024 */  lui       $v0, 0x8024
-/* CC6E2C 8024361C 24427D00 */  addiu     $v0, $v0, 0x7d00
+/* CC6E20 80243610 3C048025 */  lui       $a0, %hi(D_8024BA90)
+/* CC6E24 80243614 2484BA90 */  addiu     $a0, $a0, %lo(D_8024BA90)
+/* CC6E28 80243618 3C028024 */  lui       $v0, %hi(D_80247D00)
+/* CC6E2C 8024361C 24427D00 */  addiu     $v0, $v0, %lo(D_80247D00)
 /* CC6E30 80243620 AC820000 */  sw        $v0, ($a0)
 /* CC6E34 80243624 24020096 */  addiu     $v0, $zero, 0x96
 /* CC6E38 80243628 A4820008 */  sh        $v0, 8($a0)
diff --git a/asm/nonmatchings/world/area_flo/flo_14/CCB310/func_80240504_CCB814.s b/asm/nonmatchings/world/area_flo/flo_14/CCB310/func_80240504_CCB814.s
index 88fe836a3f..0a935856b6 100644
--- a/asm/nonmatchings/world/area_flo/flo_14/CCB310/func_80240504_CCB814.s
+++ b/asm/nonmatchings/world/area_flo/flo_14/CCB310/func_80240504_CCB814.s
@@ -9,20 +9,20 @@ glabel func_80240504_CCB814
 /* CCB824 80240514 F7B40068 */  sdc1      $f20, 0x68($sp)
 /* CCB828 80240518 0C019D28 */  jal       guMtxIdentF
 /* CCB82C 8024051C 27A40010 */   addiu    $a0, $sp, 0x10
-/* CCB830 80240520 3C108024 */  lui       $s0, 0x8024
-/* CCB834 80240524 26103B14 */  addiu     $s0, $s0, 0x3b14
+/* CCB830 80240520 3C108024 */  lui       $s0, %hi(D_80243B14)
+/* CCB834 80240524 26103B14 */  addiu     $s0, $s0, %lo(D_80243B14)
 /* CCB838 80240528 C6000000 */  lwc1      $f0, ($s0)
 /* CCB83C 8024052C 3C014130 */  lui       $at, 0x4130
 /* CCB840 80240530 44816000 */  mtc1      $at, $f12
 /* CCB844 80240534 0C00A85B */  jal       sin_rad
 /* CCB848 80240538 460C0303 */   div.s    $f12, $f0, $f12
-/* CCB84C 8024053C 3C018024 */  lui       $at, 0x8024
-/* CCB850 80240540 D4345320 */  ldc1      $f20, 0x5320($at)
+/* CCB84C 8024053C 3C018024 */  lui       $at, %hi(D_80245320)
+/* CCB850 80240540 D4345320 */  ldc1      $f20, %lo(D_80245320)($at)
 /* CCB854 80240544 46000021 */  cvt.d.s   $f0, $f0
 /* CCB858 80240548 46340002 */  mul.d     $f0, $f0, $f20
 /* CCB85C 8024054C 00000000 */  nop       
-/* CCB860 80240550 3C018024 */  lui       $at, 0x8024
-/* CCB864 80240554 D4365328 */  ldc1      $f22, 0x5328($at)
+/* CCB860 80240550 3C018024 */  lui       $at, %hi(D_80245328)
+/* CCB864 80240554 D4365328 */  ldc1      $f22, %lo(D_80245328)($at)
 /* CCB868 80240558 C6020000 */  lwc1      $f2, ($s0)
 /* CCB86C 8024055C 3C014140 */  lui       $at, 0x4140
 /* CCB870 80240560 44816000 */  mtc1      $at, $f12
@@ -123,10 +123,10 @@ glabel func_80240504_CCB814
 /* CCB9EC 802406DC 00000000 */  nop       
 /* CCB9F0 802406E0 34631630 */  ori       $v1, $v1, 0x1630
 /* CCB9F4 802406E4 27A40010 */  addiu     $a0, $sp, 0x10
-/* CCB9F8 802406E8 3C058007 */  lui       $a1, 0x8007
-/* CCB9FC 802406EC 94A541F0 */  lhu       $a1, 0x41f0($a1)
-/* CCBA00 802406F0 3C02800A */  lui       $v0, 0x800a
-/* CCBA04 802406F4 8C42A674 */  lw        $v0, -0x598c($v0)
+/* CCB9F8 802406E8 3C058007 */  lui       $a1, %hi(D_800741F0)
+/* CCB9FC 802406EC 94A541F0 */  lhu       $a1, %lo(D_800741F0)($a1)
+/* CCBA00 802406F0 3C02800A */  lui       $v0, %hi(D_8009A674)
+/* CCBA04 802406F4 8C42A674 */  lw        $v0, %lo(D_8009A674)($v0)
 /* CCBA08 802406F8 00052980 */  sll       $a1, $a1, 6
 /* CCBA0C 802406FC 00A32821 */  addu      $a1, $a1, $v1
 /* CCBA10 80240700 00452821 */  addu      $a1, $v0, $a1
@@ -142,11 +142,11 @@ glabel func_80240504_CCB814
 /* CCBA38 80240728 34630001 */  ori       $v1, $v1, 1
 /* CCBA3C 8024072C 3C080001 */  lui       $t0, 1
 /* CCBA40 80240730 35081630 */  ori       $t0, $t0, 0x1630
-/* CCBA44 80240734 3C06800A */  lui       $a2, 0x800a
-/* CCBA48 80240738 24C6A66C */  addiu     $a2, $a2, -0x5994
+/* CCBA44 80240734 3C06800A */  lui       $a2, %hi(D_8009A66C)
+/* CCBA48 80240738 24C6A66C */  addiu     $a2, $a2, %lo(D_8009A66C)
 /* CCBA4C 8024073C 0000202D */  daddu     $a0, $zero, $zero
-/* CCBA50 80240740 3C058007 */  lui       $a1, 0x8007
-/* CCBA54 80240744 24A541F0 */  addiu     $a1, $a1, 0x41f0
+/* CCBA50 80240740 3C058007 */  lui       $a1, %hi(D_800741F0)
+/* CCBA54 80240744 24A541F0 */  addiu     $a1, $a1, %lo(D_800741F0)
 /* CCBA58 80240748 8CD00000 */  lw        $s0, ($a2)
 /* CCBA5C 8024074C 94A20000 */  lhu       $v0, ($a1)
 /* CCBA60 80240750 0200382D */  daddu     $a3, $s0, $zero
@@ -157,8 +157,8 @@ glabel func_80240504_CCB814
 /* CCBA74 80240764 3042FFFF */  andi      $v0, $v0, 0xffff
 /* CCBA78 80240768 00021180 */  sll       $v0, $v0, 6
 /* CCBA7C 8024076C A4A30000 */  sh        $v1, ($a1)
-/* CCBA80 80240770 3C03800A */  lui       $v1, 0x800a
-/* CCBA84 80240774 8C63A674 */  lw        $v1, -0x598c($v1)
+/* CCBA80 80240770 3C03800A */  lui       $v1, %hi(D_8009A674)
+/* CCBA84 80240774 8C63A674 */  lw        $v1, %lo(D_8009A674)($v1)
 /* CCBA88 80240778 00481021 */  addu      $v0, $v0, $t0
 /* CCBA8C 8024077C 00621821 */  addu      $v1, $v1, $v0
 /* CCBA90 80240780 26020008 */  addiu     $v0, $s0, 8
@@ -167,8 +167,8 @@ glabel func_80240504_CCB814
 /* CCBA9C 8024078C 3C02DE00 */  lui       $v0, 0xde00
 /* CCBAA0 80240790 0C0470BB */  jal       func_8011C2EC
 /* CCBAA4 80240794 AE020000 */   sw       $v0, ($s0)
-/* CCBAA8 80240798 3C038024 */  lui       $v1, 0x8024
-/* CCBAAC 8024079C 24633B14 */  addiu     $v1, $v1, 0x3b14
+/* CCBAA8 80240798 3C038024 */  lui       $v1, %hi(D_80243B14)
+/* CCBAAC 8024079C 24633B14 */  addiu     $v1, $v1, %lo(D_80243B14)
 /* CCBAB0 802407A0 C4600000 */  lwc1      $f0, ($v1)
 /* CCBAB4 802407A4 3C013F80 */  lui       $at, 0x3f80
 /* CCBAB8 802407A8 44811000 */  mtc1      $at, $f2
diff --git a/asm/nonmatchings/world/area_flo/flo_14/CCB310/func_802407D4_CCBAE4.s b/asm/nonmatchings/world/area_flo/flo_14/CCB310/func_802407D4_CCBAE4.s
index a95b1031ad..3ef50ac48a 100644
--- a/asm/nonmatchings/world/area_flo/flo_14/CCB310/func_802407D4_CCBAE4.s
+++ b/asm/nonmatchings/world/area_flo/flo_14/CCB310/func_802407D4_CCBAE4.s
@@ -20,14 +20,14 @@ glabel func_802407D4_CCBAE4
 /* CCBB20 80240810 8FA20018 */  lw        $v0, 0x18($sp)
 /* CCBB24 80240814 18400072 */  blez      $v0, .L802409E0
 /* CCBB28 80240818 0000902D */   daddu    $s2, $zero, $zero
-/* CCBB2C 8024081C 3C138024 */  lui       $s3, 0x8024
-/* CCBB30 80240820 26733B18 */  addiu     $s3, $s3, 0x3b18
+/* CCBB2C 8024081C 3C138024 */  lui       $s3, %hi(D_80243B18)
+/* CCBB30 80240820 26733B18 */  addiu     $s3, $s3, %lo(D_80243B18)
 /* CCBB34 80240824 3C014334 */  lui       $at, 0x4334
 /* CCBB38 80240828 4481D000 */  mtc1      $at, $f26
-/* CCBB3C 8024082C 3C018024 */  lui       $at, 0x8024
-/* CCBB40 80240830 D4385330 */  ldc1      $f24, 0x5330($at)
-/* CCBB44 80240834 3C018024 */  lui       $at, 0x8024
-/* CCBB48 80240838 D4365338 */  ldc1      $f22, 0x5338($at)
+/* CCBB3C 8024082C 3C018024 */  lui       $at, %hi(D_80245330)
+/* CCBB40 80240830 D4385330 */  ldc1      $f24, %lo(D_80245330)($at)
+/* CCBB44 80240834 3C018024 */  lui       $at, %hi(D_80245338)
+/* CCBB48 80240838 D4365338 */  ldc1      $f22, %lo(D_80245338)($at)
 /* CCBB4C 8024083C 00122100 */  sll       $a0, $s2, 4
 .L80240840:
 /* CCBB50 80240840 8FA20010 */  lw        $v0, 0x10($sp)
@@ -51,13 +51,13 @@ glabel func_802407D4_CCBAE4
 /* CCBB98 80240888 46006321 */  cvt.d.s   $f12, $f12
 /* CCBB9C 8024088C 46386302 */  mul.d     $f12, $f12, $f24
 /* CCBBA0 80240890 00000000 */  nop       
-/* CCBBA4 80240894 3C018024 */  lui       $at, 0x8024
-/* CCBBA8 80240898 D4225340 */  ldc1      $f2, 0x5340($at)
+/* CCBBA4 80240894 3C018024 */  lui       $at, %hi(D_80245340)
+/* CCBBA8 80240898 D4225340 */  ldc1      $f2, %lo(D_80245340)($at)
 /* CCBBAC 8024089C 46000521 */  cvt.d.s   $f20, $f0
 /* CCBBB0 802408A0 4622A502 */  mul.d     $f20, $f20, $f2
 /* CCBBB4 802408A4 00000000 */  nop       
-/* CCBBB8 802408A8 3C018024 */  lui       $at, 0x8024
-/* CCBBBC 802408AC D4205348 */  ldc1      $f0, 0x5348($at)
+/* CCBBB8 802408A8 3C018024 */  lui       $at, %hi(D_80245348)
+/* CCBBBC 802408AC D4205348 */  ldc1      $f0, %lo(D_80245348)($at)
 /* CCBBC0 802408B0 4620A500 */  add.d     $f20, $f20, $f0
 /* CCBBC4 802408B4 46206320 */  cvt.s.d   $f12, $f12
 /* CCBBC8 802408B8 0C00A85B */  jal       sin_rad
@@ -136,8 +136,8 @@ glabel func_802407D4_CCBAE4
 /* CCBCE8 802409D8 1440FF99 */  bnez      $v0, .L80240840
 /* CCBCEC 802409DC 00122100 */   sll      $a0, $s2, 4
 .L802409E0:
-/* CCBCF0 802409E0 3C03800A */  lui       $v1, 0x800a
-/* CCBCF4 802409E4 2463A66C */  addiu     $v1, $v1, -0x5994
+/* CCBCF0 802409E0 3C03800A */  lui       $v1, %hi(D_8009A66C)
+/* CCBCF4 802409E4 2463A66C */  addiu     $v1, $v1, %lo(D_8009A66C)
 /* CCBCF8 802409E8 8C620000 */  lw        $v0, ($v1)
 /* CCBCFC 802409EC 24040001 */  addiu     $a0, $zero, 1
 /* CCBD00 802409F0 0040802D */  daddu     $s0, $v0, $zero
@@ -153,8 +153,8 @@ glabel func_802407D4_CCBAE4
 /* CCBD28 80240A18 AE020004 */   sw       $v0, 4($s0)
 /* CCBD2C 80240A1C 10400017 */  beqz      $v0, .L80240A7C
 /* CCBD30 80240A20 00000000 */   nop      
-/* CCBD34 80240A24 3C048024 */  lui       $a0, 0x8024
-/* CCBD38 80240A28 24843B18 */  addiu     $a0, $a0, 0x3b18
+/* CCBD34 80240A24 3C048024 */  lui       $a0, %hi(D_80243B18)
+/* CCBD38 80240A28 24843B18 */  addiu     $a0, $a0, %lo(D_80243B18)
 /* CCBD3C 80240A2C 8C830000 */  lw        $v1, ($a0)
 /* CCBD40 80240A30 2862005B */  slti      $v0, $v1, 0x5b
 /* CCBD44 80240A34 14400005 */  bnez      $v0, .L80240A4C
@@ -169,8 +169,8 @@ glabel func_802407D4_CCBAE4
 /* CCBD64 80240A54 24620005 */  addiu     $v0, $v1, 5
 .L80240A58:
 /* CCBD68 80240A58 AC820000 */  sw        $v0, ($a0)
-/* CCBD6C 80240A5C 3C038024 */  lui       $v1, 0x8024
-/* CCBD70 80240A60 24633B18 */  addiu     $v1, $v1, 0x3b18
+/* CCBD6C 80240A5C 3C038024 */  lui       $v1, %hi(D_80243B18)
+/* CCBD70 80240A60 24633B18 */  addiu     $v1, $v1, %lo(D_80243B18)
 /* CCBD74 80240A64 8C620000 */  lw        $v0, ($v1)
 /* CCBD78 80240A68 2842005A */  slti      $v0, $v0, 0x5a
 /* CCBD7C 80240A6C 14400013 */  bnez      $v0, .L80240ABC
@@ -178,27 +178,27 @@ glabel func_802407D4_CCBAE4
 /* CCBD84 80240A74 080902AF */  j         .L80240ABC
 /* CCBD88 80240A78 AC620000 */   sw       $v0, ($v1)
 .L80240A7C:
-/* CCBD8C 80240A7C 3C028024 */  lui       $v0, 0x8024
-/* CCBD90 80240A80 8C423B18 */  lw        $v0, 0x3b18($v0)
+/* CCBD8C 80240A7C 3C028024 */  lui       $v0, %hi(D_80243B18)
+/* CCBD90 80240A80 8C423B18 */  lw        $v0, %lo(D_80243B18)($v0)
 /* CCBD94 80240A84 2442FF73 */  addiu     $v0, $v0, -0x8d
 /* CCBD98 80240A88 2C420077 */  sltiu     $v0, $v0, 0x77
 /* CCBD9C 80240A8C 10400004 */  beqz      $v0, .L80240AA0
 /* CCBDA0 80240A90 24020001 */   addiu    $v0, $zero, 1
-/* CCBDA4 80240A94 3C018024 */  lui       $at, 0x8024
+/* CCBDA4 80240A94 3C018024 */  lui       $at, %hi(D_802431CC)
 /* CCBDA8 80240A98 080902AA */  j         .L80240AA8
-/* CCBDAC 80240A9C AC2231CC */   sw       $v0, 0x31cc($at)
+/* CCBDAC 80240A9C AC2231CC */   sw       $v0, %lo(D_802431CC)($at)
 .L80240AA0:
-/* CCBDB0 80240AA0 3C018024 */  lui       $at, 0x8024
-/* CCBDB4 80240AA4 AC2031CC */  sw        $zero, 0x31cc($at)
+/* CCBDB0 80240AA0 3C018024 */  lui       $at, %hi(D_802431CC)
+/* CCBDB4 80240AA4 AC2031CC */  sw        $zero, %lo(D_802431CC)($at)
 .L80240AA8:
-/* CCBDB8 80240AA8 3C038024 */  lui       $v1, 0x8024
-/* CCBDBC 80240AAC 24633B18 */  addiu     $v1, $v1, 0x3b18
+/* CCBDB8 80240AA8 3C038024 */  lui       $v1, %hi(D_80243B18)
+/* CCBDBC 80240AAC 24633B18 */  addiu     $v1, $v1, %lo(D_80243B18)
 /* CCBDC0 80240AB0 8C620000 */  lw        $v0, ($v1)
 /* CCBDC4 80240AB4 24420005 */  addiu     $v0, $v0, 5
 /* CCBDC8 80240AB8 AC620000 */  sw        $v0, ($v1)
 .L80240ABC:
-/* CCBDCC 80240ABC 3C048024 */  lui       $a0, 0x8024
-/* CCBDD0 80240AC0 24843B18 */  addiu     $a0, $a0, 0x3b18
+/* CCBDCC 80240ABC 3C048024 */  lui       $a0, %hi(D_80243B18)
+/* CCBDD0 80240AC0 24843B18 */  addiu     $a0, $a0, %lo(D_80243B18)
 /* CCBDD4 80240AC4 8C830000 */  lw        $v1, ($a0)
 /* CCBDD8 80240AC8 28620168 */  slti      $v0, $v1, 0x168
 /* CCBDDC 80240ACC 14400002 */  bnez      $v0, .L80240AD8
diff --git a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80240B10_CCBE20.s b/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80240B10_CCBE20.s
index a4a4fc1b06..8adc8fe739 100644
--- a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80240B10_CCBE20.s
+++ b/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80240B10_CCBE20.s
@@ -87,8 +87,8 @@ glabel func_80240B10_CCBE20
 /* CCBF60 80240C50 0809031E */  j         .L80240C78
 /* CCBF64 80240C54 E6000018 */   swc1     $f0, 0x18($s0)
 .L80240C58:
-/* CCBF68 80240C58 3C018024 */  lui       $at, 0x8024
-/* CCBF6C 80240C5C D4225350 */  ldc1      $f2, 0x5350($at)
+/* CCBF68 80240C58 3C018024 */  lui       $at, %hi(D_80245350)
+/* CCBF6C 80240C5C D4225350 */  ldc1      $f2, %lo(D_80245350)($at)
 /* CCBF70 80240C60 44820000 */  mtc1      $v0, $f0
 /* CCBF74 80240C64 00000000 */  nop       
 /* CCBF78 80240C68 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80240CC0_CCBFD0.s b/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80240CC0_CCBFD0.s
index bc388df124..5676c2bd1d 100644
--- a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80240CC0_CCBFD0.s
+++ b/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80240CC0_CCBFD0.s
@@ -104,8 +104,8 @@ glabel func_80240CC0_CCBFD0
 /* CCC154 80240E44 1040000A */  beqz      $v0, .L80240E70
 /* CCC158 80240E48 4600C106 */   mov.s    $f4, $f24
 /* CCC15C 80240E4C 4614C081 */  sub.s     $f2, $f24, $f20
-/* CCC160 80240E50 3C018024 */  lui       $at, 0x8024
-/* CCC164 80240E54 D4205358 */  ldc1      $f0, 0x5358($at)
+/* CCC160 80240E50 3C018024 */  lui       $at, %hi(D_80245358)
+/* CCC164 80240E54 D4205358 */  ldc1      $f0, %lo(D_80245358)($at)
 /* CCC168 80240E58 460010A1 */  cvt.d.s   $f2, $f2
 /* CCC16C 80240E5C 46201082 */  mul.d     $f2, $f2, $f0
 /* CCC170 80240E60 00000000 */  nop       
@@ -131,8 +131,8 @@ glabel func_80240CC0_CCBFD0
 /* CCC1BC 80240EAC C7A4002C */  lwc1      $f4, 0x2c($sp)
 /* CCC1C0 80240EB0 461A2100 */  add.s     $f4, $f4, $f26
 /* CCC1C4 80240EB4 46142081 */  sub.s     $f2, $f4, $f20
-/* CCC1C8 80240EB8 3C018024 */  lui       $at, 0x8024
-/* CCC1CC 80240EBC D4205360 */  ldc1      $f0, 0x5360($at)
+/* CCC1C8 80240EB8 3C018024 */  lui       $at, %hi(D_80245360)
+/* CCC1CC 80240EBC D4205360 */  ldc1      $f0, %lo(D_80245360)($at)
 /* CCC1D0 80240EC0 460010A1 */  cvt.d.s   $f2, $f2
 /* CCC1D4 80240EC4 46201082 */  mul.d     $f2, $f2, $f0
 /* CCC1D8 80240EC8 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241764_CCCA74.s b/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241764_CCCA74.s
index cebc459569..7fb74cc49e 100644
--- a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241764_CCCA74.s
+++ b/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241764_CCCA74.s
@@ -15,9 +15,9 @@ glabel func_80241764_CCCA74
 /* CCCA9C 8024178C 00031C00 */  sll       $v1, $v1, 0x10
 /* CCCAA0 80241790 00031B83 */  sra       $v1, $v1, 0xe
 /* CCCAA4 80241794 A444008E */  sh        $a0, 0x8e($v0)
-/* CCCAA8 80241798 3C018024 */  lui       $at, 0x8024
+/* CCCAA8 80241798 3C018024 */  lui       $at, %hi(D_802444C0)
 /* CCCAAC 8024179C 00230821 */  addu      $at, $at, $v1
-/* CCCAB0 802417A0 C42244C0 */  lwc1      $f2, 0x44c0($at)
+/* CCCAB0 802417A0 C42244C0 */  lwc1      $f2, %lo(D_802444C0)($at)
 /* CCCAB4 802417A4 8443008E */  lh        $v1, 0x8e($v0)
 /* CCCAB8 802417A8 46020000 */  add.s     $f0, $f0, $f2
 /* CCCABC 802417AC 28630005 */  slti      $v1, $v1, 5
diff --git a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241E1C_CCD12C.s b/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241E1C_CCD12C.s
index 26e4ce4c21..c113162dcb 100644
--- a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241E1C_CCD12C.s
+++ b/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241E1C_CCD12C.s
@@ -66,9 +66,9 @@ glabel func_80241E1C_CCD12C
 /* CCD218 80241F08 2C62000F */  sltiu     $v0, $v1, 0xf
 /* CCD21C 80241F0C 10400034 */  beqz      $v0, .L80241FE0
 /* CCD220 80241F10 00031080 */   sll      $v0, $v1, 2
-/* CCD224 80241F14 3C018024 */  lui       $at, 0x8024
+/* CCD224 80241F14 3C018024 */  lui       $at, %hi(D_80245368)
 /* CCD228 80241F18 00220821 */  addu      $at, $at, $v0
-/* CCD22C 80241F1C 8C225368 */  lw        $v0, 0x5368($at)
+/* CCD22C 80241F1C 8C225368 */  lw        $v0, %lo(D_80245368)($at)
 /* CCD230 80241F20 00400008 */  jr        $v0
 /* CCD234 80241F24 00000000 */   nop      
 /* CCD238 80241F28 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80242234_CCD544.s b/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80242234_CCD544.s
index 7cc2d395b7..4856be2e51 100644
--- a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80242234_CCD544.s
+++ b/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80242234_CCD544.s
@@ -6,11 +6,11 @@ glabel func_80242234_CCD544
 /* CCD548 80242238 AFBF0010 */  sw        $ra, 0x10($sp)
 /* CCD54C 8024223C 10A00003 */  beqz      $a1, .L8024224C
 /* CCD550 80242240 8C86000C */   lw       $a2, 0xc($a0)
-/* CCD554 80242244 3C018024 */  lui       $at, 0x8024
-/* CCD558 80242248 AC2045FC */  sw        $zero, 0x45fc($at)
+/* CCD554 80242244 3C018024 */  lui       $at, %hi(D_802445FC)
+/* CCD558 80242248 AC2045FC */  sw        $zero, %lo(D_802445FC)($at)
 .L8024224C:
-/* CCD55C 8024224C 3C038024 */  lui       $v1, 0x8024
-/* CCD560 80242250 246345FC */  addiu     $v1, $v1, 0x45fc
+/* CCD55C 8024224C 3C038024 */  lui       $v1, %hi(D_802445FC)
+/* CCD560 80242250 246345FC */  addiu     $v1, $v1, %lo(D_802445FC)
 /* CCD564 80242254 8C620000 */  lw        $v0, ($v1)
 /* CCD568 80242258 54400003 */  bnel      $v0, $zero, .L80242268
 /* CCD56C 8024225C AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_80242234_CCD544
 /* CCD574 80242264 0000102D */   daddu    $v0, $zero, $zero
 .L80242268:
 /* CCD578 80242268 8CC50000 */  lw        $a1, ($a2)
-/* CCD57C 8024226C 3C068024 */  lui       $a2, 0x8024
+/* CCD57C 8024226C 3C068024 */  lui       $a2, %hi(D_80244600)
 /* CCD580 80242270 0C0B2026 */  jal       set_variable
-/* CCD584 80242274 8CC64600 */   lw       $a2, 0x4600($a2)
+/* CCD584 80242274 8CC64600 */   lw       $a2, %lo(D_80244600)($a2)
 /* CCD588 80242278 24020002 */  addiu     $v0, $zero, 2
 .L8024227C:
 /* CCD58C 8024227C 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80242288_CCD598.s b/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80242288_CCD598.s
index 4fe30675ed..8ff5996baf 100644
--- a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80242288_CCD598.s
+++ b/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80242288_CCD598.s
@@ -7,12 +7,12 @@ glabel func_80242288_CCD598
 /* CCD5A0 80242290 8C82000C */  lw        $v0, 0xc($a0)
 /* CCD5A4 80242294 0C0B1EAF */  jal       get_variable
 /* CCD5A8 80242298 8C450000 */   lw       $a1, ($v0)
-/* CCD5AC 8024229C 3C018024 */  lui       $at, 0x8024
-/* CCD5B0 802422A0 AC224600 */  sw        $v0, 0x4600($at)
+/* CCD5AC 8024229C 3C018024 */  lui       $at, %hi(D_80244600)
+/* CCD5B0 802422A0 AC224600 */  sw        $v0, %lo(D_80244600)($at)
 /* CCD5B4 802422A4 24020002 */  addiu     $v0, $zero, 2
 /* CCD5B8 802422A8 8FBF0010 */  lw        $ra, 0x10($sp)
 /* CCD5BC 802422AC 24030001 */  addiu     $v1, $zero, 1
-/* CCD5C0 802422B0 3C018024 */  lui       $at, 0x8024
-/* CCD5C4 802422B4 AC2345FC */  sw        $v1, 0x45fc($at)
+/* CCD5C0 802422B0 3C018024 */  lui       $at, %hi(D_802445FC)
+/* CCD5C4 802422B4 AC2345FC */  sw        $v1, %lo(D_802445FC)($at)
 /* CCD5C8 802422B8 03E00008 */  jr        $ra
 /* CCD5CC 802422BC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_802422C0_CCD5D0.s b/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_802422C0_CCD5D0.s
index 8cb6116e94..6831e91172 100644
--- a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_802422C0_CCD5D0.s
+++ b/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_802422C0_CCD5D0.s
@@ -13,8 +13,8 @@ glabel func_802422C0_CCD5D0
 /* CCD5F0 802422E0 8C620000 */  lw        $v0, ($v1)
 /* CCD5F4 802422E4 5040000A */  beql      $v0, $zero, .L80242310
 /* CCD5F8 802422E8 00041080 */   sll      $v0, $a0, 2
-/* CCD5FC 802422EC 3C058024 */  lui       $a1, 0x8024
-/* CCD600 802422F0 24A553B0 */  addiu     $a1, $a1, 0x53b0
+/* CCD5FC 802422EC 3C058024 */  lui       $a1, %hi(D_802453B0)
+/* CCD600 802422F0 24A553B0 */  addiu     $a1, $a1, %lo(D_802453B0)
 .L802422F4:
 /* CCD604 802422F4 24630004 */  addiu     $v1, $v1, 4
 /* CCD608 802422F8 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_802422C0_CCD5D0
 /* CCD618 80242308 24A50004 */   addiu    $a1, $a1, 4
 /* CCD61C 8024230C 00041080 */  sll       $v0, $a0, 2
 .L80242310:
-/* CCD620 80242310 3C018024 */  lui       $at, 0x8024
+/* CCD620 80242310 3C018024 */  lui       $at, %hi(D_802453B0)
 /* CCD624 80242314 00220821 */  addu      $at, $at, $v0
-/* CCD628 80242318 AC2053B0 */  sw        $zero, 0x53b0($at)
+/* CCD628 80242318 AC2053B0 */  sw        $zero, %lo(D_802453B0)($at)
 /* CCD62C 8024231C 080908D3 */  j         .L8024234C
 /* CCD630 80242320 00000000 */   nop      
 .L80242324:
-/* CCD634 80242324 3C038024 */  lui       $v1, 0x8024
-/* CCD638 80242328 246353B0 */  addiu     $v1, $v1, 0x53b0
+/* CCD634 80242324 3C038024 */  lui       $v1, %hi(D_802453B0)
+/* CCD638 80242328 246353B0 */  addiu     $v1, $v1, %lo(D_802453B0)
 /* CCD63C 8024232C 0060282D */  daddu     $a1, $v1, $zero
 .L80242330:
 /* CCD640 80242330 24820080 */  addiu     $v0, $a0, 0x80
diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_802402AC_CD20DC.s b/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_802402AC_CD20DC.s
index f0f8d2470c..22ded36531 100644
--- a/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_802402AC_CD20DC.s
+++ b/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_802402AC_CD20DC.s
@@ -22,12 +22,12 @@ glabel func_802402AC_CD20DC
 /* CD2120 802402F0 0040982D */  daddu     $s3, $v0, $zero
 /* CD2124 802402F4 0000B02D */  daddu     $s6, $zero, $zero
 /* CD2128 802402F8 02C0902D */  daddu     $s2, $s6, $zero
-/* CD212C 802402FC 3C148024 */  lui       $s4, 0x8024
-/* CD2130 80240300 26943708 */  addiu     $s4, $s4, 0x3708
+/* CD212C 802402FC 3C148024 */  lui       $s4, %hi(D_80243708)
+/* CD2130 80240300 26943708 */  addiu     $s4, $s4, %lo(D_80243708)
 /* CD2134 80240304 0260882D */  daddu     $s1, $s3, $zero
 /* CD2138 80240308 8EA200B4 */  lw        $v0, 0xb4($s5)
-/* CD213C 8024030C 3C038024 */  lui       $v1, 0x8024
-/* CD2140 80240310 24633700 */  addiu     $v1, $v1, 0x3700
+/* CD213C 8024030C 3C038024 */  lui       $v1, %hi(D_80243700)
+/* CD2140 80240310 24633700 */  addiu     $v1, $v1, %lo(D_80243700)
 /* CD2144 80240314 AEB30078 */  sw        $s3, 0x78($s5)
 /* CD2148 80240318 00021027 */  nor       $v0, $zero, $v0
 /* CD214C 8024031C 0002BFC2 */  srl       $s7, $v0, 0x1f
@@ -42,8 +42,8 @@ glabel func_802402AC_CD20DC
 /* CD216C 8024033C 5040002E */  beql      $v0, $zero, .L802403F8
 /* CD2170 80240340 26520001 */   addiu    $s2, $s2, 1
 /* CD2174 80240344 00101100 */  sll       $v0, $s0, 4
-/* CD2178 80240348 3C068009 */  lui       $a2, 0x8009
-/* CD217C 8024034C 24C6EF20 */  addiu     $a2, $a2, -0x10e0
+/* CD2178 80240348 3C068009 */  lui       $a2, %hi(D_8008EF20)
+/* CD217C 8024034C 24C6EF20 */  addiu     $a2, $a2, %lo(D_8008EF20)
 /* CD2180 80240350 00461021 */  addu      $v0, $v0, $a2
 /* CD2184 80240354 0200202D */  daddu     $a0, $s0, $zero
 /* CD2188 80240358 AE300108 */  sw        $s0, 0x108($s1)
@@ -54,15 +54,15 @@ glabel func_802402AC_CD20DC
 /* CD219C 8024036C 0040202D */  daddu     $a0, $v0, $zero
 /* CD21A0 80240370 04800011 */  bltz      $a0, .L802403B8
 /* CD21A4 80240374 00101080 */   sll      $v0, $s0, 2
-/* CD21A8 80240378 3C06800F */  lui       $a2, 0x800f
-/* CD21AC 8024037C 24C67F00 */  addiu     $a2, $a2, 0x7f00
+/* CD21A8 80240378 3C06800F */  lui       $a2, %hi(D_800F7F00)
+/* CD21AC 8024037C 24C67F00 */  addiu     $a2, $a2, %lo(D_800F7F00)
 /* CD21B0 80240380 00461021 */  addu      $v0, $v0, $a2
 /* CD21B4 80240384 8C430000 */  lw        $v1, ($v0)
 /* CD21B8 80240388 24020001 */  addiu     $v0, $zero, 1
 /* CD21BC 8024038C AE22018C */  sw        $v0, 0x18c($s1)
 /* CD21C0 80240390 00041080 */  sll       $v0, $a0, 2
-/* CD21C4 80240394 3C068024 */  lui       $a2, 0x8024
-/* CD21C8 80240398 24C63718 */  addiu     $a2, $a2, 0x3718
+/* CD21C4 80240394 3C068024 */  lui       $a2, %hi(D_80243718)
+/* CD21C8 80240398 24C63718 */  addiu     $a2, $a2, %lo(D_80243718)
 /* CD21CC 8024039C AE230000 */  sw        $v1, ($s1)
 /* CD21D0 802403A0 001218C0 */  sll       $v1, $s2, 3
 /* CD21D4 802403A4 00431021 */  addu      $v0, $v0, $v1
@@ -71,8 +71,8 @@ glabel func_802402AC_CD20DC
 /* CD21E0 802403B0 080900F7 */  j         .L802403DC
 /* CD21E4 802403B4 AE220294 */   sw       $v0, 0x294($s1)
 .L802403B8:
-/* CD21E8 802403B8 3C06800F */  lui       $a2, 0x800f
-/* CD21EC 802403BC 24C67F40 */  addiu     $a2, $a2, 0x7f40
+/* CD21E8 802403B8 3C06800F */  lui       $a2, %hi(D_800F7F40)
+/* CD21EC 802403BC 24C67F40 */  addiu     $a2, $a2, %lo(D_800F7F40)
 /* CD21F0 802403C0 00461021 */  addu      $v0, $v0, $a2
 /* CD21F4 802403C4 8C420000 */  lw        $v0, ($v0)
 /* CD21F8 802403C8 AE20018C */  sw        $zero, 0x18c($s1)
@@ -130,9 +130,9 @@ glabel func_802402AC_CD20DC
 /* CD22B0 80240480 02621021 */  addu      $v0, $s3, $v0
 /* CD22B4 80240484 8C420108 */  lw        $v0, 0x108($v0)
 /* CD22B8 80240488 00021100 */  sll       $v0, $v0, 4
-/* CD22BC 8024048C 3C038009 */  lui       $v1, 0x8009
+/* CD22BC 8024048C 3C038009 */  lui       $v1, %hi(D_8008EF20)
 /* CD22C0 80240490 00621821 */  addu      $v1, $v1, $v0
-/* CD22C4 80240494 8C63EF20 */  lw        $v1, -0x10e0($v1)
+/* CD22C4 80240494 8C63EF20 */  lw        $v1, %lo(D_8008EF20)($v1)
 /* CD22C8 80240498 8EA20074 */  lw        $v0, 0x74($s5)
 /* CD22CC 8024049C 2442FFFF */  addiu     $v0, $v0, -1
 /* CD22D0 802404A0 00021080 */  sll       $v0, $v0, 2
diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240528_CD2358.s b/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240528_CD2358.s
index 8c9e36a0d3..35966456fa 100644
--- a/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240528_CD2358.s
+++ b/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240528_CD2358.s
@@ -7,9 +7,9 @@ glabel func_80240528_CD2358
 /* CD2360 80240530 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* CD2364 80240534 AFBF0010 */  sw        $ra, 0x10($sp)
 /* CD2368 80240538 00021100 */  sll       $v0, $v0, 4
-/* CD236C 8024053C 3C048009 */  lui       $a0, 0x8009
+/* CD236C 8024053C 3C048009 */  lui       $a0, %hi(D_8008EF20)
 /* CD2370 80240540 00822021 */  addu      $a0, $a0, $v0
-/* CD2374 80240544 8C84EF20 */  lw        $a0, -0x10e0($a0)
+/* CD2374 80240544 8C84EF20 */  lw        $a0, %lo(D_8008EF20)($a0)
 /* CD2378 80240548 0C0496CF */  jal       set_message_string
 /* CD237C 8024054C 0000282D */   daddu    $a1, $zero, $zero
 /* CD2380 80240550 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_802406E0_CD2510.s b/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_802406E0_CD2510.s
index e22f346e98..a11c5abf48 100644
--- a/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_802406E0_CD2510.s
+++ b/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_802406E0_CD2510.s
@@ -30,9 +30,9 @@ glabel func_802406E0_CD2510
 /* CD2574 80240744 000320C0 */  sll       $a0, $v1, 3
 /* CD2578 80240748 00641821 */  addu      $v1, $v1, $a0
 /* CD257C 8024074C 000318C0 */  sll       $v1, $v1, 3
-/* CD2580 80240750 3C01800B */  lui       $at, 0x800b
+/* CD2580 80240750 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* CD2584 80240754 00230821 */  addu      $at, $at, $v1
-/* CD2588 80240758 C42C1DEC */  lwc1      $f12, 0x1dec($at)
+/* CD2588 80240758 C42C1DEC */  lwc1      $f12, %lo(D_800B1DEC)($at)
 /* CD258C 8024075C 0C00A88D */  jal       sin_cos_deg
 /* CD2590 80240760 0040A82D */   daddu    $s5, $v0, $zero
 /* CD2594 80240764 1200005D */  beqz      $s0, .L802408DC
@@ -79,8 +79,8 @@ glabel func_802406E0_CD2510
 /* CD2634 80240804 26100004 */   addiu    $s0, $s0, 4
 /* CD2638 80240808 0000882D */  daddu     $s1, $zero, $zero
 /* CD263C 8024080C 0240802D */  daddu     $s0, $s2, $zero
-/* CD2640 80240810 3C148024 */  lui       $s4, 0x8024
-/* CD2644 80240814 26943758 */  addiu     $s4, $s4, 0x3758
+/* CD2640 80240810 3C148024 */  lui       $s4, %hi(D_80243758)
+/* CD2644 80240814 26943758 */  addiu     $s4, $s4, %lo(D_80243758)
 /* CD2648 80240818 3C014248 */  lui       $at, 0x4248
 /* CD264C 8024081C 4481A000 */  mtc1      $at, $f20
 /* CD2650 80240820 24130044 */  addiu     $s3, $zero, 0x44
@@ -150,8 +150,8 @@ glabel func_802406E0_CD2510
 /* CD2744 80240914 00000000 */   nop      
 .L80240918:
 /* CD2748 80240918 0000882D */  daddu     $s1, $zero, $zero
-/* CD274C 8024091C 3C148024 */  lui       $s4, 0x8024
-/* CD2750 80240920 26943758 */  addiu     $s4, $s4, 0x3758
+/* CD274C 8024091C 3C148024 */  lui       $s4, %hi(D_80243758)
+/* CD2750 80240920 26943758 */  addiu     $s4, $s4, %lo(D_80243758)
 /* CD2754 80240924 24130020 */  addiu     $s3, $zero, 0x20
 /* CD2758 80240928 3C064248 */  lui       $a2, 0x4248
 /* CD275C 8024092C 44800000 */  mtc1      $zero, $f0
@@ -197,8 +197,8 @@ glabel func_802406E0_CD2510
 /* CD27F8 802409C8 AE400060 */   sw       $zero, 0x60($s2)
 .L802409CC:
 /* CD27FC 802409CC 0000882D */  daddu     $s1, $zero, $zero
-/* CD2800 802409D0 3C148024 */  lui       $s4, 0x8024
-/* CD2804 802409D4 26943758 */  addiu     $s4, $s4, 0x3758
+/* CD2800 802409D0 3C148024 */  lui       $s4, %hi(D_80243758)
+/* CD2804 802409D4 26943758 */  addiu     $s4, $s4, %lo(D_80243758)
 /* CD2808 802409D8 24130020 */  addiu     $s3, $zero, 0x20
 /* CD280C 802409DC 0240802D */  daddu     $s0, $s2, $zero
 /* CD2810 802409E0 3C014248 */  lui       $at, 0x4248
diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80240E50_CD2C80.s b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80240E50_CD2C80.s
index 0297271238..07ca94cddd 100644
--- a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80240E50_CD2C80.s
+++ b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80240E50_CD2C80.s
@@ -87,8 +87,8 @@ glabel func_80240E50_CD2C80
 /* CD2DC0 80240F90 080903EE */  j         .L80240FB8
 /* CD2DC4 80240F94 E6000018 */   swc1     $f0, 0x18($s0)
 .L80240F98:
-/* CD2DC8 80240F98 3C018024 */  lui       $at, 0x8024
-/* CD2DCC 80240F9C D42253F0 */  ldc1      $f2, 0x53f0($at)
+/* CD2DC8 80240F98 3C018024 */  lui       $at, %hi(D_802453F0)
+/* CD2DCC 80240F9C D42253F0 */  ldc1      $f2, %lo(D_802453F0)($at)
 /* CD2DD0 80240FA0 44820000 */  mtc1      $v0, $f0
 /* CD2DD4 80240FA4 00000000 */  nop       
 /* CD2DD8 80240FA8 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80241000_CD2E30.s b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80241000_CD2E30.s
index 11861f2409..0e4013257b 100644
--- a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80241000_CD2E30.s
+++ b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80241000_CD2E30.s
@@ -104,8 +104,8 @@ glabel func_80241000_CD2E30
 /* CD2FB4 80241184 1040000A */  beqz      $v0, .L802411B0
 /* CD2FB8 80241188 4600C106 */   mov.s    $f4, $f24
 /* CD2FBC 8024118C 4614C081 */  sub.s     $f2, $f24, $f20
-/* CD2FC0 80241190 3C018024 */  lui       $at, 0x8024
-/* CD2FC4 80241194 D42053F8 */  ldc1      $f0, 0x53f8($at)
+/* CD2FC0 80241190 3C018024 */  lui       $at, %hi(D_802453F8)
+/* CD2FC4 80241194 D42053F8 */  ldc1      $f0, %lo(D_802453F8)($at)
 /* CD2FC8 80241198 460010A1 */  cvt.d.s   $f2, $f2
 /* CD2FCC 8024119C 46201082 */  mul.d     $f2, $f2, $f0
 /* CD2FD0 802411A0 00000000 */  nop       
@@ -131,8 +131,8 @@ glabel func_80241000_CD2E30
 /* CD301C 802411EC C7A4002C */  lwc1      $f4, 0x2c($sp)
 /* CD3020 802411F0 461A2100 */  add.s     $f4, $f4, $f26
 /* CD3024 802411F4 46142081 */  sub.s     $f2, $f4, $f20
-/* CD3028 802411F8 3C018024 */  lui       $at, 0x8024
-/* CD302C 802411FC D4205400 */  ldc1      $f0, 0x5400($at)
+/* CD3028 802411F8 3C018024 */  lui       $at, %hi(D_80245400)
+/* CD302C 802411FC D4205400 */  ldc1      $f0, %lo(D_80245400)($at)
 /* CD3030 80241200 460010A1 */  cvt.d.s   $f2, $f2
 /* CD3034 80241204 46201082 */  mul.d     $f2, $f2, $f0
 /* CD3038 80241208 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80241AA4_CD38D4.s b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80241AA4_CD38D4.s
index 5eb35dea0a..0b9f077a26 100644
--- a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80241AA4_CD38D4.s
+++ b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80241AA4_CD38D4.s
@@ -15,9 +15,9 @@ glabel func_80241AA4_CD38D4
 /* CD38FC 80241ACC 00031C00 */  sll       $v1, $v1, 0x10
 /* CD3900 80241AD0 00031B83 */  sra       $v1, $v1, 0xe
 /* CD3904 80241AD4 A444008E */  sh        $a0, 0x8e($v0)
-/* CD3908 80241AD8 3C018024 */  lui       $at, 0x8024
+/* CD3908 80241AD8 3C018024 */  lui       $at, %hi(D_80244010)
 /* CD390C 80241ADC 00230821 */  addu      $at, $at, $v1
-/* CD3910 80241AE0 C4224010 */  lwc1      $f2, 0x4010($at)
+/* CD3910 80241AE0 C4224010 */  lwc1      $f2, %lo(D_80244010)($at)
 /* CD3914 80241AE4 8443008E */  lh        $v1, 0x8e($v0)
 /* CD3918 80241AE8 46020000 */  add.s     $f0, $f0, $f2
 /* CD391C 80241AEC 28630005 */  slti      $v1, $v1, 5
diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_8024215C_CD3F8C.s b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_8024215C_CD3F8C.s
index 27f1a80f7d..0f38d616e5 100644
--- a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_8024215C_CD3F8C.s
+++ b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_8024215C_CD3F8C.s
@@ -66,9 +66,9 @@ glabel func_8024215C_CD3F8C
 /* CD4078 80242248 2C62000F */  sltiu     $v0, $v1, 0xf
 /* CD407C 8024224C 10400034 */  beqz      $v0, .L80242320
 /* CD4080 80242250 00031080 */   sll      $v0, $v1, 2
-/* CD4084 80242254 3C018024 */  lui       $at, 0x8024
+/* CD4084 80242254 3C018024 */  lui       $at, %hi(D_80245408)
 /* CD4088 80242258 00220821 */  addu      $at, $at, $v0
-/* CD408C 8024225C 8C225408 */  lw        $v0, 0x5408($at)
+/* CD408C 8024225C 8C225408 */  lw        $v0, %lo(D_80245408)($at)
 /* CD4090 80242260 00400008 */  jr        $v0
 /* CD4094 80242264 00000000 */   nop      
 /* CD4098 80242268 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242478_CD42A8.s b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242478_CD42A8.s
index 10170fb398..ec4d646ea1 100644
--- a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242478_CD42A8.s
+++ b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242478_CD42A8.s
@@ -142,8 +142,8 @@ glabel func_80242478_CD42A8
 /* CD44C0 80242690 4500000A */  bc1f      .L802426BC
 /* CD44C4 80242694 00000000 */   nop      
 .L80242698:
-/* CD44C8 80242698 3C018024 */  lui       $at, 0x8024
-/* CD44CC 8024269C D4225448 */  ldc1      $f2, 0x5448($at)
+/* CD44C8 80242698 3C018024 */  lui       $at, %hi(D_80245448)
+/* CD44CC 8024269C D4225448 */  ldc1      $f2, %lo(D_80245448)($at)
 /* CD44D0 802426A0 46003187 */  neg.s     $f6, $f6
 /* CD44D4 802426A4 46003021 */  cvt.d.s   $f0, $f6
 /* CD44D8 802426A8 46220002 */  mul.d     $f0, $f0, $f2
diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242754_CD4584.s b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242754_CD4584.s
index 624bb7e93c..2e8f18ab38 100644
--- a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242754_CD4584.s
+++ b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242754_CD4584.s
@@ -67,9 +67,9 @@ glabel func_80242754_CD4584
 /* CD4674 80242844 2C620015 */  sltiu     $v0, $v1, 0x15
 /* CD4678 80242848 10400032 */  beqz      $v0, .L80242914
 /* CD467C 8024284C 00031080 */   sll      $v0, $v1, 2
-/* CD4680 80242850 3C018024 */  lui       $at, 0x8024
+/* CD4680 80242850 3C018024 */  lui       $at, %hi(D_80245450)
 /* CD4684 80242854 00220821 */  addu      $at, $at, $v0
-/* CD4688 80242858 8C225450 */  lw        $v0, 0x5450($at)
+/* CD4688 80242858 8C225450 */  lw        $v0, %lo(D_80245450)($at)
 /* CD468C 8024285C 00400008 */  jr        $v0
 /* CD4690 80242860 00000000 */   nop      
 /* CD4694 80242864 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240070_CD7350.s b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240070_CD7350.s
index 8d6af1eb7d..c738096150 100644
--- a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240070_CD7350.s
+++ b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240070_CD7350.s
@@ -87,8 +87,8 @@ glabel func_80240070_CD7350
 /* CD7490 802401B0 08090076 */  j         .L802401D8
 /* CD7494 802401B4 E6000018 */   swc1     $f0, 0x18($s0)
 .L802401B8:
-/* CD7498 802401B8 3C018024 */  lui       $at, 0x8024
-/* CD749C 802401BC D4225300 */  ldc1      $f2, 0x5300($at)
+/* CD7498 802401B8 3C018024 */  lui       $at, %hi(D_80245300)
+/* CD749C 802401BC D4225300 */  ldc1      $f2, %lo(D_80245300)($at)
 /* CD74A0 802401C0 44820000 */  mtc1      $v0, $f0
 /* CD74A4 802401C4 00000000 */  nop       
 /* CD74A8 802401C8 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240220_CD7500.s b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240220_CD7500.s
index 6faa34d14f..cd75a848b0 100644
--- a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240220_CD7500.s
+++ b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240220_CD7500.s
@@ -104,8 +104,8 @@ glabel func_80240220_CD7500
 /* CD7684 802403A4 1040000A */  beqz      $v0, .L802403D0
 /* CD7688 802403A8 4600C106 */   mov.s    $f4, $f24
 /* CD768C 802403AC 4614C081 */  sub.s     $f2, $f24, $f20
-/* CD7690 802403B0 3C018024 */  lui       $at, 0x8024
-/* CD7694 802403B4 D4205308 */  ldc1      $f0, 0x5308($at)
+/* CD7690 802403B0 3C018024 */  lui       $at, %hi(D_80245308)
+/* CD7694 802403B4 D4205308 */  ldc1      $f0, %lo(D_80245308)($at)
 /* CD7698 802403B8 460010A1 */  cvt.d.s   $f2, $f2
 /* CD769C 802403BC 46201082 */  mul.d     $f2, $f2, $f0
 /* CD76A0 802403C0 00000000 */  nop       
@@ -131,8 +131,8 @@ glabel func_80240220_CD7500
 /* CD76EC 8024040C C7A4002C */  lwc1      $f4, 0x2c($sp)
 /* CD76F0 80240410 461A2100 */  add.s     $f4, $f4, $f26
 /* CD76F4 80240414 46142081 */  sub.s     $f2, $f4, $f20
-/* CD76F8 80240418 3C018024 */  lui       $at, 0x8024
-/* CD76FC 8024041C D4205310 */  ldc1      $f0, 0x5310($at)
+/* CD76F8 80240418 3C018024 */  lui       $at, %hi(D_80245310)
+/* CD76FC 8024041C D4205310 */  ldc1      $f0, %lo(D_80245310)($at)
 /* CD7700 80240420 460010A1 */  cvt.d.s   $f2, $f2
 /* CD7704 80240424 46201082 */  mul.d     $f2, $f2, $f0
 /* CD7708 80240428 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240CC4_CD7FA4.s b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240CC4_CD7FA4.s
index 9288bb15a3..420da0c27a 100644
--- a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240CC4_CD7FA4.s
+++ b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240CC4_CD7FA4.s
@@ -15,9 +15,9 @@ glabel func_80240CC4_CD7FA4
 /* CD7FCC 80240CEC 00031C00 */  sll       $v1, $v1, 0x10
 /* CD7FD0 80240CF0 00031B83 */  sra       $v1, $v1, 0xe
 /* CD7FD4 80240CF4 A444008E */  sh        $a0, 0x8e($v0)
-/* CD7FD8 80240CF8 3C018024 */  lui       $at, 0x8024
+/* CD7FD8 80240CF8 3C018024 */  lui       $at, %hi(D_8024440C)
 /* CD7FDC 80240CFC 00230821 */  addu      $at, $at, $v1
-/* CD7FE0 80240D00 C422440C */  lwc1      $f2, 0x440c($at)
+/* CD7FE0 80240D00 C422440C */  lwc1      $f2, %lo(D_8024440C)($at)
 /* CD7FE4 80240D04 8443008E */  lh        $v1, 0x8e($v0)
 /* CD7FE8 80240D08 46020000 */  add.s     $f0, $f0, $f2
 /* CD7FEC 80240D0C 28630005 */  slti      $v1, $v1, 5
diff --git a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_8024137C_CD865C.s b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_8024137C_CD865C.s
index 17642be878..54e89e9904 100644
--- a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_8024137C_CD865C.s
+++ b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_8024137C_CD865C.s
@@ -66,9 +66,9 @@ glabel func_8024137C_CD865C
 /* CD8748 80241468 2C62000F */  sltiu     $v0, $v1, 0xf
 /* CD874C 8024146C 10400034 */  beqz      $v0, .L80241540
 /* CD8750 80241470 00031080 */   sll      $v0, $v1, 2
-/* CD8754 80241474 3C018024 */  lui       $at, 0x8024
+/* CD8754 80241474 3C018024 */  lui       $at, %hi(D_80245318)
 /* CD8758 80241478 00220821 */  addu      $at, $at, $v0
-/* CD875C 8024147C 8C225318 */  lw        $v0, 0x5318($at)
+/* CD875C 8024147C 8C225318 */  lw        $v0, %lo(D_80245318)($at)
 /* CD8760 80241480 00400008 */  jr        $v0
 /* CD8764 80241484 00000000 */   nop      
 /* CD8768 80241488 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_802421C0_CD94A0.s b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_802421C0_CD94A0.s
index 2ee94ffdb6..db694c13cb 100644
--- a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_802421C0_CD94A0.s
+++ b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_802421C0_CD94A0.s
@@ -55,8 +55,8 @@ glabel func_802421C0_CD94A0
 /* CD955C 8024227C 8C470030 */   lw       $a3, 0x30($v0)
 /* CD9560 80242280 C6020018 */  lwc1      $f2, 0x18($s0)
 /* CD9564 80242284 46020003 */  div.s     $f0, $f0, $f2
-/* CD9568 80242288 3C018024 */  lui       $at, 0x8024
-/* CD956C 8024228C D4225358 */  ldc1      $f2, 0x5358($at)
+/* CD9568 80242288 3C018024 */  lui       $at, %hi(D_80245358)
+/* CD956C 8024228C D4225358 */  ldc1      $f2, %lo(D_80245358)($at)
 /* CD9570 80242290 46000021 */  cvt.d.s   $f0, $f0
 /* CD9574 80242294 46220000 */  add.d     $f0, $f0, $f2
 /* CD9578 80242298 4620010D */  trunc.w.d $f4, $f0
diff --git a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_802424D8_CD97B8.s b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_802424D8_CD97B8.s
index 8d41f9d02b..ce2b28ea9f 100644
--- a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_802424D8_CD97B8.s
+++ b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_802424D8_CD97B8.s
@@ -279,9 +279,9 @@ glabel func_802424D8_CD97B8
 /* CD9BA4 802428C4 2C620015 */  sltiu     $v0, $v1, 0x15
 /* CD9BA8 802428C8 10400009 */  beqz      $v0, .L802428F0
 /* CD9BAC 802428CC 00031080 */   sll      $v0, $v1, 2
-/* CD9BB0 802428D0 3C018024 */  lui       $at, 0x8024
+/* CD9BB0 802428D0 3C018024 */  lui       $at, %hi(D_80245360)
 /* CD9BB4 802428D4 00220821 */  addu      $at, $at, $v0
-/* CD9BB8 802428D8 8C225360 */  lw        $v0, 0x5360($at)
+/* CD9BB8 802428D8 8C225360 */  lw        $v0, %lo(D_80245360)($at)
 /* CD9BBC 802428DC 00400008 */  jr        $v0
 /* CD9BC0 802428E0 00000000 */   nop      
 /* CD9BC4 802428E4 8E420028 */  lw        $v0, 0x28($s2)
diff --git a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80242918_CD9BF8.s b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80242918_CD9BF8.s
index 0a9d63589b..c9259e4003 100644
--- a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80242918_CD9BF8.s
+++ b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80242918_CD9BF8.s
@@ -301,8 +301,8 @@ glabel func_80242918_CD9BF8
 /* CDA03C 80242D5C 0C00EABB */  jal       get_npc_unsafe
 /* CDA040 80242D60 84440008 */   lh       $a0, 8($v0)
 /* CDA044 80242D64 C440000C */  lwc1      $f0, 0xc($v0)
-/* CDA048 80242D68 3C018024 */  lui       $at, 0x8024
-/* CDA04C 80242D6C D42253B8 */  ldc1      $f2, 0x53b8($at)
+/* CDA048 80242D68 3C018024 */  lui       $at, %hi(D_802453B8)
+/* CDA04C 80242D6C D42253B8 */  ldc1      $f2, %lo(D_802453B8)($at)
 /* CDA050 80242D70 46000021 */  cvt.d.s   $f0, $f0
 /* CDA054 80242D74 4622003C */  c.lt.d    $f0, $f2
 /* CDA058 80242D78 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_flo/flo_21/CE6700/func_802401AC_CE68AC.s b/asm/nonmatchings/world/area_flo/flo_21/CE6700/func_802401AC_CE68AC.s
index 64455463ad..959b52b7f3 100644
--- a/asm/nonmatchings/world/area_flo/flo_21/CE6700/func_802401AC_CE68AC.s
+++ b/asm/nonmatchings/world/area_flo/flo_21/CE6700/func_802401AC_CE68AC.s
@@ -13,9 +13,9 @@ glabel func_802401AC_CE68AC
 /* CE68CC 802401CC 2C620005 */  sltiu     $v0, $v1, 5
 /* CE68D0 802401D0 1040008A */  beqz      $v0, .L802403FC
 /* CE68D4 802401D4 00031080 */   sll      $v0, $v1, 2
-/* CE68D8 802401D8 3C018024 */  lui       $at, 0x8024
+/* CE68D8 802401D8 3C018024 */  lui       $at, %hi(D_80245B10)
 /* CE68DC 802401DC 00220821 */  addu      $at, $at, $v0
-/* CE68E0 802401E0 8C225B10 */  lw        $v0, 0x5b10($at)
+/* CE68E0 802401E0 8C225B10 */  lw        $v0, %lo(D_80245B10)($at)
 /* CE68E4 802401E4 00400008 */  jr        $v0
 /* CE68E8 802401E8 00000000 */   nop      
 /* CE68EC 802401EC 8E22003C */  lw        $v0, 0x3c($s1)
diff --git a/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_8024026C_CEE4CC.s b/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_8024026C_CEE4CC.s
index 96d3c24c72..695730b9ef 100644
--- a/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_8024026C_CEE4CC.s
+++ b/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_8024026C_CEE4CC.s
@@ -6,11 +6,11 @@ glabel func_8024026C_CEE4CC
 /* CEE4D0 80240270 AFBF0010 */  sw        $ra, 0x10($sp)
 /* CEE4D4 80240274 10A00003 */  beqz      $a1, .L80240284
 /* CEE4D8 80240278 8C86000C */   lw       $a2, 0xc($a0)
-/* CEE4DC 8024027C 3C018024 */  lui       $at, 0x8024
-/* CEE4E0 80240280 AC20130C */  sw        $zero, 0x130c($at)
+/* CEE4DC 8024027C 3C018024 */  lui       $at, %hi(D_8024130C)
+/* CEE4E0 80240280 AC20130C */  sw        $zero, %lo(D_8024130C)($at)
 .L80240284:
-/* CEE4E4 80240284 3C038024 */  lui       $v1, 0x8024
-/* CEE4E8 80240288 2463130C */  addiu     $v1, $v1, 0x130c
+/* CEE4E4 80240284 3C038024 */  lui       $v1, %hi(D_8024130C)
+/* CEE4E8 80240288 2463130C */  addiu     $v1, $v1, %lo(D_8024130C)
 /* CEE4EC 8024028C 8C620000 */  lw        $v0, ($v1)
 /* CEE4F0 80240290 54400003 */  bnel      $v0, $zero, .L802402A0
 /* CEE4F4 80240294 AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_8024026C_CEE4CC
 /* CEE4FC 8024029C 0000102D */   daddu    $v0, $zero, $zero
 .L802402A0:
 /* CEE500 802402A0 8CC50000 */  lw        $a1, ($a2)
-/* CEE504 802402A4 3C068024 */  lui       $a2, 0x8024
+/* CEE504 802402A4 3C068024 */  lui       $a2, %hi(D_80241310)
 /* CEE508 802402A8 0C0B2026 */  jal       set_variable
-/* CEE50C 802402AC 8CC61310 */   lw       $a2, 0x1310($a2)
+/* CEE50C 802402AC 8CC61310 */   lw       $a2, %lo(D_80241310)($a2)
 /* CEE510 802402B0 24020002 */  addiu     $v0, $zero, 2
 .L802402B4:
 /* CEE514 802402B4 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_802402C0_CEE520.s b/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_802402C0_CEE520.s
index 86ad0d1213..72a9879d38 100644
--- a/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_802402C0_CEE520.s
+++ b/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_802402C0_CEE520.s
@@ -7,12 +7,12 @@ glabel func_802402C0_CEE520
 /* CEE528 802402C8 8C82000C */  lw        $v0, 0xc($a0)
 /* CEE52C 802402CC 0C0B1EAF */  jal       get_variable
 /* CEE530 802402D0 8C450000 */   lw       $a1, ($v0)
-/* CEE534 802402D4 3C018024 */  lui       $at, 0x8024
-/* CEE538 802402D8 AC221310 */  sw        $v0, 0x1310($at)
+/* CEE534 802402D4 3C018024 */  lui       $at, %hi(D_80241310)
+/* CEE538 802402D8 AC221310 */  sw        $v0, %lo(D_80241310)($at)
 /* CEE53C 802402DC 24020002 */  addiu     $v0, $zero, 2
 /* CEE540 802402E0 8FBF0010 */  lw        $ra, 0x10($sp)
 /* CEE544 802402E4 24030001 */  addiu     $v1, $zero, 1
-/* CEE548 802402E8 3C018024 */  lui       $at, 0x8024
-/* CEE54C 802402EC AC23130C */  sw        $v1, 0x130c($at)
+/* CEE548 802402E8 3C018024 */  lui       $at, %hi(D_8024130C)
+/* CEE54C 802402EC AC23130C */  sw        $v1, %lo(D_8024130C)($at)
 /* CEE550 802402F0 03E00008 */  jr        $ra
 /* CEE554 802402F4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_802402F8_CEE558.s b/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_802402F8_CEE558.s
index 7545e041df..d48277b404 100644
--- a/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_802402F8_CEE558.s
+++ b/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_802402F8_CEE558.s
@@ -13,8 +13,8 @@ glabel func_802402F8_CEE558
 /* CEE578 80240318 8C620000 */  lw        $v0, ($v1)
 /* CEE57C 8024031C 5040000A */  beql      $v0, $zero, .L80240348
 /* CEE580 80240320 00041080 */   sll      $v0, $a0, 2
-/* CEE584 80240324 3C058024 */  lui       $a1, 0x8024
-/* CEE588 80240328 24A526E0 */  addiu     $a1, $a1, 0x26e0
+/* CEE584 80240324 3C058024 */  lui       $a1, %hi(D_802426E0)
+/* CEE588 80240328 24A526E0 */  addiu     $a1, $a1, %lo(D_802426E0)
 .L8024032C:
 /* CEE58C 8024032C 24630004 */  addiu     $v1, $v1, 4
 /* CEE590 80240330 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_802402F8_CEE558
 /* CEE5A0 80240340 24A50004 */   addiu    $a1, $a1, 4
 /* CEE5A4 80240344 00041080 */  sll       $v0, $a0, 2
 .L80240348:
-/* CEE5A8 80240348 3C018024 */  lui       $at, 0x8024
+/* CEE5A8 80240348 3C018024 */  lui       $at, %hi(D_802426E0)
 /* CEE5AC 8024034C 00220821 */  addu      $at, $at, $v0
-/* CEE5B0 80240350 AC2026E0 */  sw        $zero, 0x26e0($at)
+/* CEE5B0 80240350 AC2026E0 */  sw        $zero, %lo(D_802426E0)($at)
 /* CEE5B4 80240354 080900E1 */  j         .L80240384
 /* CEE5B8 80240358 00000000 */   nop      
 .L8024035C:
-/* CEE5BC 8024035C 3C038024 */  lui       $v1, 0x8024
-/* CEE5C0 80240360 246326E0 */  addiu     $v1, $v1, 0x26e0
+/* CEE5BC 8024035C 3C038024 */  lui       $v1, %hi(D_802426E0)
+/* CEE5C0 80240360 246326E0 */  addiu     $v1, $v1, %lo(D_802426E0)
 /* CEE5C4 80240364 0060282D */  daddu     $a1, $v1, $zero
 .L80240368:
 /* CEE5C8 80240368 24820080 */  addiu     $v0, $a0, 0x80
diff --git a/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240410_CEE670.s b/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240410_CEE670.s
index 83cb99fc40..ac8706b4d9 100644
--- a/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240410_CEE670.s
+++ b/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240410_CEE670.s
@@ -55,8 +55,8 @@ glabel func_80240410_CEE670
 /* CEE72C 802404CC 8C470030 */   lw       $a3, 0x30($v0)
 /* CEE730 802404D0 C6020018 */  lwc1      $f2, 0x18($s0)
 /* CEE734 802404D4 46020003 */  div.s     $f0, $f0, $f2
-/* CEE738 802404D8 3C018024 */  lui       $at, 0x8024
-/* CEE73C 802404DC D4222680 */  ldc1      $f2, 0x2680($at)
+/* CEE738 802404D8 3C018024 */  lui       $at, %hi(D_80242680)
+/* CEE73C 802404DC D4222680 */  ldc1      $f2, %lo(D_80242680)($at)
 /* CEE740 802404E0 46000021 */  cvt.d.s   $f0, $f0
 /* CEE744 802404E4 46220000 */  add.d     $f0, $f0, $f2
 /* CEE748 802404E8 4620010D */  trunc.w.d $f4, $f0
diff --git a/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240728_CEE988.s b/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240728_CEE988.s
index a32a87e55b..b80aa46f45 100644
--- a/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240728_CEE988.s
+++ b/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240728_CEE988.s
@@ -279,9 +279,9 @@ glabel func_80240728_CEE988
 /* CEED74 80240B14 2C620015 */  sltiu     $v0, $v1, 0x15
 /* CEED78 80240B18 10400009 */  beqz      $v0, .L80240B40
 /* CEED7C 80240B1C 00031080 */   sll      $v0, $v1, 2
-/* CEED80 80240B20 3C018024 */  lui       $at, 0x8024
+/* CEED80 80240B20 3C018024 */  lui       $at, %hi(D_80242688)
 /* CEED84 80240B24 00220821 */  addu      $at, $at, $v0
-/* CEED88 80240B28 8C222688 */  lw        $v0, 0x2688($at)
+/* CEED88 80240B28 8C222688 */  lw        $v0, %lo(D_80242688)($at)
 /* CEED8C 80240B2C 00400008 */  jr        $v0
 /* CEED90 80240B30 00000000 */   nop      
 /* CEED94 80240B34 8E420028 */  lw        $v0, 0x28($s2)
diff --git a/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240C9C_CEEEFC.s b/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240C9C_CEEEFC.s
index b5665b97e3..34dca1671e 100644
--- a/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240C9C_CEEEFC.s
+++ b/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240C9C_CEEEFC.s
@@ -3,8 +3,8 @@
 
 glabel func_80240C9C_CEEEFC
 /* CEEEFC 80240C9C 2404005A */  addiu     $a0, $zero, 0x5a
-/* CEEF00 80240CA0 3C038024 */  lui       $v1, 0x8024
-/* CEEF04 80240CA4 246329B8 */  addiu     $v1, $v1, 0x29b8
+/* CEEF00 80240CA0 3C038024 */  lui       $v1, %hi(D_802429B8)
+/* CEEF04 80240CA4 246329B8 */  addiu     $v1, $v1, %lo(D_802429B8)
 /* CEEF08 80240CA8 240200DA */  addiu     $v0, $zero, 0xda
 .L80240CAC:
 /* CEEF0C 80240CAC AC620000 */  sw        $v0, ($v1)
@@ -12,7 +12,7 @@ glabel func_80240C9C_CEEEFC
 /* CEEF14 80240CB4 2484FFFF */  addiu     $a0, $a0, -1
 /* CEEF18 80240CB8 0481FFFC */  bgez      $a0, .L80240CAC
 /* CEEF1C 80240CBC 2442FFFF */   addiu    $v0, $v0, -1
-/* CEEF20 80240CC0 3C018024 */  lui       $at, 0x8024
-/* CEEF24 80240CC4 AC2029BC */  sw        $zero, 0x29bc($at)
+/* CEEF20 80240CC0 3C018024 */  lui       $at, %hi(D_802429BC)
+/* CEEF24 80240CC4 AC2029BC */  sw        $zero, %lo(D_802429BC)($at)
 /* CEEF28 80240CC8 03E00008 */  jr        $ra
 /* CEEF2C 80240CCC 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80240040_CF2C10.s b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80240040_CF2C10.s
index 0a64be6e8b..7f72328abd 100644
--- a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80240040_CF2C10.s
+++ b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80240040_CF2C10.s
@@ -87,8 +87,8 @@ glabel func_80240040_CF2C10
 /* CF2D50 80240180 0809006A */  j         .L802401A8
 /* CF2D54 80240184 E6000018 */   swc1     $f0, 0x18($s0)
 .L80240188:
-/* CF2D58 80240188 3C018024 */  lui       $at, 0x8024
-/* CF2D5C 8024018C D4224EE0 */  ldc1      $f2, 0x4ee0($at)
+/* CF2D58 80240188 3C018024 */  lui       $at, %hi(D_80244EE0)
+/* CF2D5C 8024018C D4224EE0 */  ldc1      $f2, %lo(D_80244EE0)($at)
 /* CF2D60 80240190 44820000 */  mtc1      $v0, $f0
 /* CF2D64 80240194 00000000 */  nop       
 /* CF2D68 80240198 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_802401F0_CF2DC0.s b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_802401F0_CF2DC0.s
index bc840ed0f3..93f2cd1faa 100644
--- a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_802401F0_CF2DC0.s
+++ b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_802401F0_CF2DC0.s
@@ -104,8 +104,8 @@ glabel func_802401F0_CF2DC0
 /* CF2F44 80240374 1040000A */  beqz      $v0, .L802403A0
 /* CF2F48 80240378 4600C106 */   mov.s    $f4, $f24
 /* CF2F4C 8024037C 4614C081 */  sub.s     $f2, $f24, $f20
-/* CF2F50 80240380 3C018024 */  lui       $at, 0x8024
-/* CF2F54 80240384 D4204EE8 */  ldc1      $f0, 0x4ee8($at)
+/* CF2F50 80240380 3C018024 */  lui       $at, %hi(D_80244EE8)
+/* CF2F54 80240384 D4204EE8 */  ldc1      $f0, %lo(D_80244EE8)($at)
 /* CF2F58 80240388 460010A1 */  cvt.d.s   $f2, $f2
 /* CF2F5C 8024038C 46201082 */  mul.d     $f2, $f2, $f0
 /* CF2F60 80240390 00000000 */  nop       
@@ -131,8 +131,8 @@ glabel func_802401F0_CF2DC0
 /* CF2FAC 802403DC C7A4002C */  lwc1      $f4, 0x2c($sp)
 /* CF2FB0 802403E0 461A2100 */  add.s     $f4, $f4, $f26
 /* CF2FB4 802403E4 46142081 */  sub.s     $f2, $f4, $f20
-/* CF2FB8 802403E8 3C018024 */  lui       $at, 0x8024
-/* CF2FBC 802403EC D4204EF0 */  ldc1      $f0, 0x4ef0($at)
+/* CF2FB8 802403E8 3C018024 */  lui       $at, %hi(D_80244EF0)
+/* CF2FBC 802403EC D4204EF0 */  ldc1      $f0, %lo(D_80244EF0)($at)
 /* CF2FC0 802403F0 460010A1 */  cvt.d.s   $f2, $f2
 /* CF2FC4 802403F4 46201082 */  mul.d     $f2, $f2, $f0
 /* CF2FC8 802403F8 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80240C94_CF3864.s b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80240C94_CF3864.s
index 079faf0e99..889048b0bc 100644
--- a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80240C94_CF3864.s
+++ b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80240C94_CF3864.s
@@ -15,9 +15,9 @@ glabel func_80240C94_CF3864
 /* CF388C 80240CBC 00031C00 */  sll       $v1, $v1, 0x10
 /* CF3890 80240CC0 00031B83 */  sra       $v1, $v1, 0xe
 /* CF3894 80240CC4 A444008E */  sh        $a0, 0x8e($v0)
-/* CF3898 80240CC8 3C018024 */  lui       $at, 0x8024
+/* CF3898 80240CC8 3C018024 */  lui       $at, %hi(D_8024291C)
 /* CF389C 80240CCC 00230821 */  addu      $at, $at, $v1
-/* CF38A0 80240CD0 C422291C */  lwc1      $f2, 0x291c($at)
+/* CF38A0 80240CD0 C422291C */  lwc1      $f2, %lo(D_8024291C)($at)
 /* CF38A4 80240CD4 8443008E */  lh        $v1, 0x8e($v0)
 /* CF38A8 80240CD8 46020000 */  add.s     $f0, $f0, $f2
 /* CF38AC 80240CDC 28630005 */  slti      $v1, $v1, 5
diff --git a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_8024134C_CF3F1C.s b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_8024134C_CF3F1C.s
index e81b2388b2..8c9adce2f0 100644
--- a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_8024134C_CF3F1C.s
+++ b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_8024134C_CF3F1C.s
@@ -66,9 +66,9 @@ glabel func_8024134C_CF3F1C
 /* CF4008 80241438 2C62000F */  sltiu     $v0, $v1, 0xf
 /* CF400C 8024143C 10400034 */  beqz      $v0, .L80241510
 /* CF4010 80241440 00031080 */   sll      $v0, $v1, 2
-/* CF4014 80241444 3C018024 */  lui       $at, 0x8024
+/* CF4014 80241444 3C018024 */  lui       $at, %hi(D_80244EF8)
 /* CF4018 80241448 00220821 */  addu      $at, $at, $v0
-/* CF401C 8024144C 8C224EF8 */  lw        $v0, 0x4ef8($at)
+/* CF401C 8024144C 8C224EF8 */  lw        $v0, %lo(D_80244EF8)($at)
 /* CF4020 80241450 00400008 */  jr        $v0
 /* CF4024 80241454 00000000 */   nop      
 /* CF4028 80241458 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241668_CF4238.s b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241668_CF4238.s
index 0571809b1f..34c8583ca0 100644
--- a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241668_CF4238.s
+++ b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241668_CF4238.s
@@ -142,8 +142,8 @@ glabel func_80241668_CF4238
 /* CF4450 80241880 4500000A */  bc1f      .L802418AC
 /* CF4454 80241884 00000000 */   nop      
 .L80241888:
-/* CF4458 80241888 3C018024 */  lui       $at, 0x8024
-/* CF445C 8024188C D4224F38 */  ldc1      $f2, 0x4f38($at)
+/* CF4458 80241888 3C018024 */  lui       $at, %hi(D_80244F38)
+/* CF445C 8024188C D4224F38 */  ldc1      $f2, %lo(D_80244F38)($at)
 /* CF4460 80241890 46003187 */  neg.s     $f6, $f6
 /* CF4464 80241894 46003021 */  cvt.d.s   $f0, $f6
 /* CF4468 80241898 46220002 */  mul.d     $f0, $f0, $f2
diff --git a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241944_CF4514.s b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241944_CF4514.s
index e01c9fa109..a928be3679 100644
--- a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241944_CF4514.s
+++ b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241944_CF4514.s
@@ -67,9 +67,9 @@ glabel func_80241944_CF4514
 /* CF4604 80241A34 2C620015 */  sltiu     $v0, $v1, 0x15
 /* CF4608 80241A38 10400032 */  beqz      $v0, .L80241B04
 /* CF460C 80241A3C 00031080 */   sll      $v0, $v1, 2
-/* CF4610 80241A40 3C018024 */  lui       $at, 0x8024
+/* CF4610 80241A40 3C018024 */  lui       $at, %hi(D_80244F40)
 /* CF4614 80241A44 00220821 */  addu      $at, $at, $v0
-/* CF4618 80241A48 8C224F40 */  lw        $v0, 0x4f40($at)
+/* CF4618 80241A48 8C224F40 */  lw        $v0, %lo(D_80244F40)($at)
 /* CF461C 80241A4C 00400008 */  jr        $v0
 /* CF4620 80241A50 00000000 */   nop      
 /* CF4624 80241A54 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241D58_CF4928.s b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241D58_CF4928.s
index bf95cd0cfc..41e743b478 100644
--- a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241D58_CF4928.s
+++ b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241D58_CF4928.s
@@ -6,11 +6,11 @@ glabel func_80241D58_CF4928
 /* CF492C 80241D5C AFBF0010 */  sw        $ra, 0x10($sp)
 /* CF4930 80241D60 10A00003 */  beqz      $a1, .L80241D70
 /* CF4934 80241D64 8C86000C */   lw       $a2, 0xc($a0)
-/* CF4938 80241D68 3C018024 */  lui       $at, 0x8024
-/* CF493C 80241D6C AC202ACC */  sw        $zero, 0x2acc($at)
+/* CF4938 80241D68 3C018024 */  lui       $at, %hi(D_80242ACC)
+/* CF493C 80241D6C AC202ACC */  sw        $zero, %lo(D_80242ACC)($at)
 .L80241D70:
-/* CF4940 80241D70 3C038024 */  lui       $v1, 0x8024
-/* CF4944 80241D74 24632ACC */  addiu     $v1, $v1, 0x2acc
+/* CF4940 80241D70 3C038024 */  lui       $v1, %hi(D_80242ACC)
+/* CF4944 80241D74 24632ACC */  addiu     $v1, $v1, %lo(D_80242ACC)
 /* CF4948 80241D78 8C620000 */  lw        $v0, ($v1)
 /* CF494C 80241D7C 54400003 */  bnel      $v0, $zero, .L80241D8C
 /* CF4950 80241D80 AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_80241D58_CF4928
 /* CF4958 80241D88 0000102D */   daddu    $v0, $zero, $zero
 .L80241D8C:
 /* CF495C 80241D8C 8CC50000 */  lw        $a1, ($a2)
-/* CF4960 80241D90 3C068024 */  lui       $a2, 0x8024
+/* CF4960 80241D90 3C068024 */  lui       $a2, %hi(D_80242AD0)
 /* CF4964 80241D94 0C0B2026 */  jal       set_variable
-/* CF4968 80241D98 8CC62AD0 */   lw       $a2, 0x2ad0($a2)
+/* CF4968 80241D98 8CC62AD0 */   lw       $a2, %lo(D_80242AD0)($a2)
 /* CF496C 80241D9C 24020002 */  addiu     $v0, $zero, 2
 .L80241DA0:
 /* CF4970 80241DA0 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241DAC_CF497C.s b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241DAC_CF497C.s
index 3bf5eb2aa0..af3c1f17c3 100644
--- a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241DAC_CF497C.s
+++ b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241DAC_CF497C.s
@@ -7,12 +7,12 @@ glabel func_80241DAC_CF497C
 /* CF4984 80241DB4 8C82000C */  lw        $v0, 0xc($a0)
 /* CF4988 80241DB8 0C0B1EAF */  jal       get_variable
 /* CF498C 80241DBC 8C450000 */   lw       $a1, ($v0)
-/* CF4990 80241DC0 3C018024 */  lui       $at, 0x8024
-/* CF4994 80241DC4 AC222AD0 */  sw        $v0, 0x2ad0($at)
+/* CF4990 80241DC0 3C018024 */  lui       $at, %hi(D_80242AD0)
+/* CF4994 80241DC4 AC222AD0 */  sw        $v0, %lo(D_80242AD0)($at)
 /* CF4998 80241DC8 24020002 */  addiu     $v0, $zero, 2
 /* CF499C 80241DCC 8FBF0010 */  lw        $ra, 0x10($sp)
 /* CF49A0 80241DD0 24030001 */  addiu     $v1, $zero, 1
-/* CF49A4 80241DD4 3C018024 */  lui       $at, 0x8024
-/* CF49A8 80241DD8 AC232ACC */  sw        $v1, 0x2acc($at)
+/* CF49A4 80241DD4 3C018024 */  lui       $at, %hi(D_80242ACC)
+/* CF49A8 80241DD8 AC232ACC */  sw        $v1, %lo(D_80242ACC)($at)
 /* CF49AC 80241DDC 03E00008 */  jr        $ra
 /* CF49B0 80241DE0 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241DE4_CF49B4.s b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241DE4_CF49B4.s
index 6c6cd9ff3d..94c12c6178 100644
--- a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241DE4_CF49B4.s
+++ b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241DE4_CF49B4.s
@@ -13,8 +13,8 @@ glabel func_80241DE4_CF49B4
 /* CF49D4 80241E04 8C620000 */  lw        $v0, ($v1)
 /* CF49D8 80241E08 5040000A */  beql      $v0, $zero, .L80241E34
 /* CF49DC 80241E0C 00041080 */   sll      $v0, $a0, 2
-/* CF49E0 80241E10 3C058024 */  lui       $a1, 0x8024
-/* CF49E4 80241E14 24A54FA0 */  addiu     $a1, $a1, 0x4fa0
+/* CF49E0 80241E10 3C058024 */  lui       $a1, %hi(D_80244FA0)
+/* CF49E4 80241E14 24A54FA0 */  addiu     $a1, $a1, %lo(D_80244FA0)
 .L80241E18:
 /* CF49E8 80241E18 24630004 */  addiu     $v1, $v1, 4
 /* CF49EC 80241E1C 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_80241DE4_CF49B4
 /* CF49FC 80241E2C 24A50004 */   addiu    $a1, $a1, 4
 /* CF4A00 80241E30 00041080 */  sll       $v0, $a0, 2
 .L80241E34:
-/* CF4A04 80241E34 3C018024 */  lui       $at, 0x8024
+/* CF4A04 80241E34 3C018024 */  lui       $at, %hi(D_80244FA0)
 /* CF4A08 80241E38 00220821 */  addu      $at, $at, $v0
-/* CF4A0C 80241E3C AC204FA0 */  sw        $zero, 0x4fa0($at)
+/* CF4A0C 80241E3C AC204FA0 */  sw        $zero, %lo(D_80244FA0)($at)
 /* CF4A10 80241E40 0809079C */  j         .L80241E70
 /* CF4A14 80241E44 00000000 */   nop      
 .L80241E48:
-/* CF4A18 80241E48 3C038024 */  lui       $v1, 0x8024
-/* CF4A1C 80241E4C 24634FA0 */  addiu     $v1, $v1, 0x4fa0
+/* CF4A18 80241E48 3C038024 */  lui       $v1, %hi(D_80244FA0)
+/* CF4A1C 80241E4C 24634FA0 */  addiu     $v1, $v1, %lo(D_80244FA0)
 /* CF4A20 80241E50 0060282D */  daddu     $a1, $v1, $zero
 .L80241E54:
 /* CF4A24 80241E54 24820080 */  addiu     $v0, $a0, 0x80
diff --git a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241FB4_CF4B84.s b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241FB4_CF4B84.s
index e47a7e33bf..9a42d0df21 100644
--- a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241FB4_CF4B84.s
+++ b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241FB4_CF4B84.s
@@ -3,8 +3,8 @@
 
 glabel func_80241FB4_CF4B84
 /* CF4B84 80241FB4 2404005A */  addiu     $a0, $zero, 0x5a
-/* CF4B88 80241FB8 3C038024 */  lui       $v1, 0x8024
-/* CF4B8C 80241FBC 24635278 */  addiu     $v1, $v1, 0x5278
+/* CF4B88 80241FB8 3C038024 */  lui       $v1, %hi(D_80245278)
+/* CF4B8C 80241FBC 24635278 */  addiu     $v1, $v1, %lo(D_80245278)
 /* CF4B90 80241FC0 240200DA */  addiu     $v0, $zero, 0xda
 .L80241FC4:
 /* CF4B94 80241FC4 AC620000 */  sw        $v0, ($v1)
@@ -12,8 +12,8 @@ glabel func_80241FB4_CF4B84
 /* CF4B9C 80241FCC 2484FFFF */  addiu     $a0, $a0, -1
 /* CF4BA0 80241FD0 0481FFFC */  bgez      $a0, .L80241FC4
 /* CF4BA4 80241FD4 2442FFFF */   addiu    $v0, $v0, -1
-/* CF4BA8 80241FD8 3C018024 */  lui       $at, 0x8024
-/* CF4BAC 80241FDC AC20527C */  sw        $zero, 0x527c($at)
+/* CF4BA8 80241FD8 3C018024 */  lui       $at, %hi(D_8024527C)
+/* CF4BAC 80241FDC AC20527C */  sw        $zero, %lo(D_8024527C)($at)
 /* CF4BB0 80241FE0 03E00008 */  jr        $ra
 /* CF4BB4 80241FE4 24020002 */   addiu    $v0, $zero, 2
 /* CF4BB8 80241FE8 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_hos/hos_00/A0BCF0/func_80240000_A0BCF0.s b/asm/nonmatchings/world/area_hos/hos_00/A0BCF0/func_80240000_A0BCF0.s
index 434a92453e..115b9281c3 100644
--- a/asm/nonmatchings/world/area_hos/hos_00/A0BCF0/func_80240000_A0BCF0.s
+++ b/asm/nonmatchings/world/area_hos/hos_00/A0BCF0/func_80240000_A0BCF0.s
@@ -10,11 +10,11 @@ glabel func_80240000_A0BCF0
 /* A0BD04 80240014 24020003 */  addiu     $v0, $zero, 3
 /* A0BD08 80240018 14620006 */  bne       $v1, $v0, .L80240034
 /* A0BD0C 8024001C 00000000 */   nop      
-/* A0BD10 80240020 3C04800E */  lui       $a0, 0x800e
-/* A0BD14 80240024 24849668 */  addiu     $a0, $a0, -0x6998
-/* A0BD18 80240028 3C058024 */  lui       $a1, 0x8024
+/* A0BD10 80240020 3C04800E */  lui       $a0, %hi(D_800D9668)
+/* A0BD14 80240024 24849668 */  addiu     $a0, $a0, %lo(D_800D9668)
+/* A0BD18 80240028 3C058024 */  lui       $a1, %hi(D_80244B30)
 /* A0BD1C 8024002C 0C01953C */  jal       sprintf
-/* A0BD20 80240030 24A54B30 */   addiu    $a1, $a1, 0x4b30
+/* A0BD20 80240030 24A54B30 */   addiu    $a1, $a1, %lo(D_80244B30)
 .L80240034:
 /* A0BD24 80240034 8FBF0010 */  lw        $ra, 0x10($sp)
 /* A0BD28 80240038 0000102D */  daddu     $v0, $zero, $zero
diff --git a/asm/nonmatchings/world/area_hos/hos_00/A0BD40/func_80240170_A0BE60.s b/asm/nonmatchings/world/area_hos/hos_00/A0BD40/func_80240170_A0BE60.s
index f88fbee737..6ac15e4e8b 100644
--- a/asm/nonmatchings/world/area_hos/hos_00/A0BD40/func_80240170_A0BE60.s
+++ b/asm/nonmatchings/world/area_hos/hos_00/A0BD40/func_80240170_A0BE60.s
@@ -4,8 +4,8 @@
 glabel func_80240170_A0BE60
 /* A0BE60 80240170 27BDFF98 */  addiu     $sp, $sp, -0x68
 /* A0BE64 80240174 F7BA0050 */  sdc1      $f26, 0x50($sp)
-/* A0BE68 80240178 3C01800B */  lui       $at, 0x800b
-/* A0BE6C 8024017C C43A1DEC */  lwc1      $f26, 0x1dec($at)
+/* A0BE68 80240178 3C01800B */  lui       $at, %hi(D_800B1DEC)
+/* A0BE6C 8024017C C43A1DEC */  lwc1      $f26, %lo(D_800B1DEC)($at)
 /* A0BE70 80240180 3C014334 */  lui       $at, 0x4334
 /* A0BE74 80240184 44810000 */  mtc1      $at, $f0
 /* A0BE78 80240188 3C014049 */  lui       $at, 0x4049
@@ -19,8 +19,8 @@ glabel func_80240170_A0BE60
 /* A0BE98 802401A8 AFB00030 */  sw        $s0, 0x30($sp)
 /* A0BE9C 802401AC F7B60040 */  sdc1      $f22, 0x40($sp)
 /* A0BEA0 802401B0 F7B40038 */  sdc1      $f20, 0x38($sp)
-/* A0BEA4 802401B4 3C018024 */  lui       $at, 0x8024
-/* A0BEA8 802401B8 D4204B40 */  ldc1      $f0, 0x4b40($at)
+/* A0BEA4 802401B4 3C018024 */  lui       $at, %hi(D_80244B40)
+/* A0BEA8 802401B8 D4204B40 */  ldc1      $f0, %lo(D_80244B40)($at)
 /* A0BEAC 802401BC 4600D521 */  cvt.d.s   $f20, $f26
 /* A0BEB0 802401C0 4620A580 */  add.d     $f22, $f20, $f0
 /* A0BEB4 802401C4 F7BE0060 */  sdc1      $f30, 0x60($sp)
diff --git a/asm/nonmatchings/world/area_hos/hos_00/A0BD40/func_8024036C_A0C05C.s b/asm/nonmatchings/world/area_hos/hos_00/A0BD40/func_8024036C_A0C05C.s
index de6dba1494..20e43f9508 100644
--- a/asm/nonmatchings/world/area_hos/hos_00/A0BD40/func_8024036C_A0C05C.s
+++ b/asm/nonmatchings/world/area_hos/hos_00/A0BD40/func_8024036C_A0C05C.s
@@ -3,8 +3,8 @@
 
 glabel func_8024036C_A0C05C
 /* A0C05C 8024036C 27BDFF98 */  addiu     $sp, $sp, -0x68
-/* A0C060 80240370 3C01800B */  lui       $at, 0x800b
-/* A0C064 80240374 C4201DEC */  lwc1      $f0, 0x1dec($at)
+/* A0C060 80240370 3C01800B */  lui       $at, %hi(D_800B1DEC)
+/* A0C064 80240374 C4201DEC */  lwc1      $f0, %lo(D_800B1DEC)($at)
 /* A0C068 80240378 3C014334 */  lui       $at, 0x4334
 /* A0C06C 8024037C 44811000 */  mtc1      $at, $f2
 /* A0C070 80240380 3C014049 */  lui       $at, 0x4049
@@ -19,8 +19,8 @@ glabel func_8024036C_A0C05C
 /* A0C094 802403A4 AFB00030 */  sw        $s0, 0x30($sp)
 /* A0C098 802403A8 F7BC0058 */  sdc1      $f28, 0x58($sp)
 /* A0C09C 802403AC F7BA0050 */  sdc1      $f26, 0x50($sp)
-/* A0C0A0 802403B0 3C018024 */  lui       $at, 0x8024
-/* A0C0A4 802403B4 D4224B48 */  ldc1      $f2, 0x4b48($at)
+/* A0C0A0 802403B0 3C018024 */  lui       $at, %hi(D_80244B48)
+/* A0C0A4 802403B4 D4224B48 */  ldc1      $f2, %lo(D_80244B48)($at)
 /* A0C0A8 802403B8 4600F021 */  cvt.d.s   $f0, $f30
 /* A0C0AC 802403BC 46220100 */  add.d     $f4, $f0, $f2
 /* A0C0B0 802403C0 F7B80048 */  sdc1      $f24, 0x48($sp)
diff --git a/asm/nonmatchings/world/area_hos/hos_00/A0BD40/func_80240584_A0C274.s b/asm/nonmatchings/world/area_hos/hos_00/A0BD40/func_80240584_A0C274.s
index cf307d46fa..474215ded2 100644
--- a/asm/nonmatchings/world/area_hos/hos_00/A0BD40/func_80240584_A0C274.s
+++ b/asm/nonmatchings/world/area_hos/hos_00/A0BD40/func_80240584_A0C274.s
@@ -5,8 +5,8 @@ glabel func_80240584_A0C274
 /* A0C274 80240584 27BDFF90 */  addiu     $sp, $sp, -0x70
 /* A0C278 80240588 AFB10034 */  sw        $s1, 0x34($sp)
 /* A0C27C 8024058C 0080882D */  daddu     $s1, $a0, $zero
-/* A0C280 80240590 3C01800B */  lui       $at, 0x800b
-/* A0C284 80240594 C4201DEC */  lwc1      $f0, 0x1dec($at)
+/* A0C280 80240590 3C01800B */  lui       $at, %hi(D_800B1DEC)
+/* A0C284 80240594 C4201DEC */  lwc1      $f0, %lo(D_800B1DEC)($at)
 /* A0C288 80240598 3C014334 */  lui       $at, 0x4334
 /* A0C28C 8024059C 44811000 */  mtc1      $at, $f2
 /* A0C290 802405A0 3C014049 */  lui       $at, 0x4049
@@ -21,8 +21,8 @@ glabel func_80240584_A0C274
 /* A0C2B4 802405C4 AFB00030 */  sw        $s0, 0x30($sp)
 /* A0C2B8 802405C8 F7BC0060 */  sdc1      $f28, 0x60($sp)
 /* A0C2BC 802405CC F7BA0058 */  sdc1      $f26, 0x58($sp)
-/* A0C2C0 802405D0 3C018024 */  lui       $at, 0x8024
-/* A0C2C4 802405D4 D4224B50 */  ldc1      $f2, 0x4b50($at)
+/* A0C2C0 802405D0 3C018024 */  lui       $at, %hi(D_80244B50)
+/* A0C2C4 802405D4 D4224B50 */  ldc1      $f2, %lo(D_80244B50)($at)
 /* A0C2C8 802405D8 4600F021 */  cvt.d.s   $f0, $f30
 /* A0C2CC 802405DC 46220100 */  add.d     $f4, $f0, $f2
 /* A0C2D0 802405E0 F7B80050 */  sdc1      $f24, 0x50($sp)
diff --git a/asm/nonmatchings/world/area_hos/hos_00/A0C4E0/func_802407F0_A0C4E0.s b/asm/nonmatchings/world/area_hos/hos_00/A0C4E0/func_802407F0_A0C4E0.s
index 9e71d5b4dd..a7b2a9d545 100644
--- a/asm/nonmatchings/world/area_hos/hos_00/A0C4E0/func_802407F0_A0C4E0.s
+++ b/asm/nonmatchings/world/area_hos/hos_00/A0C4E0/func_802407F0_A0C4E0.s
@@ -4,8 +4,8 @@
 glabel func_802407F0_A0C4E0
 /* A0C4E0 802407F0 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* A0C4E4 802407F4 AFB00010 */  sw        $s0, 0x10($sp)
-/* A0C4E8 802407F8 3C108024 */  lui       $s0, 0x8024
-/* A0C4EC 802407FC 26102970 */  addiu     $s0, $s0, 0x2970
+/* A0C4E8 802407F8 3C108024 */  lui       $s0, %hi(D_80242970)
+/* A0C4EC 802407FC 26102970 */  addiu     $s0, $s0, %lo(D_80242970)
 /* A0C4F0 80240800 AFBF0018 */  sw        $ra, 0x18($sp)
 /* A0C4F4 80240804 AFB10014 */  sw        $s1, 0x14($sp)
 /* A0C4F8 80240808 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_802407F0_A0C4E0
 /* A0C55C 8024086C 28620010 */  slti      $v0, $v1, 0x10
 /* A0C560 80240870 1440FFFA */  bnez      $v0, .L8024085C
 /* A0C564 80240874 24840004 */   addiu    $a0, $a0, 4
-/* A0C568 80240878 3C108024 */  lui       $s0, 0x8024
-/* A0C56C 8024087C 26102970 */  addiu     $s0, $s0, 0x2970
+/* A0C568 80240878 3C108024 */  lui       $s0, %hi(D_80242970)
+/* A0C56C 8024087C 26102970 */  addiu     $s0, $s0, %lo(D_80242970)
 /* A0C570 80240880 0C00AB4B */  jal       heap_free
 /* A0C574 80240884 8E040000 */   lw       $a0, ($s0)
 /* A0C578 80240888 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_hos/hos_00/A0C4E0/func_80240994_A0C684.s b/asm/nonmatchings/world/area_hos/hos_00/A0C4E0/func_80240994_A0C684.s
index c4db5b26d5..38aeb7f21b 100644
--- a/asm/nonmatchings/world/area_hos/hos_00/A0C4E0/func_80240994_A0C684.s
+++ b/asm/nonmatchings/world/area_hos/hos_00/A0C4E0/func_80240994_A0C684.s
@@ -27,8 +27,8 @@ glabel func_80240994_A0C684
 /* A0C6DC 802409EC 8E060038 */  lw        $a2, 0x38($s0)
 /* A0C6E0 802409F0 0C00A720 */  jal       atan2
 /* A0C6E4 802409F4 8E070040 */   lw       $a3, 0x40($s0)
-/* A0C6E8 802409F8 3C138024 */  lui       $s3, 0x8024
-/* A0C6EC 802409FC 26732B9C */  addiu     $s3, $s3, 0x2b9c
+/* A0C6E8 802409F8 3C138024 */  lui       $s3, %hi(D_80242B9C)
+/* A0C6EC 802409FC 26732B9C */  addiu     $s3, $s3, %lo(D_80242B9C)
 /* A0C6F0 80240A00 3C128024 */  lui       $s2, %hi(pause_set_cursor_opacity)
 /* A0C6F4 80240A04 26522BA0 */  addiu     $s2, $s2, %lo(pause_set_cursor_opacity)
 /* A0C6F8 80240A08 C66C0000 */  lwc1      $f12, ($s3)
diff --git a/asm/nonmatchings/world/area_hos/hos_00/A0C930/func_80240C40_A0C930.s b/asm/nonmatchings/world/area_hos/hos_00/A0C930/func_80240C40_A0C930.s
index 8843c118b6..74615410ea 100644
--- a/asm/nonmatchings/world/area_hos/hos_00/A0C930/func_80240C40_A0C930.s
+++ b/asm/nonmatchings/world/area_hos/hos_00/A0C930/func_80240C40_A0C930.s
@@ -32,8 +32,8 @@ glabel func_80240C40_A0C930
 /* A0C994 80240CA4 3C07FCFF */  lui       $a3, 0xfcff
 /* A0C998 80240CA8 34E7C7FF */  ori       $a3, $a3, 0xc7ff
 /* A0C99C 80240CAC 3C06FF8E */  lui       $a2, 0xff8e
-/* A0C9A0 80240CB0 3C04800A */  lui       $a0, 0x800a
-/* A0C9A4 80240CB4 2484A66C */  addiu     $a0, $a0, -0x5994
+/* A0C9A0 80240CB0 3C04800A */  lui       $a0, %hi(D_8009A66C)
+/* A0C9A4 80240CB4 2484A66C */  addiu     $a0, $a0, %lo(D_8009A66C)
 /* A0C9A8 80240CB8 8C820000 */  lw        $v0, ($a0)
 /* A0C9AC 80240CBC 34C67F3F */  ori       $a2, $a2, 0x7f3f
 /* A0C9B0 80240CC0 0040182D */  daddu     $v1, $v0, $zero
diff --git a/asm/nonmatchings/world/area_hos/hos_01/A10880/func_80240120_A109A0.s b/asm/nonmatchings/world/area_hos/hos_01/A10880/func_80240120_A109A0.s
index 845e4bed0d..bc5da11e40 100644
--- a/asm/nonmatchings/world/area_hos/hos_01/A10880/func_80240120_A109A0.s
+++ b/asm/nonmatchings/world/area_hos/hos_01/A10880/func_80240120_A109A0.s
@@ -4,8 +4,8 @@
 glabel func_80240120_A109A0
 /* A109A0 80240120 27BDFF98 */  addiu     $sp, $sp, -0x68
 /* A109A4 80240124 F7BA0050 */  sdc1      $f26, 0x50($sp)
-/* A109A8 80240128 3C01800B */  lui       $at, 0x800b
-/* A109AC 8024012C C43A1DEC */  lwc1      $f26, 0x1dec($at)
+/* A109A8 80240128 3C01800B */  lui       $at, %hi(D_800B1DEC)
+/* A109AC 8024012C C43A1DEC */  lwc1      $f26, %lo(D_800B1DEC)($at)
 /* A109B0 80240130 3C014334 */  lui       $at, 0x4334
 /* A109B4 80240134 44810000 */  mtc1      $at, $f0
 /* A109B8 80240138 3C014049 */  lui       $at, 0x4049
@@ -19,8 +19,8 @@ glabel func_80240120_A109A0
 /* A109D8 80240158 AFB00030 */  sw        $s0, 0x30($sp)
 /* A109DC 8024015C F7B60040 */  sdc1      $f22, 0x40($sp)
 /* A109E0 80240160 F7B40038 */  sdc1      $f20, 0x38($sp)
-/* A109E4 80240164 3C018024 */  lui       $at, 0x8024
-/* A109E8 80240168 D4205970 */  ldc1      $f0, 0x5970($at)
+/* A109E4 80240164 3C018024 */  lui       $at, %hi(D_80245970)
+/* A109E8 80240168 D4205970 */  ldc1      $f0, %lo(D_80245970)($at)
 /* A109EC 8024016C 4600D521 */  cvt.d.s   $f20, $f26
 /* A109F0 80240170 4620A580 */  add.d     $f22, $f20, $f0
 /* A109F4 80240174 F7BE0060 */  sdc1      $f30, 0x60($sp)
diff --git a/asm/nonmatchings/world/area_hos/hos_01/A10880/func_8024031C_A10B9C.s b/asm/nonmatchings/world/area_hos/hos_01/A10880/func_8024031C_A10B9C.s
index fa510cdf0f..f94dfd8b3f 100644
--- a/asm/nonmatchings/world/area_hos/hos_01/A10880/func_8024031C_A10B9C.s
+++ b/asm/nonmatchings/world/area_hos/hos_01/A10880/func_8024031C_A10B9C.s
@@ -3,8 +3,8 @@
 
 glabel func_8024031C_A10B9C
 /* A10B9C 8024031C 27BDFF98 */  addiu     $sp, $sp, -0x68
-/* A10BA0 80240320 3C01800B */  lui       $at, 0x800b
-/* A10BA4 80240324 C4201DEC */  lwc1      $f0, 0x1dec($at)
+/* A10BA0 80240320 3C01800B */  lui       $at, %hi(D_800B1DEC)
+/* A10BA4 80240324 C4201DEC */  lwc1      $f0, %lo(D_800B1DEC)($at)
 /* A10BA8 80240328 3C014334 */  lui       $at, 0x4334
 /* A10BAC 8024032C 44811000 */  mtc1      $at, $f2
 /* A10BB0 80240330 3C014049 */  lui       $at, 0x4049
@@ -19,8 +19,8 @@ glabel func_8024031C_A10B9C
 /* A10BD4 80240354 AFB00030 */  sw        $s0, 0x30($sp)
 /* A10BD8 80240358 F7BC0058 */  sdc1      $f28, 0x58($sp)
 /* A10BDC 8024035C F7BA0050 */  sdc1      $f26, 0x50($sp)
-/* A10BE0 80240360 3C018024 */  lui       $at, 0x8024
-/* A10BE4 80240364 D4225978 */  ldc1      $f2, 0x5978($at)
+/* A10BE0 80240360 3C018024 */  lui       $at, %hi(D_80245978)
+/* A10BE4 80240364 D4225978 */  ldc1      $f2, %lo(D_80245978)($at)
 /* A10BE8 80240368 4600F021 */  cvt.d.s   $f0, $f30
 /* A10BEC 8024036C 46220100 */  add.d     $f4, $f0, $f2
 /* A10BF0 80240370 F7B80048 */  sdc1      $f24, 0x48($sp)
diff --git a/asm/nonmatchings/world/area_hos/hos_01/A10880/func_80240534_A10DB4.s b/asm/nonmatchings/world/area_hos/hos_01/A10880/func_80240534_A10DB4.s
index 684b429e6a..53985d026d 100644
--- a/asm/nonmatchings/world/area_hos/hos_01/A10880/func_80240534_A10DB4.s
+++ b/asm/nonmatchings/world/area_hos/hos_01/A10880/func_80240534_A10DB4.s
@@ -5,8 +5,8 @@ glabel func_80240534_A10DB4
 /* A10DB4 80240534 27BDFF90 */  addiu     $sp, $sp, -0x70
 /* A10DB8 80240538 AFB10034 */  sw        $s1, 0x34($sp)
 /* A10DBC 8024053C 0080882D */  daddu     $s1, $a0, $zero
-/* A10DC0 80240540 3C01800B */  lui       $at, 0x800b
-/* A10DC4 80240544 C4201DEC */  lwc1      $f0, 0x1dec($at)
+/* A10DC0 80240540 3C01800B */  lui       $at, %hi(D_800B1DEC)
+/* A10DC4 80240544 C4201DEC */  lwc1      $f0, %lo(D_800B1DEC)($at)
 /* A10DC8 80240548 3C014334 */  lui       $at, 0x4334
 /* A10DCC 8024054C 44811000 */  mtc1      $at, $f2
 /* A10DD0 80240550 3C014049 */  lui       $at, 0x4049
diff --git a/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240BB8_A11438.s b/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240BB8_A11438.s
index 23a54e59f4..ba0092bccf 100644
--- a/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240BB8_A11438.s
+++ b/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240BB8_A11438.s
@@ -5,8 +5,8 @@ glabel func_80240BB8_A11438
 /* A11438 80240BB8 3C06FC12 */  lui       $a2, 0xfc12
 /* A1143C 80240BBC 34C61624 */  ori       $a2, $a2, 0x1624
 /* A11440 80240BC0 3C05FF2F */  lui       $a1, 0xff2f
-/* A11444 80240BC4 3C04800A */  lui       $a0, 0x800a
-/* A11448 80240BC8 2484A66C */  addiu     $a0, $a0, -0x5994
+/* A11444 80240BC4 3C04800A */  lui       $a0, %hi(D_8009A66C)
+/* A11448 80240BC8 2484A66C */  addiu     $a0, $a0, %lo(D_8009A66C)
 /* A1144C 80240BCC 8C820000 */  lw        $v0, ($a0)
 /* A11450 80240BD0 34A5FFFF */  ori       $a1, $a1, 0xffff
 /* A11454 80240BD4 0040182D */  daddu     $v1, $v0, $zero
@@ -16,8 +16,8 @@ glabel func_80240BB8_A11438
 /* A11464 80240BE4 AC650004 */  sw        $a1, 4($v1)
 /* A11468 80240BE8 24430008 */  addiu     $v1, $v0, 8
 /* A1146C 80240BEC AC830000 */  sw        $v1, ($a0)
-/* A11470 80240BF0 3C048024 */  lui       $a0, 0x8024
-/* A11474 80240BF4 90841C2F */  lbu       $a0, 0x1c2f($a0)
+/* A11470 80240BF0 3C048024 */  lui       $a0, %hi(D_80241C2F)
+/* A11474 80240BF4 90841C2F */  lbu       $a0, %lo(D_80241C2F)($a0)
 /* A11478 80240BF8 3C03FA00 */  lui       $v1, 0xfa00
 /* A1147C 80240BFC AC430000 */  sw        $v1, ($v0)
 /* A11480 80240C00 03E00008 */  jr        $ra
diff --git a/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240C08_A11488.s b/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240C08_A11488.s
index 3f88b2ad43..3071bf57f1 100644
--- a/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240C08_A11488.s
+++ b/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240C08_A11488.s
@@ -8,8 +8,8 @@ glabel func_80240C08_A11488
 /* A11494 80240C14 0C0B1EAF */  jal       get_variable
 /* A11498 80240C18 8C450000 */   lw       $a1, ($v0)
 /* A1149C 80240C1C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* A114A0 80240C20 3C018024 */  lui       $at, 0x8024
-/* A114A4 80240C24 AC221C2C */  sw        $v0, 0x1c2c($at)
+/* A114A0 80240C20 3C018024 */  lui       $at, %hi(D_80241C2C)
+/* A114A4 80240C24 AC221C2C */  sw        $v0, %lo(D_80241C2C)($at)
 /* A114A8 80240C28 24020002 */  addiu     $v0, $zero, 2
 /* A114AC 80240C2C 03E00008 */  jr        $ra
 /* A114B0 80240C30 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240C34_A114B4.s b/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240C34_A114B4.s
index c0f989f437..3aadf0c0f3 100644
--- a/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240C34_A114B4.s
+++ b/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240C34_A114B4.s
@@ -5,8 +5,8 @@ glabel func_80240C34_A114B4
 /* A114B4 80240C34 3C06FC12 */  lui       $a2, 0xfc12
 /* A114B8 80240C38 34C61624 */  ori       $a2, $a2, 0x1624
 /* A114BC 80240C3C 3C05FF2F */  lui       $a1, 0xff2f
-/* A114C0 80240C40 3C04800A */  lui       $a0, 0x800a
-/* A114C4 80240C44 2484A66C */  addiu     $a0, $a0, -0x5994
+/* A114C0 80240C40 3C04800A */  lui       $a0, %hi(D_8009A66C)
+/* A114C4 80240C44 2484A66C */  addiu     $a0, $a0, %lo(D_8009A66C)
 /* A114C8 80240C48 8C820000 */  lw        $v0, ($a0)
 /* A114CC 80240C4C 34A5FFFF */  ori       $a1, $a1, 0xffff
 /* A114D0 80240C50 0040182D */  daddu     $v1, $v0, $zero
@@ -16,8 +16,8 @@ glabel func_80240C34_A114B4
 /* A114E0 80240C60 AC650004 */  sw        $a1, 4($v1)
 /* A114E4 80240C64 24430008 */  addiu     $v1, $v0, 8
 /* A114E8 80240C68 AC830000 */  sw        $v1, ($a0)
-/* A114EC 80240C6C 3C048024 */  lui       $a0, 0x8024
-/* A114F0 80240C70 90841C33 */  lbu       $a0, 0x1c33($a0)
+/* A114EC 80240C6C 3C048024 */  lui       $a0, %hi(D_80241C33)
+/* A114F0 80240C70 90841C33 */  lbu       $a0, %lo(D_80241C33)($a0)
 /* A114F4 80240C74 3C03FA00 */  lui       $v1, 0xfa00
 /* A114F8 80240C78 AC430000 */  sw        $v1, ($v0)
 /* A114FC 80240C7C 03E00008 */  jr        $ra
diff --git a/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240C84_A11504.s b/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240C84_A11504.s
index e6db04e5c5..9f9291d729 100644
--- a/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240C84_A11504.s
+++ b/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240C84_A11504.s
@@ -8,8 +8,8 @@ glabel func_80240C84_A11504
 /* A11510 80240C90 0C0B1EAF */  jal       get_variable
 /* A11514 80240C94 8C450000 */   lw       $a1, ($v0)
 /* A11518 80240C98 8FBF0010 */  lw        $ra, 0x10($sp)
-/* A1151C 80240C9C 3C018024 */  lui       $at, 0x8024
-/* A11520 80240CA0 AC221C30 */  sw        $v0, 0x1c30($at)
+/* A1151C 80240C9C 3C018024 */  lui       $at, %hi(D_80241C30)
+/* A11520 80240CA0 AC221C30 */  sw        $v0, %lo(D_80241C30)($at)
 /* A11524 80240CA4 24020002 */  addiu     $v0, $zero, 2
 /* A11528 80240CA8 03E00008 */  jr        $ra
 /* A1152C 80240CAC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_hos/hos_02/A16220/func_8024030C_A1652C.s b/asm/nonmatchings/world/area_hos/hos_02/A16220/func_8024030C_A1652C.s
index 3b6ba78ff4..a49806efab 100644
--- a/asm/nonmatchings/world/area_hos/hos_02/A16220/func_8024030C_A1652C.s
+++ b/asm/nonmatchings/world/area_hos/hos_02/A16220/func_8024030C_A1652C.s
@@ -4,8 +4,8 @@
 glabel func_8024030C_A1652C
 /* A1652C 8024030C 27BDFFD8 */  addiu     $sp, $sp, -0x28
 /* A16530 80240310 AFB10014 */  sw        $s1, 0x14($sp)
-/* A16534 80240314 3C118024 */  lui       $s1, 0x8024
-/* A16538 80240318 263133AC */  addiu     $s1, $s1, 0x33ac
+/* A16534 80240314 3C118024 */  lui       $s1, %hi(D_802433AC)
+/* A16538 80240318 263133AC */  addiu     $s1, $s1, %lo(D_802433AC)
 /* A1653C 8024031C AFBF0020 */  sw        $ra, 0x20($sp)
 /* A16540 80240320 AFB3001C */  sw        $s3, 0x1c($sp)
 /* A16544 80240324 AFB20018 */  sw        $s2, 0x18($sp)
@@ -31,15 +31,15 @@ glabel func_8024030C_A1652C
 /* A16594 80240374 36731630 */  ori       $s3, $s3, 0x1630
 /* A16598 80240378 46220002 */  mul.d     $f0, $f0, $f2
 /* A1659C 8024037C 00000000 */  nop       
-/* A165A0 80240380 3C12800A */  lui       $s2, 0x800a
-/* A165A4 80240384 2652A674 */  addiu     $s2, $s2, -0x598c
-/* A165A8 80240388 3C108007 */  lui       $s0, 0x8007
-/* A165AC 8024038C 261041F0 */  addiu     $s0, $s0, 0x41f0
+/* A165A0 80240380 3C12800A */  lui       $s2, %hi(D_8009A674)
+/* A165A4 80240384 2652A674 */  addiu     $s2, $s2, %lo(D_8009A674)
+/* A165A8 80240388 3C108007 */  lui       $s0, %hi(D_800741F0)
+/* A165AC 8024038C 261041F0 */  addiu     $s0, $s0, %lo(D_800741F0)
 /* A165B0 80240390 96040000 */  lhu       $a0, ($s0)
 /* A165B4 80240394 8E420000 */  lw        $v0, ($s2)
 /* A165B8 80240398 00042180 */  sll       $a0, $a0, 6
-/* A165BC 8024039C 3C018024 */  lui       $at, 0x8024
-/* A165C0 802403A0 D4224DE0 */  ldc1      $f2, 0x4de0($at)
+/* A165BC 8024039C 3C018024 */  lui       $at, %hi(D_80244DE0)
+/* A165C0 802403A0 D4224DE0 */  ldc1      $f2, %lo(D_80244DE0)($at)
 /* A165C4 802403A4 00932021 */  addu      $a0, $a0, $s3
 /* A165C8 802403A8 46220000 */  add.d     $f0, $f0, $f2
 /* A165CC 802403AC 00442021 */  addu      $a0, $v0, $a0
@@ -52,8 +52,8 @@ glabel func_8024030C_A1652C
 /* A165E8 802403C8 0C019DC0 */  jal       guScale
 /* A165EC 802403CC 00A0382D */   daddu    $a3, $a1, $zero
 /* A165F0 802403D0 3C05DA38 */  lui       $a1, 0xda38
-/* A165F4 802403D4 3C04800A */  lui       $a0, 0x800a
-/* A165F8 802403D8 2484A66C */  addiu     $a0, $a0, -0x5994
+/* A165F4 802403D4 3C04800A */  lui       $a0, %hi(D_8009A66C)
+/* A165F8 802403D8 2484A66C */  addiu     $a0, $a0, %lo(D_8009A66C)
 /* A165FC 802403DC 34A50001 */  ori       $a1, $a1, 1
 /* A16600 802403E0 8C830000 */  lw        $v1, ($a0)
 /* A16604 802403E4 96020000 */  lhu       $v0, ($s0)
diff --git a/asm/nonmatchings/world/area_hos/hos_02/A16220/func_80240434_A16654.s b/asm/nonmatchings/world/area_hos/hos_02/A16220/func_80240434_A16654.s
index 55647e110d..fd4953201c 100644
--- a/asm/nonmatchings/world/area_hos/hos_02/A16220/func_80240434_A16654.s
+++ b/asm/nonmatchings/world/area_hos/hos_02/A16220/func_80240434_A16654.s
@@ -18,8 +18,8 @@ glabel func_80240434_A16654
 /* A16688 80240468 8FA20018 */  lw        $v0, 0x18($sp)
 /* A1668C 8024046C 1840004F */  blez      $v0, .L802405AC
 /* A16690 80240470 0000802D */   daddu    $s0, $zero, $zero
-/* A16694 80240474 3C158024 */  lui       $s5, 0x8024
-/* A16698 80240478 26B533AE */  addiu     $s5, $s5, 0x33ae
+/* A16694 80240474 3C158024 */  lui       $s5, %hi(D_802433AE)
+/* A16698 80240478 26B533AE */  addiu     $s5, $s5, %lo(D_802433AE)
 /* A1669C 8024047C 3C135555 */  lui       $s3, 0x5555
 /* A166A0 80240480 36735556 */  ori       $s3, $s3, 0x5556
 /* A166A4 80240484 34148000 */  ori       $s4, $zero, 0x8000
@@ -100,8 +100,8 @@ glabel func_80240434_A16654
 /* A167C4 802405A4 1440FFB9 */  bnez      $v0, .L8024048C
 /* A167C8 802405A8 02130018 */   mult     $s0, $s3
 .L802405AC:
-/* A167CC 802405AC 3C03800A */  lui       $v1, 0x800a
-/* A167D0 802405B0 2463A66C */  addiu     $v1, $v1, -0x5994
+/* A167CC 802405AC 3C03800A */  lui       $v1, %hi(D_8009A66C)
+/* A167D0 802405B0 2463A66C */  addiu     $v1, $v1, %lo(D_8009A66C)
 /* A167D4 802405B4 8C620000 */  lw        $v0, ($v1)
 /* A167D8 802405B8 0000202D */  daddu     $a0, $zero, $zero
 /* A167DC 802405BC 0040802D */  daddu     $s0, $v0, $zero
@@ -110,8 +110,8 @@ glabel func_80240434_A16654
 /* A167E8 802405C8 3C02DE00 */  lui       $v0, 0xde00
 /* A167EC 802405CC 0C0470BB */  jal       func_8011C2EC
 /* A167F0 802405D0 AE020000 */   sw       $v0, ($s0)
-/* A167F4 802405D4 3C048024 */  lui       $a0, 0x8024
-/* A167F8 802405D8 248433AE */  addiu     $a0, $a0, 0x33ae
+/* A167F4 802405D4 3C048024 */  lui       $a0, %hi(D_802433AE)
+/* A167F8 802405D8 248433AE */  addiu     $a0, $a0, %lo(D_802433AE)
 /* A167FC 802405DC 94830000 */  lhu       $v1, ($a0)
 /* A16800 802405E0 AE020004 */  sw        $v0, 4($s0)
 /* A16804 802405E4 24630253 */  addiu     $v1, $v1, 0x253
diff --git a/asm/nonmatchings/world/area_hos/hos_02/A16220/func_80240610_A16830.s b/asm/nonmatchings/world/area_hos/hos_02/A16220/func_80240610_A16830.s
index bd4833527b..ebe806d1d3 100644
--- a/asm/nonmatchings/world/area_hos/hos_02/A16220/func_80240610_A16830.s
+++ b/asm/nonmatchings/world/area_hos/hos_02/A16220/func_80240610_A16830.s
@@ -33,8 +33,8 @@ glabel func_80240610_A16830
 /* A1689C 8024067C 00031040 */  sll       $v0, $v1, 1
 /* A168A0 80240680 00431021 */  addu      $v0, $v0, $v1
 /* A168A4 80240684 02021023 */  subu      $v0, $s0, $v0
-/* A168A8 80240688 3C038024 */  lui       $v1, 0x8024
-/* A168AC 8024068C 946333B0 */  lhu       $v1, 0x33b0($v1)
+/* A168A8 80240688 3C038024 */  lui       $v1, %hi(D_802433B0)
+/* A168AC 8024068C 946333B0 */  lhu       $v1, %lo(D_802433B0)($v1)
 /* A168B0 80240690 24420001 */  addiu     $v0, $v0, 1
 /* A168B4 80240694 00620018 */  mult      $v1, $v0
 /* A168B8 80240698 8FA20014 */  lw        $v0, 0x14($sp)
@@ -94,8 +94,8 @@ glabel func_80240610_A16830
 /* A16984 80240764 24427FFF */  addiu     $v0, $v0, 0x7fff
 .L80240768:
 /* A16988 80240768 000213C3 */  sra       $v0, $v0, 0xf
-/* A1698C 8024076C 3C018024 */  lui       $at, 0x8024
-/* A16990 80240770 D4224DF0 */  ldc1      $f2, 0x4df0($at)
+/* A1698C 8024076C 3C018024 */  lui       $at, %hi(D_80244DF0)
+/* A16990 80240770 D4224DF0 */  ldc1      $f2, %lo(D_80244DF0)($at)
 /* A16994 80240774 44820000 */  mtc1      $v0, $f0
 /* A16998 80240778 00000000 */  nop       
 /* A1699C 8024077C 46800021 */  cvt.d.w   $f0, $f0
@@ -119,8 +119,8 @@ glabel func_80240610_A16830
 /* A169DC 802407BC 02031821 */  addu      $v1, $s0, $v1
 /* A169E0 802407C0 00032843 */  sra       $a1, $v1, 1
 /* A169E4 802407C4 00B20018 */  mult      $a1, $s2
-/* A169E8 802407C8 3C048024 */  lui       $a0, 0x8024
-/* A169EC 802407CC 948433B0 */  lhu       $a0, 0x33b0($a0)
+/* A169E8 802407C8 3C048024 */  lui       $a0, %hi(D_802433B0)
+/* A169EC 802407CC 948433B0 */  lhu       $a0, %lo(D_802433B0)($a0)
 /* A169F0 802407D0 00031FC3 */  sra       $v1, $v1, 0x1f
 /* A169F4 802407D4 000433C2 */  srl       $a2, $a0, 0xf
 /* A169F8 802407D8 00004810 */  mfhi      $t1
@@ -150,8 +150,8 @@ glabel func_80240610_A16830
 /* A16A58 80240838 00621821 */  addu      $v1, $v1, $v0
 .L8024083C:
 /* A16A5C 8024083C 00031403 */  sra       $v0, $v1, 0x10
-/* A16A60 80240840 3C018024 */  lui       $at, 0x8024
-/* A16A64 80240844 D4224DF8 */  ldc1      $f2, 0x4df8($at)
+/* A16A60 80240840 3C018024 */  lui       $at, %hi(D_80244DF8)
+/* A16A64 80240844 D4224DF8 */  ldc1      $f2, %lo(D_80244DF8)($at)
 /* A16A68 80240848 44820000 */  mtc1      $v0, $f0
 /* A16A6C 8024084C 00000000 */  nop       
 /* A16A70 80240850 46800021 */  cvt.d.w   $f0, $f0
@@ -177,8 +177,8 @@ glabel func_80240610_A16830
 /* A16AB8 80240898 1440FF75 */  bnez      $v0, .L80240670
 /* A16ABC 8024089C 02120018 */   mult     $s0, $s2
 .L802408A0:
-/* A16AC0 802408A0 3C03800A */  lui       $v1, 0x800a
-/* A16AC4 802408A4 2463A66C */  addiu     $v1, $v1, -0x5994
+/* A16AC0 802408A0 3C03800A */  lui       $v1, %hi(D_8009A66C)
+/* A16AC4 802408A4 2463A66C */  addiu     $v1, $v1, %lo(D_8009A66C)
 /* A16AC8 802408A8 8C620000 */  lw        $v0, ($v1)
 /* A16ACC 802408AC 24040001 */  addiu     $a0, $zero, 1
 /* A16AD0 802408B0 0040802D */  daddu     $s0, $v0, $zero
@@ -187,8 +187,8 @@ glabel func_80240610_A16830
 /* A16ADC 802408BC 3C02DE00 */  lui       $v0, 0xde00
 /* A16AE0 802408C0 0C0470BB */  jal       func_8011C2EC
 /* A16AE4 802408C4 AE020000 */   sw       $v0, ($s0)
-/* A16AE8 802408C8 3C048024 */  lui       $a0, 0x8024
-/* A16AEC 802408CC 248433B0 */  addiu     $a0, $a0, 0x33b0
+/* A16AE8 802408C8 3C048024 */  lui       $a0, %hi(D_802433B0)
+/* A16AEC 802408CC 248433B0 */  addiu     $a0, $a0, %lo(D_802433B0)
 /* A16AF0 802408D0 94830000 */  lhu       $v1, ($a0)
 /* A16AF4 802408D4 AE020004 */  sw        $v0, 4($s0)
 /* A16AF8 802408D8 24630253 */  addiu     $v1, $v1, 0x253
diff --git a/asm/nonmatchings/world/area_hos/hos_02/A16220/func_80240904_A16B24.s b/asm/nonmatchings/world/area_hos/hos_02/A16220/func_80240904_A16B24.s
index 77483fd476..de22f52509 100644
--- a/asm/nonmatchings/world/area_hos/hos_02/A16220/func_80240904_A16B24.s
+++ b/asm/nonmatchings/world/area_hos/hos_02/A16220/func_80240904_A16B24.s
@@ -33,8 +33,8 @@ glabel func_80240904_A16B24
 /* A16B90 80240970 00031040 */  sll       $v0, $v1, 1
 /* A16B94 80240974 00431021 */  addu      $v0, $v0, $v1
 /* A16B98 80240978 02021023 */  subu      $v0, $s0, $v0
-/* A16B9C 8024097C 3C038024 */  lui       $v1, 0x8024
-/* A16BA0 80240980 946333B2 */  lhu       $v1, 0x33b2($v1)
+/* A16B9C 8024097C 3C038024 */  lui       $v1, %hi(D_802433B2)
+/* A16BA0 80240980 946333B2 */  lhu       $v1, %lo(D_802433B2)($v1)
 /* A16BA4 80240984 24420001 */  addiu     $v0, $v0, 1
 /* A16BA8 80240988 00620018 */  mult      $v1, $v0
 /* A16BAC 8024098C 8FA20014 */  lw        $v0, 0x14($sp)
@@ -62,8 +62,8 @@ glabel func_80240904_A16B24
 /* A16C04 802409E4 24637FFF */  addiu     $v1, $v1, 0x7fff
 .L802409E8:
 /* A16C08 802409E8 000313C3 */  sra       $v0, $v1, 0xf
-/* A16C0C 802409EC 3C018024 */  lui       $at, 0x8024
-/* A16C10 802409F0 D4224E00 */  ldc1      $f2, 0x4e00($at)
+/* A16C0C 802409EC 3C018024 */  lui       $at, %hi(D_80244E00)
+/* A16C10 802409F0 D4224E00 */  ldc1      $f2, %lo(D_80244E00)($at)
 /* A16C14 802409F4 44820000 */  mtc1      $v0, $f0
 /* A16C18 802409F8 00000000 */  nop       
 /* A16C1C 802409FC 46800021 */  cvt.d.w   $f0, $f0
@@ -120,8 +120,8 @@ glabel func_80240904_A16B24
 /* A16CD4 80240AB4 02031821 */  addu      $v1, $s0, $v1
 /* A16CD8 80240AB8 00032843 */  sra       $a1, $v1, 1
 /* A16CDC 80240ABC 00B20018 */  mult      $a1, $s2
-/* A16CE0 80240AC0 3C048024 */  lui       $a0, 0x8024
-/* A16CE4 80240AC4 948433B2 */  lhu       $a0, 0x33b2($a0)
+/* A16CE0 80240AC0 3C048024 */  lui       $a0, %hi(D_802433B2)
+/* A16CE4 80240AC4 948433B2 */  lhu       $a0, %lo(D_802433B2)($a0)
 /* A16CE8 80240AC8 00031FC3 */  sra       $v1, $v1, 0x1f
 /* A16CEC 80240ACC 000433C2 */  srl       $a2, $a0, 0xf
 /* A16CF0 80240AD0 00004810 */  mfhi      $t1
@@ -151,8 +151,8 @@ glabel func_80240904_A16B24
 /* A16D50 80240B30 00621821 */  addu      $v1, $v1, $v0
 .L80240B34:
 /* A16D54 80240B34 00031403 */  sra       $v0, $v1, 0x10
-/* A16D58 80240B38 3C018024 */  lui       $at, 0x8024
-/* A16D5C 80240B3C D4224E08 */  ldc1      $f2, 0x4e08($at)
+/* A16D58 80240B38 3C018024 */  lui       $at, %hi(D_80244E08)
+/* A16D5C 80240B3C D4224E08 */  ldc1      $f2, %lo(D_80244E08)($at)
 /* A16D60 80240B40 44820000 */  mtc1      $v0, $f0
 /* A16D64 80240B44 00000000 */  nop       
 /* A16D68 80240B48 46800021 */  cvt.d.w   $f0, $f0
@@ -178,8 +178,8 @@ glabel func_80240904_A16B24
 /* A16DB0 80240B90 1440FF74 */  bnez      $v0, .L80240964
 /* A16DB4 80240B94 02120018 */   mult     $s0, $s2
 .L80240B98:
-/* A16DB8 80240B98 3C03800A */  lui       $v1, 0x800a
-/* A16DBC 80240B9C 2463A66C */  addiu     $v1, $v1, -0x5994
+/* A16DB8 80240B98 3C03800A */  lui       $v1, %hi(D_8009A66C)
+/* A16DBC 80240B9C 2463A66C */  addiu     $v1, $v1, %lo(D_8009A66C)
 /* A16DC0 80240BA0 8C620000 */  lw        $v0, ($v1)
 /* A16DC4 80240BA4 24040002 */  addiu     $a0, $zero, 2
 /* A16DC8 80240BA8 0040802D */  daddu     $s0, $v0, $zero
@@ -188,8 +188,8 @@ glabel func_80240904_A16B24
 /* A16DD4 80240BB4 3C02DE00 */  lui       $v0, 0xde00
 /* A16DD8 80240BB8 0C0470BB */  jal       func_8011C2EC
 /* A16DDC 80240BBC AE020000 */   sw       $v0, ($s0)
-/* A16DE0 80240BC0 3C048024 */  lui       $a0, 0x8024
-/* A16DE4 80240BC4 248433B2 */  addiu     $a0, $a0, 0x33b2
+/* A16DE0 80240BC0 3C048024 */  lui       $a0, %hi(D_802433B2)
+/* A16DE4 80240BC4 248433B2 */  addiu     $a0, $a0, %lo(D_802433B2)
 /* A16DE8 80240BC8 94830000 */  lhu       $v1, ($a0)
 /* A16DEC 80240BCC AE020004 */  sw        $v0, 4($s0)
 /* A16DF0 80240BD0 24630253 */  addiu     $v1, $v1, 0x253
diff --git a/asm/nonmatchings/world/area_hos/hos_02/A16220/func_80240BFC_A16E1C.s b/asm/nonmatchings/world/area_hos/hos_02/A16220/func_80240BFC_A16E1C.s
index 0a4571640f..84edcd6724 100644
--- a/asm/nonmatchings/world/area_hos/hos_02/A16220/func_80240BFC_A16E1C.s
+++ b/asm/nonmatchings/world/area_hos/hos_02/A16220/func_80240BFC_A16E1C.s
@@ -33,8 +33,8 @@ glabel func_80240BFC_A16E1C
 /* A16E88 80240C68 00031040 */  sll       $v0, $v1, 1
 /* A16E8C 80240C6C 00431021 */  addu      $v0, $v0, $v1
 /* A16E90 80240C70 02021023 */  subu      $v0, $s0, $v0
-/* A16E94 80240C74 3C038024 */  lui       $v1, 0x8024
-/* A16E98 80240C78 946333B4 */  lhu       $v1, 0x33b4($v1)
+/* A16E94 80240C74 3C038024 */  lui       $v1, %hi(D_802433B4)
+/* A16E98 80240C78 946333B4 */  lhu       $v1, %lo(D_802433B4)($v1)
 /* A16E9C 80240C7C 24420001 */  addiu     $v0, $v0, 1
 /* A16EA0 80240C80 00620018 */  mult      $v1, $v0
 /* A16EA4 80240C84 8FA20014 */  lw        $v0, 0x14($sp)
@@ -95,8 +95,8 @@ glabel func_80240BFC_A16E1C
 /* A16F74 80240D54 24427FFF */  addiu     $v0, $v0, 0x7fff
 .L80240D58:
 /* A16F78 80240D58 000213C3 */  sra       $v0, $v0, 0xf
-/* A16F7C 80240D5C 3C018024 */  lui       $at, 0x8024
-/* A16F80 80240D60 D4224E10 */  ldc1      $f2, 0x4e10($at)
+/* A16F7C 80240D5C 3C018024 */  lui       $at, %hi(D_80244E10)
+/* A16F80 80240D60 D4224E10 */  ldc1      $f2, %lo(D_80244E10)($at)
 /* A16F84 80240D64 44820000 */  mtc1      $v0, $f0
 /* A16F88 80240D68 00000000 */  nop       
 /* A16F8C 80240D6C 46800021 */  cvt.d.w   $f0, $f0
@@ -120,8 +120,8 @@ glabel func_80240BFC_A16E1C
 /* A16FCC 80240DAC 02031821 */  addu      $v1, $s0, $v1
 /* A16FD0 80240DB0 00032843 */  sra       $a1, $v1, 1
 /* A16FD4 80240DB4 00B20018 */  mult      $a1, $s2
-/* A16FD8 80240DB8 3C048024 */  lui       $a0, 0x8024
-/* A16FDC 80240DBC 948433B4 */  lhu       $a0, 0x33b4($a0)
+/* A16FD8 80240DB8 3C048024 */  lui       $a0, %hi(D_802433B4)
+/* A16FDC 80240DBC 948433B4 */  lhu       $a0, %lo(D_802433B4)($a0)
 /* A16FE0 80240DC0 00031FC3 */  sra       $v1, $v1, 0x1f
 /* A16FE4 80240DC4 000433C2 */  srl       $a2, $a0, 0xf
 /* A16FE8 80240DC8 00004810 */  mfhi      $t1
@@ -151,8 +151,8 @@ glabel func_80240BFC_A16E1C
 /* A17048 80240E28 00621821 */  addu      $v1, $v1, $v0
 .L80240E2C:
 /* A1704C 80240E2C 00031403 */  sra       $v0, $v1, 0x10
-/* A17050 80240E30 3C018024 */  lui       $at, 0x8024
-/* A17054 80240E34 D4224E18 */  ldc1      $f2, 0x4e18($at)
+/* A17050 80240E30 3C018024 */  lui       $at, %hi(D_80244E18)
+/* A17054 80240E34 D4224E18 */  ldc1      $f2, %lo(D_80244E18)($at)
 /* A17058 80240E38 44820000 */  mtc1      $v0, $f0
 /* A1705C 80240E3C 00000000 */  nop       
 /* A17060 80240E40 46800021 */  cvt.d.w   $f0, $f0
@@ -178,8 +178,8 @@ glabel func_80240BFC_A16E1C
 /* A170A8 80240E88 1440FF74 */  bnez      $v0, .L80240C5C
 /* A170AC 80240E8C 02120018 */   mult     $s0, $s2
 .L80240E90:
-/* A170B0 80240E90 3C03800A */  lui       $v1, 0x800a
-/* A170B4 80240E94 2463A66C */  addiu     $v1, $v1, -0x5994
+/* A170B0 80240E90 3C03800A */  lui       $v1, %hi(D_8009A66C)
+/* A170B4 80240E94 2463A66C */  addiu     $v1, $v1, %lo(D_8009A66C)
 /* A170B8 80240E98 8C620000 */  lw        $v0, ($v1)
 /* A170BC 80240E9C 24040003 */  addiu     $a0, $zero, 3
 /* A170C0 80240EA0 0040802D */  daddu     $s0, $v0, $zero
@@ -188,8 +188,8 @@ glabel func_80240BFC_A16E1C
 /* A170CC 80240EAC 3C02DE00 */  lui       $v0, 0xde00
 /* A170D0 80240EB0 0C0470BB */  jal       func_8011C2EC
 /* A170D4 80240EB4 AE020000 */   sw       $v0, ($s0)
-/* A170D8 80240EB8 3C048024 */  lui       $a0, 0x8024
-/* A170DC 80240EBC 248433B4 */  addiu     $a0, $a0, 0x33b4
+/* A170D8 80240EB8 3C048024 */  lui       $a0, %hi(D_802433B4)
+/* A170DC 80240EBC 248433B4 */  addiu     $a0, $a0, %lo(D_802433B4)
 /* A170E0 80240EC0 94830000 */  lhu       $v1, ($a0)
 /* A170E4 80240EC4 AE020004 */  sw        $v0, 4($s0)
 /* A170E8 80240EC8 24630253 */  addiu     $v1, $v1, 0x253
diff --git a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80240FF0_A17210.s b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80240FF0_A17210.s
index d9fb3f9dfa..fe12d91dd9 100644
--- a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80240FF0_A17210.s
+++ b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80240FF0_A17210.s
@@ -87,8 +87,8 @@ glabel func_80240FF0_A17210
 /* A17350 80241130 08090456 */  j         .L80241158
 /* A17354 80241134 E6000018 */   swc1     $f0, 0x18($s0)
 .L80241138:
-/* A17358 80241138 3C018024 */  lui       $at, 0x8024
-/* A1735C 8024113C D4224E20 */  ldc1      $f2, 0x4e20($at)
+/* A17358 80241138 3C018024 */  lui       $at, %hi(D_80244E20)
+/* A1735C 8024113C D4224E20 */  ldc1      $f2, %lo(D_80244E20)($at)
 /* A17360 80241140 44820000 */  mtc1      $v0, $f0
 /* A17364 80241144 00000000 */  nop       
 /* A17368 80241148 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802411A0_A173C0.s b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802411A0_A173C0.s
index c28a26b1b0..fc1b1cf496 100644
--- a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802411A0_A173C0.s
+++ b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802411A0_A173C0.s
@@ -104,8 +104,8 @@ glabel func_802411A0_A173C0
 /* A17544 80241324 1040000A */  beqz      $v0, .L80241350
 /* A17548 80241328 4600C106 */   mov.s    $f4, $f24
 /* A1754C 8024132C 4614C081 */  sub.s     $f2, $f24, $f20
-/* A17550 80241330 3C018024 */  lui       $at, 0x8024
-/* A17554 80241334 D4204E28 */  ldc1      $f0, 0x4e28($at)
+/* A17550 80241330 3C018024 */  lui       $at, %hi(D_80244E28)
+/* A17554 80241334 D4204E28 */  ldc1      $f0, %lo(D_80244E28)($at)
 /* A17558 80241338 460010A1 */  cvt.d.s   $f2, $f2
 /* A1755C 8024133C 46201082 */  mul.d     $f2, $f2, $f0
 /* A17560 80241340 00000000 */  nop       
@@ -131,8 +131,8 @@ glabel func_802411A0_A173C0
 /* A175AC 8024138C C7A4002C */  lwc1      $f4, 0x2c($sp)
 /* A175B0 80241390 461A2100 */  add.s     $f4, $f4, $f26
 /* A175B4 80241394 46142081 */  sub.s     $f2, $f4, $f20
-/* A175B8 80241398 3C018024 */  lui       $at, 0x8024
-/* A175BC 8024139C D4204E30 */  ldc1      $f0, 0x4e30($at)
+/* A175B8 80241398 3C018024 */  lui       $at, %hi(D_80244E30)
+/* A175BC 8024139C D4204E30 */  ldc1      $f0, %lo(D_80244E30)($at)
 /* A175C0 802413A0 460010A1 */  cvt.d.s   $f2, $f2
 /* A175C4 802413A4 46201082 */  mul.d     $f2, $f2, $f0
 /* A175C8 802413A8 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241C44_A17E64.s b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241C44_A17E64.s
index 4f6d9347b8..89f2c4d891 100644
--- a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241C44_A17E64.s
+++ b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241C44_A17E64.s
@@ -15,9 +15,9 @@ glabel func_80241C44_A17E64
 /* A17E8C 80241C6C 00031C00 */  sll       $v1, $v1, 0x10
 /* A17E90 80241C70 00031B83 */  sra       $v1, $v1, 0xe
 /* A17E94 80241C74 A444008E */  sh        $a0, 0x8e($v0)
-/* A17E98 80241C78 3C018024 */  lui       $at, 0x8024
+/* A17E98 80241C78 3C018024 */  lui       $at, %hi(D_80244490)
 /* A17E9C 80241C7C 00230821 */  addu      $at, $at, $v1
-/* A17EA0 80241C80 C4224490 */  lwc1      $f2, 0x4490($at)
+/* A17EA0 80241C80 C4224490 */  lwc1      $f2, %lo(D_80244490)($at)
 /* A17EA4 80241C84 8443008E */  lh        $v1, 0x8e($v0)
 /* A17EA8 80241C88 46020000 */  add.s     $f0, $f0, $f2
 /* A17EAC 80241C8C 28630005 */  slti      $v1, $v1, 5
diff --git a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802422FC_A1851C.s b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802422FC_A1851C.s
index 686318e515..5f1e654574 100644
--- a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802422FC_A1851C.s
+++ b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802422FC_A1851C.s
@@ -66,9 +66,9 @@ glabel func_802422FC_A1851C
 /* A18608 802423E8 2C62000F */  sltiu     $v0, $v1, 0xf
 /* A1860C 802423EC 10400034 */  beqz      $v0, .L802424C0
 /* A18610 802423F0 00031080 */   sll      $v0, $v1, 2
-/* A18614 802423F4 3C018024 */  lui       $at, 0x8024
+/* A18614 802423F4 3C018024 */  lui       $at, %hi(D_80244E38)
 /* A18618 802423F8 00220821 */  addu      $at, $at, $v0
-/* A1861C 802423FC 8C224E38 */  lw        $v0, 0x4e38($at)
+/* A1861C 802423FC 8C224E38 */  lw        $v0, %lo(D_80244E38)($at)
 /* A18620 80242400 00400008 */  jr        $v0
 /* A18624 80242404 00000000 */   nop      
 /* A18628 80242408 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80242618_A18838.s b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80242618_A18838.s
index 424e37741a..cde7b1932e 100644
--- a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80242618_A18838.s
+++ b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80242618_A18838.s
@@ -142,8 +142,8 @@ glabel func_80242618_A18838
 /* A18A50 80242830 4500000A */  bc1f      .L8024285C
 /* A18A54 80242834 00000000 */   nop      
 .L80242838:
-/* A18A58 80242838 3C018024 */  lui       $at, 0x8024
-/* A18A5C 8024283C D4224E78 */  ldc1      $f2, 0x4e78($at)
+/* A18A58 80242838 3C018024 */  lui       $at, %hi(D_80244E78)
+/* A18A5C 8024283C D4224E78 */  ldc1      $f2, %lo(D_80244E78)($at)
 /* A18A60 80242840 46003187 */  neg.s     $f6, $f6
 /* A18A64 80242844 46003021 */  cvt.d.s   $f0, $f6
 /* A18A68 80242848 46220002 */  mul.d     $f0, $f0, $f2
diff --git a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802428F4_A18B14.s b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802428F4_A18B14.s
index a3ba64d495..c65c71c676 100644
--- a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802428F4_A18B14.s
+++ b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802428F4_A18B14.s
@@ -67,9 +67,9 @@ glabel func_802428F4_A18B14
 /* A18C04 802429E4 2C620015 */  sltiu     $v0, $v1, 0x15
 /* A18C08 802429E8 10400032 */  beqz      $v0, .L80242AB4
 /* A18C0C 802429EC 00031080 */   sll      $v0, $v1, 2
-/* A18C10 802429F0 3C018024 */  lui       $at, 0x8024
+/* A18C10 802429F0 3C018024 */  lui       $at, %hi(D_80244E80)
 /* A18C14 802429F4 00220821 */  addu      $at, $at, $v0
-/* A18C18 802429F8 8C224E80 */  lw        $v0, 0x4e80($at)
+/* A18C18 802429F8 8C224E80 */  lw        $v0, %lo(D_80244E80)($at)
 /* A18C1C 802429FC 00400008 */  jr        $v0
 /* A18C20 80242A00 00000000 */   nop      
 /* A18C24 80242A04 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1B130/func_8024033C_A1B43C.s b/asm/nonmatchings/world/area_hos/hos_03/A1B130/func_8024033C_A1B43C.s
index bcef5e3357..8ce482fb11 100644
--- a/asm/nonmatchings/world/area_hos/hos_03/A1B130/func_8024033C_A1B43C.s
+++ b/asm/nonmatchings/world/area_hos/hos_03/A1B130/func_8024033C_A1B43C.s
@@ -6,8 +6,8 @@ glabel func_8024033C_A1B43C
 /* A1B440 80240340 AFB30034 */  sw        $s3, 0x34($sp)
 /* A1B444 80240344 3C130001 */  lui       $s3, 1
 /* A1B448 80240348 AFB00028 */  sw        $s0, 0x28($sp)
-/* A1B44C 8024034C 3C108024 */  lui       $s0, 0x8024
-/* A1B450 80240350 26103BCC */  addiu     $s0, $s0, 0x3bcc
+/* A1B44C 8024034C 3C108024 */  lui       $s0, %hi(D_80243BCC)
+/* A1B450 80240350 26103BCC */  addiu     $s0, $s0, %lo(D_80243BCC)
 /* A1B454 80240354 AFBF0040 */  sw        $ra, 0x40($sp)
 /* A1B458 80240358 AFB5003C */  sw        $s5, 0x3c($sp)
 /* A1B45C 8024035C AFB40038 */  sw        $s4, 0x38($sp)
@@ -21,10 +21,10 @@ glabel func_8024033C_A1B43C
 /* A1B47C 8024037C 44821000 */  mtc1      $v0, $f2
 /* A1B480 80240380 00000000 */  nop       
 /* A1B484 80240384 468010A0 */  cvt.s.w   $f2, $f2
-/* A1B488 80240388 3C12800A */  lui       $s2, 0x800a
-/* A1B48C 8024038C 2652A674 */  addiu     $s2, $s2, -0x598c
-/* A1B490 80240390 3C118007 */  lui       $s1, 0x8007
-/* A1B494 80240394 263141F0 */  addiu     $s1, $s1, 0x41f0
+/* A1B488 80240388 3C12800A */  lui       $s2, %hi(D_8009A674)
+/* A1B48C 8024038C 2652A674 */  addiu     $s2, $s2, %lo(D_8009A674)
+/* A1B490 80240390 3C118007 */  lui       $s1, %hi(D_800741F0)
+/* A1B494 80240394 263141F0 */  addiu     $s1, $s1, %lo(D_800741F0)
 /* A1B498 80240398 3C073F80 */  lui       $a3, 0x3f80
 /* A1B49C 8024039C 3C013800 */  lui       $at, 0x3800
 /* A1B4A0 802403A0 44810000 */  mtc1      $at, $f0
@@ -52,8 +52,8 @@ glabel func_8024033C_A1B43C
 /* A1B4F8 802403F8 24040001 */  addiu     $a0, $zero, 1
 /* A1B4FC 802403FC 27A50018 */  addiu     $a1, $sp, 0x18
 /* A1B500 80240400 27A6001C */  addiu     $a2, $sp, 0x1c
-/* A1B504 80240404 3C08800A */  lui       $t0, 0x800a
-/* A1B508 80240408 2508A66C */  addiu     $t0, $t0, -0x5994
+/* A1B504 80240404 3C08800A */  lui       $t0, %hi(D_8009A66C)
+/* A1B508 80240408 2508A66C */  addiu     $t0, $t0, %lo(D_8009A66C)
 /* A1B50C 8024040C 27A70020 */  addiu     $a3, $sp, 0x20
 /* A1B510 80240410 8D030000 */  lw        $v1, ($t0)
 /* A1B514 80240414 96220000 */  lhu       $v0, ($s1)
@@ -73,8 +73,8 @@ glabel func_8024033C_A1B43C
 /* A1B54C 8024044C 8FA20020 */  lw        $v0, 0x20($sp)
 /* A1B550 80240450 1840004F */  blez      $v0, .L80240590
 /* A1B554 80240454 0000802D */   daddu    $s0, $zero, $zero
-/* A1B558 80240458 3C158024 */  lui       $s5, 0x8024
-/* A1B55C 8024045C 26B53BCE */  addiu     $s5, $s5, 0x3bce
+/* A1B558 80240458 3C158024 */  lui       $s5, %hi(D_80243BCE)
+/* A1B55C 8024045C 26B53BCE */  addiu     $s5, $s5, %lo(D_80243BCE)
 /* A1B560 80240460 3C135555 */  lui       $s3, 0x5555
 /* A1B564 80240464 36735556 */  ori       $s3, $s3, 0x5556
 /* A1B568 80240468 34148000 */  ori       $s4, $zero, 0x8000
@@ -157,8 +157,8 @@ glabel func_8024033C_A1B43C
 .L80240590:
 /* A1B690 80240590 3C05D9FF */  lui       $a1, 0xd9ff
 /* A1B694 80240594 34A5F9FF */  ori       $a1, $a1, 0xf9ff
-/* A1B698 80240598 3C03800A */  lui       $v1, 0x800a
-/* A1B69C 8024059C 2463A66C */  addiu     $v1, $v1, -0x5994
+/* A1B698 80240598 3C03800A */  lui       $v1, %hi(D_8009A66C)
+/* A1B69C 8024059C 2463A66C */  addiu     $v1, $v1, %lo(D_8009A66C)
 /* A1B6A0 802405A0 8C700000 */  lw        $s0, ($v1)
 /* A1B6A4 802405A4 24040001 */  addiu     $a0, $zero, 1
 /* A1B6A8 802405A8 0200102D */  daddu     $v0, $s0, $zero
@@ -171,8 +171,8 @@ glabel func_8024033C_A1B43C
 /* A1B6C4 802405C4 3C02DE00 */  lui       $v0, 0xde00
 /* A1B6C8 802405C8 0C0470BB */  jal       func_8011C2EC
 /* A1B6CC 802405CC AE020000 */   sw       $v0, ($s0)
-/* A1B6D0 802405D0 3C048024 */  lui       $a0, 0x8024
-/* A1B6D4 802405D4 24843BCE */  addiu     $a0, $a0, 0x3bce
+/* A1B6D0 802405D0 3C048024 */  lui       $a0, %hi(D_80243BCE)
+/* A1B6D4 802405D4 24843BCE */  addiu     $a0, $a0, %lo(D_80243BCE)
 /* A1B6D8 802405D8 94830000 */  lhu       $v1, ($a0)
 /* A1B6DC 802405DC AE020004 */  sw        $v0, 4($s0)
 /* A1B6E0 802405E0 24630666 */  addiu     $v1, $v1, 0x666
diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1B130/func_8024060C_A1B70C.s b/asm/nonmatchings/world/area_hos/hos_03/A1B130/func_8024060C_A1B70C.s
index 3d159ab329..b872d57972 100644
--- a/asm/nonmatchings/world/area_hos/hos_03/A1B130/func_8024060C_A1B70C.s
+++ b/asm/nonmatchings/world/area_hos/hos_03/A1B130/func_8024060C_A1B70C.s
@@ -18,8 +18,8 @@ glabel func_8024060C_A1B70C
 /* A1B740 80240640 8FA20018 */  lw        $v0, 0x18($sp)
 /* A1B744 80240644 1840004F */  blez      $v0, .L80240784
 /* A1B748 80240648 0000802D */   daddu    $s0, $zero, $zero
-/* A1B74C 8024064C 3C158024 */  lui       $s5, 0x8024
-/* A1B750 80240650 26B53BD0 */  addiu     $s5, $s5, 0x3bd0
+/* A1B74C 8024064C 3C158024 */  lui       $s5, %hi(D_80243BD0)
+/* A1B750 80240650 26B53BD0 */  addiu     $s5, $s5, %lo(D_80243BD0)
 /* A1B754 80240654 3C135555 */  lui       $s3, 0x5555
 /* A1B758 80240658 36735556 */  ori       $s3, $s3, 0x5556
 /* A1B75C 8024065C 34148000 */  ori       $s4, $zero, 0x8000
@@ -100,8 +100,8 @@ glabel func_8024060C_A1B70C
 /* A1B87C 8024077C 1440FFB9 */  bnez      $v0, .L80240664
 /* A1B880 80240780 02130018 */   mult     $s0, $s3
 .L80240784:
-/* A1B884 80240784 3C03800A */  lui       $v1, 0x800a
-/* A1B888 80240788 2463A66C */  addiu     $v1, $v1, -0x5994
+/* A1B884 80240784 3C03800A */  lui       $v1, %hi(D_8009A66C)
+/* A1B888 80240788 2463A66C */  addiu     $v1, $v1, %lo(D_8009A66C)
 /* A1B88C 8024078C 8C620000 */  lw        $v0, ($v1)
 /* A1B890 80240790 24040002 */  addiu     $a0, $zero, 2
 /* A1B894 80240794 0040802D */  daddu     $s0, $v0, $zero
@@ -110,8 +110,8 @@ glabel func_8024060C_A1B70C
 /* A1B8A0 802407A0 3C02DE00 */  lui       $v0, 0xde00
 /* A1B8A4 802407A4 0C0470BB */  jal       func_8011C2EC
 /* A1B8A8 802407A8 AE020000 */   sw       $v0, ($s0)
-/* A1B8AC 802407AC 3C048024 */  lui       $a0, 0x8024
-/* A1B8B0 802407B0 24843BD0 */  addiu     $a0, $a0, 0x3bd0
+/* A1B8AC 802407AC 3C048024 */  lui       $a0, %hi(D_80243BD0)
+/* A1B8B0 802407B0 24843BD0 */  addiu     $a0, $a0, %lo(D_80243BD0)
 /* A1B8B4 802407B4 94830000 */  lhu       $v1, ($a0)
 /* A1B8B8 802407B8 AE020004 */  sw        $v0, 4($s0)
 /* A1B8BC 802407BC 24630253 */  addiu     $v1, $v1, 0x253
diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1B130/func_802407E8_A1B8E8.s b/asm/nonmatchings/world/area_hos/hos_03/A1B130/func_802407E8_A1B8E8.s
index 05d33e034b..30216a0f11 100644
--- a/asm/nonmatchings/world/area_hos/hos_03/A1B130/func_802407E8_A1B8E8.s
+++ b/asm/nonmatchings/world/area_hos/hos_03/A1B130/func_802407E8_A1B8E8.s
@@ -28,8 +28,8 @@ glabel func_802407E8_A1B8E8
 /* A1B940 80240840 00031040 */  sll       $v0, $v1, 1
 /* A1B944 80240844 00431021 */  addu      $v0, $v0, $v1
 /* A1B948 80240848 02021023 */  subu      $v0, $s0, $v0
-/* A1B94C 8024084C 3C038024 */  lui       $v1, 0x8024
-/* A1B950 80240850 94633BD2 */  lhu       $v1, 0x3bd2($v1)
+/* A1B94C 8024084C 3C038024 */  lui       $v1, %hi(D_80243BD2)
+/* A1B950 80240850 94633BD2 */  lhu       $v1, %lo(D_80243BD2)($v1)
 /* A1B954 80240854 24420001 */  addiu     $v0, $v0, 1
 /* A1B958 80240858 00620018 */  mult      $v1, $v0
 /* A1B95C 8024085C 8FA20014 */  lw        $v0, 0x14($sp)
@@ -61,8 +61,8 @@ glabel func_802407E8_A1B8E8
 /* A1B9C0 802408C0 1480FFDB */  bnez      $a0, .L80240830
 /* A1B9C4 802408C4 A6430002 */   sh       $v1, 2($s2)
 .L802408C8:
-/* A1B9C8 802408C8 3C03800A */  lui       $v1, 0x800a
-/* A1B9CC 802408CC 2463A66C */  addiu     $v1, $v1, -0x5994
+/* A1B9C8 802408C8 3C03800A */  lui       $v1, %hi(D_8009A66C)
+/* A1B9CC 802408CC 2463A66C */  addiu     $v1, $v1, %lo(D_8009A66C)
 /* A1B9D0 802408D0 8C620000 */  lw        $v0, ($v1)
 /* A1B9D4 802408D4 0000202D */  daddu     $a0, $zero, $zero
 /* A1B9D8 802408D8 0040802D */  daddu     $s0, $v0, $zero
@@ -71,8 +71,8 @@ glabel func_802407E8_A1B8E8
 /* A1B9E4 802408E4 3C02DE00 */  lui       $v0, 0xde00
 /* A1B9E8 802408E8 0C0470BB */  jal       func_8011C2EC
 /* A1B9EC 802408EC AE020000 */   sw       $v0, ($s0)
-/* A1B9F0 802408F0 3C048024 */  lui       $a0, 0x8024
-/* A1B9F4 802408F4 24843BD2 */  addiu     $a0, $a0, 0x3bd2
+/* A1B9F0 802408F0 3C048024 */  lui       $a0, %hi(D_80243BD2)
+/* A1B9F4 802408F4 24843BD2 */  addiu     $a0, $a0, %lo(D_80243BD2)
 /* A1B9F8 802408F8 94830000 */  lhu       $v1, ($a0)
 /* A1B9FC 802408FC AE020004 */  sw        $v0, 4($s0)
 /* A1BA00 80240900 246300A3 */  addiu     $v1, $v1, 0xa3
diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1B130/func_80240928_A1BA28.s b/asm/nonmatchings/world/area_hos/hos_03/A1B130/func_80240928_A1BA28.s
index 69cdd1b0cf..8ec9ec6768 100644
--- a/asm/nonmatchings/world/area_hos/hos_03/A1B130/func_80240928_A1BA28.s
+++ b/asm/nonmatchings/world/area_hos/hos_03/A1B130/func_80240928_A1BA28.s
@@ -4,8 +4,8 @@
 glabel func_80240928_A1BA28
 /* A1BA28 80240928 27BDFFD8 */  addiu     $sp, $sp, -0x28
 /* A1BA2C 8024092C AFB10014 */  sw        $s1, 0x14($sp)
-/* A1BA30 80240930 3C118024 */  lui       $s1, 0x8024
-/* A1BA34 80240934 26313BD4 */  addiu     $s1, $s1, 0x3bd4
+/* A1BA30 80240930 3C118024 */  lui       $s1, %hi(D_80243BD4)
+/* A1BA34 80240934 26313BD4 */  addiu     $s1, $s1, %lo(D_80243BD4)
 /* A1BA38 80240938 AFBF0020 */  sw        $ra, 0x20($sp)
 /* A1BA3C 8024093C AFB3001C */  sw        $s3, 0x1c($sp)
 /* A1BA40 80240940 AFB20018 */  sw        $s2, 0x18($sp)
@@ -31,15 +31,15 @@ glabel func_80240928_A1BA28
 /* A1BA90 80240990 36731630 */  ori       $s3, $s3, 0x1630
 /* A1BA94 80240994 46220002 */  mul.d     $f0, $f0, $f2
 /* A1BA98 80240998 00000000 */  nop       
-/* A1BA9C 8024099C 3C12800A */  lui       $s2, 0x800a
-/* A1BAA0 802409A0 2652A674 */  addiu     $s2, $s2, -0x598c
-/* A1BAA4 802409A4 3C108007 */  lui       $s0, 0x8007
-/* A1BAA8 802409A8 261041F0 */  addiu     $s0, $s0, 0x41f0
+/* A1BA9C 8024099C 3C12800A */  lui       $s2, %hi(D_8009A674)
+/* A1BAA0 802409A0 2652A674 */  addiu     $s2, $s2, %lo(D_8009A674)
+/* A1BAA4 802409A4 3C108007 */  lui       $s0, %hi(D_800741F0)
+/* A1BAA8 802409A8 261041F0 */  addiu     $s0, $s0, %lo(D_800741F0)
 /* A1BAAC 802409AC 96040000 */  lhu       $a0, ($s0)
 /* A1BAB0 802409B0 8E420000 */  lw        $v0, ($s2)
 /* A1BAB4 802409B4 00042180 */  sll       $a0, $a0, 6
-/* A1BAB8 802409B8 3C018025 */  lui       $at, 0x8025
-/* A1BABC 802409BC D422BD60 */  ldc1      $f2, -0x42a0($at)
+/* A1BAB8 802409B8 3C018025 */  lui       $at, %hi(D_8024BD60)
+/* A1BABC 802409BC D422BD60 */  ldc1      $f2, %lo(D_8024BD60)($at)
 /* A1BAC0 802409C0 00932021 */  addu      $a0, $a0, $s3
 /* A1BAC4 802409C4 46220000 */  add.d     $f0, $f0, $f2
 /* A1BAC8 802409C8 00442021 */  addu      $a0, $v0, $a0
@@ -52,8 +52,8 @@ glabel func_80240928_A1BA28
 /* A1BAE4 802409E4 0C019DC0 */  jal       guScale
 /* A1BAE8 802409E8 00A0382D */   daddu    $a3, $a1, $zero
 /* A1BAEC 802409EC 3C05DA38 */  lui       $a1, 0xda38
-/* A1BAF0 802409F0 3C04800A */  lui       $a0, 0x800a
-/* A1BAF4 802409F4 2484A66C */  addiu     $a0, $a0, -0x5994
+/* A1BAF0 802409F0 3C04800A */  lui       $a0, %hi(D_8009A66C)
+/* A1BAF4 802409F4 2484A66C */  addiu     $a0, $a0, %lo(D_8009A66C)
 /* A1BAF8 802409F8 34A50001 */  ori       $a1, $a1, 1
 /* A1BAFC 802409FC 8C830000 */  lw        $v1, ($a0)
 /* A1BB00 80240A00 96020000 */  lhu       $v0, ($s0)
diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80240CB0_A1BDB0.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80240CB0_A1BDB0.s
index 2276f00b3d..abb4c0b6e7 100644
--- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80240CB0_A1BDB0.s
+++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80240CB0_A1BDB0.s
@@ -87,8 +87,8 @@ glabel func_80240CB0_A1BDB0
 /* A1BEF0 80240DF0 08090386 */  j         .L80240E18
 /* A1BEF4 80240DF4 E6000018 */   swc1     $f0, 0x18($s0)
 .L80240DF8:
-/* A1BEF8 80240DF8 3C018025 */  lui       $at, 0x8025
-/* A1BEFC 80240DFC D422BD70 */  ldc1      $f2, -0x4290($at)
+/* A1BEF8 80240DF8 3C018025 */  lui       $at, %hi(D_8024BD70)
+/* A1BEFC 80240DFC D422BD70 */  ldc1      $f2, %lo(D_8024BD70)($at)
 /* A1BF00 80240E00 44820000 */  mtc1      $v0, $f0
 /* A1BF04 80240E04 00000000 */  nop       
 /* A1BF08 80240E08 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80240E60_A1BF60.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80240E60_A1BF60.s
index 3bcc8190f1..51ab0a132f 100644
--- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80240E60_A1BF60.s
+++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80240E60_A1BF60.s
@@ -104,8 +104,8 @@ glabel func_80240E60_A1BF60
 /* A1C0E4 80240FE4 1040000A */  beqz      $v0, .L80241010
 /* A1C0E8 80240FE8 4600C106 */   mov.s    $f4, $f24
 /* A1C0EC 80240FEC 4614C081 */  sub.s     $f2, $f24, $f20
-/* A1C0F0 80240FF0 3C018025 */  lui       $at, 0x8025
-/* A1C0F4 80240FF4 D420BD78 */  ldc1      $f0, -0x4288($at)
+/* A1C0F0 80240FF0 3C018025 */  lui       $at, %hi(D_8024BD78)
+/* A1C0F4 80240FF4 D420BD78 */  ldc1      $f0, %lo(D_8024BD78)($at)
 /* A1C0F8 80240FF8 460010A1 */  cvt.d.s   $f2, $f2
 /* A1C0FC 80240FFC 46201082 */  mul.d     $f2, $f2, $f0
 /* A1C100 80241000 00000000 */  nop       
@@ -131,8 +131,8 @@ glabel func_80240E60_A1BF60
 /* A1C14C 8024104C C7A4002C */  lwc1      $f4, 0x2c($sp)
 /* A1C150 80241050 461A2100 */  add.s     $f4, $f4, $f26
 /* A1C154 80241054 46142081 */  sub.s     $f2, $f4, $f20
-/* A1C158 80241058 3C018025 */  lui       $at, 0x8025
-/* A1C15C 8024105C D420BD80 */  ldc1      $f0, -0x4280($at)
+/* A1C158 80241058 3C018025 */  lui       $at, %hi(D_8024BD80)
+/* A1C15C 8024105C D420BD80 */  ldc1      $f0, %lo(D_8024BD80)($at)
 /* A1C160 80241060 460010A1 */  cvt.d.s   $f2, $f2
 /* A1C164 80241064 46201082 */  mul.d     $f2, $f2, $f0
 /* A1C168 80241068 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241904_A1CA04.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241904_A1CA04.s
index 42a59fac70..95c6b2ae6e 100644
--- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241904_A1CA04.s
+++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241904_A1CA04.s
@@ -15,9 +15,9 @@ glabel func_80241904_A1CA04
 /* A1CA2C 8024192C 00031C00 */  sll       $v1, $v1, 0x10
 /* A1CA30 80241930 00031B83 */  sra       $v1, $v1, 0xe
 /* A1CA34 80241934 A444008E */  sh        $a0, 0x8e($v0)
-/* A1CA38 80241938 3C018024 */  lui       $at, 0x8024
+/* A1CA38 80241938 3C018024 */  lui       $at, %hi(D_802457F4)
 /* A1CA3C 8024193C 00230821 */  addu      $at, $at, $v1
-/* A1CA40 80241940 C42257F4 */  lwc1      $f2, 0x57f4($at)
+/* A1CA40 80241940 C42257F4 */  lwc1      $f2, %lo(D_802457F4)($at)
 /* A1CA44 80241944 8443008E */  lh        $v1, 0x8e($v0)
 /* A1CA48 80241948 46020000 */  add.s     $f0, $f0, $f2
 /* A1CA4C 8024194C 28630005 */  slti      $v1, $v1, 5
diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241FBC_A1D0BC.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241FBC_A1D0BC.s
index 9735c6e736..7324dc3f1c 100644
--- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241FBC_A1D0BC.s
+++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241FBC_A1D0BC.s
@@ -66,9 +66,9 @@ glabel func_80241FBC_A1D0BC
 /* A1D1A8 802420A8 2C62000F */  sltiu     $v0, $v1, 0xf
 /* A1D1AC 802420AC 10400034 */  beqz      $v0, .L80242180
 /* A1D1B0 802420B0 00031080 */   sll      $v0, $v1, 2
-/* A1D1B4 802420B4 3C018025 */  lui       $at, 0x8025
+/* A1D1B4 802420B4 3C018025 */  lui       $at, %hi(D_8024BD88)
 /* A1D1B8 802420B8 00220821 */  addu      $at, $at, $v0
-/* A1D1BC 802420BC 8C22BD88 */  lw        $v0, -0x4278($at)
+/* A1D1BC 802420BC 8C22BD88 */  lw        $v0, %lo(D_8024BD88)($at)
 /* A1D1C0 802420C0 00400008 */  jr        $v0
 /* A1D1C4 802420C4 00000000 */   nop      
 /* A1D1C8 802420C8 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_8024226C_A1D36C.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_8024226C_A1D36C.s
index d0803cac96..a105fa29ce 100644
--- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_8024226C_A1D36C.s
+++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_8024226C_A1D36C.s
@@ -26,9 +26,9 @@ glabel func_8024226C_A1D36C
 /* A1D3C0 802422C0 000320C0 */  sll       $a0, $v1, 3
 /* A1D3C4 802422C4 00641821 */  addu      $v1, $v1, $a0
 /* A1D3C8 802422C8 000318C0 */  sll       $v1, $v1, 3
-/* A1D3CC 802422CC 3C01800B */  lui       $at, 0x800b
+/* A1D3CC 802422CC 3C01800B */  lui       $at, %hi(D_800B1D98)
 /* A1D3D0 802422D0 00230821 */  addu      $at, $at, $v1
-/* A1D3D4 802422D4 E4201D98 */  swc1      $f0, 0x1d98($at)
+/* A1D3D4 802422D4 E4201D98 */  swc1      $f0, %lo(D_800B1D98)($at)
 /* A1D3D8 802422D8 8FBF0018 */  lw        $ra, 0x18($sp)
 /* A1D3DC 802422DC 8FB10014 */  lw        $s1, 0x14($sp)
 /* A1D3E0 802422E0 8FB00010 */  lw        $s0, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802424A4_A1D5A4.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802424A4_A1D5A4.s
index a00baa0753..19d088a168 100644
--- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802424A4_A1D5A4.s
+++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802424A4_A1D5A4.s
@@ -4,8 +4,8 @@
 glabel func_802424A4_A1D5A4
 /* A1D5A4 802424A4 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* A1D5A8 802424A8 AFB00010 */  sw        $s0, 0x10($sp)
-/* A1D5AC 802424AC 3C108025 */  lui       $s0, 0x8025
-/* A1D5B0 802424B0 2610801C */  addiu     $s0, $s0, -0x7fe4
+/* A1D5AC 802424AC 3C108025 */  lui       $s0, %hi(D_8024801C)
+/* A1D5B0 802424B0 2610801C */  addiu     $s0, $s0, %lo(D_8024801C)
 /* A1D5B4 802424B4 AFBF0018 */  sw        $ra, 0x18($sp)
 /* A1D5B8 802424B8 AFB10014 */  sw        $s1, 0x14($sp)
 /* A1D5BC 802424BC 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_802424A4_A1D5A4
 /* A1D620 80242520 28620010 */  slti      $v0, $v1, 0x10
 /* A1D624 80242524 1440FFFA */  bnez      $v0, .L80242510
 /* A1D628 80242528 24840004 */   addiu    $a0, $a0, 4
-/* A1D62C 8024252C 3C108025 */  lui       $s0, 0x8025
-/* A1D630 80242530 2610801C */  addiu     $s0, $s0, -0x7fe4
+/* A1D62C 8024252C 3C108025 */  lui       $s0, %hi(D_8024801C)
+/* A1D630 80242530 2610801C */  addiu     $s0, $s0, %lo(D_8024801C)
 /* A1D634 80242534 0C00AB4B */  jal       heap_free
 /* A1D638 80242538 8E040000 */   lw       $a0, ($s0)
 /* A1D63C 8024253C AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802425E0_A1D6E0.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802425E0_A1D6E0.s
index 36d6fd0e2f..b3207fa62d 100644
--- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802425E0_A1D6E0.s
+++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802425E0_A1D6E0.s
@@ -90,8 +90,8 @@ glabel func_802425E0_A1D6E0
 /* A1D82C 8024272C 0040802D */   daddu    $s0, $v0, $zero
 /* A1D830 80242730 0040282D */  daddu     $a1, $v0, $zero
 /* A1D834 80242734 0000182D */  daddu     $v1, $zero, $zero
-/* A1D838 80242738 3C068025 */  lui       $a2, 0x8025
-/* A1D83C 8024273C 24C680C0 */  addiu     $a2, $a2, -0x7f40
+/* A1D838 80242738 3C068025 */  lui       $a2, %hi(D_802480C0)
+/* A1D83C 8024273C 24C680C0 */  addiu     $a2, $a2, %lo(D_802480C0)
 /* A1D840 80242740 00C0202D */  daddu     $a0, $a2, $zero
 .L80242744:
 /* A1D844 80242744 8C820000 */  lw        $v0, ($a0)
diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242804_A1D904.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242804_A1D904.s
index 5c14863d04..4909e9e6b3 100644
--- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242804_A1D904.s
+++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242804_A1D904.s
@@ -9,8 +9,8 @@ glabel func_80242804_A1D904
 /* A1D914 80242814 8C84014C */   lw       $a0, 0x14c($a0)
 /* A1D918 80242818 24040008 */  addiu     $a0, $zero, 8
 /* A1D91C 8024281C 0040802D */  daddu     $s0, $v0, $zero
-/* A1D920 80242820 3C028024 */  lui       $v0, 0x8024
-/* A1D924 80242824 24422870 */  addiu     $v0, $v0, 0x2870
+/* A1D920 80242820 3C028024 */  lui       $v0, %hi(D_80242870)
+/* A1D924 80242824 24422870 */  addiu     $v0, $v0, %lo(D_80242870)
 /* A1D928 80242828 0C00AB39 */  jal       heap_malloc
 /* A1D92C 8024282C AE020008 */   sw       $v0, 8($s0)
 /* A1D930 80242830 0040182D */  daddu     $v1, $v0, $zero
diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242870_A1D970.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242870_A1D970.s
index 5926c4e5f1..fb66cacabc 100644
--- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242870_A1D970.s
+++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242870_A1D970.s
@@ -3,8 +3,8 @@
 
 glabel func_80242870_A1D970
 /* A1D970 80242870 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* A1D974 80242874 3C03800A */  lui       $v1, 0x800a
-/* A1D978 80242878 8463A634 */  lh        $v1, -0x59cc($v1)
+/* A1D974 80242874 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* A1D978 80242878 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* A1D97C 8024287C 3C05800B */  lui       $a1, %hi(gCameras)
 /* A1D980 80242880 24A51D80 */  addiu     $a1, $a1, %lo(gCameras)
 /* A1D984 80242884 AFBF0010 */  sw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802428D0_A1D9D0.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802428D0_A1D9D0.s
index 633bc277b3..9c2831740d 100644
--- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802428D0_A1D9D0.s
+++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802428D0_A1D9D0.s
@@ -21,8 +21,8 @@ glabel func_802428D0_A1D9D0
 /* A1DA10 80242910 2414FFFC */  addiu     $s4, $zero, -4
 /* A1DA14 80242914 24130007 */  addiu     $s3, $zero, 7
 /* A1DA18 80242918 3C120080 */  lui       $s2, 0x80
-/* A1DA1C 8024291C 3C038015 */  lui       $v1, 0x8015
-/* A1DA20 80242920 8C6312F0 */  lw        $v1, 0x12f0($v1)
+/* A1DA1C 8024291C 3C038015 */  lui       $v1, %hi(D_801512F0)
+/* A1DA20 80242920 8C6312F0 */  lw        $v1, %lo(D_801512F0)($v1)
 /* A1DA24 80242924 24020001 */  addiu     $v0, $zero, 1
 /* A1DA28 80242928 0C046F97 */  jal       set_background_color_blend
 /* A1DA2C 8024292C A0620000 */   sb       $v0, ($v1)
diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242A1C_A1DB1C.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242A1C_A1DB1C.s
index 44bc7d6a61..3d198cd3e5 100644
--- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242A1C_A1DB1C.s
+++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242A1C_A1DB1C.s
@@ -49,8 +49,8 @@ glabel func_80242A1C_A1DB1C
 /* A1DBC0 80242AC0 2413FFFC */  addiu     $s3, $zero, -4
 /* A1DBC4 80242AC4 24120007 */  addiu     $s2, $zero, 7
 /* A1DBC8 80242AC8 3C11FF7F */  lui       $s1, 0xff7f
-/* A1DBCC 80242ACC 3C028015 */  lui       $v0, 0x8015
-/* A1DBD0 80242AD0 8C4212F0 */  lw        $v0, 0x12f0($v0)
+/* A1DBCC 80242ACC 3C028015 */  lui       $v0, %hi(D_801512F0)
+/* A1DBD0 80242AD0 8C4212F0 */  lw        $v0, %lo(D_801512F0)($v0)
 /* A1DBD4 80242AD4 3631FFFF */  ori       $s1, $s1, 0xffff
 /* A1DBD8 80242AD8 A0400000 */  sb        $zero, ($v0)
 .L80242ADC:
diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242B90_A1DC90.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242B90_A1DC90.s
index ed37e193ff..c8510f862f 100644
--- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242B90_A1DC90.s
+++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242B90_A1DC90.s
@@ -19,9 +19,9 @@ glabel func_80242B90_A1DC90
 /* A1DCC4 80242BC4 34A502E0 */  ori       $a1, $a1, 0x2e0
 /* A1DCC8 80242BC8 0C0B1EAF */  jal       get_variable
 /* A1DCCC 80242BCC 0000202D */   daddu    $a0, $zero, $zero
-/* A1DCD0 80242BD0 3C038025 */  lui       $v1, 0x8025
+/* A1DCD0 80242BD0 3C038025 */  lui       $v1, %hi(D_80248080)
 /* A1DCD4 80242BD4 00621821 */  addu      $v1, $v1, $v0
-/* A1DCD8 80242BD8 90638080 */  lbu       $v1, -0x7f80($v1)
+/* A1DCD8 80242BD8 90638080 */  lbu       $v1, %lo(D_80248080)($v1)
 /* A1DCDC 80242BDC 8E220084 */  lw        $v0, 0x84($s1)
 /* A1DCE0 80242BE0 54430006 */  bnel      $v0, $v1, .L80242BFC
 /* A1DCE4 80242BE4 AE200084 */   sw       $zero, 0x84($s1)
diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242C14_A1DD14.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242C14_A1DD14.s
index b69e695343..f4f8d63cd5 100644
--- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242C14_A1DD14.s
+++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242C14_A1DD14.s
@@ -38,8 +38,8 @@ glabel func_80242C14_A1DD14
 /* A1DD98 80242C98 0220202D */  daddu     $a0, $s1, $zero
 /* A1DD9C 80242C9C 3C05F4AC */  lui       $a1, 0xf4ac
 /* A1DDA0 80242CA0 34A5D481 */  ori       $a1, $a1, 0xd481
-/* A1DDA4 80242CA4 3C108025 */  lui       $s0, 0x8025
-/* A1DDA8 80242CA8 2610BDF0 */  addiu     $s0, $s0, -0x4210
+/* A1DDA4 80242CA4 3C108025 */  lui       $s0, %hi(D_8024BDF0)
+/* A1DDA8 80242CA8 2610BDF0 */  addiu     $s0, $s0, %lo(D_8024BDF0)
 /* A1DDAC 80242CAC 0C0B1EAF */  jal       get_variable
 /* A1DDB0 80242CB0 AE020000 */   sw       $v0, ($s0)
 /* A1DDB4 80242CB4 0220202D */  daddu     $a0, $s1, $zero
@@ -66,8 +66,8 @@ glabel func_80242C14_A1DD14
 /* A1DE08 80242D08 0000202D */   daddu    $a0, $zero, $zero
 /* A1DE0C 80242D0C 0220202D */  daddu     $a0, $s1, $zero
 /* A1DE10 80242D10 3C05F4AC */  lui       $a1, 0xf4ac
-/* A1DE14 80242D14 3C018025 */  lui       $at, 0x8025
-/* A1DE18 80242D18 AC22BDF4 */  sw        $v0, -0x420c($at)
+/* A1DE14 80242D14 3C018025 */  lui       $at, %hi(D_8024BDF4)
+/* A1DE18 80242D18 AC22BDF4 */  sw        $v0, %lo(D_8024BDF4)($at)
 /* A1DE1C 80242D1C 0C0B1EAF */  jal       get_variable
 /* A1DE20 80242D20 34A5D481 */   ori      $a1, $a1, 0xd481
 /* A1DE24 80242D24 0220202D */  daddu     $a0, $s1, $zero
@@ -98,16 +98,16 @@ glabel func_80242C14_A1DD14
 /* A1DE88 80242D88 E7A00010 */   swc1     $f0, 0x10($sp)
 /* A1DE8C 80242D8C 8E030000 */  lw        $v1, ($s0)
 /* A1DE90 80242D90 8C64000C */  lw        $a0, 0xc($v1)
-/* A1DE94 80242D94 3C018025 */  lui       $at, 0x8025
-/* A1DE98 80242D98 AC22BDF8 */  sw        $v0, -0x4208($at)
+/* A1DE94 80242D94 3C018025 */  lui       $at, %hi(D_8024BDF8)
+/* A1DE98 80242D98 AC22BDF8 */  sw        $v0, %lo(D_8024BDF8)($at)
 /* A1DE9C 80242D9C AC800018 */  sw        $zero, 0x18($a0)
 /* A1DEA0 80242DA0 AC800020 */  sw        $zero, 0x20($a0)
 /* A1DEA4 80242DA4 AC800024 */  sw        $zero, 0x24($a0)
 /* A1DEA8 80242DA8 AC800028 */  sw        $zero, 0x28($a0)
 /* A1DEAC 80242DAC AC80001C */  sw        $zero, 0x1c($a0)
 .L80242DB0:
-/* A1DEB0 80242DB0 3C028025 */  lui       $v0, 0x8025
-/* A1DEB4 80242DB4 8C42BDF0 */  lw        $v0, -0x4210($v0)
+/* A1DEB0 80242DB0 3C028025 */  lui       $v0, %hi(D_8024BDF0)
+/* A1DEB4 80242DB4 8C42BDF0 */  lw        $v0, %lo(D_8024BDF0)($v0)
 /* A1DEB8 80242DB8 8C44000C */  lw        $a0, 0xc($v0)
 /* A1DEBC 80242DBC 8C820020 */  lw        $v0, 0x20($a0)
 /* A1DEC0 80242DC0 8C830028 */  lw        $v1, 0x28($a0)
diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242E2C_A1DF2C.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242E2C_A1DF2C.s
index 280573941a..aaf32412af 100644
--- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242E2C_A1DF2C.s
+++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242E2C_A1DF2C.s
@@ -5,19 +5,19 @@ glabel func_80242E2C_A1DF2C
 /* A1DF2C 80242E2C 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* A1DF30 80242E30 10A0000B */  beqz      $a1, .L80242E60
 /* A1DF34 80242E34 AFBF0010 */   sw       $ra, 0x10($sp)
-/* A1DF38 80242E38 3C038025 */  lui       $v1, 0x8025
-/* A1DF3C 80242E3C 8C63BDF4 */  lw        $v1, -0x420c($v1)
+/* A1DF38 80242E38 3C038025 */  lui       $v1, %hi(D_8024BDF4)
+/* A1DF3C 80242E3C 8C63BDF4 */  lw        $v1, %lo(D_8024BDF4)($v1)
 /* A1DF40 80242E40 8C620000 */  lw        $v0, ($v1)
-/* A1DF44 80242E44 3C048025 */  lui       $a0, 0x8025
-/* A1DF48 80242E48 8C84BDF8 */  lw        $a0, -0x4208($a0)
+/* A1DF44 80242E44 3C048025 */  lui       $a0, %hi(D_8024BDF8)
+/* A1DF48 80242E48 8C84BDF8 */  lw        $a0, %lo(D_8024BDF8)($a0)
 /* A1DF4C 80242E4C 34420010 */  ori       $v0, $v0, 0x10
 /* A1DF50 80242E50 AC620000 */  sw        $v0, ($v1)
 /* A1DF54 80242E54 8C820000 */  lw        $v0, ($a0)
 /* A1DF58 80242E58 34420010 */  ori       $v0, $v0, 0x10
 /* A1DF5C 80242E5C AC820000 */  sw        $v0, ($a0)
 .L80242E60:
-/* A1DF60 80242E60 3C048025 */  lui       $a0, 0x8025
-/* A1DF64 80242E64 8C84BDF0 */  lw        $a0, -0x4210($a0)
+/* A1DF60 80242E60 3C048025 */  lui       $a0, %hi(D_8024BDF0)
+/* A1DF64 80242E64 8C84BDF0 */  lw        $a0, %lo(D_8024BDF0)($a0)
 /* A1DF68 80242E68 8C85000C */  lw        $a1, 0xc($a0)
 /* A1DF6C 80242E6C 8CA20018 */  lw        $v0, 0x18($a1)
 /* A1DF70 80242E70 8CA30020 */  lw        $v1, 0x20($a1)
@@ -41,8 +41,8 @@ glabel func_80242E2C_A1DF2C
 .L80242EB8:
 /* A1DFB8 80242EB8 0C016914 */  jal       remove_effect
 /* A1DFBC 80242EBC ACA00018 */   sw       $zero, 0x18($a1)
-/* A1DFC0 80242EC0 3C048025 */  lui       $a0, 0x8025
-/* A1DFC4 80242EC4 8C84BDD0 */  lw        $a0, -0x4230($a0)
+/* A1DFC0 80242EC0 3C048025 */  lui       $a0, %hi(D_8024BDD0)
+/* A1DFC4 80242EC4 8C84BDD0 */  lw        $a0, %lo(D_8024BDD0)($a0)
 /* A1DFC8 80242EC8 0C048D70 */  jal       func_801235C0
 /* A1DFCC 80242ECC 00000000 */   nop      
 /* A1DFD0 80242ED0 24020002 */  addiu     $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242EE0_A1DFE0.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242EE0_A1DFE0.s
index 67875f05da..23d9193dea 100644
--- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242EE0_A1DFE0.s
+++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242EE0_A1DFE0.s
@@ -7,8 +7,8 @@ glabel func_80242EE0_A1DFE0
 /* A1DFE8 80242EE8 8C82000C */  lw        $v0, 0xc($a0)
 /* A1DFEC 80242EEC 0C0B1EAF */  jal       get_variable
 /* A1DFF0 80242EF0 8C450000 */   lw       $a1, ($v0)
-/* A1DFF4 80242EF4 3C038025 */  lui       $v1, 0x8025
-/* A1DFF8 80242EF8 8C63BDF0 */  lw        $v1, -0x4210($v1)
+/* A1DFF4 80242EF4 3C038025 */  lui       $v1, %hi(D_8024BDF0)
+/* A1DFF8 80242EF8 8C63BDF0 */  lw        $v1, %lo(D_8024BDF0)($v1)
 /* A1DFFC 80242EFC 8C63000C */  lw        $v1, 0xc($v1)
 /* A1E000 80242F00 AC620034 */  sw        $v0, 0x34($v1)
 /* A1E004 80242F04 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242F14_A1E014.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242F14_A1E014.s
index 3f52f4afb6..057d785ffa 100644
--- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242F14_A1E014.s
+++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242F14_A1E014.s
@@ -8,8 +8,8 @@ glabel func_80242F14_A1E014
 /* A1E020 80242F20 0C0B1EAF */  jal       get_variable
 /* A1E024 80242F24 8C450000 */   lw       $a1, ($v0)
 /* A1E028 80242F28 0040202D */  daddu     $a0, $v0, $zero
-/* A1E02C 80242F2C 3C028025 */  lui       $v0, 0x8025
-/* A1E030 80242F30 8C42BDF0 */  lw        $v0, -0x4210($v0)
+/* A1E02C 80242F2C 3C028025 */  lui       $v0, %hi(D_8024BDF0)
+/* A1E030 80242F30 8C42BDF0 */  lw        $v0, %lo(D_8024BDF0)($v0)
 /* A1E034 80242F34 24030001 */  addiu     $v1, $zero, 1
 /* A1E038 80242F38 8C45000C */  lw        $a1, 0xc($v0)
 /* A1E03C 80242F3C 1083000D */  beq       $a0, $v1, .L80242F74
diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242F94_A1E094.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242F94_A1E094.s
index 07d2367c9a..19b0c6313b 100644
--- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242F94_A1E094.s
+++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242F94_A1E094.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80242F94_A1E094
-/* A1E094 80242F94 3C028025 */  lui       $v0, 0x8025
-/* A1E098 80242F98 8C42BDF8 */  lw        $v0, -0x4208($v0)
+/* A1E094 80242F94 3C028025 */  lui       $v0, %hi(D_8024BDF8)
+/* A1E098 80242F98 8C42BDF8 */  lw        $v0, %lo(D_8024BDF8)($v0)
 /* A1E09C 80242F9C 8C42000C */  lw        $v0, 0xc($v0)
 /* A1E0A0 80242FA0 AC40001C */  sw        $zero, 0x1c($v0)
 /* A1E0A4 80242FA4 03E00008 */  jr        $ra
diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242FAC_A1E0AC.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242FAC_A1E0AC.s
index c3fa781f17..b9abcd93ad 100644
--- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242FAC_A1E0AC.s
+++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242FAC_A1E0AC.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80242FAC_A1E0AC
-/* A1E0AC 80242FAC 3C028025 */  lui       $v0, 0x8025
-/* A1E0B0 80242FB0 8C42BDF8 */  lw        $v0, -0x4208($v0)
+/* A1E0AC 80242FAC 3C028025 */  lui       $v0, %hi(D_8024BDF8)
+/* A1E0B0 80242FB0 8C42BDF8 */  lw        $v0, %lo(D_8024BDF8)($v0)
 /* A1E0B4 80242FB4 8C43000C */  lw        $v1, 0xc($v0)
 /* A1E0B8 80242FB8 24020001 */  addiu     $v0, $zero, 1
 /* A1E0BC 80242FBC AC62001C */  sw        $v0, 0x1c($v1)
diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242FC8_A1E0C8.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242FC8_A1E0C8.s
index 5bb7479fa1..04fde3136d 100644
--- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242FC8_A1E0C8.s
+++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242FC8_A1E0C8.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80242FC8_A1E0C8
-/* A1E0C8 80242FC8 3C028025 */  lui       $v0, 0x8025
-/* A1E0CC 80242FCC 8C42BDF8 */  lw        $v0, -0x4208($v0)
+/* A1E0C8 80242FC8 3C028025 */  lui       $v0, %hi(D_8024BDF8)
+/* A1E0CC 80242FCC 8C42BDF8 */  lw        $v0, %lo(D_8024BDF8)($v0)
 /* A1E0D0 80242FD0 8C43000C */  lw        $v1, 0xc($v0)
 /* A1E0D4 80242FD4 24020002 */  addiu     $v0, $zero, 2
 /* A1E0D8 80242FD8 03E00008 */  jr        $ra
diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_8024349C_A1E59C.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_8024349C_A1E59C.s
index 846503e7fd..79e25a33c5 100644
--- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_8024349C_A1E59C.s
+++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_8024349C_A1E59C.s
@@ -3,8 +3,8 @@
 
 glabel func_8024349C_A1E59C
 /* A1E59C 8024349C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* A1E5A0 802434A0 3C058025 */  lui       $a1, 0x8025
-/* A1E5A4 802434A4 8CA5BDE8 */  lw        $a1, -0x4218($a1)
+/* A1E5A0 802434A0 3C058025 */  lui       $a1, %hi(D_8024BDE8)
+/* A1E5A4 802434A4 8CA5BDE8 */  lw        $a1, %lo(D_8024BDE8)($a1)
 /* A1E5A8 802434A8 AFBF0010 */  sw        $ra, 0x10($sp)
 /* A1E5AC 802434AC 0C0B1EAF */  jal       get_variable
 /* A1E5B0 802434B0 0000202D */   daddu    $a0, $zero, $zero
diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80243508_A1E608.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80243508_A1E608.s
index 23837c38e5..77d4e15edb 100644
--- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80243508_A1E608.s
+++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80243508_A1E608.s
@@ -3,14 +3,14 @@
 
 glabel func_80243508_A1E608
 /* A1E608 80243508 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* A1E60C 8024350C 3C058024 */  lui       $a1, 0x8024
-/* A1E610 80243510 24A5349C */  addiu     $a1, $a1, 0x349c
+/* A1E60C 8024350C 3C058024 */  lui       $a1, %hi(D_8024349C)
+/* A1E610 80243510 24A5349C */  addiu     $a1, $a1, %lo(D_8024349C)
 /* A1E614 80243514 AFBF0010 */  sw        $ra, 0x10($sp)
 /* A1E618 80243518 0C048C8F */  jal       bind_dynamic_entity_7
 /* A1E61C 8024351C 0000202D */   daddu    $a0, $zero, $zero
 /* A1E620 80243520 8FBF0010 */  lw        $ra, 0x10($sp)
-/* A1E624 80243524 3C018025 */  lui       $at, 0x8025
-/* A1E628 80243528 AC22BDD0 */  sw        $v0, -0x4230($at)
+/* A1E624 80243524 3C018025 */  lui       $at, %hi(D_8024BDD0)
+/* A1E628 80243528 AC22BDD0 */  sw        $v0, %lo(D_8024BDD0)($at)
 /* A1E62C 8024352C 24020002 */  addiu     $v0, $zero, 2
 /* A1E630 80243530 03E00008 */  jr        $ra
 /* A1E634 80243534 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_hos/hos_04/A26ED0/func_80240000_A26ED0.s b/asm/nonmatchings/world/area_hos/hos_04/A26ED0/func_80240000_A26ED0.s
index bf2fa22b2c..222316914a 100644
--- a/asm/nonmatchings/world/area_hos/hos_04/A26ED0/func_80240000_A26ED0.s
+++ b/asm/nonmatchings/world/area_hos/hos_04/A26ED0/func_80240000_A26ED0.s
@@ -4,8 +4,8 @@
 glabel func_80240000_A26ED0
 /* A26ED0 80240000 27BDFFD8 */  addiu     $sp, $sp, -0x28
 /* A26ED4 80240004 AFB10014 */  sw        $s1, 0x14($sp)
-/* A26ED8 80240008 3C118024 */  lui       $s1, 0x8024
-/* A26EDC 8024000C 263116F0 */  addiu     $s1, $s1, 0x16f0
+/* A26ED8 80240008 3C118024 */  lui       $s1, %hi(D_802416F0)
+/* A26EDC 8024000C 263116F0 */  addiu     $s1, $s1, %lo(D_802416F0)
 /* A26EE0 80240010 AFBF0020 */  sw        $ra, 0x20($sp)
 /* A26EE4 80240014 AFB3001C */  sw        $s3, 0x1c($sp)
 /* A26EE8 80240018 AFB20018 */  sw        $s2, 0x18($sp)
@@ -34,17 +34,17 @@ glabel func_80240000_A26ED0
 /* A26F44 80240074 44801000 */  mtc1      $zero, $f2
 /* A26F48 80240078 46000021 */  cvt.d.s   $f0, $f0
 /* A26F4C 8024007C 46220000 */  add.d     $f0, $f0, $f2
-/* A26F50 80240080 3C018024 */  lui       $at, 0x8024
-/* A26F54 80240084 D4243300 */  ldc1      $f4, 0x3300($at)
+/* A26F50 80240080 3C018024 */  lui       $at, %hi(D_80243300)
+/* A26F54 80240084 D4243300 */  ldc1      $f4, %lo(D_80243300)($at)
 /* A26F58 80240088 46200020 */  cvt.s.d   $f0, $f0
 /* A26F5C 8024008C 460000A1 */  cvt.d.s   $f2, $f0
 /* A26F60 80240090 46241082 */  mul.d     $f2, $f2, $f4
 /* A26F64 80240094 00000000 */  nop       
 /* A26F68 80240098 36731630 */  ori       $s3, $s3, 0x1630
-/* A26F6C 8024009C 3C12800A */  lui       $s2, 0x800a
-/* A26F70 802400A0 2652A674 */  addiu     $s2, $s2, -0x598c
-/* A26F74 802400A4 3C108007 */  lui       $s0, 0x8007
-/* A26F78 802400A8 261041F0 */  addiu     $s0, $s0, 0x41f0
+/* A26F6C 8024009C 3C12800A */  lui       $s2, %hi(D_8009A674)
+/* A26F70 802400A0 2652A674 */  addiu     $s2, $s2, %lo(D_8009A674)
+/* A26F74 802400A4 3C108007 */  lui       $s0, %hi(D_800741F0)
+/* A26F78 802400A8 261041F0 */  addiu     $s0, $s0, %lo(D_800741F0)
 /* A26F7C 802400AC 96040000 */  lhu       $a0, ($s0)
 /* A26F80 802400B0 8E420000 */  lw        $v0, ($s2)
 /* A26F84 802400B4 3C013FE0 */  lui       $at, 0x3fe0
@@ -60,8 +60,8 @@ glabel func_80240000_A26ED0
 /* A26FAC 802400DC 0C019DC0 */  jal       guScale
 /* A26FB0 802400E0 00A0382D */   daddu    $a3, $a1, $zero
 /* A26FB4 802400E4 3C05DA38 */  lui       $a1, 0xda38
-/* A26FB8 802400E8 3C04800A */  lui       $a0, 0x800a
-/* A26FBC 802400EC 2484A66C */  addiu     $a0, $a0, -0x5994
+/* A26FB8 802400E8 3C04800A */  lui       $a0, %hi(D_8009A66C)
+/* A26FBC 802400EC 2484A66C */  addiu     $a0, $a0, %lo(D_8009A66C)
 /* A26FC0 802400F0 34A50001 */  ori       $a1, $a1, 1
 /* A26FC4 802400F4 8C820000 */  lw        $v0, ($a0)
 /* A26FC8 802400F8 96030000 */  lhu       $v1, ($s0)
diff --git a/asm/nonmatchings/world/area_hos/hos_04/A26ED0/func_80240154_A27024.s b/asm/nonmatchings/world/area_hos/hos_04/A26ED0/func_80240154_A27024.s
index 30a63b281b..85ad195a4f 100644
--- a/asm/nonmatchings/world/area_hos/hos_04/A26ED0/func_80240154_A27024.s
+++ b/asm/nonmatchings/world/area_hos/hos_04/A26ED0/func_80240154_A27024.s
@@ -4,8 +4,8 @@
 glabel func_80240154_A27024
 /* A27024 80240154 27BDFFD8 */  addiu     $sp, $sp, -0x28
 /* A27028 80240158 AFB00010 */  sw        $s0, 0x10($sp)
-/* A2702C 8024015C 3C108024 */  lui       $s0, 0x8024
-/* A27030 80240160 261016F0 */  addiu     $s0, $s0, 0x16f0
+/* A2702C 8024015C 3C108024 */  lui       $s0, %hi(D_802416F0)
+/* A27030 80240160 261016F0 */  addiu     $s0, $s0, %lo(D_802416F0)
 /* A27034 80240164 AFBF001C */  sw        $ra, 0x1c($sp)
 /* A27038 80240168 AFB20018 */  sw        $s2, 0x18($sp)
 /* A2703C 8024016C AFB10014 */  sw        $s1, 0x14($sp)
@@ -46,10 +46,10 @@ glabel func_80240154_A27024
 /* A270C8 802401F8 46000021 */  cvt.d.s   $f0, $f0
 /* A270CC 802401FC 46220002 */  mul.d     $f0, $f0, $f2
 /* A270D0 80240200 00000000 */  nop       
-/* A270D4 80240204 3C108007 */  lui       $s0, 0x8007
-/* A270D8 80240208 261041F0 */  addiu     $s0, $s0, 0x41f0
-/* A270DC 8024020C 3C11800A */  lui       $s1, 0x800a
-/* A270E0 80240210 2631A674 */  addiu     $s1, $s1, -0x598c
+/* A270D4 80240204 3C108007 */  lui       $s0, %hi(D_800741F0)
+/* A270D8 80240208 261041F0 */  addiu     $s0, $s0, %lo(D_800741F0)
+/* A270DC 8024020C 3C11800A */  lui       $s1, %hi(D_8009A674)
+/* A270E0 80240210 2631A674 */  addiu     $s1, $s1, %lo(D_8009A674)
 /* A270E4 80240214 96040000 */  lhu       $a0, ($s0)
 /* A270E8 80240218 8E220000 */  lw        $v0, ($s1)
 /* A270EC 8024021C 00042180 */  sll       $a0, $a0, 6
@@ -63,8 +63,8 @@ glabel func_80240154_A27024
 /* A2710C 8024023C 0C019E08 */  jal       guTranslate
 /* A27110 80240240 00A0382D */   daddu    $a3, $a1, $zero
 /* A27114 80240244 3C05DA38 */  lui       $a1, 0xda38
-/* A27118 80240248 3C04800A */  lui       $a0, 0x800a
-/* A2711C 8024024C 2484A66C */  addiu     $a0, $a0, -0x5994
+/* A27118 80240248 3C04800A */  lui       $a0, %hi(D_8009A66C)
+/* A2711C 8024024C 2484A66C */  addiu     $a0, $a0, %lo(D_8009A66C)
 /* A27120 80240250 34A50001 */  ori       $a1, $a1, 1
 /* A27124 80240254 8C830000 */  lw        $v1, ($a0)
 /* A27128 80240258 96020000 */  lhu       $v0, ($s0)
diff --git a/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_80240734_A27604.s b/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_80240734_A27604.s
index a6b1d6ab1a..dfccc8c510 100644
--- a/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_80240734_A27604.s
+++ b/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_80240734_A27604.s
@@ -19,9 +19,9 @@ glabel func_80240734_A27604
 /* A27638 80240768 2C820005 */  sltiu     $v0, $a0, 5
 /* A2763C 8024076C 10400056 */  beqz      $v0, .L802408C8
 /* A27640 80240770 00041080 */   sll      $v0, $a0, 2
-/* A27644 80240774 3C018024 */  lui       $at, 0x8024
+/* A27644 80240774 3C018024 */  lui       $at, %hi(D_80243310)
 /* A27648 80240778 00220821 */  addu      $at, $at, $v0
-/* A2764C 8024077C 8C223310 */  lw        $v0, 0x3310($at)
+/* A2764C 8024077C 8C223310 */  lw        $v0, %lo(D_80243310)($at)
 /* A27650 80240780 00400008 */  jr        $v0
 /* A27654 80240784 00000000 */   nop      
 /* A27658 80240788 3C0142B4 */  lui       $at, 0x42b4
@@ -101,8 +101,8 @@ glabel func_80240734_A27604
 /* A27778 802408A8 46020000 */  add.s     $f0, $f0, $f2
 /* A2777C 802408AC 46000021 */  cvt.d.s   $f0, $f0
 /* A27780 802408B0 46200000 */  add.d     $f0, $f0, $f0
-/* A27784 802408B4 3C018024 */  lui       $at, 0x8024
-/* A27788 802408B8 D4223328 */  ldc1      $f2, 0x3328($at)
+/* A27784 802408B4 3C018024 */  lui       $at, %hi(D_80243328)
+/* A27788 802408B8 D4223328 */  ldc1      $f2, %lo(D_80243328)($at)
 /* A2778C 802408BC 46220003 */  div.d     $f0, $f0, $f2
 /* A27790 802408C0 08090233 */  j         .L802408CC
 /* A27794 802408C4 46200320 */   cvt.s.d  $f12, $f0
diff --git a/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_802408F8_A277C8.s b/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_802408F8_A277C8.s
index fa9f629ae2..9d294f5a72 100644
--- a/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_802408F8_A277C8.s
+++ b/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_802408F8_A277C8.s
@@ -7,10 +7,10 @@ glabel func_802408F8_A277C8
 /* A277D0 80240900 24841D80 */  addiu     $a0, $a0, %lo(gCameras)
 /* A277D4 80240904 3C038007 */  lui       $v1, %hi(gCurrentCameraID)
 /* A277D8 80240908 8C637410 */  lw        $v1, %lo(gCurrentCameraID)($v1)
-/* A277DC 8024090C 3C05800A */  lui       $a1, 0x800a
-/* A277E0 80240910 8CA5A64C */  lw        $a1, -0x59b4($a1)
-/* A277E4 80240914 3C088024 */  lui       $t0, 0x8024
-/* A277E8 80240918 25081B80 */  addiu     $t0, $t0, 0x1b80
+/* A277DC 8024090C 3C05800A */  lui       $a1, %hi(D_8009A64C)
+/* A277E0 80240910 8CA5A64C */  lw        $a1, %lo(D_8009A64C)($a1)
+/* A277E4 80240914 3C088024 */  lui       $t0, %hi(D_80241B80)
+/* A277E8 80240918 25081B80 */  addiu     $t0, $t0, %lo(D_80241B80)
 /* A277EC 8024091C AFBF0020 */  sw        $ra, 0x20($sp)
 /* A277F0 80240920 AFB1001C */  sw        $s1, 0x1c($sp)
 /* A277F4 80240924 AFB00018 */  sw        $s0, 0x18($sp)
@@ -24,8 +24,8 @@ glabel func_802408F8_A277C8
 /* A27814 80240944 8D030000 */  lw        $v1, ($t0)
 /* A27818 80240948 10A30013 */  beq       $a1, $v1, .L80240998
 /* A2781C 8024094C 00448821 */   addu     $s1, $v0, $a0
-/* A27820 80240950 3C108024 */  lui       $s0, 0x8024
-/* A27824 80240954 26101B7C */  addiu     $s0, $s0, 0x1b7c
+/* A27820 80240950 3C108024 */  lui       $s0, %hi(D_80241B7C)
+/* A27824 80240954 26101B7C */  addiu     $s0, $s0, %lo(D_80241B7C)
 /* A27828 80240958 3C01442F */  lui       $at, 0x442f
 /* A2782C 8024095C 44816000 */  mtc1      $at, $f12
 /* A27830 80240960 3C014396 */  lui       $at, 0x4396
diff --git a/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_802409B0_A27880.s b/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_802409B0_A27880.s
index d5d66e0144..1216e037ea 100644
--- a/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_802409B0_A27880.s
+++ b/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_802409B0_A27880.s
@@ -20,20 +20,20 @@ glabel func_802409B0_A27880
 /* A278BC 802409EC 000210C0 */  sll       $v0, $v0, 3
 /* A278C0 802409F0 10A00005 */  beqz      $a1, .L80240A08
 /* A278C4 802409F4 00449021 */   addu     $s2, $v0, $a0
-/* A278C8 802409F8 3C018024 */  lui       $at, 0x8024
-/* A278CC 802409FC C4201B54 */  lwc1      $f0, 0x1b54($at)
-/* A278D0 80240A00 3C018024 */  lui       $at, 0x8024
-/* A278D4 80240A04 E4203370 */  swc1      $f0, 0x3370($at)
+/* A278C8 802409F8 3C018024 */  lui       $at, %hi(D_80241B54)
+/* A278CC 802409FC C4201B54 */  lwc1      $f0, %lo(D_80241B54)($at)
+/* A278D0 80240A00 3C018024 */  lui       $at, %hi(D_80243370)
+/* A278D4 80240A04 E4203370 */  swc1      $f0, %lo(D_80243370)($at)
 .L80240A08:
-/* A278D8 80240A08 3C118024 */  lui       $s1, 0x8024
-/* A278DC 80240A0C 26313370 */  addiu     $s1, $s1, 0x3370
+/* A278D8 80240A08 3C118024 */  lui       $s1, %hi(D_80243370)
+/* A278DC 80240A0C 26313370 */  addiu     $s1, $s1, %lo(D_80243370)
 /* A278E0 80240A10 3C01428C */  lui       $at, 0x428c
 /* A278E4 80240A14 44810000 */  mtc1      $at, $f0
-/* A278E8 80240A18 3C058024 */  lui       $a1, 0x8024
-/* A278EC 80240A1C 8CA51B54 */  lw        $a1, 0x1b54($a1)
+/* A278E8 80240A18 3C058024 */  lui       $a1, %hi(D_80241B54)
+/* A278EC 80240A1C 8CA51B54 */  lw        $a1, %lo(D_80241B54)($a1)
 /* A278F0 80240A20 3C06442F */  lui       $a2, 0x442f
-/* A278F4 80240A24 3C108024 */  lui       $s0, 0x8024
-/* A278F8 80240A28 26101B84 */  addiu     $s0, $s0, 0x1b84
+/* A278F4 80240A24 3C108024 */  lui       $s0, %hi(D_80241B84)
+/* A278F8 80240A28 26101B84 */  addiu     $s0, $s0, %lo(D_80241B84)
 /* A278FC 80240A2C AFB10014 */  sw        $s1, 0x14($sp)
 /* A27900 80240A30 E7A00010 */  swc1      $f0, 0x10($sp)
 /* A27904 80240A34 C6000000 */  lwc1      $f0, ($s0)
diff --git a/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_80240A84_A27954.s b/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_80240A84_A27954.s
index 0f1ca9a817..1be527b486 100644
--- a/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_80240A84_A27954.s
+++ b/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_80240A84_A27954.s
@@ -20,20 +20,20 @@ glabel func_80240A84_A27954
 /* A27990 80240AC0 000210C0 */  sll       $v0, $v0, 3
 /* A27994 80240AC4 10A00005 */  beqz      $a1, .L80240ADC
 /* A27998 80240AC8 00449021 */   addu     $s2, $v0, $a0
-/* A2799C 80240ACC 3C018024 */  lui       $at, 0x8024
-/* A279A0 80240AD0 C4201B74 */  lwc1      $f0, 0x1b74($at)
-/* A279A4 80240AD4 3C018024 */  lui       $at, 0x8024
-/* A279A8 80240AD8 E4203374 */  swc1      $f0, 0x3374($at)
+/* A2799C 80240ACC 3C018024 */  lui       $at, %hi(D_80241B74)
+/* A279A0 80240AD0 C4201B74 */  lwc1      $f0, %lo(D_80241B74)($at)
+/* A279A4 80240AD4 3C018024 */  lui       $at, %hi(D_80243374)
+/* A279A8 80240AD8 E4203374 */  swc1      $f0, %lo(D_80243374)($at)
 .L80240ADC:
-/* A279AC 80240ADC 3C118024 */  lui       $s1, 0x8024
-/* A279B0 80240AE0 26313374 */  addiu     $s1, $s1, 0x3374
+/* A279AC 80240ADC 3C118024 */  lui       $s1, %hi(D_80243374)
+/* A279B0 80240AE0 26313374 */  addiu     $s1, $s1, %lo(D_80243374)
 /* A279B4 80240AE4 3C014348 */  lui       $at, 0x4348
 /* A279B8 80240AE8 44810000 */  mtc1      $at, $f0
-/* A279BC 80240AEC 3C058024 */  lui       $a1, 0x8024
-/* A279C0 80240AF0 8CA51B74 */  lw        $a1, 0x1b74($a1)
+/* A279BC 80240AEC 3C058024 */  lui       $a1, %hi(D_80241B74)
+/* A279C0 80240AF0 8CA51B74 */  lw        $a1, %lo(D_80241B74)($a1)
 /* A279C4 80240AF4 3C06C2A0 */  lui       $a2, 0xc2a0
-/* A279C8 80240AF8 3C108024 */  lui       $s0, 0x8024
-/* A279CC 80240AFC 26101B88 */  addiu     $s0, $s0, 0x1b88
+/* A279C8 80240AF8 3C108024 */  lui       $s0, %hi(D_80241B88)
+/* A279CC 80240AFC 26101B88 */  addiu     $s0, $s0, %lo(D_80241B88)
 /* A279D0 80240B00 AFB10014 */  sw        $s1, 0x14($sp)
 /* A279D4 80240B04 E7A00010 */  swc1      $f0, 0x10($sp)
 /* A279D8 80240B08 C6000000 */  lwc1      $f0, ($s0)
diff --git a/asm/nonmatchings/world/area_hos/hos_04/A27AA0/func_80240BD0_A27AA0.s b/asm/nonmatchings/world/area_hos/hos_04/A27AA0/func_80240BD0_A27AA0.s
index 9334cf0cae..a4843dda21 100644
--- a/asm/nonmatchings/world/area_hos/hos_04/A27AA0/func_80240BD0_A27AA0.s
+++ b/asm/nonmatchings/world/area_hos/hos_04/A27AA0/func_80240BD0_A27AA0.s
@@ -3,8 +3,8 @@
 
 glabel func_80240BD0_A27AA0
 /* A27AA0 80240BD0 27BDFFC8 */  addiu     $sp, $sp, -0x38
-/* A27AA4 80240BD4 3C038024 */  lui       $v1, 0x8024
-/* A27AA8 80240BD8 24633258 */  addiu     $v1, $v1, 0x3258
+/* A27AA4 80240BD4 3C038024 */  lui       $v1, %hi(D_80243258)
+/* A27AA8 80240BD8 24633258 */  addiu     $v1, $v1, %lo(D_80243258)
 /* A27AAC 80240BDC AFBF0034 */  sw        $ra, 0x34($sp)
 /* A27AB0 80240BE0 AFB20030 */  sw        $s2, 0x30($sp)
 /* A27AB4 80240BE4 AFB1002C */  sw        $s1, 0x2c($sp)
@@ -19,18 +19,18 @@ glabel func_80240BD0_A27AA0
 /* A27AD8 80240C08 8C420000 */  lw        $v0, ($v0)
 /* A27ADC 80240C0C AC620000 */  sw        $v0, ($v1)
 .L80240C10:
-/* A27AE0 80240C10 3C038024 */  lui       $v1, 0x8024
-/* A27AE4 80240C14 8C633250 */  lw        $v1, 0x3250($v1)
+/* A27AE0 80240C10 3C038024 */  lui       $v1, %hi(D_80243250)
+/* A27AE4 80240C14 8C633250 */  lw        $v1, %lo(D_80243250)($v1)
 /* A27AE8 80240C18 2C620005 */  sltiu     $v0, $v1, 5
 /* A27AEC 80240C1C 10400050 */  beqz      $v0, .L80240D60
 /* A27AF0 80240C20 00031080 */   sll      $v0, $v1, 2
-/* A27AF4 80240C24 3C018024 */  lui       $at, 0x8024
+/* A27AF4 80240C24 3C018024 */  lui       $at, %hi(D_80243358)
 /* A27AF8 80240C28 00220821 */  addu      $at, $at, $v0
-/* A27AFC 80240C2C 8C223358 */  lw        $v0, 0x3358($at)
+/* A27AFC 80240C2C 8C223358 */  lw        $v0, %lo(D_80243358)($at)
 /* A27B00 80240C30 00400008 */  jr        $v0
 /* A27B04 80240C34 00000000 */   nop      
-/* A27B08 80240C38 3C048024 */  lui       $a0, 0x8024
-/* A27B0C 80240C3C 8C843258 */  lw        $a0, 0x3258($a0)
+/* A27B08 80240C38 3C048024 */  lui       $a0, %hi(D_80243258)
+/* A27B0C 80240C3C 8C843258 */  lw        $a0, %lo(D_80243258)($a0)
 /* A27B10 80240C40 8C830000 */  lw        $v1, ($a0)
 /* A27B14 80240C44 2402FFFF */  addiu     $v0, $zero, -1
 /* A27B18 80240C48 14620004 */  bne       $v1, $v0, .L80240C5C
@@ -39,8 +39,8 @@ glabel func_80240BD0_A27AA0
 /* A27B24 80240C54 08090323 */  j         .L80240C8C
 /* A27B28 80240C58 00000000 */   nop      
 .L80240C5C:
-/* A27B2C 80240C5C 3C038024 */  lui       $v1, 0x8024
-/* A27B30 80240C60 24633254 */  addiu     $v1, $v1, 0x3254
+/* A27B2C 80240C5C 3C038024 */  lui       $v1, %hi(D_80243254)
+/* A27B30 80240C60 24633254 */  addiu     $v1, $v1, %lo(D_80243254)
 /* A27B34 80240C64 8C620000 */  lw        $v0, ($v1)
 /* A27B38 80240C68 2442000A */  addiu     $v0, $v0, 0xa
 /* A27B3C 80240C6C AC620000 */  sw        $v0, ($v1)
@@ -52,30 +52,30 @@ glabel func_80240BD0_A27AA0
 /* A27B54 80240C84 8C830004 */  lw        $v1, 4($a0)
 /* A27B58 80240C88 24020001 */  addiu     $v0, $zero, 1
 .L80240C8C:
-/* A27B5C 80240C8C 3C018024 */  lui       $at, 0x8024
-/* A27B60 80240C90 AC223250 */  sw        $v0, 0x3250($at)
-/* A27B64 80240C94 3C018024 */  lui       $at, 0x8024
-/* A27B68 80240C98 AC233380 */  sw        $v1, 0x3380($at)
+/* A27B5C 80240C8C 3C018024 */  lui       $at, %hi(D_80243250)
+/* A27B60 80240C90 AC223250 */  sw        $v0, %lo(D_80243250)($at)
+/* A27B64 80240C94 3C018024 */  lui       $at, %hi(D_80243380)
+/* A27B68 80240C98 AC233380 */  sw        $v1, %lo(D_80243380)($at)
 /* A27B6C 80240C9C 08090359 */  j         .L80240D64
 /* A27B70 80240CA0 24040001 */   addiu    $a0, $zero, 1
-/* A27B74 80240CA4 3C038024 */  lui       $v1, 0x8024
-/* A27B78 80240CA8 24633380 */  addiu     $v1, $v1, 0x3380
+/* A27B74 80240CA4 3C038024 */  lui       $v1, %hi(D_80243380)
+/* A27B78 80240CA8 24633380 */  addiu     $v1, $v1, %lo(D_80243380)
 /* A27B7C 80240CAC 8C620000 */  lw        $v0, ($v1)
 /* A27B80 80240CB0 1440001B */  bnez      $v0, .L80240D20
 /* A27B84 80240CB4 2442FFFF */   addiu    $v0, $v0, -1
 /* A27B88 80240CB8 24020002 */  addiu     $v0, $zero, 2
-/* A27B8C 80240CBC 3C018024 */  lui       $at, 0x8024
-/* A27B90 80240CC0 AC223250 */  sw        $v0, 0x3250($at)
+/* A27B8C 80240CBC 3C018024 */  lui       $at, %hi(D_80243250)
+/* A27B90 80240CC0 AC223250 */  sw        $v0, %lo(D_80243250)($at)
 /* A27B94 80240CC4 08090359 */  j         .L80240D64
 /* A27B98 80240CC8 24040001 */   addiu    $a0, $zero, 1
-/* A27B9C 80240CCC 3C048024 */  lui       $a0, 0x8024
-/* A27BA0 80240CD0 24843254 */  addiu     $a0, $a0, 0x3254
+/* A27B9C 80240CCC 3C048024 */  lui       $a0, %hi(D_80243254)
+/* A27BA0 80240CD0 24843254 */  addiu     $a0, $a0, %lo(D_80243254)
 /* A27BA4 80240CD4 8C820000 */  lw        $v0, ($a0)
 /* A27BA8 80240CD8 2442FFF6 */  addiu     $v0, $v0, -0xa
 /* A27BAC 80240CDC 04410020 */  bgez      $v0, .L80240D60
 /* A27BB0 80240CE0 AC820000 */   sw       $v0, ($a0)
-/* A27BB4 80240CE4 3C028024 */  lui       $v0, 0x8024
-/* A27BB8 80240CE8 24423258 */  addiu     $v0, $v0, 0x3258
+/* A27BB4 80240CE4 3C028024 */  lui       $v0, %hi(D_80243258)
+/* A27BB8 80240CE8 24423258 */  addiu     $v0, $v0, %lo(D_80243258)
 /* A27BBC 80240CEC 8C430000 */  lw        $v1, ($v0)
 /* A27BC0 80240CF0 AC800000 */  sw        $zero, ($a0)
 /* A27BC4 80240CF4 8C640008 */  lw        $a0, 8($v1)
@@ -84,8 +84,8 @@ glabel func_80240BD0_A27AA0
 /* A27BD0 80240D00 AC430000 */   sw       $v1, ($v0)
 /* A27BD4 80240D04 08090356 */  j         .L80240D58
 /* A27BD8 80240D08 00000000 */   nop      
-/* A27BDC 80240D0C 3C038024 */  lui       $v1, 0x8024
-/* A27BE0 80240D10 24633380 */  addiu     $v1, $v1, 0x3380
+/* A27BDC 80240D0C 3C038024 */  lui       $v1, %hi(D_80243380)
+/* A27BE0 80240D10 24633380 */  addiu     $v1, $v1, %lo(D_80243380)
 /* A27BE4 80240D14 8C620000 */  lw        $v0, ($v1)
 /* A27BE8 80240D18 10400003 */  beqz      $v0, .L80240D28
 /* A27BEC 80240D1C 2442FFFF */   addiu    $v0, $v0, -1
@@ -93,8 +93,8 @@ glabel func_80240BD0_A27AA0
 /* A27BF0 80240D20 08090358 */  j         .L80240D60
 /* A27BF4 80240D24 AC620000 */   sw       $v0, ($v1)
 .L80240D28:
-/* A27BF8 80240D28 3C028024 */  lui       $v0, 0x8024
-/* A27BFC 80240D2C 24423258 */  addiu     $v0, $v0, 0x3258
+/* A27BF8 80240D28 3C028024 */  lui       $v0, %hi(D_80243258)
+/* A27BFC 80240D2C 24423258 */  addiu     $v0, $v0, %lo(D_80243258)
 /* A27C00 80240D30 8C430000 */  lw        $v1, ($v0)
 /* A27C04 80240D34 8C640008 */  lw        $a0, 8($v1)
 /* A27C08 80240D38 24630008 */  addiu     $v1, $v1, 8
@@ -102,13 +102,13 @@ glabel func_80240BD0_A27AA0
 /* A27C10 80240D40 AC430000 */   sw       $v1, ($v0)
 .L80240D44:
 /* A27C14 80240D44 24020003 */  addiu     $v0, $zero, 3
-/* A27C18 80240D48 3C018024 */  lui       $at, 0x8024
-/* A27C1C 80240D4C AC223250 */  sw        $v0, 0x3250($at)
+/* A27C18 80240D48 3C018024 */  lui       $at, %hi(D_80243250)
+/* A27C1C 80240D4C AC223250 */  sw        $v0, %lo(D_80243250)($at)
 /* A27C20 80240D50 08090359 */  j         .L80240D64
 /* A27C24 80240D54 24040001 */   addiu    $a0, $zero, 1
 .L80240D58:
-/* A27C28 80240D58 3C018024 */  lui       $at, 0x8024
-/* A27C2C 80240D5C AC203250 */  sw        $zero, 0x3250($at)
+/* A27C28 80240D58 3C018024 */  lui       $at, %hi(D_80243250)
+/* A27C2C 80240D5C AC203250 */  sw        $zero, %lo(D_80243250)($at)
 .L80240D60:
 /* A27C30 80240D60 24040001 */  addiu     $a0, $zero, 1
 .L80240D64:
@@ -125,8 +125,8 @@ glabel func_80240BD0_A27AA0
 /* A27C5C 80240D8C 44812000 */  mtc1      $at, $f4
 /* A27C60 80240D90 00000000 */  nop       
 /* A27C64 80240D94 46022081 */  sub.s     $f2, $f4, $f2
-/* A27C68 80240D98 3C018024 */  lui       $at, 0x8024
-/* A27C6C 80240D9C C4203254 */  lwc1      $f0, 0x3254($at)
+/* A27C68 80240D98 3C018024 */  lui       $at, %hi(D_80243254)
+/* A27C6C 80240D9C C4203254 */  lwc1      $f0, %lo(D_80243254)($at)
 /* A27C70 80240DA0 46800020 */  cvt.s.w   $f0, $f0
 /* A27C74 80240DA4 46020002 */  mul.s     $f0, $f0, $f2
 /* A27C78 80240DA8 00000000 */  nop       
@@ -141,8 +141,8 @@ glabel func_80240BD0_A27AA0
 /* A27C9C 80240DCC 00000000 */  nop       
 /* A27CA0 80240DD0 1A200015 */  blez      $s1, .L80240E28
 /* A27CA4 80240DD4 00000000 */   nop      
-/* A27CA8 80240DD8 3C128024 */  lui       $s2, 0x8024
-/* A27CAC 80240DDC 26523258 */  addiu     $s2, $s2, 0x3258
+/* A27CA8 80240DD8 3C128024 */  lui       $s2, %hi(D_80243258)
+/* A27CAC 80240DDC 26523258 */  addiu     $s2, $s2, %lo(D_80243258)
 /* A27CB0 80240DE0 8E420000 */  lw        $v0, ($s2)
 /* A27CB4 80240DE4 8C440000 */  lw        $a0, ($v0)
 /* A27CB8 80240DE8 1080000F */  beqz      $a0, .L80240E28
diff --git a/asm/nonmatchings/world/area_hos/hos_04/A27AA0/func_80240E6C_A27D3C.s b/asm/nonmatchings/world/area_hos/hos_04/A27AA0/func_80240E6C_A27D3C.s
index ac6362fdd0..c57d182186 100644
--- a/asm/nonmatchings/world/area_hos/hos_04/A27AA0/func_80240E6C_A27D3C.s
+++ b/asm/nonmatchings/world/area_hos/hos_04/A27AA0/func_80240E6C_A27D3C.s
@@ -3,8 +3,8 @@
 
 glabel func_80240E6C_A27D3C
 /* A27D3C 80240E6C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* A27D40 80240E70 3C048024 */  lui       $a0, 0x8024
-/* A27D44 80240E74 24843284 */  addiu     $a0, $a0, 0x3284
+/* A27D40 80240E70 3C048024 */  lui       $a0, %hi(D_80243284)
+/* A27D44 80240E74 24843284 */  addiu     $a0, $a0, %lo(D_80243284)
 /* A27D48 80240E78 AFBF0010 */  sw        $ra, 0x10($sp)
 /* A27D4C 80240E7C 0C0902F4 */  jal       func_80240BD0_A27AA0
 /* A27D50 80240E80 00000000 */   nop      
diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2A240/func_80240000_A2A240.s b/asm/nonmatchings/world/area_hos/hos_05/A2A240/func_80240000_A2A240.s
index ed2604a37c..ec5d4ad870 100644
--- a/asm/nonmatchings/world/area_hos/hos_05/A2A240/func_80240000_A2A240.s
+++ b/asm/nonmatchings/world/area_hos/hos_05/A2A240/func_80240000_A2A240.s
@@ -71,8 +71,8 @@ glabel func_80240000_A2A240
 /* A2A334 802400F4 08090035 */  j         .L802400D4
 /* A2A338 802400F8 00000000 */   nop      
 .L802400FC:
-/* A2A33C 802400FC 3C028015 */  lui       $v0, 0x8015
-/* A2A340 80240100 8C4212F0 */  lw        $v0, 0x12f0($v0)
+/* A2A33C 802400FC 3C028015 */  lui       $v0, %hi(D_801512F0)
+/* A2A340 80240100 8C4212F0 */  lw        $v0, %lo(D_801512F0)($v0)
 /* A2A344 80240104 A0510000 */  sb        $s1, ($v0)
 .L80240108:
 /* A2A348 80240108 24020002 */  addiu     $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2A240/func_80240690_A2A8D0.s b/asm/nonmatchings/world/area_hos/hos_05/A2A240/func_80240690_A2A8D0.s
index b103891291..d9a79ac8ba 100644
--- a/asm/nonmatchings/world/area_hos/hos_05/A2A240/func_80240690_A2A8D0.s
+++ b/asm/nonmatchings/world/area_hos/hos_05/A2A240/func_80240690_A2A8D0.s
@@ -80,8 +80,8 @@ glabel func_80240690_A2A8D0
 /* A2A9FC 802407BC 44820000 */  mtc1      $v0, $f0
 /* A2AA00 802407C0 00000000 */  nop       
 /* A2AA04 802407C4 46800020 */  cvt.s.w   $f0, $f0
-/* A2AA08 802407C8 3C018025 */  lui       $at, 0x8025
-/* A2AA0C 802407CC D422F1D0 */  ldc1      $f2, -0xe30($at)
+/* A2AA08 802407C8 3C018025 */  lui       $at, %hi(D_8024F1D0)
+/* A2AA0C 802407CC D422F1D0 */  ldc1      $f2, %lo(D_8024F1D0)($at)
 /* A2AA10 802407D0 46000021 */  cvt.d.s   $f0, $f0
 /* A2AA14 802407D4 46220002 */  mul.d     $f0, $f0, $f2
 /* A2AA18 802407D8 00000000 */  nop       
@@ -91,8 +91,8 @@ glabel func_80240690_A2A8D0
 /* A2AA28 802407E8 00000000 */  nop       
 /* A2AA2C 802407EC 46220002 */  mul.d     $f0, $f0, $f2
 /* A2AA30 802407F0 00000000 */  nop       
-/* A2AA34 802407F4 3C018025 */  lui       $at, 0x8025
-/* A2AA38 802407F8 D422F1D8 */  ldc1      $f2, -0xe28($at)
+/* A2AA34 802407F4 3C018025 */  lui       $at, %hi(D_8024F1D8)
+/* A2AA38 802407F8 D422F1D8 */  ldc1      $f2, %lo(D_8024F1D8)($at)
 /* A2AA3C 802407FC 46220000 */  add.d     $f0, $f0, $f2
 /* A2AA40 80240800 4620010D */  trunc.w.d $f4, $f0
 /* A2AA44 80240804 E60400B8 */  swc1      $f4, 0xb8($s0)
diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802409C4_A2AC04.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802409C4_A2AC04.s
index 44b426e280..5f4a9ab828 100644
--- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802409C4_A2AC04.s
+++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802409C4_A2AC04.s
@@ -9,80 +9,80 @@ glabel func_802409C4_A2AC04
 /* A2AC14 802409D4 AFB00018 */  sw        $s0, 0x18($sp)
 /* A2AC18 802409D8 10A0003B */  beqz      $a1, .L80240AC8
 /* A2AC1C 802409DC 8E30000C */   lw       $s0, 0xc($s1)
-/* A2AC20 802409E0 3C048025 */  lui       $a0, 0x8025
-/* A2AC24 802409E4 2484F2A0 */  addiu     $a0, $a0, -0xd60
-/* A2AC28 802409E8 3C058025 */  lui       $a1, 0x8025
-/* A2AC2C 802409EC 24A5F2A1 */  addiu     $a1, $a1, -0xd5f
-/* A2AC30 802409F0 3C068025 */  lui       $a2, 0x8025
-/* A2AC34 802409F4 24C6F2A2 */  addiu     $a2, $a2, -0xd5e
-/* A2AC38 802409F8 3C078025 */  lui       $a3, 0x8025
-/* A2AC3C 802409FC 24E7F2A3 */  addiu     $a3, $a3, -0xd5d
-/* A2AC40 80240A00 3C028025 */  lui       $v0, 0x8025
-/* A2AC44 80240A04 2442F2A4 */  addiu     $v0, $v0, -0xd5c
+/* A2AC20 802409E0 3C048025 */  lui       $a0, %hi(D_8024F2A0)
+/* A2AC24 802409E4 2484F2A0 */  addiu     $a0, $a0, %lo(D_8024F2A0)
+/* A2AC28 802409E8 3C058025 */  lui       $a1, %hi(D_8024F2A1)
+/* A2AC2C 802409EC 24A5F2A1 */  addiu     $a1, $a1, %lo(D_8024F2A1)
+/* A2AC30 802409F0 3C068025 */  lui       $a2, %hi(D_8024F2A2)
+/* A2AC34 802409F4 24C6F2A2 */  addiu     $a2, $a2, %lo(D_8024F2A2)
+/* A2AC38 802409F8 3C078025 */  lui       $a3, %hi(D_8024F2A3)
+/* A2AC3C 802409FC 24E7F2A3 */  addiu     $a3, $a3, %lo(D_8024F2A3)
+/* A2AC40 80240A00 3C028025 */  lui       $v0, %hi(D_8024F2A4)
+/* A2AC44 80240A04 2442F2A4 */  addiu     $v0, $v0, %lo(D_8024F2A4)
 /* A2AC48 80240A08 AFA20010 */  sw        $v0, 0x10($sp)
-/* A2AC4C 80240A0C 3C028025 */  lui       $v0, 0x8025
-/* A2AC50 80240A10 2442F2A5 */  addiu     $v0, $v0, -0xd5b
+/* A2AC4C 80240A0C 3C028025 */  lui       $v0, %hi(D_8024F2A5)
+/* A2AC50 80240A10 2442F2A5 */  addiu     $v0, $v0, %lo(D_8024F2A5)
 /* A2AC54 80240A14 0C046FF5 */  jal       func_8011BFD4
 /* A2AC58 80240A18 AFA20014 */   sw       $v0, 0x14($sp)
 /* A2AC5C 80240A1C 8E050000 */  lw        $a1, ($s0)
 /* A2AC60 80240A20 26100004 */  addiu     $s0, $s0, 4
 /* A2AC64 80240A24 0C0B1EAF */  jal       get_variable
 /* A2AC68 80240A28 0220202D */   daddu    $a0, $s1, $zero
-/* A2AC6C 80240A2C 3C018025 */  lui       $at, 0x8025
-/* A2AC70 80240A30 AC22F2A8 */  sw        $v0, -0xd58($at)
+/* A2AC6C 80240A2C 3C018025 */  lui       $at, %hi(D_8024F2A8)
+/* A2AC70 80240A30 AC22F2A8 */  sw        $v0, %lo(D_8024F2A8)($at)
 /* A2AC74 80240A34 8E050000 */  lw        $a1, ($s0)
 /* A2AC78 80240A38 26100004 */  addiu     $s0, $s0, 4
 /* A2AC7C 80240A3C 0C0B1EAF */  jal       get_variable
 /* A2AC80 80240A40 0220202D */   daddu    $a0, $s1, $zero
-/* A2AC84 80240A44 3C018025 */  lui       $at, 0x8025
-/* A2AC88 80240A48 AC22F2AC */  sw        $v0, -0xd54($at)
+/* A2AC84 80240A44 3C018025 */  lui       $at, %hi(D_8024F2AC)
+/* A2AC88 80240A48 AC22F2AC */  sw        $v0, %lo(D_8024F2AC)($at)
 /* A2AC8C 80240A4C 8E050000 */  lw        $a1, ($s0)
 /* A2AC90 80240A50 26100004 */  addiu     $s0, $s0, 4
 /* A2AC94 80240A54 0C0B1EAF */  jal       get_variable
 /* A2AC98 80240A58 0220202D */   daddu    $a0, $s1, $zero
-/* A2AC9C 80240A5C 3C018025 */  lui       $at, 0x8025
-/* A2ACA0 80240A60 AC22F2B0 */  sw        $v0, -0xd50($at)
+/* A2AC9C 80240A5C 3C018025 */  lui       $at, %hi(D_8024F2B0)
+/* A2ACA0 80240A60 AC22F2B0 */  sw        $v0, %lo(D_8024F2B0)($at)
 /* A2ACA4 80240A64 8E050000 */  lw        $a1, ($s0)
 /* A2ACA8 80240A68 26100004 */  addiu     $s0, $s0, 4
 /* A2ACAC 80240A6C 0C0B1EAF */  jal       get_variable
 /* A2ACB0 80240A70 0220202D */   daddu    $a0, $s1, $zero
-/* A2ACB4 80240A74 3C018025 */  lui       $at, 0x8025
-/* A2ACB8 80240A78 AC22F2B4 */  sw        $v0, -0xd4c($at)
+/* A2ACB4 80240A74 3C018025 */  lui       $at, %hi(D_8024F2B4)
+/* A2ACB8 80240A78 AC22F2B4 */  sw        $v0, %lo(D_8024F2B4)($at)
 /* A2ACBC 80240A7C 8E050000 */  lw        $a1, ($s0)
 /* A2ACC0 80240A80 26100004 */  addiu     $s0, $s0, 4
 /* A2ACC4 80240A84 0C0B1EAF */  jal       get_variable
 /* A2ACC8 80240A88 0220202D */   daddu    $a0, $s1, $zero
-/* A2ACCC 80240A8C 3C018025 */  lui       $at, 0x8025
-/* A2ACD0 80240A90 AC22F2B8 */  sw        $v0, -0xd48($at)
+/* A2ACCC 80240A8C 3C018025 */  lui       $at, %hi(D_8024F2B8)
+/* A2ACD0 80240A90 AC22F2B8 */  sw        $v0, %lo(D_8024F2B8)($at)
 /* A2ACD4 80240A94 8E050000 */  lw        $a1, ($s0)
 /* A2ACD8 80240A98 26100004 */  addiu     $s0, $s0, 4
 /* A2ACDC 80240A9C 0C0B1EAF */  jal       get_variable
 /* A2ACE0 80240AA0 0220202D */   daddu    $a0, $s1, $zero
-/* A2ACE4 80240AA4 3C018025 */  lui       $at, 0x8025
-/* A2ACE8 80240AA8 AC22F2BC */  sw        $v0, -0xd44($at)
+/* A2ACE4 80240AA4 3C018025 */  lui       $at, %hi(D_8024F2BC)
+/* A2ACE8 80240AA8 AC22F2BC */  sw        $v0, %lo(D_8024F2BC)($at)
 /* A2ACEC 80240AAC 8E050000 */  lw        $a1, ($s0)
 /* A2ACF0 80240AB0 0C0B1EAF */  jal       get_variable
 /* A2ACF4 80240AB4 0220202D */   daddu    $a0, $s1, $zero
-/* A2ACF8 80240AB8 3C018025 */  lui       $at, 0x8025
-/* A2ACFC 80240ABC AC22F2C0 */  sw        $v0, -0xd40($at)
-/* A2AD00 80240AC0 3C018025 */  lui       $at, 0x8025
-/* A2AD04 80240AC4 AC20F2C4 */  sw        $zero, -0xd3c($at)
+/* A2ACF8 80240AB8 3C018025 */  lui       $at, %hi(D_8024F2C0)
+/* A2ACFC 80240ABC AC22F2C0 */  sw        $v0, %lo(D_8024F2C0)($at)
+/* A2AD00 80240AC0 3C018025 */  lui       $at, %hi(D_8024F2C4)
+/* A2AD04 80240AC4 AC20F2C4 */  sw        $zero, %lo(D_8024F2C4)($at)
 .L80240AC8:
-/* A2AD08 80240AC8 3C118025 */  lui       $s1, 0x8025
-/* A2AD0C 80240ACC 2631F2C0 */  addiu     $s1, $s1, -0xd40
+/* A2AD08 80240AC8 3C118025 */  lui       $s1, %hi(D_8024F2C0)
+/* A2AD0C 80240ACC 2631F2C0 */  addiu     $s1, $s1, %lo(D_8024F2C0)
 /* A2AD10 80240AD0 8E2F0000 */  lw        $t7, ($s1)
 /* A2AD14 80240AD4 19E0008A */  blez      $t7, .L80240D00
 /* A2AD18 80240AD8 00000000 */   nop      
-/* A2AD1C 80240ADC 3C108025 */  lui       $s0, 0x8025
-/* A2AD20 80240AE0 2610F2C4 */  addiu     $s0, $s0, -0xd3c
+/* A2AD1C 80240ADC 3C108025 */  lui       $s0, %hi(D_8024F2C4)
+/* A2AD20 80240AE0 2610F2C4 */  addiu     $s0, $s0, %lo(D_8024F2C4)
 /* A2AD24 80240AE4 8E030000 */  lw        $v1, ($s0)
 /* A2AD28 80240AE8 006F102A */  slt       $v0, $v1, $t7
 /* A2AD2C 80240AEC 10400093 */  beqz      $v0, .L80240D3C
 /* A2AD30 80240AF0 24630001 */   addiu    $v1, $v1, 1
-/* A2AD34 80240AF4 3C048025 */  lui       $a0, 0x8025
-/* A2AD38 80240AF8 9084F2A0 */  lbu       $a0, -0xd60($a0)
-/* A2AD3C 80240AFC 3C028025 */  lui       $v0, 0x8025
-/* A2AD40 80240B00 8C42F2A8 */  lw        $v0, -0xd58($v0)
+/* A2AD34 80240AF4 3C048025 */  lui       $a0, %hi(D_8024F2A0)
+/* A2AD38 80240AF8 9084F2A0 */  lbu       $a0, %lo(D_8024F2A0)($a0)
+/* A2AD3C 80240AFC 3C028025 */  lui       $v0, %hi(D_8024F2A8)
+/* A2AD40 80240B00 8C42F2A8 */  lw        $v0, %lo(D_8024F2A8)($v0)
 /* A2AD44 80240B04 00441023 */  subu      $v0, $v0, $a0
 /* A2AD48 80240B08 00430018 */  mult      $v0, $v1
 /* A2AD4C 80240B0C 00004012 */  mflo      $t0
@@ -99,10 +99,10 @@ glabel func_802409C4_A2AC04
 /* A2AD74 80240B34 0006000D */  break     6
 .L80240B38:
 /* A2AD78 80240B38 00007012 */   mflo     $t6
-/* A2AD7C 80240B3C 3C058025 */  lui       $a1, 0x8025
-/* A2AD80 80240B40 90A5F2A1 */  lbu       $a1, -0xd5f($a1)
-/* A2AD84 80240B44 3C028025 */  lui       $v0, 0x8025
-/* A2AD88 80240B48 8C42F2AC */  lw        $v0, -0xd54($v0)
+/* A2AD7C 80240B3C 3C058025 */  lui       $a1, %hi(D_8024F2A1)
+/* A2AD80 80240B40 90A5F2A1 */  lbu       $a1, %lo(D_8024F2A1)($a1)
+/* A2AD84 80240B44 3C028025 */  lui       $v0, %hi(D_8024F2AC)
+/* A2AD88 80240B48 8C42F2AC */  lw        $v0, %lo(D_8024F2AC)($v0)
 /* A2AD8C 80240B4C 00451023 */  subu      $v0, $v0, $a1
 /* A2AD90 80240B50 00430018 */  mult      $v0, $v1
 /* A2AD94 80240B54 00004012 */  mflo      $t0
@@ -119,10 +119,10 @@ glabel func_802409C4_A2AC04
 /* A2ADBC 80240B7C 0006000D */  break     6
 .L80240B80:
 /* A2ADC0 80240B80 00006812 */   mflo     $t5
-/* A2ADC4 80240B84 3C068025 */  lui       $a2, 0x8025
-/* A2ADC8 80240B88 90C6F2A2 */  lbu       $a2, -0xd5e($a2)
-/* A2ADCC 80240B8C 3C028025 */  lui       $v0, 0x8025
-/* A2ADD0 80240B90 8C42F2B0 */  lw        $v0, -0xd50($v0)
+/* A2ADC4 80240B84 3C068025 */  lui       $a2, %hi(D_8024F2A2)
+/* A2ADC8 80240B88 90C6F2A2 */  lbu       $a2, %lo(D_8024F2A2)($a2)
+/* A2ADCC 80240B8C 3C028025 */  lui       $v0, %hi(D_8024F2B0)
+/* A2ADD0 80240B90 8C42F2B0 */  lw        $v0, %lo(D_8024F2B0)($v0)
 /* A2ADD4 80240B94 00461023 */  subu      $v0, $v0, $a2
 /* A2ADD8 80240B98 00430018 */  mult      $v0, $v1
 /* A2ADDC 80240B9C 00004012 */  mflo      $t0
@@ -139,10 +139,10 @@ glabel func_802409C4_A2AC04
 /* A2AE04 80240BC4 0006000D */  break     6
 .L80240BC8:
 /* A2AE08 80240BC8 00006012 */   mflo     $t4
-/* A2AE0C 80240BCC 3C078025 */  lui       $a3, 0x8025
-/* A2AE10 80240BD0 90E7F2A3 */  lbu       $a3, -0xd5d($a3)
-/* A2AE14 80240BD4 3C028025 */  lui       $v0, 0x8025
-/* A2AE18 80240BD8 8C42F2B4 */  lw        $v0, -0xd4c($v0)
+/* A2AE0C 80240BCC 3C078025 */  lui       $a3, %hi(D_8024F2A3)
+/* A2AE10 80240BD0 90E7F2A3 */  lbu       $a3, %lo(D_8024F2A3)($a3)
+/* A2AE14 80240BD4 3C028025 */  lui       $v0, %hi(D_8024F2B4)
+/* A2AE18 80240BD8 8C42F2B4 */  lw        $v0, %lo(D_8024F2B4)($v0)
 /* A2AE1C 80240BDC 00471023 */  subu      $v0, $v0, $a3
 /* A2AE20 80240BE0 00430018 */  mult      $v0, $v1
 /* A2AE24 80240BE4 00004012 */  mflo      $t0
@@ -159,10 +159,10 @@ glabel func_802409C4_A2AC04
 /* A2AE4C 80240C0C 0006000D */  break     6
 .L80240C10:
 /* A2AE50 80240C10 00005812 */   mflo     $t3
-/* A2AE54 80240C14 3C098025 */  lui       $t1, 0x8025
-/* A2AE58 80240C18 9129F2A4 */  lbu       $t1, -0xd5c($t1)
-/* A2AE5C 80240C1C 3C028025 */  lui       $v0, 0x8025
-/* A2AE60 80240C20 8C42F2B8 */  lw        $v0, -0xd48($v0)
+/* A2AE54 80240C14 3C098025 */  lui       $t1, %hi(D_8024F2A4)
+/* A2AE58 80240C18 9129F2A4 */  lbu       $t1, %lo(D_8024F2A4)($t1)
+/* A2AE5C 80240C1C 3C028025 */  lui       $v0, %hi(D_8024F2B8)
+/* A2AE60 80240C20 8C42F2B8 */  lw        $v0, %lo(D_8024F2B8)($v0)
 /* A2AE64 80240C24 00491023 */  subu      $v0, $v0, $t1
 /* A2AE68 80240C28 00430018 */  mult      $v0, $v1
 /* A2AE6C 80240C2C 00004012 */  mflo      $t0
@@ -179,10 +179,10 @@ glabel func_802409C4_A2AC04
 /* A2AE94 80240C54 0006000D */  break     6
 .L80240C58:
 /* A2AE98 80240C58 00005012 */   mflo     $t2
-/* A2AE9C 80240C5C 3C088025 */  lui       $t0, 0x8025
-/* A2AEA0 80240C60 9108F2A5 */  lbu       $t0, -0xd5b($t0)
-/* A2AEA4 80240C64 3C028025 */  lui       $v0, 0x8025
-/* A2AEA8 80240C68 8C42F2BC */  lw        $v0, -0xd44($v0)
+/* A2AE9C 80240C5C 3C088025 */  lui       $t0, %hi(D_8024F2A5)
+/* A2AEA0 80240C60 9108F2A5 */  lbu       $t0, %lo(D_8024F2A5)($t0)
+/* A2AEA4 80240C64 3C028025 */  lui       $v0, %hi(D_8024F2BC)
+/* A2AEA8 80240C68 8C42F2BC */  lw        $v0, %lo(D_8024F2BC)($v0)
 /* A2AEAC 80240C6C 00481023 */  subu      $v0, $v0, $t0
 /* A2AEB0 80240C70 00430018 */  mult      $v0, $v1
 /* A2AEB4 80240C74 0000C812 */  mflo      $t9
@@ -223,18 +223,18 @@ glabel func_802409C4_A2AC04
 /* A2AF38 80240CF8 08090350 */  j         .L80240D40
 /* A2AF3C 80240CFC 24020002 */   addiu    $v0, $zero, 2
 .L80240D00:
-/* A2AF40 80240D00 3C028025 */  lui       $v0, 0x8025
-/* A2AF44 80240D04 9042F2BB */  lbu       $v0, -0xd45($v0)
-/* A2AF48 80240D08 3C048025 */  lui       $a0, 0x8025
-/* A2AF4C 80240D0C 9084F2AB */  lbu       $a0, -0xd55($a0)
-/* A2AF50 80240D10 3C058025 */  lui       $a1, 0x8025
-/* A2AF54 80240D14 90A5F2AF */  lbu       $a1, -0xd51($a1)
-/* A2AF58 80240D18 3C068025 */  lui       $a2, 0x8025
-/* A2AF5C 80240D1C 90C6F2B3 */  lbu       $a2, -0xd4d($a2)
-/* A2AF60 80240D20 3C078025 */  lui       $a3, 0x8025
-/* A2AF64 80240D24 90E7F2B7 */  lbu       $a3, -0xd49($a3)
-/* A2AF68 80240D28 3C038025 */  lui       $v1, 0x8025
-/* A2AF6C 80240D2C 9063F2BF */  lbu       $v1, -0xd41($v1)
+/* A2AF40 80240D00 3C028025 */  lui       $v0, %hi(D_8024F2BB)
+/* A2AF44 80240D04 9042F2BB */  lbu       $v0, %lo(D_8024F2BB)($v0)
+/* A2AF48 80240D08 3C048025 */  lui       $a0, %hi(D_8024F2AB)
+/* A2AF4C 80240D0C 9084F2AB */  lbu       $a0, %lo(D_8024F2AB)($a0)
+/* A2AF50 80240D10 3C058025 */  lui       $a1, %hi(D_8024F2AF)
+/* A2AF54 80240D14 90A5F2AF */  lbu       $a1, %lo(D_8024F2AF)($a1)
+/* A2AF58 80240D18 3C068025 */  lui       $a2, %hi(D_8024F2B3)
+/* A2AF5C 80240D1C 90C6F2B3 */  lbu       $a2, %lo(D_8024F2B3)($a2)
+/* A2AF60 80240D20 3C078025 */  lui       $a3, %hi(D_8024F2B7)
+/* A2AF64 80240D24 90E7F2B7 */  lbu       $a3, %lo(D_8024F2B7)($a3)
+/* A2AF68 80240D28 3C038025 */  lui       $v1, %hi(D_8024F2BF)
+/* A2AF6C 80240D2C 9063F2BF */  lbu       $v1, %lo(D_8024F2BF)($v1)
 /* A2AF70 80240D30 AFA20010 */  sw        $v0, 0x10($sp)
 /* A2AF74 80240D34 0C046FE6 */  jal       func_8011BF98
 /* A2AF78 80240D38 AFA30014 */   sw       $v1, 0x14($sp)
diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80240D54_A2AF94.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80240D54_A2AF94.s
index f1fdef19b3..770d1abe0e 100644
--- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80240D54_A2AF94.s
+++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80240D54_A2AF94.s
@@ -3,8 +3,8 @@
 
 glabel func_80240D54_A2AF94
 /* A2AF94 80240D54 44852000 */  mtc1      $a1, $f4
-/* A2AF98 80240D58 3C018025 */  lui       $at, 0x8025
-/* A2AF9C 80240D5C D422F1E0 */  ldc1      $f2, -0xe20($at)
+/* A2AF98 80240D58 3C018025 */  lui       $at, %hi(D_8024F1E0)
+/* A2AF9C 80240D5C D422F1E0 */  ldc1      $f2, %lo(D_8024F1E0)($at)
 /* A2AFA0 80240D60 46002021 */  cvt.d.s   $f0, $f4
 /* A2AFA4 80240D64 46220002 */  mul.d     $f0, $f0, $f2
 /* A2AFA8 80240D68 00000000 */  nop       
@@ -16,8 +16,8 @@ glabel func_80240D54_A2AF94
 /* A2AFC0 80240D80 00431021 */  addu      $v0, $v0, $v1
 /* A2AFC4 80240D84 000210C0 */  sll       $v0, $v0, 3
 /* A2AFC8 80240D88 46200020 */  cvt.s.d   $f0, $f0
-/* A2AFCC 80240D8C 3C01800B */  lui       $at, 0x800b
+/* A2AFCC 80240D8C 3C01800B */  lui       $at, %hi(D_800B1D98)
 /* A2AFD0 80240D90 00220821 */  addu      $at, $at, $v0
-/* A2AFD4 80240D94 E4201D98 */  swc1      $f0, 0x1d98($at)
+/* A2AFD4 80240D94 E4201D98 */  swc1      $f0, %lo(D_800B1D98)($at)
 /* A2AFD8 80240D98 03E00008 */  jr        $ra
 /* A2AFDC 80240D9C 00000000 */   nop      
diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80240F30_A2B170.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80240F30_A2B170.s
index 64c0a66f9e..881af959d0 100644
--- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80240F30_A2B170.s
+++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80240F30_A2B170.s
@@ -3,12 +3,12 @@
 
 glabel func_80240F30_A2B170
 /* A2B170 80240F30 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* A2B174 80240F34 3C05F4AC */  lui       $a1, 0xf4ac
+/* A2B174 80240F34 3C05F4AC */  lui       $a1, %hi(D_F4AB95DC)
 /* A2B178 80240F38 AFBF0010 */  sw        $ra, 0x10($sp)
 /* A2B17C 80240F3C 0C0B1EAF */  jal       get_variable
 /* A2B180 80240F40 34A5D480 */   ori      $a1, $a1, 0xd480
-/* A2B184 80240F44 3C058025 */  lui       $a1, 0x8025
-/* A2B188 80240F48 24A595DC */  addiu     $a1, $a1, -0x6a24
+/* A2B184 80240F44 3C058025 */  lui       $a1, %hi(D_802495DC)
+/* A2B188 80240F48 24A595DC */  addiu     $a1, $a1, %lo(D_F4AB95DC)
 /* A2B18C 80240F4C 8CA40000 */  lw        $a0, ($a1)
 /* A2B190 80240F50 8C42000C */  lw        $v0, 0xc($v0)
 /* A2B194 80240F54 00041840 */  sll       $v1, $a0, 1
diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80240F88_A2B1C8.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80240F88_A2B1C8.s
index 5a3ffce2d0..aab87a8e3b 100644
--- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80240F88_A2B1C8.s
+++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80240F88_A2B1C8.s
@@ -3,12 +3,12 @@
 
 glabel func_80240F88_A2B1C8
 /* A2B1C8 80240F88 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* A2B1CC 80240F8C 3C05F4AC */  lui       $a1, 0xf4ac
+/* A2B1CC 80240F8C 3C05F4AC */  lui       $a1, %hi(D_F4AB95E0)
 /* A2B1D0 80240F90 AFBF0010 */  sw        $ra, 0x10($sp)
 /* A2B1D4 80240F94 0C0B1EAF */  jal       get_variable
 /* A2B1D8 80240F98 34A5D480 */   ori      $a1, $a1, 0xd480
-/* A2B1DC 80240F9C 3C058025 */  lui       $a1, 0x8025
-/* A2B1E0 80240FA0 24A595E0 */  addiu     $a1, $a1, -0x6a20
+/* A2B1DC 80240F9C 3C058025 */  lui       $a1, %hi(D_802495E0)
+/* A2B1E0 80240FA0 24A595E0 */  addiu     $a1, $a1, %lo(D_F4AB95E0)
 /* A2B1E4 80240FA4 8CA40000 */  lw        $a0, ($a1)
 /* A2B1E8 80240FA8 8C42000C */  lw        $v0, 0xc($v0)
 /* A2B1EC 80240FAC 00041840 */  sll       $v1, $a0, 1
diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241274_A2B4B4.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241274_A2B4B4.s
index 935f900024..8e335819ad 100644
--- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241274_A2B4B4.s
+++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241274_A2B4B4.s
@@ -7,10 +7,10 @@ glabel func_80241274_A2B4B4
 /* A2B4BC 8024127C 24841D80 */  addiu     $a0, $a0, %lo(gCameras)
 /* A2B4C0 80241280 3C038007 */  lui       $v1, %hi(gCurrentCameraID)
 /* A2B4C4 80241284 8C637410 */  lw        $v1, %lo(gCurrentCameraID)($v1)
-/* A2B4C8 80241288 3C05800A */  lui       $a1, 0x800a
-/* A2B4CC 8024128C 8CA5A64C */  lw        $a1, -0x59b4($a1)
-/* A2B4D0 80241290 3C088025 */  lui       $t0, 0x8025
-/* A2B4D4 80241294 250898D4 */  addiu     $t0, $t0, -0x672c
+/* A2B4C8 80241288 3C05800A */  lui       $a1, %hi(D_8009A64C)
+/* A2B4CC 8024128C 8CA5A64C */  lw        $a1, %lo(D_8009A64C)($a1)
+/* A2B4D0 80241290 3C088025 */  lui       $t0, %hi(D_802498D4)
+/* A2B4D4 80241294 250898D4 */  addiu     $t0, $t0, %lo(D_802498D4)
 /* A2B4D8 80241298 AFBF0030 */  sw        $ra, 0x30($sp)
 /* A2B4DC 8024129C AFB5002C */  sw        $s5, 0x2c($sp)
 /* A2B4E0 802412A0 AFB40028 */  sw        $s4, 0x28($sp)
@@ -29,8 +29,8 @@ glabel func_80241274_A2B4B4
 /* A2B514 802412D4 8D030000 */  lw        $v1, ($t0)
 /* A2B518 802412D8 10A30059 */  beq       $a1, $v1, .L80241440
 /* A2B51C 802412DC 0044A821 */   addu     $s5, $v0, $a0
-/* A2B520 802412E0 3C138025 */  lui       $s3, 0x8025
-/* A2B524 802412E4 267398D0 */  addiu     $s3, $s3, -0x6730
+/* A2B520 802412E0 3C138025 */  lui       $s3, %hi(D_802498D0)
+/* A2B524 802412E4 267398D0 */  addiu     $s3, $s3, %lo(D_802498D0)
 /* A2B528 802412E8 3C01437A */  lui       $at, 0x437a
 /* A2B52C 802412EC 44816000 */  mtc1      $at, $f12
 /* A2B530 802412F0 8E660000 */  lw        $a2, ($s3)
@@ -41,21 +41,21 @@ glabel func_80241274_A2B4B4
 /* A2B544 80241304 0C090411 */  jal       func_80241044_A2B284
 /* A2B548 80241308 4600A386 */   mov.s    $f14, $f20
 /* A2B54C 8024130C 24040002 */  addiu     $a0, $zero, 2
-/* A2B550 80241310 3C108025 */  lui       $s0, 0x8025
-/* A2B554 80241314 2610963C */  addiu     $s0, $s0, -0x69c4
+/* A2B550 80241310 3C108025 */  lui       $s0, %hi(D_8024963C)
+/* A2B554 80241314 2610963C */  addiu     $s0, $s0, %lo(D_8024963C)
 /* A2B558 80241318 3C054302 */  lui       $a1, 0x4302
 /* A2B55C 8024131C 34A56666 */  ori       $a1, $a1, 0x6666
 /* A2B560 80241320 8E060004 */  lw        $a2, 4($s0)
 /* A2B564 80241324 4407A000 */  mfc1      $a3, $f20
 /* A2B568 80241328 3C0143EB */  lui       $at, 0x43eb
 /* A2B56C 8024132C 44810000 */  mtc1      $at, $f0
-/* A2B570 80241330 3C148025 */  lui       $s4, 0x8025
-/* A2B574 80241334 269498D8 */  addiu     $s4, $s4, -0x6728
+/* A2B570 80241330 3C148025 */  lui       $s4, %hi(D_802498D8)
+/* A2B574 80241334 269498D8 */  addiu     $s4, $s4, %lo(D_802498D8)
 /* A2B578 80241338 AFB40014 */  sw        $s4, 0x14($sp)
 /* A2B57C 8024133C 0C090439 */  jal       func_802410E4_A2B324
 /* A2B580 80241340 E7A00010 */   swc1     $f0, 0x10($sp)
-/* A2B584 80241344 3C128025 */  lui       $s2, 0x8025
-/* A2B588 80241348 265298DC */  addiu     $s2, $s2, -0x6724
+/* A2B584 80241344 3C128025 */  lui       $s2, %hi(D_802498DC)
+/* A2B588 80241348 265298DC */  addiu     $s2, $s2, %lo(D_802498DC)
 /* A2B58C 8024134C 3C014146 */  lui       $at, 0x4146
 /* A2B590 80241350 34216666 */  ori       $at, $at, 0x6666
 /* A2B594 80241354 44816000 */  mtc1      $at, $f12
@@ -77,8 +77,8 @@ glabel func_80241274_A2B4B4
 /* A2B5D4 80241394 4407A000 */  mfc1      $a3, $f20
 /* A2B5D8 80241398 0C090411 */  jal       func_80241044_A2B284
 /* A2B5DC 8024139C AFB10010 */   sw       $s1, 0x10($sp)
-/* A2B5E0 802413A0 3C108025 */  lui       $s0, 0x8025
-/* A2B5E4 802413A4 261098E4 */  addiu     $s0, $s0, -0x671c
+/* A2B5E0 802413A0 3C108025 */  lui       $s0, %hi(D_802498E4)
+/* A2B5E4 802413A4 261098E4 */  addiu     $s0, $s0, %lo(D_802498E4)
 /* A2B5E8 802413A8 3C014278 */  lui       $at, 0x4278
 /* A2B5EC 802413AC 44816000 */  mtc1      $at, $f12
 /* A2B5F0 802413B0 3C014244 */  lui       $at, 0x4244
diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_8024146C_A2B6AC.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_8024146C_A2B6AC.s
index c7dc157247..e7e03a0ea8 100644
--- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_8024146C_A2B6AC.s
+++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_8024146C_A2B6AC.s
@@ -7,10 +7,10 @@ glabel func_8024146C_A2B6AC
 /* A2B6B4 80241474 24841D80 */  addiu     $a0, $a0, %lo(gCameras)
 /* A2B6B8 80241478 3C038007 */  lui       $v1, %hi(gCurrentCameraID)
 /* A2B6BC 8024147C 8C637410 */  lw        $v1, %lo(gCurrentCameraID)($v1)
-/* A2B6C0 80241480 3C05800A */  lui       $a1, 0x800a
-/* A2B6C4 80241484 8CA5A64C */  lw        $a1, -0x59b4($a1)
-/* A2B6C8 80241488 3C088025 */  lui       $t0, 0x8025
-/* A2B6CC 8024148C 250898D4 */  addiu     $t0, $t0, -0x672c
+/* A2B6C0 80241480 3C05800A */  lui       $a1, %hi(D_8009A64C)
+/* A2B6C4 80241484 8CA5A64C */  lw        $a1, %lo(D_8009A64C)($a1)
+/* A2B6C8 80241488 3C088025 */  lui       $t0, %hi(D_802498D4)
+/* A2B6CC 8024148C 250898D4 */  addiu     $t0, $t0, %lo(D_802498D4)
 /* A2B6D0 80241490 AFBF0034 */  sw        $ra, 0x34($sp)
 /* A2B6D4 80241494 AFB60030 */  sw        $s6, 0x30($sp)
 /* A2B6D8 80241498 AFB5002C */  sw        $s5, 0x2c($sp)
@@ -34,8 +34,8 @@ glabel func_8024146C_A2B6AC
 /* A2B720 802414E0 080905A3 */  j         .L8024168C
 /* A2B724 802414E4 0000102D */   daddu    $v0, $zero, $zero
 .L802414E8:
-/* A2B728 802414E8 3C138025 */  lui       $s3, 0x8025
-/* A2B72C 802414EC 267398D0 */  addiu     $s3, $s3, -0x6730
+/* A2B728 802414E8 3C138025 */  lui       $s3, %hi(D_802498D0)
+/* A2B72C 802414EC 267398D0 */  addiu     $s3, $s3, %lo(D_802498D0)
 /* A2B730 802414F0 3C01437A */  lui       $at, 0x437a
 /* A2B734 802414F4 44816000 */  mtc1      $at, $f12
 /* A2B738 802414F8 8E660000 */  lw        $a2, ($s3)
@@ -46,10 +46,10 @@ glabel func_8024146C_A2B6AC
 /* A2B74C 8024150C 0C090411 */  jal       func_80241044_A2B284
 /* A2B750 80241510 4600B386 */   mov.s    $f14, $f22
 /* A2B754 80241514 24040002 */  addiu     $a0, $zero, 2
-/* A2B758 80241518 3C108025 */  lui       $s0, 0x8025
-/* A2B75C 8024151C 2610963C */  addiu     $s0, $s0, -0x69c4
-/* A2B760 80241520 3C148025 */  lui       $s4, 0x8025
-/* A2B764 80241524 269498FC */  addiu     $s4, $s4, -0x6704
+/* A2B758 80241518 3C108025 */  lui       $s0, %hi(D_8024963C)
+/* A2B75C 8024151C 2610963C */  addiu     $s0, $s0, %lo(D_8024963C)
+/* A2B760 80241520 3C148025 */  lui       $s4, %hi(D_802498FC)
+/* A2B764 80241524 269498FC */  addiu     $s4, $s4, %lo(D_802498FC)
 /* A2B768 80241528 C6800000 */  lwc1      $f0, ($s4)
 /* A2B76C 8024152C 46800020 */  cvt.s.w   $f0, $f0
 /* A2B770 80241530 3C054302 */  lui       $a1, 0x4302
@@ -58,13 +58,13 @@ glabel func_8024146C_A2B6AC
 /* A2B77C 8024153C 44070000 */  mfc1      $a3, $f0
 /* A2B780 80241540 3C0143EB */  lui       $at, 0x43eb
 /* A2B784 80241544 44810000 */  mtc1      $at, $f0
-/* A2B788 80241548 3C158025 */  lui       $s5, 0x8025
-/* A2B78C 8024154C 26B598E8 */  addiu     $s5, $s5, -0x6718
+/* A2B788 80241548 3C158025 */  lui       $s5, %hi(D_802498E8)
+/* A2B78C 8024154C 26B598E8 */  addiu     $s5, $s5, %lo(D_802498E8)
 /* A2B790 80241550 AFB50014 */  sw        $s5, 0x14($sp)
 /* A2B794 80241554 0C090439 */  jal       func_802410E4_A2B324
 /* A2B798 80241558 E7A00010 */   swc1     $f0, 0x10($sp)
-/* A2B79C 8024155C 3C128025 */  lui       $s2, 0x8025
-/* A2B7A0 80241560 265298EC */  addiu     $s2, $s2, -0x6714
+/* A2B79C 8024155C 3C128025 */  lui       $s2, %hi(D_802498EC)
+/* A2B7A0 80241560 265298EC */  addiu     $s2, $s2, %lo(D_802498EC)
 /* A2B7A4 80241564 3C014146 */  lui       $at, 0x4146
 /* A2B7A8 80241568 34216666 */  ori       $at, $at, 0x6666
 /* A2B7AC 8024156C 44816000 */  mtc1      $at, $f12
@@ -76,8 +76,8 @@ glabel func_8024146C_A2B6AC
 /* A2B7C4 80241584 4407A000 */  mfc1      $a3, $f20
 /* A2B7C8 80241588 0C090411 */  jal       func_80241044_A2B284
 /* A2B7CC 8024158C AFB20010 */   sw       $s2, 0x10($sp)
-/* A2B7D0 80241590 3C118025 */  lui       $s1, 0x8025
-/* A2B7D4 80241594 263198F0 */  addiu     $s1, $s1, -0x6710
+/* A2B7D0 80241590 3C118025 */  lui       $s1, %hi(D_802498F0)
+/* A2B7D4 80241594 263198F0 */  addiu     $s1, $s1, %lo(D_802498F0)
 /* A2B7D8 80241598 3C01C186 */  lui       $at, 0xc186
 /* A2B7DC 8024159C 34216666 */  ori       $at, $at, 0x6666
 /* A2B7E0 802415A0 44816000 */  mtc1      $at, $f12
@@ -86,8 +86,8 @@ glabel func_8024146C_A2B6AC
 /* A2B7EC 802415AC 4407A000 */  mfc1      $a3, $f20
 /* A2B7F0 802415B0 0C090411 */  jal       func_80241044_A2B284
 /* A2B7F4 802415B4 AFB10010 */   sw       $s1, 0x10($sp)
-/* A2B7F8 802415B8 3C108025 */  lui       $s0, 0x8025
-/* A2B7FC 802415BC 261098F4 */  addiu     $s0, $s0, -0x670c
+/* A2B7F8 802415B8 3C108025 */  lui       $s0, %hi(D_802498F4)
+/* A2B7FC 802415BC 261098F4 */  addiu     $s0, $s0, %lo(D_802498F4)
 /* A2B800 802415C0 3C014278 */  lui       $at, 0x4278
 /* A2B804 802415C4 44816000 */  mtc1      $at, $f12
 /* A2B808 802415C8 3C014244 */  lui       $at, 0x4244
@@ -130,14 +130,14 @@ glabel func_8024146C_A2B6AC
 /* A2B89C 8024165C 00000000 */  nop       
 /* A2B8A0 80241660 45000006 */  bc1f      .L8024167C
 /* A2B8A4 80241664 E6C004F8 */   swc1     $f0, 0x4f8($s6)
-/* A2B8A8 80241668 3C038025 */  lui       $v1, 0x8025
-/* A2B8AC 8024166C 246398F8 */  addiu     $v1, $v1, -0x6708
+/* A2B8A8 80241668 3C038025 */  lui       $v1, %hi(D_802498F8)
+/* A2B8AC 8024166C 246398F8 */  addiu     $v1, $v1, %lo(D_802498F8)
 /* A2B8B0 80241670 8C620000 */  lw        $v0, ($v1)
 /* A2B8B4 80241674 24420001 */  addiu     $v0, $v0, 1
 /* A2B8B8 80241678 AC620000 */  sw        $v0, ($v1)
 .L8024167C:
-/* A2B8BC 8024167C 3C028025 */  lui       $v0, 0x8025
-/* A2B8C0 80241680 8C4298F8 */  lw        $v0, -0x6708($v0)
+/* A2B8BC 8024167C 3C028025 */  lui       $v0, %hi(D_802498F8)
+/* A2B8C0 80241680 8C4298F8 */  lw        $v0, %lo(D_802498F8)($v0)
 /* A2B8C4 80241684 2842001F */  slti      $v0, $v0, 0x1f
 /* A2B8C8 80241688 38420001 */  xori      $v0, $v0, 1
 .L8024168C:
diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802416BC_A2B8FC.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802416BC_A2B8FC.s
index 4f095c8b67..4980f4794f 100644
--- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802416BC_A2B8FC.s
+++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802416BC_A2B8FC.s
@@ -27,8 +27,8 @@ glabel func_802416BC_A2B8FC
 /* A2B954 80241714 34420008 */  ori       $v0, $v0, 8
 /* A2B958 80241718 A6420000 */  sh        $v0, ($s2)
 .L8024171C:
-/* A2B95C 8024171C 3C118025 */  lui       $s1, 0x8025
-/* A2B960 80241720 26319900 */  addiu     $s1, $s1, -0x6700
+/* A2B95C 8024171C 3C118025 */  lui       $s1, %hi(D_80249900)
+/* A2B960 80241720 26319900 */  addiu     $s1, $s1, %lo(D_80249900)
 /* A2B964 80241724 8E230000 */  lw        $v1, ($s1)
 /* A2B968 80241728 00031100 */  sll       $v0, $v1, 4
 /* A2B96C 8024172C 00431023 */  subu      $v0, $v0, $v1
@@ -42,8 +42,8 @@ glabel func_802416BC_A2B8FC
 /* A2B98C 8024174C 46806320 */  cvt.s.w   $f12, $f12
 /* A2B990 80241750 0C00A8BB */  jal       sin_deg
 /* A2B994 80241754 26530194 */   addiu    $s3, $s2, 0x194
-/* A2B998 80241758 3C108025 */  lui       $s0, 0x8025
-/* A2B99C 8024175C 26109904 */  addiu     $s0, $s0, -0x66fc
+/* A2B998 80241758 3C108025 */  lui       $s0, %hi(D_80249904)
+/* A2B99C 8024175C 26109904 */  addiu     $s0, $s0, %lo(D_80249904)
 /* A2B9A0 80241760 8E230000 */  lw        $v1, ($s1)
 /* A2B9A4 80241764 C6140000 */  lwc1      $f20, ($s0)
 /* A2B9A8 80241768 000311C0 */  sll       $v0, $v1, 7
@@ -70,8 +70,8 @@ glabel func_802416BC_A2B8FC
 /* A2B9FC 802417BC 44810000 */  mtc1      $at, $f0
 /* A2BA00 802417C0 00000000 */  nop       
 /* A2BA04 802417C4 46020001 */  sub.s     $f0, $f0, $f2
-/* A2BA08 802417C8 3C018025 */  lui       $at, 0x8025
-/* A2BA0C 802417CC D424F1E8 */  ldc1      $f4, -0xe18($at)
+/* A2BA08 802417C8 3C018025 */  lui       $at, %hi(D_8024F1E8)
+/* A2BA0C 802417CC D424F1E8 */  ldc1      $f4, %lo(D_8024F1E8)($at)
 /* A2BA10 802417D0 46000021 */  cvt.d.s   $f0, $f0
 /* A2BA14 802417D4 46240002 */  mul.d     $f0, $f0, $f4
 /* A2BA18 802417D8 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241850_A2BA90.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241850_A2BA90.s
index b9b00847c0..82ea6aa00e 100644
--- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241850_A2BA90.s
+++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241850_A2BA90.s
@@ -27,8 +27,8 @@ glabel func_80241850_A2BA90
 /* A2BAE8 802418A8 34420008 */  ori       $v0, $v0, 8
 /* A2BAEC 802418AC A6220000 */  sh        $v0, ($s1)
 .L802418B0:
-/* A2BAF0 802418B0 3C128025 */  lui       $s2, 0x8025
-/* A2BAF4 802418B4 26529908 */  addiu     $s2, $s2, -0x66f8
+/* A2BAF0 802418B0 3C128025 */  lui       $s2, %hi(D_80249908)
+/* A2BAF4 802418B4 26529908 */  addiu     $s2, $s2, %lo(D_80249908)
 /* A2BAF8 802418B8 8E430000 */  lw        $v1, ($s2)
 /* A2BAFC 802418BC 00031100 */  sll       $v0, $v1, 4
 /* A2BB00 802418C0 00431023 */  subu      $v0, $v0, $v1
@@ -41,8 +41,8 @@ glabel func_80241850_A2BA90
 /* A2BB1C 802418DC 00000000 */  nop       
 /* A2BB20 802418E0 0C00A8BB */  jal       sin_deg
 /* A2BB24 802418E4 46806320 */   cvt.s.w  $f12, $f12
-/* A2BB28 802418E8 3C108025 */  lui       $s0, 0x8025
-/* A2BB2C 802418EC 2610990C */  addiu     $s0, $s0, -0x66f4
+/* A2BB28 802418E8 3C108025 */  lui       $s0, %hi(D_8024990C)
+/* A2BB2C 802418EC 2610990C */  addiu     $s0, $s0, %lo(D_8024990C)
 /* A2BB30 802418F0 8E430000 */  lw        $v1, ($s2)
 /* A2BB34 802418F4 C6160000 */  lwc1      $f22, ($s0)
 /* A2BB38 802418F8 000311C0 */  sll       $v0, $v1, 7
diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802419F4_A2BC34.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802419F4_A2BC34.s
index c35a26568f..1b3f901e7c 100644
--- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802419F4_A2BC34.s
+++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802419F4_A2BC34.s
@@ -35,18 +35,18 @@ glabel func_802419F4_A2BC34
 /* A2BCAC 80241A6C C6000040 */  lwc1      $f0, 0x40($s0)
 /* A2BCB0 80241A70 E6000074 */  swc1      $f0, 0x74($s0)
 /* A2BCB4 80241A74 C4A00040 */  lwc1      $f0, 0x40($a1)
-/* A2BCB8 80241A78 3C018025 */  lui       $at, 0x8025
-/* A2BCBC 80241A7C E422F2C8 */  swc1      $f2, -0xd38($at)
+/* A2BCB8 80241A78 3C018025 */  lui       $at, %hi(D_8024F2C8)
+/* A2BCBC 80241A7C E422F2C8 */  swc1      $f2, %lo(D_8024F2C8)($at)
 /* A2BCC0 80241A80 E4A00074 */  swc1      $f0, 0x74($a1)
 .L80241A84:
-/* A2BCC4 80241A84 3C038025 */  lui       $v1, 0x8025
-/* A2BCC8 80241A88 8C639910 */  lw        $v1, -0x66f0($v1)
+/* A2BCC4 80241A84 3C038025 */  lui       $v1, %hi(D_80249910)
+/* A2BCC8 80241A88 8C639910 */  lw        $v1, %lo(D_80249910)($v1)
 /* A2BCCC 80241A8C 28620014 */  slti      $v0, $v1, 0x14
 /* A2BCD0 80241A90 10400009 */  beqz      $v0, .L80241AB8
 /* A2BCD4 80241A94 00031040 */   sll      $v0, $v1, 1
-/* A2BCD8 80241A98 3C018025 */  lui       $at, 0x8025
+/* A2BCD8 80241A98 3C018025 */  lui       $at, %hi(D_80249934)
 /* A2BCDC 80241A9C 00220821 */  addu      $at, $at, $v0
-/* A2BCE0 80241AA0 84229934 */  lh        $v0, -0x66cc($at)
+/* A2BCE0 80241AA0 84229934 */  lh        $v0, %lo(D_80249934)($at)
 /* A2BCE4 80241AA4 44820000 */  mtc1      $v0, $f0
 /* A2BCE8 80241AA8 00000000 */  nop       
 /* A2BCEC 80241AAC 46800020 */  cvt.s.w   $f0, $f0
@@ -55,9 +55,9 @@ glabel func_802419F4_A2BC34
 .L80241AB8:
 /* A2BCF8 80241AB8 2462FFEC */  addiu     $v0, $v1, -0x14
 /* A2BCFC 80241ABC 3042001E */  andi      $v0, $v0, 0x1e
-/* A2BD00 80241AC0 3C018025 */  lui       $at, 0x8025
+/* A2BD00 80241AC0 3C018025 */  lui       $at, %hi(D_80249914)
 /* A2BD04 80241AC4 00220821 */  addu      $at, $at, $v0
-/* A2BD08 80241AC8 84229914 */  lh        $v0, -0x66ec($at)
+/* A2BD08 80241AC8 84229914 */  lh        $v0, %lo(D_80249914)($at)
 /* A2BD0C 80241ACC 3C013DCC */  lui       $at, 0x3dcc
 /* A2BD10 80241AD0 3421CCCD */  ori       $at, $at, 0xcccd
 /* A2BD14 80241AD4 44810000 */  mtc1      $at, $f0
@@ -71,8 +71,8 @@ glabel func_802419F4_A2BC34
 /* A2BD34 80241AF4 E600003C */  swc1      $f0, 0x3c($s0)
 .L80241AF8:
 /* A2BD38 80241AF8 C600003C */  lwc1      $f0, 0x3c($s0)
-/* A2BD3C 80241AFC 3C048025 */  lui       $a0, 0x8025
-/* A2BD40 80241B00 24849910 */  addiu     $a0, $a0, -0x66f0
+/* A2BD3C 80241AFC 3C048025 */  lui       $a0, %hi(D_80249910)
+/* A2BD40 80241B00 24849910 */  addiu     $a0, $a0, %lo(D_80249910)
 /* A2BD44 80241B04 E4A0003C */  swc1      $f0, 0x3c($a1)
 /* A2BD48 80241B08 8C830000 */  lw        $v1, ($a0)
 /* A2BD4C 80241B0C C600003C */  lwc1      $f0, 0x3c($s0)
diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241B40_A2BD80.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241B40_A2BD80.s
index 4e2aac1ecd..734b067363 100644
--- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241B40_A2BD80.s
+++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241B40_A2BD80.s
@@ -35,18 +35,18 @@ glabel func_80241B40_A2BD80
 /* A2BDF8 80241BB8 C6000040 */  lwc1      $f0, 0x40($s0)
 /* A2BDFC 80241BBC E6000074 */  swc1      $f0, 0x74($s0)
 /* A2BE00 80241BC0 C4A00040 */  lwc1      $f0, 0x40($a1)
-/* A2BE04 80241BC4 3C018025 */  lui       $at, 0x8025
-/* A2BE08 80241BC8 E422F2CC */  swc1      $f2, -0xd34($at)
+/* A2BE04 80241BC4 3C018025 */  lui       $at, %hi(D_8024F2CC)
+/* A2BE08 80241BC8 E422F2CC */  swc1      $f2, %lo(D_8024F2CC)($at)
 /* A2BE0C 80241BCC E4A00074 */  swc1      $f0, 0x74($a1)
 .L80241BD0:
-/* A2BE10 80241BD0 3C048025 */  lui       $a0, 0x8025
-/* A2BE14 80241BD4 2484995C */  addiu     $a0, $a0, -0x66a4
+/* A2BE10 80241BD0 3C048025 */  lui       $a0, %hi(D_8024995C)
+/* A2BE14 80241BD4 2484995C */  addiu     $a0, $a0, %lo(D_8024995C)
 /* A2BE18 80241BD8 8C830000 */  lw        $v1, ($a0)
 /* A2BE1C 80241BDC 2462FFEC */  addiu     $v0, $v1, -0x14
 /* A2BE20 80241BE0 3042001E */  andi      $v0, $v0, 0x1e
-/* A2BE24 80241BE4 3C018025 */  lui       $at, 0x8025
+/* A2BE24 80241BE4 3C018025 */  lui       $at, %hi(D_80249960)
 /* A2BE28 80241BE8 00220821 */  addu      $at, $at, $v0
-/* A2BE2C 80241BEC 84229960 */  lh        $v0, -0x66a0($at)
+/* A2BE2C 80241BEC 84229960 */  lh        $v0, %lo(D_80249960)($at)
 /* A2BE30 80241BF0 3C013DCC */  lui       $at, 0x3dcc
 /* A2BE34 80241BF4 3421CCCD */  ori       $at, $at, 0xcccd
 /* A2BE38 80241BF8 44810000 */  mtc1      $at, $f0
diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241C54_A2BE94.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241C54_A2BE94.s
index f7465a14dc..6ceb781eda 100644
--- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241C54_A2BE94.s
+++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241C54_A2BE94.s
@@ -6,8 +6,8 @@ glabel func_80241C54_A2BE94
 /* A2BE98 80241C58 8C427410 */  lw        $v0, %lo(gCurrentCameraID)($v0)
 /* A2BE9C 80241C5C 27BDFFD0 */  addiu     $sp, $sp, -0x30
 /* A2BEA0 80241C60 AFB1001C */  sw        $s1, 0x1c($sp)
-/* A2BEA4 80241C64 3C118025 */  lui       $s1, 0x8025
-/* A2BEA8 80241C68 26319980 */  addiu     $s1, $s1, -0x6680
+/* A2BEA4 80241C64 3C118025 */  lui       $s1, %hi(D_80249980)
+/* A2BEA8 80241C68 26319980 */  addiu     $s1, $s1, %lo(D_80249980)
 /* A2BEAC 80241C6C F7B40028 */  sdc1      $f20, 0x28($sp)
 /* A2BEB0 80241C70 3C014170 */  lui       $at, 0x4170
 /* A2BEB4 80241C74 4481A000 */  mtc1      $at, $f20
diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241D7C_A2BFBC.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241D7C_A2BFBC.s
index d32e9bcd93..bdb5e200af 100644
--- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241D7C_A2BFBC.s
+++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241D7C_A2BFBC.s
@@ -24,8 +24,8 @@ glabel func_80241D7C_A2BFBC
 /* A2C008 80241DC8 E4A2006C */  swc1      $f2, 0x6c($a1)
 /* A2C00C 80241DCC E4A40074 */  swc1      $f4, 0x74($a1)
 .L80241DD0:
-/* A2C010 80241DD0 3C048025 */  lui       $a0, 0x8025
-/* A2C014 80241DD4 24849984 */  addiu     $a0, $a0, -0x667c
+/* A2C010 80241DD0 3C048025 */  lui       $a0, %hi(D_80249984)
+/* A2C014 80241DD4 24849984 */  addiu     $a0, $a0, %lo(D_80249984)
 /* A2C018 80241DD8 8C830000 */  lw        $v1, ($a0)
 /* A2C01C 80241DDC 2402001E */  addiu     $v0, $zero, 0x1e
 /* A2C020 80241DE0 14620005 */  bne       $v1, $v0, .L80241DF8
@@ -39,8 +39,8 @@ glabel func_80241D7C_A2BFBC
 /* A2C03C 80241DFC 28C20028 */  slti      $v0, $a2, 0x28
 /* A2C040 80241E00 10400037 */  beqz      $v0, .L80241EE0
 /* A2C044 80241E04 00061880 */   sll      $v1, $a2, 2
-/* A2C048 80241E08 3C028025 */  lui       $v0, 0x8025
-/* A2C04C 80241E0C 244299A8 */  addiu     $v0, $v0, -0x6658
+/* A2C048 80241E08 3C028025 */  lui       $v0, %hi(D_802499A8)
+/* A2C04C 80241E0C 244299A8 */  addiu     $v0, $v0, %lo(D_802499A8)
 /* A2C050 80241E10 00621821 */  addu      $v1, $v1, $v0
 /* A2C054 80241E14 84620000 */  lh        $v0, ($v1)
 /* A2C058 80241E18 3C0491A2 */  lui       $a0, 0x91a2
@@ -98,9 +98,9 @@ glabel func_80241D7C_A2BFBC
 .L80241EE0:
 /* A2C120 80241EE0 24C2FFD8 */  addiu     $v0, $a2, -0x28
 /* A2C124 80241EE4 3042001E */  andi      $v0, $v0, 0x1e
-/* A2C128 80241EE8 3C018025 */  lui       $at, 0x8025
+/* A2C128 80241EE8 3C018025 */  lui       $at, %hi(D_80249988)
 /* A2C12C 80241EEC 00220821 */  addu      $at, $at, $v0
-/* A2C130 80241EF0 84229988 */  lh        $v0, -0x6678($at)
+/* A2C130 80241EF0 84229988 */  lh        $v0, %lo(D_80249988)($at)
 /* A2C134 80241EF4 3C013DCC */  lui       $at, 0x3dcc
 /* A2C138 80241EF8 3421CCCD */  ori       $at, $at, 0xcccd
 /* A2C13C 80241EFC 44810000 */  mtc1      $at, $f0
@@ -113,8 +113,8 @@ glabel func_80241D7C_A2BFBC
 /* A2C158 80241F18 46020000 */  add.s     $f0, $f0, $f2
 /* A2C15C 80241F1C E4A0003C */  swc1      $f0, 0x3c($a1)
 .L80241F20:
-/* A2C160 80241F20 3C048025 */  lui       $a0, 0x8025
-/* A2C164 80241F24 24849984 */  addiu     $a0, $a0, -0x667c
+/* A2C160 80241F20 3C048025 */  lui       $a0, %hi(D_80249984)
+/* A2C164 80241F24 24849984 */  addiu     $a0, $a0, %lo(D_80249984)
 /* A2C168 80241F28 8C830000 */  lw        $v1, ($a0)
 /* A2C16C 80241F2C C4A0003C */  lwc1      $f0, 0x3c($a1)
 /* A2C170 80241F30 24630001 */  addiu     $v1, $v1, 1
diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241F54_A2C194.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241F54_A2C194.s
index ba90b52d0f..6e404336b7 100644
--- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241F54_A2C194.s
+++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241F54_A2C194.s
@@ -27,14 +27,14 @@ glabel func_80241F54_A2C194
 /* A2C1EC 80241FAC E4A0003C */  swc1      $f0, 0x3c($a1)
 /* A2C1F0 80241FB0 E4A60074 */  swc1      $f6, 0x74($a1)
 .L80241FB4:
-/* A2C1F4 80241FB4 3C048025 */  lui       $a0, 0x8025
-/* A2C1F8 80241FB8 24849A48 */  addiu     $a0, $a0, -0x65b8
+/* A2C1F4 80241FB4 3C048025 */  lui       $a0, %hi(D_80249A48)
+/* A2C1F8 80241FB8 24849A48 */  addiu     $a0, $a0, %lo(D_80249A48)
 /* A2C1FC 80241FBC 8C830000 */  lw        $v1, ($a0)
 /* A2C200 80241FC0 2462FFD8 */  addiu     $v0, $v1, -0x28
 /* A2C204 80241FC4 3042001E */  andi      $v0, $v0, 0x1e
-/* A2C208 80241FC8 3C018025 */  lui       $at, 0x8025
+/* A2C208 80241FC8 3C018025 */  lui       $at, %hi(D_80249A4C)
 /* A2C20C 80241FCC 00220821 */  addu      $at, $at, $v0
-/* A2C210 80241FD0 84229A4C */  lh        $v0, -0x65b4($at)
+/* A2C210 80241FD0 84229A4C */  lh        $v0, %lo(D_80249A4C)($at)
 /* A2C214 80241FD4 3C013DCC */  lui       $at, 0x3dcc
 /* A2C218 80241FD8 3421CCCD */  ori       $at, $at, 0xcccd
 /* A2C21C 80241FDC 44810000 */  mtc1      $at, $f0
diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802421E0_A2C420.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802421E0_A2C420.s
index 84f84e391e..d2e3f05453 100644
--- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802421E0_A2C420.s
+++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802421E0_A2C420.s
@@ -4,13 +4,13 @@
 glabel func_802421E0_A2C420
 /* A2C420 802421E0 27BDFFD8 */  addiu     $sp, $sp, -0x28
 /* A2C424 802421E4 AFB20020 */  sw        $s2, 0x20($sp)
-/* A2C428 802421E8 3C128025 */  lui       $s2, 0x8025
-/* A2C42C 802421EC 26529A74 */  addiu     $s2, $s2, -0x658c
+/* A2C428 802421E8 3C128025 */  lui       $s2, %hi(D_80249A74)
+/* A2C42C 802421EC 26529A74 */  addiu     $s2, $s2, %lo(D_80249A74)
 /* A2C430 802421F0 3C03800B */  lui       $v1, %hi(gCameras)
 /* A2C434 802421F4 24631D80 */  addiu     $v1, $v1, %lo(gCameras)
 /* A2C438 802421F8 AFB1001C */  sw        $s1, 0x1c($sp)
-/* A2C43C 802421FC 3C118025 */  lui       $s1, 0x8025
-/* A2C440 80242200 26319A78 */  addiu     $s1, $s1, -0x6588
+/* A2C43C 802421FC 3C118025 */  lui       $s1, %hi(D_80249A78)
+/* A2C440 80242200 26319A78 */  addiu     $s1, $s1, %lo(D_80249A78)
 /* A2C444 80242204 3C0141A0 */  lui       $at, 0x41a0
 /* A2C448 80242208 44810000 */  mtc1      $at, $f0
 /* A2C44C 8024220C 3C028007 */  lui       $v0, %hi(gCurrentCameraID)
diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802422A0_A2C4E0.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802422A0_A2C4E0.s
index c0b7aadde6..0f75937536 100644
--- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802422A0_A2C4E0.s
+++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802422A0_A2C4E0.s
@@ -22,18 +22,18 @@ glabel func_802422A0_A2C4E0
 /* A2C524 802422E4 0040982D */   daddu    $s3, $v0, $zero
 /* A2C528 802422E8 C6400038 */  lwc1      $f0, 0x38($s2)
 /* A2C52C 802422EC C6420040 */  lwc1      $f2, 0x40($s2)
-/* A2C530 802422F0 3C018025 */  lui       $at, 0x8025
-/* A2C534 802422F4 E420F2D8 */  swc1      $f0, -0xd28($at)
-/* A2C538 802422F8 3C018025 */  lui       $at, 0x8025
-/* A2C53C 802422FC E422F2DC */  swc1      $f2, -0xd24($at)
+/* A2C530 802422F0 3C018025 */  lui       $at, %hi(D_8024F2D8)
+/* A2C534 802422F4 E420F2D8 */  swc1      $f0, %lo(D_8024F2D8)($at)
+/* A2C538 802422F8 3C018025 */  lui       $at, %hi(D_8024F2DC)
+/* A2C53C 802422FC E422F2DC */  swc1      $f2, %lo(D_8024F2DC)($at)
 .L80242300:
 /* A2C540 80242300 24040003 */  addiu     $a0, $zero, 3
-/* A2C544 80242304 3C108025 */  lui       $s0, 0x8025
-/* A2C548 80242308 26109A7C */  addiu     $s0, $s0, -0x6584
+/* A2C544 80242304 3C108025 */  lui       $s0, %hi(D_80249A7C)
+/* A2C548 80242308 26109A7C */  addiu     $s0, $s0, %lo(D_80249A7C)
 /* A2C54C 8024230C C6000000 */  lwc1      $f0, ($s0)
 /* A2C550 80242310 46800020 */  cvt.s.w   $f0, $f0
-/* A2C554 80242314 3C058025 */  lui       $a1, 0x8025
-/* A2C558 80242318 8CA5F2D8 */  lw        $a1, -0xd28($a1)
+/* A2C554 80242314 3C058025 */  lui       $a1, %hi(D_8024F2D8)
+/* A2C558 80242318 8CA5F2D8 */  lw        $a1, %lo(D_8024F2D8)($a1)
 /* A2C55C 8024231C 4480A000 */  mtc1      $zero, $f20
 /* A2C560 80242320 44070000 */  mfc1      $a3, $f0
 /* A2C564 80242324 3C014220 */  lui       $at, 0x4220
@@ -46,8 +46,8 @@ glabel func_802422A0_A2C4E0
 /* A2C580 80242340 C6000000 */  lwc1      $f0, ($s0)
 /* A2C584 80242344 46800020 */  cvt.s.w   $f0, $f0
 /* A2C588 80242348 24040003 */  addiu     $a0, $zero, 3
-/* A2C58C 8024234C 3C058025 */  lui       $a1, 0x8025
-/* A2C590 80242350 8CA5F2DC */  lw        $a1, -0xd24($a1)
+/* A2C58C 8024234C 3C058025 */  lui       $a1, %hi(D_8024F2DC)
+/* A2C590 80242350 8CA5F2DC */  lw        $a1, %lo(D_8024F2DC)($a1)
 /* A2C594 80242354 4406A000 */  mfc1      $a2, $f20
 /* A2C598 80242358 44070000 */  mfc1      $a3, $f0
 /* A2C59C 8024235C 26420040 */  addiu     $v0, $s2, 0x40
diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802423D4_A2C614.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802423D4_A2C614.s
index ad3159af46..7fd9b90c42 100644
--- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802423D4_A2C614.s
+++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802423D4_A2C614.s
@@ -5,8 +5,8 @@ glabel func_802423D4_A2C614
 /* A2C614 802423D4 27BDFFB8 */  addiu     $sp, $sp, -0x48
 /* A2C618 802423D8 24040004 */  addiu     $a0, $zero, 4
 /* A2C61C 802423DC AFB20020 */  sw        $s2, 0x20($sp)
-/* A2C620 802423E0 3C128025 */  lui       $s2, 0x8025
-/* A2C624 802423E4 26529A80 */  addiu     $s2, $s2, -0x6580
+/* A2C620 802423E0 3C128025 */  lui       $s2, %hi(D_80249A80)
+/* A2C624 802423E4 26529A80 */  addiu     $s2, $s2, %lo(D_80249A80)
 /* A2C628 802423E8 AFBF0034 */  sw        $ra, 0x34($sp)
 /* A2C62C 802423EC AFB60030 */  sw        $s6, 0x30($sp)
 /* A2C630 802423F0 AFB5002C */  sw        $s5, 0x2c($sp)
@@ -18,8 +18,8 @@ glabel func_802423D4_A2C614
 /* A2C648 80242408 F7B40038 */  sdc1      $f20, 0x38($sp)
 /* A2C64C 8024240C C6400000 */  lwc1      $f0, ($s2)
 /* A2C650 80242410 46800020 */  cvt.s.w   $f0, $f0
-/* A2C654 80242414 3C168025 */  lui       $s6, 0x8025
-/* A2C658 80242418 26D6F2E0 */  addiu     $s6, $s6, -0xd20
+/* A2C654 80242414 3C168025 */  lui       $s6, %hi(D_8024F2E0)
+/* A2C658 80242418 26D6F2E0 */  addiu     $s6, $s6, %lo(D_8024F2E0)
 /* A2C65C 8024241C 3C01420C */  lui       $at, 0x420c
 /* A2C660 80242420 44811000 */  mtc1      $at, $f2
 /* A2C664 80242424 44070000 */  mfc1      $a3, $f0
@@ -48,8 +48,8 @@ glabel func_802423D4_A2C614
 /* A2C6C0 80242480 3C054302 */  lui       $a1, 0x4302
 /* A2C6C4 80242484 3C064387 */  lui       $a2, 0x4387
 /* A2C6C8 80242488 44070000 */  mfc1      $a3, $f0
-/* A2C6CC 8024248C 3C158025 */  lui       $s5, 0x8025
-/* A2C6D0 80242490 26B5F2E4 */  addiu     $s5, $s5, -0xd1c
+/* A2C6CC 8024248C 3C158025 */  lui       $s5, %hi(D_8024F2E4)
+/* A2C6D0 80242490 26B5F2E4 */  addiu     $s5, $s5, %lo(D_8024F2E4)
 /* A2C6D4 80242494 E7B40010 */  swc1      $f20, 0x10($sp)
 /* A2C6D8 80242498 0C090439 */  jal       func_802410E4_A2B324
 /* A2C6DC 8024249C AFB50014 */   sw       $s5, 0x14($sp)
@@ -60,8 +60,8 @@ glabel func_802423D4_A2C614
 /* A2C6F0 802424B0 3C0541F0 */  lui       $a1, 0x41f0
 /* A2C6F4 802424B4 44070000 */  mfc1      $a3, $f0
 /* A2C6F8 802424B8 4406B000 */  mfc1      $a2, $f22
-/* A2C6FC 802424BC 3C148025 */  lui       $s4, 0x8025
-/* A2C700 802424C0 2694F2E8 */  addiu     $s4, $s4, -0xd18
+/* A2C6FC 802424BC 3C148025 */  lui       $s4, %hi(D_8024F2E8)
+/* A2C700 802424C0 2694F2E8 */  addiu     $s4, $s4, %lo(D_8024F2E8)
 /* A2C704 802424C4 E7B40010 */  swc1      $f20, 0x10($sp)
 /* A2C708 802424C8 0C090439 */  jal       func_802410E4_A2B324
 /* A2C70C 802424CC AFB40014 */   sw       $s4, 0x14($sp)
@@ -71,8 +71,8 @@ glabel func_802423D4_A2C614
 /* A2C71C 802424DC 3C054368 */  lui       $a1, 0x4368
 /* A2C720 802424E0 3C064331 */  lui       $a2, 0x4331
 /* A2C724 802424E4 44070000 */  mfc1      $a3, $f0
-/* A2C728 802424E8 3C138025 */  lui       $s3, 0x8025
-/* A2C72C 802424EC 2673F2EC */  addiu     $s3, $s3, -0xd14
+/* A2C728 802424E8 3C138025 */  lui       $s3, %hi(D_8024F2EC)
+/* A2C72C 802424EC 2673F2EC */  addiu     $s3, $s3, %lo(D_8024F2EC)
 /* A2C730 802424F0 E7B40010 */  swc1      $f20, 0x10($sp)
 /* A2C734 802424F4 0C090439 */  jal       func_802410E4_A2B324
 /* A2C738 802424F8 AFB30014 */   sw       $s3, 0x14($sp)
@@ -81,8 +81,8 @@ glabel func_802423D4_A2C614
 /* A2C744 80242504 24040004 */  addiu     $a0, $zero, 4
 /* A2C748 80242508 4405B000 */  mfc1      $a1, $f22
 /* A2C74C 8024250C 44070000 */  mfc1      $a3, $f0
-/* A2C750 80242510 3C118025 */  lui       $s1, 0x8025
-/* A2C754 80242514 2631F2F0 */  addiu     $s1, $s1, -0xd10
+/* A2C750 80242510 3C118025 */  lui       $s1, %hi(D_8024F2F0)
+/* A2C754 80242514 2631F2F0 */  addiu     $s1, $s1, %lo(D_8024F2F0)
 /* A2C758 80242518 E7B40010 */  swc1      $f20, 0x10($sp)
 /* A2C75C 8024251C AFB10014 */  sw        $s1, 0x14($sp)
 /* A2C760 80242520 0C090439 */  jal       func_802410E4_A2B324
diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802425A0_A2C7E0.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802425A0_A2C7E0.s
index 3f8d1272f0..4cbcffe61f 100644
--- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802425A0_A2C7E0.s
+++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802425A0_A2C7E0.s
@@ -5,8 +5,8 @@ glabel func_802425A0_A2C7E0
 /* A2C7E0 802425A0 27BDFFC8 */  addiu     $sp, $sp, -0x38
 /* A2C7E4 802425A4 0000202D */  daddu     $a0, $zero, $zero
 /* A2C7E8 802425A8 AFB20020 */  sw        $s2, 0x20($sp)
-/* A2C7EC 802425AC 3C128025 */  lui       $s2, 0x8025
-/* A2C7F0 802425B0 26529A90 */  addiu     $s2, $s2, -0x6570
+/* A2C7EC 802425AC 3C128025 */  lui       $s2, %hi(D_80249A90)
+/* A2C7F0 802425B0 26529A90 */  addiu     $s2, $s2, %lo(D_80249A90)
 /* A2C7F4 802425B4 AFBF002C */  sw        $ra, 0x2c($sp)
 /* A2C7F8 802425B8 AFB40028 */  sw        $s4, 0x28($sp)
 /* A2C7FC 802425BC AFB30024 */  sw        $s3, 0x24($sp)
@@ -15,8 +15,8 @@ glabel func_802425A0_A2C7E0
 /* A2C808 802425C8 F7B40030 */  sdc1      $f20, 0x30($sp)
 /* A2C80C 802425CC C6400000 */  lwc1      $f0, ($s2)
 /* A2C810 802425D0 46800020 */  cvt.s.w   $f0, $f0
-/* A2C814 802425D4 3C148025 */  lui       $s4, 0x8025
-/* A2C818 802425D8 26949A84 */  addiu     $s4, $s4, -0x657c
+/* A2C814 802425D4 3C148025 */  lui       $s4, %hi(D_80249A84)
+/* A2C818 802425D8 26949A84 */  addiu     $s4, $s4, %lo(D_80249A84)
 /* A2C81C 802425DC 3C054220 */  lui       $a1, 0x4220
 /* A2C820 802425E0 3C06C302 */  lui       $a2, 0xc302
 /* A2C824 802425E4 44070000 */  mfc1      $a3, $f0
@@ -43,8 +43,8 @@ glabel func_802425A0_A2C7E0
 /* A2C878 80242638 3C05C220 */  lui       $a1, 0xc220
 /* A2C87C 8024263C 3C064302 */  lui       $a2, 0x4302
 /* A2C880 80242640 44070000 */  mfc1      $a3, $f0
-/* A2C884 80242644 3C138025 */  lui       $s3, 0x8025
-/* A2C888 80242648 26739A88 */  addiu     $s3, $s3, -0x6578
+/* A2C884 80242644 3C138025 */  lui       $s3, %hi(D_80249A88)
+/* A2C888 80242648 26739A88 */  addiu     $s3, $s3, %lo(D_80249A88)
 /* A2C88C 8024264C E7B40010 */  swc1      $f20, 0x10($sp)
 /* A2C890 80242650 0C090439 */  jal       func_802410E4_A2B324
 /* A2C894 80242654 AFB30014 */   sw       $s3, 0x14($sp)
@@ -54,8 +54,8 @@ glabel func_802425A0_A2C7E0
 /* A2C8A4 80242664 3C054234 */  lui       $a1, 0x4234
 /* A2C8A8 80242668 3C0641C8 */  lui       $a2, 0x41c8
 /* A2C8AC 8024266C 44070000 */  mfc1      $a3, $f0
-/* A2C8B0 80242670 3C118025 */  lui       $s1, 0x8025
-/* A2C8B4 80242674 26319A8C */  addiu     $s1, $s1, -0x6574
+/* A2C8B0 80242670 3C118025 */  lui       $s1, %hi(D_80249A8C)
+/* A2C8B4 80242674 26319A8C */  addiu     $s1, $s1, %lo(D_80249A8C)
 /* A2C8B8 80242678 E7B40010 */  swc1      $f20, 0x10($sp)
 /* A2C8BC 8024267C 0C090439 */  jal       func_802410E4_A2B324
 /* A2C8C0 80242680 AFB10014 */   sw       $s1, 0x14($sp)
diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80242704_A2C944.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80242704_A2C944.s
index a4912da51d..dd90bc494e 100644
--- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80242704_A2C944.s
+++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80242704_A2C944.s
@@ -5,8 +5,8 @@ glabel func_80242704_A2C944
 /* A2C944 80242704 27BDFFB8 */  addiu     $sp, $sp, -0x48
 /* A2C948 80242708 24040003 */  addiu     $a0, $zero, 3
 /* A2C94C 8024270C AFB1001C */  sw        $s1, 0x1c($sp)
-/* A2C950 80242710 3C118025 */  lui       $s1, 0x8025
-/* A2C954 80242714 26319AA4 */  addiu     $s1, $s1, -0x655c
+/* A2C950 80242710 3C118025 */  lui       $s1, %hi(D_80249AA4)
+/* A2C954 80242714 26319AA4 */  addiu     $s1, $s1, %lo(D_80249AA4)
 /* A2C958 80242718 AFBF0030 */  sw        $ra, 0x30($sp)
 /* A2C95C 8024271C AFB5002C */  sw        $s5, 0x2c($sp)
 /* A2C960 80242720 AFB40028 */  sw        $s4, 0x28($sp)
@@ -17,8 +17,8 @@ glabel func_80242704_A2C944
 /* A2C974 80242734 F7B40038 */  sdc1      $f20, 0x38($sp)
 /* A2C978 80242738 C6200000 */  lwc1      $f0, ($s1)
 /* A2C97C 8024273C 46800020 */  cvt.s.w   $f0, $f0
-/* A2C980 80242740 3C138025 */  lui       $s3, 0x8025
-/* A2C984 80242744 26739AA0 */  addiu     $s3, $s3, -0x6560
+/* A2C980 80242740 3C138025 */  lui       $s3, %hi(D_80249AA0)
+/* A2C984 80242744 26739AA0 */  addiu     $s3, $s3, %lo(D_80249AA0)
 /* A2C988 80242748 3C0541C8 */  lui       $a1, 0x41c8
 /* A2C98C 8024274C 3C014348 */  lui       $at, 0x4348
 /* A2C990 80242750 4481B000 */  mtc1      $at, $f22
@@ -49,8 +49,8 @@ glabel func_80242704_A2C944
 /* A2C9F4 802427B4 44070000 */  mfc1      $a3, $f0
 /* A2C9F8 802427B8 3C0141F0 */  lui       $at, 0x41f0
 /* A2C9FC 802427BC 4481A000 */  mtc1      $at, $f20
-/* A2CA00 802427C0 3C158025 */  lui       $s5, 0x8025
-/* A2CA04 802427C4 26B59A94 */  addiu     $s5, $s5, -0x656c
+/* A2CA00 802427C0 3C158025 */  lui       $s5, %hi(D_80249A94)
+/* A2CA04 802427C4 26B59A94 */  addiu     $s5, $s5, %lo(D_80249A94)
 /* A2CA08 802427C8 AFB50014 */  sw        $s5, 0x14($sp)
 /* A2CA0C 802427CC 0C090439 */  jal       func_802410E4_A2B324
 /* A2CA10 802427D0 E7B40010 */   swc1     $f20, 0x10($sp)
@@ -61,8 +61,8 @@ glabel func_80242704_A2C944
 /* A2CA24 802427E4 34A5199A */  ori       $a1, $a1, 0x199a
 /* A2CA28 802427E8 3C064334 */  lui       $a2, 0x4334
 /* A2CA2C 802427EC 44070000 */  mfc1      $a3, $f0
-/* A2CA30 802427F0 3C148025 */  lui       $s4, 0x8025
-/* A2CA34 802427F4 26949A98 */  addiu     $s4, $s4, -0x6568
+/* A2CA30 802427F0 3C148025 */  lui       $s4, %hi(D_80249A98)
+/* A2CA34 802427F4 26949A98 */  addiu     $s4, $s4, %lo(D_80249A98)
 /* A2CA38 802427F8 E7B40010 */  swc1      $f20, 0x10($sp)
 /* A2CA3C 802427FC 0C090439 */  jal       func_802410E4_A2B324
 /* A2CA40 80242800 AFB40014 */   sw       $s4, 0x14($sp)
@@ -72,8 +72,8 @@ glabel func_80242704_A2C944
 /* A2CA50 80242810 4405B000 */  mfc1      $a1, $f22
 /* A2CA54 80242814 3C06435C */  lui       $a2, 0x435c
 /* A2CA58 80242818 44070000 */  mfc1      $a3, $f0
-/* A2CA5C 8024281C 3C128025 */  lui       $s2, 0x8025
-/* A2CA60 80242820 26529A9C */  addiu     $s2, $s2, -0x6564
+/* A2CA5C 8024281C 3C128025 */  lui       $s2, %hi(D_80249A9C)
+/* A2CA60 80242820 26529A9C */  addiu     $s2, $s2, %lo(D_80249A9C)
 /* A2CA64 80242824 E7B40010 */  swc1      $f20, 0x10($sp)
 /* A2CA68 80242828 0C090439 */  jal       func_802410E4_A2B324
 /* A2CA6C 8024282C AFB20014 */   sw       $s2, 0x14($sp)
diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802428C8_A2CB08.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802428C8_A2CB08.s
index 403bf01852..f2dd749e6e 100644
--- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802428C8_A2CB08.s
+++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802428C8_A2CB08.s
@@ -42,13 +42,13 @@ glabel func_802428C8_A2CB08
 /* A2CB9C 8024295C 104000CE */  beqz      $v0, .L80242C98
 /* A2CBA0 80242960 0080882D */   daddu    $s1, $a0, $zero
 /* A2CBA4 80242964 00031080 */  sll       $v0, $v1, 2
-/* A2CBA8 80242968 3C018025 */  lui       $at, 0x8025
+/* A2CBA8 80242968 3C018025 */  lui       $at, %hi(D_8024F1F0)
 /* A2CBAC 8024296C 00220821 */  addu      $at, $at, $v0
-/* A2CBB0 80242970 8C22F1F0 */  lw        $v0, -0xe10($at)
+/* A2CBB0 80242970 8C22F1F0 */  lw        $v0, %lo(D_8024F1F0)($at)
 /* A2CBB4 80242974 00400008 */  jr        $v0
 /* A2CBB8 80242978 00000000 */   nop      
-/* A2CBBC 8024297C 3C108025 */  lui       $s0, 0x8025
-/* A2CBC0 80242980 2610F3F8 */  addiu     $s0, $s0, -0xc08
+/* A2CBBC 8024297C 3C108025 */  lui       $s0, %hi(D_8024F3F8)
+/* A2CBC0 80242980 2610F3F8 */  addiu     $s0, $s0, %lo(D_8024F3F8)
 /* A2CBC4 80242984 0200902D */  daddu     $s2, $s0, $zero
 /* A2CBC8 80242988 2415001E */  addiu     $s5, $zero, 0x1e
 /* A2CBCC 8024298C 8E22000C */  lw        $v0, 0xc($s1)
@@ -72,12 +72,12 @@ glabel func_802428C8_A2CB08
 /* A2CC10 802429D0 46201520 */  cvt.s.d   $f20, $f2
 /* A2CC14 802429D4 4600A502 */  mul.s     $f20, $f20, $f0
 /* A2CC18 802429D8 00000000 */  nop       
-/* A2CC1C 802429DC 3C018025 */  lui       $at, 0x8025
-/* A2CC20 802429E0 D420F208 */  ldc1      $f0, -0xdf8($at)
+/* A2CC1C 802429DC 3C018025 */  lui       $at, %hi(D_8024F208)
+/* A2CC20 802429E0 D420F208 */  ldc1      $f0, %lo(D_8024F208)($at)
 /* A2CC24 802429E4 08090B41 */  j         .L80242D04
 /* A2CC28 802429E8 4600A521 */   cvt.d.s  $f20, $f20
-/* A2CC2C 802429EC 3C108025 */  lui       $s0, 0x8025
-/* A2CC30 802429F0 2610F420 */  addiu     $s0, $s0, -0xbe0
+/* A2CC2C 802429EC 3C108025 */  lui       $s0, %hi(D_8024F420)
+/* A2CC30 802429F0 2610F420 */  addiu     $s0, $s0, %lo(D_8024F420)
 /* A2CC34 802429F4 0200902D */  daddu     $s2, $s0, $zero
 /* A2CC38 802429F8 2415001E */  addiu     $s5, $zero, 0x1e
 /* A2CC3C 802429FC 8E22000C */  lw        $v0, 0xc($s1)
@@ -101,12 +101,12 @@ glabel func_802428C8_A2CB08
 /* A2CC80 80242A40 46201520 */  cvt.s.d   $f20, $f2
 /* A2CC84 80242A44 4600A502 */  mul.s     $f20, $f20, $f0
 /* A2CC88 80242A48 00000000 */  nop       
-/* A2CC8C 80242A4C 3C018025 */  lui       $at, 0x8025
-/* A2CC90 80242A50 D420F210 */  ldc1      $f0, -0xdf0($at)
+/* A2CC8C 80242A4C 3C018025 */  lui       $at, %hi(D_8024F210)
+/* A2CC90 80242A50 D420F210 */  ldc1      $f0, %lo(D_8024F210)($at)
 /* A2CC94 80242A54 08090B41 */  j         .L80242D04
 /* A2CC98 80242A58 4600A521 */   cvt.d.s  $f20, $f20
-/* A2CC9C 80242A5C 3C108025 */  lui       $s0, 0x8025
-/* A2CCA0 80242A60 2610F448 */  addiu     $s0, $s0, -0xbb8
+/* A2CC9C 80242A5C 3C108025 */  lui       $s0, %hi(D_8024F448)
+/* A2CCA0 80242A60 2610F448 */  addiu     $s0, $s0, %lo(D_8024F448)
 /* A2CCA4 80242A64 0200902D */  daddu     $s2, $s0, $zero
 /* A2CCA8 80242A68 2415001E */  addiu     $s5, $zero, 0x1e
 /* A2CCAC 80242A6C 8E22000C */  lw        $v0, 0xc($s1)
@@ -130,12 +130,12 @@ glabel func_802428C8_A2CB08
 /* A2CCF0 80242AB0 46201520 */  cvt.s.d   $f20, $f2
 /* A2CCF4 80242AB4 4600A502 */  mul.s     $f20, $f20, $f0
 /* A2CCF8 80242AB8 00000000 */  nop       
-/* A2CCFC 80242ABC 3C018025 */  lui       $at, 0x8025
-/* A2CD00 80242AC0 D420F218 */  ldc1      $f0, -0xde8($at)
+/* A2CCFC 80242ABC 3C018025 */  lui       $at, %hi(D_8024F218)
+/* A2CD00 80242AC0 D420F218 */  ldc1      $f0, %lo(D_8024F218)($at)
 /* A2CD04 80242AC4 08090B41 */  j         .L80242D04
 /* A2CD08 80242AC8 4600A521 */   cvt.d.s  $f20, $f20
-/* A2CD0C 80242ACC 3C108025 */  lui       $s0, 0x8025
-/* A2CD10 80242AD0 2610F470 */  addiu     $s0, $s0, -0xb90
+/* A2CD0C 80242ACC 3C108025 */  lui       $s0, %hi(D_8024F470)
+/* A2CD10 80242AD0 2610F470 */  addiu     $s0, $s0, %lo(D_8024F470)
 /* A2CD14 80242AD4 8E22000C */  lw        $v0, 0xc($s1)
 /* A2CD18 80242AD8 2415001E */  addiu     $s5, $zero, 0x1e
 /* A2CD1C 80242ADC 8C420014 */  lw        $v0, 0x14($v0)
@@ -158,8 +158,8 @@ glabel func_802428C8_A2CB08
 /* A2CD5C 80242B1C 46201520 */  cvt.s.d   $f20, $f2
 /* A2CD60 80242B20 4600A502 */  mul.s     $f20, $f20, $f0
 /* A2CD64 80242B24 00000000 */  nop       
-/* A2CD68 80242B28 3C018025 */  lui       $at, 0x8025
-/* A2CD6C 80242B2C D420F220 */  ldc1      $f0, -0xde0($at)
+/* A2CD68 80242B28 3C018025 */  lui       $at, %hi(D_8024F220)
+/* A2CD6C 80242B2C D420F220 */  ldc1      $f0, %lo(D_8024F220)($at)
 /* A2CD70 80242B30 4600A521 */  cvt.d.s   $f20, $f20
 /* A2CD74 80242B34 4620A500 */  add.d     $f20, $f20, $f0
 /* A2CD78 80242B38 4620A520 */  cvt.s.d   $f20, $f20
@@ -194,8 +194,8 @@ glabel func_802428C8_A2CB08
 /* A2CDEC 80242BAC C442000C */  lwc1      $f2, 0xc($v0)
 /* A2CDF0 80242BB0 08090B60 */  j         .L80242D80
 /* A2CDF4 80242BB4 24140003 */   addiu    $s4, $zero, 3
-/* A2CDF8 80242BB8 3C108025 */  lui       $s0, 0x8025
-/* A2CDFC 80242BBC 2610F498 */  addiu     $s0, $s0, -0xb68
+/* A2CDF8 80242BB8 3C108025 */  lui       $s0, %hi(D_8024F498)
+/* A2CDFC 80242BBC 2610F498 */  addiu     $s0, $s0, %lo(D_8024F498)
 /* A2CE00 80242BC0 0200902D */  daddu     $s2, $s0, $zero
 /* A2CE04 80242BC4 2415001E */  addiu     $s5, $zero, 0x1e
 /* A2CE08 80242BC8 8E22000C */  lw        $v0, 0xc($s1)
@@ -219,12 +219,12 @@ glabel func_802428C8_A2CB08
 /* A2CE4C 80242C0C 46201520 */  cvt.s.d   $f20, $f2
 /* A2CE50 80242C10 4600A502 */  mul.s     $f20, $f20, $f0
 /* A2CE54 80242C14 00000000 */  nop       
-/* A2CE58 80242C18 3C018025 */  lui       $at, 0x8025
-/* A2CE5C 80242C1C D420F228 */  ldc1      $f0, -0xdd8($at)
+/* A2CE58 80242C18 3C018025 */  lui       $at, %hi(D_8024F228)
+/* A2CE5C 80242C1C D420F228 */  ldc1      $f0, %lo(D_8024F228)($at)
 /* A2CE60 80242C20 08090B41 */  j         .L80242D04
 /* A2CE64 80242C24 4600A521 */   cvt.d.s  $f20, $f20
-/* A2CE68 80242C28 3C108025 */  lui       $s0, 0x8025
-/* A2CE6C 80242C2C 2610F4C0 */  addiu     $s0, $s0, -0xb40
+/* A2CE68 80242C28 3C108025 */  lui       $s0, %hi(D_8024F4C0)
+/* A2CE6C 80242C2C 2610F4C0 */  addiu     $s0, $s0, %lo(D_8024F4C0)
 /* A2CE70 80242C30 0200902D */  daddu     $s2, $s0, $zero
 /* A2CE74 80242C34 2415001E */  addiu     $s5, $zero, 0x1e
 /* A2CE78 80242C38 8E22000C */  lw        $v0, 0xc($s1)
@@ -248,13 +248,13 @@ glabel func_802428C8_A2CB08
 /* A2CEBC 80242C7C 46201520 */  cvt.s.d   $f20, $f2
 /* A2CEC0 80242C80 4600A502 */  mul.s     $f20, $f20, $f0
 /* A2CEC4 80242C84 00000000 */  nop       
-/* A2CEC8 80242C88 3C018025 */  lui       $at, 0x8025
-/* A2CECC 80242C8C D420F230 */  ldc1      $f0, -0xdd0($at)
+/* A2CEC8 80242C88 3C018025 */  lui       $at, %hi(D_8024F230)
+/* A2CECC 80242C8C D420F230 */  ldc1      $f0, %lo(D_8024F230)($at)
 /* A2CED0 80242C90 08090B41 */  j         .L80242D04
 /* A2CED4 80242C94 4600A521 */   cvt.d.s  $f20, $f20
 .L80242C98:
-/* A2CED8 80242C98 3C108025 */  lui       $s0, 0x8025
-/* A2CEDC 80242C9C 2610F4E8 */  addiu     $s0, $s0, -0xb18
+/* A2CED8 80242C98 3C108025 */  lui       $s0, %hi(D_8024F4E8)
+/* A2CEDC 80242C9C 2610F4E8 */  addiu     $s0, $s0, %lo(D_8024F4E8)
 /* A2CEE0 80242CA0 0200902D */  daddu     $s2, $s0, $zero
 /* A2CEE4 80242CA4 2415001E */  addiu     $s5, $zero, 0x1e
 /* A2CEE8 80242CA8 8C82000C */  lw        $v0, 0xc($a0)
@@ -278,8 +278,8 @@ glabel func_802428C8_A2CB08
 /* A2CF2C 80242CEC 46201520 */  cvt.s.d   $f20, $f2
 /* A2CF30 80242CF0 4600A502 */  mul.s     $f20, $f20, $f0
 /* A2CF34 80242CF4 00000000 */  nop       
-/* A2CF38 80242CF8 3C018025 */  lui       $at, 0x8025
-/* A2CF3C 80242CFC D420F238 */  ldc1      $f0, -0xdc8($at)
+/* A2CF38 80242CF8 3C018025 */  lui       $at, %hi(D_8024F238)
+/* A2CF3C 80242CFC D420F238 */  ldc1      $f0, %lo(D_8024F238)($at)
 /* A2CF40 80242D00 4600A521 */  cvt.d.s   $f20, $f20
 .L80242D04:
 /* A2CF44 80242D04 4620A500 */  add.d     $f20, $f20, $f0
diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80242F74_A2D1B4.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80242F74_A2D1B4.s
index 22fe89b5fb..9af3a3e1d1 100644
--- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80242F74_A2D1B4.s
+++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80242F74_A2D1B4.s
@@ -4,14 +4,14 @@
 glabel func_80242F74_A2D1B4
 /* A2D1B4 80242F74 27BDFFD8 */  addiu     $sp, $sp, -0x28
 /* A2D1B8 80242F78 AFB1001C */  sw        $s1, 0x1c($sp)
-/* A2D1BC 80242F7C 3C118025 */  lui       $s1, 0x8025
-/* A2D1C0 80242F80 2631A9C8 */  addiu     $s1, $s1, -0x5638
+/* A2D1BC 80242F7C 3C118025 */  lui       $s1, %hi(D_8024A9C8)
+/* A2D1C0 80242F80 2631A9C8 */  addiu     $s1, $s1, %lo(D_8024A9C8)
 /* A2D1C4 80242F84 3C028007 */  lui       $v0, %hi(gCurrentCameraID)
 /* A2D1C8 80242F88 8C427410 */  lw        $v0, %lo(gCurrentCameraID)($v0)
-/* A2D1CC 80242F8C 3C018025 */  lui       $at, 0x8025
-/* A2D1D0 80242F90 C42C987C */  lwc1      $f12, -0x6784($at)
-/* A2D1D4 80242F94 3C018025 */  lui       $at, 0x8025
-/* A2D1D8 80242F98 C42E98A8 */  lwc1      $f14, -0x6758($at)
+/* A2D1CC 80242F8C 3C018025 */  lui       $at, %hi(D_8024987C)
+/* A2D1D0 80242F90 C42C987C */  lwc1      $f12, %lo(D_8024987C)($at)
+/* A2D1D4 80242F94 3C018025 */  lui       $at, %hi(D_802498A8)
+/* A2D1D8 80242F98 C42E98A8 */  lwc1      $f14, %lo(D_802498A8)($at)
 /* A2D1DC 80242F9C 3C03800B */  lui       $v1, %hi(gCameras)
 /* A2D1E0 80242FA0 24631D80 */  addiu     $v1, $v1, %lo(gCameras)
 /* A2D1E4 80242FA4 AFBF0020 */  sw        $ra, 0x20($sp)
diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_8024301C_A2D25C.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_8024301C_A2D25C.s
index 78f1975fc5..d0ec515414 100644
--- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_8024301C_A2D25C.s
+++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_8024301C_A2D25C.s
@@ -14,18 +14,18 @@ glabel func_8024301C_A2D25C
 /* A2D280 80243040 0040882D */   daddu    $s1, $v0, $zero
 /* A2D284 80243044 C6200038 */  lwc1      $f0, 0x38($s1)
 /* A2D288 80243048 C6220040 */  lwc1      $f2, 0x40($s1)
-/* A2D28C 8024304C 3C018025 */  lui       $at, 0x8025
-/* A2D290 80243050 E420F2F4 */  swc1      $f0, -0xd0c($at)
-/* A2D294 80243054 3C018025 */  lui       $at, 0x8025
-/* A2D298 80243058 E422F2F8 */  swc1      $f2, -0xd08($at)
+/* A2D28C 8024304C 3C018025 */  lui       $at, %hi(D_8024F2F4)
+/* A2D290 80243050 E420F2F4 */  swc1      $f0, %lo(D_8024F2F4)($at)
+/* A2D294 80243054 3C018025 */  lui       $at, %hi(D_8024F2F8)
+/* A2D298 80243058 E422F2F8 */  swc1      $f2, %lo(D_8024F2F8)($at)
 .L8024305C:
 /* A2D29C 8024305C 24040003 */  addiu     $a0, $zero, 3
-/* A2D2A0 80243060 3C108025 */  lui       $s0, 0x8025
-/* A2D2A4 80243064 2610A9CC */  addiu     $s0, $s0, -0x5634
+/* A2D2A0 80243060 3C108025 */  lui       $s0, %hi(D_8024A9CC)
+/* A2D2A4 80243064 2610A9CC */  addiu     $s0, $s0, %lo(D_8024A9CC)
 /* A2D2A8 80243068 C6000000 */  lwc1      $f0, ($s0)
 /* A2D2AC 8024306C 46800020 */  cvt.s.w   $f0, $f0
-/* A2D2B0 80243070 3C058025 */  lui       $a1, 0x8025
-/* A2D2B4 80243074 8CA5F2F4 */  lw        $a1, -0xd0c($a1)
+/* A2D2B0 80243070 3C058025 */  lui       $a1, %hi(D_8024F2F4)
+/* A2D2B4 80243074 8CA5F2F4 */  lw        $a1, %lo(D_8024F2F4)($a1)
 /* A2D2B8 80243078 3C06C2BE */  lui       $a2, 0xc2be
 /* A2D2BC 8024307C 44070000 */  mfc1      $a3, $f0
 /* A2D2C0 80243080 3C014220 */  lui       $at, 0x4220
@@ -37,8 +37,8 @@ glabel func_8024301C_A2D25C
 /* A2D2D8 80243098 C6000000 */  lwc1      $f0, ($s0)
 /* A2D2DC 8024309C 46800020 */  cvt.s.w   $f0, $f0
 /* A2D2E0 802430A0 24040003 */  addiu     $a0, $zero, 3
-/* A2D2E4 802430A4 3C058025 */  lui       $a1, 0x8025
-/* A2D2E8 802430A8 8CA5F2F8 */  lw        $a1, -0xd08($a1)
+/* A2D2E4 802430A4 3C058025 */  lui       $a1, %hi(D_8024F2F8)
+/* A2D2E8 802430A8 8CA5F2F8 */  lw        $a1, %lo(D_8024F2F8)($a1)
 /* A2D2EC 802430AC 3C0641A0 */  lui       $a2, 0x41a0
 /* A2D2F0 802430B0 44070000 */  mfc1      $a3, $f0
 /* A2D2F4 802430B4 26220040 */  addiu     $v0, $s1, 0x40
diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243100_A2D340.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243100_A2D340.s
index cfcb2e4215..13cc9a3ca0 100644
--- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243100_A2D340.s
+++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243100_A2D340.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80243100_A2D340
-/* A2D340 80243100 3C078025 */  lui       $a3, 0x8025
-/* A2D344 80243104 8CE7AA20 */  lw        $a3, -0x55e0($a3)
+/* A2D340 80243100 3C078025 */  lui       $a3, %hi(D_8024AA20)
+/* A2D344 80243104 8CE7AA20 */  lw        $a3, %lo(D_8024AA20)($a3)
 /* A2D348 80243108 27BDFFD8 */  addiu     $sp, $sp, -0x28
 /* A2D34C 8024310C AFBF0020 */  sw        $ra, 0x20($sp)
 /* A2D350 80243110 94E20044 */  lhu       $v0, 0x44($a3)
diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243164_A2D3A4.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243164_A2D3A4.s
index c6ba9e08c5..b12e022846 100644
--- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243164_A2D3A4.s
+++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243164_A2D3A4.s
@@ -22,8 +22,8 @@ glabel func_80243164_A2D3A4
 /* A2D3E8 802431A8 AFA50054 */  sw        $a1, 0x54($sp)
 /* A2D3EC 802431AC 1220014B */  beqz      $s1, .L802436DC
 /* A2D3F0 802431B0 AFA60058 */   sw       $a2, 0x58($sp)
-/* A2D3F4 802431B4 3C06800A */  lui       $a2, 0x800a
-/* A2D3F8 802431B8 24C6A66C */  addiu     $a2, $a2, -0x5994
+/* A2D3F4 802431B4 3C06800A */  lui       $a2, %hi(D_8009A66C)
+/* A2D3F8 802431B8 24C6A66C */  addiu     $a2, $a2, %lo(D_8009A66C)
 /* A2D3FC 802431BC 8CC50000 */  lw        $a1, ($a2)
 /* A2D400 802431C0 3C07E700 */  lui       $a3, 0xe700
 /* A2D404 802431C4 00A0102D */  daddu     $v0, $a1, $zero
@@ -33,10 +33,10 @@ glabel func_80243164_A2D3A4
 /* A2D414 802431D4 AC400004 */  sw        $zero, 4($v0)
 /* A2D418 802431D8 24A20008 */  addiu     $v0, $a1, 8
 /* A2D41C 802431DC ACC20000 */  sw        $v0, ($a2)
-/* A2D420 802431E0 3C02DE00 */  lui       $v0, 0xde00
+/* A2D420 802431E0 3C02DE00 */  lui       $v0, %hi(D_DDFFAA28)
 /* A2D424 802431E4 ACA20000 */  sw        $v0, ($a1)
-/* A2D428 802431E8 3C028025 */  lui       $v0, 0x8025
-/* A2D42C 802431EC 2442AA28 */  addiu     $v0, $v0, -0x55d8
+/* A2D428 802431E8 3C028025 */  lui       $v0, %hi(D_8024AA28)
+/* A2D42C 802431EC 2442AA28 */  addiu     $v0, $v0, %lo(D_DDFFAA28)
 /* A2D430 802431F0 12600023 */  beqz      $s3, .L80243280
 /* A2D434 802431F4 ACA20004 */   sw       $v0, 4($a1)
 /* A2D438 802431F8 3C03F500 */  lui       $v1, 0xf500
@@ -114,8 +114,8 @@ glabel func_80243164_A2D3A4
 /* A2D550 80243310 3C06FCFF */   lui      $a2, 0xfcff
 /* A2D554 80243314 34C6B3FF */  ori       $a2, $a2, 0xb3ff
 /* A2D558 80243318 3C05FF64 */  lui       $a1, 0xff64
-/* A2D55C 8024331C 3C04800A */  lui       $a0, 0x800a
-/* A2D560 80243320 2484A66C */  addiu     $a0, $a0, -0x5994
+/* A2D55C 8024331C 3C04800A */  lui       $a0, %hi(D_8009A66C)
+/* A2D560 80243320 2484A66C */  addiu     $a0, $a0, %lo(D_8009A66C)
 /* A2D564 80243324 8C820000 */  lw        $v0, ($a0)
 /* A2D568 80243328 34A5FE7F */  ori       $a1, $a1, 0xfe7f
 /* A2D56C 8024332C 0040182D */  daddu     $v1, $v0, $zero
@@ -133,8 +133,8 @@ glabel func_80243164_A2D3A4
 .L8024335C:
 /* A2D59C 8024335C 34C6FFFF */  ori       $a2, $a2, 0xffff
 /* A2D5A0 80243360 3C05FFFC */  lui       $a1, 0xfffc
-/* A2D5A4 80243364 3C04800A */  lui       $a0, 0x800a
-/* A2D5A8 80243368 2484A66C */  addiu     $a0, $a0, -0x5994
+/* A2D5A4 80243364 3C04800A */  lui       $a0, %hi(D_8009A66C)
+/* A2D5A8 80243368 2484A66C */  addiu     $a0, $a0, %lo(D_8009A66C)
 /* A2D5AC 8024336C 8C820000 */  lw        $v0, ($a0)
 /* A2D5B0 80243370 34A5F279 */  ori       $a1, $a1, 0xf279
 /* A2D5B4 80243374 0040182D */  daddu     $v1, $v0, $zero
@@ -161,8 +161,8 @@ glabel func_80243164_A2D3A4
 /* A2D5FC 802433BC 34E7001C */  ori       $a3, $a3, 0x1c
 /* A2D600 802433C0 3C060050 */  lui       $a2, 0x50
 /* A2D604 802433C4 34C64340 */  ori       $a2, $a2, 0x4340
-/* A2D608 802433C8 3C08800A */  lui       $t0, 0x800a
-/* A2D60C 802433CC 2508A66C */  addiu     $t0, $t0, -0x5994
+/* A2D608 802433C8 3C08800A */  lui       $t0, %hi(D_8009A66C)
+/* A2D60C 802433CC 2508A66C */  addiu     $t0, $t0, %lo(D_8009A66C)
 /* A2D610 802433D0 0000582D */  daddu     $t3, $zero, $zero
 /* A2D614 802433D4 8D020000 */  lw        $v0, ($t0)
 /* A2D618 802433D8 3C03ED00 */  lui       $v1, 0xed00
@@ -369,8 +369,8 @@ glabel func_80243164_A2D3A4
 /* A2D8F0 802436B0 1440FF74 */  bnez      $v0, .L80243484
 /* A2D8F4 802436B4 AC640004 */   sw       $a0, 4($v1)
 .L802436B8:
-/* A2D8F8 802436B8 3C03800A */  lui       $v1, 0x800a
-/* A2D8FC 802436BC 2463A66C */  addiu     $v1, $v1, -0x5994
+/* A2D8F8 802436B8 3C03800A */  lui       $v1, %hi(D_8009A66C)
+/* A2D8FC 802436BC 2463A66C */  addiu     $v1, $v1, %lo(D_8009A66C)
 /* A2D900 802436C0 8C620000 */  lw        $v0, ($v1)
 /* A2D904 802436C4 0040202D */  daddu     $a0, $v0, $zero
 /* A2D908 802436C8 24420008 */  addiu     $v0, $v0, 8
diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_8024370C_A2D94C.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_8024370C_A2D94C.s
index a63774cd66..0ec8686a18 100644
--- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_8024370C_A2D94C.s
+++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_8024370C_A2D94C.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_8024370C_A2D94C
-/* A2D94C 8024370C 3C038025 */  lui       $v1, 0x8025
-/* A2D950 80243710 8C63AA20 */  lw        $v1, -0x55e0($v1)
+/* A2D94C 8024370C 3C038025 */  lui       $v1, %hi(D_8024AA20)
+/* A2D950 80243710 8C63AA20 */  lw        $v1, %lo(D_8024AA20)($v1)
 /* A2D954 80243714 27BDFFD8 */  addiu     $sp, $sp, -0x28
 /* A2D958 80243718 AFBF0020 */  sw        $ra, 0x20($sp)
 /* A2D95C 8024371C 84640048 */  lh        $a0, 0x48($v1)
diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243758_A2D998.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243758_A2D998.s
index 9eef653fd5..3b8f0febb8 100644
--- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243758_A2D998.s
+++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243758_A2D998.s
@@ -15,8 +15,8 @@ glabel func_80243758_A2D998
 /* A2D9C0 80243780 3C06073F */  lui       $a2, 0x73f
 /* A2D9C4 80243784 34C6C000 */  ori       $a2, $a2, 0xc000
 /* A2D9C8 80243788 0000502D */  daddu     $t2, $zero, $zero
-/* A2D9CC 8024378C 3C02800A */  lui       $v0, 0x800a
-/* A2D9D0 80243790 2442A66C */  addiu     $v0, $v0, -0x5994
+/* A2D9CC 8024378C 3C02800A */  lui       $v0, %hi(D_8009A66C)
+/* A2D9D0 80243790 2442A66C */  addiu     $v0, $v0, %lo(D_8009A66C)
 /* A2D9D4 80243794 0040402D */  daddu     $t0, $v0, $zero
 /* A2D9D8 80243798 3C0FF548 */  lui       $t7, 0xf548
 /* A2D9DC 8024379C 35EF4200 */  ori       $t7, $t7, 0x4200
@@ -206,8 +206,8 @@ glabel func_80243758_A2D998
 /* A2DC90 80243A50 3C070741 */  lui       $a3, 0x741
 /* A2DC94 80243A54 34E7C000 */  ori       $a3, $a3, 0xc000
 /* A2DC98 80243A58 3C090041 */  lui       $t1, 0x41
-/* A2DC9C 80243A5C 3C05800A */  lui       $a1, 0x800a
-/* A2DCA0 80243A60 24A5A66C */  addiu     $a1, $a1, -0x5994
+/* A2DC9C 80243A5C 3C05800A */  lui       $a1, %hi(D_8009A66C)
+/* A2DCA0 80243A60 24A5A66C */  addiu     $a1, $a1, %lo(D_8009A66C)
 /* A2DCA4 80243A64 8CA40000 */  lw        $a0, ($a1)
 /* A2DCA8 80243A68 3529C000 */  ori       $t1, $t1, 0xc000
 /* A2DCAC 80243A6C 0080102D */  daddu     $v0, $a0, $zero
@@ -303,8 +303,8 @@ glabel func_80243758_A2D998
 /* A2DE00 80243BC0 00621025 */  or        $v0, $v1, $v0
 /* A2DE04 80243BC4 ACE20000 */  sw        $v0, ($a3)
 .L80243BC8:
-/* A2DE08 80243BC8 3C03800A */  lui       $v1, 0x800a
-/* A2DE0C 80243BCC 2463A66C */  addiu     $v1, $v1, -0x5994
+/* A2DE08 80243BC8 3C03800A */  lui       $v1, %hi(D_8009A66C)
+/* A2DE0C 80243BCC 2463A66C */  addiu     $v1, $v1, %lo(D_8009A66C)
 /* A2DE10 80243BD0 8C620000 */  lw        $v0, ($v1)
 /* A2DE14 80243BD4 00053140 */  sll       $a2, $a1, 5
 /* A2DE18 80243BD8 0040202D */  daddu     $a0, $v0, $zero
@@ -343,22 +343,22 @@ glabel func_80243758_A2D998
 /* A2DE88 80243C48 00621025 */  or        $v0, $v1, $v0
 /* A2DE8C 80243C4C AC820000 */  sw        $v0, ($a0)
 /* A2DE90 80243C50 3C050400 */  lui       $a1, 0x400
-/* A2DE94 80243C54 3C03800A */  lui       $v1, 0x800a
-/* A2DE98 80243C58 2463A66C */  addiu     $v1, $v1, -0x5994
+/* A2DE94 80243C54 3C03800A */  lui       $v1, %hi(D_8009A66C)
+/* A2DE98 80243C58 2463A66C */  addiu     $v1, $v1, %lo(D_8009A66C)
 /* A2DE9C 80243C5C 8C620000 */  lw        $v0, ($v1)
 /* A2DEA0 80243C60 34A50400 */  ori       $a1, $a1, 0x400
 /* A2DEA4 80243C64 0040202D */  daddu     $a0, $v0, $zero
 /* A2DEA8 80243C68 24420008 */  addiu     $v0, $v0, 8
 /* A2DEAC 80243C6C AC620000 */  sw        $v0, ($v1)
-/* A2DEB0 80243C70 3C02F100 */  lui       $v0, 0xf100
+/* A2DEB0 80243C70 3C02F100 */  lui       $v0, %hi(D_F1000008)
 /* A2DEB4 80243C74 AC820000 */  sw        $v0, ($a0)
 /* A2DEB8 80243C78 AC850004 */  sw        $a1, 4($a0)
 .L80243C7C:
-/* A2DEBC 80243C7C 3C03800A */  lui       $v1, 0x800a
-/* A2DEC0 80243C80 2463A66C */  addiu     $v1, $v1, -0x5994
+/* A2DEBC 80243C7C 3C03800A */  lui       $v1, %hi(D_8009A66C)
+/* A2DEC0 80243C80 2463A66C */  addiu     $v1, $v1, %lo(D_8009A66C)
 /* A2DEC4 80243C84 8C620000 */  lw        $v0, ($v1)
 /* A2DEC8 80243C88 0040202D */  daddu     $a0, $v0, $zero
-/* A2DECC 80243C8C 24420008 */  addiu     $v0, $v0, 8
+/* A2DECC 80243C8C 24420008 */  addiu     $v0, $v0, %lo(D_F1000008)
 /* A2DED0 80243C90 AC620000 */  sw        $v0, ($v1)
 /* A2DED4 80243C94 3C02E700 */  lui       $v0, 0xe700
 /* A2DED8 80243C98 AC820000 */  sw        $v0, ($a0)
diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243CC0_A2DF00.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243CC0_A2DF00.s
index 12d0e5f65c..3f5f0bf0b0 100644
--- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243CC0_A2DF00.s
+++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243CC0_A2DF00.s
@@ -24,22 +24,22 @@ glabel func_80243CC0_A2DF00
 /* A2DF4C 80243D0C 0C090DC3 */  jal       func_8024370C_A2D94C
 /* A2DF50 80243D10 84520010 */   lh       $s2, 0x10($v0)
 /* A2DF54 80243D14 3C05FF10 */  lui       $a1, 0xff10
-/* A2DF58 80243D18 3C10800A */  lui       $s0, 0x800a
-/* A2DF5C 80243D1C 2610A66C */  addiu     $s0, $s0, -0x5994
+/* A2DF58 80243D18 3C10800A */  lui       $s0, %hi(D_8009A66C)
+/* A2DF5C 80243D1C 2610A66C */  addiu     $s0, $s0, %lo(D_8009A66C)
 /* A2DF60 80243D20 34A5013F */  ori       $a1, $a1, 0x13f
 /* A2DF64 80243D24 8E060000 */  lw        $a2, ($s0)
 /* A2DF68 80243D28 3C02DE00 */  lui       $v0, 0xde00
 /* A2DF6C 80243D2C 00C0202D */  daddu     $a0, $a2, $zero
 /* A2DF70 80243D30 24C60008 */  addiu     $a2, $a2, 8
 /* A2DF74 80243D34 AE060000 */  sw        $a2, ($s0)
-/* A2DF78 80243D38 3C03800A */  lui       $v1, 0x800a
-/* A2DF7C 80243D3C 8C63A64C */  lw        $v1, -0x59b4($v1)
-/* A2DF80 80243D40 3C138025 */  lui       $s3, 0x8025
-/* A2DF84 80243D44 2673AA20 */  addiu     $s3, $s3, -0x55e0
+/* A2DF78 80243D38 3C03800A */  lui       $v1, %hi(D_8009A64C)
+/* A2DF7C 80243D3C 8C63A64C */  lw        $v1, %lo(D_8009A64C)($v1)
+/* A2DF80 80243D40 3C138025 */  lui       $s3, %hi(D_8024AA20)
+/* A2DF84 80243D44 2673AA20 */  addiu     $s3, $s3, %lo(D_8024AA20)
 /* A2DF88 80243D48 AC820000 */  sw        $v0, ($a0)
 /* A2DF8C 80243D4C 8E670000 */  lw        $a3, ($s3)
-/* A2DF90 80243D50 3C028025 */  lui       $v0, 0x8025
-/* A2DF94 80243D54 2442AA28 */  addiu     $v0, $v0, -0x55d8
+/* A2DF90 80243D50 3C028025 */  lui       $v0, %hi(D_8024AA28)
+/* A2DF94 80243D54 2442AA28 */  addiu     $v0, $v0, %lo(D_8024AA28)
 /* A2DF98 80243D58 AC820004 */  sw        $v0, 4($a0)
 /* A2DF9C 80243D5C ACC50000 */  sw        $a1, ($a2)
 /* A2DFA0 80243D60 ACC30004 */  sw        $v1, 4($a2)
diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243ED0_A2E110.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243ED0_A2E110.s
index 7b040d1a45..d2b2c30902 100644
--- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243ED0_A2E110.s
+++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243ED0_A2E110.s
@@ -7,8 +7,8 @@ glabel func_80243ED0_A2E110
 /* A2E118 80243ED8 04A1000C */  bgez      $a1, .L80243F0C
 /* A2E11C 80243EDC AFBF0010 */   sw       $ra, 0x10($sp)
 /* A2E120 80243EE0 3404D6B5 */  ori       $a0, $zero, 0xd6b5
-/* A2E124 80243EE4 3C028025 */  lui       $v0, 0x8025
-/* A2E128 80243EE8 8C42AA20 */  lw        $v0, -0x55e0($v0)
+/* A2E124 80243EE4 3C028025 */  lui       $v0, %hi(D_8024AA20)
+/* A2E128 80243EE8 8C42AA20 */  lw        $v0, %lo(D_8024AA20)($v0)
 /* A2E12C 80243EEC 240300FF */  addiu     $v1, $zero, 0xff
 /* A2E130 80243EF0 8C420008 */  lw        $v0, 8($v0)
 .L80243EF4:
@@ -31,8 +31,8 @@ glabel func_80243ED0_A2E110
 /* A2E170 80243F30 00042100 */  sll       $a0, $a0, 4
 /* A2E174 80243F34 00852021 */  addu      $a0, $a0, $a1
 /* A2E178 80243F38 00042100 */  sll       $a0, $a0, 4
-/* A2E17C 80243F3C 3C028025 */  lui       $v0, 0x8025
-/* A2E180 80243F40 8C42AA20 */  lw        $v0, -0x55e0($v0)
+/* A2E17C 80243F3C 3C028025 */  lui       $v0, %hi(D_8024AA20)
+/* A2E180 80243F40 8C42AA20 */  lw        $v0, %lo(D_8024AA20)($v0)
 /* A2E184 80243F44 8C460004 */  lw        $a2, 4($v0)
 /* A2E188 80243F48 08090FE2 */  j         .L80243F88
 /* A2E18C 80243F4C 00832021 */   addu     $a0, $a0, $v1
@@ -47,8 +47,8 @@ glabel func_80243ED0_A2E110
 /* A2E1AC 80243F6C 00042100 */  sll       $a0, $a0, 4
 /* A2E1B0 80243F70 00852021 */  addu      $a0, $a0, $a1
 /* A2E1B4 80243F74 00042100 */  sll       $a0, $a0, 4
-/* A2E1B8 80243F78 3C028025 */  lui       $v0, 0x8025
-/* A2E1BC 80243F7C 8C42AA20 */  lw        $v0, -0x55e0($v0)
+/* A2E1B8 80243F78 3C028025 */  lui       $v0, %hi(D_8024AA20)
+/* A2E1BC 80243F7C 8C42AA20 */  lw        $v0, %lo(D_8024AA20)($v0)
 /* A2E1C0 80243F80 00832021 */  addu      $a0, $a0, $v1
 /* A2E1C4 80243F84 8C46000C */  lw        $a2, 0xc($v0)
 .L80243F88:
diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243FC4_A2E204.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243FC4_A2E204.s
index f16010f3c2..adaa7ff780 100644
--- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243FC4_A2E204.s
+++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243FC4_A2E204.s
@@ -4,14 +4,14 @@
 glabel func_80243FC4_A2E204
 /* A2E204 80243FC4 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* A2E208 80243FC8 0000202D */  daddu     $a0, $zero, $zero
-/* A2E20C 80243FCC 3C058024 */  lui       $a1, 0x8024
-/* A2E210 80243FD0 24A53CC0 */  addiu     $a1, $a1, 0x3cc0
+/* A2E20C 80243FCC 3C058024 */  lui       $a1, %hi(D_80243CC0)
+/* A2E210 80243FD0 24A53CC0 */  addiu     $a1, $a1, %lo(D_80243CC0)
 /* A2E214 80243FD4 AFBF0014 */  sw        $ra, 0x14($sp)
 /* A2E218 80243FD8 0C048C8F */  jal       bind_dynamic_entity_7
 /* A2E21C 80243FDC AFB00010 */   sw       $s0, 0x10($sp)
 /* A2E220 80243FE0 3C040001 */  lui       $a0, 1
-/* A2E224 80243FE4 3C108025 */  lui       $s0, 0x8025
-/* A2E228 80243FE8 2610AA20 */  addiu     $s0, $s0, -0x55e0
+/* A2E224 80243FE4 3C108025 */  lui       $s0, %hi(D_8024AA20)
+/* A2E228 80243FE8 2610AA20 */  addiu     $s0, $s0, %lo(D_8024AA20)
 /* A2E22C 80243FEC 8E030000 */  lw        $v1, ($s0)
 /* A2E230 80243FF0 3484D420 */  ori       $a0, $a0, 0xd420
 /* A2E234 80243FF4 0C0475F9 */  jal       func_8011D7E4
diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802440D0_A2E310.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802440D0_A2E310.s
index 57ed8d84ed..fc586d8f66 100644
--- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802440D0_A2E310.s
+++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802440D0_A2E310.s
@@ -2,26 +2,26 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_802440D0_A2E310
-/* A2E310 802440D0 3C038025 */  lui       $v1, 0x8025
-/* A2E314 802440D4 8C63AAB0 */  lw        $v1, -0x5550($v1)
+/* A2E310 802440D0 3C038025 */  lui       $v1, %hi(D_8024AAB0)
+/* A2E314 802440D4 8C63AAB0 */  lw        $v1, %lo(D_8024AAB0)($v1)
 /* A2E318 802440D8 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* A2E31C 802440DC AFBF0014 */  sw        $ra, 0x14($sp)
 /* A2E320 802440E0 2C620007 */  sltiu     $v0, $v1, 7
 /* A2E324 802440E4 104000D4 */  beqz      $v0, .L80244438
 /* A2E328 802440E8 AFB00010 */   sw       $s0, 0x10($sp)
 /* A2E32C 802440EC 00031080 */  sll       $v0, $v1, 2
-/* A2E330 802440F0 3C018025 */  lui       $at, 0x8025
+/* A2E330 802440F0 3C018025 */  lui       $at, %hi(D_8024F240)
 /* A2E334 802440F4 00220821 */  addu      $at, $at, $v0
-/* A2E338 802440F8 8C22F240 */  lw        $v0, -0xdc0($at)
+/* A2E338 802440F8 8C22F240 */  lw        $v0, %lo(D_8024F240)($at)
 /* A2E33C 802440FC 00400008 */  jr        $v0
 /* A2E340 80244100 00000000 */   nop      
-/* A2E344 80244104 3C048025 */  lui       $a0, 0x8025
-/* A2E348 80244108 2484AAB0 */  addiu     $a0, $a0, -0x5550
-/* A2E34C 8024410C 3C038025 */  lui       $v1, 0x8025
+/* A2E344 80244104 3C048025 */  lui       $a0, %hi(D_8024AAB0)
+/* A2E348 80244108 2484AAB0 */  addiu     $a0, $a0, %lo(D_8024AAB0)
+/* A2E34C 8024410C 3C038025 */  lui       $v1, %hi(D_8024AAB4)
 /* A2E350 80244110 08091097 */  j         .L8024425C
-/* A2E354 80244114 8C63AAB4 */   lw       $v1, -0x554c($v1)
-/* A2E358 80244118 3C068025 */  lui       $a2, 0x8025
-/* A2E35C 8024411C 24C6AAB8 */  addiu     $a2, $a2, -0x5548
+/* A2E354 80244114 8C63AAB4 */   lw       $v1, %lo(D_8024AAB4)($v1)
+/* A2E358 80244118 3C068025 */  lui       $a2, %hi(D_8024AAB8)
+/* A2E35C 8024411C 24C6AAB8 */  addiu     $a2, $a2, %lo(D_8024AAB8)
 /* A2E360 80244120 8CC20000 */  lw        $v0, ($a2)
 /* A2E364 80244124 10400003 */  beqz      $v0, .L80244134
 /* A2E368 80244128 2442FFFF */   addiu    $v0, $v0, -1
@@ -29,8 +29,8 @@ glabel func_802440D0_A2E310
 /* A2E370 80244130 ACC20000 */   sw       $v0, ($a2)
 .L80244134:
 /* A2E374 80244134 240400B0 */  addiu     $a0, $zero, 0xb0
-/* A2E378 80244138 3C028025 */  lui       $v0, 0x8025
-/* A2E37C 8024413C 2442AAB0 */  addiu     $v0, $v0, -0x5550
+/* A2E378 80244138 3C028025 */  lui       $v0, %hi(D_8024AAB0)
+/* A2E37C 8024413C 2442AAB0 */  addiu     $v0, $v0, %lo(D_8024AAB0)
 /* A2E380 80244140 8C430000 */  lw        $v1, ($v0)
 /* A2E384 80244144 2405001A */  addiu     $a1, $zero, 0x1a
 /* A2E388 80244148 ACC50000 */  sw        $a1, ($a2)
@@ -39,21 +39,21 @@ glabel func_802440D0_A2E310
 /* A2E394 80244154 AC430000 */   sw       $v1, ($v0)
 /* A2E398 80244158 08091111 */  j         .L80244444
 /* A2E39C 8024415C 0000102D */   daddu    $v0, $zero, $zero
-/* A2E3A0 80244160 3C058025 */  lui       $a1, 0x8025
-/* A2E3A4 80244164 24A5AAB8 */  addiu     $a1, $a1, -0x5548
+/* A2E3A0 80244160 3C058025 */  lui       $a1, %hi(D_8024AAB8)
+/* A2E3A4 80244164 24A5AAB8 */  addiu     $a1, $a1, %lo(D_8024AAB8)
 /* A2E3A8 80244168 8CA30000 */  lw        $v1, ($a1)
 /* A2E3AC 8024416C 10600008 */  beqz      $v1, .L80244190
 /* A2E3B0 80244170 2463FFFF */   addiu    $v1, $v1, -1
-/* A2E3B4 80244174 3C048025 */  lui       $a0, 0x8025
-/* A2E3B8 80244178 8C84AA20 */  lw        $a0, -0x55e0($a0)
+/* A2E3B4 80244174 3C048025 */  lui       $a0, %hi(D_8024AA20)
+/* A2E3B8 80244178 8C84AA20 */  lw        $a0, %lo(D_8024AA20)($a0)
 /* A2E3BC 8024417C 84820058 */  lh        $v0, 0x58($a0)
 /* A2E3C0 80244180 1040009E */  beqz      $v0, .L802443FC
 /* A2E3C4 80244184 ACA30000 */   sw       $v1, ($a1)
 /* A2E3C8 80244188 080910F7 */  j         .L802443DC
 /* A2E3CC 8024418C 24020019 */   addiu    $v0, $zero, 0x19
 .L80244190:
-/* A2E3D0 80244190 3C038025 */  lui       $v1, 0x8025
-/* A2E3D4 80244194 2463AAB4 */  addiu     $v1, $v1, -0x554c
+/* A2E3D0 80244190 3C038025 */  lui       $v1, %hi(D_8024AAB4)
+/* A2E3D4 80244194 2463AAB4 */  addiu     $v1, $v1, %lo(D_8024AAB4)
 /* A2E3D8 80244198 8C640000 */  lw        $a0, ($v1)
 /* A2E3DC 8024419C 24820001 */  addiu     $v0, $a0, 1
 /* A2E3E0 802441A0 24850002 */  addiu     $a1, $a0, 2
@@ -61,15 +61,15 @@ glabel func_802440D0_A2E310
 /* A2E3E8 802441A8 28A20005 */  slti      $v0, $a1, 5
 /* A2E3EC 802441AC 10400011 */  beqz      $v0, .L802441F4
 /* A2E3F0 802441B0 00000000 */   nop      
-/* A2E3F4 802441B4 3C108025 */  lui       $s0, 0x8025
-/* A2E3F8 802441B8 2610AA20 */  addiu     $s0, $s0, -0x55e0
+/* A2E3F4 802441B4 3C108025 */  lui       $s0, %hi(D_8024AA20)
+/* A2E3F8 802441B8 2610AA20 */  addiu     $s0, $s0, %lo(D_8024AA20)
 /* A2E3FC 802441BC 8E020000 */  lw        $v0, ($s0)
 /* A2E400 802441C0 0C090FB4 */  jal       func_80243ED0_A2E110
 /* A2E404 802441C4 84440058 */   lh       $a0, 0x58($v0)
 /* A2E408 802441C8 8E020000 */  lw        $v0, ($s0)
 /* A2E40C 802441CC 94430058 */  lhu       $v1, 0x58($v0)
-/* A2E410 802441D0 3C018025 */  lui       $at, 0x8025
-/* A2E414 802441D4 AC20AAB0 */  sw        $zero, -0x5550($at)
+/* A2E410 802441D0 3C018025 */  lui       $at, %hi(D_8024AAB0)
+/* A2E414 802441D4 AC20AAB0 */  sw        $zero, %lo(D_8024AAB0)($at)
 /* A2E418 802441D8 A440003C */  sh        $zero, 0x3c($v0)
 /* A2E41C 802441DC A440003E */  sh        $zero, 0x3e($v0)
 /* A2E420 802441E0 A4400040 */  sh        $zero, 0x40($v0)
@@ -78,8 +78,8 @@ glabel func_802440D0_A2E310
 /* A2E42C 802441EC 08091110 */  j         .L80244440
 /* A2E430 802441F0 A4430058 */   sh       $v1, 0x58($v0)
 .L802441F4:
-/* A2E434 802441F4 3C038025 */  lui       $v1, 0x8025
-/* A2E438 802441F8 8C63AA20 */  lw        $v1, -0x55e0($v1)
+/* A2E434 802441F4 3C038025 */  lui       $v1, %hi(D_8024AA20)
+/* A2E438 802441F8 8C63AA20 */  lw        $v1, %lo(D_8024AA20)($v1)
 /* A2E43C 802441FC 84620058 */  lh        $v0, 0x58($v1)
 /* A2E440 80244200 54400004 */  bnel      $v0, $zero, .L80244214
 /* A2E444 80244204 A460003C */   sh       $zero, 0x3c($v1)
@@ -91,8 +91,8 @@ glabel func_802440D0_A2E310
 .L80244218:
 /* A2E458 80244218 3C04800B */  lui       $a0, %hi(gCameras)
 /* A2E45C 8024421C 24841D80 */  addiu     $a0, $a0, %lo(gCameras)
-/* A2E460 80244220 3C058025 */  lui       $a1, 0x8025
-/* A2E464 80244224 24A5AAB0 */  addiu     $a1, $a1, -0x5550
+/* A2E460 80244220 3C058025 */  lui       $a1, %hi(D_8024AAB0)
+/* A2E464 80244224 24A5AAB0 */  addiu     $a1, $a1, %lo(D_8024AAB0)
 /* A2E468 80244228 94820000 */  lhu       $v0, ($a0)
 /* A2E46C 8024422C 8CA30000 */  lw        $v1, ($a1)
 /* A2E470 80244230 3042FFFD */  andi      $v0, $v0, 0xfffd
@@ -100,109 +100,109 @@ glabel func_802440D0_A2E310
 /* A2E478 80244238 A4820000 */  sh        $v0, ($a0)
 /* A2E47C 8024423C 08091110 */  j         .L80244440
 /* A2E480 80244240 ACA30000 */   sw       $v1, ($a1)
-/* A2E484 80244244 3C038025 */  lui       $v1, 0x8025
-/* A2E488 80244248 8C63AAB4 */  lw        $v1, -0x554c($v1)
-/* A2E48C 8024424C 3C048025 */  lui       $a0, 0x8025
-/* A2E490 80244250 2484AAB0 */  addiu     $a0, $a0, -0x5550
-/* A2E494 80244254 3C018025 */  lui       $at, 0x8025
-/* A2E498 80244258 AC20AABC */  sw        $zero, -0x5544($at)
+/* A2E484 80244244 3C038025 */  lui       $v1, %hi(D_8024AAB4)
+/* A2E488 80244248 8C63AAB4 */  lw        $v1, %lo(D_8024AAB4)($v1)
+/* A2E48C 8024424C 3C048025 */  lui       $a0, %hi(D_8024AAB0)
+/* A2E490 80244250 2484AAB0 */  addiu     $a0, $a0, %lo(D_8024AAB0)
+/* A2E494 80244254 3C018025 */  lui       $at, %hi(D_8024AABC)
+/* A2E498 80244258 AC20AABC */  sw        $zero, %lo(D_8024AABC)($at)
 .L8024425C:
 /* A2E49C 8024425C 8C820000 */  lw        $v0, ($a0)
 /* A2E4A0 80244260 00031880 */  sll       $v1, $v1, 2
-/* A2E4A4 80244264 3C018025 */  lui       $at, 0x8025
+/* A2E4A4 80244264 3C018025 */  lui       $at, %hi(D_8024AAC0)
 /* A2E4A8 80244268 00230821 */  addu      $at, $at, $v1
-/* A2E4AC 8024426C 8C23AAC0 */  lw        $v1, -0x5540($at)
+/* A2E4AC 8024426C 8C23AAC0 */  lw        $v1, %lo(D_8024AAC0)($at)
 /* A2E4B0 80244270 24420001 */  addiu     $v0, $v0, 1
 /* A2E4B4 80244274 AC820000 */  sw        $v0, ($a0)
-/* A2E4B8 80244278 3C018025 */  lui       $at, 0x8025
-/* A2E4BC 8024427C AC23AAB8 */  sw        $v1, -0x5548($at)
+/* A2E4B8 80244278 3C018025 */  lui       $at, %hi(D_8024AAB8)
+/* A2E4BC 8024427C AC23AAB8 */  sw        $v1, %lo(D_8024AAB8)($at)
 /* A2E4C0 80244280 08091111 */  j         .L80244444
 /* A2E4C4 80244284 0000102D */   daddu    $v0, $zero, $zero
-/* A2E4C8 80244288 3C068025 */  lui       $a2, 0x8025
-/* A2E4CC 8024428C 24C6AAB8 */  addiu     $a2, $a2, -0x5548
+/* A2E4C8 80244288 3C068025 */  lui       $a2, %hi(D_8024AAB8)
+/* A2E4CC 8024428C 24C6AAB8 */  addiu     $a2, $a2, %lo(D_8024AAB8)
 /* A2E4D0 80244290 8CC30000 */  lw        $v1, ($a2)
 /* A2E4D4 80244294 10600038 */  beqz      $v1, .L80244378
 /* A2E4D8 80244298 240400B0 */   addiu    $a0, $zero, 0xb0
-/* A2E4DC 8024429C 3C028025 */  lui       $v0, 0x8025
-/* A2E4E0 802442A0 8C42AAB4 */  lw        $v0, -0x554c($v0)
+/* A2E4DC 8024429C 3C028025 */  lui       $v0, %hi(D_8024AAB4)
+/* A2E4E0 802442A0 8C42AAB4 */  lw        $v0, %lo(D_8024AAB4)($v0)
 /* A2E4E4 802442A4 00021080 */  sll       $v0, $v0, 2
-/* A2E4E8 802442A8 3C018025 */  lui       $at, 0x8025
+/* A2E4E8 802442A8 3C018025 */  lui       $at, %hi(D_8024AAC0)
 /* A2E4EC 802442AC 00220821 */  addu      $at, $at, $v0
-/* A2E4F0 802442B0 8C22AAC0 */  lw        $v0, -0x5540($at)
+/* A2E4F0 802442B0 8C22AAC0 */  lw        $v0, %lo(D_8024AAC0)($at)
 /* A2E4F4 802442B4 2442FEF4 */  addiu     $v0, $v0, -0x10c
 /* A2E4F8 802442B8 0062102A */  slt       $v0, $v1, $v0
 /* A2E4FC 802442BC 10400028 */  beqz      $v0, .L80244360
 /* A2E500 802442C0 00000000 */   nop      
-/* A2E504 802442C4 3C048025 */  lui       $a0, 0x8025
-/* A2E508 802442C8 8C84AABC */  lw        $a0, -0x5544($a0)
+/* A2E504 802442C4 3C048025 */  lui       $a0, %hi(D_8024AABC)
+/* A2E508 802442C8 8C84AABC */  lw        $a0, %lo(D_8024AABC)($a0)
 /* A2E50C 802442CC 2C820140 */  sltiu     $v0, $a0, 0x140
 /* A2E510 802442D0 1040000B */  beqz      $v0, .L80244300
 /* A2E514 802442D4 2483FEC0 */   addiu    $v1, $a0, -0x140
-/* A2E518 802442D8 3C028025 */  lui       $v0, 0x8025
-/* A2E51C 802442DC 8C42AA20 */  lw        $v0, -0x55e0($v0)
-/* A2E520 802442E0 3C038025 */  lui       $v1, 0x8025
-/* A2E524 802442E4 9463AC7C */  lhu       $v1, -0x5384($v1)
+/* A2E518 802442D8 3C028025 */  lui       $v0, %hi(D_8024AA20)
+/* A2E51C 802442DC 8C42AA20 */  lw        $v0, %lo(D_8024AA20)($v0)
+/* A2E520 802442E0 3C038025 */  lui       $v1, %hi(D_8024AC7C)
+/* A2E524 802442E4 9463AC7C */  lhu       $v1, %lo(D_8024AC7C)($v1)
 /* A2E528 802442E8 A4430044 */  sh        $v1, 0x44($v0)
-/* A2E52C 802442EC 3C038025 */  lui       $v1, 0x8025
+/* A2E52C 802442EC 3C038025 */  lui       $v1, %hi(D_8024AB3C)
 /* A2E530 802442F0 00641821 */  addu      $v1, $v1, $a0
-/* A2E534 802442F4 9063AB3C */  lbu       $v1, -0x54c4($v1)
+/* A2E534 802442F4 9063AB3C */  lbu       $v1, %lo(D_8024AB3C)($v1)
 /* A2E538 802442F8 080910D3 */  j         .L8024434C
 /* A2E53C 802442FC A4430046 */   sh       $v1, 0x46($v0)
 .L80244300:
 /* A2E540 80244300 2C62000F */  sltiu     $v0, $v1, 0xf
 /* A2E544 80244304 10400011 */  beqz      $v0, .L8024434C
 /* A2E548 80244308 00032040 */   sll      $a0, $v1, 1
-/* A2E54C 8024430C 3C058025 */  lui       $a1, 0x8025
-/* A2E550 80244310 8CA5AA20 */  lw        $a1, -0x55e0($a1)
-/* A2E554 80244314 3C028025 */  lui       $v0, 0x8025
+/* A2E54C 8024430C 3C058025 */  lui       $a1, %hi(D_8024AA20)
+/* A2E550 80244310 8CA5AA20 */  lw        $a1, %lo(D_8024AA20)($a1)
+/* A2E554 80244314 3C028025 */  lui       $v0, %hi(D_8024AC7C)
 /* A2E558 80244318 00441021 */  addu      $v0, $v0, $a0
-/* A2E55C 8024431C 9442AC7C */  lhu       $v0, -0x5384($v0)
+/* A2E55C 8024431C 9442AC7C */  lhu       $v0, %lo(D_8024AC7C)($v0)
 /* A2E560 80244320 A4A20044 */  sh        $v0, 0x44($a1)
 /* A2E564 80244324 2C62000D */  sltiu     $v0, $v1, 0xd
 /* A2E568 80244328 10400008 */  beqz      $v0, .L8024434C
 /* A2E56C 8024432C 00000000 */   nop      
-/* A2E570 80244330 3C028025 */  lui       $v0, 0x8025
-/* A2E574 80244334 9042AC7B */  lbu       $v0, -0x5385($v0)
-/* A2E578 80244338 3C038025 */  lui       $v1, 0x8025
+/* A2E570 80244330 3C028025 */  lui       $v0, %hi(D_8024AC7B)
+/* A2E574 80244334 9042AC7B */  lbu       $v0, %lo(D_8024AC7B)($v0)
+/* A2E578 80244338 3C038025 */  lui       $v1, %hi(D_8024AC9C)
 /* A2E57C 8024433C 00641821 */  addu      $v1, $v1, $a0
-/* A2E580 80244340 9463AC9C */  lhu       $v1, -0x5364($v1)
+/* A2E580 80244340 9463AC9C */  lhu       $v1, %lo(D_8024AC9C)($v1)
 /* A2E584 80244344 00431021 */  addu      $v0, $v0, $v1
 /* A2E588 80244348 A4A20046 */  sh        $v0, 0x46($a1)
 .L8024434C:
-/* A2E58C 8024434C 3C038025 */  lui       $v1, 0x8025
-/* A2E590 80244350 2463AABC */  addiu     $v1, $v1, -0x5544
+/* A2E58C 8024434C 3C038025 */  lui       $v1, %hi(D_8024AABC)
+/* A2E590 80244350 2463AABC */  addiu     $v1, $v1, %lo(D_8024AABC)
 /* A2E594 80244354 8C620000 */  lw        $v0, ($v1)
 /* A2E598 80244358 24420001 */  addiu     $v0, $v0, 1
 /* A2E59C 8024435C AC620000 */  sw        $v0, ($v1)
 .L80244360:
-/* A2E5A0 80244360 3C038025 */  lui       $v1, 0x8025
-/* A2E5A4 80244364 2463AAB8 */  addiu     $v1, $v1, -0x5548
+/* A2E5A0 80244360 3C038025 */  lui       $v1, %hi(D_8024AAB8)
+/* A2E5A4 80244364 2463AAB8 */  addiu     $v1, $v1, %lo(D_8024AAB8)
 /* A2E5A8 80244368 8C620000 */  lw        $v0, ($v1)
 /* A2E5AC 8024436C 2442FFFF */  addiu     $v0, $v0, -1
 /* A2E5B0 80244370 08091110 */  j         .L80244440
 /* A2E5B4 80244374 AC620000 */   sw       $v0, ($v1)
 .L80244378:
-/* A2E5B8 80244378 3C058025 */  lui       $a1, 0x8025
-/* A2E5BC 8024437C 24A5AAB0 */  addiu     $a1, $a1, -0x5550
+/* A2E5B8 80244378 3C058025 */  lui       $a1, %hi(D_8024AAB0)
+/* A2E5BC 8024437C 24A5AAB0 */  addiu     $a1, $a1, %lo(D_8024AAB0)
 /* A2E5C0 80244380 8CA20000 */  lw        $v0, ($a1)
 /* A2E5C4 80244384 2403001A */  addiu     $v1, $zero, 0x1a
 /* A2E5C8 80244388 ACC30000 */  sw        $v1, ($a2)
 /* A2E5CC 8024438C 24420001 */  addiu     $v0, $v0, 1
 /* A2E5D0 80244390 ACA20000 */  sw        $v0, ($a1)
-/* A2E5D4 80244394 3C038025 */  lui       $v1, 0x8025
-/* A2E5D8 80244398 8C63AA20 */  lw        $v1, -0x55e0($v1)
+/* A2E5D4 80244394 3C038025 */  lui       $v1, %hi(D_8024AA20)
+/* A2E5D8 80244398 8C63AA20 */  lw        $v1, %lo(D_8024AA20)($v1)
 /* A2E5DC 8024439C 240200FF */  addiu     $v0, $zero, 0xff
 /* A2E5E0 802443A0 0C05272D */  jal       play_sound
 /* A2E5E4 802443A4 A462005C */   sh       $v0, 0x5c($v1)
 /* A2E5E8 802443A8 08091111 */  j         .L80244444
 /* A2E5EC 802443AC 0000102D */   daddu    $v0, $zero, $zero
-/* A2E5F0 802443B0 3C058025 */  lui       $a1, 0x8025
-/* A2E5F4 802443B4 24A5AAB8 */  addiu     $a1, $a1, -0x5548
+/* A2E5F0 802443B0 3C058025 */  lui       $a1, %hi(D_8024AAB8)
+/* A2E5F4 802443B4 24A5AAB8 */  addiu     $a1, $a1, %lo(D_8024AAB8)
 /* A2E5F8 802443B8 8CA30000 */  lw        $v1, ($a1)
 /* A2E5FC 802443BC 10600018 */  beqz      $v1, .L80244420
 /* A2E600 802443C0 2463FFFF */   addiu    $v1, $v1, -1
-/* A2E604 802443C4 3C048025 */  lui       $a0, 0x8025
-/* A2E608 802443C8 8C84AA20 */  lw        $a0, -0x55e0($a0)
+/* A2E604 802443C4 3C048025 */  lui       $a0, %hi(D_8024AA20)
+/* A2E608 802443C8 8C84AA20 */  lw        $a0, %lo(D_8024AA20)($a0)
 /* A2E60C 802443CC 84820058 */  lh        $v0, 0x58($a0)
 /* A2E610 802443D0 1440000A */  bnez      $v0, .L802443FC
 /* A2E614 802443D4 ACA30000 */   sw       $v1, ($a1)
@@ -210,9 +210,9 @@ glabel func_802440D0_A2E310
 .L802443DC:
 /* A2E61C 802443DC 00431023 */  subu      $v0, $v0, $v1
 /* A2E620 802443E0 00021080 */  sll       $v0, $v0, 2
-/* A2E624 802443E4 3C018025 */  lui       $at, 0x8025
+/* A2E624 802443E4 3C018025 */  lui       $at, %hi(D_8024AAD6)
 /* A2E628 802443E8 00220821 */  addu      $at, $at, $v0
-/* A2E62C 802443EC 9422AAD6 */  lhu       $v0, -0x552a($at)
+/* A2E62C 802443EC 9422AAD6 */  lhu       $v0, %lo(D_8024AAD6)($at)
 /* A2E630 802443F0 A4800042 */  sh        $zero, 0x42($a0)
 /* A2E634 802443F4 08091110 */  j         .L80244440
 /* A2E638 802443F8 A4820040 */   sh       $v0, 0x40($a0)
@@ -220,15 +220,15 @@ glabel func_802440D0_A2E310
 /* A2E63C 802443FC 24020019 */  addiu     $v0, $zero, 0x19
 /* A2E640 80244400 00431023 */  subu      $v0, $v0, $v1
 /* A2E644 80244404 00021080 */  sll       $v0, $v0, 2
-/* A2E648 80244408 3C018025 */  lui       $at, 0x8025
+/* A2E648 80244408 3C018025 */  lui       $at, %hi(D_8024AAD6)
 /* A2E64C 8024440C 00220821 */  addu      $at, $at, $v0
-/* A2E650 80244410 9422AAD6 */  lhu       $v0, -0x552a($at)
+/* A2E650 80244410 9422AAD6 */  lhu       $v0, %lo(D_8024AAD6)($at)
 /* A2E654 80244414 A480003E */  sh        $zero, 0x3e($a0)
 /* A2E658 80244418 08091110 */  j         .L80244440
 /* A2E65C 8024441C A482003C */   sh       $v0, 0x3c($a0)
 .L80244420:
-/* A2E660 80244420 3C038025 */  lui       $v1, 0x8025
-/* A2E664 80244424 2463AAB0 */  addiu     $v1, $v1, -0x5550
+/* A2E660 80244420 3C038025 */  lui       $v1, %hi(D_8024AAB0)
+/* A2E664 80244424 2463AAB0 */  addiu     $v1, $v1, %lo(D_8024AAB0)
 /* A2E668 80244428 8C620000 */  lw        $v0, ($v1)
 /* A2E66C 8024442C 24420001 */  addiu     $v0, $v0, 1
 /* A2E670 80244430 08091110 */  j         .L80244440
diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80244454_A2E694.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80244454_A2E694.s
index e281d5a18f..51b519512f 100644
--- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80244454_A2E694.s
+++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80244454_A2E694.s
@@ -3,15 +3,15 @@
 
 glabel func_80244454_A2E694
 /* A2E694 80244454 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* A2E698 80244458 3C058025 */  lui       $a1, 0x8025
-/* A2E69C 8024445C 24A5ACB8 */  addiu     $a1, $a1, -0x5348
+/* A2E698 80244458 3C058025 */  lui       $a1, %hi(D_8024ACB8)
+/* A2E69C 8024445C 24A5ACB8 */  addiu     $a1, $a1, %lo(D_8024ACB8)
 /* A2E6A0 80244460 AFBF0014 */  sw        $ra, 0x14($sp)
 /* A2E6A4 80244464 AFB00010 */  sw        $s0, 0x10($sp)
 /* A2E6A8 80244468 8CA40000 */  lw        $a0, ($a1)
 /* A2E6AC 8024446C 1480000B */  bnez      $a0, .L8024449C
 /* A2E6B0 80244470 3C028888 */   lui      $v0, 0x8888
-/* A2E6B4 80244474 3C108025 */  lui       $s0, 0x8025
-/* A2E6B8 80244478 2610AA20 */  addiu     $s0, $s0, -0x55e0
+/* A2E6B4 80244474 3C108025 */  lui       $s0, %hi(D_8024AA20)
+/* A2E6B8 80244478 2610AA20 */  addiu     $s0, $s0, %lo(D_8024AA20)
 /* A2E6BC 8024447C 8E020000 */  lw        $v0, ($s0)
 /* A2E6C0 80244480 8C440000 */  lw        $a0, ($v0)
 /* A2E6C4 80244484 0C048D70 */  jal       func_801235C0
@@ -28,8 +28,8 @@ glabel func_80244454_A2E694
 /* A2E6EC 802444AC 00620018 */  mult      $v1, $v0
 /* A2E6F0 802444B0 0000102D */  daddu     $v0, $zero, $zero
 /* A2E6F4 802444B4 ACA40000 */  sw        $a0, ($a1)
-/* A2E6F8 802444B8 3C058025 */  lui       $a1, 0x8025
-/* A2E6FC 802444BC 8CA5AA20 */  lw        $a1, -0x55e0($a1)
+/* A2E6F8 802444B8 3C058025 */  lui       $a1, %hi(D_8024AA20)
+/* A2E6FC 802444BC 8CA5AA20 */  lw        $a1, %lo(D_8024AA20)($a1)
 /* A2E700 802444C0 00003010 */  mfhi      $a2
 /* A2E704 802444C4 00C32021 */  addu      $a0, $a2, $v1
 /* A2E708 802444C8 00042103 */  sra       $a0, $a0, 4
diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802444E8_A2E728.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802444E8_A2E728.s
index 35e8327d42..51e715b48b 100644
--- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802444E8_A2E728.s
+++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802444E8_A2E728.s
@@ -17,9 +17,9 @@ glabel func_802444E8_A2E728
 /* A2E758 80244518 000320C0 */  sll       $a0, $v1, 3
 /* A2E75C 8024451C 00641821 */  addu      $v1, $v1, $a0
 /* A2E760 80244520 000318C0 */  sll       $v1, $v1, 3
-/* A2E764 80244524 3C01800B */  lui       $at, 0x800b
+/* A2E764 80244524 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* A2E768 80244528 00230821 */  addu      $at, $at, $v1
-/* A2E76C 8024452C C4221DEC */  lwc1      $f2, 0x1dec($at)
+/* A2E76C 8024452C C4221DEC */  lwc1      $f2, %lo(D_800B1DEC)($at)
 /* A2E770 80244530 46020001 */  sub.s     $f0, $f0, $f2
 /* A2E774 80244534 0040182D */  daddu     $v1, $v0, $zero
 /* A2E778 80244538 E4600034 */  swc1      $f0, 0x34($v1)
diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80244550_A2E790.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80244550_A2E790.s
index 441ea6d42a..99a223db4d 100644
--- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80244550_A2E790.s
+++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80244550_A2E790.s
@@ -26,21 +26,21 @@ glabel func_80244550_A2E790
 /* A2E7E4 802445A4 1200002B */  beqz      $s0, .L80244654
 /* A2E7E8 802445A8 0040A82D */   daddu    $s5, $v0, $zero
 /* A2E7EC 802445AC 0000802D */  daddu     $s0, $zero, $zero
-/* A2E7F0 802445B0 3C138025 */  lui       $s3, 0x8025
-/* A2E7F4 802445B4 2673F358 */  addiu     $s3, $s3, -0xca8
-/* A2E7F8 802445B8 3C128025 */  lui       $s2, 0x8025
-/* A2E7FC 802445BC 2652F338 */  addiu     $s2, $s2, -0xcc8
+/* A2E7F0 802445B0 3C138025 */  lui       $s3, %hi(D_8024F358)
+/* A2E7F4 802445B4 2673F358 */  addiu     $s3, $s3, %lo(D_8024F358)
+/* A2E7F8 802445B8 3C128025 */  lui       $s2, %hi(D_8024F338)
+/* A2E7FC 802445BC 2652F338 */  addiu     $s2, $s2, %lo(D_8024F338)
 /* A2E800 802445C0 C6800038 */  lwc1      $f0, 0x38($s4)
 /* A2E804 802445C4 C682003C */  lwc1      $f2, 0x3c($s4)
 /* A2E808 802445C8 C6840040 */  lwc1      $f4, 0x40($s4)
-/* A2E80C 802445CC 3C118025 */  lui       $s1, 0x8025
-/* A2E810 802445D0 2631F318 */  addiu     $s1, $s1, -0xce8
-/* A2E814 802445D4 3C018025 */  lui       $at, 0x8025
-/* A2E818 802445D8 E420F2FC */  swc1      $f0, -0xd04($at)
-/* A2E81C 802445DC 3C018025 */  lui       $at, 0x8025
-/* A2E820 802445E0 E422F300 */  swc1      $f2, -0xd00($at)
-/* A2E824 802445E4 3C018025 */  lui       $at, 0x8025
-/* A2E828 802445E8 E424F304 */  swc1      $f4, -0xcfc($at)
+/* A2E80C 802445CC 3C118025 */  lui       $s1, %hi(D_8024F318)
+/* A2E810 802445D0 2631F318 */  addiu     $s1, $s1, %lo(D_8024F318)
+/* A2E814 802445D4 3C018025 */  lui       $at, %hi(D_8024F2FC)
+/* A2E818 802445D8 E420F2FC */  swc1      $f0, %lo(D_8024F2FC)($at)
+/* A2E81C 802445DC 3C018025 */  lui       $at, %hi(D_8024F300)
+/* A2E820 802445E0 E422F300 */  swc1      $f2, %lo(D_8024F300)($at)
+/* A2E824 802445E4 3C018025 */  lui       $at, %hi(D_8024F304)
+/* A2E828 802445E8 E424F304 */  swc1      $f4, %lo(D_8024F304)($at)
 .L802445EC:
 /* A2E82C 802445EC 02C0202D */  daddu     $a0, $s6, $zero
 /* A2E830 802445F0 0C0B36B0 */  jal       resolve_npc
@@ -62,31 +62,31 @@ glabel func_80244550_A2E790
 /* A2E870 80244630 C4440004 */  lwc1      $f4, 4($v0)
 /* A2E874 80244634 C4400008 */  lwc1      $f0, 8($v0)
 /* A2E878 80244638 C462000C */  lwc1      $f2, 0xc($v1)
-/* A2E87C 8024463C 3C018025 */  lui       $at, 0x8025
-/* A2E880 80244640 E424F308 */  swc1      $f4, -0xcf8($at)
-/* A2E884 80244644 3C018025 */  lui       $at, 0x8025
-/* A2E888 80244648 E420F30C */  swc1      $f0, -0xcf4($at)
-/* A2E88C 8024464C 3C018025 */  lui       $at, 0x8025
-/* A2E890 80244650 E422F310 */  swc1      $f2, -0xcf0($at)
+/* A2E87C 8024463C 3C018025 */  lui       $at, %hi(D_8024F308)
+/* A2E880 80244640 E424F308 */  swc1      $f4, %lo(D_8024F308)($at)
+/* A2E884 80244644 3C018025 */  lui       $at, %hi(D_8024F30C)
+/* A2E888 80244648 E420F30C */  swc1      $f0, %lo(D_8024F30C)($at)
+/* A2E88C 8024464C 3C018025 */  lui       $at, %hi(D_8024F310)
+/* A2E890 80244650 E422F310 */  swc1      $f2, %lo(D_8024F310)($at)
 .L80244654:
 /* A2E894 80244654 0000802D */  daddu     $s0, $zero, $zero
 /* A2E898 80244658 C6820038 */  lwc1      $f2, 0x38($s4)
-/* A2E89C 8024465C 3C018025 */  lui       $at, 0x8025
-/* A2E8A0 80244660 C420F2FC */  lwc1      $f0, -0xd04($at)
-/* A2E8A4 80244664 3C138025 */  lui       $s3, 0x8025
-/* A2E8A8 80244668 2673F358 */  addiu     $s3, $s3, -0xca8
+/* A2E89C 8024465C 3C018025 */  lui       $at, %hi(D_8024F2FC)
+/* A2E8A0 80244660 C420F2FC */  lwc1      $f0, %lo(D_8024F2FC)($at)
+/* A2E8A4 80244664 3C138025 */  lui       $s3, %hi(D_8024F358)
+/* A2E8A8 80244668 2673F358 */  addiu     $s3, $s3, %lo(D_8024F358)
 /* A2E8AC 8024466C 46001501 */  sub.s     $f20, $f2, $f0
 /* A2E8B0 80244670 C682003C */  lwc1      $f2, 0x3c($s4)
-/* A2E8B4 80244674 3C018025 */  lui       $at, 0x8025
-/* A2E8B8 80244678 C420F300 */  lwc1      $f0, -0xd00($at)
-/* A2E8BC 8024467C 3C128025 */  lui       $s2, 0x8025
-/* A2E8C0 80244680 2652F338 */  addiu     $s2, $s2, -0xcc8
+/* A2E8B4 80244674 3C018025 */  lui       $at, %hi(D_8024F300)
+/* A2E8B8 80244678 C420F300 */  lwc1      $f0, %lo(D_8024F300)($at)
+/* A2E8BC 8024467C 3C128025 */  lui       $s2, %hi(D_8024F338)
+/* A2E8C0 80244680 2652F338 */  addiu     $s2, $s2, %lo(D_8024F338)
 /* A2E8C4 80244684 46001581 */  sub.s     $f22, $f2, $f0
 /* A2E8C8 80244688 C6820040 */  lwc1      $f2, 0x40($s4)
-/* A2E8CC 8024468C 3C018025 */  lui       $at, 0x8025
-/* A2E8D0 80244690 C420F304 */  lwc1      $f0, -0xcfc($at)
-/* A2E8D4 80244694 3C118025 */  lui       $s1, 0x8025
-/* A2E8D8 80244698 2631F318 */  addiu     $s1, $s1, -0xce8
+/* A2E8CC 8024468C 3C018025 */  lui       $at, %hi(D_8024F304)
+/* A2E8D0 80244690 C420F304 */  lwc1      $f0, %lo(D_8024F304)($at)
+/* A2E8D4 80244694 3C118025 */  lui       $s1, %hi(D_8024F318)
+/* A2E8D8 80244698 2631F318 */  addiu     $s1, $s1, %lo(D_8024F318)
 /* A2E8DC 8024469C 46001601 */  sub.s     $f24, $f2, $f0
 .L802446A0:
 /* A2E8E0 802446A0 02C0202D */  daddu     $a0, $s6, $zero
@@ -113,16 +113,16 @@ glabel func_80244550_A2E790
 /* A2E934 802446F4 2A020007 */  slti      $v0, $s0, 7
 /* A2E938 802446F8 1440FFE9 */  bnez      $v0, .L802446A0
 /* A2E93C 802446FC 26730004 */   addiu    $s3, $s3, 4
-/* A2E940 80244700 3C018025 */  lui       $at, 0x8025
-/* A2E944 80244704 C420F308 */  lwc1      $f0, -0xcf8($at)
+/* A2E940 80244700 3C018025 */  lui       $at, %hi(D_8024F308)
+/* A2E944 80244704 C420F308 */  lwc1      $f0, %lo(D_8024F308)($at)
 /* A2E948 80244708 46140000 */  add.s     $f0, $f0, $f20
-/* A2E94C 8024470C 3C018025 */  lui       $at, 0x8025
-/* A2E950 80244710 C422F30C */  lwc1      $f2, -0xcf4($at)
+/* A2E94C 8024470C 3C018025 */  lui       $at, %hi(D_8024F30C)
+/* A2E950 80244710 C422F30C */  lwc1      $f2, %lo(D_8024F30C)($at)
 /* A2E954 80244714 8EA2000C */  lw        $v0, 0xc($s5)
 /* A2E958 80244718 46161080 */  add.s     $f2, $f2, $f22
 /* A2E95C 8024471C E4400004 */  swc1      $f0, 4($v0)
-/* A2E960 80244720 3C018025 */  lui       $at, 0x8025
-/* A2E964 80244724 C420F310 */  lwc1      $f0, -0xcf0($at)
+/* A2E960 80244720 3C018025 */  lui       $at, %hi(D_8024F310)
+/* A2E964 80244724 C420F310 */  lwc1      $f0, %lo(D_8024F310)($at)
 /* A2E968 80244728 8EA2000C */  lw        $v0, 0xc($s5)
 /* A2E96C 8024472C 46180000 */  add.s     $f0, $f0, $f24
 /* A2E970 80244730 E4420008 */  swc1      $f2, 8($v0)
diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80244774_A2E9B4.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80244774_A2E9B4.s
index 3896af4eb6..f8cf061aaa 100644
--- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80244774_A2E9B4.s
+++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80244774_A2E9B4.s
@@ -20,18 +20,18 @@ glabel func_80244774_A2E9B4
 /* A2E9F0 802447B0 12200004 */  beqz      $s1, .L802447C4
 /* A2E9F4 802447B4 0040982D */   daddu    $s3, $v0, $zero
 /* A2E9F8 802447B8 C640003C */  lwc1      $f0, 0x3c($s2)
-/* A2E9FC 802447BC 3C018025 */  lui       $at, 0x8025
-/* A2EA00 802447C0 E420F374 */  swc1      $f0, -0xc8c($at)
+/* A2E9FC 802447BC 3C018025 */  lui       $at, %hi(D_8024F374)
+/* A2EA00 802447C0 E420F374 */  swc1      $f0, %lo(D_8024F374)($at)
 .L802447C4:
-/* A2EA04 802447C4 3C018025 */  lui       $at, 0x8025
-/* A2EA08 802447C8 C420F374 */  lwc1      $f0, -0xc8c($at)
+/* A2EA04 802447C4 3C018025 */  lui       $at, %hi(D_8024F374)
+/* A2EA08 802447C8 C420F374 */  lwc1      $f0, %lo(D_8024F374)($at)
 /* A2EA0C 802447CC 24040003 */  addiu     $a0, $zero, 3
 /* A2EA10 802447D0 44050000 */  mfc1      $a1, $f0
 /* A2EA14 802447D4 3C0143FA */  lui       $at, 0x43fa
 /* A2EA18 802447D8 44810000 */  mtc1      $at, $f0
 /* A2EA1C 802447DC 44853000 */  mtc1      $a1, $f6
-/* A2EA20 802447E0 3C108025 */  lui       $s0, 0x8025
-/* A2EA24 802447E4 2610AEC4 */  addiu     $s0, $s0, -0x513c
+/* A2EA20 802447E0 3C108025 */  lui       $s0, %hi(D_8024AEC4)
+/* A2EA24 802447E4 2610AEC4 */  addiu     $s0, $s0, %lo(D_8024AEC4)
 /* A2EA28 802447E8 46003180 */  add.s     $f6, $f6, $f0
 /* A2EA2C 802447EC 3C014220 */  lui       $at, 0x4220
 /* A2EA30 802447F0 4481A000 */  mtc1      $at, $f20
diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_8024486C_A2EAAC.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_8024486C_A2EAAC.s
index 7a86d9279d..ea074e3af1 100644
--- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_8024486C_A2EAAC.s
+++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_8024486C_A2EAAC.s
@@ -13,18 +13,18 @@ glabel func_8024486C_A2EAAC
 /* A2EACC 8024488C 12000004 */  beqz      $s0, .L802448A0
 /* A2EAD0 80244890 0040882D */   daddu    $s1, $v0, $zero
 /* A2EAD4 80244894 C620003C */  lwc1      $f0, 0x3c($s1)
-/* A2EAD8 80244898 3C018025 */  lui       $at, 0x8025
-/* A2EADC 8024489C E420F378 */  swc1      $f0, -0xc88($at)
+/* A2EAD8 80244898 3C018025 */  lui       $at, %hi(D_8024F378)
+/* A2EADC 8024489C E420F378 */  swc1      $f0, %lo(D_8024F378)($at)
 .L802448A0:
-/* A2EAE0 802448A0 3C018025 */  lui       $at, 0x8025
-/* A2EAE4 802448A4 C420F378 */  lwc1      $f0, -0xc88($at)
+/* A2EAE0 802448A0 3C018025 */  lui       $at, %hi(D_8024F378)
+/* A2EAE4 802448A4 C420F378 */  lwc1      $f0, %lo(D_8024F378)($at)
 /* A2EAE8 802448A8 24040003 */  addiu     $a0, $zero, 3
 /* A2EAEC 802448AC 44050000 */  mfc1      $a1, $f0
 /* A2EAF0 802448B0 3C0143FA */  lui       $at, 0x43fa
 /* A2EAF4 802448B4 44810000 */  mtc1      $at, $f0
 /* A2EAF8 802448B8 44852000 */  mtc1      $a1, $f4
-/* A2EAFC 802448BC 3C108025 */  lui       $s0, 0x8025
-/* A2EB00 802448C0 2610AEC8 */  addiu     $s0, $s0, -0x5138
+/* A2EAFC 802448BC 3C108025 */  lui       $s0, %hi(D_8024AEC8)
+/* A2EB00 802448C0 2610AEC8 */  addiu     $s0, $s0, %lo(D_8024AEC8)
 /* A2EB04 802448C4 46002100 */  add.s     $f4, $f4, $f0
 /* A2EB08 802448C8 3C014220 */  lui       $at, 0x4220
 /* A2EB0C 802448CC 4481A000 */  mtc1      $at, $f20
diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/update_heroes_start_turn_A2C264.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/update_heroes_start_turn_A2C264.s
index b1b19cee48..c3caee949d 100644
--- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/update_heroes_start_turn_A2C264.s
+++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/update_heroes_start_turn_A2C264.s
@@ -7,16 +7,16 @@ glabel update_heroes_start_turn_A2C264
 /* A2C26C 8024202C 0080982D */  daddu     $s3, $a0, $zero
 /* A2C270 80242030 0000202D */  daddu     $a0, $zero, $zero
 /* A2C274 80242034 AFB20030 */  sw        $s2, 0x30($sp)
-/* A2C278 80242038 3C128025 */  lui       $s2, 0x8025
-/* A2C27C 8024203C 26529A70 */  addiu     $s2, $s2, -0x6590
+/* A2C278 80242038 3C128025 */  lui       $s2, %hi(D_80249A70)
+/* A2C27C 8024203C 26529A70 */  addiu     $s2, $s2, %lo(D_80249A70)
 /* A2C280 80242040 AFBF0038 */  sw        $ra, 0x38($sp)
 /* A2C284 80242044 AFB1002C */  sw        $s1, 0x2c($sp)
 /* A2C288 80242048 AFB00028 */  sw        $s0, 0x28($sp)
 /* A2C28C 8024204C F7B40040 */  sdc1      $f20, 0x40($sp)
 /* A2C290 80242050 C6400000 */  lwc1      $f0, ($s2)
 /* A2C294 80242054 46800020 */  cvt.s.w   $f0, $f0
-/* A2C298 80242058 3C118025 */  lui       $s1, 0x8025
-/* A2C29C 8024205C 26319A6C */  addiu     $s1, $s1, -0x6594
+/* A2C298 80242058 3C118025 */  lui       $s1, %hi(D_80249A6C)
+/* A2C29C 8024205C 26319A6C */  addiu     $s1, $s1, %lo(D_80249A6C)
 /* A2C2A0 80242060 3C0542F3 */  lui       $a1, 0x42f3
 /* A2C2A4 80242064 34A53333 */  ori       $a1, $a1, 0x3333
 /* A2C2A8 80242068 3C0142B4 */  lui       $at, 0x42b4
@@ -99,8 +99,8 @@ glabel update_heroes_start_turn_A2C264
 /* A2C3DC 8024219C 0C01C34C */  jal       func_80070D30
 /* A2C3E0 802421A0 E7A00018 */   swc1     $f0, 0x18($sp)
 .L802421A4:
-/* A2C3E4 802421A4 3C038025 */  lui       $v1, 0x8025
-/* A2C3E8 802421A8 24639A70 */  addiu     $v1, $v1, -0x6590
+/* A2C3E4 802421A4 3C038025 */  lui       $v1, %hi(D_80249A70)
+/* A2C3E8 802421A8 24639A70 */  addiu     $v1, $v1, %lo(D_80249A70)
 /* A2C3EC 802421AC 8C640000 */  lw        $a0, ($v1)
 /* A2C3F0 802421B0 24840001 */  addiu     $a0, $a0, 1
 /* A2C3F4 802421B4 28820029 */  slti      $v0, $a0, 0x29
diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2EC30/func_802449F0_A2EC30.s b/asm/nonmatchings/world/area_hos/hos_05/A2EC30/func_802449F0_A2EC30.s
index da48d622cf..5175723fd2 100644
--- a/asm/nonmatchings/world/area_hos/hos_05/A2EC30/func_802449F0_A2EC30.s
+++ b/asm/nonmatchings/world/area_hos/hos_05/A2EC30/func_802449F0_A2EC30.s
@@ -3,8 +3,8 @@
 
 glabel func_802449F0_A2EC30
 /* A2EC30 802449F0 27BDFFC8 */  addiu     $sp, $sp, -0x38
-/* A2EC34 802449F4 3C038025 */  lui       $v1, 0x8025
-/* A2EC38 802449F8 2463DA98 */  addiu     $v1, $v1, -0x2568
+/* A2EC34 802449F4 3C038025 */  lui       $v1, %hi(D_8024DA98)
+/* A2EC38 802449F8 2463DA98 */  addiu     $v1, $v1, %lo(D_8024DA98)
 /* A2EC3C 802449FC AFBF0034 */  sw        $ra, 0x34($sp)
 /* A2EC40 80244A00 AFB20030 */  sw        $s2, 0x30($sp)
 /* A2EC44 80244A04 AFB1002C */  sw        $s1, 0x2c($sp)
@@ -19,18 +19,18 @@ glabel func_802449F0_A2EC30
 /* A2EC68 80244A28 8C420000 */  lw        $v0, ($v0)
 /* A2EC6C 80244A2C AC620000 */  sw        $v0, ($v1)
 .L80244A30:
-/* A2EC70 80244A30 3C038025 */  lui       $v1, 0x8025
-/* A2EC74 80244A34 8C63DA90 */  lw        $v1, -0x2570($v1)
+/* A2EC70 80244A30 3C038025 */  lui       $v1, %hi(D_8024DA90)
+/* A2EC74 80244A34 8C63DA90 */  lw        $v1, %lo(D_8024DA90)($v1)
 /* A2EC78 80244A38 2C620005 */  sltiu     $v0, $v1, 5
 /* A2EC7C 80244A3C 10400050 */  beqz      $v0, .L80244B80
 /* A2EC80 80244A40 00031080 */   sll      $v0, $v1, 2
-/* A2EC84 80244A44 3C018025 */  lui       $at, 0x8025
+/* A2EC84 80244A44 3C018025 */  lui       $at, %hi(D_8024F260)
 /* A2EC88 80244A48 00220821 */  addu      $at, $at, $v0
-/* A2EC8C 80244A4C 8C22F260 */  lw        $v0, -0xda0($at)
+/* A2EC8C 80244A4C 8C22F260 */  lw        $v0, %lo(D_8024F260)($at)
 /* A2EC90 80244A50 00400008 */  jr        $v0
 /* A2EC94 80244A54 00000000 */   nop      
-/* A2EC98 80244A58 3C048025 */  lui       $a0, 0x8025
-/* A2EC9C 80244A5C 8C84DA98 */  lw        $a0, -0x2568($a0)
+/* A2EC98 80244A58 3C048025 */  lui       $a0, %hi(D_8024DA98)
+/* A2EC9C 80244A5C 8C84DA98 */  lw        $a0, %lo(D_8024DA98)($a0)
 /* A2ECA0 80244A60 8C830000 */  lw        $v1, ($a0)
 /* A2ECA4 80244A64 2402FFFF */  addiu     $v0, $zero, -1
 /* A2ECA8 80244A68 14620004 */  bne       $v1, $v0, .L80244A7C
@@ -39,8 +39,8 @@ glabel func_802449F0_A2EC30
 /* A2ECB4 80244A74 080912AB */  j         .L80244AAC
 /* A2ECB8 80244A78 00000000 */   nop      
 .L80244A7C:
-/* A2ECBC 80244A7C 3C038025 */  lui       $v1, 0x8025
-/* A2ECC0 80244A80 2463DA94 */  addiu     $v1, $v1, -0x256c
+/* A2ECBC 80244A7C 3C038025 */  lui       $v1, %hi(D_8024DA94)
+/* A2ECC0 80244A80 2463DA94 */  addiu     $v1, $v1, %lo(D_8024DA94)
 /* A2ECC4 80244A84 8C620000 */  lw        $v0, ($v1)
 /* A2ECC8 80244A88 2442000A */  addiu     $v0, $v0, 0xa
 /* A2ECCC 80244A8C AC620000 */  sw        $v0, ($v1)
@@ -52,30 +52,30 @@ glabel func_802449F0_A2EC30
 /* A2ECE4 80244AA4 8C830004 */  lw        $v1, 4($a0)
 /* A2ECE8 80244AA8 24020001 */  addiu     $v0, $zero, 1
 .L80244AAC:
-/* A2ECEC 80244AAC 3C018025 */  lui       $at, 0x8025
-/* A2ECF0 80244AB0 AC22DA90 */  sw        $v0, -0x2570($at)
-/* A2ECF4 80244AB4 3C018025 */  lui       $at, 0x8025
-/* A2ECF8 80244AB8 AC23F570 */  sw        $v1, -0xa90($at)
+/* A2ECEC 80244AAC 3C018025 */  lui       $at, %hi(D_8024DA90)
+/* A2ECF0 80244AB0 AC22DA90 */  sw        $v0, %lo(D_8024DA90)($at)
+/* A2ECF4 80244AB4 3C018025 */  lui       $at, %hi(D_8024F570)
+/* A2ECF8 80244AB8 AC23F570 */  sw        $v1, %lo(D_8024F570)($at)
 /* A2ECFC 80244ABC 080912E1 */  j         .L80244B84
 /* A2ED00 80244AC0 24040001 */   addiu    $a0, $zero, 1
-/* A2ED04 80244AC4 3C038025 */  lui       $v1, 0x8025
-/* A2ED08 80244AC8 2463F570 */  addiu     $v1, $v1, -0xa90
+/* A2ED04 80244AC4 3C038025 */  lui       $v1, %hi(D_8024F570)
+/* A2ED08 80244AC8 2463F570 */  addiu     $v1, $v1, %lo(D_8024F570)
 /* A2ED0C 80244ACC 8C620000 */  lw        $v0, ($v1)
 /* A2ED10 80244AD0 1440001B */  bnez      $v0, .L80244B40
 /* A2ED14 80244AD4 2442FFFF */   addiu    $v0, $v0, -1
 /* A2ED18 80244AD8 24020002 */  addiu     $v0, $zero, 2
-/* A2ED1C 80244ADC 3C018025 */  lui       $at, 0x8025
-/* A2ED20 80244AE0 AC22DA90 */  sw        $v0, -0x2570($at)
+/* A2ED1C 80244ADC 3C018025 */  lui       $at, %hi(D_8024DA90)
+/* A2ED20 80244AE0 AC22DA90 */  sw        $v0, %lo(D_8024DA90)($at)
 /* A2ED24 80244AE4 080912E1 */  j         .L80244B84
 /* A2ED28 80244AE8 24040001 */   addiu    $a0, $zero, 1
-/* A2ED2C 80244AEC 3C048025 */  lui       $a0, 0x8025
-/* A2ED30 80244AF0 2484DA94 */  addiu     $a0, $a0, -0x256c
+/* A2ED2C 80244AEC 3C048025 */  lui       $a0, %hi(D_8024DA94)
+/* A2ED30 80244AF0 2484DA94 */  addiu     $a0, $a0, %lo(D_8024DA94)
 /* A2ED34 80244AF4 8C820000 */  lw        $v0, ($a0)
 /* A2ED38 80244AF8 2442FFF6 */  addiu     $v0, $v0, -0xa
 /* A2ED3C 80244AFC 04410020 */  bgez      $v0, .L80244B80
 /* A2ED40 80244B00 AC820000 */   sw       $v0, ($a0)
-/* A2ED44 80244B04 3C028025 */  lui       $v0, 0x8025
-/* A2ED48 80244B08 2442DA98 */  addiu     $v0, $v0, -0x2568
+/* A2ED44 80244B04 3C028025 */  lui       $v0, %hi(D_8024DA98)
+/* A2ED48 80244B08 2442DA98 */  addiu     $v0, $v0, %lo(D_8024DA98)
 /* A2ED4C 80244B0C 8C430000 */  lw        $v1, ($v0)
 /* A2ED50 80244B10 AC800000 */  sw        $zero, ($a0)
 /* A2ED54 80244B14 8C640008 */  lw        $a0, 8($v1)
@@ -84,8 +84,8 @@ glabel func_802449F0_A2EC30
 /* A2ED60 80244B20 AC430000 */   sw       $v1, ($v0)
 /* A2ED64 80244B24 080912DE */  j         .L80244B78
 /* A2ED68 80244B28 00000000 */   nop      
-/* A2ED6C 80244B2C 3C038025 */  lui       $v1, 0x8025
-/* A2ED70 80244B30 2463F570 */  addiu     $v1, $v1, -0xa90
+/* A2ED6C 80244B2C 3C038025 */  lui       $v1, %hi(D_8024F570)
+/* A2ED70 80244B30 2463F570 */  addiu     $v1, $v1, %lo(D_8024F570)
 /* A2ED74 80244B34 8C620000 */  lw        $v0, ($v1)
 /* A2ED78 80244B38 10400003 */  beqz      $v0, .L80244B48
 /* A2ED7C 80244B3C 2442FFFF */   addiu    $v0, $v0, -1
@@ -93,8 +93,8 @@ glabel func_802449F0_A2EC30
 /* A2ED80 80244B40 080912E0 */  j         .L80244B80
 /* A2ED84 80244B44 AC620000 */   sw       $v0, ($v1)
 .L80244B48:
-/* A2ED88 80244B48 3C028025 */  lui       $v0, 0x8025
-/* A2ED8C 80244B4C 2442DA98 */  addiu     $v0, $v0, -0x2568
+/* A2ED88 80244B48 3C028025 */  lui       $v0, %hi(D_8024DA98)
+/* A2ED8C 80244B4C 2442DA98 */  addiu     $v0, $v0, %lo(D_8024DA98)
 /* A2ED90 80244B50 8C430000 */  lw        $v1, ($v0)
 /* A2ED94 80244B54 8C640008 */  lw        $a0, 8($v1)
 /* A2ED98 80244B58 24630008 */  addiu     $v1, $v1, 8
@@ -102,13 +102,13 @@ glabel func_802449F0_A2EC30
 /* A2EDA0 80244B60 AC430000 */   sw       $v1, ($v0)
 .L80244B64:
 /* A2EDA4 80244B64 24020003 */  addiu     $v0, $zero, 3
-/* A2EDA8 80244B68 3C018025 */  lui       $at, 0x8025
-/* A2EDAC 80244B6C AC22DA90 */  sw        $v0, -0x2570($at)
+/* A2EDA8 80244B68 3C018025 */  lui       $at, %hi(D_8024DA90)
+/* A2EDAC 80244B6C AC22DA90 */  sw        $v0, %lo(D_8024DA90)($at)
 /* A2EDB0 80244B70 080912E1 */  j         .L80244B84
 /* A2EDB4 80244B74 24040001 */   addiu    $a0, $zero, 1
 .L80244B78:
-/* A2EDB8 80244B78 3C018025 */  lui       $at, 0x8025
-/* A2EDBC 80244B7C AC20DA90 */  sw        $zero, -0x2570($at)
+/* A2EDB8 80244B78 3C018025 */  lui       $at, %hi(D_8024DA90)
+/* A2EDBC 80244B7C AC20DA90 */  sw        $zero, %lo(D_8024DA90)($at)
 .L80244B80:
 /* A2EDC0 80244B80 24040001 */  addiu     $a0, $zero, 1
 .L80244B84:
@@ -125,8 +125,8 @@ glabel func_802449F0_A2EC30
 /* A2EDEC 80244BAC 44812000 */  mtc1      $at, $f4
 /* A2EDF0 80244BB0 00000000 */  nop       
 /* A2EDF4 80244BB4 46022081 */  sub.s     $f2, $f4, $f2
-/* A2EDF8 80244BB8 3C018025 */  lui       $at, 0x8025
-/* A2EDFC 80244BBC C420DA94 */  lwc1      $f0, -0x256c($at)
+/* A2EDF8 80244BB8 3C018025 */  lui       $at, %hi(D_8024DA94)
+/* A2EDFC 80244BBC C420DA94 */  lwc1      $f0, %lo(D_8024DA94)($at)
 /* A2EE00 80244BC0 46800020 */  cvt.s.w   $f0, $f0
 /* A2EE04 80244BC4 46020002 */  mul.s     $f0, $f0, $f2
 /* A2EE08 80244BC8 00000000 */  nop       
@@ -141,8 +141,8 @@ glabel func_802449F0_A2EC30
 /* A2EE2C 80244BEC 00000000 */  nop       
 /* A2EE30 80244BF0 1A200015 */  blez      $s1, .L80244C48
 /* A2EE34 80244BF4 00000000 */   nop      
-/* A2EE38 80244BF8 3C128025 */  lui       $s2, 0x8025
-/* A2EE3C 80244BFC 2652DA98 */  addiu     $s2, $s2, -0x2568
+/* A2EE38 80244BF8 3C128025 */  lui       $s2, %hi(D_8024DA98)
+/* A2EE3C 80244BFC 2652DA98 */  addiu     $s2, $s2, %lo(D_8024DA98)
 /* A2EE40 80244C00 8E420000 */  lw        $v0, ($s2)
 /* A2EE44 80244C04 8C440000 */  lw        $a0, ($v0)
 /* A2EE48 80244C08 1080000F */  beqz      $a0, .L80244C48
diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2EC30/func_80244C8C_A2EECC.s b/asm/nonmatchings/world/area_hos/hos_05/A2EC30/func_80244C8C_A2EECC.s
index 7b7898e746..111d9bf828 100644
--- a/asm/nonmatchings/world/area_hos/hos_05/A2EC30/func_80244C8C_A2EECC.s
+++ b/asm/nonmatchings/world/area_hos/hos_05/A2EC30/func_80244C8C_A2EECC.s
@@ -6,9 +6,9 @@ glabel func_80244C8C_A2EECC
 /* A2EED0 80244C90 AFBF0010 */  sw        $ra, 0x10($sp)
 /* A2EED4 80244C94 0C090C40 */  jal       func_80243100_A2D340
 /* A2EED8 80244C98 00000000 */   nop      
-/* A2EEDC 80244C9C 3C048025 */  lui       $a0, 0x8025
+/* A2EEDC 80244C9C 3C048025 */  lui       $a0, %hi(D_8024DBCC)
 /* A2EEE0 80244CA0 0C09127C */  jal       func_802449F0_A2EC30
-/* A2EEE4 80244CA4 2484DBCC */   addiu    $a0, $a0, -0x2434
+/* A2EEE4 80244CA4 2484DBCC */   addiu    $a0, $a0, %lo(D_8024DBCC)
 /* A2EEE8 80244CA8 8FBF0010 */  lw        $ra, 0x10($sp)
 /* A2EEEC 80244CAC 03E00008 */  jr        $ra
 /* A2EEF0 80244CB0 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_802452C4_A2F504.s b/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_802452C4_A2F504.s
index 6f76767a28..213a614b51 100644
--- a/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_802452C4_A2F504.s
+++ b/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_802452C4_A2F504.s
@@ -9,77 +9,77 @@ glabel func_802452C4_A2F504
 /* A2F514 802452D4 AFB00018 */  sw        $s0, 0x18($sp)
 /* A2F518 802452D8 10A0003B */  beqz      $a1, .L802453C8
 /* A2F51C 802452DC 8E30000C */   lw       $s0, 0xc($s1)
-/* A2F520 802452E0 3C048025 */  lui       $a0, 0x8025
-/* A2F524 802452E4 2484F580 */  addiu     $a0, $a0, -0xa80
-/* A2F528 802452E8 3C058025 */  lui       $a1, 0x8025
-/* A2F52C 802452EC 24A5F581 */  addiu     $a1, $a1, -0xa7f
-/* A2F530 802452F0 3C068025 */  lui       $a2, 0x8025
-/* A2F534 802452F4 24C6F582 */  addiu     $a2, $a2, -0xa7e
-/* A2F538 802452F8 3C078025 */  lui       $a3, 0x8025
-/* A2F53C 802452FC 24E7F583 */  addiu     $a3, $a3, -0xa7d
-/* A2F540 80245300 3C028025 */  lui       $v0, 0x8025
-/* A2F544 80245304 2442F584 */  addiu     $v0, $v0, -0xa7c
+/* A2F520 802452E0 3C048025 */  lui       $a0, %hi(D_8024F580)
+/* A2F524 802452E4 2484F580 */  addiu     $a0, $a0, %lo(D_8024F580)
+/* A2F528 802452E8 3C058025 */  lui       $a1, %hi(D_8024F581)
+/* A2F52C 802452EC 24A5F581 */  addiu     $a1, $a1, %lo(D_8024F581)
+/* A2F530 802452F0 3C068025 */  lui       $a2, %hi(D_8024F582)
+/* A2F534 802452F4 24C6F582 */  addiu     $a2, $a2, %lo(D_8024F582)
+/* A2F538 802452F8 3C078025 */  lui       $a3, %hi(D_8024F583)
+/* A2F53C 802452FC 24E7F583 */  addiu     $a3, $a3, %lo(D_8024F583)
+/* A2F540 80245300 3C028025 */  lui       $v0, %hi(D_8024F584)
+/* A2F544 80245304 2442F584 */  addiu     $v0, $v0, %lo(D_8024F584)
 /* A2F548 80245308 AFA20010 */  sw        $v0, 0x10($sp)
-/* A2F54C 8024530C 3C028025 */  lui       $v0, 0x8025
-/* A2F550 80245310 2442F585 */  addiu     $v0, $v0, -0xa7b
+/* A2F54C 8024530C 3C028025 */  lui       $v0, %hi(D_8024F585)
+/* A2F550 80245310 2442F585 */  addiu     $v0, $v0, %lo(D_8024F585)
 /* A2F554 80245314 0C046FF5 */  jal       func_8011BFD4
 /* A2F558 80245318 AFA20014 */   sw       $v0, 0x14($sp)
 /* A2F55C 8024531C 8E050000 */  lw        $a1, ($s0)
 /* A2F560 80245320 26100004 */  addiu     $s0, $s0, 4
 /* A2F564 80245324 0C0B1EAF */  jal       get_variable
 /* A2F568 80245328 0220202D */   daddu    $a0, $s1, $zero
-/* A2F56C 8024532C 3C018025 */  lui       $at, 0x8025
-/* A2F570 80245330 AC22F588 */  sw        $v0, -0xa78($at)
+/* A2F56C 8024532C 3C018025 */  lui       $at, %hi(D_8024F588)
+/* A2F570 80245330 AC22F588 */  sw        $v0, %lo(D_8024F588)($at)
 /* A2F574 80245334 8E050000 */  lw        $a1, ($s0)
 /* A2F578 80245338 26100004 */  addiu     $s0, $s0, 4
 /* A2F57C 8024533C 0C0B1EAF */  jal       get_variable
 /* A2F580 80245340 0220202D */   daddu    $a0, $s1, $zero
-/* A2F584 80245344 3C018025 */  lui       $at, 0x8025
-/* A2F588 80245348 AC22F58C */  sw        $v0, -0xa74($at)
+/* A2F584 80245344 3C018025 */  lui       $at, %hi(D_8024F58C)
+/* A2F588 80245348 AC22F58C */  sw        $v0, %lo(D_8024F58C)($at)
 /* A2F58C 8024534C 8E050000 */  lw        $a1, ($s0)
 /* A2F590 80245350 26100004 */  addiu     $s0, $s0, 4
 /* A2F594 80245354 0C0B1EAF */  jal       get_variable
 /* A2F598 80245358 0220202D */   daddu    $a0, $s1, $zero
-/* A2F59C 8024535C 3C018025 */  lui       $at, 0x8025
-/* A2F5A0 80245360 AC22F590 */  sw        $v0, -0xa70($at)
+/* A2F59C 8024535C 3C018025 */  lui       $at, %hi(D_8024F590)
+/* A2F5A0 80245360 AC22F590 */  sw        $v0, %lo(D_8024F590)($at)
 /* A2F5A4 80245364 8E050000 */  lw        $a1, ($s0)
 /* A2F5A8 80245368 26100004 */  addiu     $s0, $s0, 4
 /* A2F5AC 8024536C 0C0B1EAF */  jal       get_variable
 /* A2F5B0 80245370 0220202D */   daddu    $a0, $s1, $zero
-/* A2F5B4 80245374 3C018025 */  lui       $at, 0x8025
-/* A2F5B8 80245378 AC22F594 */  sw        $v0, -0xa6c($at)
+/* A2F5B4 80245374 3C018025 */  lui       $at, %hi(D_8024F594)
+/* A2F5B8 80245378 AC22F594 */  sw        $v0, %lo(D_8024F594)($at)
 /* A2F5BC 8024537C 8E050000 */  lw        $a1, ($s0)
 /* A2F5C0 80245380 26100004 */  addiu     $s0, $s0, 4
 /* A2F5C4 80245384 0C0B1EAF */  jal       get_variable
 /* A2F5C8 80245388 0220202D */   daddu    $a0, $s1, $zero
-/* A2F5CC 8024538C 3C018025 */  lui       $at, 0x8025
-/* A2F5D0 80245390 AC22F598 */  sw        $v0, -0xa68($at)
+/* A2F5CC 8024538C 3C018025 */  lui       $at, %hi(D_8024F598)
+/* A2F5D0 80245390 AC22F598 */  sw        $v0, %lo(D_8024F598)($at)
 /* A2F5D4 80245394 8E050000 */  lw        $a1, ($s0)
 /* A2F5D8 80245398 26100004 */  addiu     $s0, $s0, 4
 /* A2F5DC 8024539C 0C0B1EAF */  jal       get_variable
 /* A2F5E0 802453A0 0220202D */   daddu    $a0, $s1, $zero
-/* A2F5E4 802453A4 3C018025 */  lui       $at, 0x8025
-/* A2F5E8 802453A8 AC22F59C */  sw        $v0, -0xa64($at)
+/* A2F5E4 802453A4 3C018025 */  lui       $at, %hi(D_8024F59C)
+/* A2F5E8 802453A8 AC22F59C */  sw        $v0, %lo(D_8024F59C)($at)
 /* A2F5EC 802453AC 8E050000 */  lw        $a1, ($s0)
 /* A2F5F0 802453B0 0C0B1EAF */  jal       get_variable
 /* A2F5F4 802453B4 0220202D */   daddu    $a0, $s1, $zero
-/* A2F5F8 802453B8 3C018025 */  lui       $at, 0x8025
-/* A2F5FC 802453BC AC22F5A0 */  sw        $v0, -0xa60($at)
-/* A2F600 802453C0 3C018025 */  lui       $at, 0x8025
-/* A2F604 802453C4 AC20F5A4 */  sw        $zero, -0xa5c($at)
+/* A2F5F8 802453B8 3C018025 */  lui       $at, %hi(D_8024F5A0)
+/* A2F5FC 802453BC AC22F5A0 */  sw        $v0, %lo(D_8024F5A0)($at)
+/* A2F600 802453C0 3C018025 */  lui       $at, %hi(D_8024F5A4)
+/* A2F604 802453C4 AC20F5A4 */  sw        $zero, %lo(D_8024F5A4)($at)
 .L802453C8:
-/* A2F608 802453C8 3C118025 */  lui       $s1, 0x8025
-/* A2F60C 802453CC 2631F5A0 */  addiu     $s1, $s1, -0xa60
+/* A2F608 802453C8 3C118025 */  lui       $s1, %hi(D_8024F5A0)
+/* A2F60C 802453CC 2631F5A0 */  addiu     $s1, $s1, %lo(D_8024F5A0)
 /* A2F610 802453D0 8E2F0000 */  lw        $t7, ($s1)
 /* A2F614 802453D4 19E00088 */  blez      $t7, .L802455F8
 /* A2F618 802453D8 00000000 */   nop      
-/* A2F61C 802453DC 3C108025 */  lui       $s0, 0x8025
-/* A2F620 802453E0 2610F5A4 */  addiu     $s0, $s0, -0xa5c
+/* A2F61C 802453DC 3C108025 */  lui       $s0, %hi(D_8024F5A4)
+/* A2F620 802453E0 2610F5A4 */  addiu     $s0, $s0, %lo(D_8024F5A4)
 /* A2F624 802453E4 8E030000 */  lw        $v1, ($s0)
-/* A2F628 802453E8 3C048025 */  lui       $a0, 0x8025
-/* A2F62C 802453EC 9084F580 */  lbu       $a0, -0xa80($a0)
-/* A2F630 802453F0 3C028025 */  lui       $v0, 0x8025
-/* A2F634 802453F4 8C42F588 */  lw        $v0, -0xa78($v0)
+/* A2F628 802453E8 3C048025 */  lui       $a0, %hi(D_8024F580)
+/* A2F62C 802453EC 9084F580 */  lbu       $a0, %lo(D_8024F580)($a0)
+/* A2F630 802453F0 3C028025 */  lui       $v0, %hi(D_8024F588)
+/* A2F634 802453F4 8C42F588 */  lw        $v0, %lo(D_8024F588)($v0)
 /* A2F638 802453F8 24630001 */  addiu     $v1, $v1, 1
 /* A2F63C 802453FC 00441023 */  subu      $v0, $v0, $a0
 /* A2F640 80245400 00430018 */  mult      $v0, $v1
@@ -97,10 +97,10 @@ glabel func_802452C4_A2F504
 /* A2F66C 8024542C 0006000D */  break     6
 .L80245430:
 /* A2F670 80245430 00007012 */   mflo     $t6
-/* A2F674 80245434 3C058025 */  lui       $a1, 0x8025
-/* A2F678 80245438 90A5F581 */  lbu       $a1, -0xa7f($a1)
-/* A2F67C 8024543C 3C028025 */  lui       $v0, 0x8025
-/* A2F680 80245440 8C42F58C */  lw        $v0, -0xa74($v0)
+/* A2F674 80245434 3C058025 */  lui       $a1, %hi(D_8024F581)
+/* A2F678 80245438 90A5F581 */  lbu       $a1, %lo(D_8024F581)($a1)
+/* A2F67C 8024543C 3C028025 */  lui       $v0, %hi(D_8024F58C)
+/* A2F680 80245440 8C42F58C */  lw        $v0, %lo(D_8024F58C)($v0)
 /* A2F684 80245444 00451023 */  subu      $v0, $v0, $a1
 /* A2F688 80245448 00430018 */  mult      $v0, $v1
 /* A2F68C 8024544C 00004012 */  mflo      $t0
@@ -117,10 +117,10 @@ glabel func_802452C4_A2F504
 /* A2F6B4 80245474 0006000D */  break     6
 .L80245478:
 /* A2F6B8 80245478 00006812 */   mflo     $t5
-/* A2F6BC 8024547C 3C068025 */  lui       $a2, 0x8025
-/* A2F6C0 80245480 90C6F582 */  lbu       $a2, -0xa7e($a2)
-/* A2F6C4 80245484 3C028025 */  lui       $v0, 0x8025
-/* A2F6C8 80245488 8C42F590 */  lw        $v0, -0xa70($v0)
+/* A2F6BC 8024547C 3C068025 */  lui       $a2, %hi(D_8024F582)
+/* A2F6C0 80245480 90C6F582 */  lbu       $a2, %lo(D_8024F582)($a2)
+/* A2F6C4 80245484 3C028025 */  lui       $v0, %hi(D_8024F590)
+/* A2F6C8 80245488 8C42F590 */  lw        $v0, %lo(D_8024F590)($v0)
 /* A2F6CC 8024548C 00461023 */  subu      $v0, $v0, $a2
 /* A2F6D0 80245490 00430018 */  mult      $v0, $v1
 /* A2F6D4 80245494 00004012 */  mflo      $t0
@@ -137,10 +137,10 @@ glabel func_802452C4_A2F504
 /* A2F6FC 802454BC 0006000D */  break     6
 .L802454C0:
 /* A2F700 802454C0 00006012 */   mflo     $t4
-/* A2F704 802454C4 3C078025 */  lui       $a3, 0x8025
-/* A2F708 802454C8 90E7F583 */  lbu       $a3, -0xa7d($a3)
-/* A2F70C 802454CC 3C028025 */  lui       $v0, 0x8025
-/* A2F710 802454D0 8C42F594 */  lw        $v0, -0xa6c($v0)
+/* A2F704 802454C4 3C078025 */  lui       $a3, %hi(D_8024F583)
+/* A2F708 802454C8 90E7F583 */  lbu       $a3, %lo(D_8024F583)($a3)
+/* A2F70C 802454CC 3C028025 */  lui       $v0, %hi(D_8024F594)
+/* A2F710 802454D0 8C42F594 */  lw        $v0, %lo(D_8024F594)($v0)
 /* A2F714 802454D4 00471023 */  subu      $v0, $v0, $a3
 /* A2F718 802454D8 00430018 */  mult      $v0, $v1
 /* A2F71C 802454DC 00004012 */  mflo      $t0
@@ -157,10 +157,10 @@ glabel func_802452C4_A2F504
 /* A2F744 80245504 0006000D */  break     6
 .L80245508:
 /* A2F748 80245508 00005812 */   mflo     $t3
-/* A2F74C 8024550C 3C098025 */  lui       $t1, 0x8025
-/* A2F750 80245510 9129F584 */  lbu       $t1, -0xa7c($t1)
-/* A2F754 80245514 3C028025 */  lui       $v0, 0x8025
-/* A2F758 80245518 8C42F598 */  lw        $v0, -0xa68($v0)
+/* A2F74C 8024550C 3C098025 */  lui       $t1, %hi(D_8024F584)
+/* A2F750 80245510 9129F584 */  lbu       $t1, %lo(D_8024F584)($t1)
+/* A2F754 80245514 3C028025 */  lui       $v0, %hi(D_8024F598)
+/* A2F758 80245518 8C42F598 */  lw        $v0, %lo(D_8024F598)($v0)
 /* A2F75C 8024551C 00491023 */  subu      $v0, $v0, $t1
 /* A2F760 80245520 00430018 */  mult      $v0, $v1
 /* A2F764 80245524 00004012 */  mflo      $t0
@@ -177,10 +177,10 @@ glabel func_802452C4_A2F504
 /* A2F78C 8024554C 0006000D */  break     6
 .L80245550:
 /* A2F790 80245550 00005012 */   mflo     $t2
-/* A2F794 80245554 3C088025 */  lui       $t0, 0x8025
-/* A2F798 80245558 9108F585 */  lbu       $t0, -0xa7b($t0)
-/* A2F79C 8024555C 3C028025 */  lui       $v0, 0x8025
-/* A2F7A0 80245560 8C42F59C */  lw        $v0, -0xa64($v0)
+/* A2F794 80245554 3C088025 */  lui       $t0, %hi(D_8024F585)
+/* A2F798 80245558 9108F585 */  lbu       $t0, %lo(D_8024F585)($t0)
+/* A2F79C 8024555C 3C028025 */  lui       $v0, %hi(D_8024F59C)
+/* A2F7A0 80245560 8C42F59C */  lw        $v0, %lo(D_8024F59C)($v0)
 /* A2F7A4 80245564 00481023 */  subu      $v0, $v0, $t0
 /* A2F7A8 80245568 00430018 */  mult      $v0, $v1
 /* A2F7AC 8024556C 0000C812 */  mflo      $t9
@@ -221,18 +221,18 @@ glabel func_802452C4_A2F504
 /* A2F830 802455F0 0809158E */  j         .L80245638
 /* A2F834 802455F4 24020002 */   addiu    $v0, $zero, 2
 .L802455F8:
-/* A2F838 802455F8 3C028025 */  lui       $v0, 0x8025
-/* A2F83C 802455FC 9042F59B */  lbu       $v0, -0xa65($v0)
-/* A2F840 80245600 3C048025 */  lui       $a0, 0x8025
-/* A2F844 80245604 9084F58B */  lbu       $a0, -0xa75($a0)
-/* A2F848 80245608 3C058025 */  lui       $a1, 0x8025
-/* A2F84C 8024560C 90A5F58F */  lbu       $a1, -0xa71($a1)
-/* A2F850 80245610 3C068025 */  lui       $a2, 0x8025
-/* A2F854 80245614 90C6F593 */  lbu       $a2, -0xa6d($a2)
-/* A2F858 80245618 3C078025 */  lui       $a3, 0x8025
-/* A2F85C 8024561C 90E7F597 */  lbu       $a3, -0xa69($a3)
-/* A2F860 80245620 3C038025 */  lui       $v1, 0x8025
-/* A2F864 80245624 9063F59F */  lbu       $v1, -0xa61($v1)
+/* A2F838 802455F8 3C028025 */  lui       $v0, %hi(D_8024F59B)
+/* A2F83C 802455FC 9042F59B */  lbu       $v0, %lo(D_8024F59B)($v0)
+/* A2F840 80245600 3C048025 */  lui       $a0, %hi(D_8024F58B)
+/* A2F844 80245604 9084F58B */  lbu       $a0, %lo(D_8024F58B)($a0)
+/* A2F848 80245608 3C058025 */  lui       $a1, %hi(D_8024F58F)
+/* A2F84C 8024560C 90A5F58F */  lbu       $a1, %lo(D_8024F58F)($a1)
+/* A2F850 80245610 3C068025 */  lui       $a2, %hi(D_8024F593)
+/* A2F854 80245614 90C6F593 */  lbu       $a2, %lo(D_8024F593)($a2)
+/* A2F858 80245618 3C078025 */  lui       $a3, %hi(D_8024F597)
+/* A2F85C 8024561C 90E7F597 */  lbu       $a3, %lo(D_8024F597)($a3)
+/* A2F860 80245620 3C038025 */  lui       $v1, %hi(D_8024F59F)
+/* A2F864 80245624 9063F59F */  lbu       $v1, %lo(D_8024F59F)($v1)
 /* A2F868 80245628 AFA20010 */  sw        $v0, 0x10($sp)
 /* A2F86C 8024562C 0C046FE6 */  jal       func_8011BF98
 /* A2F870 80245630 AFA30014 */   sw       $v1, 0x14($sp)
diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_8024564C_A2F88C.s b/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_8024564C_A2F88C.s
index 6298ca2002..c193a74319 100644
--- a/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_8024564C_A2F88C.s
+++ b/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_8024564C_A2F88C.s
@@ -5,8 +5,8 @@ glabel func_8024564C_A2F88C
 /* A2F88C 8024564C 3C06FC12 */  lui       $a2, 0xfc12
 /* A2F890 80245650 34C61624 */  ori       $a2, $a2, 0x1624
 /* A2F894 80245654 3C05FF2F */  lui       $a1, 0xff2f
-/* A2F898 80245658 3C04800A */  lui       $a0, 0x800a
-/* A2F89C 8024565C 2484A66C */  addiu     $a0, $a0, -0x5994
+/* A2F898 80245658 3C04800A */  lui       $a0, %hi(D_8009A66C)
+/* A2F89C 8024565C 2484A66C */  addiu     $a0, $a0, %lo(D_8009A66C)
 /* A2F8A0 80245660 8C820000 */  lw        $v0, ($a0)
 /* A2F8A4 80245664 34A5FFFF */  ori       $a1, $a1, 0xffff
 /* A2F8A8 80245668 0040182D */  daddu     $v1, $v0, $zero
@@ -16,8 +16,8 @@ glabel func_8024564C_A2F88C
 /* A2F8B8 80245678 AC650004 */  sw        $a1, 4($v1)
 /* A2F8BC 8024567C 24430008 */  addiu     $v1, $v0, 8
 /* A2F8C0 80245680 AC830000 */  sw        $v1, ($a0)
-/* A2F8C4 80245684 3C04802E */  lui       $a0, 0x802e
-/* A2F8C8 80245688 90849D73 */  lbu       $a0, -0x628d($a0)
+/* A2F8C4 80245684 3C04802E */  lui       $a0, %hi(D_802D9D73)
+/* A2F8C8 80245688 90849D73 */  lbu       $a0, %lo(D_802D9D73)($a0)
 /* A2F8CC 8024568C 3C03FA00 */  lui       $v1, 0xfa00
 /* A2F8D0 80245690 AC430000 */  sw        $v1, ($v0)
 /* A2F8D4 80245694 03E00008 */  jr        $ra
diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_8024569C_A2F8DC.s b/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_8024569C_A2F8DC.s
index 3cbce8492a..1c84ca3516 100644
--- a/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_8024569C_A2F8DC.s
+++ b/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_8024569C_A2F8DC.s
@@ -8,8 +8,8 @@ glabel func_8024569C_A2F8DC
 /* A2F8E8 802456A8 0C0B1EAF */  jal       get_variable
 /* A2F8EC 802456AC 8C450000 */   lw       $a1, ($v0)
 /* A2F8F0 802456B0 8FBF0010 */  lw        $ra, 0x10($sp)
-/* A2F8F4 802456B4 3C01802E */  lui       $at, 0x802e
-/* A2F8F8 802456B8 A4229D72 */  sh        $v0, -0x628e($at)
+/* A2F8F4 802456B4 3C01802E */  lui       $at, %hi(D_802D9D72)
+/* A2F8F8 802456B8 A4229D72 */  sh        $v0, %lo(D_802D9D72)($at)
 /* A2F8FC 802456BC 24020002 */  addiu     $v0, $zero, 2
 /* A2F900 802456C0 03E00008 */  jr        $ra
 /* A2F904 802456C4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_802456C8_A2F908.s b/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_802456C8_A2F908.s
index d1147f2bab..8c1d4dacf7 100644
--- a/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_802456C8_A2F908.s
+++ b/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_802456C8_A2F908.s
@@ -5,8 +5,8 @@ glabel func_802456C8_A2F908
 /* A2F908 802456C8 3C06FC12 */  lui       $a2, 0xfc12
 /* A2F90C 802456CC 34C61624 */  ori       $a2, $a2, 0x1624
 /* A2F910 802456D0 3C05FF2F */  lui       $a1, 0xff2f
-/* A2F914 802456D4 3C04800A */  lui       $a0, 0x800a
-/* A2F918 802456D8 2484A66C */  addiu     $a0, $a0, -0x5994
+/* A2F914 802456D4 3C04800A */  lui       $a0, %hi(D_8009A66C)
+/* A2F918 802456D8 2484A66C */  addiu     $a0, $a0, %lo(D_8009A66C)
 /* A2F91C 802456DC 8C820000 */  lw        $v0, ($a0)
 /* A2F920 802456E0 34A5FFFF */  ori       $a1, $a1, 0xffff
 /* A2F924 802456E4 0040182D */  daddu     $v1, $v0, $zero
@@ -16,8 +16,8 @@ glabel func_802456C8_A2F908
 /* A2F934 802456F4 AC650004 */  sw        $a1, 4($v1)
 /* A2F938 802456F8 24430008 */  addiu     $v1, $v0, 8
 /* A2F93C 802456FC AC830000 */  sw        $v1, ($a0)
-/* A2F940 80245700 3C048025 */  lui       $a0, 0x8025
-/* A2F944 80245704 9084DCCF */  lbu       $a0, -0x2331($a0)
+/* A2F940 80245700 3C048025 */  lui       $a0, %hi(D_8024DCCF)
+/* A2F944 80245704 9084DCCF */  lbu       $a0, %lo(D_8024DCCF)($a0)
 /* A2F948 80245708 3C03FA00 */  lui       $v1, 0xfa00
 /* A2F94C 8024570C AC430000 */  sw        $v1, ($v0)
 /* A2F950 80245710 03E00008 */  jr        $ra
diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_80245718_A2F958.s b/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_80245718_A2F958.s
index 5218d498d5..2ceb422099 100644
--- a/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_80245718_A2F958.s
+++ b/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_80245718_A2F958.s
@@ -8,8 +8,8 @@ glabel func_80245718_A2F958
 /* A2F964 80245724 0C0B1EAF */  jal       get_variable
 /* A2F968 80245728 8C450000 */   lw       $a1, ($v0)
 /* A2F96C 8024572C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* A2F970 80245730 3C018025 */  lui       $at, 0x8025
-/* A2F974 80245734 AC22DCCC */  sw        $v0, -0x2334($at)
+/* A2F970 80245730 3C018025 */  lui       $at, %hi(D_8024DCCC)
+/* A2F974 80245734 AC22DCCC */  sw        $v0, %lo(D_8024DCCC)($at)
 /* A2F978 80245738 24020002 */  addiu     $v0, $zero, 2
 /* A2F97C 8024573C 03E00008 */  jr        $ra
 /* A2F980 80245740 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_80245744_A2F984.s b/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_80245744_A2F984.s
index ce1e0ff0ba..f2df52e685 100644
--- a/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_80245744_A2F984.s
+++ b/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_80245744_A2F984.s
@@ -5,8 +5,8 @@ glabel func_80245744_A2F984
 /* A2F984 80245744 3C06FC12 */  lui       $a2, 0xfc12
 /* A2F988 80245748 34C61624 */  ori       $a2, $a2, 0x1624
 /* A2F98C 8024574C 3C05FF2F */  lui       $a1, 0xff2f
-/* A2F990 80245750 3C04800A */  lui       $a0, 0x800a
-/* A2F994 80245754 2484A66C */  addiu     $a0, $a0, -0x5994
+/* A2F990 80245750 3C04800A */  lui       $a0, %hi(D_8009A66C)
+/* A2F994 80245754 2484A66C */  addiu     $a0, $a0, %lo(D_8009A66C)
 /* A2F998 80245758 8C820000 */  lw        $v0, ($a0)
 /* A2F99C 8024575C 34A5FFFF */  ori       $a1, $a1, 0xffff
 /* A2F9A0 80245760 0040182D */  daddu     $v1, $v0, $zero
@@ -16,8 +16,8 @@ glabel func_80245744_A2F984
 /* A2F9B0 80245770 AC650004 */  sw        $a1, 4($v1)
 /* A2F9B4 80245774 24430008 */  addiu     $v1, $v0, 8
 /* A2F9B8 80245778 AC830000 */  sw        $v1, ($a0)
-/* A2F9BC 8024577C 3C048025 */  lui       $a0, 0x8025
-/* A2F9C0 80245780 9084DCD3 */  lbu       $a0, -0x232d($a0)
+/* A2F9BC 8024577C 3C048025 */  lui       $a0, %hi(D_8024DCD3)
+/* A2F9C0 80245780 9084DCD3 */  lbu       $a0, %lo(D_8024DCD3)($a0)
 /* A2F9C4 80245784 3C03FA00 */  lui       $v1, 0xfa00
 /* A2F9C8 80245788 AC430000 */  sw        $v1, ($v0)
 /* A2F9CC 8024578C 03E00008 */  jr        $ra
diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_80245794_A2F9D4.s b/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_80245794_A2F9D4.s
index 376bf4db74..6e3153348f 100644
--- a/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_80245794_A2F9D4.s
+++ b/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_80245794_A2F9D4.s
@@ -8,8 +8,8 @@ glabel func_80245794_A2F9D4
 /* A2F9E0 802457A0 0C0B1EAF */  jal       get_variable
 /* A2F9E4 802457A4 8C450000 */   lw       $a1, ($v0)
 /* A2F9E8 802457A8 8FBF0010 */  lw        $ra, 0x10($sp)
-/* A2F9EC 802457AC 3C018025 */  lui       $at, 0x8025
-/* A2F9F0 802457B0 AC22DCD0 */  sw        $v0, -0x2330($at)
+/* A2F9EC 802457AC 3C018025 */  lui       $at, %hi(D_8024DCD0)
+/* A2F9F0 802457B0 AC22DCD0 */  sw        $v0, %lo(D_8024DCD0)($at)
 /* A2F9F4 802457B4 24020002 */  addiu     $v0, $zero, 2
 /* A2F9F8 802457B8 03E00008 */  jr        $ra
 /* A2F9FC 802457BC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_802457C0_A2FA00.s b/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_802457C0_A2FA00.s
index 7471e94016..d98dedeb8b 100644
--- a/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_802457C0_A2FA00.s
+++ b/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_802457C0_A2FA00.s
@@ -24,8 +24,8 @@ glabel func_802457C0_A2FA00
 /* A2FA44 80245804 44821000 */  mtc1      $v0, $f2
 /* A2FA48 80245808 00000000 */  nop       
 /* A2FA4C 8024580C 468010A0 */  cvt.s.w   $f2, $f2
-/* A2FA50 80245810 3C018025 */  lui       $at, 0x8025
-/* A2FA54 80245814 D420F280 */  ldc1      $f0, -0xd80($at)
+/* A2FA50 80245810 3C018025 */  lui       $at, %hi(D_8024F280)
+/* A2FA54 80245814 D420F280 */  ldc1      $f0, %lo(D_8024F280)($at)
 /* A2FA58 80245818 460010A1 */  cvt.d.s   $f2, $f2
 /* A2FA5C 8024581C 46201082 */  mul.d     $f2, $f2, $f0
 /* A2FA60 80245820 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2EF00/pause_tabs_draw_badges_A2EF00.s b/asm/nonmatchings/world/area_hos/hos_05/A2EF00/pause_tabs_draw_badges_A2EF00.s
index 5c4aff40ea..14fa1cdef7 100644
--- a/asm/nonmatchings/world/area_hos/hos_05/A2EF00/pause_tabs_draw_badges_A2EF00.s
+++ b/asm/nonmatchings/world/area_hos/hos_05/A2EF00/pause_tabs_draw_badges_A2EF00.s
@@ -71,8 +71,8 @@ glabel pause_tabs_draw_badges_A2EF00
 /* A2EFF4 80244DB4 08091365 */  j         .L80244D94
 /* A2EFF8 80244DB8 00000000 */   nop      
 .L80244DBC:
-/* A2EFFC 80244DBC 3C028015 */  lui       $v0, 0x8015
-/* A2F000 80244DC0 8C4212F0 */  lw        $v0, 0x12f0($v0)
+/* A2EFFC 80244DBC 3C028015 */  lui       $v0, %hi(D_801512F0)
+/* A2F000 80244DC0 8C4212F0 */  lw        $v0, %lo(D_801512F0)($v0)
 /* A2F004 80244DC4 A0510000 */  sb        $s1, ($v0)
 .L80244DC8:
 /* A2F008 80244DC8 24020002 */  addiu     $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240310_A397F0.s b/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240310_A397F0.s
index 7e1dd3382f..b00d9f5dee 100644
--- a/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240310_A397F0.s
+++ b/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240310_A397F0.s
@@ -4,8 +4,8 @@
 glabel func_80240310_A397F0
 /* A397F0 80240310 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* A397F4 80240314 AFB00010 */  sw        $s0, 0x10($sp)
-/* A397F8 80240318 3C108024 */  lui       $s0, 0x8024
-/* A397FC 8024031C 26102C08 */  addiu     $s0, $s0, 0x2c08
+/* A397F8 80240318 3C108024 */  lui       $s0, %hi(D_80242C08)
+/* A397FC 8024031C 26102C08 */  addiu     $s0, $s0, %lo(D_80242C08)
 /* A39800 80240320 AFBF0018 */  sw        $ra, 0x18($sp)
 /* A39804 80240324 AFB10014 */  sw        $s1, 0x14($sp)
 /* A39808 80240328 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_80240310_A397F0
 /* A3986C 8024038C 28620010 */  slti      $v0, $v1, 0x10
 /* A39870 80240390 1440FFFA */  bnez      $v0, .L8024037C
 /* A39874 80240394 24840004 */   addiu    $a0, $a0, 4
-/* A39878 80240398 3C108024 */  lui       $s0, 0x8024
-/* A3987C 8024039C 26102C08 */  addiu     $s0, $s0, 0x2c08
+/* A39878 80240398 3C108024 */  lui       $s0, %hi(D_80242C08)
+/* A3987C 8024039C 26102C08 */  addiu     $s0, $s0, %lo(D_80242C08)
 /* A39880 802403A0 0C00AB4B */  jal       heap_free
 /* A39884 802403A4 8E040000 */   lw       $a0, ($s0)
 /* A39888 802403A8 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240654_A39B34.s b/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240654_A39B34.s
index 18b2129f42..5b4dbe8ce9 100644
--- a/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240654_A39B34.s
+++ b/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240654_A39B34.s
@@ -6,11 +6,11 @@ glabel func_80240654_A39B34
 /* A39B38 80240658 AFBF0010 */  sw        $ra, 0x10($sp)
 /* A39B3C 8024065C 10A00003 */  beqz      $a1, .L8024066C
 /* A39B40 80240660 8C86000C */   lw       $a2, 0xc($a0)
-/* A39B44 80240664 3C018024 */  lui       $at, 0x8024
-/* A39B48 80240668 AC202C6C */  sw        $zero, 0x2c6c($at)
+/* A39B44 80240664 3C018024 */  lui       $at, %hi(D_80242C6C)
+/* A39B48 80240668 AC202C6C */  sw        $zero, %lo(D_80242C6C)($at)
 .L8024066C:
-/* A39B4C 8024066C 3C038024 */  lui       $v1, 0x8024
-/* A39B50 80240670 24632C6C */  addiu     $v1, $v1, 0x2c6c
+/* A39B4C 8024066C 3C038024 */  lui       $v1, %hi(D_80242C6C)
+/* A39B50 80240670 24632C6C */  addiu     $v1, $v1, %lo(D_80242C6C)
 /* A39B54 80240674 8C620000 */  lw        $v0, ($v1)
 /* A39B58 80240678 54400003 */  bnel      $v0, $zero, .L80240688
 /* A39B5C 8024067C AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_80240654_A39B34
 /* A39B64 80240684 0000102D */   daddu    $v0, $zero, $zero
 .L80240688:
 /* A39B68 80240688 8CC50000 */  lw        $a1, ($a2)
-/* A39B6C 8024068C 3C068024 */  lui       $a2, 0x8024
+/* A39B6C 8024068C 3C068024 */  lui       $a2, %hi(D_80242C70)
 /* A39B70 80240690 0C0B2026 */  jal       set_variable
-/* A39B74 80240694 8CC62C70 */   lw       $a2, 0x2c70($a2)
+/* A39B74 80240694 8CC62C70 */   lw       $a2, %lo(D_80242C70)($a2)
 /* A39B78 80240698 24020002 */  addiu     $v0, $zero, 2
 .L8024069C:
 /* A39B7C 8024069C 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_802406A8_A39B88.s b/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_802406A8_A39B88.s
index 335d3994ea..78e84ebfc3 100644
--- a/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_802406A8_A39B88.s
+++ b/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_802406A8_A39B88.s
@@ -7,12 +7,12 @@ glabel func_802406A8_A39B88
 /* A39B90 802406B0 8C82000C */  lw        $v0, 0xc($a0)
 /* A39B94 802406B4 0C0B1EAF */  jal       get_variable
 /* A39B98 802406B8 8C450000 */   lw       $a1, ($v0)
-/* A39B9C 802406BC 3C018024 */  lui       $at, 0x8024
-/* A39BA0 802406C0 AC222C70 */  sw        $v0, 0x2c70($at)
+/* A39B9C 802406BC 3C018024 */  lui       $at, %hi(D_80242C70)
+/* A39BA0 802406C0 AC222C70 */  sw        $v0, %lo(D_80242C70)($at)
 /* A39BA4 802406C4 24020002 */  addiu     $v0, $zero, 2
 /* A39BA8 802406C8 8FBF0010 */  lw        $ra, 0x10($sp)
 /* A39BAC 802406CC 24030001 */  addiu     $v1, $zero, 1
-/* A39BB0 802406D0 3C018024 */  lui       $at, 0x8024
-/* A39BB4 802406D4 AC232C6C */  sw        $v1, 0x2c6c($at)
+/* A39BB0 802406D0 3C018024 */  lui       $at, %hi(D_80242C6C)
+/* A39BB4 802406D4 AC232C6C */  sw        $v1, %lo(D_80242C6C)($at)
 /* A39BB8 802406D8 03E00008 */  jr        $ra
 /* A39BBC 802406DC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_802406E0_A39BC0.s b/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_802406E0_A39BC0.s
index 97460ba2ae..e0cb6b1abc 100644
--- a/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_802406E0_A39BC0.s
+++ b/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_802406E0_A39BC0.s
@@ -13,8 +13,8 @@ glabel func_802406E0_A39BC0
 /* A39BE0 80240700 8C620000 */  lw        $v0, ($v1)
 /* A39BE4 80240704 5040000A */  beql      $v0, $zero, .L80240730
 /* A39BE8 80240708 00041080 */   sll      $v0, $a0, 2
-/* A39BEC 8024070C 3C058024 */  lui       $a1, 0x8024
-/* A39BF0 80240710 24A56260 */  addiu     $a1, $a1, 0x6260
+/* A39BEC 8024070C 3C058024 */  lui       $a1, %hi(D_80246260)
+/* A39BF0 80240710 24A56260 */  addiu     $a1, $a1, %lo(D_80246260)
 .L80240714:
 /* A39BF4 80240714 24630004 */  addiu     $v1, $v1, 4
 /* A39BF8 80240718 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_802406E0_A39BC0
 /* A39C08 80240728 24A50004 */   addiu    $a1, $a1, 4
 /* A39C0C 8024072C 00041080 */  sll       $v0, $a0, 2
 .L80240730:
-/* A39C10 80240730 3C018024 */  lui       $at, 0x8024
+/* A39C10 80240730 3C018024 */  lui       $at, %hi(D_80246260)
 /* A39C14 80240734 00220821 */  addu      $at, $at, $v0
-/* A39C18 80240738 AC206260 */  sw        $zero, 0x6260($at)
+/* A39C18 80240738 AC206260 */  sw        $zero, %lo(D_80246260)($at)
 /* A39C1C 8024073C 080901DB */  j         .L8024076C
 /* A39C20 80240740 00000000 */   nop      
 .L80240744:
-/* A39C24 80240744 3C038024 */  lui       $v1, 0x8024
-/* A39C28 80240748 24636260 */  addiu     $v1, $v1, 0x6260
+/* A39C24 80240744 3C038024 */  lui       $v1, %hi(D_80246260)
+/* A39C28 80240748 24636260 */  addiu     $v1, $v1, %lo(D_80246260)
 /* A39C2C 8024074C 0060282D */  daddu     $a1, $v1, $zero
 .L80240750:
 /* A39C30 80240750 24820010 */  addiu     $v0, $a0, 0x10
diff --git a/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_802409F8_A39ED8.s b/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_802409F8_A39ED8.s
index 7f9a5a5940..c831529f52 100644
--- a/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_802409F8_A39ED8.s
+++ b/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_802409F8_A39ED8.s
@@ -15,7 +15,7 @@ glabel func_802409F8_A39ED8
 /* A39F00 80240A20 8FBF0014 */  lw        $ra, 0x14($sp)
 /* A39F04 80240A24 8FB00010 */  lw        $s0, 0x10($sp)
 /* A39F08 80240A28 24020002 */  addiu     $v0, $zero, 2
-/* A39F0C 80240A2C 3C018024 */  lui       $at, 0x8024
-/* A39F10 80240A30 AC236424 */  sw        $v1, 0x6424($at)
+/* A39F0C 80240A2C 3C018024 */  lui       $at, %hi(D_80246424)
+/* A39F10 80240A30 AC236424 */  sw        $v1, %lo(D_80246424)($at)
 /* A39F14 80240A34 03E00008 */  jr        $ra
 /* A39F18 80240A38 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240A3C_A39F1C.s b/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240A3C_A39F1C.s
index 3a6300e8cc..9ea93aff4a 100644
--- a/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240A3C_A39F1C.s
+++ b/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240A3C_A39F1C.s
@@ -6,8 +6,8 @@ glabel func_80240A3C_A39F1C
 /* A39F20 80240A40 AFBF0010 */  sw        $ra, 0x10($sp)
 /* A39F24 80240A44 0C00EABB */  jal       get_npc_unsafe
 /* A39F28 80240A48 8C84008C */   lw       $a0, 0x8c($a0)
-/* A39F2C 80240A4C 3C038024 */  lui       $v1, 0x8024
-/* A39F30 80240A50 8C636424 */  lw        $v1, 0x6424($v1)
+/* A39F2C 80240A4C 3C038024 */  lui       $v1, %hi(D_80246424)
+/* A39F30 80240A50 8C636424 */  lw        $v1, %lo(D_80246424)($v1)
 /* A39F34 80240A54 AC430028 */  sw        $v1, 0x28($v0)
 /* A39F38 80240A58 8FBF0010 */  lw        $ra, 0x10($sp)
 /* A39F3C 80240A5C 24020002 */  addiu     $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240AD0_A39FB0.s b/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240AD0_A39FB0.s
index cb0f944197..dd913dad36 100644
--- a/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240AD0_A39FB0.s
+++ b/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240AD0_A39FB0.s
@@ -25,10 +25,10 @@ glabel func_80240AD0_A39FB0
 /* A3A000 80240B20 0280902D */  daddu     $s2, $s4, $zero
 /* A3A004 80240B24 3C17F840 */  lui       $s7, 0xf840
 /* A3A008 80240B28 36F7626B */  ori       $s7, $s7, 0x626b
-/* A3A00C 80240B2C 3C1E8009 */  lui       $fp, 0x8009
-/* A3A010 80240B30 27DEA680 */  addiu     $fp, $fp, -0x5980
-/* A3A014 80240B34 3C118024 */  lui       $s1, 0x8024
-/* A3A018 80240B38 263135EC */  addiu     $s1, $s1, 0x35ec
+/* A3A00C 80240B2C 3C1E8009 */  lui       $fp, %hi(D_8008A680)
+/* A3A010 80240B30 27DEA680 */  addiu     $fp, $fp, %lo(D_8008A680)
+/* A3A014 80240B34 3C118024 */  lui       $s1, %hi(D_802435EC)
+/* A3A018 80240B38 263135EC */  addiu     $s1, $s1, %lo(D_802435EC)
 /* A3A01C 80240B3C 02A0802D */  daddu     $s0, $s5, $zero
 .L80240B40:
 /* A3A020 80240B40 0000202D */  daddu     $a0, $zero, $zero
@@ -111,8 +111,8 @@ glabel func_80240AD0_A39FB0
 /* A3A13C 80240C5C 00021080 */  sll       $v0, $v0, 2
 /* A3A140 80240C60 02A21021 */  addu      $v0, $s5, $v0
 /* A3A144 80240C64 8C520108 */  lw        $s2, 0x108($v0)
-/* A3A148 80240C68 3C028024 */  lui       $v0, 0x8024
-/* A3A14C 80240C6C 244235EC */  addiu     $v0, $v0, 0x35ec
+/* A3A148 80240C68 3C028024 */  lui       $v0, %hi(D_802435EC)
+/* A3A14C 80240C6C 244235EC */  addiu     $v0, $v0, %lo(D_802435EC)
 /* A3A150 80240C70 00121840 */  sll       $v1, $s2, 1
 /* A3A154 80240C74 00721821 */  addu      $v1, $v1, $s2
 /* A3A158 80240C78 00031880 */  sll       $v1, $v1, 2
@@ -136,9 +136,9 @@ glabel func_80240AD0_A39FB0
 /* A3A1A0 80240CC0 00031080 */  sll       $v0, $v1, 2
 /* A3A1A4 80240CC4 00431021 */  addu      $v0, $v0, $v1
 /* A3A1A8 80240CC8 00021080 */  sll       $v0, $v0, 2
-/* A3A1AC 80240CCC 3C018009 */  lui       $at, 0x8009
+/* A3A1AC 80240CCC 3C018009 */  lui       $at, %hi(D_8008F072)
 /* A3A1B0 80240CD0 00220821 */  addu      $at, $at, $v0
-/* A3A1B4 80240CD4 8022F072 */  lb        $v0, -0xf8e($at)
+/* A3A1B4 80240CD4 8022F072 */  lb        $v0, %lo(D_8008F072)($at)
 /* A3A1B8 80240CD8 0809033A */  j         .L80240CE8
 /* A3A1BC 80240CDC AE620098 */   sw       $v0, 0x98($s3)
 .L80240CE0:
diff --git a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80240F7C_A3A45C.s b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80240F7C_A3A45C.s
index ee559458f3..c7481bb4d0 100644
--- a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80240F7C_A3A45C.s
+++ b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80240F7C_A3A45C.s
@@ -6,11 +6,11 @@ glabel func_80240F7C_A3A45C
 /* A3A460 80240F80 AFBF0010 */  sw        $ra, 0x10($sp)
 /* A3A464 80240F84 10A00003 */  beqz      $a1, .L80240F94
 /* A3A468 80240F88 8C86000C */   lw       $a2, 0xc($a0)
-/* A3A46C 80240F8C 3C018024 */  lui       $at, 0x8024
-/* A3A470 80240F90 AC2045D0 */  sw        $zero, 0x45d0($at)
+/* A3A46C 80240F8C 3C018024 */  lui       $at, %hi(D_802445D0)
+/* A3A470 80240F90 AC2045D0 */  sw        $zero, %lo(D_802445D0)($at)
 .L80240F94:
-/* A3A474 80240F94 3C038024 */  lui       $v1, 0x8024
-/* A3A478 80240F98 246345D0 */  addiu     $v1, $v1, 0x45d0
+/* A3A474 80240F94 3C038024 */  lui       $v1, %hi(D_802445D0)
+/* A3A478 80240F98 246345D0 */  addiu     $v1, $v1, %lo(D_802445D0)
 /* A3A47C 80240F9C 8C620000 */  lw        $v0, ($v1)
 /* A3A480 80240FA0 54400003 */  bnel      $v0, $zero, .L80240FB0
 /* A3A484 80240FA4 AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_80240F7C_A3A45C
 /* A3A48C 80240FAC 0000102D */   daddu    $v0, $zero, $zero
 .L80240FB0:
 /* A3A490 80240FB0 8CC50000 */  lw        $a1, ($a2)
-/* A3A494 80240FB4 3C068024 */  lui       $a2, 0x8024
+/* A3A494 80240FB4 3C068024 */  lui       $a2, %hi(D_802445D4)
 /* A3A498 80240FB8 0C0B2026 */  jal       set_variable
-/* A3A49C 80240FBC 8CC645D4 */   lw       $a2, 0x45d4($a2)
+/* A3A49C 80240FBC 8CC645D4 */   lw       $a2, %lo(D_802445D4)($a2)
 /* A3A4A0 80240FC0 24020002 */  addiu     $v0, $zero, 2
 .L80240FC4:
 /* A3A4A4 80240FC4 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80240FD0_A3A4B0.s b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80240FD0_A3A4B0.s
index 5f64815a23..06fbc25a34 100644
--- a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80240FD0_A3A4B0.s
+++ b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80240FD0_A3A4B0.s
@@ -7,12 +7,12 @@ glabel func_80240FD0_A3A4B0
 /* A3A4B8 80240FD8 8C82000C */  lw        $v0, 0xc($a0)
 /* A3A4BC 80240FDC 0C0B1EAF */  jal       get_variable
 /* A3A4C0 80240FE0 8C450000 */   lw       $a1, ($v0)
-/* A3A4C4 80240FE4 3C018024 */  lui       $at, 0x8024
-/* A3A4C8 80240FE8 AC2245D4 */  sw        $v0, 0x45d4($at)
+/* A3A4C4 80240FE4 3C018024 */  lui       $at, %hi(D_802445D4)
+/* A3A4C8 80240FE8 AC2245D4 */  sw        $v0, %lo(D_802445D4)($at)
 /* A3A4CC 80240FEC 24020002 */  addiu     $v0, $zero, 2
 /* A3A4D0 80240FF0 8FBF0010 */  lw        $ra, 0x10($sp)
 /* A3A4D4 80240FF4 24030001 */  addiu     $v1, $zero, 1
-/* A3A4D8 80240FF8 3C018024 */  lui       $at, 0x8024
-/* A3A4DC 80240FFC AC2345D0 */  sw        $v1, 0x45d0($at)
+/* A3A4D8 80240FF8 3C018024 */  lui       $at, %hi(D_802445D0)
+/* A3A4DC 80240FFC AC2345D0 */  sw        $v1, %lo(D_802445D0)($at)
 /* A3A4E0 80241000 03E00008 */  jr        $ra
 /* A3A4E4 80241004 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241008_A3A4E8.s b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241008_A3A4E8.s
index 70181e5706..aa86c06220 100644
--- a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241008_A3A4E8.s
+++ b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241008_A3A4E8.s
@@ -13,8 +13,8 @@ glabel func_80241008_A3A4E8
 /* A3A508 80241028 8C620000 */  lw        $v0, ($v1)
 /* A3A50C 8024102C 5040000A */  beql      $v0, $zero, .L80241058
 /* A3A510 80241030 00041080 */   sll      $v0, $a0, 2
-/* A3A514 80241034 3C058024 */  lui       $a1, 0x8024
-/* A3A518 80241038 24A56430 */  addiu     $a1, $a1, 0x6430
+/* A3A514 80241034 3C058024 */  lui       $a1, %hi(D_80246430)
+/* A3A518 80241038 24A56430 */  addiu     $a1, $a1, %lo(D_80246430)
 .L8024103C:
 /* A3A51C 8024103C 24630004 */  addiu     $v1, $v1, 4
 /* A3A520 80241040 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_80241008_A3A4E8
 /* A3A530 80241050 24A50004 */   addiu    $a1, $a1, 4
 /* A3A534 80241054 00041080 */  sll       $v0, $a0, 2
 .L80241058:
-/* A3A538 80241058 3C018024 */  lui       $at, 0x8024
+/* A3A538 80241058 3C018024 */  lui       $at, %hi(D_80246430)
 /* A3A53C 8024105C 00220821 */  addu      $at, $at, $v0
-/* A3A540 80241060 AC206430 */  sw        $zero, 0x6430($at)
+/* A3A540 80241060 AC206430 */  sw        $zero, %lo(D_80246430)($at)
 /* A3A544 80241064 08090425 */  j         .L80241094
 /* A3A548 80241068 00000000 */   nop      
 .L8024106C:
-/* A3A54C 8024106C 3C038024 */  lui       $v1, 0x8024
-/* A3A550 80241070 24636430 */  addiu     $v1, $v1, 0x6430
+/* A3A54C 8024106C 3C038024 */  lui       $v1, %hi(D_80246430)
+/* A3A550 80241070 24636430 */  addiu     $v1, $v1, %lo(D_80246430)
 /* A3A554 80241074 0060282D */  daddu     $a1, $v1, $zero
 .L80241078:
 /* A3A558 80241078 24820010 */  addiu     $v0, $a0, 0x10
diff --git a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802410A4_A3A584.s b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802410A4_A3A584.s
index a46924702a..902e7e8d12 100644
--- a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802410A4_A3A584.s
+++ b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802410A4_A3A584.s
@@ -4,8 +4,8 @@
 glabel func_802410A4_A3A584
 /* A3A584 802410A4 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* A3A588 802410A8 AFB00010 */  sw        $s0, 0x10($sp)
-/* A3A58C 802410AC 3C108024 */  lui       $s0, 0x8024
-/* A3A590 802410B0 2610476C */  addiu     $s0, $s0, 0x476c
+/* A3A58C 802410AC 3C108024 */  lui       $s0, %hi(D_8024476C)
+/* A3A590 802410B0 2610476C */  addiu     $s0, $s0, %lo(D_8024476C)
 /* A3A594 802410B4 AFBF0018 */  sw        $ra, 0x18($sp)
 /* A3A598 802410B8 AFB10014 */  sw        $s1, 0x14($sp)
 /* A3A59C 802410BC 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_802410A4_A3A584
 /* A3A600 80241120 28620010 */  slti      $v0, $v1, 0x10
 /* A3A604 80241124 1440FFFA */  bnez      $v0, .L80241110
 /* A3A608 80241128 24840004 */   addiu    $a0, $a0, 4
-/* A3A60C 8024112C 3C108024 */  lui       $s0, 0x8024
-/* A3A610 80241130 2610476C */  addiu     $s0, $s0, 0x476c
+/* A3A60C 8024112C 3C108024 */  lui       $s0, %hi(D_8024476C)
+/* A3A610 80241130 2610476C */  addiu     $s0, $s0, %lo(D_8024476C)
 /* A3A614 80241134 0C00AB4B */  jal       heap_free
 /* A3A618 80241138 8E040000 */   lw       $a0, ($s0)
 /* A3A61C 8024113C AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_8024126C_A3A74C.s b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_8024126C_A3A74C.s
index 307e06e129..75a2f62e80 100644
--- a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_8024126C_A3A74C.s
+++ b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_8024126C_A3A74C.s
@@ -23,8 +23,8 @@ glabel func_8024126C_A3A74C
 /* A3A794 802412B4 0280802D */  daddu     $s0, $s4, $zero
 /* A3A798 802412B8 3C12F971 */  lui       $s2, 0xf971
 /* A3A79C 802412BC 36528883 */  ori       $s2, $s2, 0x8883
-/* A3A7A0 802412C0 3C118024 */  lui       $s1, 0x8024
-/* A3A7A4 802412C4 263147D8 */  addiu     $s1, $s1, 0x47d8
+/* A3A7A0 802412C0 3C118024 */  lui       $s1, %hi(D_802447D8)
+/* A3A7A4 802412C4 263147D8 */  addiu     $s1, $s1, %lo(D_802447D8)
 /* A3A7A8 802412C8 AFC00088 */  sw        $zero, 0x88($fp)
 .L802412CC:
 /* A3A7AC 802412CC 8E220004 */  lw        $v0, 4($s1)
@@ -47,8 +47,8 @@ glabel func_8024126C_A3A74C
 /* A3A7E8 80241308 2E02004F */  sltiu     $v0, $s0, 0x4f
 /* A3A7EC 8024130C 1440FFEF */  bnez      $v0, .L802412CC
 /* A3A7F0 80241310 2631000C */   addiu    $s1, $s1, 0xc
-/* A3A7F4 80241314 3C118024 */  lui       $s1, 0x8024
-/* A3A7F8 80241318 263147D4 */  addiu     $s1, $s1, 0x47d4
+/* A3A7F4 80241314 3C118024 */  lui       $s1, %hi(D_802447D4)
+/* A3A7F8 80241318 263147D4 */  addiu     $s1, $s1, %lo(D_802447D4)
 /* A3A7FC 8024131C 1280002D */  beqz      $s4, .L802413D4
 /* A3A800 80241320 0000802D */   daddu    $s0, $zero, $zero
 /* A3A804 80241324 0C00A67F */  jal       rand_int
@@ -130,8 +130,8 @@ glabel func_8024126C_A3A74C
 /* A3A910 80241430 0C00A67F */  jal       rand_int
 /* A3A914 80241434 2684FFFF */   addiu    $a0, $s4, -1
 /* A3A918 80241438 0040A82D */  daddu     $s5, $v0, $zero
-/* A3A91C 8024143C 3C138024 */  lui       $s3, 0x8024
-/* A3A920 80241440 267347D4 */  addiu     $s3, $s3, 0x47d4
+/* A3A91C 8024143C 3C138024 */  lui       $s3, %hi(D_802447D4)
+/* A3A920 80241440 267347D4 */  addiu     $s3, $s3, %lo(D_802447D4)
 /* A3A924 80241444 0000A02D */  daddu     $s4, $zero, $zero
 /* A3A928 80241448 0280802D */  daddu     $s0, $s4, $zero
 /* A3A92C 8024144C 24172712 */  addiu     $s7, $zero, 0x2712
diff --git a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802414E4_A3A9C4.s b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802414E4_A3A9C4.s
index 64964c2acb..014908d11a 100644
--- a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802414E4_A3A9C4.s
+++ b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802414E4_A3A9C4.s
@@ -23,8 +23,8 @@ glabel func_802414E4_A3A9C4
 /* A3AA0C 8024152C 0280802D */  daddu     $s0, $s4, $zero
 /* A3AA10 80241530 3C12F971 */  lui       $s2, 0xf971
 /* A3AA14 80241534 365288E4 */  ori       $s2, $s2, 0x88e4
-/* A3AA18 80241538 3C118024 */  lui       $s1, 0x8024
-/* A3AA1C 8024153C 26314B8C */  addiu     $s1, $s1, 0x4b8c
+/* A3AA18 80241538 3C118024 */  lui       $s1, %hi(D_80244B8C)
+/* A3AA1C 8024153C 26314B8C */  addiu     $s1, $s1, %lo(D_80244B8C)
 /* A3AA20 80241540 AFC00088 */  sw        $zero, 0x88($fp)
 .L80241544:
 /* A3AA24 80241544 8E220004 */  lw        $v0, 4($s1)
@@ -52,8 +52,8 @@ glabel func_802414E4_A3A9C4
 /* A3AA74 80241594 0C00A67F */  jal       rand_int
 /* A3AA78 80241598 2684FFFF */   addiu    $a0, $s4, -1
 /* A3AA7C 8024159C 0040B82D */  daddu     $s7, $v0, $zero
-/* A3AA80 802415A0 3C138024 */  lui       $s3, 0x8024
-/* A3AA84 802415A4 26734B88 */  addiu     $s3, $s3, 0x4b88
+/* A3AA80 802415A0 3C138024 */  lui       $s3, %hi(D_80244B88)
+/* A3AA84 802415A4 26734B88 */  addiu     $s3, $s3, %lo(D_80244B88)
 /* A3AA88 802415A8 0000A02D */  daddu     $s4, $zero, $zero
 /* A3AA8C 802415AC 0280802D */  daddu     $s0, $s4, $zero
 /* A3AA90 802415B0 3C16F971 */  lui       $s6, 0xf971
diff --git a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241668_A3AB48.s b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241668_A3AB48.s
index 56b15d1aa9..ff17ad28c9 100644
--- a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241668_A3AB48.s
+++ b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241668_A3AB48.s
@@ -23,8 +23,8 @@ glabel func_80241668_A3AB48
 /* A3AB90 802416B0 0280802D */  daddu     $s0, $s4, $zero
 /* A3AB94 802416B4 3C12F971 */  lui       $s2, 0xf971
 /* A3AB98 802416B8 365288F4 */  ori       $s2, $s2, 0x88f4
-/* A3AB9C 802416BC 3C118024 */  lui       $s1, 0x8024
-/* A3ABA0 802416C0 26314C4C */  addiu     $s1, $s1, 0x4c4c
+/* A3AB9C 802416BC 3C118024 */  lui       $s1, %hi(D_80244C4C)
+/* A3ABA0 802416C0 26314C4C */  addiu     $s1, $s1, %lo(D_80244C4C)
 /* A3ABA4 802416C4 AFC00088 */  sw        $zero, 0x88($fp)
 .L802416C8:
 /* A3ABA8 802416C8 8E220004 */  lw        $v0, 4($s1)
@@ -52,8 +52,8 @@ glabel func_80241668_A3AB48
 /* A3ABF8 80241718 0C00A67F */  jal       rand_int
 /* A3ABFC 8024171C 2684FFFF */   addiu    $a0, $s4, -1
 /* A3AC00 80241720 0040B82D */  daddu     $s7, $v0, $zero
-/* A3AC04 80241724 3C138024 */  lui       $s3, 0x8024
-/* A3AC08 80241728 26734C48 */  addiu     $s3, $s3, 0x4c48
+/* A3AC04 80241724 3C138024 */  lui       $s3, %hi(D_80244C48)
+/* A3AC08 80241728 26734C48 */  addiu     $s3, $s3, %lo(D_80244C48)
 /* A3AC0C 8024172C 0000A02D */  daddu     $s4, $zero, $zero
 /* A3AC10 80241730 0280802D */  daddu     $s0, $s4, $zero
 /* A3AC14 80241734 3C16F971 */  lui       $s6, 0xf971
diff --git a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802417EC_A3ACCC.s b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802417EC_A3ACCC.s
index 0a3e0f9ec6..d42dc39c26 100644
--- a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802417EC_A3ACCC.s
+++ b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802417EC_A3ACCC.s
@@ -13,9 +13,9 @@ glabel func_802417EC_A3ACCC
 /* A3ACEC 8024180C 26100004 */   addiu    $s0, $s0, 4
 /* A3ACF0 80241810 3C038011 */  lui       $v1, %hi(gPlayerData+0xC)
 /* A3ACF4 80241814 8463F29C */  lh        $v1, %lo(gPlayerData+0xC)($v1)
-/* A3ACF8 80241818 3C018024 */  lui       $at, 0x8024
+/* A3ACF8 80241818 3C018024 */  lui       $at, %hi(D_802447D0)
 /* A3ACFC 8024181C 00220821 */  addu      $at, $at, $v0
-/* A3AD00 80241820 902247D0 */  lbu       $v0, 0x47d0($at)
+/* A3AD00 80241820 902247D0 */  lbu       $v0, %lo(D_802447D0)($at)
 /* A3AD04 80241824 8E050000 */  lw        $a1, ($s0)
 /* A3AD08 80241828 0062182A */  slt       $v1, $v1, $v0
 /* A3AD0C 8024182C 10600003 */  beqz      $v1, .L8024183C
diff --git a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241860_A3AD40.s b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241860_A3AD40.s
index 59f2c82a15..e2ee7b5bc9 100644
--- a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241860_A3AD40.s
+++ b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241860_A3AD40.s
@@ -9,9 +9,9 @@ glabel func_80241860_A3AD40
 /* A3AD50 80241870 8C450000 */   lw       $a1, ($v0)
 /* A3AD54 80241874 3C058011 */  lui       $a1, %hi(gPlayerData)
 /* A3AD58 80241878 24A5F290 */  addiu     $a1, $a1, %lo(gPlayerData)
-/* A3AD5C 8024187C 3C048024 */  lui       $a0, 0x8024
+/* A3AD5C 8024187C 3C048024 */  lui       $a0, %hi(D_802447D0)
 /* A3AD60 80241880 00822021 */  addu      $a0, $a0, $v0
-/* A3AD64 80241884 908447D0 */  lbu       $a0, 0x47d0($a0)
+/* A3AD64 80241884 908447D0 */  lbu       $a0, %lo(D_802447D0)($a0)
 /* A3AD68 80241888 94A3000C */  lhu       $v1, 0xc($a1)
 /* A3AD6C 8024188C 00641823 */  subu      $v1, $v1, $a0
 /* A3AD70 80241890 A4A3000C */  sh        $v1, 0xc($a1)
diff --git a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802418A4_A3AD84.s b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802418A4_A3AD84.s
index e416bd2eb4..dc35fcfd25 100644
--- a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802418A4_A3AD84.s
+++ b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802418A4_A3AD84.s
@@ -9,9 +9,9 @@ glabel func_802418A4_A3AD84
 /* A3AD94 802418B4 8C450000 */   lw       $a1, ($v0)
 /* A3AD98 802418B8 3C058011 */  lui       $a1, %hi(gPlayerData)
 /* A3AD9C 802418BC 24A5F290 */  addiu     $a1, $a1, %lo(gPlayerData)
-/* A3ADA0 802418C0 3C048024 */  lui       $a0, 0x8024
+/* A3ADA0 802418C0 3C048024 */  lui       $a0, %hi(D_802447D0)
 /* A3ADA4 802418C4 00822021 */  addu      $a0, $a0, $v0
-/* A3ADA8 802418C8 908447D0 */  lbu       $a0, 0x47d0($a0)
+/* A3ADA8 802418C8 908447D0 */  lbu       $a0, %lo(D_802447D0)($a0)
 /* A3ADAC 802418CC 94A3000C */  lhu       $v1, 0xc($a1)
 /* A3ADB0 802418D0 00641821 */  addu      $v1, $v1, $a0
 /* A3ADB4 802418D4 A4A3000C */  sh        $v1, 0xc($a1)
diff --git a/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_80241FD0_A3B4B0.s b/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_80241FD0_A3B4B0.s
index 4965af9db1..8297befba7 100644
--- a/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_80241FD0_A3B4B0.s
+++ b/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_80241FD0_A3B4B0.s
@@ -4,8 +4,8 @@
 glabel func_80241FD0_A3B4B0
 /* A3B4B0 80241FD0 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* A3B4B4 80241FD4 AFB00010 */  sw        $s0, 0x10($sp)
-/* A3B4B8 80241FD8 3C108024 */  lui       $s0, 0x8024
-/* A3B4BC 80241FDC 26105E80 */  addiu     $s0, $s0, 0x5e80
+/* A3B4B8 80241FD8 3C108024 */  lui       $s0, %hi(D_80245E80)
+/* A3B4BC 80241FDC 26105E80 */  addiu     $s0, $s0, %lo(D_80245E80)
 /* A3B4C0 80241FE0 AFBF0018 */  sw        $ra, 0x18($sp)
 /* A3B4C4 80241FE4 AFB10014 */  sw        $s1, 0x14($sp)
 /* A3B4C8 80241FE8 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_80241FD0_A3B4B0
 /* A3B52C 8024204C 28620010 */  slti      $v0, $v1, 0x10
 /* A3B530 80242050 1440FFFA */  bnez      $v0, .L8024203C
 /* A3B534 80242054 24840004 */   addiu    $a0, $a0, 4
-/* A3B538 80242058 3C108024 */  lui       $s0, 0x8024
-/* A3B53C 8024205C 26105E80 */  addiu     $s0, $s0, 0x5e80
+/* A3B538 80242058 3C108024 */  lui       $s0, %hi(D_80245E80)
+/* A3B53C 8024205C 26105E80 */  addiu     $s0, $s0, %lo(D_80245E80)
 /* A3B540 80242060 0C00AB4B */  jal       heap_free
 /* A3B544 80242064 8E040000 */   lw       $a0, ($s0)
 /* A3B548 80242068 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_8024228C_A3B76C.s b/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_8024228C_A3B76C.s
index 05207daec1..ada03b1739 100644
--- a/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_8024228C_A3B76C.s
+++ b/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_8024228C_A3B76C.s
@@ -41,11 +41,11 @@ glabel func_8024228C_A3B76C
 /* A3B7F4 80242314 AEA20318 */  sw        $v0, 0x318($s5)
 /* A3B7F8 80242318 0000B02D */  daddu     $s6, $zero, $zero
 /* A3B7FC 8024231C 02C0902D */  daddu     $s2, $s6, $zero
-/* A3B800 80242320 3C1E8009 */  lui       $fp, 0x8009
-/* A3B804 80242324 27DEA680 */  addiu     $fp, $fp, -0x5980
+/* A3B800 80242320 3C1E8009 */  lui       $fp, %hi(D_8008A680)
+/* A3B804 80242324 27DEA680 */  addiu     $fp, $fp, %lo(D_8008A680)
 /* A3B808 80242328 24170001 */  addiu     $s7, $zero, 1
-/* A3B80C 8024232C 3C148024 */  lui       $s4, 0x8024
-/* A3B810 80242330 26945EEC */  addiu     $s4, $s4, 0x5eec
+/* A3B80C 8024232C 3C148024 */  lui       $s4, %hi(D_80245EEC)
+/* A3B810 80242330 26945EEC */  addiu     $s4, $s4, %lo(D_80245EEC)
 /* A3B814 80242334 02A0882D */  daddu     $s1, $s5, $zero
 .L80242338:
 /* A3B818 80242338 8E650088 */  lw        $a1, 0x88($s3)
@@ -130,9 +130,9 @@ glabel func_8024228C_A3B76C
 /* A3B938 80242458 8C460108 */  lw        $a2, 0x108($v0)
 /* A3B93C 8024245C 8E6300AC */  lw        $v1, 0xac($s3)
 /* A3B940 80242460 00061080 */  sll       $v0, $a2, 2
-/* A3B944 80242464 3C018024 */  lui       $at, 0x8024
+/* A3B944 80242464 3C018024 */  lui       $at, %hi(D_80245EEC)
 /* A3B948 80242468 00220821 */  addu      $at, $at, $v0
-/* A3B94C 8024246C 8C225EEC */  lw        $v0, 0x5eec($at)
+/* A3B94C 8024246C 8C225EEC */  lw        $v0, %lo(D_80245EEC)($at)
 /* A3B950 80242470 14600006 */  bnez      $v1, .L8024248C
 /* A3B954 80242474 AE620084 */   sw       $v0, 0x84($s3)
 /* A3B958 80242478 8E65008C */  lw        $a1, 0x8c($s3)
diff --git a/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_802424CC_A3B9AC.s b/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_802424CC_A3B9AC.s
index d6573b2783..a567162977 100644
--- a/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_802424CC_A3B9AC.s
+++ b/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_802424CC_A3B9AC.s
@@ -5,8 +5,8 @@ glabel func_802424CC_A3B9AC
 /* A3B9AC 802424CC 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* A3B9B0 802424D0 0000282D */  daddu     $a1, $zero, $zero
 /* A3B9B4 802424D4 00A0302D */  daddu     $a2, $a1, $zero
-/* A3B9B8 802424D8 3C038024 */  lui       $v1, 0x8024
-/* A3B9BC 802424DC 24635EEC */  addiu     $v1, $v1, 0x5eec
+/* A3B9B8 802424D8 3C038024 */  lui       $v1, %hi(D_80245EEC)
+/* A3B9BC 802424DC 24635EEC */  addiu     $v1, $v1, %lo(D_80245EEC)
 /* A3B9C0 802424E0 AFBF0010 */  sw        $ra, 0x10($sp)
 /* A3B9C4 802424E4 8C840084 */  lw        $a0, 0x84($a0)
 .L802424E8:
diff --git a/asm/nonmatchings/world/area_isk/isk_04/97B670/func_802400BC_97B6EC.s b/asm/nonmatchings/world/area_isk/isk_04/97B670/func_802400BC_97B6EC.s
index 5879210b28..8a34fbfcf8 100644
--- a/asm/nonmatchings/world/area_isk/isk_04/97B670/func_802400BC_97B6EC.s
+++ b/asm/nonmatchings/world/area_isk/isk_04/97B670/func_802400BC_97B6EC.s
@@ -55,8 +55,8 @@ glabel func_802400BC_97B6EC
 /* 97B7A8 80240178 8C470030 */   lw       $a3, 0x30($v0)
 /* 97B7AC 8024017C C6020018 */  lwc1      $f2, 0x18($s0)
 /* 97B7B0 80240180 46020003 */  div.s     $f0, $f0, $f2
-/* 97B7B4 80240184 3C018024 */  lui       $at, 0x8024
-/* 97B7B8 80240188 D4222430 */  ldc1      $f2, 0x2430($at)
+/* 97B7B4 80240184 3C018024 */  lui       $at, %hi(D_80242430)
+/* 97B7B8 80240188 D4222430 */  ldc1      $f2, %lo(D_80242430)($at)
 /* 97B7BC 8024018C 46000021 */  cvt.d.s   $f0, $f0
 /* 97B7C0 80240190 46220000 */  add.d     $f0, $f0, $f2
 /* 97B7C4 80240194 4620010D */  trunc.w.d $f4, $f0
diff --git a/asm/nonmatchings/world/area_isk/isk_04/97B670/func_802403D4_97BA04.s b/asm/nonmatchings/world/area_isk/isk_04/97B670/func_802403D4_97BA04.s
index a4ddee434d..a0306a7b79 100644
--- a/asm/nonmatchings/world/area_isk/isk_04/97B670/func_802403D4_97BA04.s
+++ b/asm/nonmatchings/world/area_isk/isk_04/97B670/func_802403D4_97BA04.s
@@ -279,9 +279,9 @@ glabel func_802403D4_97BA04
 /* 97BDF0 802407C0 2C620015 */  sltiu     $v0, $v1, 0x15
 /* 97BDF4 802407C4 10400009 */  beqz      $v0, .L802407EC
 /* 97BDF8 802407C8 00031080 */   sll      $v0, $v1, 2
-/* 97BDFC 802407CC 3C018024 */  lui       $at, 0x8024
+/* 97BDFC 802407CC 3C018024 */  lui       $at, %hi(D_80242438)
 /* 97BE00 802407D0 00220821 */  addu      $at, $at, $v0
-/* 97BE04 802407D4 8C222438 */  lw        $v0, 0x2438($at)
+/* 97BE04 802407D4 8C222438 */  lw        $v0, %lo(D_80242438)($at)
 /* 97BE08 802407D8 00400008 */  jr        $v0
 /* 97BE0C 802407DC 00000000 */   nop      
 /* 97BE10 802407E0 8E420028 */  lw        $v0, 0x28($s2)
diff --git a/asm/nonmatchings/world/area_isk/isk_04/97BF60/func_8024095C_97BF8C.s b/asm/nonmatchings/world/area_isk/isk_04/97BF60/func_8024095C_97BF8C.s
index 03ffc39587..32d33b670c 100644
--- a/asm/nonmatchings/world/area_isk/isk_04/97BF60/func_8024095C_97BF8C.s
+++ b/asm/nonmatchings/world/area_isk/isk_04/97BF60/func_8024095C_97BF8C.s
@@ -3,8 +3,8 @@
 
 glabel func_8024095C_97BF8C
 /* 97BF8C 8024095C 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 97BF90 80240960 3C048024 */  lui       $a0, 0x8024
-/* 97BF94 80240964 24842288 */  addiu     $a0, $a0, 0x2288
+/* 97BF90 80240960 3C048024 */  lui       $a0, %hi(D_80242288)
+/* 97BF94 80240964 24842288 */  addiu     $a0, $a0, %lo(D_80242288)
 /* 97BF98 80240968 AFBF0018 */  sw        $ra, 0x18($sp)
 /* 97BF9C 8024096C AFB10014 */  sw        $s1, 0x14($sp)
 /* 97BFA0 80240970 AFB00010 */  sw        $s0, 0x10($sp)
@@ -37,8 +37,8 @@ glabel func_8024095C_97BF8C
 /* 97BFFC 802409CC C6200028 */  lwc1      $f0, 0x28($s1)
 /* 97C000 802409D0 3C0141F0 */  lui       $at, 0x41f0
 /* 97C004 802409D4 44811000 */  mtc1      $at, $f2
-/* 97C008 802409D8 3C108011 */  lui       $s0, 0x8011
-/* 97C00C 802409DC 2610C930 */  addiu     $s0, $s0, -0x36d0
+/* 97C008 802409D8 3C108011 */  lui       $s0, %hi(D_8010C930)
+/* 97C00C 802409DC 2610C930 */  addiu     $s0, $s0, %lo(D_8010C930)
 /* 97C010 802409E0 46020001 */  sub.s     $f0, $f0, $f2
 /* 97C014 802409E4 8E040000 */  lw        $a0, ($s0)
 /* 97C018 802409E8 E4800038 */  swc1      $f0, 0x38($a0)
diff --git a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240230_97DD00.s b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240230_97DD00.s
index 7887fc56d5..72159bcfb4 100644
--- a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240230_97DD00.s
+++ b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240230_97DD00.s
@@ -83,8 +83,8 @@ glabel func_80240230_97DD00
 /* 97DE2C 8024035C 27A5002C */   addiu    $a1, $sp, 0x2c
 /* 97DE30 80240360 C6000038 */  lwc1      $f0, 0x38($s0)
 /* 97DE34 80240364 860200A6 */  lh        $v0, 0xa6($s0)
-/* 97DE38 80240368 3C018024 */  lui       $at, 0x8024
-/* 97DE3C 8024036C D4222EB0 */  ldc1      $f2, 0x2eb0($at)
+/* 97DE38 80240368 3C018024 */  lui       $at, %hi(D_80242EB0)
+/* 97DE3C 8024036C D4222EB0 */  ldc1      $f2, %lo(D_80242EB0)($at)
 /* 97DE40 80240370 27A60030 */  addiu     $a2, $sp, 0x30
 /* 97DE44 80240374 E7A0002C */  swc1      $f0, 0x2c($sp)
 /* 97DE48 80240378 44820000 */  mtc1      $v0, $f0
diff --git a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240BF0_97E6C0.s b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240BF0_97E6C0.s
index c84e977603..25a00dd06c 100644
--- a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240BF0_97E6C0.s
+++ b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240BF0_97E6C0.s
@@ -88,9 +88,9 @@ glabel func_80240BF0_97E6C0
 /* 97E804 80240D34 2C62000F */  sltiu     $v0, $v1, 0xf
 /* 97E808 80240D38 1040002C */  beqz      $v0, .L80240DEC
 /* 97E80C 80240D3C 00031080 */   sll      $v0, $v1, 2
-/* 97E810 80240D40 3C018024 */  lui       $at, 0x8024
+/* 97E810 80240D40 3C018024 */  lui       $at, %hi(D_80242EB8)
 /* 97E814 80240D44 00220821 */  addu      $at, $at, $v0
-/* 97E818 80240D48 8C222EB8 */  lw        $v0, 0x2eb8($at)
+/* 97E818 80240D48 8C222EB8 */  lw        $v0, %lo(D_80242EB8)($at)
 /* 97E81C 80240D4C 00400008 */  jr        $v0
 /* 97E820 80240D50 00000000 */   nop      
 /* 97E824 80240D54 0260202D */  daddu     $a0, $s3, $zero
diff --git a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240F3C_97EA0C.s b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240F3C_97EA0C.s
index b8ec54257c..e115704373 100644
--- a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240F3C_97EA0C.s
+++ b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240F3C_97EA0C.s
@@ -69,9 +69,9 @@ glabel func_80240F3C_97EA0C
 /* 97EB08 80241038 2C62000F */  sltiu     $v0, $v1, 0xf
 /* 97EB0C 8024103C 10400028 */  beqz      $v0, .L802410E0
 /* 97EB10 80241040 00031080 */   sll      $v0, $v1, 2
-/* 97EB14 80241044 3C018024 */  lui       $at, 0x8024
+/* 97EB14 80241044 3C018024 */  lui       $at, %hi(D_80242EF8)
 /* 97EB18 80241048 00220821 */  addu      $at, $at, $v0
-/* 97EB1C 8024104C 8C222EF8 */  lw        $v0, 0x2ef8($at)
+/* 97EB1C 8024104C 8C222EF8 */  lw        $v0, %lo(D_80242EF8)($at)
 /* 97EB20 80241050 00400008 */  jr        $v0
 /* 97EB24 80241054 00000000 */   nop      
 /* 97EB28 80241058 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241610_97F0E0.s b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241610_97F0E0.s
index 96f0b225b0..140523898a 100644
--- a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241610_97F0E0.s
+++ b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241610_97F0E0.s
@@ -5,8 +5,8 @@ glabel func_80241610_97F0E0
 /* 97F0E0 80241610 27BDFEF8 */  addiu     $sp, $sp, -0x108
 /* 97F0E4 80241614 3C02DC08 */  lui       $v0, 0xdc08
 /* 97F0E8 80241618 AFB700EC */  sw        $s7, 0xec($sp)
-/* 97F0EC 8024161C 3C17800A */  lui       $s7, 0x800a
-/* 97F0F0 80241620 26F7A66C */  addiu     $s7, $s7, -0x5994
+/* 97F0EC 8024161C 3C17800A */  lui       $s7, %hi(D_8009A66C)
+/* 97F0F0 80241620 26F7A66C */  addiu     $s7, $s7, %lo(D_8009A66C)
 /* 97F0F4 80241624 34420008 */  ori       $v0, $v0, 8
 /* 97F0F8 80241628 AFBF00F4 */  sw        $ra, 0xf4($sp)
 /* 97F0FC 8024162C AFBE00F0 */  sw        $fp, 0xf0($sp)
@@ -40,8 +40,8 @@ glabel func_80241610_97F0E0
 /* 97F16C 8024169C 24C200A0 */  addiu     $v0, $a2, 0xa0
 /* 97F170 802416A0 AC820004 */  sw        $v0, 4($a0)
 /* 97F174 802416A4 94C20000 */  lhu       $v0, ($a2)
-/* 97F178 802416A8 3C1E8024 */  lui       $fp, 0x8024
-/* 97F17C 802416AC 27DE2614 */  addiu     $fp, $fp, 0x2614
+/* 97F178 802416A8 3C1E8024 */  lui       $fp, %hi(D_80242614)
+/* 97F17C 802416AC 27DE2614 */  addiu     $fp, $fp, %lo(D_80242614)
 /* 97F180 802416B0 30420010 */  andi      $v0, $v0, 0x10
 /* 97F184 802416B4 14400007 */  bnez      $v0, .L802416D4
 /* 97F188 802416B8 24C400D4 */   addiu    $a0, $a2, 0xd4
@@ -53,8 +53,8 @@ glabel func_80241610_97F0E0
 /* 97F1A0 802416D0 ACA30004 */  sw        $v1, 4($a1)
 .L802416D4:
 /* 97F1A4 802416D4 3C180001 */  lui       $t8, 1
-/* 97F1A8 802416D8 3C12800A */  lui       $s2, 0x800a
-/* 97F1AC 802416DC 2652A674 */  addiu     $s2, $s2, -0x598c
+/* 97F1A8 802416D8 3C12800A */  lui       $s2, %hi(D_8009A674)
+/* 97F1AC 802416DC 2652A674 */  addiu     $s2, $s2, %lo(D_8009A674)
 /* 97F1B0 802416E0 AFB800C8 */  sw        $t8, 0xc8($sp)
 /* 97F1B4 802416E4 8EC50000 */  lw        $a1, ($s6)
 /* 97F1B8 802416E8 8E420000 */  lw        $v0, ($s2)
@@ -227,8 +227,8 @@ glabel func_80241610_97F0E0
 /* 97F454 80241984 0220282D */  daddu     $a1, $s1, $zero
 /* 97F458 80241988 0C019D80 */  jal       guMtxCatF
 /* 97F45C 8024198C 0220302D */   daddu    $a2, $s1, $zero
-/* 97F460 80241990 3C108007 */  lui       $s0, 0x8007
-/* 97F464 80241994 261041F0 */  addiu     $s0, $s0, 0x41f0
+/* 97F460 80241990 3C108007 */  lui       $s0, %hi(D_800741F0)
+/* 97F464 80241994 261041F0 */  addiu     $s0, $s0, %lo(D_800741F0)
 /* 97F468 80241998 0220202D */  daddu     $a0, $s1, $zero
 /* 97F46C 8024199C 96050000 */  lhu       $a1, ($s0)
 /* 97F470 802419A0 8E420000 */  lw        $v0, ($s2)
diff --git a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241B28_97F5F8.s b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241B28_97F5F8.s
index 69981efa5e..cbcbf25a29 100644
--- a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241B28_97F5F8.s
+++ b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241B28_97F5F8.s
@@ -11,8 +11,8 @@ glabel func_80241B28_97F5F8
 /* 97F610 80241B40 84440008 */   lh       $a0, 8($v0)
 /* 97F614 80241B44 27A40010 */  addiu     $a0, $sp, 0x10
 /* 97F618 80241B48 24050035 */  addiu     $a1, $zero, 0x35
-/* 97F61C 80241B4C 3C108024 */  lui       $s0, 0x8024
-/* 97F620 80241B50 26102614 */  addiu     $s0, $s0, 0x2614
+/* 97F61C 80241B4C 3C108024 */  lui       $s0, %hi(D_80242614)
+/* 97F620 80241B50 26102614 */  addiu     $s0, $s0, %lo(D_80242614)
 /* 97F624 80241B54 00A0182D */  daddu     $v1, $a1, $zero
 /* 97F628 80241B58 0040882D */  daddu     $s1, $v0, $zero
 /* 97F62C 80241B5C 0000302D */  daddu     $a2, $zero, $zero
@@ -21,8 +21,8 @@ glabel func_80241B28_97F5F8
 /* 97F638 80241B68 AE00000C */   sw       $zero, 0xc($s0)
 /* 97F63C 80241B6C C7A6001C */  lwc1      $f6, 0x1c($sp)
 /* 97F640 80241B70 468031A0 */  cvt.s.w   $f6, $f6
-/* 97F644 80241B74 3C018024 */  lui       $at, 0x8024
-/* 97F648 80241B78 D4202F38 */  ldc1      $f0, 0x2f38($at)
+/* 97F644 80241B74 3C018024 */  lui       $at, %hi(D_80242F38)
+/* 97F648 80241B78 D4202F38 */  ldc1      $f0, %lo(D_80242F38)($at)
 /* 97F64C 80241B7C 460030A1 */  cvt.d.s   $f2, $f6
 /* 97F650 80241B80 46201082 */  mul.d     $f2, $f2, $f0
 /* 97F654 80241B84 00000000 */  nop       
@@ -49,8 +49,8 @@ glabel func_80241B28_97F5F8
 /* 97F6A8 80241BD8 3C013F36 */  lui       $at, 0x3f36
 /* 97F6AC 80241BDC 3421DB6E */  ori       $at, $at, 0xdb6e
 /* 97F6B0 80241BE0 44810000 */  mtc1      $at, $f0
-/* 97F6B4 80241BE4 3C058024 */  lui       $a1, 0x8024
-/* 97F6B8 80241BE8 24A51610 */  addiu     $a1, $a1, 0x1610
+/* 97F6B4 80241BE4 3C058024 */  lui       $a1, %hi(D_80241610)
+/* 97F6B8 80241BE8 24A51610 */  addiu     $a1, $a1, %lo(D_80241610)
 /* 97F6BC 80241BEC AE00001C */  sw        $zero, 0x1c($s0)
 /* 97F6C0 80241BF0 AE000020 */  sw        $zero, 0x20($s0)
 /* 97F6C4 80241BF4 AE000024 */  sw        $zero, 0x24($s0)
diff --git a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241C34_97F704.s b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241C34_97F704.s
index 6efed8aa4d..5c4898bc1d 100644
--- a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241C34_97F704.s
+++ b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241C34_97F704.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80241C34_97F704
-/* 97F704 80241C34 3C048024 */  lui       $a0, 0x8024
-/* 97F708 80241C38 8C842618 */  lw        $a0, 0x2618($a0)
+/* 97F704 80241C34 3C048024 */  lui       $a0, %hi(D_80242618)
+/* 97F708 80241C38 8C842618 */  lw        $a0, %lo(D_80242618)($a0)
 /* 97F70C 80241C3C 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 97F710 80241C40 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 97F714 80241C44 0C048D70 */  jal       func_801235C0
diff --git a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241C5C_97F72C.s b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241C5C_97F72C.s
index a1f9fec5a8..20b2121617 100644
--- a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241C5C_97F72C.s
+++ b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241C5C_97F72C.s
@@ -23,11 +23,11 @@ glabel func_80241C5C_97F72C
 /* 97F774 80241CA4 44103000 */  mfc1      $s0, $f6
 /* 97F778 80241CA8 0C0B210B */  jal       get_float_variable
 /* 97F77C 80241CAC 0220202D */   daddu    $a0, $s1, $zero
-/* 97F780 80241CB0 3C028024 */  lui       $v0, 0x8024
-/* 97F784 80241CB4 24422614 */  addiu     $v0, $v0, 0x2614
+/* 97F780 80241CB0 3C028024 */  lui       $v0, %hi(D_80242614)
+/* 97F784 80241CB4 24422614 */  addiu     $v0, $v0, %lo(D_80242614)
 /* 97F788 80241CB8 C4420040 */  lwc1      $f2, 0x40($v0)
-/* 97F78C 80241CBC 3C018024 */  lui       $at, 0x8024
-/* 97F790 80241CC0 D4242F40 */  ldc1      $f4, 0x2f40($at)
+/* 97F78C 80241CBC 3C018024 */  lui       $at, %hi(D_80242F40)
+/* 97F790 80241CC0 D4242F40 */  ldc1      $f4, %lo(D_80242F40)($at)
 /* 97F794 80241CC4 460010A1 */  cvt.d.s   $f2, $f2
 /* 97F798 80241CC8 46241082 */  mul.d     $f2, $f2, $f4
 /* 97F79C 80241CCC 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241D44_97F814.s b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241D44_97F814.s
index 61e6abed2e..f75893bcc3 100644
--- a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241D44_97F814.s
+++ b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241D44_97F814.s
@@ -23,8 +23,8 @@ glabel func_80241D44_97F814
 /* 97F85C 80241D8C 44102000 */  mfc1      $s0, $f4
 /* 97F860 80241D90 0C0B210B */  jal       get_float_variable
 /* 97F864 80241D94 0220202D */   daddu    $a0, $s1, $zero
-/* 97F868 80241D98 3C038024 */  lui       $v1, 0x8024
-/* 97F86C 80241D9C 24632614 */  addiu     $v1, $v1, 0x2614
+/* 97F868 80241D98 3C038024 */  lui       $v1, %hi(D_80242614)
+/* 97F86C 80241D9C 24632614 */  addiu     $v1, $v1, %lo(D_80242614)
 /* 97F870 80241DA0 44921000 */  mtc1      $s2, $f2
 /* 97F874 80241DA4 00000000 */  nop       
 /* 97F878 80241DA8 468010A0 */  cvt.s.w   $f2, $f2
diff --git a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241DF8_97F8C8.s b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241DF8_97F8C8.s
index 65a55df53c..4d19b43f25 100644
--- a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241DF8_97F8C8.s
+++ b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241DF8_97F8C8.s
@@ -8,8 +8,8 @@ glabel func_80241DF8_97F8C8
 /* 97F8D4 80241E04 0C0B1EAF */  jal       get_variable
 /* 97F8D8 80241E08 8C450000 */   lw       $a1, ($v0)
 /* 97F8DC 80241E0C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 97F8E0 80241E10 3C018024 */  lui       $at, 0x8024
-/* 97F8E4 80241E14 AC22264C */  sw        $v0, 0x264c($at)
+/* 97F8E0 80241E10 3C018024 */  lui       $at, %hi(D_8024264C)
+/* 97F8E4 80241E14 AC22264C */  sw        $v0, %lo(D_8024264C)($at)
 /* 97F8E8 80241E18 24020002 */  addiu     $v0, $zero, 2
 /* 97F8EC 80241E1C 03E00008 */  jr        $ra
 /* 97F8F0 80241E20 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_isk/isk_08/984E30/func_8024007C_984EAC.s b/asm/nonmatchings/world/area_isk/isk_08/984E30/func_8024007C_984EAC.s
index 21d25b310b..4686d0abba 100644
--- a/asm/nonmatchings/world/area_isk/isk_08/984E30/func_8024007C_984EAC.s
+++ b/asm/nonmatchings/world/area_isk/isk_08/984E30/func_8024007C_984EAC.s
@@ -55,8 +55,8 @@ glabel func_8024007C_984EAC
 /* 984F68 80240138 8C470030 */   lw       $a3, 0x30($v0)
 /* 984F6C 8024013C C6020018 */  lwc1      $f2, 0x18($s0)
 /* 984F70 80240140 46020003 */  div.s     $f0, $f0, $f2
-/* 984F74 80240144 3C018024 */  lui       $at, 0x8024
-/* 984F78 80240148 D4221650 */  ldc1      $f2, 0x1650($at)
+/* 984F74 80240144 3C018024 */  lui       $at, %hi(D_80241650)
+/* 984F78 80240148 D4221650 */  ldc1      $f2, %lo(D_80241650)($at)
 /* 984F7C 8024014C 46000021 */  cvt.d.s   $f0, $f0
 /* 984F80 80240150 46220000 */  add.d     $f0, $f0, $f2
 /* 984F84 80240154 4620010D */  trunc.w.d $f4, $f0
diff --git a/asm/nonmatchings/world/area_isk/isk_08/984E30/func_80240394_9851C4.s b/asm/nonmatchings/world/area_isk/isk_08/984E30/func_80240394_9851C4.s
index 42a7c3d8b9..7dfd011c6f 100644
--- a/asm/nonmatchings/world/area_isk/isk_08/984E30/func_80240394_9851C4.s
+++ b/asm/nonmatchings/world/area_isk/isk_08/984E30/func_80240394_9851C4.s
@@ -279,9 +279,9 @@ glabel func_80240394_9851C4
 /* 9855B0 80240780 2C620015 */  sltiu     $v0, $v1, 0x15
 /* 9855B4 80240784 10400009 */  beqz      $v0, .L802407AC
 /* 9855B8 80240788 00031080 */   sll      $v0, $v1, 2
-/* 9855BC 8024078C 3C018024 */  lui       $at, 0x8024
+/* 9855BC 8024078C 3C018024 */  lui       $at, %hi(D_80241658)
 /* 9855C0 80240790 00220821 */  addu      $at, $at, $v0
-/* 9855C4 80240794 8C221658 */  lw        $v0, 0x1658($at)
+/* 9855C4 80240794 8C221658 */  lw        $v0, %lo(D_80241658)($at)
 /* 9855C8 80240798 00400008 */  jr        $v0
 /* 9855CC 8024079C 00000000 */   nop      
 /* 9855D0 802407A0 8E420028 */  lw        $v0, 0x28($s2)
diff --git a/asm/nonmatchings/world/area_isk/isk_09/9864E0/func_80240000_9864E0.s b/asm/nonmatchings/world/area_isk/isk_09/9864E0/func_80240000_9864E0.s
index 61d58c5cd2..be0aeb6788 100644
--- a/asm/nonmatchings/world/area_isk/isk_09/9864E0/func_80240000_9864E0.s
+++ b/asm/nonmatchings/world/area_isk/isk_09/9864E0/func_80240000_9864E0.s
@@ -4,8 +4,8 @@
 glabel func_80240000_9864E0
 /* 9864E0 80240000 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* 9864E4 80240004 AFB00010 */  sw        $s0, 0x10($sp)
-/* 9864E8 80240008 3C108024 */  lui       $s0, 0x8024
-/* 9864EC 8024000C 261006F0 */  addiu     $s0, $s0, 0x6f0
+/* 9864E8 80240008 3C108024 */  lui       $s0, %hi(D_802406F0)
+/* 9864EC 8024000C 261006F0 */  addiu     $s0, $s0, %lo(D_802406F0)
 /* 9864F0 80240010 AFBF0018 */  sw        $ra, 0x18($sp)
 /* 9864F4 80240014 AFB10014 */  sw        $s1, 0x14($sp)
 /* 9864F8 80240018 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_80240000_9864E0
 /* 98655C 8024007C 28620010 */  slti      $v0, $v1, 0x10
 /* 986560 80240080 1440FFFA */  bnez      $v0, .L8024006C
 /* 986564 80240084 24840004 */   addiu    $a0, $a0, 4
-/* 986568 80240088 3C108024 */  lui       $s0, 0x8024
-/* 98656C 8024008C 261006F0 */  addiu     $s0, $s0, 0x6f0
+/* 986568 80240088 3C108024 */  lui       $s0, %hi(D_802406F0)
+/* 98656C 8024008C 261006F0 */  addiu     $s0, $s0, %lo(D_802406F0)
 /* 986570 80240090 0C00AB4B */  jal       heap_free
 /* 986574 80240094 8E040000 */   lw       $a0, ($s0)
 /* 986578 80240098 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_802401CC_988D2C.s b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_802401CC_988D2C.s
index 45a2ece26c..236b0876ca 100644
--- a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_802401CC_988D2C.s
+++ b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_802401CC_988D2C.s
@@ -22,12 +22,12 @@ glabel func_802401CC_988D2C
 /* 988D70 80240210 0040982D */  daddu     $s3, $v0, $zero
 /* 988D74 80240214 0000B02D */  daddu     $s6, $zero, $zero
 /* 988D78 80240218 02C0902D */  daddu     $s2, $s6, $zero
-/* 988D7C 8024021C 3C148024 */  lui       $s4, 0x8024
-/* 988D80 80240220 26941108 */  addiu     $s4, $s4, 0x1108
+/* 988D7C 8024021C 3C148024 */  lui       $s4, %hi(D_80241108)
+/* 988D80 80240220 26941108 */  addiu     $s4, $s4, %lo(D_80241108)
 /* 988D84 80240224 0260882D */  daddu     $s1, $s3, $zero
 /* 988D88 80240228 8EA200B4 */  lw        $v0, 0xb4($s5)
-/* 988D8C 8024022C 3C038024 */  lui       $v1, 0x8024
-/* 988D90 80240230 24631100 */  addiu     $v1, $v1, 0x1100
+/* 988D8C 8024022C 3C038024 */  lui       $v1, %hi(D_80241100)
+/* 988D90 80240230 24631100 */  addiu     $v1, $v1, %lo(D_80241100)
 /* 988D94 80240234 AEB30078 */  sw        $s3, 0x78($s5)
 /* 988D98 80240238 00021027 */  nor       $v0, $zero, $v0
 /* 988D9C 8024023C 0002BFC2 */  srl       $s7, $v0, 0x1f
@@ -42,8 +42,8 @@ glabel func_802401CC_988D2C
 /* 988DBC 8024025C 5040002E */  beql      $v0, $zero, .L80240318
 /* 988DC0 80240260 26520001 */   addiu    $s2, $s2, 1
 /* 988DC4 80240264 00101100 */  sll       $v0, $s0, 4
-/* 988DC8 80240268 3C068009 */  lui       $a2, 0x8009
-/* 988DCC 8024026C 24C6EF20 */  addiu     $a2, $a2, -0x10e0
+/* 988DC8 80240268 3C068009 */  lui       $a2, %hi(D_8008EF20)
+/* 988DCC 8024026C 24C6EF20 */  addiu     $a2, $a2, %lo(D_8008EF20)
 /* 988DD0 80240270 00461021 */  addu      $v0, $v0, $a2
 /* 988DD4 80240274 0200202D */  daddu     $a0, $s0, $zero
 /* 988DD8 80240278 AE300108 */  sw        $s0, 0x108($s1)
@@ -54,15 +54,15 @@ glabel func_802401CC_988D2C
 /* 988DEC 8024028C 0040202D */  daddu     $a0, $v0, $zero
 /* 988DF0 80240290 04800011 */  bltz      $a0, .L802402D8
 /* 988DF4 80240294 00101080 */   sll      $v0, $s0, 2
-/* 988DF8 80240298 3C06800F */  lui       $a2, 0x800f
-/* 988DFC 8024029C 24C67F00 */  addiu     $a2, $a2, 0x7f00
+/* 988DF8 80240298 3C06800F */  lui       $a2, %hi(D_800F7F00)
+/* 988DFC 8024029C 24C67F00 */  addiu     $a2, $a2, %lo(D_800F7F00)
 /* 988E00 802402A0 00461021 */  addu      $v0, $v0, $a2
 /* 988E04 802402A4 8C430000 */  lw        $v1, ($v0)
 /* 988E08 802402A8 24020001 */  addiu     $v0, $zero, 1
 /* 988E0C 802402AC AE22018C */  sw        $v0, 0x18c($s1)
 /* 988E10 802402B0 00041080 */  sll       $v0, $a0, 2
-/* 988E14 802402B4 3C068024 */  lui       $a2, 0x8024
-/* 988E18 802402B8 24C61118 */  addiu     $a2, $a2, 0x1118
+/* 988E14 802402B4 3C068024 */  lui       $a2, %hi(D_80241118)
+/* 988E18 802402B8 24C61118 */  addiu     $a2, $a2, %lo(D_80241118)
 /* 988E1C 802402BC AE230000 */  sw        $v1, ($s1)
 /* 988E20 802402C0 001218C0 */  sll       $v1, $s2, 3
 /* 988E24 802402C4 00431021 */  addu      $v0, $v0, $v1
@@ -71,8 +71,8 @@ glabel func_802401CC_988D2C
 /* 988E30 802402D0 080900BF */  j         .L802402FC
 /* 988E34 802402D4 AE220294 */   sw       $v0, 0x294($s1)
 .L802402D8:
-/* 988E38 802402D8 3C06800F */  lui       $a2, 0x800f
-/* 988E3C 802402DC 24C67F40 */  addiu     $a2, $a2, 0x7f40
+/* 988E38 802402D8 3C06800F */  lui       $a2, %hi(D_800F7F40)
+/* 988E3C 802402DC 24C67F40 */  addiu     $a2, $a2, %lo(D_800F7F40)
 /* 988E40 802402E0 00461021 */  addu      $v0, $v0, $a2
 /* 988E44 802402E4 8C420000 */  lw        $v0, ($v0)
 /* 988E48 802402E8 AE20018C */  sw        $zero, 0x18c($s1)
@@ -130,9 +130,9 @@ glabel func_802401CC_988D2C
 /* 988F00 802403A0 02621021 */  addu      $v0, $s3, $v0
 /* 988F04 802403A4 8C420108 */  lw        $v0, 0x108($v0)
 /* 988F08 802403A8 00021100 */  sll       $v0, $v0, 4
-/* 988F0C 802403AC 3C038009 */  lui       $v1, 0x8009
+/* 988F0C 802403AC 3C038009 */  lui       $v1, %hi(D_8008EF20)
 /* 988F10 802403B0 00621821 */  addu      $v1, $v1, $v0
-/* 988F14 802403B4 8C63EF20 */  lw        $v1, -0x10e0($v1)
+/* 988F14 802403B4 8C63EF20 */  lw        $v1, %lo(D_8008EF20)($v1)
 /* 988F18 802403B8 8EA20074 */  lw        $v0, 0x74($s5)
 /* 988F1C 802403BC 2442FFFF */  addiu     $v0, $v0, -1
 /* 988F20 802403C0 00021080 */  sll       $v0, $v0, 2
diff --git a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240448_988FA8.s b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240448_988FA8.s
index 09a3bfe846..4cd4f4f1c2 100644
--- a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240448_988FA8.s
+++ b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240448_988FA8.s
@@ -7,9 +7,9 @@ glabel func_80240448_988FA8
 /* 988FB0 80240450 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 988FB4 80240454 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 988FB8 80240458 00021100 */  sll       $v0, $v0, 4
-/* 988FBC 8024045C 3C048009 */  lui       $a0, 0x8009
+/* 988FBC 8024045C 3C048009 */  lui       $a0, %hi(D_8008EF20)
 /* 988FC0 80240460 00822021 */  addu      $a0, $a0, $v0
-/* 988FC4 80240464 8C84EF20 */  lw        $a0, -0x10e0($a0)
+/* 988FC4 80240464 8C84EF20 */  lw        $a0, %lo(D_8008EF20)($a0)
 /* 988FC8 80240468 0C0496CF */  jal       set_message_string
 /* 988FCC 8024046C 0000282D */   daddu    $a1, $zero, $zero
 /* 988FD0 80240470 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240600_989160.s b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240600_989160.s
index 94ec916685..e9203e06d9 100644
--- a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240600_989160.s
+++ b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240600_989160.s
@@ -30,9 +30,9 @@ glabel func_80240600_989160
 /* 9891C4 80240664 000320C0 */  sll       $a0, $v1, 3
 /* 9891C8 80240668 00641821 */  addu      $v1, $v1, $a0
 /* 9891CC 8024066C 000318C0 */  sll       $v1, $v1, 3
-/* 9891D0 80240670 3C01800B */  lui       $at, 0x800b
+/* 9891D0 80240670 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* 9891D4 80240674 00230821 */  addu      $at, $at, $v1
-/* 9891D8 80240678 C42C1DEC */  lwc1      $f12, 0x1dec($at)
+/* 9891D8 80240678 C42C1DEC */  lwc1      $f12, %lo(D_800B1DEC)($at)
 /* 9891DC 8024067C 0C00A88D */  jal       sin_cos_deg
 /* 9891E0 80240680 0040A82D */   daddu    $s5, $v0, $zero
 /* 9891E4 80240684 1200005D */  beqz      $s0, .L802407FC
@@ -79,8 +79,8 @@ glabel func_80240600_989160
 /* 989284 80240724 26100004 */   addiu    $s0, $s0, 4
 /* 989288 80240728 0000882D */  daddu     $s1, $zero, $zero
 /* 98928C 8024072C 0240802D */  daddu     $s0, $s2, $zero
-/* 989290 80240730 3C148024 */  lui       $s4, 0x8024
-/* 989294 80240734 26941158 */  addiu     $s4, $s4, 0x1158
+/* 989290 80240730 3C148024 */  lui       $s4, %hi(D_80241158)
+/* 989294 80240734 26941158 */  addiu     $s4, $s4, %lo(D_80241158)
 /* 989298 80240738 3C014248 */  lui       $at, 0x4248
 /* 98929C 8024073C 4481A000 */  mtc1      $at, $f20
 /* 9892A0 80240740 24130044 */  addiu     $s3, $zero, 0x44
@@ -150,8 +150,8 @@ glabel func_80240600_989160
 /* 989394 80240834 00000000 */   nop      
 .L80240838:
 /* 989398 80240838 0000882D */  daddu     $s1, $zero, $zero
-/* 98939C 8024083C 3C148024 */  lui       $s4, 0x8024
-/* 9893A0 80240840 26941158 */  addiu     $s4, $s4, 0x1158
+/* 98939C 8024083C 3C148024 */  lui       $s4, %hi(D_80241158)
+/* 9893A0 80240840 26941158 */  addiu     $s4, $s4, %lo(D_80241158)
 /* 9893A4 80240844 24130020 */  addiu     $s3, $zero, 0x20
 /* 9893A8 80240848 3C064248 */  lui       $a2, 0x4248
 /* 9893AC 8024084C 44800000 */  mtc1      $zero, $f0
@@ -197,8 +197,8 @@ glabel func_80240600_989160
 /* 989448 802408E8 AE400060 */   sw       $zero, 0x60($s2)
 .L802408EC:
 /* 98944C 802408EC 0000882D */  daddu     $s1, $zero, $zero
-/* 989450 802408F0 3C148024 */  lui       $s4, 0x8024
-/* 989454 802408F4 26941158 */  addiu     $s4, $s4, 0x1158
+/* 989450 802408F0 3C148024 */  lui       $s4, %hi(D_80241158)
+/* 989454 802408F4 26941158 */  addiu     $s4, $s4, %lo(D_80241158)
 /* 989458 802408F8 24130020 */  addiu     $s3, $zero, 0x20
 /* 98945C 802408FC 0240802D */  daddu     $s0, $s2, $zero
 /* 989460 80240900 3C014248 */  lui       $at, 0x4248
diff --git a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240D38_989898.s b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240D38_989898.s
index 02b81e54e7..264efe9e96 100644
--- a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240D38_989898.s
+++ b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240D38_989898.s
@@ -5,8 +5,8 @@ glabel func_80240D38_989898
 /* 989898 80240D38 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 98989C 80240D3C 3C028011 */  lui       $v0, %hi(gPlayerStatus+0x18)
 /* 9898A0 80240D40 8442EFE0 */  lh        $v0, %lo(gPlayerStatus+0x18)($v0)
-/* 9898A4 80240D44 3C018024 */  lui       $at, 0x8024
-/* 9898A8 80240D48 D4201EA0 */  ldc1      $f0, 0x1ea0($at)
+/* 9898A4 80240D44 3C018024 */  lui       $at, %hi(D_80241EA0)
+/* 9898A8 80240D48 D4201EA0 */  ldc1      $f0, %lo(D_80241EA0)($at)
 /* 9898AC 80240D4C 2406FFFF */  addiu     $a2, $zero, -1
 /* 9898B0 80240D50 44821000 */  mtc1      $v0, $f2
 /* 9898B4 80240D54 00000000 */  nop       
@@ -17,8 +17,8 @@ glabel func_80240D38_989898
 /* 9898C8 80240D68 AFBF0010 */   sw       $ra, 0x10($sp)
 /* 9898CC 80240D6C 0000302D */  daddu     $a2, $zero, $zero
 .L80240D70:
-/* 9898D0 80240D70 3C018024 */  lui       $at, 0x8024
-/* 9898D4 80240D74 D4201EA8 */  ldc1      $f0, 0x1ea8($at)
+/* 9898D0 80240D70 3C018024 */  lui       $at, %hi(D_80241EA8)
+/* 9898D4 80240D74 D4201EA8 */  ldc1      $f0, %lo(D_80241EA8)($at)
 /* 9898D8 80240D78 4620103C */  c.lt.d    $f2, $f0
 /* 9898DC 80240D7C 00000000 */  nop       
 /* 9898E0 80240D80 45030001 */  bc1tl     .L80240D88
diff --git a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240230_98FA10.s b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240230_98FA10.s
index 17fd90daf4..5c94bbeb03 100644
--- a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240230_98FA10.s
+++ b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240230_98FA10.s
@@ -83,8 +83,8 @@ glabel func_80240230_98FA10
 /* 98FB3C 8024035C 27A5002C */   addiu    $a1, $sp, 0x2c
 /* 98FB40 80240360 C6000038 */  lwc1      $f0, 0x38($s0)
 /* 98FB44 80240364 860200A6 */  lh        $v0, 0xa6($s0)
-/* 98FB48 80240368 3C018024 */  lui       $at, 0x8024
-/* 98FB4C 8024036C D4222EB0 */  ldc1      $f2, 0x2eb0($at)
+/* 98FB48 80240368 3C018024 */  lui       $at, %hi(D_80242EB0)
+/* 98FB4C 8024036C D4222EB0 */  ldc1      $f2, %lo(D_80242EB0)($at)
 /* 98FB50 80240370 27A60030 */  addiu     $a2, $sp, 0x30
 /* 98FB54 80240374 E7A0002C */  swc1      $f0, 0x2c($sp)
 /* 98FB58 80240378 44820000 */  mtc1      $v0, $f0
diff --git a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240BF0_9903D0.s b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240BF0_9903D0.s
index 2fe962f256..bf43aca157 100644
--- a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240BF0_9903D0.s
+++ b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240BF0_9903D0.s
@@ -88,9 +88,9 @@ glabel func_80240BF0_9903D0
 /* 990514 80240D34 2C62000F */  sltiu     $v0, $v1, 0xf
 /* 990518 80240D38 1040002C */  beqz      $v0, .L80240DEC
 /* 99051C 80240D3C 00031080 */   sll      $v0, $v1, 2
-/* 990520 80240D40 3C018024 */  lui       $at, 0x8024
+/* 990520 80240D40 3C018024 */  lui       $at, %hi(D_80242EB8)
 /* 990524 80240D44 00220821 */  addu      $at, $at, $v0
-/* 990528 80240D48 8C222EB8 */  lw        $v0, 0x2eb8($at)
+/* 990528 80240D48 8C222EB8 */  lw        $v0, %lo(D_80242EB8)($at)
 /* 99052C 80240D4C 00400008 */  jr        $v0
 /* 990530 80240D50 00000000 */   nop      
 /* 990534 80240D54 0260202D */  daddu     $a0, $s3, $zero
diff --git a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240F3C_99071C.s b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240F3C_99071C.s
index 9f80c1af40..f2fb398515 100644
--- a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240F3C_99071C.s
+++ b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240F3C_99071C.s
@@ -69,9 +69,9 @@ glabel func_80240F3C_99071C
 /* 990818 80241038 2C62000F */  sltiu     $v0, $v1, 0xf
 /* 99081C 8024103C 10400028 */  beqz      $v0, .L802410E0
 /* 990820 80241040 00031080 */   sll      $v0, $v1, 2
-/* 990824 80241044 3C018024 */  lui       $at, 0x8024
+/* 990824 80241044 3C018024 */  lui       $at, %hi(D_80242EF8)
 /* 990828 80241048 00220821 */  addu      $at, $at, $v0
-/* 99082C 8024104C 8C222EF8 */  lw        $v0, 0x2ef8($at)
+/* 99082C 8024104C 8C222EF8 */  lw        $v0, %lo(D_80242EF8)($at)
 /* 990830 80241050 00400008 */  jr        $v0
 /* 990834 80241054 00000000 */   nop      
 /* 990838 80241058 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241610_990DF0.s b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241610_990DF0.s
index c5d49f38b2..47283cfe22 100644
--- a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241610_990DF0.s
+++ b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241610_990DF0.s
@@ -20,8 +20,8 @@ glabel func_80241610_990DF0
 /* 990E2C 8024164C 0C0B1EAF */  jal       get_variable
 /* 990E30 80241650 34A50F8A */   ori      $a1, $a1, 0xf8a
 /* 990E34 80241654 3C03DC08 */  lui       $v1, 0xdc08
-/* 990E38 80241658 3C1E800A */  lui       $fp, 0x800a
-/* 990E3C 8024165C 27DEA66C */  addiu     $fp, $fp, -0x5994
+/* 990E38 80241658 3C1E800A */  lui       $fp, %hi(D_8009A66C)
+/* 990E3C 8024165C 27DEA66C */  addiu     $fp, $fp, %lo(D_8009A66C)
 /* 990E40 80241660 34630008 */  ori       $v1, $v1, 8
 /* 990E44 80241664 8FC60000 */  lw        $a2, ($fp)
 /* 990E48 80241668 3C168007 */  lui       $s6, %hi(gCurrentCameraID)
@@ -56,8 +56,8 @@ glabel func_80241610_990DF0
 .L802416DC:
 /* 990EBC 802416DC 248400D4 */  addiu     $a0, $a0, 0xd4
 /* 990EC0 802416E0 3C180001 */  lui       $t8, 1
-/* 990EC4 802416E4 3C12800A */  lui       $s2, 0x800a
-/* 990EC8 802416E8 2652A674 */  addiu     $s2, $s2, -0x598c
+/* 990EC4 802416E4 3C12800A */  lui       $s2, %hi(D_8009A674)
+/* 990EC8 802416E8 2652A674 */  addiu     $s2, $s2, %lo(D_8009A674)
 /* 990ECC 802416EC AFB800C8 */  sw        $t8, 0xc8($sp)
 /* 990ED0 802416F0 8EC50000 */  lw        $a1, ($s6)
 /* 990ED4 802416F4 8E420000 */  lw        $v0, ($s2)
@@ -230,8 +230,8 @@ glabel func_80241610_990DF0
 /* 991170 80241990 0220282D */  daddu     $a1, $s1, $zero
 /* 991174 80241994 0C019D80 */  jal       guMtxCatF
 /* 991178 80241998 0220302D */   daddu    $a2, $s1, $zero
-/* 99117C 8024199C 3C108007 */  lui       $s0, 0x8007
-/* 991180 802419A0 261041F0 */  addiu     $s0, $s0, 0x41f0
+/* 99117C 8024199C 3C108007 */  lui       $s0, %hi(D_800741F0)
+/* 991180 802419A0 261041F0 */  addiu     $s0, $s0, %lo(D_800741F0)
 /* 991184 802419A4 0220202D */  daddu     $a0, $s1, $zero
 /* 991188 802419A8 96050000 */  lhu       $a1, ($s0)
 /* 99118C 802419AC 8E420000 */  lw        $v0, ($s2)
@@ -339,8 +339,8 @@ glabel func_80241610_990DF0
 /* 99131C 80241B3C 0C04EBDC */  jal       func_8013AF70
 /* 991320 80241B40 27A70048 */   addiu    $a3, $sp, 0x48
 /* 991324 80241B44 3C05D838 */  lui       $a1, 0xd838
-/* 991328 80241B48 3C03800A */  lui       $v1, 0x800a
-/* 99132C 80241B4C 2463A66C */  addiu     $v1, $v1, -0x5994
+/* 991328 80241B48 3C03800A */  lui       $v1, %hi(D_8009A66C)
+/* 99132C 80241B4C 2463A66C */  addiu     $v1, $v1, %lo(D_8009A66C)
 /* 991330 80241B50 8C620000 */  lw        $v0, ($v1)
 /* 991334 80241B54 34A50002 */  ori       $a1, $a1, 2
 /* 991338 80241B58 0040202D */  daddu     $a0, $v0, $zero
diff --git a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241BA8_991388.s b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241BA8_991388.s
index 3bfd31b324..b467f8a491 100644
--- a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241BA8_991388.s
+++ b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241BA8_991388.s
@@ -30,8 +30,8 @@ glabel func_80241BA8_991388
 /* 9913EC 80241C0C 46800020 */  cvt.s.w   $f0, $f0
 /* 9913F0 80241C10 E6000050 */  swc1      $f0, 0x50($s0)
 /* 9913F4 80241C14 46000086 */  mov.s     $f2, $f0
-/* 9913F8 80241C18 3C018024 */  lui       $at, 0x8024
-/* 9913FC 80241C1C D4202F38 */  ldc1      $f0, 0x2f38($at)
+/* 9913F8 80241C18 3C018024 */  lui       $at, %hi(D_80242F38)
+/* 9913FC 80241C1C D4202F38 */  ldc1      $f0, %lo(D_80242F38)($at)
 /* 991400 80241C20 460010A1 */  cvt.d.s   $f2, $f2
 /* 991404 80241C24 46201082 */  mul.d     $f2, $f2, $f0
 /* 991408 80241C28 00000000 */  nop       
@@ -61,8 +61,8 @@ glabel func_80241BA8_991388
 /* 991468 80241C88 3C013F36 */  lui       $at, 0x3f36
 /* 99146C 80241C8C 3421DB6E */  ori       $at, $at, 0xdb6e
 /* 991470 80241C90 44810000 */  mtc1      $at, $f0
-/* 991474 80241C94 3C058024 */  lui       $a1, 0x8024
-/* 991478 80241C98 24A51610 */  addiu     $a1, $a1, 0x1610
+/* 991474 80241C94 3C058024 */  lui       $a1, %hi(D_80241610)
+/* 991478 80241C98 24A51610 */  addiu     $a1, $a1, %lo(D_80241610)
 /* 99147C 80241C9C AE000020 */  sw        $zero, 0x20($s0)
 /* 991480 80241CA0 AE000024 */  sw        $zero, 0x24($s0)
 /* 991484 80241CA4 E6020028 */  swc1      $f2, 0x28($s0)
diff --git a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241D38_991518.s b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241D38_991518.s
index bdc5d5830a..5829ffa6ac 100644
--- a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241D38_991518.s
+++ b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241D38_991518.s
@@ -32,8 +32,8 @@ glabel func_80241D38_991518
 /* 991584 80241DA4 34A50F8A */   ori      $a1, $a1, 0xf8a
 /* 991588 80241DA8 0040182D */  daddu     $v1, $v0, $zero
 /* 99158C 80241DAC C4600050 */  lwc1      $f0, 0x50($v1)
-/* 991590 80241DB0 3C018024 */  lui       $at, 0x8024
-/* 991594 80241DB4 D4222F40 */  ldc1      $f2, 0x2f40($at)
+/* 991590 80241DB0 3C018024 */  lui       $at, %hi(D_80242F40)
+/* 991594 80241DB4 D4222F40 */  ldc1      $f2, %lo(D_80242F40)($at)
 /* 991598 80241DB8 46000021 */  cvt.d.s   $f0, $f0
 /* 99159C 80241DBC 46220002 */  mul.d     $f0, $f0, $f2
 /* 9915A0 80241DC0 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240230_992960.s b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240230_992960.s
index bf8537515d..46b9f25540 100644
--- a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240230_992960.s
+++ b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240230_992960.s
@@ -83,8 +83,8 @@ glabel func_80240230_992960
 /* 992A8C 8024035C 27A5002C */   addiu    $a1, $sp, 0x2c
 /* 992A90 80240360 C6000038 */  lwc1      $f0, 0x38($s0)
 /* 992A94 80240364 860200A6 */  lh        $v0, 0xa6($s0)
-/* 992A98 80240368 3C018024 */  lui       $at, 0x8024
-/* 992A9C 8024036C D4222A30 */  ldc1      $f2, 0x2a30($at)
+/* 992A98 80240368 3C018024 */  lui       $at, %hi(D_80242A30)
+/* 992A9C 8024036C D4222A30 */  ldc1      $f2, %lo(D_80242A30)($at)
 /* 992AA0 80240370 27A60030 */  addiu     $a2, $sp, 0x30
 /* 992AA4 80240374 E7A0002C */  swc1      $f0, 0x2c($sp)
 /* 992AA8 80240378 44820000 */  mtc1      $v0, $f0
diff --git a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240BF0_993320.s b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240BF0_993320.s
index 9d5bdcf89d..285469a46c 100644
--- a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240BF0_993320.s
+++ b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240BF0_993320.s
@@ -88,9 +88,9 @@ glabel func_80240BF0_993320
 /* 993464 80240D34 2C62000F */  sltiu     $v0, $v1, 0xf
 /* 993468 80240D38 1040002C */  beqz      $v0, .L80240DEC
 /* 99346C 80240D3C 00031080 */   sll      $v0, $v1, 2
-/* 993470 80240D40 3C018024 */  lui       $at, 0x8024
+/* 993470 80240D40 3C018024 */  lui       $at, %hi(D_80242A38)
 /* 993474 80240D44 00220821 */  addu      $at, $at, $v0
-/* 993478 80240D48 8C222A38 */  lw        $v0, 0x2a38($at)
+/* 993478 80240D48 8C222A38 */  lw        $v0, %lo(D_80242A38)($at)
 /* 99347C 80240D4C 00400008 */  jr        $v0
 /* 993480 80240D50 00000000 */   nop      
 /* 993484 80240D54 0260202D */  daddu     $a0, $s3, $zero
diff --git a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240F3C_99366C.s b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240F3C_99366C.s
index 9bbc92e817..05d3abb94f 100644
--- a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240F3C_99366C.s
+++ b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240F3C_99366C.s
@@ -69,9 +69,9 @@ glabel func_80240F3C_99366C
 /* 993768 80241038 2C62000F */  sltiu     $v0, $v1, 0xf
 /* 99376C 8024103C 10400028 */  beqz      $v0, .L802410E0
 /* 993770 80241040 00031080 */   sll      $v0, $v1, 2
-/* 993774 80241044 3C018024 */  lui       $at, 0x8024
+/* 993774 80241044 3C018024 */  lui       $at, %hi(D_80242A78)
 /* 993778 80241048 00220821 */  addu      $at, $at, $v0
-/* 99377C 8024104C 8C222A78 */  lw        $v0, 0x2a78($at)
+/* 99377C 8024104C 8C222A78 */  lw        $v0, %lo(D_80242A78)($at)
 /* 993780 80241050 00400008 */  jr        $v0
 /* 993784 80241054 00000000 */   nop      
 /* 993788 80241058 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241610_993D40.s b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241610_993D40.s
index 2da4925817..96778cdf3b 100644
--- a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241610_993D40.s
+++ b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241610_993D40.s
@@ -5,8 +5,8 @@ glabel func_80241610_993D40
 /* 993D40 80241610 27BDFF00 */  addiu     $sp, $sp, -0x100
 /* 993D44 80241614 3C02DC08 */  lui       $v0, 0xdc08
 /* 993D48 80241618 AFB700E4 */  sw        $s7, 0xe4($sp)
-/* 993D4C 8024161C 3C17800A */  lui       $s7, 0x800a
-/* 993D50 80241620 26F7A66C */  addiu     $s7, $s7, -0x5994
+/* 993D4C 8024161C 3C17800A */  lui       $s7, %hi(D_8009A66C)
+/* 993D50 80241620 26F7A66C */  addiu     $s7, $s7, %lo(D_8009A66C)
 /* 993D54 80241624 34420008 */  ori       $v0, $v0, 8
 /* 993D58 80241628 AFBF00EC */  sw        $ra, 0xec($sp)
 /* 993D5C 8024162C AFBE00E8 */  sw        $fp, 0xe8($sp)
@@ -40,8 +40,8 @@ glabel func_80241610_993D40
 /* 993DCC 8024169C 24C200A0 */  addiu     $v0, $a2, 0xa0
 /* 993DD0 802416A0 AC820004 */  sw        $v0, 4($a0)
 /* 993DD4 802416A4 94C20000 */  lhu       $v0, ($a2)
-/* 993DD8 802416A8 3C1E8024 */  lui       $fp, 0x8024
-/* 993DDC 802416AC 27DE2AC0 */  addiu     $fp, $fp, 0x2ac0
+/* 993DD8 802416A8 3C1E8024 */  lui       $fp, %hi(D_80242AC0)
+/* 993DDC 802416AC 27DE2AC0 */  addiu     $fp, $fp, %lo(D_80242AC0)
 /* 993DE0 802416B0 30420010 */  andi      $v0, $v0, 0x10
 /* 993DE4 802416B4 14400007 */  bnez      $v0, .L802416D4
 /* 993DE8 802416B8 24C400D4 */   addiu    $a0, $a2, 0xd4
@@ -53,8 +53,8 @@ glabel func_80241610_993D40
 /* 993E00 802416D0 ACA30004 */  sw        $v1, 4($a1)
 .L802416D4:
 /* 993E04 802416D4 3C180001 */  lui       $t8, 1
-/* 993E08 802416D8 3C12800A */  lui       $s2, 0x800a
-/* 993E0C 802416DC 2652A674 */  addiu     $s2, $s2, -0x598c
+/* 993E08 802416D8 3C12800A */  lui       $s2, %hi(D_8009A674)
+/* 993E0C 802416DC 2652A674 */  addiu     $s2, $s2, %lo(D_8009A674)
 /* 993E10 802416E0 AFB800C0 */  sw        $t8, 0xc0($sp)
 /* 993E14 802416E4 8EC50000 */  lw        $a1, ($s6)
 /* 993E18 802416E8 8E420000 */  lw        $v0, ($s2)
@@ -227,8 +227,8 @@ glabel func_80241610_993D40
 /* 9940B4 80241984 0220282D */  daddu     $a1, $s1, $zero
 /* 9940B8 80241988 0C019D80 */  jal       guMtxCatF
 /* 9940BC 8024198C 0220302D */   daddu    $a2, $s1, $zero
-/* 9940C0 80241990 3C108007 */  lui       $s0, 0x8007
-/* 9940C4 80241994 261041F0 */  addiu     $s0, $s0, 0x41f0
+/* 9940C0 80241990 3C108007 */  lui       $s0, %hi(D_800741F0)
+/* 9940C4 80241994 261041F0 */  addiu     $s0, $s0, %lo(D_800741F0)
 /* 9940C8 80241998 0220202D */  daddu     $a0, $s1, $zero
 /* 9940CC 8024199C 96050000 */  lhu       $a1, ($s0)
 /* 9940D0 802419A0 8E420000 */  lw        $v0, ($s2)
diff --git a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241AF0_994220.s b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241AF0_994220.s
index f262abc8de..b22b5da554 100644
--- a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241AF0_994220.s
+++ b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241AF0_994220.s
@@ -11,8 +11,8 @@ glabel func_80241AF0_994220
 /* 994238 80241B08 84440008 */   lh       $a0, 8($v0)
 /* 99423C 80241B0C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 994240 80241B10 24050035 */  addiu     $a1, $zero, 0x35
-/* 994244 80241B14 3C108024 */  lui       $s0, 0x8024
-/* 994248 80241B18 26102AC0 */  addiu     $s0, $s0, 0x2ac0
+/* 994244 80241B14 3C108024 */  lui       $s0, %hi(D_80242AC0)
+/* 994248 80241B18 26102AC0 */  addiu     $s0, $s0, %lo(D_80242AC0)
 /* 99424C 80241B1C 00A0182D */  daddu     $v1, $a1, $zero
 /* 994250 80241B20 0040882D */  daddu     $s1, $v0, $zero
 /* 994254 80241B24 0000302D */  daddu     $a2, $zero, $zero
@@ -36,8 +36,8 @@ glabel func_80241AF0_994220
 /* 99429C 80241B6C 3C013F36 */  lui       $at, 0x3f36
 /* 9942A0 80241B70 3421DB6E */  ori       $at, $at, 0xdb6e
 /* 9942A4 80241B74 44810000 */  mtc1      $at, $f0
-/* 9942A8 80241B78 3C058024 */  lui       $a1, 0x8024
-/* 9942AC 80241B7C 24A51610 */  addiu     $a1, $a1, 0x1610
+/* 9942A8 80241B78 3C058024 */  lui       $a1, %hi(D_80241610)
+/* 9942AC 80241B7C 24A51610 */  addiu     $a1, $a1, %lo(D_80241610)
 /* 9942B0 80241B80 AE00001C */  sw        $zero, 0x1c($s0)
 /* 9942B4 80241B84 AE000020 */  sw        $zero, 0x20($s0)
 /* 9942B8 80241B88 AE000024 */  sw        $zero, 0x24($s0)
diff --git a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241BC4_9942F4.s b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241BC4_9942F4.s
index e4357ec2ea..05450d6373 100644
--- a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241BC4_9942F4.s
+++ b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241BC4_9942F4.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80241BC4_9942F4
-/* 9942F4 80241BC4 3C048024 */  lui       $a0, 0x8024
-/* 9942F8 80241BC8 8C842AC4 */  lw        $a0, 0x2ac4($a0)
+/* 9942F4 80241BC4 3C048024 */  lui       $a0, %hi(D_80242AC4)
+/* 9942F8 80241BC8 8C842AC4 */  lw        $a0, %lo(D_80242AC4)($a0)
 /* 9942FC 80241BCC 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 994300 80241BD0 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 994304 80241BD4 0C048D70 */  jal       func_801235C0
diff --git a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241BEC_99431C.s b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241BEC_99431C.s
index f99bbafb66..dd4bb0fcaa 100644
--- a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241BEC_99431C.s
+++ b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241BEC_99431C.s
@@ -23,8 +23,8 @@ glabel func_80241BEC_99431C
 /* 994364 80241C34 44102000 */  mfc1      $s0, $f4
 /* 994368 80241C38 0C0B210B */  jal       get_float_variable
 /* 99436C 80241C3C 0220202D */   daddu    $a0, $s1, $zero
-/* 994370 80241C40 3C038024 */  lui       $v1, 0x8024
-/* 994374 80241C44 24632AC0 */  addiu     $v1, $v1, 0x2ac0
+/* 994370 80241C40 3C038024 */  lui       $v1, %hi(D_80242AC0)
+/* 994374 80241C44 24632AC0 */  addiu     $v1, $v1, %lo(D_80242AC0)
 /* 994378 80241C48 44921000 */  mtc1      $s2, $f2
 /* 99437C 80241C4C 00000000 */  nop       
 /* 994380 80241C50 468010A0 */  cvt.s.w   $f2, $f2
diff --git a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241CA0_9943D0.s b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241CA0_9943D0.s
index 112d07520c..561799b425 100644
--- a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241CA0_9943D0.s
+++ b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241CA0_9943D0.s
@@ -23,8 +23,8 @@ glabel func_80241CA0_9943D0
 /* 994418 80241CE8 44102000 */  mfc1      $s0, $f4
 /* 99441C 80241CEC 0C0B210B */  jal       get_float_variable
 /* 994420 80241CF0 0220202D */   daddu    $a0, $s1, $zero
-/* 994424 80241CF4 3C038024 */  lui       $v1, 0x8024
-/* 994428 80241CF8 24632AC0 */  addiu     $v1, $v1, 0x2ac0
+/* 994424 80241CF4 3C038024 */  lui       $v1, %hi(D_80242AC0)
+/* 994428 80241CF8 24632AC0 */  addiu     $v1, $v1, %lo(D_80242AC0)
 /* 99442C 80241CFC 44921000 */  mtc1      $s2, $f2
 /* 994430 80241D00 00000000 */  nop       
 /* 994434 80241D04 468010A0 */  cvt.s.w   $f2, $f2
diff --git a/asm/nonmatchings/world/area_isk/isk_16/9951F0/func_802401AC_99539C.s b/asm/nonmatchings/world/area_isk/isk_16/9951F0/func_802401AC_99539C.s
index a4d4ae6975..435a259633 100644
--- a/asm/nonmatchings/world/area_isk/isk_16/9951F0/func_802401AC_99539C.s
+++ b/asm/nonmatchings/world/area_isk/isk_16/9951F0/func_802401AC_99539C.s
@@ -13,9 +13,9 @@ glabel func_802401AC_99539C
 /* 9953BC 802401CC 2C620005 */  sltiu     $v0, $v1, 5
 /* 9953C0 802401D0 1040008A */  beqz      $v0, .L802403FC
 /* 9953C4 802401D4 00031080 */   sll      $v0, $v1, 2
-/* 9953C8 802401D8 3C018024 */  lui       $at, 0x8024
+/* 9953C8 802401D8 3C018024 */  lui       $at, %hi(D_80242D50)
 /* 9953CC 802401DC 00220821 */  addu      $at, $at, $v0
-/* 9953D0 802401E0 8C222D50 */  lw        $v0, 0x2d50($at)
+/* 9953D0 802401E0 8C222D50 */  lw        $v0, %lo(D_80242D50)($at)
 /* 9953D4 802401E4 00400008 */  jr        $v0
 /* 9953D8 802401E8 00000000 */   nop      
 /* 9953DC 802401EC 8E22003C */  lw        $v0, 0x3c($s1)
diff --git a/asm/nonmatchings/world/area_isk/isk_16/9959F0/func_80240800_9959F0.s b/asm/nonmatchings/world/area_isk/isk_16/9959F0/func_80240800_9959F0.s
index a61f407176..9659535dfe 100644
--- a/asm/nonmatchings/world/area_isk/isk_16/9959F0/func_80240800_9959F0.s
+++ b/asm/nonmatchings/world/area_isk/isk_16/9959F0/func_80240800_9959F0.s
@@ -71,8 +71,8 @@ glabel func_80240800_9959F0
 /* 995AE4 802408F4 08090235 */  j         .L802408D4
 /* 995AE8 802408F8 00000000 */   nop      
 .L802408FC:
-/* 995AEC 802408FC 3C028015 */  lui       $v0, 0x8015
-/* 995AF0 80240900 8C4212F0 */  lw        $v0, 0x12f0($v0)
+/* 995AEC 802408FC 3C028015 */  lui       $v0, %hi(D_801512F0)
+/* 995AF0 80240900 8C4212F0 */  lw        $v0, %lo(D_801512F0)($v0)
 /* 995AF4 80240904 A0510000 */  sb        $s1, ($v0)
 .L80240908:
 /* 995AF8 80240908 24020002 */  addiu     $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_isk/isk_18/997F70/func_8024007C_997FEC.s b/asm/nonmatchings/world/area_isk/isk_18/997F70/func_8024007C_997FEC.s
index d37479a8b7..4ebac89bd6 100644
--- a/asm/nonmatchings/world/area_isk/isk_18/997F70/func_8024007C_997FEC.s
+++ b/asm/nonmatchings/world/area_isk/isk_18/997F70/func_8024007C_997FEC.s
@@ -55,8 +55,8 @@ glabel func_8024007C_997FEC
 /* 9980A8 80240138 8C470030 */   lw       $a3, 0x30($v0)
 /* 9980AC 8024013C C6020018 */  lwc1      $f2, 0x18($s0)
 /* 9980B0 80240140 46020003 */  div.s     $f0, $f0, $f2
-/* 9980B4 80240144 3C018024 */  lui       $at, 0x8024
-/* 9980B8 80240148 D4221770 */  ldc1      $f2, 0x1770($at)
+/* 9980B4 80240144 3C018024 */  lui       $at, %hi(D_80241770)
+/* 9980B8 80240148 D4221770 */  ldc1      $f2, %lo(D_80241770)($at)
 /* 9980BC 8024014C 46000021 */  cvt.d.s   $f0, $f0
 /* 9980C0 80240150 46220000 */  add.d     $f0, $f0, $f2
 /* 9980C4 80240154 4620010D */  trunc.w.d $f4, $f0
diff --git a/asm/nonmatchings/world/area_isk/isk_18/997F70/func_80240394_998304.s b/asm/nonmatchings/world/area_isk/isk_18/997F70/func_80240394_998304.s
index 2da63f1ef2..69d9b95c62 100644
--- a/asm/nonmatchings/world/area_isk/isk_18/997F70/func_80240394_998304.s
+++ b/asm/nonmatchings/world/area_isk/isk_18/997F70/func_80240394_998304.s
@@ -279,9 +279,9 @@ glabel func_80240394_998304
 /* 9986F0 80240780 2C620015 */  sltiu     $v0, $v1, 0x15
 /* 9986F4 80240784 10400009 */  beqz      $v0, .L802407AC
 /* 9986F8 80240788 00031080 */   sll      $v0, $v1, 2
-/* 9986FC 8024078C 3C018024 */  lui       $at, 0x8024
+/* 9986FC 8024078C 3C018024 */  lui       $at, %hi(D_80241778)
 /* 998700 80240790 00220821 */  addu      $at, $at, $v0
-/* 998704 80240794 8C221778 */  lw        $v0, 0x1778($at)
+/* 998704 80240794 8C221778 */  lw        $v0, %lo(D_80241778)($at)
 /* 998708 80240798 00400008 */  jr        $v0
 /* 99870C 8024079C 00000000 */   nop      
 /* 998710 802407A0 8E420028 */  lw        $v0, 0x28($s2)
diff --git a/asm/nonmatchings/world/area_iwa/iwa_00/90CC40/func_80240000_90CC40.s b/asm/nonmatchings/world/area_iwa/iwa_00/90CC40/func_80240000_90CC40.s
index 9137f14794..2291e189eb 100644
--- a/asm/nonmatchings/world/area_iwa/iwa_00/90CC40/func_80240000_90CC40.s
+++ b/asm/nonmatchings/world/area_iwa/iwa_00/90CC40/func_80240000_90CC40.s
@@ -4,8 +4,8 @@
 glabel func_80240000_90CC40
 /* 90CC40 80240000 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* 90CC44 80240004 AFB00010 */  sw        $s0, 0x10($sp)
-/* 90CC48 80240008 3C108024 */  lui       $s0, 0x8024
-/* 90CC4C 8024000C 26100FF8 */  addiu     $s0, $s0, 0xff8
+/* 90CC48 80240008 3C108024 */  lui       $s0, %hi(D_80240FF8)
+/* 90CC4C 8024000C 26100FF8 */  addiu     $s0, $s0, %lo(D_80240FF8)
 /* 90CC50 80240010 AFBF0018 */  sw        $ra, 0x18($sp)
 /* 90CC54 80240014 AFB10014 */  sw        $s1, 0x14($sp)
 /* 90CC58 80240018 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_80240000_90CC40
 /* 90CCBC 8024007C 28620010 */  slti      $v0, $v1, 0x10
 /* 90CCC0 80240080 1440FFFA */  bnez      $v0, .L8024006C
 /* 90CCC4 80240084 24840004 */   addiu    $a0, $a0, 4
-/* 90CCC8 80240088 3C108024 */  lui       $s0, 0x8024
-/* 90CCCC 8024008C 26100FF8 */  addiu     $s0, $s0, 0xff8
+/* 90CCC8 80240088 3C108024 */  lui       $s0, %hi(D_80240FF8)
+/* 90CCCC 8024008C 26100FF8 */  addiu     $s0, $s0, %lo(D_80240FF8)
 /* 90CCD0 80240090 0C00AB4B */  jal       heap_free
 /* 90CCD4 80240094 8E040000 */   lw       $a0, ($s0)
 /* 90CCD8 80240098 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90F6B0/func_80240000_90F6B0.s b/asm/nonmatchings/world/area_iwa/iwa_01/90F6B0/func_80240000_90F6B0.s
index c3a71e1941..b4e8341a1e 100644
--- a/asm/nonmatchings/world/area_iwa/iwa_01/90F6B0/func_80240000_90F6B0.s
+++ b/asm/nonmatchings/world/area_iwa/iwa_01/90F6B0/func_80240000_90F6B0.s
@@ -20,21 +20,21 @@ glabel func_80240000_90F6B0
 /* 90F6EC 8024003C 34A50F8F */   ori      $a1, $a1, 0xf8f
 /* 90F6F0 80240040 0040882D */  daddu     $s1, $v0, $zero
 /* 90F6F4 80240044 0000982D */  daddu     $s3, $zero, $zero
-/* 90F6F8 80240048 3C12800A */  lui       $s2, 0x800a
-/* 90F6FC 8024004C 2652A66C */  addiu     $s2, $s2, -0x5994
-/* 90F700 80240050 3C16800A */  lui       $s6, 0x800a
-/* 90F704 80240054 26D6A674 */  addiu     $s6, $s6, -0x598c
-/* 90F708 80240058 3C158007 */  lui       $s5, 0x8007
-/* 90F70C 8024005C 26B541F0 */  addiu     $s5, $s5, 0x41f0
+/* 90F6F8 80240048 3C12800A */  lui       $s2, %hi(D_8009A66C)
+/* 90F6FC 8024004C 2652A66C */  addiu     $s2, $s2, %lo(D_8009A66C)
+/* 90F700 80240050 3C16800A */  lui       $s6, %hi(D_8009A674)
+/* 90F704 80240054 26D6A674 */  addiu     $s6, $s6, %lo(D_8009A674)
+/* 90F708 80240058 3C158007 */  lui       $s5, %hi(D_800741F0)
+/* 90F70C 8024005C 26B541F0 */  addiu     $s5, $s5, %lo(D_800741F0)
 /* 90F710 80240060 3C140001 */  lui       $s4, 1
 /* 90F714 80240064 36941630 */  ori       $s4, $s4, 0x1630
 /* 90F718 80240068 26300018 */  addiu     $s0, $s1, 0x18
-/* 90F71C 8024006C 3C01C1F0 */  lui       $at, 0xc1f0
+/* 90F71C 8024006C 3C01C1F0 */  lui       $at, %hi(D_C1F06370)
 /* 90F720 80240070 4481C000 */  mtc1      $at, $f24
 /* 90F724 80240074 3C014120 */  lui       $at, 0x4120
 /* 90F728 80240078 4481B000 */  mtc1      $at, $f22
-/* 90F72C 8024007C 3C018024 */  lui       $at, 0x8024
-/* 90F730 80240080 D4346370 */  ldc1      $f20, 0x6370($at)
+/* 90F72C 8024007C 3C018024 */  lui       $at, %hi(D_80246370)
+/* 90F730 80240080 D4346370 */  ldc1      $f20, %lo(D_C1F06370)($at)
 .L80240084:
 /* 90F734 80240084 C600FFEC */  lwc1      $f0, -0x14($s0)
 /* 90F738 80240088 4618003C */  c.lt.s    $f0, $f24
@@ -97,8 +97,8 @@ glabel func_80240000_90F6B0
 /* 90F818 80240168 46341082 */  mul.d     $f2, $f2, $f20
 /* 90F81C 8024016C 00000000 */  nop       
 /* 90F820 80240170 C6000008 */  lwc1      $f0, 8($s0)
-/* 90F824 80240174 3C018024 */  lui       $at, 0x8024
-/* 90F828 80240178 D4266378 */  ldc1      $f6, 0x6378($at)
+/* 90F824 80240174 3C018024 */  lui       $at, %hi(D_80246378)
+/* 90F828 80240178 D4266378 */  ldc1      $f6, %lo(D_80246378)($at)
 /* 90F82C 8024017C 46000021 */  cvt.d.s   $f0, $f0
 /* 90F830 80240180 46260000 */  add.d     $f0, $f0, $f6
 /* 90F834 80240184 46200020 */  cvt.s.d   $f0, $f0
@@ -196,10 +196,10 @@ glabel func_80240000_90F6B0
 /* 90F99C 802402EC 24820008 */  addiu     $v0, $a0, 8
 /* 90F9A0 802402F0 ACA30004 */  sw        $v1, 4($a1)
 /* 90F9A4 802402F4 AE420000 */  sw        $v0, ($s2)
-/* 90F9A8 802402F8 3C02DE00 */  lui       $v0, 0xde00
+/* 90F9A8 802402F8 3C02DE00 */  lui       $v0, %hi(D_DE003E00)
 /* 90F9AC 802402FC AC820000 */  sw        $v0, ($a0)
-/* 90F9B0 80240300 3C028024 */  lui       $v0, 0x8024
-/* 90F9B4 80240304 24423E00 */  addiu     $v0, $v0, 0x3e00
+/* 90F9B0 80240300 3C028024 */  lui       $v0, %hi(D_80243E00)
+/* 90F9B4 80240304 24423E00 */  addiu     $v0, $v0, %lo(D_DE003E00)
 /* 90F9B8 80240308 AC820004 */  sw        $v0, 4($a0)
 /* 90F9BC 8024030C 24820010 */  addiu     $v0, $a0, 0x10
 /* 90F9C0 80240310 AE420000 */  sw        $v0, ($s2)
@@ -209,8 +209,8 @@ glabel func_80240000_90F6B0
 /* 90F9D0 80240320 1440FF58 */  bnez      $v0, .L80240084
 /* 90F9D4 80240324 AC860008 */   sw       $a2, 8($a0)
 /* 90F9D8 80240328 3C05E200 */  lui       $a1, 0xe200
-/* 90F9DC 8024032C 3C04800A */  lui       $a0, 0x800a
-/* 90F9E0 80240330 2484A66C */  addiu     $a0, $a0, -0x5994
+/* 90F9DC 8024032C 3C04800A */  lui       $a0, %hi(D_8009A66C)
+/* 90F9E0 80240330 2484A66C */  addiu     $a0, $a0, %lo(D_8009A66C)
 /* 90F9E4 80240334 8C820000 */  lw        $v0, ($a0)
 /* 90F9E8 80240338 34A51E01 */  ori       $a1, $a1, 0x1e01
 /* 90F9EC 8024033C 0040182D */  daddu     $v1, $v0, $zero
diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90F6B0/func_80240398_90FA48.s b/asm/nonmatchings/world/area_iwa/iwa_01/90F6B0/func_80240398_90FA48.s
index 95cd2816be..c975abdd34 100644
--- a/asm/nonmatchings/world/area_iwa/iwa_01/90F6B0/func_80240398_90FA48.s
+++ b/asm/nonmatchings/world/area_iwa/iwa_01/90F6B0/func_80240398_90FA48.s
@@ -27,8 +27,8 @@ glabel func_80240398_90FA48
 /* 90FAA0 802403F0 0240882D */  daddu     $s1, $s2, $zero
 /* 90FAA4 802403F4 3C014120 */  lui       $at, 0x4120
 /* 90FAA8 802403F8 4481C000 */  mtc1      $at, $f24
-/* 90FAAC 802403FC 3C018024 */  lui       $at, 0x8024
-/* 90FAB0 80240400 D4346380 */  ldc1      $f20, 0x6380($at)
+/* 90FAAC 802403FC 3C018024 */  lui       $at, %hi(D_80246380)
+/* 90FAB0 80240400 D4346380 */  ldc1      $f20, %lo(D_80246380)($at)
 /* 90FAB4 80240404 3C013F80 */  lui       $at, 0x3f80
 /* 90FAB8 80240408 4481B000 */  mtc1      $at, $f22
 .L8024040C:
diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240520_90FBD0.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240520_90FBD0.s
index 33f0ab2417..24804fbe3b 100644
--- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240520_90FBD0.s
+++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240520_90FBD0.s
@@ -13,8 +13,8 @@ glabel func_80240520_90FBD0
 /* 90FBF0 80240540 AFB00010 */  sw        $s0, 0x10($sp)
 /* 90FBF4 80240544 F7B40028 */  sdc1      $f20, 0x28($sp)
 /* 90FBF8 80240548 8E330148 */  lw        $s3, 0x148($s1)
-/* 90FBFC 8024054C 3C03800A */  lui       $v1, 0x800a
-/* 90FC00 80240550 8463A634 */  lh        $v1, -0x59cc($v1)
+/* 90FBFC 8024054C 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* 90FC00 80240550 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* 90FC04 80240554 8E30000C */  lw        $s0, 0xc($s1)
 /* 90FC08 80240558 00031080 */  sll       $v0, $v1, 2
 /* 90FC0C 8024055C 00431021 */  addu      $v0, $v0, $v1
@@ -45,8 +45,8 @@ glabel func_80240520_90FBD0
 /* 90FC70 802405C0 00000000 */   nop      
 /* 90FC74 802405C4 0C00A6C9 */  jal       clamp_angle
 /* 90FC78 802405C8 46000306 */   mov.s    $f12, $f0
-/* 90FC7C 802405CC 3C018024 */  lui       $at, 0x8024
-/* 90FC80 802405D0 D4226390 */  ldc1      $f2, 0x6390($at)
+/* 90FC7C 802405CC 3C018024 */  lui       $at, %hi(D_80246390)
+/* 90FC80 802405D0 D4226390 */  ldc1      $f2, %lo(D_80246390)($at)
 /* 90FC84 802405D4 46000021 */  cvt.d.s   $f0, $f0
 /* 90FC88 802405D8 4622003C */  c.lt.d    $f0, $f2
 /* 90FC8C 802405DC 00000000 */  nop       
@@ -67,8 +67,8 @@ glabel func_80240520_90FBD0
 /* 90FCC4 80240614 0C00A70A */  jal       get_clamped_angle_diff
 /* 90FCC8 80240618 46000386 */   mov.s    $f14, $f0
 /* 90FCCC 8024061C 46000005 */  abs.s     $f0, $f0
-/* 90FCD0 80240620 3C018024 */  lui       $at, 0x8024
-/* 90FCD4 80240624 D4226398 */  ldc1      $f2, 0x6398($at)
+/* 90FCD0 80240620 3C018024 */  lui       $at, %hi(D_80246398)
+/* 90FCD4 80240624 D4226398 */  ldc1      $f2, %lo(D_80246398)($at)
 /* 90FCD8 80240628 46000021 */  cvt.d.s   $f0, $f0
 /* 90FCDC 8024062C 4620103C */  c.lt.d    $f2, $f0
 /* 90FCE0 80240630 00000000 */  nop       
@@ -89,8 +89,8 @@ glabel func_80240520_90FBD0
 /* 90FD1C 8024066C 00000000 */  nop       
 /* 90FD20 80240670 4501001F */  bc1t      .L802406F0
 /* 90FD24 80240674 2402FFFF */   addiu    $v0, $zero, -1
-/* 90FD28 80240678 3C038011 */  lui       $v1, 0x8011
-/* 90FD2C 8024067C 8063EBB3 */  lb        $v1, -0x144d($v1)
+/* 90FD28 80240678 3C038011 */  lui       $v1, %hi(D_8010EBB3)
+/* 90FD2C 8024067C 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
 /* 90FD30 80240680 24020009 */  addiu     $v0, $zero, 9
 /* 90FD34 80240684 10620019 */  beq       $v1, $v0, .L802406EC
 /* 90FD38 80240688 24020007 */   addiu    $v0, $zero, 7
diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240FB8_910668.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240FB8_910668.s
index 4e7de8d770..9dba1a150b 100644
--- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240FB8_910668.s
+++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240FB8_910668.s
@@ -7,8 +7,8 @@ glabel func_80240FB8_910668
 /* 910670 80240FC0 0080982D */  daddu     $s3, $a0, $zero
 /* 910674 80240FC4 AFB40040 */  sw        $s4, 0x40($sp)
 /* 910678 80240FC8 0000A02D */  daddu     $s4, $zero, $zero
-/* 91067C 80240FCC 3C03800A */  lui       $v1, 0x800a
-/* 910680 80240FD0 8463A634 */  lh        $v1, -0x59cc($v1)
+/* 91067C 80240FCC 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* 910680 80240FD0 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* 910684 80240FD4 3C04800B */  lui       $a0, %hi(gCameras)
 /* 910688 80240FD8 24841D80 */  addiu     $a0, $a0, %lo(gCameras)
 /* 91068C 80240FDC AFBF0044 */  sw        $ra, 0x44($sp)
@@ -80,12 +80,12 @@ glabel func_80240FB8_910668
 /* 910780 802410D0 C64C006C */  lwc1      $f12, 0x6c($s2)
 /* 910784 802410D4 0C00A6C9 */  jal       clamp_angle
 /* 910788 802410D8 00000000 */   nop      
-/* 91078C 802410DC 3C018024 */  lui       $at, 0x8024
-/* 910790 802410E0 D43863A0 */  ldc1      $f24, 0x63a0($at)
+/* 91078C 802410DC 3C018024 */  lui       $at, %hi(D_802463A0)
+/* 910790 802410E0 D43863A0 */  ldc1      $f24, %lo(D_802463A0)($at)
 /* 910794 802410E4 46000521 */  cvt.d.s   $f20, $f0
 /* 910798 802410E8 4638A300 */  add.d     $f12, $f20, $f24
-/* 91079C 802410EC 3C018024 */  lui       $at, 0x8024
-/* 9107A0 802410F0 D43663A8 */  ldc1      $f22, 0x63a8($at)
+/* 91079C 802410EC 3C018024 */  lui       $at, %hi(D_802463A8)
+/* 9107A0 802410F0 D43663A8 */  ldc1      $f22, %lo(D_802463A8)($at)
 /* 9107A4 802410F4 0C00A6C9 */  jal       clamp_angle
 /* 9107A8 802410F8 46206320 */   cvt.s.d  $f12, $f12
 /* 9107AC 802410FC 4636A500 */  add.d     $f20, $f20, $f22
@@ -113,8 +113,8 @@ glabel func_80240FB8_910668
 /* 910804 80241154 E616000C */  swc1      $f22, 0xc($s0)
 .L80241158:
 /* 910808 80241158 C6000018 */  lwc1      $f0, 0x18($s0)
-/* 91080C 8024115C 3C018024 */  lui       $at, 0x8024
-/* 910810 80241160 D42263B0 */  ldc1      $f2, 0x63b0($at)
+/* 91080C 8024115C 3C018024 */  lui       $at, %hi(D_802463B0)
+/* 910810 80241160 D42263B0 */  ldc1      $f2, %lo(D_802463B0)($at)
 /* 910814 80241164 46000021 */  cvt.d.s   $f0, $f0
 /* 910818 80241168 46220002 */  mul.d     $f0, $f0, $f2
 /* 91081C 8024116C 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241414_910AC4.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241414_910AC4.s
index 1a51f392a1..b2a284e417 100644
--- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241414_910AC4.s
+++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241414_910AC4.s
@@ -21,13 +21,13 @@ glabel func_80241414_910AC4
 /* 910B04 80241454 0040902D */  daddu     $s2, $v0, $zero
 /* 910B08 80241458 3C03800B */  lui       $v1, %hi(gCameras)
 /* 910B0C 8024145C 24631D80 */  addiu     $v1, $v1, %lo(gCameras)
-/* 910B10 80241460 3C018024 */  lui       $at, 0x8024
-/* 910B14 80241464 D42063B8 */  ldc1      $f0, 0x63b8($at)
+/* 910B10 80241460 3C018024 */  lui       $at, %hi(D_802463B8)
+/* 910B14 80241464 D42063B8 */  ldc1      $f0, %lo(D_802463B8)($at)
 /* 910B18 80241468 3C014387 */  lui       $at, 0x4387
 /* 910B1C 8024146C 4481C000 */  mtc1      $at, $f24
 /* 910B20 80241470 4407B000 */  mfc1      $a3, $f22
-/* 910B24 80241474 3C02800A */  lui       $v0, 0x800a
-/* 910B28 80241478 8442A634 */  lh        $v0, -0x59cc($v0)
+/* 910B24 80241474 3C02800A */  lui       $v0, %hi(D_8009A634)
+/* 910B28 80241478 8442A634 */  lh        $v0, %lo(D_8009A634)($v0)
 /* 910B2C 8024147C 0220282D */  daddu     $a1, $s1, $zero
 /* 910B30 80241480 AFA00010 */  sw        $zero, 0x10($sp)
 /* 910B34 80241484 4620A502 */  mul.d     $f20, $f20, $f0
@@ -49,8 +49,8 @@ glabel func_80241414_910AC4
 /* 910B74 802414C4 0002802B */   sltu     $s0, $zero, $v0
 /* 910B78 802414C8 0C00A6C9 */  jal       clamp_angle
 /* 910B7C 802414CC 46000306 */   mov.s    $f12, $f0
-/* 910B80 802414D0 3C018024 */  lui       $at, 0x8024
-/* 910B84 802414D4 D42263C0 */  ldc1      $f2, 0x63c0($at)
+/* 910B80 802414D0 3C018024 */  lui       $at, %hi(D_802463C0)
+/* 910B84 802414D4 D42263C0 */  ldc1      $f2, %lo(D_802463C0)($at)
 /* 910B88 802414D8 46000021 */  cvt.d.s   $f0, $f0
 /* 910B8C 802414DC 4622003C */  c.lt.d    $f0, $f2
 /* 910B90 802414E0 00000000 */  nop       
@@ -106,8 +106,8 @@ glabel func_80241414_910AC4
 /* 910C4C 8024159C 45030001 */  bc1tl     .L802415A4
 /* 910C50 802415A0 0000802D */   daddu    $s0, $zero, $zero
 .L802415A4:
-/* 910C54 802415A4 3C038011 */  lui       $v1, 0x8011
-/* 910C58 802415A8 8063EBB3 */  lb        $v1, -0x144d($v1)
+/* 910C54 802415A4 3C038011 */  lui       $v1, %hi(D_8010EBB3)
+/* 910C58 802415A8 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
 /* 910C5C 802415AC 24020009 */  addiu     $v0, $zero, 9
 /* 910C60 802415B0 50620001 */  beql      $v1, $v0, .L802415B8
 /* 910C64 802415B4 0000802D */   daddu    $s0, $zero, $zero
diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802415E0_910C90.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802415E0_910C90.s
index 4dd64d08a9..6ee86b6d24 100644
--- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802415E0_910C90.s
+++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802415E0_910C90.s
@@ -46,8 +46,8 @@ glabel func_802415E0_910C90
 /* 910D34 80241684 080905AB */  j         .L802416AC
 /* 910D38 80241688 E6000018 */   swc1     $f0, 0x18($s0)
 .L8024168C:
-/* 910D3C 8024168C 3C018024 */  lui       $at, 0x8024
-/* 910D40 80241690 D42263C8 */  ldc1      $f2, 0x63c8($at)
+/* 910D3C 8024168C 3C018024 */  lui       $at, %hi(D_802463C8)
+/* 910D40 80241690 D42263C8 */  ldc1      $f2, %lo(D_802463C8)($at)
 /* 910D44 80241694 44820000 */  mtc1      $v0, $f0
 /* 910D48 80241698 00000000 */  nop       
 /* 910D4C 8024169C 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241A4C_9110FC.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241A4C_9110FC.s
index 72fbe082ba..a88fc67457 100644
--- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241A4C_9110FC.s
+++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241A4C_9110FC.s
@@ -22,8 +22,8 @@ glabel func_80241A4C_9110FC
 /* 911140 80241A90 1C400031 */  bgtz      $v0, .L80241B58
 /* 911144 80241A94 0220202D */   daddu    $a0, $s1, $zero
 /* 911148 80241A98 C640000C */  lwc1      $f0, 0xc($s2)
-/* 91114C 80241A9C 3C018024 */  lui       $at, 0x8024
-/* 911150 80241AA0 D42263D0 */  ldc1      $f2, 0x63d0($at)
+/* 91114C 80241A9C 3C018024 */  lui       $at, %hi(D_802463D0)
+/* 911150 80241AA0 D42263D0 */  ldc1      $f2, %lo(D_802463D0)($at)
 /* 911154 80241AA4 46000021 */  cvt.d.s   $f0, $f0
 /* 911158 80241AA8 46220002 */  mul.d     $f0, $f0, $f2
 /* 91115C 80241AAC 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241D70_911420.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241D70_911420.s
index 2ce200a846..14e5a97f35 100644
--- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241D70_911420.s
+++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241D70_911420.s
@@ -68,9 +68,9 @@ glabel func_80241D70_911420
 /* 911514 80241E64 2C620016 */  sltiu     $v0, $v1, 0x16
 /* 911518 80241E68 10400036 */  beqz      $v0, .L80241F44
 /* 91151C 80241E6C 00031080 */   sll      $v0, $v1, 2
-/* 911520 80241E70 3C018024 */  lui       $at, 0x8024
+/* 911520 80241E70 3C018024 */  lui       $at, %hi(D_802463D8)
 /* 911524 80241E74 00220821 */  addu      $at, $at, $v0
-/* 911528 80241E78 8C2263D8 */  lw        $v0, 0x63d8($at)
+/* 911528 80241E78 8C2263D8 */  lw        $v0, %lo(D_802463D8)($at)
 /* 91152C 80241E7C 00400008 */  jr        $v0
 /* 911530 80241E80 00000000 */   nop      
 /* 911534 80241E84 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241F6C_91161C.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241F6C_91161C.s
index c950127b10..604ad68641 100644
--- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241F6C_91161C.s
+++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241F6C_91161C.s
@@ -103,9 +103,9 @@ glabel func_80241F6C_91161C
 /* 91178C 802420DC 2C620064 */  sltiu     $v0, $v1, 0x64
 /* 911790 802420E0 10400060 */  beqz      $v0, .L80242264
 /* 911794 802420E4 00031080 */   sll      $v0, $v1, 2
-/* 911798 802420E8 3C018024 */  lui       $at, 0x8024
+/* 911798 802420E8 3C018024 */  lui       $at, %hi(D_80246430)
 /* 91179C 802420EC 00220821 */  addu      $at, $at, $v0
-/* 9117A0 802420F0 8C226430 */  lw        $v0, 0x6430($at)
+/* 9117A0 802420F0 8C226430 */  lw        $v0, %lo(D_80246430)($at)
 /* 9117A4 802420F4 00400008 */  jr        $v0
 /* 9117A8 802420F8 00000000 */   nop      
 /* 9117AC 802420FC 0260202D */  daddu     $a0, $s3, $zero
diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802422C4_911974.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802422C4_911974.s
index 6004bc6399..7145e63b92 100644
--- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802422C4_911974.s
+++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802422C4_911974.s
@@ -20,8 +20,8 @@ glabel func_802422C4_911974
 /* 9119B0 80242300 0040882D */  daddu     $s1, $v0, $zero
 /* 9119B4 80242304 3C03800B */  lui       $v1, %hi(gCameras)
 /* 9119B8 80242308 24631D80 */  addiu     $v1, $v1, %lo(gCameras)
-/* 9119BC 8024230C 3C02800A */  lui       $v0, 0x800a
-/* 9119C0 80242310 8442A634 */  lh        $v0, -0x59cc($v0)
+/* 9119BC 8024230C 3C02800A */  lui       $v0, %hi(D_8009A634)
+/* 9119C0 80242310 8442A634 */  lh        $v0, %lo(D_8009A634)($v0)
 /* 9119C4 80242314 0000282D */  daddu     $a1, $zero, $zero
 /* 9119C8 80242318 00028080 */  sll       $s0, $v0, 2
 /* 9119CC 8024231C 02028021 */  addu      $s0, $s0, $v0
@@ -38,8 +38,8 @@ glabel func_802422C4_911974
 /* 9119F8 80242348 0002802B */   sltu     $s0, $zero, $v0
 /* 9119FC 8024234C 0C00A6C9 */  jal       clamp_angle
 /* 911A00 80242350 46000306 */   mov.s    $f12, $f0
-/* 911A04 80242354 3C018024 */  lui       $at, 0x8024
-/* 911A08 80242358 D42265C0 */  ldc1      $f2, 0x65c0($at)
+/* 911A04 80242354 3C018024 */  lui       $at, %hi(D_802465C0)
+/* 911A08 80242358 D42265C0 */  ldc1      $f2, %lo(D_802465C0)($at)
 /* 911A0C 8024235C 46000021 */  cvt.d.s   $f0, $f0
 /* 911A10 80242360 4622003C */  c.lt.d    $f0, $f2
 /* 911A14 80242364 00000000 */  nop       
@@ -60,8 +60,8 @@ glabel func_802422C4_911974
 /* 911A4C 8024239C 0C00A70A */  jal       get_clamped_angle_diff
 /* 911A50 802423A0 46000386 */   mov.s    $f14, $f0
 /* 911A54 802423A4 46000005 */  abs.s     $f0, $f0
-/* 911A58 802423A8 3C018024 */  lui       $at, 0x8024
-/* 911A5C 802423AC D42265C8 */  ldc1      $f2, 0x65c8($at)
+/* 911A58 802423A8 3C018024 */  lui       $at, %hi(D_802465C8)
+/* 911A5C 802423AC D42265C8 */  ldc1      $f2, %lo(D_802465C8)($at)
 /* 911A60 802423B0 46000021 */  cvt.d.s   $f0, $f0
 /* 911A64 802423B4 4620103C */  c.lt.d    $f2, $f0
 /* 911A68 802423B8 00000000 */  nop       
@@ -80,8 +80,8 @@ glabel func_802422C4_911974
 /* 911A98 802423E8 45030001 */  bc1tl     .L802423F0
 /* 911A9C 802423EC 0000802D */   daddu    $s0, $zero, $zero
 .L802423F0:
-/* 911AA0 802423F0 3C038011 */  lui       $v1, 0x8011
-/* 911AA4 802423F4 8063EBB3 */  lb        $v1, -0x144d($v1)
+/* 911AA0 802423F0 3C038011 */  lui       $v1, %hi(D_8010EBB3)
+/* 911AA4 802423F4 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
 /* 911AA8 802423F8 24020009 */  addiu     $v0, $zero, 9
 /* 911AAC 802423FC 50620001 */  beql      $v1, $v0, .L80242404
 /* 911AB0 80242400 0000802D */   daddu    $s0, $zero, $zero
diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242498_911B48.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242498_911B48.s
index 56bd5f893b..c6edfb1401 100644
--- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242498_911B48.s
+++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242498_911B48.s
@@ -21,8 +21,8 @@ glabel func_80242498_911B48
 /* 911B88 802424D8 8E420014 */  lw        $v0, 0x14($s2)
 /* 911B8C 802424DC AE620074 */  sw        $v0, 0x74($s3)
 /* 911B90 802424E0 C640000C */  lwc1      $f0, 0xc($s2)
-/* 911B94 802424E4 3C018024 */  lui       $at, 0x8024
-/* 911B98 802424E8 D42265D0 */  ldc1      $f2, 0x65d0($at)
+/* 911B94 802424E4 3C018024 */  lui       $at, %hi(D_802465D0)
+/* 911B98 802424E8 D42265D0 */  ldc1      $f2, %lo(D_802465D0)($at)
 /* 911B9C 802424EC 46000021 */  cvt.d.s   $f0, $f0
 /* 911BA0 802424F0 46220002 */  mul.d     $f0, $f0, $f2
 /* 911BA4 802424F4 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242958_912008.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242958_912008.s
index 911e58e4a0..6156e015a3 100644
--- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242958_912008.s
+++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242958_912008.s
@@ -83,8 +83,8 @@ glabel func_80242958_912008
 /* 91213C 80242A8C 8C470030 */   lw       $a3, 0x30($v0)
 /* 912140 80242A90 C6020018 */  lwc1      $f2, 0x18($s0)
 /* 912144 80242A94 46020003 */  div.s     $f0, $f0, $f2
-/* 912148 80242A98 3C018024 */  lui       $at, 0x8024
-/* 91214C 80242A9C D42265D8 */  ldc1      $f2, 0x65d8($at)
+/* 912148 80242A98 3C018024 */  lui       $at, %hi(D_802465D8)
+/* 91214C 80242A9C D42265D8 */  ldc1      $f2, %lo(D_802465D8)($at)
 /* 912150 80242AA0 46000021 */  cvt.d.s   $f0, $f0
 /* 912154 80242AA4 46220000 */  add.d     $f0, $f0, $f2
 /* 912158 80242AA8 4620010D */  trunc.w.d $f4, $f0
diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242C48_9122F8.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242C48_9122F8.s
index fb714bd8ba..df7db8831e 100644
--- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242C48_9122F8.s
+++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242C48_9122F8.s
@@ -30,8 +30,8 @@ glabel func_80242C48_9122F8
 /* 91235C 80242CAC 08090B35 */  j         .L80242CD4
 /* 912360 80242CB0 E4600018 */   swc1     $f0, 0x18($v1)
 .L80242CB4:
-/* 912364 80242CB4 3C018024 */  lui       $at, 0x8024
-/* 912368 80242CB8 D42265E0 */  ldc1      $f2, 0x65e0($at)
+/* 912364 80242CB4 3C018024 */  lui       $at, %hi(D_802465E0)
+/* 912368 80242CB8 D42265E0 */  ldc1      $f2, %lo(D_802465E0)($at)
 /* 91236C 80242CBC 44820000 */  mtc1      $v0, $f0
 /* 912370 80242CC0 00000000 */  nop       
 /* 912374 80242CC4 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242F54_912604.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242F54_912604.s
index c7f694a5ac..42135cffca 100644
--- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242F54_912604.s
+++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242F54_912604.s
@@ -95,9 +95,9 @@ glabel func_80242F54_912604
 /* 912758 802430A8 2C620035 */  sltiu     $v0, $v1, 0x35
 /* 91275C 802430AC 10400073 */  beqz      $v0, .L8024327C
 /* 912760 802430B0 00031080 */   sll      $v0, $v1, 2
-/* 912764 802430B4 3C018024 */  lui       $at, 0x8024
+/* 912764 802430B4 3C018024 */  lui       $at, %hi(D_802465E8)
 /* 912768 802430B8 00220821 */  addu      $at, $at, $v0
-/* 91276C 802430BC 8C2265E8 */  lw        $v0, 0x65e8($at)
+/* 91276C 802430BC 8C2265E8 */  lw        $v0, %lo(D_802465E8)($at)
 /* 912770 802430C0 00400008 */  jr        $v0
 /* 912774 802430C4 00000000 */   nop      
 /* 912778 802430C8 0260202D */  daddu     $a0, $s3, $zero
diff --git a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240000_915D70.s b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240000_915D70.s
index bd8486e9b0..867bdcd10f 100644
--- a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240000_915D70.s
+++ b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240000_915D70.s
@@ -20,8 +20,8 @@ glabel func_80240000_915D70
 /* 915DAC 8024003C 0040882D */  daddu     $s1, $v0, $zero
 /* 915DB0 80240040 3C03800B */  lui       $v1, %hi(gCameras)
 /* 915DB4 80240044 24631D80 */  addiu     $v1, $v1, %lo(gCameras)
-/* 915DB8 80240048 3C02800A */  lui       $v0, 0x800a
-/* 915DBC 8024004C 8442A634 */  lh        $v0, -0x59cc($v0)
+/* 915DB8 80240048 3C02800A */  lui       $v0, %hi(D_8009A634)
+/* 915DBC 8024004C 8442A634 */  lh        $v0, %lo(D_8009A634)($v0)
 /* 915DC0 80240050 0000282D */  daddu     $a1, $zero, $zero
 /* 915DC4 80240054 00028080 */  sll       $s0, $v0, 2
 /* 915DC8 80240058 02028021 */  addu      $s0, $s0, $v0
@@ -38,8 +38,8 @@ glabel func_80240000_915D70
 /* 915DF4 80240084 0002802B */   sltu     $s0, $zero, $v0
 /* 915DF8 80240088 0C00A6C9 */  jal       clamp_angle
 /* 915DFC 8024008C 46000306 */   mov.s    $f12, $f0
-/* 915E00 80240090 3C018024 */  lui       $at, 0x8024
-/* 915E04 80240094 D4222D40 */  ldc1      $f2, 0x2d40($at)
+/* 915E00 80240090 3C018024 */  lui       $at, %hi(D_80242D40)
+/* 915E04 80240094 D4222D40 */  ldc1      $f2, %lo(D_80242D40)($at)
 /* 915E08 80240098 46000021 */  cvt.d.s   $f0, $f0
 /* 915E0C 8024009C 4622003C */  c.lt.d    $f0, $f2
 /* 915E10 802400A0 00000000 */  nop       
@@ -60,8 +60,8 @@ glabel func_80240000_915D70
 /* 915E48 802400D8 0C00A70A */  jal       get_clamped_angle_diff
 /* 915E4C 802400DC 46000386 */   mov.s    $f14, $f0
 /* 915E50 802400E0 46000005 */  abs.s     $f0, $f0
-/* 915E54 802400E4 3C018024 */  lui       $at, 0x8024
-/* 915E58 802400E8 D4222D48 */  ldc1      $f2, 0x2d48($at)
+/* 915E54 802400E4 3C018024 */  lui       $at, %hi(D_80242D48)
+/* 915E58 802400E8 D4222D48 */  ldc1      $f2, %lo(D_80242D48)($at)
 /* 915E5C 802400EC 46000021 */  cvt.d.s   $f0, $f0
 /* 915E60 802400F0 4620103C */  c.lt.d    $f2, $f0
 /* 915E64 802400F4 00000000 */  nop       
@@ -80,8 +80,8 @@ glabel func_80240000_915D70
 /* 915E94 80240124 45030001 */  bc1tl     .L8024012C
 /* 915E98 80240128 0000802D */   daddu    $s0, $zero, $zero
 .L8024012C:
-/* 915E9C 8024012C 3C038011 */  lui       $v1, 0x8011
-/* 915EA0 80240130 8063EBB3 */  lb        $v1, -0x144d($v1)
+/* 915E9C 8024012C 3C038011 */  lui       $v1, %hi(D_8010EBB3)
+/* 915EA0 80240130 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
 /* 915EA4 80240134 24020009 */  addiu     $v0, $zero, 9
 /* 915EA8 80240138 50620001 */  beql      $v1, $v0, .L80240140
 /* 915EAC 8024013C 0000802D */   daddu    $s0, $zero, $zero
diff --git a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_802401D4_915F44.s b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_802401D4_915F44.s
index 39c2d5f94f..9abafbafc7 100644
--- a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_802401D4_915F44.s
+++ b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_802401D4_915F44.s
@@ -21,8 +21,8 @@ glabel func_802401D4_915F44
 /* 915F84 80240214 8E420014 */  lw        $v0, 0x14($s2)
 /* 915F88 80240218 AE620074 */  sw        $v0, 0x74($s3)
 /* 915F8C 8024021C C640000C */  lwc1      $f0, 0xc($s2)
-/* 915F90 80240220 3C018024 */  lui       $at, 0x8024
-/* 915F94 80240224 D4222D50 */  ldc1      $f2, 0x2d50($at)
+/* 915F90 80240220 3C018024 */  lui       $at, %hi(D_80242D50)
+/* 915F94 80240224 D4222D50 */  ldc1      $f2, %lo(D_80242D50)($at)
 /* 915F98 80240228 46000021 */  cvt.d.s   $f0, $f0
 /* 915F9C 8024022C 46220002 */  mul.d     $f0, $f0, $f2
 /* 915FA0 80240230 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240694_916404.s b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240694_916404.s
index 91f8051d7c..bf01e01e10 100644
--- a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240694_916404.s
+++ b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240694_916404.s
@@ -83,8 +83,8 @@ glabel func_80240694_916404
 /* 916538 802407C8 8C470030 */   lw       $a3, 0x30($v0)
 /* 91653C 802407CC C6020018 */  lwc1      $f2, 0x18($s0)
 /* 916540 802407D0 46020003 */  div.s     $f0, $f0, $f2
-/* 916544 802407D4 3C018024 */  lui       $at, 0x8024
-/* 916548 802407D8 D4222D58 */  ldc1      $f2, 0x2d58($at)
+/* 916544 802407D4 3C018024 */  lui       $at, %hi(D_80242D58)
+/* 916548 802407D8 D4222D58 */  ldc1      $f2, %lo(D_80242D58)($at)
 /* 91654C 802407DC 46000021 */  cvt.d.s   $f0, $f0
 /* 916550 802407E0 46220000 */  add.d     $f0, $f0, $f2
 /* 916554 802407E4 4620010D */  trunc.w.d $f4, $f0
diff --git a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240984_9166F4.s b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240984_9166F4.s
index 05037d5e46..2b3bdf1620 100644
--- a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240984_9166F4.s
+++ b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240984_9166F4.s
@@ -30,8 +30,8 @@ glabel func_80240984_9166F4
 /* 916758 802409E8 08090284 */  j         .L80240A10
 /* 91675C 802409EC E4600018 */   swc1     $f0, 0x18($v1)
 .L802409F0:
-/* 916760 802409F0 3C018024 */  lui       $at, 0x8024
-/* 916764 802409F4 D4222D60 */  ldc1      $f2, 0x2d60($at)
+/* 916760 802409F0 3C018024 */  lui       $at, %hi(D_80242D60)
+/* 916764 802409F4 D4222D60 */  ldc1      $f2, %lo(D_80242D60)($at)
 /* 916768 802409F8 44820000 */  mtc1      $v0, $f0
 /* 91676C 802409FC 00000000 */  nop       
 /* 916770 80240A00 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240C90_916A00.s b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240C90_916A00.s
index f25cbb8379..58dd0c1ab2 100644
--- a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240C90_916A00.s
+++ b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240C90_916A00.s
@@ -95,9 +95,9 @@ glabel func_80240C90_916A00
 /* 916B54 80240DE4 2C620035 */  sltiu     $v0, $v1, 0x35
 /* 916B58 80240DE8 10400073 */  beqz      $v0, .L80240FB8
 /* 916B5C 80240DEC 00031080 */   sll      $v0, $v1, 2
-/* 916B60 80240DF0 3C018024 */  lui       $at, 0x8024
+/* 916B60 80240DF0 3C018024 */  lui       $at, %hi(D_80242D68)
 /* 916B64 80240DF4 00220821 */  addu      $at, $at, $v0
-/* 916B68 80240DF8 8C222D68 */  lw        $v0, 0x2d68($at)
+/* 916B68 80240DF8 8C222D68 */  lw        $v0, %lo(D_80242D68)($at)
 /* 916B6C 80240DFC 00400008 */  jr        $v0
 /* 916B70 80240E00 00000000 */   nop      
 /* 916B74 80240E04 0260202D */  daddu     $a0, $s3, $zero
diff --git a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240FE0_916D50.s b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240FE0_916D50.s
index 89235fc56d..2b08cedef9 100644
--- a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240FE0_916D50.s
+++ b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240FE0_916D50.s
@@ -4,8 +4,8 @@
 glabel func_80240FE0_916D50
 /* 916D50 80240FE0 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* 916D54 80240FE4 AFB00010 */  sw        $s0, 0x10($sp)
-/* 916D58 80240FE8 3C108024 */  lui       $s0, 0x8024
-/* 916D5C 80240FEC 26101DA8 */  addiu     $s0, $s0, 0x1da8
+/* 916D58 80240FE8 3C108024 */  lui       $s0, %hi(D_80241DA8)
+/* 916D5C 80240FEC 26101DA8 */  addiu     $s0, $s0, %lo(D_80241DA8)
 /* 916D60 80240FF0 AFBF0018 */  sw        $ra, 0x18($sp)
 /* 916D64 80240FF4 AFB10014 */  sw        $s1, 0x14($sp)
 /* 916D68 80240FF8 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_80240FE0_916D50
 /* 916DCC 8024105C 28620010 */  slti      $v0, $v1, 0x10
 /* 916DD0 80241060 1440FFFA */  bnez      $v0, .L8024104C
 /* 916DD4 80241064 24840004 */   addiu    $a0, $a0, 4
-/* 916DD8 80241068 3C108024 */  lui       $s0, 0x8024
-/* 916DDC 8024106C 26101DA8 */  addiu     $s0, $s0, 0x1da8
+/* 916DD8 80241068 3C108024 */  lui       $s0, %hi(D_80241DA8)
+/* 916DDC 8024106C 26101DA8 */  addiu     $s0, $s0, %lo(D_80241DA8)
 /* 916DE0 80241070 0C00AB4B */  jal       heap_free
 /* 916DE4 80241074 8E040000 */   lw       $a0, ($s0)
 /* 916DE8 80241078 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_80240000_918BB0.s b/asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_80240000_918BB0.s
index a5d8562079..394a7e943f 100644
--- a/asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_80240000_918BB0.s
+++ b/asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_80240000_918BB0.s
@@ -4,8 +4,8 @@
 glabel func_80240000_918BB0
 /* 918BB0 80240000 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* 918BB4 80240004 AFB00010 */  sw        $s0, 0x10($sp)
-/* 918BB8 80240008 3C108024 */  lui       $s0, 0x8024
-/* 918BBC 8024000C 26101530 */  addiu     $s0, $s0, 0x1530
+/* 918BB8 80240008 3C108024 */  lui       $s0, %hi(D_80241530)
+/* 918BBC 8024000C 26101530 */  addiu     $s0, $s0, %lo(D_80241530)
 /* 918BC0 80240010 AFBF0018 */  sw        $ra, 0x18($sp)
 /* 918BC4 80240014 AFB10014 */  sw        $s1, 0x14($sp)
 /* 918BC8 80240018 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_80240000_918BB0
 /* 918C2C 8024007C 28620010 */  slti      $v0, $v1, 0x10
 /* 918C30 80240080 1440FFFA */  bnez      $v0, .L8024006C
 /* 918C34 80240084 24840004 */   addiu    $a0, $a0, 4
-/* 918C38 80240088 3C108024 */  lui       $s0, 0x8024
-/* 918C3C 8024008C 26101530 */  addiu     $s0, $s0, 0x1530
+/* 918C38 80240088 3C108024 */  lui       $s0, %hi(D_80241530)
+/* 918C3C 8024008C 26101530 */  addiu     $s0, $s0, %lo(D_80241530)
 /* 918C40 80240090 0C00AB4B */  jal       heap_free
 /* 918C44 80240094 8E040000 */   lw       $a0, ($s0)
 /* 918C48 80240098 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240340_918EF0.s b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240340_918EF0.s
index 3790724b68..881cdbd590 100644
--- a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240340_918EF0.s
+++ b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240340_918EF0.s
@@ -20,8 +20,8 @@ glabel func_80240340_918EF0
 /* 918F2C 8024037C 0040882D */  daddu     $s1, $v0, $zero
 /* 918F30 80240380 3C03800B */  lui       $v1, %hi(gCameras)
 /* 918F34 80240384 24631D80 */  addiu     $v1, $v1, %lo(gCameras)
-/* 918F38 80240388 3C02800A */  lui       $v0, 0x800a
-/* 918F3C 8024038C 8442A634 */  lh        $v0, -0x59cc($v0)
+/* 918F38 80240388 3C02800A */  lui       $v0, %hi(D_8009A634)
+/* 918F3C 8024038C 8442A634 */  lh        $v0, %lo(D_8009A634)($v0)
 /* 918F40 80240390 0000282D */  daddu     $a1, $zero, $zero
 /* 918F44 80240394 00028080 */  sll       $s0, $v0, 2
 /* 918F48 80240398 02028021 */  addu      $s0, $s0, $v0
@@ -38,8 +38,8 @@ glabel func_80240340_918EF0
 /* 918F74 802403C4 0002802B */   sltu     $s0, $zero, $v0
 /* 918F78 802403C8 0C00A6C9 */  jal       clamp_angle
 /* 918F7C 802403CC 46000306 */   mov.s    $f12, $f0
-/* 918F80 802403D0 3C018024 */  lui       $at, 0x8024
-/* 918F84 802403D4 D4222C30 */  ldc1      $f2, 0x2c30($at)
+/* 918F80 802403D0 3C018024 */  lui       $at, %hi(D_80242C30)
+/* 918F84 802403D4 D4222C30 */  ldc1      $f2, %lo(D_80242C30)($at)
 /* 918F88 802403D8 46000021 */  cvt.d.s   $f0, $f0
 /* 918F8C 802403DC 4622003C */  c.lt.d    $f0, $f2
 /* 918F90 802403E0 00000000 */  nop       
@@ -60,8 +60,8 @@ glabel func_80240340_918EF0
 /* 918FC8 80240418 0C00A70A */  jal       get_clamped_angle_diff
 /* 918FCC 8024041C 46000386 */   mov.s    $f14, $f0
 /* 918FD0 80240420 46000005 */  abs.s     $f0, $f0
-/* 918FD4 80240424 3C018024 */  lui       $at, 0x8024
-/* 918FD8 80240428 D4222C38 */  ldc1      $f2, 0x2c38($at)
+/* 918FD4 80240424 3C018024 */  lui       $at, %hi(D_80242C38)
+/* 918FD8 80240428 D4222C38 */  ldc1      $f2, %lo(D_80242C38)($at)
 /* 918FDC 8024042C 46000021 */  cvt.d.s   $f0, $f0
 /* 918FE0 80240430 4620103C */  c.lt.d    $f2, $f0
 /* 918FE4 80240434 00000000 */  nop       
@@ -80,8 +80,8 @@ glabel func_80240340_918EF0
 /* 919014 80240464 45030001 */  bc1tl     .L8024046C
 /* 919018 80240468 0000802D */   daddu    $s0, $zero, $zero
 .L8024046C:
-/* 91901C 8024046C 3C038011 */  lui       $v1, 0x8011
-/* 919020 80240470 8063EBB3 */  lb        $v1, -0x144d($v1)
+/* 91901C 8024046C 3C038011 */  lui       $v1, %hi(D_8010EBB3)
+/* 919020 80240470 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
 /* 919024 80240474 24020009 */  addiu     $v0, $zero, 9
 /* 919028 80240478 50620001 */  beql      $v1, $v0, .L80240480
 /* 91902C 8024047C 0000802D */   daddu    $s0, $zero, $zero
diff --git a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240514_9190C4.s b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240514_9190C4.s
index 3e16c8bbad..8076d5e302 100644
--- a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240514_9190C4.s
+++ b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240514_9190C4.s
@@ -21,8 +21,8 @@ glabel func_80240514_9190C4
 /* 919104 80240554 8E420014 */  lw        $v0, 0x14($s2)
 /* 919108 80240558 AE620074 */  sw        $v0, 0x74($s3)
 /* 91910C 8024055C C640000C */  lwc1      $f0, 0xc($s2)
-/* 919110 80240560 3C018024 */  lui       $at, 0x8024
-/* 919114 80240564 D4222C40 */  ldc1      $f2, 0x2c40($at)
+/* 919110 80240560 3C018024 */  lui       $at, %hi(D_80242C40)
+/* 919114 80240564 D4222C40 */  ldc1      $f2, %lo(D_80242C40)($at)
 /* 919118 80240568 46000021 */  cvt.d.s   $f0, $f0
 /* 91911C 8024056C 46220002 */  mul.d     $f0, $f0, $f2
 /* 919120 80240570 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_802409D4_919584.s b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_802409D4_919584.s
index 2a0ef3c3b1..07dc105c2a 100644
--- a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_802409D4_919584.s
+++ b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_802409D4_919584.s
@@ -83,8 +83,8 @@ glabel func_802409D4_919584
 /* 9196B8 80240B08 8C470030 */   lw       $a3, 0x30($v0)
 /* 9196BC 80240B0C C6020018 */  lwc1      $f2, 0x18($s0)
 /* 9196C0 80240B10 46020003 */  div.s     $f0, $f0, $f2
-/* 9196C4 80240B14 3C018024 */  lui       $at, 0x8024
-/* 9196C8 80240B18 D4222C48 */  ldc1      $f2, 0x2c48($at)
+/* 9196C4 80240B14 3C018024 */  lui       $at, %hi(D_80242C48)
+/* 9196C8 80240B18 D4222C48 */  ldc1      $f2, %lo(D_80242C48)($at)
 /* 9196CC 80240B1C 46000021 */  cvt.d.s   $f0, $f0
 /* 9196D0 80240B20 46220000 */  add.d     $f0, $f0, $f2
 /* 9196D4 80240B24 4620010D */  trunc.w.d $f4, $f0
diff --git a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240CC4_919874.s b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240CC4_919874.s
index fd22942e40..4e6fbff08a 100644
--- a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240CC4_919874.s
+++ b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240CC4_919874.s
@@ -30,8 +30,8 @@ glabel func_80240CC4_919874
 /* 9198D8 80240D28 08090354 */  j         .L80240D50
 /* 9198DC 80240D2C E4600018 */   swc1     $f0, 0x18($v1)
 .L80240D30:
-/* 9198E0 80240D30 3C018024 */  lui       $at, 0x8024
-/* 9198E4 80240D34 D4222C50 */  ldc1      $f2, 0x2c50($at)
+/* 9198E0 80240D30 3C018024 */  lui       $at, %hi(D_80242C50)
+/* 9198E4 80240D34 D4222C50 */  ldc1      $f2, %lo(D_80242C50)($at)
 /* 9198E8 80240D38 44820000 */  mtc1      $v0, $f0
 /* 9198EC 80240D3C 00000000 */  nop       
 /* 9198F0 80240D40 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240FD0_919B80.s b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240FD0_919B80.s
index 6f1da41cdb..2850f43cf7 100644
--- a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240FD0_919B80.s
+++ b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240FD0_919B80.s
@@ -95,9 +95,9 @@ glabel func_80240FD0_919B80
 /* 919CD4 80241124 2C620035 */  sltiu     $v0, $v1, 0x35
 /* 919CD8 80241128 10400073 */  beqz      $v0, .L802412F8
 /* 919CDC 8024112C 00031080 */   sll      $v0, $v1, 2
-/* 919CE0 80241130 3C018024 */  lui       $at, 0x8024
+/* 919CE0 80241130 3C018024 */  lui       $at, %hi(D_80242C58)
 /* 919CE4 80241134 00220821 */  addu      $at, $at, $v0
-/* 919CE8 80241138 8C222C58 */  lw        $v0, 0x2c58($at)
+/* 919CE8 80241138 8C222C58 */  lw        $v0, %lo(D_80242C58)($at)
 /* 919CEC 8024113C 00400008 */  jr        $v0
 /* 919CF0 80241140 00000000 */   nop      
 /* 919CF4 80241144 0260202D */  daddu     $a0, $s3, $zero
diff --git a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240080_91B960.s b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240080_91B960.s
index 854b520592..57ee38493c 100644
--- a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240080_91B960.s
+++ b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240080_91B960.s
@@ -20,8 +20,8 @@ glabel func_80240080_91B960
 /* 91B99C 802400BC 0040882D */  daddu     $s1, $v0, $zero
 /* 91B9A0 802400C0 3C03800B */  lui       $v1, %hi(gCameras)
 /* 91B9A4 802400C4 24631D80 */  addiu     $v1, $v1, %lo(gCameras)
-/* 91B9A8 802400C8 3C02800A */  lui       $v0, 0x800a
-/* 91B9AC 802400CC 8442A634 */  lh        $v0, -0x59cc($v0)
+/* 91B9A8 802400C8 3C02800A */  lui       $v0, %hi(D_8009A634)
+/* 91B9AC 802400CC 8442A634 */  lh        $v0, %lo(D_8009A634)($v0)
 /* 91B9B0 802400D0 0000282D */  daddu     $a1, $zero, $zero
 /* 91B9B4 802400D4 00028080 */  sll       $s0, $v0, 2
 /* 91B9B8 802400D8 02028021 */  addu      $s0, $s0, $v0
@@ -38,8 +38,8 @@ glabel func_80240080_91B960
 /* 91B9E4 80240104 0002802B */   sltu     $s0, $zero, $v0
 /* 91B9E8 80240108 0C00A6C9 */  jal       clamp_angle
 /* 91B9EC 8024010C 46000306 */   mov.s    $f12, $f0
-/* 91B9F0 80240110 3C018024 */  lui       $at, 0x8024
-/* 91B9F4 80240114 D4222B90 */  ldc1      $f2, 0x2b90($at)
+/* 91B9F0 80240110 3C018024 */  lui       $at, %hi(D_80242B90)
+/* 91B9F4 80240114 D4222B90 */  ldc1      $f2, %lo(D_80242B90)($at)
 /* 91B9F8 80240118 46000021 */  cvt.d.s   $f0, $f0
 /* 91B9FC 8024011C 4622003C */  c.lt.d    $f0, $f2
 /* 91BA00 80240120 00000000 */  nop       
@@ -60,8 +60,8 @@ glabel func_80240080_91B960
 /* 91BA38 80240158 0C00A70A */  jal       get_clamped_angle_diff
 /* 91BA3C 8024015C 46000386 */   mov.s    $f14, $f0
 /* 91BA40 80240160 46000005 */  abs.s     $f0, $f0
-/* 91BA44 80240164 3C018024 */  lui       $at, 0x8024
-/* 91BA48 80240168 D4222B98 */  ldc1      $f2, 0x2b98($at)
+/* 91BA44 80240164 3C018024 */  lui       $at, %hi(D_80242B98)
+/* 91BA48 80240168 D4222B98 */  ldc1      $f2, %lo(D_80242B98)($at)
 /* 91BA4C 8024016C 46000021 */  cvt.d.s   $f0, $f0
 /* 91BA50 80240170 4620103C */  c.lt.d    $f2, $f0
 /* 91BA54 80240174 00000000 */  nop       
@@ -80,8 +80,8 @@ glabel func_80240080_91B960
 /* 91BA84 802401A4 45030001 */  bc1tl     .L802401AC
 /* 91BA88 802401A8 0000802D */   daddu    $s0, $zero, $zero
 .L802401AC:
-/* 91BA8C 802401AC 3C038011 */  lui       $v1, 0x8011
-/* 91BA90 802401B0 8063EBB3 */  lb        $v1, -0x144d($v1)
+/* 91BA8C 802401AC 3C038011 */  lui       $v1, %hi(D_8010EBB3)
+/* 91BA90 802401B0 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
 /* 91BA94 802401B4 24020009 */  addiu     $v0, $zero, 9
 /* 91BA98 802401B8 50620001 */  beql      $v1, $v0, .L802401C0
 /* 91BA9C 802401BC 0000802D */   daddu    $s0, $zero, $zero
diff --git a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240714_91BFF4.s b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240714_91BFF4.s
index 6afd1924f8..f811b517cc 100644
--- a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240714_91BFF4.s
+++ b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240714_91BFF4.s
@@ -83,8 +83,8 @@ glabel func_80240714_91BFF4
 /* 91C128 80240848 8C470030 */   lw       $a3, 0x30($v0)
 /* 91C12C 8024084C C6020018 */  lwc1      $f2, 0x18($s0)
 /* 91C130 80240850 46020003 */  div.s     $f0, $f0, $f2
-/* 91C134 80240854 3C018024 */  lui       $at, 0x8024
-/* 91C138 80240858 D4222BA8 */  ldc1      $f2, 0x2ba8($at)
+/* 91C134 80240854 3C018024 */  lui       $at, %hi(D_80242BA8)
+/* 91C138 80240858 D4222BA8 */  ldc1      $f2, %lo(D_80242BA8)($at)
 /* 91C13C 8024085C 46000021 */  cvt.d.s   $f0, $f0
 /* 91C140 80240860 46220000 */  add.d     $f0, $f0, $f2
 /* 91C144 80240864 4620010D */  trunc.w.d $f4, $f0
diff --git a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240D10_91C5F0.s b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240D10_91C5F0.s
index 3350e240e3..af649cf4db 100644
--- a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240D10_91C5F0.s
+++ b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240D10_91C5F0.s
@@ -95,9 +95,9 @@ glabel func_80240D10_91C5F0
 /* 91C744 80240E64 2C620035 */  sltiu     $v0, $v1, 0x35
 /* 91C748 80240E68 10400073 */  beqz      $v0, .L80241038
 /* 91C74C 80240E6C 00031080 */   sll      $v0, $v1, 2
-/* 91C750 80240E70 3C018024 */  lui       $at, 0x8024
+/* 91C750 80240E70 3C018024 */  lui       $at, %hi(D_80242BB8)
 /* 91C754 80240E74 00220821 */  addu      $at, $at, $v0
-/* 91C758 80240E78 8C222BB8 */  lw        $v0, 0x2bb8($at)
+/* 91C758 80240E78 8C222BB8 */  lw        $v0, %lo(D_80242BB8)($at)
 /* 91C75C 80240E7C 00400008 */  jr        $v0
 /* 91C760 80240E80 00000000 */   nop      
 /* 91C764 80240E84 0260202D */  daddu     $a0, $s3, $zero
diff --git a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80241060_91C940.s b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80241060_91C940.s
index c5a7bbfc7f..cd0fb56302 100644
--- a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80241060_91C940.s
+++ b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80241060_91C940.s
@@ -5,7 +5,7 @@ glabel func_80241060_91C940
 /* 91C940 80241060 3C013F80 */  lui       $at, 0x3f80
 /* 91C944 80241064 44810000 */  mtc1      $at, $f0
 /* 91C948 80241068 00000000 */  nop       
-/* 91C94C 8024106C 3C01800B */  lui       $at, 0x800b
-/* 91C950 80241070 E4202218 */  swc1      $f0, 0x2218($at)
+/* 91C94C 8024106C 3C01800B */  lui       $at, %hi(D_800B2218)
+/* 91C950 80241070 E4202218 */  swc1      $f0, %lo(D_800B2218)($at)
 /* 91C954 80241074 03E00008 */  jr        $ra
 /* 91C958 80241078 0000102D */   daddu    $v0, $zero, $zero
diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/91E5B0/func_80240040_91E5B0.s b/asm/nonmatchings/world/area_iwa/iwa_10/91E5B0/func_80240040_91E5B0.s
index e4384b4adc..d4e8adbd52 100644
--- a/asm/nonmatchings/world/area_iwa/iwa_10/91E5B0/func_80240040_91E5B0.s
+++ b/asm/nonmatchings/world/area_iwa/iwa_10/91E5B0/func_80240040_91E5B0.s
@@ -4,8 +4,8 @@
 glabel func_80240040_91E5B0
 /* 91E5B0 80240040 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* 91E5B4 80240044 AFB00010 */  sw        $s0, 0x10($sp)
-/* 91E5B8 80240048 3C108024 */  lui       $s0, 0x8024
-/* 91E5BC 8024004C 26101DD0 */  addiu     $s0, $s0, 0x1dd0
+/* 91E5B8 80240048 3C108024 */  lui       $s0, %hi(D_80241DD0)
+/* 91E5BC 8024004C 26101DD0 */  addiu     $s0, $s0, %lo(D_80241DD0)
 /* 91E5C0 80240050 AFBF0018 */  sw        $ra, 0x18($sp)
 /* 91E5C4 80240054 AFB10014 */  sw        $s1, 0x14($sp)
 /* 91E5C8 80240058 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_80240040_91E5B0
 /* 91E62C 802400BC 28620010 */  slti      $v0, $v1, 0x10
 /* 91E630 802400C0 1440FFFA */  bnez      $v0, .L802400AC
 /* 91E634 802400C4 24840004 */   addiu    $a0, $a0, 4
-/* 91E638 802400C8 3C108024 */  lui       $s0, 0x8024
-/* 91E63C 802400CC 26101DD0 */  addiu     $s0, $s0, 0x1dd0
+/* 91E638 802400C8 3C108024 */  lui       $s0, %hi(D_80241DD0)
+/* 91E63C 802400CC 26101DD0 */  addiu     $s0, $s0, %lo(D_80241DD0)
 /* 91E640 802400D0 0C00AB4B */  jal       heap_free
 /* 91E644 802400D4 8E040000 */   lw       $a0, ($s0)
 /* 91E648 802400D8 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_802404BC_91EA2C.s b/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_802404BC_91EA2C.s
index 6f5fa6b66c..4464205cf7 100644
--- a/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_802404BC_91EA2C.s
+++ b/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_802404BC_91EA2C.s
@@ -22,12 +22,12 @@ glabel func_802404BC_91EA2C
 /* 91EA70 80240500 0040982D */  daddu     $s3, $v0, $zero
 /* 91EA74 80240504 0000B02D */  daddu     $s6, $zero, $zero
 /* 91EA78 80240508 02C0902D */  daddu     $s2, $s6, $zero
-/* 91EA7C 8024050C 3C148024 */  lui       $s4, 0x8024
-/* 91EA80 80240510 26945A68 */  addiu     $s4, $s4, 0x5a68
+/* 91EA7C 8024050C 3C148024 */  lui       $s4, %hi(D_80245A68)
+/* 91EA80 80240510 26945A68 */  addiu     $s4, $s4, %lo(D_80245A68)
 /* 91EA84 80240514 0260882D */  daddu     $s1, $s3, $zero
 /* 91EA88 80240518 8EA200B4 */  lw        $v0, 0xb4($s5)
-/* 91EA8C 8024051C 3C038024 */  lui       $v1, 0x8024
-/* 91EA90 80240520 24635A60 */  addiu     $v1, $v1, 0x5a60
+/* 91EA8C 8024051C 3C038024 */  lui       $v1, %hi(D_80245A60)
+/* 91EA90 80240520 24635A60 */  addiu     $v1, $v1, %lo(D_80245A60)
 /* 91EA94 80240524 AEB30078 */  sw        $s3, 0x78($s5)
 /* 91EA98 80240528 00021027 */  nor       $v0, $zero, $v0
 /* 91EA9C 8024052C 0002BFC2 */  srl       $s7, $v0, 0x1f
@@ -42,8 +42,8 @@ glabel func_802404BC_91EA2C
 /* 91EABC 8024054C 5040002E */  beql      $v0, $zero, .L80240608
 /* 91EAC0 80240550 26520001 */   addiu    $s2, $s2, 1
 /* 91EAC4 80240554 00101100 */  sll       $v0, $s0, 4
-/* 91EAC8 80240558 3C068009 */  lui       $a2, 0x8009
-/* 91EACC 8024055C 24C6EF20 */  addiu     $a2, $a2, -0x10e0
+/* 91EAC8 80240558 3C068009 */  lui       $a2, %hi(D_8008EF20)
+/* 91EACC 8024055C 24C6EF20 */  addiu     $a2, $a2, %lo(D_8008EF20)
 /* 91EAD0 80240560 00461021 */  addu      $v0, $v0, $a2
 /* 91EAD4 80240564 0200202D */  daddu     $a0, $s0, $zero
 /* 91EAD8 80240568 AE300108 */  sw        $s0, 0x108($s1)
@@ -54,15 +54,15 @@ glabel func_802404BC_91EA2C
 /* 91EAEC 8024057C 0040202D */  daddu     $a0, $v0, $zero
 /* 91EAF0 80240580 04800011 */  bltz      $a0, .L802405C8
 /* 91EAF4 80240584 00101080 */   sll      $v0, $s0, 2
-/* 91EAF8 80240588 3C06800F */  lui       $a2, 0x800f
-/* 91EAFC 8024058C 24C67F00 */  addiu     $a2, $a2, 0x7f00
+/* 91EAF8 80240588 3C06800F */  lui       $a2, %hi(D_800F7F00)
+/* 91EAFC 8024058C 24C67F00 */  addiu     $a2, $a2, %lo(D_800F7F00)
 /* 91EB00 80240590 00461021 */  addu      $v0, $v0, $a2
 /* 91EB04 80240594 8C430000 */  lw        $v1, ($v0)
 /* 91EB08 80240598 24020001 */  addiu     $v0, $zero, 1
 /* 91EB0C 8024059C AE22018C */  sw        $v0, 0x18c($s1)
 /* 91EB10 802405A0 00041080 */  sll       $v0, $a0, 2
-/* 91EB14 802405A4 3C068024 */  lui       $a2, 0x8024
-/* 91EB18 802405A8 24C65A78 */  addiu     $a2, $a2, 0x5a78
+/* 91EB14 802405A4 3C068024 */  lui       $a2, %hi(D_80245A78)
+/* 91EB18 802405A8 24C65A78 */  addiu     $a2, $a2, %lo(D_80245A78)
 /* 91EB1C 802405AC AE230000 */  sw        $v1, ($s1)
 /* 91EB20 802405B0 001218C0 */  sll       $v1, $s2, 3
 /* 91EB24 802405B4 00431021 */  addu      $v0, $v0, $v1
@@ -71,8 +71,8 @@ glabel func_802404BC_91EA2C
 /* 91EB30 802405C0 0809017B */  j         .L802405EC
 /* 91EB34 802405C4 AE220294 */   sw       $v0, 0x294($s1)
 .L802405C8:
-/* 91EB38 802405C8 3C06800F */  lui       $a2, 0x800f
-/* 91EB3C 802405CC 24C67F40 */  addiu     $a2, $a2, 0x7f40
+/* 91EB38 802405C8 3C06800F */  lui       $a2, %hi(D_800F7F40)
+/* 91EB3C 802405CC 24C67F40 */  addiu     $a2, $a2, %lo(D_800F7F40)
 /* 91EB40 802405D0 00461021 */  addu      $v0, $v0, $a2
 /* 91EB44 802405D4 8C420000 */  lw        $v0, ($v0)
 /* 91EB48 802405D8 AE20018C */  sw        $zero, 0x18c($s1)
@@ -130,9 +130,9 @@ glabel func_802404BC_91EA2C
 /* 91EC00 80240690 02621021 */  addu      $v0, $s3, $v0
 /* 91EC04 80240694 8C420108 */  lw        $v0, 0x108($v0)
 /* 91EC08 80240698 00021100 */  sll       $v0, $v0, 4
-/* 91EC0C 8024069C 3C038009 */  lui       $v1, 0x8009
+/* 91EC0C 8024069C 3C038009 */  lui       $v1, %hi(D_8008EF20)
 /* 91EC10 802406A0 00621821 */  addu      $v1, $v1, $v0
-/* 91EC14 802406A4 8C63EF20 */  lw        $v1, -0x10e0($v1)
+/* 91EC14 802406A4 8C63EF20 */  lw        $v1, %lo(D_8008EF20)($v1)
 /* 91EC18 802406A8 8EA20074 */  lw        $v0, 0x74($s5)
 /* 91EC1C 802406AC 2442FFFF */  addiu     $v0, $v0, -1
 /* 91EC20 802406B0 00021080 */  sll       $v0, $v0, 2
diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240738_91ECA8.s b/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240738_91ECA8.s
index 51476c406b..adf3fdd27e 100644
--- a/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240738_91ECA8.s
+++ b/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240738_91ECA8.s
@@ -7,9 +7,9 @@ glabel func_80240738_91ECA8
 /* 91ECB0 80240740 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 91ECB4 80240744 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 91ECB8 80240748 00021100 */  sll       $v0, $v0, 4
-/* 91ECBC 8024074C 3C048009 */  lui       $a0, 0x8009
+/* 91ECBC 8024074C 3C048009 */  lui       $a0, %hi(D_8008EF20)
 /* 91ECC0 80240750 00822021 */  addu      $a0, $a0, $v0
-/* 91ECC4 80240754 8C84EF20 */  lw        $a0, -0x10e0($a0)
+/* 91ECC4 80240754 8C84EF20 */  lw        $a0, %lo(D_8008EF20)($a0)
 /* 91ECC8 80240758 0C0496CF */  jal       set_message_string
 /* 91ECCC 8024075C 0000282D */   daddu    $a1, $zero, $zero
 /* 91ECD0 80240760 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_802408F0_91EE60.s b/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_802408F0_91EE60.s
index c4d468dcf4..ce271abf36 100644
--- a/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_802408F0_91EE60.s
+++ b/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_802408F0_91EE60.s
@@ -30,9 +30,9 @@ glabel func_802408F0_91EE60
 /* 91EEC4 80240954 000320C0 */  sll       $a0, $v1, 3
 /* 91EEC8 80240958 00641821 */  addu      $v1, $v1, $a0
 /* 91EECC 8024095C 000318C0 */  sll       $v1, $v1, 3
-/* 91EED0 80240960 3C01800B */  lui       $at, 0x800b
+/* 91EED0 80240960 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* 91EED4 80240964 00230821 */  addu      $at, $at, $v1
-/* 91EED8 80240968 C42C1DEC */  lwc1      $f12, 0x1dec($at)
+/* 91EED8 80240968 C42C1DEC */  lwc1      $f12, %lo(D_800B1DEC)($at)
 /* 91EEDC 8024096C 0C00A88D */  jal       sin_cos_deg
 /* 91EEE0 80240970 0040A82D */   daddu    $s5, $v0, $zero
 /* 91EEE4 80240974 1200005D */  beqz      $s0, .L80240AEC
@@ -79,8 +79,8 @@ glabel func_802408F0_91EE60
 /* 91EF84 80240A14 26100004 */   addiu    $s0, $s0, 4
 /* 91EF88 80240A18 0000882D */  daddu     $s1, $zero, $zero
 /* 91EF8C 80240A1C 0240802D */  daddu     $s0, $s2, $zero
-/* 91EF90 80240A20 3C148024 */  lui       $s4, 0x8024
-/* 91EF94 80240A24 26945AB8 */  addiu     $s4, $s4, 0x5ab8
+/* 91EF90 80240A20 3C148024 */  lui       $s4, %hi(D_80245AB8)
+/* 91EF94 80240A24 26945AB8 */  addiu     $s4, $s4, %lo(D_80245AB8)
 /* 91EF98 80240A28 3C014248 */  lui       $at, 0x4248
 /* 91EF9C 80240A2C 4481A000 */  mtc1      $at, $f20
 /* 91EFA0 80240A30 24130044 */  addiu     $s3, $zero, 0x44
@@ -150,8 +150,8 @@ glabel func_802408F0_91EE60
 /* 91F094 80240B24 00000000 */   nop      
 .L80240B28:
 /* 91F098 80240B28 0000882D */  daddu     $s1, $zero, $zero
-/* 91F09C 80240B2C 3C148024 */  lui       $s4, 0x8024
-/* 91F0A0 80240B30 26945AB8 */  addiu     $s4, $s4, 0x5ab8
+/* 91F09C 80240B2C 3C148024 */  lui       $s4, %hi(D_80245AB8)
+/* 91F0A0 80240B30 26945AB8 */  addiu     $s4, $s4, %lo(D_80245AB8)
 /* 91F0A4 80240B34 24130020 */  addiu     $s3, $zero, 0x20
 /* 91F0A8 80240B38 3C064248 */  lui       $a2, 0x4248
 /* 91F0AC 80240B3C 44800000 */  mtc1      $zero, $f0
@@ -197,8 +197,8 @@ glabel func_802408F0_91EE60
 /* 91F148 80240BD8 AE400060 */   sw       $zero, 0x60($s2)
 .L80240BDC:
 /* 91F14C 80240BDC 0000882D */  daddu     $s1, $zero, $zero
-/* 91F150 80240BE0 3C148024 */  lui       $s4, 0x8024
-/* 91F154 80240BE4 26945AB8 */  addiu     $s4, $s4, 0x5ab8
+/* 91F150 80240BE0 3C148024 */  lui       $s4, %hi(D_80245AB8)
+/* 91F154 80240BE4 26945AB8 */  addiu     $s4, $s4, %lo(D_80245AB8)
 /* 91F158 80240BE8 24130020 */  addiu     $s3, $zero, 0x20
 /* 91F15C 80240BEC 0240802D */  daddu     $s0, $s2, $zero
 /* 91F160 80240BF0 3C014248 */  lui       $at, 0x4248
diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/91F5A0/func_802413E0_91F950.s b/asm/nonmatchings/world/area_iwa/iwa_10/91F5A0/func_802413E0_91F950.s
index 27ee6d0218..18cae2f82d 100644
--- a/asm/nonmatchings/world/area_iwa/iwa_10/91F5A0/func_802413E0_91F950.s
+++ b/asm/nonmatchings/world/area_iwa/iwa_10/91F5A0/func_802413E0_91F950.s
@@ -6,11 +6,11 @@ glabel func_802413E0_91F950
 /* 91F954 802413E4 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 91F958 802413E8 10A00003 */  beqz      $a1, .L802413F8
 /* 91F95C 802413EC 8C86000C */   lw       $a2, 0xc($a0)
-/* 91F960 802413F0 3C018024 */  lui       $at, 0x8024
-/* 91F964 802413F4 AC20626C */  sw        $zero, 0x626c($at)
+/* 91F960 802413F0 3C018024 */  lui       $at, %hi(D_8024626C)
+/* 91F964 802413F4 AC20626C */  sw        $zero, %lo(D_8024626C)($at)
 .L802413F8:
-/* 91F968 802413F8 3C038024 */  lui       $v1, 0x8024
-/* 91F96C 802413FC 2463626C */  addiu     $v1, $v1, 0x626c
+/* 91F968 802413F8 3C038024 */  lui       $v1, %hi(D_8024626C)
+/* 91F96C 802413FC 2463626C */  addiu     $v1, $v1, %lo(D_8024626C)
 /* 91F970 80241400 8C620000 */  lw        $v0, ($v1)
 /* 91F974 80241404 54400003 */  bnel      $v0, $zero, .L80241414
 /* 91F978 80241408 AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_802413E0_91F950
 /* 91F980 80241410 0000102D */   daddu    $v0, $zero, $zero
 .L80241414:
 /* 91F984 80241414 8CC50000 */  lw        $a1, ($a2)
-/* 91F988 80241418 3C068024 */  lui       $a2, 0x8024
+/* 91F988 80241418 3C068024 */  lui       $a2, %hi(D_80246270)
 /* 91F98C 8024141C 0C0B2026 */  jal       set_variable
-/* 91F990 80241420 8CC66270 */   lw       $a2, 0x6270($a2)
+/* 91F990 80241420 8CC66270 */   lw       $a2, %lo(D_80246270)($a2)
 /* 91F994 80241424 24020002 */  addiu     $v0, $zero, 2
 .L80241428:
 /* 91F998 80241428 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/91F5A0/func_80241434_91F9A4.s b/asm/nonmatchings/world/area_iwa/iwa_10/91F5A0/func_80241434_91F9A4.s
index 550ad9118f..ce41839153 100644
--- a/asm/nonmatchings/world/area_iwa/iwa_10/91F5A0/func_80241434_91F9A4.s
+++ b/asm/nonmatchings/world/area_iwa/iwa_10/91F5A0/func_80241434_91F9A4.s
@@ -7,12 +7,12 @@ glabel func_80241434_91F9A4
 /* 91F9AC 8024143C 8C82000C */  lw        $v0, 0xc($a0)
 /* 91F9B0 80241440 0C0B1EAF */  jal       get_variable
 /* 91F9B4 80241444 8C450000 */   lw       $a1, ($v0)
-/* 91F9B8 80241448 3C018024 */  lui       $at, 0x8024
-/* 91F9BC 8024144C AC226270 */  sw        $v0, 0x6270($at)
+/* 91F9B8 80241448 3C018024 */  lui       $at, %hi(D_80246270)
+/* 91F9BC 8024144C AC226270 */  sw        $v0, %lo(D_80246270)($at)
 /* 91F9C0 80241450 24020002 */  addiu     $v0, $zero, 2
 /* 91F9C4 80241454 8FBF0010 */  lw        $ra, 0x10($sp)
 /* 91F9C8 80241458 24030001 */  addiu     $v1, $zero, 1
-/* 91F9CC 8024145C 3C018024 */  lui       $at, 0x8024
-/* 91F9D0 80241460 AC23626C */  sw        $v1, 0x626c($at)
+/* 91F9CC 8024145C 3C018024 */  lui       $at, %hi(D_8024626C)
+/* 91F9D0 80241460 AC23626C */  sw        $v1, %lo(D_8024626C)($at)
 /* 91F9D4 80241464 03E00008 */  jr        $ra
 /* 91F9D8 80241468 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/91F5A0/func_8024146C_91F9DC.s b/asm/nonmatchings/world/area_iwa/iwa_10/91F5A0/func_8024146C_91F9DC.s
index 5495c48d57..ae8c415e4e 100644
--- a/asm/nonmatchings/world/area_iwa/iwa_10/91F5A0/func_8024146C_91F9DC.s
+++ b/asm/nonmatchings/world/area_iwa/iwa_10/91F5A0/func_8024146C_91F9DC.s
@@ -13,8 +13,8 @@ glabel func_8024146C_91F9DC
 /* 91F9FC 8024148C 8C620000 */  lw        $v0, ($v1)
 /* 91FA00 80241490 5040000A */  beql      $v0, $zero, .L802414BC
 /* 91FA04 80241494 00041080 */   sll      $v0, $a0, 2
-/* 91FA08 80241498 3C058025 */  lui       $a1, 0x8025
-/* 91FA0C 8024149C 24A58480 */  addiu     $a1, $a1, -0x7b80
+/* 91FA08 80241498 3C058025 */  lui       $a1, %hi(D_80248480)
+/* 91FA0C 8024149C 24A58480 */  addiu     $a1, $a1, %lo(D_80248480)
 .L802414A0:
 /* 91FA10 802414A0 24630004 */  addiu     $v1, $v1, 4
 /* 91FA14 802414A4 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_8024146C_91F9DC
 /* 91FA24 802414B4 24A50004 */   addiu    $a1, $a1, 4
 /* 91FA28 802414B8 00041080 */  sll       $v0, $a0, 2
 .L802414BC:
-/* 91FA2C 802414BC 3C018025 */  lui       $at, 0x8025
+/* 91FA2C 802414BC 3C018025 */  lui       $at, %hi(D_80248480)
 /* 91FA30 802414C0 00220821 */  addu      $at, $at, $v0
-/* 91FA34 802414C4 AC208480 */  sw        $zero, -0x7b80($at)
+/* 91FA34 802414C4 AC208480 */  sw        $zero, %lo(D_80248480)($at)
 /* 91FA38 802414C8 0809053E */  j         .L802414F8
 /* 91FA3C 802414CC 00000000 */   nop      
 .L802414D0:
-/* 91FA40 802414D0 3C038025 */  lui       $v1, 0x8025
-/* 91FA44 802414D4 24638480 */  addiu     $v1, $v1, -0x7b80
+/* 91FA40 802414D0 3C038025 */  lui       $v1, %hi(D_80248480)
+/* 91FA44 802414D4 24638480 */  addiu     $v1, $v1, %lo(D_80248480)
 /* 91FA48 802414D8 0060282D */  daddu     $a1, $v1, $zero
 .L802414DC:
 /* 91FA4C 802414DC 24820010 */  addiu     $v0, $a0, 0x10
diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/91FA80/func_80241510_91FA80.s b/asm/nonmatchings/world/area_iwa/iwa_10/91FA80/func_80241510_91FA80.s
index 0c16a39100..4e5fced331 100644
--- a/asm/nonmatchings/world/area_iwa/iwa_10/91FA80/func_80241510_91FA80.s
+++ b/asm/nonmatchings/world/area_iwa/iwa_10/91FA80/func_80241510_91FA80.s
@@ -3,8 +3,8 @@
 
 glabel func_80241510_91FA80
 /* 91FA80 80241510 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 91FA84 80241514 3C048025 */  lui       $a0, 0x8025
-/* 91FA88 80241518 24848470 */  addiu     $a0, $a0, -0x7b90
+/* 91FA84 80241514 3C048025 */  lui       $a0, %hi(D_80248470)
+/* 91FA88 80241518 24848470 */  addiu     $a0, $a0, %lo(D_80248470)
 /* 91FA8C 8024151C 27A50010 */  addiu     $a1, $sp, 0x10
 /* 91FA90 80241520 AFBF0020 */  sw        $ra, 0x20($sp)
 /* 91FA94 80241524 AFB1001C */  sw        $s1, 0x1c($sp)
@@ -12,16 +12,16 @@ glabel func_80241510_91FA80
 /* 91FA9C 8024152C AFB00018 */   sw       $s0, 0x18($sp)
 /* 91FAA0 80241530 0040802D */  daddu     $s0, $v0, $zero
 /* 91FAA4 80241534 0200202D */  daddu     $a0, $s0, $zero
-/* 91FAA8 80241538 3C118025 */  lui       $s1, 0x8025
-/* 91FAAC 8024153C 26318650 */  addiu     $s1, $s1, -0x79b0
+/* 91FAA8 80241538 3C118025 */  lui       $s1, %hi(D_80248650)
+/* 91FAAC 8024153C 26318650 */  addiu     $s1, $s1, %lo(D_80248650)
 /* 91FAB0 80241540 0C01BB7C */  jal       decode_yay0
 /* 91FAB4 80241544 0220282D */   daddu    $a1, $s1, $zero
 /* 91FAB8 80241548 0C00AB1E */  jal       general_heap_free
 /* 91FABC 8024154C 0200202D */   daddu    $a0, $s0, $zero
-/* 91FAC0 80241550 3C048025 */  lui       $a0, 0x8025
-/* 91FAC4 80241554 2484C5E0 */  addiu     $a0, $a0, -0x3a20
-/* 91FAC8 80241558 3C028025 */  lui       $v0, 0x8025
-/* 91FACC 8024155C 24428850 */  addiu     $v0, $v0, -0x77b0
+/* 91FAC0 80241550 3C048025 */  lui       $a0, %hi(D_8024C5E0)
+/* 91FAC4 80241554 2484C5E0 */  addiu     $a0, $a0, %lo(D_8024C5E0)
+/* 91FAC8 80241558 3C028025 */  lui       $v0, %hi(D_80248850)
+/* 91FACC 8024155C 24428850 */  addiu     $v0, $v0, %lo(D_80248850)
 /* 91FAD0 80241560 AC820000 */  sw        $v0, ($a0)
 /* 91FAD4 80241564 24020096 */  addiu     $v0, $zero, 0x96
 /* 91FAD8 80241568 A4820008 */  sh        $v0, 8($a0)
diff --git a/asm/nonmatchings/world/area_iwa/iwa_11/926C70/func_80240280_926C70.s b/asm/nonmatchings/world/area_iwa/iwa_11/926C70/func_80240280_926C70.s
index 370ce730bd..7e9b3a6a87 100644
--- a/asm/nonmatchings/world/area_iwa/iwa_11/926C70/func_80240280_926C70.s
+++ b/asm/nonmatchings/world/area_iwa/iwa_11/926C70/func_80240280_926C70.s
@@ -4,8 +4,8 @@
 glabel func_80240280_926C70
 /* 926C70 80240280 8C860084 */  lw        $a2, 0x84($a0)
 /* 926C74 80240284 0000282D */  daddu     $a1, $zero, $zero
-/* 926C78 80240288 3C038024 */  lui       $v1, 0x8024
-/* 926C7C 8024028C 24632148 */  addiu     $v1, $v1, 0x2148
+/* 926C78 80240288 3C038024 */  lui       $v1, %hi(D_80242148)
+/* 926C7C 8024028C 24632148 */  addiu     $v1, $v1, %lo(D_80242148)
 .L80240290:
 /* 926C80 80240290 8C620000 */  lw        $v0, ($v1)
 /* 926C84 80240294 00C2102A */  slt       $v0, $a2, $v0
@@ -18,8 +18,8 @@ glabel func_80240280_926C70
 /* 926CA0 802402B0 24A3FFFF */  addiu     $v1, $a1, -1
 .L802402B4:
 /* 926CA4 802402B4 0000282D */  daddu     $a1, $zero, $zero
-/* 926CA8 802402B8 3C078024 */  lui       $a3, 0x8024
-/* 926CAC 802402BC 24E72148 */  addiu     $a3, $a3, 0x2148
+/* 926CA8 802402B8 3C078024 */  lui       $a3, %hi(D_80242148)
+/* 926CAC 802402BC 24E72148 */  addiu     $a3, $a3, %lo(D_80242148)
 /* 926CB0 802402C0 000310C0 */  sll       $v0, $v1, 3
 /* 926CB4 802402C4 00431023 */  subu      $v0, $v0, $v1
 /* 926CB8 802402C8 00023080 */  sll       $a2, $v0, 2
diff --git a/asm/nonmatchings/world/area_jan/jan_00/B20540/func_802403F4_B20934.s b/asm/nonmatchings/world/area_jan/jan_00/B20540/func_802403F4_B20934.s
index 4c51cc1c23..96031a03e2 100644
--- a/asm/nonmatchings/world/area_jan/jan_00/B20540/func_802403F4_B20934.s
+++ b/asm/nonmatchings/world/area_jan/jan_00/B20540/func_802403F4_B20934.s
@@ -4,8 +4,8 @@
 glabel func_802403F4_B20934
 /* B20934 802403F4 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* B20938 802403F8 AFB00010 */  sw        $s0, 0x10($sp)
-/* B2093C 802403FC 3C108024 */  lui       $s0, 0x8024
-/* B20940 80240400 261023C8 */  addiu     $s0, $s0, 0x23c8
+/* B2093C 802403FC 3C108024 */  lui       $s0, %hi(D_802423C8)
+/* B20940 80240400 261023C8 */  addiu     $s0, $s0, %lo(D_802423C8)
 /* B20944 80240404 AFBF0018 */  sw        $ra, 0x18($sp)
 /* B20948 80240408 AFB10014 */  sw        $s1, 0x14($sp)
 /* B2094C 8024040C 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_802403F4_B20934
 /* B209B0 80240470 28620010 */  slti      $v0, $v1, 0x10
 /* B209B4 80240474 1440FFFA */  bnez      $v0, .L80240460
 /* B209B8 80240478 24840004 */   addiu    $a0, $a0, 4
-/* B209BC 8024047C 3C108024 */  lui       $s0, 0x8024
-/* B209C0 80240480 261023C8 */  addiu     $s0, $s0, 0x23c8
+/* B209BC 8024047C 3C108024 */  lui       $s0, %hi(D_802423C8)
+/* B209C0 80240480 261023C8 */  addiu     $s0, $s0, %lo(D_802423C8)
 /* B209C4 80240484 0C00AB4B */  jal       heap_free
 /* B209C8 80240488 8E040000 */   lw       $a0, ($s0)
 /* B209CC 8024048C AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240738_B20C78.s b/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240738_B20C78.s
index 48ed16b568..3d2c87ee4c 100644
--- a/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240738_B20C78.s
+++ b/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240738_B20C78.s
@@ -6,11 +6,11 @@ glabel func_80240738_B20C78
 /* B20C7C 8024073C AFBF0010 */  sw        $ra, 0x10($sp)
 /* B20C80 80240740 10A00003 */  beqz      $a1, .L80240750
 /* B20C84 80240744 8C86000C */   lw       $a2, 0xc($a0)
-/* B20C88 80240748 3C018024 */  lui       $at, 0x8024
-/* B20C8C 8024074C AC20242C */  sw        $zero, 0x242c($at)
+/* B20C88 80240748 3C018024 */  lui       $at, %hi(D_8024242C)
+/* B20C8C 8024074C AC20242C */  sw        $zero, %lo(D_8024242C)($at)
 .L80240750:
-/* B20C90 80240750 3C038024 */  lui       $v1, 0x8024
-/* B20C94 80240754 2463242C */  addiu     $v1, $v1, 0x242c
+/* B20C90 80240750 3C038024 */  lui       $v1, %hi(D_8024242C)
+/* B20C94 80240754 2463242C */  addiu     $v1, $v1, %lo(D_8024242C)
 /* B20C98 80240758 8C620000 */  lw        $v0, ($v1)
 /* B20C9C 8024075C 54400003 */  bnel      $v0, $zero, .L8024076C
 /* B20CA0 80240760 AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_80240738_B20C78
 /* B20CA8 80240768 0000102D */   daddu    $v0, $zero, $zero
 .L8024076C:
 /* B20CAC 8024076C 8CC50000 */  lw        $a1, ($a2)
-/* B20CB0 80240770 3C068024 */  lui       $a2, 0x8024
+/* B20CB0 80240770 3C068024 */  lui       $a2, %hi(D_80242430)
 /* B20CB4 80240774 0C0B2026 */  jal       set_variable
-/* B20CB8 80240778 8CC62430 */   lw       $a2, 0x2430($a2)
+/* B20CB8 80240778 8CC62430 */   lw       $a2, %lo(D_80242430)($a2)
 /* B20CBC 8024077C 24020002 */  addiu     $v0, $zero, 2
 .L80240780:
 /* B20CC0 80240780 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_jan/jan_00/B20540/func_8024078C_B20CCC.s b/asm/nonmatchings/world/area_jan/jan_00/B20540/func_8024078C_B20CCC.s
index 39935b0030..f8e7b406e8 100644
--- a/asm/nonmatchings/world/area_jan/jan_00/B20540/func_8024078C_B20CCC.s
+++ b/asm/nonmatchings/world/area_jan/jan_00/B20540/func_8024078C_B20CCC.s
@@ -7,12 +7,12 @@ glabel func_8024078C_B20CCC
 /* B20CD4 80240794 8C82000C */  lw        $v0, 0xc($a0)
 /* B20CD8 80240798 0C0B1EAF */  jal       get_variable
 /* B20CDC 8024079C 8C450000 */   lw       $a1, ($v0)
-/* B20CE0 802407A0 3C018024 */  lui       $at, 0x8024
-/* B20CE4 802407A4 AC222430 */  sw        $v0, 0x2430($at)
+/* B20CE0 802407A0 3C018024 */  lui       $at, %hi(D_80242430)
+/* B20CE4 802407A4 AC222430 */  sw        $v0, %lo(D_80242430)($at)
 /* B20CE8 802407A8 24020002 */  addiu     $v0, $zero, 2
 /* B20CEC 802407AC 8FBF0010 */  lw        $ra, 0x10($sp)
 /* B20CF0 802407B0 24030001 */  addiu     $v1, $zero, 1
-/* B20CF4 802407B4 3C018024 */  lui       $at, 0x8024
-/* B20CF8 802407B8 AC23242C */  sw        $v1, 0x242c($at)
+/* B20CF4 802407B4 3C018024 */  lui       $at, %hi(D_8024242C)
+/* B20CF8 802407B8 AC23242C */  sw        $v1, %lo(D_8024242C)($at)
 /* B20CFC 802407BC 03E00008 */  jr        $ra
 /* B20D00 802407C0 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_jan/jan_00/B20540/func_802407C4_B20D04.s b/asm/nonmatchings/world/area_jan/jan_00/B20540/func_802407C4_B20D04.s
index 147d39b70e..89ba1b66aa 100644
--- a/asm/nonmatchings/world/area_jan/jan_00/B20540/func_802407C4_B20D04.s
+++ b/asm/nonmatchings/world/area_jan/jan_00/B20540/func_802407C4_B20D04.s
@@ -13,8 +13,8 @@ glabel func_802407C4_B20D04
 /* B20D24 802407E4 8C620000 */  lw        $v0, ($v1)
 /* B20D28 802407E8 5040000A */  beql      $v0, $zero, .L80240814
 /* B20D2C 802407EC 00041080 */   sll      $v0, $a0, 2
-/* B20D30 802407F0 3C058024 */  lui       $a1, 0x8024
-/* B20D34 802407F4 24A57AF0 */  addiu     $a1, $a1, 0x7af0
+/* B20D30 802407F0 3C058024 */  lui       $a1, %hi(D_80247AF0)
+/* B20D34 802407F4 24A57AF0 */  addiu     $a1, $a1, %lo(D_80247AF0)
 .L802407F8:
 /* B20D38 802407F8 24630004 */  addiu     $v1, $v1, 4
 /* B20D3C 802407FC 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_802407C4_B20D04
 /* B20D4C 8024080C 24A50004 */   addiu    $a1, $a1, 4
 /* B20D50 80240810 00041080 */  sll       $v0, $a0, 2
 .L80240814:
-/* B20D54 80240814 3C018024 */  lui       $at, 0x8024
+/* B20D54 80240814 3C018024 */  lui       $at, %hi(D_80247AF0)
 /* B20D58 80240818 00220821 */  addu      $at, $at, $v0
-/* B20D5C 8024081C AC207AF0 */  sw        $zero, 0x7af0($at)
+/* B20D5C 8024081C AC207AF0 */  sw        $zero, %lo(D_80247AF0)($at)
 /* B20D60 80240820 08090214 */  j         .L80240850
 /* B20D64 80240824 00000000 */   nop      
 .L80240828:
-/* B20D68 80240828 3C038024 */  lui       $v1, 0x8024
-/* B20D6C 8024082C 24637AF0 */  addiu     $v1, $v1, 0x7af0
+/* B20D68 80240828 3C038024 */  lui       $v1, %hi(D_80247AF0)
+/* B20D6C 8024082C 24637AF0 */  addiu     $v1, $v1, %lo(D_80247AF0)
 /* B20D70 80240830 0060282D */  daddu     $a1, $v1, $zero
 .L80240834:
 /* B20D74 80240834 24820010 */  addiu     $v0, $a0, 0x10
diff --git a/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240ADC_B2101C.s b/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240ADC_B2101C.s
index 6550d0e90c..6ad675303e 100644
--- a/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240ADC_B2101C.s
+++ b/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240ADC_B2101C.s
@@ -15,7 +15,7 @@ glabel func_80240ADC_B2101C
 /* B21044 80240B04 8FBF0014 */  lw        $ra, 0x14($sp)
 /* B21048 80240B08 8FB00010 */  lw        $s0, 0x10($sp)
 /* B2104C 80240B0C 24020002 */  addiu     $v0, $zero, 2
-/* B21050 80240B10 3C018024 */  lui       $at, 0x8024
-/* B21054 80240B14 AC237CB4 */  sw        $v1, 0x7cb4($at)
+/* B21050 80240B10 3C018024 */  lui       $at, %hi(D_80247CB4)
+/* B21054 80240B14 AC237CB4 */  sw        $v1, %lo(D_80247CB4)($at)
 /* B21058 80240B18 03E00008 */  jr        $ra
 /* B2105C 80240B1C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240B20_B21060.s b/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240B20_B21060.s
index af3d199586..981d2071da 100644
--- a/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240B20_B21060.s
+++ b/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240B20_B21060.s
@@ -6,8 +6,8 @@ glabel func_80240B20_B21060
 /* B21064 80240B24 AFBF0010 */  sw        $ra, 0x10($sp)
 /* B21068 80240B28 0C00EABB */  jal       get_npc_unsafe
 /* B2106C 80240B2C 8C84008C */   lw       $a0, 0x8c($a0)
-/* B21070 80240B30 3C038024 */  lui       $v1, 0x8024
-/* B21074 80240B34 8C637CB4 */  lw        $v1, 0x7cb4($v1)
+/* B21070 80240B30 3C038024 */  lui       $v1, %hi(D_80247CB4)
+/* B21074 80240B34 8C637CB4 */  lw        $v1, %lo(D_80247CB4)($v1)
 /* B21078 80240B38 AC430028 */  sw        $v1, 0x28($v0)
 /* B2107C 80240B3C 8FBF0010 */  lw        $ra, 0x10($sp)
 /* B21080 80240B40 24020002 */  addiu     $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_802411EC_B2172C.s b/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_802411EC_B2172C.s
index 86d2bc0dcb..db340f9bd0 100644
--- a/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_802411EC_B2172C.s
+++ b/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_802411EC_B2172C.s
@@ -25,8 +25,8 @@ glabel func_802411EC_B2172C
 /* B2177C 8024123C 0040802D */  daddu     $s0, $v0, $zero
 /* B21780 80241240 12000034 */  beqz      $s0, .L80241314
 /* B21784 80241244 24020002 */   addiu    $v0, $zero, 2
-/* B21788 80241248 3C038024 */  lui       $v1, 0x8024
-/* B2178C 8024124C 24635950 */  addiu     $v1, $v1, 0x5950
+/* B21788 80241248 3C038024 */  lui       $v1, %hi(D_80245950)
+/* B2178C 8024124C 24635950 */  addiu     $v1, $v1, %lo(D_80245950)
 /* B21790 80241250 8C640000 */  lw        $a0, ($v1)
 /* B21794 80241254 24820004 */  addiu     $v0, $a0, 4
 /* B21798 80241258 AC620000 */  sw        $v0, ($v1)
@@ -50,8 +50,8 @@ glabel func_802411EC_B2172C
 /* B217DC 8024129C 14620011 */  bne       $v1, $v0, .L802412E4
 /* B217E0 802412A0 0220202D */   daddu    $a0, $s1, $zero
 .L802412A4:
-/* B217E4 802412A4 3C028024 */  lui       $v0, 0x8024
-/* B217E8 802412A8 8C425950 */  lw        $v0, 0x5950($v0)
+/* B217E4 802412A4 3C028024 */  lui       $v0, %hi(D_80245950)
+/* B217E8 802412A8 8C425950 */  lw        $v0, %lo(D_80245950)($v0)
 /* B217EC 802412AC 44826000 */  mtc1      $v0, $f12
 /* B217F0 802412B0 00000000 */  nop       
 /* B217F4 802412B4 04410006 */  bgez      $v0, .L802412D0
diff --git a/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_80241338_B21878.s b/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_80241338_B21878.s
index 588261d340..d926d8ee59 100644
--- a/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_80241338_B21878.s
+++ b/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_80241338_B21878.s
@@ -31,9 +31,9 @@ glabel func_80241338_B21878
 /* B218E0 802413A0 2C62000D */  sltiu     $v0, $v1, 0xd
 /* B218E4 802413A4 1040000B */  beqz      $v0, .L802413D4
 /* B218E8 802413A8 00031080 */   sll      $v0, $v1, 2
-/* B218EC 802413AC 3C018024 */  lui       $at, 0x8024
+/* B218EC 802413AC 3C018024 */  lui       $at, %hi(D_80247AB8)
 /* B218F0 802413B0 00220821 */  addu      $at, $at, $v0
-/* B218F4 802413B4 8C227AB8 */  lw        $v0, 0x7ab8($at)
+/* B218F4 802413B4 8C227AB8 */  lw        $v0, %lo(D_80247AB8)($at)
 /* B218F8 802413B8 00400008 */  jr        $v0
 /* B218FC 802413BC 00000000 */   nop      
 /* B21900 802413C0 8E020000 */  lw        $v0, ($s0)
diff --git a/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_802415B0_B21AF0.s b/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_802415B0_B21AF0.s
index a72717edee..b3c100a3ee 100644
--- a/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_802415B0_B21AF0.s
+++ b/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_802415B0_B21AF0.s
@@ -11,15 +11,15 @@ glabel func_802415B0_B21AF0
 /* B21B08 802415C8 AFB10024 */  sw        $s1, 0x24($sp)
 /* B21B0C 802415CC 0C0470AC */  jal       func_8011C2B0
 /* B21B10 802415D0 AFB00020 */   sw       $s0, 0x20($sp)
-/* B21B14 802415D4 3C118024 */  lui       $s1, 0x8024
-/* B21B18 802415D8 26315954 */  addiu     $s1, $s1, 0x5954
+/* B21B14 802415D4 3C118024 */  lui       $s1, %hi(D_80245954)
+/* B21B18 802415D8 26315954 */  addiu     $s1, $s1, %lo(D_80245954)
 /* B21B1C 802415DC 8FA40010 */  lw        $a0, 0x10($sp)
 /* B21B20 802415E0 8FA50014 */  lw        $a1, 0x14($sp)
 /* B21B24 802415E4 8FA60018 */  lw        $a2, 0x18($sp)
 /* B21B28 802415E8 0C0904CE */  jal       func_80241338_B21878
 /* B21B2C 802415EC 0220382D */   daddu    $a3, $s1, $zero
-/* B21B30 802415F0 3C03800A */  lui       $v1, 0x800a
-/* B21B34 802415F4 2463A66C */  addiu     $v1, $v1, -0x5994
+/* B21B30 802415F0 3C03800A */  lui       $v1, %hi(D_8009A66C)
+/* B21B34 802415F4 2463A66C */  addiu     $v1, $v1, %lo(D_8009A66C)
 /* B21B38 802415F8 8C620000 */  lw        $v0, ($v1)
 /* B21B3C 802415FC 24040001 */  addiu     $a0, $zero, 1
 /* B21B40 80241600 0040802D */  daddu     $s0, $v0, $zero
diff --git a/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_80241654_B21B94.s b/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_80241654_B21B94.s
index 30b7e184f6..d58c66004f 100644
--- a/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_80241654_B21B94.s
+++ b/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_80241654_B21B94.s
@@ -11,15 +11,15 @@ glabel func_80241654_B21B94
 /* B21BAC 8024166C AFB10024 */  sw        $s1, 0x24($sp)
 /* B21BB0 80241670 0C0470AC */  jal       func_8011C2B0
 /* B21BB4 80241674 AFB00020 */   sw       $s0, 0x20($sp)
-/* B21BB8 80241678 3C118024 */  lui       $s1, 0x8024
-/* B21BBC 8024167C 26315958 */  addiu     $s1, $s1, 0x5958
+/* B21BB8 80241678 3C118024 */  lui       $s1, %hi(D_80245958)
+/* B21BBC 8024167C 26315958 */  addiu     $s1, $s1, %lo(D_80245958)
 /* B21BC0 80241680 8FA40010 */  lw        $a0, 0x10($sp)
 /* B21BC4 80241684 8FA50014 */  lw        $a1, 0x14($sp)
 /* B21BC8 80241688 8FA60018 */  lw        $a2, 0x18($sp)
 /* B21BCC 8024168C 0C0904CE */  jal       func_80241338_B21878
 /* B21BD0 80241690 0220382D */   daddu    $a3, $s1, $zero
-/* B21BD4 80241694 3C03800A */  lui       $v1, 0x800a
-/* B21BD8 80241698 2463A66C */  addiu     $v1, $v1, -0x5994
+/* B21BD4 80241694 3C03800A */  lui       $v1, %hi(D_8009A66C)
+/* B21BD8 80241698 2463A66C */  addiu     $v1, $v1, %lo(D_8009A66C)
 /* B21BDC 8024169C 8C620000 */  lw        $v0, ($v1)
 /* B21BE0 802416A0 24040002 */  addiu     $a0, $zero, 2
 /* B21BE4 802416A4 0040802D */  daddu     $s0, $v0, $zero
diff --git a/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240570_B285A0.s b/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240570_B285A0.s
index c78fae13e6..74c6b2992e 100644
--- a/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240570_B285A0.s
+++ b/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240570_B285A0.s
@@ -83,8 +83,8 @@ glabel func_80240570_B285A0
 /* B286CC 8024069C 27A5002C */   addiu    $a1, $sp, 0x2c
 /* B286D0 802406A0 C6000038 */  lwc1      $f0, 0x38($s0)
 /* B286D4 802406A4 860200A6 */  lh        $v0, 0xa6($s0)
-/* B286D8 802406A8 3C018024 */  lui       $at, 0x8024
-/* B286DC 802406AC D42243F0 */  ldc1      $f2, 0x43f0($at)
+/* B286D8 802406A8 3C018024 */  lui       $at, %hi(D_802443F0)
+/* B286DC 802406AC D42243F0 */  ldc1      $f2, %lo(D_802443F0)($at)
 /* B286E0 802406B0 27A60030 */  addiu     $a2, $sp, 0x30
 /* B286E4 802406B4 E7A0002C */  swc1      $f0, 0x2c($sp)
 /* B286E8 802406B8 44820000 */  mtc1      $v0, $f0
diff --git a/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240F30_B28F60.s b/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240F30_B28F60.s
index 4622b3cad8..75eeb7e3cb 100644
--- a/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240F30_B28F60.s
+++ b/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240F30_B28F60.s
@@ -88,9 +88,9 @@ glabel func_80240F30_B28F60
 /* B290A4 80241074 2C62000F */  sltiu     $v0, $v1, 0xf
 /* B290A8 80241078 1040002C */  beqz      $v0, .L8024112C
 /* B290AC 8024107C 00031080 */   sll      $v0, $v1, 2
-/* B290B0 80241080 3C018024 */  lui       $at, 0x8024
+/* B290B0 80241080 3C018024 */  lui       $at, %hi(D_802443F8)
 /* B290B4 80241084 00220821 */  addu      $at, $at, $v0
-/* B290B8 80241088 8C2243F8 */  lw        $v0, 0x43f8($at)
+/* B290B8 80241088 8C2243F8 */  lw        $v0, %lo(D_802443F8)($at)
 /* B290BC 8024108C 00400008 */  jr        $v0
 /* B290C0 80241090 00000000 */   nop      
 /* B290C4 80241094 0260202D */  daddu     $a0, $s3, $zero
diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C4A0/func_80240360_B2C7D0.s b/asm/nonmatchings/world/area_jan/jan_02/B2C4A0/func_80240360_B2C7D0.s
index 2f7149978a..49b54e531f 100644
--- a/asm/nonmatchings/world/area_jan/jan_02/B2C4A0/func_80240360_B2C7D0.s
+++ b/asm/nonmatchings/world/area_jan/jan_02/B2C4A0/func_80240360_B2C7D0.s
@@ -4,8 +4,8 @@
 glabel func_80240360_B2C7D0
 /* B2C7D0 80240360 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* B2C7D4 80240364 AFB00010 */  sw        $s0, 0x10($sp)
-/* B2C7D8 80240368 3C108024 */  lui       $s0, 0x8024
-/* B2C7DC 8024036C 26102BD8 */  addiu     $s0, $s0, 0x2bd8
+/* B2C7D8 80240368 3C108024 */  lui       $s0, %hi(D_80242BD8)
+/* B2C7DC 8024036C 26102BD8 */  addiu     $s0, $s0, %lo(D_80242BD8)
 /* B2C7E0 80240370 AFBF0014 */  sw        $ra, 0x14($sp)
 /* B2C7E4 80240374 8E020000 */  lw        $v0, ($s0)
 /* B2C7E8 80240378 3C038016 */  lui       $v1, %hi(gCollisionStatus+0x2)
diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240430_B2C8A0.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240430_B2C8A0.s
index 37714280b5..1b4443127f 100644
--- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240430_B2C8A0.s
+++ b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240430_B2C8A0.s
@@ -69,8 +69,8 @@ glabel func_80240430_B2C8A0
 /* B2C994 80240524 08090153 */  j         .L8024054C
 /* B2C998 80240528 E6800018 */   swc1     $f0, 0x18($s4)
 .L8024052C:
-/* B2C99C 8024052C 3C018025 */  lui       $at, 0x8025
-/* B2C9A0 80240530 D42285C0 */  ldc1      $f2, -0x7a40($at)
+/* B2C99C 8024052C 3C018025 */  lui       $at, %hi(D_802485C0)
+/* B2C9A0 80240530 D42285C0 */  ldc1      $f2, %lo(D_802485C0)($at)
 /* B2C9A4 80240534 44820000 */  mtc1      $v0, $f0
 /* B2C9A8 80240538 00000000 */  nop       
 /* B2C9AC 8024053C 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240AAC_B2CF1C.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240AAC_B2CF1C.s
index 4c2c27a33c..684568fb4b 100644
--- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240AAC_B2CF1C.s
+++ b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240AAC_B2CF1C.s
@@ -33,8 +33,8 @@ glabel func_80240AAC_B2CF1C
 /* B2CF88 80240B18 080902D0 */  j         .L80240B40
 /* B2CF8C 80240B1C E4A00018 */   swc1     $f0, 0x18($a1)
 .L80240B20:
-/* B2CF90 80240B20 3C018025 */  lui       $at, 0x8025
-/* B2CF94 80240B24 D42285C8 */  ldc1      $f2, -0x7a38($at)
+/* B2CF90 80240B20 3C018025 */  lui       $at, %hi(D_802485C8)
+/* B2CF94 80240B24 D42285C8 */  ldc1      $f2, %lo(D_802485C8)($at)
 /* B2CF98 80240B28 44820000 */  mtc1      $v0, $f0
 /* B2CF9C 80240B2C 00000000 */  nop       
 /* B2CFA0 80240B30 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240FC4_B2D434.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240FC4_B2D434.s
index 6576492cd4..a77451d221 100644
--- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240FC4_B2D434.s
+++ b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240FC4_B2D434.s
@@ -124,9 +124,9 @@ glabel func_80240FC4_B2D434
 /* B2D5F8 80241188 2C620064 */  sltiu     $v0, $v1, 0x64
 /* B2D5FC 8024118C 10400042 */  beqz      $v0, .L80241298
 /* B2D600 80241190 00031080 */   sll      $v0, $v1, 2
-/* B2D604 80241194 3C018025 */  lui       $at, 0x8025
+/* B2D604 80241194 3C018025 */  lui       $at, %hi(D_802485D0)
 /* B2D608 80241198 00220821 */  addu      $at, $at, $v0
-/* B2D60C 8024119C 8C2285D0 */  lw        $v0, -0x7a30($at)
+/* B2D60C 8024119C 8C2285D0 */  lw        $v0, %lo(D_802485D0)($at)
 /* B2D610 802411A0 00400008 */  jr        $v0
 /* B2D614 802411A4 00000000 */   nop      
 /* B2D618 802411A8 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802414EC_B2D95C.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802414EC_B2D95C.s
index cfaef3065e..35f566482a 100644
--- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802414EC_B2D95C.s
+++ b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802414EC_B2D95C.s
@@ -6,11 +6,11 @@ glabel func_802414EC_B2D95C
 /* B2D960 802414F0 AFBF0010 */  sw        $ra, 0x10($sp)
 /* B2D964 802414F4 10A00003 */  beqz      $a1, .L80241504
 /* B2D968 802414F8 8C86000C */   lw       $a2, 0xc($a0)
-/* B2D96C 802414FC 3C018024 */  lui       $at, 0x8024
-/* B2D970 80241500 AC203048 */  sw        $zero, 0x3048($at)
+/* B2D96C 802414FC 3C018024 */  lui       $at, %hi(D_80243048)
+/* B2D970 80241500 AC203048 */  sw        $zero, %lo(D_80243048)($at)
 .L80241504:
-/* B2D974 80241504 3C038024 */  lui       $v1, 0x8024
-/* B2D978 80241508 24633048 */  addiu     $v1, $v1, 0x3048
+/* B2D974 80241504 3C038024 */  lui       $v1, %hi(D_80243048)
+/* B2D978 80241508 24633048 */  addiu     $v1, $v1, %lo(D_80243048)
 /* B2D97C 8024150C 8C620000 */  lw        $v0, ($v1)
 /* B2D980 80241510 54400003 */  bnel      $v0, $zero, .L80241520
 /* B2D984 80241514 AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_802414EC_B2D95C
 /* B2D98C 8024151C 0000102D */   daddu    $v0, $zero, $zero
 .L80241520:
 /* B2D990 80241520 8CC50000 */  lw        $a1, ($a2)
-/* B2D994 80241524 3C068024 */  lui       $a2, 0x8024
+/* B2D994 80241524 3C068024 */  lui       $a2, %hi(D_8024304C)
 /* B2D998 80241528 0C0B2026 */  jal       set_variable
-/* B2D99C 8024152C 8CC6304C */   lw       $a2, 0x304c($a2)
+/* B2D99C 8024152C 8CC6304C */   lw       $a2, %lo(D_8024304C)($a2)
 /* B2D9A0 80241530 24020002 */  addiu     $v0, $zero, 2
 .L80241534:
 /* B2D9A4 80241534 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241540_B2D9B0.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241540_B2D9B0.s
index 2aeada36e0..6e7339cc4e 100644
--- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241540_B2D9B0.s
+++ b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241540_B2D9B0.s
@@ -7,12 +7,12 @@ glabel func_80241540_B2D9B0
 /* B2D9B8 80241548 8C82000C */  lw        $v0, 0xc($a0)
 /* B2D9BC 8024154C 0C0B1EAF */  jal       get_variable
 /* B2D9C0 80241550 8C450000 */   lw       $a1, ($v0)
-/* B2D9C4 80241554 3C018024 */  lui       $at, 0x8024
-/* B2D9C8 80241558 AC22304C */  sw        $v0, 0x304c($at)
+/* B2D9C4 80241554 3C018024 */  lui       $at, %hi(D_8024304C)
+/* B2D9C8 80241558 AC22304C */  sw        $v0, %lo(D_8024304C)($at)
 /* B2D9CC 8024155C 24020002 */  addiu     $v0, $zero, 2
 /* B2D9D0 80241560 8FBF0010 */  lw        $ra, 0x10($sp)
 /* B2D9D4 80241564 24030001 */  addiu     $v1, $zero, 1
-/* B2D9D8 80241568 3C018024 */  lui       $at, 0x8024
-/* B2D9DC 8024156C AC233048 */  sw        $v1, 0x3048($at)
+/* B2D9D8 80241568 3C018024 */  lui       $at, %hi(D_80243048)
+/* B2D9DC 8024156C AC233048 */  sw        $v1, %lo(D_80243048)($at)
 /* B2D9E0 80241570 03E00008 */  jr        $ra
 /* B2D9E4 80241574 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241578_B2D9E8.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241578_B2D9E8.s
index 66a095b1b0..8107c67c0b 100644
--- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241578_B2D9E8.s
+++ b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241578_B2D9E8.s
@@ -13,8 +13,8 @@ glabel func_80241578_B2D9E8
 /* B2DA08 80241598 8C620000 */  lw        $v0, ($v1)
 /* B2DA0C 8024159C 5040000A */  beql      $v0, $zero, .L802415C8
 /* B2DA10 802415A0 00041080 */   sll      $v0, $a0, 2
-/* B2DA14 802415A4 3C058025 */  lui       $a1, 0x8025
-/* B2DA18 802415A8 24A58760 */  addiu     $a1, $a1, -0x78a0
+/* B2DA14 802415A4 3C058025 */  lui       $a1, %hi(D_80248760)
+/* B2DA18 802415A8 24A58760 */  addiu     $a1, $a1, %lo(D_80248760)
 .L802415AC:
 /* B2DA1C 802415AC 24630004 */  addiu     $v1, $v1, 4
 /* B2DA20 802415B0 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_80241578_B2D9E8
 /* B2DA30 802415C0 24A50004 */   addiu    $a1, $a1, 4
 /* B2DA34 802415C4 00041080 */  sll       $v0, $a0, 2
 .L802415C8:
-/* B2DA38 802415C8 3C018025 */  lui       $at, 0x8025
+/* B2DA38 802415C8 3C018025 */  lui       $at, %hi(D_80248760)
 /* B2DA3C 802415CC 00220821 */  addu      $at, $at, $v0
-/* B2DA40 802415D0 AC208760 */  sw        $zero, -0x78a0($at)
+/* B2DA40 802415D0 AC208760 */  sw        $zero, %lo(D_80248760)($at)
 /* B2DA44 802415D4 08090581 */  j         .L80241604
 /* B2DA48 802415D8 00000000 */   nop      
 .L802415DC:
-/* B2DA4C 802415DC 3C038025 */  lui       $v1, 0x8025
-/* B2DA50 802415E0 24638760 */  addiu     $v1, $v1, -0x78a0
+/* B2DA4C 802415DC 3C038025 */  lui       $v1, %hi(D_80248760)
+/* B2DA50 802415E0 24638760 */  addiu     $v1, $v1, %lo(D_80248760)
 /* B2DA54 802415E4 0060282D */  daddu     $a1, $v1, $zero
 .L802415E8:
 /* B2DA58 802415E8 24820010 */  addiu     $v0, $a0, 0x10
diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241614_B2DA84.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241614_B2DA84.s
index 77c1f675a0..1bc4e676bd 100644
--- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241614_B2DA84.s
+++ b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241614_B2DA84.s
@@ -4,8 +4,8 @@
 glabel func_80241614_B2DA84
 /* B2DA84 80241614 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* B2DA88 80241618 AFB00010 */  sw        $s0, 0x10($sp)
-/* B2DA8C 8024161C 3C108024 */  lui       $s0, 0x8024
-/* B2DA90 80241620 261031E4 */  addiu     $s0, $s0, 0x31e4
+/* B2DA8C 8024161C 3C108024 */  lui       $s0, %hi(D_802431E4)
+/* B2DA90 80241620 261031E4 */  addiu     $s0, $s0, %lo(D_802431E4)
 /* B2DA94 80241624 AFBF0018 */  sw        $ra, 0x18($sp)
 /* B2DA98 80241628 AFB10014 */  sw        $s1, 0x14($sp)
 /* B2DA9C 8024162C 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_80241614_B2DA84
 /* B2DB00 80241690 28620010 */  slti      $v0, $v1, 0x10
 /* B2DB04 80241694 1440FFFA */  bnez      $v0, .L80241680
 /* B2DB08 80241698 24840004 */   addiu    $a0, $a0, 4
-/* B2DB0C 8024169C 3C108024 */  lui       $s0, 0x8024
-/* B2DB10 802416A0 261031E4 */  addiu     $s0, $s0, 0x31e4
+/* B2DB0C 8024169C 3C108024 */  lui       $s0, %hi(D_802431E4)
+/* B2DB10 802416A0 261031E4 */  addiu     $s0, $s0, %lo(D_802431E4)
 /* B2DB14 802416A4 0C00AB4B */  jal       heap_free
 /* B2DB18 802416A8 8E040000 */   lw       $a0, ($s0)
 /* B2DB1C 802416AC AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241750_B2DBC0.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241750_B2DBC0.s
index 064b690a08..a07de4efef 100644
--- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241750_B2DBC0.s
+++ b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241750_B2DBC0.s
@@ -90,8 +90,8 @@ glabel func_80241750_B2DBC0
 /* B2DD0C 8024189C 0040802D */   daddu    $s0, $v0, $zero
 /* B2DD10 802418A0 0040282D */  daddu     $a1, $v0, $zero
 /* B2DD14 802418A4 0000182D */  daddu     $v1, $zero, $zero
-/* B2DD18 802418A8 3C068024 */  lui       $a2, 0x8024
-/* B2DD1C 802418AC 24C63288 */  addiu     $a2, $a2, 0x3288
+/* B2DD18 802418A8 3C068024 */  lui       $a2, %hi(D_80243288)
+/* B2DD1C 802418AC 24C63288 */  addiu     $a2, $a2, %lo(D_80243288)
 /* B2DD20 802418B0 00C0202D */  daddu     $a0, $a2, $zero
 .L802418B4:
 /* B2DD24 802418B4 8C820000 */  lw        $v0, ($a0)
diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241974_B2DDE4.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241974_B2DDE4.s
index 2861460b8a..aac2c77f95 100644
--- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241974_B2DDE4.s
+++ b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241974_B2DDE4.s
@@ -9,8 +9,8 @@ glabel func_80241974_B2DDE4
 /* B2DDF4 80241984 8C84014C */   lw       $a0, 0x14c($a0)
 /* B2DDF8 80241988 24040008 */  addiu     $a0, $zero, 8
 /* B2DDFC 8024198C 0040802D */  daddu     $s0, $v0, $zero
-/* B2DE00 80241990 3C028024 */  lui       $v0, 0x8024
-/* B2DE04 80241994 244219E0 */  addiu     $v0, $v0, 0x19e0
+/* B2DE00 80241990 3C028024 */  lui       $v0, %hi(D_802419E0)
+/* B2DE04 80241994 244219E0 */  addiu     $v0, $v0, %lo(D_802419E0)
 /* B2DE08 80241998 0C00AB39 */  jal       heap_malloc
 /* B2DE0C 8024199C AE020008 */   sw       $v0, 8($s0)
 /* B2DE10 802419A0 0040182D */  daddu     $v1, $v0, $zero
diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802419E0_B2DE50.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802419E0_B2DE50.s
index 87e577d10e..ae51d71f4a 100644
--- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802419E0_B2DE50.s
+++ b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802419E0_B2DE50.s
@@ -3,8 +3,8 @@
 
 glabel func_802419E0_B2DE50
 /* B2DE50 802419E0 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* B2DE54 802419E4 3C03800A */  lui       $v1, 0x800a
-/* B2DE58 802419E8 8463A634 */  lh        $v1, -0x59cc($v1)
+/* B2DE54 802419E4 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* B2DE58 802419E8 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* B2DE5C 802419EC 3C05800B */  lui       $a1, %hi(gCameras)
 /* B2DE60 802419F0 24A51D80 */  addiu     $a1, $a1, %lo(gCameras)
 /* B2DE64 802419F4 AFBF0010 */  sw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241A40_B2DEB0.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241A40_B2DEB0.s
index 0c4e1a8e55..8c2e25b547 100644
--- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241A40_B2DEB0.s
+++ b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241A40_B2DEB0.s
@@ -21,8 +21,8 @@ glabel func_80241A40_B2DEB0
 /* B2DEF0 80241A80 2414FFFC */  addiu     $s4, $zero, -4
 /* B2DEF4 80241A84 24130005 */  addiu     $s3, $zero, 5
 /* B2DEF8 80241A88 3C120080 */  lui       $s2, 0x80
-/* B2DEFC 80241A8C 3C038015 */  lui       $v1, 0x8015
-/* B2DF00 80241A90 8C6312F0 */  lw        $v1, 0x12f0($v1)
+/* B2DEFC 80241A8C 3C038015 */  lui       $v1, %hi(D_801512F0)
+/* B2DF00 80241A90 8C6312F0 */  lw        $v1, %lo(D_801512F0)($v1)
 /* B2DF04 80241A94 24020001 */  addiu     $v0, $zero, 1
 /* B2DF08 80241A98 0C046F97 */  jal       set_background_color_blend
 /* B2DF0C 80241A9C A0620000 */   sb       $v0, ($v1)
diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241B8C_B2DFFC.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241B8C_B2DFFC.s
index 167a0ff4f5..9c72d26c5a 100644
--- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241B8C_B2DFFC.s
+++ b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241B8C_B2DFFC.s
@@ -49,8 +49,8 @@ glabel func_80241B8C_B2DFFC
 /* B2E0A0 80241C30 2413FFFC */  addiu     $s3, $zero, -4
 /* B2E0A4 80241C34 24120005 */  addiu     $s2, $zero, 5
 /* B2E0A8 80241C38 3C11FF7F */  lui       $s1, 0xff7f
-/* B2E0AC 80241C3C 3C028015 */  lui       $v0, 0x8015
-/* B2E0B0 80241C40 8C4212F0 */  lw        $v0, 0x12f0($v0)
+/* B2E0AC 80241C3C 3C028015 */  lui       $v0, %hi(D_801512F0)
+/* B2E0B0 80241C40 8C4212F0 */  lw        $v0, %lo(D_801512F0)($v0)
 /* B2E0B4 80241C44 3631FFFF */  ori       $s1, $s1, 0xffff
 /* B2E0B8 80241C48 A0400000 */  sb        $zero, ($v0)
 .L80241C4C:
diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241D00_B2E170.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241D00_B2E170.s
index 31a5d70721..e4693fb95e 100644
--- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241D00_B2E170.s
+++ b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241D00_B2E170.s
@@ -19,9 +19,9 @@ glabel func_80241D00_B2E170
 /* B2E1A4 80241D34 34A502E0 */  ori       $a1, $a1, 0x2e0
 /* B2E1A8 80241D38 0C0B1EAF */  jal       get_variable
 /* B2E1AC 80241D3C 0000202D */   daddu    $a0, $zero, $zero
-/* B2E1B0 80241D40 3C038024 */  lui       $v1, 0x8024
+/* B2E1B0 80241D40 3C038024 */  lui       $v1, %hi(D_80243248)
 /* B2E1B4 80241D44 00621821 */  addu      $v1, $v1, $v0
-/* B2E1B8 80241D48 90633248 */  lbu       $v1, 0x3248($v1)
+/* B2E1B8 80241D48 90633248 */  lbu       $v1, %lo(D_80243248)($v1)
 /* B2E1BC 80241D4C 8E220084 */  lw        $v0, 0x84($s1)
 /* B2E1C0 80241D50 54430006 */  bnel      $v0, $v1, .L80241D6C
 /* B2E1C4 80241D54 AE200084 */   sw       $zero, 0x84($s1)
diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241D84_B2E1F4.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241D84_B2E1F4.s
index e48b5e781e..050a2af3e2 100644
--- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241D84_B2E1F4.s
+++ b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241D84_B2E1F4.s
@@ -38,8 +38,8 @@ glabel func_80241D84_B2E1F4
 /* B2E278 80241E08 0220202D */  daddu     $a0, $s1, $zero
 /* B2E27C 80241E0C 3C05F4AC */  lui       $a1, 0xf4ac
 /* B2E280 80241E10 34A5D481 */  ori       $a1, $a1, 0xd481
-/* B2E284 80241E14 3C108025 */  lui       $s0, 0x8025
-/* B2E288 80241E18 26108940 */  addiu     $s0, $s0, -0x76c0
+/* B2E284 80241E14 3C108025 */  lui       $s0, %hi(D_80248940)
+/* B2E288 80241E18 26108940 */  addiu     $s0, $s0, %lo(D_80248940)
 /* B2E28C 80241E1C 0C0B1EAF */  jal       get_variable
 /* B2E290 80241E20 AE020000 */   sw       $v0, ($s0)
 /* B2E294 80241E24 0220202D */  daddu     $a0, $s1, $zero
@@ -66,8 +66,8 @@ glabel func_80241D84_B2E1F4
 /* B2E2E8 80241E78 0000202D */   daddu    $a0, $zero, $zero
 /* B2E2EC 80241E7C 0220202D */  daddu     $a0, $s1, $zero
 /* B2E2F0 80241E80 3C05F4AC */  lui       $a1, 0xf4ac
-/* B2E2F4 80241E84 3C018025 */  lui       $at, 0x8025
-/* B2E2F8 80241E88 AC228944 */  sw        $v0, -0x76bc($at)
+/* B2E2F4 80241E84 3C018025 */  lui       $at, %hi(D_80248944)
+/* B2E2F8 80241E88 AC228944 */  sw        $v0, %lo(D_80248944)($at)
 /* B2E2FC 80241E8C 0C0B1EAF */  jal       get_variable
 /* B2E300 80241E90 34A5D481 */   ori      $a1, $a1, 0xd481
 /* B2E304 80241E94 0220202D */  daddu     $a0, $s1, $zero
@@ -98,16 +98,16 @@ glabel func_80241D84_B2E1F4
 /* B2E368 80241EF8 E7A00010 */   swc1     $f0, 0x10($sp)
 /* B2E36C 80241EFC 8E030000 */  lw        $v1, ($s0)
 /* B2E370 80241F00 8C64000C */  lw        $a0, 0xc($v1)
-/* B2E374 80241F04 3C018025 */  lui       $at, 0x8025
-/* B2E378 80241F08 AC228948 */  sw        $v0, -0x76b8($at)
+/* B2E374 80241F04 3C018025 */  lui       $at, %hi(D_80248948)
+/* B2E378 80241F08 AC228948 */  sw        $v0, %lo(D_80248948)($at)
 /* B2E37C 80241F0C AC800018 */  sw        $zero, 0x18($a0)
 /* B2E380 80241F10 AC800020 */  sw        $zero, 0x20($a0)
 /* B2E384 80241F14 AC800024 */  sw        $zero, 0x24($a0)
 /* B2E388 80241F18 AC800028 */  sw        $zero, 0x28($a0)
 /* B2E38C 80241F1C AC80001C */  sw        $zero, 0x1c($a0)
 .L80241F20:
-/* B2E390 80241F20 3C028025 */  lui       $v0, 0x8025
-/* B2E394 80241F24 8C428940 */  lw        $v0, -0x76c0($v0)
+/* B2E390 80241F20 3C028025 */  lui       $v0, %hi(D_80248940)
+/* B2E394 80241F24 8C428940 */  lw        $v0, %lo(D_80248940)($v0)
 /* B2E398 80241F28 8C44000C */  lw        $a0, 0xc($v0)
 /* B2E39C 80241F2C 8C820020 */  lw        $v0, 0x20($a0)
 /* B2E3A0 80241F30 8C830028 */  lw        $v1, 0x28($a0)
diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241F9C_B2E40C.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241F9C_B2E40C.s
index 9a2dbd2d7c..ce84e0dcf5 100644
--- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241F9C_B2E40C.s
+++ b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241F9C_B2E40C.s
@@ -5,19 +5,19 @@ glabel func_80241F9C_B2E40C
 /* B2E40C 80241F9C 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* B2E410 80241FA0 10A0000B */  beqz      $a1, .L80241FD0
 /* B2E414 80241FA4 AFBF0010 */   sw       $ra, 0x10($sp)
-/* B2E418 80241FA8 3C038025 */  lui       $v1, 0x8025
-/* B2E41C 80241FAC 8C638944 */  lw        $v1, -0x76bc($v1)
+/* B2E418 80241FA8 3C038025 */  lui       $v1, %hi(D_80248944)
+/* B2E41C 80241FAC 8C638944 */  lw        $v1, %lo(D_80248944)($v1)
 /* B2E420 80241FB0 8C620000 */  lw        $v0, ($v1)
-/* B2E424 80241FB4 3C048025 */  lui       $a0, 0x8025
-/* B2E428 80241FB8 8C848948 */  lw        $a0, -0x76b8($a0)
+/* B2E424 80241FB4 3C048025 */  lui       $a0, %hi(D_80248948)
+/* B2E428 80241FB8 8C848948 */  lw        $a0, %lo(D_80248948)($a0)
 /* B2E42C 80241FBC 34420010 */  ori       $v0, $v0, 0x10
 /* B2E430 80241FC0 AC620000 */  sw        $v0, ($v1)
 /* B2E434 80241FC4 8C820000 */  lw        $v0, ($a0)
 /* B2E438 80241FC8 34420010 */  ori       $v0, $v0, 0x10
 /* B2E43C 80241FCC AC820000 */  sw        $v0, ($a0)
 .L80241FD0:
-/* B2E440 80241FD0 3C048025 */  lui       $a0, 0x8025
-/* B2E444 80241FD4 8C848940 */  lw        $a0, -0x76c0($a0)
+/* B2E440 80241FD0 3C048025 */  lui       $a0, %hi(D_80248940)
+/* B2E444 80241FD4 8C848940 */  lw        $a0, %lo(D_80248940)($a0)
 /* B2E448 80241FD8 8C85000C */  lw        $a1, 0xc($a0)
 /* B2E44C 80241FDC 8CA20018 */  lw        $v0, 0x18($a1)
 /* B2E450 80241FE0 8CA30020 */  lw        $v1, 0x20($a1)
@@ -41,8 +41,8 @@ glabel func_80241F9C_B2E40C
 .L80242028:
 /* B2E498 80242028 0C016914 */  jal       remove_effect
 /* B2E49C 8024202C ACA00018 */   sw       $zero, 0x18($a1)
-/* B2E4A0 80242030 3C048025 */  lui       $a0, 0x8025
-/* B2E4A4 80242034 8C848924 */  lw        $a0, -0x76dc($a0)
+/* B2E4A0 80242030 3C048025 */  lui       $a0, %hi(D_80248924)
+/* B2E4A4 80242034 8C848924 */  lw        $a0, %lo(D_80248924)($a0)
 /* B2E4A8 80242038 0C048D70 */  jal       func_801235C0
 /* B2E4AC 8024203C 00000000 */   nop      
 /* B2E4B0 80242040 24020002 */  addiu     $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242050_B2E4C0.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242050_B2E4C0.s
index 84f539dcb1..02337eca34 100644
--- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242050_B2E4C0.s
+++ b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242050_B2E4C0.s
@@ -7,8 +7,8 @@ glabel func_80242050_B2E4C0
 /* B2E4C8 80242058 8C82000C */  lw        $v0, 0xc($a0)
 /* B2E4CC 8024205C 0C0B1EAF */  jal       get_variable
 /* B2E4D0 80242060 8C450000 */   lw       $a1, ($v0)
-/* B2E4D4 80242064 3C038025 */  lui       $v1, 0x8025
-/* B2E4D8 80242068 8C638940 */  lw        $v1, -0x76c0($v1)
+/* B2E4D4 80242064 3C038025 */  lui       $v1, %hi(D_80248940)
+/* B2E4D8 80242068 8C638940 */  lw        $v1, %lo(D_80248940)($v1)
 /* B2E4DC 8024206C 8C63000C */  lw        $v1, 0xc($v1)
 /* B2E4E0 80242070 AC620034 */  sw        $v0, 0x34($v1)
 /* B2E4E4 80242074 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242084_B2E4F4.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242084_B2E4F4.s
index b85e85aa54..11aeba0c56 100644
--- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242084_B2E4F4.s
+++ b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242084_B2E4F4.s
@@ -8,8 +8,8 @@ glabel func_80242084_B2E4F4
 /* B2E500 80242090 0C0B1EAF */  jal       get_variable
 /* B2E504 80242094 8C450000 */   lw       $a1, ($v0)
 /* B2E508 80242098 0040202D */  daddu     $a0, $v0, $zero
-/* B2E50C 8024209C 3C028025 */  lui       $v0, 0x8025
-/* B2E510 802420A0 8C428940 */  lw        $v0, -0x76c0($v0)
+/* B2E50C 8024209C 3C028025 */  lui       $v0, %hi(D_80248940)
+/* B2E510 802420A0 8C428940 */  lw        $v0, %lo(D_80248940)($v0)
 /* B2E514 802420A4 24030001 */  addiu     $v1, $zero, 1
 /* B2E518 802420A8 8C45000C */  lw        $a1, 0xc($v0)
 /* B2E51C 802420AC 1083000D */  beq       $a0, $v1, .L802420E4
diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242104_B2E574.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242104_B2E574.s
index 6f2dcd6a46..9d8d74e3f1 100644
--- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242104_B2E574.s
+++ b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242104_B2E574.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80242104_B2E574
-/* B2E574 80242104 3C028025 */  lui       $v0, 0x8025
-/* B2E578 80242108 8C428948 */  lw        $v0, -0x76b8($v0)
+/* B2E574 80242104 3C028025 */  lui       $v0, %hi(D_80248948)
+/* B2E578 80242108 8C428948 */  lw        $v0, %lo(D_80248948)($v0)
 /* B2E57C 8024210C 8C42000C */  lw        $v0, 0xc($v0)
 /* B2E580 80242110 AC40001C */  sw        $zero, 0x1c($v0)
 /* B2E584 80242114 03E00008 */  jr        $ra
diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_8024211C_B2E58C.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_8024211C_B2E58C.s
index cbb9ea94c6..add883a0fe 100644
--- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_8024211C_B2E58C.s
+++ b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_8024211C_B2E58C.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_8024211C_B2E58C
-/* B2E58C 8024211C 3C028025 */  lui       $v0, 0x8025
-/* B2E590 80242120 8C428948 */  lw        $v0, -0x76b8($v0)
+/* B2E58C 8024211C 3C028025 */  lui       $v0, %hi(D_80248948)
+/* B2E590 80242120 8C428948 */  lw        $v0, %lo(D_80248948)($v0)
 /* B2E594 80242124 8C43000C */  lw        $v1, 0xc($v0)
 /* B2E598 80242128 24020001 */  addiu     $v0, $zero, 1
 /* B2E59C 8024212C AC62001C */  sw        $v0, 0x1c($v1)
diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242138_B2E5A8.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242138_B2E5A8.s
index a116209de9..96df52d6bd 100644
--- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242138_B2E5A8.s
+++ b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242138_B2E5A8.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80242138_B2E5A8
-/* B2E5A8 80242138 3C028025 */  lui       $v0, 0x8025
-/* B2E5AC 8024213C 8C428948 */  lw        $v0, -0x76b8($v0)
+/* B2E5A8 80242138 3C028025 */  lui       $v0, %hi(D_80248948)
+/* B2E5AC 8024213C 8C428948 */  lw        $v0, %lo(D_80248948)($v0)
 /* B2E5B0 80242140 8C43000C */  lw        $v1, 0xc($v0)
 /* B2E5B4 80242144 24020002 */  addiu     $v0, $zero, 2
 /* B2E5B8 80242148 03E00008 */  jr        $ra
diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_8024260C_B2EA7C.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_8024260C_B2EA7C.s
index c135ebcabc..4f4ca2cf49 100644
--- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_8024260C_B2EA7C.s
+++ b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_8024260C_B2EA7C.s
@@ -3,8 +3,8 @@
 
 glabel func_8024260C_B2EA7C
 /* B2EA7C 8024260C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* B2EA80 80242610 3C058025 */  lui       $a1, 0x8025
-/* B2EA84 80242614 8CA58938 */  lw        $a1, -0x76c8($a1)
+/* B2EA80 80242610 3C058025 */  lui       $a1, %hi(D_80248938)
+/* B2EA84 80242614 8CA58938 */  lw        $a1, %lo(D_80248938)($a1)
 /* B2EA88 80242618 AFBF0010 */  sw        $ra, 0x10($sp)
 /* B2EA8C 8024261C 0C0B1EAF */  jal       get_variable
 /* B2EA90 80242620 0000202D */   daddu    $a0, $zero, $zero
diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242678_B2EAE8.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242678_B2EAE8.s
index ee4ff90c88..99efd7f0bb 100644
--- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242678_B2EAE8.s
+++ b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242678_B2EAE8.s
@@ -3,14 +3,14 @@
 
 glabel func_80242678_B2EAE8
 /* B2EAE8 80242678 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* B2EAEC 8024267C 3C058024 */  lui       $a1, 0x8024
-/* B2EAF0 80242680 24A5260C */  addiu     $a1, $a1, 0x260c
+/* B2EAEC 8024267C 3C058024 */  lui       $a1, %hi(D_8024260C)
+/* B2EAF0 80242680 24A5260C */  addiu     $a1, $a1, %lo(D_8024260C)
 /* B2EAF4 80242684 AFBF0010 */  sw        $ra, 0x10($sp)
 /* B2EAF8 80242688 0C048C8F */  jal       bind_dynamic_entity_7
 /* B2EAFC 8024268C 0000202D */   daddu    $a0, $zero, $zero
 /* B2EB00 80242690 8FBF0010 */  lw        $ra, 0x10($sp)
-/* B2EB04 80242694 3C018025 */  lui       $at, 0x8025
-/* B2EB08 80242698 AC228924 */  sw        $v0, -0x76dc($at)
+/* B2EB04 80242694 3C018025 */  lui       $at, %hi(D_80248924)
+/* B2EB08 80242698 AC228924 */  sw        $v0, %lo(D_80248924)($at)
 /* B2EB0C 8024269C 24020002 */  addiu     $v0, $zero, 2
 /* B2EB10 802426A0 03E00008 */  jr        $ra
 /* B2EB14 802426A4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240620_B351F0.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240620_B351F0.s
index 872d251910..2efef45d76 100644
--- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240620_B351F0.s
+++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240620_B351F0.s
@@ -69,8 +69,8 @@ glabel func_80240620_B351F0
 /* B352E4 80240714 080901CF */  j         .L8024073C
 /* B352E8 80240718 E6800018 */   swc1     $f0, 0x18($s4)
 .L8024071C:
-/* B352EC 8024071C 3C018025 */  lui       $at, 0x8025
-/* B352F0 80240720 D422F9F0 */  ldc1      $f2, -0x610($at)
+/* B352EC 8024071C 3C018025 */  lui       $at, %hi(D_8024F9F0)
+/* B352F0 80240720 D422F9F0 */  ldc1      $f2, %lo(D_8024F9F0)($at)
 /* B352F4 80240724 44820000 */  mtc1      $v0, $f0
 /* B352F8 80240728 00000000 */  nop       
 /* B352FC 8024072C 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240C9C_B3586C.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240C9C_B3586C.s
index 6c6d2b8c50..58acd2b76a 100644
--- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240C9C_B3586C.s
+++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240C9C_B3586C.s
@@ -33,8 +33,8 @@ glabel func_80240C9C_B3586C
 /* B358D8 80240D08 0809034C */  j         .L80240D30
 /* B358DC 80240D0C E4A00018 */   swc1     $f0, 0x18($a1)
 .L80240D10:
-/* B358E0 80240D10 3C018025 */  lui       $at, 0x8025
-/* B358E4 80240D14 D422F9F8 */  ldc1      $f2, -0x608($at)
+/* B358E0 80240D10 3C018025 */  lui       $at, %hi(D_8024F9F8)
+/* B358E4 80240D14 D422F9F8 */  ldc1      $f2, %lo(D_8024F9F8)($at)
 /* B358E8 80240D18 44820000 */  mtc1      $v0, $f0
 /* B358EC 80240D1C 00000000 */  nop       
 /* B358F0 80240D20 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802411B4_B35D84.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802411B4_B35D84.s
index 18d7ebb482..382469e0c7 100644
--- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802411B4_B35D84.s
+++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802411B4_B35D84.s
@@ -124,9 +124,9 @@ glabel func_802411B4_B35D84
 /* B35F48 80241378 2C620064 */  sltiu     $v0, $v1, 0x64
 /* B35F4C 8024137C 10400042 */  beqz      $v0, .L80241488
 /* B35F50 80241380 00031080 */   sll      $v0, $v1, 2
-/* B35F54 80241384 3C018025 */  lui       $at, 0x8025
+/* B35F54 80241384 3C018025 */  lui       $at, %hi(D_8024FA00)
 /* B35F58 80241388 00220821 */  addu      $at, $at, $v0
-/* B35F5C 8024138C 8C22FA00 */  lw        $v0, -0x600($at)
+/* B35F5C 8024138C 8C22FA00 */  lw        $v0, %lo(D_8024FA00)($at)
 /* B35F60 80241390 00400008 */  jr        $v0
 /* B35F64 80241394 00000000 */   nop      
 /* B35F68 80241398 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241574_B36144.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241574_B36144.s
index a70c9e640a..ecaedbdafd 100644
--- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241574_B36144.s
+++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241574_B36144.s
@@ -26,9 +26,9 @@ glabel func_80241574_B36144
 /* B36198 802415C8 000320C0 */  sll       $a0, $v1, 3
 /* B3619C 802415CC 00641821 */  addu      $v1, $v1, $a0
 /* B361A0 802415D0 000318C0 */  sll       $v1, $v1, 3
-/* B361A4 802415D4 3C01800B */  lui       $at, 0x800b
+/* B361A4 802415D4 3C01800B */  lui       $at, %hi(D_800B1D98)
 /* B361A8 802415D8 00230821 */  addu      $at, $at, $v1
-/* B361AC 802415DC E4201D98 */  swc1      $f0, 0x1d98($at)
+/* B361AC 802415DC E4201D98 */  swc1      $f0, %lo(D_800B1D98)($at)
 /* B361B0 802415E0 8FBF0018 */  lw        $ra, 0x18($sp)
 /* B361B4 802415E4 8FB10014 */  lw        $s1, 0x14($sp)
 /* B361B8 802415E8 8FB00010 */  lw        $s0, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802419D8_B365A8.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802419D8_B365A8.s
index e0eefef0fc..10a7656f8b 100644
--- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802419D8_B365A8.s
+++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802419D8_B365A8.s
@@ -6,11 +6,11 @@ glabel func_802419D8_B365A8
 /* B365AC 802419DC AFBF0010 */  sw        $ra, 0x10($sp)
 /* B365B0 802419E0 10A00003 */  beqz      $a1, .L802419F0
 /* B365B4 802419E4 8C86000C */   lw       $a2, 0xc($a0)
-/* B365B8 802419E8 3C018024 */  lui       $at, 0x8024
-/* B365BC 802419EC AC207444 */  sw        $zero, 0x7444($at)
+/* B365B8 802419E8 3C018024 */  lui       $at, %hi(D_80247444)
+/* B365BC 802419EC AC207444 */  sw        $zero, %lo(D_80247444)($at)
 .L802419F0:
-/* B365C0 802419F0 3C038024 */  lui       $v1, 0x8024
-/* B365C4 802419F4 24637444 */  addiu     $v1, $v1, 0x7444
+/* B365C0 802419F0 3C038024 */  lui       $v1, %hi(D_80247444)
+/* B365C4 802419F4 24637444 */  addiu     $v1, $v1, %lo(D_80247444)
 /* B365C8 802419F8 8C620000 */  lw        $v0, ($v1)
 /* B365CC 802419FC 54400003 */  bnel      $v0, $zero, .L80241A0C
 /* B365D0 80241A00 AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_802419D8_B365A8
 /* B365D8 80241A08 0000102D */   daddu    $v0, $zero, $zero
 .L80241A0C:
 /* B365DC 80241A0C 8CC50000 */  lw        $a1, ($a2)
-/* B365E0 80241A10 3C068024 */  lui       $a2, 0x8024
+/* B365E0 80241A10 3C068024 */  lui       $a2, %hi(D_80247448)
 /* B365E4 80241A14 0C0B2026 */  jal       set_variable
-/* B365E8 80241A18 8CC67448 */   lw       $a2, 0x7448($a2)
+/* B365E8 80241A18 8CC67448 */   lw       $a2, %lo(D_80247448)($a2)
 /* B365EC 80241A1C 24020002 */  addiu     $v0, $zero, 2
 .L80241A20:
 /* B365F0 80241A20 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241A2C_B365FC.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241A2C_B365FC.s
index 2a615299ce..52d3e24207 100644
--- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241A2C_B365FC.s
+++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241A2C_B365FC.s
@@ -7,12 +7,12 @@ glabel func_80241A2C_B365FC
 /* B36604 80241A34 8C82000C */  lw        $v0, 0xc($a0)
 /* B36608 80241A38 0C0B1EAF */  jal       get_variable
 /* B3660C 80241A3C 8C450000 */   lw       $a1, ($v0)
-/* B36610 80241A40 3C018024 */  lui       $at, 0x8024
-/* B36614 80241A44 AC227448 */  sw        $v0, 0x7448($at)
+/* B36610 80241A40 3C018024 */  lui       $at, %hi(D_80247448)
+/* B36614 80241A44 AC227448 */  sw        $v0, %lo(D_80247448)($at)
 /* B36618 80241A48 24020002 */  addiu     $v0, $zero, 2
 /* B3661C 80241A4C 8FBF0010 */  lw        $ra, 0x10($sp)
 /* B36620 80241A50 24030001 */  addiu     $v1, $zero, 1
-/* B36624 80241A54 3C018024 */  lui       $at, 0x8024
-/* B36628 80241A58 AC237444 */  sw        $v1, 0x7444($at)
+/* B36624 80241A54 3C018024 */  lui       $at, %hi(D_80247444)
+/* B36628 80241A58 AC237444 */  sw        $v1, %lo(D_80247444)($at)
 /* B3662C 80241A5C 03E00008 */  jr        $ra
 /* B36630 80241A60 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241A64_B36634.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241A64_B36634.s
index aa1f594872..70e0b0b793 100644
--- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241A64_B36634.s
+++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241A64_B36634.s
@@ -13,8 +13,8 @@ glabel func_80241A64_B36634
 /* B36654 80241A84 8C620000 */  lw        $v0, ($v1)
 /* B36658 80241A88 5040000A */  beql      $v0, $zero, .L80241AB4
 /* B3665C 80241A8C 00041080 */   sll      $v0, $a0, 2
-/* B36660 80241A90 3C058025 */  lui       $a1, 0x8025
-/* B36664 80241A94 24A5FBA0 */  addiu     $a1, $a1, -0x460
+/* B36660 80241A90 3C058025 */  lui       $a1, %hi(D_8024FBA0)
+/* B36664 80241A94 24A5FBA0 */  addiu     $a1, $a1, %lo(D_8024FBA0)
 .L80241A98:
 /* B36668 80241A98 24630004 */  addiu     $v1, $v1, 4
 /* B3666C 80241A9C 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_80241A64_B36634
 /* B3667C 80241AAC 24A50004 */   addiu    $a1, $a1, 4
 /* B36680 80241AB0 00041080 */  sll       $v0, $a0, 2
 .L80241AB4:
-/* B36684 80241AB4 3C018025 */  lui       $at, 0x8025
+/* B36684 80241AB4 3C018025 */  lui       $at, %hi(D_8024FBA0)
 /* B36688 80241AB8 00220821 */  addu      $at, $at, $v0
-/* B3668C 80241ABC AC20FBA0 */  sw        $zero, -0x460($at)
+/* B3668C 80241ABC AC20FBA0 */  sw        $zero, %lo(D_8024FBA0)($at)
 /* B36690 80241AC0 080906BC */  j         .L80241AF0
 /* B36694 80241AC4 00000000 */   nop      
 .L80241AC8:
-/* B36698 80241AC8 3C038025 */  lui       $v1, 0x8025
-/* B3669C 80241ACC 2463FBA0 */  addiu     $v1, $v1, -0x460
+/* B36698 80241AC8 3C038025 */  lui       $v1, %hi(D_8024FBA0)
+/* B3669C 80241ACC 2463FBA0 */  addiu     $v1, $v1, %lo(D_8024FBA0)
 /* B366A0 80241AD0 0060282D */  daddu     $a1, $v1, $zero
 .L80241AD4:
 /* B366A4 80241AD4 24820010 */  addiu     $v0, $a0, 0x10
diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241B00_B366D0.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241B00_B366D0.s
index 2f9df6327e..c98d5ab237 100644
--- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241B00_B366D0.s
+++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241B00_B366D0.s
@@ -13,8 +13,8 @@ glabel func_80241B00_B366D0
 /* B366F0 80241B20 8C620000 */  lw        $v0, ($v1)
 /* B366F4 80241B24 5040000A */  beql      $v0, $zero, .L80241B50
 /* B366F8 80241B28 00041080 */   sll      $v0, $a0, 2
-/* B366FC 80241B2C 3C058025 */  lui       $a1, 0x8025
-/* B36700 80241B30 24A5FD68 */  addiu     $a1, $a1, -0x298
+/* B366FC 80241B2C 3C058025 */  lui       $a1, %hi(D_8024FD68)
+/* B36700 80241B30 24A5FD68 */  addiu     $a1, $a1, %lo(D_8024FD68)
 .L80241B34:
 /* B36704 80241B34 24630004 */  addiu     $v1, $v1, 4
 /* B36708 80241B38 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_80241B00_B366D0
 /* B36718 80241B48 24A50004 */   addiu    $a1, $a1, 4
 /* B3671C 80241B4C 00041080 */  sll       $v0, $a0, 2
 .L80241B50:
-/* B36720 80241B50 3C018025 */  lui       $at, 0x8025
+/* B36720 80241B50 3C018025 */  lui       $at, %hi(D_8024FD68)
 /* B36724 80241B54 00220821 */  addu      $at, $at, $v0
-/* B36728 80241B58 AC20FD68 */  sw        $zero, -0x298($at)
+/* B36728 80241B58 AC20FD68 */  sw        $zero, %lo(D_8024FD68)($at)
 /* B3672C 80241B5C 080906E3 */  j         .L80241B8C
 /* B36730 80241B60 00000000 */   nop      
 .L80241B64:
-/* B36734 80241B64 3C038025 */  lui       $v1, 0x8025
-/* B36738 80241B68 2463FD68 */  addiu     $v1, $v1, -0x298
+/* B36734 80241B64 3C038025 */  lui       $v1, %hi(D_8024FD68)
+/* B36738 80241B68 2463FD68 */  addiu     $v1, $v1, %lo(D_8024FD68)
 /* B3673C 80241B6C 0060282D */  daddu     $a1, $v1, $zero
 .L80241B70:
 /* B36740 80241B70 24820080 */  addiu     $v0, $a0, 0x80
diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241B9C_B3676C.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241B9C_B3676C.s
index 97f86ce28a..e4c5368d12 100644
--- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241B9C_B3676C.s
+++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241B9C_B3676C.s
@@ -4,8 +4,8 @@
 glabel func_80241B9C_B3676C
 /* B3676C 80241B9C 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* B36770 80241BA0 AFB00010 */  sw        $s0, 0x10($sp)
-/* B36774 80241BA4 3C108024 */  lui       $s0, 0x8024
-/* B36778 80241BA8 26107764 */  addiu     $s0, $s0, 0x7764
+/* B36774 80241BA4 3C108024 */  lui       $s0, %hi(D_80247764)
+/* B36778 80241BA8 26107764 */  addiu     $s0, $s0, %lo(D_80247764)
 /* B3677C 80241BAC AFBF0018 */  sw        $ra, 0x18($sp)
 /* B36780 80241BB0 AFB10014 */  sw        $s1, 0x14($sp)
 /* B36784 80241BB4 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_80241B9C_B3676C
 /* B367E8 80241C18 28620010 */  slti      $v0, $v1, 0x10
 /* B367EC 80241C1C 1440FFFA */  bnez      $v0, .L80241C08
 /* B367F0 80241C20 24840004 */   addiu    $a0, $a0, 4
-/* B367F4 80241C24 3C108024 */  lui       $s0, 0x8024
-/* B367F8 80241C28 26107764 */  addiu     $s0, $s0, 0x7764
+/* B367F4 80241C24 3C108024 */  lui       $s0, %hi(D_80247764)
+/* B367F8 80241C28 26107764 */  addiu     $s0, $s0, %lo(D_80247764)
 /* B367FC 80241C2C 0C00AB4B */  jal       heap_free
 /* B36800 80241C30 8E040000 */   lw       $a0, ($s0)
 /* B36804 80241C34 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241CD8_B368A8.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241CD8_B368A8.s
index 4b1fe22b9d..cbbdcbaf9a 100644
--- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241CD8_B368A8.s
+++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241CD8_B368A8.s
@@ -90,8 +90,8 @@ glabel func_80241CD8_B368A8
 /* B369F4 80241E24 0040802D */   daddu    $s0, $v0, $zero
 /* B369F8 80241E28 0040282D */  daddu     $a1, $v0, $zero
 /* B369FC 80241E2C 0000182D */  daddu     $v1, $zero, $zero
-/* B36A00 80241E30 3C068024 */  lui       $a2, 0x8024
-/* B36A04 80241E34 24C67808 */  addiu     $a2, $a2, 0x7808
+/* B36A00 80241E30 3C068024 */  lui       $a2, %hi(D_80247808)
+/* B36A04 80241E34 24C67808 */  addiu     $a2, $a2, %lo(D_80247808)
 /* B36A08 80241E38 00C0202D */  daddu     $a0, $a2, $zero
 .L80241E3C:
 /* B36A0C 80241E3C 8C820000 */  lw        $v0, ($a0)
diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241EFC_B36ACC.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241EFC_B36ACC.s
index 400e0f2c05..7f46b11d23 100644
--- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241EFC_B36ACC.s
+++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241EFC_B36ACC.s
@@ -9,8 +9,8 @@ glabel func_80241EFC_B36ACC
 /* B36ADC 80241F0C 8C84014C */   lw       $a0, 0x14c($a0)
 /* B36AE0 80241F10 24040008 */  addiu     $a0, $zero, 8
 /* B36AE4 80241F14 0040802D */  daddu     $s0, $v0, $zero
-/* B36AE8 80241F18 3C028024 */  lui       $v0, 0x8024
-/* B36AEC 80241F1C 24421F68 */  addiu     $v0, $v0, 0x1f68
+/* B36AE8 80241F18 3C028024 */  lui       $v0, %hi(D_80241F68)
+/* B36AEC 80241F1C 24421F68 */  addiu     $v0, $v0, %lo(D_80241F68)
 /* B36AF0 80241F20 0C00AB39 */  jal       heap_malloc
 /* B36AF4 80241F24 AE020008 */   sw       $v0, 8($s0)
 /* B36AF8 80241F28 0040182D */  daddu     $v1, $v0, $zero
diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241F68_B36B38.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241F68_B36B38.s
index f80a7a8585..18cfed6aad 100644
--- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241F68_B36B38.s
+++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241F68_B36B38.s
@@ -3,8 +3,8 @@
 
 glabel func_80241F68_B36B38
 /* B36B38 80241F68 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* B36B3C 80241F6C 3C03800A */  lui       $v1, 0x800a
-/* B36B40 80241F70 8463A634 */  lh        $v1, -0x59cc($v1)
+/* B36B3C 80241F6C 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* B36B40 80241F70 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* B36B44 80241F74 3C05800B */  lui       $a1, %hi(gCameras)
 /* B36B48 80241F78 24A51D80 */  addiu     $a1, $a1, %lo(gCameras)
 /* B36B4C 80241F7C AFBF0010 */  sw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241FC8_B36B98.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241FC8_B36B98.s
index b8757a8ca6..e7d8522c08 100644
--- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241FC8_B36B98.s
+++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241FC8_B36B98.s
@@ -21,8 +21,8 @@ glabel func_80241FC8_B36B98
 /* B36BD8 80242008 2414FFFC */  addiu     $s4, $zero, -4
 /* B36BDC 8024200C 24130011 */  addiu     $s3, $zero, 0x11
 /* B36BE0 80242010 3C120080 */  lui       $s2, 0x80
-/* B36BE4 80242014 3C038015 */  lui       $v1, 0x8015
-/* B36BE8 80242018 8C6312F0 */  lw        $v1, 0x12f0($v1)
+/* B36BE4 80242014 3C038015 */  lui       $v1, %hi(D_801512F0)
+/* B36BE8 80242018 8C6312F0 */  lw        $v1, %lo(D_801512F0)($v1)
 /* B36BEC 8024201C 24020001 */  addiu     $v0, $zero, 1
 /* B36BF0 80242020 0C046F97 */  jal       set_background_color_blend
 /* B36BF4 80242024 A0620000 */   sb       $v0, ($v1)
diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242114_B36CE4.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242114_B36CE4.s
index 618f30d90d..da62d257a5 100644
--- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242114_B36CE4.s
+++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242114_B36CE4.s
@@ -49,8 +49,8 @@ glabel func_80242114_B36CE4
 /* B36D88 802421B8 2413FFFC */  addiu     $s3, $zero, -4
 /* B36D8C 802421BC 24120011 */  addiu     $s2, $zero, 0x11
 /* B36D90 802421C0 3C11FF7F */  lui       $s1, 0xff7f
-/* B36D94 802421C4 3C028015 */  lui       $v0, 0x8015
-/* B36D98 802421C8 8C4212F0 */  lw        $v0, 0x12f0($v0)
+/* B36D94 802421C4 3C028015 */  lui       $v0, %hi(D_801512F0)
+/* B36D98 802421C8 8C4212F0 */  lw        $v0, %lo(D_801512F0)($v0)
 /* B36D9C 802421CC 3631FFFF */  ori       $s1, $s1, 0xffff
 /* B36DA0 802421D0 A0400000 */  sb        $zero, ($v0)
 .L802421D4:
diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242288_B36E58.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242288_B36E58.s
index 778c392692..952846b0c7 100644
--- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242288_B36E58.s
+++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242288_B36E58.s
@@ -19,9 +19,9 @@ glabel func_80242288_B36E58
 /* B36E8C 802422BC 34A502E0 */  ori       $a1, $a1, 0x2e0
 /* B36E90 802422C0 0C0B1EAF */  jal       get_variable
 /* B36E94 802422C4 0000202D */   daddu    $a0, $zero, $zero
-/* B36E98 802422C8 3C038024 */  lui       $v1, 0x8024
+/* B36E98 802422C8 3C038024 */  lui       $v1, %hi(D_802477C8)
 /* B36E9C 802422CC 00621821 */  addu      $v1, $v1, $v0
-/* B36EA0 802422D0 906377C8 */  lbu       $v1, 0x77c8($v1)
+/* B36EA0 802422D0 906377C8 */  lbu       $v1, %lo(D_802477C8)($v1)
 /* B36EA4 802422D4 8E220084 */  lw        $v0, 0x84($s1)
 /* B36EA8 802422D8 54430006 */  bnel      $v0, $v1, .L802422F4
 /* B36EAC 802422DC AE200084 */   sw       $zero, 0x84($s1)
diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024230C_B36EDC.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024230C_B36EDC.s
index 364b8c17b5..8d1699bc70 100644
--- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024230C_B36EDC.s
+++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024230C_B36EDC.s
@@ -38,8 +38,8 @@ glabel func_8024230C_B36EDC
 /* B36F60 80242390 0220202D */  daddu     $a0, $s1, $zero
 /* B36F64 80242394 3C05F4AC */  lui       $a1, 0xf4ac
 /* B36F68 80242398 34A5D481 */  ori       $a1, $a1, 0xd481
-/* B36F6C 8024239C 3C108025 */  lui       $s0, 0x8025
-/* B36F70 802423A0 2610FEF8 */  addiu     $s0, $s0, -0x108
+/* B36F6C 8024239C 3C108025 */  lui       $s0, %hi(D_8024FEF8)
+/* B36F70 802423A0 2610FEF8 */  addiu     $s0, $s0, %lo(D_8024FEF8)
 /* B36F74 802423A4 0C0B1EAF */  jal       get_variable
 /* B36F78 802423A8 AE020000 */   sw       $v0, ($s0)
 /* B36F7C 802423AC 0220202D */  daddu     $a0, $s1, $zero
@@ -66,8 +66,8 @@ glabel func_8024230C_B36EDC
 /* B36FD0 80242400 0000202D */   daddu    $a0, $zero, $zero
 /* B36FD4 80242404 0220202D */  daddu     $a0, $s1, $zero
 /* B36FD8 80242408 3C05F4AC */  lui       $a1, 0xf4ac
-/* B36FDC 8024240C 3C018025 */  lui       $at, 0x8025
-/* B36FE0 80242410 AC22FEFC */  sw        $v0, -0x104($at)
+/* B36FDC 8024240C 3C018025 */  lui       $at, %hi(D_8024FEFC)
+/* B36FE0 80242410 AC22FEFC */  sw        $v0, %lo(D_8024FEFC)($at)
 /* B36FE4 80242414 0C0B1EAF */  jal       get_variable
 /* B36FE8 80242418 34A5D481 */   ori      $a1, $a1, 0xd481
 /* B36FEC 8024241C 0220202D */  daddu     $a0, $s1, $zero
@@ -98,16 +98,16 @@ glabel func_8024230C_B36EDC
 /* B37050 80242480 E7A00010 */   swc1     $f0, 0x10($sp)
 /* B37054 80242484 8E030000 */  lw        $v1, ($s0)
 /* B37058 80242488 8C64000C */  lw        $a0, 0xc($v1)
-/* B3705C 8024248C 3C018025 */  lui       $at, 0x8025
-/* B37060 80242490 AC22FF00 */  sw        $v0, -0x100($at)
+/* B3705C 8024248C 3C018025 */  lui       $at, %hi(D_8024FF00)
+/* B37060 80242490 AC22FF00 */  sw        $v0, %lo(D_8024FF00)($at)
 /* B37064 80242494 AC800018 */  sw        $zero, 0x18($a0)
 /* B37068 80242498 AC800020 */  sw        $zero, 0x20($a0)
 /* B3706C 8024249C AC800024 */  sw        $zero, 0x24($a0)
 /* B37070 802424A0 AC800028 */  sw        $zero, 0x28($a0)
 /* B37074 802424A4 AC80001C */  sw        $zero, 0x1c($a0)
 .L802424A8:
-/* B37078 802424A8 3C028025 */  lui       $v0, 0x8025
-/* B3707C 802424AC 8C42FEF8 */  lw        $v0, -0x108($v0)
+/* B37078 802424A8 3C028025 */  lui       $v0, %hi(D_8024FEF8)
+/* B3707C 802424AC 8C42FEF8 */  lw        $v0, %lo(D_8024FEF8)($v0)
 /* B37080 802424B0 8C44000C */  lw        $a0, 0xc($v0)
 /* B37084 802424B4 8C820020 */  lw        $v0, 0x20($a0)
 /* B37088 802424B8 8C830028 */  lw        $v1, 0x28($a0)
diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242524_B370F4.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242524_B370F4.s
index 44f1b61d14..a0be813130 100644
--- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242524_B370F4.s
+++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242524_B370F4.s
@@ -5,19 +5,19 @@ glabel func_80242524_B370F4
 /* B370F4 80242524 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* B370F8 80242528 10A0000B */  beqz      $a1, .L80242558
 /* B370FC 8024252C AFBF0010 */   sw       $ra, 0x10($sp)
-/* B37100 80242530 3C038025 */  lui       $v1, 0x8025
-/* B37104 80242534 8C63FEFC */  lw        $v1, -0x104($v1)
+/* B37100 80242530 3C038025 */  lui       $v1, %hi(D_8024FEFC)
+/* B37104 80242534 8C63FEFC */  lw        $v1, %lo(D_8024FEFC)($v1)
 /* B37108 80242538 8C620000 */  lw        $v0, ($v1)
-/* B3710C 8024253C 3C048025 */  lui       $a0, 0x8025
-/* B37110 80242540 8C84FF00 */  lw        $a0, -0x100($a0)
+/* B3710C 8024253C 3C048025 */  lui       $a0, %hi(D_8024FF00)
+/* B37110 80242540 8C84FF00 */  lw        $a0, %lo(D_8024FF00)($a0)
 /* B37114 80242544 34420010 */  ori       $v0, $v0, 0x10
 /* B37118 80242548 AC620000 */  sw        $v0, ($v1)
 /* B3711C 8024254C 8C820000 */  lw        $v0, ($a0)
 /* B37120 80242550 34420010 */  ori       $v0, $v0, 0x10
 /* B37124 80242554 AC820000 */  sw        $v0, ($a0)
 .L80242558:
-/* B37128 80242558 3C048025 */  lui       $a0, 0x8025
-/* B3712C 8024255C 8C84FEF8 */  lw        $a0, -0x108($a0)
+/* B37128 80242558 3C048025 */  lui       $a0, %hi(D_8024FEF8)
+/* B3712C 8024255C 8C84FEF8 */  lw        $a0, %lo(D_8024FEF8)($a0)
 /* B37130 80242560 8C85000C */  lw        $a1, 0xc($a0)
 /* B37134 80242564 8CA20018 */  lw        $v0, 0x18($a1)
 /* B37138 80242568 8CA30020 */  lw        $v1, 0x20($a1)
@@ -41,8 +41,8 @@ glabel func_80242524_B370F4
 .L802425B0:
 /* B37180 802425B0 0C016914 */  jal       remove_effect
 /* B37184 802425B4 ACA00018 */   sw       $zero, 0x18($a1)
-/* B37188 802425B8 3C048025 */  lui       $a0, 0x8025
-/* B3718C 802425BC 8C84FED8 */  lw        $a0, -0x128($a0)
+/* B37188 802425B8 3C048025 */  lui       $a0, %hi(D_8024FED8)
+/* B3718C 802425BC 8C84FED8 */  lw        $a0, %lo(D_8024FED8)($a0)
 /* B37190 802425C0 0C048D70 */  jal       func_801235C0
 /* B37194 802425C4 00000000 */   nop      
 /* B37198 802425C8 24020002 */  addiu     $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802425D8_B371A8.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802425D8_B371A8.s
index a3d9ef886d..4a1e7964e4 100644
--- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802425D8_B371A8.s
+++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802425D8_B371A8.s
@@ -7,8 +7,8 @@ glabel func_802425D8_B371A8
 /* B371B0 802425E0 8C82000C */  lw        $v0, 0xc($a0)
 /* B371B4 802425E4 0C0B1EAF */  jal       get_variable
 /* B371B8 802425E8 8C450000 */   lw       $a1, ($v0)
-/* B371BC 802425EC 3C038025 */  lui       $v1, 0x8025
-/* B371C0 802425F0 8C63FEF8 */  lw        $v1, -0x108($v1)
+/* B371BC 802425EC 3C038025 */  lui       $v1, %hi(D_8024FEF8)
+/* B371C0 802425F0 8C63FEF8 */  lw        $v1, %lo(D_8024FEF8)($v1)
 /* B371C4 802425F4 8C63000C */  lw        $v1, 0xc($v1)
 /* B371C8 802425F8 AC620034 */  sw        $v0, 0x34($v1)
 /* B371CC 802425FC 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024260C_B371DC.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024260C_B371DC.s
index e4ac48a1dc..3afcb75a9e 100644
--- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024260C_B371DC.s
+++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024260C_B371DC.s
@@ -8,8 +8,8 @@ glabel func_8024260C_B371DC
 /* B371E8 80242618 0C0B1EAF */  jal       get_variable
 /* B371EC 8024261C 8C450000 */   lw       $a1, ($v0)
 /* B371F0 80242620 0040202D */  daddu     $a0, $v0, $zero
-/* B371F4 80242624 3C028025 */  lui       $v0, 0x8025
-/* B371F8 80242628 8C42FEF8 */  lw        $v0, -0x108($v0)
+/* B371F4 80242624 3C028025 */  lui       $v0, %hi(D_8024FEF8)
+/* B371F8 80242628 8C42FEF8 */  lw        $v0, %lo(D_8024FEF8)($v0)
 /* B371FC 8024262C 24030001 */  addiu     $v1, $zero, 1
 /* B37200 80242630 8C45000C */  lw        $a1, 0xc($v0)
 /* B37204 80242634 1083000D */  beq       $a0, $v1, .L8024266C
diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024268C_B3725C.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024268C_B3725C.s
index a26c5f86fa..b58390cff6 100644
--- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024268C_B3725C.s
+++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024268C_B3725C.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_8024268C_B3725C
-/* B3725C 8024268C 3C028025 */  lui       $v0, 0x8025
-/* B37260 80242690 8C42FF00 */  lw        $v0, -0x100($v0)
+/* B3725C 8024268C 3C028025 */  lui       $v0, %hi(D_8024FF00)
+/* B37260 80242690 8C42FF00 */  lw        $v0, %lo(D_8024FF00)($v0)
 /* B37264 80242694 8C42000C */  lw        $v0, 0xc($v0)
 /* B37268 80242698 AC40001C */  sw        $zero, 0x1c($v0)
 /* B3726C 8024269C 03E00008 */  jr        $ra
diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802426A4_B37274.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802426A4_B37274.s
index 1346e29b47..253e481b9c 100644
--- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802426A4_B37274.s
+++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802426A4_B37274.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_802426A4_B37274
-/* B37274 802426A4 3C028025 */  lui       $v0, 0x8025
-/* B37278 802426A8 8C42FF00 */  lw        $v0, -0x100($v0)
+/* B37274 802426A4 3C028025 */  lui       $v0, %hi(D_8024FF00)
+/* B37278 802426A8 8C42FF00 */  lw        $v0, %lo(D_8024FF00)($v0)
 /* B3727C 802426AC 8C43000C */  lw        $v1, 0xc($v0)
 /* B37280 802426B0 24020001 */  addiu     $v0, $zero, 1
 /* B37284 802426B4 AC62001C */  sw        $v0, 0x1c($v1)
diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802426C0_B37290.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802426C0_B37290.s
index 57994a01dd..0a1c512640 100644
--- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802426C0_B37290.s
+++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802426C0_B37290.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_802426C0_B37290
-/* B37290 802426C0 3C028025 */  lui       $v0, 0x8025
-/* B37294 802426C4 8C42FF00 */  lw        $v0, -0x100($v0)
+/* B37290 802426C0 3C028025 */  lui       $v0, %hi(D_8024FF00)
+/* B37294 802426C4 8C42FF00 */  lw        $v0, %lo(D_8024FF00)($v0)
 /* B37298 802426C8 8C43000C */  lw        $v1, 0xc($v0)
 /* B3729C 802426CC 24020002 */  addiu     $v0, $zero, 2
 /* B372A0 802426D0 03E00008 */  jr        $ra
diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242B94_B37764.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242B94_B37764.s
index d9fd2b4aba..2b5109a763 100644
--- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242B94_B37764.s
+++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242B94_B37764.s
@@ -3,8 +3,8 @@
 
 glabel func_80242B94_B37764
 /* B37764 80242B94 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* B37768 80242B98 3C058025 */  lui       $a1, 0x8025
-/* B3776C 80242B9C 8CA5FEF0 */  lw        $a1, -0x110($a1)
+/* B37768 80242B98 3C058025 */  lui       $a1, %hi(D_8024FEF0)
+/* B3776C 80242B9C 8CA5FEF0 */  lw        $a1, %lo(D_8024FEF0)($a1)
 /* B37770 80242BA0 AFBF0010 */  sw        $ra, 0x10($sp)
 /* B37774 80242BA4 0C0B1EAF */  jal       get_variable
 /* B37778 80242BA8 0000202D */   daddu    $a0, $zero, $zero
diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242C00_B377D0.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242C00_B377D0.s
index 8af13a7ac1..bc94bc4568 100644
--- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242C00_B377D0.s
+++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242C00_B377D0.s
@@ -3,14 +3,14 @@
 
 glabel func_80242C00_B377D0
 /* B377D0 80242C00 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* B377D4 80242C04 3C058024 */  lui       $a1, 0x8024
-/* B377D8 80242C08 24A52B94 */  addiu     $a1, $a1, 0x2b94
+/* B377D4 80242C04 3C058024 */  lui       $a1, %hi(D_80242B94)
+/* B377D8 80242C08 24A52B94 */  addiu     $a1, $a1, %lo(D_80242B94)
 /* B377DC 80242C0C AFBF0010 */  sw        $ra, 0x10($sp)
 /* B377E0 80242C10 0C048C8F */  jal       bind_dynamic_entity_7
 /* B377E4 80242C14 0000202D */   daddu    $a0, $zero, $zero
 /* B377E8 80242C18 8FBF0010 */  lw        $ra, 0x10($sp)
-/* B377EC 80242C1C 3C018025 */  lui       $at, 0x8025
-/* B377F0 80242C20 AC22FED8 */  sw        $v0, -0x128($at)
+/* B377EC 80242C1C 3C018025 */  lui       $at, %hi(D_8024FED8)
+/* B377F0 80242C20 AC22FED8 */  sw        $v0, %lo(D_8024FED8)($at)
 /* B377F4 80242C24 24020002 */  addiu     $v0, $zero, 2
 /* B377F8 80242C28 03E00008 */  jr        $ra
 /* B377FC 80242C2C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242EAC_B37A7C.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242EAC_B37A7C.s
index 6f83dce1ab..1adf15906e 100644
--- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242EAC_B37A7C.s
+++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242EAC_B37A7C.s
@@ -15,7 +15,7 @@ glabel func_80242EAC_B37A7C
 /* B37AA4 80242ED4 8FBF0014 */  lw        $ra, 0x14($sp)
 /* B37AA8 80242ED8 8FB00010 */  lw        $s0, 0x10($sp)
 /* B37AAC 80242EDC 24020002 */  addiu     $v0, $zero, 2
-/* B37AB0 80242EE0 3C018025 */  lui       $at, 0x8025
-/* B37AB4 80242EE4 AC23FF04 */  sw        $v1, -0xfc($at)
+/* B37AB0 80242EE0 3C018025 */  lui       $at, %hi(D_8024FF04)
+/* B37AB4 80242EE4 AC23FF04 */  sw        $v1, %lo(D_8024FF04)($at)
 /* B37AB8 80242EE8 03E00008 */  jr        $ra
 /* B37ABC 80242EEC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242EF0_B37AC0.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242EF0_B37AC0.s
index 84170d0b52..99ab91088c 100644
--- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242EF0_B37AC0.s
+++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242EF0_B37AC0.s
@@ -6,8 +6,8 @@ glabel func_80242EF0_B37AC0
 /* B37AC4 80242EF4 AFBF0010 */  sw        $ra, 0x10($sp)
 /* B37AC8 80242EF8 0C00EABB */  jal       get_npc_unsafe
 /* B37ACC 80242EFC 8C84008C */   lw       $a0, 0x8c($a0)
-/* B37AD0 80242F00 3C038025 */  lui       $v1, 0x8025
-/* B37AD4 80242F04 8C63FF04 */  lw        $v1, -0xfc($v1)
+/* B37AD0 80242F00 3C038025 */  lui       $v1, %hi(D_8024FF04)
+/* B37AD4 80242F04 8C63FF04 */  lw        $v1, %lo(D_8024FF04)($v1)
 /* B37AD8 80242F08 AC430028 */  sw        $v1, 0x28($v0)
 /* B37ADC 80242F0C 8FBF0010 */  lw        $ra, 0x10($sp)
 /* B37AE0 80242F10 24020002 */  addiu     $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242F1C_B37AEC.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242F1C_B37AEC.s
index 15767e5112..7cb56a8f42 100644
--- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242F1C_B37AEC.s
+++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242F1C_B37AEC.s
@@ -11,8 +11,8 @@ glabel func_80242F1C_B37AEC
 /* B37B04 80242F34 2508F290 */  addiu     $t0, $t0, %lo(gPlayerData)
 /* B37B08 80242F38 8C450000 */  lw        $a1, ($v0)
 .L80242F3C:
-/* B37B0C 80242F3C 3C038025 */  lui       $v1, 0x8025
-/* B37B10 80242F40 2463A5AC */  addiu     $v1, $v1, -0x5a54
+/* B37B0C 80242F3C 3C038025 */  lui       $v1, %hi(D_8024A5AC)
+/* B37B10 80242F40 2463A5AC */  addiu     $v1, $v1, %lo(D_8024A5AC)
 /* B37B14 80242F44 8C620000 */  lw        $v0, ($v1)
 /* B37B18 80242F48 5040000A */  beql      $v0, $zero, .L80242F74
 /* B37B1C 80242F4C 25290001 */   addiu    $t1, $t1, 1
diff --git a/asm/nonmatchings/world/area_jan/jan_04/B44AC0/func_80240350_B44AC0.s b/asm/nonmatchings/world/area_jan/jan_04/B44AC0/func_80240350_B44AC0.s
index bd8debaa3c..f278e31759 100644
--- a/asm/nonmatchings/world/area_jan/jan_04/B44AC0/func_80240350_B44AC0.s
+++ b/asm/nonmatchings/world/area_jan/jan_04/B44AC0/func_80240350_B44AC0.s
@@ -4,8 +4,8 @@
 glabel func_80240350_B44AC0
 /* B44AC0 80240350 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* B44AC4 80240354 AFB00010 */  sw        $s0, 0x10($sp)
-/* B44AC8 80240358 3C108024 */  lui       $s0, 0x8024
-/* B44ACC 8024035C 26101800 */  addiu     $s0, $s0, 0x1800
+/* B44AC8 80240358 3C108024 */  lui       $s0, %hi(D_80241800)
+/* B44ACC 8024035C 26101800 */  addiu     $s0, $s0, %lo(D_80241800)
 /* B44AD0 80240360 AFBF0018 */  sw        $ra, 0x18($sp)
 /* B44AD4 80240364 AFB10014 */  sw        $s1, 0x14($sp)
 /* B44AD8 80240368 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_80240350_B44AC0
 /* B44B3C 802403CC 28620010 */  slti      $v0, $v1, 0x10
 /* B44B40 802403D0 1440FFFA */  bnez      $v0, .L802403BC
 /* B44B44 802403D4 24840004 */   addiu    $a0, $a0, 4
-/* B44B48 802403D8 3C108024 */  lui       $s0, 0x8024
-/* B44B4C 802403DC 26101800 */  addiu     $s0, $s0, 0x1800
+/* B44B48 802403D8 3C108024 */  lui       $s0, %hi(D_80241800)
+/* B44B4C 802403DC 26101800 */  addiu     $s0, $s0, %lo(D_80241800)
 /* B44B50 802403E0 0C00AB4B */  jal       heap_free
 /* B44B54 802403E4 8E040000 */   lw       $a0, ($s0)
 /* B44B58 802403E8 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_jan/jan_04/B45150/func_802409E0_B45150.s b/asm/nonmatchings/world/area_jan/jan_04/B45150/func_802409E0_B45150.s
index d8d62db4dc..122aa863dd 100644
--- a/asm/nonmatchings/world/area_jan/jan_04/B45150/func_802409E0_B45150.s
+++ b/asm/nonmatchings/world/area_jan/jan_04/B45150/func_802409E0_B45150.s
@@ -3,8 +3,8 @@
 
 glabel func_802409E0_B45150
 /* B45150 802409E0 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* B45154 802409E4 3C048024 */  lui       $a0, 0x8024
-/* B45158 802409E8 248462C0 */  addiu     $a0, $a0, 0x62c0
+/* B45154 802409E4 3C048024 */  lui       $a0, %hi(D_802462C0)
+/* B45158 802409E8 248462C0 */  addiu     $a0, $a0, %lo(D_802462C0)
 /* B4515C 802409EC 27A50010 */  addiu     $a1, $sp, 0x10
 /* B45160 802409F0 AFBF0020 */  sw        $ra, 0x20($sp)
 /* B45164 802409F4 AFB1001C */  sw        $s1, 0x1c($sp)
@@ -12,16 +12,16 @@ glabel func_802409E0_B45150
 /* B4516C 802409FC AFB00018 */   sw       $s0, 0x18($sp)
 /* B45170 80240A00 0040802D */  daddu     $s0, $v0, $zero
 /* B45174 80240A04 0200202D */  daddu     $a0, $s0, $zero
-/* B45178 80240A08 3C118024 */  lui       $s1, 0x8024
-/* B4517C 80240A0C 26316300 */  addiu     $s1, $s1, 0x6300
+/* B45178 80240A08 3C118024 */  lui       $s1, %hi(D_80246300)
+/* B4517C 80240A0C 26316300 */  addiu     $s1, $s1, %lo(D_80246300)
 /* B45180 80240A10 0C01BB7C */  jal       decode_yay0
 /* B45184 80240A14 0220282D */   daddu    $a1, $s1, $zero
 /* B45188 80240A18 0C00AB1E */  jal       general_heap_free
 /* B4518C 80240A1C 0200202D */   daddu    $a0, $s0, $zero
-/* B45190 80240A20 3C048025 */  lui       $a0, 0x8025
-/* B45194 80240A24 2484A2A0 */  addiu     $a0, $a0, -0x5d60
-/* B45198 80240A28 3C028024 */  lui       $v0, 0x8024
-/* B4519C 80240A2C 24426500 */  addiu     $v0, $v0, 0x6500
+/* B45190 80240A20 3C048025 */  lui       $a0, %hi(D_8024A2A0)
+/* B45194 80240A24 2484A2A0 */  addiu     $a0, $a0, %lo(D_8024A2A0)
+/* B45198 80240A28 3C028024 */  lui       $v0, %hi(D_80246500)
+/* B4519C 80240A2C 24426500 */  addiu     $v0, $v0, %lo(D_80246500)
 /* B451A0 80240A30 AC820000 */  sw        $v0, ($a0)
 /* B451A4 80240A34 24020096 */  addiu     $v0, $zero, 0x96
 /* B451A8 80240A38 A4820008 */  sh        $v0, 8($a0)
diff --git a/asm/nonmatchings/world/area_jan/jan_04/B451F0/func_80240BE8_B45358.s b/asm/nonmatchings/world/area_jan/jan_04/B451F0/func_80240BE8_B45358.s
index 8d98a709a5..50089bec82 100644
--- a/asm/nonmatchings/world/area_jan/jan_04/B451F0/func_80240BE8_B45358.s
+++ b/asm/nonmatchings/world/area_jan/jan_04/B451F0/func_80240BE8_B45358.s
@@ -51,8 +51,8 @@ glabel func_80240BE8_B45358
 /* B4540C 80240C9C 44811000 */  mtc1      $at, $f2
 /* B45410 80240CA0 00000000 */  nop       
 /* B45414 80240CA4 46001081 */  sub.s     $f2, $f2, $f0
-/* B45418 80240CA8 3C018024 */  lui       $at, 0x8024
-/* B4541C 80240CAC D42062E0 */  ldc1      $f0, 0x62e0($at)
+/* B45418 80240CA8 3C018024 */  lui       $at, %hi(D_802462E0)
+/* B4541C 80240CAC D42062E0 */  ldc1      $f0, %lo(D_802462E0)($at)
 /* B45420 80240CB0 460010A1 */  cvt.d.s   $f2, $f2
 /* B45424 80240CB4 46201082 */  mul.d     $f2, $f2, $f0
 /* B45428 80240CB8 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_jan/jan_04/B45730/func_80240FC0_B45730.s b/asm/nonmatchings/world/area_jan/jan_04/B45730/func_80240FC0_B45730.s
index 0e42b0dc85..af7c1cb228 100644
--- a/asm/nonmatchings/world/area_jan/jan_04/B45730/func_80240FC0_B45730.s
+++ b/asm/nonmatchings/world/area_jan/jan_04/B45730/func_80240FC0_B45730.s
@@ -7,8 +7,8 @@ glabel func_80240FC0_B45730
 /* B45738 80240FC8 3C118011 */  lui       $s1, %hi(gPlayerStatus)
 /* B4573C 80240FCC 2631EFC8 */  addiu     $s1, $s1, %lo(gPlayerStatus)
 /* B45740 80240FD0 AFB00010 */  sw        $s0, 0x10($sp)
-/* B45744 80240FD4 3C108024 */  lui       $s0, 0x8024
-/* B45748 80240FD8 2610625C */  addiu     $s0, $s0, 0x625c
+/* B45744 80240FD4 3C108024 */  lui       $s0, %hi(D_8024625C)
+/* B45748 80240FD8 2610625C */  addiu     $s0, $s0, %lo(D_8024625C)
 /* B4574C 80240FDC AFBF0018 */  sw        $ra, 0x18($sp)
 /* B45750 80240FE0 8E030000 */  lw        $v1, ($s0)
 /* B45754 80240FE4 28620003 */  slti      $v0, $v1, 3
@@ -49,8 +49,8 @@ glabel func_80240FC0_B45730
 /* B457D8 80241068 E444008C */  swc1      $f4, 0x8c($v0)
 /* B457DC 8024106C C6200030 */  lwc1      $f0, 0x30($s1)
 /* B457E0 80241070 24030001 */  addiu     $v1, $zero, 1
-/* B457E4 80241074 3C018025 */  lui       $at, 0x8025
-/* B457E8 80241078 AC22A290 */  sw        $v0, -0x5d70($at)
+/* B457E4 80241074 3C018025 */  lui       $at, %hi(D_8024A290)
+/* B457E8 80241078 AC22A290 */  sw        $v0, %lo(D_8024A290)($at)
 /* B457EC 8024107C AC4300B4 */  sw        $v1, 0xb4($v0)
 /* B457F0 80241080 4600010D */  trunc.w.s $f4, $f0
 /* B457F4 80241084 E4440090 */  swc1      $f4, 0x90($v0)
@@ -60,8 +60,8 @@ glabel func_80240FC0_B45730
 /* B45800 80241090 08090436 */  j         .L802410D8
 /* B45804 80241094 AE020000 */   sw       $v0, ($s0)
 .L80241098:
-/* B45808 80241098 3C038011 */  lui       $v1, 0x8011
-/* B4580C 8024109C 8C63C930 */  lw        $v1, -0x36d0($v1)
+/* B45808 80241098 3C038011 */  lui       $v1, %hi(D_8010C930)
+/* B4580C 8024109C 8C63C930 */  lw        $v1, %lo(D_8010C930)($v1)
 /* B45810 802410A0 3C014387 */  lui       $at, 0x4387
 /* B45814 802410A4 44810000 */  mtc1      $at, $f0
 /* B45818 802410A8 3C014334 */  lui       $at, 0x4334
@@ -71,8 +71,8 @@ glabel func_80240FC0_B45730
 /* B45828 802410B8 E4800080 */  swc1      $f0, 0x80($a0)
 /* B4582C 802410BC E4800084 */  swc1      $f0, 0x84($a0)
 /* B45830 802410C0 E48200A8 */  swc1      $f2, 0xa8($a0)
-/* B45834 802410C4 3C048025 */  lui       $a0, 0x8025
-/* B45838 802410C8 8C84A290 */  lw        $a0, -0x5d70($a0)
+/* B45834 802410C4 3C048025 */  lui       $a0, %hi(D_8024A290)
+/* B45838 802410C8 8C84A290 */  lw        $a0, %lo(D_8024A290)($a0)
 /* B4583C 802410CC 24030001 */  addiu     $v1, $zero, 1
 /* B45840 802410D0 08090437 */  j         .L802410DC
 /* B45844 802410D4 AC830074 */   sw       $v1, 0x74($a0)
diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4AF10/func_802406DC_B4B14C.s b/asm/nonmatchings/world/area_jan/jan_05/B4AF10/func_802406DC_B4B14C.s
index 8674e54e1e..5b34cec244 100644
--- a/asm/nonmatchings/world/area_jan/jan_05/B4AF10/func_802406DC_B4B14C.s
+++ b/asm/nonmatchings/world/area_jan/jan_05/B4AF10/func_802406DC_B4B14C.s
@@ -9,8 +9,8 @@ glabel func_802406DC_B4B14C
 /* B4B15C 802406EC AFBF0014 */  sw        $ra, 0x14($sp)
 /* B4B160 802406F0 0C019D28 */  jal       guMtxIdentF
 /* B4B164 802406F4 0080802D */   daddu    $s0, $a0, $zero
-/* B4B168 802406F8 3C018024 */  lui       $at, 0x8024
-/* B4B16C 802406FC D4207A20 */  ldc1      $f0, 0x7a20($at)
+/* B4B168 802406F8 3C018024 */  lui       $at, %hi(D_80247A20)
+/* B4B16C 802406FC D4207A20 */  ldc1      $f0, %lo(D_80247A20)($at)
 /* B4B170 80240700 4600A521 */  cvt.d.s   $f20, $f20
 /* B4B174 80240704 4620A502 */  mul.d     $f20, $f20, $f0
 /* B4B178 80240708 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80240AD4_B4B544.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80240AD4_B4B544.s
index c81330a28c..e4fc08273b 100644
--- a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80240AD4_B4B544.s
+++ b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80240AD4_B4B544.s
@@ -83,8 +83,8 @@ glabel func_80240AD4_B4B544
 /* B4B670 80240C00 27A5002C */   addiu    $a1, $sp, 0x2c
 /* B4B674 80240C04 C6000038 */  lwc1      $f0, 0x38($s0)
 /* B4B678 80240C08 860200A6 */  lh        $v0, 0xa6($s0)
-/* B4B67C 80240C0C 3C018024 */  lui       $at, 0x8024
-/* B4B680 80240C10 D4227A30 */  ldc1      $f2, 0x7a30($at)
+/* B4B67C 80240C0C 3C018024 */  lui       $at, %hi(D_80247A30)
+/* B4B680 80240C10 D4227A30 */  ldc1      $f2, %lo(D_80247A30)($at)
 /* B4B684 80240C14 27A60030 */  addiu     $a2, $sp, 0x30
 /* B4B688 80240C18 E7A0002C */  swc1      $f0, 0x2c($sp)
 /* B4B68C 80240C1C 44820000 */  mtc1      $v0, $f0
diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241494_B4BF04.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241494_B4BF04.s
index 02d7ee09f5..688ecc7494 100644
--- a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241494_B4BF04.s
+++ b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241494_B4BF04.s
@@ -88,9 +88,9 @@ glabel func_80241494_B4BF04
 /* B4C048 802415D8 2C62000F */  sltiu     $v0, $v1, 0xf
 /* B4C04C 802415DC 1040002C */  beqz      $v0, .L80241690
 /* B4C050 802415E0 00031080 */   sll      $v0, $v1, 2
-/* B4C054 802415E4 3C018024 */  lui       $at, 0x8024
+/* B4C054 802415E4 3C018024 */  lui       $at, %hi(D_80247A38)
 /* B4C058 802415E8 00220821 */  addu      $at, $at, $v0
-/* B4C05C 802415EC 8C227A38 */  lw        $v0, 0x7a38($at)
+/* B4C05C 802415EC 8C227A38 */  lw        $v0, %lo(D_80247A38)($at)
 /* B4C060 802415F0 00400008 */  jr        $v0
 /* B4C064 802415F4 00000000 */   nop      
 /* B4C068 802415F8 0260202D */  daddu     $a0, $s3, $zero
diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241708_B4C178.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241708_B4C178.s
index 3389478de9..b41cc458b1 100644
--- a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241708_B4C178.s
+++ b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241708_B4C178.s
@@ -31,9 +31,9 @@ glabel func_80241708_B4C178
 /* B4C1D8 80241768 2C620006 */  sltiu     $v0, $v1, 6
 /* B4C1DC 8024176C 1040004D */  beqz      $v0, .L802418A4
 /* B4C1E0 80241770 00031080 */   sll      $v0, $v1, 2
-/* B4C1E4 80241774 3C018024 */  lui       $at, 0x8024
+/* B4C1E4 80241774 3C018024 */  lui       $at, %hi(D_80247A78)
 /* B4C1E8 80241778 00220821 */  addu      $at, $at, $v0
-/* B4C1EC 8024177C 8C227A78 */  lw        $v0, 0x7a78($at)
+/* B4C1EC 8024177C 8C227A78 */  lw        $v0, %lo(D_80247A78)($at)
 /* B4C1F0 80241780 00400008 */  jr        $v0
 /* B4C1F4 80241784 00000000 */   nop      
 /* B4C1F8 80241788 3C030042 */  lui       $v1, 0x42
diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241AD4_B4C544.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241AD4_B4C544.s
index 2a2da850ab..9ee84bf10a 100644
--- a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241AD4_B4C544.s
+++ b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241AD4_B4C544.s
@@ -18,8 +18,8 @@ glabel func_80241AD4_B4C544
 /* B4C578 80241B08 0040802D */  daddu     $s0, $v0, $zero
 /* B4C57C 80241B0C 3C05800B */  lui       $a1, %hi(gCameras)
 /* B4C580 80241B10 24A51D80 */  addiu     $a1, $a1, %lo(gCameras)
-/* B4C584 80241B14 3C03800A */  lui       $v1, 0x800a
-/* B4C588 80241B18 8463A634 */  lh        $v1, -0x59cc($v1)
+/* B4C584 80241B14 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* B4C588 80241B18 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* B4C58C 80241B1C 00912021 */  addu      $a0, $a0, $s1
 /* B4C590 80241B20 00031080 */  sll       $v0, $v1, 2
 /* B4C594 80241B24 00431021 */  addu      $v0, $v0, $v1
@@ -54,8 +54,8 @@ glabel func_80241AD4_B4C544
 /* B4C604 80241B94 00000000 */   nop      
 /* B4C608 80241B98 0C00A6C9 */  jal       clamp_angle
 /* B4C60C 80241B9C 46000306 */   mov.s    $f12, $f0
-/* B4C610 80241BA0 3C018024 */  lui       $at, 0x8024
-/* B4C614 80241BA4 D4227A90 */  ldc1      $f2, 0x7a90($at)
+/* B4C610 80241BA0 3C018024 */  lui       $at, %hi(D_80247A90)
+/* B4C614 80241BA4 D4227A90 */  ldc1      $f2, %lo(D_80247A90)($at)
 /* B4C618 80241BA8 46000021 */  cvt.d.s   $f0, $f0
 /* B4C61C 80241BAC 4622003C */  c.lt.d    $f0, $f2
 /* B4C620 80241BB0 00000000 */  nop       
@@ -97,8 +97,8 @@ glabel func_80241AD4_B4C544
 /* B4C6A8 80241C38 45030001 */  bc1tl     .L80241C40
 /* B4C6AC 80241C3C 0000882D */   daddu    $s1, $zero, $zero
 .L80241C40:
-/* B4C6B0 80241C40 3C038011 */  lui       $v1, 0x8011
-/* B4C6B4 80241C44 8063EBB3 */  lb        $v1, -0x144d($v1)
+/* B4C6B0 80241C40 3C038011 */  lui       $v1, %hi(D_8010EBB3)
+/* B4C6B4 80241C44 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
 /* B4C6B8 80241C48 24020009 */  addiu     $v0, $zero, 9
 /* B4C6BC 80241C4C 50620001 */  beql      $v1, $v0, .L80241C54
 /* B4C6C0 80241C50 0000882D */   daddu    $s1, $zero, $zero
diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241EE8_B4C958.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241EE8_B4C958.s
index 0bdc9c4046..9ebefaa6fe 100644
--- a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241EE8_B4C958.s
+++ b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241EE8_B4C958.s
@@ -100,9 +100,9 @@ glabel func_80241EE8_B4C958
 /* B4CABC 8024204C 2C620064 */  sltiu     $v0, $v1, 0x64
 /* B4CAC0 80242050 10400048 */  beqz      $v0, .L80242174
 /* B4CAC4 80242054 00031080 */   sll      $v0, $v1, 2
-/* B4CAC8 80242058 3C018024 */  lui       $at, 0x8024
+/* B4CAC8 80242058 3C018024 */  lui       $at, %hi(D_80247A98)
 /* B4CACC 8024205C 00220821 */  addu      $at, $at, $v0
-/* B4CAD0 80242060 8C227A98 */  lw        $v0, 0x7a98($at)
+/* B4CAD0 80242060 8C227A98 */  lw        $v0, %lo(D_80247A98)($at)
 /* B4CAD4 80242064 00400008 */  jr        $v0
 /* B4CAD8 80242068 00000000 */   nop      
 /* B4CADC 8024206C 0240202D */  daddu     $a0, $s2, $zero
diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_8024219C_B4CC0C.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_8024219C_B4CC0C.s
index aaa9967efc..e2714b4560 100644
--- a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_8024219C_B4CC0C.s
+++ b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_8024219C_B4CC0C.s
@@ -100,9 +100,9 @@ glabel func_8024219C_B4CC0C
 /* B4CD70 80242300 2C620064 */  sltiu     $v0, $v1, 0x64
 /* B4CD74 80242304 10400048 */  beqz      $v0, .L80242428
 /* B4CD78 80242308 00031080 */   sll      $v0, $v1, 2
-/* B4CD7C 8024230C 3C018024 */  lui       $at, 0x8024
+/* B4CD7C 8024230C 3C018024 */  lui       $at, %hi(D_80247C28)
 /* B4CD80 80242310 00220821 */  addu      $at, $at, $v0
-/* B4CD84 80242314 8C227C28 */  lw        $v0, 0x7c28($at)
+/* B4CD84 80242314 8C227C28 */  lw        $v0, %lo(D_80247C28)($at)
 /* B4CD88 80242318 00400008 */  jr        $v0
 /* B4CD8C 8024231C 00000000 */   nop      
 /* B4CD90 80242320 0240202D */  daddu     $a0, $s2, $zero
diff --git a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80240970_B531A0.s b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80240970_B531A0.s
index 70675ce271..6e7ae673d5 100644
--- a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80240970_B531A0.s
+++ b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80240970_B531A0.s
@@ -83,8 +83,8 @@ glabel func_80240970_B531A0
 /* B532CC 80240A9C 27A5002C */   addiu    $a1, $sp, 0x2c
 /* B532D0 80240AA0 C6000038 */  lwc1      $f0, 0x38($s0)
 /* B532D4 80240AA4 860200A6 */  lh        $v0, 0xa6($s0)
-/* B532D8 80240AA8 3C018024 */  lui       $at, 0x8024
-/* B532DC 80240AAC D4226CB0 */  ldc1      $f2, 0x6cb0($at)
+/* B532D8 80240AA8 3C018024 */  lui       $at, %hi(D_80246CB0)
+/* B532DC 80240AAC D4226CB0 */  ldc1      $f2, %lo(D_80246CB0)($at)
 /* B532E0 80240AB0 27A60030 */  addiu     $a2, $sp, 0x30
 /* B532E4 80240AB4 E7A0002C */  swc1      $f0, 0x2c($sp)
 /* B532E8 80240AB8 44820000 */  mtc1      $v0, $f0
diff --git a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241330_B53B60.s b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241330_B53B60.s
index 47eebdcc84..f1110ce09f 100644
--- a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241330_B53B60.s
+++ b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241330_B53B60.s
@@ -88,9 +88,9 @@ glabel func_80241330_B53B60
 /* B53CA4 80241474 2C62000F */  sltiu     $v0, $v1, 0xf
 /* B53CA8 80241478 1040002C */  beqz      $v0, .L8024152C
 /* B53CAC 8024147C 00031080 */   sll      $v0, $v1, 2
-/* B53CB0 80241480 3C018024 */  lui       $at, 0x8024
+/* B53CB0 80241480 3C018024 */  lui       $at, %hi(D_80246CB8)
 /* B53CB4 80241484 00220821 */  addu      $at, $at, $v0
-/* B53CB8 80241488 8C226CB8 */  lw        $v0, 0x6cb8($at)
+/* B53CB8 80241488 8C226CB8 */  lw        $v0, %lo(D_80246CB8)($at)
 /* B53CBC 8024148C 00400008 */  jr        $v0
 /* B53CC0 80241490 00000000 */   nop      
 /* B53CC4 80241494 0260202D */  daddu     $a0, $s3, $zero
diff --git a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241658_B53E88.s b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241658_B53E88.s
index 7693d8a396..c16a360a23 100644
--- a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241658_B53E88.s
+++ b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241658_B53E88.s
@@ -31,9 +31,9 @@ glabel func_80241658_B53E88
 /* B53EE8 802416B8 2C620006 */  sltiu     $v0, $v1, 6
 /* B53EEC 802416BC 1040004D */  beqz      $v0, .L802417F4
 /* B53EF0 802416C0 00031080 */   sll      $v0, $v1, 2
-/* B53EF4 802416C4 3C018024 */  lui       $at, 0x8024
+/* B53EF4 802416C4 3C018024 */  lui       $at, %hi(D_80246CF8)
 /* B53EF8 802416C8 00220821 */  addu      $at, $at, $v0
-/* B53EFC 802416CC 8C226CF8 */  lw        $v0, 0x6cf8($at)
+/* B53EFC 802416CC 8C226CF8 */  lw        $v0, %lo(D_80246CF8)($at)
 /* B53F00 802416D0 00400008 */  jr        $v0
 /* B53F04 802416D4 00000000 */   nop      
 /* B53F08 802416D8 3C030042 */  lui       $v1, 0x42
diff --git a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241A24_B54254.s b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241A24_B54254.s
index ef0f1c8640..a9aa179af3 100644
--- a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241A24_B54254.s
+++ b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241A24_B54254.s
@@ -18,8 +18,8 @@ glabel func_80241A24_B54254
 /* B54288 80241A58 0040802D */  daddu     $s0, $v0, $zero
 /* B5428C 80241A5C 3C05800B */  lui       $a1, %hi(gCameras)
 /* B54290 80241A60 24A51D80 */  addiu     $a1, $a1, %lo(gCameras)
-/* B54294 80241A64 3C03800A */  lui       $v1, 0x800a
-/* B54298 80241A68 8463A634 */  lh        $v1, -0x59cc($v1)
+/* B54294 80241A64 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* B54298 80241A68 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* B5429C 80241A6C 00912021 */  addu      $a0, $a0, $s1
 /* B542A0 80241A70 00031080 */  sll       $v0, $v1, 2
 /* B542A4 80241A74 00431021 */  addu      $v0, $v0, $v1
@@ -54,8 +54,8 @@ glabel func_80241A24_B54254
 /* B54314 80241AE4 00000000 */   nop      
 /* B54318 80241AE8 0C00A6C9 */  jal       clamp_angle
 /* B5431C 80241AEC 46000306 */   mov.s    $f12, $f0
-/* B54320 80241AF0 3C018024 */  lui       $at, 0x8024
-/* B54324 80241AF4 D4226D10 */  ldc1      $f2, 0x6d10($at)
+/* B54320 80241AF0 3C018024 */  lui       $at, %hi(D_80246D10)
+/* B54324 80241AF4 D4226D10 */  ldc1      $f2, %lo(D_80246D10)($at)
 /* B54328 80241AF8 46000021 */  cvt.d.s   $f0, $f0
 /* B5432C 80241AFC 4622003C */  c.lt.d    $f0, $f2
 /* B54330 80241B00 00000000 */  nop       
@@ -97,8 +97,8 @@ glabel func_80241A24_B54254
 /* B543B8 80241B88 45030001 */  bc1tl     .L80241B90
 /* B543BC 80241B8C 0000882D */   daddu    $s1, $zero, $zero
 .L80241B90:
-/* B543C0 80241B90 3C038011 */  lui       $v1, 0x8011
-/* B543C4 80241B94 8063EBB3 */  lb        $v1, -0x144d($v1)
+/* B543C0 80241B90 3C038011 */  lui       $v1, %hi(D_8010EBB3)
+/* B543C4 80241B94 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
 /* B543C8 80241B98 24020009 */  addiu     $v0, $zero, 9
 /* B543CC 80241B9C 50620001 */  beql      $v1, $v0, .L80241BA4
 /* B543D0 80241BA0 0000882D */   daddu    $s1, $zero, $zero
diff --git a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241E38_B54668.s b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241E38_B54668.s
index 1882ae2e5c..f457ba1849 100644
--- a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241E38_B54668.s
+++ b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241E38_B54668.s
@@ -100,9 +100,9 @@ glabel func_80241E38_B54668
 /* B547CC 80241F9C 2C620064 */  sltiu     $v0, $v1, 0x64
 /* B547D0 80241FA0 10400048 */  beqz      $v0, .L802420C4
 /* B547D4 80241FA4 00031080 */   sll      $v0, $v1, 2
-/* B547D8 80241FA8 3C018024 */  lui       $at, 0x8024
+/* B547D8 80241FA8 3C018024 */  lui       $at, %hi(D_80246D18)
 /* B547DC 80241FAC 00220821 */  addu      $at, $at, $v0
-/* B547E0 80241FB0 8C226D18 */  lw        $v0, 0x6d18($at)
+/* B547E0 80241FB0 8C226D18 */  lw        $v0, %lo(D_80246D18)($at)
 /* B547E4 80241FB4 00400008 */  jr        $v0
 /* B547E8 80241FB8 00000000 */   nop      
 /* B547EC 80241FBC 0240202D */  daddu     $a0, $s2, $zero
diff --git a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802420EC_B5491C.s b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802420EC_B5491C.s
index 760bee367a..942953e7a2 100644
--- a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802420EC_B5491C.s
+++ b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802420EC_B5491C.s
@@ -100,9 +100,9 @@ glabel func_802420EC_B5491C
 /* B54A80 80242250 2C620064 */  sltiu     $v0, $v1, 0x64
 /* B54A84 80242254 10400048 */  beqz      $v0, .L80242378
 /* B54A88 80242258 00031080 */   sll      $v0, $v1, 2
-/* B54A8C 8024225C 3C018024 */  lui       $at, 0x8024
+/* B54A8C 8024225C 3C018024 */  lui       $at, %hi(D_80246EA8)
 /* B54A90 80242260 00220821 */  addu      $at, $at, $v0
-/* B54A94 80242264 8C226EA8 */  lw        $v0, 0x6ea8($at)
+/* B54A94 80242264 8C226EA8 */  lw        $v0, %lo(D_80246EA8)($at)
 /* B54A98 80242268 00400008 */  jr        $v0
 /* B54A9C 8024226C 00000000 */   nop      
 /* B54AA0 80242270 0240202D */  daddu     $a0, $s2, $zero
diff --git a/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240050_B598C0.s b/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240050_B598C0.s
index 5ec63e6259..59c9bcfee3 100644
--- a/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240050_B598C0.s
+++ b/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240050_B598C0.s
@@ -31,9 +31,9 @@ glabel func_80240050_B598C0
 /* B59920 802400B0 2C620006 */  sltiu     $v0, $v1, 6
 /* B59924 802400B4 1040004D */  beqz      $v0, .L802401EC
 /* B59928 802400B8 00031080 */   sll      $v0, $v1, 2
-/* B5992C 802400BC 3C018024 */  lui       $at, 0x8024
+/* B5992C 802400BC 3C018024 */  lui       $at, %hi(D_80244700)
 /* B59930 802400C0 00220821 */  addu      $at, $at, $v0
-/* B59934 802400C4 8C224700 */  lw        $v0, 0x4700($at)
+/* B59934 802400C4 8C224700 */  lw        $v0, %lo(D_80244700)($at)
 /* B59938 802400C8 00400008 */  jr        $v0
 /* B5993C 802400CC 00000000 */   nop      
 /* B59940 802400D0 3C030042 */  lui       $v1, 0x42
diff --git a/asm/nonmatchings/world/area_jan/jan_07/B59870/func_8024041C_B59C8C.s b/asm/nonmatchings/world/area_jan/jan_07/B59870/func_8024041C_B59C8C.s
index d8a805a04d..c67b6ab7a4 100644
--- a/asm/nonmatchings/world/area_jan/jan_07/B59870/func_8024041C_B59C8C.s
+++ b/asm/nonmatchings/world/area_jan/jan_07/B59870/func_8024041C_B59C8C.s
@@ -18,8 +18,8 @@ glabel func_8024041C_B59C8C
 /* B59CC0 80240450 0040802D */  daddu     $s0, $v0, $zero
 /* B59CC4 80240454 3C05800B */  lui       $a1, %hi(gCameras)
 /* B59CC8 80240458 24A51D80 */  addiu     $a1, $a1, %lo(gCameras)
-/* B59CCC 8024045C 3C03800A */  lui       $v1, 0x800a
-/* B59CD0 80240460 8463A634 */  lh        $v1, -0x59cc($v1)
+/* B59CCC 8024045C 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* B59CD0 80240460 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* B59CD4 80240464 00912021 */  addu      $a0, $a0, $s1
 /* B59CD8 80240468 00031080 */  sll       $v0, $v1, 2
 /* B59CDC 8024046C 00431021 */  addu      $v0, $v0, $v1
@@ -54,8 +54,8 @@ glabel func_8024041C_B59C8C
 /* B59D4C 802404DC 00000000 */   nop      
 /* B59D50 802404E0 0C00A6C9 */  jal       clamp_angle
 /* B59D54 802404E4 46000306 */   mov.s    $f12, $f0
-/* B59D58 802404E8 3C018024 */  lui       $at, 0x8024
-/* B59D5C 802404EC D4224718 */  ldc1      $f2, 0x4718($at)
+/* B59D58 802404E8 3C018024 */  lui       $at, %hi(D_80244718)
+/* B59D5C 802404EC D4224718 */  ldc1      $f2, %lo(D_80244718)($at)
 /* B59D60 802404F0 46000021 */  cvt.d.s   $f0, $f0
 /* B59D64 802404F4 4622003C */  c.lt.d    $f0, $f2
 /* B59D68 802404F8 00000000 */  nop       
@@ -97,8 +97,8 @@ glabel func_8024041C_B59C8C
 /* B59DF0 80240580 45030001 */  bc1tl     .L80240588
 /* B59DF4 80240584 0000882D */   daddu    $s1, $zero, $zero
 .L80240588:
-/* B59DF8 80240588 3C038011 */  lui       $v1, 0x8011
-/* B59DFC 8024058C 8063EBB3 */  lb        $v1, -0x144d($v1)
+/* B59DF8 80240588 3C038011 */  lui       $v1, %hi(D_8010EBB3)
+/* B59DFC 8024058C 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
 /* B59E00 80240590 24020009 */  addiu     $v0, $zero, 9
 /* B59E04 80240594 50620001 */  beql      $v1, $v0, .L8024059C
 /* B59E08 80240598 0000882D */   daddu    $s1, $zero, $zero
diff --git a/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240830_B5A0A0.s b/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240830_B5A0A0.s
index 5f08cc61b2..7322b95189 100644
--- a/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240830_B5A0A0.s
+++ b/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240830_B5A0A0.s
@@ -100,9 +100,9 @@ glabel func_80240830_B5A0A0
 /* B5A204 80240994 2C620064 */  sltiu     $v0, $v1, 0x64
 /* B5A208 80240998 10400048 */  beqz      $v0, .L80240ABC
 /* B5A20C 8024099C 00031080 */   sll      $v0, $v1, 2
-/* B5A210 802409A0 3C018024 */  lui       $at, 0x8024
+/* B5A210 802409A0 3C018024 */  lui       $at, %hi(D_80244720)
 /* B5A214 802409A4 00220821 */  addu      $at, $at, $v0
-/* B5A218 802409A8 8C224720 */  lw        $v0, 0x4720($at)
+/* B5A218 802409A8 8C224720 */  lw        $v0, %lo(D_80244720)($at)
 /* B5A21C 802409AC 00400008 */  jr        $v0
 /* B5A220 802409B0 00000000 */   nop      
 /* B5A224 802409B4 0240202D */  daddu     $a0, $s2, $zero
diff --git a/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240AE4_B5A354.s b/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240AE4_B5A354.s
index 99f5dd98ca..adbea53a04 100644
--- a/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240AE4_B5A354.s
+++ b/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240AE4_B5A354.s
@@ -100,9 +100,9 @@ glabel func_80240AE4_B5A354
 /* B5A4B8 80240C48 2C620064 */  sltiu     $v0, $v1, 0x64
 /* B5A4BC 80240C4C 10400048 */  beqz      $v0, .L80240D70
 /* B5A4C0 80240C50 00031080 */   sll      $v0, $v1, 2
-/* B5A4C4 80240C54 3C018024 */  lui       $at, 0x8024
+/* B5A4C4 80240C54 3C018024 */  lui       $at, %hi(D_802448B0)
 /* B5A4C8 80240C58 00220821 */  addu      $at, $at, $v0
-/* B5A4CC 80240C5C 8C2248B0 */  lw        $v0, 0x48b0($at)
+/* B5A4CC 80240C5C 8C2248B0 */  lw        $v0, %lo(D_802448B0)($at)
 /* B5A4D0 80240C60 00400008 */  jr        $v0
 /* B5A4D4 80240C64 00000000 */   nop      
 /* B5A4D8 80240C68 0240202D */  daddu     $a0, $s2, $zero
diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5E5C0/func_8024054C_B5E7FC.s b/asm/nonmatchings/world/area_jan/jan_08/B5E5C0/func_8024054C_B5E7FC.s
index 00fe64ca5d..8e24ac6d43 100644
--- a/asm/nonmatchings/world/area_jan/jan_08/B5E5C0/func_8024054C_B5E7FC.s
+++ b/asm/nonmatchings/world/area_jan/jan_08/B5E5C0/func_8024054C_B5E7FC.s
@@ -9,8 +9,8 @@ glabel func_8024054C_B5E7FC
 /* B5E80C 8024055C AFBF0014 */  sw        $ra, 0x14($sp)
 /* B5E810 80240560 0C019D28 */  jal       guMtxIdentF
 /* B5E814 80240564 0080802D */   daddu    $s0, $a0, $zero
-/* B5E818 80240568 3C018024 */  lui       $at, 0x8024
-/* B5E81C 8024056C D42074B0 */  ldc1      $f0, 0x74b0($at)
+/* B5E818 80240568 3C018024 */  lui       $at, %hi(D_802474B0)
+/* B5E81C 8024056C D42074B0 */  ldc1      $f0, %lo(D_802474B0)($at)
 /* B5E820 80240570 4600A521 */  cvt.d.s   $f20, $f20
 /* B5E824 80240574 4620A502 */  mul.d     $f20, $f20, $f0
 /* B5E828 80240578 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_8024082C_B5EADC.s b/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_8024082C_B5EADC.s
index 18c144befd..2a0c896da0 100644
--- a/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_8024082C_B5EADC.s
+++ b/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_8024082C_B5EADC.s
@@ -22,12 +22,12 @@ glabel func_8024082C_B5EADC
 /* B5EB20 80240870 0040982D */  daddu     $s3, $v0, $zero
 /* B5EB24 80240874 0000B02D */  daddu     $s6, $zero, $zero
 /* B5EB28 80240878 02C0902D */  daddu     $s2, $s6, $zero
-/* B5EB2C 8024087C 3C148024 */  lui       $s4, 0x8024
-/* B5EB30 80240880 26943E08 */  addiu     $s4, $s4, 0x3e08
+/* B5EB2C 8024087C 3C148024 */  lui       $s4, %hi(D_80243E08)
+/* B5EB30 80240880 26943E08 */  addiu     $s4, $s4, %lo(D_80243E08)
 /* B5EB34 80240884 0260882D */  daddu     $s1, $s3, $zero
 /* B5EB38 80240888 8EA200B4 */  lw        $v0, 0xb4($s5)
-/* B5EB3C 8024088C 3C038024 */  lui       $v1, 0x8024
-/* B5EB40 80240890 24633E00 */  addiu     $v1, $v1, 0x3e00
+/* B5EB3C 8024088C 3C038024 */  lui       $v1, %hi(D_80243E00)
+/* B5EB40 80240890 24633E00 */  addiu     $v1, $v1, %lo(D_80243E00)
 /* B5EB44 80240894 AEB30078 */  sw        $s3, 0x78($s5)
 /* B5EB48 80240898 00021027 */  nor       $v0, $zero, $v0
 /* B5EB4C 8024089C 0002BFC2 */  srl       $s7, $v0, 0x1f
@@ -42,8 +42,8 @@ glabel func_8024082C_B5EADC
 /* B5EB6C 802408BC 5040002E */  beql      $v0, $zero, .L80240978
 /* B5EB70 802408C0 26520001 */   addiu    $s2, $s2, 1
 /* B5EB74 802408C4 00101100 */  sll       $v0, $s0, 4
-/* B5EB78 802408C8 3C068009 */  lui       $a2, 0x8009
-/* B5EB7C 802408CC 24C6EF20 */  addiu     $a2, $a2, -0x10e0
+/* B5EB78 802408C8 3C068009 */  lui       $a2, %hi(D_8008EF20)
+/* B5EB7C 802408CC 24C6EF20 */  addiu     $a2, $a2, %lo(D_8008EF20)
 /* B5EB80 802408D0 00461021 */  addu      $v0, $v0, $a2
 /* B5EB84 802408D4 0200202D */  daddu     $a0, $s0, $zero
 /* B5EB88 802408D8 AE300108 */  sw        $s0, 0x108($s1)
@@ -54,15 +54,15 @@ glabel func_8024082C_B5EADC
 /* B5EB9C 802408EC 0040202D */  daddu     $a0, $v0, $zero
 /* B5EBA0 802408F0 04800011 */  bltz      $a0, .L80240938
 /* B5EBA4 802408F4 00101080 */   sll      $v0, $s0, 2
-/* B5EBA8 802408F8 3C06800F */  lui       $a2, 0x800f
-/* B5EBAC 802408FC 24C67F00 */  addiu     $a2, $a2, 0x7f00
+/* B5EBA8 802408F8 3C06800F */  lui       $a2, %hi(D_800F7F00)
+/* B5EBAC 802408FC 24C67F00 */  addiu     $a2, $a2, %lo(D_800F7F00)
 /* B5EBB0 80240900 00461021 */  addu      $v0, $v0, $a2
 /* B5EBB4 80240904 8C430000 */  lw        $v1, ($v0)
 /* B5EBB8 80240908 24020001 */  addiu     $v0, $zero, 1
 /* B5EBBC 8024090C AE22018C */  sw        $v0, 0x18c($s1)
 /* B5EBC0 80240910 00041080 */  sll       $v0, $a0, 2
-/* B5EBC4 80240914 3C068024 */  lui       $a2, 0x8024
-/* B5EBC8 80240918 24C63E18 */  addiu     $a2, $a2, 0x3e18
+/* B5EBC4 80240914 3C068024 */  lui       $a2, %hi(D_80243E18)
+/* B5EBC8 80240918 24C63E18 */  addiu     $a2, $a2, %lo(D_80243E18)
 /* B5EBCC 8024091C AE230000 */  sw        $v1, ($s1)
 /* B5EBD0 80240920 001218C0 */  sll       $v1, $s2, 3
 /* B5EBD4 80240924 00431021 */  addu      $v0, $v0, $v1
@@ -71,8 +71,8 @@ glabel func_8024082C_B5EADC
 /* B5EBE0 80240930 08090257 */  j         .L8024095C
 /* B5EBE4 80240934 AE220294 */   sw       $v0, 0x294($s1)
 .L80240938:
-/* B5EBE8 80240938 3C06800F */  lui       $a2, 0x800f
-/* B5EBEC 8024093C 24C67F40 */  addiu     $a2, $a2, 0x7f40
+/* B5EBE8 80240938 3C06800F */  lui       $a2, %hi(D_800F7F40)
+/* B5EBEC 8024093C 24C67F40 */  addiu     $a2, $a2, %lo(D_800F7F40)
 /* B5EBF0 80240940 00461021 */  addu      $v0, $v0, $a2
 /* B5EBF4 80240944 8C420000 */  lw        $v0, ($v0)
 /* B5EBF8 80240948 AE20018C */  sw        $zero, 0x18c($s1)
@@ -130,9 +130,9 @@ glabel func_8024082C_B5EADC
 /* B5ECB0 80240A00 02621021 */  addu      $v0, $s3, $v0
 /* B5ECB4 80240A04 8C420108 */  lw        $v0, 0x108($v0)
 /* B5ECB8 80240A08 00021100 */  sll       $v0, $v0, 4
-/* B5ECBC 80240A0C 3C038009 */  lui       $v1, 0x8009
+/* B5ECBC 80240A0C 3C038009 */  lui       $v1, %hi(D_8008EF20)
 /* B5ECC0 80240A10 00621821 */  addu      $v1, $v1, $v0
-/* B5ECC4 80240A14 8C63EF20 */  lw        $v1, -0x10e0($v1)
+/* B5ECC4 80240A14 8C63EF20 */  lw        $v1, %lo(D_8008EF20)($v1)
 /* B5ECC8 80240A18 8EA20074 */  lw        $v0, 0x74($s5)
 /* B5ECCC 80240A1C 2442FFFF */  addiu     $v0, $v0, -1
 /* B5ECD0 80240A20 00021080 */  sll       $v0, $v0, 2
diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240AA8_B5ED58.s b/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240AA8_B5ED58.s
index a92c7dc2dd..7f1d37fb8d 100644
--- a/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240AA8_B5ED58.s
+++ b/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240AA8_B5ED58.s
@@ -7,9 +7,9 @@ glabel func_80240AA8_B5ED58
 /* B5ED60 80240AB0 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* B5ED64 80240AB4 AFBF0010 */  sw        $ra, 0x10($sp)
 /* B5ED68 80240AB8 00021100 */  sll       $v0, $v0, 4
-/* B5ED6C 80240ABC 3C048009 */  lui       $a0, 0x8009
+/* B5ED6C 80240ABC 3C048009 */  lui       $a0, %hi(D_8008EF20)
 /* B5ED70 80240AC0 00822021 */  addu      $a0, $a0, $v0
-/* B5ED74 80240AC4 8C84EF20 */  lw        $a0, -0x10e0($a0)
+/* B5ED74 80240AC4 8C84EF20 */  lw        $a0, %lo(D_8008EF20)($a0)
 /* B5ED78 80240AC8 0C0496CF */  jal       set_message_string
 /* B5ED7C 80240ACC 0000282D */   daddu    $a1, $zero, $zero
 /* B5ED80 80240AD0 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240C60_B5EF10.s b/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240C60_B5EF10.s
index b808b24280..3c72a5e509 100644
--- a/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240C60_B5EF10.s
+++ b/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240C60_B5EF10.s
@@ -30,9 +30,9 @@ glabel func_80240C60_B5EF10
 /* B5EF74 80240CC4 000320C0 */  sll       $a0, $v1, 3
 /* B5EF78 80240CC8 00641821 */  addu      $v1, $v1, $a0
 /* B5EF7C 80240CCC 000318C0 */  sll       $v1, $v1, 3
-/* B5EF80 80240CD0 3C01800B */  lui       $at, 0x800b
+/* B5EF80 80240CD0 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* B5EF84 80240CD4 00230821 */  addu      $at, $at, $v1
-/* B5EF88 80240CD8 C42C1DEC */  lwc1      $f12, 0x1dec($at)
+/* B5EF88 80240CD8 C42C1DEC */  lwc1      $f12, %lo(D_800B1DEC)($at)
 /* B5EF8C 80240CDC 0C00A88D */  jal       sin_cos_deg
 /* B5EF90 80240CE0 0040A82D */   daddu    $s5, $v0, $zero
 /* B5EF94 80240CE4 1200005D */  beqz      $s0, .L80240E5C
@@ -79,8 +79,8 @@ glabel func_80240C60_B5EF10
 /* B5F034 80240D84 26100004 */   addiu    $s0, $s0, 4
 /* B5F038 80240D88 0000882D */  daddu     $s1, $zero, $zero
 /* B5F03C 80240D8C 0240802D */  daddu     $s0, $s2, $zero
-/* B5F040 80240D90 3C148024 */  lui       $s4, 0x8024
-/* B5F044 80240D94 26943E58 */  addiu     $s4, $s4, 0x3e58
+/* B5F040 80240D90 3C148024 */  lui       $s4, %hi(D_80243E58)
+/* B5F044 80240D94 26943E58 */  addiu     $s4, $s4, %lo(D_80243E58)
 /* B5F048 80240D98 3C014248 */  lui       $at, 0x4248
 /* B5F04C 80240D9C 4481A000 */  mtc1      $at, $f20
 /* B5F050 80240DA0 24130044 */  addiu     $s3, $zero, 0x44
@@ -150,8 +150,8 @@ glabel func_80240C60_B5EF10
 /* B5F144 80240E94 00000000 */   nop      
 .L80240E98:
 /* B5F148 80240E98 0000882D */  daddu     $s1, $zero, $zero
-/* B5F14C 80240E9C 3C148024 */  lui       $s4, 0x8024
-/* B5F150 80240EA0 26943E58 */  addiu     $s4, $s4, 0x3e58
+/* B5F14C 80240E9C 3C148024 */  lui       $s4, %hi(D_80243E58)
+/* B5F150 80240EA0 26943E58 */  addiu     $s4, $s4, %lo(D_80243E58)
 /* B5F154 80240EA4 24130020 */  addiu     $s3, $zero, 0x20
 /* B5F158 80240EA8 3C064248 */  lui       $a2, 0x4248
 /* B5F15C 80240EAC 44800000 */  mtc1      $zero, $f0
@@ -197,8 +197,8 @@ glabel func_80240C60_B5EF10
 /* B5F1F8 80240F48 AE400060 */   sw       $zero, 0x60($s2)
 .L80240F4C:
 /* B5F1FC 80240F4C 0000882D */  daddu     $s1, $zero, $zero
-/* B5F200 80240F50 3C148024 */  lui       $s4, 0x8024
-/* B5F204 80240F54 26943E58 */  addiu     $s4, $s4, 0x3e58
+/* B5F200 80240F50 3C148024 */  lui       $s4, %hi(D_80243E58)
+/* B5F204 80240F54 26943E58 */  addiu     $s4, $s4, %lo(D_80243E58)
 /* B5F208 80240F58 24130020 */  addiu     $s3, $zero, 0x20
 /* B5F20C 80240F5C 0240802D */  daddu     $s0, $s2, $zero
 /* B5F210 80240F60 3C014248 */  lui       $at, 0x4248
diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_802414A4_B5F754.s b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_802414A4_B5F754.s
index e8b641221e..f469b519f5 100644
--- a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_802414A4_B5F754.s
+++ b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_802414A4_B5F754.s
@@ -31,9 +31,9 @@ glabel func_802414A4_B5F754
 /* B5F7B4 80241504 2C620006 */  sltiu     $v0, $v1, 6
 /* B5F7B8 80241508 1040004D */  beqz      $v0, .L80241640
 /* B5F7BC 8024150C 00031080 */   sll      $v0, $v1, 2
-/* B5F7C0 80241510 3C018024 */  lui       $at, 0x8024
+/* B5F7C0 80241510 3C018024 */  lui       $at, %hi(D_802474C0)
 /* B5F7C4 80241514 00220821 */  addu      $at, $at, $v0
-/* B5F7C8 80241518 8C2274C0 */  lw        $v0, 0x74c0($at)
+/* B5F7C8 80241518 8C2274C0 */  lw        $v0, %lo(D_802474C0)($at)
 /* B5F7CC 8024151C 00400008 */  jr        $v0
 /* B5F7D0 80241520 00000000 */   nop      
 /* B5F7D4 80241524 3C030042 */  lui       $v1, 0x42
diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241870_B5FB20.s b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241870_B5FB20.s
index 6c89860112..b6a9aef041 100644
--- a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241870_B5FB20.s
+++ b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241870_B5FB20.s
@@ -18,8 +18,8 @@ glabel func_80241870_B5FB20
 /* B5FB54 802418A4 0040802D */  daddu     $s0, $v0, $zero
 /* B5FB58 802418A8 3C05800B */  lui       $a1, %hi(gCameras)
 /* B5FB5C 802418AC 24A51D80 */  addiu     $a1, $a1, %lo(gCameras)
-/* B5FB60 802418B0 3C03800A */  lui       $v1, 0x800a
-/* B5FB64 802418B4 8463A634 */  lh        $v1, -0x59cc($v1)
+/* B5FB60 802418B0 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* B5FB64 802418B4 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* B5FB68 802418B8 00912021 */  addu      $a0, $a0, $s1
 /* B5FB6C 802418BC 00031080 */  sll       $v0, $v1, 2
 /* B5FB70 802418C0 00431021 */  addu      $v0, $v0, $v1
@@ -54,8 +54,8 @@ glabel func_80241870_B5FB20
 /* B5FBE0 80241930 00000000 */   nop      
 /* B5FBE4 80241934 0C00A6C9 */  jal       clamp_angle
 /* B5FBE8 80241938 46000306 */   mov.s    $f12, $f0
-/* B5FBEC 8024193C 3C018024 */  lui       $at, 0x8024
-/* B5FBF0 80241940 D42274D8 */  ldc1      $f2, 0x74d8($at)
+/* B5FBEC 8024193C 3C018024 */  lui       $at, %hi(D_802474D8)
+/* B5FBF0 80241940 D42274D8 */  ldc1      $f2, %lo(D_802474D8)($at)
 /* B5FBF4 80241944 46000021 */  cvt.d.s   $f0, $f0
 /* B5FBF8 80241948 4622003C */  c.lt.d    $f0, $f2
 /* B5FBFC 8024194C 00000000 */  nop       
@@ -97,8 +97,8 @@ glabel func_80241870_B5FB20
 /* B5FC84 802419D4 45030001 */  bc1tl     .L802419DC
 /* B5FC88 802419D8 0000882D */   daddu    $s1, $zero, $zero
 .L802419DC:
-/* B5FC8C 802419DC 3C038011 */  lui       $v1, 0x8011
-/* B5FC90 802419E0 8063EBB3 */  lb        $v1, -0x144d($v1)
+/* B5FC8C 802419DC 3C038011 */  lui       $v1, %hi(D_8010EBB3)
+/* B5FC90 802419E0 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
 /* B5FC94 802419E4 24020009 */  addiu     $v0, $zero, 9
 /* B5FC98 802419E8 50620001 */  beql      $v1, $v0, .L802419F0
 /* B5FC9C 802419EC 0000882D */   daddu    $s1, $zero, $zero
diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241C84_B5FF34.s b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241C84_B5FF34.s
index 1b2d044531..612b1e1a14 100644
--- a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241C84_B5FF34.s
+++ b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241C84_B5FF34.s
@@ -100,9 +100,9 @@ glabel func_80241C84_B5FF34
 /* B60098 80241DE8 2C620064 */  sltiu     $v0, $v1, 0x64
 /* B6009C 80241DEC 10400048 */  beqz      $v0, .L80241F10
 /* B600A0 80241DF0 00031080 */   sll      $v0, $v1, 2
-/* B600A4 80241DF4 3C018024 */  lui       $at, 0x8024
+/* B600A4 80241DF4 3C018024 */  lui       $at, %hi(D_802474E0)
 /* B600A8 80241DF8 00220821 */  addu      $at, $at, $v0
-/* B600AC 80241DFC 8C2274E0 */  lw        $v0, 0x74e0($at)
+/* B600AC 80241DFC 8C2274E0 */  lw        $v0, %lo(D_802474E0)($at)
 /* B600B0 80241E00 00400008 */  jr        $v0
 /* B600B4 80241E04 00000000 */   nop      
 /* B600B8 80241E08 0240202D */  daddu     $a0, $s2, $zero
diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241F38_B601E8.s b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241F38_B601E8.s
index 23417e2a66..ef8087b9c2 100644
--- a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241F38_B601E8.s
+++ b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241F38_B601E8.s
@@ -100,9 +100,9 @@ glabel func_80241F38_B601E8
 /* B6034C 8024209C 2C620064 */  sltiu     $v0, $v1, 0x64
 /* B60350 802420A0 10400048 */  beqz      $v0, .L802421C4
 /* B60354 802420A4 00031080 */   sll      $v0, $v1, 2
-/* B60358 802420A8 3C018024 */  lui       $at, 0x8024
+/* B60358 802420A8 3C018024 */  lui       $at, %hi(D_80247670)
 /* B6035C 802420AC 00220821 */  addu      $at, $at, $v0
-/* B60360 802420B0 8C227670 */  lw        $v0, 0x7670($at)
+/* B60360 802420B0 8C227670 */  lw        $v0, %lo(D_80247670)($at)
 /* B60364 802420B4 00400008 */  jr        $v0
 /* B60368 802420B8 00000000 */   nop      
 /* B6036C 802420BC 0240202D */  daddu     $a0, $s2, $zero
diff --git a/asm/nonmatchings/world/area_jan/jan_09/B660A0/func_8024082C_B662DC.s b/asm/nonmatchings/world/area_jan/jan_09/B660A0/func_8024082C_B662DC.s
index 8cf065bd55..6e8f5a6c87 100644
--- a/asm/nonmatchings/world/area_jan/jan_09/B660A0/func_8024082C_B662DC.s
+++ b/asm/nonmatchings/world/area_jan/jan_09/B660A0/func_8024082C_B662DC.s
@@ -9,8 +9,8 @@ glabel func_8024082C_B662DC
 /* B662EC 8024083C AFBF0014 */  sw        $ra, 0x14($sp)
 /* B662F0 80240840 0C019D28 */  jal       guMtxIdentF
 /* B662F4 80240844 0080802D */   daddu    $s0, $a0, $zero
-/* B662F8 80240848 3C018024 */  lui       $at, 0x8024
-/* B662FC 8024084C D4206590 */  ldc1      $f0, 0x6590($at)
+/* B662F8 80240848 3C018024 */  lui       $at, %hi(D_80246590)
+/* B662FC 8024084C D4206590 */  ldc1      $f0, %lo(D_80246590)($at)
 /* B66300 80240850 4600A521 */  cvt.d.s   $f20, $f20
 /* B66304 80240854 4620A502 */  mul.d     $f20, $f20, $f0
 /* B66308 80240858 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80240990_B66440.s b/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80240990_B66440.s
index 428bc2acf7..40e4e79dd0 100644
--- a/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80240990_B66440.s
+++ b/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80240990_B66440.s
@@ -31,9 +31,9 @@ glabel func_80240990_B66440
 /* B664A0 802409F0 2C620006 */  sltiu     $v0, $v1, 6
 /* B664A4 802409F4 1040004D */  beqz      $v0, .L80240B2C
 /* B664A8 802409F8 00031080 */   sll      $v0, $v1, 2
-/* B664AC 802409FC 3C018024 */  lui       $at, 0x8024
+/* B664AC 802409FC 3C018024 */  lui       $at, %hi(D_802465A0)
 /* B664B0 80240A00 00220821 */  addu      $at, $at, $v0
-/* B664B4 80240A04 8C2265A0 */  lw        $v0, 0x65a0($at)
+/* B664B4 80240A04 8C2265A0 */  lw        $v0, %lo(D_802465A0)($at)
 /* B664B8 80240A08 00400008 */  jr        $v0
 /* B664BC 80240A0C 00000000 */   nop      
 /* B664C0 80240A10 3C030042 */  lui       $v1, 0x42
diff --git a/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80240D5C_B6680C.s b/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80240D5C_B6680C.s
index 4843fc2db6..b53c829491 100644
--- a/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80240D5C_B6680C.s
+++ b/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80240D5C_B6680C.s
@@ -18,8 +18,8 @@ glabel func_80240D5C_B6680C
 /* B66840 80240D90 0040802D */  daddu     $s0, $v0, $zero
 /* B66844 80240D94 3C05800B */  lui       $a1, %hi(gCameras)
 /* B66848 80240D98 24A51D80 */  addiu     $a1, $a1, %lo(gCameras)
-/* B6684C 80240D9C 3C03800A */  lui       $v1, 0x800a
-/* B66850 80240DA0 8463A634 */  lh        $v1, -0x59cc($v1)
+/* B6684C 80240D9C 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* B66850 80240DA0 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* B66854 80240DA4 00912021 */  addu      $a0, $a0, $s1
 /* B66858 80240DA8 00031080 */  sll       $v0, $v1, 2
 /* B6685C 80240DAC 00431021 */  addu      $v0, $v0, $v1
@@ -54,8 +54,8 @@ glabel func_80240D5C_B6680C
 /* B668CC 80240E1C 00000000 */   nop      
 /* B668D0 80240E20 0C00A6C9 */  jal       clamp_angle
 /* B668D4 80240E24 46000306 */   mov.s    $f12, $f0
-/* B668D8 80240E28 3C018024 */  lui       $at, 0x8024
-/* B668DC 80240E2C D42265B8 */  ldc1      $f2, 0x65b8($at)
+/* B668D8 80240E28 3C018024 */  lui       $at, %hi(D_802465B8)
+/* B668DC 80240E2C D42265B8 */  ldc1      $f2, %lo(D_802465B8)($at)
 /* B668E0 80240E30 46000021 */  cvt.d.s   $f0, $f0
 /* B668E4 80240E34 4622003C */  c.lt.d    $f0, $f2
 /* B668E8 80240E38 00000000 */  nop       
@@ -97,8 +97,8 @@ glabel func_80240D5C_B6680C
 /* B66970 80240EC0 45030001 */  bc1tl     .L80240EC8
 /* B66974 80240EC4 0000882D */   daddu    $s1, $zero, $zero
 .L80240EC8:
-/* B66978 80240EC8 3C038011 */  lui       $v1, 0x8011
-/* B6697C 80240ECC 8063EBB3 */  lb        $v1, -0x144d($v1)
+/* B66978 80240EC8 3C038011 */  lui       $v1, %hi(D_8010EBB3)
+/* B6697C 80240ECC 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
 /* B66980 80240ED0 24020009 */  addiu     $v0, $zero, 9
 /* B66984 80240ED4 50620001 */  beql      $v1, $v0, .L80240EDC
 /* B66988 80240ED8 0000882D */   daddu    $s1, $zero, $zero
diff --git a/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241170_B66C20.s b/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241170_B66C20.s
index 72e21d6375..2740b5d931 100644
--- a/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241170_B66C20.s
+++ b/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241170_B66C20.s
@@ -100,9 +100,9 @@ glabel func_80241170_B66C20
 /* B66D84 802412D4 2C620064 */  sltiu     $v0, $v1, 0x64
 /* B66D88 802412D8 10400048 */  beqz      $v0, .L802413FC
 /* B66D8C 802412DC 00031080 */   sll      $v0, $v1, 2
-/* B66D90 802412E0 3C018024 */  lui       $at, 0x8024
+/* B66D90 802412E0 3C018024 */  lui       $at, %hi(D_802465C0)
 /* B66D94 802412E4 00220821 */  addu      $at, $at, $v0
-/* B66D98 802412E8 8C2265C0 */  lw        $v0, 0x65c0($at)
+/* B66D98 802412E8 8C2265C0 */  lw        $v0, %lo(D_802465C0)($at)
 /* B66D9C 802412EC 00400008 */  jr        $v0
 /* B66DA0 802412F0 00000000 */   nop      
 /* B66DA4 802412F4 0240202D */  daddu     $a0, $s2, $zero
diff --git a/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241424_B66ED4.s b/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241424_B66ED4.s
index 9c7e5d4905..9f9c3e3a01 100644
--- a/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241424_B66ED4.s
+++ b/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241424_B66ED4.s
@@ -100,9 +100,9 @@ glabel func_80241424_B66ED4
 /* B67038 80241588 2C620064 */  sltiu     $v0, $v1, 0x64
 /* B6703C 8024158C 10400048 */  beqz      $v0, .L802416B0
 /* B67040 80241590 00031080 */   sll      $v0, $v1, 2
-/* B67044 80241594 3C018024 */  lui       $at, 0x8024
+/* B67044 80241594 3C018024 */  lui       $at, %hi(D_80246750)
 /* B67048 80241598 00220821 */  addu      $at, $at, $v0
-/* B6704C 8024159C 8C226750 */  lw        $v0, 0x6750($at)
+/* B6704C 8024159C 8C226750 */  lw        $v0, %lo(D_80246750)($at)
 /* B67050 802415A0 00400008 */  jr        $v0
 /* B67054 802415A4 00000000 */   nop      
 /* B67058 802415A8 0240202D */  daddu     $a0, $s2, $zero
diff --git a/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240540_B6C8D0.s b/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240540_B6C8D0.s
index b388f204f3..c24af4d506 100644
--- a/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240540_B6C8D0.s
+++ b/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240540_B6C8D0.s
@@ -83,8 +83,8 @@ glabel func_80240540_B6C8D0
 /* B6C9FC 8024066C 27A5002C */   addiu    $a1, $sp, 0x2c
 /* B6CA00 80240670 C6000038 */  lwc1      $f0, 0x38($s0)
 /* B6CA04 80240674 860200A6 */  lh        $v0, 0xa6($s0)
-/* B6CA08 80240678 3C018024 */  lui       $at, 0x8024
-/* B6CA0C 8024067C D4224480 */  ldc1      $f2, 0x4480($at)
+/* B6CA08 80240678 3C018024 */  lui       $at, %hi(D_80244480)
+/* B6CA0C 8024067C D4224480 */  ldc1      $f2, %lo(D_80244480)($at)
 /* B6CA10 80240680 27A60030 */  addiu     $a2, $sp, 0x30
 /* B6CA14 80240684 E7A0002C */  swc1      $f0, 0x2c($sp)
 /* B6CA18 80240688 44820000 */  mtc1      $v0, $f0
diff --git a/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240F00_B6D290.s b/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240F00_B6D290.s
index a7d0de149b..02f87ff8e4 100644
--- a/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240F00_B6D290.s
+++ b/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240F00_B6D290.s
@@ -88,9 +88,9 @@ glabel func_80240F00_B6D290
 /* B6D3D4 80241044 2C62000F */  sltiu     $v0, $v1, 0xf
 /* B6D3D8 80241048 1040002C */  beqz      $v0, .L802410FC
 /* B6D3DC 8024104C 00031080 */   sll      $v0, $v1, 2
-/* B6D3E0 80241050 3C018024 */  lui       $at, 0x8024
+/* B6D3E0 80241050 3C018024 */  lui       $at, %hi(D_80244488)
 /* B6D3E4 80241054 00220821 */  addu      $at, $at, $v0
-/* B6D3E8 80241058 8C224488 */  lw        $v0, 0x4488($at)
+/* B6D3E8 80241058 8C224488 */  lw        $v0, %lo(D_80244488)($at)
 /* B6D3EC 8024105C 00400008 */  jr        $v0
 /* B6D3F0 80241060 00000000 */   nop      
 /* B6D3F4 80241064 0260202D */  daddu     $a0, $s3, $zero
diff --git a/asm/nonmatchings/world/area_jan/jan_11/B71010/func_802407DC_B7103C.s b/asm/nonmatchings/world/area_jan/jan_11/B71010/func_802407DC_B7103C.s
index 332765c51a..944b331f88 100644
--- a/asm/nonmatchings/world/area_jan/jan_11/B71010/func_802407DC_B7103C.s
+++ b/asm/nonmatchings/world/area_jan/jan_11/B71010/func_802407DC_B7103C.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_802407DC_B7103C
-/* B7103C 802407DC 3C038011 */  lui       $v1, 0x8011
-/* B71040 802407E0 8063EBB3 */  lb        $v1, -0x144d($v1)
+/* B7103C 802407DC 3C038011 */  lui       $v1, %hi(D_8010EBB3)
+/* B71040 802407E0 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
 /* B71044 802407E4 24020006 */  addiu     $v0, $zero, 6
 /* B71048 802407E8 54620003 */  bnel      $v1, $v0, .L802407F8
 /* B7104C 802407EC AC8000A8 */   sw       $zero, 0xa8($a0)
diff --git a/asm/nonmatchings/world/area_jan/jan_12/B730B0/func_80240170_B73220.s b/asm/nonmatchings/world/area_jan/jan_12/B730B0/func_80240170_B73220.s
index db1d495d0b..65d946928a 100644
--- a/asm/nonmatchings/world/area_jan/jan_12/B730B0/func_80240170_B73220.s
+++ b/asm/nonmatchings/world/area_jan/jan_12/B730B0/func_80240170_B73220.s
@@ -9,8 +9,8 @@ glabel func_80240170_B73220
 /* B73230 80240180 AFBF0014 */  sw        $ra, 0x14($sp)
 /* B73234 80240184 0C019D28 */  jal       guMtxIdentF
 /* B73238 80240188 0080802D */   daddu    $s0, $a0, $zero
-/* B7323C 8024018C 3C018024 */  lui       $at, 0x8024
-/* B73240 80240190 D42033B0 */  ldc1      $f0, 0x33b0($at)
+/* B7323C 8024018C 3C018024 */  lui       $at, %hi(D_802433B0)
+/* B73240 80240190 D42033B0 */  ldc1      $f0, %lo(D_802433B0)($at)
 /* B73244 80240194 4600A521 */  cvt.d.s   $f20, $f20
 /* B73248 80240198 4620A502 */  mul.d     $f20, $f20, $f0
 /* B7324C 8024019C 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240510_B735C0.s b/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240510_B735C0.s
index edc5779f50..d9465934c3 100644
--- a/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240510_B735C0.s
+++ b/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240510_B735C0.s
@@ -31,9 +31,9 @@ glabel func_80240510_B735C0
 /* B73620 80240570 2C620006 */  sltiu     $v0, $v1, 6
 /* B73624 80240574 1040004D */  beqz      $v0, .L802406AC
 /* B73628 80240578 00031080 */   sll      $v0, $v1, 2
-/* B7362C 8024057C 3C018024 */  lui       $at, 0x8024
+/* B7362C 8024057C 3C018024 */  lui       $at, %hi(D_802433C0)
 /* B73630 80240580 00220821 */  addu      $at, $at, $v0
-/* B73634 80240584 8C2233C0 */  lw        $v0, 0x33c0($at)
+/* B73634 80240584 8C2233C0 */  lw        $v0, %lo(D_802433C0)($at)
 /* B73638 80240588 00400008 */  jr        $v0
 /* B7363C 8024058C 00000000 */   nop      
 /* B73640 80240590 3C030042 */  lui       $v1, 0x42
diff --git a/asm/nonmatchings/world/area_jan/jan_12/B73570/func_802408DC_B7398C.s b/asm/nonmatchings/world/area_jan/jan_12/B73570/func_802408DC_B7398C.s
index 09876b52d9..3476032329 100644
--- a/asm/nonmatchings/world/area_jan/jan_12/B73570/func_802408DC_B7398C.s
+++ b/asm/nonmatchings/world/area_jan/jan_12/B73570/func_802408DC_B7398C.s
@@ -18,8 +18,8 @@ glabel func_802408DC_B7398C
 /* B739C0 80240910 0040802D */  daddu     $s0, $v0, $zero
 /* B739C4 80240914 3C05800B */  lui       $a1, %hi(gCameras)
 /* B739C8 80240918 24A51D80 */  addiu     $a1, $a1, %lo(gCameras)
-/* B739CC 8024091C 3C03800A */  lui       $v1, 0x800a
-/* B739D0 80240920 8463A634 */  lh        $v1, -0x59cc($v1)
+/* B739CC 8024091C 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* B739D0 80240920 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* B739D4 80240924 00912021 */  addu      $a0, $a0, $s1
 /* B739D8 80240928 00031080 */  sll       $v0, $v1, 2
 /* B739DC 8024092C 00431021 */  addu      $v0, $v0, $v1
@@ -54,8 +54,8 @@ glabel func_802408DC_B7398C
 /* B73A4C 8024099C 00000000 */   nop      
 /* B73A50 802409A0 0C00A6C9 */  jal       clamp_angle
 /* B73A54 802409A4 46000306 */   mov.s    $f12, $f0
-/* B73A58 802409A8 3C018024 */  lui       $at, 0x8024
-/* B73A5C 802409AC D42233D8 */  ldc1      $f2, 0x33d8($at)
+/* B73A58 802409A8 3C018024 */  lui       $at, %hi(D_802433D8)
+/* B73A5C 802409AC D42233D8 */  ldc1      $f2, %lo(D_802433D8)($at)
 /* B73A60 802409B0 46000021 */  cvt.d.s   $f0, $f0
 /* B73A64 802409B4 4622003C */  c.lt.d    $f0, $f2
 /* B73A68 802409B8 00000000 */  nop       
@@ -97,8 +97,8 @@ glabel func_802408DC_B7398C
 /* B73AF0 80240A40 45030001 */  bc1tl     .L80240A48
 /* B73AF4 80240A44 0000882D */   daddu    $s1, $zero, $zero
 .L80240A48:
-/* B73AF8 80240A48 3C038011 */  lui       $v1, 0x8011
-/* B73AFC 80240A4C 8063EBB3 */  lb        $v1, -0x144d($v1)
+/* B73AF8 80240A48 3C038011 */  lui       $v1, %hi(D_8010EBB3)
+/* B73AFC 80240A4C 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
 /* B73B00 80240A50 24020009 */  addiu     $v0, $zero, 9
 /* B73B04 80240A54 50620001 */  beql      $v1, $v0, .L80240A5C
 /* B73B08 80240A58 0000882D */   daddu    $s1, $zero, $zero
diff --git a/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240CF0_B73DA0.s b/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240CF0_B73DA0.s
index 6a9f16e404..2fa45bc149 100644
--- a/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240CF0_B73DA0.s
+++ b/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240CF0_B73DA0.s
@@ -100,9 +100,9 @@ glabel func_80240CF0_B73DA0
 /* B73F04 80240E54 2C620064 */  sltiu     $v0, $v1, 0x64
 /* B73F08 80240E58 10400048 */  beqz      $v0, .L80240F7C
 /* B73F0C 80240E5C 00031080 */   sll      $v0, $v1, 2
-/* B73F10 80240E60 3C018024 */  lui       $at, 0x8024
+/* B73F10 80240E60 3C018024 */  lui       $at, %hi(D_802433E0)
 /* B73F14 80240E64 00220821 */  addu      $at, $at, $v0
-/* B73F18 80240E68 8C2233E0 */  lw        $v0, 0x33e0($at)
+/* B73F18 80240E68 8C2233E0 */  lw        $v0, %lo(D_802433E0)($at)
 /* B73F1C 80240E6C 00400008 */  jr        $v0
 /* B73F20 80240E70 00000000 */   nop      
 /* B73F24 80240E74 0240202D */  daddu     $a0, $s2, $zero
diff --git a/asm/nonmatchings/world/area_jan/jan_13/B767B0/func_80240000_B767B0.s b/asm/nonmatchings/world/area_jan/jan_13/B767B0/func_80240000_B767B0.s
index 88db315902..c4de0b6e05 100644
--- a/asm/nonmatchings/world/area_jan/jan_13/B767B0/func_80240000_B767B0.s
+++ b/asm/nonmatchings/world/area_jan/jan_13/B767B0/func_80240000_B767B0.s
@@ -4,8 +4,8 @@
 glabel func_80240000_B767B0
 /* B767B0 80240000 27BDFFB8 */  addiu     $sp, $sp, -0x48
 /* B767B4 80240004 AFB10014 */  sw        $s1, 0x14($sp)
-/* B767B8 80240008 3C118024 */  lui       $s1, 0x8024
-/* B767BC 8024000C 26310850 */  addiu     $s1, $s1, 0x850
+/* B767B8 80240008 3C118024 */  lui       $s1, %hi(D_80240850)
+/* B767BC 8024000C 26310850 */  addiu     $s1, $s1, %lo(D_80240850)
 /* B767C0 80240010 AFBF0020 */  sw        $ra, 0x20($sp)
 /* B767C4 80240014 AFB3001C */  sw        $s3, 0x1c($sp)
 /* B767C8 80240018 AFB20018 */  sw        $s2, 0x18($sp)
@@ -15,8 +15,8 @@ glabel func_80240000_B767B0
 /* B767D8 80240028 F7B60030 */  sdc1      $f22, 0x30($sp)
 /* B767DC 8024002C F7B40028 */  sdc1      $f20, 0x28($sp)
 /* B767E0 80240030 96220000 */  lhu       $v0, ($s1)
-/* B767E4 80240034 3C018024 */  lui       $at, 0x8024
-/* B767E8 80240038 D4203880 */  ldc1      $f0, 0x3880($at)
+/* B767E4 80240034 3C018024 */  lui       $at, %hi(D_80243880)
+/* B767E8 80240038 D4203880 */  ldc1      $f0, %lo(D_80243880)($at)
 /* B767EC 8024003C 44826000 */  mtc1      $v0, $f12
 /* B767F0 80240040 00000000 */  nop       
 /* B767F4 80240044 46806320 */  cvt.s.w   $f12, $f12
@@ -26,8 +26,8 @@ glabel func_80240000_B767B0
 /* B76804 80240054 0C00A85B */  jal       sin_rad
 /* B76808 80240058 46206320 */   cvt.s.d  $f12, $f12
 /* B7680C 8024005C 96220000 */  lhu       $v0, ($s1)
-/* B76810 80240060 3C018024 */  lui       $at, 0x8024
-/* B76814 80240064 D4363888 */  ldc1      $f22, 0x3888($at)
+/* B76810 80240060 3C018024 */  lui       $at, %hi(D_80243888)
+/* B76814 80240064 D4363888 */  ldc1      $f22, %lo(D_80243888)($at)
 /* B76818 80240068 44826000 */  mtc1      $v0, $f12
 /* B7681C 8024006C 00000000 */  nop       
 /* B76820 80240070 46806320 */  cvt.s.w   $f12, $f12
@@ -38,13 +38,13 @@ glabel func_80240000_B767B0
 /* B76834 80240084 4481D000 */  mtc1      $at, $f26
 /* B76838 80240088 00000000 */  nop       
 /* B7683C 8024008C 461A0500 */  add.s     $f20, $f0, $f26
-/* B76840 80240090 3C018024 */  lui       $at, 0x8024
-/* B76844 80240094 D4383890 */  ldc1      $f24, 0x3890($at)
+/* B76840 80240090 3C018024 */  lui       $at, %hi(D_80243890)
+/* B76844 80240094 D4383890 */  ldc1      $f24, %lo(D_80243890)($at)
 /* B76848 80240098 4600A521 */  cvt.d.s   $f20, $f20
 /* B7684C 8024009C 4638A502 */  mul.d     $f20, $f20, $f24
 /* B76850 802400A0 00000000 */  nop       
-/* B76854 802400A4 3C018024 */  lui       $at, 0x8024
-/* B76858 802400A8 D4203898 */  ldc1      $f0, 0x3898($at)
+/* B76854 802400A4 3C018024 */  lui       $at, %hi(D_80243898)
+/* B76858 802400A8 D4203898 */  ldc1      $f0, %lo(D_80243898)($at)
 /* B7685C 802400AC 4620A500 */  add.d     $f20, $f20, $f0
 /* B76860 802400B0 0C00A85B */  jal       sin_rad
 /* B76864 802400B4 46206320 */   cvt.s.d  $f12, $f12
@@ -59,10 +59,10 @@ glabel func_80240000_B767B0
 /* B76888 802400D8 46380002 */  mul.d     $f0, $f0, $f24
 /* B7688C 802400DC 00000000 */  nop       
 /* B76890 802400E0 36731630 */  ori       $s3, $s3, 0x1630
-/* B76894 802400E4 3C12800A */  lui       $s2, 0x800a
-/* B76898 802400E8 2652A674 */  addiu     $s2, $s2, -0x598c
-/* B7689C 802400EC 3C108007 */  lui       $s0, 0x8007
-/* B768A0 802400F0 261041F0 */  addiu     $s0, $s0, 0x41f0
+/* B76894 802400E4 3C12800A */  lui       $s2, %hi(D_8009A674)
+/* B76898 802400E8 2652A674 */  addiu     $s2, $s2, %lo(D_8009A674)
+/* B7689C 802400EC 3C108007 */  lui       $s0, %hi(D_800741F0)
+/* B768A0 802400F0 261041F0 */  addiu     $s0, $s0, %lo(D_800741F0)
 /* B768A4 802400F4 3C013FE0 */  lui       $at, 0x3fe0
 /* B768A8 802400F8 44811800 */  mtc1      $at, $f3
 /* B768AC 802400FC 44801000 */  mtc1      $zero, $f2
@@ -78,8 +78,8 @@ glabel func_80240000_B767B0
 /* B768D4 80240124 0C019DC0 */  jal       guScale
 /* B768D8 80240128 00A0382D */   daddu    $a3, $a1, $zero
 /* B768DC 8024012C 3C05DA38 */  lui       $a1, 0xda38
-/* B768E0 80240130 3C04800A */  lui       $a0, 0x800a
-/* B768E4 80240134 2484A66C */  addiu     $a0, $a0, -0x5994
+/* B768E0 80240130 3C04800A */  lui       $a0, %hi(D_8009A66C)
+/* B768E4 80240134 2484A66C */  addiu     $a0, $a0, %lo(D_8009A66C)
 /* B768E8 80240138 34A50001 */  ori       $a1, $a1, 1
 /* B768EC 8024013C 8C820000 */  lw        $v0, ($a0)
 /* B768F0 80240140 96030000 */  lhu       $v1, ($s0)
diff --git a/asm/nonmatchings/world/area_jan/jan_14/B7A050/func_80240170_B7A1C0.s b/asm/nonmatchings/world/area_jan/jan_14/B7A050/func_80240170_B7A1C0.s
index 43222efa4e..3f117b8799 100644
--- a/asm/nonmatchings/world/area_jan/jan_14/B7A050/func_80240170_B7A1C0.s
+++ b/asm/nonmatchings/world/area_jan/jan_14/B7A050/func_80240170_B7A1C0.s
@@ -9,8 +9,8 @@ glabel func_80240170_B7A1C0
 /* B7A1D0 80240180 AFBF0014 */  sw        $ra, 0x14($sp)
 /* B7A1D4 80240184 0C019D28 */  jal       guMtxIdentF
 /* B7A1D8 80240188 0080802D */   daddu    $s0, $a0, $zero
-/* B7A1DC 8024018C 3C018024 */  lui       $at, 0x8024
-/* B7A1E0 80240190 D4203870 */  ldc1      $f0, 0x3870($at)
+/* B7A1DC 8024018C 3C018024 */  lui       $at, %hi(D_80243870)
+/* B7A1E0 80240190 D4203870 */  ldc1      $f0, %lo(D_80243870)($at)
 /* B7A1E4 80240194 4600A521 */  cvt.d.s   $f20, $f20
 /* B7A1E8 80240198 4620A502 */  mul.d     $f20, $f20, $f0
 /* B7A1EC 8024019C 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_802406F0_B7A740.s b/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_802406F0_B7A740.s
index 1fd863a35f..594d622f50 100644
--- a/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_802406F0_B7A740.s
+++ b/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_802406F0_B7A740.s
@@ -83,8 +83,8 @@ glabel func_802406F0_B7A740
 /* B7A86C 8024081C 27A5002C */   addiu    $a1, $sp, 0x2c
 /* B7A870 80240820 C6000038 */  lwc1      $f0, 0x38($s0)
 /* B7A874 80240824 860200A6 */  lh        $v0, 0xa6($s0)
-/* B7A878 80240828 3C018024 */  lui       $at, 0x8024
-/* B7A87C 8024082C D4223880 */  ldc1      $f2, 0x3880($at)
+/* B7A878 80240828 3C018024 */  lui       $at, %hi(D_80243880)
+/* B7A87C 8024082C D4223880 */  ldc1      $f2, %lo(D_80243880)($at)
 /* B7A880 80240830 27A60030 */  addiu     $a2, $sp, 0x30
 /* B7A884 80240834 E7A0002C */  swc1      $f0, 0x2c($sp)
 /* B7A888 80240838 44820000 */  mtc1      $v0, $f0
diff --git a/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_802410B0_B7B100.s b/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_802410B0_B7B100.s
index f00f97e0a4..fd3e81dfa6 100644
--- a/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_802410B0_B7B100.s
+++ b/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_802410B0_B7B100.s
@@ -88,9 +88,9 @@ glabel func_802410B0_B7B100
 /* B7B244 802411F4 2C62000F */  sltiu     $v0, $v1, 0xf
 /* B7B248 802411F8 1040002C */  beqz      $v0, .L802412AC
 /* B7B24C 802411FC 00031080 */   sll      $v0, $v1, 2
-/* B7B250 80241200 3C018024 */  lui       $at, 0x8024
+/* B7B250 80241200 3C018024 */  lui       $at, %hi(D_80243888)
 /* B7B254 80241204 00220821 */  addu      $at, $at, $v0
-/* B7B258 80241208 8C223888 */  lw        $v0, 0x3888($at)
+/* B7B258 80241208 8C223888 */  lw        $v0, %lo(D_80243888)($at)
 /* B7B25C 8024120C 00400008 */  jr        $v0
 /* B7B260 80241210 00000000 */   nop      
 /* B7B264 80241214 0260202D */  daddu     $a0, $s3, $zero
diff --git a/asm/nonmatchings/world/area_jan/jan_16/B80000/func_80240000_B80000.s b/asm/nonmatchings/world/area_jan/jan_16/B80000/func_80240000_B80000.s
index 6d4d8e19c4..f2ec26a977 100644
--- a/asm/nonmatchings/world/area_jan/jan_16/B80000/func_80240000_B80000.s
+++ b/asm/nonmatchings/world/area_jan/jan_16/B80000/func_80240000_B80000.s
@@ -71,8 +71,8 @@ glabel func_80240000_B80000
 /* B800F4 802400F4 08090035 */  j         .L802400D4
 /* B800F8 802400F8 00000000 */   nop      
 .L802400FC:
-/* B800FC 802400FC 3C028015 */  lui       $v0, 0x8015
-/* B80100 80240100 8C4212F0 */  lw        $v0, 0x12f0($v0)
+/* B800FC 802400FC 3C028015 */  lui       $v0, %hi(D_801512F0)
+/* B80100 80240100 8C4212F0 */  lw        $v0, %lo(D_801512F0)($v0)
 /* B80104 80240104 A0510000 */  sb        $s1, ($v0)
 .L80240108:
 /* B80108 80240108 24020002 */  addiu     $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240000_B84180.s b/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240000_B84180.s
index b748dc2cf4..8f4d0591ec 100644
--- a/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240000_B84180.s
+++ b/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240000_B84180.s
@@ -69,8 +69,8 @@ glabel func_80240000_B84180
 /* B84274 802400F4 08090047 */  j         .L8024011C
 /* B84278 802400F8 E6800018 */   swc1     $f0, 0x18($s4)
 .L802400FC:
-/* B8427C 802400FC 3C018025 */  lui       $at, 0x8025
-/* B84280 80240100 D422B9A0 */  ldc1      $f2, -0x4660($at)
+/* B8427C 802400FC 3C018025 */  lui       $at, %hi(D_8024B9A0)
+/* B84280 80240100 D422B9A0 */  ldc1      $f2, %lo(D_8024B9A0)($at)
 /* B84284 80240104 44820000 */  mtc1      $v0, $f0
 /* B84288 80240108 00000000 */  nop       
 /* B8428C 8024010C 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_jan/jan_22/B84180/func_8024067C_B847FC.s b/asm/nonmatchings/world/area_jan/jan_22/B84180/func_8024067C_B847FC.s
index 26df9cf9e3..99394a8f77 100644
--- a/asm/nonmatchings/world/area_jan/jan_22/B84180/func_8024067C_B847FC.s
+++ b/asm/nonmatchings/world/area_jan/jan_22/B84180/func_8024067C_B847FC.s
@@ -33,8 +33,8 @@ glabel func_8024067C_B847FC
 /* B84868 802406E8 080901C4 */  j         .L80240710
 /* B8486C 802406EC E4A00018 */   swc1     $f0, 0x18($a1)
 .L802406F0:
-/* B84870 802406F0 3C018025 */  lui       $at, 0x8025
-/* B84874 802406F4 D422B9A8 */  ldc1      $f2, -0x4658($at)
+/* B84870 802406F0 3C018025 */  lui       $at, %hi(D_8024B9A8)
+/* B84874 802406F4 D422B9A8 */  ldc1      $f2, %lo(D_8024B9A8)($at)
 /* B84878 802406F8 44820000 */  mtc1      $v0, $f0
 /* B8487C 802406FC 00000000 */  nop       
 /* B84880 80240700 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240B94_B84D14.s b/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240B94_B84D14.s
index a40a992616..fd679174dc 100644
--- a/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240B94_B84D14.s
+++ b/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240B94_B84D14.s
@@ -124,9 +124,9 @@ glabel func_80240B94_B84D14
 /* B84ED8 80240D58 2C620064 */  sltiu     $v0, $v1, 0x64
 /* B84EDC 80240D5C 10400042 */  beqz      $v0, .L80240E68
 /* B84EE0 80240D60 00031080 */   sll      $v0, $v1, 2
-/* B84EE4 80240D64 3C018025 */  lui       $at, 0x8025
+/* B84EE4 80240D64 3C018025 */  lui       $at, %hi(D_8024B9B0)
 /* B84EE8 80240D68 00220821 */  addu      $at, $at, $v0
-/* B84EEC 80240D6C 8C22B9B0 */  lw        $v0, -0x4650($at)
+/* B84EEC 80240D6C 8C22B9B0 */  lw        $v0, %lo(D_8024B9B0)($at)
 /* B84EF0 80240D70 00400008 */  jr        $v0
 /* B84EF4 80240D74 00000000 */   nop      
 /* B84EF8 80240D78 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240E90_B85010.s b/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240E90_B85010.s
index 7f3e998486..01a2b52c50 100644
--- a/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240E90_B85010.s
+++ b/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240E90_B85010.s
@@ -4,8 +4,8 @@
 glabel func_80240E90_B85010
 /* B85010 80240E90 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* B85014 80240E94 AFB00010 */  sw        $s0, 0x10($sp)
-/* B85018 80240E98 3C108024 */  lui       $s0, 0x8024
-/* B8501C 80240E9C 261025BC */  addiu     $s0, $s0, 0x25bc
+/* B85018 80240E98 3C108024 */  lui       $s0, %hi(D_802425BC)
+/* B8501C 80240E9C 261025BC */  addiu     $s0, $s0, %lo(D_802425BC)
 /* B85020 80240EA0 AFBF0018 */  sw        $ra, 0x18($sp)
 /* B85024 80240EA4 AFB10014 */  sw        $s1, 0x14($sp)
 /* B85028 80240EA8 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_80240E90_B85010
 /* B8508C 80240F0C 28620010 */  slti      $v0, $v1, 0x10
 /* B85090 80240F10 1440FFFA */  bnez      $v0, .L80240EFC
 /* B85094 80240F14 24840004 */   addiu    $a0, $a0, 4
-/* B85098 80240F18 3C108024 */  lui       $s0, 0x8024
-/* B8509C 80240F1C 261025BC */  addiu     $s0, $s0, 0x25bc
+/* B85098 80240F18 3C108024 */  lui       $s0, %hi(D_802425BC)
+/* B8509C 80240F1C 261025BC */  addiu     $s0, $s0, %lo(D_802425BC)
 /* B850A0 80240F20 0C00AB4B */  jal       heap_free
 /* B850A4 80240F24 8E040000 */   lw       $a0, ($s0)
 /* B850A8 80240F28 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_8024160C_B8578C.s b/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_8024160C_B8578C.s
index 36fa84465a..e4c1ff76ef 100644
--- a/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_8024160C_B8578C.s
+++ b/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_8024160C_B8578C.s
@@ -9,8 +9,8 @@ glabel func_8024160C_B8578C
 /* B8579C 8024161C AFBF0014 */  sw        $ra, 0x14($sp)
 /* B857A0 80241620 0C019D28 */  jal       guMtxIdentF
 /* B857A4 80241624 0080802D */   daddu    $s0, $a0, $zero
-/* B857A8 80241628 3C018025 */  lui       $at, 0x8025
-/* B857AC 8024162C D420BB40 */  ldc1      $f0, -0x44c0($at)
+/* B857A8 80241628 3C018025 */  lui       $at, %hi(D_8024BB40)
+/* B857AC 8024162C D420BB40 */  ldc1      $f0, %lo(D_8024BB40)($at)
 /* B857B0 80241630 4600A521 */  cvt.d.s   $f20, $f20
 /* B857B4 80241634 4620A502 */  mul.d     $f20, $f20, $f0
 /* B857B8 80241638 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_80240160_8A9B70.s b/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_80240160_8A9B70.s
index f1a5e70b40..8e320cc92f 100644
--- a/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_80240160_8A9B70.s
+++ b/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_80240160_8A9B70.s
@@ -56,8 +56,8 @@ glabel func_80240160_8A9B70
 /* 8A9C38 80240228 50400001 */  beql      $v0, $zero, .L80240230
 /* 8A9C3C 8024022C 2410000A */   addiu    $s0, $zero, 0xa
 .L80240230:
-/* 8A9C40 80240230 3C018024 */  lui       $at, 0x8024
-/* 8A9C44 80240234 D4200A30 */  ldc1      $f0, 0xa30($at)
+/* 8A9C40 80240230 3C018024 */  lui       $at, %hi(D_80240A30)
+/* 8A9C44 80240234 D4200A30 */  ldc1      $f0, %lo(D_80240A30)($at)
 /* 8A9C48 80240238 46006321 */  cvt.d.s   $f12, $f12
 /* 8A9C4C 8024023C 46206302 */  mul.d     $f12, $f12, $f0
 /* 8A9C50 80240240 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_80240354_8A9D64.s b/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_80240354_8A9D64.s
index cf341e024e..8eff3cd710 100644
--- a/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_80240354_8A9D64.s
+++ b/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_80240354_8A9D64.s
@@ -11,15 +11,15 @@ glabel func_80240354_8A9D64
 /* 8A9D7C 8024036C AFB10024 */  sw        $s1, 0x24($sp)
 /* 8A9D80 80240370 0C0470AC */  jal       func_8011C2B0
 /* 8A9D84 80240374 AFB00020 */   sw       $s0, 0x20($sp)
-/* 8A9D88 80240378 3C108024 */  lui       $s0, 0x8024
-/* 8A9D8C 8024037C 261007C0 */  addiu     $s0, $s0, 0x7c0
+/* 8A9D88 80240378 3C108024 */  lui       $s0, %hi(D_802407C0)
+/* 8A9D8C 8024037C 261007C0 */  addiu     $s0, $s0, %lo(D_802407C0)
 /* 8A9D90 80240380 8FA40010 */  lw        $a0, 0x10($sp)
 /* 8A9D94 80240384 8FA50014 */  lw        $a1, 0x14($sp)
 /* 8A9D98 80240388 8FA60018 */  lw        $a2, 0x18($sp)
 /* 8A9D9C 8024038C 0C090058 */  jal       func_80240160_8A9B70
 /* 8A9DA0 80240390 96070000 */   lhu      $a3, ($s0)
-/* 8A9DA4 80240394 3C03800A */  lui       $v1, 0x800a
-/* 8A9DA8 80240398 2463A66C */  addiu     $v1, $v1, -0x5994
+/* 8A9DA4 80240394 3C03800A */  lui       $v1, %hi(D_8009A66C)
+/* 8A9DA8 80240398 2463A66C */  addiu     $v1, $v1, %lo(D_8009A66C)
 /* 8A9DAC 8024039C 8C620000 */  lw        $v0, ($v1)
 /* 8A9DB0 802403A0 24040001 */  addiu     $a0, $zero, 1
 /* 8A9DB4 802403A4 0040882D */  daddu     $s1, $v0, $zero
diff --git a/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_802403E0_8A9DF0.s b/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_802403E0_8A9DF0.s
index 5abc5012b3..3de139a898 100644
--- a/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_802403E0_8A9DF0.s
+++ b/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_802403E0_8A9DF0.s
@@ -8,8 +8,8 @@ glabel func_802403E0_8A9DF0
 /* 8A9DFC 802403EC AFBF0014 */  sw        $ra, 0x14($sp)
 /* 8A9E00 802403F0 C60C0084 */  lwc1      $f12, 0x84($s0)
 /* 8A9E04 802403F4 46806320 */  cvt.s.w   $f12, $f12
-/* 8A9E08 802403F8 3C018024 */  lui       $at, 0x8024
-/* 8A9E0C 802403FC D4200A38 */  ldc1      $f0, 0xa38($at)
+/* 8A9E08 802403F8 3C018024 */  lui       $at, %hi(D_80240A38)
+/* 8A9E0C 802403FC D4200A38 */  ldc1      $f0, %lo(D_80240A38)($at)
 /* 8A9E10 80240400 46006321 */  cvt.d.s   $f12, $f12
 /* 8A9E14 80240404 46206302 */  mul.d     $f12, $f12, $f0
 /* 8A9E18 80240408 00000000 */  nop       
@@ -20,8 +20,8 @@ glabel func_802403E0_8A9DF0
 /* 8A9E2C 8024041C 468010A0 */  cvt.s.w   $f2, $f2
 /* 8A9E30 80240420 46001082 */  mul.s     $f2, $f2, $f0
 /* 8A9E34 80240424 00000000 */  nop       
-/* 8A9E38 80240428 3C028024 */  lui       $v0, 0x8024
-/* 8A9E3C 8024042C 944207C0 */  lhu       $v0, 0x7c0($v0)
+/* 8A9E38 80240428 3C028024 */  lui       $v0, %hi(D_802407C0)
+/* 8A9E3C 8024042C 944207C0 */  lhu       $v0, %lo(D_802407C0)($v0)
 /* 8A9E40 80240430 3C013C23 */  lui       $at, 0x3c23
 /* 8A9E44 80240434 3421D70A */  ori       $at, $at, 0xd70a
 /* 8A9E48 80240438 44812000 */  mtc1      $at, $f4
diff --git a/asm/nonmatchings/world/area_kgr/kgr_02/8AA5B0/func_80240160_8AA5B0.s b/asm/nonmatchings/world/area_kgr/kgr_02/8AA5B0/func_80240160_8AA5B0.s
index 0c6d8965aa..c2790dd37b 100644
--- a/asm/nonmatchings/world/area_kgr/kgr_02/8AA5B0/func_80240160_8AA5B0.s
+++ b/asm/nonmatchings/world/area_kgr/kgr_02/8AA5B0/func_80240160_8AA5B0.s
@@ -5,8 +5,8 @@ glabel func_80240160_8AA5B0
 /* 8AA5B0 80240160 27BDFFB0 */  addiu     $sp, $sp, -0x50
 /* 8AA5B4 80240164 AFB70044 */  sw        $s7, 0x44($sp)
 /* 8AA5B8 80240168 0080B82D */  daddu     $s7, $a0, $zero
-/* 8AA5BC 8024016C 3C028024 */  lui       $v0, 0x8024
-/* 8AA5C0 80240170 24420970 */  addiu     $v0, $v0, 0x970
+/* 8AA5BC 8024016C 3C028024 */  lui       $v0, %hi(D_80240970)
+/* 8AA5C0 80240170 24420970 */  addiu     $v0, $v0, %lo(D_80240970)
 /* 8AA5C4 80240174 AFBF004C */  sw        $ra, 0x4c($sp)
 /* 8AA5C8 80240178 AFBE0048 */  sw        $fp, 0x48($sp)
 /* 8AA5CC 8024017C AFB60040 */  sw        $s6, 0x40($sp)
@@ -79,8 +79,8 @@ glabel func_80240160_8AA5B0
 /* 8AA6B0 80240260 24560004 */  addiu     $s6, $v0, 4
 /* 8AA6B4 80240264 3C052AAA */  lui       $a1, 0x2aaa
 /* 8AA6B8 80240268 34A5AAAB */  ori       $a1, $a1, 0xaaab
-/* 8AA6BC 8024026C 3C06800A */  lui       $a2, 0x800a
-/* 8AA6C0 80240270 24C6A66C */  addiu     $a2, $a2, -0x5994
+/* 8AA6BC 8024026C 3C06800A */  lui       $a2, %hi(D_8009A66C)
+/* 8AA6C0 80240270 24C6A66C */  addiu     $a2, $a2, %lo(D_8009A66C)
 /* 8AA6C4 80240274 8CC20000 */  lw        $v0, ($a2)
 /* 8AA6C8 80240278 0000F02D */  daddu     $fp, $zero, $zero
 /* 8AA6CC 8024027C 0040202D */  daddu     $a0, $v0, $zero
@@ -101,8 +101,8 @@ glabel func_80240160_8AA5B0
 /* 8AA708 802402B8 000D1040 */  sll       $v0, $t5, 1
 /* 8AA70C 802402BC 004D1021 */  addu      $v0, $v0, $t5
 /* 8AA710 802402C0 00021040 */  sll       $v0, $v0, 1
-/* 8AA714 802402C4 3C0C800A */  lui       $t4, 0x800a
-/* 8AA718 802402C8 8D8CA64C */  lw        $t4, -0x59b4($t4)
+/* 8AA714 802402C4 3C0C800A */  lui       $t4, %hi(D_8009A64C)
+/* 8AA718 802402C8 8D8CA64C */  lw        $t4, %lo(D_8009A64C)($t4)
 /* 8AA71C 802402CC 00621823 */  subu      $v1, $v1, $v0
 /* 8AA720 802402D0 AFAD0010 */  sw        $t5, 0x10($sp)
 /* 8AA724 802402D4 AFA30014 */  sw        $v1, 0x14($sp)
@@ -186,8 +186,8 @@ glabel func_80240160_8AA5B0
 /* 8AA858 80240408 AE820000 */  sw        $v0, ($s4)
 /* 8AA85C 8024040C 02111025 */  or        $v0, $s0, $s1
 /* 8AA860 80240410 AC620020 */  sw        $v0, 0x20($v1)
-/* 8AA864 80240414 3C028024 */  lui       $v0, 0x8024
-/* 8AA868 80240418 8C420970 */  lw        $v0, 0x970($v0)
+/* 8AA864 80240414 3C028024 */  lui       $v0, %hi(D_80240970)
+/* 8AA868 80240418 8C420970 */  lw        $v0, %lo(D_80240970)($v0)
 /* 8AA86C 8024041C 00852025 */  or        $a0, $a0, $a1
 /* 8AA870 80240420 AC640024 */  sw        $a0, 0x24($v1)
 /* 8AA874 80240424 8FAC0024 */  lw        $t4, 0x24($sp)
@@ -266,8 +266,8 @@ glabel func_80240160_8AA5B0
 /* 8AA994 80240544 1180006D */  beqz      $t4, .L802406FC
 /* 8AA998 80240548 3C03FD10 */   lui      $v1, 0xfd10
 /* 8AA99C 8024054C 3463013F */  ori       $v1, $v1, 0x13f
-/* 8AA9A0 80240550 3C10800A */  lui       $s0, 0x800a
-/* 8AA9A4 80240554 2610A66C */  addiu     $s0, $s0, -0x5994
+/* 8AA9A0 80240550 3C10800A */  lui       $s0, %hi(D_8009A66C)
+/* 8AA9A4 80240554 2610A66C */  addiu     $s0, $s0, %lo(D_8009A66C)
 /* 8AA9A8 80240558 8E020000 */  lw        $v0, ($s0)
 /* 8AA9AC 8024055C 8FA40018 */  lw        $a0, 0x18($sp)
 /* 8AA9B0 80240560 0040882D */  daddu     $s1, $v0, $zero
diff --git a/asm/nonmatchings/world/area_kgr/kgr_02/8AAB80/func_80240730_8AAB80.s b/asm/nonmatchings/world/area_kgr/kgr_02/8AAB80/func_80240730_8AAB80.s
index 2efc1d65cd..5d73240277 100644
--- a/asm/nonmatchings/world/area_kgr/kgr_02/8AAB80/func_80240730_8AAB80.s
+++ b/asm/nonmatchings/world/area_kgr/kgr_02/8AAB80/func_80240730_8AAB80.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80240730_8AAB80
-/* 8AAB80 80240730 3C028011 */  lui       $v0, 0x8011
-/* 8AAB84 80240734 8042EBB3 */  lb        $v0, -0x144d($v0)
+/* 8AAB80 80240730 3C028011 */  lui       $v0, %hi(D_8010EBB3)
+/* 8AAB84 80240734 8042EBB3 */  lb        $v0, %lo(D_8010EBB3)($v0)
 /* 8AAB88 80240738 38420006 */  xori      $v0, $v0, 6
 /* 8AAB8C 8024073C 2C420001 */  sltiu     $v0, $v0, 1
 /* 8AAB90 80240740 03E00008 */  jr        $ra
diff --git a/asm/nonmatchings/world/area_kgr/kgr_02/8AAB80/func_80240748_8AAB98.s b/asm/nonmatchings/world/area_kgr/kgr_02/8AAB80/func_80240748_8AAB98.s
index 067f21531f..ef23504183 100644
--- a/asm/nonmatchings/world/area_kgr/kgr_02/8AAB80/func_80240748_8AAB98.s
+++ b/asm/nonmatchings/world/area_kgr/kgr_02/8AAB80/func_80240748_8AAB98.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80240748_8AAB98
-/* 8AAB98 80240748 3C028011 */  lui       $v0, 0x8011
-/* 8AAB9C 8024074C 8042EBB3 */  lb        $v0, -0x144d($v0)
+/* 8AAB98 80240748 3C028011 */  lui       $v0, %hi(D_8010EBB3)
+/* 8AAB9C 8024074C 8042EBB3 */  lb        $v0, %lo(D_8010EBB3)($v0)
 /* 8AABA0 80240750 38420006 */  xori      $v0, $v0, 6
 /* 8AABA4 80240754 0002102B */  sltu      $v0, $zero, $v0
 /* 8AABA8 80240758 03E00008 */  jr        $ra
diff --git a/asm/nonmatchings/world/area_kkj/kkj_00/ABB290/func_80240040_ABB2D0.s b/asm/nonmatchings/world/area_kkj/kkj_00/ABB290/func_80240040_ABB2D0.s
index 25a332ddba..77e07c0e83 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_00/ABB290/func_80240040_ABB2D0.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_00/ABB290/func_80240040_ABB2D0.s
@@ -13,13 +13,13 @@ glabel func_80240040_ABB2D0
 /* ABB2F0 80240060 00000000 */   nop      
 /* ABB2F4 80240064 14400005 */  bnez      $v0, .L8024007C
 /* ABB2F8 80240068 00000000 */   nop      
-/* ABB2FC 8024006C 3C028024 */  lui       $v0, 0x8024
-/* ABB300 80240070 2442160C */  addiu     $v0, $v0, 0x160c
+/* ABB2FC 8024006C 3C028024 */  lui       $v0, %hi(D_8024160C)
+/* ABB300 80240070 2442160C */  addiu     $v0, $v0, %lo(D_8024160C)
 /* ABB304 80240074 08090022 */  j         .L80240088
 /* ABB308 80240078 AE0200D0 */   sw       $v0, 0xd0($s0)
 .L8024007C:
-/* ABB30C 8024007C 3C028024 */  lui       $v0, 0x8024
-/* ABB310 80240080 2442162C */  addiu     $v0, $v0, 0x162c
+/* ABB30C 8024007C 3C028024 */  lui       $v0, %hi(D_8024162C)
+/* ABB310 80240080 2442162C */  addiu     $v0, $v0, %lo(D_8024162C)
 /* ABB314 80240084 AE0200D0 */  sw        $v0, 0xd0($s0)
 .L80240088:
 /* ABB318 80240088 8E030000 */  lw        $v1, ($s0)
diff --git a/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_802400B0_ABB340.s b/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_802400B0_ABB340.s
index 102e9fd5b7..640fd273fd 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_802400B0_ABB340.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_802400B0_ABB340.s
@@ -69,8 +69,8 @@ glabel func_802400B0_ABB340
 /* ABB434 802401A4 08090073 */  j         .L802401CC
 /* ABB438 802401A8 E6800018 */   swc1     $f0, 0x18($s4)
 .L802401AC:
-/* ABB43C 802401AC 3C018025 */  lui       $at, 0x8025
-/* ABB440 802401B0 D4229D30 */  ldc1      $f2, -0x62d0($at)
+/* ABB43C 802401AC 3C018025 */  lui       $at, %hi(D_80249D30)
+/* ABB440 802401B0 D4229D30 */  ldc1      $f2, %lo(D_80249D30)($at)
 /* ABB444 802401B4 44820000 */  mtc1      $v0, $f0
 /* ABB448 802401B8 00000000 */  nop       
 /* ABB44C 802401BC 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_8024072C_ABB9BC.s b/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_8024072C_ABB9BC.s
index 36bb5839c1..169c1d0913 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_8024072C_ABB9BC.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_8024072C_ABB9BC.s
@@ -33,8 +33,8 @@ glabel func_8024072C_ABB9BC
 /* ABBA28 80240798 080901F0 */  j         .L802407C0
 /* ABBA2C 8024079C E4A00018 */   swc1     $f0, 0x18($a1)
 .L802407A0:
-/* ABBA30 802407A0 3C018025 */  lui       $at, 0x8025
-/* ABBA34 802407A4 D4229D38 */  ldc1      $f2, -0x62c8($at)
+/* ABBA30 802407A0 3C018025 */  lui       $at, %hi(D_80249D38)
+/* ABBA34 802407A4 D4229D38 */  ldc1      $f2, %lo(D_80249D38)($at)
 /* ABBA38 802407A8 44820000 */  mtc1      $v0, $f0
 /* ABBA3C 802407AC 00000000 */  nop       
 /* ABBA40 802407B0 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240C44_ABBED4.s b/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240C44_ABBED4.s
index ec8a97c57a..bb9002355a 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240C44_ABBED4.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240C44_ABBED4.s
@@ -124,9 +124,9 @@ glabel func_80240C44_ABBED4
 /* ABC098 80240E08 2C620064 */  sltiu     $v0, $v1, 0x64
 /* ABC09C 80240E0C 10400042 */  beqz      $v0, .L80240F18
 /* ABC0A0 80240E10 00031080 */   sll      $v0, $v1, 2
-/* ABC0A4 80240E14 3C018025 */  lui       $at, 0x8025
+/* ABC0A4 80240E14 3C018025 */  lui       $at, %hi(D_80249D40)
 /* ABC0A8 80240E18 00220821 */  addu      $at, $at, $v0
-/* ABC0AC 80240E1C 8C229D40 */  lw        $v0, -0x62c0($at)
+/* ABC0AC 80240E1C 8C229D40 */  lw        $v0, %lo(D_80249D40)($at)
 /* ABC0B0 80240E20 00400008 */  jr        $v0
 /* ABC0B4 80240E24 00000000 */   nop      
 /* ABC0B8 80240E28 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240000_AC5170.s b/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240000_AC5170.s
index 736b554cfb..81b5100e9b 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240000_AC5170.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240000_AC5170.s
@@ -69,8 +69,8 @@ glabel func_80240000_AC5170
 /* AC5264 802400F4 08090047 */  j         .L8024011C
 /* AC5268 802400F8 E6800018 */   swc1     $f0, 0x18($s4)
 .L802400FC:
-/* AC526C 802400FC 3C018024 */  lui       $at, 0x8024
-/* AC5270 80240100 D4223A10 */  ldc1      $f2, 0x3a10($at)
+/* AC526C 802400FC 3C018024 */  lui       $at, %hi(D_80243A10)
+/* AC5270 80240100 D4223A10 */  ldc1      $f2, %lo(D_80243A10)($at)
 /* AC5274 80240104 44820000 */  mtc1      $v0, $f0
 /* AC5278 80240108 00000000 */  nop       
 /* AC527C 8024010C 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_8024067C_AC57EC.s b/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_8024067C_AC57EC.s
index d26990c1a2..89cdc8a061 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_8024067C_AC57EC.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_8024067C_AC57EC.s
@@ -33,8 +33,8 @@ glabel func_8024067C_AC57EC
 /* AC5858 802406E8 080901C4 */  j         .L80240710
 /* AC585C 802406EC E4A00018 */   swc1     $f0, 0x18($a1)
 .L802406F0:
-/* AC5860 802406F0 3C018024 */  lui       $at, 0x8024
-/* AC5864 802406F4 D4223A18 */  ldc1      $f2, 0x3a18($at)
+/* AC5860 802406F0 3C018024 */  lui       $at, %hi(D_80243A18)
+/* AC5864 802406F4 D4223A18 */  ldc1      $f2, %lo(D_80243A18)($at)
 /* AC5868 802406F8 44820000 */  mtc1      $v0, $f0
 /* AC586C 802406FC 00000000 */  nop       
 /* AC5870 80240700 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240B94_AC5D04.s b/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240B94_AC5D04.s
index 6837052c56..caed7cce26 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240B94_AC5D04.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240B94_AC5D04.s
@@ -124,9 +124,9 @@ glabel func_80240B94_AC5D04
 /* AC5EC8 80240D58 2C620064 */  sltiu     $v0, $v1, 0x64
 /* AC5ECC 80240D5C 10400042 */  beqz      $v0, .L80240E68
 /* AC5ED0 80240D60 00031080 */   sll      $v0, $v1, 2
-/* AC5ED4 80240D64 3C018024 */  lui       $at, 0x8024
+/* AC5ED4 80240D64 3C018024 */  lui       $at, %hi(D_80243A20)
 /* AC5ED8 80240D68 00220821 */  addu      $at, $at, $v0
-/* AC5EDC 80240D6C 8C223A20 */  lw        $v0, 0x3a20($at)
+/* AC5EDC 80240D6C 8C223A20 */  lw        $v0, %lo(D_80243A20)($at)
 /* AC5EE0 80240D70 00400008 */  jr        $v0
 /* AC5EE4 80240D74 00000000 */   nop      
 /* AC5EE8 80240D78 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_kkj/kkj_10/ACABD0/func_802400B0_ACABD0.s b/asm/nonmatchings/world/area_kkj/kkj_10/ACABD0/func_802400B0_ACABD0.s
index 88220ba5d0..8562bbd570 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_10/ACABD0/func_802400B0_ACABD0.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_10/ACABD0/func_802400B0_ACABD0.s
@@ -51,15 +51,15 @@ glabel func_802400B0_ACABD0
 /* ACAC88 80240168 0C00A7B5 */  jal       dist2D
 /* ACAC8C 8024016C 46000506 */   mov.s    $f20, $f0
 /* ACAC90 80240170 C604000C */  lwc1      $f4, 0xc($s0)
-/* ACAC94 80240174 3C018024 */  lui       $at, 0x8024
-/* ACAC98 80240178 D42235E0 */  ldc1      $f2, 0x35e0($at)
+/* ACAC94 80240174 3C018024 */  lui       $at, %hi(D_802435E0)
+/* ACAC98 80240178 D42235E0 */  ldc1      $f2, %lo(D_802435E0)($at)
 /* ACAC9C 8024017C 46002121 */  cvt.d.s   $f4, $f4
 /* ACACA0 80240180 46222032 */  c.eq.d    $f4, $f2
 /* ACACA4 80240184 00000000 */  nop       
 /* ACACA8 80240188 45010007 */  bc1t      .L802401A8
 /* ACACAC 8024018C 46000086 */   mov.s    $f2, $f0
-/* ACACB0 80240190 3C018024 */  lui       $at, 0x8024
-/* ACACB4 80240194 D42035E8 */  ldc1      $f0, 0x35e8($at)
+/* ACACB0 80240190 3C018024 */  lui       $at, %hi(D_802435E8)
+/* ACACB4 80240194 D42035E8 */  ldc1      $f0, %lo(D_802435E8)($at)
 /* ACACB8 80240198 46202032 */  c.eq.d    $f4, $f0
 /* ACACBC 8024019C 00000000 */  nop       
 /* ACACC0 802401A0 45000008 */  bc1f      .L802401C4
diff --git a/asm/nonmatchings/world/area_kkj/kkj_10/ACABD0/func_8024036C_ACAE8C.s b/asm/nonmatchings/world/area_kkj/kkj_10/ACABD0/func_8024036C_ACAE8C.s
index d0f0433058..21838694a6 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_10/ACABD0/func_8024036C_ACAE8C.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_10/ACABD0/func_8024036C_ACAE8C.s
@@ -94,8 +94,8 @@ glabel func_8024036C_ACAE8C
 /* ACAFEC 802404CC 3C014059 */  lui       $at, 0x4059
 /* ACAFF0 802404D0 44811800 */  mtc1      $at, $f3
 /* ACAFF4 802404D4 44801000 */  mtc1      $zero, $f2
-/* ACAFF8 802404D8 3C018024 */  lui       $at, 0x8024
-/* ACAFFC 802404DC D42435F0 */  ldc1      $f4, 0x35f0($at)
+/* ACAFF8 802404D8 3C018024 */  lui       $at, %hi(D_802435F0)
+/* ACAFFC 802404DC D42435F0 */  ldc1      $f4, %lo(D_802435F0)($at)
 /* ACB000 802404E0 46220003 */  div.d     $f0, $f0, $f2
 /* ACB004 802404E4 46240000 */  add.d     $f0, $f0, $f4
 /* ACB008 802404E8 C7A20020 */  lwc1      $f2, 0x20($sp)
diff --git a/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_802408A0_ACB3C0.s b/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_802408A0_ACB3C0.s
index 62dbdf88dd..8b8a6c55bf 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_802408A0_ACB3C0.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_802408A0_ACB3C0.s
@@ -51,15 +51,15 @@ glabel func_802408A0_ACB3C0
 /* ACB478 80240958 0C00A7B5 */  jal       dist2D
 /* ACB47C 8024095C 46000506 */   mov.s    $f20, $f0
 /* ACB480 80240960 C604000C */  lwc1      $f4, 0xc($s0)
-/* ACB484 80240964 3C018024 */  lui       $at, 0x8024
-/* ACB488 80240968 D4223600 */  ldc1      $f2, 0x3600($at)
+/* ACB484 80240964 3C018024 */  lui       $at, %hi(D_80243600)
+/* ACB488 80240968 D4223600 */  ldc1      $f2, %lo(D_80243600)($at)
 /* ACB48C 8024096C 46002121 */  cvt.d.s   $f4, $f4
 /* ACB490 80240970 46222032 */  c.eq.d    $f4, $f2
 /* ACB494 80240974 00000000 */  nop       
 /* ACB498 80240978 45010007 */  bc1t      .L80240998
 /* ACB49C 8024097C 46000086 */   mov.s    $f2, $f0
-/* ACB4A0 80240980 3C018024 */  lui       $at, 0x8024
-/* ACB4A4 80240984 D4203608 */  ldc1      $f0, 0x3608($at)
+/* ACB4A0 80240980 3C018024 */  lui       $at, %hi(D_80243608)
+/* ACB4A4 80240984 D4203608 */  ldc1      $f0, %lo(D_80243608)($at)
 /* ACB4A8 80240988 46202032 */  c.eq.d    $f4, $f0
 /* ACB4AC 8024098C 00000000 */  nop       
 /* ACB4B0 80240990 45000008 */  bc1f      .L802409B4
diff --git a/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240B5C_ACB67C.s b/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240B5C_ACB67C.s
index 3626685983..1181ec36be 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240B5C_ACB67C.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240B5C_ACB67C.s
@@ -94,8 +94,8 @@ glabel func_80240B5C_ACB67C
 /* ACB7DC 80240CBC 3C014059 */  lui       $at, 0x4059
 /* ACB7E0 80240CC0 44811800 */  mtc1      $at, $f3
 /* ACB7E4 80240CC4 44801000 */  mtc1      $zero, $f2
-/* ACB7E8 80240CC8 3C018024 */  lui       $at, 0x8024
-/* ACB7EC 80240CCC D4243610 */  ldc1      $f4, 0x3610($at)
+/* ACB7E8 80240CC8 3C018024 */  lui       $at, %hi(D_80243610)
+/* ACB7EC 80240CCC D4243610 */  ldc1      $f4, %lo(D_80243610)($at)
 /* ACB7F0 80240CD0 46220003 */  div.d     $f0, $f0, $f2
 /* ACB7F4 80240CD4 46240000 */  add.d     $f0, $f0, $f4
 /* ACB7F8 80240CD8 C7A20020 */  lwc1      $f2, 0x20($sp)
diff --git a/asm/nonmatchings/world/area_kkj/kkj_11/ACE1F0/func_802400B0_ACE1F0.s b/asm/nonmatchings/world/area_kkj/kkj_11/ACE1F0/func_802400B0_ACE1F0.s
index ee2b9e1b99..d557b32dcc 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_11/ACE1F0/func_802400B0_ACE1F0.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_11/ACE1F0/func_802400B0_ACE1F0.s
@@ -51,15 +51,15 @@ glabel func_802400B0_ACE1F0
 /* ACE2A8 80240168 0C00A7B5 */  jal       dist2D
 /* ACE2AC 8024016C 46000506 */   mov.s    $f20, $f0
 /* ACE2B0 80240170 C604000C */  lwc1      $f4, 0xc($s0)
-/* ACE2B4 80240174 3C018024 */  lui       $at, 0x8024
-/* ACE2B8 80240178 D4225F10 */  ldc1      $f2, 0x5f10($at)
+/* ACE2B4 80240174 3C018024 */  lui       $at, %hi(D_80245F10)
+/* ACE2B8 80240178 D4225F10 */  ldc1      $f2, %lo(D_80245F10)($at)
 /* ACE2BC 8024017C 46002121 */  cvt.d.s   $f4, $f4
 /* ACE2C0 80240180 46222032 */  c.eq.d    $f4, $f2
 /* ACE2C4 80240184 00000000 */  nop       
 /* ACE2C8 80240188 45010007 */  bc1t      .L802401A8
 /* ACE2CC 8024018C 46000086 */   mov.s    $f2, $f0
-/* ACE2D0 80240190 3C018024 */  lui       $at, 0x8024
-/* ACE2D4 80240194 D4205F18 */  ldc1      $f0, 0x5f18($at)
+/* ACE2D0 80240190 3C018024 */  lui       $at, %hi(D_80245F18)
+/* ACE2D4 80240194 D4205F18 */  ldc1      $f0, %lo(D_80245F18)($at)
 /* ACE2D8 80240198 46202032 */  c.eq.d    $f4, $f0
 /* ACE2DC 8024019C 00000000 */  nop       
 /* ACE2E0 802401A0 45000008 */  bc1f      .L802401C4
diff --git a/asm/nonmatchings/world/area_kkj/kkj_11/ACE1F0/func_8024036C_ACE4AC.s b/asm/nonmatchings/world/area_kkj/kkj_11/ACE1F0/func_8024036C_ACE4AC.s
index 296eb00a34..ee2bddbdf0 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_11/ACE1F0/func_8024036C_ACE4AC.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_11/ACE1F0/func_8024036C_ACE4AC.s
@@ -94,8 +94,8 @@ glabel func_8024036C_ACE4AC
 /* ACE60C 802404CC 3C014059 */  lui       $at, 0x4059
 /* ACE610 802404D0 44811800 */  mtc1      $at, $f3
 /* ACE614 802404D4 44801000 */  mtc1      $zero, $f2
-/* ACE618 802404D8 3C018024 */  lui       $at, 0x8024
-/* ACE61C 802404DC D4245F20 */  ldc1      $f4, 0x5f20($at)
+/* ACE618 802404D8 3C018024 */  lui       $at, %hi(D_80245F20)
+/* ACE61C 802404DC D4245F20 */  ldc1      $f4, %lo(D_80245F20)($at)
 /* ACE620 802404E0 46220003 */  div.d     $f0, $f0, $f2
 /* ACE624 802404E4 46240000 */  add.d     $f0, $f0, $f4
 /* ACE628 802404E8 C7A20020 */  lwc1      $f2, 0x20($sp)
diff --git a/asm/nonmatchings/world/area_kkj/kkj_11/ACE9E0/func_802408A0_ACE9E0.s b/asm/nonmatchings/world/area_kkj/kkj_11/ACE9E0/func_802408A0_ACE9E0.s
index 4076e2c13a..cc685e9fe9 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_11/ACE9E0/func_802408A0_ACE9E0.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_11/ACE9E0/func_802408A0_ACE9E0.s
@@ -51,15 +51,15 @@ glabel func_802408A0_ACE9E0
 /* ACEA98 80240958 0C00A7B5 */  jal       dist2D
 /* ACEA9C 8024095C 46000506 */   mov.s    $f20, $f0
 /* ACEAA0 80240960 C604000C */  lwc1      $f4, 0xc($s0)
-/* ACEAA4 80240964 3C018024 */  lui       $at, 0x8024
-/* ACEAA8 80240968 D4225F30 */  ldc1      $f2, 0x5f30($at)
+/* ACEAA4 80240964 3C018024 */  lui       $at, %hi(D_80245F30)
+/* ACEAA8 80240968 D4225F30 */  ldc1      $f2, %lo(D_80245F30)($at)
 /* ACEAAC 8024096C 46002121 */  cvt.d.s   $f4, $f4
 /* ACEAB0 80240970 46222032 */  c.eq.d    $f4, $f2
 /* ACEAB4 80240974 00000000 */  nop       
 /* ACEAB8 80240978 45010007 */  bc1t      .L80240998
 /* ACEABC 8024097C 46000086 */   mov.s    $f2, $f0
-/* ACEAC0 80240980 3C018024 */  lui       $at, 0x8024
-/* ACEAC4 80240984 D4205F38 */  ldc1      $f0, 0x5f38($at)
+/* ACEAC0 80240980 3C018024 */  lui       $at, %hi(D_80245F38)
+/* ACEAC4 80240984 D4205F38 */  ldc1      $f0, %lo(D_80245F38)($at)
 /* ACEAC8 80240988 46202032 */  c.eq.d    $f4, $f0
 /* ACEACC 8024098C 00000000 */  nop       
 /* ACEAD0 80240990 45000008 */  bc1f      .L802409B4
diff --git a/asm/nonmatchings/world/area_kkj/kkj_11/ACE9E0/func_80240B5C_ACEC9C.s b/asm/nonmatchings/world/area_kkj/kkj_11/ACE9E0/func_80240B5C_ACEC9C.s
index 0669df4af7..fef5f93b47 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_11/ACE9E0/func_80240B5C_ACEC9C.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_11/ACE9E0/func_80240B5C_ACEC9C.s
@@ -94,8 +94,8 @@ glabel func_80240B5C_ACEC9C
 /* ACEDFC 80240CBC 3C014059 */  lui       $at, 0x4059
 /* ACEE00 80240CC0 44811800 */  mtc1      $at, $f3
 /* ACEE04 80240CC4 44801000 */  mtc1      $zero, $f2
-/* ACEE08 80240CC8 3C018024 */  lui       $at, 0x8024
-/* ACEE0C 80240CCC D4245F40 */  ldc1      $f4, 0x5f40($at)
+/* ACEE08 80240CC8 3C018024 */  lui       $at, %hi(D_80245F40)
+/* ACEE0C 80240CCC D4245F40 */  ldc1      $f4, %lo(D_80245F40)($at)
 /* ACEE10 80240CD0 46220003 */  div.d     $f0, $f0, $f2
 /* ACEE14 80240CD4 46240000 */  add.d     $f0, $f0, $f4
 /* ACEE18 80240CD8 C7A20020 */  lwc1      $f2, 0x20($sp)
diff --git a/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_80240070_AD4100.s b/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_80240070_AD4100.s
index b19281eef7..0174885d2c 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_80240070_AD4100.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_80240070_AD4100.s
@@ -51,15 +51,15 @@ glabel func_80240070_AD4100
 /* AD41B8 80240128 0C00A7B5 */  jal       dist2D
 /* AD41BC 8024012C 46000506 */   mov.s    $f20, $f0
 /* AD41C0 80240130 C604000C */  lwc1      $f4, 0xc($s0)
-/* AD41C4 80240134 3C018024 */  lui       $at, 0x8024
-/* AD41C8 80240138 D4221E20 */  ldc1      $f2, 0x1e20($at)
+/* AD41C4 80240134 3C018024 */  lui       $at, %hi(D_80241E20)
+/* AD41C8 80240138 D4221E20 */  ldc1      $f2, %lo(D_80241E20)($at)
 /* AD41CC 8024013C 46002121 */  cvt.d.s   $f4, $f4
 /* AD41D0 80240140 46222032 */  c.eq.d    $f4, $f2
 /* AD41D4 80240144 00000000 */  nop       
 /* AD41D8 80240148 45010007 */  bc1t      .L80240168
 /* AD41DC 8024014C 46000086 */   mov.s    $f2, $f0
-/* AD41E0 80240150 3C018024 */  lui       $at, 0x8024
-/* AD41E4 80240154 D4201E28 */  ldc1      $f0, 0x1e28($at)
+/* AD41E0 80240150 3C018024 */  lui       $at, %hi(D_80241E28)
+/* AD41E4 80240154 D4201E28 */  ldc1      $f0, %lo(D_80241E28)($at)
 /* AD41E8 80240158 46202032 */  c.eq.d    $f4, $f0
 /* AD41EC 8024015C 00000000 */  nop       
 /* AD41F0 80240160 45000008 */  bc1f      .L80240184
diff --git a/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_8024032C_AD43BC.s b/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_8024032C_AD43BC.s
index 34e4f436b5..90e025ce4f 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_8024032C_AD43BC.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_8024032C_AD43BC.s
@@ -94,8 +94,8 @@ glabel func_8024032C_AD43BC
 /* AD451C 8024048C 3C014059 */  lui       $at, 0x4059
 /* AD4520 80240490 44811800 */  mtc1      $at, $f3
 /* AD4524 80240494 44801000 */  mtc1      $zero, $f2
-/* AD4528 80240498 3C018024 */  lui       $at, 0x8024
-/* AD452C 8024049C D4241E30 */  ldc1      $f4, 0x1e30($at)
+/* AD4528 80240498 3C018024 */  lui       $at, %hi(D_80241E30)
+/* AD452C 8024049C D4241E30 */  ldc1      $f4, %lo(D_80241E30)($at)
 /* AD4530 802404A0 46220003 */  div.d     $f0, $f0, $f2
 /* AD4534 802404A4 46240000 */  add.d     $f0, $f0, $f4
 /* AD4538 802404A8 C7A20020 */  lwc1      $f2, 0x20($sp)
diff --git a/asm/nonmatchings/world/area_kkj/kkj_13/AD6200/func_802404E0_AD63B0.s b/asm/nonmatchings/world/area_kkj/kkj_13/AD6200/func_802404E0_AD63B0.s
index 3d6783fe83..be2734ac17 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_13/AD6200/func_802404E0_AD63B0.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_13/AD6200/func_802404E0_AD63B0.s
@@ -4,15 +4,15 @@
 glabel func_802404E0_AD63B0
 /* AD63B0 802404E0 27BDFFA8 */  addiu     $sp, $sp, -0x58
 /* AD63B4 802404E4 F7BC0050 */  sdc1      $f28, 0x50($sp)
-/* AD63B8 802404E8 3C018024 */  lui       $at, 0x8024
-/* AD63BC 802404EC D43C4FA0 */  ldc1      $f28, 0x4fa0($at)
+/* AD63B8 802404E8 3C018024 */  lui       $at, %hi(D_80244FA0)
+/* AD63BC 802404EC D43C4FA0 */  ldc1      $f28, %lo(D_80244FA0)($at)
 /* AD63C0 802404F0 AFB20020 */  sw        $s2, 0x20($sp)
 /* AD63C4 802404F4 0000902D */  daddu     $s2, $zero, $zero
 /* AD63C8 802404F8 AFB30024 */  sw        $s3, 0x24($sp)
 /* AD63CC 802404FC 0240982D */  daddu     $s3, $s2, $zero
 /* AD63D0 80240500 AFB1001C */  sw        $s1, 0x1c($sp)
-/* AD63D4 80240504 3C118024 */  lui       $s1, 0x8024
-/* AD63D8 80240508 26313614 */  addiu     $s1, $s1, 0x3614
+/* AD63D4 80240504 3C118024 */  lui       $s1, %hi(D_80243614)
+/* AD63D8 80240508 26313614 */  addiu     $s1, $s1, %lo(D_80243614)
 /* AD63DC 8024050C AFBF0028 */  sw        $ra, 0x28($sp)
 /* AD63E0 80240510 AFB00018 */  sw        $s0, 0x18($sp)
 /* AD63E4 80240514 F7BA0048 */  sdc1      $f26, 0x48($sp)
@@ -33,8 +33,8 @@ glabel func_802404E0_AD63B0
 /* AD641C 8024054C 26100002 */   addiu    $s0, $s0, 2
 /* AD6420 80240550 4600A002 */  mul.s     $f0, $f20, $f0
 /* AD6424 80240554 00000000 */  nop       
-/* AD6428 80240558 3C018024 */  lui       $at, 0x8024
-/* AD642C 8024055C D4224FA8 */  ldc1      $f2, 0x4fa8($at)
+/* AD6428 80240558 3C018024 */  lui       $at, %hi(D_80244FA8)
+/* AD642C 8024055C D4224FA8 */  ldc1      $f2, %lo(D_80244FA8)($at)
 /* AD6430 80240560 46000021 */  cvt.d.s   $f0, $f0
 /* AD6434 80240564 46220002 */  mul.d     $f0, $f0, $f2
 /* AD6438 80240568 00000000 */  nop       
@@ -75,8 +75,8 @@ glabel func_802404E0_AD63B0
 /* AD64C4 802405F4 0C00A8D4 */  jal       cos_deg
 /* AD64C8 802405F8 462006A0 */   cvt.s.d  $f26, $f0
 /* AD64CC 802405FC 32420003 */  andi      $v0, $s2, 3
-/* AD64D0 80240600 3C018024 */  lui       $at, 0x8024
-/* AD64D4 80240604 D4244FB0 */  ldc1      $f4, 0x4fb0($at)
+/* AD64D0 80240600 3C018024 */  lui       $at, %hi(D_80244FB0)
+/* AD64D4 80240604 D4244FB0 */  ldc1      $f4, %lo(D_80244FB0)($at)
 /* AD64D8 80240608 44821000 */  mtc1      $v0, $f2
 /* AD64DC 8024060C 00000000 */  nop       
 /* AD64E0 80240610 468010A1 */  cvt.d.w   $f2, $f2
@@ -107,8 +107,8 @@ glabel func_802404E0_AD63B0
 /* AD6544 80240674 2404000A */  addiu     $a0, $zero, 0xa
 /* AD6548 80240678 0C00A67F */  jal       rand_int
 /* AD654C 8024067C AC400044 */   sw       $zero, 0x44($v0)
-/* AD6550 80240680 3C018024 */  lui       $at, 0x8024
-/* AD6554 80240684 D4224FB8 */  ldc1      $f2, 0x4fb8($at)
+/* AD6550 80240680 3C018024 */  lui       $at, %hi(D_80244FB8)
+/* AD6554 80240684 D4224FB8 */  ldc1      $f2, %lo(D_80244FB8)($at)
 /* AD6558 80240688 44820000 */  mtc1      $v0, $f0
 /* AD655C 8024068C 00000000 */  nop       
 /* AD6560 80240690 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_kkj/kkj_14/ADAEA0/func_80240000_ADAEA0.s b/asm/nonmatchings/world/area_kkj/kkj_14/ADAEA0/func_80240000_ADAEA0.s
index e270bc645d..b29f35b3c7 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_14/ADAEA0/func_80240000_ADAEA0.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_14/ADAEA0/func_80240000_ADAEA0.s
@@ -11,11 +11,11 @@ glabel func_80240000_ADAEA0
 /* ADAEB8 80240018 2403FF80 */  addiu     $v1, $zero, -0x80
 /* ADAEBC 8024001C 14430006 */  bne       $v0, $v1, .L80240038
 /* ADAEC0 80240020 00000000 */   nop      
-/* ADAEC4 80240024 3C04800E */  lui       $a0, 0x800e
-/* ADAEC8 80240028 24849668 */  addiu     $a0, $a0, -0x6998
-/* ADAECC 8024002C 3C058025 */  lui       $a1, 0x8025
+/* ADAEC4 80240024 3C04800E */  lui       $a0, %hi(D_800D9668)
+/* ADAEC8 80240028 24849668 */  addiu     $a0, $a0, %lo(D_800D9668)
+/* ADAECC 8024002C 3C058025 */  lui       $a1, %hi(D_8024A6B0)
 /* ADAED0 80240030 0C01953C */  jal       sprintf
-/* ADAED4 80240034 24A5A6B0 */   addiu    $a1, $a1, -0x5950
+/* ADAED4 80240034 24A5A6B0 */   addiu    $a1, $a1, %lo(D_8024A6B0)
 .L80240038:
 /* ADAED8 80240038 8FBF0010 */  lw        $ra, 0x10($sp)
 /* ADAEDC 8024003C 0000102D */  daddu     $v0, $zero, $zero
diff --git a/asm/nonmatchings/world/area_kkj/kkj_14/ADAEF0/func_802403CC_ADB26C.s b/asm/nonmatchings/world/area_kkj/kkj_14/ADAEF0/func_802403CC_ADB26C.s
index 1e8d8776e2..f10d21f83c 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_14/ADAEF0/func_802403CC_ADB26C.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_14/ADAEF0/func_802403CC_ADB26C.s
@@ -8,8 +8,8 @@ glabel func_802403CC_ADB26C
 /* ADB278 802403D8 0C0B1EAF */  jal       get_variable
 /* ADB27C 802403DC 8C450000 */   lw       $a1, ($v0)
 /* ADB280 802403E0 8FBF0010 */  lw        $ra, 0x10($sp)
-/* ADB284 802403E4 3C018024 */  lui       $at, 0x8024
-/* ADB288 802403E8 AC221D38 */  sw        $v0, 0x1d38($at)
+/* ADB284 802403E4 3C018024 */  lui       $at, %hi(D_80241D38)
+/* ADB288 802403E8 AC221D38 */  sw        $v0, %lo(D_80241D38)($at)
 /* ADB28C 802403EC 24020002 */  addiu     $v0, $zero, 2
 /* ADB290 802403F0 03E00008 */  jr        $ra
 /* ADB294 802403F4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kkj/kkj_14/ADAEF0/func_802403F8_ADB298.s b/asm/nonmatchings/world/area_kkj/kkj_14/ADAEF0/func_802403F8_ADB298.s
index bf1d93070d..4475b5a106 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_14/ADAEF0/func_802403F8_ADB298.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_14/ADAEF0/func_802403F8_ADB298.s
@@ -9,8 +9,8 @@ glabel func_802403F8_ADB298
 /* ADB2A8 80240408 3C060C18 */  lui       $a2, 0xc18
 /* ADB2AC 8024040C 34C649D8 */  ori       $a2, $a2, 0x49d8
 /* ADB2B0 80240410 3C08FC11 */  lui       $t0, 0xfc11
-/* ADB2B4 80240414 3C04800A */  lui       $a0, 0x800a
-/* ADB2B8 80240418 2484A66C */  addiu     $a0, $a0, -0x5994
+/* ADB2B4 80240414 3C04800A */  lui       $a0, %hi(D_8009A66C)
+/* ADB2B8 80240418 2484A66C */  addiu     $a0, $a0, %lo(D_8009A66C)
 /* ADB2BC 8024041C 8C830000 */  lw        $v1, ($a0)
 /* ADB2C0 80240420 350815FF */  ori       $t0, $t0, 0x15ff
 /* ADB2C4 80240424 0060282D */  daddu     $a1, $v1, $zero
@@ -30,8 +30,8 @@ glabel func_802403F8_ADB298
 /* ADB2FC 8024045C 24620018 */  addiu     $v0, $v1, 0x18
 /* ADB300 80240460 AC680008 */  sw        $t0, 8($v1)
 /* ADB304 80240464 AC820000 */  sw        $v0, ($a0)
-/* ADB308 80240468 3C048024 */  lui       $a0, 0x8024
-/* ADB30C 8024046C 90841D3B */  lbu       $a0, 0x1d3b($a0)
+/* ADB308 80240468 3C048024 */  lui       $a0, %hi(D_80241D3B)
+/* ADB30C 8024046C 90841D3B */  lbu       $a0, %lo(D_80241D3B)($a0)
 /* ADB310 80240470 3C02FA00 */  lui       $v0, 0xfa00
 /* ADB314 80240474 AC620010 */  sw        $v0, 0x10($v1)
 /* ADB318 80240478 03E00008 */  jr        $ra
diff --git a/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_80240060_AED470.s b/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_80240060_AED470.s
index d69d1558bd..8570eb96ce 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_80240060_AED470.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_80240060_AED470.s
@@ -51,15 +51,15 @@ glabel func_80240060_AED470
 /* AED528 80240118 0C00A7B5 */  jal       dist2D
 /* AED52C 8024011C 46000506 */   mov.s    $f20, $f0
 /* AED530 80240120 C604000C */  lwc1      $f4, 0xc($s0)
-/* AED534 80240124 3C018024 */  lui       $at, 0x8024
-/* AED538 80240128 D4224810 */  ldc1      $f2, 0x4810($at)
+/* AED534 80240124 3C018024 */  lui       $at, %hi(D_80244810)
+/* AED538 80240128 D4224810 */  ldc1      $f2, %lo(D_80244810)($at)
 /* AED53C 8024012C 46002121 */  cvt.d.s   $f4, $f4
 /* AED540 80240130 46222032 */  c.eq.d    $f4, $f2
 /* AED544 80240134 00000000 */  nop       
 /* AED548 80240138 45010007 */  bc1t      .L80240158
 /* AED54C 8024013C 46000086 */   mov.s    $f2, $f0
-/* AED550 80240140 3C018024 */  lui       $at, 0x8024
-/* AED554 80240144 D4204818 */  ldc1      $f0, 0x4818($at)
+/* AED550 80240140 3C018024 */  lui       $at, %hi(D_80244818)
+/* AED554 80240144 D4204818 */  ldc1      $f0, %lo(D_80244818)($at)
 /* AED558 80240148 46202032 */  c.eq.d    $f4, $f0
 /* AED55C 8024014C 00000000 */  nop       
 /* AED560 80240150 45000008 */  bc1f      .L80240174
diff --git a/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_8024031C_AED72C.s b/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_8024031C_AED72C.s
index 8a9cd0d335..8620a19764 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_8024031C_AED72C.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_8024031C_AED72C.s
@@ -94,8 +94,8 @@ glabel func_8024031C_AED72C
 /* AED88C 8024047C 3C014059 */  lui       $at, 0x4059
 /* AED890 80240480 44811800 */  mtc1      $at, $f3
 /* AED894 80240484 44801000 */  mtc1      $zero, $f2
-/* AED898 80240488 3C018024 */  lui       $at, 0x8024
-/* AED89C 8024048C D4244820 */  ldc1      $f4, 0x4820($at)
+/* AED898 80240488 3C018024 */  lui       $at, %hi(D_80244820)
+/* AED89C 8024048C D4244820 */  ldc1      $f4, %lo(D_80244820)($at)
 /* AED8A0 80240490 46220003 */  div.d     $f0, $f0, $f2
 /* AED8A4 80240494 46240000 */  add.d     $f0, $f0, $f4
 /* AED8A8 80240498 C7A20020 */  lwc1      $f2, 0x20($sp)
diff --git a/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240850_AEDC60.s b/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240850_AEDC60.s
index 0069c9a26d..903d31c021 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240850_AEDC60.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240850_AEDC60.s
@@ -51,15 +51,15 @@ glabel func_80240850_AEDC60
 /* AEDD18 80240908 0C00A7B5 */  jal       dist2D
 /* AEDD1C 8024090C 46000506 */   mov.s    $f20, $f0
 /* AEDD20 80240910 C604000C */  lwc1      $f4, 0xc($s0)
-/* AEDD24 80240914 3C018024 */  lui       $at, 0x8024
-/* AEDD28 80240918 D4224830 */  ldc1      $f2, 0x4830($at)
+/* AEDD24 80240914 3C018024 */  lui       $at, %hi(D_80244830)
+/* AEDD28 80240918 D4224830 */  ldc1      $f2, %lo(D_80244830)($at)
 /* AEDD2C 8024091C 46002121 */  cvt.d.s   $f4, $f4
 /* AEDD30 80240920 46222032 */  c.eq.d    $f4, $f2
 /* AEDD34 80240924 00000000 */  nop       
 /* AEDD38 80240928 45010007 */  bc1t      .L80240948
 /* AEDD3C 8024092C 46000086 */   mov.s    $f2, $f0
-/* AEDD40 80240930 3C018024 */  lui       $at, 0x8024
-/* AEDD44 80240934 D4204838 */  ldc1      $f0, 0x4838($at)
+/* AEDD40 80240930 3C018024 */  lui       $at, %hi(D_80244838)
+/* AEDD44 80240934 D4204838 */  ldc1      $f0, %lo(D_80244838)($at)
 /* AEDD48 80240938 46202032 */  c.eq.d    $f4, $f0
 /* AEDD4C 8024093C 00000000 */  nop       
 /* AEDD50 80240940 45000008 */  bc1f      .L80240964
diff --git a/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240B0C_AEDF1C.s b/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240B0C_AEDF1C.s
index a85269d194..22ee4bead6 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240B0C_AEDF1C.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240B0C_AEDF1C.s
@@ -94,8 +94,8 @@ glabel func_80240B0C_AEDF1C
 /* AEE07C 80240C6C 3C014059 */  lui       $at, 0x4059
 /* AEE080 80240C70 44811800 */  mtc1      $at, $f3
 /* AEE084 80240C74 44801000 */  mtc1      $zero, $f2
-/* AEE088 80240C78 3C018024 */  lui       $at, 0x8024
-/* AEE08C 80240C7C D4244840 */  ldc1      $f4, 0x4840($at)
+/* AEE088 80240C78 3C018024 */  lui       $at, %hi(D_80244840)
+/* AEE08C 80240C7C D4244840 */  ldc1      $f4, %lo(D_80244840)($at)
 /* AEE090 80240C80 46220003 */  div.d     $f0, $f0, $f2
 /* AEE094 80240C84 46240000 */  add.d     $f0, $f0, $f4
 /* AEE098 80240C88 C7A20020 */  lwc1      $f2, 0x20($sp)
diff --git a/asm/nonmatchings/world/area_kkj/kkj_17/AF1C60/func_80240000_AF1C60.s b/asm/nonmatchings/world/area_kkj/kkj_17/AF1C60/func_80240000_AF1C60.s
index 437150fd73..30147ac999 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_17/AF1C60/func_80240000_AF1C60.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_17/AF1C60/func_80240000_AF1C60.s
@@ -4,8 +4,8 @@
 glabel func_80240000_AF1C60
 /* AF1C60 80240000 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* AF1C64 80240004 AFB00010 */  sw        $s0, 0x10($sp)
-/* AF1C68 80240008 3C108024 */  lui       $s0, 0x8024
-/* AF1C6C 8024000C 261008C0 */  addiu     $s0, $s0, 0x8c0
+/* AF1C68 80240008 3C108024 */  lui       $s0, %hi(D_802408C0)
+/* AF1C6C 8024000C 261008C0 */  addiu     $s0, $s0, %lo(D_802408C0)
 /* AF1C70 80240010 AFBF0018 */  sw        $ra, 0x18($sp)
 /* AF1C74 80240014 AFB10014 */  sw        $s1, 0x14($sp)
 /* AF1C78 80240018 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_80240000_AF1C60
 /* AF1CDC 8024007C 28620010 */  slti      $v0, $v1, 0x10
 /* AF1CE0 80240080 1440FFFA */  bnez      $v0, .L8024006C
 /* AF1CE4 80240084 24840004 */   addiu    $a0, $a0, 4
-/* AF1CE8 80240088 3C108024 */  lui       $s0, 0x8024
-/* AF1CEC 8024008C 261008C0 */  addiu     $s0, $s0, 0x8c0
+/* AF1CE8 80240088 3C108024 */  lui       $s0, %hi(D_802408C0)
+/* AF1CEC 8024008C 261008C0 */  addiu     $s0, $s0, %lo(D_802408C0)
 /* AF1CF0 80240090 0C00AB4B */  jal       heap_free
 /* AF1CF4 80240094 8E040000 */   lw       $a0, ($s0)
 /* AF1CF8 80240098 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_kkj/kkj_17/AF1C60/func_802402BC_AF1F1C.s b/asm/nonmatchings/world/area_kkj/kkj_17/AF1C60/func_802402BC_AF1F1C.s
index 5f7a4f4c25..b4ec3f7a99 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_17/AF1C60/func_802402BC_AF1F1C.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_17/AF1C60/func_802402BC_AF1F1C.s
@@ -42,11 +42,11 @@ glabel func_802402BC_AF1F1C
 /* AF1FA8 80240348 AEA20318 */  sw        $v0, 0x318($s5)
 /* AF1FAC 8024034C 0000B02D */  daddu     $s6, $zero, $zero
 /* AF1FB0 80240350 02C0902D */  daddu     $s2, $s6, $zero
-/* AF1FB4 80240354 3C1E8009 */  lui       $fp, 0x8009
-/* AF1FB8 80240358 27DEA680 */  addiu     $fp, $fp, -0x5980
+/* AF1FB4 80240354 3C1E8009 */  lui       $fp, %hi(D_8008A680)
+/* AF1FB8 80240358 27DEA680 */  addiu     $fp, $fp, %lo(D_8008A680)
 /* AF1FBC 8024035C 24170001 */  addiu     $s7, $zero, 1
-/* AF1FC0 80240360 3C148024 */  lui       $s4, 0x8024
-/* AF1FC4 80240364 2694092C */  addiu     $s4, $s4, 0x92c
+/* AF1FC0 80240360 3C148024 */  lui       $s4, %hi(D_8024092C)
+/* AF1FC4 80240364 2694092C */  addiu     $s4, $s4, %lo(D_8024092C)
 /* AF1FC8 80240368 02A0882D */  daddu     $s1, $s5, $zero
 .L8024036C:
 /* AF1FCC 8024036C 8E650088 */  lw        $a1, 0x88($s3)
@@ -131,9 +131,9 @@ glabel func_802402BC_AF1F1C
 /* AF20EC 8024048C 8C460108 */  lw        $a2, 0x108($v0)
 /* AF20F0 80240490 8E6300AC */  lw        $v1, 0xac($s3)
 /* AF20F4 80240494 00061080 */  sll       $v0, $a2, 2
-/* AF20F8 80240498 3C018024 */  lui       $at, 0x8024
+/* AF20F8 80240498 3C018024 */  lui       $at, %hi(D_8024092C)
 /* AF20FC 8024049C 00220821 */  addu      $at, $at, $v0
-/* AF2100 802404A0 8C22092C */  lw        $v0, 0x92c($at)
+/* AF2100 802404A0 8C22092C */  lw        $v0, %lo(D_8024092C)($at)
 /* AF2104 802404A4 14600006 */  bnez      $v1, .L802404C0
 /* AF2108 802404A8 AE620084 */   sw       $v0, 0x84($s3)
 /* AF210C 802404AC 8E65008C */  lw        $a1, 0x8c($s3)
diff --git a/asm/nonmatchings/world/area_kkj/kkj_17/AF1C60/func_80240500_AF2160.s b/asm/nonmatchings/world/area_kkj/kkj_17/AF1C60/func_80240500_AF2160.s
index 9e50212de9..6631aa0f2f 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_17/AF1C60/func_80240500_AF2160.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_17/AF1C60/func_80240500_AF2160.s
@@ -5,8 +5,8 @@ glabel func_80240500_AF2160
 /* AF2160 80240500 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* AF2164 80240504 0000282D */  daddu     $a1, $zero, $zero
 /* AF2168 80240508 00A0302D */  daddu     $a2, $a1, $zero
-/* AF216C 8024050C 3C038024 */  lui       $v1, 0x8024
-/* AF2170 80240510 2463092C */  addiu     $v1, $v1, 0x92c
+/* AF216C 8024050C 3C038024 */  lui       $v1, %hi(D_8024092C)
+/* AF2170 80240510 2463092C */  addiu     $v1, $v1, %lo(D_8024092C)
 /* AF2174 80240514 AFBF0010 */  sw        $ra, 0x10($sp)
 /* AF2178 80240518 8C840084 */  lw        $a0, 0x84($a0)
 .L8024051C:
diff --git a/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_8024056C_AF320C.s b/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_8024056C_AF320C.s
index 88b46ac5f8..d3a4eeb6c6 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_8024056C_AF320C.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_8024056C_AF320C.s
@@ -6,11 +6,11 @@ glabel func_8024056C_AF320C
 /* AF3210 80240570 AFBF0010 */  sw        $ra, 0x10($sp)
 /* AF3214 80240574 10A00003 */  beqz      $a1, .L80240584
 /* AF3218 80240578 8C86000C */   lw       $a2, 0xc($a0)
-/* AF321C 8024057C 3C018024 */  lui       $at, 0x8024
-/* AF3220 80240580 AC201F10 */  sw        $zero, 0x1f10($at)
+/* AF321C 8024057C 3C018024 */  lui       $at, %hi(D_80241F10)
+/* AF3220 80240580 AC201F10 */  sw        $zero, %lo(D_80241F10)($at)
 .L80240584:
-/* AF3224 80240584 3C038024 */  lui       $v1, 0x8024
-/* AF3228 80240588 24631F10 */  addiu     $v1, $v1, 0x1f10
+/* AF3224 80240584 3C038024 */  lui       $v1, %hi(D_80241F10)
+/* AF3228 80240588 24631F10 */  addiu     $v1, $v1, %lo(D_80241F10)
 /* AF322C 8024058C 8C620000 */  lw        $v0, ($v1)
 /* AF3230 80240590 54400003 */  bnel      $v0, $zero, .L802405A0
 /* AF3234 80240594 AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_8024056C_AF320C
 /* AF323C 8024059C 0000102D */   daddu    $v0, $zero, $zero
 .L802405A0:
 /* AF3240 802405A0 8CC50000 */  lw        $a1, ($a2)
-/* AF3244 802405A4 3C068024 */  lui       $a2, 0x8024
+/* AF3244 802405A4 3C068024 */  lui       $a2, %hi(D_80241F14)
 /* AF3248 802405A8 0C0B2026 */  jal       set_variable
-/* AF324C 802405AC 8CC61F14 */   lw       $a2, 0x1f14($a2)
+/* AF324C 802405AC 8CC61F14 */   lw       $a2, %lo(D_80241F14)($a2)
 /* AF3250 802405B0 24020002 */  addiu     $v0, $zero, 2
 .L802405B4:
 /* AF3254 802405B4 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_802405C0_AF3260.s b/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_802405C0_AF3260.s
index aeda168184..ec9c3b57a6 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_802405C0_AF3260.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_802405C0_AF3260.s
@@ -7,12 +7,12 @@ glabel func_802405C0_AF3260
 /* AF3268 802405C8 8C82000C */  lw        $v0, 0xc($a0)
 /* AF326C 802405CC 0C0B1EAF */  jal       get_variable
 /* AF3270 802405D0 8C450000 */   lw       $a1, ($v0)
-/* AF3274 802405D4 3C018024 */  lui       $at, 0x8024
-/* AF3278 802405D8 AC221F14 */  sw        $v0, 0x1f14($at)
+/* AF3274 802405D4 3C018024 */  lui       $at, %hi(D_80241F14)
+/* AF3278 802405D8 AC221F14 */  sw        $v0, %lo(D_80241F14)($at)
 /* AF327C 802405DC 24020002 */  addiu     $v0, $zero, 2
 /* AF3280 802405E0 8FBF0010 */  lw        $ra, 0x10($sp)
 /* AF3284 802405E4 24030001 */  addiu     $v1, $zero, 1
-/* AF3288 802405E8 3C018024 */  lui       $at, 0x8024
-/* AF328C 802405EC AC231F10 */  sw        $v1, 0x1f10($at)
+/* AF3288 802405E8 3C018024 */  lui       $at, %hi(D_80241F10)
+/* AF328C 802405EC AC231F10 */  sw        $v1, %lo(D_80241F10)($at)
 /* AF3290 802405F0 03E00008 */  jr        $ra
 /* AF3294 802405F4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_802405F8_AF3298.s b/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_802405F8_AF3298.s
index e016b97610..73d918412a 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_802405F8_AF3298.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_802405F8_AF3298.s
@@ -13,8 +13,8 @@ glabel func_802405F8_AF3298
 /* AF32B8 80240618 8C620000 */  lw        $v0, ($v1)
 /* AF32BC 8024061C 5040000A */  beql      $v0, $zero, .L80240648
 /* AF32C0 80240620 00041080 */   sll      $v0, $a0, 2
-/* AF32C4 80240624 3C058024 */  lui       $a1, 0x8024
-/* AF32C8 80240628 24A54CB0 */  addiu     $a1, $a1, 0x4cb0
+/* AF32C4 80240624 3C058024 */  lui       $a1, %hi(D_80244CB0)
+/* AF32C8 80240628 24A54CB0 */  addiu     $a1, $a1, %lo(D_80244CB0)
 .L8024062C:
 /* AF32CC 8024062C 24630004 */  addiu     $v1, $v1, 4
 /* AF32D0 80240630 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_802405F8_AF3298
 /* AF32E0 80240640 24A50004 */   addiu    $a1, $a1, 4
 /* AF32E4 80240644 00041080 */  sll       $v0, $a0, 2
 .L80240648:
-/* AF32E8 80240648 3C018024 */  lui       $at, 0x8024
+/* AF32E8 80240648 3C018024 */  lui       $at, %hi(D_80244CB0)
 /* AF32EC 8024064C 00220821 */  addu      $at, $at, $v0
-/* AF32F0 80240650 AC204CB0 */  sw        $zero, 0x4cb0($at)
+/* AF32F0 80240650 AC204CB0 */  sw        $zero, %lo(D_80244CB0)($at)
 /* AF32F4 80240654 080901A1 */  j         .L80240684
 /* AF32F8 80240658 00000000 */   nop      
 .L8024065C:
-/* AF32FC 8024065C 3C038024 */  lui       $v1, 0x8024
-/* AF3300 80240660 24634CB0 */  addiu     $v1, $v1, 0x4cb0
+/* AF32FC 8024065C 3C038024 */  lui       $v1, %hi(D_80244CB0)
+/* AF3300 80240660 24634CB0 */  addiu     $v1, $v1, %lo(D_80244CB0)
 /* AF3304 80240664 0060282D */  daddu     $a1, $v1, $zero
 .L80240668:
 /* AF3308 80240668 24820010 */  addiu     $v0, $a0, 0x10
diff --git a/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_80240694_AF3334.s b/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_80240694_AF3334.s
index 8dff8f507e..db2ff229b5 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_80240694_AF3334.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_80240694_AF3334.s
@@ -13,8 +13,8 @@ glabel func_80240694_AF3334
 /* AF3354 802406B4 8C620000 */  lw        $v0, ($v1)
 /* AF3358 802406B8 5040000A */  beql      $v0, $zero, .L802406E4
 /* AF335C 802406BC 00041080 */   sll      $v0, $a0, 2
-/* AF3360 802406C0 3C058024 */  lui       $a1, 0x8024
-/* AF3364 802406C4 24A54E78 */  addiu     $a1, $a1, 0x4e78
+/* AF3360 802406C0 3C058024 */  lui       $a1, %hi(D_80244E78)
+/* AF3364 802406C4 24A54E78 */  addiu     $a1, $a1, %lo(D_80244E78)
 .L802406C8:
 /* AF3368 802406C8 24630004 */  addiu     $v1, $v1, 4
 /* AF336C 802406CC 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_80240694_AF3334
 /* AF337C 802406DC 24A50004 */   addiu    $a1, $a1, 4
 /* AF3380 802406E0 00041080 */  sll       $v0, $a0, 2
 .L802406E4:
-/* AF3384 802406E4 3C018024 */  lui       $at, 0x8024
+/* AF3384 802406E4 3C018024 */  lui       $at, %hi(D_80244E78)
 /* AF3388 802406E8 00220821 */  addu      $at, $at, $v0
-/* AF338C 802406EC AC204E78 */  sw        $zero, 0x4e78($at)
+/* AF338C 802406EC AC204E78 */  sw        $zero, %lo(D_80244E78)($at)
 /* AF3390 802406F0 080901C8 */  j         .L80240720
 /* AF3394 802406F4 00000000 */   nop      
 .L802406F8:
-/* AF3398 802406F8 3C038024 */  lui       $v1, 0x8024
-/* AF339C 802406FC 24634E78 */  addiu     $v1, $v1, 0x4e78
+/* AF3398 802406F8 3C038024 */  lui       $v1, %hi(D_80244E78)
+/* AF339C 802406FC 24634E78 */  addiu     $v1, $v1, %lo(D_80244E78)
 /* AF33A0 80240700 0060282D */  daddu     $a1, $v1, $zero
 .L80240704:
 /* AF33A4 80240704 24820080 */  addiu     $v0, $a0, 0x80
diff --git a/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_80240774_AF3414.s b/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_80240774_AF3414.s
index 279ecef40f..beca9d6cbc 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_80240774_AF3414.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_80240774_AF3414.s
@@ -31,8 +31,8 @@ glabel func_80240774_AF3414
 /* AF3478 802407D8 0C019EC8 */  jal       guRotateF
 /* AF347C 802407DC 00C0382D */   daddu    $a3, $a2, $zero
 /* AF3480 802407E0 C6000070 */  lwc1      $f0, 0x70($s0)
-/* AF3484 802407E4 3C018024 */  lui       $at, 0x8024
-/* AF3488 802407E8 D4224CA0 */  ldc1      $f2, 0x4ca0($at)
+/* AF3484 802407E4 3C018024 */  lui       $at, %hi(D_80244CA0)
+/* AF3488 802407E8 D4224CA0 */  ldc1      $f2, %lo(D_80244CA0)($at)
 /* AF348C 802407EC 46000021 */  cvt.d.s   $f0, $f0
 /* AF3490 802407F0 4620103E */  c.le.d    $f2, $f0
 /* AF3494 802407F4 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_80240000_AF7950.s b/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_80240000_AF7950.s
index 81a00ac61f..dca3b0052c 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_80240000_AF7950.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_80240000_AF7950.s
@@ -9,22 +9,22 @@ glabel func_80240000_AF7950
 /* AF7960 80240010 8C450000 */   lw       $a1, ($v0)
 /* AF7964 80240014 0000202D */  daddu     $a0, $zero, $zero
 /* AF7968 80240018 3C05F971 */  lui       $a1, 0xf971
-/* AF796C 8024001C 3C018024 */  lui       $at, 0x8024
-/* AF7970 80240020 AC220E90 */  sw        $v0, 0xe90($at)
+/* AF796C 8024001C 3C018024 */  lui       $at, %hi(D_80240E90)
+/* AF7970 80240020 AC220E90 */  sw        $v0, %lo(D_80240E90)($at)
 /* AF7974 80240024 0C0B1EAF */  jal       get_variable
 /* AF7978 80240028 34A58892 */   ori      $a1, $a1, 0x8892
 /* AF797C 8024002C 0040182D */  daddu     $v1, $v0, $zero
 /* AF7980 80240030 24020001 */  addiu     $v0, $zero, 1
 /* AF7984 80240034 14620006 */  bne       $v1, $v0, .L80240050
 /* AF7988 80240038 24020005 */   addiu    $v0, $zero, 5
-/* AF798C 8024003C 3C018024 */  lui       $at, 0x8024
-/* AF7990 80240040 AC230E88 */  sw        $v1, 0xe88($at)
-/* AF7994 80240044 3C018024 */  lui       $at, 0x8024
+/* AF798C 8024003C 3C018024 */  lui       $at, %hi(D_80240E88)
+/* AF7990 80240040 AC230E88 */  sw        $v1, %lo(D_80240E88)($at)
+/* AF7994 80240044 3C018024 */  lui       $at, %hi(D_80240E8C)
 /* AF7998 80240048 08090016 */  j         .L80240058
-/* AF799C 8024004C AC220E8C */   sw       $v0, 0xe8c($at)
+/* AF799C 8024004C AC220E8C */   sw       $v0, %lo(D_80240E8C)($at)
 .L80240050:
-/* AF79A0 80240050 3C018024 */  lui       $at, 0x8024
-/* AF79A4 80240054 AC200E88 */  sw        $zero, 0xe88($at)
+/* AF79A0 80240050 3C018024 */  lui       $at, %hi(D_80240E88)
+/* AF79A4 80240054 AC200E88 */  sw        $zero, %lo(D_80240E88)($at)
 .L80240058:
 /* AF79A8 80240058 8FBF0010 */  lw        $ra, 0x10($sp)
 /* AF79AC 8024005C 24020002 */  addiu     $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_80240068_AF79B8.s b/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_80240068_AF79B8.s
index a12fae7772..d6ab662ada 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_80240068_AF79B8.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_80240068_AF79B8.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80240068_AF79B8
-/* AF79B8 80240068 3C028024 */  lui       $v0, 0x8024
-/* AF79BC 8024006C 8C420E88 */  lw        $v0, 0xe88($v0)
+/* AF79B8 80240068 3C028024 */  lui       $v0, %hi(D_80240E88)
+/* AF79BC 8024006C 8C420E88 */  lw        $v0, %lo(D_80240E88)($v0)
 /* AF79C0 80240070 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* AF79C4 80240074 AFBF0014 */  sw        $ra, 0x14($sp)
 /* AF79C8 80240078 10400005 */  beqz      $v0, .L80240090
@@ -22,16 +22,16 @@ glabel func_80240068_AF79B8
 /* AF79F4 802400A4 2404000B */  addiu     $a0, $zero, 0xb
 /* AF79F8 802400A8 0C051F9F */  jal       func_80147E7C
 /* AF79FC 802400AC 0200282D */   daddu    $a1, $s0, $zero
-/* AF7A00 802400B0 3C038024 */  lui       $v1, 0x8024
-/* AF7A04 802400B4 24630E8C */  addiu     $v1, $v1, 0xe8c
+/* AF7A00 802400B0 3C038024 */  lui       $v1, %hi(D_80240E8C)
+/* AF7A04 802400B4 24630E8C */  addiu     $v1, $v1, %lo(D_80240E8C)
 /* AF7A08 802400B8 8C620000 */  lw        $v0, ($v1)
 /* AF7A0C 802400BC 18400003 */  blez      $v0, .L802400CC
 /* AF7A10 802400C0 2442FFFF */   addiu    $v0, $v0, -1
 /* AF7A14 802400C4 08090035 */  j         .L802400D4
 /* AF7A18 802400C8 AC620000 */   sw       $v0, ($v1)
 .L802400CC:
-/* AF7A1C 802400CC 3C018024 */  lui       $at, 0x8024
-/* AF7A20 802400D0 AC200E88 */  sw        $zero, 0xe88($at)
+/* AF7A1C 802400CC 3C018024 */  lui       $at, %hi(D_80240E88)
+/* AF7A20 802400D0 AC200E88 */  sw        $zero, %lo(D_80240E88)($at)
 .L802400D4:
 /* AF7A24 802400D4 8FBF0014 */  lw        $ra, 0x14($sp)
 /* AF7A28 802400D8 8FB00010 */  lw        $s0, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_802400E4_AF7A34.s b/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_802400E4_AF7A34.s
index ae3d19fe31..57eec0f9e0 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_802400E4_AF7A34.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_802400E4_AF7A34.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_802400E4_AF7A34
-/* AF7A34 802400E4 3C038024 */  lui       $v1, 0x8024
-/* AF7A38 802400E8 8C630E90 */  lw        $v1, 0xe90($v1)
+/* AF7A34 802400E4 3C038024 */  lui       $v1, %hi(D_80240E90)
+/* AF7A38 802400E8 8C630E90 */  lw        $v1, %lo(D_80240E90)($v1)
 /* AF7A3C 802400EC 27BDFFD8 */  addiu     $sp, $sp, -0x28
 /* AF7A40 802400F0 AFB1001C */  sw        $s1, 0x1c($sp)
 /* AF7A44 802400F4 00A0882D */  daddu     $s1, $a1, $zero
@@ -14,9 +14,9 @@ glabel func_802400E4_AF7A34
 /* AF7A58 80240108 00031040 */  sll       $v0, $v1, 1
 /* AF7A5C 8024010C 00431021 */  addu      $v0, $v0, $v1
 /* AF7A60 80240110 00021080 */  sll       $v0, $v0, 2
-/* AF7A64 80240114 3C108024 */  lui       $s0, 0x8024
+/* AF7A64 80240114 3C108024 */  lui       $s0, %hi(D_80240E10)
 /* AF7A68 80240118 02028021 */  addu      $s0, $s0, $v0
-/* AF7A6C 8024011C 8E100E10 */  lw        $s0, 0xe10($s0)
+/* AF7A6C 8024011C 8E100E10 */  lw        $s0, %lo(D_80240E10)($s0)
 /* AF7A70 80240120 3C028008 */  lui       $v0, %hi(gItemTable)
 /* AF7A74 80240124 244278E0 */  addiu     $v0, $v0, %lo(gItemTable)
 /* AF7A78 80240128 00108140 */  sll       $s0, $s0, 5
diff --git a/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_80240178_AF7AC8.s b/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_80240178_AF7AC8.s
index 7b7ab18ccb..c4b101280e 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_80240178_AF7AC8.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_80240178_AF7AC8.s
@@ -3,10 +3,10 @@
 
 glabel func_80240178_AF7AC8
 /* AF7AC8 80240178 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* AF7ACC 8024017C 3C038024 */  lui       $v1, 0x8024
-/* AF7AD0 80240180 8C630E90 */  lw        $v1, 0xe90($v1)
-/* AF7AD4 80240184 3C048024 */  lui       $a0, 0x8024
-/* AF7AD8 80240188 24840E10 */  addiu     $a0, $a0, 0xe10
+/* AF7ACC 8024017C 3C038024 */  lui       $v1, %hi(D_80240E90)
+/* AF7AD0 80240180 8C630E90 */  lw        $v1, %lo(D_80240E90)($v1)
+/* AF7AD4 80240184 3C048024 */  lui       $a0, %hi(D_80240E10)
+/* AF7AD8 80240188 24840E10 */  addiu     $a0, $a0, %lo(D_80240E10)
 /* AF7ADC 8024018C AFBF0018 */  sw        $ra, 0x18($sp)
 /* AF7AE0 80240190 00031040 */  sll       $v0, $v1, 1
 /* AF7AE4 80240194 00431021 */  addu      $v0, $v0, $v1
diff --git a/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_802401FC_AF7B4C.s b/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_802401FC_AF7B4C.s
index 4c1bfca704..98ff3dbb36 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_802401FC_AF7B4C.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_802401FC_AF7B4C.s
@@ -3,33 +3,33 @@
 
 glabel func_802401FC_AF7B4C
 /* AF7B4C 802401FC 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* AF7B50 80240200 3C048024 */  lui       $a0, 0x8024
-/* AF7B54 80240204 24840068 */  addiu     $a0, $a0, 0x68
+/* AF7B50 80240200 3C048024 */  lui       $a0, %hi(D_80240068)
+/* AF7B54 80240204 24840068 */  addiu     $a0, $a0, %lo(D_80240068)
 /* AF7B58 80240208 AFBF0024 */  sw        $ra, 0x24($sp)
 /* AF7B5C 8024020C AFB20020 */  sw        $s2, 0x20($sp)
 /* AF7B60 80240210 AFB1001C */  sw        $s1, 0x1c($sp)
 /* AF7B64 80240214 AFB00018 */  sw        $s0, 0x18($sp)
-/* AF7B68 80240218 3C018024 */  lui       $at, 0x8024
-/* AF7B6C 8024021C AC200E88 */  sw        $zero, 0xe88($at)
-/* AF7B70 80240220 3C018024 */  lui       $at, 0x8024
-/* AF7B74 80240224 AC200E8C */  sw        $zero, 0xe8c($at)
-/* AF7B78 80240228 3C018024 */  lui       $at, 0x8024
-/* AF7B7C 8024022C AC200E90 */  sw        $zero, 0xe90($at)
+/* AF7B68 80240218 3C018024 */  lui       $at, %hi(D_80240E88)
+/* AF7B6C 8024021C AC200E88 */  sw        $zero, %lo(D_80240E88)($at)
+/* AF7B70 80240220 3C018024 */  lui       $at, %hi(D_80240E8C)
+/* AF7B74 80240224 AC200E8C */  sw        $zero, %lo(D_80240E8C)($at)
+/* AF7B78 80240228 3C018024 */  lui       $at, %hi(D_80240E90)
+/* AF7B7C 8024022C AC200E90 */  sw        $zero, %lo(D_80240E90)($at)
 /* AF7B80 80240230 0C048C8F */  jal       bind_dynamic_entity_7
 /* AF7B84 80240234 0000282D */   daddu    $a1, $zero, $zero
 /* AF7B88 80240238 0C048D8F */  jal       get_dynamic_entity
 /* AF7B8C 8024023C 0040202D */   daddu    $a0, $v0, $zero
-/* AF7B90 80240240 3C048024 */  lui       $a0, 0x8024
-/* AF7B94 80240244 24840EF0 */  addiu     $a0, $a0, 0xef0
+/* AF7B90 80240240 3C048024 */  lui       $a0, %hi(D_80240EF0)
+/* AF7B94 80240244 24840EF0 */  addiu     $a0, $a0, %lo(D_80240EF0)
 /* AF7B98 80240248 0C051FCC */  jal       func_80147F30
 /* AF7B9C 8024024C 24050002 */   addiu    $a1, $zero, 2
 /* AF7BA0 80240250 0000802D */  daddu     $s0, $zero, $zero
 /* AF7BA4 80240254 24120003 */  addiu     $s2, $zero, 3
-/* AF7BA8 80240258 3C118024 */  lui       $s1, 0x8024
-/* AF7BAC 8024025C 26310E10 */  addiu     $s1, $s1, 0xe10
+/* AF7BA8 80240258 3C118024 */  lui       $s1, %hi(D_80240E10)
+/* AF7BAC 8024025C 26310E10 */  addiu     $s1, $s1, %lo(D_80240E10)
 .L80240260:
-/* AF7BB0 80240260 3C048024 */  lui       $a0, 0x8024
-/* AF7BB4 80240264 24840E94 */  addiu     $a0, $a0, 0xe94
+/* AF7BB0 80240260 3C048024 */  lui       $a0, %hi(D_80240E94)
+/* AF7BB4 80240264 24840E94 */  addiu     $a0, $a0, %lo(D_80240E94)
 /* AF7BB8 80240268 24050080 */  addiu     $a1, $zero, 0x80
 /* AF7BBC 8024026C AFA00010 */  sw        $zero, 0x10($sp)
 /* AF7BC0 80240270 AFB20014 */  sw        $s2, 0x14($sp)
diff --git a/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_802404DC_AF7E2C.s b/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_802404DC_AF7E2C.s
index 07fc32e928..574bb7b45b 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_802404DC_AF7E2C.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_802404DC_AF7E2C.s
@@ -6,11 +6,11 @@ glabel func_802404DC_AF7E2C
 /* AF7E30 802404E0 AFBF0010 */  sw        $ra, 0x10($sp)
 /* AF7E34 802404E4 10A00003 */  beqz      $a1, .L802404F4
 /* AF7E38 802404E8 8C86000C */   lw       $a2, 0xc($a0)
-/* AF7E3C 802404EC 3C018024 */  lui       $at, 0x8024
-/* AF7E40 802404F0 AC201B10 */  sw        $zero, 0x1b10($at)
+/* AF7E3C 802404EC 3C018024 */  lui       $at, %hi(D_80241B10)
+/* AF7E40 802404F0 AC201B10 */  sw        $zero, %lo(D_80241B10)($at)
 .L802404F4:
-/* AF7E44 802404F4 3C038024 */  lui       $v1, 0x8024
-/* AF7E48 802404F8 24631B10 */  addiu     $v1, $v1, 0x1b10
+/* AF7E44 802404F4 3C038024 */  lui       $v1, %hi(D_80241B10)
+/* AF7E48 802404F8 24631B10 */  addiu     $v1, $v1, %lo(D_80241B10)
 /* AF7E4C 802404FC 8C620000 */  lw        $v0, ($v1)
 /* AF7E50 80240500 54400003 */  bnel      $v0, $zero, .L80240510
 /* AF7E54 80240504 AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_802404DC_AF7E2C
 /* AF7E5C 8024050C 0000102D */   daddu    $v0, $zero, $zero
 .L80240510:
 /* AF7E60 80240510 8CC50000 */  lw        $a1, ($a2)
-/* AF7E64 80240514 3C068024 */  lui       $a2, 0x8024
+/* AF7E64 80240514 3C068024 */  lui       $a2, %hi(D_80241B14)
 /* AF7E68 80240518 0C0B2026 */  jal       set_variable
-/* AF7E6C 8024051C 8CC61B14 */   lw       $a2, 0x1b14($a2)
+/* AF7E6C 8024051C 8CC61B14 */   lw       $a2, %lo(D_80241B14)($a2)
 /* AF7E70 80240520 24020002 */  addiu     $v0, $zero, 2
 .L80240524:
 /* AF7E74 80240524 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240530_AF7E80.s b/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240530_AF7E80.s
index d4f85a4ff5..ea7806f04f 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240530_AF7E80.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240530_AF7E80.s
@@ -7,12 +7,12 @@ glabel func_80240530_AF7E80
 /* AF7E88 80240538 8C82000C */  lw        $v0, 0xc($a0)
 /* AF7E8C 8024053C 0C0B1EAF */  jal       get_variable
 /* AF7E90 80240540 8C450000 */   lw       $a1, ($v0)
-/* AF7E94 80240544 3C018024 */  lui       $at, 0x8024
-/* AF7E98 80240548 AC221B14 */  sw        $v0, 0x1b14($at)
+/* AF7E94 80240544 3C018024 */  lui       $at, %hi(D_80241B14)
+/* AF7E98 80240548 AC221B14 */  sw        $v0, %lo(D_80241B14)($at)
 /* AF7E9C 8024054C 24020002 */  addiu     $v0, $zero, 2
 /* AF7EA0 80240550 8FBF0010 */  lw        $ra, 0x10($sp)
 /* AF7EA4 80240554 24030001 */  addiu     $v1, $zero, 1
-/* AF7EA8 80240558 3C018024 */  lui       $at, 0x8024
-/* AF7EAC 8024055C AC231B10 */  sw        $v1, 0x1b10($at)
+/* AF7EA8 80240558 3C018024 */  lui       $at, %hi(D_80241B10)
+/* AF7EAC 8024055C AC231B10 */  sw        $v1, %lo(D_80241B10)($at)
 /* AF7EB0 80240560 03E00008 */  jr        $ra
 /* AF7EB4 80240564 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240568_AF7EB8.s b/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240568_AF7EB8.s
index 7a38562025..1638302fcf 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240568_AF7EB8.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240568_AF7EB8.s
@@ -13,8 +13,8 @@ glabel func_80240568_AF7EB8
 /* AF7ED8 80240588 8C620000 */  lw        $v0, ($v1)
 /* AF7EDC 8024058C 5040000A */  beql      $v0, $zero, .L802405B8
 /* AF7EE0 80240590 00041080 */   sll      $v0, $a0, 2
-/* AF7EE4 80240594 3C058024 */  lui       $a1, 0x8024
-/* AF7EE8 80240598 24A561F0 */  addiu     $a1, $a1, 0x61f0
+/* AF7EE4 80240594 3C058024 */  lui       $a1, %hi(D_802461F0)
+/* AF7EE8 80240598 24A561F0 */  addiu     $a1, $a1, %lo(D_802461F0)
 .L8024059C:
 /* AF7EEC 8024059C 24630004 */  addiu     $v1, $v1, 4
 /* AF7EF0 802405A0 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_80240568_AF7EB8
 /* AF7F00 802405B0 24A50004 */   addiu    $a1, $a1, 4
 /* AF7F04 802405B4 00041080 */  sll       $v0, $a0, 2
 .L802405B8:
-/* AF7F08 802405B8 3C018024 */  lui       $at, 0x8024
+/* AF7F08 802405B8 3C018024 */  lui       $at, %hi(D_802461F0)
 /* AF7F0C 802405BC 00220821 */  addu      $at, $at, $v0
-/* AF7F10 802405C0 AC2061F0 */  sw        $zero, 0x61f0($at)
+/* AF7F10 802405C0 AC2061F0 */  sw        $zero, %lo(D_802461F0)($at)
 /* AF7F14 802405C4 0809017D */  j         .L802405F4
 /* AF7F18 802405C8 00000000 */   nop      
 .L802405CC:
-/* AF7F1C 802405CC 3C038024 */  lui       $v1, 0x8024
-/* AF7F20 802405D0 246361F0 */  addiu     $v1, $v1, 0x61f0
+/* AF7F1C 802405CC 3C038024 */  lui       $v1, %hi(D_802461F0)
+/* AF7F20 802405D0 246361F0 */  addiu     $v1, $v1, %lo(D_802461F0)
 /* AF7F24 802405D4 0060282D */  daddu     $a1, $v1, $zero
 .L802405D8:
 /* AF7F28 802405D8 24820010 */  addiu     $v0, $a0, 0x10
diff --git a/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240604_AF7F54.s b/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240604_AF7F54.s
index cfd332c8df..7609f21187 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240604_AF7F54.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240604_AF7F54.s
@@ -13,8 +13,8 @@ glabel func_80240604_AF7F54
 /* AF7F74 80240624 8C620000 */  lw        $v0, ($v1)
 /* AF7F78 80240628 5040000A */  beql      $v0, $zero, .L80240654
 /* AF7F7C 8024062C 00041080 */   sll      $v0, $a0, 2
-/* AF7F80 80240630 3C058024 */  lui       $a1, 0x8024
-/* AF7F84 80240634 24A563B8 */  addiu     $a1, $a1, 0x63b8
+/* AF7F80 80240630 3C058024 */  lui       $a1, %hi(D_802463B8)
+/* AF7F84 80240634 24A563B8 */  addiu     $a1, $a1, %lo(D_802463B8)
 .L80240638:
 /* AF7F88 80240638 24630004 */  addiu     $v1, $v1, 4
 /* AF7F8C 8024063C 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_80240604_AF7F54
 /* AF7F9C 8024064C 24A50004 */   addiu    $a1, $a1, 4
 /* AF7FA0 80240650 00041080 */  sll       $v0, $a0, 2
 .L80240654:
-/* AF7FA4 80240654 3C018024 */  lui       $at, 0x8024
+/* AF7FA4 80240654 3C018024 */  lui       $at, %hi(D_802463B8)
 /* AF7FA8 80240658 00220821 */  addu      $at, $at, $v0
-/* AF7FAC 8024065C AC2063B8 */  sw        $zero, 0x63b8($at)
+/* AF7FAC 8024065C AC2063B8 */  sw        $zero, %lo(D_802463B8)($at)
 /* AF7FB0 80240660 080901A4 */  j         .L80240690
 /* AF7FB4 80240664 00000000 */   nop      
 .L80240668:
-/* AF7FB8 80240668 3C038024 */  lui       $v1, 0x8024
-/* AF7FBC 8024066C 246363B8 */  addiu     $v1, $v1, 0x63b8
+/* AF7FB8 80240668 3C038024 */  lui       $v1, %hi(D_802463B8)
+/* AF7FBC 8024066C 246363B8 */  addiu     $v1, $v1, %lo(D_802463B8)
 /* AF7FC0 80240670 0060282D */  daddu     $a1, $v1, $zero
 .L80240674:
 /* AF7FC4 80240674 24820080 */  addiu     $v0, $a0, 0x80
diff --git a/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_802406A0_AF7FF0.s b/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_802406A0_AF7FF0.s
index a74a38c985..08d98e9584 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_802406A0_AF7FF0.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_802406A0_AF7FF0.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_802406A0_AF7FF0
-/* AF7FF0 802406A0 3C048024 */  lui       $a0, 0x8024
-/* AF7FF4 802406A4 8C846568 */  lw        $a0, 0x6568($a0)
+/* AF7FF0 802406A0 3C048024 */  lui       $a0, %hi(D_80246568)
+/* AF7FF4 802406A4 8C846568 */  lw        $a0, %lo(D_80246568)($a0)
 /* AF7FF8 802406A8 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* AF7FFC 802406AC AFBF0010 */  sw        $ra, 0x10($sp)
 /* AF8000 802406B0 0C0511EA */  jal       draw_icon_0
diff --git a/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_802406C4_AF8014.s b/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_802406C4_AF8014.s
index b6365606f2..ebd81b9b32 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_802406C4_AF8014.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_802406C4_AF8014.s
@@ -13,47 +13,47 @@ glabel func_802406C4_AF8014
 /* AF8034 802406E4 AFB00010 */  sw        $s0, 0x10($sp)
 /* AF8038 802406E8 10A00003 */  beqz      $a1, .L802406F8
 /* AF803C 802406EC 8EA6000C */   lw       $a2, 0xc($s5)
-/* AF8040 802406F0 3C018024 */  lui       $at, 0x8024
-/* AF8044 802406F4 AC206558 */  sw        $zero, 0x6558($at)
+/* AF8040 802406F0 3C018024 */  lui       $at, %hi(D_80246558)
+/* AF8044 802406F4 AC206558 */  sw        $zero, %lo(D_80246558)($at)
 .L802406F8:
-/* AF8048 802406F8 3C038024 */  lui       $v1, 0x8024
-/* AF804C 802406FC 8C636558 */  lw        $v1, 0x6558($v1)
+/* AF8048 802406F8 3C038024 */  lui       $v1, %hi(D_80246558)
+/* AF804C 802406FC 8C636558 */  lw        $v1, %lo(D_80246558)($v1)
 /* AF8050 80240700 2C62000D */  sltiu     $v0, $v1, 0xd
 /* AF8054 80240704 104000F1 */  beqz      $v0, .L80240ACC
 /* AF8058 80240708 00031080 */   sll      $v0, $v1, 2
-/* AF805C 8024070C 3C018024 */  lui       $at, 0x8024
+/* AF805C 8024070C 3C018024 */  lui       $at, %hi(D_802461B0)
 /* AF8060 80240710 00220821 */  addu      $at, $at, $v0
-/* AF8064 80240714 8C2261B0 */  lw        $v0, 0x61b0($at)
+/* AF8064 80240714 8C2261B0 */  lw        $v0, %lo(D_802461B0)($at)
 /* AF8068 80240718 00400008 */  jr        $v0
 /* AF806C 8024071C 00000000 */   nop      
 /* AF8070 80240720 02A0202D */  daddu     $a0, $s5, $zero
 /* AF8074 80240724 8CC50000 */  lw        $a1, ($a2)
 /* AF8078 80240728 0C0B1EAF */  jal       get_variable
 /* AF807C 8024072C 24140009 */   addiu    $s4, $zero, 9
-/* AF8080 80240730 3C058024 */  lui       $a1, 0x8024
-/* AF8084 80240734 24A506A0 */  addiu     $a1, $a1, 0x6a0
-/* AF8088 80240738 3C018024 */  lui       $at, 0x8024
-/* AF808C 8024073C AC226534 */  sw        $v0, 0x6534($at)
+/* AF8080 80240730 3C058024 */  lui       $a1, %hi(D_802406A0)
+/* AF8084 80240734 24A506A0 */  addiu     $a1, $a1, %lo(D_802406A0)
+/* AF8088 80240738 3C018024 */  lui       $at, %hi(D_80246534)
+/* AF808C 8024073C AC226534 */  sw        $v0, %lo(D_80246534)($at)
 /* AF8090 80240740 0C048C8F */  jal       bind_dynamic_entity_7
 /* AF8094 80240744 0000202D */   daddu    $a0, $zero, $zero
-/* AF8098 80240748 3C038024 */  lui       $v1, 0x8024
-/* AF809C 8024074C 2463659C */  addiu     $v1, $v1, 0x659c
-/* AF80A0 80240750 3C018024 */  lui       $at, 0x8024
-/* AF80A4 80240754 AC226554 */  sw        $v0, 0x6554($at)
-/* AF80A8 80240758 3C018024 */  lui       $at, 0x8024
-/* AF80AC 8024075C AC206528 */  sw        $zero, 0x6528($at)
-/* AF80B0 80240760 3C018024 */  lui       $at, 0x8024
-/* AF80B4 80240764 AC206530 */  sw        $zero, 0x6530($at)
+/* AF8098 80240748 3C038024 */  lui       $v1, %hi(D_8024659C)
+/* AF809C 8024074C 2463659C */  addiu     $v1, $v1, %lo(D_8024659C)
+/* AF80A0 80240750 3C018024 */  lui       $at, %hi(D_80246554)
+/* AF80A4 80240754 AC226554 */  sw        $v0, %lo(D_80246554)($at)
+/* AF80A8 80240758 3C018024 */  lui       $at, %hi(D_80246528)
+/* AF80AC 8024075C AC206528 */  sw        $zero, %lo(D_80246528)($at)
+/* AF80B0 80240760 3C018024 */  lui       $at, %hi(D_80246530)
+/* AF80B4 80240764 AC206530 */  sw        $zero, %lo(D_80246530)($at)
 .L80240768:
 /* AF80B8 80240768 AC600000 */  sw        $zero, ($v1)
 /* AF80BC 8024076C 2694FFFF */  addiu     $s4, $s4, -1
 /* AF80C0 80240770 0681FFFD */  bgez      $s4, .L80240768
 /* AF80C4 80240774 2463FFFC */   addiu    $v1, $v1, -4
 /* AF80C8 80240778 2414000A */  addiu     $s4, $zero, 0xa
-/* AF80CC 8024077C 3C048011 */  lui       $a0, 0x8011
-/* AF80D0 80240780 24848B28 */  addiu     $a0, $a0, -0x74d8
-/* AF80D4 80240784 3C038024 */  lui       $v1, 0x8024
-/* AF80D8 80240788 24636538 */  addiu     $v1, $v1, 0x6538
+/* AF80CC 8024077C 3C048011 */  lui       $a0, %hi(D_80108B28)
+/* AF80D0 80240780 24848B28 */  addiu     $a0, $a0, %lo(D_80108B28)
+/* AF80D4 80240784 3C038024 */  lui       $v1, %hi(D_80246538)
+/* AF80D8 80240788 24636538 */  addiu     $v1, $v1, %lo(D_80246538)
 /* AF80DC 8024078C 2402000C */  addiu     $v0, $zero, 0xc
 /* AF80E0 80240790 AC620004 */  sw        $v0, 4($v1)
 /* AF80E4 80240794 24020018 */  addiu     $v0, $zero, 0x18
@@ -65,15 +65,15 @@ glabel func_802406C4_AF8014
 /* AF80FC 802407AC 2402003C */  addiu     $v0, $zero, 0x3c
 /* AF8100 802407B0 AC620014 */  sw        $v0, 0x14($v1)
 /* AF8104 802407B4 24020005 */  addiu     $v0, $zero, 5
-/* AF8108 802407B8 3C118024 */  lui       $s1, 0x8024
-/* AF810C 802407BC 2631655C */  addiu     $s1, $s1, 0x655c
-/* AF8110 802407C0 3C018024 */  lui       $at, 0x8024
-/* AF8114 802407C4 AC226550 */  sw        $v0, 0x6550($at)
+/* AF8108 802407B8 3C118024 */  lui       $s1, %hi(D_8024655C)
+/* AF810C 802407BC 2631655C */  addiu     $s1, $s1, %lo(D_8024655C)
+/* AF8110 802407C0 3C018024 */  lui       $at, %hi(D_80246550)
+/* AF8114 802407C4 AC226550 */  sw        $v0, %lo(D_80246550)($at)
 /* AF8118 802407C8 2402FFD0 */  addiu     $v0, $zero, -0x30
-/* AF811C 802407CC 3C108024 */  lui       $s0, 0x8024
-/* AF8120 802407D0 26106560 */  addiu     $s0, $s0, 0x6560
-/* AF8124 802407D4 3C018024 */  lui       $at, 0x8024
-/* AF8128 802407D8 AC2065A0 */  sw        $zero, 0x65a0($at)
+/* AF811C 802407CC 3C108024 */  lui       $s0, %hi(D_80246560)
+/* AF8120 802407D0 26106560 */  addiu     $s0, $s0, %lo(D_80246560)
+/* AF8124 802407D4 3C018024 */  lui       $at, %hi(D_802465A0)
+/* AF8128 802407D8 AC2065A0 */  sw        $zero, %lo(D_802465A0)($at)
 /* AF812C 802407DC AC600000 */  sw        $zero, ($v1)
 /* AF8130 802407E0 AE220000 */  sw        $v0, ($s1)
 /* AF8134 802407E4 24020040 */  addiu     $v0, $zero, 0x40
@@ -83,8 +83,8 @@ glabel func_802406C4_AF8014
 /* AF8144 802407F4 0260202D */  daddu     $a0, $s3, $zero
 /* AF8148 802407F8 8E250000 */  lw        $a1, ($s1)
 /* AF814C 802407FC 8E060000 */  lw        $a2, ($s0)
-/* AF8150 80240800 3C128024 */  lui       $s2, 0x8024
-/* AF8154 80240804 26526568 */  addiu     $s2, $s2, 0x6568
+/* AF8150 80240800 3C128024 */  lui       $s2, %hi(D_80246568)
+/* AF8154 80240804 26526568 */  addiu     $s2, $s2, %lo(D_80246568)
 /* AF8158 80240808 0C051261 */  jal       set_icon_render_pos
 /* AF815C 8024080C AE530000 */   sw       $s3, ($s2)
 /* AF8160 80240810 0260202D */  daddu     $a0, $s3, $zero
@@ -93,8 +93,8 @@ glabel func_802406C4_AF8014
 /* AF816C 8024081C 0260202D */  daddu     $a0, $s3, $zero
 /* AF8170 80240820 0C051280 */  jal       set_icon_flags
 /* AF8174 80240824 24050082 */   addiu    $a1, $zero, 0x82
-/* AF8178 80240828 3C048011 */  lui       $a0, 0x8011
-/* AF817C 8024082C 24848AFC */  addiu     $a0, $a0, -0x7504
+/* AF8178 80240828 3C048011 */  lui       $a0, %hi(D_80108AFC)
+/* AF817C 8024082C 24848AFC */  addiu     $a0, $a0, %lo(D_80108AFC)
 /* AF8180 80240830 0C050529 */  jal       create_icon
 /* AF8184 80240834 00000000 */   nop      
 /* AF8188 80240838 0040982D */  daddu     $s3, $v0, $zero
@@ -125,12 +125,12 @@ glabel func_802406C4_AF8014
 /* AF81EC 8024089C 0C05128B */  jal       clear_icon_flags
 /* AF81F0 802408A0 24050002 */   addiu    $a1, $zero, 2
 /* AF81F4 802408A4 24020001 */  addiu     $v0, $zero, 1
-/* AF81F8 802408A8 3C018024 */  lui       $at, 0x8024
-/* AF81FC 802408AC AC226558 */  sw        $v0, 0x6558($at)
+/* AF81F8 802408A8 3C018024 */  lui       $at, %hi(D_80246558)
+/* AF81FC 802408AC AC226558 */  sw        $v0, %lo(D_80246558)($at)
 /* AF8200 802408B0 080902B3 */  j         .L80240ACC
 /* AF8204 802408B4 AEB40070 */   sw       $s4, 0x70($s5)
-/* AF8208 802408B8 3C128024 */  lui       $s2, 0x8024
-/* AF820C 802408BC 2652655C */  addiu     $s2, $s2, 0x655c
+/* AF8208 802408B8 3C128024 */  lui       $s2, %hi(D_8024655C)
+/* AF820C 802408BC 2652655C */  addiu     $s2, $s2, %lo(D_8024655C)
 /* AF8210 802408C0 8E420000 */  lw        $v0, ($s2)
 /* AF8214 802408C4 24420014 */  addiu     $v0, $v0, 0x14
 /* AF8218 802408C8 AE420000 */  sw        $v0, ($s2)
@@ -139,10 +139,10 @@ glabel func_802406C4_AF8014
 /* AF8224 802408D4 24020032 */   addiu    $v0, $zero, 0x32
 /* AF8228 802408D8 AE420000 */  sw        $v0, ($s2)
 .L802408DC:
-/* AF822C 802408DC 3C118024 */  lui       $s1, 0x8024
-/* AF8230 802408E0 26316568 */  addiu     $s1, $s1, 0x6568
-/* AF8234 802408E4 3C108024 */  lui       $s0, 0x8024
-/* AF8238 802408E8 26106560 */  addiu     $s0, $s0, 0x6560
+/* AF822C 802408DC 3C118024 */  lui       $s1, %hi(D_80246568)
+/* AF8230 802408E0 26316568 */  addiu     $s1, $s1, %lo(D_80246568)
+/* AF8234 802408E4 3C108024 */  lui       $s0, %hi(D_80246560)
+/* AF8238 802408E8 26106560 */  addiu     $s0, $s0, %lo(D_80246560)
 /* AF823C 802408EC 8E240000 */  lw        $a0, ($s1)
 /* AF8240 802408F0 8E450000 */  lw        $a1, ($s2)
 /* AF8244 802408F4 0C051261 */  jal       set_icon_render_pos
@@ -159,50 +159,50 @@ glabel func_802406C4_AF8014
 /* AF8270 80240920 AEA20070 */   sw       $v0, 0x70($s5)
 .L80240924:
 /* AF8274 80240924 2402000A */  addiu     $v0, $zero, 0xa
-/* AF8278 80240928 3C018024 */  lui       $at, 0x8024
-/* AF827C 8024092C AC226558 */  sw        $v0, 0x6558($at)
+/* AF8278 80240928 3C018024 */  lui       $at, %hi(D_80246558)
+/* AF827C 8024092C AC226558 */  sw        $v0, %lo(D_80246558)($at)
 /* AF8280 80240930 080902B3 */  j         .L80240ACC
 /* AF8284 80240934 00000000 */   nop      
-/* AF8288 80240938 3C048024 */  lui       $a0, 0x8024
-/* AF828C 8024093C 8C846568 */  lw        $a0, 0x6568($a0)
-/* AF8290 80240940 3C058011 */  lui       $a1, 0x8011
-/* AF8294 80240944 24A58B80 */  addiu     $a1, $a1, -0x7480
+/* AF8288 80240938 3C048024 */  lui       $a0, %hi(D_80246568)
+/* AF828C 8024093C 8C846568 */  lw        $a0, %lo(D_80246568)($a0)
+/* AF8290 80240940 3C058011 */  lui       $a1, %hi(D_80108B80)
+/* AF8294 80240944 24A58B80 */  addiu     $a1, $a1, %lo(D_80108B80)
 /* AF8298 80240948 0C0511FF */  jal       set_menu_icon_script
 /* AF829C 8024094C 00000000 */   nop      
 /* AF82A0 80240950 2402000B */  addiu     $v0, $zero, 0xb
-/* AF82A4 80240954 3C018024 */  lui       $at, 0x8024
-/* AF82A8 80240958 AC206528 */  sw        $zero, 0x6528($at)
-/* AF82AC 8024095C 3C018024 */  lui       $at, 0x8024
-/* AF82B0 80240960 AC20652C */  sw        $zero, 0x652c($at)
-/* AF82B4 80240964 3C018024 */  lui       $at, 0x8024
-/* AF82B8 80240968 AC226558 */  sw        $v0, 0x6558($at)
-/* AF82BC 8024096C 3C038024 */  lui       $v1, 0x8024
-/* AF82C0 80240970 8C636550 */  lw        $v1, 0x6550($v1)
+/* AF82A4 80240954 3C018024 */  lui       $at, %hi(D_80246528)
+/* AF82A8 80240958 AC206528 */  sw        $zero, %lo(D_80246528)($at)
+/* AF82AC 8024095C 3C018024 */  lui       $at, %hi(D_8024652C)
+/* AF82B0 80240960 AC20652C */  sw        $zero, %lo(D_8024652C)($at)
+/* AF82B4 80240964 3C018024 */  lui       $at, %hi(D_80246558)
+/* AF82B8 80240968 AC226558 */  sw        $v0, %lo(D_80246558)($at)
+/* AF82BC 8024096C 3C038024 */  lui       $v1, %hi(D_80246550)
+/* AF82C0 80240970 8C636550 */  lw        $v1, %lo(D_80246550)($v1)
 /* AF82C4 80240974 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
 /* AF82C8 80240978 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
 /* AF82CC 8024097C 00031880 */  sll       $v1, $v1, 2
 /* AF82D0 80240980 8C420010 */  lw        $v0, 0x10($v0)
-/* AF82D4 80240984 3C048024 */  lui       $a0, 0x8024
+/* AF82D4 80240984 3C048024 */  lui       $a0, %hi(D_80246538)
 /* AF82D8 80240988 00832021 */  addu      $a0, $a0, $v1
-/* AF82DC 8024098C 8C846538 */  lw        $a0, 0x6538($a0)
+/* AF82DC 8024098C 8C846538 */  lw        $a0, %lo(D_80246538)($a0)
 /* AF82E0 80240990 30428000 */  andi      $v0, $v0, 0x8000
 /* AF82E4 80240994 10400006 */  beqz      $v0, .L802409B0
 /* AF82E8 80240998 00000000 */   nop      
-/* AF82EC 8024099C 3C038024 */  lui       $v1, 0x8024
-/* AF82F0 802409A0 24636528 */  addiu     $v1, $v1, 0x6528
+/* AF82EC 8024099C 3C038024 */  lui       $v1, %hi(D_80246528)
+/* AF82F0 802409A0 24636528 */  addiu     $v1, $v1, %lo(D_80246528)
 /* AF82F4 802409A4 8C620000 */  lw        $v0, ($v1)
 /* AF82F8 802409A8 24420001 */  addiu     $v0, $v0, 1
 /* AF82FC 802409AC AC620000 */  sw        $v0, ($v1)
 .L802409B0:
-/* AF8300 802409B0 3C038024 */  lui       $v1, 0x8024
-/* AF8304 802409B4 24636528 */  addiu     $v1, $v1, 0x6528
+/* AF8300 802409B0 3C038024 */  lui       $v1, %hi(D_80246528)
+/* AF8304 802409B4 24636528 */  addiu     $v1, $v1, %lo(D_80246528)
 /* AF8308 802409B8 8C620000 */  lw        $v0, ($v1)
 /* AF830C 802409BC 0082102A */  slt       $v0, $a0, $v0
 /* AF8310 802409C0 54400001 */  bnel      $v0, $zero, .L802409C8
 /* AF8314 802409C4 AC640000 */   sw       $a0, ($v1)
 .L802409C8:
-/* AF8318 802409C8 3C048024 */  lui       $a0, 0x8024
-/* AF831C 802409CC 2484652C */  addiu     $a0, $a0, 0x652c
+/* AF8318 802409C8 3C048024 */  lui       $a0, %hi(D_8024652C)
+/* AF831C 802409CC 2484652C */  addiu     $a0, $a0, %lo(D_8024652C)
 /* AF8320 802409D0 8C830000 */  lw        $v1, ($a0)
 /* AF8324 802409D4 24020002 */  addiu     $v0, $zero, 2
 /* AF8328 802409D8 14620003 */  bne       $v1, $v0, .L802409E8
@@ -210,8 +210,8 @@ glabel func_802406C4_AF8014
 /* AF8330 802409E0 24020003 */  addiu     $v0, $zero, 3
 /* AF8334 802409E4 AC820000 */  sw        $v0, ($a0)
 .L802409E8:
-/* AF8338 802409E8 3C038024 */  lui       $v1, 0x8024
-/* AF833C 802409EC 24636578 */  addiu     $v1, $v1, 0x6578
+/* AF8338 802409E8 3C038024 */  lui       $v1, %hi(D_80246578)
+/* AF833C 802409EC 24636578 */  addiu     $v1, $v1, %lo(D_80246578)
 .L802409F0:
 /* AF8340 802409F0 8C620000 */  lw        $v0, ($v1)
 /* AF8344 802409F4 14400006 */  bnez      $v0, .L80240A10
@@ -225,20 +225,20 @@ glabel func_802406C4_AF8014
 /* AF8360 80240A10 14400006 */  bnez      $v0, .L80240A2C
 /* AF8364 80240A14 24020003 */   addiu    $v0, $zero, 3
 /* AF8368 80240A18 24020002 */  addiu     $v0, $zero, 2
-/* AF836C 80240A1C 3C018024 */  lui       $at, 0x8024
-/* AF8370 80240A20 AC22652C */  sw        $v0, 0x652c($at)
+/* AF836C 80240A1C 3C018024 */  lui       $at, %hi(D_8024652C)
+/* AF8370 80240A20 AC22652C */  sw        $v0, %lo(D_8024652C)($at)
 /* AF8374 80240A24 08090291 */  j         .L80240A44
 /* AF8378 80240A28 00000000 */   nop      
 .L80240A2C:
-/* AF837C 80240A2C 3C048024 */  lui       $a0, 0x8024
-/* AF8380 80240A30 2484652C */  addiu     $a0, $a0, 0x652c
+/* AF837C 80240A2C 3C048024 */  lui       $a0, %hi(D_8024652C)
+/* AF8380 80240A30 2484652C */  addiu     $a0, $a0, %lo(D_8024652C)
 /* AF8384 80240A34 8C830000 */  lw        $v1, ($a0)
 /* AF8388 80240A38 10620002 */  beq       $v1, $v0, .L80240A44
 /* AF838C 80240A3C 24020002 */   addiu    $v0, $zero, 2
 /* AF8390 80240A40 AC820000 */  sw        $v0, ($a0)
 .L80240A44:
-/* AF8394 80240A44 3C038024 */  lui       $v1, 0x8024
-/* AF8398 80240A48 24636534 */  addiu     $v1, $v1, 0x6534
+/* AF8394 80240A44 3C038024 */  lui       $v1, %hi(D_80246534)
+/* AF8398 80240A48 24636534 */  addiu     $v1, $v1, %lo(D_80246534)
 /* AF839C 80240A4C 8C620000 */  lw        $v0, ($v1)
 /* AF83A0 80240A50 2442FFFF */  addiu     $v0, $v0, -1
 /* AF83A4 80240A54 1440001D */  bnez      $v0, .L80240ACC
@@ -246,26 +246,26 @@ glabel func_802406C4_AF8014
 /* AF83AC 80240A5C 24020005 */  addiu     $v0, $zero, 5
 /* AF83B0 80240A60 AC620000 */  sw        $v0, ($v1)
 /* AF83B4 80240A64 2402000C */  addiu     $v0, $zero, 0xc
-/* AF83B8 80240A68 3C018024 */  lui       $at, 0x8024
-/* AF83BC 80240A6C AC226558 */  sw        $v0, 0x6558($at)
+/* AF83B8 80240A68 3C018024 */  lui       $at, %hi(D_80246558)
+/* AF83BC 80240A6C AC226558 */  sw        $v0, %lo(D_80246558)($at)
 /* AF83C0 80240A70 080902B3 */  j         .L80240ACC
 /* AF83C4 80240A74 00000000 */   nop      
-/* AF83C8 80240A78 3C038024 */  lui       $v1, 0x8024
-/* AF83CC 80240A7C 24636534 */  addiu     $v1, $v1, 0x6534
+/* AF83C8 80240A78 3C038024 */  lui       $v1, %hi(D_80246534)
+/* AF83CC 80240A7C 24636534 */  addiu     $v1, $v1, %lo(D_80246534)
 /* AF83D0 80240A80 8C620000 */  lw        $v0, ($v1)
 /* AF83D4 80240A84 54400010 */  bnel      $v0, $zero, .L80240AC8
 /* AF83D8 80240A88 2442FFFF */   addiu    $v0, $v0, -1
-/* AF83DC 80240A8C 3C028024 */  lui       $v0, 0x8024
-/* AF83E0 80240A90 8C426528 */  lw        $v0, 0x6528($v0)
-/* AF83E4 80240A94 3C108024 */  lui       $s0, 0x8024
-/* AF83E8 80240A98 26106568 */  addiu     $s0, $s0, 0x6568
+/* AF83DC 80240A8C 3C028024 */  lui       $v0, %hi(D_80246528)
+/* AF83E0 80240A90 8C426528 */  lw        $v0, %lo(D_80246528)($v0)
+/* AF83E4 80240A94 3C108024 */  lui       $s0, %hi(D_80246568)
+/* AF83E8 80240A98 26106568 */  addiu     $s0, $s0, %lo(D_80246568)
 /* AF83EC 80240A9C AEA20084 */  sw        $v0, 0x84($s5)
 /* AF83F0 80240AA0 0C05123D */  jal       free_icon
 /* AF83F4 80240AA4 8E040000 */   lw       $a0, ($s0)
 /* AF83F8 80240AA8 0C05123D */  jal       free_icon
 /* AF83FC 80240AAC 8E040004 */   lw       $a0, 4($s0)
-/* AF8400 80240AB0 3C048024 */  lui       $a0, 0x8024
-/* AF8404 80240AB4 8C846554 */  lw        $a0, 0x6554($a0)
+/* AF8400 80240AB0 3C048024 */  lui       $a0, %hi(D_80246554)
+/* AF8404 80240AB4 8C846554 */  lw        $a0, %lo(D_80246554)($a0)
 /* AF8408 80240AB8 0C048D70 */  jal       func_801235C0
 /* AF840C 80240ABC 00000000 */   nop      
 /* AF8410 80240AC0 080902CA */  j         .L80240B28
@@ -273,8 +273,8 @@ glabel func_802406C4_AF8014
 .L80240AC8:
 /* AF8418 80240AC8 AC620000 */  sw        $v0, ($v1)
 .L80240ACC:
-/* AF841C 80240ACC 3C058024 */  lui       $a1, 0x8024
-/* AF8420 80240AD0 24A565A0 */  addiu     $a1, $a1, 0x65a0
+/* AF841C 80240ACC 3C058024 */  lui       $a1, %hi(D_802465A0)
+/* AF8420 80240AD0 24A565A0 */  addiu     $a1, $a1, %lo(D_802465A0)
 /* AF8424 80240AD4 8CA20000 */  lw        $v0, ($a1)
 /* AF8428 80240AD8 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
 /* AF842C 80240ADC 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
@@ -284,16 +284,16 @@ glabel func_802406C4_AF8014
 /* AF843C 80240AEC ACA20000 */  sw        $v0, ($a1)
 /* AF8440 80240AF0 2842000A */  slti      $v0, $v0, 0xa
 /* AF8444 80240AF4 30638000 */  andi      $v1, $v1, 0x8000
-/* AF8448 80240AF8 3C018024 */  lui       $at, 0x8024
+/* AF8448 80240AF8 3C018024 */  lui       $at, %hi(D_80246578)
 /* AF844C 80240AFC 00240821 */  addu      $at, $at, $a0
-/* AF8450 80240B00 AC236578 */  sw        $v1, 0x6578($at)
+/* AF8450 80240B00 AC236578 */  sw        $v1, %lo(D_80246578)($at)
 /* AF8454 80240B04 50400001 */  beql      $v0, $zero, .L80240B0C
 /* AF8458 80240B08 ACA00000 */   sw       $zero, ($a1)
 .L80240B0C:
 /* AF845C 80240B0C 02A0202D */  daddu     $a0, $s5, $zero
 /* AF8460 80240B10 3C05F70F */  lui       $a1, 0xf70f
-/* AF8464 80240B14 3C068024 */  lui       $a2, 0x8024
-/* AF8468 80240B18 8CC6652C */  lw        $a2, 0x652c($a2)
+/* AF8464 80240B14 3C068024 */  lui       $a2, %hi(D_8024652C)
+/* AF8468 80240B18 8CC6652C */  lw        $a2, %lo(D_8024652C)($a2)
 /* AF846C 80240B1C 0C0B2026 */  jal       set_variable
 /* AF8470 80240B20 34A52E83 */   ori      $a1, $a1, 0x2e83
 /* AF8474 80240B24 0000102D */  daddu     $v0, $zero, $zero
diff --git a/asm/nonmatchings/world/area_kkj/kkj_20/AFDB40/func_80240000_AFDB40.s b/asm/nonmatchings/world/area_kkj/kkj_20/AFDB40/func_80240000_AFDB40.s
index bf4b2528e9..1f8d9e1c6c 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_20/AFDB40/func_80240000_AFDB40.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_20/AFDB40/func_80240000_AFDB40.s
@@ -4,8 +4,8 @@
 glabel func_80240000_AFDB40
 /* AFDB40 80240000 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* AFDB44 80240004 AFB00010 */  sw        $s0, 0x10($sp)
-/* AFDB48 80240008 3C108024 */  lui       $s0, 0x8024
-/* AFDB4C 8024000C 26100880 */  addiu     $s0, $s0, 0x880
+/* AFDB48 80240008 3C108024 */  lui       $s0, %hi(D_80240880)
+/* AFDB4C 8024000C 26100880 */  addiu     $s0, $s0, %lo(D_80240880)
 /* AFDB50 80240010 AFBF0018 */  sw        $ra, 0x18($sp)
 /* AFDB54 80240014 AFB10014 */  sw        $s1, 0x14($sp)
 /* AFDB58 80240018 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_80240000_AFDB40
 /* AFDBBC 8024007C 28620010 */  slti      $v0, $v1, 0x10
 /* AFDBC0 80240080 1440FFFA */  bnez      $v0, .L8024006C
 /* AFDBC4 80240084 24840004 */   addiu    $a0, $a0, 4
-/* AFDBC8 80240088 3C108024 */  lui       $s0, 0x8024
-/* AFDBCC 8024008C 26100880 */  addiu     $s0, $s0, 0x880
+/* AFDBC8 80240088 3C108024 */  lui       $s0, %hi(D_80240880)
+/* AFDBCC 8024008C 26100880 */  addiu     $s0, $s0, %lo(D_80240880)
 /* AFDBD0 80240090 0C00AB4B */  jal       heap_free
 /* AFDBD4 80240094 8E040000 */   lw       $a0, ($s0)
 /* AFDBD8 80240098 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_80240384_AFDEC4.s b/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_80240384_AFDEC4.s
index b578ccc936..8ac32ccdec 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_80240384_AFDEC4.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_80240384_AFDEC4.s
@@ -26,9 +26,9 @@ glabel func_80240384_AFDEC4
 /* AFDF18 802403D8 000320C0 */  sll       $a0, $v1, 3
 /* AFDF1C 802403DC 00641821 */  addu      $v1, $v1, $a0
 /* AFDF20 802403E0 000318C0 */  sll       $v1, $v1, 3
-/* AFDF24 802403E4 3C01800B */  lui       $at, 0x800b
+/* AFDF24 802403E4 3C01800B */  lui       $at, %hi(D_800B1D98)
 /* AFDF28 802403E8 00230821 */  addu      $at, $at, $v1
-/* AFDF2C 802403EC E4201D98 */  swc1      $f0, 0x1d98($at)
+/* AFDF2C 802403EC E4201D98 */  swc1      $f0, %lo(D_800B1D98)($at)
 /* AFDF30 802403F0 8FBF0018 */  lw        $ra, 0x18($sp)
 /* AFDF34 802403F4 8FB10014 */  lw        $s1, 0x14($sp)
 /* AFDF38 802403F8 8FB00010 */  lw        $s0, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_802400E0_B02960.s b/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_802400E0_B02960.s
index 97092057ac..050450e07e 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_802400E0_B02960.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_802400E0_B02960.s
@@ -51,15 +51,15 @@ glabel func_802400E0_B02960
 /* B02A18 80240198 0C00A7B5 */  jal       dist2D
 /* B02A1C 8024019C 46000506 */   mov.s    $f20, $f0
 /* B02A20 802401A0 C604000C */  lwc1      $f4, 0xc($s0)
-/* B02A24 802401A4 3C018024 */  lui       $at, 0x8024
-/* B02A28 802401A8 D4223CD0 */  ldc1      $f2, 0x3cd0($at)
+/* B02A24 802401A4 3C018024 */  lui       $at, %hi(D_80243CD0)
+/* B02A28 802401A8 D4223CD0 */  ldc1      $f2, %lo(D_80243CD0)($at)
 /* B02A2C 802401AC 46002121 */  cvt.d.s   $f4, $f4
 /* B02A30 802401B0 46222032 */  c.eq.d    $f4, $f2
 /* B02A34 802401B4 00000000 */  nop       
 /* B02A38 802401B8 45010007 */  bc1t      .L802401D8
 /* B02A3C 802401BC 46000086 */   mov.s    $f2, $f0
-/* B02A40 802401C0 3C018024 */  lui       $at, 0x8024
-/* B02A44 802401C4 D4203CD8 */  ldc1      $f0, 0x3cd8($at)
+/* B02A40 802401C0 3C018024 */  lui       $at, %hi(D_80243CD8)
+/* B02A44 802401C4 D4203CD8 */  ldc1      $f0, %lo(D_80243CD8)($at)
 /* B02A48 802401C8 46202032 */  c.eq.d    $f4, $f0
 /* B02A4C 802401CC 00000000 */  nop       
 /* B02A50 802401D0 45000008 */  bc1f      .L802401F4
diff --git a/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_8024039C_B02C1C.s b/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_8024039C_B02C1C.s
index b61e2e306a..add958555c 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_8024039C_B02C1C.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_8024039C_B02C1C.s
@@ -94,8 +94,8 @@ glabel func_8024039C_B02C1C
 /* B02D7C 802404FC 3C014059 */  lui       $at, 0x4059
 /* B02D80 80240500 44811800 */  mtc1      $at, $f3
 /* B02D84 80240504 44801000 */  mtc1      $zero, $f2
-/* B02D88 80240508 3C018024 */  lui       $at, 0x8024
-/* B02D8C 8024050C D4243CE0 */  ldc1      $f4, 0x3ce0($at)
+/* B02D88 80240508 3C018024 */  lui       $at, %hi(D_80243CE0)
+/* B02D8C 8024050C D4243CE0 */  ldc1      $f4, %lo(D_80243CE0)($at)
 /* B02D90 80240510 46220003 */  div.d     $f0, $f0, $f2
 /* B02D94 80240514 46240000 */  add.d     $f0, $f0, $f4
 /* B02D98 80240518 C7A20020 */  lwc1      $f2, 0x20($sp)
diff --git a/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240310_B06D10.s b/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240310_B06D10.s
index a3f8f72e22..e2b84f0a10 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240310_B06D10.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240310_B06D10.s
@@ -46,8 +46,8 @@ glabel func_80240310_B06D10
 /* B06DB4 802403B4 27B30040 */  addiu     $s3, $sp, 0x40
 /* B06DB8 802403B8 0260202D */  daddu     $a0, $s3, $zero
 /* B06DBC 802403BC 3C160001 */  lui       $s6, 1
-/* B06DC0 802403C0 3C11800A */  lui       $s1, 0x800a
-/* B06DC4 802403C4 2631A66C */  addiu     $s1, $s1, -0x5994
+/* B06DC0 802403C0 3C11800A */  lui       $s1, %hi(D_8009A66C)
+/* B06DC4 802403C4 2631A66C */  addiu     $s1, $s1, %lo(D_8009A66C)
 /* B06DC8 802403C8 36D61630 */  ori       $s6, $s6, 0x1630
 /* B06DCC 802403CC 3C05E700 */  lui       $a1, 0xe700
 /* B06DD0 802403D0 8E230000 */  lw        $v1, ($s1)
@@ -158,10 +158,10 @@ glabel func_80240310_B06D10
 /* B06F74 80240574 0C019D80 */  jal       guMtxCatF
 /* B06F78 80240578 0260302D */   daddu    $a2, $s3, $zero
 /* B06F7C 8024057C 0260202D */  daddu     $a0, $s3, $zero
-/* B06F80 80240580 3C108007 */  lui       $s0, 0x8007
-/* B06F84 80240584 261041F0 */  addiu     $s0, $s0, 0x41f0
-/* B06F88 80240588 3C14800A */  lui       $s4, 0x800a
-/* B06F8C 8024058C 2694A674 */  addiu     $s4, $s4, -0x598c
+/* B06F80 80240580 3C108007 */  lui       $s0, %hi(D_800741F0)
+/* B06F84 80240584 261041F0 */  addiu     $s0, $s0, %lo(D_800741F0)
+/* B06F88 80240588 3C14800A */  lui       $s4, %hi(D_8009A674)
+/* B06F8C 8024058C 2694A674 */  addiu     $s4, $s4, %lo(D_8009A674)
 /* B06F90 80240590 96050000 */  lhu       $a1, ($s0)
 /* B06F94 80240594 8E820000 */  lw        $v0, ($s4)
 /* B06F98 80240598 00052980 */  sll       $a1, $a1, 6
diff --git a/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_802406EC_B070EC.s b/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_802406EC_B070EC.s
index 44da0b56cc..f5ad368848 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_802406EC_B070EC.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_802406EC_B070EC.s
@@ -53,8 +53,8 @@ glabel func_802406EC_B070EC
 /* B071AC 802407AC 0C04E9C1 */  jal       func_8013A704
 /* B071B0 802407B0 E6020018 */   swc1     $f2, 0x18($s0)
 /* B071B4 802407B4 0000202D */  daddu     $a0, $zero, $zero
-/* B071B8 802407B8 3C058024 */  lui       $a1, 0x8024
-/* B071BC 802407BC 24A50310 */  addiu     $a1, $a1, 0x310
+/* B071B8 802407B8 3C058024 */  lui       $a1, %hi(D_80240310)
+/* B071BC 802407BC 24A50310 */  addiu     $a1, $a1, %lo(D_80240310)
 /* B071C0 802407C0 0C048C56 */  jal       bind_dynamic_entity_3
 /* B071C4 802407C4 AE020000 */   sw       $v0, ($s0)
 /* B071C8 802407C8 0260202D */  daddu     $a0, $s3, $zero
diff --git a/asm/nonmatchings/world/area_kkj/kkj_27/B14080/func_8024041C_B1418C.s b/asm/nonmatchings/world/area_kkj/kkj_27/B14080/func_8024041C_B1418C.s
index abfd527898..c6fa4668ec 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_27/B14080/func_8024041C_B1418C.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_27/B14080/func_8024041C_B1418C.s
@@ -8,8 +8,8 @@ glabel func_8024041C_B1418C
 /* B14198 80240428 0C0B1EAF */  jal       get_variable
 /* B1419C 8024042C 8C450000 */   lw       $a1, ($v0)
 /* B141A0 80240430 8FBF0010 */  lw        $ra, 0x10($sp)
-/* B141A4 80240434 3C018024 */  lui       $at, 0x8024
-/* B141A8 80240438 AC220B00 */  sw        $v0, 0xb00($at)
+/* B141A4 80240434 3C018024 */  lui       $at, %hi(D_80240B00)
+/* B141A8 80240438 AC220B00 */  sw        $v0, %lo(D_80240B00)($at)
 /* B141AC 8024043C 24020002 */  addiu     $v0, $zero, 2
 /* B141B0 80240440 03E00008 */  jr        $ra
 /* B141B4 80240444 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kkj/kkj_27/B14080/func_80240448_B141B8.s b/asm/nonmatchings/world/area_kkj/kkj_27/B14080/func_80240448_B141B8.s
index 1d25b6773d..c95776236e 100644
--- a/asm/nonmatchings/world/area_kkj/kkj_27/B14080/func_80240448_B141B8.s
+++ b/asm/nonmatchings/world/area_kkj/kkj_27/B14080/func_80240448_B141B8.s
@@ -2,12 +2,12 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80240448_B141B8
-/* B141B8 80240448 3C068024 */  lui       $a2, 0x8024
-/* B141BC 8024044C 8CC60B00 */  lw        $a2, 0xb00($a2)
+/* B141B8 80240448 3C068024 */  lui       $a2, %hi(D_80240B00)
+/* B141BC 8024044C 8CC60B00 */  lw        $a2, %lo(D_80240B00)($a2)
 /* B141C0 80240450 18C00011 */  blez      $a2, .L80240498
 /* B141C4 80240454 3C02FC12 */   lui      $v0, 0xfc12
-/* B141C8 80240458 3C04800A */  lui       $a0, 0x800a
-/* B141CC 8024045C 2484A66C */  addiu     $a0, $a0, -0x5994
+/* B141C8 80240458 3C04800A */  lui       $a0, %hi(D_8009A66C)
+/* B141CC 8024045C 2484A66C */  addiu     $a0, $a0, %lo(D_8009A66C)
 /* B141D0 80240460 8C830000 */  lw        $v1, ($a0)
 /* B141D4 80240464 34427E24 */  ori       $v0, $v0, 0x7e24
 /* B141D8 80240468 0060282D */  daddu     $a1, $v1, $zero
diff --git a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240000_8ABF90.s b/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240000_8ABF90.s
index ddb283b941..39ecc54a74 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240000_8ABF90.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240000_8ABF90.s
@@ -9,77 +9,77 @@ glabel func_80240000_8ABF90
 /* 8ABFA0 80240010 AFB00018 */  sw        $s0, 0x18($sp)
 /* 8ABFA4 80240014 10A0003B */  beqz      $a1, .L80240104
 /* 8ABFA8 80240018 8E30000C */   lw       $s0, 0xc($s1)
-/* 8ABFAC 8024001C 3C048024 */  lui       $a0, 0x8024
-/* 8ABFB0 80240020 248440E0 */  addiu     $a0, $a0, 0x40e0
-/* 8ABFB4 80240024 3C058024 */  lui       $a1, 0x8024
-/* 8ABFB8 80240028 24A540E1 */  addiu     $a1, $a1, 0x40e1
-/* 8ABFBC 8024002C 3C068024 */  lui       $a2, 0x8024
-/* 8ABFC0 80240030 24C640E2 */  addiu     $a2, $a2, 0x40e2
-/* 8ABFC4 80240034 3C078024 */  lui       $a3, 0x8024
-/* 8ABFC8 80240038 24E740E3 */  addiu     $a3, $a3, 0x40e3
-/* 8ABFCC 8024003C 3C028024 */  lui       $v0, 0x8024
-/* 8ABFD0 80240040 244240E4 */  addiu     $v0, $v0, 0x40e4
+/* 8ABFAC 8024001C 3C048024 */  lui       $a0, %hi(D_802440E0)
+/* 8ABFB0 80240020 248440E0 */  addiu     $a0, $a0, %lo(D_802440E0)
+/* 8ABFB4 80240024 3C058024 */  lui       $a1, %hi(D_802440E1)
+/* 8ABFB8 80240028 24A540E1 */  addiu     $a1, $a1, %lo(D_802440E1)
+/* 8ABFBC 8024002C 3C068024 */  lui       $a2, %hi(D_802440E2)
+/* 8ABFC0 80240030 24C640E2 */  addiu     $a2, $a2, %lo(D_802440E2)
+/* 8ABFC4 80240034 3C078024 */  lui       $a3, %hi(D_802440E3)
+/* 8ABFC8 80240038 24E740E3 */  addiu     $a3, $a3, %lo(D_802440E3)
+/* 8ABFCC 8024003C 3C028024 */  lui       $v0, %hi(D_802440E4)
+/* 8ABFD0 80240040 244240E4 */  addiu     $v0, $v0, %lo(D_802440E4)
 /* 8ABFD4 80240044 AFA20010 */  sw        $v0, 0x10($sp)
-/* 8ABFD8 80240048 3C028024 */  lui       $v0, 0x8024
-/* 8ABFDC 8024004C 244240E5 */  addiu     $v0, $v0, 0x40e5
+/* 8ABFD8 80240048 3C028024 */  lui       $v0, %hi(D_802440E5)
+/* 8ABFDC 8024004C 244240E5 */  addiu     $v0, $v0, %lo(D_802440E5)
 /* 8ABFE0 80240050 0C046FF5 */  jal       func_8011BFD4
 /* 8ABFE4 80240054 AFA20014 */   sw       $v0, 0x14($sp)
 /* 8ABFE8 80240058 8E050000 */  lw        $a1, ($s0)
 /* 8ABFEC 8024005C 26100004 */  addiu     $s0, $s0, 4
 /* 8ABFF0 80240060 0C0B1EAF */  jal       get_variable
 /* 8ABFF4 80240064 0220202D */   daddu    $a0, $s1, $zero
-/* 8ABFF8 80240068 3C018024 */  lui       $at, 0x8024
-/* 8ABFFC 8024006C AC2240E8 */  sw        $v0, 0x40e8($at)
+/* 8ABFF8 80240068 3C018024 */  lui       $at, %hi(D_802440E8)
+/* 8ABFFC 8024006C AC2240E8 */  sw        $v0, %lo(D_802440E8)($at)
 /* 8AC000 80240070 8E050000 */  lw        $a1, ($s0)
 /* 8AC004 80240074 26100004 */  addiu     $s0, $s0, 4
 /* 8AC008 80240078 0C0B1EAF */  jal       get_variable
 /* 8AC00C 8024007C 0220202D */   daddu    $a0, $s1, $zero
-/* 8AC010 80240080 3C018024 */  lui       $at, 0x8024
-/* 8AC014 80240084 AC2240EC */  sw        $v0, 0x40ec($at)
+/* 8AC010 80240080 3C018024 */  lui       $at, %hi(D_802440EC)
+/* 8AC014 80240084 AC2240EC */  sw        $v0, %lo(D_802440EC)($at)
 /* 8AC018 80240088 8E050000 */  lw        $a1, ($s0)
 /* 8AC01C 8024008C 26100004 */  addiu     $s0, $s0, 4
 /* 8AC020 80240090 0C0B1EAF */  jal       get_variable
 /* 8AC024 80240094 0220202D */   daddu    $a0, $s1, $zero
-/* 8AC028 80240098 3C018024 */  lui       $at, 0x8024
-/* 8AC02C 8024009C AC2240F0 */  sw        $v0, 0x40f0($at)
+/* 8AC028 80240098 3C018024 */  lui       $at, %hi(D_802440F0)
+/* 8AC02C 8024009C AC2240F0 */  sw        $v0, %lo(D_802440F0)($at)
 /* 8AC030 802400A0 8E050000 */  lw        $a1, ($s0)
 /* 8AC034 802400A4 26100004 */  addiu     $s0, $s0, 4
 /* 8AC038 802400A8 0C0B1EAF */  jal       get_variable
 /* 8AC03C 802400AC 0220202D */   daddu    $a0, $s1, $zero
-/* 8AC040 802400B0 3C018024 */  lui       $at, 0x8024
-/* 8AC044 802400B4 AC2240F4 */  sw        $v0, 0x40f4($at)
+/* 8AC040 802400B0 3C018024 */  lui       $at, %hi(D_802440F4)
+/* 8AC044 802400B4 AC2240F4 */  sw        $v0, %lo(D_802440F4)($at)
 /* 8AC048 802400B8 8E050000 */  lw        $a1, ($s0)
 /* 8AC04C 802400BC 26100004 */  addiu     $s0, $s0, 4
 /* 8AC050 802400C0 0C0B1EAF */  jal       get_variable
 /* 8AC054 802400C4 0220202D */   daddu    $a0, $s1, $zero
-/* 8AC058 802400C8 3C018024 */  lui       $at, 0x8024
-/* 8AC05C 802400CC AC2240F8 */  sw        $v0, 0x40f8($at)
+/* 8AC058 802400C8 3C018024 */  lui       $at, %hi(D_802440F8)
+/* 8AC05C 802400CC AC2240F8 */  sw        $v0, %lo(D_802440F8)($at)
 /* 8AC060 802400D0 8E050000 */  lw        $a1, ($s0)
 /* 8AC064 802400D4 26100004 */  addiu     $s0, $s0, 4
 /* 8AC068 802400D8 0C0B1EAF */  jal       get_variable
 /* 8AC06C 802400DC 0220202D */   daddu    $a0, $s1, $zero
-/* 8AC070 802400E0 3C018024 */  lui       $at, 0x8024
-/* 8AC074 802400E4 AC2240FC */  sw        $v0, 0x40fc($at)
+/* 8AC070 802400E0 3C018024 */  lui       $at, %hi(D_802440FC)
+/* 8AC074 802400E4 AC2240FC */  sw        $v0, %lo(D_802440FC)($at)
 /* 8AC078 802400E8 8E050000 */  lw        $a1, ($s0)
 /* 8AC07C 802400EC 0C0B1EAF */  jal       get_variable
 /* 8AC080 802400F0 0220202D */   daddu    $a0, $s1, $zero
-/* 8AC084 802400F4 3C018024 */  lui       $at, 0x8024
-/* 8AC088 802400F8 AC224100 */  sw        $v0, 0x4100($at)
-/* 8AC08C 802400FC 3C018024 */  lui       $at, 0x8024
-/* 8AC090 80240100 AC204104 */  sw        $zero, 0x4104($at)
+/* 8AC084 802400F4 3C018024 */  lui       $at, %hi(D_80244100)
+/* 8AC088 802400F8 AC224100 */  sw        $v0, %lo(D_80244100)($at)
+/* 8AC08C 802400FC 3C018024 */  lui       $at, %hi(D_80244104)
+/* 8AC090 80240100 AC204104 */  sw        $zero, %lo(D_80244104)($at)
 .L80240104:
-/* 8AC094 80240104 3C118024 */  lui       $s1, 0x8024
-/* 8AC098 80240108 26314100 */  addiu     $s1, $s1, 0x4100
+/* 8AC094 80240104 3C118024 */  lui       $s1, %hi(D_80244100)
+/* 8AC098 80240108 26314100 */  addiu     $s1, $s1, %lo(D_80244100)
 /* 8AC09C 8024010C 8E2F0000 */  lw        $t7, ($s1)
 /* 8AC0A0 80240110 19E00088 */  blez      $t7, .L80240334
 /* 8AC0A4 80240114 00000000 */   nop      
-/* 8AC0A8 80240118 3C108024 */  lui       $s0, 0x8024
-/* 8AC0AC 8024011C 26104104 */  addiu     $s0, $s0, 0x4104
+/* 8AC0A8 80240118 3C108024 */  lui       $s0, %hi(D_80244104)
+/* 8AC0AC 8024011C 26104104 */  addiu     $s0, $s0, %lo(D_80244104)
 /* 8AC0B0 80240120 8E030000 */  lw        $v1, ($s0)
-/* 8AC0B4 80240124 3C048024 */  lui       $a0, 0x8024
-/* 8AC0B8 80240128 908440E0 */  lbu       $a0, 0x40e0($a0)
-/* 8AC0BC 8024012C 3C028024 */  lui       $v0, 0x8024
-/* 8AC0C0 80240130 8C4240E8 */  lw        $v0, 0x40e8($v0)
+/* 8AC0B4 80240124 3C048024 */  lui       $a0, %hi(D_802440E0)
+/* 8AC0B8 80240128 908440E0 */  lbu       $a0, %lo(D_802440E0)($a0)
+/* 8AC0BC 8024012C 3C028024 */  lui       $v0, %hi(D_802440E8)
+/* 8AC0C0 80240130 8C4240E8 */  lw        $v0, %lo(D_802440E8)($v0)
 /* 8AC0C4 80240134 24630001 */  addiu     $v1, $v1, 1
 /* 8AC0C8 80240138 00441023 */  subu      $v0, $v0, $a0
 /* 8AC0CC 8024013C 00430018 */  mult      $v0, $v1
@@ -97,10 +97,10 @@ glabel func_80240000_8ABF90
 /* 8AC0F8 80240168 0006000D */  break     6
 .L8024016C:
 /* 8AC0FC 8024016C 00007012 */   mflo     $t6
-/* 8AC100 80240170 3C058024 */  lui       $a1, 0x8024
-/* 8AC104 80240174 90A540E1 */  lbu       $a1, 0x40e1($a1)
-/* 8AC108 80240178 3C028024 */  lui       $v0, 0x8024
-/* 8AC10C 8024017C 8C4240EC */  lw        $v0, 0x40ec($v0)
+/* 8AC100 80240170 3C058024 */  lui       $a1, %hi(D_802440E1)
+/* 8AC104 80240174 90A540E1 */  lbu       $a1, %lo(D_802440E1)($a1)
+/* 8AC108 80240178 3C028024 */  lui       $v0, %hi(D_802440EC)
+/* 8AC10C 8024017C 8C4240EC */  lw        $v0, %lo(D_802440EC)($v0)
 /* 8AC110 80240180 00451023 */  subu      $v0, $v0, $a1
 /* 8AC114 80240184 00430018 */  mult      $v0, $v1
 /* 8AC118 80240188 00004012 */  mflo      $t0
@@ -117,10 +117,10 @@ glabel func_80240000_8ABF90
 /* 8AC140 802401B0 0006000D */  break     6
 .L802401B4:
 /* 8AC144 802401B4 00006812 */   mflo     $t5
-/* 8AC148 802401B8 3C068024 */  lui       $a2, 0x8024
-/* 8AC14C 802401BC 90C640E2 */  lbu       $a2, 0x40e2($a2)
-/* 8AC150 802401C0 3C028024 */  lui       $v0, 0x8024
-/* 8AC154 802401C4 8C4240F0 */  lw        $v0, 0x40f0($v0)
+/* 8AC148 802401B8 3C068024 */  lui       $a2, %hi(D_802440E2)
+/* 8AC14C 802401BC 90C640E2 */  lbu       $a2, %lo(D_802440E2)($a2)
+/* 8AC150 802401C0 3C028024 */  lui       $v0, %hi(D_802440F0)
+/* 8AC154 802401C4 8C4240F0 */  lw        $v0, %lo(D_802440F0)($v0)
 /* 8AC158 802401C8 00461023 */  subu      $v0, $v0, $a2
 /* 8AC15C 802401CC 00430018 */  mult      $v0, $v1
 /* 8AC160 802401D0 00004012 */  mflo      $t0
@@ -137,10 +137,10 @@ glabel func_80240000_8ABF90
 /* 8AC188 802401F8 0006000D */  break     6
 .L802401FC:
 /* 8AC18C 802401FC 00006012 */   mflo     $t4
-/* 8AC190 80240200 3C078024 */  lui       $a3, 0x8024
-/* 8AC194 80240204 90E740E3 */  lbu       $a3, 0x40e3($a3)
-/* 8AC198 80240208 3C028024 */  lui       $v0, 0x8024
-/* 8AC19C 8024020C 8C4240F4 */  lw        $v0, 0x40f4($v0)
+/* 8AC190 80240200 3C078024 */  lui       $a3, %hi(D_802440E3)
+/* 8AC194 80240204 90E740E3 */  lbu       $a3, %lo(D_802440E3)($a3)
+/* 8AC198 80240208 3C028024 */  lui       $v0, %hi(D_802440F4)
+/* 8AC19C 8024020C 8C4240F4 */  lw        $v0, %lo(D_802440F4)($v0)
 /* 8AC1A0 80240210 00471023 */  subu      $v0, $v0, $a3
 /* 8AC1A4 80240214 00430018 */  mult      $v0, $v1
 /* 8AC1A8 80240218 00004012 */  mflo      $t0
@@ -157,10 +157,10 @@ glabel func_80240000_8ABF90
 /* 8AC1D0 80240240 0006000D */  break     6
 .L80240244:
 /* 8AC1D4 80240244 00005812 */   mflo     $t3
-/* 8AC1D8 80240248 3C098024 */  lui       $t1, 0x8024
-/* 8AC1DC 8024024C 912940E4 */  lbu       $t1, 0x40e4($t1)
-/* 8AC1E0 80240250 3C028024 */  lui       $v0, 0x8024
-/* 8AC1E4 80240254 8C4240F8 */  lw        $v0, 0x40f8($v0)
+/* 8AC1D8 80240248 3C098024 */  lui       $t1, %hi(D_802440E4)
+/* 8AC1DC 8024024C 912940E4 */  lbu       $t1, %lo(D_802440E4)($t1)
+/* 8AC1E0 80240250 3C028024 */  lui       $v0, %hi(D_802440F8)
+/* 8AC1E4 80240254 8C4240F8 */  lw        $v0, %lo(D_802440F8)($v0)
 /* 8AC1E8 80240258 00491023 */  subu      $v0, $v0, $t1
 /* 8AC1EC 8024025C 00430018 */  mult      $v0, $v1
 /* 8AC1F0 80240260 00004012 */  mflo      $t0
@@ -177,10 +177,10 @@ glabel func_80240000_8ABF90
 /* 8AC218 80240288 0006000D */  break     6
 .L8024028C:
 /* 8AC21C 8024028C 00005012 */   mflo     $t2
-/* 8AC220 80240290 3C088024 */  lui       $t0, 0x8024
-/* 8AC224 80240294 910840E5 */  lbu       $t0, 0x40e5($t0)
-/* 8AC228 80240298 3C028024 */  lui       $v0, 0x8024
-/* 8AC22C 8024029C 8C4240FC */  lw        $v0, 0x40fc($v0)
+/* 8AC220 80240290 3C088024 */  lui       $t0, %hi(D_802440E5)
+/* 8AC224 80240294 910840E5 */  lbu       $t0, %lo(D_802440E5)($t0)
+/* 8AC228 80240298 3C028024 */  lui       $v0, %hi(D_802440FC)
+/* 8AC22C 8024029C 8C4240FC */  lw        $v0, %lo(D_802440FC)($v0)
 /* 8AC230 802402A0 00481023 */  subu      $v0, $v0, $t0
 /* 8AC234 802402A4 00430018 */  mult      $v0, $v1
 /* 8AC238 802402A8 0000C812 */  mflo      $t9
@@ -221,18 +221,18 @@ glabel func_80240000_8ABF90
 /* 8AC2BC 8024032C 080900DD */  j         .L80240374
 /* 8AC2C0 80240330 24020002 */   addiu    $v0, $zero, 2
 .L80240334:
-/* 8AC2C4 80240334 3C028024 */  lui       $v0, 0x8024
-/* 8AC2C8 80240338 904240FB */  lbu       $v0, 0x40fb($v0)
-/* 8AC2CC 8024033C 3C048024 */  lui       $a0, 0x8024
-/* 8AC2D0 80240340 908440EB */  lbu       $a0, 0x40eb($a0)
-/* 8AC2D4 80240344 3C058024 */  lui       $a1, 0x8024
-/* 8AC2D8 80240348 90A540EF */  lbu       $a1, 0x40ef($a1)
-/* 8AC2DC 8024034C 3C068024 */  lui       $a2, 0x8024
-/* 8AC2E0 80240350 90C640F3 */  lbu       $a2, 0x40f3($a2)
-/* 8AC2E4 80240354 3C078024 */  lui       $a3, 0x8024
-/* 8AC2E8 80240358 90E740F7 */  lbu       $a3, 0x40f7($a3)
-/* 8AC2EC 8024035C 3C038024 */  lui       $v1, 0x8024
-/* 8AC2F0 80240360 906340FF */  lbu       $v1, 0x40ff($v1)
+/* 8AC2C4 80240334 3C028024 */  lui       $v0, %hi(D_802440FB)
+/* 8AC2C8 80240338 904240FB */  lbu       $v0, %lo(D_802440FB)($v0)
+/* 8AC2CC 8024033C 3C048024 */  lui       $a0, %hi(D_802440EB)
+/* 8AC2D0 80240340 908440EB */  lbu       $a0, %lo(D_802440EB)($a0)
+/* 8AC2D4 80240344 3C058024 */  lui       $a1, %hi(D_802440EF)
+/* 8AC2D8 80240348 90A540EF */  lbu       $a1, %lo(D_802440EF)($a1)
+/* 8AC2DC 8024034C 3C068024 */  lui       $a2, %hi(D_802440F3)
+/* 8AC2E0 80240350 90C640F3 */  lbu       $a2, %lo(D_802440F3)($a2)
+/* 8AC2E4 80240354 3C078024 */  lui       $a3, %hi(D_802440F7)
+/* 8AC2E8 80240358 90E740F7 */  lbu       $a3, %lo(D_802440F7)($a3)
+/* 8AC2EC 8024035C 3C038024 */  lui       $v1, %hi(D_802440FF)
+/* 8AC2F0 80240360 906340FF */  lbu       $v1, %lo(D_802440FF)($v1)
 /* 8AC2F4 80240364 AFA20010 */  sw        $v0, 0x10($sp)
 /* 8AC2F8 80240368 0C046FE6 */  jal       func_8011BF98
 /* 8AC2FC 8024036C AFA30014 */   sw       $v1, 0x14($sp)
diff --git a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240388_8AC318.s b/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240388_8AC318.s
index 1777077b1a..17461cebb5 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240388_8AC318.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240388_8AC318.s
@@ -6,8 +6,8 @@ glabel func_80240388_8AC318
 /* 8AC31C 8024038C AFBF0010 */  sw        $ra, 0x10($sp)
 /* 8AC320 80240390 0C04760B */  jal       func_8011D82C
 /* 8AC324 80240394 24040003 */   addiu    $a0, $zero, 3
-/* 8AC328 80240398 3C038015 */  lui       $v1, 0x8015
-/* 8AC32C 8024039C 8C6312F0 */  lw        $v1, 0x12f0($v1)
+/* 8AC328 80240398 3C038015 */  lui       $v1, %hi(D_801512F0)
+/* 8AC32C 8024039C 8C6312F0 */  lw        $v1, %lo(D_801512F0)($v1)
 /* 8AC330 802403A0 24020003 */  addiu     $v0, $zero, 3
 /* 8AC334 802403A4 A0620000 */  sb        $v0, ($v1)
 /* 8AC338 802403A8 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802404E8_8AC478.s b/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802404E8_8AC478.s
index 81003dc90a..c171f9a74f 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802404E8_8AC478.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802404E8_8AC478.s
@@ -16,7 +16,7 @@ glabel func_802404E8_8AC478
 /* 8AC4A4 80240514 00000000 */  nop       
 /* 8AC4A8 80240518 8FBF0010 */  lw        $ra, 0x10($sp)
 /* 8AC4AC 8024051C 24020002 */  addiu     $v0, $zero, 2
-/* 8AC4B0 80240520 3C01800B */  lui       $at, 0x800b
-/* 8AC4B4 80240524 E4202260 */  swc1      $f0, 0x2260($at)
+/* 8AC4B0 80240520 3C01800B */  lui       $at, %hi(D_800B2260)
+/* 8AC4B4 80240524 E4202260 */  swc1      $f0, %lo(D_800B2260)($at)
 /* 8AC4B8 80240528 03E00008 */  jr        $ra
 /* 8AC4BC 8024052C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240CB0_8ACC40.s b/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240CB0_8ACC40.s
index 03a2cc7b28..b861d8f3f2 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240CB0_8ACC40.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240CB0_8ACC40.s
@@ -15,9 +15,9 @@ glabel func_80240CB0_8ACC40
 /* 8ACC68 80240CD8 AE220078 */  sw        $v0, 0x78($s1)
 /* 8ACC6C 80240CDC 2463FFFF */  addiu     $v1, $v1, -1
 /* 8ACC70 80240CE0 00031840 */  sll       $v1, $v1, 1
-/* 8ACC74 80240CE4 3C028024 */  lui       $v0, 0x8024
+/* 8ACC74 80240CE4 3C028024 */  lui       $v0, %hi(D_80242D60)
 /* 8ACC78 80240CE8 00431021 */  addu      $v0, $v0, $v1
-/* 8ACC7C 80240CEC 84422D60 */  lh        $v0, 0x2d60($v0)
+/* 8ACC7C 80240CEC 84422D60 */  lh        $v0, %lo(D_80242D60)($v0)
 /* 8ACC80 80240CF0 AE22007C */  sw        $v0, 0x7c($s1)
 .L80240CF4:
 /* 8ACC84 80240CF4 8E22007C */  lw        $v0, 0x7c($s1)
diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802402E0_8B0350.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802402E0_8B0350.s
index 441c43efc6..f3954cde11 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802402E0_8B0350.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802402E0_8B0350.s
@@ -17,10 +17,10 @@ glabel func_802402E0_8B0350
 /* 8B0380 80240310 0040802D */   daddu    $s0, $v0, $zero
 /* 8B0384 80240314 0200202D */  daddu     $a0, $s0, $zero
 /* 8B0388 80240318 00021080 */  sll       $v0, $v0, 2
-/* 8B038C 8024031C 3C108024 */  lui       $s0, 0x8024
+/* 8B038C 8024031C 3C108024 */  lui       $s0, %hi(D_80244B2C)
 /* 8B0390 80240320 02028021 */  addu      $s0, $s0, $v0
 /* 8B0394 80240324 0C00FB3A */  jal       get_enemy
-/* 8B0398 80240328 8E104B2C */   lw       $s0, 0x4b2c($s0)
+/* 8B0398 80240328 8E104B2C */   lw       $s0, %lo(D_80244B2C)($s0)
 /* 8B039C 8024032C 0040302D */  daddu     $a2, $v0, $zero
 /* 8B03A0 80240330 0000282D */  daddu     $a1, $zero, $zero
 .L80240334:
diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240390_8B0400.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240390_8B0400.s
index 981c3424ce..5d61e5f345 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240390_8B0400.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240390_8B0400.s
@@ -4,8 +4,8 @@
 glabel func_80240390_8B0400
 /* 8B0400 80240390 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* 8B0404 80240394 AFB00010 */  sw        $s0, 0x10($sp)
-/* 8B0408 80240398 3C108024 */  lui       $s0, 0x8024
-/* 8B040C 8024039C 261055D0 */  addiu     $s0, $s0, 0x55d0
+/* 8B0408 80240398 3C108024 */  lui       $s0, %hi(D_802455D0)
+/* 8B040C 8024039C 261055D0 */  addiu     $s0, $s0, %lo(D_802455D0)
 /* 8B0410 802403A0 AFBF0018 */  sw        $ra, 0x18($sp)
 /* 8B0414 802403A4 AFB10014 */  sw        $s1, 0x14($sp)
 /* 8B0418 802403A8 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_80240390_8B0400
 /* 8B047C 8024040C 28620010 */  slti      $v0, $v1, 0x10
 /* 8B0480 80240410 1440FFFA */  bnez      $v0, .L802403FC
 /* 8B0484 80240414 24840004 */   addiu    $a0, $a0, 4
-/* 8B0488 80240418 3C108024 */  lui       $s0, 0x8024
-/* 8B048C 8024041C 261055D0 */  addiu     $s0, $s0, 0x55d0
+/* 8B0488 80240418 3C108024 */  lui       $s0, %hi(D_802455D0)
+/* 8B048C 8024041C 261055D0 */  addiu     $s0, $s0, %lo(D_802455D0)
 /* 8B0490 80240420 0C00AB4B */  jal       heap_free
 /* 8B0494 80240424 8E040000 */   lw       $a0, ($s0)
 /* 8B0498 80240428 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802404CC_8B053C.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802404CC_8B053C.s
index b66321aa0e..d2d742a04b 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802404CC_8B053C.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802404CC_8B053C.s
@@ -90,8 +90,8 @@ glabel func_802404CC_8B053C
 /* 8B0688 80240618 0040802D */   daddu    $s0, $v0, $zero
 /* 8B068C 8024061C 0040282D */  daddu     $a1, $v0, $zero
 /* 8B0690 80240620 0000182D */  daddu     $v1, $zero, $zero
-/* 8B0694 80240624 3C068024 */  lui       $a2, 0x8024
-/* 8B0698 80240628 24C65674 */  addiu     $a2, $a2, 0x5674
+/* 8B0694 80240624 3C068024 */  lui       $a2, %hi(D_80245674)
+/* 8B0698 80240628 24C65674 */  addiu     $a2, $a2, %lo(D_80245674)
 /* 8B069C 8024062C 00C0202D */  daddu     $a0, $a2, $zero
 .L80240630:
 /* 8B06A0 80240630 8C820000 */  lw        $v0, ($a0)
diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802406F0_8B0760.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802406F0_8B0760.s
index d6706adf3e..f15248a0e9 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802406F0_8B0760.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802406F0_8B0760.s
@@ -9,8 +9,8 @@ glabel func_802406F0_8B0760
 /* 8B0770 80240700 8C84014C */   lw       $a0, 0x14c($a0)
 /* 8B0774 80240704 24040008 */  addiu     $a0, $zero, 8
 /* 8B0778 80240708 0040802D */  daddu     $s0, $v0, $zero
-/* 8B077C 8024070C 3C028024 */  lui       $v0, 0x8024
-/* 8B0780 80240710 2442075C */  addiu     $v0, $v0, 0x75c
+/* 8B077C 8024070C 3C028024 */  lui       $v0, %hi(D_8024075C)
+/* 8B0780 80240710 2442075C */  addiu     $v0, $v0, %lo(D_8024075C)
 /* 8B0784 80240714 0C00AB39 */  jal       heap_malloc
 /* 8B0788 80240718 AE020008 */   sw       $v0, 8($s0)
 /* 8B078C 8024071C 0040182D */  daddu     $v1, $v0, $zero
diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024075C_8B07CC.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024075C_8B07CC.s
index a7f47993a8..21a6e2ee4d 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024075C_8B07CC.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024075C_8B07CC.s
@@ -3,8 +3,8 @@
 
 glabel func_8024075C_8B07CC
 /* 8B07CC 8024075C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8B07D0 80240760 3C03800A */  lui       $v1, 0x800a
-/* 8B07D4 80240764 8463A634 */  lh        $v1, -0x59cc($v1)
+/* 8B07D0 80240760 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* 8B07D4 80240764 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* 8B07D8 80240768 3C05800B */  lui       $a1, %hi(gCameras)
 /* 8B07DC 8024076C 24A51D80 */  addiu     $a1, $a1, %lo(gCameras)
 /* 8B07E0 80240770 AFBF0010 */  sw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802407BC_8B082C.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802407BC_8B082C.s
index 1fe9a90ad7..50195a3665 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802407BC_8B082C.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802407BC_8B082C.s
@@ -21,8 +21,8 @@ glabel func_802407BC_8B082C
 /* 8B086C 802407FC 2414FFFC */  addiu     $s4, $zero, -4
 /* 8B0870 80240800 24130008 */  addiu     $s3, $zero, 8
 /* 8B0874 80240804 3C120080 */  lui       $s2, 0x80
-/* 8B0878 80240808 3C038015 */  lui       $v1, 0x8015
-/* 8B087C 8024080C 8C6312F0 */  lw        $v1, 0x12f0($v1)
+/* 8B0878 80240808 3C038015 */  lui       $v1, %hi(D_801512F0)
+/* 8B087C 8024080C 8C6312F0 */  lw        $v1, %lo(D_801512F0)($v1)
 /* 8B0880 80240810 24020001 */  addiu     $v0, $zero, 1
 /* 8B0884 80240814 0C046F97 */  jal       set_background_color_blend
 /* 8B0888 80240818 A0620000 */   sb       $v0, ($v1)
diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240908_8B0978.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240908_8B0978.s
index 1a8a235e83..873820aae0 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240908_8B0978.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240908_8B0978.s
@@ -49,8 +49,8 @@ glabel func_80240908_8B0978
 /* 8B0A1C 802409AC 2413FFFC */  addiu     $s3, $zero, -4
 /* 8B0A20 802409B0 24120008 */  addiu     $s2, $zero, 8
 /* 8B0A24 802409B4 3C11FF7F */  lui       $s1, 0xff7f
-/* 8B0A28 802409B8 3C028015 */  lui       $v0, 0x8015
-/* 8B0A2C 802409BC 8C4212F0 */  lw        $v0, 0x12f0($v0)
+/* 8B0A28 802409B8 3C028015 */  lui       $v0, %hi(D_801512F0)
+/* 8B0A2C 802409BC 8C4212F0 */  lw        $v0, %lo(D_801512F0)($v0)
 /* 8B0A30 802409C0 3631FFFF */  ori       $s1, $s1, 0xffff
 /* 8B0A34 802409C4 A0400000 */  sb        $zero, ($v0)
 .L802409C8:
diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240A7C_8B0AEC.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240A7C_8B0AEC.s
index 59b8405a16..c50f4a54c3 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240A7C_8B0AEC.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240A7C_8B0AEC.s
@@ -19,9 +19,9 @@ glabel func_80240A7C_8B0AEC
 /* 8B0B20 80240AB0 34A502E0 */  ori       $a1, $a1, 0x2e0
 /* 8B0B24 80240AB4 0C0B1EAF */  jal       get_variable
 /* 8B0B28 80240AB8 0000202D */   daddu    $a0, $zero, $zero
-/* 8B0B2C 80240ABC 3C038024 */  lui       $v1, 0x8024
+/* 8B0B2C 80240ABC 3C038024 */  lui       $v1, %hi(D_80245634)
 /* 8B0B30 80240AC0 00621821 */  addu      $v1, $v1, $v0
-/* 8B0B34 80240AC4 90635634 */  lbu       $v1, 0x5634($v1)
+/* 8B0B34 80240AC4 90635634 */  lbu       $v1, %lo(D_80245634)($v1)
 /* 8B0B38 80240AC8 8E220084 */  lw        $v0, 0x84($s1)
 /* 8B0B3C 80240ACC 54430006 */  bnel      $v0, $v1, .L80240AE8
 /* 8B0B40 80240AD0 AE200084 */   sw       $zero, 0x84($s1)
diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240B00_8B0B70.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240B00_8B0B70.s
index 827c561b38..152e4dc364 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240B00_8B0B70.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240B00_8B0B70.s
@@ -38,8 +38,8 @@ glabel func_80240B00_8B0B70
 /* 8B0BF4 80240B84 0220202D */  daddu     $a0, $s1, $zero
 /* 8B0BF8 80240B88 3C05F4AC */  lui       $a1, 0xf4ac
 /* 8B0BFC 80240B8C 34A5D481 */  ori       $a1, $a1, 0xd481
-/* 8B0C00 80240B90 3C108025 */  lui       $s0, 0x8025
-/* 8B0C04 80240B94 26107F48 */  addiu     $s0, $s0, 0x7f48
+/* 8B0C00 80240B90 3C108025 */  lui       $s0, %hi(D_80257F48)
+/* 8B0C04 80240B94 26107F48 */  addiu     $s0, $s0, %lo(D_80257F48)
 /* 8B0C08 80240B98 0C0B1EAF */  jal       get_variable
 /* 8B0C0C 80240B9C AE020000 */   sw       $v0, ($s0)
 /* 8B0C10 80240BA0 0220202D */  daddu     $a0, $s1, $zero
@@ -66,8 +66,8 @@ glabel func_80240B00_8B0B70
 /* 8B0C64 80240BF4 0000202D */   daddu    $a0, $zero, $zero
 /* 8B0C68 80240BF8 0220202D */  daddu     $a0, $s1, $zero
 /* 8B0C6C 80240BFC 3C05F4AC */  lui       $a1, 0xf4ac
-/* 8B0C70 80240C00 3C018025 */  lui       $at, 0x8025
-/* 8B0C74 80240C04 AC227F4C */  sw        $v0, 0x7f4c($at)
+/* 8B0C70 80240C00 3C018025 */  lui       $at, %hi(D_80257F4C)
+/* 8B0C74 80240C04 AC227F4C */  sw        $v0, %lo(D_80257F4C)($at)
 /* 8B0C78 80240C08 0C0B1EAF */  jal       get_variable
 /* 8B0C7C 80240C0C 34A5D481 */   ori      $a1, $a1, 0xd481
 /* 8B0C80 80240C10 0220202D */  daddu     $a0, $s1, $zero
@@ -98,16 +98,16 @@ glabel func_80240B00_8B0B70
 /* 8B0CE4 80240C74 E7A00010 */   swc1     $f0, 0x10($sp)
 /* 8B0CE8 80240C78 8E030000 */  lw        $v1, ($s0)
 /* 8B0CEC 80240C7C 8C64000C */  lw        $a0, 0xc($v1)
-/* 8B0CF0 80240C80 3C018025 */  lui       $at, 0x8025
-/* 8B0CF4 80240C84 AC227F50 */  sw        $v0, 0x7f50($at)
+/* 8B0CF0 80240C80 3C018025 */  lui       $at, %hi(D_80257F50)
+/* 8B0CF4 80240C84 AC227F50 */  sw        $v0, %lo(D_80257F50)($at)
 /* 8B0CF8 80240C88 AC800018 */  sw        $zero, 0x18($a0)
 /* 8B0CFC 80240C8C AC800020 */  sw        $zero, 0x20($a0)
 /* 8B0D00 80240C90 AC800024 */  sw        $zero, 0x24($a0)
 /* 8B0D04 80240C94 AC800028 */  sw        $zero, 0x28($a0)
 /* 8B0D08 80240C98 AC80001C */  sw        $zero, 0x1c($a0)
 .L80240C9C:
-/* 8B0D0C 80240C9C 3C028025 */  lui       $v0, 0x8025
-/* 8B0D10 80240CA0 8C427F48 */  lw        $v0, 0x7f48($v0)
+/* 8B0D0C 80240C9C 3C028025 */  lui       $v0, %hi(D_80257F48)
+/* 8B0D10 80240CA0 8C427F48 */  lw        $v0, %lo(D_80257F48)($v0)
 /* 8B0D14 80240CA4 8C44000C */  lw        $a0, 0xc($v0)
 /* 8B0D18 80240CA8 8C820020 */  lw        $v0, 0x20($a0)
 /* 8B0D1C 80240CAC 8C830028 */  lw        $v1, 0x28($a0)
diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240D18_8B0D88.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240D18_8B0D88.s
index 1184de1d8f..a7965caa1e 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240D18_8B0D88.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240D18_8B0D88.s
@@ -5,19 +5,19 @@ glabel func_80240D18_8B0D88
 /* 8B0D88 80240D18 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 8B0D8C 80240D1C 10A0000B */  beqz      $a1, .L80240D4C
 /* 8B0D90 80240D20 AFBF0010 */   sw       $ra, 0x10($sp)
-/* 8B0D94 80240D24 3C038025 */  lui       $v1, 0x8025
-/* 8B0D98 80240D28 8C637F4C */  lw        $v1, 0x7f4c($v1)
+/* 8B0D94 80240D24 3C038025 */  lui       $v1, %hi(D_80257F4C)
+/* 8B0D98 80240D28 8C637F4C */  lw        $v1, %lo(D_80257F4C)($v1)
 /* 8B0D9C 80240D2C 8C620000 */  lw        $v0, ($v1)
-/* 8B0DA0 80240D30 3C048025 */  lui       $a0, 0x8025
-/* 8B0DA4 80240D34 8C847F50 */  lw        $a0, 0x7f50($a0)
+/* 8B0DA0 80240D30 3C048025 */  lui       $a0, %hi(D_80257F50)
+/* 8B0DA4 80240D34 8C847F50 */  lw        $a0, %lo(D_80257F50)($a0)
 /* 8B0DA8 80240D38 34420010 */  ori       $v0, $v0, 0x10
 /* 8B0DAC 80240D3C AC620000 */  sw        $v0, ($v1)
 /* 8B0DB0 80240D40 8C820000 */  lw        $v0, ($a0)
 /* 8B0DB4 80240D44 34420010 */  ori       $v0, $v0, 0x10
 /* 8B0DB8 80240D48 AC820000 */  sw        $v0, ($a0)
 .L80240D4C:
-/* 8B0DBC 80240D4C 3C048025 */  lui       $a0, 0x8025
-/* 8B0DC0 80240D50 8C847F48 */  lw        $a0, 0x7f48($a0)
+/* 8B0DBC 80240D4C 3C048025 */  lui       $a0, %hi(D_80257F48)
+/* 8B0DC0 80240D50 8C847F48 */  lw        $a0, %lo(D_80257F48)($a0)
 /* 8B0DC4 80240D54 8C85000C */  lw        $a1, 0xc($a0)
 /* 8B0DC8 80240D58 8CA20018 */  lw        $v0, 0x18($a1)
 /* 8B0DCC 80240D5C 8CA30020 */  lw        $v1, 0x20($a1)
@@ -41,8 +41,8 @@ glabel func_80240D18_8B0D88
 .L80240DA4:
 /* 8B0E14 80240DA4 0C016914 */  jal       remove_effect
 /* 8B0E18 80240DA8 ACA00018 */   sw       $zero, 0x18($a1)
-/* 8B0E1C 80240DAC 3C048025 */  lui       $a0, 0x8025
-/* 8B0E20 80240DB0 8C847F2C */  lw        $a0, 0x7f2c($a0)
+/* 8B0E1C 80240DAC 3C048025 */  lui       $a0, %hi(D_80257F2C)
+/* 8B0E20 80240DB0 8C847F2C */  lw        $a0, %lo(D_80257F2C)($a0)
 /* 8B0E24 80240DB4 0C048D70 */  jal       func_801235C0
 /* 8B0E28 80240DB8 00000000 */   nop      
 /* 8B0E2C 80240DBC 24020002 */  addiu     $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240DCC_8B0E3C.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240DCC_8B0E3C.s
index 1874a7eb3e..72b36f4087 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240DCC_8B0E3C.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240DCC_8B0E3C.s
@@ -7,8 +7,8 @@ glabel func_80240DCC_8B0E3C
 /* 8B0E44 80240DD4 8C82000C */  lw        $v0, 0xc($a0)
 /* 8B0E48 80240DD8 0C0B1EAF */  jal       get_variable
 /* 8B0E4C 80240DDC 8C450000 */   lw       $a1, ($v0)
-/* 8B0E50 80240DE0 3C038025 */  lui       $v1, 0x8025
-/* 8B0E54 80240DE4 8C637F48 */  lw        $v1, 0x7f48($v1)
+/* 8B0E50 80240DE0 3C038025 */  lui       $v1, %hi(D_80257F48)
+/* 8B0E54 80240DE4 8C637F48 */  lw        $v1, %lo(D_80257F48)($v1)
 /* 8B0E58 80240DE8 8C63000C */  lw        $v1, 0xc($v1)
 /* 8B0E5C 80240DEC AC620034 */  sw        $v0, 0x34($v1)
 /* 8B0E60 80240DF0 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240E00_8B0E70.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240E00_8B0E70.s
index a2587b98ec..4579ddbfd0 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240E00_8B0E70.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240E00_8B0E70.s
@@ -8,8 +8,8 @@ glabel func_80240E00_8B0E70
 /* 8B0E7C 80240E0C 0C0B1EAF */  jal       get_variable
 /* 8B0E80 80240E10 8C450000 */   lw       $a1, ($v0)
 /* 8B0E84 80240E14 0040202D */  daddu     $a0, $v0, $zero
-/* 8B0E88 80240E18 3C028025 */  lui       $v0, 0x8025
-/* 8B0E8C 80240E1C 8C427F48 */  lw        $v0, 0x7f48($v0)
+/* 8B0E88 80240E18 3C028025 */  lui       $v0, %hi(D_80257F48)
+/* 8B0E8C 80240E1C 8C427F48 */  lw        $v0, %lo(D_80257F48)($v0)
 /* 8B0E90 80240E20 24030001 */  addiu     $v1, $zero, 1
 /* 8B0E94 80240E24 8C45000C */  lw        $a1, 0xc($v0)
 /* 8B0E98 80240E28 1083000D */  beq       $a0, $v1, .L80240E60
diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240E80_8B0EF0.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240E80_8B0EF0.s
index 9206be6fba..d269dd6b1e 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240E80_8B0EF0.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240E80_8B0EF0.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80240E80_8B0EF0
-/* 8B0EF0 80240E80 3C028025 */  lui       $v0, 0x8025
-/* 8B0EF4 80240E84 8C427F50 */  lw        $v0, 0x7f50($v0)
+/* 8B0EF0 80240E80 3C028025 */  lui       $v0, %hi(D_80257F50)
+/* 8B0EF4 80240E84 8C427F50 */  lw        $v0, %lo(D_80257F50)($v0)
 /* 8B0EF8 80240E88 8C42000C */  lw        $v0, 0xc($v0)
 /* 8B0EFC 80240E8C AC40001C */  sw        $zero, 0x1c($v0)
 /* 8B0F00 80240E90 03E00008 */  jr        $ra
diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240E98_8B0F08.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240E98_8B0F08.s
index 7fcc029f45..1e829d60d7 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240E98_8B0F08.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240E98_8B0F08.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80240E98_8B0F08
-/* 8B0F08 80240E98 3C028025 */  lui       $v0, 0x8025
-/* 8B0F0C 80240E9C 8C427F50 */  lw        $v0, 0x7f50($v0)
+/* 8B0F08 80240E98 3C028025 */  lui       $v0, %hi(D_80257F50)
+/* 8B0F0C 80240E9C 8C427F50 */  lw        $v0, %lo(D_80257F50)($v0)
 /* 8B0F10 80240EA0 8C43000C */  lw        $v1, 0xc($v0)
 /* 8B0F14 80240EA4 24020001 */  addiu     $v0, $zero, 1
 /* 8B0F18 80240EA8 AC62001C */  sw        $v0, 0x1c($v1)
diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240EB4_8B0F24.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240EB4_8B0F24.s
index 8838e4e415..4e4256e5b8 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240EB4_8B0F24.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240EB4_8B0F24.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80240EB4_8B0F24
-/* 8B0F24 80240EB4 3C028025 */  lui       $v0, 0x8025
-/* 8B0F28 80240EB8 8C427F50 */  lw        $v0, 0x7f50($v0)
+/* 8B0F24 80240EB4 3C028025 */  lui       $v0, %hi(D_80257F50)
+/* 8B0F28 80240EB8 8C427F50 */  lw        $v0, %lo(D_80257F50)($v0)
 /* 8B0F2C 80240EBC 8C43000C */  lw        $v1, 0xc($v0)
 /* 8B0F30 80240EC0 24020002 */  addiu     $v0, $zero, 2
 /* 8B0F34 80240EC4 03E00008 */  jr        $ra
diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241388_8B13F8.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241388_8B13F8.s
index 9dfb43afab..cd1c366e5c 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241388_8B13F8.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241388_8B13F8.s
@@ -3,8 +3,8 @@
 
 glabel func_80241388_8B13F8
 /* 8B13F8 80241388 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8B13FC 8024138C 3C058025 */  lui       $a1, 0x8025
-/* 8B1400 80241390 8CA57F40 */  lw        $a1, 0x7f40($a1)
+/* 8B13FC 8024138C 3C058025 */  lui       $a1, %hi(D_80257F40)
+/* 8B1400 80241390 8CA57F40 */  lw        $a1, %lo(D_80257F40)($a1)
 /* 8B1404 80241394 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 8B1408 80241398 0C0B1EAF */  jal       get_variable
 /* 8B140C 8024139C 0000202D */   daddu    $a0, $zero, $zero
diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802413F4_8B1464.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802413F4_8B1464.s
index 638f14ce97..ee2693860d 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802413F4_8B1464.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802413F4_8B1464.s
@@ -3,14 +3,14 @@
 
 glabel func_802413F4_8B1464
 /* 8B1464 802413F4 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8B1468 802413F8 3C058024 */  lui       $a1, 0x8024
-/* 8B146C 802413FC 24A51388 */  addiu     $a1, $a1, 0x1388
+/* 8B1468 802413F8 3C058024 */  lui       $a1, %hi(D_80241388)
+/* 8B146C 802413FC 24A51388 */  addiu     $a1, $a1, %lo(D_80241388)
 /* 8B1470 80241400 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 8B1474 80241404 0C048C8F */  jal       bind_dynamic_entity_7
 /* 8B1478 80241408 0000202D */   daddu    $a0, $zero, $zero
 /* 8B147C 8024140C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 8B1480 80241410 3C018025 */  lui       $at, 0x8025
-/* 8B1484 80241414 AC227F2C */  sw        $v0, 0x7f2c($at)
+/* 8B1480 80241410 3C018025 */  lui       $at, %hi(D_80257F2C)
+/* 8B1484 80241414 AC227F2C */  sw        $v0, %lo(D_80257F2C)($at)
 /* 8B1488 80241418 24020002 */  addiu     $v0, $zero, 2
 /* 8B148C 8024141C 03E00008 */  jr        $ra
 /* 8B1490 80241420 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241424_8B1494.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241424_8B1494.s
index f5c6854041..397bfe78fa 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241424_8B1494.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241424_8B1494.s
@@ -35,8 +35,8 @@ glabel func_80241424_8B1494
 /* 8B1508 80241498 08090530 */  j         .L802414C0
 /* 8B150C 8024149C E4800018 */   swc1     $f0, 0x18($a0)
 .L802414A0:
-/* 8B1510 802414A0 3C018025 */  lui       $at, 0x8025
-/* 8B1514 802414A4 D4227D40 */  ldc1      $f2, 0x7d40($at)
+/* 8B1510 802414A0 3C018025 */  lui       $at, %hi(D_80257D40)
+/* 8B1514 802414A4 D4227D40 */  ldc1      $f2, %lo(D_80257D40)($at)
 /* 8B1518 802414A8 44820000 */  mtc1      $v0, $f0
 /* 8B151C 802414AC 00000000 */  nop       
 /* 8B1520 802414B0 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241964_8B19D4.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241964_8B19D4.s
index 50debe542f..052966038b 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241964_8B19D4.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241964_8B19D4.s
@@ -21,16 +21,16 @@ glabel func_80241964_8B19D4
 /* 8B1A14 802419A4 04410009 */  bgez      $v0, .L802419CC
 /* 8B1A18 802419A8 00000000 */   nop      
 /* 8B1A1C 802419AC C640000C */  lwc1      $f0, 0xc($s2)
-/* 8B1A20 802419B0 3C018025 */  lui       $at, 0x8025
-/* 8B1A24 802419B4 D4227D48 */  ldc1      $f2, 0x7d48($at)
+/* 8B1A20 802419B0 3C018025 */  lui       $at, %hi(D_80257D48)
+/* 8B1A24 802419B4 D4227D48 */  ldc1      $f2, %lo(D_80257D48)($at)
 /* 8B1A28 802419B8 46000021 */  cvt.d.s   $f0, $f0
 /* 8B1A2C 802419BC 46220002 */  mul.d     $f0, $f0, $f2
 /* 8B1A30 802419C0 00000000 */  nop       
 /* 8B1A34 802419C4 0809067A */  j         .L802419E8
 /* 8B1A38 802419C8 46200020 */   cvt.s.d  $f0, $f0
 .L802419CC:
-/* 8B1A3C 802419CC 3C018025 */  lui       $at, 0x8025
-/* 8B1A40 802419D0 D4227D50 */  ldc1      $f2, 0x7d50($at)
+/* 8B1A3C 802419CC 3C018025 */  lui       $at, %hi(D_80257D50)
+/* 8B1A40 802419D0 D4227D50 */  ldc1      $f2, %lo(D_80257D50)($at)
 /* 8B1A44 802419D4 44820000 */  mtc1      $v0, $f0
 /* 8B1A48 802419D8 00000000 */  nop       
 /* 8B1A4C 802419DC 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241C18_8B1C88.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241C18_8B1C88.s
index 509cc0f2c6..2ffdd0b108 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241C18_8B1C88.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241C18_8B1C88.s
@@ -102,9 +102,9 @@ glabel func_80241C18_8B1C88
 /* 8B1DF8 80241D88 2C620064 */  sltiu     $v0, $v1, 0x64
 /* 8B1DFC 80241D8C 10400036 */  beqz      $v0, .L80241E68
 /* 8B1E00 80241D90 00031080 */   sll      $v0, $v1, 2
-/* 8B1E04 80241D94 3C018025 */  lui       $at, 0x8025
+/* 8B1E04 80241D94 3C018025 */  lui       $at, %hi(D_80257D58)
 /* 8B1E08 80241D98 00220821 */  addu      $at, $at, $v0
-/* 8B1E0C 80241D9C 8C227D58 */  lw        $v0, 0x7d58($at)
+/* 8B1E0C 80241D9C 8C227D58 */  lw        $v0, %lo(D_80257D58)($at)
 /* 8B1E10 80241DA0 00400008 */  jr        $v0
 /* 8B1E14 80241DA4 00000000 */   nop      
 /* 8B1E18 80241DA8 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024226C_8B22DC.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024226C_8B22DC.s
index 5cbe7d8783..bbe9dcbe3d 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024226C_8B22DC.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024226C_8B22DC.s
@@ -6,11 +6,11 @@ glabel func_8024226C_8B22DC
 /* 8B22E0 80242270 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 8B22E4 80242274 10A00003 */  beqz      $a1, .L80242284
 /* 8B22E8 80242278 8C86000C */   lw       $a2, 0xc($a0)
-/* 8B22EC 8024227C 3C018024 */  lui       $at, 0x8024
-/* 8B22F0 80242280 AC207E30 */  sw        $zero, 0x7e30($at)
+/* 8B22EC 8024227C 3C018024 */  lui       $at, %hi(D_80247E30)
+/* 8B22F0 80242280 AC207E30 */  sw        $zero, %lo(D_80247E30)($at)
 .L80242284:
-/* 8B22F4 80242284 3C038024 */  lui       $v1, 0x8024
-/* 8B22F8 80242288 24637E30 */  addiu     $v1, $v1, 0x7e30
+/* 8B22F4 80242284 3C038024 */  lui       $v1, %hi(D_80247E30)
+/* 8B22F8 80242288 24637E30 */  addiu     $v1, $v1, %lo(D_80247E30)
 /* 8B22FC 8024228C 8C620000 */  lw        $v0, ($v1)
 /* 8B2300 80242290 54400003 */  bnel      $v0, $zero, .L802422A0
 /* 8B2304 80242294 AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_8024226C_8B22DC
 /* 8B230C 8024229C 0000102D */   daddu    $v0, $zero, $zero
 .L802422A0:
 /* 8B2310 802422A0 8CC50000 */  lw        $a1, ($a2)
-/* 8B2314 802422A4 3C068024 */  lui       $a2, 0x8024
+/* 8B2314 802422A4 3C068024 */  lui       $a2, %hi(D_80247E34)
 /* 8B2318 802422A8 0C0B2026 */  jal       set_variable
-/* 8B231C 802422AC 8CC67E34 */   lw       $a2, 0x7e34($a2)
+/* 8B231C 802422AC 8CC67E34 */   lw       $a2, %lo(D_80247E34)($a2)
 /* 8B2320 802422B0 24020002 */  addiu     $v0, $zero, 2
 .L802422B4:
 /* 8B2324 802422B4 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802422C0_8B2330.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802422C0_8B2330.s
index 37147cd1ff..f49ec75cdd 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802422C0_8B2330.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802422C0_8B2330.s
@@ -7,12 +7,12 @@ glabel func_802422C0_8B2330
 /* 8B2338 802422C8 8C82000C */  lw        $v0, 0xc($a0)
 /* 8B233C 802422CC 0C0B1EAF */  jal       get_variable
 /* 8B2340 802422D0 8C450000 */   lw       $a1, ($v0)
-/* 8B2344 802422D4 3C018024 */  lui       $at, 0x8024
-/* 8B2348 802422D8 AC227E34 */  sw        $v0, 0x7e34($at)
+/* 8B2344 802422D4 3C018024 */  lui       $at, %hi(D_80247E34)
+/* 8B2348 802422D8 AC227E34 */  sw        $v0, %lo(D_80247E34)($at)
 /* 8B234C 802422DC 24020002 */  addiu     $v0, $zero, 2
 /* 8B2350 802422E0 8FBF0010 */  lw        $ra, 0x10($sp)
 /* 8B2354 802422E4 24030001 */  addiu     $v1, $zero, 1
-/* 8B2358 802422E8 3C018024 */  lui       $at, 0x8024
-/* 8B235C 802422EC AC237E30 */  sw        $v1, 0x7e30($at)
+/* 8B2358 802422E8 3C018024 */  lui       $at, %hi(D_80247E30)
+/* 8B235C 802422EC AC237E30 */  sw        $v1, %lo(D_80247E30)($at)
 /* 8B2360 802422F0 03E00008 */  jr        $ra
 /* 8B2364 802422F4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802422F8_8B2368.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802422F8_8B2368.s
index fd66987151..7dce972a11 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802422F8_8B2368.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802422F8_8B2368.s
@@ -13,8 +13,8 @@ glabel func_802422F8_8B2368
 /* 8B2388 80242318 8C620000 */  lw        $v0, ($v1)
 /* 8B238C 8024231C 5040000A */  beql      $v0, $zero, .L80242348
 /* 8B2390 80242320 00041080 */   sll      $v0, $a0, 2
-/* 8B2394 80242324 3C058025 */  lui       $a1, 0x8025
-/* 8B2398 80242328 24A57F58 */  addiu     $a1, $a1, 0x7f58
+/* 8B2394 80242324 3C058025 */  lui       $a1, %hi(D_80257F58)
+/* 8B2398 80242328 24A57F58 */  addiu     $a1, $a1, %lo(D_80257F58)
 .L8024232C:
 /* 8B239C 8024232C 24630004 */  addiu     $v1, $v1, 4
 /* 8B23A0 80242330 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_802422F8_8B2368
 /* 8B23B0 80242340 24A50004 */   addiu    $a1, $a1, 4
 /* 8B23B4 80242344 00041080 */  sll       $v0, $a0, 2
 .L80242348:
-/* 8B23B8 80242348 3C018025 */  lui       $at, 0x8025
+/* 8B23B8 80242348 3C018025 */  lui       $at, %hi(D_80257F58)
 /* 8B23BC 8024234C 00220821 */  addu      $at, $at, $v0
-/* 8B23C0 80242350 AC207F58 */  sw        $zero, 0x7f58($at)
+/* 8B23C0 80242350 AC207F58 */  sw        $zero, %lo(D_80257F58)($at)
 /* 8B23C4 80242354 080908E1 */  j         .L80242384
 /* 8B23C8 80242358 00000000 */   nop      
 .L8024235C:
-/* 8B23CC 8024235C 3C038025 */  lui       $v1, 0x8025
-/* 8B23D0 80242360 24637F58 */  addiu     $v1, $v1, 0x7f58
+/* 8B23CC 8024235C 3C038025 */  lui       $v1, %hi(D_80257F58)
+/* 8B23D0 80242360 24637F58 */  addiu     $v1, $v1, %lo(D_80257F58)
 /* 8B23D4 80242364 0060282D */  daddu     $a1, $v1, $zero
 .L80242368:
 /* 8B23D8 80242368 24820010 */  addiu     $v0, $a0, 0x10
diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242394_8B2404.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242394_8B2404.s
index 918a0fb956..92159dcdf3 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242394_8B2404.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242394_8B2404.s
@@ -17,10 +17,10 @@ glabel func_80242394_8B2404
 /* 8B2434 802423C4 0040802D */   daddu    $s0, $v0, $zero
 /* 8B2438 802423C8 0200202D */  daddu     $a0, $s0, $zero
 /* 8B243C 802423CC 00021080 */  sll       $v0, $v0, 2
-/* 8B2440 802423D0 3C108025 */  lui       $s0, 0x8025
+/* 8B2440 802423D0 3C108025 */  lui       $s0, %hi(D_802480AC)
 /* 8B2444 802423D4 02028021 */  addu      $s0, $s0, $v0
 /* 8B2448 802423D8 0C00FB3A */  jal       get_enemy
-/* 8B244C 802423DC 8E1080AC */   lw       $s0, -0x7f54($s0)
+/* 8B244C 802423DC 8E1080AC */   lw       $s0, %lo(D_802480AC)($s0)
 /* 8B2450 802423E0 0040302D */  daddu     $a2, $v0, $zero
 /* 8B2454 802423E4 0000282D */  daddu     $a1, $zero, $zero
 .L802423E8:
diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802426A0_8B2710.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802426A0_8B2710.s
index 099096301d..225f9e12e4 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802426A0_8B2710.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802426A0_8B2710.s
@@ -15,7 +15,7 @@ glabel func_802426A0_8B2710
 /* 8B2738 802426C8 8FBF0014 */  lw        $ra, 0x14($sp)
 /* 8B273C 802426CC 8FB00010 */  lw        $s0, 0x10($sp)
 /* 8B2740 802426D0 24020002 */  addiu     $v0, $zero, 2
-/* 8B2744 802426D4 3C018026 */  lui       $at, 0x8026
-/* 8B2748 802426D8 AC23811C */  sw        $v1, -0x7ee4($at)
+/* 8B2744 802426D4 3C018026 */  lui       $at, %hi(D_8025811C)
+/* 8B2748 802426D8 AC23811C */  sw        $v1, %lo(D_8025811C)($at)
 /* 8B274C 802426DC 03E00008 */  jr        $ra
 /* 8B2750 802426E0 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802426E4_8B2754.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802426E4_8B2754.s
index a98eaf9032..7eb5a997da 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802426E4_8B2754.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802426E4_8B2754.s
@@ -6,8 +6,8 @@ glabel func_802426E4_8B2754
 /* 8B2758 802426E8 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 8B275C 802426EC 0C00EABB */  jal       get_npc_unsafe
 /* 8B2760 802426F0 8C84008C */   lw       $a0, 0x8c($a0)
-/* 8B2764 802426F4 3C038026 */  lui       $v1, 0x8026
-/* 8B2768 802426F8 8C63811C */  lw        $v1, -0x7ee4($v1)
+/* 8B2764 802426F4 3C038026 */  lui       $v1, %hi(D_8025811C)
+/* 8B2768 802426F8 8C63811C */  lw        $v1, %lo(D_8025811C)($v1)
 /* 8B276C 802426FC AC430028 */  sw        $v1, 0x28($v0)
 /* 8B2770 80242700 8FBF0010 */  lw        $ra, 0x10($sp)
 /* 8B2774 80242704 24020002 */  addiu     $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242734_8B27A4.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242734_8B27A4.s
index 86e850cebd..c3eb28a13b 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242734_8B27A4.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242734_8B27A4.s
@@ -3,14 +3,14 @@
 
 glabel func_80242734_8B27A4
 /* 8B27A4 80242734 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8B27A8 80242738 3C048026 */  lui       $a0, 0x8026
-/* 8B27AC 8024273C 24848120 */  addiu     $a0, $a0, -0x7ee0
-/* 8B27B0 80242740 3C028025 */  lui       $v0, 0x8025
-/* 8B27B4 80242744 24427B00 */  addiu     $v0, $v0, 0x7b00
+/* 8B27A8 80242738 3C048026 */  lui       $a0, %hi(D_80258120)
+/* 8B27AC 8024273C 24848120 */  addiu     $a0, $a0, %lo(D_80258120)
+/* 8B27B0 80242740 3C028025 */  lui       $v0, %hi(D_80257B00)
+/* 8B27B4 80242744 24427B00 */  addiu     $v0, $v0, %lo(D_80257B00)
 /* 8B27B8 80242748 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 8B27BC 8024274C AC820000 */  sw        $v0, ($a0)
-/* 8B27C0 80242750 3C028025 */  lui       $v0, 0x8025
-/* 8B27C4 80242754 24427D00 */  addiu     $v0, $v0, 0x7d00
+/* 8B27C0 80242750 3C028025 */  lui       $v0, %hi(D_80257D00)
+/* 8B27C4 80242754 24427D00 */  addiu     $v0, $v0, %lo(D_80257D00)
 /* 8B27C8 80242758 AC820004 */  sw        $v0, 4($a0)
 /* 8B27CC 8024275C 24020020 */  addiu     $v0, $zero, 0x20
 /* 8B27D0 80242760 A4820008 */  sh        $v0, 8($a0)
diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024295C_8B29CC.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024295C_8B29CC.s
index 83765e8988..a5251f64b0 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024295C_8B29CC.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024295C_8B29CC.s
@@ -38,21 +38,21 @@ glabel func_8024295C_8B29CC
 /* 8B2A50 802429E0 0040A82D */   daddu    $s5, $v0, $zero
 /* 8B2A54 802429E4 1220000B */  beqz      $s1, .L80242A14
 /* 8B2A58 802429E8 0040802D */   daddu    $s0, $v0, $zero
-/* 8B2A5C 802429EC 3C048025 */  lui       $a0, 0x8025
-/* 8B2A60 802429F0 24847F20 */  addiu     $a0, $a0, 0x7f20
-/* 8B2A64 802429F4 3C058025 */  lui       $a1, 0x8025
-/* 8B2A68 802429F8 24A57F21 */  addiu     $a1, $a1, 0x7f21
-/* 8B2A6C 802429FC 3C068025 */  lui       $a2, 0x8025
-/* 8B2A70 80242A00 24C67F22 */  addiu     $a2, $a2, 0x7f22
-/* 8B2A74 80242A04 3C078025 */  lui       $a3, 0x8025
+/* 8B2A5C 802429EC 3C048025 */  lui       $a0, %hi(D_80257F20)
+/* 8B2A60 802429F0 24847F20 */  addiu     $a0, $a0, %lo(D_80257F20)
+/* 8B2A64 802429F4 3C058025 */  lui       $a1, %hi(D_80257F21)
+/* 8B2A68 802429F8 24A57F21 */  addiu     $a1, $a1, %lo(D_80257F21)
+/* 8B2A6C 802429FC 3C068025 */  lui       $a2, %hi(D_80257F22)
+/* 8B2A70 80242A00 24C67F22 */  addiu     $a2, $a2, %lo(D_80257F22)
+/* 8B2A74 80242A04 3C078025 */  lui       $a3, %hi(D_80257F23)
 /* 8B2A78 80242A08 0C046FA0 */  jal       get_background_color_blend
-/* 8B2A7C 80242A0C 24E77F23 */   addiu    $a3, $a3, 0x7f23
+/* 8B2A7C 80242A0C 24E77F23 */   addiu    $a3, $a3, %lo(D_80257F23)
 /* 8B2A80 80242A10 AE400070 */  sw        $zero, 0x70($s2)
 .L80242A14:
 /* 8B2A84 80242A14 1A000053 */  blez      $s0, .L80242B64
 /* 8B2A88 80242A18 32C400FF */   andi     $a0, $s6, 0xff
-/* 8B2A8C 80242A1C 3C048025 */  lui       $a0, 0x8025
-/* 8B2A90 80242A20 90847F20 */  lbu       $a0, 0x7f20($a0)
+/* 8B2A8C 80242A1C 3C048025 */  lui       $a0, %hi(D_80257F20)
+/* 8B2A90 80242A20 90847F20 */  lbu       $a0, %lo(D_80257F20)($a0)
 /* 8B2A94 80242A24 8E430070 */  lw        $v1, 0x70($s2)
 /* 8B2A98 80242A28 02C41023 */  subu      $v0, $s6, $a0
 /* 8B2A9C 80242A2C 00430018 */  mult      $v0, $v1
@@ -70,8 +70,8 @@ glabel func_8024295C_8B29CC
 /* 8B2AC8 80242A58 0006000D */  break     6
 .L80242A5C:
 /* 8B2ACC 80242A5C 00005012 */   mflo     $t2
-/* 8B2AD0 80242A60 3C058025 */  lui       $a1, 0x8025
-/* 8B2AD4 80242A64 90A57F21 */  lbu       $a1, 0x7f21($a1)
+/* 8B2AD0 80242A60 3C058025 */  lui       $a1, %hi(D_80257F21)
+/* 8B2AD4 80242A64 90A57F21 */  lbu       $a1, %lo(D_80257F21)($a1)
 /* 8B2AD8 80242A68 02851023 */  subu      $v0, $s4, $a1
 /* 8B2ADC 80242A6C 00430018 */  mult      $v0, $v1
 /* 8B2AE0 80242A70 00004012 */  mflo      $t0
@@ -88,8 +88,8 @@ glabel func_8024295C_8B29CC
 /* 8B2B08 80242A98 0006000D */  break     6
 .L80242A9C:
 /* 8B2B0C 80242A9C 00004812 */   mflo     $t1
-/* 8B2B10 80242AA0 3C068025 */  lui       $a2, 0x8025
-/* 8B2B14 80242AA4 90C67F22 */  lbu       $a2, 0x7f22($a2)
+/* 8B2B10 80242AA0 3C068025 */  lui       $a2, %hi(D_80257F22)
+/* 8B2B14 80242AA4 90C67F22 */  lbu       $a2, %lo(D_80257F22)($a2)
 /* 8B2B18 80242AA8 02661023 */  subu      $v0, $s3, $a2
 /* 8B2B1C 80242AAC 00430018 */  mult      $v0, $v1
 /* 8B2B20 80242AB0 00004012 */  mflo      $t0
@@ -106,8 +106,8 @@ glabel func_8024295C_8B29CC
 /* 8B2B48 80242AD8 0006000D */  break     6
 .L80242ADC:
 /* 8B2B4C 80242ADC 00004012 */   mflo     $t0
-/* 8B2B50 80242AE0 3C078025 */  lui       $a3, 0x8025
-/* 8B2B54 80242AE4 90E77F23 */  lbu       $a3, 0x7f23($a3)
+/* 8B2B50 80242AE0 3C078025 */  lui       $a3, %hi(D_80257F23)
+/* 8B2B54 80242AE4 90E77F23 */  lbu       $a3, %lo(D_80257F23)($a3)
 /* 8B2B58 80242AE8 02A71023 */  subu      $v0, $s5, $a3
 /* 8B2B5C 80242AEC 00430018 */  mult      $v0, $v1
 /* 8B2B60 80242AF0 00001812 */  mflo      $v1
diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242BA8_8B2C18.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242BA8_8B2C18.s
index a091951d4b..51a142d403 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242BA8_8B2C18.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242BA8_8B2C18.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80242BA8_8B2C18
-/* 8B2C18 80242BA8 3C038015 */  lui       $v1, 0x8015
-/* 8B2C1C 80242BAC 8C6312F0 */  lw        $v1, 0x12f0($v1)
+/* 8B2C18 80242BA8 3C038015 */  lui       $v1, %hi(D_801512F0)
+/* 8B2C1C 80242BAC 8C6312F0 */  lw        $v1, %lo(D_801512F0)($v1)
 /* 8B2C20 80242BB0 24020001 */  addiu     $v0, $zero, 1
 /* 8B2C24 80242BB4 A0620000 */  sb        $v0, ($v1)
 /* 8B2C28 80242BB8 03E00008 */  jr        $ra
diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242BC0_8B2C30.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242BC0_8B2C30.s
index 50a7e42deb..43b8985912 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242BC0_8B2C30.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242BC0_8B2C30.s
@@ -50,27 +50,27 @@ glabel func_80242BC0_8B2C30
 /* 8B2CE4 80242C74 0040F02D */   daddu    $fp, $v0, $zero
 /* 8B2CE8 80242C78 12200011 */  beqz      $s1, .L80242CC0
 /* 8B2CEC 80242C7C 0040802D */   daddu    $s0, $v0, $zero
-/* 8B2CF0 80242C80 3C048025 */  lui       $a0, 0x8025
-/* 8B2CF4 80242C84 24847F24 */  addiu     $a0, $a0, 0x7f24
-/* 8B2CF8 80242C88 3C058025 */  lui       $a1, 0x8025
-/* 8B2CFC 80242C8C 24A57F25 */  addiu     $a1, $a1, 0x7f25
-/* 8B2D00 80242C90 3C068025 */  lui       $a2, 0x8025
-/* 8B2D04 80242C94 24C67F26 */  addiu     $a2, $a2, 0x7f26
-/* 8B2D08 80242C98 3C078025 */  lui       $a3, 0x8025
-/* 8B2D0C 80242C9C 24E77F27 */  addiu     $a3, $a3, 0x7f27
-/* 8B2D10 80242CA0 3C028025 */  lui       $v0, 0x8025
-/* 8B2D14 80242CA4 24427F28 */  addiu     $v0, $v0, 0x7f28
+/* 8B2CF0 80242C80 3C048025 */  lui       $a0, %hi(D_80257F24)
+/* 8B2CF4 80242C84 24847F24 */  addiu     $a0, $a0, %lo(D_80257F24)
+/* 8B2CF8 80242C88 3C058025 */  lui       $a1, %hi(D_80257F25)
+/* 8B2CFC 80242C8C 24A57F25 */  addiu     $a1, $a1, %lo(D_80257F25)
+/* 8B2D00 80242C90 3C068025 */  lui       $a2, %hi(D_80257F26)
+/* 8B2D04 80242C94 24C67F26 */  addiu     $a2, $a2, %lo(D_80257F26)
+/* 8B2D08 80242C98 3C078025 */  lui       $a3, %hi(D_80257F27)
+/* 8B2D0C 80242C9C 24E77F27 */  addiu     $a3, $a3, %lo(D_80257F27)
+/* 8B2D10 80242CA0 3C028025 */  lui       $v0, %hi(D_80257F28)
+/* 8B2D14 80242CA4 24427F28 */  addiu     $v0, $v0, %lo(D_80257F28)
 /* 8B2D18 80242CA8 AFA20010 */  sw        $v0, 0x10($sp)
-/* 8B2D1C 80242CAC 3C028025 */  lui       $v0, 0x8025
-/* 8B2D20 80242CB0 24427F29 */  addiu     $v0, $v0, 0x7f29
+/* 8B2D1C 80242CAC 3C028025 */  lui       $v0, %hi(D_80257F29)
+/* 8B2D20 80242CB0 24427F29 */  addiu     $v0, $v0, %lo(D_80257F29)
 /* 8B2D24 80242CB4 0C046FF5 */  jal       func_8011BFD4
 /* 8B2D28 80242CB8 AFA20014 */   sw       $v0, 0x14($sp)
 /* 8B2D2C 80242CBC AE400070 */  sw        $zero, 0x70($s2)
 .L80242CC0:
 /* 8B2D30 80242CC0 1A00007A */  blez      $s0, .L80242EAC
 /* 8B2D34 80242CC4 32C400FF */   andi     $a0, $s6, 0xff
-/* 8B2D38 80242CC8 3C048025 */  lui       $a0, 0x8025
-/* 8B2D3C 80242CCC 90847F24 */  lbu       $a0, 0x7f24($a0)
+/* 8B2D38 80242CC8 3C048025 */  lui       $a0, %hi(D_80257F24)
+/* 8B2D3C 80242CCC 90847F24 */  lbu       $a0, %lo(D_80257F24)($a0)
 /* 8B2D40 80242CD0 8E480070 */  lw        $t0, 0x70($s2)
 /* 8B2D44 80242CD4 02C41023 */  subu      $v0, $s6, $a0
 /* 8B2D48 80242CD8 00480018 */  mult      $v0, $t0
@@ -88,8 +88,8 @@ glabel func_80242BC0_8B2C30
 /* 8B2D74 80242D04 0006000D */  break     6
 .L80242D08:
 /* 8B2D78 80242D08 00006812 */   mflo     $t5
-/* 8B2D7C 80242D0C 3C058025 */  lui       $a1, 0x8025
-/* 8B2D80 80242D10 90A57F25 */  lbu       $a1, 0x7f25($a1)
+/* 8B2D7C 80242D0C 3C058025 */  lui       $a1, %hi(D_80257F25)
+/* 8B2D80 80242D10 90A57F25 */  lbu       $a1, %lo(D_80257F25)($a1)
 /* 8B2D84 80242D14 02A51023 */  subu      $v0, $s5, $a1
 /* 8B2D88 80242D18 00480018 */  mult      $v0, $t0
 /* 8B2D8C 80242D1C 00001812 */  mflo      $v1
@@ -106,8 +106,8 @@ glabel func_80242BC0_8B2C30
 /* 8B2DB4 80242D44 0006000D */  break     6
 .L80242D48:
 /* 8B2DB8 80242D48 00006012 */   mflo     $t4
-/* 8B2DBC 80242D4C 3C068025 */  lui       $a2, 0x8025
-/* 8B2DC0 80242D50 90C67F26 */  lbu       $a2, 0x7f26($a2)
+/* 8B2DBC 80242D4C 3C068025 */  lui       $a2, %hi(D_80257F26)
+/* 8B2DC0 80242D50 90C67F26 */  lbu       $a2, %lo(D_80257F26)($a2)
 /* 8B2DC4 80242D54 02861023 */  subu      $v0, $s4, $a2
 /* 8B2DC8 80242D58 00480018 */  mult      $v0, $t0
 /* 8B2DCC 80242D5C 00001812 */  mflo      $v1
@@ -124,8 +124,8 @@ glabel func_80242BC0_8B2C30
 /* 8B2DF4 80242D84 0006000D */  break     6
 .L80242D88:
 /* 8B2DF8 80242D88 00005812 */   mflo     $t3
-/* 8B2DFC 80242D8C 3C038025 */  lui       $v1, 0x8025
-/* 8B2E00 80242D90 90637F28 */  lbu       $v1, 0x7f28($v1)
+/* 8B2DFC 80242D8C 3C038025 */  lui       $v1, %hi(D_80257F28)
+/* 8B2E00 80242D90 90637F28 */  lbu       $v1, %lo(D_80257F28)($v1)
 /* 8B2E04 80242D94 02631023 */  subu      $v0, $s3, $v1
 /* 8B2E08 80242D98 00480018 */  mult      $v0, $t0
 /* 8B2E0C 80242D9C 00004812 */  mflo      $t1
@@ -142,8 +142,8 @@ glabel func_80242BC0_8B2C30
 /* 8B2E34 80242DC4 0006000D */  break     6
 .L80242DC8:
 /* 8B2E38 80242DC8 00004812 */   mflo     $t1
-/* 8B2E3C 80242DCC 3C078025 */  lui       $a3, 0x8025
-/* 8B2E40 80242DD0 90E77F27 */  lbu       $a3, 0x7f27($a3)
+/* 8B2E3C 80242DCC 3C078025 */  lui       $a3, %hi(D_80257F27)
+/* 8B2E40 80242DD0 90E77F27 */  lbu       $a3, %lo(D_80257F27)($a3)
 /* 8B2E44 80242DD4 02E71023 */  subu      $v0, $s7, $a3
 /* 8B2E48 80242DD8 00480018 */  mult      $v0, $t0
 /* 8B2E4C 80242DDC 00004012 */  mflo      $t0
@@ -160,8 +160,8 @@ glabel func_80242BC0_8B2C30
 /* 8B2E74 80242E04 0006000D */  break     6
 .L80242E08:
 /* 8B2E78 80242E08 00005012 */   mflo     $t2
-/* 8B2E7C 80242E0C 3C088025 */  lui       $t0, 0x8025
-/* 8B2E80 80242E10 91087F29 */  lbu       $t0, 0x7f29($t0)
+/* 8B2E7C 80242E0C 3C088025 */  lui       $t0, %hi(D_80257F29)
+/* 8B2E80 80242E10 91087F29 */  lbu       $t0, %lo(D_80257F29)($t0)
 /* 8B2E84 80242E14 00691821 */  addu      $v1, $v1, $t1
 /* 8B2E88 80242E18 306300FF */  andi      $v1, $v1, 0xff
 /* 8B2E8C 80242E1C AFA30010 */  sw        $v1, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242F7C_8B2FEC.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242F7C_8B2FEC.s
index 8e13b3b310..7108dc750d 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242F7C_8B2FEC.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242F7C_8B2FEC.s
@@ -14,9 +14,9 @@ glabel func_80242F7C_8B2FEC
 /* 8B3010 80242FA0 8E23014C */  lw        $v1, 0x14c($s1)
 /* 8B3014 80242FA4 AE220078 */  sw        $v0, 0x78($s1)
 /* 8B3018 80242FA8 00031840 */  sll       $v1, $v1, 1
-/* 8B301C 80242FAC 3C028025 */  lui       $v0, 0x8025
+/* 8B301C 80242FAC 3C028025 */  lui       $v0, %hi(D_8024E538)
 /* 8B3020 80242FB0 00431021 */  addu      $v0, $v0, $v1
-/* 8B3024 80242FB4 8442E538 */  lh        $v0, -0x1ac8($v0)
+/* 8B3024 80242FB4 8442E538 */  lh        $v0, %lo(D_8024E538)($v0)
 /* 8B3028 80242FB8 AE22007C */  sw        $v0, 0x7c($s1)
 .L80242FBC:
 /* 8B302C 80242FBC 8E22007C */  lw        $v0, 0x7c($s1)
diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243134_8B31A4.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243134_8B31A4.s
index dc1dd907dc..24dbe34424 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243134_8B31A4.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243134_8B31A4.s
@@ -26,9 +26,9 @@ glabel func_80243134_8B31A4
 /* 8B31F8 80243188 000320C0 */  sll       $a0, $v1, 3
 /* 8B31FC 8024318C 00641821 */  addu      $v1, $v1, $a0
 /* 8B3200 80243190 000318C0 */  sll       $v1, $v1, 3
-/* 8B3204 80243194 3C01800B */  lui       $at, 0x800b
+/* 8B3204 80243194 3C01800B */  lui       $at, %hi(D_800B1D98)
 /* 8B3208 80243198 00230821 */  addu      $at, $at, $v1
-/* 8B320C 8024319C E4201D98 */  swc1      $f0, 0x1d98($at)
+/* 8B320C 8024319C E4201D98 */  swc1      $f0, %lo(D_800B1D98)($at)
 /* 8B3210 802431A0 8FBF0018 */  lw        $ra, 0x18($sp)
 /* 8B3214 802431A4 8FB10014 */  lw        $s1, 0x14($sp)
 /* 8B3218 802431A8 8FB00010 */  lw        $s0, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243514_8B3584.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243514_8B3584.s
index 036e198e12..1171cb7967 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243514_8B3584.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243514_8B3584.s
@@ -51,8 +51,8 @@ glabel func_80243514_8B3584
 /* 8B3638 802435C8 44811000 */  mtc1      $at, $f2
 /* 8B363C 802435CC 00000000 */  nop       
 /* 8B3640 802435D0 46001081 */  sub.s     $f2, $f2, $f0
-/* 8B3644 802435D4 3C018025 */  lui       $at, 0x8025
-/* 8B3648 802435D8 D4207F08 */  ldc1      $f0, 0x7f08($at)
+/* 8B3644 802435D4 3C018025 */  lui       $at, %hi(D_80257F08)
+/* 8B3648 802435D8 D4207F08 */  ldc1      $f0, %lo(D_80257F08)($at)
 /* 8B364C 802435DC 460010A1 */  cvt.d.s   $f2, $f2
 /* 8B3650 802435E0 46201082 */  mul.d     $f2, $f2, $f0
 /* 8B3654 802435E4 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B36B0/func_8024366C_8B36DC.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B36B0/func_8024366C_8B36DC.s
index 990d57dc19..856506e5d2 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_02/8B36B0/func_8024366C_8B36DC.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B36B0/func_8024366C_8B36DC.s
@@ -17,10 +17,10 @@ glabel func_8024366C_8B36DC
 /* 8B370C 8024369C 0040802D */   daddu    $s0, $v0, $zero
 /* 8B3710 802436A0 0200202D */  daddu     $a0, $s0, $zero
 /* 8B3714 802436A4 00021080 */  sll       $v0, $v0, 2
-/* 8B3718 802436A8 3C108025 */  lui       $s0, 0x8025
+/* 8B3718 802436A8 3C108025 */  lui       $s0, %hi(D_8025578C)
 /* 8B371C 802436AC 02028021 */  addu      $s0, $s0, $v0
 /* 8B3720 802436B0 0C00FB3A */  jal       get_enemy
-/* 8B3724 802436B4 8E10578C */   lw       $s0, 0x578c($s0)
+/* 8B3724 802436B4 8E10578C */   lw       $s0, %lo(D_8025578C)($s0)
 /* 8B3728 802436B8 0040302D */  daddu     $a2, $v0, $zero
 /* 8B372C 802436BC 0000282D */  daddu     $a1, $zero, $zero
 .L802436C0:
diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B3A10/func_802439A0_8B3A10.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B3A10/func_802439A0_8B3A10.s
index a0aa881904..dfccf84a8e 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_02/8B3A10/func_802439A0_8B3A10.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B3A10/func_802439A0_8B3A10.s
@@ -3,8 +3,8 @@
 
 glabel func_802439A0_8B3A10
 /* 8B3A10 802439A0 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 8B3A14 802439A4 3C048025 */  lui       $a0, 0x8025
-/* 8B3A18 802439A8 24847F10 */  addiu     $a0, $a0, 0x7f10
+/* 8B3A14 802439A4 3C048025 */  lui       $a0, %hi(D_80257F10)
+/* 8B3A18 802439A8 24847F10 */  addiu     $a0, $a0, %lo(D_80257F10)
 /* 8B3A1C 802439AC 27A50010 */  addiu     $a1, $sp, 0x10
 /* 8B3A20 802439B0 AFBF0020 */  sw        $ra, 0x20($sp)
 /* 8B3A24 802439B4 AFB1001C */  sw        $s1, 0x1c($sp)
@@ -12,16 +12,16 @@ glabel func_802439A0_8B3A10
 /* 8B3A2C 802439BC AFB00018 */   sw       $s0, 0x18($sp)
 /* 8B3A30 802439C0 0040802D */  daddu     $s0, $v0, $zero
 /* 8B3A34 802439C4 0200202D */  daddu     $a0, $s0, $zero
-/* 8B3A38 802439C8 3C118026 */  lui       $s1, 0x8026
-/* 8B3A3C 802439CC 26318140 */  addiu     $s1, $s1, -0x7ec0
+/* 8B3A38 802439C8 3C118026 */  lui       $s1, %hi(D_80258140)
+/* 8B3A3C 802439CC 26318140 */  addiu     $s1, $s1, %lo(D_80258140)
 /* 8B3A40 802439D0 0C01BB7C */  jal       decode_yay0
 /* 8B3A44 802439D4 0220282D */   daddu    $a1, $s1, $zero
 /* 8B3A48 802439D8 0C00AB1E */  jal       general_heap_free
 /* 8B3A4C 802439DC 0200202D */   daddu    $a0, $s0, $zero
-/* 8B3A50 802439E0 3C048026 */  lui       $a0, 0x8026
-/* 8B3A54 802439E4 2484C0D0 */  addiu     $a0, $a0, -0x3f30
-/* 8B3A58 802439E8 3C028026 */  lui       $v0, 0x8026
-/* 8B3A5C 802439EC 24428340 */  addiu     $v0, $v0, -0x7cc0
+/* 8B3A50 802439E0 3C048026 */  lui       $a0, %hi(D_8025C0D0)
+/* 8B3A54 802439E4 2484C0D0 */  addiu     $a0, $a0, %lo(D_8025C0D0)
+/* 8B3A58 802439E8 3C028026 */  lui       $v0, %hi(D_80258340)
+/* 8B3A5C 802439EC 24428340 */  addiu     $v0, $v0, %lo(D_80258340)
 /* 8B3A60 802439F0 AC820000 */  sw        $v0, ($a0)
 /* 8B3A64 802439F4 24020096 */  addiu     $v0, $zero, 0x96
 /* 8B3A68 802439F8 A4820008 */  sh        $v0, 8($a0)
diff --git a/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_802402C8_8CABC8.s b/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_802402C8_8CABC8.s
index 86b25a34dc..fe9c60fbff 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_802402C8_8CABC8.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_802402C8_8CABC8.s
@@ -4,8 +4,8 @@
 glabel func_802402C8_8CABC8
 /* 8CABC8 802402C8 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* 8CABCC 802402CC AFB00010 */  sw        $s0, 0x10($sp)
-/* 8CABD0 802402D0 3C108024 */  lui       $s0, 0x8024
-/* 8CABD4 802402D4 261029F4 */  addiu     $s0, $s0, 0x29f4
+/* 8CABD0 802402D0 3C108024 */  lui       $s0, %hi(D_802429F4)
+/* 8CABD4 802402D4 261029F4 */  addiu     $s0, $s0, %lo(D_802429F4)
 /* 8CABD8 802402D8 AFBF0018 */  sw        $ra, 0x18($sp)
 /* 8CABDC 802402DC AFB10014 */  sw        $s1, 0x14($sp)
 /* 8CABE0 802402E0 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_802402C8_8CABC8
 /* 8CAC44 80240344 28620010 */  slti      $v0, $v1, 0x10
 /* 8CAC48 80240348 1440FFFA */  bnez      $v0, .L80240334
 /* 8CAC4C 8024034C 24840004 */   addiu    $a0, $a0, 4
-/* 8CAC50 80240350 3C108024 */  lui       $s0, 0x8024
-/* 8CAC54 80240354 261029F4 */  addiu     $s0, $s0, 0x29f4
+/* 8CAC50 80240350 3C108024 */  lui       $s0, %hi(D_802429F4)
+/* 8CAC54 80240354 261029F4 */  addiu     $s0, $s0, %lo(D_802429F4)
 /* 8CAC58 80240358 0C00AB4B */  jal       heap_free
 /* 8CAC5C 8024035C 8E040000 */   lw       $a0, ($s0)
 /* 8CAC60 80240360 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_802403E0_8CACE0.s b/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_802403E0_8CACE0.s
index 3dcf2177e0..0c3511ba4a 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_802403E0_8CACE0.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_802403E0_8CACE0.s
@@ -3,14 +3,14 @@
 
 glabel func_802403E0_8CACE0
 /* 8CACE0 802403E0 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8CACE4 802403E4 3C048024 */  lui       $a0, 0x8024
-/* 8CACE8 802403E8 24843770 */  addiu     $a0, $a0, 0x3770
-/* 8CACEC 802403EC 3C028024 */  lui       $v0, 0x8024
-/* 8CACF0 802403F0 24421BF0 */  addiu     $v0, $v0, 0x1bf0
+/* 8CACE4 802403E4 3C048024 */  lui       $a0, %hi(D_80243770)
+/* 8CACE8 802403E8 24843770 */  addiu     $a0, $a0, %lo(D_80243770)
+/* 8CACEC 802403EC 3C028024 */  lui       $v0, %hi(D_80241BF0)
+/* 8CACF0 802403F0 24421BF0 */  addiu     $v0, $v0, %lo(D_80241BF0)
 /* 8CACF4 802403F4 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 8CACF8 802403F8 AC820000 */  sw        $v0, ($a0)
-/* 8CACFC 802403FC 3C028024 */  lui       $v0, 0x8024
-/* 8CAD00 80240400 24422070 */  addiu     $v0, $v0, 0x2070
+/* 8CACFC 802403FC 3C028024 */  lui       $v0, %hi(D_80242070)
+/* 8CAD00 80240400 24422070 */  addiu     $v0, $v0, %lo(D_80242070)
 /* 8CAD04 80240404 AC820004 */  sw        $v0, 4($a0)
 /* 8CAD08 80240408 24020030 */  addiu     $v0, $zero, 0x30
 /* 8CAD0C 8024040C A4820008 */  sh        $v0, 8($a0)
diff --git a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240000_8CE070.s b/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240000_8CE070.s
index bdf9dd4b25..12cec37abd 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240000_8CE070.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240000_8CE070.s
@@ -87,8 +87,8 @@ glabel func_80240000_8CE070
 /* 8CE1B0 80240140 0809005A */  j         .L80240168
 /* 8CE1B4 80240144 E6000018 */   swc1     $f0, 0x18($s0)
 .L80240148:
-/* 8CE1B8 80240148 3C018024 */  lui       $at, 0x8024
-/* 8CE1BC 8024014C D4223440 */  ldc1      $f2, 0x3440($at)
+/* 8CE1B8 80240148 3C018024 */  lui       $at, %hi(D_80243440)
+/* 8CE1BC 8024014C D4223440 */  ldc1      $f2, %lo(D_80243440)($at)
 /* 8CE1C0 80240150 44820000 */  mtc1      $v0, $f0
 /* 8CE1C4 80240154 00000000 */  nop       
 /* 8CE1C8 80240158 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_802401B0_8CE220.s b/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_802401B0_8CE220.s
index 3a27dc746d..006b28c6bd 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_802401B0_8CE220.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_802401B0_8CE220.s
@@ -104,8 +104,8 @@ glabel func_802401B0_8CE220
 /* 8CE3A4 80240334 1040000A */  beqz      $v0, .L80240360
 /* 8CE3A8 80240338 4600C106 */   mov.s    $f4, $f24
 /* 8CE3AC 8024033C 4614C081 */  sub.s     $f2, $f24, $f20
-/* 8CE3B0 80240340 3C018024 */  lui       $at, 0x8024
-/* 8CE3B4 80240344 D4203448 */  ldc1      $f0, 0x3448($at)
+/* 8CE3B0 80240340 3C018024 */  lui       $at, %hi(D_80243448)
+/* 8CE3B4 80240344 D4203448 */  ldc1      $f0, %lo(D_80243448)($at)
 /* 8CE3B8 80240348 460010A1 */  cvt.d.s   $f2, $f2
 /* 8CE3BC 8024034C 46201082 */  mul.d     $f2, $f2, $f0
 /* 8CE3C0 80240350 00000000 */  nop       
@@ -131,8 +131,8 @@ glabel func_802401B0_8CE220
 /* 8CE40C 8024039C C7A4002C */  lwc1      $f4, 0x2c($sp)
 /* 8CE410 802403A0 461A2100 */  add.s     $f4, $f4, $f26
 /* 8CE414 802403A4 46142081 */  sub.s     $f2, $f4, $f20
-/* 8CE418 802403A8 3C018024 */  lui       $at, 0x8024
-/* 8CE41C 802403AC D4203450 */  ldc1      $f0, 0x3450($at)
+/* 8CE418 802403A8 3C018024 */  lui       $at, %hi(D_80243450)
+/* 8CE41C 802403AC D4203450 */  ldc1      $f0, %lo(D_80243450)($at)
 /* 8CE420 802403B0 460010A1 */  cvt.d.s   $f2, $f2
 /* 8CE424 802403B4 46201082 */  mul.d     $f2, $f2, $f0
 /* 8CE428 802403B8 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240C54_8CECC4.s b/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240C54_8CECC4.s
index c3d8b4b540..59d6975321 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240C54_8CECC4.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240C54_8CECC4.s
@@ -15,9 +15,9 @@ glabel func_80240C54_8CECC4
 /* 8CECEC 80240C7C 00031C00 */  sll       $v1, $v1, 0x10
 /* 8CECF0 80240C80 00031B83 */  sra       $v1, $v1, 0xe
 /* 8CECF4 80240C84 A444008E */  sh        $a0, 0x8e($v0)
-/* 8CECF8 80240C88 3C018024 */  lui       $at, 0x8024
+/* 8CECF8 80240C88 3C018024 */  lui       $at, %hi(D_80241B2C)
 /* 8CECFC 80240C8C 00230821 */  addu      $at, $at, $v1
-/* 8CED00 80240C90 C4221B2C */  lwc1      $f2, 0x1b2c($at)
+/* 8CED00 80240C90 C4221B2C */  lwc1      $f2, %lo(D_80241B2C)($at)
 /* 8CED04 80240C94 8443008E */  lh        $v1, 0x8e($v0)
 /* 8CED08 80240C98 46020000 */  add.s     $f0, $f0, $f2
 /* 8CED0C 80240C9C 28630005 */  slti      $v1, $v1, 5
diff --git a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_8024130C_8CF37C.s b/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_8024130C_8CF37C.s
index 5a43cc4d2f..1a8102b32d 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_8024130C_8CF37C.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_8024130C_8CF37C.s
@@ -66,9 +66,9 @@ glabel func_8024130C_8CF37C
 /* 8CF468 802413F8 2C62000F */  sltiu     $v0, $v1, 0xf
 /* 8CF46C 802413FC 10400034 */  beqz      $v0, .L802414D0
 /* 8CF470 80241400 00031080 */   sll      $v0, $v1, 2
-/* 8CF474 80241404 3C018024 */  lui       $at, 0x8024
+/* 8CF474 80241404 3C018024 */  lui       $at, %hi(D_80243458)
 /* 8CF478 80241408 00220821 */  addu      $at, $at, $v0
-/* 8CF47C 8024140C 8C223458 */  lw        $v0, 0x3458($at)
+/* 8CF47C 8024140C 8C223458 */  lw        $v0, %lo(D_80243458)($at)
 /* 8CF480 80241410 00400008 */  jr        $v0
 /* 8CF484 80241414 00000000 */   nop      
 /* 8CF488 80241418 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_80240000_8D1510.s b/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_80240000_8D1510.s
index 386510f3b8..32201ac16b 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_80240000_8D1510.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_80240000_8D1510.s
@@ -87,8 +87,8 @@ glabel func_80240000_8D1510
 /* 8D1650 80240140 0809005A */  j         .L80240168
 /* 8D1654 80240144 E6000018 */   swc1     $f0, 0x18($s0)
 .L80240148:
-/* 8D1658 80240148 3C018024 */  lui       $at, 0x8024
-/* 8D165C 8024014C D4222850 */  ldc1      $f2, 0x2850($at)
+/* 8D1658 80240148 3C018024 */  lui       $at, %hi(D_80242850)
+/* 8D165C 8024014C D4222850 */  ldc1      $f2, %lo(D_80242850)($at)
 /* 8D1660 80240150 44820000 */  mtc1      $v0, $f0
 /* 8D1664 80240154 00000000 */  nop       
 /* 8D1668 80240158 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_802401B0_8D16C0.s b/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_802401B0_8D16C0.s
index c958659b35..58415e1540 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_802401B0_8D16C0.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_802401B0_8D16C0.s
@@ -104,8 +104,8 @@ glabel func_802401B0_8D16C0
 /* 8D1844 80240334 1040000A */  beqz      $v0, .L80240360
 /* 8D1848 80240338 4600C106 */   mov.s    $f4, $f24
 /* 8D184C 8024033C 4614C081 */  sub.s     $f2, $f24, $f20
-/* 8D1850 80240340 3C018024 */  lui       $at, 0x8024
-/* 8D1854 80240344 D4202858 */  ldc1      $f0, 0x2858($at)
+/* 8D1850 80240340 3C018024 */  lui       $at, %hi(D_80242858)
+/* 8D1854 80240344 D4202858 */  ldc1      $f0, %lo(D_80242858)($at)
 /* 8D1858 80240348 460010A1 */  cvt.d.s   $f2, $f2
 /* 8D185C 8024034C 46201082 */  mul.d     $f2, $f2, $f0
 /* 8D1860 80240350 00000000 */  nop       
@@ -131,8 +131,8 @@ glabel func_802401B0_8D16C0
 /* 8D18AC 8024039C C7A4002C */  lwc1      $f4, 0x2c($sp)
 /* 8D18B0 802403A0 461A2100 */  add.s     $f4, $f4, $f26
 /* 8D18B4 802403A4 46142081 */  sub.s     $f2, $f4, $f20
-/* 8D18B8 802403A8 3C018024 */  lui       $at, 0x8024
-/* 8D18BC 802403AC D4202860 */  ldc1      $f0, 0x2860($at)
+/* 8D18B8 802403A8 3C018024 */  lui       $at, %hi(D_80242860)
+/* 8D18BC 802403AC D4202860 */  ldc1      $f0, %lo(D_80242860)($at)
 /* 8D18C0 802403B0 460010A1 */  cvt.d.s   $f2, $f2
 /* 8D18C4 802403B4 46201082 */  mul.d     $f2, $f2, $f0
 /* 8D18C8 802403B8 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_80240C54_8D2164.s b/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_80240C54_8D2164.s
index 41cf9ff4a8..b832d5fb43 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_80240C54_8D2164.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_80240C54_8D2164.s
@@ -15,9 +15,9 @@ glabel func_80240C54_8D2164
 /* 8D218C 80240C7C 00031C00 */  sll       $v1, $v1, 0x10
 /* 8D2190 80240C80 00031B83 */  sra       $v1, $v1, 0xe
 /* 8D2194 80240C84 A444008E */  sh        $a0, 0x8e($v0)
-/* 8D2198 80240C88 3C018024 */  lui       $at, 0x8024
+/* 8D2198 80240C88 3C018024 */  lui       $at, %hi(D_802420BC)
 /* 8D219C 80240C8C 00230821 */  addu      $at, $at, $v1
-/* 8D21A0 80240C90 C42220BC */  lwc1      $f2, 0x20bc($at)
+/* 8D21A0 80240C90 C42220BC */  lwc1      $f2, %lo(D_802420BC)($at)
 /* 8D21A4 80240C94 8443008E */  lh        $v1, 0x8e($v0)
 /* 8D21A8 80240C98 46020000 */  add.s     $f0, $f0, $f2
 /* 8D21AC 80240C9C 28630005 */  slti      $v1, $v1, 5
diff --git a/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_8024130C_8D281C.s b/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_8024130C_8D281C.s
index 1d1b2ac8cb..c02b8d8844 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_8024130C_8D281C.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_8024130C_8D281C.s
@@ -66,9 +66,9 @@ glabel func_8024130C_8D281C
 /* 8D2908 802413F8 2C62000F */  sltiu     $v0, $v1, 0xf
 /* 8D290C 802413FC 10400034 */  beqz      $v0, .L802414D0
 /* 8D2910 80241400 00031080 */   sll      $v0, $v1, 2
-/* 8D2914 80241404 3C018024 */  lui       $at, 0x8024
+/* 8D2914 80241404 3C018024 */  lui       $at, %hi(D_80242868)
 /* 8D2918 80241408 00220821 */  addu      $at, $at, $v0
-/* 8D291C 8024140C 8C222868 */  lw        $v0, 0x2868($at)
+/* 8D291C 8024140C 8C222868 */  lw        $v0, %lo(D_80242868)($at)
 /* 8D2920 80241410 00400008 */  jr        $v0
 /* 8D2924 80241414 00000000 */   nop      
 /* 8D2928 80241418 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_80241500_8D2A10.s b/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_80241500_8D2A10.s
index 054e7b4e73..8a9b2938ab 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_80241500_8D2A10.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_80241500_8D2A10.s
@@ -32,8 +32,8 @@ glabel func_80241500_8D2A10
 /* 8D2A7C 8024156C 27B10038 */  addiu     $s1, $sp, 0x38
 /* 8D2A80 80241570 0220202D */  daddu     $a0, $s1, $zero
 /* 8D2A84 80241574 3C130001 */  lui       $s3, 1
-/* 8D2A88 80241578 3C12800A */  lui       $s2, 0x800a
-/* 8D2A8C 8024157C 2652A66C */  addiu     $s2, $s2, -0x5994
+/* 8D2A88 80241578 3C12800A */  lui       $s2, %hi(D_8009A66C)
+/* 8D2A8C 8024157C 2652A66C */  addiu     $s2, $s2, %lo(D_8009A66C)
 /* 8D2A90 80241580 36731630 */  ori       $s3, $s3, 0x1630
 /* 8D2A94 80241584 3C03E700 */  lui       $v1, 0xe700
 /* 8D2A98 80241588 0040A02D */  daddu     $s4, $v0, $zero
@@ -81,10 +81,10 @@ glabel func_80241500_8D2A10
 /* 8D2B40 80241630 0C019D80 */  jal       guMtxCatF
 /* 8D2B44 80241634 0220302D */   daddu    $a2, $s1, $zero
 /* 8D2B48 80241638 0220202D */  daddu     $a0, $s1, $zero
-/* 8D2B4C 8024163C 3C108007 */  lui       $s0, 0x8007
-/* 8D2B50 80241640 261041F0 */  addiu     $s0, $s0, 0x41f0
-/* 8D2B54 80241644 3C11800A */  lui       $s1, 0x800a
-/* 8D2B58 80241648 2631A674 */  addiu     $s1, $s1, -0x598c
+/* 8D2B4C 8024163C 3C108007 */  lui       $s0, %hi(D_800741F0)
+/* 8D2B50 80241640 261041F0 */  addiu     $s0, $s0, %lo(D_800741F0)
+/* 8D2B54 80241644 3C11800A */  lui       $s1, %hi(D_8009A674)
+/* 8D2B58 80241648 2631A674 */  addiu     $s1, $s1, %lo(D_8009A674)
 /* 8D2B5C 8024164C 96050000 */  lhu       $a1, ($s0)
 /* 8D2B60 80241650 8E220000 */  lw        $v0, ($s1)
 /* 8D2B64 80241654 00052980 */  sll       $a1, $a1, 6
@@ -151,8 +151,8 @@ glabel func_80241500_8D2A10
 /* 8D2C50 80241740 0C04EBDC */  jal       func_8013AF70
 /* 8D2C54 80241744 27A70038 */   addiu    $a3, $sp, 0x38
 /* 8D2C58 80241748 3C05D838 */  lui       $a1, 0xd838
-/* 8D2C5C 8024174C 3C03800A */  lui       $v1, 0x800a
-/* 8D2C60 80241750 2463A66C */  addiu     $v1, $v1, -0x5994
+/* 8D2C5C 8024174C 3C03800A */  lui       $v1, %hi(D_8009A66C)
+/* 8D2C60 80241750 2463A66C */  addiu     $v1, $v1, %lo(D_8009A66C)
 /* 8D2C64 80241754 8C620000 */  lw        $v0, ($v1)
 /* 8D2C68 80241758 34A50002 */  ori       $a1, $a1, 2
 /* 8D2C6C 8024175C 0040202D */  daddu     $a0, $v0, $zero
diff --git a/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_802417A8_8D2CB8.s b/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_802417A8_8D2CB8.s
index a656f5f01e..d29d61945e 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_802417A8_8D2CB8.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_802417A8_8D2CB8.s
@@ -5,8 +5,8 @@ glabel func_802417A8_8D2CB8
 /* 8D2CB8 802417A8 27BDFFD8 */  addiu     $sp, $sp, -0x28
 /* 8D2CBC 802417AC 2402000D */  addiu     $v0, $zero, 0xd
 /* 8D2CC0 802417B0 AFA20010 */  sw        $v0, 0x10($sp)
-/* 8D2CC4 802417B4 3C028024 */  lui       $v0, 0x8024
-/* 8D2CC8 802417B8 24421500 */  addiu     $v0, $v0, 0x1500
+/* 8D2CC4 802417B4 3C028024 */  lui       $v0, %hi(D_80241500)
+/* 8D2CC8 802417B8 24421500 */  addiu     $v0, $v0, %lo(D_80241500)
 /* 8D2CCC 802417BC 27A40010 */  addiu     $a0, $sp, 0x10
 /* 8D2CD0 802417C0 AFBF0020 */  sw        $ra, 0x20($sp)
 /* 8D2CD4 802417C4 AFA00018 */  sw        $zero, 0x18($sp)
diff --git a/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_802417E0_8D2CF0.s b/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_802417E0_8D2CF0.s
index c3a82c1f18..15aa373ad9 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_802417E0_8D2CF0.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_802417E0_8D2CF0.s
@@ -46,16 +46,16 @@ glabel func_802417E0_8D2CF0
 /* 8D2D94 80241884 E600001C */  swc1      $f0, 0x1c($s0)
 /* 8D2D98 80241888 E6000020 */  swc1      $f0, 0x20($s0)
 /* 8D2D9C 8024188C E6000024 */  swc1      $f0, 0x24($s0)
-/* 8D2DA0 80241890 3C038009 */  lui       $v1, 0x8009
+/* 8D2DA0 80241890 3C038009 */  lui       $v1, %hi(D_8008E3D8)
 /* 8D2DA4 80241894 00721821 */  addu      $v1, $v1, $s2
-/* 8D2DA8 80241898 8C63E3D8 */  lw        $v1, -0x1c28($v1)
+/* 8D2DA8 80241898 8C63E3D8 */  lw        $v1, %lo(D_8008E3D8)($v1)
 /* 8D2DAC 8024189C 0040A02D */  daddu     $s4, $v0, $zero
 /* 8D2DB0 802418A0 00712021 */  addu      $a0, $v1, $s1
 /* 8D2DB4 802418A4 0C00A5CF */  jal       dma_copy
 /* 8D2DB8 802418A8 00652821 */   addu     $a1, $v1, $a1
-/* 8D2DBC 802418AC 3C058009 */  lui       $a1, 0x8009
+/* 8D2DBC 802418AC 3C058009 */  lui       $a1, %hi(D_8008E94C)
 /* 8D2DC0 802418B0 00B22821 */  addu      $a1, $a1, $s2
-/* 8D2DC4 802418B4 8CA5E94C */  lw        $a1, -0x16b4($a1)
+/* 8D2DC4 802418B4 8CA5E94C */  lw        $a1, %lo(D_8008E94C)($a1)
 /* 8D2DC8 802418B8 0280302D */  daddu     $a2, $s4, $zero
 /* 8D2DCC 802418BC 00B12021 */  addu      $a0, $a1, $s1
 /* 8D2DD0 802418C0 26310020 */  addiu     $s1, $s1, 0x20
@@ -64,8 +64,8 @@ glabel func_802417E0_8D2CF0
 /* 8D2DDC 802418CC 0C04E9C1 */  jal       func_8013A704
 /* 8D2DE0 802418D0 24040001 */   addiu    $a0, $zero, 1
 /* 8D2DE4 802418D4 0000202D */  daddu     $a0, $zero, $zero
-/* 8D2DE8 802418D8 3C058024 */  lui       $a1, 0x8024
-/* 8D2DEC 802418DC 24A517A8 */  addiu     $a1, $a1, 0x17a8
+/* 8D2DE8 802418D8 3C058024 */  lui       $a1, %hi(D_802417A8)
+/* 8D2DEC 802418DC 24A517A8 */  addiu     $a1, $a1, %lo(D_802417A8)
 /* 8D2DF0 802418E0 0C048C56 */  jal       bind_dynamic_entity_3
 /* 8D2DF4 802418E4 AE020000 */   sw       $v0, ($s0)
 /* 8D2DF8 802418E8 0260202D */  daddu     $a0, $s3, $zero
diff --git a/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_80240000_8D3DC0.s b/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_80240000_8D3DC0.s
index e88c115aeb..65f77d1ff6 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_80240000_8D3DC0.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_80240000_8D3DC0.s
@@ -35,8 +35,8 @@ glabel func_80240000_8D3DC0
 /* 8D3E34 80240074 08090027 */  j         .L8024009C
 /* 8D3E38 80240078 E4800018 */   swc1     $f0, 0x18($a0)
 .L8024007C:
-/* 8D3E3C 8024007C 3C018024 */  lui       $at, 0x8024
-/* 8D3E40 80240080 D4221E90 */  ldc1      $f2, 0x1e90($at)
+/* 8D3E3C 8024007C 3C018024 */  lui       $at, %hi(D_80241E90)
+/* 8D3E40 80240080 D4221E90 */  ldc1      $f2, %lo(D_80241E90)($at)
 /* 8D3E44 80240084 44820000 */  mtc1      $v0, $f0
 /* 8D3E48 80240088 00000000 */  nop       
 /* 8D3E4C 8024008C 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_80240540_8D4300.s b/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_80240540_8D4300.s
index 2544caa9df..0bd0e2b7e5 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_80240540_8D4300.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_80240540_8D4300.s
@@ -21,16 +21,16 @@ glabel func_80240540_8D4300
 /* 8D4340 80240580 04410009 */  bgez      $v0, .L802405A8
 /* 8D4344 80240584 00000000 */   nop      
 /* 8D4348 80240588 C640000C */  lwc1      $f0, 0xc($s2)
-/* 8D434C 8024058C 3C018024 */  lui       $at, 0x8024
-/* 8D4350 80240590 D4221E98 */  ldc1      $f2, 0x1e98($at)
+/* 8D434C 8024058C 3C018024 */  lui       $at, %hi(D_80241E98)
+/* 8D4350 80240590 D4221E98 */  ldc1      $f2, %lo(D_80241E98)($at)
 /* 8D4354 80240594 46000021 */  cvt.d.s   $f0, $f0
 /* 8D4358 80240598 46220002 */  mul.d     $f0, $f0, $f2
 /* 8D435C 8024059C 00000000 */  nop       
 /* 8D4360 802405A0 08090171 */  j         .L802405C4
 /* 8D4364 802405A4 46200020 */   cvt.s.d  $f0, $f0
 .L802405A8:
-/* 8D4368 802405A8 3C018024 */  lui       $at, 0x8024
-/* 8D436C 802405AC D4221EA0 */  ldc1      $f2, 0x1ea0($at)
+/* 8D4368 802405A8 3C018024 */  lui       $at, %hi(D_80241EA0)
+/* 8D436C 802405AC D4221EA0 */  ldc1      $f2, %lo(D_80241EA0)($at)
 /* 8D4370 802405B0 44820000 */  mtc1      $v0, $f0
 /* 8D4374 802405B4 00000000 */  nop       
 /* 8D4378 802405B8 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802407F4_8D45B4.s b/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802407F4_8D45B4.s
index a8e6af7dff..dde0bee6fc 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802407F4_8D45B4.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802407F4_8D45B4.s
@@ -102,9 +102,9 @@ glabel func_802407F4_8D45B4
 /* 8D4724 80240964 2C620064 */  sltiu     $v0, $v1, 0x64
 /* 8D4728 80240968 10400036 */  beqz      $v0, .L80240A44
 /* 8D472C 8024096C 00031080 */   sll      $v0, $v1, 2
-/* 8D4730 80240970 3C018024 */  lui       $at, 0x8024
+/* 8D4730 80240970 3C018024 */  lui       $at, %hi(D_80241EA8)
 /* 8D4734 80240974 00220821 */  addu      $at, $at, $v0
-/* 8D4738 80240978 8C221EA8 */  lw        $v0, 0x1ea8($at)
+/* 8D4738 80240978 8C221EA8 */  lw        $v0, %lo(D_80241EA8)($at)
 /* 8D473C 8024097C 00400008 */  jr        $v0
 /* 8D4740 80240980 00000000 */   nop      
 /* 8D4744 80240984 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_80240000_8D5E00.s b/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_80240000_8D5E00.s
index 3bf1253890..cdcf0af5f3 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_80240000_8D5E00.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_80240000_8D5E00.s
@@ -87,8 +87,8 @@ glabel func_80240000_8D5E00
 /* 8D5F40 80240140 0809005A */  j         .L80240168
 /* 8D5F44 80240144 E6000018 */   swc1     $f0, 0x18($s0)
 .L80240148:
-/* 8D5F48 80240148 3C018024 */  lui       $at, 0x8024
-/* 8D5F4C 8024014C D4222670 */  ldc1      $f2, 0x2670($at)
+/* 8D5F48 80240148 3C018024 */  lui       $at, %hi(D_80242670)
+/* 8D5F4C 8024014C D4222670 */  ldc1      $f2, %lo(D_80242670)($at)
 /* 8D5F50 80240150 44820000 */  mtc1      $v0, $f0
 /* 8D5F54 80240154 00000000 */  nop       
 /* 8D5F58 80240158 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_802401B0_8D5FB0.s b/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_802401B0_8D5FB0.s
index 5ce6864503..3291ee3e36 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_802401B0_8D5FB0.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_802401B0_8D5FB0.s
@@ -104,8 +104,8 @@ glabel func_802401B0_8D5FB0
 /* 8D6134 80240334 1040000A */  beqz      $v0, .L80240360
 /* 8D6138 80240338 4600C106 */   mov.s    $f4, $f24
 /* 8D613C 8024033C 4614C081 */  sub.s     $f2, $f24, $f20
-/* 8D6140 80240340 3C018024 */  lui       $at, 0x8024
-/* 8D6144 80240344 D4202678 */  ldc1      $f0, 0x2678($at)
+/* 8D6140 80240340 3C018024 */  lui       $at, %hi(D_80242678)
+/* 8D6144 80240344 D4202678 */  ldc1      $f0, %lo(D_80242678)($at)
 /* 8D6148 80240348 460010A1 */  cvt.d.s   $f2, $f2
 /* 8D614C 8024034C 46201082 */  mul.d     $f2, $f2, $f0
 /* 8D6150 80240350 00000000 */  nop       
@@ -131,8 +131,8 @@ glabel func_802401B0_8D5FB0
 /* 8D619C 8024039C C7A4002C */  lwc1      $f4, 0x2c($sp)
 /* 8D61A0 802403A0 461A2100 */  add.s     $f4, $f4, $f26
 /* 8D61A4 802403A4 46142081 */  sub.s     $f2, $f4, $f20
-/* 8D61A8 802403A8 3C018024 */  lui       $at, 0x8024
-/* 8D61AC 802403AC D4202680 */  ldc1      $f0, 0x2680($at)
+/* 8D61A8 802403A8 3C018024 */  lui       $at, %hi(D_80242680)
+/* 8D61AC 802403AC D4202680 */  ldc1      $f0, %lo(D_80242680)($at)
 /* 8D61B0 802403B0 460010A1 */  cvt.d.s   $f2, $f2
 /* 8D61B4 802403B4 46201082 */  mul.d     $f2, $f2, $f0
 /* 8D61B8 802403B8 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_80240C54_8D6A54.s b/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_80240C54_8D6A54.s
index 9a03bbc738..610b10a1f0 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_80240C54_8D6A54.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_80240C54_8D6A54.s
@@ -15,9 +15,9 @@ glabel func_80240C54_8D6A54
 /* 8D6A7C 80240C7C 00031C00 */  sll       $v1, $v1, 0x10
 /* 8D6A80 80240C80 00031B83 */  sra       $v1, $v1, 0xe
 /* 8D6A84 80240C84 A444008E */  sh        $a0, 0x8e($v0)
-/* 8D6A88 80240C88 3C018024 */  lui       $at, 0x8024
+/* 8D6A88 80240C88 3C018024 */  lui       $at, %hi(D_8024186C)
 /* 8D6A8C 80240C8C 00230821 */  addu      $at, $at, $v1
-/* 8D6A90 80240C90 C422186C */  lwc1      $f2, 0x186c($at)
+/* 8D6A90 80240C90 C422186C */  lwc1      $f2, %lo(D_8024186C)($at)
 /* 8D6A94 80240C94 8443008E */  lh        $v1, 0x8e($v0)
 /* 8D6A98 80240C98 46020000 */  add.s     $f0, $f0, $f2
 /* 8D6A9C 80240C9C 28630005 */  slti      $v1, $v1, 5
diff --git a/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_8024130C_8D710C.s b/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_8024130C_8D710C.s
index 334e3cda25..f6449ad25d 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_8024130C_8D710C.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_8024130C_8D710C.s
@@ -66,9 +66,9 @@ glabel func_8024130C_8D710C
 /* 8D71F8 802413F8 2C62000F */  sltiu     $v0, $v1, 0xf
 /* 8D71FC 802413FC 10400034 */  beqz      $v0, .L802414D0
 /* 8D7200 80241400 00031080 */   sll      $v0, $v1, 2
-/* 8D7204 80241404 3C018024 */  lui       $at, 0x8024
+/* 8D7204 80241404 3C018024 */  lui       $at, %hi(D_80242688)
 /* 8D7208 80241408 00220821 */  addu      $at, $at, $v0
-/* 8D720C 8024140C 8C222688 */  lw        $v0, 0x2688($at)
+/* 8D720C 8024140C 8C222688 */  lw        $v0, %lo(D_80242688)($at)
 /* 8D7210 80241410 00400008 */  jr        $v0
 /* 8D7214 80241414 00000000 */   nop      
 /* 8D7218 80241418 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_80240000_8D84D0.s b/asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_80240000_8D84D0.s
index b1d9f9d990..2d43a6b8d3 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_80240000_8D84D0.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_80240000_8D84D0.s
@@ -4,8 +4,8 @@
 glabel func_80240000_8D84D0
 /* 8D84D0 80240000 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* 8D84D4 80240004 AFB00010 */  sw        $s0, 0x10($sp)
-/* 8D84D8 80240008 3C108024 */  lui       $s0, 0x8024
-/* 8D84DC 8024000C 26100C20 */  addiu     $s0, $s0, 0xc20
+/* 8D84D8 80240008 3C108024 */  lui       $s0, %hi(D_80240C20)
+/* 8D84DC 8024000C 26100C20 */  addiu     $s0, $s0, %lo(D_80240C20)
 /* 8D84E0 80240010 AFBF0018 */  sw        $ra, 0x18($sp)
 /* 8D84E4 80240014 AFB10014 */  sw        $s1, 0x14($sp)
 /* 8D84E8 80240018 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_80240000_8D84D0
 /* 8D854C 8024007C 28620010 */  slti      $v0, $v1, 0x10
 /* 8D8550 80240080 1440FFFA */  bnez      $v0, .L8024006C
 /* 8D8554 80240084 24840004 */   addiu    $a0, $a0, 4
-/* 8D8558 80240088 3C108024 */  lui       $s0, 0x8024
-/* 8D855C 8024008C 26100C20 */  addiu     $s0, $s0, 0xc20
+/* 8D8558 80240088 3C108024 */  lui       $s0, %hi(D_80240C20)
+/* 8D855C 8024008C 26100C20 */  addiu     $s0, $s0, %lo(D_80240C20)
 /* 8D8560 80240090 0C00AB4B */  jal       heap_free
 /* 8D8564 80240094 8E040000 */   lw       $a0, ($s0)
 /* 8D8568 80240098 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240344_8DA444.s b/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240344_8DA444.s
index 9f8bddb626..7665d7d586 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240344_8DA444.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240344_8DA444.s
@@ -9,7 +9,7 @@ glabel func_80240344_8DA444
 /* 8DA454 80240354 8C450000 */   lw       $a1, ($v0)
 /* 8DA458 80240358 8FBF0010 */  lw        $ra, 0x10($sp)
 /* 8DA45C 8024035C 24020002 */  addiu     $v0, $zero, 2
-/* 8DA460 80240360 3C01800B */  lui       $at, 0x800b
-/* 8DA464 80240364 E4201D98 */  swc1      $f0, 0x1d98($at)
+/* 8DA460 80240360 3C01800B */  lui       $at, %hi(D_800B1D98)
+/* 8DA464 80240364 E4201D98 */  swc1      $f0, %lo(D_800B1D98)($at)
 /* 8DA468 80240368 03E00008 */  jr        $ra
 /* 8DA46C 8024036C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240370_8DA470.s b/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240370_8DA470.s
index ce1d0d7c2e..18b970b3e5 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240370_8DA470.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240370_8DA470.s
@@ -35,8 +35,8 @@ glabel func_80240370_8DA470
 /* 8DA4E4 802403E4 08090103 */  j         .L8024040C
 /* 8DA4E8 802403E8 E4800018 */   swc1     $f0, 0x18($a0)
 .L802403EC:
-/* 8DA4EC 802403EC 3C018025 */  lui       $at, 0x8025
-/* 8DA4F0 802403F0 D42210B0 */  ldc1      $f2, 0x10b0($at)
+/* 8DA4EC 802403EC 3C018025 */  lui       $at, %hi(D_802510B0)
+/* 8DA4F0 802403F0 D42210B0 */  ldc1      $f2, %lo(D_802510B0)($at)
 /* 8DA4F4 802403F4 44820000 */  mtc1      $v0, $f0
 /* 8DA4F8 802403F8 00000000 */  nop       
 /* 8DA4FC 802403FC 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_802408B0_8DA9B0.s b/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_802408B0_8DA9B0.s
index a8a8e8ce92..9b0c7092fd 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_802408B0_8DA9B0.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_802408B0_8DA9B0.s
@@ -21,16 +21,16 @@ glabel func_802408B0_8DA9B0
 /* 8DA9F0 802408F0 04410009 */  bgez      $v0, .L80240918
 /* 8DA9F4 802408F4 00000000 */   nop      
 /* 8DA9F8 802408F8 C640000C */  lwc1      $f0, 0xc($s2)
-/* 8DA9FC 802408FC 3C018025 */  lui       $at, 0x8025
-/* 8DAA00 80240900 D42210B8 */  ldc1      $f2, 0x10b8($at)
+/* 8DA9FC 802408FC 3C018025 */  lui       $at, %hi(D_802510B8)
+/* 8DAA00 80240900 D42210B8 */  ldc1      $f2, %lo(D_802510B8)($at)
 /* 8DAA04 80240904 46000021 */  cvt.d.s   $f0, $f0
 /* 8DAA08 80240908 46220002 */  mul.d     $f0, $f0, $f2
 /* 8DAA0C 8024090C 00000000 */  nop       
 /* 8DAA10 80240910 0809024D */  j         .L80240934
 /* 8DAA14 80240914 46200020 */   cvt.s.d  $f0, $f0
 .L80240918:
-/* 8DAA18 80240918 3C018025 */  lui       $at, 0x8025
-/* 8DAA1C 8024091C D42210C0 */  ldc1      $f2, 0x10c0($at)
+/* 8DAA18 80240918 3C018025 */  lui       $at, %hi(D_802510C0)
+/* 8DAA1C 8024091C D42210C0 */  ldc1      $f2, %lo(D_802510C0)($at)
 /* 8DAA20 80240920 44820000 */  mtc1      $v0, $f0
 /* 8DAA24 80240924 00000000 */  nop       
 /* 8DAA28 80240928 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240B64_8DAC64.s b/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240B64_8DAC64.s
index d2ded110ad..9781534526 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240B64_8DAC64.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240B64_8DAC64.s
@@ -102,9 +102,9 @@ glabel func_80240B64_8DAC64
 /* 8DADD4 80240CD4 2C620064 */  sltiu     $v0, $v1, 0x64
 /* 8DADD8 80240CD8 10400036 */  beqz      $v0, .L80240DB4
 /* 8DADDC 80240CDC 00031080 */   sll      $v0, $v1, 2
-/* 8DADE0 80240CE0 3C018025 */  lui       $at, 0x8025
+/* 8DADE0 80240CE0 3C018025 */  lui       $at, %hi(D_802510C8)
 /* 8DADE4 80240CE4 00220821 */  addu      $at, $at, $v0
-/* 8DADE8 80240CE8 8C2210C8 */  lw        $v0, 0x10c8($at)
+/* 8DADE8 80240CE8 8C2210C8 */  lw        $v0, %lo(D_802510C8)($at)
 /* 8DADEC 80240CEC 00400008 */  jr        $v0
 /* 8DADF0 80240CF0 00000000 */   nop      
 /* 8DADF4 80240CF4 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_802405BC_8EC3DC.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_802405BC_8EC3DC.s
index 8462df87a1..1771f11146 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_802405BC_8EC3DC.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_802405BC_8EC3DC.s
@@ -4,8 +4,8 @@
 glabel func_802405BC_8EC3DC
 /* 8EC3DC 802405BC 27BDFFB0 */  addiu     $sp, $sp, -0x50
 /* 8EC3E0 802405C0 AFB30044 */  sw        $s3, 0x44($sp)
-/* 8EC3E4 802405C4 3C138026 */  lui       $s3, 0x8026
-/* 8EC3E8 802405C8 2673B2AC */  addiu     $s3, $s3, -0x4d54
+/* 8EC3E4 802405C4 3C138026 */  lui       $s3, %hi(D_8025B2AC)
+/* 8EC3E8 802405C8 2673B2AC */  addiu     $s3, $s3, %lo(D_8025B2AC)
 /* 8EC3EC 802405CC AFBF0048 */  sw        $ra, 0x48($sp)
 /* 8EC3F0 802405D0 AFB20040 */  sw        $s2, 0x40($sp)
 /* 8EC3F4 802405D4 AFB1003C */  sw        $s1, 0x3c($sp)
@@ -18,8 +18,8 @@ glabel func_802405BC_8EC3DC
 /* 8EC410 802405F0 240200FF */   addiu    $v0, $zero, 0xff
 /* 8EC414 802405F4 AE620000 */  sw        $v0, ($s3)
 .L802405F8:
-/* 8EC418 802405F8 3C108026 */  lui       $s0, 0x8026
-/* 8EC41C 802405FC 2610B2B0 */  addiu     $s0, $s0, -0x4d50
+/* 8EC418 802405F8 3C108026 */  lui       $s0, %hi(D_8025B2B0)
+/* 8EC41C 802405FC 2610B2B0 */  addiu     $s0, $s0, %lo(D_8025B2B0)
 /* 8EC420 80240600 8E040000 */  lw        $a0, ($s0)
 /* 8EC424 80240604 8E07000C */  lw        $a3, 0xc($s0)
 /* 8EC428 80240608 24020055 */  addiu     $v0, $zero, 0x55
diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_802406C8_8EC4E8.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_802406C8_8EC4E8.s
index c3b167fe1c..10939d30fc 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_802406C8_8EC4E8.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_802406C8_8EC4E8.s
@@ -29,12 +29,12 @@ glabel func_802406C8_8EC4E8
 /* 8EC540 80240720 0000B82D */  daddu     $s7, $zero, $zero
 /* 8EC544 80240724 02E0902D */  daddu     $s2, $s7, $zero
 /* 8EC548 80240728 241E0001 */  addiu     $fp, $zero, 1
-/* 8EC54C 8024072C 3C168024 */  lui       $s6, 0x8024
-/* 8EC550 80240730 26D64D54 */  addiu     $s6, $s6, 0x4d54
-/* 8EC554 80240734 3C158024 */  lui       $s5, 0x8024
-/* 8EC558 80240738 26B54D24 */  addiu     $s5, $s5, 0x4d24
-/* 8EC55C 8024073C 3C118025 */  lui       $s1, 0x8025
-/* 8EC560 80240740 26313060 */  addiu     $s1, $s1, 0x3060
+/* 8EC54C 8024072C 3C168024 */  lui       $s6, %hi(D_80244D54)
+/* 8EC550 80240730 26D64D54 */  addiu     $s6, $s6, %lo(D_80244D54)
+/* 8EC554 80240734 3C158024 */  lui       $s5, %hi(D_80244D24)
+/* 8EC558 80240738 26B54D24 */  addiu     $s5, $s5, %lo(D_80244D24)
+/* 8EC55C 8024073C 3C118025 */  lui       $s1, %hi(D_80253060)
+/* 8EC560 80240740 26313060 */  addiu     $s1, $s1, %lo(D_80253060)
 .L80240744:
 /* 8EC564 80240744 8EB00000 */  lw        $s0, ($s5)
 /* 8EC568 80240748 2402FFFE */  addiu     $v0, $zero, -2
@@ -95,8 +95,8 @@ glabel func_802406C8_8EC4E8
 .L8024080C:
 /* 8EC62C 8024080C 1260001A */  beqz      $s3, .L80240878
 /* 8EC630 80240810 0240802D */   daddu    $s0, $s2, $zero
-/* 8EC634 80240814 3C028008 */  lui       $v0, 0x8008
-/* 8EC638 80240818 244222F8 */  addiu     $v0, $v0, 0x22f8
+/* 8EC634 80240814 3C028008 */  lui       $v0, %hi(D_800822F8)
+/* 8EC638 80240818 244222F8 */  addiu     $v0, $v0, %lo(D_800822F8)
 /* 8EC63C 8024081C AE220000 */  sw        $v0, ($s1)
 /* 8EC640 80240820 AE320108 */  sw        $s2, 0x108($s1)
 /* 8EC644 80240824 AE3E018C */  sw        $fp, 0x18c($s1)
@@ -115,8 +115,8 @@ glabel func_802406C8_8EC4E8
 /* 8EC674 80240854 00508024 */  and       $s0, $v0, $s0
 /* 8EC678 80240858 12000005 */  beqz      $s0, .L80240870
 /* 8EC67C 8024085C AE200210 */   sw       $zero, 0x210($s1)
-/* 8EC680 80240860 3C028008 */  lui       $v0, 0x8008
-/* 8EC684 80240864 24422328 */  addiu     $v0, $v0, 0x2328
+/* 8EC680 80240860 3C028008 */  lui       $v0, %hi(D_80082328)
+/* 8EC684 80240864 24422328 */  addiu     $v0, $v0, %lo(D_80082328)
 /* 8EC688 80240868 AE3E0210 */  sw        $fp, 0x210($s1)
 /* 8EC68C 8024086C AE220000 */  sw        $v0, ($s1)
 .L80240870:
@@ -134,13 +134,13 @@ glabel func_802406C8_8EC4E8
 /* 8EC6B8 80240898 080902BC */  j         .L80240AF0
 /* 8EC6BC 8024089C 24020002 */   addiu    $v0, $zero, 2
 .L802408A0:
-/* 8EC6C0 802408A0 3C018025 */  lui       $at, 0x8025
-/* 8EC6C4 802408A4 AC223378 */  sw        $v0, 0x3378($at)
-/* 8EC6C8 802408A8 3C018025 */  lui       $at, 0x8025
-/* 8EC6CC 802408AC AC373384 */  sw        $s7, 0x3384($at)
+/* 8EC6C0 802408A0 3C018025 */  lui       $at, %hi(D_80253378)
+/* 8EC6C4 802408A4 AC223378 */  sw        $v0, %lo(D_80253378)($at)
+/* 8EC6C8 802408A8 3C018025 */  lui       $at, %hi(D_80253384)
+/* 8EC6CC 802408AC AC373384 */  sw        $s7, %lo(D_80253384)($at)
 /* 8EC6D0 802408B0 8E82007C */  lw        $v0, 0x7c($s4)
-/* 8EC6D4 802408B4 3C048025 */  lui       $a0, 0x8025
-/* 8EC6D8 802408B8 24843060 */  addiu     $a0, $a0, 0x3060
+/* 8EC6D4 802408B4 3C048025 */  lui       $a0, %hi(D_80253060)
+/* 8EC6D8 802408B8 24843060 */  addiu     $a0, $a0, %lo(D_80253060)
 /* 8EC6DC 802408BC 0C03D390 */  jal       func_800F4E40
 /* 8EC6E0 802408C0 AC820328 */   sw       $v0, 0x328($a0)
 /* 8EC6E4 802408C4 0C03A631 */  jal       func_800E98C4
@@ -155,8 +155,8 @@ glabel func_802406C8_8EC4E8
 /* 8EC704 802408E4 8E820074 */  lw        $v0, 0x74($s4)
 /* 8EC708 802408E8 14400009 */  bnez      $v0, .L80240910
 /* 8EC70C 802408EC 24420001 */   addiu    $v0, $v0, 1
-/* 8EC710 802408F0 3C028025 */  lui       $v0, 0x8025
-/* 8EC714 802408F4 8442338C */  lh        $v0, 0x338c($v0)
+/* 8EC710 802408F0 3C028025 */  lui       $v0, %hi(D_8025338C)
+/* 8EC714 802408F4 8442338C */  lh        $v0, %lo(D_8025338C)($v0)
 /* 8EC718 802408F8 1040007C */  beqz      $v0, .L80240AEC
 /* 8EC71C 802408FC AE820078 */   sw       $v0, 0x78($s4)
 /* 8EC720 80240900 0C03C4EC */  jal       func_800F13B0
@@ -180,17 +180,17 @@ glabel func_802406C8_8EC4E8
 /* 8EC764 80240944 24020002 */   addiu    $v0, $zero, 2
 .L80240948:
 /* 8EC768 80240948 8E820078 */  lw        $v0, 0x78($s4)
-/* 8EC76C 8024094C 3C078025 */  lui       $a3, 0x8025
-/* 8EC770 80240950 24E73060 */  addiu     $a3, $a3, 0x3060
+/* 8EC76C 8024094C 3C078025 */  lui       $a3, %hi(D_80253060)
+/* 8EC770 80240950 24E73060 */  addiu     $a3, $a3, %lo(D_80253060)
 /* 8EC774 80240954 AE83007C */  sw        $v1, 0x7c($s4)
 /* 8EC778 80240958 2442FFFF */  addiu     $v0, $v0, -1
 /* 8EC77C 8024095C 00021080 */  sll       $v0, $v0, 2
 /* 8EC780 80240960 00471021 */  addu      $v0, $v0, $a3
 /* 8EC784 80240964 8C5E0108 */  lw        $fp, 0x108($v0)
 /* 8EC788 80240968 001E1080 */  sll       $v0, $fp, 2
-/* 8EC78C 8024096C 3C018024 */  lui       $at, 0x8024
+/* 8EC78C 8024096C 3C018024 */  lui       $at, %hi(D_80244D84)
 /* 8EC790 80240970 00220821 */  addu      $at, $at, $v0
-/* 8EC794 80240974 8C224D84 */  lw        $v0, 0x4d84($at)
+/* 8EC794 80240974 8C224D84 */  lw        $v0, %lo(D_80244D84)($at)
 /* 8EC798 80240978 03C0802D */  daddu     $s0, $fp, $zero
 /* 8EC79C 8024097C 07C10002 */  bgez      $fp, .L80240988
 /* 8EC7A0 80240980 AE820084 */   sw       $v0, 0x84($s4)
@@ -215,11 +215,11 @@ glabel func_802406C8_8EC4E8
 /* 8EC7E8 802409C8 0C0B2026 */  jal       set_variable
 /* 8EC7EC 802409CC 24060001 */   addiu    $a2, $zero, 1
 .L802409D0:
-/* 8EC7F0 802409D0 3C148025 */  lui       $s4, 0x8025
-/* 8EC7F4 802409D4 26943390 */  addiu     $s4, $s4, 0x3390
+/* 8EC7F0 802409D0 3C148025 */  lui       $s4, %hi(D_80253390)
+/* 8EC7F4 802409D4 26943390 */  addiu     $s4, $s4, %lo(D_80253390)
 /* 8EC7F8 802409D8 0280302D */  daddu     $a2, $s4, $zero
-/* 8EC7FC 802409DC 3C138024 */  lui       $s3, 0x8024
-/* 8EC800 802409E0 26734DB4 */  addiu     $s3, $s3, 0x4db4
+/* 8EC7FC 802409DC 3C138024 */  lui       $s3, %hi(D_80244DB4)
+/* 8EC800 802409E0 26734DB4 */  addiu     $s3, $s3, %lo(D_80244DB4)
 /* 8EC804 802409E4 3C120011 */  lui       $s2, 0x11
 /* 8EC808 802409E8 2652F1B0 */  addiu     $s2, $s2, -0xe50
 /* 8EC80C 802409EC 8E650000 */  lw        $a1, ($s3)
@@ -227,16 +227,16 @@ glabel func_802406C8_8EC4E8
 /* 8EC814 802409F4 00B22021 */  addu      $a0, $a1, $s2
 /* 8EC818 802409F8 0C00A5CF */  jal       dma_copy
 /* 8EC81C 802409FC 00B52821 */   addu     $a1, $a1, $s5
-/* 8EC820 80240A00 3C108025 */  lui       $s0, 0x8025
-/* 8EC824 80240A04 26107118 */  addiu     $s0, $s0, 0x7118
+/* 8EC820 80240A00 3C108025 */  lui       $s0, %hi(D_80257118)
+/* 8EC824 80240A04 26107118 */  addiu     $s0, $s0, %lo(D_80257118)
 /* 8EC828 80240A08 0200302D */  daddu     $a2, $s0, $zero
 /* 8EC82C 80240A0C 8E650004 */  lw        $a1, 4($s3)
 /* 8EC830 80240A10 26560200 */  addiu     $s6, $s2, 0x200
 /* 8EC834 80240A14 00B22021 */  addu      $a0, $a1, $s2
 /* 8EC838 80240A18 0C00A5CF */  jal       dma_copy
 /* 8EC83C 80240A1C 00B62821 */   addu     $a1, $a1, $s6
-/* 8EC840 80240A20 3C118026 */  lui       $s1, 0x8026
-/* 8EC844 80240A24 2631B2B0 */  addiu     $s1, $s1, -0x4d50
+/* 8EC840 80240A20 3C118026 */  lui       $s1, %hi(D_8025B2B0)
+/* 8EC844 80240A24 2631B2B0 */  addiu     $s1, $s1, %lo(D_8025B2B0)
 /* 8EC848 80240A28 24020096 */  addiu     $v0, $zero, 0x96
 /* 8EC84C 80240A2C A6220008 */  sh        $v0, 8($s1)
 /* 8EC850 80240A30 24020069 */  addiu     $v0, $zero, 0x69
@@ -248,8 +248,8 @@ glabel func_802406C8_8EC4E8
 /* 8EC868 80240A48 02E21004 */  sllv      $v0, $v0, $s7
 /* 8EC86C 80240A4C 00531021 */  addu      $v0, $v0, $s3
 /* 8EC870 80240A50 AE340000 */  sw        $s4, ($s1)
-/* 8EC874 80240A54 3C148025 */  lui       $s4, 0x8025
-/* 8EC878 80240A58 26947320 */  addiu     $s4, $s4, 0x7320
+/* 8EC874 80240A54 3C148025 */  lui       $s4, %hi(D_80257320)
+/* 8EC878 80240A58 26947320 */  addiu     $s4, $s4, %lo(D_80257320)
 /* 8EC87C 80240A5C AE37000C */  sw        $s7, 0xc($s1)
 /* 8EC880 80240A60 AE200010 */  sw        $zero, 0x10($s1)
 /* 8EC884 80240A64 8C450000 */  lw        $a1, ($v0)
@@ -260,8 +260,8 @@ glabel func_802406C8_8EC4E8
 /* 8EC898 80240A78 26100003 */  addiu     $s0, $s0, 3
 /* 8EC89C 80240A7C 02F08004 */  sllv      $s0, $s0, $s7
 /* 8EC8A0 80240A80 02138021 */  addu      $s0, $s0, $s3
-/* 8EC8A4 80240A84 3C138026 */  lui       $s3, 0x8026
-/* 8EC8A8 80240A88 2673B0A8 */  addiu     $s3, $s3, -0x4f58
+/* 8EC8A4 80240A84 3C138026 */  lui       $s3, %hi(D_8025B0A8)
+/* 8EC8A8 80240A88 2673B0A8 */  addiu     $s3, $s3, %lo(D_8025B0A8)
 /* 8EC8AC 80240A8C 8E050000 */  lw        $a1, ($s0)
 /* 8EC8B0 80240A90 0260302D */  daddu     $a2, $s3, $zero
 /* 8EC8B4 80240A94 00B22021 */  addu      $a0, $a1, $s2
@@ -276,14 +276,14 @@ glabel func_802406C8_8EC4E8
 /* 8EC8D8 80240AB8 A622001E */  sh        $v0, 0x1e($s1)
 /* 8EC8DC 80240ABC AE370020 */  sw        $s7, 0x20($s1)
 /* 8EC8E0 80240AC0 8FA70010 */  lw        $a3, 0x10($sp)
-/* 8EC8E4 80240AC4 3C058024 */  lui       $a1, 0x8024
-/* 8EC8E8 80240AC8 24A505BC */  addiu     $a1, $a1, 0x5bc
+/* 8EC8E4 80240AC4 3C058024 */  lui       $a1, %hi(D_802405BC)
+/* 8EC8E8 80240AC8 24A505BC */  addiu     $a1, $a1, %lo(D_802405BC)
 /* 8EC8EC 80240ACC 0C048C8F */  jal       bind_dynamic_entity_7
 /* 8EC8F0 80240AD0 AE270024 */   sw       $a3, 0x24($s1)
-/* 8EC8F4 80240AD4 3C018026 */  lui       $at, 0x8026
-/* 8EC8F8 80240AD8 AC22B2A8 */  sw        $v0, -0x4d58($at)
-/* 8EC8FC 80240ADC 3C018026 */  lui       $at, 0x8026
-/* 8EC900 80240AE0 AC20B2AC */  sw        $zero, -0x4d54($at)
+/* 8EC8F4 80240AD4 3C018026 */  lui       $at, %hi(D_8025B2A8)
+/* 8EC8F8 80240AD8 AC22B2A8 */  sw        $v0, %lo(D_8025B2A8)($at)
+/* 8EC8FC 80240ADC 3C018026 */  lui       $at, %hi(D_8025B2AC)
+/* 8EC900 80240AE0 AC20B2AC */  sw        $zero, %lo(D_8025B2AC)($at)
 /* 8EC904 80240AE4 080902BC */  j         .L80240AF0
 /* 8EC908 80240AE8 02E0102D */   daddu    $v0, $s7, $zero
 .L80240AEC:
diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240B20_8EC940.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240B20_8EC940.s
index 421d47ec14..42c06a2074 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240B20_8EC940.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240B20_8EC940.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80240B20_8EC940
-/* 8EC940 80240B20 3C048026 */  lui       $a0, 0x8026
-/* 8EC944 80240B24 8C84B2A8 */  lw        $a0, -0x4d58($a0)
+/* 8EC940 80240B20 3C048026 */  lui       $a0, %hi(D_8025B2A8)
+/* 8EC944 80240B24 8C84B2A8 */  lw        $a0, %lo(D_8025B2A8)($a0)
 /* 8EC948 80240B28 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 8EC94C 80240B2C AFBF0010 */  sw        $ra, 0x10($sp)
 /* 8EC950 80240B30 0C048D70 */  jal       func_801235C0
diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240B54_8EC974.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240B54_8EC974.s
index e8a4343f1e..a493abe96f 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240B54_8EC974.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240B54_8EC974.s
@@ -6,8 +6,8 @@ glabel func_80240B54_8EC974
 /* 8EC978 80240B58 AFB40020 */  sw        $s4, 0x20($sp)
 /* 8EC97C 80240B5C 0080A02D */  daddu     $s4, $a0, $zero
 /* 8EC980 80240B60 AFB7002C */  sw        $s7, 0x2c($sp)
-/* 8EC984 80240B64 3C178025 */  lui       $s7, 0x8025
-/* 8EC988 80240B68 26F73060 */  addiu     $s7, $s7, 0x3060
+/* 8EC984 80240B64 3C178025 */  lui       $s7, %hi(D_80253060)
+/* 8EC988 80240B68 26F73060 */  addiu     $s7, $s7, %lo(D_80253060)
 /* 8EC98C 80240B6C AFBF0034 */  sw        $ra, 0x34($sp)
 /* 8EC990 80240B70 AFBE0030 */  sw        $fp, 0x30($sp)
 /* 8EC994 80240B74 AFB60028 */  sw        $s6, 0x28($sp)
@@ -30,10 +30,10 @@ glabel func_80240B54_8EC974
 /* 8EC9D0 80240BB0 0000A82D */  daddu     $s5, $zero, $zero
 /* 8EC9D4 80240BB4 02A0902D */  daddu     $s2, $s5, $zero
 /* 8EC9D8 80240BB8 24160001 */  addiu     $s6, $zero, 1
-/* 8EC9DC 80240BBC 3C1E8008 */  lui       $fp, 0x8008
-/* 8EC9E0 80240BC0 27DE2388 */  addiu     $fp, $fp, 0x2388
-/* 8EC9E4 80240BC4 3C138024 */  lui       $s3, 0x8024
-/* 8EC9E8 80240BC8 26734FA0 */  addiu     $s3, $s3, 0x4fa0
+/* 8EC9DC 80240BBC 3C1E8008 */  lui       $fp, %hi(D_80082388)
+/* 8EC9E0 80240BC0 27DE2388 */  addiu     $fp, $fp, %lo(D_80082388)
+/* 8EC9E4 80240BC4 3C138024 */  lui       $s3, %hi(D_80244FA0)
+/* 8EC9E8 80240BC8 26734FA0 */  addiu     $s3, $s3, %lo(D_80244FA0)
 /* 8EC9EC 80240BCC 02E0882D */  daddu     $s1, $s7, $zero
 .L80240BD0:
 /* 8EC9F0 80240BD0 0000202D */  daddu     $a0, $zero, $zero
@@ -45,8 +45,8 @@ glabel func_80240B54_8EC974
 /* 8ECA08 80240BE8 54400019 */  bnel      $v0, $zero, .L80240C50
 /* 8ECA0C 80240BEC 26520001 */   addiu    $s2, $s2, 1
 /* 8ECA10 80240BF0 0240802D */  daddu     $s0, $s2, $zero
-/* 8ECA14 80240BF4 3C068008 */  lui       $a2, 0x8008
-/* 8ECA18 80240BF8 24C62358 */  addiu     $a2, $a2, 0x2358
+/* 8ECA14 80240BF4 3C068008 */  lui       $a2, %hi(D_80082358)
+/* 8ECA18 80240BF8 24C62358 */  addiu     $a2, $a2, %lo(D_80082358)
 /* 8ECA1C 80240BFC AE260000 */  sw        $a2, ($s1)
 /* 8ECA20 80240C00 AE320108 */  sw        $s2, 0x108($s1)
 /* 8ECA24 80240C04 AE36018C */  sw        $s6, 0x18c($s1)
@@ -128,9 +128,9 @@ glabel func_80240B54_8EC974
 /* 8ECB38 80240D18 00571021 */  addu      $v0, $v0, $s7
 /* 8ECB3C 80240D1C 8C510108 */  lw        $s1, 0x108($v0)
 /* 8ECB40 80240D20 00111080 */  sll       $v0, $s1, 2
-/* 8ECB44 80240D24 3C018024 */  lui       $at, 0x8024
+/* 8ECB44 80240D24 3C018024 */  lui       $at, %hi(D_80244FD0)
 /* 8ECB48 80240D28 00220821 */  addu      $at, $at, $v0
-/* 8ECB4C 80240D2C 8C224FD0 */  lw        $v0, 0x4fd0($at)
+/* 8ECB4C 80240D2C 8C224FD0 */  lw        $v0, %lo(D_80244FD0)($at)
 /* 8ECB50 80240D30 0220802D */  daddu     $s0, $s1, $zero
 /* 8ECB54 80240D34 06210002 */  bgez      $s1, .L80240D40
 /* 8ECB58 80240D38 AE820084 */   sw       $v0, 0x84($s4)
diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241364_8ED184.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241364_8ED184.s
index 939320055f..2212c07f5a 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241364_8ED184.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241364_8ED184.s
@@ -26,9 +26,9 @@ glabel func_80241364_8ED184
 /* 8ED1D8 802413B8 000320C0 */  sll       $a0, $v1, 3
 /* 8ED1DC 802413BC 00641821 */  addu      $v1, $v1, $a0
 /* 8ED1E0 802413C0 000318C0 */  sll       $v1, $v1, 3
-/* 8ED1E4 802413C4 3C01800B */  lui       $at, 0x800b
+/* 8ED1E4 802413C4 3C01800B */  lui       $at, %hi(D_800B1D98)
 /* 8ED1E8 802413C8 00230821 */  addu      $at, $at, $v1
-/* 8ED1EC 802413CC E4201D98 */  swc1      $f0, 0x1d98($at)
+/* 8ED1EC 802413CC E4201D98 */  swc1      $f0, %lo(D_800B1D98)($at)
 /* 8ED1F0 802413D0 8FBF0018 */  lw        $ra, 0x18($sp)
 /* 8ED1F4 802413D4 8FB10014 */  lw        $s1, 0x14($sp)
 /* 8ED1F8 802413D8 8FB00010 */  lw        $s0, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED440/func_80241620_8ED440.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED440/func_80241620_8ED440.s
index 5d45de7e62..9547f00c81 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_20/8ED440/func_80241620_8ED440.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_20/8ED440/func_80241620_8ED440.s
@@ -4,8 +4,8 @@
 glabel func_80241620_8ED440
 /* 8ED440 80241620 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* 8ED444 80241624 AFB00010 */  sw        $s0, 0x10($sp)
-/* 8ED448 80241628 3C108025 */  lui       $s0, 0x8025
-/* 8ED44C 8024162C 2610A908 */  addiu     $s0, $s0, -0x56f8
+/* 8ED448 80241628 3C108025 */  lui       $s0, %hi(D_8024A908)
+/* 8ED44C 8024162C 2610A908 */  addiu     $s0, $s0, %lo(D_8024A908)
 /* 8ED450 80241630 AFBF0018 */  sw        $ra, 0x18($sp)
 /* 8ED454 80241634 AFB10014 */  sw        $s1, 0x14($sp)
 /* 8ED458 80241638 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_80241620_8ED440
 /* 8ED4BC 8024169C 28620010 */  slti      $v0, $v1, 0x10
 /* 8ED4C0 802416A0 1440FFFA */  bnez      $v0, .L8024168C
 /* 8ED4C4 802416A4 24840004 */   addiu    $a0, $a0, 4
-/* 8ED4C8 802416A8 3C108025 */  lui       $s0, 0x8025
-/* 8ED4CC 802416AC 2610A908 */  addiu     $s0, $s0, -0x56f8
+/* 8ED4C8 802416A8 3C108025 */  lui       $s0, %hi(D_8024A908)
+/* 8ED4CC 802416AC 2610A908 */  addiu     $s0, $s0, %lo(D_8024A908)
 /* 8ED4D0 802416B0 0C00AB4B */  jal       heap_free
 /* 8ED4D4 802416B4 8E040000 */   lw       $a0, ($s0)
 /* 8ED4D8 802416B8 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241CF0_8EDB10.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241CF0_8EDB10.s
index 744086861d..eef22c214d 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241CF0_8EDB10.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241CF0_8EDB10.s
@@ -9,7 +9,7 @@ glabel func_80241CF0_8EDB10
 /* 8EDB20 80241D00 8C450000 */   lw       $a1, ($v0)
 /* 8EDB24 80241D04 8FBF0010 */  lw        $ra, 0x10($sp)
 /* 8EDB28 80241D08 24020002 */  addiu     $v0, $zero, 2
-/* 8EDB2C 80241D0C 3C01800B */  lui       $at, 0x800b
-/* 8EDB30 80241D10 E4202210 */  swc1      $f0, 0x2210($at)
+/* 8EDB2C 80241D0C 3C01800B */  lui       $at, %hi(D_800B2210)
+/* 8EDB30 80241D10 E4202210 */  swc1      $f0, %lo(D_800B2210)($at)
 /* 8EDB34 80241D14 03E00008 */  jr        $ra
 /* 8EDB38 80241D18 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_802421A0_8EDFC0.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_802421A0_8EDFC0.s
index 62ba9cb125..d4853a1e45 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_802421A0_8EDFC0.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_802421A0_8EDFC0.s
@@ -14,21 +14,21 @@ glabel func_802421A0_8EDFC0
 /* 8EDFE4 802421C4 AFB20030 */  sw        $s2, 0x30($sp)
 /* 8EDFE8 802421C8 1A00019F */  blez      $s0, .L80242848
 /* 8EDFEC 802421CC AFB1002C */   sw       $s1, 0x2c($sp)
-/* 8EDFF0 802421D0 3C04800A */  lui       $a0, 0x800a
-/* 8EDFF4 802421D4 2484A66C */  addiu     $a0, $a0, -0x5994
+/* 8EDFF0 802421D0 3C04800A */  lui       $a0, %hi(D_8009A66C)
+/* 8EDFF4 802421D4 2484A66C */  addiu     $a0, $a0, %lo(D_8009A66C)
 /* 8EDFF8 802421D8 3C02DE00 */  lui       $v0, 0xde00
 /* 8EDFFC 802421DC 44900000 */  mtc1      $s0, $f0
 /* 8EE000 802421E0 00000000 */  nop       
 /* 8EE004 802421E4 46800021 */  cvt.d.w   $f0, $f0
 /* 8EE008 802421E8 8C830000 */  lw        $v1, ($a0)
-/* 8EE00C 802421EC 3C018025 */  lui       $at, 0x8025
-/* 8EE010 802421F0 D4223030 */  ldc1      $f2, 0x3030($at)
+/* 8EE00C 802421EC 3C018025 */  lui       $at, %hi(D_80253030)
+/* 8EE010 802421F0 D4223030 */  ldc1      $f2, %lo(D_80253030)($at)
 /* 8EE014 802421F4 0060282D */  daddu     $a1, $v1, $zero
 /* 8EE018 802421F8 24630008 */  addiu     $v1, $v1, 8
 /* 8EE01C 802421FC AC830000 */  sw        $v1, ($a0)
 /* 8EE020 80242200 ACA20000 */  sw        $v0, ($a1)
-/* 8EE024 80242204 3C028025 */  lui       $v0, 0x8025
-/* 8EE028 80242208 24422D50 */  addiu     $v0, $v0, 0x2d50
+/* 8EE024 80242204 3C028025 */  lui       $v0, %hi(D_80252D50)
+/* 8EE028 80242208 24422D50 */  addiu     $v0, $v0, %lo(D_80252D50)
 /* 8EE02C 8024220C ACA20004 */  sw        $v0, 4($a1)
 /* 8EE030 80242210 24620008 */  addiu     $v0, $v1, 8
 /* 8EE034 80242214 AC820000 */  sw        $v0, ($a0)
@@ -69,16 +69,16 @@ glabel func_802421A0_8EDFC0
 /* 8EE0B8 80242298 2404001E */  addiu     $a0, $zero, 0x1e
 /* 8EE0BC 8024229C 24050028 */  addiu     $a1, $zero, 0x28
 /* 8EE0C0 802422A0 24060104 */  addiu     $a2, $zero, 0x104
-/* 8EE0C4 802422A4 3C08800A */  lui       $t0, 0x800a
-/* 8EE0C8 802422A8 2508A66C */  addiu     $t0, $t0, -0x5994
+/* 8EE0C4 802422A4 3C08800A */  lui       $t0, %hi(D_8009A66C)
+/* 8EE0C8 802422A8 2508A66C */  addiu     $t0, $t0, %lo(D_8009A66C)
 /* 8EE0CC 802422AC 318200FF */  andi      $v0, $t4, 0xff
 /* 8EE0D0 802422B0 00491025 */  or        $v0, $v0, $t1
 /* 8EE0D4 802422B4 44901000 */  mtc1      $s0, $f2
 /* 8EE0D8 802422B8 00000000 */  nop       
 /* 8EE0DC 802422BC 468010A1 */  cvt.d.w   $f2, $f2
 /* 8EE0E0 802422C0 8D030000 */  lw        $v1, ($t0)
-/* 8EE0E4 802422C4 3C018025 */  lui       $at, 0x8025
-/* 8EE0E8 802422C8 D4203038 */  ldc1      $f0, 0x3038($at)
+/* 8EE0E4 802422C4 3C018025 */  lui       $at, %hi(D_80253038)
+/* 8EE0E8 802422C8 D4203038 */  ldc1      $f0, %lo(D_80253038)($at)
 /* 8EE0EC 802422CC 24110001 */  addiu     $s1, $zero, 1
 /* 8EE0F0 802422D0 ADA20000 */  sw        $v0, ($t5)
 /* 8EE0F4 802422D4 0060102D */  daddu     $v0, $v1, $zero
diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_80242870_8EE690.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_80242870_8EE690.s
index 8b753b194e..2a81d77c76 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_80242870_8EE690.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_80242870_8EE690.s
@@ -14,9 +14,9 @@ glabel func_80242870_8EE690
 /* 8EE6B4 80242894 2C620005 */  sltiu     $v0, $v1, 5
 /* 8EE6B8 80242898 10400053 */  beqz      $v0, .L802429E8
 /* 8EE6BC 8024289C 00031080 */   sll      $v0, $v1, 2
-/* 8EE6C0 802428A0 3C018025 */  lui       $at, 0x8025
+/* 8EE6C0 802428A0 3C018025 */  lui       $at, %hi(D_80253040)
 /* 8EE6C4 802428A4 00220821 */  addu      $at, $at, $v0
-/* 8EE6C8 802428A8 8C223040 */  lw        $v0, 0x3040($at)
+/* 8EE6C8 802428A8 8C223040 */  lw        $v0, %lo(D_80253040)($at)
 /* 8EE6CC 802428AC 00400008 */  jr        $v0
 /* 8EE6D0 802428B0 00000000 */   nop      
 /* 8EE6D4 802428B4 2404021C */  addiu     $a0, $zero, 0x21c
diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_80242A04_8EE824.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_80242A04_8EE824.s
index 4f0cb431ff..b085e2cc43 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_80242A04_8EE824.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_80242A04_8EE824.s
@@ -5,8 +5,8 @@ glabel func_80242A04_8EE824
 /* 8EE824 80242A04 27BDFFD8 */  addiu     $sp, $sp, -0x28
 /* 8EE828 80242A08 2402002D */  addiu     $v0, $zero, 0x2d
 /* 8EE82C 80242A0C AFA20010 */  sw        $v0, 0x10($sp)
-/* 8EE830 80242A10 3C028024 */  lui       $v0, 0x8024
-/* 8EE834 80242A14 24422870 */  addiu     $v0, $v0, 0x2870
+/* 8EE830 80242A10 3C028024 */  lui       $v0, %hi(D_80242870)
+/* 8EE834 80242A14 24422870 */  addiu     $v0, $v0, %lo(D_80242870)
 /* 8EE838 80242A18 27A40010 */  addiu     $a0, $sp, 0x10
 /* 8EE83C 80242A1C AFBF0020 */  sw        $ra, 0x20($sp)
 /* 8EE840 80242A20 AFA00018 */  sw        $zero, 0x18($sp)
diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_80242A3C_8EE85C.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_80242A3C_8EE85C.s
index 84d454f1bb..c95f765ae6 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_80242A3C_8EE85C.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_80242A3C_8EE85C.s
@@ -25,8 +25,8 @@ glabel func_80242A3C_8EE85C
 /* 8EE8A4 80242A84 A6710024 */  sh        $s1, 0x24($s3)
 /* 8EE8A8 80242A88 0000882D */  daddu     $s1, $zero, $zero
 /* 8EE8AC 80242A8C 0220802D */  daddu     $s0, $s1, $zero
-/* 8EE8B0 80242A90 3C128025 */  lui       $s2, 0x8025
-/* 8EE8B4 80242A94 26522DC0 */  addiu     $s2, $s2, 0x2dc0
+/* 8EE8B0 80242A90 3C128025 */  lui       $s2, %hi(D_80252DC0)
+/* 8EE8B4 80242A94 26522DC0 */  addiu     $s2, $s2, %lo(D_80252DC0)
 .L80242A98:
 /* 8EE8B8 80242A98 8E450000 */  lw        $a1, ($s2)
 /* 8EE8BC 80242A9C 10A00008 */  beqz      $a1, .L80242AC0
diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_80242B04_8EE924.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_80242B04_8EE924.s
index 35a3f9be15..44b855c9d1 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_80242B04_8EE924.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_80242B04_8EE924.s
@@ -12,8 +12,8 @@ glabel func_80242B04_8EE924
 /* 8EE940 80242B20 2404002C */   addiu    $a0, $zero, 0x2c
 /* 8EE944 80242B24 0040802D */  daddu     $s0, $v0, $zero
 /* 8EE948 80242B28 0000202D */  daddu     $a0, $zero, $zero
-/* 8EE94C 80242B2C 3C058024 */  lui       $a1, 0x8024
-/* 8EE950 80242B30 24A52A04 */  addiu     $a1, $a1, 0x2a04
+/* 8EE94C 80242B2C 3C058024 */  lui       $a1, %hi(D_80242A04)
+/* 8EE950 80242B30 24A52A04 */  addiu     $a1, $a1, %lo(D_80242A04)
 /* 8EE954 80242B34 240200FF */  addiu     $v0, $zero, 0xff
 /* 8EE958 80242B38 AE300070 */  sw        $s0, 0x70($s1)
 /* 8EE95C 80242B3C A6000000 */  sh        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_80240010_8FEE90.s b/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_80240010_8FEE90.s
index 371009bd9b..e5e925f9df 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_80240010_8FEE90.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_80240010_8FEE90.s
@@ -4,14 +4,14 @@
 glabel func_80240010_8FEE90
 /* 8FEE90 80240010 27BDFFF0 */  addiu     $sp, $sp, -0x10
 /* 8FEE94 80240014 0000482D */  daddu     $t1, $zero, $zero
-/* 8FEE98 80240018 3C02800A */  lui       $v0, 0x800a
-/* 8FEE9C 8024001C 2442A66C */  addiu     $v0, $v0, -0x5994
+/* 8FEE98 80240018 3C02800A */  lui       $v0, %hi(D_8009A66C)
+/* 8FEE9C 8024001C 2442A66C */  addiu     $v0, $v0, %lo(D_8009A66C)
 /* 8FEEA0 80240020 0040402D */  daddu     $t0, $v0, $zero
 /* 8FEEA4 80240024 3C0EFD18 */  lui       $t6, 0xfd18
 /* 8FEEA8 80240028 35CE00C7 */  ori       $t6, $t6, 0xc7
 /* 8FEEAC 8024002C AFB3000C */  sw        $s3, 0xc($sp)
-/* 8FEEB0 80240030 3C138024 */  lui       $s3, 0x8024
-/* 8FEEB4 80240034 267307F4 */  addiu     $s3, $s3, 0x7f4
+/* 8FEEB0 80240030 3C138024 */  lui       $s3, %hi(D_802407F4)
+/* 8FEEB4 80240034 267307F4 */  addiu     $s3, $s3, %lo(D_802407F4)
 /* 8FEEB8 80240038 3C0BF518 */  lui       $t3, 0xf518
 /* 8FEEBC 8024003C 356B6400 */  ori       $t3, $t3, 0x6400
 /* 8FEEC0 80240040 AFB20008 */  sw        $s2, 8($sp)
@@ -26,22 +26,22 @@ glabel func_80240010_8FEE90
 /* 8FEEE4 80240064 3C18F200 */  lui       $t8, 0xf200
 /* 8FEEE8 80240068 3C0C0031 */  lui       $t4, 0x31
 /* 8FEEEC 8024006C 358CC004 */  ori       $t4, $t4, 0xc004
-/* 8FEEF0 80240070 3C0F8024 */  lui       $t7, 0x8024
-/* 8FEEF4 80240074 25EF0334 */  addiu     $t7, $t7, 0x334
+/* 8FEEF0 80240070 3C0F8024 */  lui       $t7, %hi(D_80240334)
+/* 8FEEF4 80240074 25EF0334 */  addiu     $t7, $t7, %lo(D_80240334)
 /* 8FEEF8 80240078 0120502D */  daddu     $t2, $t1, $zero
 /* 8FEEFC 8024007C 8D030000 */  lw        $v1, ($t0)
-/* 8FEF00 80240080 3C02DE00 */  lui       $v0, 0xde00
+/* 8FEF00 80240080 3C02DE00 */  lui       $v0, %hi(D_DE000338)
 /* 8FEF04 80240084 0060202D */  daddu     $a0, $v1, $zero
 /* 8FEF08 80240088 24630008 */  addiu     $v1, $v1, 8
 /* 8FEF0C 8024008C AD030000 */  sw        $v1, ($t0)
 /* 8FEF10 80240090 AC820000 */  sw        $v0, ($a0)
-/* 8FEF14 80240094 3C028024 */  lui       $v0, 0x8024
-/* 8FEF18 80240098 24420338 */  addiu     $v0, $v0, 0x338
+/* 8FEF14 80240094 3C028024 */  lui       $v0, %hi(D_80240338)
+/* 8FEF18 80240098 24420338 */  addiu     $v0, $v0, %lo(D_DE000338)
 /* 8FEF1C 8024009C AC820004 */  sw        $v0, 4($a0)
 /* 8FEF20 802400A0 24620008 */  addiu     $v0, $v1, 8
 /* 8FEF24 802400A4 AD020000 */  sw        $v0, ($t0)
-/* 8FEF28 802400A8 3C048024 */  lui       $a0, 0x8024
-/* 8FEF2C 802400AC 90840333 */  lbu       $a0, 0x333($a0)
+/* 8FEF28 802400A8 3C048024 */  lui       $a0, %hi(D_80240333)
+/* 8FEF2C 802400AC 90840333 */  lbu       $a0, %lo(D_80240333)($a0)
 /* 8FEF30 802400B0 3C02FA00 */  lui       $v0, 0xfa00
 /* 8FEF34 802400B4 AC620000 */  sw        $v0, ($v1)
 /* 8FEF38 802400B8 24620010 */  addiu     $v0, $v1, 0x10
@@ -116,8 +116,8 @@ glabel func_80240010_8FEE90
 /* 8FF048 802401C8 29220038 */  slti      $v0, $t1, 0x38
 /* 8FF04C 802401CC 1440FFC0 */  bnez      $v0, .L802400D0
 /* 8FF050 802401D0 AC870044 */   sw       $a3, 0x44($a0)
-/* 8FF054 802401D4 3C03800A */  lui       $v1, 0x800a
-/* 8FF058 802401D8 2463A66C */  addiu     $v1, $v1, -0x5994
+/* 8FF054 802401D4 3C03800A */  lui       $v1, %hi(D_8009A66C)
+/* 8FF058 802401D8 2463A66C */  addiu     $v1, $v1, %lo(D_8009A66C)
 /* 8FF05C 802401DC 8C620000 */  lw        $v0, ($v1)
 /* 8FF060 802401E0 0040202D */  daddu     $a0, $v0, $zero
 /* 8FF064 802401E4 24420008 */  addiu     $v0, $v0, 8
diff --git a/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_80240210_8FF090.s b/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_80240210_8FF090.s
index 7b7f9f32bd..182c41d43c 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_80240210_8FF090.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_80240210_8FF090.s
@@ -3,8 +3,8 @@
 
 glabel func_80240210_8FF090
 /* 8FF090 80240210 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 8FF094 80240214 3C048024 */  lui       $a0, 0x8024
-/* 8FF098 80240218 248407D0 */  addiu     $a0, $a0, 0x7d0
+/* 8FF094 80240214 3C048024 */  lui       $a0, %hi(D_802407D0)
+/* 8FF098 80240218 248407D0 */  addiu     $a0, $a0, %lo(D_802407D0)
 /* 8FF09C 8024021C 27A50010 */  addiu     $a1, $sp, 0x10
 /* 8FF0A0 80240220 AFBF0020 */  sw        $ra, 0x20($sp)
 /* 8FF0A4 80240224 AFB1001C */  sw        $s1, 0x1c($sp)
@@ -15,19 +15,19 @@ glabel func_80240210_8FF090
 /* 8FF0B8 80240238 0040882D */   daddu    $s1, $v0, $zero
 /* 8FF0BC 8024023C 0220202D */  daddu     $a0, $s1, $zero
 /* 8FF0C0 80240240 0040282D */  daddu     $a1, $v0, $zero
-/* 8FF0C4 80240244 3C108024 */  lui       $s0, 0x8024
-/* 8FF0C8 80240248 261007F0 */  addiu     $s0, $s0, 0x7f0
+/* 8FF0C4 80240244 3C108024 */  lui       $s0, %hi(D_802407F0)
+/* 8FF0C8 80240248 261007F0 */  addiu     $s0, $s0, %lo(D_802407F0)
 /* 8FF0CC 8024024C 0C01BB7C */  jal       decode_yay0
 /* 8FF0D0 80240250 AE050000 */   sw       $a1, ($s0)
 /* 8FF0D4 80240254 0C00AB1E */  jal       general_heap_free
 /* 8FF0D8 80240258 0220202D */   daddu    $a0, $s1, $zero
 /* 8FF0DC 8024025C 8E030000 */  lw        $v1, ($s0)
 /* 8FF0E0 80240260 8C620000 */  lw        $v0, ($v1)
-/* 8FF0E4 80240264 3C058024 */  lui       $a1, 0x8024
-/* 8FF0E8 80240268 24A50010 */  addiu     $a1, $a1, 0x10
+/* 8FF0E4 80240264 3C058024 */  lui       $a1, %hi(D_80240010)
+/* 8FF0E8 80240268 24A50010 */  addiu     $a1, $a1, %lo(D_80240010)
 /* 8FF0EC 8024026C 00431021 */  addu      $v0, $v0, $v1
-/* 8FF0F0 80240270 3C018024 */  lui       $at, 0x8024
-/* 8FF0F4 80240274 AC2207F4 */  sw        $v0, 0x7f4($at)
+/* 8FF0F0 80240270 3C018024 */  lui       $at, %hi(D_802407F4)
+/* 8FF0F4 80240274 AC2207F4 */  sw        $v0, %lo(D_802407F4)($at)
 /* 8FF0F8 80240278 0C048C8F */  jal       bind_dynamic_entity_7
 /* 8FF0FC 8024027C 0000202D */   daddu    $a0, $zero, $zero
 /* 8FF100 80240280 8FBF0020 */  lw        $ra, 0x20($sp)
diff --git a/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_802402B4_8FF134.s b/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_802402B4_8FF134.s
index db4027da30..7ce890d710 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_802402B4_8FF134.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_802402B4_8FF134.s
@@ -3,7 +3,7 @@
 
 glabel func_802402B4_8FF134
 /* 8FF134 802402B4 8C820084 */  lw        $v0, 0x84($a0)
-/* 8FF138 802402B8 3C018024 */  lui       $at, 0x8024
-/* 8FF13C 802402BC AC220330 */  sw        $v0, 0x330($at)
+/* 8FF138 802402B8 3C018024 */  lui       $at, %hi(D_80240330)
+/* 8FF13C 802402BC AC220330 */  sw        $v0, %lo(D_80240330)($at)
 /* 8FF140 802402C0 03E00008 */  jr        $ra
 /* 8FF144 802402C4 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_802402C8_8FF148.s b/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_802402C8_8FF148.s
index d68dc0133e..3ece9755ce 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_802402C8_8FF148.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_802402C8_8FF148.s
@@ -3,8 +3,8 @@
 
 glabel func_802402C8_8FF148
 /* 8FF148 802402C8 8C820084 */  lw        $v0, 0x84($a0)
-/* 8FF14C 802402CC 3C018024 */  lui       $at, 0x8024
-/* 8FF150 802402D0 AC220334 */  sw        $v0, 0x334($at)
+/* 8FF14C 802402CC 3C018024 */  lui       $at, %hi(D_80240334)
+/* 8FF150 802402D0 AC220334 */  sw        $v0, %lo(D_80240334)($at)
 /* 8FF154 802402D4 03E00008 */  jr        $ra
 /* 8FF158 802402D8 24020002 */   addiu    $v0, $zero, 2
 /* 8FF15C 802402DC 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_kmr/kmr_22/8FF680/func_80240010_8FF680.s b/asm/nonmatchings/world/area_kmr/kmr_22/8FF680/func_80240010_8FF680.s
index a84ec57135..105bb2a931 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_22/8FF680/func_80240010_8FF680.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_22/8FF680/func_80240010_8FF680.s
@@ -28,37 +28,37 @@ glabel func_80240010_8FF680
 /* 8FF6D8 80240068 AFA00014 */  sw        $zero, 0x14($sp)
 /* 8FF6DC 8024006C 0C01C97C */  jal       func_800725F0
 /* 8FF6E0 80240070 00A0302D */   daddu    $a2, $a1, $zero
-/* 8FF6E4 80240074 3C018025 */  lui       $at, 0x8025
-/* 8FF6E8 80240078 AC2283C0 */  sw        $v0, -0x7c40($at)
-/* 8FF6EC 8024007C 3C018025 */  lui       $at, 0x8025
-/* 8FF6F0 80240080 AC2083C4 */  sw        $zero, -0x7c3c($at)
+/* 8FF6E4 80240074 3C018025 */  lui       $at, %hi(D_802483C0)
+/* 8FF6E8 80240078 AC2283C0 */  sw        $v0, %lo(D_802483C0)($at)
+/* 8FF6EC 8024007C 3C018025 */  lui       $at, %hi(D_802483C4)
+/* 8FF6F0 80240080 AC2083C4 */  sw        $zero, %lo(D_802483C4)($at)
 .L80240084:
-/* 8FF6F4 80240084 3C038025 */  lui       $v1, 0x8025
-/* 8FF6F8 80240088 8C6383C4 */  lw        $v1, -0x7c3c($v1)
+/* 8FF6F4 80240084 3C038025 */  lui       $v1, %hi(D_802483C4)
+/* 8FF6F8 80240088 8C6383C4 */  lw        $v1, %lo(D_802483C4)($v1)
 /* 8FF6FC 8024008C 04600009 */  bltz      $v1, .L802400B4
 /* 8FF700 80240090 26240075 */   addiu    $a0, $s1, 0x75
 /* 8FF704 80240094 28620014 */  slti      $v0, $v1, 0x14
 /* 8FF708 80240098 10400007 */  beqz      $v0, .L802400B8
 /* 8FF70C 8024009C 00031040 */   sll      $v0, $v1, 1
-/* 8FF710 802400A0 3C018024 */  lui       $at, 0x8024
+/* 8FF710 802400A0 3C018024 */  lui       $at, %hi(D_80240DE0)
 /* 8FF714 802400A4 00220821 */  addu      $at, $at, $v0
-/* 8FF718 802400A8 84220DE0 */  lh        $v0, 0xde0($at)
+/* 8FF718 802400A8 84220DE0 */  lh        $v0, %lo(D_80240DE0)($at)
 /* 8FF71C 802400AC 0809002E */  j         .L802400B8
 /* 8FF720 802400B0 00822023 */   subu     $a0, $a0, $v0
 .L802400B4:
 /* 8FF724 802400B4 2624FF3F */  addiu     $a0, $s1, -0xc1
 .L802400B8:
 /* 8FF728 802400B8 2406003A */  addiu     $a2, $zero, 0x3a
-/* 8FF72C 802400BC 3C038025 */  lui       $v1, 0x8025
-/* 8FF730 802400C0 8C6383C0 */  lw        $v1, -0x7c40($v1)
+/* 8FF72C 802400BC 3C038025 */  lui       $v1, %hi(D_802483C0)
+/* 8FF730 802400C0 8C6383C0 */  lw        $v1, %lo(D_802483C0)($v1)
 /* 8FF734 802400C4 44840000 */  mtc1      $a0, $f0
 /* 8FF738 802400C8 00000000 */  nop       
 /* 8FF73C 802400CC 46800020 */  cvt.s.w   $f0, $f0
 /* 8FF740 802400D0 8C62000C */  lw        $v0, 0xc($v1)
 /* 8FF744 802400D4 E4400004 */  swc1      $f0, 4($v0)
 /* 8FF748 802400D8 8C62000C */  lw        $v0, 0xc($v1)
-/* 8FF74C 802400DC 3C038025 */  lui       $v1, 0x8025
-/* 8FF750 802400E0 8C6383C4 */  lw        $v1, -0x7c3c($v1)
+/* 8FF74C 802400DC 3C038025 */  lui       $v1, %hi(D_802483C4)
+/* 8FF750 802400E0 8C6383C4 */  lw        $v1, %lo(D_802483C4)($v1)
 /* 8FF754 802400E4 44860000 */  mtc1      $a2, $f0
 /* 8FF758 802400E8 00000000 */  nop       
 /* 8FF75C 802400EC 46800020 */  cvt.s.w   $f0, $f0
@@ -70,24 +70,24 @@ glabel func_80240010_8FF680
 /* 8FF774 80240104 10400008 */  beqz      $v0, .L80240128
 /* 8FF778 80240108 2462FFF6 */   addiu    $v0, $v1, -0xa
 /* 8FF77C 8024010C 00021040 */  sll       $v0, $v0, 1
-/* 8FF780 80240110 3C018024 */  lui       $at, 0x8024
+/* 8FF780 80240110 3C018024 */  lui       $at, %hi(D_80240DE0)
 /* 8FF784 80240114 00220821 */  addu      $at, $at, $v0
-/* 8FF788 80240118 84220DE0 */  lh        $v0, 0xde0($at)
+/* 8FF788 80240118 84220DE0 */  lh        $v0, %lo(D_80240DE0)($at)
 /* 8FF78C 8024011C 0809004A */  j         .L80240128
 /* 8FF790 80240120 00C23023 */   subu     $a2, $a2, $v0
 .L80240124:
 /* 8FF794 80240124 2406FF04 */  addiu     $a2, $zero, -0xfc
 .L80240128:
-/* 8FF798 80240128 3C038025 */  lui       $v1, 0x8025
-/* 8FF79C 8024012C 8C6383C0 */  lw        $v1, -0x7c40($v1)
+/* 8FF798 80240128 3C038025 */  lui       $v1, %hi(D_802483C0)
+/* 8FF79C 8024012C 8C6383C0 */  lw        $v1, %lo(D_802483C0)($v1)
 /* 8FF7A0 80240130 44840000 */  mtc1      $a0, $f0
 /* 8FF7A4 80240134 00000000 */  nop       
 /* 8FF7A8 80240138 46800020 */  cvt.s.w   $f0, $f0
 /* 8FF7AC 8024013C 8C62000C */  lw        $v0, 0xc($v1)
 /* 8FF7B0 80240140 E4400010 */  swc1      $f0, 0x10($v0)
 /* 8FF7B4 80240144 8C62000C */  lw        $v0, 0xc($v1)
-/* 8FF7B8 80240148 3C038025 */  lui       $v1, 0x8025
-/* 8FF7BC 8024014C 8C6383C4 */  lw        $v1, -0x7c3c($v1)
+/* 8FF7B8 80240148 3C038025 */  lui       $v1, %hi(D_802483C4)
+/* 8FF7BC 8024014C 8C6383C4 */  lw        $v1, %lo(D_802483C4)($v1)
 /* 8FF7C0 80240150 44860000 */  mtc1      $a2, $f0
 /* 8FF7C4 80240154 00000000 */  nop       
 /* 8FF7C8 80240158 46800020 */  cvt.s.w   $f0, $f0
@@ -99,21 +99,21 @@ glabel func_80240010_8FF680
 /* 8FF7E0 80240170 10400008 */  beqz      $v0, .L80240194
 /* 8FF7E4 80240174 2462FFEC */   addiu    $v0, $v1, -0x14
 /* 8FF7E8 80240178 00021040 */  sll       $v0, $v0, 1
-/* 8FF7EC 8024017C 3C018024 */  lui       $at, 0x8024
+/* 8FF7EC 8024017C 3C018024 */  lui       $at, %hi(D_80240DE0)
 /* 8FF7F0 80240180 00220821 */  addu      $at, $at, $v0
-/* 8FF7F4 80240184 84220DE0 */  lh        $v0, 0xde0($at)
+/* 8FF7F4 80240184 84220DE0 */  lh        $v0, %lo(D_80240DE0)($at)
 /* 8FF7F8 80240188 08090065 */  j         .L80240194
 /* 8FF7FC 8024018C 00442021 */   addu     $a0, $v0, $a0
 .L80240190:
 /* 8FF800 80240190 2404024E */  addiu     $a0, $zero, 0x24e
 .L80240194:
-/* 8FF804 80240194 3C058025 */  lui       $a1, 0x8025
-/* 8FF808 80240198 8CA583C0 */  lw        $a1, -0x7c40($a1)
+/* 8FF804 80240194 3C058025 */  lui       $a1, %hi(D_802483C0)
+/* 8FF808 80240198 8CA583C0 */  lw        $a1, %lo(D_802483C0)($a1)
 /* 8FF80C 8024019C 8CA3000C */  lw        $v1, 0xc($a1)
 /* 8FF810 802401A0 2406005A */  addiu     $a2, $zero, 0x5a
 /* 8FF814 802401A4 AC640040 */  sw        $a0, 0x40($v1)
-/* 8FF818 802401A8 3C048025 */  lui       $a0, 0x8025
-/* 8FF81C 802401AC 248483C4 */  addiu     $a0, $a0, -0x7c3c
+/* 8FF818 802401A8 3C048025 */  lui       $a0, %hi(D_802483C4)
+/* 8FF81C 802401AC 248483C4 */  addiu     $a0, $a0, %lo(D_802483C4)
 /* 8FF820 802401B0 8C830000 */  lw        $v1, ($a0)
 /* 8FF824 802401B4 8CA5000C */  lw        $a1, 0xc($a1)
 /* 8FF828 802401B8 24630001 */  addiu     $v1, $v1, 1
diff --git a/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_8024056C_8FFBDC.s b/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_8024056C_8FFBDC.s
index 4ca89db914..411d2c629c 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_8024056C_8FFBDC.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_8024056C_8FFBDC.s
@@ -3,8 +3,8 @@
 
 glabel func_8024056C_8FFBDC
 /* 8FFBDC 8024056C 27BDFF70 */  addiu     $sp, $sp, -0x90
-/* 8FFBE0 80240570 3C038025 */  lui       $v1, 0x8025
-/* 8FFBE4 80240574 8C6383D0 */  lw        $v1, -0x7c30($v1)
+/* 8FFBE0 80240570 3C038025 */  lui       $v1, %hi(D_802483D0)
+/* 8FFBE4 80240574 8C6383D0 */  lw        $v1, %lo(D_802483D0)($v1)
 /* 8FFBE8 80240578 2402FFFF */  addiu     $v0, $zero, -1
 /* 8FFBEC 8024057C AFBF005C */  sw        $ra, 0x5c($sp)
 /* 8FFBF0 80240580 AFBE0058 */  sw        $fp, 0x58($sp)
@@ -82,8 +82,8 @@ glabel func_8024056C_8FFBDC
 /* 8FFCF4 80240684 3C013FE0 */  lui       $at, 0x3fe0
 /* 8FFCF8 80240688 44814800 */  mtc1      $at, $f9
 /* 8FFCFC 8024068C 44804000 */  mtc1      $zero, $f8
-/* 8FFD00 80240690 3C018025 */  lui       $at, 0x8025
-/* 8FFD04 80240694 D42683B0 */  ldc1      $f6, -0x7c50($at)
+/* 8FFD00 80240690 3C018025 */  lui       $at, %hi(D_802483B0)
+/* 8FFD04 80240694 D42683B0 */  ldc1      $f6, %lo(D_802483B0)($at)
 .L80240698:
 /* 8FFD08 80240698 16260004 */  bne       $s1, $a2, .L802406AC
 /* 8FFD0C 8024069C 00851021 */   addu     $v0, $a0, $a1
@@ -128,12 +128,12 @@ glabel func_8024056C_8FFBDC
 /* 8FFD94 80240724 1440FFB1 */  bnez      $v0, .L802405EC
 /* 8FFD98 80240728 261001E0 */   addiu    $s0, $s0, 0x1e0
 /* 8FFD9C 8024072C 24020001 */  addiu     $v0, $zero, 1
-/* 8FFDA0 80240730 3C018025 */  lui       $at, 0x8025
-/* 8FFDA4 80240734 AC2283D0 */  sw        $v0, -0x7c30($at)
+/* 8FFDA0 80240730 3C018025 */  lui       $at, %hi(D_802483D0)
+/* 8FFDA4 80240734 AC2283D0 */  sw        $v0, %lo(D_802483D0)($at)
 /* 8FFDA8 80240738 0000382D */  daddu     $a3, $zero, $zero
 .L8024073C:
-/* 8FFDAC 8024073C 3C02800A */  lui       $v0, 0x800a
-/* 8FFDB0 80240740 2442A66C */  addiu     $v0, $v0, -0x5994
+/* 8FFDAC 8024073C 3C02800A */  lui       $v0, %hi(D_8009A66C)
+/* 8FFDB0 80240740 2442A66C */  addiu     $v0, $v0, %lo(D_8009A66C)
 /* 8FFDB4 80240744 0040402D */  daddu     $t0, $v0, $zero
 /* 8FFDB8 80240748 3C090100 */  lui       $t1, 0x100
 /* 8FFDBC 8024074C 35294008 */  ori       $t1, $t1, 0x4008
@@ -151,10 +151,10 @@ glabel func_8024056C_8FFBDC
 /* 8FFDEC 8024077C 24620008 */  addiu     $v0, $v1, 8
 /* 8FFDF0 80240780 AC800004 */  sw        $zero, 4($a0)
 /* 8FFDF4 80240784 AD020000 */  sw        $v0, ($t0)
-/* 8FFDF8 80240788 3C02DE00 */  lui       $v0, 0xde00
+/* 8FFDF8 80240788 3C02DE00 */  lui       $v0, %hi(D_DE001F00)
 /* 8FFDFC 8024078C AC620000 */  sw        $v0, ($v1)
-/* 8FFE00 80240790 3C028024 */  lui       $v0, 0x8024
-/* 8FFE04 80240794 24421F00 */  addiu     $v0, $v0, 0x1f00
+/* 8FFE00 80240790 3C028024 */  lui       $v0, %hi(D_80241F00)
+/* 8FFE04 80240794 24421F00 */  addiu     $v0, $v0, %lo(D_DE001F00)
 /* 8FFE08 80240798 AC620004 */  sw        $v0, 4($v1)
 .L8024079C:
 /* 8FFE0C 8024079C 0000202D */  daddu     $a0, $zero, $zero
@@ -355,8 +355,8 @@ glabel func_8024056C_8FFBDC
 /* 9000F8 80240A88 252901E0 */  addiu     $t1, $t1, 0x1e0
 /* 9000FC 80240A8C 1440FF43 */  bnez      $v0, .L8024079C
 /* 900100 80240A90 AFA90020 */   sw       $t1, 0x20($sp)
-/* 900104 80240A94 3C03800A */  lui       $v1, 0x800a
-/* 900108 80240A98 2463A66C */  addiu     $v1, $v1, -0x5994
+/* 900104 80240A94 3C03800A */  lui       $v1, %hi(D_8009A66C)
+/* 900108 80240A98 2463A66C */  addiu     $v1, $v1, %lo(D_8009A66C)
 /* 90010C 80240A9C 8C620000 */  lw        $v0, ($v1)
 /* 900110 80240AA0 0040202D */  daddu     $a0, $v0, $zero
 /* 900114 80240AA4 24420008 */  addiu     $v0, $v0, 8
diff --git a/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240B00_900170.s b/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240B00_900170.s
index 5dc29783e0..f54170a0ac 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240B00_900170.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240B00_900170.s
@@ -3,8 +3,8 @@
 
 glabel func_80240B00_900170
 /* 900170 80240B00 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 900174 80240B04 3C028024 */  lui       $v0, 0x8024
-/* 900178 80240B08 2442056C */  addiu     $v0, $v0, 0x56c
+/* 900174 80240B04 3C028024 */  lui       $v0, %hi(D_8024056C)
+/* 900178 80240B08 2442056C */  addiu     $v0, $v0, %lo(D_8024056C)
 /* 90017C 80240B0C AFA2001C */  sw        $v0, 0x1c($sp)
 /* 900180 80240B10 2402000A */  addiu     $v0, $zero, 0xa
 /* 900184 80240B14 AFA20014 */  sw        $v0, 0x14($sp)
diff --git a/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240B3C_9001AC.s b/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240B3C_9001AC.s
index a28625e719..b33d396594 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240B3C_9001AC.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240B3C_9001AC.s
@@ -2,7 +2,7 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80240B3C_9001AC
-/* 9001AC 80240B3C 3C018025 */  lui       $at, 0x8025
-/* 9001B0 80240B40 AC2083D0 */  sw        $zero, -0x7c30($at)
+/* 9001AC 80240B3C 3C018025 */  lui       $at, %hi(D_802483D0)
+/* 9001B0 80240B40 AC2083D0 */  sw        $zero, %lo(D_802483D0)($at)
 /* 9001B4 80240B44 03E00008 */  jr        $ra
 /* 9001B8 80240B48 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240B4C_9001BC.s b/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240B4C_9001BC.s
index 42bdeb3094..49593dcca2 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240B4C_9001BC.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240B4C_9001BC.s
@@ -9,15 +9,15 @@ glabel func_80240B4C_9001BC
 /* 9001CC 80240B5C 0C00AB39 */  jal       heap_malloc
 /* 9001D0 80240B60 24040780 */   addiu    $a0, $zero, 0x780
 /* 9001D4 80240B64 0200202D */  daddu     $a0, $s0, $zero
-/* 9001D8 80240B68 3C05FD05 */  lui       $a1, 0xfd05
+/* 9001D8 80240B68 3C05FD05 */  lui       $a1, %hi(D_FD050B00)
 /* 9001DC 80240B6C 34A50F80 */  ori       $a1, $a1, 0xf80
 /* 9001E0 80240B70 0C0B2026 */  jal       set_variable
 /* 9001E4 80240B74 0040302D */   daddu    $a2, $v0, $zero
 /* 9001E8 80240B78 2402FFFF */  addiu     $v0, $zero, -1
-/* 9001EC 80240B7C 3C058024 */  lui       $a1, 0x8024
-/* 9001F0 80240B80 24A50B00 */  addiu     $a1, $a1, 0xb00
-/* 9001F4 80240B84 3C018025 */  lui       $at, 0x8025
-/* 9001F8 80240B88 AC2283D0 */  sw        $v0, -0x7c30($at)
+/* 9001EC 80240B7C 3C058024 */  lui       $a1, %hi(D_80240B00)
+/* 9001F0 80240B80 24A50B00 */  addiu     $a1, $a1, %lo(D_FD050B00)
+/* 9001F4 80240B84 3C018025 */  lui       $at, %hi(D_802483D0)
+/* 9001F8 80240B88 AC2283D0 */  sw        $v0, %lo(D_802483D0)($at)
 /* 9001FC 80240B8C 0C048C56 */  jal       bind_dynamic_entity_3
 /* 900200 80240B90 0000202D */   daddu    $a0, $zero, $zero
 /* 900204 80240B94 8FBF0014 */  lw        $ra, 0x14($sp)
diff --git a/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240BA8_900218.s b/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240BA8_900218.s
index 0679a2a1b3..bb0edbf207 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240BA8_900218.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240BA8_900218.s
@@ -33,8 +33,8 @@ glabel func_80240BA8_900218
 /* 900284 80240C14 0809033D */  j         .L80240CF4
 /* 900288 80240C18 00000000 */   nop      
 .L80240C1C:
-/* 90028C 80240C1C 3C028024 */  lui       $v0, 0x8024
-/* 900290 80240C20 24421FE0 */  addiu     $v0, $v0, 0x1fe0
+/* 90028C 80240C1C 3C028024 */  lui       $v0, %hi(D_80241FE0)
+/* 900290 80240C20 24421FE0 */  addiu     $v0, $v0, %lo(D_80241FE0)
 /* 900294 80240C24 00641821 */  addu      $v1, $v1, $a0
 /* 900298 80240C28 00032080 */  sll       $a0, $v1, 2
 /* 90029C 80240C2C 00822021 */  addu      $a0, $a0, $v0
@@ -47,8 +47,8 @@ glabel func_80240BA8_900218
 /* 9002B8 80240C48 3C068020 */   lui      $a2, 0x8020
 .L80240C4C:
 /* 9002BC 80240C4C 3C068020 */  lui       $a2, 0x8020
-/* 9002C0 80240C50 3C028024 */  lui       $v0, 0x8024
-/* 9002C4 80240C54 24421FE0 */  addiu     $v0, $v0, 0x1fe0
+/* 9002C0 80240C50 3C028024 */  lui       $v0, %hi(D_80241FE0)
+/* 9002C4 80240C54 24421FE0 */  addiu     $v0, $v0, %lo(D_80241FE0)
 /* 9002C8 80240C58 00041840 */  sll       $v1, $a0, 1
 /* 9002CC 80240C5C 00641821 */  addu      $v1, $v1, $a0
 /* 9002D0 80240C60 00032080 */  sll       $a0, $v1, 2
@@ -62,8 +62,8 @@ glabel func_80240BA8_900218
 /* 9002F0 80240C80 34C64000 */   ori      $a2, $a2, 0x4000
 .L80240C84:
 /* 9002F4 80240C84 3C068020 */  lui       $a2, 0x8020
-/* 9002F8 80240C88 3C028024 */  lui       $v0, 0x8024
-/* 9002FC 80240C8C 24421FE0 */  addiu     $v0, $v0, 0x1fe0
+/* 9002F8 80240C88 3C028024 */  lui       $v0, %hi(D_80241FE0)
+/* 9002FC 80240C8C 24421FE0 */  addiu     $v0, $v0, %lo(D_80241FE0)
 /* 900300 80240C90 00041840 */  sll       $v1, $a0, 1
 /* 900304 80240C94 00641821 */  addu      $v1, $v1, $a0
 /* 900308 80240C98 00032080 */  sll       $a0, $v1, 2
@@ -76,8 +76,8 @@ glabel func_80240BA8_900218
 /* 900324 80240CB4 0809033B */  j         .L80240CEC
 /* 900328 80240CB8 34C67000 */   ori      $a2, $a2, 0x7000
 .L80240CBC:
-/* 90032C 80240CBC 3C028024 */  lui       $v0, 0x8024
-/* 900330 80240CC0 24421FE0 */  addiu     $v0, $v0, 0x1fe0
+/* 90032C 80240CBC 3C028024 */  lui       $v0, %hi(D_80241FE0)
+/* 900330 80240CC0 24421FE0 */  addiu     $v0, $v0, %lo(D_80241FE0)
 /* 900334 80240CC4 00041840 */  sll       $v1, $a0, 1
 /* 900338 80240CC8 00641821 */  addu      $v1, $v1, $a0
 /* 90033C 80240CCC 00032080 */  sll       $a0, $v1, 2
diff --git a/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240040_907A70.s b/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240040_907A70.s
index 6c5267dff4..73731e233e 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240040_907A70.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240040_907A70.s
@@ -65,8 +65,8 @@ glabel func_80240040_907A70
 /* 907B60 80240130 A0620034 */  sb        $v0, 0x34($v1)
 /* 907B64 80240134 8E020028 */  lw        $v0, 0x28($s0)
 /* 907B68 80240138 8C42000C */  lw        $v0, 0xc($v0)
-/* 907B6C 8024013C 3C048024 */  lui       $a0, 0x8024
-/* 907B70 80240140 24840DA4 */  addiu     $a0, $a0, 0xda4
+/* 907B6C 8024013C 3C048024 */  lui       $a0, %hi(D_80240DA4)
+/* 907B70 80240140 24840DA4 */  addiu     $a0, $a0, %lo(D_80240DA4)
 /* 907B74 80240144 0C00AFC1 */  jal       set_curtain_draw_callback
 /* 907B78 80240148 AC400020 */   sw       $zero, 0x20($v0)
 .L8024014C:
@@ -109,9 +109,9 @@ glabel func_80240040_907A70
 /* 907C08 802401D8 00111880 */  sll       $v1, $s1, 2
 /* 907C0C 802401DC 000210C0 */  sll       $v0, $v0, 3
 /* 907C10 802401E0 00621821 */  addu      $v1, $v1, $v0
-/* 907C14 802401E4 3C028024 */  lui       $v0, 0x8024
+/* 907C14 802401E4 3C028024 */  lui       $v0, %hi(D_8024168C)
 /* 907C18 802401E8 00431021 */  addu      $v0, $v0, $v1
-/* 907C1C 802401EC 8C42168C */  lw        $v0, 0x168c($v0)
+/* 907C1C 802401EC 8C42168C */  lw        $v0, %lo(D_8024168C)($v0)
 /* 907C20 802401F0 AE420028 */  sw        $v0, 0x28($s2)
 .L802401F4:
 /* 907C24 802401F4 8E020028 */  lw        $v0, 0x28($s0)
diff --git a/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240D14_908744.s b/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240D14_908744.s
index 1a7ae46a94..5687f4e99a 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240D14_908744.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240D14_908744.s
@@ -3,14 +3,14 @@
 
 glabel func_80240D14_908744
 /* 908744 80240D14 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 908748 80240D18 3C05FD05 */  lui       $a1, 0xfd05
+/* 908748 80240D18 3C05FD05 */  lui       $a1, %hi(D_FD04A650)
 /* 90874C 80240D1C 34A50F80 */  ori       $a1, $a1, 0xf80
 /* 908750 80240D20 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 908754 80240D24 0C0B1EAF */  jal       get_variable
 /* 908758 80240D28 0000202D */   daddu    $a0, $zero, $zero
 /* 90875C 80240D2C 24030001 */  addiu     $v1, $zero, 1
 /* 908760 80240D30 3C05800A */  lui       $a1, %hi(D_8009A650)
-/* 908764 80240D34 24A5A650 */  addiu     $a1, $a1, %lo(D_8009A650)
+/* 908764 80240D34 24A5A650 */  addiu     $a1, $a1, %lo(D_FD04A650)
 /* 908768 80240D38 A443001E */  sh        $v1, 0x1e($v0)
 /* 90876C 80240D3C 8CA30000 */  lw        $v1, ($a1)
 /* 908770 80240D40 3C040010 */  lui       $a0, 0x10
diff --git a/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240DA4_9087D4.s b/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240DA4_9087D4.s
index 270fcf33bd..e45bce9846 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240DA4_9087D4.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240DA4_9087D4.s
@@ -11,16 +11,16 @@ glabel func_80240DA4_9087D4
 /* 9087EC 80240DBC 0C0B1EAF */  jal       get_variable
 /* 9087F0 80240DC0 AFB00050 */   sw       $s0, 0x50($sp)
 /* 9087F4 80240DC4 241000E2 */  addiu     $s0, $zero, 0xe2
-/* 9087F8 80240DC8 3C038024 */  lui       $v1, 0x8024
-/* 9087FC 80240DCC 8C6317C8 */  lw        $v1, 0x17c8($v1)
+/* 9087F8 80240DC8 3C038024 */  lui       $v1, %hi(D_802417C8)
+/* 9087FC 80240DCC 8C6317C8 */  lw        $v1, %lo(D_802417C8)($v1)
 /* 908800 80240DD0 0040202D */  daddu     $a0, $v0, $zero
 /* 908804 80240DD4 2C620005 */  sltiu     $v0, $v1, 5
 /* 908808 80240DD8 1040003F */  beqz      $v0, .L80240ED8
 /* 90880C 80240DDC 24110046 */   addiu    $s1, $zero, 0x46
 /* 908810 80240DE0 00031080 */  sll       $v0, $v1, 2
-/* 908814 80240DE4 3C018024 */  lui       $at, 0x8024
+/* 908814 80240DE4 3C018024 */  lui       $at, %hi(D_802437F0)
 /* 908818 80240DE8 00220821 */  addu      $at, $at, $v0
-/* 90881C 80240DEC 8C2237F0 */  lw        $v0, 0x37f0($at)
+/* 90881C 80240DEC 8C2237F0 */  lw        $v0, %lo(D_802437F0)($at)
 /* 908820 80240DF0 00400008 */  jr        $v0
 /* 908824 80240DF4 00000000 */   nop      
 /* 908828 80240DF8 8482001E */  lh        $v0, 0x1e($a0)
@@ -28,10 +28,10 @@ glabel func_80240DA4_9087D4
 /* 908830 80240E00 24020001 */   addiu    $v0, $zero, 1
 /* 908834 80240E04 080903B4 */  j         .L80240ED0
 /* 908838 80240E08 00000000 */   nop      
-/* 90883C 80240E0C 3C048024 */  lui       $a0, 0x8024
-/* 908840 80240E10 248417CC */  addiu     $a0, $a0, 0x17cc
-/* 908844 80240E14 3C058024 */  lui       $a1, 0x8024
-/* 908848 80240E18 24A517D0 */  addiu     $a1, $a1, 0x17d0
+/* 90883C 80240E0C 3C048024 */  lui       $a0, %hi(D_802417CC)
+/* 908840 80240E10 248417CC */  addiu     $a0, $a0, %lo(D_802417CC)
+/* 908844 80240E14 3C058024 */  lui       $a1, %hi(D_802417D0)
+/* 908848 80240E18 24A517D0 */  addiu     $a1, $a1, %lo(D_802417D0)
 /* 90884C 80240E1C 8C820000 */  lw        $v0, ($a0)
 /* 908850 80240E20 8CA30000 */  lw        $v1, ($a1)
 /* 908854 80240E24 24420014 */  addiu     $v0, $v0, 0x14
@@ -59,10 +59,10 @@ glabel func_80240DA4_9087D4
 /* 9088A4 80240E74 24020003 */   addiu    $v0, $zero, 3
 /* 9088A8 80240E78 080903B4 */  j         .L80240ED0
 /* 9088AC 80240E7C 00000000 */   nop      
-/* 9088B0 80240E80 3C048024 */  lui       $a0, 0x8024
-/* 9088B4 80240E84 248417CC */  addiu     $a0, $a0, 0x17cc
-/* 9088B8 80240E88 3C058024 */  lui       $a1, 0x8024
-/* 9088BC 80240E8C 24A517D0 */  addiu     $a1, $a1, 0x17d0
+/* 9088B0 80240E80 3C048024 */  lui       $a0, %hi(D_802417CC)
+/* 9088B4 80240E84 248417CC */  addiu     $a0, $a0, %lo(D_802417CC)
+/* 9088B8 80240E88 3C058024 */  lui       $a1, %hi(D_802417D0)
+/* 9088BC 80240E8C 24A517D0 */  addiu     $a1, $a1, %lo(D_802417D0)
 /* 9088C0 80240E90 8C820000 */  lw        $v0, ($a0)
 /* 9088C4 80240E94 8CA30000 */  lw        $v1, ($a1)
 /* 9088C8 80240E98 2442FFEC */  addiu     $v0, $v0, -0x14
@@ -82,16 +82,16 @@ glabel func_80240DA4_9087D4
 /* 9088F8 80240EC8 14400003 */  bnez      $v0, .L80240ED8
 /* 9088FC 80240ECC 24020004 */   addiu    $v0, $zero, 4
 .L80240ED0:
-/* 908900 80240ED0 3C018024 */  lui       $at, 0x8024
-/* 908904 80240ED4 AC2217C8 */  sw        $v0, 0x17c8($at)
+/* 908900 80240ED0 3C018024 */  lui       $at, %hi(D_802417C8)
+/* 908904 80240ED4 AC2217C8 */  sw        $v0, %lo(D_802417C8)($at)
 .L80240ED8:
-/* 908908 80240ED8 3C028024 */  lui       $v0, 0x8024
-/* 90890C 80240EDC 8C4217CC */  lw        $v0, 0x17cc($v0)
+/* 908908 80240ED8 3C028024 */  lui       $v0, %hi(D_802417CC)
+/* 90890C 80240EDC 8C4217CC */  lw        $v0, %lo(D_802417CC)($v0)
 /* 908910 80240EE0 10400074 */  beqz      $v0, .L802410B4
 /* 908914 80240EE4 00000000 */   nop      
 .L80240EE8:
-/* 908918 80240EE8 3C098024 */  lui       $t1, 0x8024
-/* 90891C 80240EEC 8D2917D0 */  lw        $t1, 0x17d0($t1)
+/* 908918 80240EE8 3C098024 */  lui       $t1, %hi(D_802417D0)
+/* 90891C 80240EEC 8D2917D0 */  lw        $t1, %lo(D_802417D0)($t1)
 /* 908920 80240EF0 11200070 */  beqz      $t1, .L802410B4
 /* 908924 80240EF4 2402002F */   addiu    $v0, $zero, 0x2f
 /* 908928 80240EF8 3C013FE0 */  lui       $at, 0x3fe0
@@ -102,8 +102,8 @@ glabel func_80240DA4_9087D4
 /* 90893C 80240F0C 46802121 */  cvt.d.w   $f4, $f4
 /* 908940 80240F10 46202102 */  mul.d     $f4, $f4, $f0
 /* 908944 80240F14 00000000 */  nop       
-/* 908948 80240F18 3C088024 */  lui       $t0, 0x8024
-/* 90894C 80240F1C 8D0817CC */  lw        $t0, 0x17cc($t0)
+/* 908948 80240F18 3C088024 */  lui       $t0, %hi(D_802417CC)
+/* 90894C 80240F1C 8D0817CC */  lw        $t0, %lo(D_802417CC)($t0)
 /* 908950 80240F20 44884000 */  mtc1      $t0, $f8
 /* 908954 80240F24 00000000 */  nop       
 /* 908958 80240F28 46804221 */  cvt.d.w   $f8, $f8
@@ -140,13 +140,13 @@ glabel func_80240DA4_9087D4
 /* 9089D4 80240FA4 00000000 */  nop       
 /* 9089D8 80240FA8 46281080 */  add.d     $f2, $f2, $f8
 /* 9089DC 80240FAC 24040004 */  addiu     $a0, $zero, 4
-/* 9089E0 80240FB0 3C03800A */  lui       $v1, 0x800a
-/* 9089E4 80240FB4 2463A66C */  addiu     $v1, $v1, -0x5994
+/* 9089E0 80240FB0 3C03800A */  lui       $v1, %hi(D_8009A66C)
+/* 9089E4 80240FB4 2463A66C */  addiu     $v1, $v1, %lo(D_8009A66C)
 /* 9089E8 80240FB8 462010A0 */  cvt.s.d   $f2, $f2
 /* 9089EC 80240FBC 460E1082 */  mul.s     $f2, $f2, $f14
 /* 9089F0 80240FC0 00000000 */  nop       
-/* 9089F4 80240FC4 3C058024 */  lui       $a1, 0x8024
-/* 9089F8 80240FC8 24A517D8 */  addiu     $a1, $a1, 0x17d8
+/* 9089F4 80240FC4 3C058024 */  lui       $a1, %hi(D_802417D8)
+/* 9089F8 80240FC8 24A517D8 */  addiu     $a1, $a1, %lo(D_802417D8)
 /* 9089FC 80240FCC 8C620000 */  lw        $v0, ($v1)
 /* 908A00 80240FD0 3C06ED00 */  lui       $a2, 0xed00
 /* 908A04 80240FD4 0040382D */  daddu     $a3, $v0, $zero
diff --git a/asm/nonmatchings/world/area_kmr/kmr_24/90B250/func_80240074_90B2B4.s b/asm/nonmatchings/world/area_kmr/kmr_24/90B250/func_80240074_90B2B4.s
index b95e671235..6a0573cb2a 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_24/90B250/func_80240074_90B2B4.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_24/90B250/func_80240074_90B2B4.s
@@ -3,8 +3,8 @@
 
 glabel func_80240074_90B2B4
 /* 90B2B4 80240074 27BDFFD0 */  addiu     $sp, $sp, -0x30
-/* 90B2B8 80240078 3C048024 */  lui       $a0, 0x8024
-/* 90B2BC 8024007C 24840480 */  addiu     $a0, $a0, 0x480
+/* 90B2B8 80240078 3C048024 */  lui       $a0, %hi(D_80240480)
+/* 90B2BC 8024007C 24840480 */  addiu     $a0, $a0, %lo(D_80240480)
 /* 90B2C0 80240080 AFB00018 */  sw        $s0, 0x18($sp)
 /* 90B2C4 80240084 3C108007 */  lui       $s0, %hi(gGameStatusPtr)
 /* 90B2C8 80240088 2610419C */  addiu     $s0, $s0, %lo(gGameStatusPtr)
diff --git a/asm/nonmatchings/world/area_kmr/kmr_30/90B9E0/func_8024045C_90BB2C.s b/asm/nonmatchings/world/area_kmr/kmr_30/90B9E0/func_8024045C_90BB2C.s
index 6d92920311..dcb7fe77ac 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_30/90B9E0/func_8024045C_90BB2C.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_30/90B9E0/func_8024045C_90BB2C.s
@@ -8,8 +8,8 @@ glabel func_8024045C_90BB2C
 /* 90BB38 80240468 0C0B1EAF */  jal       get_variable
 /* 90BB3C 8024046C 8C450000 */   lw       $a1, ($v0)
 /* 90BB40 80240470 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 90BB44 80240474 3C018024 */  lui       $at, 0x8024
-/* 90BB48 80240478 AC220C0C */  sw        $v0, 0xc0c($at)
+/* 90BB44 80240474 3C018024 */  lui       $at, %hi(D_80240C0C)
+/* 90BB48 80240478 AC220C0C */  sw        $v0, %lo(D_80240C0C)($at)
 /* 90BB4C 8024047C 24020002 */  addiu     $v0, $zero, 2
 /* 90BB50 80240480 03E00008 */  jr        $ra
 /* 90BB54 80240484 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kmr/kmr_30/90B9E0/func_80240488_90BB58.s b/asm/nonmatchings/world/area_kmr/kmr_30/90B9E0/func_80240488_90BB58.s
index aabf4c0b39..100256954a 100644
--- a/asm/nonmatchings/world/area_kmr/kmr_30/90B9E0/func_80240488_90BB58.s
+++ b/asm/nonmatchings/world/area_kmr/kmr_30/90B9E0/func_80240488_90BB58.s
@@ -5,8 +5,8 @@ glabel func_80240488_90BB58
 /* 90BB58 80240488 3C06FC12 */  lui       $a2, 0xfc12
 /* 90BB5C 8024048C 34C61624 */  ori       $a2, $a2, 0x1624
 /* 90BB60 80240490 3C05FF2F */  lui       $a1, 0xff2f
-/* 90BB64 80240494 3C04800A */  lui       $a0, 0x800a
-/* 90BB68 80240498 2484A66C */  addiu     $a0, $a0, -0x5994
+/* 90BB64 80240494 3C04800A */  lui       $a0, %hi(D_8009A66C)
+/* 90BB68 80240498 2484A66C */  addiu     $a0, $a0, %lo(D_8009A66C)
 /* 90BB6C 8024049C 8C820000 */  lw        $v0, ($a0)
 /* 90BB70 802404A0 34A5FFFF */  ori       $a1, $a1, 0xffff
 /* 90BB74 802404A4 0040182D */  daddu     $v1, $v0, $zero
@@ -16,8 +16,8 @@ glabel func_80240488_90BB58
 /* 90BB84 802404B4 AC650004 */  sw        $a1, 4($v1)
 /* 90BB88 802404B8 24430008 */  addiu     $v1, $v0, 8
 /* 90BB8C 802404BC AC830000 */  sw        $v1, ($a0)
-/* 90BB90 802404C0 3C048024 */  lui       $a0, 0x8024
-/* 90BB94 802404C4 90840C0F */  lbu       $a0, 0xc0f($a0)
+/* 90BB90 802404C0 3C048024 */  lui       $a0, %hi(D_80240C0F)
+/* 90BB94 802404C4 90840C0F */  lbu       $a0, %lo(D_80240C0F)($a0)
 /* 90BB98 802404C8 3C03FA00 */  lui       $v1, 0xfa00
 /* 90BB9C 802404CC AC430000 */  sw        $v1, ($v0)
 /* 90BBA0 802404D0 03E00008 */  jr        $ra
diff --git a/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_802401DC_A4713C.s b/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_802401DC_A4713C.s
index 6572357f44..21500015e0 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_802401DC_A4713C.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_802401DC_A4713C.s
@@ -55,8 +55,8 @@ glabel func_802401DC_A4713C
 /* A471F8 80240298 8C470030 */   lw       $a3, 0x30($v0)
 /* A471FC 8024029C C6020018 */  lwc1      $f2, 0x18($s0)
 /* A47200 802402A0 46020003 */  div.s     $f0, $f0, $f2
-/* A47204 802402A4 3C018024 */  lui       $at, 0x8024
-/* A47208 802402A8 D4221600 */  ldc1      $f2, 0x1600($at)
+/* A47204 802402A4 3C018024 */  lui       $at, %hi(D_80241600)
+/* A47208 802402A8 D4221600 */  ldc1      $f2, %lo(D_80241600)($at)
 /* A4720C 802402AC 46000021 */  cvt.d.s   $f0, $f0
 /* A47210 802402B0 46220000 */  add.d     $f0, $f0, $f2
 /* A47214 802402B4 4620010D */  trunc.w.d $f4, $f0
diff --git a/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_802404F4_A47454.s b/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_802404F4_A47454.s
index 63c4977e11..0fdd491b21 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_802404F4_A47454.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_802404F4_A47454.s
@@ -279,9 +279,9 @@ glabel func_802404F4_A47454
 /* A47840 802408E0 2C620015 */  sltiu     $v0, $v1, 0x15
 /* A47844 802408E4 10400009 */  beqz      $v0, .L8024090C
 /* A47848 802408E8 00031080 */   sll      $v0, $v1, 2
-/* A4784C 802408EC 3C018024 */  lui       $at, 0x8024
+/* A4784C 802408EC 3C018024 */  lui       $at, %hi(D_80241608)
 /* A47850 802408F0 00220821 */  addu      $at, $at, $v0
-/* A47854 802408F4 8C221608 */  lw        $v0, 0x1608($at)
+/* A47854 802408F4 8C221608 */  lw        $v0, %lo(D_80241608)($at)
 /* A47858 802408F8 00400008 */  jr        $v0
 /* A4785C 802408FC 00000000 */   nop      
 /* A47860 80240900 8E420028 */  lw        $v0, 0x28($s2)
diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802401DC_A4879C.s b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802401DC_A4879C.s
index 2e700dd16a..4e838458f0 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802401DC_A4879C.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802401DC_A4879C.s
@@ -55,8 +55,8 @@ glabel func_802401DC_A4879C
 /* A48858 80240298 8C470030 */   lw       $a3, 0x30($v0)
 /* A4885C 8024029C C6020018 */  lwc1      $f2, 0x18($s0)
 /* A48860 802402A0 46020003 */  div.s     $f0, $f0, $f2
-/* A48864 802402A4 3C018024 */  lui       $at, 0x8024
-/* A48868 802402A8 D4223880 */  ldc1      $f2, 0x3880($at)
+/* A48864 802402A4 3C018024 */  lui       $at, %hi(D_80243880)
+/* A48868 802402A8 D4223880 */  ldc1      $f2, %lo(D_80243880)($at)
 /* A4886C 802402AC 46000021 */  cvt.d.s   $f0, $f0
 /* A48870 802402B0 46220000 */  add.d     $f0, $f0, $f2
 /* A48874 802402B4 4620010D */  trunc.w.d $f4, $f0
diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802404F4_A48AB4.s b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802404F4_A48AB4.s
index 52ef2405f7..f4f79c5b18 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802404F4_A48AB4.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802404F4_A48AB4.s
@@ -279,9 +279,9 @@ glabel func_802404F4_A48AB4
 /* A48EA0 802408E0 2C620015 */  sltiu     $v0, $v1, 0x15
 /* A48EA4 802408E4 10400009 */  beqz      $v0, .L8024090C
 /* A48EA8 802408E8 00031080 */   sll      $v0, $v1, 2
-/* A48EAC 802408EC 3C018024 */  lui       $at, 0x8024
+/* A48EAC 802408EC 3C018024 */  lui       $at, %hi(D_80243888)
 /* A48EB0 802408F0 00220821 */  addu      $at, $at, $v0
-/* A48EB4 802408F4 8C223888 */  lw        $v0, 0x3888($at)
+/* A48EB4 802408F4 8C223888 */  lw        $v0, %lo(D_80243888)($at)
 /* A48EB8 802408F8 00400008 */  jr        $v0
 /* A48EBC 802408FC 00000000 */   nop      
 /* A48EC0 80240900 8E420028 */  lw        $v0, 0x28($s2)
diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80240A48_A49008.s b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80240A48_A49008.s
index f71763faca..475eb32d0e 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80240A48_A49008.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80240A48_A49008.s
@@ -19,8 +19,8 @@ glabel func_80240A48_A49008
 /* A49040 80240A80 0040882D */  daddu     $s1, $v0, $zero
 /* A49044 80240A84 4406A000 */  mfc1      $a2, $f20
 /* A49048 80240A88 4407B000 */  mfc1      $a3, $f22
-/* A4904C 80240A8C 3C03800A */  lui       $v1, 0x800a
-/* A49050 80240A90 8463A634 */  lh        $v1, -0x59cc($v1)
+/* A4904C 80240A8C 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* A49050 80240A90 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* A49054 80240A94 3C05800B */  lui       $a1, %hi(gCameras)
 /* A49058 80240A98 24A51D80 */  addiu     $a1, $a1, %lo(gCameras)
 /* A4905C 80240A9C AFA00010 */  sw        $zero, 0x10($sp)
@@ -44,8 +44,8 @@ glabel func_80240A48_A49008
 /* A490A4 80240AE4 00000000 */   nop      
 /* A490A8 80240AE8 0C00A6C9 */  jal       clamp_angle
 /* A490AC 80240AEC 46000306 */   mov.s    $f12, $f0
-/* A490B0 80240AF0 3C018024 */  lui       $at, 0x8024
-/* A490B4 80240AF4 D42238E0 */  ldc1      $f2, 0x38e0($at)
+/* A490B0 80240AF0 3C018024 */  lui       $at, %hi(D_802438E0)
+/* A490B4 80240AF4 D42238E0 */  ldc1      $f2, %lo(D_802438E0)($at)
 /* A490B8 80240AF8 46000021 */  cvt.d.s   $f0, $f0
 /* A490BC 80240AFC 4622003C */  c.lt.d    $f0, $f2
 /* A490C0 80240B00 00000000 */  nop       
@@ -66,8 +66,8 @@ glabel func_80240A48_A49008
 /* A490F8 80240B38 0C00A70A */  jal       get_clamped_angle_diff
 /* A490FC 80240B3C 46000386 */   mov.s    $f14, $f0
 /* A49100 80240B40 46000005 */  abs.s     $f0, $f0
-/* A49104 80240B44 3C018024 */  lui       $at, 0x8024
-/* A49108 80240B48 D42238E8 */  ldc1      $f2, 0x38e8($at)
+/* A49104 80240B44 3C018024 */  lui       $at, %hi(D_802438E8)
+/* A49108 80240B48 D42238E8 */  ldc1      $f2, %lo(D_802438E8)($at)
 /* A4910C 80240B4C 46000021 */  cvt.d.s   $f0, $f0
 /* A49110 80240B50 4620103C */  c.lt.d    $f2, $f0
 /* A49114 80240B54 00000000 */  nop       
@@ -84,12 +84,12 @@ glabel func_80240A48_A49008
 /* A49140 80240B80 44060000 */  mfc1      $a2, $f0
 /* A49144 80240B84 0C00A720 */  jal       atan2
 /* A49148 80240B88 00000000 */   nop      
-/* A4914C 80240B8C 3C018024 */  lui       $at, 0x8024
-/* A49150 80240B90 D42238F0 */  ldc1      $f2, 0x38f0($at)
+/* A4914C 80240B8C 3C018024 */  lui       $at, %hi(D_802438F0)
+/* A49150 80240B90 D42238F0 */  ldc1      $f2, %lo(D_802438F0)($at)
 /* A49154 80240B94 46000021 */  cvt.d.s   $f0, $f0
 /* A49158 80240B98 46220001 */  sub.d     $f0, $f0, $f2
-/* A4915C 80240B9C 3C018024 */  lui       $at, 0x8024
-/* A49160 80240BA0 D42238F8 */  ldc1      $f2, 0x38f8($at)
+/* A4915C 80240B9C 3C018024 */  lui       $at, %hi(D_802438F8)
+/* A49160 80240BA0 D42238F8 */  ldc1      $f2, %lo(D_802438F8)($at)
 /* A49164 80240BA4 46200020 */  cvt.s.d   $f0, $f0
 /* A49168 80240BA8 46000005 */  abs.s     $f0, $f0
 /* A4916C 80240BAC 46000021 */  cvt.d.s   $f0, $f0
@@ -97,8 +97,8 @@ glabel func_80240A48_A49008
 /* A49174 80240BB4 00000000 */  nop       
 /* A49178 80240BB8 4501000F */  bc1t      .L80240BF8
 /* A4917C 80240BBC 2402FFFF */   addiu    $v0, $zero, -1
-/* A49180 80240BC0 3C038011 */  lui       $v1, 0x8011
-/* A49184 80240BC4 8063EBB3 */  lb        $v1, -0x144d($v1)
+/* A49180 80240BC0 3C038011 */  lui       $v1, %hi(D_8010EBB3)
+/* A49184 80240BC4 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
 /* A49188 80240BC8 24020009 */  addiu     $v0, $zero, 9
 /* A4918C 80240BCC 10620009 */  beq       $v1, $v0, .L80240BF4
 /* A49190 80240BD0 24020007 */   addiu    $v0, $zero, 7
diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80240C18_A491D8.s b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80240C18_A491D8.s
index b2f39b7b11..d9b9b0db05 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80240C18_A491D8.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80240C18_A491D8.s
@@ -60,9 +60,9 @@ glabel func_80240C18_A491D8
 /* A492AC 80240CEC 2C620005 */  sltiu     $v0, $v1, 5
 /* A492B0 80240CF0 10400101 */  beqz      $v0, .L802410F8
 /* A492B4 80240CF4 00031080 */   sll      $v0, $v1, 2
-/* A492B8 80240CF8 3C018024 */  lui       $at, 0x8024
+/* A492B8 80240CF8 3C018024 */  lui       $at, %hi(D_80243900)
 /* A492BC 80240CFC 00220821 */  addu      $at, $at, $v0
-/* A492C0 80240D00 8C223900 */  lw        $v0, 0x3900($at)
+/* A492C0 80240D00 8C223900 */  lw        $v0, %lo(D_80243900)($at)
 /* A492C4 80240D04 00400008 */  jr        $v0
 /* A492C8 80240D08 00000000 */   nop      
 /* A492CC 80240D0C 3C01C47A */  lui       $at, 0xc47a
diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_8024119C_A4975C.s b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_8024119C_A4975C.s
index 1d0940049f..3352650c9c 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_8024119C_A4975C.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_8024119C_A4975C.s
@@ -14,29 +14,29 @@ glabel func_8024119C_A4975C
 /* A49780 802411C0 86440008 */   lh       $a0, 8($s2)
 /* A49784 802411C4 0040802D */  daddu     $s0, $v0, $zero
 /* A49788 802411C8 8603008E */  lh        $v1, 0x8e($s0)
-/* A4978C 802411CC 3C118024 */  lui       $s1, 0x8024
-/* A49790 802411D0 263125E0 */  addiu     $s1, $s1, 0x25e0
+/* A4978C 802411CC 3C118024 */  lui       $s1, %hi(D_802425E0)
+/* A49790 802411D0 263125E0 */  addiu     $s1, $s1, %lo(D_802425E0)
 /* A49794 802411D4 00031040 */  sll       $v0, $v1, 1
 /* A49798 802411D8 00431021 */  addu      $v0, $v0, $v1
 /* A4979C 802411DC 00021080 */  sll       $v0, $v0, 2
-/* A497A0 802411E0 3C018024 */  lui       $at, 0x8024
+/* A497A0 802411E0 3C018024 */  lui       $at, %hi(D_802425E0)
 /* A497A4 802411E4 00220821 */  addu      $at, $at, $v0
-/* A497A8 802411E8 C42025E0 */  lwc1      $f0, 0x25e0($at)
+/* A497A8 802411E8 C42025E0 */  lwc1      $f0, %lo(D_802425E0)($at)
 /* A497AC 802411EC 00031040 */  sll       $v0, $v1, 1
 /* A497B0 802411F0 00431021 */  addu      $v0, $v0, $v1
 /* A497B4 802411F4 00021080 */  sll       $v0, $v0, 2
 /* A497B8 802411F8 E6000054 */  swc1      $f0, 0x54($s0)
-/* A497BC 802411FC 3C018024 */  lui       $at, 0x8024
+/* A497BC 802411FC 3C018024 */  lui       $at, %hi(D_802425E4)
 /* A497C0 80241200 00220821 */  addu      $at, $at, $v0
-/* A497C4 80241204 C42025E4 */  lwc1      $f0, 0x25e4($at)
+/* A497C4 80241204 C42025E4 */  lwc1      $f0, %lo(D_802425E4)($at)
 /* A497C8 80241208 00031040 */  sll       $v0, $v1, 1
 /* A497CC 8024120C 00431021 */  addu      $v0, $v0, $v1
 /* A497D0 80241210 9603008E */  lhu       $v1, 0x8e($s0)
 /* A497D4 80241214 00021080 */  sll       $v0, $v0, 2
 /* A497D8 80241218 E6000058 */  swc1      $f0, 0x58($s0)
-/* A497DC 8024121C 3C018024 */  lui       $at, 0x8024
+/* A497DC 8024121C 3C018024 */  lui       $at, %hi(D_802425E8)
 /* A497E0 80241220 00220821 */  addu      $at, $at, $v0
-/* A497E4 80241224 902225E8 */  lbu       $v0, 0x25e8($at)
+/* A497E4 80241224 902225E8 */  lbu       $v0, %lo(D_802425E8)($at)
 /* A497E8 80241228 24630001 */  addiu     $v1, $v1, 1
 /* A497EC 8024122C A603008E */  sh        $v1, 0x8e($s0)
 /* A497F0 80241230 00031C00 */  sll       $v1, $v1, 0x10
diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_8024150C_A49ACC.s b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_8024150C_A49ACC.s
index 0a0942659a..e503816ca1 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_8024150C_A49ACC.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_8024150C_A49ACC.s
@@ -32,16 +32,16 @@ glabel func_8024150C_A49ACC
 /* A49B30 80241570 240300FF */   addiu    $v1, $zero, 0xff
 .L80241574:
 /* A49B34 80241574 8602008E */  lh        $v0, 0x8e($s0)
-/* A49B38 80241578 3C018024 */  lui       $at, 0x8024
-/* A49B3C 8024157C D4223920 */  ldc1      $f2, 0x3920($at)
+/* A49B38 80241578 3C018024 */  lui       $at, %hi(D_80243920)
+/* A49B3C 8024157C D4223920 */  ldc1      $f2, %lo(D_80243920)($at)
 /* A49B40 80241580 44820000 */  mtc1      $v0, $f0
 /* A49B44 80241584 00000000 */  nop       
 /* A49B48 80241588 46800020 */  cvt.s.w   $f0, $f0
 /* A49B4C 8024158C 46000021 */  cvt.d.s   $f0, $f0
 /* A49B50 80241590 46220002 */  mul.d     $f0, $f0, $f2
 /* A49B54 80241594 00000000 */  nop       
-/* A49B58 80241598 3C018024 */  lui       $at, 0x8024
-/* A49B5C 8024159C D4223928 */  ldc1      $f2, 0x3928($at)
+/* A49B58 80241598 3C018024 */  lui       $at, %hi(D_80243928)
+/* A49B5C 8024159C D4223928 */  ldc1      $f2, %lo(D_80243928)($at)
 /* A49B60 802415A0 46220000 */  add.d     $f0, $f0, $f2
 /* A49B64 802415A4 A20300AC */  sb        $v1, 0xac($s0)
 /* A49B68 802415A8 3C013FF0 */  lui       $at, 0x3ff0
diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241AB4_A4A074.s b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241AB4_A4A074.s
index c984274524..a5aec9ea65 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241AB4_A4A074.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241AB4_A4A074.s
@@ -83,9 +83,9 @@ glabel func_80241AB4_A4A074
 /* A4A1A0 80241BE0 2C620019 */  sltiu     $v0, $v1, 0x19
 /* A4A1A4 80241BE4 10400044 */  beqz      $v0, .L80241CF8
 /* A4A1A8 80241BE8 00031080 */   sll      $v0, $v1, 2
-/* A4A1AC 80241BEC 3C018024 */  lui       $at, 0x8024
+/* A4A1AC 80241BEC 3C018024 */  lui       $at, %hi(D_80243930)
 /* A4A1B0 80241BF0 00220821 */  addu      $at, $at, $v0
-/* A4A1B4 80241BF4 8C223930 */  lw        $v0, 0x3930($at)
+/* A4A1B4 80241BF4 8C223930 */  lw        $v0, %lo(D_80243930)($at)
 /* A4A1B8 80241BF8 00400008 */  jr        $v0
 /* A4A1BC 80241BFC 00000000 */   nop      
 /* A4A1C0 80241C00 02A0202D */  daddu     $a0, $s5, $zero
diff --git a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_802400A0_A4CAC0.s b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_802400A0_A4CAC0.s
index e616dda1b1..687b0a8a7c 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_802400A0_A4CAC0.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_802400A0_A4CAC0.s
@@ -19,8 +19,8 @@ glabel func_802400A0_A4CAC0
 /* A4CAF8 802400D8 0040882D */  daddu     $s1, $v0, $zero
 /* A4CAFC 802400DC 4406A000 */  mfc1      $a2, $f20
 /* A4CB00 802400E0 4407B000 */  mfc1      $a3, $f22
-/* A4CB04 802400E4 3C03800A */  lui       $v1, 0x800a
-/* A4CB08 802400E8 8463A634 */  lh        $v1, -0x59cc($v1)
+/* A4CB04 802400E4 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* A4CB08 802400E8 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* A4CB0C 802400EC 3C05800B */  lui       $a1, %hi(gCameras)
 /* A4CB10 802400F0 24A51D80 */  addiu     $a1, $a1, %lo(gCameras)
 /* A4CB14 802400F4 AFA00010 */  sw        $zero, 0x10($sp)
@@ -44,8 +44,8 @@ glabel func_802400A0_A4CAC0
 /* A4CB5C 8024013C 00000000 */   nop      
 /* A4CB60 80240140 0C00A6C9 */  jal       clamp_angle
 /* A4CB64 80240144 46000306 */   mov.s    $f12, $f0
-/* A4CB68 80240148 3C018024 */  lui       $at, 0x8024
-/* A4CB6C 8024014C D4222520 */  ldc1      $f2, 0x2520($at)
+/* A4CB68 80240148 3C018024 */  lui       $at, %hi(D_80242520)
+/* A4CB6C 8024014C D4222520 */  ldc1      $f2, %lo(D_80242520)($at)
 /* A4CB70 80240150 46000021 */  cvt.d.s   $f0, $f0
 /* A4CB74 80240154 4622003C */  c.lt.d    $f0, $f2
 /* A4CB78 80240158 00000000 */  nop       
@@ -66,8 +66,8 @@ glabel func_802400A0_A4CAC0
 /* A4CBB0 80240190 0C00A70A */  jal       get_clamped_angle_diff
 /* A4CBB4 80240194 46000386 */   mov.s    $f14, $f0
 /* A4CBB8 80240198 46000005 */  abs.s     $f0, $f0
-/* A4CBBC 8024019C 3C018024 */  lui       $at, 0x8024
-/* A4CBC0 802401A0 D4222528 */  ldc1      $f2, 0x2528($at)
+/* A4CBBC 8024019C 3C018024 */  lui       $at, %hi(D_80242528)
+/* A4CBC0 802401A0 D4222528 */  ldc1      $f2, %lo(D_80242528)($at)
 /* A4CBC4 802401A4 46000021 */  cvt.d.s   $f0, $f0
 /* A4CBC8 802401A8 4620103C */  c.lt.d    $f2, $f0
 /* A4CBCC 802401AC 00000000 */  nop       
@@ -84,12 +84,12 @@ glabel func_802400A0_A4CAC0
 /* A4CBF8 802401D8 44060000 */  mfc1      $a2, $f0
 /* A4CBFC 802401DC 0C00A720 */  jal       atan2
 /* A4CC00 802401E0 00000000 */   nop      
-/* A4CC04 802401E4 3C018024 */  lui       $at, 0x8024
-/* A4CC08 802401E8 D4222530 */  ldc1      $f2, 0x2530($at)
+/* A4CC04 802401E4 3C018024 */  lui       $at, %hi(D_80242530)
+/* A4CC08 802401E8 D4222530 */  ldc1      $f2, %lo(D_80242530)($at)
 /* A4CC0C 802401EC 46000021 */  cvt.d.s   $f0, $f0
 /* A4CC10 802401F0 46220001 */  sub.d     $f0, $f0, $f2
-/* A4CC14 802401F4 3C018024 */  lui       $at, 0x8024
-/* A4CC18 802401F8 D4222538 */  ldc1      $f2, 0x2538($at)
+/* A4CC14 802401F4 3C018024 */  lui       $at, %hi(D_80242538)
+/* A4CC18 802401F8 D4222538 */  ldc1      $f2, %lo(D_80242538)($at)
 /* A4CC1C 802401FC 46200020 */  cvt.s.d   $f0, $f0
 /* A4CC20 80240200 46000005 */  abs.s     $f0, $f0
 /* A4CC24 80240204 46000021 */  cvt.d.s   $f0, $f0
@@ -97,8 +97,8 @@ glabel func_802400A0_A4CAC0
 /* A4CC2C 8024020C 00000000 */  nop       
 /* A4CC30 80240210 4501000F */  bc1t      .L80240250
 /* A4CC34 80240214 2402FFFF */   addiu    $v0, $zero, -1
-/* A4CC38 80240218 3C038011 */  lui       $v1, 0x8011
-/* A4CC3C 8024021C 8063EBB3 */  lb        $v1, -0x144d($v1)
+/* A4CC38 80240218 3C038011 */  lui       $v1, %hi(D_8010EBB3)
+/* A4CC3C 8024021C 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
 /* A4CC40 80240220 24020009 */  addiu     $v0, $zero, 9
 /* A4CC44 80240224 10620009 */  beq       $v1, $v0, .L8024024C
 /* A4CC48 80240228 24020007 */   addiu    $v0, $zero, 7
diff --git a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240270_A4CC90.s b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240270_A4CC90.s
index de7d90c854..a28e4983ce 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240270_A4CC90.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240270_A4CC90.s
@@ -60,9 +60,9 @@ glabel func_80240270_A4CC90
 /* A4CD64 80240344 2C620005 */  sltiu     $v0, $v1, 5
 /* A4CD68 80240348 10400101 */  beqz      $v0, .L80240750
 /* A4CD6C 8024034C 00031080 */   sll      $v0, $v1, 2
-/* A4CD70 80240350 3C018024 */  lui       $at, 0x8024
+/* A4CD70 80240350 3C018024 */  lui       $at, %hi(D_80242540)
 /* A4CD74 80240354 00220821 */  addu      $at, $at, $v0
-/* A4CD78 80240358 8C222540 */  lw        $v0, 0x2540($at)
+/* A4CD78 80240358 8C222540 */  lw        $v0, %lo(D_80242540)($at)
 /* A4CD7C 8024035C 00400008 */  jr        $v0
 /* A4CD80 80240360 00000000 */   nop      
 /* A4CD84 80240364 3C01C47A */  lui       $at, 0xc47a
@@ -148,8 +148,8 @@ glabel func_80240270_A4CC90
 /* A4CEC4 802404A4 44061000 */  mfc1      $a2, $f2
 /* A4CEC8 802404A8 0C00A720 */  jal       atan2
 /* A4CECC 802404AC 00000000 */   nop      
-/* A4CED0 802404B0 3C018024 */  lui       $at, 0x8024
-/* A4CED4 802404B4 D4222558 */  ldc1      $f2, 0x2558($at)
+/* A4CED0 802404B0 3C018024 */  lui       $at, %hi(D_80242558)
+/* A4CED4 802404B4 D4222558 */  ldc1      $f2, %lo(D_80242558)($at)
 /* A4CED8 802404B8 46000021 */  cvt.d.s   $f0, $f0
 /* A4CEDC 802404BC 46220001 */  sub.d     $f0, $f0, $f2
 /* A4CEE0 802404C0 46200020 */  cvt.s.d   $f0, $f0
diff --git a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_802407F4_A4D214.s b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_802407F4_A4D214.s
index 54d6713917..a7fc10e919 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_802407F4_A4D214.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_802407F4_A4D214.s
@@ -14,29 +14,29 @@ glabel func_802407F4_A4D214
 /* A4D238 80240818 86440008 */   lh       $a0, 8($s2)
 /* A4D23C 8024081C 0040802D */  daddu     $s0, $v0, $zero
 /* A4D240 80240820 8603008E */  lh        $v1, 0x8e($s0)
-/* A4D244 80240824 3C118024 */  lui       $s1, 0x8024
-/* A4D248 80240828 26311CF0 */  addiu     $s1, $s1, 0x1cf0
+/* A4D244 80240824 3C118024 */  lui       $s1, %hi(D_80241CF0)
+/* A4D248 80240828 26311CF0 */  addiu     $s1, $s1, %lo(D_80241CF0)
 /* A4D24C 8024082C 00031040 */  sll       $v0, $v1, 1
 /* A4D250 80240830 00431021 */  addu      $v0, $v0, $v1
 /* A4D254 80240834 00021080 */  sll       $v0, $v0, 2
-/* A4D258 80240838 3C018024 */  lui       $at, 0x8024
+/* A4D258 80240838 3C018024 */  lui       $at, %hi(D_80241CF0)
 /* A4D25C 8024083C 00220821 */  addu      $at, $at, $v0
-/* A4D260 80240840 C4201CF0 */  lwc1      $f0, 0x1cf0($at)
+/* A4D260 80240840 C4201CF0 */  lwc1      $f0, %lo(D_80241CF0)($at)
 /* A4D264 80240844 00031040 */  sll       $v0, $v1, 1
 /* A4D268 80240848 00431021 */  addu      $v0, $v0, $v1
 /* A4D26C 8024084C 00021080 */  sll       $v0, $v0, 2
 /* A4D270 80240850 E6000054 */  swc1      $f0, 0x54($s0)
-/* A4D274 80240854 3C018024 */  lui       $at, 0x8024
+/* A4D274 80240854 3C018024 */  lui       $at, %hi(D_80241CF4)
 /* A4D278 80240858 00220821 */  addu      $at, $at, $v0
-/* A4D27C 8024085C C4201CF4 */  lwc1      $f0, 0x1cf4($at)
+/* A4D27C 8024085C C4201CF4 */  lwc1      $f0, %lo(D_80241CF4)($at)
 /* A4D280 80240860 00031040 */  sll       $v0, $v1, 1
 /* A4D284 80240864 00431021 */  addu      $v0, $v0, $v1
 /* A4D288 80240868 9603008E */  lhu       $v1, 0x8e($s0)
 /* A4D28C 8024086C 00021080 */  sll       $v0, $v0, 2
 /* A4D290 80240870 E6000058 */  swc1      $f0, 0x58($s0)
-/* A4D294 80240874 3C018024 */  lui       $at, 0x8024
+/* A4D294 80240874 3C018024 */  lui       $at, %hi(D_80241CF8)
 /* A4D298 80240878 00220821 */  addu      $at, $at, $v0
-/* A4D29C 8024087C 90221CF8 */  lbu       $v0, 0x1cf8($at)
+/* A4D29C 8024087C 90221CF8 */  lbu       $v0, %lo(D_80241CF8)($at)
 /* A4D2A0 80240880 24630001 */  addiu     $v1, $v1, 1
 /* A4D2A4 80240884 A603008E */  sh        $v1, 0x8e($s0)
 /* A4D2A8 80240888 00031C00 */  sll       $v1, $v1, 0x10
diff --git a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240B64_A4D584.s b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240B64_A4D584.s
index c6b2d8648e..f1e5d945fe 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240B64_A4D584.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240B64_A4D584.s
@@ -32,16 +32,16 @@ glabel func_80240B64_A4D584
 /* A4D5E8 80240BC8 240300FF */   addiu    $v1, $zero, 0xff
 .L80240BCC:
 /* A4D5EC 80240BCC 8602008E */  lh        $v0, 0x8e($s0)
-/* A4D5F0 80240BD0 3C018024 */  lui       $at, 0x8024
-/* A4D5F4 80240BD4 D4222560 */  ldc1      $f2, 0x2560($at)
+/* A4D5F0 80240BD0 3C018024 */  lui       $at, %hi(D_80242560)
+/* A4D5F4 80240BD4 D4222560 */  ldc1      $f2, %lo(D_80242560)($at)
 /* A4D5F8 80240BD8 44820000 */  mtc1      $v0, $f0
 /* A4D5FC 80240BDC 00000000 */  nop       
 /* A4D600 80240BE0 46800020 */  cvt.s.w   $f0, $f0
 /* A4D604 80240BE4 46000021 */  cvt.d.s   $f0, $f0
 /* A4D608 80240BE8 46220002 */  mul.d     $f0, $f0, $f2
 /* A4D60C 80240BEC 00000000 */  nop       
-/* A4D610 80240BF0 3C018024 */  lui       $at, 0x8024
-/* A4D614 80240BF4 D4222568 */  ldc1      $f2, 0x2568($at)
+/* A4D610 80240BF0 3C018024 */  lui       $at, %hi(D_80242568)
+/* A4D614 80240BF4 D4222568 */  ldc1      $f2, %lo(D_80242568)($at)
 /* A4D618 80240BF8 46220000 */  add.d     $f0, $f0, $f2
 /* A4D61C 80240BFC A20300AC */  sb        $v1, 0xac($s0)
 /* A4D620 80240C00 3C013FF0 */  lui       $at, 0x3ff0
diff --git a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_8024110C_A4DB2C.s b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_8024110C_A4DB2C.s
index 91de053050..f6f40aa538 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_8024110C_A4DB2C.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_8024110C_A4DB2C.s
@@ -83,9 +83,9 @@ glabel func_8024110C_A4DB2C
 /* A4DC58 80241238 2C620019 */  sltiu     $v0, $v1, 0x19
 /* A4DC5C 8024123C 10400044 */  beqz      $v0, .L80241350
 /* A4DC60 80241240 00031080 */   sll      $v0, $v1, 2
-/* A4DC64 80241244 3C018024 */  lui       $at, 0x8024
+/* A4DC64 80241244 3C018024 */  lui       $at, %hi(D_80242570)
 /* A4DC68 80241248 00220821 */  addu      $at, $at, $v0
-/* A4DC6C 8024124C 8C222570 */  lw        $v0, 0x2570($at)
+/* A4DC6C 8024124C 8C222570 */  lw        $v0, %lo(D_80242570)($at)
 /* A4DC70 80241250 00400008 */  jr        $v0
 /* A4DC74 80241254 00000000 */   nop      
 /* A4DC78 80241258 02A0202D */  daddu     $a0, $s5, $zero
diff --git a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802400A0_A4F0A0.s b/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802400A0_A4F0A0.s
index 54b7613332..90e9b44748 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802400A0_A4F0A0.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802400A0_A4F0A0.s
@@ -13,8 +13,8 @@ glabel func_802400A0_A4F0A0
 /* A4F0C0 802400C0 AFB00010 */  sw        $s0, 0x10($sp)
 /* A4F0C4 802400C4 F7B40028 */  sdc1      $f20, 0x28($sp)
 /* A4F0C8 802400C8 8E330148 */  lw        $s3, 0x148($s1)
-/* A4F0CC 802400CC 3C03800A */  lui       $v1, 0x800a
-/* A4F0D0 802400D0 8463A634 */  lh        $v1, -0x59cc($v1)
+/* A4F0CC 802400CC 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* A4F0D0 802400D0 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* A4F0D4 802400D4 8E30000C */  lw        $s0, 0xc($s1)
 /* A4F0D8 802400D8 00031080 */  sll       $v0, $v1, 2
 /* A4F0DC 802400DC 00431021 */  addu      $v0, $v0, $v1
@@ -45,8 +45,8 @@ glabel func_802400A0_A4F0A0
 /* A4F140 80240140 00000000 */   nop      
 /* A4F144 80240144 0C00A6C9 */  jal       clamp_angle
 /* A4F148 80240148 46000306 */   mov.s    $f12, $f0
-/* A4F14C 8024014C 3C018024 */  lui       $at, 0x8024
-/* A4F150 80240150 D42227C0 */  ldc1      $f2, 0x27c0($at)
+/* A4F14C 8024014C 3C018024 */  lui       $at, %hi(D_802427C0)
+/* A4F150 80240150 D42227C0 */  ldc1      $f2, %lo(D_802427C0)($at)
 /* A4F154 80240154 46000021 */  cvt.d.s   $f0, $f0
 /* A4F158 80240158 4622003C */  c.lt.d    $f0, $f2
 /* A4F15C 8024015C 00000000 */  nop       
@@ -67,8 +67,8 @@ glabel func_802400A0_A4F0A0
 /* A4F194 80240194 0C00A70A */  jal       get_clamped_angle_diff
 /* A4F198 80240198 46000386 */   mov.s    $f14, $f0
 /* A4F19C 8024019C 46000005 */  abs.s     $f0, $f0
-/* A4F1A0 802401A0 3C018024 */  lui       $at, 0x8024
-/* A4F1A4 802401A4 D42227C8 */  ldc1      $f2, 0x27c8($at)
+/* A4F1A0 802401A0 3C018024 */  lui       $at, %hi(D_802427C8)
+/* A4F1A4 802401A4 D42227C8 */  ldc1      $f2, %lo(D_802427C8)($at)
 /* A4F1A8 802401A8 46000021 */  cvt.d.s   $f0, $f0
 /* A4F1AC 802401AC 4620103C */  c.lt.d    $f2, $f0
 /* A4F1B0 802401B0 00000000 */  nop       
@@ -89,8 +89,8 @@ glabel func_802400A0_A4F0A0
 /* A4F1EC 802401EC 00000000 */  nop       
 /* A4F1F0 802401F0 4501001F */  bc1t      .L80240270
 /* A4F1F4 802401F4 2402FFFF */   addiu    $v0, $zero, -1
-/* A4F1F8 802401F8 3C038011 */  lui       $v1, 0x8011
-/* A4F1FC 802401FC 8063EBB3 */  lb        $v1, -0x144d($v1)
+/* A4F1F8 802401F8 3C038011 */  lui       $v1, %hi(D_8010EBB3)
+/* A4F1FC 802401FC 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
 /* A4F200 80240200 24020009 */  addiu     $v0, $zero, 9
 /* A4F204 80240204 10620019 */  beq       $v1, $v0, .L8024026C
 /* A4F208 80240208 24020007 */   addiu    $v0, $zero, 7
diff --git a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240B38_A4FB38.s b/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240B38_A4FB38.s
index b088341961..d78433c641 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240B38_A4FB38.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240B38_A4FB38.s
@@ -7,8 +7,8 @@ glabel func_80240B38_A4FB38
 /* A4FB40 80240B40 0080982D */  daddu     $s3, $a0, $zero
 /* A4FB44 80240B44 AFB40040 */  sw        $s4, 0x40($sp)
 /* A4FB48 80240B48 0000A02D */  daddu     $s4, $zero, $zero
-/* A4FB4C 80240B4C 3C03800A */  lui       $v1, 0x800a
-/* A4FB50 80240B50 8463A634 */  lh        $v1, -0x59cc($v1)
+/* A4FB4C 80240B4C 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* A4FB50 80240B50 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* A4FB54 80240B54 3C04800B */  lui       $a0, %hi(gCameras)
 /* A4FB58 80240B58 24841D80 */  addiu     $a0, $a0, %lo(gCameras)
 /* A4FB5C 80240B5C AFBF0044 */  sw        $ra, 0x44($sp)
@@ -80,12 +80,12 @@ glabel func_80240B38_A4FB38
 /* A4FC50 80240C50 C64C006C */  lwc1      $f12, 0x6c($s2)
 /* A4FC54 80240C54 0C00A6C9 */  jal       clamp_angle
 /* A4FC58 80240C58 00000000 */   nop      
-/* A4FC5C 80240C5C 3C018024 */  lui       $at, 0x8024
-/* A4FC60 80240C60 D43827D0 */  ldc1      $f24, 0x27d0($at)
+/* A4FC5C 80240C5C 3C018024 */  lui       $at, %hi(D_802427D0)
+/* A4FC60 80240C60 D43827D0 */  ldc1      $f24, %lo(D_802427D0)($at)
 /* A4FC64 80240C64 46000521 */  cvt.d.s   $f20, $f0
 /* A4FC68 80240C68 4638A300 */  add.d     $f12, $f20, $f24
-/* A4FC6C 80240C6C 3C018024 */  lui       $at, 0x8024
-/* A4FC70 80240C70 D43627D8 */  ldc1      $f22, 0x27d8($at)
+/* A4FC6C 80240C6C 3C018024 */  lui       $at, %hi(D_802427D8)
+/* A4FC70 80240C70 D43627D8 */  ldc1      $f22, %lo(D_802427D8)($at)
 /* A4FC74 80240C74 0C00A6C9 */  jal       clamp_angle
 /* A4FC78 80240C78 46206320 */   cvt.s.d  $f12, $f12
 /* A4FC7C 80240C7C 4636A500 */  add.d     $f20, $f20, $f22
@@ -113,8 +113,8 @@ glabel func_80240B38_A4FB38
 /* A4FCD4 80240CD4 E616000C */  swc1      $f22, 0xc($s0)
 .L80240CD8:
 /* A4FCD8 80240CD8 C6000018 */  lwc1      $f0, 0x18($s0)
-/* A4FCDC 80240CDC 3C018024 */  lui       $at, 0x8024
-/* A4FCE0 80240CE0 D42227E0 */  ldc1      $f2, 0x27e0($at)
+/* A4FCDC 80240CDC 3C018024 */  lui       $at, %hi(D_802427E0)
+/* A4FCE0 80240CE0 D42227E0 */  ldc1      $f2, %lo(D_802427E0)($at)
 /* A4FCE4 80240CE4 46000021 */  cvt.d.s   $f0, $f0
 /* A4FCE8 80240CE8 46220002 */  mul.d     $f0, $f0, $f2
 /* A4FCEC 80240CEC 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240F94_A4FF94.s b/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240F94_A4FF94.s
index 7b8c932a60..12a866ad68 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240F94_A4FF94.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240F94_A4FF94.s
@@ -103,9 +103,9 @@ glabel func_80240F94_A4FF94
 /* A50104 80241104 2C620064 */  sltiu     $v0, $v1, 0x64
 /* A50108 80241108 10400060 */  beqz      $v0, .L8024128C
 /* A5010C 8024110C 00031080 */   sll      $v0, $v1, 2
-/* A50110 80241110 3C018024 */  lui       $at, 0x8024
+/* A50110 80241110 3C018024 */  lui       $at, %hi(D_802427E8)
 /* A50114 80241114 00220821 */  addu      $at, $at, $v0
-/* A50118 80241118 8C2227E8 */  lw        $v0, 0x27e8($at)
+/* A50118 80241118 8C2227E8 */  lw        $v0, %lo(D_802427E8)($at)
 /* A5011C 8024111C 00400008 */  jr        $v0
 /* A50120 80241120 00000000 */   nop      
 /* A50124 80241124 0260202D */  daddu     $a0, $s3, $zero
diff --git a/asm/nonmatchings/world/area_kpa/kpa_100/A93160/func_80240000_A93160.s b/asm/nonmatchings/world/area_kpa/kpa_100/A93160/func_80240000_A93160.s
index ecd8de440c..562d942d92 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_100/A93160/func_80240000_A93160.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_100/A93160/func_80240000_A93160.s
@@ -3,18 +3,18 @@
 
 glabel func_80240000_A93160
 /* A93160 80240000 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* A93164 80240004 3C04800E */  lui       $a0, 0x800e
-/* A93168 80240008 24849230 */  addiu     $a0, $a0, -0x6dd0
-/* A9316C 8024000C 3C058024 */  lui       $a1, 0x8024
-/* A93170 80240010 24A502B0 */  addiu     $a1, $a1, 0x2b0
+/* A93164 80240004 3C04800E */  lui       $a0, %hi(D_800D9230)
+/* A93168 80240008 24849230 */  addiu     $a0, $a0, %lo(D_800D9230)
+/* A9316C 8024000C 3C058024 */  lui       $a1, %hi(D_802402B0)
+/* A93170 80240010 24A502B0 */  addiu     $a1, $a1, %lo(D_802402B0)
 /* A93174 80240014 AFBF0010 */  sw        $ra, 0x10($sp)
 /* A93178 80240018 0C01953C */  jal       sprintf
 /* A9317C 8024001C 00000000 */   nop      
-/* A93180 80240020 3C04800E */  lui       $a0, 0x800e
-/* A93184 80240024 248491E0 */  addiu     $a0, $a0, -0x6e20
-/* A93188 80240028 3C058024 */  lui       $a1, 0x8024
+/* A93180 80240020 3C04800E */  lui       $a0, %hi(D_800D91E0)
+/* A93184 80240024 248491E0 */  addiu     $a0, $a0, %lo(D_800D91E0)
+/* A93188 80240028 3C058024 */  lui       $a1, %hi(D_802402C0)
 /* A9318C 8024002C 0C01953C */  jal       sprintf
-/* A93190 80240030 24A502C0 */   addiu    $a1, $a1, 0x2c0
+/* A93190 80240030 24A502C0 */   addiu    $a1, $a1, %lo(D_802402C0)
 /* A93194 80240034 8FBF0010 */  lw        $ra, 0x10($sp)
 /* A93198 80240038 0000102D */  daddu     $v0, $zero, $zero
 /* A9319C 8024003C 03E00008 */  jr        $ra
diff --git a/asm/nonmatchings/world/area_kpa/kpa_101/A93440/func_80240000_A93440.s b/asm/nonmatchings/world/area_kpa/kpa_101/A93440/func_80240000_A93440.s
index 56a0a9fae1..1f47ea3f63 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_101/A93440/func_80240000_A93440.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_101/A93440/func_80240000_A93440.s
@@ -3,18 +3,18 @@
 
 glabel func_80240000_A93440
 /* A93440 80240000 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* A93444 80240004 3C04800E */  lui       $a0, 0x800e
-/* A93448 80240008 24849230 */  addiu     $a0, $a0, -0x6dd0
-/* A9344C 8024000C 3C058024 */  lui       $a1, 0x8024
-/* A93450 80240010 24A502D0 */  addiu     $a1, $a1, 0x2d0
+/* A93444 80240004 3C04800E */  lui       $a0, %hi(D_800D9230)
+/* A93448 80240008 24849230 */  addiu     $a0, $a0, %lo(D_800D9230)
+/* A9344C 8024000C 3C058024 */  lui       $a1, %hi(D_802402D0)
+/* A93450 80240010 24A502D0 */  addiu     $a1, $a1, %lo(D_802402D0)
 /* A93454 80240014 AFBF0010 */  sw        $ra, 0x10($sp)
 /* A93458 80240018 0C01953C */  jal       sprintf
 /* A9345C 8024001C 00000000 */   nop      
-/* A93460 80240020 3C04800E */  lui       $a0, 0x800e
-/* A93464 80240024 248491E0 */  addiu     $a0, $a0, -0x6e20
-/* A93468 80240028 3C058024 */  lui       $a1, 0x8024
+/* A93460 80240020 3C04800E */  lui       $a0, %hi(D_800D91E0)
+/* A93464 80240024 248491E0 */  addiu     $a0, $a0, %lo(D_800D91E0)
+/* A93468 80240028 3C058024 */  lui       $a1, %hi(D_802402E0)
 /* A9346C 8024002C 0C01953C */  jal       sprintf
-/* A93470 80240030 24A502E0 */   addiu    $a1, $a1, 0x2e0
+/* A93470 80240030 24A502E0 */   addiu    $a1, $a1, %lo(D_802402E0)
 /* A93474 80240034 8FBF0010 */  lw        $ra, 0x10($sp)
 /* A93478 80240038 0000102D */  daddu     $v0, $zero, $zero
 /* A9347C 8024003C 03E00008 */  jr        $ra
diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240310_A93A50.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240310_A93A50.s
index b41088cae9..7228d8e948 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240310_A93A50.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240310_A93A50.s
@@ -13,8 +13,8 @@ glabel func_80240310_A93A50
 /* A93A70 80240330 AFB00010 */  sw        $s0, 0x10($sp)
 /* A93A74 80240334 F7B40028 */  sdc1      $f20, 0x28($sp)
 /* A93A78 80240338 8E330148 */  lw        $s3, 0x148($s1)
-/* A93A7C 8024033C 3C03800A */  lui       $v1, 0x800a
-/* A93A80 80240340 8463A634 */  lh        $v1, -0x59cc($v1)
+/* A93A7C 8024033C 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* A93A80 80240340 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* A93A84 80240344 8E30000C */  lw        $s0, 0xc($s1)
 /* A93A88 80240348 00031080 */  sll       $v0, $v1, 2
 /* A93A8C 8024034C 00431021 */  addu      $v0, $v0, $v1
@@ -45,8 +45,8 @@ glabel func_80240310_A93A50
 /* A93AF0 802403B0 00000000 */   nop      
 /* A93AF4 802403B4 0C00A6C9 */  jal       clamp_angle
 /* A93AF8 802403B8 46000306 */   mov.s    $f12, $f0
-/* A93AFC 802403BC 3C018024 */  lui       $at, 0x8024
-/* A93B00 802403C0 D4225B20 */  ldc1      $f2, 0x5b20($at)
+/* A93AFC 802403BC 3C018024 */  lui       $at, %hi(D_80245B20)
+/* A93B00 802403C0 D4225B20 */  ldc1      $f2, %lo(D_80245B20)($at)
 /* A93B04 802403C4 46000021 */  cvt.d.s   $f0, $f0
 /* A93B08 802403C8 4622003C */  c.lt.d    $f0, $f2
 /* A93B0C 802403CC 00000000 */  nop       
@@ -67,8 +67,8 @@ glabel func_80240310_A93A50
 /* A93B44 80240404 0C00A70A */  jal       get_clamped_angle_diff
 /* A93B48 80240408 46000386 */   mov.s    $f14, $f0
 /* A93B4C 8024040C 46000005 */  abs.s     $f0, $f0
-/* A93B50 80240410 3C018024 */  lui       $at, 0x8024
-/* A93B54 80240414 D4225B28 */  ldc1      $f2, 0x5b28($at)
+/* A93B50 80240410 3C018024 */  lui       $at, %hi(D_80245B28)
+/* A93B54 80240414 D4225B28 */  ldc1      $f2, %lo(D_80245B28)($at)
 /* A93B58 80240418 46000021 */  cvt.d.s   $f0, $f0
 /* A93B5C 8024041C 4620103C */  c.lt.d    $f2, $f0
 /* A93B60 80240420 00000000 */  nop       
@@ -89,8 +89,8 @@ glabel func_80240310_A93A50
 /* A93B9C 8024045C 00000000 */  nop       
 /* A93BA0 80240460 4501001F */  bc1t      .L802404E0
 /* A93BA4 80240464 2402FFFF */   addiu    $v0, $zero, -1
-/* A93BA8 80240468 3C038011 */  lui       $v1, 0x8011
-/* A93BAC 8024046C 8063EBB3 */  lb        $v1, -0x144d($v1)
+/* A93BA8 80240468 3C038011 */  lui       $v1, %hi(D_8010EBB3)
+/* A93BAC 8024046C 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
 /* A93BB0 80240470 24020009 */  addiu     $v0, $zero, 9
 /* A93BB4 80240474 10620019 */  beq       $v1, $v0, .L802404DC
 /* A93BB8 80240478 24020007 */   addiu    $v0, $zero, 7
diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240DA8_A944E8.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240DA8_A944E8.s
index c3c26648e9..3cf223cba3 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240DA8_A944E8.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240DA8_A944E8.s
@@ -7,8 +7,8 @@ glabel func_80240DA8_A944E8
 /* A944F0 80240DB0 0080982D */  daddu     $s3, $a0, $zero
 /* A944F4 80240DB4 AFB40040 */  sw        $s4, 0x40($sp)
 /* A944F8 80240DB8 0000A02D */  daddu     $s4, $zero, $zero
-/* A944FC 80240DBC 3C03800A */  lui       $v1, 0x800a
-/* A94500 80240DC0 8463A634 */  lh        $v1, -0x59cc($v1)
+/* A944FC 80240DBC 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* A94500 80240DC0 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* A94504 80240DC4 3C04800B */  lui       $a0, %hi(gCameras)
 /* A94508 80240DC8 24841D80 */  addiu     $a0, $a0, %lo(gCameras)
 /* A9450C 80240DCC AFBF0044 */  sw        $ra, 0x44($sp)
@@ -80,12 +80,12 @@ glabel func_80240DA8_A944E8
 /* A94600 80240EC0 C64C006C */  lwc1      $f12, 0x6c($s2)
 /* A94604 80240EC4 0C00A6C9 */  jal       clamp_angle
 /* A94608 80240EC8 00000000 */   nop      
-/* A9460C 80240ECC 3C018024 */  lui       $at, 0x8024
-/* A94610 80240ED0 D4385B30 */  ldc1      $f24, 0x5b30($at)
+/* A9460C 80240ECC 3C018024 */  lui       $at, %hi(D_80245B30)
+/* A94610 80240ED0 D4385B30 */  ldc1      $f24, %lo(D_80245B30)($at)
 /* A94614 80240ED4 46000521 */  cvt.d.s   $f20, $f0
 /* A94618 80240ED8 4638A300 */  add.d     $f12, $f20, $f24
-/* A9461C 80240EDC 3C018024 */  lui       $at, 0x8024
-/* A94620 80240EE0 D4365B38 */  ldc1      $f22, 0x5b38($at)
+/* A9461C 80240EDC 3C018024 */  lui       $at, %hi(D_80245B38)
+/* A94620 80240EE0 D4365B38 */  ldc1      $f22, %lo(D_80245B38)($at)
 /* A94624 80240EE4 0C00A6C9 */  jal       clamp_angle
 /* A94628 80240EE8 46206320 */   cvt.s.d  $f12, $f12
 /* A9462C 80240EEC 4636A500 */  add.d     $f20, $f20, $f22
@@ -113,8 +113,8 @@ glabel func_80240DA8_A944E8
 /* A94684 80240F44 E616000C */  swc1      $f22, 0xc($s0)
 .L80240F48:
 /* A94688 80240F48 C6000018 */  lwc1      $f0, 0x18($s0)
-/* A9468C 80240F4C 3C018024 */  lui       $at, 0x8024
-/* A94690 80240F50 D4225B40 */  ldc1      $f2, 0x5b40($at)
+/* A9468C 80240F4C 3C018024 */  lui       $at, %hi(D_80245B40)
+/* A94690 80240F50 D4225B40 */  ldc1      $f2, %lo(D_80245B40)($at)
 /* A94694 80240F54 46000021 */  cvt.d.s   $f0, $f0
 /* A94698 80240F58 46220002 */  mul.d     $f0, $f0, $f2
 /* A9469C 80240F5C 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241204_A94944.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241204_A94944.s
index a3230b90e3..1d4e61ca7a 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241204_A94944.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241204_A94944.s
@@ -103,9 +103,9 @@ glabel func_80241204_A94944
 /* A94AB4 80241374 2C620064 */  sltiu     $v0, $v1, 0x64
 /* A94AB8 80241378 10400060 */  beqz      $v0, .L802414FC
 /* A94ABC 8024137C 00031080 */   sll      $v0, $v1, 2
-/* A94AC0 80241380 3C018024 */  lui       $at, 0x8024
+/* A94AC0 80241380 3C018024 */  lui       $at, %hi(D_80245B48)
 /* A94AC4 80241384 00220821 */  addu      $at, $at, $v0
-/* A94AC8 80241388 8C225B48 */  lw        $v0, 0x5b48($at)
+/* A94AC8 80241388 8C225B48 */  lw        $v0, %lo(D_80245B48)($at)
 /* A94ACC 8024138C 00400008 */  jr        $v0
 /* A94AD0 80241390 00000000 */   nop      
 /* A94AD4 80241394 0260202D */  daddu     $a0, $s3, $zero
diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802415D8_A94D18.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802415D8_A94D18.s
index 59c787a210..399f365bee 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802415D8_A94D18.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802415D8_A94D18.s
@@ -55,8 +55,8 @@ glabel func_802415D8_A94D18
 /* A94DD4 80241694 8C470030 */   lw       $a3, 0x30($v0)
 /* A94DD8 80241698 C6020018 */  lwc1      $f2, 0x18($s0)
 /* A94DDC 8024169C 46020003 */  div.s     $f0, $f0, $f2
-/* A94DE0 802416A0 3C018024 */  lui       $at, 0x8024
-/* A94DE4 802416A4 D4225CD8 */  ldc1      $f2, 0x5cd8($at)
+/* A94DE0 802416A0 3C018024 */  lui       $at, %hi(D_80245CD8)
+/* A94DE4 802416A4 D4225CD8 */  ldc1      $f2, %lo(D_80245CD8)($at)
 /* A94DE8 802416A8 46000021 */  cvt.d.s   $f0, $f0
 /* A94DEC 802416AC 46220000 */  add.d     $f0, $f0, $f2
 /* A94DF0 802416B0 4620010D */  trunc.w.d $f4, $f0
diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802418F0_A95030.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802418F0_A95030.s
index 24559f8720..a92efa86d3 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802418F0_A95030.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802418F0_A95030.s
@@ -279,9 +279,9 @@ glabel func_802418F0_A95030
 /* A9541C 80241CDC 2C620015 */  sltiu     $v0, $v1, 0x15
 /* A95420 80241CE0 10400009 */  beqz      $v0, .L80241D08
 /* A95424 80241CE4 00031080 */   sll      $v0, $v1, 2
-/* A95428 80241CE8 3C018024 */  lui       $at, 0x8024
+/* A95428 80241CE8 3C018024 */  lui       $at, %hi(D_80245CE0)
 /* A9542C 80241CEC 00220821 */  addu      $at, $at, $v0
-/* A95430 80241CF0 8C225CE0 */  lw        $v0, 0x5ce0($at)
+/* A95430 80241CF0 8C225CE0 */  lw        $v0, %lo(D_80245CE0)($at)
 /* A95434 80241CF4 00400008 */  jr        $v0
 /* A95438 80241CF8 00000000 */   nop      
 /* A9543C 80241CFC 8E420028 */  lw        $v0, 0x28($s2)
diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241D30_A95470.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241D30_A95470.s
index 304dfc04a1..a4ecfec3e7 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241D30_A95470.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241D30_A95470.s
@@ -19,8 +19,8 @@ glabel func_80241D30_A95470
 /* A954A8 80241D68 0040882D */  daddu     $s1, $v0, $zero
 /* A954AC 80241D6C 4406A000 */  mfc1      $a2, $f20
 /* A954B0 80241D70 4407B000 */  mfc1      $a3, $f22
-/* A954B4 80241D74 3C03800A */  lui       $v1, 0x800a
-/* A954B8 80241D78 8463A634 */  lh        $v1, -0x59cc($v1)
+/* A954B4 80241D74 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* A954B8 80241D78 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* A954BC 80241D7C 3C05800B */  lui       $a1, %hi(gCameras)
 /* A954C0 80241D80 24A51D80 */  addiu     $a1, $a1, %lo(gCameras)
 /* A954C4 80241D84 AFA00010 */  sw        $zero, 0x10($sp)
@@ -44,8 +44,8 @@ glabel func_80241D30_A95470
 /* A9550C 80241DCC 00000000 */   nop      
 /* A95510 80241DD0 0C00A6C9 */  jal       clamp_angle
 /* A95514 80241DD4 46000306 */   mov.s    $f12, $f0
-/* A95518 80241DD8 3C018024 */  lui       $at, 0x8024
-/* A9551C 80241DDC D4225D38 */  ldc1      $f2, 0x5d38($at)
+/* A95518 80241DD8 3C018024 */  lui       $at, %hi(D_80245D38)
+/* A9551C 80241DDC D4225D38 */  ldc1      $f2, %lo(D_80245D38)($at)
 /* A95520 80241DE0 46000021 */  cvt.d.s   $f0, $f0
 /* A95524 80241DE4 4622003C */  c.lt.d    $f0, $f2
 /* A95528 80241DE8 00000000 */  nop       
@@ -66,8 +66,8 @@ glabel func_80241D30_A95470
 /* A95560 80241E20 0C00A70A */  jal       get_clamped_angle_diff
 /* A95564 80241E24 46000386 */   mov.s    $f14, $f0
 /* A95568 80241E28 46000005 */  abs.s     $f0, $f0
-/* A9556C 80241E2C 3C018024 */  lui       $at, 0x8024
-/* A95570 80241E30 D4225D40 */  ldc1      $f2, 0x5d40($at)
+/* A9556C 80241E2C 3C018024 */  lui       $at, %hi(D_80245D40)
+/* A95570 80241E30 D4225D40 */  ldc1      $f2, %lo(D_80245D40)($at)
 /* A95574 80241E34 46000021 */  cvt.d.s   $f0, $f0
 /* A95578 80241E38 4620103C */  c.lt.d    $f2, $f0
 /* A9557C 80241E3C 00000000 */  nop       
@@ -84,12 +84,12 @@ glabel func_80241D30_A95470
 /* A955A8 80241E68 44060000 */  mfc1      $a2, $f0
 /* A955AC 80241E6C 0C00A720 */  jal       atan2
 /* A955B0 80241E70 00000000 */   nop      
-/* A955B4 80241E74 3C018024 */  lui       $at, 0x8024
-/* A955B8 80241E78 D4225D48 */  ldc1      $f2, 0x5d48($at)
+/* A955B4 80241E74 3C018024 */  lui       $at, %hi(D_80245D48)
+/* A955B8 80241E78 D4225D48 */  ldc1      $f2, %lo(D_80245D48)($at)
 /* A955BC 80241E7C 46000021 */  cvt.d.s   $f0, $f0
 /* A955C0 80241E80 46220001 */  sub.d     $f0, $f0, $f2
-/* A955C4 80241E84 3C018024 */  lui       $at, 0x8024
-/* A955C8 80241E88 D4225D50 */  ldc1      $f2, 0x5d50($at)
+/* A955C4 80241E84 3C018024 */  lui       $at, %hi(D_80245D50)
+/* A955C8 80241E88 D4225D50 */  ldc1      $f2, %lo(D_80245D50)($at)
 /* A955CC 80241E8C 46200020 */  cvt.s.d   $f0, $f0
 /* A955D0 80241E90 46000005 */  abs.s     $f0, $f0
 /* A955D4 80241E94 46000021 */  cvt.d.s   $f0, $f0
@@ -97,8 +97,8 @@ glabel func_80241D30_A95470
 /* A955DC 80241E9C 00000000 */  nop       
 /* A955E0 80241EA0 4501000F */  bc1t      .L80241EE0
 /* A955E4 80241EA4 2402FFFF */   addiu    $v0, $zero, -1
-/* A955E8 80241EA8 3C038011 */  lui       $v1, 0x8011
-/* A955EC 80241EAC 8063EBB3 */  lb        $v1, -0x144d($v1)
+/* A955E8 80241EA8 3C038011 */  lui       $v1, %hi(D_8010EBB3)
+/* A955EC 80241EAC 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
 /* A955F0 80241EB0 24020009 */  addiu     $v0, $zero, 9
 /* A955F4 80241EB4 10620009 */  beq       $v1, $v0, .L80241EDC
 /* A955F8 80241EB8 24020007 */   addiu    $v0, $zero, 7
diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241F00_A95640.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241F00_A95640.s
index 8c24464546..6128ff5dfe 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241F00_A95640.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241F00_A95640.s
@@ -60,9 +60,9 @@ glabel func_80241F00_A95640
 /* A95714 80241FD4 2C620005 */  sltiu     $v0, $v1, 5
 /* A95718 80241FD8 10400101 */  beqz      $v0, .L802423E0
 /* A9571C 80241FDC 00031080 */   sll      $v0, $v1, 2
-/* A95720 80241FE0 3C018024 */  lui       $at, 0x8024
+/* A95720 80241FE0 3C018024 */  lui       $at, %hi(D_80245D58)
 /* A95724 80241FE4 00220821 */  addu      $at, $at, $v0
-/* A95728 80241FE8 8C225D58 */  lw        $v0, 0x5d58($at)
+/* A95728 80241FE8 8C225D58 */  lw        $v0, %lo(D_80245D58)($at)
 /* A9572C 80241FEC 00400008 */  jr        $v0
 /* A95730 80241FF0 00000000 */   nop      
 /* A95734 80241FF4 3C01C47A */  lui       $at, 0xc47a
@@ -148,8 +148,8 @@ glabel func_80241F00_A95640
 /* A95874 80242134 44061000 */  mfc1      $a2, $f2
 /* A95878 80242138 0C00A720 */  jal       atan2
 /* A9587C 8024213C 00000000 */   nop      
-/* A95880 80242140 3C018024 */  lui       $at, 0x8024
-/* A95884 80242144 D4225D70 */  ldc1      $f2, 0x5d70($at)
+/* A95880 80242140 3C018024 */  lui       $at, %hi(D_80245D70)
+/* A95884 80242144 D4225D70 */  ldc1      $f2, %lo(D_80245D70)($at)
 /* A95888 80242148 46000021 */  cvt.d.s   $f0, $f0
 /* A9588C 8024214C 46220001 */  sub.d     $f0, $f0, $f2
 /* A95890 80242150 46200020 */  cvt.s.d   $f0, $f0
diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802425D8_A95D18.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802425D8_A95D18.s
index 6f9015bb78..4a48aaa9ac 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802425D8_A95D18.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802425D8_A95D18.s
@@ -30,8 +30,8 @@ glabel func_802425D8_A95D18
 /* A95D7C 8024263C 0260902D */  daddu     $s2, $s3, $zero
 /* A95D80 80242640 8EA400D0 */  lw        $a0, 0xd0($s5)
 /* A95D84 80242644 C6000040 */  lwc1      $f0, 0x40($s0)
-/* A95D88 80242648 3C018024 */  lui       $at, 0x8024
-/* A95D8C 8024264C D4365D78 */  ldc1      $f22, 0x5d78($at)
+/* A95D88 80242648 3C018024 */  lui       $at, %hi(D_80245D78)
+/* A95D8C 8024264C D4365D78 */  ldc1      $f22, %lo(D_80245D78)($at)
 /* A95D90 80242650 C4820000 */  lwc1      $f2, ($a0)
 /* A95D94 80242654 468010A0 */  cvt.s.w   $f2, $f2
 /* A95D98 80242658 C4840008 */  lwc1      $f4, 8($a0)
@@ -106,14 +106,14 @@ glabel func_802425D8_A95D18
 /* A95EA8 80242768 E600000C */   swc1     $f0, 0xc($s0)
 /* A95EAC 8024276C 0C00A67F */  jal       rand_int
 /* A95EB0 80242770 2404000A */   addiu    $a0, $zero, 0xa
-/* A95EB4 80242774 3C018024 */  lui       $at, 0x8024
+/* A95EB4 80242774 3C018024 */  lui       $at, %hi(D_80245D80)
 /* A95EB8 80242778 080909E4 */  j         .L80242790
-/* A95EBC 8024277C D4205D80 */   ldc1     $f0, 0x5d80($at)
+/* A95EBC 8024277C D4205D80 */   ldc1     $f0, %lo(D_80245D80)($at)
 .L80242780:
 /* A95EC0 80242780 0C00A67F */  jal       rand_int
 /* A95EC4 80242784 2404000A */   addiu    $a0, $zero, 0xa
-/* A95EC8 80242788 3C018024 */  lui       $at, 0x8024
-/* A95ECC 8024278C D4205D88 */  ldc1      $f0, 0x5d88($at)
+/* A95EC8 80242788 3C018024 */  lui       $at, %hi(D_80245D88)
+/* A95ECC 8024278C D4205D88 */  ldc1      $f0, %lo(D_80245D88)($at)
 .L80242790:
 /* A95ED0 80242790 44821000 */  mtc1      $v0, $f2
 /* A95ED4 80242794 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80242ABC_A961FC.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80242ABC_A961FC.s
index 337b3bbd59..bb3ad38cbb 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80242ABC_A961FC.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80242ABC_A961FC.s
@@ -59,8 +59,8 @@ glabel func_80242ABC_A961FC
 /* A962D4 80242B94 46800020 */  cvt.s.w   $f0, $f0
 /* A962D8 80242B98 46000021 */  cvt.d.s   $f0, $f0
 /* A962DC 80242B9C 8602008E */  lh        $v0, 0x8e($s0)
-/* A962E0 80242BA0 3C018024 */  lui       $at, 0x8024
-/* A962E4 80242BA4 D4345D90 */  ldc1      $f20, 0x5d90($at)
+/* A962E0 80242BA0 3C018024 */  lui       $at, %hi(D_80245D90)
+/* A962E4 80242BA4 D4345D90 */  ldc1      $f20, %lo(D_80245D90)($at)
 /* A962E8 80242BA8 44821000 */  mtc1      $v0, $f2
 /* A962EC 80242BAC 00000000 */  nop       
 /* A962F0 80242BB0 468010A1 */  cvt.d.w   $f2, $f2
@@ -125,8 +125,8 @@ glabel func_80242ABC_A961FC
 /* A963D4 80242C94 00000000 */  nop       
 /* A963D8 80242C98 4500000F */  bc1f      .L80242CD8
 /* A963DC 80242C9C 2402000A */   addiu    $v0, $zero, 0xa
-/* A963E0 80242CA0 3C018024 */  lui       $at, 0x8024
-/* A963E4 80242CA4 D4205D98 */  ldc1      $f0, 0x5d98($at)
+/* A963E0 80242CA0 3C018024 */  lui       $at, %hi(D_80245D98)
+/* A963E4 80242CA4 D4205D98 */  ldc1      $f0, %lo(D_80245D98)($at)
 /* A963E8 80242CA8 4620103C */  c.lt.d    $f2, $f0
 /* A963EC 80242CAC 00000000 */  nop       
 /* A963F0 80242CB0 45000008 */  bc1f      .L80242CD4
diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80243270_A969B0.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80243270_A969B0.s
index ed187c39c2..b513812277 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80243270_A969B0.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80243270_A969B0.s
@@ -86,9 +86,9 @@ glabel func_80243270_A969B0
 /* A96AEC 802433AC 2C620029 */  sltiu     $v0, $v1, 0x29
 /* A96AF0 802433B0 1040004A */  beqz      $v0, .L802434DC
 /* A96AF4 802433B4 00031080 */   sll      $v0, $v1, 2
-/* A96AF8 802433B8 3C018024 */  lui       $at, 0x8024
+/* A96AF8 802433B8 3C018024 */  lui       $at, %hi(D_80245DA0)
 /* A96AFC 802433BC 00220821 */  addu      $at, $at, $v0
-/* A96B00 802433C0 8C225DA0 */  lw        $v0, 0x5da0($at)
+/* A96B00 802433C0 8C225DA0 */  lw        $v0, %lo(D_80245DA0)($at)
 /* A96B04 802433C4 00400008 */  jr        $v0
 /* A96B08 802433C8 00000000 */   nop      
 /* A96B0C 802433CC 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_kpa/kpa_11/A52BD0/func_8024038C_A52C4C.s b/asm/nonmatchings/world/area_kpa/kpa_11/A52BD0/func_8024038C_A52C4C.s
index e11076b3c5..58b82b455e 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_11/A52BD0/func_8024038C_A52C4C.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_11/A52BD0/func_8024038C_A52C4C.s
@@ -55,8 +55,8 @@ glabel func_8024038C_A52C4C
 /* A52D08 80240448 8C470030 */   lw       $a3, 0x30($v0)
 /* A52D0C 8024044C C6020018 */  lwc1      $f2, 0x18($s0)
 /* A52D10 80240450 46020003 */  div.s     $f0, $f0, $f2
-/* A52D14 80240454 3C018024 */  lui       $at, 0x8024
-/* A52D18 80240458 D4222030 */  ldc1      $f2, 0x2030($at)
+/* A52D14 80240454 3C018024 */  lui       $at, %hi(D_80242030)
+/* A52D18 80240458 D4222030 */  ldc1      $f2, %lo(D_80242030)($at)
 /* A52D1C 8024045C 46000021 */  cvt.d.s   $f0, $f0
 /* A52D20 80240460 46220000 */  add.d     $f0, $f0, $f2
 /* A52D24 80240464 4620010D */  trunc.w.d $f4, $f0
diff --git a/asm/nonmatchings/world/area_kpa/kpa_11/A52BD0/func_802406A4_A52F64.s b/asm/nonmatchings/world/area_kpa/kpa_11/A52BD0/func_802406A4_A52F64.s
index 3df9b9f05a..82f8e02377 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_11/A52BD0/func_802406A4_A52F64.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_11/A52BD0/func_802406A4_A52F64.s
@@ -279,9 +279,9 @@ glabel func_802406A4_A52F64
 /* A53350 80240A90 2C620015 */  sltiu     $v0, $v1, 0x15
 /* A53354 80240A94 10400009 */  beqz      $v0, .L80240ABC
 /* A53358 80240A98 00031080 */   sll      $v0, $v1, 2
-/* A5335C 80240A9C 3C018024 */  lui       $at, 0x8024
+/* A5335C 80240A9C 3C018024 */  lui       $at, %hi(D_80242038)
 /* A53360 80240AA0 00220821 */  addu      $at, $at, $v0
-/* A53364 80240AA4 8C222038 */  lw        $v0, 0x2038($at)
+/* A53364 80240AA4 8C222038 */  lw        $v0, %lo(D_80242038)($at)
 /* A53368 80240AA8 00400008 */  jr        $v0
 /* A5336C 80240AAC 00000000 */   nop      
 /* A53370 80240AB0 8E420028 */  lw        $v0, 0x28($s2)
diff --git a/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240170_A99700.s b/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240170_A99700.s
index b449ea1694..526a854dd4 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240170_A99700.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240170_A99700.s
@@ -13,8 +13,8 @@ glabel func_80240170_A99700
 /* A99720 80240190 AFB00010 */  sw        $s0, 0x10($sp)
 /* A99724 80240194 F7B40028 */  sdc1      $f20, 0x28($sp)
 /* A99728 80240198 8E330148 */  lw        $s3, 0x148($s1)
-/* A9972C 8024019C 3C03800A */  lui       $v1, 0x800a
-/* A99730 802401A0 8463A634 */  lh        $v1, -0x59cc($v1)
+/* A9972C 8024019C 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* A99730 802401A0 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* A99734 802401A4 8E30000C */  lw        $s0, 0xc($s1)
 /* A99738 802401A8 00031080 */  sll       $v0, $v1, 2
 /* A9973C 802401AC 00431021 */  addu      $v0, $v0, $v1
@@ -45,8 +45,8 @@ glabel func_80240170_A99700
 /* A997A0 80240210 00000000 */   nop      
 /* A997A4 80240214 0C00A6C9 */  jal       clamp_angle
 /* A997A8 80240218 46000306 */   mov.s    $f12, $f0
-/* A997AC 8024021C 3C018024 */  lui       $at, 0x8024
-/* A997B0 80240220 D4223240 */  ldc1      $f2, 0x3240($at)
+/* A997AC 8024021C 3C018024 */  lui       $at, %hi(D_80243240)
+/* A997B0 80240220 D4223240 */  ldc1      $f2, %lo(D_80243240)($at)
 /* A997B4 80240224 46000021 */  cvt.d.s   $f0, $f0
 /* A997B8 80240228 4622003C */  c.lt.d    $f0, $f2
 /* A997BC 8024022C 00000000 */  nop       
@@ -67,8 +67,8 @@ glabel func_80240170_A99700
 /* A997F4 80240264 0C00A70A */  jal       get_clamped_angle_diff
 /* A997F8 80240268 46000386 */   mov.s    $f14, $f0
 /* A997FC 8024026C 46000005 */  abs.s     $f0, $f0
-/* A99800 80240270 3C018024 */  lui       $at, 0x8024
-/* A99804 80240274 D4223248 */  ldc1      $f2, 0x3248($at)
+/* A99800 80240270 3C018024 */  lui       $at, %hi(D_80243248)
+/* A99804 80240274 D4223248 */  ldc1      $f2, %lo(D_80243248)($at)
 /* A99808 80240278 46000021 */  cvt.d.s   $f0, $f0
 /* A9980C 8024027C 4620103C */  c.lt.d    $f2, $f0
 /* A99810 80240280 00000000 */  nop       
@@ -89,8 +89,8 @@ glabel func_80240170_A99700
 /* A9984C 802402BC 00000000 */  nop       
 /* A99850 802402C0 4501001F */  bc1t      .L80240340
 /* A99854 802402C4 2402FFFF */   addiu    $v0, $zero, -1
-/* A99858 802402C8 3C038011 */  lui       $v1, 0x8011
-/* A9985C 802402CC 8063EBB3 */  lb        $v1, -0x144d($v1)
+/* A99858 802402C8 3C038011 */  lui       $v1, %hi(D_8010EBB3)
+/* A9985C 802402CC 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
 /* A99860 802402D0 24020009 */  addiu     $v0, $zero, 9
 /* A99864 802402D4 10620019 */  beq       $v1, $v0, .L8024033C
 /* A99868 802402D8 24020007 */   addiu    $v0, $zero, 7
diff --git a/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240C08_A9A198.s b/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240C08_A9A198.s
index c372efd1c9..211e400f6f 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240C08_A9A198.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240C08_A9A198.s
@@ -7,8 +7,8 @@ glabel func_80240C08_A9A198
 /* A9A1A0 80240C10 0080982D */  daddu     $s3, $a0, $zero
 /* A9A1A4 80240C14 AFB40040 */  sw        $s4, 0x40($sp)
 /* A9A1A8 80240C18 0000A02D */  daddu     $s4, $zero, $zero
-/* A9A1AC 80240C1C 3C03800A */  lui       $v1, 0x800a
-/* A9A1B0 80240C20 8463A634 */  lh        $v1, -0x59cc($v1)
+/* A9A1AC 80240C1C 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* A9A1B0 80240C20 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* A9A1B4 80240C24 3C04800B */  lui       $a0, %hi(gCameras)
 /* A9A1B8 80240C28 24841D80 */  addiu     $a0, $a0, %lo(gCameras)
 /* A9A1BC 80240C2C AFBF0044 */  sw        $ra, 0x44($sp)
@@ -80,12 +80,12 @@ glabel func_80240C08_A9A198
 /* A9A2B0 80240D20 C64C006C */  lwc1      $f12, 0x6c($s2)
 /* A9A2B4 80240D24 0C00A6C9 */  jal       clamp_angle
 /* A9A2B8 80240D28 00000000 */   nop      
-/* A9A2BC 80240D2C 3C018024 */  lui       $at, 0x8024
-/* A9A2C0 80240D30 D4383250 */  ldc1      $f24, 0x3250($at)
+/* A9A2BC 80240D2C 3C018024 */  lui       $at, %hi(D_80243250)
+/* A9A2C0 80240D30 D4383250 */  ldc1      $f24, %lo(D_80243250)($at)
 /* A9A2C4 80240D34 46000521 */  cvt.d.s   $f20, $f0
 /* A9A2C8 80240D38 4638A300 */  add.d     $f12, $f20, $f24
-/* A9A2CC 80240D3C 3C018024 */  lui       $at, 0x8024
-/* A9A2D0 80240D40 D4363258 */  ldc1      $f22, 0x3258($at)
+/* A9A2CC 80240D3C 3C018024 */  lui       $at, %hi(D_80243258)
+/* A9A2D0 80240D40 D4363258 */  ldc1      $f22, %lo(D_80243258)($at)
 /* A9A2D4 80240D44 0C00A6C9 */  jal       clamp_angle
 /* A9A2D8 80240D48 46206320 */   cvt.s.d  $f12, $f12
 /* A9A2DC 80240D4C 4636A500 */  add.d     $f20, $f20, $f22
@@ -113,8 +113,8 @@ glabel func_80240C08_A9A198
 /* A9A334 80240DA4 E616000C */  swc1      $f22, 0xc($s0)
 .L80240DA8:
 /* A9A338 80240DA8 C6000018 */  lwc1      $f0, 0x18($s0)
-/* A9A33C 80240DAC 3C018024 */  lui       $at, 0x8024
-/* A9A340 80240DB0 D4223260 */  ldc1      $f2, 0x3260($at)
+/* A9A33C 80240DAC 3C018024 */  lui       $at, %hi(D_80243260)
+/* A9A340 80240DB0 D4223260 */  ldc1      $f2, %lo(D_80243260)($at)
 /* A9A344 80240DB4 46000021 */  cvt.d.s   $f0, $f0
 /* A9A348 80240DB8 46220002 */  mul.d     $f0, $f0, $f2
 /* A9A34C 80240DBC 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80241064_A9A5F4.s b/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80241064_A9A5F4.s
index 3369c278db..b7646ad26a 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80241064_A9A5F4.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80241064_A9A5F4.s
@@ -103,9 +103,9 @@ glabel func_80241064_A9A5F4
 /* A9A764 802411D4 2C620064 */  sltiu     $v0, $v1, 0x64
 /* A9A768 802411D8 10400060 */  beqz      $v0, .L8024135C
 /* A9A76C 802411DC 00031080 */   sll      $v0, $v1, 2
-/* A9A770 802411E0 3C018024 */  lui       $at, 0x8024
+/* A9A770 802411E0 3C018024 */  lui       $at, %hi(D_80243268)
 /* A9A774 802411E4 00220821 */  addu      $at, $at, $v0
-/* A9A778 802411E8 8C223268 */  lw        $v0, 0x3268($at)
+/* A9A778 802411E8 8C223268 */  lw        $v0, %lo(D_80243268)($at)
 /* A9A77C 802411EC 00400008 */  jr        $v0
 /* A9A780 802411F0 00000000 */   nop      
 /* A9A784 802411F4 0260202D */  daddu     $a0, $s3, $zero
diff --git a/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_8024022C_A9CE5C.s b/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_8024022C_A9CE5C.s
index 5170a94ca9..97fbe2a0c9 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_8024022C_A9CE5C.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_8024022C_A9CE5C.s
@@ -55,8 +55,8 @@ glabel func_8024022C_A9CE5C
 /* A9CF18 802402E8 8C470030 */   lw       $a3, 0x30($v0)
 /* A9CF1C 802402EC C6020018 */  lwc1      $f2, 0x18($s0)
 /* A9CF20 802402F0 46020003 */  div.s     $f0, $f0, $f2
-/* A9CF24 802402F4 3C018024 */  lui       $at, 0x8024
-/* A9CF28 802402F8 D4221CF0 */  ldc1      $f2, 0x1cf0($at)
+/* A9CF24 802402F4 3C018024 */  lui       $at, %hi(D_80241CF0)
+/* A9CF28 802402F8 D4221CF0 */  ldc1      $f2, %lo(D_80241CF0)($at)
 /* A9CF2C 802402FC 46000021 */  cvt.d.s   $f0, $f0
 /* A9CF30 80240300 46220000 */  add.d     $f0, $f0, $f2
 /* A9CF34 80240304 4620010D */  trunc.w.d $f4, $f0
diff --git a/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_80240544_A9D174.s b/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_80240544_A9D174.s
index f2d8c8b6e5..c5b4ab920a 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_80240544_A9D174.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_80240544_A9D174.s
@@ -279,9 +279,9 @@ glabel func_80240544_A9D174
 /* A9D560 80240930 2C620015 */  sltiu     $v0, $v1, 0x15
 /* A9D564 80240934 10400009 */  beqz      $v0, .L8024095C
 /* A9D568 80240938 00031080 */   sll      $v0, $v1, 2
-/* A9D56C 8024093C 3C018024 */  lui       $at, 0x8024
+/* A9D56C 8024093C 3C018024 */  lui       $at, %hi(D_80241CF8)
 /* A9D570 80240940 00220821 */  addu      $at, $at, $v0
-/* A9D574 80240944 8C221CF8 */  lw        $v0, 0x1cf8($at)
+/* A9D574 80240944 8C221CF8 */  lw        $v0, %lo(D_80241CF8)($at)
 /* A9D578 80240948 00400008 */  jr        $v0
 /* A9D57C 8024094C 00000000 */   nop      
 /* A9D580 80240950 8E420028 */  lw        $v0, 0x28($s2)
diff --git a/asm/nonmatchings/world/area_kpa/kpa_114/A9E980/func_80240000_A9E980.s b/asm/nonmatchings/world/area_kpa/kpa_114/A9E980/func_80240000_A9E980.s
index 1dac983c2c..5865f06925 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_114/A9E980/func_80240000_A9E980.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_114/A9E980/func_80240000_A9E980.s
@@ -3,18 +3,18 @@
 
 glabel func_80240000_A9E980
 /* A9E980 80240000 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* A9E984 80240004 3C04800E */  lui       $a0, 0x800e
-/* A9E988 80240008 24849230 */  addiu     $a0, $a0, -0x6dd0
-/* A9E98C 8024000C 3C058024 */  lui       $a1, 0x8024
-/* A9E990 80240010 24A50390 */  addiu     $a1, $a1, 0x390
+/* A9E984 80240004 3C04800E */  lui       $a0, %hi(D_800D9230)
+/* A9E988 80240008 24849230 */  addiu     $a0, $a0, %lo(D_800D9230)
+/* A9E98C 8024000C 3C058024 */  lui       $a1, %hi(D_80240390)
+/* A9E990 80240010 24A50390 */  addiu     $a1, $a1, %lo(D_80240390)
 /* A9E994 80240014 AFBF0010 */  sw        $ra, 0x10($sp)
 /* A9E998 80240018 0C01953C */  jal       sprintf
 /* A9E99C 8024001C 00000000 */   nop      
-/* A9E9A0 80240020 3C04800E */  lui       $a0, 0x800e
-/* A9E9A4 80240024 248491E0 */  addiu     $a0, $a0, -0x6e20
-/* A9E9A8 80240028 3C058024 */  lui       $a1, 0x8024
+/* A9E9A0 80240020 3C04800E */  lui       $a0, %hi(D_800D91E0)
+/* A9E9A4 80240024 248491E0 */  addiu     $a0, $a0, %lo(D_800D91E0)
+/* A9E9A8 80240028 3C058024 */  lui       $a1, %hi(D_802403A0)
 /* A9E9AC 8024002C 0C01953C */  jal       sprintf
-/* A9E9B0 80240030 24A503A0 */   addiu    $a1, $a1, 0x3a0
+/* A9E9B0 80240030 24A503A0 */   addiu    $a1, $a1, %lo(D_802403A0)
 /* A9E9B4 80240034 8FBF0010 */  lw        $ra, 0x10($sp)
 /* A9E9B8 80240038 0000102D */  daddu     $v0, $zero, $zero
 /* A9E9BC 8024003C 03E00008 */  jr        $ra
diff --git a/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240170_A9EEB0.s b/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240170_A9EEB0.s
index 1565a907e6..66c747f413 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240170_A9EEB0.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240170_A9EEB0.s
@@ -13,8 +13,8 @@ glabel func_80240170_A9EEB0
 /* A9EED0 80240190 AFB00010 */  sw        $s0, 0x10($sp)
 /* A9EED4 80240194 F7B40028 */  sdc1      $f20, 0x28($sp)
 /* A9EED8 80240198 8E330148 */  lw        $s3, 0x148($s1)
-/* A9EEDC 8024019C 3C03800A */  lui       $v1, 0x800a
-/* A9EEE0 802401A0 8463A634 */  lh        $v1, -0x59cc($v1)
+/* A9EEDC 8024019C 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* A9EEE0 802401A0 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* A9EEE4 802401A4 8E30000C */  lw        $s0, 0xc($s1)
 /* A9EEE8 802401A8 00031080 */  sll       $v0, $v1, 2
 /* A9EEEC 802401AC 00431021 */  addu      $v0, $v0, $v1
@@ -45,8 +45,8 @@ glabel func_80240170_A9EEB0
 /* A9EF50 80240210 00000000 */   nop      
 /* A9EF54 80240214 0C00A6C9 */  jal       clamp_angle
 /* A9EF58 80240218 46000306 */   mov.s    $f12, $f0
-/* A9EF5C 8024021C 3C018024 */  lui       $at, 0x8024
-/* A9EF60 80240220 D4222FE0 */  ldc1      $f2, 0x2fe0($at)
+/* A9EF5C 8024021C 3C018024 */  lui       $at, %hi(D_80242FE0)
+/* A9EF60 80240220 D4222FE0 */  ldc1      $f2, %lo(D_80242FE0)($at)
 /* A9EF64 80240224 46000021 */  cvt.d.s   $f0, $f0
 /* A9EF68 80240228 4622003C */  c.lt.d    $f0, $f2
 /* A9EF6C 8024022C 00000000 */  nop       
@@ -67,8 +67,8 @@ glabel func_80240170_A9EEB0
 /* A9EFA4 80240264 0C00A70A */  jal       get_clamped_angle_diff
 /* A9EFA8 80240268 46000386 */   mov.s    $f14, $f0
 /* A9EFAC 8024026C 46000005 */  abs.s     $f0, $f0
-/* A9EFB0 80240270 3C018024 */  lui       $at, 0x8024
-/* A9EFB4 80240274 D4222FE8 */  ldc1      $f2, 0x2fe8($at)
+/* A9EFB0 80240270 3C018024 */  lui       $at, %hi(D_80242FE8)
+/* A9EFB4 80240274 D4222FE8 */  ldc1      $f2, %lo(D_80242FE8)($at)
 /* A9EFB8 80240278 46000021 */  cvt.d.s   $f0, $f0
 /* A9EFBC 8024027C 4620103C */  c.lt.d    $f2, $f0
 /* A9EFC0 80240280 00000000 */  nop       
@@ -89,8 +89,8 @@ glabel func_80240170_A9EEB0
 /* A9EFFC 802402BC 00000000 */  nop       
 /* A9F000 802402C0 4501001F */  bc1t      .L80240340
 /* A9F004 802402C4 2402FFFF */   addiu    $v0, $zero, -1
-/* A9F008 802402C8 3C038011 */  lui       $v1, 0x8011
-/* A9F00C 802402CC 8063EBB3 */  lb        $v1, -0x144d($v1)
+/* A9F008 802402C8 3C038011 */  lui       $v1, %hi(D_8010EBB3)
+/* A9F00C 802402CC 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
 /* A9F010 802402D0 24020009 */  addiu     $v0, $zero, 9
 /* A9F014 802402D4 10620019 */  beq       $v1, $v0, .L8024033C
 /* A9F018 802402D8 24020007 */   addiu    $v0, $zero, 7
diff --git a/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240C08_A9F948.s b/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240C08_A9F948.s
index 6d302f3a19..24147f3026 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240C08_A9F948.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240C08_A9F948.s
@@ -7,8 +7,8 @@ glabel func_80240C08_A9F948
 /* A9F950 80240C10 0080982D */  daddu     $s3, $a0, $zero
 /* A9F954 80240C14 AFB40040 */  sw        $s4, 0x40($sp)
 /* A9F958 80240C18 0000A02D */  daddu     $s4, $zero, $zero
-/* A9F95C 80240C1C 3C03800A */  lui       $v1, 0x800a
-/* A9F960 80240C20 8463A634 */  lh        $v1, -0x59cc($v1)
+/* A9F95C 80240C1C 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* A9F960 80240C20 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* A9F964 80240C24 3C04800B */  lui       $a0, %hi(gCameras)
 /* A9F968 80240C28 24841D80 */  addiu     $a0, $a0, %lo(gCameras)
 /* A9F96C 80240C2C AFBF0044 */  sw        $ra, 0x44($sp)
@@ -80,12 +80,12 @@ glabel func_80240C08_A9F948
 /* A9FA60 80240D20 C64C006C */  lwc1      $f12, 0x6c($s2)
 /* A9FA64 80240D24 0C00A6C9 */  jal       clamp_angle
 /* A9FA68 80240D28 00000000 */   nop      
-/* A9FA6C 80240D2C 3C018024 */  lui       $at, 0x8024
-/* A9FA70 80240D30 D4382FF0 */  ldc1      $f24, 0x2ff0($at)
+/* A9FA6C 80240D2C 3C018024 */  lui       $at, %hi(D_80242FF0)
+/* A9FA70 80240D30 D4382FF0 */  ldc1      $f24, %lo(D_80242FF0)($at)
 /* A9FA74 80240D34 46000521 */  cvt.d.s   $f20, $f0
 /* A9FA78 80240D38 4638A300 */  add.d     $f12, $f20, $f24
-/* A9FA7C 80240D3C 3C018024 */  lui       $at, 0x8024
-/* A9FA80 80240D40 D4362FF8 */  ldc1      $f22, 0x2ff8($at)
+/* A9FA7C 80240D3C 3C018024 */  lui       $at, %hi(D_80242FF8)
+/* A9FA80 80240D40 D4362FF8 */  ldc1      $f22, %lo(D_80242FF8)($at)
 /* A9FA84 80240D44 0C00A6C9 */  jal       clamp_angle
 /* A9FA88 80240D48 46206320 */   cvt.s.d  $f12, $f12
 /* A9FA8C 80240D4C 4636A500 */  add.d     $f20, $f20, $f22
@@ -113,8 +113,8 @@ glabel func_80240C08_A9F948
 /* A9FAE4 80240DA4 E616000C */  swc1      $f22, 0xc($s0)
 .L80240DA8:
 /* A9FAE8 80240DA8 C6000018 */  lwc1      $f0, 0x18($s0)
-/* A9FAEC 80240DAC 3C018024 */  lui       $at, 0x8024
-/* A9FAF0 80240DB0 D4223000 */  ldc1      $f2, 0x3000($at)
+/* A9FAEC 80240DAC 3C018024 */  lui       $at, %hi(D_80243000)
+/* A9FAF0 80240DB0 D4223000 */  ldc1      $f2, %lo(D_80243000)($at)
 /* A9FAF4 80240DB4 46000021 */  cvt.d.s   $f0, $f0
 /* A9FAF8 80240DB8 46220002 */  mul.d     $f0, $f0, $f2
 /* A9FAFC 80240DBC 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80241064_A9FDA4.s b/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80241064_A9FDA4.s
index e14ff88a56..f6da239f94 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80241064_A9FDA4.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80241064_A9FDA4.s
@@ -103,9 +103,9 @@ glabel func_80241064_A9FDA4
 /* A9FF14 802411D4 2C620064 */  sltiu     $v0, $v1, 0x64
 /* A9FF18 802411D8 10400060 */  beqz      $v0, .L8024135C
 /* A9FF1C 802411DC 00031080 */   sll      $v0, $v1, 2
-/* A9FF20 802411E0 3C018024 */  lui       $at, 0x8024
+/* A9FF20 802411E0 3C018024 */  lui       $at, %hi(D_80243008)
 /* A9FF24 802411E4 00220821 */  addu      $at, $at, $v0
-/* A9FF28 802411E8 8C223008 */  lw        $v0, 0x3008($at)
+/* A9FF28 802411E8 8C223008 */  lw        $v0, %lo(D_80243008)($at)
 /* A9FF2C 802411EC 00400008 */  jr        $v0
 /* A9FF30 802411F0 00000000 */   nop      
 /* A9FF34 802411F4 0260202D */  daddu     $a0, $s3, $zero
diff --git a/asm/nonmatchings/world/area_kpa/kpa_12/A54CA0/func_80240444_A54D94.s b/asm/nonmatchings/world/area_kpa/kpa_12/A54CA0/func_80240444_A54D94.s
index 2bdaa349cf..54bb16154f 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_12/A54CA0/func_80240444_A54D94.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_12/A54CA0/func_80240444_A54D94.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80240444_A54D94
-/* A54D94 80240444 3C038011 */  lui       $v1, 0x8011
-/* A54D98 80240448 8063EBB3 */  lb        $v1, -0x144d($v1)
+/* A54D94 80240444 3C038011 */  lui       $v1, %hi(D_8010EBB3)
+/* A54D98 80240448 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
 /* A54D9C 8024044C 24020008 */  addiu     $v0, $zero, 8
 /* A54DA0 80240450 54620003 */  bnel      $v1, $v0, .L80240460
 /* A54DA4 80240454 AC8000A8 */   sw       $zero, 0xa8($a0)
diff --git a/asm/nonmatchings/world/area_kpa/kpa_13/A56270/func_80240444_A56364.s b/asm/nonmatchings/world/area_kpa/kpa_13/A56270/func_80240444_A56364.s
index 67d1c72200..16dcb9dead 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_13/A56270/func_80240444_A56364.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_13/A56270/func_80240444_A56364.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80240444_A56364
-/* A56364 80240444 3C038011 */  lui       $v1, 0x8011
-/* A56368 80240448 8063EBB3 */  lb        $v1, -0x144d($v1)
+/* A56364 80240444 3C038011 */  lui       $v1, %hi(D_8010EBB3)
+/* A56368 80240448 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
 /* A5636C 8024044C 24020008 */  addiu     $v0, $zero, 8
 /* A56370 80240450 54620003 */  bnel      $v1, $v0, .L80240460
 /* A56374 80240454 AC8000A8 */   sw       $zero, 0xa8($a0)
diff --git a/asm/nonmatchings/world/area_kpa/kpa_130/AA2D20/func_80240048_AA2D68.s b/asm/nonmatchings/world/area_kpa/kpa_130/AA2D20/func_80240048_AA2D68.s
index 41807de99e..b78594047d 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_130/AA2D20/func_80240048_AA2D68.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_130/AA2D20/func_80240048_AA2D68.s
@@ -167,8 +167,8 @@ glabel func_80240048_AA2D68
 /* AA2FD0 802402B0 C620003C */  lwc1      $f0, 0x3c($s1)
 /* AA2FD4 802402B4 C442002C */  lwc1      $f2, 0x2c($v0)
 /* AA2FD8 802402B8 46020001 */  sub.s     $f0, $f0, $f2
-/* AA2FDC 802402BC 3C018024 */  lui       $at, 0x8024
-/* AA2FE0 802402C0 D4224750 */  ldc1      $f2, 0x4750($at)
+/* AA2FDC 802402BC 3C018024 */  lui       $at, %hi(D_80244750)
+/* AA2FE0 802402C0 D4224750 */  ldc1      $f2, %lo(D_80244750)($at)
 /* AA2FE4 802402C4 46000121 */  cvt.d.s   $f4, $f0
 /* AA2FE8 802402C8 4624103C */  c.lt.d    $f2, $f4
 /* AA2FEC 802402CC 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_kpa/kpa_130/AA2D20/func_802404AC_AA31CC.s b/asm/nonmatchings/world/area_kpa/kpa_130/AA2D20/func_802404AC_AA31CC.s
index adffe8c957..b5d46b205f 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_130/AA2D20/func_802404AC_AA31CC.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_130/AA2D20/func_802404AC_AA31CC.s
@@ -38,8 +38,8 @@ glabel func_802404AC_AA31CC
 /* AA324C 8024052C C660003C */  lwc1      $f0, 0x3c($s3)
 /* AA3250 80240530 C442002C */  lwc1      $f2, 0x2c($v0)
 /* AA3254 80240534 46020001 */  sub.s     $f0, $f0, $f2
-/* AA3258 80240538 3C018024 */  lui       $at, 0x8024
-/* AA325C 8024053C D4224758 */  ldc1      $f2, 0x4758($at)
+/* AA3258 80240538 3C018024 */  lui       $at, %hi(D_80244758)
+/* AA325C 8024053C D4224758 */  ldc1      $f2, %lo(D_80244758)($at)
 /* AA3260 80240540 46000121 */  cvt.d.s   $f4, $f0
 /* AA3264 80240544 4624103C */  c.lt.d    $f2, $f4
 /* AA3268 80240548 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_80240380_A57830.s b/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_80240380_A57830.s
index 38b334add3..5c9c8b475a 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_80240380_A57830.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_80240380_A57830.s
@@ -4,8 +4,8 @@
 glabel func_80240380_A57830
 /* A57830 80240380 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* A57834 80240384 AFB00010 */  sw        $s0, 0x10($sp)
-/* A57838 80240388 3C108024 */  lui       $s0, 0x8024
-/* A5783C 8024038C 26101900 */  addiu     $s0, $s0, 0x1900
+/* A57838 80240388 3C108024 */  lui       $s0, %hi(D_80241900)
+/* A5783C 8024038C 26101900 */  addiu     $s0, $s0, %lo(D_80241900)
 /* A57840 80240390 AFBF0018 */  sw        $ra, 0x18($sp)
 /* A57844 80240394 AFB10014 */  sw        $s1, 0x14($sp)
 /* A57848 80240398 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_80240380_A57830
 /* A578AC 802403FC 28620010 */  slti      $v0, $v1, 0x10
 /* A578B0 80240400 1440FFFA */  bnez      $v0, .L802403EC
 /* A578B4 80240404 24840004 */   addiu    $a0, $a0, 4
-/* A578B8 80240408 3C108024 */  lui       $s0, 0x8024
-/* A578BC 8024040C 26101900 */  addiu     $s0, $s0, 0x1900
+/* A578B8 80240408 3C108024 */  lui       $s0, %hi(D_80241900)
+/* A578BC 8024040C 26101900 */  addiu     $s0, $s0, %lo(D_80241900)
 /* A578C0 80240410 0C00AB4B */  jal       heap_free
 /* A578C4 80240414 8E040000 */   lw       $a0, ($s0)
 /* A578C8 80240418 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_80240840_A57CF0.s b/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_80240840_A57CF0.s
index 12b4367cd1..afca307481 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_80240840_A57CF0.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_80240840_A57CF0.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80240840_A57CF0
-/* A57CF0 80240840 3C038011 */  lui       $v1, 0x8011
-/* A57CF4 80240844 8063EBB3 */  lb        $v1, -0x144d($v1)
+/* A57CF0 80240840 3C038011 */  lui       $v1, %hi(D_8010EBB3)
+/* A57CF4 80240844 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
 /* A57CF8 80240848 24020008 */  addiu     $v0, $zero, 8
 /* A57CFC 8024084C 54620003 */  bnel      $v1, $v0, .L8024085C
 /* A57D00 80240850 AC8000A8 */   sw       $zero, 0xa8($a0)
diff --git a/asm/nonmatchings/world/area_kpa/kpa_15/A596A0/func_80240310_A596A0.s b/asm/nonmatchings/world/area_kpa/kpa_15/A596A0/func_80240310_A596A0.s
index d839af1a59..3a51f34bd7 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_15/A596A0/func_80240310_A596A0.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_15/A596A0/func_80240310_A596A0.s
@@ -4,8 +4,8 @@
 glabel func_80240310_A596A0
 /* A596A0 80240310 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* A596A4 80240314 AFB00010 */  sw        $s0, 0x10($sp)
-/* A596A8 80240318 3C108024 */  lui       $s0, 0x8024
-/* A596AC 8024031C 26100AA0 */  addiu     $s0, $s0, 0xaa0
+/* A596A8 80240318 3C108024 */  lui       $s0, %hi(D_80240AA0)
+/* A596AC 8024031C 26100AA0 */  addiu     $s0, $s0, %lo(D_80240AA0)
 /* A596B0 80240320 AFBF0018 */  sw        $ra, 0x18($sp)
 /* A596B4 80240324 AFB10014 */  sw        $s1, 0x14($sp)
 /* A596B8 80240328 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_80240310_A596A0
 /* A5971C 8024038C 28620010 */  slti      $v0, $v1, 0x10
 /* A59720 80240390 1440FFFA */  bnez      $v0, .L8024037C
 /* A59724 80240394 24840004 */   addiu    $a0, $a0, 4
-/* A59728 80240398 3C108024 */  lui       $s0, 0x8024
-/* A5972C 8024039C 26100AA0 */  addiu     $s0, $s0, 0xaa0
+/* A59728 80240398 3C108024 */  lui       $s0, %hi(D_80240AA0)
+/* A5972C 8024039C 26100AA0 */  addiu     $s0, $s0, %lo(D_80240AA0)
 /* A59730 802403A0 0C00AB4B */  jal       heap_free
 /* A59734 802403A4 8E040000 */   lw       $a0, ($s0)
 /* A59738 802403A8 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240000_A609D0.s b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240000_A609D0.s
index 6037a565e6..5a5eaa19a5 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240000_A609D0.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240000_A609D0.s
@@ -13,8 +13,8 @@ glabel func_80240000_A609D0
 /* A609F0 80240020 AFB00010 */  sw        $s0, 0x10($sp)
 /* A609F4 80240024 F7B40028 */  sdc1      $f20, 0x28($sp)
 /* A609F8 80240028 8E330148 */  lw        $s3, 0x148($s1)
-/* A609FC 8024002C 3C03800A */  lui       $v1, 0x800a
-/* A60A00 80240030 8463A634 */  lh        $v1, -0x59cc($v1)
+/* A609FC 8024002C 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* A60A00 80240030 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* A60A04 80240034 8E30000C */  lw        $s0, 0xc($s1)
 /* A60A08 80240038 00031080 */  sll       $v0, $v1, 2
 /* A60A0C 8024003C 00431021 */  addu      $v0, $v0, $v1
@@ -45,8 +45,8 @@ glabel func_80240000_A609D0
 /* A60A70 802400A0 00000000 */   nop      
 /* A60A74 802400A4 0C00A6C9 */  jal       clamp_angle
 /* A60A78 802400A8 46000306 */   mov.s    $f12, $f0
-/* A60A7C 802400AC 3C018024 */  lui       $at, 0x8024
-/* A60A80 802400B0 D42234A0 */  ldc1      $f2, 0x34a0($at)
+/* A60A7C 802400AC 3C018024 */  lui       $at, %hi(D_802434A0)
+/* A60A80 802400B0 D42234A0 */  ldc1      $f2, %lo(D_802434A0)($at)
 /* A60A84 802400B4 46000021 */  cvt.d.s   $f0, $f0
 /* A60A88 802400B8 4622003C */  c.lt.d    $f0, $f2
 /* A60A8C 802400BC 00000000 */  nop       
@@ -67,8 +67,8 @@ glabel func_80240000_A609D0
 /* A60AC4 802400F4 0C00A70A */  jal       get_clamped_angle_diff
 /* A60AC8 802400F8 46000386 */   mov.s    $f14, $f0
 /* A60ACC 802400FC 46000005 */  abs.s     $f0, $f0
-/* A60AD0 80240100 3C018024 */  lui       $at, 0x8024
-/* A60AD4 80240104 D42234A8 */  ldc1      $f2, 0x34a8($at)
+/* A60AD0 80240100 3C018024 */  lui       $at, %hi(D_802434A8)
+/* A60AD4 80240104 D42234A8 */  ldc1      $f2, %lo(D_802434A8)($at)
 /* A60AD8 80240108 46000021 */  cvt.d.s   $f0, $f0
 /* A60ADC 8024010C 4620103C */  c.lt.d    $f2, $f0
 /* A60AE0 80240110 00000000 */  nop       
@@ -89,8 +89,8 @@ glabel func_80240000_A609D0
 /* A60B1C 8024014C 00000000 */  nop       
 /* A60B20 80240150 4501001F */  bc1t      .L802401D0
 /* A60B24 80240154 2402FFFF */   addiu    $v0, $zero, -1
-/* A60B28 80240158 3C038011 */  lui       $v1, 0x8011
-/* A60B2C 8024015C 8063EBB3 */  lb        $v1, -0x144d($v1)
+/* A60B28 80240158 3C038011 */  lui       $v1, %hi(D_8010EBB3)
+/* A60B2C 8024015C 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
 /* A60B30 80240160 24020009 */  addiu     $v0, $zero, 9
 /* A60B34 80240164 10620019 */  beq       $v1, $v0, .L802401CC
 /* A60B38 80240168 24020007 */   addiu    $v0, $zero, 7
diff --git a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240A98_A61468.s b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240A98_A61468.s
index 2737fb1e12..5fad03a78f 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240A98_A61468.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240A98_A61468.s
@@ -7,8 +7,8 @@ glabel func_80240A98_A61468
 /* A61470 80240AA0 0080982D */  daddu     $s3, $a0, $zero
 /* A61474 80240AA4 AFB40040 */  sw        $s4, 0x40($sp)
 /* A61478 80240AA8 0000A02D */  daddu     $s4, $zero, $zero
-/* A6147C 80240AAC 3C03800A */  lui       $v1, 0x800a
-/* A61480 80240AB0 8463A634 */  lh        $v1, -0x59cc($v1)
+/* A6147C 80240AAC 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* A61480 80240AB0 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* A61484 80240AB4 3C04800B */  lui       $a0, %hi(gCameras)
 /* A61488 80240AB8 24841D80 */  addiu     $a0, $a0, %lo(gCameras)
 /* A6148C 80240ABC AFBF0044 */  sw        $ra, 0x44($sp)
@@ -80,12 +80,12 @@ glabel func_80240A98_A61468
 /* A61580 80240BB0 C64C006C */  lwc1      $f12, 0x6c($s2)
 /* A61584 80240BB4 0C00A6C9 */  jal       clamp_angle
 /* A61588 80240BB8 00000000 */   nop      
-/* A6158C 80240BBC 3C018024 */  lui       $at, 0x8024
-/* A61590 80240BC0 D43834B0 */  ldc1      $f24, 0x34b0($at)
+/* A6158C 80240BBC 3C018024 */  lui       $at, %hi(D_802434B0)
+/* A61590 80240BC0 D43834B0 */  ldc1      $f24, %lo(D_802434B0)($at)
 /* A61594 80240BC4 46000521 */  cvt.d.s   $f20, $f0
 /* A61598 80240BC8 4638A300 */  add.d     $f12, $f20, $f24
-/* A6159C 80240BCC 3C018024 */  lui       $at, 0x8024
-/* A615A0 80240BD0 D43634B8 */  ldc1      $f22, 0x34b8($at)
+/* A6159C 80240BCC 3C018024 */  lui       $at, %hi(D_802434B8)
+/* A615A0 80240BD0 D43634B8 */  ldc1      $f22, %lo(D_802434B8)($at)
 /* A615A4 80240BD4 0C00A6C9 */  jal       clamp_angle
 /* A615A8 80240BD8 46206320 */   cvt.s.d  $f12, $f12
 /* A615AC 80240BDC 4636A500 */  add.d     $f20, $f20, $f22
@@ -113,8 +113,8 @@ glabel func_80240A98_A61468
 /* A61604 80240C34 E616000C */  swc1      $f22, 0xc($s0)
 .L80240C38:
 /* A61608 80240C38 C6000018 */  lwc1      $f0, 0x18($s0)
-/* A6160C 80240C3C 3C018024 */  lui       $at, 0x8024
-/* A61610 80240C40 D42234C0 */  ldc1      $f2, 0x34c0($at)
+/* A6160C 80240C3C 3C018024 */  lui       $at, %hi(D_802434C0)
+/* A61610 80240C40 D42234C0 */  ldc1      $f2, %lo(D_802434C0)($at)
 /* A61614 80240C44 46000021 */  cvt.d.s   $f0, $f0
 /* A61618 80240C48 46220002 */  mul.d     $f0, $f0, $f2
 /* A6161C 80240C4C 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240EF4_A618C4.s b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240EF4_A618C4.s
index bc8b7629af..efe4857766 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240EF4_A618C4.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240EF4_A618C4.s
@@ -103,9 +103,9 @@ glabel func_80240EF4_A618C4
 /* A61A34 80241064 2C620064 */  sltiu     $v0, $v1, 0x64
 /* A61A38 80241068 10400060 */  beqz      $v0, .L802411EC
 /* A61A3C 8024106C 00031080 */   sll      $v0, $v1, 2
-/* A61A40 80241070 3C018024 */  lui       $at, 0x8024
+/* A61A40 80241070 3C018024 */  lui       $at, %hi(D_802434C8)
 /* A61A44 80241074 00220821 */  addu      $at, $at, $v0
-/* A61A48 80241078 8C2234C8 */  lw        $v0, 0x34c8($at)
+/* A61A48 80241078 8C2234C8 */  lw        $v0, %lo(D_802434C8)($at)
 /* A61A4C 8024107C 00400008 */  jr        $v0
 /* A61A50 80241080 00000000 */   nop      
 /* A61A54 80241084 0260202D */  daddu     $a0, $s3, $zero
diff --git a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_802412C8_A61C98.s b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_802412C8_A61C98.s
index 673eeb8fcf..56173ba446 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_802412C8_A61C98.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_802412C8_A61C98.s
@@ -55,8 +55,8 @@ glabel func_802412C8_A61C98
 /* A61D54 80241384 8C470030 */   lw       $a3, 0x30($v0)
 /* A61D58 80241388 C6020018 */  lwc1      $f2, 0x18($s0)
 /* A61D5C 8024138C 46020003 */  div.s     $f0, $f0, $f2
-/* A61D60 80241390 3C018024 */  lui       $at, 0x8024
-/* A61D64 80241394 D4223658 */  ldc1      $f2, 0x3658($at)
+/* A61D60 80241390 3C018024 */  lui       $at, %hi(D_80243658)
+/* A61D64 80241394 D4223658 */  ldc1      $f2, %lo(D_80243658)($at)
 /* A61D68 80241398 46000021 */  cvt.d.s   $f0, $f0
 /* A61D6C 8024139C 46220000 */  add.d     $f0, $f0, $f2
 /* A61D70 802413A0 4620010D */  trunc.w.d $f4, $f0
diff --git a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_802415E0_A61FB0.s b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_802415E0_A61FB0.s
index ce04b6ffd2..5d51c1003d 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_802415E0_A61FB0.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_802415E0_A61FB0.s
@@ -279,9 +279,9 @@ glabel func_802415E0_A61FB0
 /* A6239C 802419CC 2C620015 */  sltiu     $v0, $v1, 0x15
 /* A623A0 802419D0 10400009 */  beqz      $v0, .L802419F8
 /* A623A4 802419D4 00031080 */   sll      $v0, $v1, 2
-/* A623A8 802419D8 3C018024 */  lui       $at, 0x8024
+/* A623A8 802419D8 3C018024 */  lui       $at, %hi(D_80243660)
 /* A623AC 802419DC 00220821 */  addu      $at, $at, $v0
-/* A623B0 802419E0 8C223660 */  lw        $v0, 0x3660($at)
+/* A623B0 802419E0 8C223660 */  lw        $v0, %lo(D_80243660)($at)
 /* A623B4 802419E4 00400008 */  jr        $v0
 /* A623B8 802419E8 00000000 */   nop      
 /* A623BC 802419EC 8E420028 */  lw        $v0, 0x28($s2)
diff --git a/asm/nonmatchings/world/area_kpa/kpa_51/A64090/func_80240000_A64090.s b/asm/nonmatchings/world/area_kpa/kpa_51/A64090/func_80240000_A64090.s
index f59af24d4d..8f5b9860a5 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_51/A64090/func_80240000_A64090.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_51/A64090/func_80240000_A64090.s
@@ -3,18 +3,18 @@
 
 glabel func_80240000_A64090
 /* A64090 80240000 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* A64094 80240004 3C04800E */  lui       $a0, 0x800e
-/* A64098 80240008 24849230 */  addiu     $a0, $a0, -0x6dd0
-/* A6409C 8024000C 3C058024 */  lui       $a1, 0x8024
-/* A640A0 80240010 24A52F20 */  addiu     $a1, $a1, 0x2f20
+/* A64094 80240004 3C04800E */  lui       $a0, %hi(D_800D9230)
+/* A64098 80240008 24849230 */  addiu     $a0, $a0, %lo(D_800D9230)
+/* A6409C 8024000C 3C058024 */  lui       $a1, %hi(D_80242F20)
+/* A640A0 80240010 24A52F20 */  addiu     $a1, $a1, %lo(D_80242F20)
 /* A640A4 80240014 AFBF0010 */  sw        $ra, 0x10($sp)
 /* A640A8 80240018 0C01953C */  jal       sprintf
 /* A640AC 8024001C 00000000 */   nop      
-/* A640B0 80240020 3C04800E */  lui       $a0, 0x800e
-/* A640B4 80240024 248491E0 */  addiu     $a0, $a0, -0x6e20
-/* A640B8 80240028 3C058024 */  lui       $a1, 0x8024
+/* A640B0 80240020 3C04800E */  lui       $a0, %hi(D_800D91E0)
+/* A640B4 80240024 248491E0 */  addiu     $a0, $a0, %lo(D_800D91E0)
+/* A640B8 80240028 3C058024 */  lui       $a1, %hi(D_80242F30)
 /* A640BC 8024002C 0C01953C */  jal       sprintf
-/* A640C0 80240030 24A52F30 */   addiu    $a1, $a1, 0x2f30
+/* A640C0 80240030 24A52F30 */   addiu    $a1, $a1, %lo(D_80242F30)
 /* A640C4 80240034 8FBF0010 */  lw        $ra, 0x10($sp)
 /* A640C8 80240038 0000102D */  daddu     $v0, $zero, $zero
 /* A640CC 8024003C 03E00008 */  jr        $ra
diff --git a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240050_A640E0.s b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240050_A640E0.s
index 93dfbb9790..65c783bdd5 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240050_A640E0.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240050_A640E0.s
@@ -19,8 +19,8 @@ glabel func_80240050_A640E0
 /* A64118 80240088 0040882D */  daddu     $s1, $v0, $zero
 /* A6411C 8024008C 4406A000 */  mfc1      $a2, $f20
 /* A64120 80240090 4407B000 */  mfc1      $a3, $f22
-/* A64124 80240094 3C03800A */  lui       $v1, 0x800a
-/* A64128 80240098 8463A634 */  lh        $v1, -0x59cc($v1)
+/* A64124 80240094 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* A64128 80240098 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* A6412C 8024009C 3C05800B */  lui       $a1, %hi(gCameras)
 /* A64130 802400A0 24A51D80 */  addiu     $a1, $a1, %lo(gCameras)
 /* A64134 802400A4 AFA00010 */  sw        $zero, 0x10($sp)
@@ -44,8 +44,8 @@ glabel func_80240050_A640E0
 /* A6417C 802400EC 00000000 */   nop      
 /* A64180 802400F0 0C00A6C9 */  jal       clamp_angle
 /* A64184 802400F4 46000306 */   mov.s    $f12, $f0
-/* A64188 802400F8 3C018024 */  lui       $at, 0x8024
-/* A6418C 802400FC D4222F50 */  ldc1      $f2, 0x2f50($at)
+/* A64188 802400F8 3C018024 */  lui       $at, %hi(D_80242F50)
+/* A6418C 802400FC D4222F50 */  ldc1      $f2, %lo(D_80242F50)($at)
 /* A64190 80240100 46000021 */  cvt.d.s   $f0, $f0
 /* A64194 80240104 4622003C */  c.lt.d    $f0, $f2
 /* A64198 80240108 00000000 */  nop       
@@ -66,8 +66,8 @@ glabel func_80240050_A640E0
 /* A641D0 80240140 0C00A70A */  jal       get_clamped_angle_diff
 /* A641D4 80240144 46000386 */   mov.s    $f14, $f0
 /* A641D8 80240148 46000005 */  abs.s     $f0, $f0
-/* A641DC 8024014C 3C018024 */  lui       $at, 0x8024
-/* A641E0 80240150 D4222F58 */  ldc1      $f2, 0x2f58($at)
+/* A641DC 8024014C 3C018024 */  lui       $at, %hi(D_80242F58)
+/* A641E0 80240150 D4222F58 */  ldc1      $f2, %lo(D_80242F58)($at)
 /* A641E4 80240154 46000021 */  cvt.d.s   $f0, $f0
 /* A641E8 80240158 4620103C */  c.lt.d    $f2, $f0
 /* A641EC 8024015C 00000000 */  nop       
@@ -84,12 +84,12 @@ glabel func_80240050_A640E0
 /* A64218 80240188 44060000 */  mfc1      $a2, $f0
 /* A6421C 8024018C 0C00A720 */  jal       atan2
 /* A64220 80240190 00000000 */   nop      
-/* A64224 80240194 3C018024 */  lui       $at, 0x8024
-/* A64228 80240198 D4222F60 */  ldc1      $f2, 0x2f60($at)
+/* A64224 80240194 3C018024 */  lui       $at, %hi(D_80242F60)
+/* A64228 80240198 D4222F60 */  ldc1      $f2, %lo(D_80242F60)($at)
 /* A6422C 8024019C 46000021 */  cvt.d.s   $f0, $f0
 /* A64230 802401A0 46220001 */  sub.d     $f0, $f0, $f2
-/* A64234 802401A4 3C018024 */  lui       $at, 0x8024
-/* A64238 802401A8 D4222F68 */  ldc1      $f2, 0x2f68($at)
+/* A64234 802401A4 3C018024 */  lui       $at, %hi(D_80242F68)
+/* A64238 802401A8 D4222F68 */  ldc1      $f2, %lo(D_80242F68)($at)
 /* A6423C 802401AC 46200020 */  cvt.s.d   $f0, $f0
 /* A64240 802401B0 46000005 */  abs.s     $f0, $f0
 /* A64244 802401B4 46000021 */  cvt.d.s   $f0, $f0
@@ -97,8 +97,8 @@ glabel func_80240050_A640E0
 /* A6424C 802401BC 00000000 */  nop       
 /* A64250 802401C0 4501000F */  bc1t      .L80240200
 /* A64254 802401C4 2402FFFF */   addiu    $v0, $zero, -1
-/* A64258 802401C8 3C038011 */  lui       $v1, 0x8011
-/* A6425C 802401CC 8063EBB3 */  lb        $v1, -0x144d($v1)
+/* A64258 802401C8 3C038011 */  lui       $v1, %hi(D_8010EBB3)
+/* A6425C 802401CC 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
 /* A64260 802401D0 24020009 */  addiu     $v0, $zero, 9
 /* A64264 802401D4 10620009 */  beq       $v1, $v0, .L802401FC
 /* A64268 802401D8 24020007 */   addiu    $v0, $zero, 7
diff --git a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240220_A642B0.s b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240220_A642B0.s
index b430944b18..9d53da7ce8 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240220_A642B0.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240220_A642B0.s
@@ -60,9 +60,9 @@ glabel func_80240220_A642B0
 /* A64384 802402F4 2C620005 */  sltiu     $v0, $v1, 5
 /* A64388 802402F8 10400101 */  beqz      $v0, .L80240700
 /* A6438C 802402FC 00031080 */   sll      $v0, $v1, 2
-/* A64390 80240300 3C018024 */  lui       $at, 0x8024
+/* A64390 80240300 3C018024 */  lui       $at, %hi(D_80242F70)
 /* A64394 80240304 00220821 */  addu      $at, $at, $v0
-/* A64398 80240308 8C222F70 */  lw        $v0, 0x2f70($at)
+/* A64398 80240308 8C222F70 */  lw        $v0, %lo(D_80242F70)($at)
 /* A6439C 8024030C 00400008 */  jr        $v0
 /* A643A0 80240310 00000000 */   nop      
 /* A643A4 80240314 3C01C47A */  lui       $at, 0xc47a
@@ -148,8 +148,8 @@ glabel func_80240220_A642B0
 /* A644E4 80240454 44061000 */  mfc1      $a2, $f2
 /* A644E8 80240458 0C00A720 */  jal       atan2
 /* A644EC 8024045C 00000000 */   nop      
-/* A644F0 80240460 3C018024 */  lui       $at, 0x8024
-/* A644F4 80240464 D4222F88 */  ldc1      $f2, 0x2f88($at)
+/* A644F0 80240460 3C018024 */  lui       $at, %hi(D_80242F88)
+/* A644F4 80240464 D4222F88 */  ldc1      $f2, %lo(D_80242F88)($at)
 /* A644F8 80240468 46000021 */  cvt.d.s   $f0, $f0
 /* A644FC 8024046C 46220001 */  sub.d     $f0, $f0, $f2
 /* A64500 80240470 46200020 */  cvt.s.d   $f0, $f0
diff --git a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802407A4_A64834.s b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802407A4_A64834.s
index a84033b3ba..70e3583488 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802407A4_A64834.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802407A4_A64834.s
@@ -14,29 +14,29 @@ glabel func_802407A4_A64834
 /* A64858 802407C8 86440008 */   lh       $a0, 8($s2)
 /* A6485C 802407CC 0040802D */  daddu     $s0, $v0, $zero
 /* A64860 802407D0 8603008E */  lh        $v1, 0x8e($s0)
-/* A64864 802407D4 3C118024 */  lui       $s1, 0x8024
-/* A64868 802407D8 26312050 */  addiu     $s1, $s1, 0x2050
+/* A64864 802407D4 3C118024 */  lui       $s1, %hi(D_80242050)
+/* A64868 802407D8 26312050 */  addiu     $s1, $s1, %lo(D_80242050)
 /* A6486C 802407DC 00031040 */  sll       $v0, $v1, 1
 /* A64870 802407E0 00431021 */  addu      $v0, $v0, $v1
 /* A64874 802407E4 00021080 */  sll       $v0, $v0, 2
-/* A64878 802407E8 3C018024 */  lui       $at, 0x8024
+/* A64878 802407E8 3C018024 */  lui       $at, %hi(D_80242050)
 /* A6487C 802407EC 00220821 */  addu      $at, $at, $v0
-/* A64880 802407F0 C4202050 */  lwc1      $f0, 0x2050($at)
+/* A64880 802407F0 C4202050 */  lwc1      $f0, %lo(D_80242050)($at)
 /* A64884 802407F4 00031040 */  sll       $v0, $v1, 1
 /* A64888 802407F8 00431021 */  addu      $v0, $v0, $v1
 /* A6488C 802407FC 00021080 */  sll       $v0, $v0, 2
 /* A64890 80240800 E6000054 */  swc1      $f0, 0x54($s0)
-/* A64894 80240804 3C018024 */  lui       $at, 0x8024
+/* A64894 80240804 3C018024 */  lui       $at, %hi(D_80242054)
 /* A64898 80240808 00220821 */  addu      $at, $at, $v0
-/* A6489C 8024080C C4202054 */  lwc1      $f0, 0x2054($at)
+/* A6489C 8024080C C4202054 */  lwc1      $f0, %lo(D_80242054)($at)
 /* A648A0 80240810 00031040 */  sll       $v0, $v1, 1
 /* A648A4 80240814 00431021 */  addu      $v0, $v0, $v1
 /* A648A8 80240818 9603008E */  lhu       $v1, 0x8e($s0)
 /* A648AC 8024081C 00021080 */  sll       $v0, $v0, 2
 /* A648B0 80240820 E6000058 */  swc1      $f0, 0x58($s0)
-/* A648B4 80240824 3C018024 */  lui       $at, 0x8024
+/* A648B4 80240824 3C018024 */  lui       $at, %hi(D_80242058)
 /* A648B8 80240828 00220821 */  addu      $at, $at, $v0
-/* A648BC 8024082C 90222058 */  lbu       $v0, 0x2058($at)
+/* A648BC 8024082C 90222058 */  lbu       $v0, %lo(D_80242058)($at)
 /* A648C0 80240830 24630001 */  addiu     $v1, $v1, 1
 /* A648C4 80240834 A603008E */  sh        $v1, 0x8e($s0)
 /* A648C8 80240838 00031C00 */  sll       $v1, $v1, 0x10
diff --git a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240B14_A64BA4.s b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240B14_A64BA4.s
index 31e17def2f..cfdceac11a 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240B14_A64BA4.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240B14_A64BA4.s
@@ -32,16 +32,16 @@ glabel func_80240B14_A64BA4
 /* A64C08 80240B78 240300FF */   addiu    $v1, $zero, 0xff
 .L80240B7C:
 /* A64C0C 80240B7C 8602008E */  lh        $v0, 0x8e($s0)
-/* A64C10 80240B80 3C018024 */  lui       $at, 0x8024
-/* A64C14 80240B84 D4222F90 */  ldc1      $f2, 0x2f90($at)
+/* A64C10 80240B80 3C018024 */  lui       $at, %hi(D_80242F90)
+/* A64C14 80240B84 D4222F90 */  ldc1      $f2, %lo(D_80242F90)($at)
 /* A64C18 80240B88 44820000 */  mtc1      $v0, $f0
 /* A64C1C 80240B8C 00000000 */  nop       
 /* A64C20 80240B90 46800020 */  cvt.s.w   $f0, $f0
 /* A64C24 80240B94 46000021 */  cvt.d.s   $f0, $f0
 /* A64C28 80240B98 46220002 */  mul.d     $f0, $f0, $f2
 /* A64C2C 80240B9C 00000000 */  nop       
-/* A64C30 80240BA0 3C018024 */  lui       $at, 0x8024
-/* A64C34 80240BA4 D4222F98 */  ldc1      $f2, 0x2f98($at)
+/* A64C30 80240BA0 3C018024 */  lui       $at, %hi(D_80242F98)
+/* A64C34 80240BA4 D4222F98 */  ldc1      $f2, %lo(D_80242F98)($at)
 /* A64C38 80240BA8 46220000 */  add.d     $f0, $f0, $f2
 /* A64C3C 80240BAC A20300AC */  sb        $v1, 0xac($s0)
 /* A64C40 80240BB0 3C013FF0 */  lui       $at, 0x3ff0
diff --git a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802410BC_A6514C.s b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802410BC_A6514C.s
index 9e12789d79..6e5c6374b7 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802410BC_A6514C.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802410BC_A6514C.s
@@ -83,9 +83,9 @@ glabel func_802410BC_A6514C
 /* A65278 802411E8 2C620019 */  sltiu     $v0, $v1, 0x19
 /* A6527C 802411EC 10400044 */  beqz      $v0, .L80241300
 /* A65280 802411F0 00031080 */   sll      $v0, $v1, 2
-/* A65284 802411F4 3C018024 */  lui       $at, 0x8024
+/* A65284 802411F4 3C018024 */  lui       $at, %hi(D_80242FA0)
 /* A65288 802411F8 00220821 */  addu      $at, $at, $v0
-/* A6528C 802411FC 8C222FA0 */  lw        $v0, 0x2fa0($at)
+/* A6528C 802411FC 8C222FA0 */  lw        $v0, %lo(D_80242FA0)($at)
 /* A65290 80241200 00400008 */  jr        $v0
 /* A65294 80241204 00000000 */   nop      
 /* A65298 80241208 02A0202D */  daddu     $a0, $s5, $zero
diff --git a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802414C8_A65558.s b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802414C8_A65558.s
index 6493119069..6805ad769e 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802414C8_A65558.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802414C8_A65558.s
@@ -55,8 +55,8 @@ glabel func_802414C8_A65558
 /* A65614 80241584 8C470030 */   lw       $a3, 0x30($v0)
 /* A65618 80241588 C6020018 */  lwc1      $f2, 0x18($s0)
 /* A6561C 8024158C 46020003 */  div.s     $f0, $f0, $f2
-/* A65620 80241590 3C018024 */  lui       $at, 0x8024
-/* A65624 80241594 D4223008 */  ldc1      $f2, 0x3008($at)
+/* A65620 80241590 3C018024 */  lui       $at, %hi(D_80243008)
+/* A65624 80241594 D4223008 */  ldc1      $f2, %lo(D_80243008)($at)
 /* A65628 80241598 46000021 */  cvt.d.s   $f0, $f0
 /* A6562C 8024159C 46220000 */  add.d     $f0, $f0, $f2
 /* A65630 802415A0 4620010D */  trunc.w.d $f4, $f0
diff --git a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802417E0_A65870.s b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802417E0_A65870.s
index 37ff78a161..5091193de4 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802417E0_A65870.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802417E0_A65870.s
@@ -279,9 +279,9 @@ glabel func_802417E0_A65870
 /* A65C5C 80241BCC 2C620015 */  sltiu     $v0, $v1, 0x15
 /* A65C60 80241BD0 10400009 */  beqz      $v0, .L80241BF8
 /* A65C64 80241BD4 00031080 */   sll      $v0, $v1, 2
-/* A65C68 80241BD8 3C018024 */  lui       $at, 0x8024
+/* A65C68 80241BD8 3C018024 */  lui       $at, %hi(D_80243010)
 /* A65C6C 80241BDC 00220821 */  addu      $at, $at, $v0
-/* A65C70 80241BE0 8C223010 */  lw        $v0, 0x3010($at)
+/* A65C70 80241BE0 8C223010 */  lw        $v0, %lo(D_80243010)($at)
 /* A65C74 80241BE4 00400008 */  jr        $v0
 /* A65C78 80241BE8 00000000 */   nop      
 /* A65C7C 80241BEC 8E420028 */  lw        $v0, 0x28($s2)
diff --git a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_802400E0_A671E0.s b/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_802400E0_A671E0.s
index 5e02bfca2c..4b3987785d 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_802400E0_A671E0.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_802400E0_A671E0.s
@@ -13,8 +13,8 @@ glabel func_802400E0_A671E0
 /* A67200 80240100 AFB00010 */  sw        $s0, 0x10($sp)
 /* A67204 80240104 F7B40028 */  sdc1      $f20, 0x28($sp)
 /* A67208 80240108 8E330148 */  lw        $s3, 0x148($s1)
-/* A6720C 8024010C 3C03800A */  lui       $v1, 0x800a
-/* A67210 80240110 8463A634 */  lh        $v1, -0x59cc($v1)
+/* A6720C 8024010C 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* A67210 80240110 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* A67214 80240114 8E30000C */  lw        $s0, 0xc($s1)
 /* A67218 80240118 00031080 */  sll       $v0, $v1, 2
 /* A6721C 8024011C 00431021 */  addu      $v0, $v0, $v1
@@ -45,8 +45,8 @@ glabel func_802400E0_A671E0
 /* A67280 80240180 00000000 */   nop      
 /* A67284 80240184 0C00A6C9 */  jal       clamp_angle
 /* A67288 80240188 46000306 */   mov.s    $f12, $f0
-/* A6728C 8024018C 3C018024 */  lui       $at, 0x8024
-/* A67290 80240190 D42239E0 */  ldc1      $f2, 0x39e0($at)
+/* A6728C 8024018C 3C018024 */  lui       $at, %hi(D_802439E0)
+/* A67290 80240190 D42239E0 */  ldc1      $f2, %lo(D_802439E0)($at)
 /* A67294 80240194 46000021 */  cvt.d.s   $f0, $f0
 /* A67298 80240198 4622003C */  c.lt.d    $f0, $f2
 /* A6729C 8024019C 00000000 */  nop       
@@ -67,8 +67,8 @@ glabel func_802400E0_A671E0
 /* A672D4 802401D4 0C00A70A */  jal       get_clamped_angle_diff
 /* A672D8 802401D8 46000386 */   mov.s    $f14, $f0
 /* A672DC 802401DC 46000005 */  abs.s     $f0, $f0
-/* A672E0 802401E0 3C018024 */  lui       $at, 0x8024
-/* A672E4 802401E4 D42239E8 */  ldc1      $f2, 0x39e8($at)
+/* A672E0 802401E0 3C018024 */  lui       $at, %hi(D_802439E8)
+/* A672E4 802401E4 D42239E8 */  ldc1      $f2, %lo(D_802439E8)($at)
 /* A672E8 802401E8 46000021 */  cvt.d.s   $f0, $f0
 /* A672EC 802401EC 4620103C */  c.lt.d    $f2, $f0
 /* A672F0 802401F0 00000000 */  nop       
@@ -89,8 +89,8 @@ glabel func_802400E0_A671E0
 /* A6732C 8024022C 00000000 */  nop       
 /* A67330 80240230 4501001F */  bc1t      .L802402B0
 /* A67334 80240234 2402FFFF */   addiu    $v0, $zero, -1
-/* A67338 80240238 3C038011 */  lui       $v1, 0x8011
-/* A6733C 8024023C 8063EBB3 */  lb        $v1, -0x144d($v1)
+/* A67338 80240238 3C038011 */  lui       $v1, %hi(D_8010EBB3)
+/* A6733C 8024023C 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
 /* A67340 80240240 24020009 */  addiu     $v0, $zero, 9
 /* A67344 80240244 10620019 */  beq       $v1, $v0, .L802402AC
 /* A67348 80240248 24020007 */   addiu    $v0, $zero, 7
diff --git a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240B78_A67C78.s b/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240B78_A67C78.s
index 8f171daaa9..ba126b448d 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240B78_A67C78.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240B78_A67C78.s
@@ -7,8 +7,8 @@ glabel func_80240B78_A67C78
 /* A67C80 80240B80 0080982D */  daddu     $s3, $a0, $zero
 /* A67C84 80240B84 AFB40040 */  sw        $s4, 0x40($sp)
 /* A67C88 80240B88 0000A02D */  daddu     $s4, $zero, $zero
-/* A67C8C 80240B8C 3C03800A */  lui       $v1, 0x800a
-/* A67C90 80240B90 8463A634 */  lh        $v1, -0x59cc($v1)
+/* A67C8C 80240B8C 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* A67C90 80240B90 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* A67C94 80240B94 3C04800B */  lui       $a0, %hi(gCameras)
 /* A67C98 80240B98 24841D80 */  addiu     $a0, $a0, %lo(gCameras)
 /* A67C9C 80240B9C AFBF0044 */  sw        $ra, 0x44($sp)
@@ -80,12 +80,12 @@ glabel func_80240B78_A67C78
 /* A67D90 80240C90 C64C006C */  lwc1      $f12, 0x6c($s2)
 /* A67D94 80240C94 0C00A6C9 */  jal       clamp_angle
 /* A67D98 80240C98 00000000 */   nop      
-/* A67D9C 80240C9C 3C018024 */  lui       $at, 0x8024
-/* A67DA0 80240CA0 D43839F0 */  ldc1      $f24, 0x39f0($at)
+/* A67D9C 80240C9C 3C018024 */  lui       $at, %hi(D_802439F0)
+/* A67DA0 80240CA0 D43839F0 */  ldc1      $f24, %lo(D_802439F0)($at)
 /* A67DA4 80240CA4 46000521 */  cvt.d.s   $f20, $f0
 /* A67DA8 80240CA8 4638A300 */  add.d     $f12, $f20, $f24
-/* A67DAC 80240CAC 3C018024 */  lui       $at, 0x8024
-/* A67DB0 80240CB0 D43639F8 */  ldc1      $f22, 0x39f8($at)
+/* A67DAC 80240CAC 3C018024 */  lui       $at, %hi(D_802439F8)
+/* A67DB0 80240CB0 D43639F8 */  ldc1      $f22, %lo(D_802439F8)($at)
 /* A67DB4 80240CB4 0C00A6C9 */  jal       clamp_angle
 /* A67DB8 80240CB8 46206320 */   cvt.s.d  $f12, $f12
 /* A67DBC 80240CBC 4636A500 */  add.d     $f20, $f20, $f22
@@ -113,8 +113,8 @@ glabel func_80240B78_A67C78
 /* A67E14 80240D14 E616000C */  swc1      $f22, 0xc($s0)
 .L80240D18:
 /* A67E18 80240D18 C6000018 */  lwc1      $f0, 0x18($s0)
-/* A67E1C 80240D1C 3C018024 */  lui       $at, 0x8024
-/* A67E20 80240D20 D4223A00 */  ldc1      $f2, 0x3a00($at)
+/* A67E1C 80240D1C 3C018024 */  lui       $at, %hi(D_80243A00)
+/* A67E20 80240D20 D4223A00 */  ldc1      $f2, %lo(D_80243A00)($at)
 /* A67E24 80240D24 46000021 */  cvt.d.s   $f0, $f0
 /* A67E28 80240D28 46220002 */  mul.d     $f0, $f0, $f2
 /* A67E2C 80240D2C 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240FD4_A680D4.s b/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240FD4_A680D4.s
index c729f8820b..e0bfe27d60 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240FD4_A680D4.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240FD4_A680D4.s
@@ -103,9 +103,9 @@ glabel func_80240FD4_A680D4
 /* A68244 80241144 2C620064 */  sltiu     $v0, $v1, 0x64
 /* A68248 80241148 10400060 */  beqz      $v0, .L802412CC
 /* A6824C 8024114C 00031080 */   sll      $v0, $v1, 2
-/* A68250 80241150 3C018024 */  lui       $at, 0x8024
+/* A68250 80241150 3C018024 */  lui       $at, %hi(D_80243A08)
 /* A68254 80241154 00220821 */  addu      $at, $at, $v0
-/* A68258 80241158 8C223A08 */  lw        $v0, 0x3a08($at)
+/* A68258 80241158 8C223A08 */  lw        $v0, %lo(D_80243A08)($at)
 /* A6825C 8024115C 00400008 */  jr        $v0
 /* A68260 80241160 00000000 */   nop      
 /* A68264 80241164 0260202D */  daddu     $a0, $s3, $zero
diff --git a/asm/nonmatchings/world/area_kpa/kpa_53/A6ACA0/func_80240000_A6ACA0.s b/asm/nonmatchings/world/area_kpa/kpa_53/A6ACA0/func_80240000_A6ACA0.s
index 91aad3cde5..6a47e97240 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_53/A6ACA0/func_80240000_A6ACA0.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_53/A6ACA0/func_80240000_A6ACA0.s
@@ -3,21 +3,21 @@
 
 glabel func_80240000_A6ACA0
 /* A6ACA0 80240000 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* A6ACA4 80240004 3C04800E */  lui       $a0, 0x800e
-/* A6ACA8 80240008 24849230 */  addiu     $a0, $a0, -0x6dd0
-/* A6ACAC 8024000C 3C058024 */  lui       $a1, 0x8024
-/* A6ACB0 80240010 24A51E20 */  addiu     $a1, $a1, 0x1e20
+/* A6ACA4 80240004 3C04800E */  lui       $a0, %hi(D_800D9230)
+/* A6ACA8 80240008 24849230 */  addiu     $a0, $a0, %lo(D_800D9230)
+/* A6ACAC 8024000C 3C058024 */  lui       $a1, %hi(D_80241E20)
+/* A6ACB0 80240010 24A51E20 */  addiu     $a1, $a1, %lo(D_80241E20)
 /* A6ACB4 80240014 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
 /* A6ACB8 80240018 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
 /* A6ACBC 8024001C 24020002 */  addiu     $v0, $zero, 2
 /* A6ACC0 80240020 AFBF0010 */  sw        $ra, 0x10($sp)
 /* A6ACC4 80240024 0C01953C */  jal       sprintf
 /* A6ACC8 80240028 A0620084 */   sb       $v0, 0x84($v1)
-/* A6ACCC 8024002C 3C04800E */  lui       $a0, 0x800e
-/* A6ACD0 80240030 248491E0 */  addiu     $a0, $a0, -0x6e20
-/* A6ACD4 80240034 3C058024 */  lui       $a1, 0x8024
+/* A6ACCC 8024002C 3C04800E */  lui       $a0, %hi(D_800D91E0)
+/* A6ACD0 80240030 248491E0 */  addiu     $a0, $a0, %lo(D_800D91E0)
+/* A6ACD4 80240034 3C058024 */  lui       $a1, %hi(D_80241E30)
 /* A6ACD8 80240038 0C01953C */  jal       sprintf
-/* A6ACDC 8024003C 24A51E30 */   addiu    $a1, $a1, 0x1e30
+/* A6ACDC 8024003C 24A51E30 */   addiu    $a1, $a1, %lo(D_80241E30)
 /* A6ACE0 80240040 8FBF0010 */  lw        $ra, 0x10($sp)
 /* A6ACE4 80240044 0000102D */  daddu     $v0, $zero, $zero
 /* A6ACE8 80240048 03E00008 */  jr        $ra
diff --git a/asm/nonmatchings/world/area_kpa/kpa_53/A6ACA0/func_80240050_A6ACF0.s b/asm/nonmatchings/world/area_kpa/kpa_53/A6ACA0/func_80240050_A6ACF0.s
index d365f6bdc3..d866de6d9c 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_53/A6ACA0/func_80240050_A6ACF0.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_53/A6ACA0/func_80240050_A6ACF0.s
@@ -22,8 +22,8 @@ glabel func_80240050_A6ACF0
 /* A6AD34 80240094 1060002F */  beqz      $v1, .L80240154
 /* A6AD38 80240098 24020002 */   addiu    $v0, $zero, 2
 /* A6AD3C 8024009C C6000028 */  lwc1      $f0, 0x28($s0)
-/* A6AD40 802400A0 3C018024 */  lui       $at, 0x8024
-/* A6AD44 802400A4 D4221E50 */  ldc1      $f2, 0x1e50($at)
+/* A6AD40 802400A0 3C018024 */  lui       $at, %hi(D_80241E50)
+/* A6AD44 802400A4 D4221E50 */  ldc1      $f2, %lo(D_80241E50)($at)
 /* A6AD48 802400A8 4600010D */  trunc.w.s $f4, $f0
 /* A6AD4C 802400AC 44022000 */  mfc1      $v0, $f4
 /* A6AD50 802400B0 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_8024038C_A6E76C.s b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_8024038C_A6E76C.s
index 737e181d46..91ea1a1789 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_8024038C_A6E76C.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_8024038C_A6E76C.s
@@ -55,8 +55,8 @@ glabel func_8024038C_A6E76C
 /* A6E828 80240448 8C470030 */   lw       $a3, 0x30($v0)
 /* A6E82C 8024044C C6020018 */  lwc1      $f2, 0x18($s0)
 /* A6E830 80240450 46020003 */  div.s     $f0, $f0, $f2
-/* A6E834 80240454 3C018024 */  lui       $at, 0x8024
-/* A6E838 80240458 D4223CD0 */  ldc1      $f2, 0x3cd0($at)
+/* A6E834 80240454 3C018024 */  lui       $at, %hi(D_80243CD0)
+/* A6E838 80240458 D4223CD0 */  ldc1      $f2, %lo(D_80243CD0)($at)
 /* A6E83C 8024045C 46000021 */  cvt.d.s   $f0, $f0
 /* A6E840 80240460 46220000 */  add.d     $f0, $f0, $f2
 /* A6E844 80240464 4620010D */  trunc.w.d $f4, $f0
diff --git a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802406A4_A6EA84.s b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802406A4_A6EA84.s
index dae6743224..30cc1edae7 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802406A4_A6EA84.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802406A4_A6EA84.s
@@ -279,9 +279,9 @@ glabel func_802406A4_A6EA84
 /* A6EE70 80240A90 2C620015 */  sltiu     $v0, $v1, 0x15
 /* A6EE74 80240A94 10400009 */  beqz      $v0, .L80240ABC
 /* A6EE78 80240A98 00031080 */   sll      $v0, $v1, 2
-/* A6EE7C 80240A9C 3C018024 */  lui       $at, 0x8024
+/* A6EE7C 80240A9C 3C018024 */  lui       $at, %hi(D_80243CD8)
 /* A6EE80 80240AA0 00220821 */  addu      $at, $at, $v0
-/* A6EE84 80240AA4 8C223CD8 */  lw        $v0, 0x3cd8($at)
+/* A6EE84 80240AA4 8C223CD8 */  lw        $v0, %lo(D_80243CD8)($at)
 /* A6EE88 80240AA8 00400008 */  jr        $v0
 /* A6EE8C 80240AAC 00000000 */   nop      
 /* A6EE90 80240AB0 8E420028 */  lw        $v0, 0x28($s2)
diff --git a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80240AE4_A6EEC4.s b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80240AE4_A6EEC4.s
index 43a152002c..10f116da0d 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80240AE4_A6EEC4.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80240AE4_A6EEC4.s
@@ -19,8 +19,8 @@ glabel func_80240AE4_A6EEC4
 /* A6EEFC 80240B1C 0040882D */  daddu     $s1, $v0, $zero
 /* A6EF00 80240B20 4406A000 */  mfc1      $a2, $f20
 /* A6EF04 80240B24 4407B000 */  mfc1      $a3, $f22
-/* A6EF08 80240B28 3C03800A */  lui       $v1, 0x800a
-/* A6EF0C 80240B2C 8463A634 */  lh        $v1, -0x59cc($v1)
+/* A6EF08 80240B28 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* A6EF0C 80240B2C 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* A6EF10 80240B30 3C05800B */  lui       $a1, %hi(gCameras)
 /* A6EF14 80240B34 24A51D80 */  addiu     $a1, $a1, %lo(gCameras)
 /* A6EF18 80240B38 AFA00010 */  sw        $zero, 0x10($sp)
@@ -44,8 +44,8 @@ glabel func_80240AE4_A6EEC4
 /* A6EF60 80240B80 00000000 */   nop      
 /* A6EF64 80240B84 0C00A6C9 */  jal       clamp_angle
 /* A6EF68 80240B88 46000306 */   mov.s    $f12, $f0
-/* A6EF6C 80240B8C 3C018024 */  lui       $at, 0x8024
-/* A6EF70 80240B90 D4223D30 */  ldc1      $f2, 0x3d30($at)
+/* A6EF6C 80240B8C 3C018024 */  lui       $at, %hi(D_80243D30)
+/* A6EF70 80240B90 D4223D30 */  ldc1      $f2, %lo(D_80243D30)($at)
 /* A6EF74 80240B94 46000021 */  cvt.d.s   $f0, $f0
 /* A6EF78 80240B98 4622003C */  c.lt.d    $f0, $f2
 /* A6EF7C 80240B9C 00000000 */  nop       
@@ -66,8 +66,8 @@ glabel func_80240AE4_A6EEC4
 /* A6EFB4 80240BD4 0C00A70A */  jal       get_clamped_angle_diff
 /* A6EFB8 80240BD8 46000386 */   mov.s    $f14, $f0
 /* A6EFBC 80240BDC 46000005 */  abs.s     $f0, $f0
-/* A6EFC0 80240BE0 3C018024 */  lui       $at, 0x8024
-/* A6EFC4 80240BE4 D4223D38 */  ldc1      $f2, 0x3d38($at)
+/* A6EFC0 80240BE0 3C018024 */  lui       $at, %hi(D_80243D38)
+/* A6EFC4 80240BE4 D4223D38 */  ldc1      $f2, %lo(D_80243D38)($at)
 /* A6EFC8 80240BE8 46000021 */  cvt.d.s   $f0, $f0
 /* A6EFCC 80240BEC 4620103C */  c.lt.d    $f2, $f0
 /* A6EFD0 80240BF0 00000000 */  nop       
@@ -84,12 +84,12 @@ glabel func_80240AE4_A6EEC4
 /* A6EFFC 80240C1C 44060000 */  mfc1      $a2, $f0
 /* A6F000 80240C20 0C00A720 */  jal       atan2
 /* A6F004 80240C24 00000000 */   nop      
-/* A6F008 80240C28 3C018024 */  lui       $at, 0x8024
-/* A6F00C 80240C2C D4223D40 */  ldc1      $f2, 0x3d40($at)
+/* A6F008 80240C28 3C018024 */  lui       $at, %hi(D_80243D40)
+/* A6F00C 80240C2C D4223D40 */  ldc1      $f2, %lo(D_80243D40)($at)
 /* A6F010 80240C30 46000021 */  cvt.d.s   $f0, $f0
 /* A6F014 80240C34 46220001 */  sub.d     $f0, $f0, $f2
-/* A6F018 80240C38 3C018024 */  lui       $at, 0x8024
-/* A6F01C 80240C3C D4223D48 */  ldc1      $f2, 0x3d48($at)
+/* A6F018 80240C38 3C018024 */  lui       $at, %hi(D_80243D48)
+/* A6F01C 80240C3C D4223D48 */  ldc1      $f2, %lo(D_80243D48)($at)
 /* A6F020 80240C40 46200020 */  cvt.s.d   $f0, $f0
 /* A6F024 80240C44 46000005 */  abs.s     $f0, $f0
 /* A6F028 80240C48 46000021 */  cvt.d.s   $f0, $f0
@@ -97,8 +97,8 @@ glabel func_80240AE4_A6EEC4
 /* A6F030 80240C50 00000000 */  nop       
 /* A6F034 80240C54 4501000F */  bc1t      .L80240C94
 /* A6F038 80240C58 2402FFFF */   addiu    $v0, $zero, -1
-/* A6F03C 80240C5C 3C038011 */  lui       $v1, 0x8011
-/* A6F040 80240C60 8063EBB3 */  lb        $v1, -0x144d($v1)
+/* A6F03C 80240C5C 3C038011 */  lui       $v1, %hi(D_8010EBB3)
+/* A6F040 80240C60 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
 /* A6F044 80240C64 24020009 */  addiu     $v0, $zero, 9
 /* A6F048 80240C68 10620009 */  beq       $v1, $v0, .L80240C90
 /* A6F04C 80240C6C 24020007 */   addiu    $v0, $zero, 7
diff --git a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80240CB4_A6F094.s b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80240CB4_A6F094.s
index 1282e34bcb..ecc90629a3 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80240CB4_A6F094.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80240CB4_A6F094.s
@@ -60,9 +60,9 @@ glabel func_80240CB4_A6F094
 /* A6F168 80240D88 2C620005 */  sltiu     $v0, $v1, 5
 /* A6F16C 80240D8C 10400101 */  beqz      $v0, .L80241194
 /* A6F170 80240D90 00031080 */   sll      $v0, $v1, 2
-/* A6F174 80240D94 3C018024 */  lui       $at, 0x8024
+/* A6F174 80240D94 3C018024 */  lui       $at, %hi(D_80243D50)
 /* A6F178 80240D98 00220821 */  addu      $at, $at, $v0
-/* A6F17C 80240D9C 8C223D50 */  lw        $v0, 0x3d50($at)
+/* A6F17C 80240D9C 8C223D50 */  lw        $v0, %lo(D_80243D50)($at)
 /* A6F180 80240DA0 00400008 */  jr        $v0
 /* A6F184 80240DA4 00000000 */   nop      
 /* A6F188 80240DA8 3C01C47A */  lui       $at, 0xc47a
@@ -148,8 +148,8 @@ glabel func_80240CB4_A6F094
 /* A6F2C8 80240EE8 44061000 */  mfc1      $a2, $f2
 /* A6F2CC 80240EEC 0C00A720 */  jal       atan2
 /* A6F2D0 80240EF0 00000000 */   nop      
-/* A6F2D4 80240EF4 3C018024 */  lui       $at, 0x8024
-/* A6F2D8 80240EF8 D4223D68 */  ldc1      $f2, 0x3d68($at)
+/* A6F2D4 80240EF4 3C018024 */  lui       $at, %hi(D_80243D68)
+/* A6F2D8 80240EF8 D4223D68 */  ldc1      $f2, %lo(D_80243D68)($at)
 /* A6F2DC 80240EFC 46000021 */  cvt.d.s   $f0, $f0
 /* A6F2E0 80240F00 46220001 */  sub.d     $f0, $f0, $f2
 /* A6F2E4 80240F04 46200020 */  cvt.s.d   $f0, $f0
diff --git a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_8024138C_A6F76C.s b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_8024138C_A6F76C.s
index 23011dfe9b..10c7c7b47f 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_8024138C_A6F76C.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_8024138C_A6F76C.s
@@ -30,8 +30,8 @@ glabel func_8024138C_A6F76C
 /* A6F7D0 802413F0 0260902D */  daddu     $s2, $s3, $zero
 /* A6F7D4 802413F4 8EA400D0 */  lw        $a0, 0xd0($s5)
 /* A6F7D8 802413F8 C6000040 */  lwc1      $f0, 0x40($s0)
-/* A6F7DC 802413FC 3C018024 */  lui       $at, 0x8024
-/* A6F7E0 80241400 D4363D70 */  ldc1      $f22, 0x3d70($at)
+/* A6F7DC 802413FC 3C018024 */  lui       $at, %hi(D_80243D70)
+/* A6F7E0 80241400 D4363D70 */  ldc1      $f22, %lo(D_80243D70)($at)
 /* A6F7E4 80241404 C4820000 */  lwc1      $f2, ($a0)
 /* A6F7E8 80241408 468010A0 */  cvt.s.w   $f2, $f2
 /* A6F7EC 8024140C C4840008 */  lwc1      $f4, 8($a0)
@@ -106,14 +106,14 @@ glabel func_8024138C_A6F76C
 /* A6F8FC 8024151C E600000C */   swc1     $f0, 0xc($s0)
 /* A6F900 80241520 0C00A67F */  jal       rand_int
 /* A6F904 80241524 2404000A */   addiu    $a0, $zero, 0xa
-/* A6F908 80241528 3C018024 */  lui       $at, 0x8024
+/* A6F908 80241528 3C018024 */  lui       $at, %hi(D_80243D78)
 /* A6F90C 8024152C 08090551 */  j         .L80241544
-/* A6F910 80241530 D4203D78 */   ldc1     $f0, 0x3d78($at)
+/* A6F910 80241530 D4203D78 */   ldc1     $f0, %lo(D_80243D78)($at)
 .L80241534:
 /* A6F914 80241534 0C00A67F */  jal       rand_int
 /* A6F918 80241538 2404000A */   addiu    $a0, $zero, 0xa
-/* A6F91C 8024153C 3C018024 */  lui       $at, 0x8024
-/* A6F920 80241540 D4203D80 */  ldc1      $f0, 0x3d80($at)
+/* A6F91C 8024153C 3C018024 */  lui       $at, %hi(D_80243D80)
+/* A6F920 80241540 D4203D80 */  ldc1      $f0, %lo(D_80243D80)($at)
 .L80241544:
 /* A6F924 80241544 44821000 */  mtc1      $v0, $f2
 /* A6F928 80241548 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241870_A6FC50.s b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241870_A6FC50.s
index ccbdfd5c8b..1fa5c8f37c 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241870_A6FC50.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241870_A6FC50.s
@@ -59,8 +59,8 @@ glabel func_80241870_A6FC50
 /* A6FD28 80241948 46800020 */  cvt.s.w   $f0, $f0
 /* A6FD2C 8024194C 46000021 */  cvt.d.s   $f0, $f0
 /* A6FD30 80241950 8602008E */  lh        $v0, 0x8e($s0)
-/* A6FD34 80241954 3C018024 */  lui       $at, 0x8024
-/* A6FD38 80241958 D4343D88 */  ldc1      $f20, 0x3d88($at)
+/* A6FD34 80241954 3C018024 */  lui       $at, %hi(D_80243D88)
+/* A6FD38 80241958 D4343D88 */  ldc1      $f20, %lo(D_80243D88)($at)
 /* A6FD3C 8024195C 44821000 */  mtc1      $v0, $f2
 /* A6FD40 80241960 00000000 */  nop       
 /* A6FD44 80241964 468010A1 */  cvt.d.w   $f2, $f2
@@ -125,8 +125,8 @@ glabel func_80241870_A6FC50
 /* A6FE28 80241A48 00000000 */  nop       
 /* A6FE2C 80241A4C 4500000F */  bc1f      .L80241A8C
 /* A6FE30 80241A50 2402000A */   addiu    $v0, $zero, 0xa
-/* A6FE34 80241A54 3C018024 */  lui       $at, 0x8024
-/* A6FE38 80241A58 D4203D90 */  ldc1      $f0, 0x3d90($at)
+/* A6FE34 80241A54 3C018024 */  lui       $at, %hi(D_80243D90)
+/* A6FE38 80241A58 D4203D90 */  ldc1      $f0, %lo(D_80243D90)($at)
 /* A6FE3C 80241A5C 4620103C */  c.lt.d    $f2, $f0
 /* A6FE40 80241A60 00000000 */  nop       
 /* A6FE44 80241A64 45000008 */  bc1f      .L80241A88
diff --git a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/update_heroes_start_turn_A70404.s b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/update_heroes_start_turn_A70404.s
index 4b168b0b66..61fff01fd8 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/update_heroes_start_turn_A70404.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/update_heroes_start_turn_A70404.s
@@ -86,9 +86,9 @@ glabel update_heroes_start_turn_A70404
 /* A70540 80242160 2C620029 */  sltiu     $v0, $v1, 0x29
 /* A70544 80242164 1040004A */  beqz      $v0, .L80242290
 /* A70548 80242168 00031080 */   sll      $v0, $v1, 2
-/* A7054C 8024216C 3C018024 */  lui       $at, 0x8024
+/* A7054C 8024216C 3C018024 */  lui       $at, %hi(D_80243D98)
 /* A70550 80242170 00220821 */  addu      $at, $at, $v0
-/* A70554 80242174 8C223D98 */  lw        $v0, 0x3d98($at)
+/* A70554 80242174 8C223D98 */  lw        $v0, %lo(D_80243D98)($at)
 /* A70558 80242178 00400008 */  jr        $v0
 /* A7055C 8024217C 00000000 */   nop      
 /* A70560 80242180 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_kpa/kpa_70/A74B80/func_8024038C_A74BFC.s b/asm/nonmatchings/world/area_kpa/kpa_70/A74B80/func_8024038C_A74BFC.s
index 588e1d3fad..d5e2f66a84 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_70/A74B80/func_8024038C_A74BFC.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_70/A74B80/func_8024038C_A74BFC.s
@@ -55,8 +55,8 @@ glabel func_8024038C_A74BFC
 /* A74CB8 80240448 8C470030 */   lw       $a3, 0x30($v0)
 /* A74CBC 8024044C C6020018 */  lwc1      $f2, 0x18($s0)
 /* A74CC0 80240450 46020003 */  div.s     $f0, $f0, $f2
-/* A74CC4 80240454 3C018024 */  lui       $at, 0x8024
-/* A74CC8 80240458 D4223BF0 */  ldc1      $f2, 0x3bf0($at)
+/* A74CC4 80240454 3C018024 */  lui       $at, %hi(D_80243BF0)
+/* A74CC8 80240458 D4223BF0 */  ldc1      $f2, %lo(D_80243BF0)($at)
 /* A74CCC 8024045C 46000021 */  cvt.d.s   $f0, $f0
 /* A74CD0 80240460 46220000 */  add.d     $f0, $f0, $f2
 /* A74CD4 80240464 4620010D */  trunc.w.d $f4, $f0
diff --git a/asm/nonmatchings/world/area_kpa/kpa_70/A74B80/func_802406A4_A74F14.s b/asm/nonmatchings/world/area_kpa/kpa_70/A74B80/func_802406A4_A74F14.s
index 3639a44714..4d69ceb281 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_70/A74B80/func_802406A4_A74F14.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_70/A74B80/func_802406A4_A74F14.s
@@ -279,9 +279,9 @@ glabel func_802406A4_A74F14
 /* A75300 80240A90 2C620015 */  sltiu     $v0, $v1, 0x15
 /* A75304 80240A94 10400009 */  beqz      $v0, .L80240ABC
 /* A75308 80240A98 00031080 */   sll      $v0, $v1, 2
-/* A7530C 80240A9C 3C018024 */  lui       $at, 0x8024
+/* A7530C 80240A9C 3C018024 */  lui       $at, %hi(D_80243BF8)
 /* A75310 80240AA0 00220821 */  addu      $at, $at, $v0
-/* A75314 80240AA4 8C223BF8 */  lw        $v0, 0x3bf8($at)
+/* A75314 80240AA4 8C223BF8 */  lw        $v0, %lo(D_80243BF8)($at)
 /* A75318 80240AA8 00400008 */  jr        $v0
 /* A7531C 80240AAC 00000000 */   nop      
 /* A75320 80240AB0 8E420028 */  lw        $v0, 0x28($s2)
diff --git a/asm/nonmatchings/world/area_kpa/kpa_81/A784C0/func_80240000_A784C0.s b/asm/nonmatchings/world/area_kpa/kpa_81/A784C0/func_80240000_A784C0.s
index 3e51490366..e624c69f06 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_81/A784C0/func_80240000_A784C0.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_81/A784C0/func_80240000_A784C0.s
@@ -3,18 +3,18 @@
 
 glabel func_80240000_A784C0
 /* A784C0 80240000 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* A784C4 80240004 3C04800E */  lui       $a0, 0x800e
-/* A784C8 80240008 24849230 */  addiu     $a0, $a0, -0x6dd0
-/* A784CC 8024000C 3C058024 */  lui       $a1, 0x8024
-/* A784D0 80240010 24A52000 */  addiu     $a1, $a1, 0x2000
+/* A784C4 80240004 3C04800E */  lui       $a0, %hi(D_800D9230)
+/* A784C8 80240008 24849230 */  addiu     $a0, $a0, %lo(D_800D9230)
+/* A784CC 8024000C 3C058024 */  lui       $a1, %hi(D_80242000)
+/* A784D0 80240010 24A52000 */  addiu     $a1, $a1, %lo(D_80242000)
 /* A784D4 80240014 AFBF0010 */  sw        $ra, 0x10($sp)
 /* A784D8 80240018 0C01953C */  jal       sprintf
 /* A784DC 8024001C 00000000 */   nop      
-/* A784E0 80240020 3C04800E */  lui       $a0, 0x800e
-/* A784E4 80240024 248491E0 */  addiu     $a0, $a0, -0x6e20
-/* A784E8 80240028 3C058024 */  lui       $a1, 0x8024
+/* A784E0 80240020 3C04800E */  lui       $a0, %hi(D_800D91E0)
+/* A784E4 80240024 248491E0 */  addiu     $a0, $a0, %lo(D_800D91E0)
+/* A784E8 80240028 3C058024 */  lui       $a1, %hi(D_80242010)
 /* A784EC 8024002C 0C01953C */  jal       sprintf
-/* A784F0 80240030 24A52010 */   addiu    $a1, $a1, 0x2010
+/* A784F0 80240030 24A52010 */   addiu    $a1, $a1, %lo(D_80242010)
 /* A784F4 80240034 8FBF0010 */  lw        $ra, 0x10($sp)
 /* A784F8 80240038 0000102D */  daddu     $v0, $zero, $zero
 /* A784FC 8024003C 03E00008 */  jr        $ra
diff --git a/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_8024027C_A7873C.s b/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_8024027C_A7873C.s
index 724049dc3b..6b9ff760b2 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_8024027C_A7873C.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_8024027C_A7873C.s
@@ -6,11 +6,11 @@ glabel func_8024027C_A7873C
 /* A78740 80240280 AFBF0010 */  sw        $ra, 0x10($sp)
 /* A78744 80240284 10A00003 */  beqz      $a1, .L80240294
 /* A78748 80240288 8C86000C */   lw       $a2, 0xc($a0)
-/* A7874C 8024028C 3C018024 */  lui       $at, 0x8024
-/* A78750 80240290 AC200D98 */  sw        $zero, 0xd98($at)
+/* A7874C 8024028C 3C018024 */  lui       $at, %hi(D_80240D98)
+/* A78750 80240290 AC200D98 */  sw        $zero, %lo(D_80240D98)($at)
 .L80240294:
-/* A78754 80240294 3C038024 */  lui       $v1, 0x8024
-/* A78758 80240298 24630D98 */  addiu     $v1, $v1, 0xd98
+/* A78754 80240294 3C038024 */  lui       $v1, %hi(D_80240D98)
+/* A78758 80240298 24630D98 */  addiu     $v1, $v1, %lo(D_80240D98)
 /* A7875C 8024029C 8C620000 */  lw        $v0, ($v1)
 /* A78760 802402A0 54400003 */  bnel      $v0, $zero, .L802402B0
 /* A78764 802402A4 AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_8024027C_A7873C
 /* A7876C 802402AC 0000102D */   daddu    $v0, $zero, $zero
 .L802402B0:
 /* A78770 802402B0 8CC50000 */  lw        $a1, ($a2)
-/* A78774 802402B4 3C068024 */  lui       $a2, 0x8024
+/* A78774 802402B4 3C068024 */  lui       $a2, %hi(D_80240D9C)
 /* A78778 802402B8 0C0B2026 */  jal       set_variable
-/* A7877C 802402BC 8CC60D9C */   lw       $a2, 0xd9c($a2)
+/* A7877C 802402BC 8CC60D9C */   lw       $a2, %lo(D_80240D9C)($a2)
 /* A78780 802402C0 24020002 */  addiu     $v0, $zero, 2
 .L802402C4:
 /* A78784 802402C4 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_802402D0_A78790.s b/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_802402D0_A78790.s
index d446601a41..1efa66c68f 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_802402D0_A78790.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_802402D0_A78790.s
@@ -7,12 +7,12 @@ glabel func_802402D0_A78790
 /* A78798 802402D8 8C82000C */  lw        $v0, 0xc($a0)
 /* A7879C 802402DC 0C0B1EAF */  jal       get_variable
 /* A787A0 802402E0 8C450000 */   lw       $a1, ($v0)
-/* A787A4 802402E4 3C018024 */  lui       $at, 0x8024
-/* A787A8 802402E8 AC220D9C */  sw        $v0, 0xd9c($at)
+/* A787A4 802402E4 3C018024 */  lui       $at, %hi(D_80240D9C)
+/* A787A8 802402E8 AC220D9C */  sw        $v0, %lo(D_80240D9C)($at)
 /* A787AC 802402EC 24020002 */  addiu     $v0, $zero, 2
 /* A787B0 802402F0 8FBF0010 */  lw        $ra, 0x10($sp)
 /* A787B4 802402F4 24030001 */  addiu     $v1, $zero, 1
-/* A787B8 802402F8 3C018024 */  lui       $at, 0x8024
-/* A787BC 802402FC AC230D98 */  sw        $v1, 0xd98($at)
+/* A787B8 802402F8 3C018024 */  lui       $at, %hi(D_80240D98)
+/* A787BC 802402FC AC230D98 */  sw        $v1, %lo(D_80240D98)($at)
 /* A787C0 80240300 03E00008 */  jr        $ra
 /* A787C4 80240304 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_80240308_A787C8.s b/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_80240308_A787C8.s
index be0bb5e904..cba4307122 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_80240308_A787C8.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_80240308_A787C8.s
@@ -13,8 +13,8 @@ glabel func_80240308_A787C8
 /* A787E8 80240328 8C620000 */  lw        $v0, ($v1)
 /* A787EC 8024032C 5040000A */  beql      $v0, $zero, .L80240358
 /* A787F0 80240330 00041080 */   sll      $v0, $a0, 2
-/* A787F4 80240334 3C058024 */  lui       $a1, 0x8024
-/* A787F8 80240338 24A52040 */  addiu     $a1, $a1, 0x2040
+/* A787F4 80240334 3C058024 */  lui       $a1, %hi(D_80242040)
+/* A787F8 80240338 24A52040 */  addiu     $a1, $a1, %lo(D_80242040)
 .L8024033C:
 /* A787FC 8024033C 24630004 */  addiu     $v1, $v1, 4
 /* A78800 80240340 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_80240308_A787C8
 /* A78810 80240350 24A50004 */   addiu    $a1, $a1, 4
 /* A78814 80240354 00041080 */  sll       $v0, $a0, 2
 .L80240358:
-/* A78818 80240358 3C018024 */  lui       $at, 0x8024
+/* A78818 80240358 3C018024 */  lui       $at, %hi(D_80242040)
 /* A7881C 8024035C 00220821 */  addu      $at, $at, $v0
-/* A78820 80240360 AC202040 */  sw        $zero, 0x2040($at)
+/* A78820 80240360 AC202040 */  sw        $zero, %lo(D_80242040)($at)
 /* A78824 80240364 080900E5 */  j         .L80240394
 /* A78828 80240368 00000000 */   nop      
 .L8024036C:
-/* A7882C 8024036C 3C038024 */  lui       $v1, 0x8024
-/* A78830 80240370 24632040 */  addiu     $v1, $v1, 0x2040
+/* A7882C 8024036C 3C038024 */  lui       $v1, %hi(D_80242040)
+/* A78830 80240370 24632040 */  addiu     $v1, $v1, %lo(D_80242040)
 /* A78834 80240374 0060282D */  daddu     $a1, $v1, $zero
 .L80240378:
 /* A78838 80240378 24820010 */  addiu     $v0, $a0, 0x10
diff --git a/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_802403A4_A78864.s b/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_802403A4_A78864.s
index c304cb5cb3..db2a46d200 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_802403A4_A78864.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_802403A4_A78864.s
@@ -13,8 +13,8 @@ glabel func_802403A4_A78864
 /* A78884 802403C4 8C620000 */  lw        $v0, ($v1)
 /* A78888 802403C8 5040000A */  beql      $v0, $zero, .L802403F4
 /* A7888C 802403CC 00041080 */   sll      $v0, $a0, 2
-/* A78890 802403D0 3C058024 */  lui       $a1, 0x8024
-/* A78894 802403D4 24A52208 */  addiu     $a1, $a1, 0x2208
+/* A78890 802403D0 3C058024 */  lui       $a1, %hi(D_80242208)
+/* A78894 802403D4 24A52208 */  addiu     $a1, $a1, %lo(D_80242208)
 .L802403D8:
 /* A78898 802403D8 24630004 */  addiu     $v1, $v1, 4
 /* A7889C 802403DC 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_802403A4_A78864
 /* A788AC 802403EC 24A50004 */   addiu    $a1, $a1, 4
 /* A788B0 802403F0 00041080 */  sll       $v0, $a0, 2
 .L802403F4:
-/* A788B4 802403F4 3C018024 */  lui       $at, 0x8024
+/* A788B4 802403F4 3C018024 */  lui       $at, %hi(D_80242208)
 /* A788B8 802403F8 00220821 */  addu      $at, $at, $v0
-/* A788BC 802403FC AC202208 */  sw        $zero, 0x2208($at)
+/* A788BC 802403FC AC202208 */  sw        $zero, %lo(D_80242208)($at)
 /* A788C0 80240400 0809010C */  j         .L80240430
 /* A788C4 80240404 00000000 */   nop      
 .L80240408:
-/* A788C8 80240408 3C038024 */  lui       $v1, 0x8024
-/* A788CC 8024040C 24632208 */  addiu     $v1, $v1, 0x2208
+/* A788C8 80240408 3C038024 */  lui       $v1, %hi(D_80242208)
+/* A788CC 8024040C 24632208 */  addiu     $v1, $v1, %lo(D_80242208)
 /* A788D0 80240410 0060282D */  daddu     $a1, $v1, $zero
 .L80240414:
 /* A788D4 80240414 24820080 */  addiu     $v0, $a0, 0x80
diff --git a/asm/nonmatchings/world/area_kpa/kpa_82/A7A500/func_80240000_A7A500.s b/asm/nonmatchings/world/area_kpa/kpa_82/A7A500/func_80240000_A7A500.s
index e8efc05b93..44fcb1ab95 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_82/A7A500/func_80240000_A7A500.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_82/A7A500/func_80240000_A7A500.s
@@ -3,18 +3,18 @@
 
 glabel func_80240000_A7A500
 /* A7A500 80240000 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* A7A504 80240004 3C04800E */  lui       $a0, 0x800e
-/* A7A508 80240008 24849230 */  addiu     $a0, $a0, -0x6dd0
-/* A7A50C 8024000C 3C058025 */  lui       $a1, 0x8025
-/* A7A510 80240010 24A58F60 */  addiu     $a1, $a1, -0x70a0
+/* A7A504 80240004 3C04800E */  lui       $a0, %hi(D_800D9230)
+/* A7A508 80240008 24849230 */  addiu     $a0, $a0, %lo(D_800D9230)
+/* A7A50C 8024000C 3C058025 */  lui       $a1, %hi(D_80248F60)
+/* A7A510 80240010 24A58F60 */  addiu     $a1, $a1, %lo(D_80248F60)
 /* A7A514 80240014 AFBF0010 */  sw        $ra, 0x10($sp)
 /* A7A518 80240018 0C01953C */  jal       sprintf
 /* A7A51C 8024001C 00000000 */   nop      
-/* A7A520 80240020 3C04800E */  lui       $a0, 0x800e
-/* A7A524 80240024 248491E0 */  addiu     $a0, $a0, -0x6e20
-/* A7A528 80240028 3C058025 */  lui       $a1, 0x8025
+/* A7A520 80240020 3C04800E */  lui       $a0, %hi(D_800D91E0)
+/* A7A524 80240024 248491E0 */  addiu     $a0, $a0, %lo(D_800D91E0)
+/* A7A528 80240028 3C058025 */  lui       $a1, %hi(D_80248F70)
 /* A7A52C 8024002C 0C01953C */  jal       sprintf
-/* A7A530 80240030 24A58F70 */   addiu    $a1, $a1, -0x7090
+/* A7A530 80240030 24A58F70 */   addiu    $a1, $a1, %lo(D_80248F70)
 /* A7A534 80240034 8FBF0010 */  lw        $ra, 0x10($sp)
 /* A7A538 80240038 0000102D */  daddu     $v0, $zero, $zero
 /* A7A53C 8024003C 03E00008 */  jr        $ra
diff --git a/asm/nonmatchings/world/area_kpa/kpa_82/A7A550/func_8024027C_A7A77C.s b/asm/nonmatchings/world/area_kpa/kpa_82/A7A550/func_8024027C_A7A77C.s
index 551925ee11..48bd6d28ee 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_82/A7A550/func_8024027C_A7A77C.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_82/A7A550/func_8024027C_A7A77C.s
@@ -6,11 +6,11 @@ glabel func_8024027C_A7A77C
 /* A7A780 80240280 AFBF0010 */  sw        $ra, 0x10($sp)
 /* A7A784 80240284 10A00003 */  beqz      $a1, .L80240294
 /* A7A788 80240288 8C86000C */   lw       $a2, 0xc($a0)
-/* A7A78C 8024028C 3C018024 */  lui       $at, 0x8024
-/* A7A790 80240290 AC200C20 */  sw        $zero, 0xc20($at)
+/* A7A78C 8024028C 3C018024 */  lui       $at, %hi(D_80240C20)
+/* A7A790 80240290 AC200C20 */  sw        $zero, %lo(D_80240C20)($at)
 .L80240294:
-/* A7A794 80240294 3C038024 */  lui       $v1, 0x8024
-/* A7A798 80240298 24630C20 */  addiu     $v1, $v1, 0xc20
+/* A7A794 80240294 3C038024 */  lui       $v1, %hi(D_80240C20)
+/* A7A798 80240298 24630C20 */  addiu     $v1, $v1, %lo(D_80240C20)
 /* A7A79C 8024029C 8C620000 */  lw        $v0, ($v1)
 /* A7A7A0 802402A0 54400003 */  bnel      $v0, $zero, .L802402B0
 /* A7A7A4 802402A4 AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_8024027C_A7A77C
 /* A7A7AC 802402AC 0000102D */   daddu    $v0, $zero, $zero
 .L802402B0:
 /* A7A7B0 802402B0 8CC50000 */  lw        $a1, ($a2)
-/* A7A7B4 802402B4 3C068024 */  lui       $a2, 0x8024
+/* A7A7B4 802402B4 3C068024 */  lui       $a2, %hi(D_80240C24)
 /* A7A7B8 802402B8 0C0B2026 */  jal       set_variable
-/* A7A7BC 802402BC 8CC60C24 */   lw       $a2, 0xc24($a2)
+/* A7A7BC 802402BC 8CC60C24 */   lw       $a2, %lo(D_80240C24)($a2)
 /* A7A7C0 802402C0 24020002 */  addiu     $v0, $zero, 2
 .L802402C4:
 /* A7A7C4 802402C4 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_kpa/kpa_82/A7A550/func_802402D0_A7A7D0.s b/asm/nonmatchings/world/area_kpa/kpa_82/A7A550/func_802402D0_A7A7D0.s
index 42279383f0..ad0848b503 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_82/A7A550/func_802402D0_A7A7D0.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_82/A7A550/func_802402D0_A7A7D0.s
@@ -7,12 +7,12 @@ glabel func_802402D0_A7A7D0
 /* A7A7D8 802402D8 8C82000C */  lw        $v0, 0xc($a0)
 /* A7A7DC 802402DC 0C0B1EAF */  jal       get_variable
 /* A7A7E0 802402E0 8C450000 */   lw       $a1, ($v0)
-/* A7A7E4 802402E4 3C018024 */  lui       $at, 0x8024
-/* A7A7E8 802402E8 AC220C24 */  sw        $v0, 0xc24($at)
+/* A7A7E4 802402E4 3C018024 */  lui       $at, %hi(D_80240C24)
+/* A7A7E8 802402E8 AC220C24 */  sw        $v0, %lo(D_80240C24)($at)
 /* A7A7EC 802402EC 24020002 */  addiu     $v0, $zero, 2
 /* A7A7F0 802402F0 8FBF0010 */  lw        $ra, 0x10($sp)
 /* A7A7F4 802402F4 24030001 */  addiu     $v1, $zero, 1
-/* A7A7F8 802402F8 3C018024 */  lui       $at, 0x8024
-/* A7A7FC 802402FC AC230C20 */  sw        $v1, 0xc20($at)
+/* A7A7F8 802402F8 3C018024 */  lui       $at, %hi(D_80240C20)
+/* A7A7FC 802402FC AC230C20 */  sw        $v1, %lo(D_80240C20)($at)
 /* A7A800 80240300 03E00008 */  jr        $ra
 /* A7A804 80240304 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kpa/kpa_82/A7A550/func_80240308_A7A808.s b/asm/nonmatchings/world/area_kpa/kpa_82/A7A550/func_80240308_A7A808.s
index d18a37d9fb..8f0a134ec7 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_82/A7A550/func_80240308_A7A808.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_82/A7A550/func_80240308_A7A808.s
@@ -13,8 +13,8 @@ glabel func_80240308_A7A808
 /* A7A828 80240328 8C620000 */  lw        $v0, ($v1)
 /* A7A82C 8024032C 5040000A */  beql      $v0, $zero, .L80240358
 /* A7A830 80240330 00041080 */   sll      $v0, $a0, 2
-/* A7A834 80240334 3C058025 */  lui       $a1, 0x8025
-/* A7A838 80240338 24A58F90 */  addiu     $a1, $a1, -0x7070
+/* A7A834 80240334 3C058025 */  lui       $a1, %hi(D_80248F90)
+/* A7A838 80240338 24A58F90 */  addiu     $a1, $a1, %lo(D_80248F90)
 .L8024033C:
 /* A7A83C 8024033C 24630004 */  addiu     $v1, $v1, 4
 /* A7A840 80240340 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_80240308_A7A808
 /* A7A850 80240350 24A50004 */   addiu    $a1, $a1, 4
 /* A7A854 80240354 00041080 */  sll       $v0, $a0, 2
 .L80240358:
-/* A7A858 80240358 3C018025 */  lui       $at, 0x8025
+/* A7A858 80240358 3C018025 */  lui       $at, %hi(D_80248F90)
 /* A7A85C 8024035C 00220821 */  addu      $at, $at, $v0
-/* A7A860 80240360 AC208F90 */  sw        $zero, -0x7070($at)
+/* A7A860 80240360 AC208F90 */  sw        $zero, %lo(D_80248F90)($at)
 /* A7A864 80240364 080900E5 */  j         .L80240394
 /* A7A868 80240368 00000000 */   nop      
 .L8024036C:
-/* A7A86C 8024036C 3C038025 */  lui       $v1, 0x8025
-/* A7A870 80240370 24638F90 */  addiu     $v1, $v1, -0x7070
+/* A7A86C 8024036C 3C038025 */  lui       $v1, %hi(D_80248F90)
+/* A7A870 80240370 24638F90 */  addiu     $v1, $v1, %lo(D_80248F90)
 /* A7A874 80240374 0060282D */  daddu     $a1, $v1, $zero
 .L80240378:
 /* A7A878 80240378 24820010 */  addiu     $v0, $a0, 0x10
diff --git a/asm/nonmatchings/world/area_kpa/kpa_82/A7A550/func_802403A4_A7A8A4.s b/asm/nonmatchings/world/area_kpa/kpa_82/A7A550/func_802403A4_A7A8A4.s
index 96bf6b5484..3f067fbcc5 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_82/A7A550/func_802403A4_A7A8A4.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_82/A7A550/func_802403A4_A7A8A4.s
@@ -13,8 +13,8 @@ glabel func_802403A4_A7A8A4
 /* A7A8C4 802403C4 8C620000 */  lw        $v0, ($v1)
 /* A7A8C8 802403C8 5040000A */  beql      $v0, $zero, .L802403F4
 /* A7A8CC 802403CC 00041080 */   sll      $v0, $a0, 2
-/* A7A8D0 802403D0 3C058025 */  lui       $a1, 0x8025
-/* A7A8D4 802403D4 24A59158 */  addiu     $a1, $a1, -0x6ea8
+/* A7A8D0 802403D0 3C058025 */  lui       $a1, %hi(D_80249158)
+/* A7A8D4 802403D4 24A59158 */  addiu     $a1, $a1, %lo(D_80249158)
 .L802403D8:
 /* A7A8D8 802403D8 24630004 */  addiu     $v1, $v1, 4
 /* A7A8DC 802403DC 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_802403A4_A7A8A4
 /* A7A8EC 802403EC 24A50004 */   addiu    $a1, $a1, 4
 /* A7A8F0 802403F0 00041080 */  sll       $v0, $a0, 2
 .L802403F4:
-/* A7A8F4 802403F4 3C018025 */  lui       $at, 0x8025
+/* A7A8F4 802403F4 3C018025 */  lui       $at, %hi(D_80249158)
 /* A7A8F8 802403F8 00220821 */  addu      $at, $at, $v0
-/* A7A8FC 802403FC AC209158 */  sw        $zero, -0x6ea8($at)
+/* A7A8FC 802403FC AC209158 */  sw        $zero, %lo(D_80249158)($at)
 /* A7A900 80240400 0809010C */  j         .L80240430
 /* A7A904 80240404 00000000 */   nop      
 .L80240408:
-/* A7A908 80240408 3C038025 */  lui       $v1, 0x8025
-/* A7A90C 8024040C 24639158 */  addiu     $v1, $v1, -0x6ea8
+/* A7A908 80240408 3C038025 */  lui       $v1, %hi(D_80249158)
+/* A7A90C 8024040C 24639158 */  addiu     $v1, $v1, %lo(D_80249158)
 /* A7A910 80240410 0060282D */  daddu     $a1, $v1, $zero
 .L80240414:
 /* A7A914 80240414 24820080 */  addiu     $v0, $a0, 0x80
diff --git a/asm/nonmatchings/world/area_kpa/kpa_83/A83490/func_80240000_A83490.s b/asm/nonmatchings/world/area_kpa/kpa_83/A83490/func_80240000_A83490.s
index 86f102f2bf..eb66fc606e 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_83/A83490/func_80240000_A83490.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_83/A83490/func_80240000_A83490.s
@@ -3,18 +3,18 @@
 
 glabel func_80240000_A83490
 /* A83490 80240000 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* A83494 80240004 3C04800E */  lui       $a0, 0x800e
-/* A83498 80240008 24849230 */  addiu     $a0, $a0, -0x6dd0
-/* A8349C 8024000C 3C058024 */  lui       $a1, 0x8024
-/* A834A0 80240010 24A532F0 */  addiu     $a1, $a1, 0x32f0
+/* A83494 80240004 3C04800E */  lui       $a0, %hi(D_800D9230)
+/* A83498 80240008 24849230 */  addiu     $a0, $a0, %lo(D_800D9230)
+/* A8349C 8024000C 3C058024 */  lui       $a1, %hi(D_802432F0)
+/* A834A0 80240010 24A532F0 */  addiu     $a1, $a1, %lo(D_802432F0)
 /* A834A4 80240014 AFBF0010 */  sw        $ra, 0x10($sp)
 /* A834A8 80240018 0C01953C */  jal       sprintf
 /* A834AC 8024001C 00000000 */   nop      
-/* A834B0 80240020 3C04800E */  lui       $a0, 0x800e
-/* A834B4 80240024 248491E0 */  addiu     $a0, $a0, -0x6e20
-/* A834B8 80240028 3C058024 */  lui       $a1, 0x8024
+/* A834B0 80240020 3C04800E */  lui       $a0, %hi(D_800D91E0)
+/* A834B4 80240024 248491E0 */  addiu     $a0, $a0, %lo(D_800D91E0)
+/* A834B8 80240028 3C058024 */  lui       $a1, %hi(D_80243300)
 /* A834BC 8024002C 0C01953C */  jal       sprintf
-/* A834C0 80240030 24A53300 */   addiu    $a1, $a1, 0x3300
+/* A834C0 80240030 24A53300 */   addiu    $a1, $a1, %lo(D_80243300)
 /* A834C4 80240034 8FBF0010 */  lw        $ra, 0x10($sp)
 /* A834C8 80240038 0000102D */  daddu     $v0, $zero, $zero
 /* A834CC 8024003C 03E00008 */  jr        $ra
diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240000_A86A50.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240000_A86A50.s
index 8460e06fac..248901a1bc 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240000_A86A50.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240000_A86A50.s
@@ -69,8 +69,8 @@ glabel func_80240000_A86A50
 /* A86B44 802400F4 08090047 */  j         .L8024011C
 /* A86B48 802400F8 E6800018 */   swc1     $f0, 0x18($s4)
 .L802400FC:
-/* A86B4C 802400FC 3C018024 */  lui       $at, 0x8024
-/* A86B50 80240100 D4225A30 */  ldc1      $f2, 0x5a30($at)
+/* A86B4C 802400FC 3C018024 */  lui       $at, %hi(D_80245A30)
+/* A86B50 80240100 D4225A30 */  ldc1      $f2, %lo(D_80245A30)($at)
 /* A86B54 80240104 44820000 */  mtc1      $v0, $f0
 /* A86B58 80240108 00000000 */  nop       
 /* A86B5C 8024010C 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024067C_A870CC.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024067C_A870CC.s
index 6286a88426..e4dc3c950f 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024067C_A870CC.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024067C_A870CC.s
@@ -33,8 +33,8 @@ glabel func_8024067C_A870CC
 /* A87138 802406E8 080901C4 */  j         .L80240710
 /* A8713C 802406EC E4A00018 */   swc1     $f0, 0x18($a1)
 .L802406F0:
-/* A87140 802406F0 3C018024 */  lui       $at, 0x8024
-/* A87144 802406F4 D4225A38 */  ldc1      $f2, 0x5a38($at)
+/* A87140 802406F0 3C018024 */  lui       $at, %hi(D_80245A38)
+/* A87144 802406F4 D4225A38 */  ldc1      $f2, %lo(D_80245A38)($at)
 /* A87148 802406F8 44820000 */  mtc1      $v0, $f0
 /* A8714C 802406FC 00000000 */  nop       
 /* A87150 80240700 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240B94_A875E4.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240B94_A875E4.s
index 5ca26d0a86..722429269c 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240B94_A875E4.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240B94_A875E4.s
@@ -124,9 +124,9 @@ glabel func_80240B94_A875E4
 /* A877A8 80240D58 2C620064 */  sltiu     $v0, $v1, 0x64
 /* A877AC 80240D5C 10400042 */  beqz      $v0, .L80240E68
 /* A877B0 80240D60 00031080 */   sll      $v0, $v1, 2
-/* A877B4 80240D64 3C018024 */  lui       $at, 0x8024
+/* A877B4 80240D64 3C018024 */  lui       $at, %hi(D_80245A40)
 /* A877B8 80240D68 00220821 */  addu      $at, $at, $v0
-/* A877BC 80240D6C 8C225A40 */  lw        $v0, 0x5a40($at)
+/* A877BC 80240D6C 8C225A40 */  lw        $v0, %lo(D_80245A40)($at)
 /* A877C0 80240D70 00400008 */  jr        $v0
 /* A877C4 80240D74 00000000 */   nop      
 /* A877C8 80240D78 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240F0C_A8795C.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240F0C_A8795C.s
index d2cf09f277..a11cc0e32f 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240F0C_A8795C.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240F0C_A8795C.s
@@ -55,8 +55,8 @@ glabel func_80240F0C_A8795C
 /* A87A18 80240FC8 8C470030 */   lw       $a3, 0x30($v0)
 /* A87A1C 80240FCC C6020018 */  lwc1      $f2, 0x18($s0)
 /* A87A20 80240FD0 46020003 */  div.s     $f0, $f0, $f2
-/* A87A24 80240FD4 3C018024 */  lui       $at, 0x8024
-/* A87A28 80240FD8 D4225BD0 */  ldc1      $f2, 0x5bd0($at)
+/* A87A24 80240FD4 3C018024 */  lui       $at, %hi(D_80245BD0)
+/* A87A28 80240FD8 D4225BD0 */  ldc1      $f2, %lo(D_80245BD0)($at)
 /* A87A2C 80240FDC 46000021 */  cvt.d.s   $f0, $f0
 /* A87A30 80240FE0 46220000 */  add.d     $f0, $f0, $f2
 /* A87A34 80240FE4 4620010D */  trunc.w.d $f4, $f0
diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241224_A87C74.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241224_A87C74.s
index b5090ccd23..cf7169242b 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241224_A87C74.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241224_A87C74.s
@@ -134,9 +134,9 @@ glabel func_80241224_A87C74
 /* A87E60 80241410 2C620064 */  sltiu     $v0, $v1, 0x64
 /* A87E64 80241414 1040003A */  beqz      $v0, .L80241500
 /* A87E68 80241418 00031080 */   sll      $v0, $v1, 2
-/* A87E6C 8024141C 3C018024 */  lui       $at, 0x8024
+/* A87E6C 8024141C 3C018024 */  lui       $at, %hi(D_80245BD8)
 /* A87E70 80241420 00220821 */  addu      $at, $at, $v0
-/* A87E74 80241424 8C225BD8 */  lw        $v0, 0x5bd8($at)
+/* A87E74 80241424 8C225BD8 */  lw        $v0, %lo(D_80245BD8)($at)
 /* A87E78 80241428 00400008 */  jr        $v0
 /* A87E7C 8024142C 00000000 */   nop      
 /* A87E80 80241430 0260202D */  daddu     $a0, $s3, $zero
diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802415EC_A8803C.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802415EC_A8803C.s
index 08042452f7..4d60a1ad57 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802415EC_A8803C.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802415EC_A8803C.s
@@ -26,9 +26,9 @@ glabel func_802415EC_A8803C
 /* A88090 80241640 000320C0 */  sll       $a0, $v1, 3
 /* A88094 80241644 00641821 */  addu      $v1, $v1, $a0
 /* A88098 80241648 000318C0 */  sll       $v1, $v1, 3
-/* A8809C 8024164C 3C01800B */  lui       $at, 0x800b
+/* A8809C 8024164C 3C01800B */  lui       $at, %hi(D_800B1D98)
 /* A880A0 80241650 00230821 */  addu      $at, $at, $v1
-/* A880A4 80241654 E4201D98 */  swc1      $f0, 0x1d98($at)
+/* A880A4 80241654 E4201D98 */  swc1      $f0, %lo(D_800B1D98)($at)
 /* A880A8 80241658 8FBF0018 */  lw        $ra, 0x18($sp)
 /* A880AC 8024165C 8FB10014 */  lw        $s1, 0x14($sp)
 /* A880B0 80241660 8FB00010 */  lw        $s0, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802400E0_A8CB60.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802400E0_A8CB60.s
index 75f5ffbddd..f6076ed4ee 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802400E0_A8CB60.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802400E0_A8CB60.s
@@ -69,8 +69,8 @@ glabel func_802400E0_A8CB60
 /* A8CC54 802401D4 0809007F */  j         .L802401FC
 /* A8CC58 802401D8 E6800018 */   swc1     $f0, 0x18($s4)
 .L802401DC:
-/* A8CC5C 802401DC 3C018024 */  lui       $at, 0x8024
-/* A8CC60 802401E0 D4225A00 */  ldc1      $f2, 0x5a00($at)
+/* A8CC5C 802401DC 3C018024 */  lui       $at, %hi(D_80245A00)
+/* A8CC60 802401E0 D4225A00 */  ldc1      $f2, %lo(D_80245A00)($at)
 /* A8CC64 802401E4 44820000 */  mtc1      $v0, $f0
 /* A8CC68 802401E8 00000000 */  nop       
 /* A8CC6C 802401EC 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_8024075C_A8D1DC.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_8024075C_A8D1DC.s
index b708c88021..fb440bb1b1 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_8024075C_A8D1DC.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_8024075C_A8D1DC.s
@@ -33,8 +33,8 @@ glabel func_8024075C_A8D1DC
 /* A8D248 802407C8 080901FC */  j         .L802407F0
 /* A8D24C 802407CC E4A00018 */   swc1     $f0, 0x18($a1)
 .L802407D0:
-/* A8D250 802407D0 3C018024 */  lui       $at, 0x8024
-/* A8D254 802407D4 D4225A08 */  ldc1      $f2, 0x5a08($at)
+/* A8D250 802407D0 3C018024 */  lui       $at, %hi(D_80245A08)
+/* A8D254 802407D4 D4225A08 */  ldc1      $f2, %lo(D_80245A08)($at)
 /* A8D258 802407D8 44820000 */  mtc1      $v0, $f0
 /* A8D25C 802407DC 00000000 */  nop       
 /* A8D260 802407E0 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240C74_A8D6F4.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240C74_A8D6F4.s
index aff86105af..2d4cc274df 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240C74_A8D6F4.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240C74_A8D6F4.s
@@ -124,9 +124,9 @@ glabel func_80240C74_A8D6F4
 /* A8D8B8 80240E38 2C620064 */  sltiu     $v0, $v1, 0x64
 /* A8D8BC 80240E3C 10400042 */  beqz      $v0, .L80240F48
 /* A8D8C0 80240E40 00031080 */   sll      $v0, $v1, 2
-/* A8D8C4 80240E44 3C018024 */  lui       $at, 0x8024
+/* A8D8C4 80240E44 3C018024 */  lui       $at, %hi(D_80245A10)
 /* A8D8C8 80240E48 00220821 */  addu      $at, $at, $v0
-/* A8D8CC 80240E4C 8C225A10 */  lw        $v0, 0x5a10($at)
+/* A8D8CC 80240E4C 8C225A10 */  lw        $v0, %lo(D_80245A10)($at)
 /* A8D8D0 80240E50 00400008 */  jr        $v0
 /* A8D8D4 80240E54 00000000 */   nop      
 /* A8D8D8 80240E58 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240FEC_A8DA6C.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240FEC_A8DA6C.s
index a68164b026..72c8497433 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240FEC_A8DA6C.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240FEC_A8DA6C.s
@@ -55,8 +55,8 @@ glabel func_80240FEC_A8DA6C
 /* A8DB28 802410A8 8C470030 */   lw       $a3, 0x30($v0)
 /* A8DB2C 802410AC C6020018 */  lwc1      $f2, 0x18($s0)
 /* A8DB30 802410B0 46020003 */  div.s     $f0, $f0, $f2
-/* A8DB34 802410B4 3C018024 */  lui       $at, 0x8024
-/* A8DB38 802410B8 D4225BA0 */  ldc1      $f2, 0x5ba0($at)
+/* A8DB34 802410B4 3C018024 */  lui       $at, %hi(D_80245BA0)
+/* A8DB38 802410B8 D4225BA0 */  ldc1      $f2, %lo(D_80245BA0)($at)
 /* A8DB3C 802410BC 46000021 */  cvt.d.s   $f0, $f0
 /* A8DB40 802410C0 46220000 */  add.d     $f0, $f0, $f2
 /* A8DB44 802410C4 4620010D */  trunc.w.d $f4, $f0
diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241304_A8DD84.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241304_A8DD84.s
index 48cec3e51f..062e08714e 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241304_A8DD84.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241304_A8DD84.s
@@ -134,9 +134,9 @@ glabel func_80241304_A8DD84
 /* A8DF70 802414F0 2C620064 */  sltiu     $v0, $v1, 0x64
 /* A8DF74 802414F4 1040003A */  beqz      $v0, .L802415E0
 /* A8DF78 802414F8 00031080 */   sll      $v0, $v1, 2
-/* A8DF7C 802414FC 3C018024 */  lui       $at, 0x8024
+/* A8DF7C 802414FC 3C018024 */  lui       $at, %hi(D_80245BA8)
 /* A8DF80 80241500 00220821 */  addu      $at, $at, $v0
-/* A8DF84 80241504 8C225BA8 */  lw        $v0, 0x5ba8($at)
+/* A8DF84 80241504 8C225BA8 */  lw        $v0, %lo(D_80245BA8)($at)
 /* A8DF88 80241508 00400008 */  jr        $v0
 /* A8DF8C 8024150C 00000000 */   nop      
 /* A8DF90 80241510 0260202D */  daddu     $a0, $s3, $zero
diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802416CC_A8E14C.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802416CC_A8E14C.s
index 545ea9f8cc..dd2bc3c826 100644
--- a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802416CC_A8E14C.s
+++ b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802416CC_A8E14C.s
@@ -26,9 +26,9 @@ glabel func_802416CC_A8E14C
 /* A8E1A0 80241720 000320C0 */  sll       $a0, $v1, 3
 /* A8E1A4 80241724 00641821 */  addu      $v1, $v1, $a0
 /* A8E1A8 80241728 000318C0 */  sll       $v1, $v1, 3
-/* A8E1AC 8024172C 3C01800B */  lui       $at, 0x800b
+/* A8E1AC 8024172C 3C01800B */  lui       $at, %hi(D_800B1D98)
 /* A8E1B0 80241730 00230821 */  addu      $at, $at, $v1
-/* A8E1B4 80241734 E4201D98 */  swc1      $f0, 0x1d98($at)
+/* A8E1B4 80241734 E4201D98 */  swc1      $f0, %lo(D_800B1D98)($at)
 /* A8E1B8 80241738 8FBF0018 */  lw        $ra, 0x18($sp)
 /* A8E1BC 8024173C 8FB10014 */  lw        $s1, 0x14($sp)
 /* A8E1C0 80241740 8FB00010 */  lw        $s0, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AA50/func_802403B0_C5AAF0.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AA50/func_802403B0_C5AAF0.s
index 3dfd0cd25d..cb01327373 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_02/C5AA50/func_802403B0_C5AAF0.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_02/C5AA50/func_802403B0_C5AAF0.s
@@ -5,8 +5,8 @@ glabel func_802403B0_C5AAF0
 /* C5AAF0 802403B0 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* C5AAF4 802403B4 AFBF0010 */  sw        $ra, 0x10($sp)
 /* C5AAF8 802403B8 8C82000C */  lw        $v0, 0xc($a0)
-/* C5AAFC 802403BC 3C068011 */  lui       $a2, 0x8011
-/* C5AB00 802403C0 80C6EBB3 */  lb        $a2, -0x144d($a2)
+/* C5AAFC 802403BC 3C068011 */  lui       $a2, %hi(D_8010EBB3)
+/* C5AB00 802403C0 80C6EBB3 */  lb        $a2, %lo(D_8010EBB3)($a2)
 /* C5AB04 802403C4 0C0B2026 */  jal       set_variable
 /* C5AB08 802403C8 8C450000 */   lw       $a1, ($v0)
 /* C5AB0C 802403CC 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802404E0_C5AC20.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802404E0_C5AC20.s
index 2660b4c8ab..2f58782aa5 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802404E0_C5AC20.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802404E0_C5AC20.s
@@ -87,8 +87,8 @@ glabel func_802404E0_C5AC20
 /* C5AD60 80240620 08090192 */  j         .L80240648
 /* C5AD64 80240624 E6000018 */   swc1     $f0, 0x18($s0)
 .L80240628:
-/* C5AD68 80240628 3C018024 */  lui       $at, 0x8024
-/* C5AD6C 8024062C D4226500 */  ldc1      $f2, 0x6500($at)
+/* C5AD68 80240628 3C018024 */  lui       $at, %hi(D_80246500)
+/* C5AD6C 8024062C D4226500 */  ldc1      $f2, %lo(D_80246500)($at)
 /* C5AD70 80240630 44820000 */  mtc1      $v0, $f0
 /* C5AD74 80240634 00000000 */  nop       
 /* C5AD78 80240638 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80240690_C5ADD0.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80240690_C5ADD0.s
index fcc6eda0b8..46ece87a98 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80240690_C5ADD0.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80240690_C5ADD0.s
@@ -104,8 +104,8 @@ glabel func_80240690_C5ADD0
 /* C5AF54 80240814 1040000A */  beqz      $v0, .L80240840
 /* C5AF58 80240818 4600C106 */   mov.s    $f4, $f24
 /* C5AF5C 8024081C 4614C081 */  sub.s     $f2, $f24, $f20
-/* C5AF60 80240820 3C018024 */  lui       $at, 0x8024
-/* C5AF64 80240824 D4206508 */  ldc1      $f0, 0x6508($at)
+/* C5AF60 80240820 3C018024 */  lui       $at, %hi(D_80246508)
+/* C5AF64 80240824 D4206508 */  ldc1      $f0, %lo(D_80246508)($at)
 /* C5AF68 80240828 460010A1 */  cvt.d.s   $f2, $f2
 /* C5AF6C 8024082C 46201082 */  mul.d     $f2, $f2, $f0
 /* C5AF70 80240830 00000000 */  nop       
@@ -131,8 +131,8 @@ glabel func_80240690_C5ADD0
 /* C5AFBC 8024087C C7A4002C */  lwc1      $f4, 0x2c($sp)
 /* C5AFC0 80240880 461A2100 */  add.s     $f4, $f4, $f26
 /* C5AFC4 80240884 46142081 */  sub.s     $f2, $f4, $f20
-/* C5AFC8 80240888 3C018024 */  lui       $at, 0x8024
-/* C5AFCC 8024088C D4206510 */  ldc1      $f0, 0x6510($at)
+/* C5AFC8 80240888 3C018024 */  lui       $at, %hi(D_80246510)
+/* C5AFCC 8024088C D4206510 */  ldc1      $f0, %lo(D_80246510)($at)
 /* C5AFD0 80240890 460010A1 */  cvt.d.s   $f2, $f2
 /* C5AFD4 80240894 46201082 */  mul.d     $f2, $f2, $f0
 /* C5AFD8 80240898 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241134_C5B874.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241134_C5B874.s
index 1809f03279..ea03b8f16e 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241134_C5B874.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241134_C5B874.s
@@ -15,9 +15,9 @@ glabel func_80241134_C5B874
 /* C5B89C 8024115C 00031C00 */  sll       $v1, $v1, 0x10
 /* C5B8A0 80241160 00031B83 */  sra       $v1, $v1, 0xe
 /* C5B8A4 80241164 A444008E */  sh        $a0, 0x8e($v0)
-/* C5B8A8 80241168 3C018024 */  lui       $at, 0x8024
+/* C5B8A8 80241168 3C018024 */  lui       $at, %hi(D_80244900)
 /* C5B8AC 8024116C 00230821 */  addu      $at, $at, $v1
-/* C5B8B0 80241170 C4224900 */  lwc1      $f2, 0x4900($at)
+/* C5B8B0 80241170 C4224900 */  lwc1      $f2, %lo(D_80244900)($at)
 /* C5B8B4 80241174 8443008E */  lh        $v1, 0x8e($v0)
 /* C5B8B8 80241178 46020000 */  add.s     $f0, $f0, $f2
 /* C5B8BC 8024117C 28630005 */  slti      $v1, $v1, 5
diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802417EC_C5BF2C.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802417EC_C5BF2C.s
index b61a2c2a90..a3ad5b322f 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802417EC_C5BF2C.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802417EC_C5BF2C.s
@@ -66,9 +66,9 @@ glabel func_802417EC_C5BF2C
 /* C5C018 802418D8 2C62000F */  sltiu     $v0, $v1, 0xf
 /* C5C01C 802418DC 10400034 */  beqz      $v0, .L802419B0
 /* C5C020 802418E0 00031080 */   sll      $v0, $v1, 2
-/* C5C024 802418E4 3C018024 */  lui       $at, 0x8024
+/* C5C024 802418E4 3C018024 */  lui       $at, %hi(D_80246518)
 /* C5C028 802418E8 00220821 */  addu      $at, $at, $v0
-/* C5C02C 802418EC 8C226518 */  lw        $v0, 0x6518($at)
+/* C5C02C 802418EC 8C226518 */  lw        $v0, %lo(D_80246518)($at)
 /* C5C030 802418F0 00400008 */  jr        $v0
 /* C5C034 802418F4 00000000 */   nop      
 /* C5C038 802418F8 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241B08_C5C248.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241B08_C5C248.s
index 2650827a32..a11a12ac1d 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241B08_C5C248.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241B08_C5C248.s
@@ -142,8 +142,8 @@ glabel func_80241B08_C5C248
 /* C5C460 80241D20 4500000A */  bc1f      .L80241D4C
 /* C5C464 80241D24 00000000 */   nop      
 .L80241D28:
-/* C5C468 80241D28 3C018024 */  lui       $at, 0x8024
-/* C5C46C 80241D2C D4226558 */  ldc1      $f2, 0x6558($at)
+/* C5C468 80241D28 3C018024 */  lui       $at, %hi(D_80246558)
+/* C5C46C 80241D2C D4226558 */  ldc1      $f2, %lo(D_80246558)($at)
 /* C5C470 80241D30 46003187 */  neg.s     $f6, $f6
 /* C5C474 80241D34 46003021 */  cvt.d.s   $f0, $f6
 /* C5C478 80241D38 46220002 */  mul.d     $f0, $f0, $f2
diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241DE4_C5C524.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241DE4_C5C524.s
index b29db4a384..271d7b6368 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241DE4_C5C524.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241DE4_C5C524.s
@@ -67,9 +67,9 @@ glabel func_80241DE4_C5C524
 /* C5C614 80241ED4 2C620015 */  sltiu     $v0, $v1, 0x15
 /* C5C618 80241ED8 10400032 */  beqz      $v0, .L80241FA4
 /* C5C61C 80241EDC 00031080 */   sll      $v0, $v1, 2
-/* C5C620 80241EE0 3C018024 */  lui       $at, 0x8024
+/* C5C620 80241EE0 3C018024 */  lui       $at, %hi(D_80246560)
 /* C5C624 80241EE4 00220821 */  addu      $at, $at, $v0
-/* C5C628 80241EE8 8C226560 */  lw        $v0, 0x6560($at)
+/* C5C628 80241EE8 8C226560 */  lw        $v0, %lo(D_80246560)($at)
 /* C5C62C 80241EEC 00400008 */  jr        $v0
 /* C5C630 80241EF0 00000000 */   nop      
 /* C5C634 80241EF4 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241FCC_C5C70C.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241FCC_C5C70C.s
index 94c92b769e..fa94f9ca4f 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241FCC_C5C70C.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241FCC_C5C70C.s
@@ -4,8 +4,8 @@
 glabel func_80241FCC_C5C70C
 /* C5C70C 80241FCC 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* C5C710 80241FD0 AFB00010 */  sw        $s0, 0x10($sp)
-/* C5C714 80241FD4 3C108024 */  lui       $s0, 0x8024
-/* C5C718 80241FD8 26104A10 */  addiu     $s0, $s0, 0x4a10
+/* C5C714 80241FD4 3C108024 */  lui       $s0, %hi(D_80244A10)
+/* C5C718 80241FD8 26104A10 */  addiu     $s0, $s0, %lo(D_80244A10)
 /* C5C71C 80241FDC AFBF0018 */  sw        $ra, 0x18($sp)
 /* C5C720 80241FE0 AFB10014 */  sw        $s1, 0x14($sp)
 /* C5C724 80241FE4 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_80241FCC_C5C70C
 /* C5C788 80242048 28620010 */  slti      $v0, $v1, 0x10
 /* C5C78C 8024204C 1440FFFA */  bnez      $v0, .L80242038
 /* C5C790 80242050 24840004 */   addiu    $a0, $a0, 4
-/* C5C794 80242054 3C108024 */  lui       $s0, 0x8024
-/* C5C798 80242058 26104A10 */  addiu     $s0, $s0, 0x4a10
+/* C5C794 80242054 3C108024 */  lui       $s0, %hi(D_80244A10)
+/* C5C798 80242058 26104A10 */  addiu     $s0, $s0, %lo(D_80244A10)
 /* C5C79C 8024205C 0C00AB4B */  jal       heap_free
 /* C5C7A0 80242060 8E040000 */   lw       $a0, ($s0)
 /* C5C7A4 80242064 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80242310_C5CA50.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80242310_C5CA50.s
index dc8ee30192..6a905025e1 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80242310_C5CA50.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80242310_C5CA50.s
@@ -6,11 +6,11 @@ glabel func_80242310_C5CA50
 /* C5CA54 80242314 AFBF0010 */  sw        $ra, 0x10($sp)
 /* C5CA58 80242318 10A00003 */  beqz      $a1, .L80242328
 /* C5CA5C 8024231C 8C86000C */   lw       $a2, 0xc($a0)
-/* C5CA60 80242320 3C018024 */  lui       $at, 0x8024
-/* C5CA64 80242324 AC204A74 */  sw        $zero, 0x4a74($at)
+/* C5CA60 80242320 3C018024 */  lui       $at, %hi(D_80244A74)
+/* C5CA64 80242324 AC204A74 */  sw        $zero, %lo(D_80244A74)($at)
 .L80242328:
-/* C5CA68 80242328 3C038024 */  lui       $v1, 0x8024
-/* C5CA6C 8024232C 24634A74 */  addiu     $v1, $v1, 0x4a74
+/* C5CA68 80242328 3C038024 */  lui       $v1, %hi(D_80244A74)
+/* C5CA6C 8024232C 24634A74 */  addiu     $v1, $v1, %lo(D_80244A74)
 /* C5CA70 80242330 8C620000 */  lw        $v0, ($v1)
 /* C5CA74 80242334 54400003 */  bnel      $v0, $zero, .L80242344
 /* C5CA78 80242338 AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_80242310_C5CA50
 /* C5CA80 80242340 0000102D */   daddu    $v0, $zero, $zero
 .L80242344:
 /* C5CA84 80242344 8CC50000 */  lw        $a1, ($a2)
-/* C5CA88 80242348 3C068024 */  lui       $a2, 0x8024
+/* C5CA88 80242348 3C068024 */  lui       $a2, %hi(D_80244A78)
 /* C5CA8C 8024234C 0C0B2026 */  jal       set_variable
-/* C5CA90 80242350 8CC64A78 */   lw       $a2, 0x4a78($a2)
+/* C5CA90 80242350 8CC64A78 */   lw       $a2, %lo(D_80244A78)($a2)
 /* C5CA94 80242354 24020002 */  addiu     $v0, $zero, 2
 .L80242358:
 /* C5CA98 80242358 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80242364_C5CAA4.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80242364_C5CAA4.s
index 6904d78db6..9b8a726768 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80242364_C5CAA4.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80242364_C5CAA4.s
@@ -7,12 +7,12 @@ glabel func_80242364_C5CAA4
 /* C5CAAC 8024236C 8C82000C */  lw        $v0, 0xc($a0)
 /* C5CAB0 80242370 0C0B1EAF */  jal       get_variable
 /* C5CAB4 80242374 8C450000 */   lw       $a1, ($v0)
-/* C5CAB8 80242378 3C018024 */  lui       $at, 0x8024
-/* C5CABC 8024237C AC224A78 */  sw        $v0, 0x4a78($at)
+/* C5CAB8 80242378 3C018024 */  lui       $at, %hi(D_80244A78)
+/* C5CABC 8024237C AC224A78 */  sw        $v0, %lo(D_80244A78)($at)
 /* C5CAC0 80242380 24020002 */  addiu     $v0, $zero, 2
 /* C5CAC4 80242384 8FBF0010 */  lw        $ra, 0x10($sp)
 /* C5CAC8 80242388 24030001 */  addiu     $v1, $zero, 1
-/* C5CACC 8024238C 3C018024 */  lui       $at, 0x8024
-/* C5CAD0 80242390 AC234A74 */  sw        $v1, 0x4a74($at)
+/* C5CACC 8024238C 3C018024 */  lui       $at, %hi(D_80244A74)
+/* C5CAD0 80242390 AC234A74 */  sw        $v1, %lo(D_80244A74)($at)
 /* C5CAD4 80242394 03E00008 */  jr        $ra
 /* C5CAD8 80242398 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_8024239C_C5CADC.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_8024239C_C5CADC.s
index 2a97b668f3..7991591d22 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_8024239C_C5CADC.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_8024239C_C5CADC.s
@@ -13,8 +13,8 @@ glabel func_8024239C_C5CADC
 /* C5CAFC 802423BC 8C620000 */  lw        $v0, ($v1)
 /* C5CB00 802423C0 5040000A */  beql      $v0, $zero, .L802423EC
 /* C5CB04 802423C4 00041080 */   sll      $v0, $a0, 2
-/* C5CB08 802423C8 3C058024 */  lui       $a1, 0x8024
-/* C5CB0C 802423CC 24A565D0 */  addiu     $a1, $a1, 0x65d0
+/* C5CB08 802423C8 3C058024 */  lui       $a1, %hi(D_802465D0)
+/* C5CB0C 802423CC 24A565D0 */  addiu     $a1, $a1, %lo(D_802465D0)
 .L802423D0:
 /* C5CB10 802423D0 24630004 */  addiu     $v1, $v1, 4
 /* C5CB14 802423D4 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_8024239C_C5CADC
 /* C5CB24 802423E4 24A50004 */   addiu    $a1, $a1, 4
 /* C5CB28 802423E8 00041080 */  sll       $v0, $a0, 2
 .L802423EC:
-/* C5CB2C 802423EC 3C018024 */  lui       $at, 0x8024
+/* C5CB2C 802423EC 3C018024 */  lui       $at, %hi(D_802465D0)
 /* C5CB30 802423F0 00220821 */  addu      $at, $at, $v0
-/* C5CB34 802423F4 AC2065D0 */  sw        $zero, 0x65d0($at)
+/* C5CB34 802423F4 AC2065D0 */  sw        $zero, %lo(D_802465D0)($at)
 /* C5CB38 802423F8 0809090A */  j         .L80242428
 /* C5CB3C 802423FC 00000000 */   nop      
 .L80242400:
-/* C5CB40 80242400 3C038024 */  lui       $v1, 0x8024
-/* C5CB44 80242404 246365D0 */  addiu     $v1, $v1, 0x65d0
+/* C5CB40 80242400 3C038024 */  lui       $v1, %hi(D_802465D0)
+/* C5CB44 80242404 246365D0 */  addiu     $v1, $v1, %lo(D_802465D0)
 /* C5CB48 80242408 0060282D */  daddu     $a1, $v1, $zero
 .L8024240C:
 /* C5CB4C 8024240C 24820010 */  addiu     $v0, $a0, 0x10
diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802426B4_C5CDF4.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802426B4_C5CDF4.s
index 980df4c1eb..88f25e1866 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802426B4_C5CDF4.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802426B4_C5CDF4.s
@@ -15,7 +15,7 @@ glabel func_802426B4_C5CDF4
 /* C5CE1C 802426DC 8FBF0014 */  lw        $ra, 0x14($sp)
 /* C5CE20 802426E0 8FB00010 */  lw        $s0, 0x10($sp)
 /* C5CE24 802426E4 24020002 */  addiu     $v0, $zero, 2
-/* C5CE28 802426E8 3C018024 */  lui       $at, 0x8024
-/* C5CE2C 802426EC AC236794 */  sw        $v1, 0x6794($at)
+/* C5CE28 802426E8 3C018024 */  lui       $at, %hi(D_80246794)
+/* C5CE2C 802426EC AC236794 */  sw        $v1, %lo(D_80246794)($at)
 /* C5CE30 802426F0 03E00008 */  jr        $ra
 /* C5CE34 802426F4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802426F8_C5CE38.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802426F8_C5CE38.s
index 0ed28e4e81..967031be99 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802426F8_C5CE38.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802426F8_C5CE38.s
@@ -6,8 +6,8 @@ glabel func_802426F8_C5CE38
 /* C5CE3C 802426FC AFBF0010 */  sw        $ra, 0x10($sp)
 /* C5CE40 80242700 0C00EABB */  jal       get_npc_unsafe
 /* C5CE44 80242704 8C84008C */   lw       $a0, 0x8c($a0)
-/* C5CE48 80242708 3C038024 */  lui       $v1, 0x8024
-/* C5CE4C 8024270C 8C636794 */  lw        $v1, 0x6794($v1)
+/* C5CE48 80242708 3C038024 */  lui       $v1, %hi(D_80246794)
+/* C5CE4C 8024270C 8C636794 */  lw        $v1, %lo(D_80246794)($v1)
 /* C5CE50 80242710 AC430028 */  sw        $v1, 0x28($v0)
 /* C5CE54 80242714 8FBF0010 */  lw        $ra, 0x10($sp)
 /* C5CE58 80242718 24020002 */  addiu     $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5CE70/func_80242730_C5CE70.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5CE70/func_80242730_C5CE70.s
index def45d9b64..6920e6fb4d 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_02/C5CE70/func_80242730_C5CE70.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_02/C5CE70/func_80242730_C5CE70.s
@@ -3,8 +3,8 @@
 
 glabel func_80242730_C5CE70
 /* C5CE70 80242730 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* C5CE74 80242734 3C048024 */  lui       $a0, 0x8024
-/* C5CE78 80242738 248464A4 */  addiu     $a0, $a0, 0x64a4
+/* C5CE74 80242734 3C048024 */  lui       $a0, %hi(D_802464A4)
+/* C5CE78 80242738 248464A4 */  addiu     $a0, $a0, %lo(D_802464A4)
 /* C5CE7C 8024273C AFBF0018 */  sw        $ra, 0x18($sp)
 /* C5CE80 80242740 AFB10014 */  sw        $s1, 0x14($sp)
 /* C5CE84 80242744 AFB00010 */  sw        $s0, 0x10($sp)
@@ -34,8 +34,8 @@ glabel func_80242730_C5CE70
 /* C5CED8 80242798 08090A01 */  j         .L80242804
 /* C5CEDC 8024279C AC820000 */   sw       $v0, ($a0)
 .L802427A0:
-/* C5CEE0 802427A0 3C108011 */  lui       $s0, 0x8011
-/* C5CEE4 802427A4 2610C930 */  addiu     $s0, $s0, -0x36d0
+/* C5CEE0 802427A0 3C108011 */  lui       $s0, %hi(D_8010C930)
+/* C5CEE4 802427A4 2610C930 */  addiu     $s0, $s0, %lo(D_8010C930)
 /* C5CEE8 802427A8 0C03BD17 */  jal       clear_partner_move_history
 /* C5CEEC 802427AC 8E040000 */   lw       $a0, ($s0)
 /* C5CEF0 802427B0 C6200028 */  lwc1      $f0, 0x28($s1)
diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_8024038C_C6109C.s b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_8024038C_C6109C.s
index 0be5825a43..9780eaf910 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_8024038C_C6109C.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_8024038C_C6109C.s
@@ -55,8 +55,8 @@ glabel func_8024038C_C6109C
 /* C61158 80240448 8C470030 */   lw       $a3, 0x30($v0)
 /* C6115C 8024044C C6020018 */  lwc1      $f2, 0x18($s0)
 /* C61160 80240450 46020003 */  div.s     $f0, $f0, $f2
-/* C61164 80240454 3C018024 */  lui       $at, 0x8024
-/* C61168 80240458 D42271E0 */  ldc1      $f2, 0x71e0($at)
+/* C61164 80240454 3C018024 */  lui       $at, %hi(D_802471E0)
+/* C61168 80240458 D42271E0 */  ldc1      $f2, %lo(D_802471E0)($at)
 /* C6116C 8024045C 46000021 */  cvt.d.s   $f0, $f0
 /* C61170 80240460 46220000 */  add.d     $f0, $f0, $f2
 /* C61174 80240464 4620010D */  trunc.w.d $f4, $f0
diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_802406A4_C613B4.s b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_802406A4_C613B4.s
index c8695264ca..e14eb6187b 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_802406A4_C613B4.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_802406A4_C613B4.s
@@ -279,9 +279,9 @@ glabel func_802406A4_C613B4
 /* C617A0 80240A90 2C620015 */  sltiu     $v0, $v1, 0x15
 /* C617A4 80240A94 10400009 */  beqz      $v0, .L80240ABC
 /* C617A8 80240A98 00031080 */   sll      $v0, $v1, 2
-/* C617AC 80240A9C 3C018024 */  lui       $at, 0x8024
+/* C617AC 80240A9C 3C018024 */  lui       $at, %hi(D_802471E8)
 /* C617B0 80240AA0 00220821 */  addu      $at, $at, $v0
-/* C617B4 80240AA4 8C2271E8 */  lw        $v0, 0x71e8($at)
+/* C617B4 80240AA4 8C2271E8 */  lw        $v0, %lo(D_802471E8)($at)
 /* C617B8 80240AA8 00400008 */  jr        $v0
 /* C617BC 80240AAC 00000000 */   nop      
 /* C617C0 80240AB0 8E420028 */  lw        $v0, 0x28($s2)
diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80240E00_C61B10.s b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80240E00_C61B10.s
index c24514fd14..6f1e46141b 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80240E00_C61B10.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80240E00_C61B10.s
@@ -18,8 +18,8 @@ glabel func_80240E00_C61B10
 /* C61B44 80240E34 0040802D */  daddu     $s0, $v0, $zero
 /* C61B48 80240E38 3C05800B */  lui       $a1, %hi(gCameras)
 /* C61B4C 80240E3C 24A51D80 */  addiu     $a1, $a1, %lo(gCameras)
-/* C61B50 80240E40 3C03800A */  lui       $v1, 0x800a
-/* C61B54 80240E44 8463A634 */  lh        $v1, -0x59cc($v1)
+/* C61B50 80240E40 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* C61B54 80240E44 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* C61B58 80240E48 00912021 */  addu      $a0, $a0, $s1
 /* C61B5C 80240E4C 00031080 */  sll       $v0, $v1, 2
 /* C61B60 80240E50 00431021 */  addu      $v0, $v0, $v1
@@ -54,8 +54,8 @@ glabel func_80240E00_C61B10
 /* C61BD0 80240EC0 00000000 */   nop      
 /* C61BD4 80240EC4 0C00A6C9 */  jal       clamp_angle
 /* C61BD8 80240EC8 46000306 */   mov.s    $f12, $f0
-/* C61BDC 80240ECC 3C018024 */  lui       $at, 0x8024
-/* C61BE0 80240ED0 D4227240 */  ldc1      $f2, 0x7240($at)
+/* C61BDC 80240ECC 3C018024 */  lui       $at, %hi(D_80247240)
+/* C61BE0 80240ED0 D4227240 */  ldc1      $f2, %lo(D_80247240)($at)
 /* C61BE4 80240ED4 46000021 */  cvt.d.s   $f0, $f0
 /* C61BE8 80240ED8 4622003C */  c.lt.d    $f0, $f2
 /* C61BEC 80240EDC 00000000 */  nop       
@@ -97,8 +97,8 @@ glabel func_80240E00_C61B10
 /* C61C74 80240F64 45030001 */  bc1tl     .L80240F6C
 /* C61C78 80240F68 0000882D */   daddu    $s1, $zero, $zero
 .L80240F6C:
-/* C61C7C 80240F6C 3C038011 */  lui       $v1, 0x8011
-/* C61C80 80240F70 8063EBB3 */  lb        $v1, -0x144d($v1)
+/* C61C7C 80240F6C 3C038011 */  lui       $v1, %hi(D_8010EBB3)
+/* C61C80 80240F70 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
 /* C61C84 80240F74 24020009 */  addiu     $v0, $zero, 9
 /* C61C88 80240F78 50620001 */  beql      $v1, $v0, .L80240F80
 /* C61C8C 80240F7C 0000882D */   daddu    $s1, $zero, $zero
diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80241214_C61F24.s b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80241214_C61F24.s
index b672386072..80180d582a 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80241214_C61F24.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80241214_C61F24.s
@@ -100,9 +100,9 @@ glabel func_80241214_C61F24
 /* C62088 80241378 2C620064 */  sltiu     $v0, $v1, 0x64
 /* C6208C 8024137C 10400048 */  beqz      $v0, .L802414A0
 /* C62090 80241380 00031080 */   sll      $v0, $v1, 2
-/* C62094 80241384 3C018024 */  lui       $at, 0x8024
+/* C62094 80241384 3C018024 */  lui       $at, %hi(D_80247248)
 /* C62098 80241388 00220821 */  addu      $at, $at, $v0
-/* C6209C 8024138C 8C227248 */  lw        $v0, 0x7248($at)
+/* C6209C 8024138C 8C227248 */  lw        $v0, %lo(D_80247248)($at)
 /* C620A0 80241390 00400008 */  jr        $v0
 /* C620A4 80241394 00000000 */   nop      
 /* C620A8 80241398 0240202D */  daddu     $a0, $s2, $zero
diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80241630_C62340.s b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80241630_C62340.s
index 2075b9b006..765eb87c28 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80241630_C62340.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80241630_C62340.s
@@ -62,9 +62,9 @@ glabel func_80241630_C62340
 /* C62420 80241710 000218C0 */  sll       $v1, $v0, 3
 /* C62424 80241714 00431021 */  addu      $v0, $v0, $v1
 /* C62428 80241718 000210C0 */  sll       $v0, $v0, 3
-/* C6242C 8024171C 3C01800B */  lui       $at, 0x800b
+/* C6242C 8024171C 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* C62430 80241720 00220821 */  addu      $at, $at, $v0
-/* C62434 80241724 C4201DEC */  lwc1      $f0, 0x1dec($at)
+/* C62434 80241724 C4201DEC */  lwc1      $f0, %lo(D_800B1DEC)($at)
 /* C62438 80241728 080905DB */  j         .L8024176C
 /* C6243C 8024172C 460C0301 */   sub.s    $f12, $f0, $f12
 .L80241730:
@@ -79,9 +79,9 @@ glabel func_80241630_C62340
 /* C62460 80241750 000218C0 */  sll       $v1, $v0, 3
 /* C62464 80241754 00431021 */  addu      $v0, $v0, $v1
 /* C62468 80241758 000210C0 */  sll       $v0, $v0, 3
-/* C6246C 8024175C 3C01800B */  lui       $at, 0x800b
+/* C6246C 8024175C 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* C62470 80241760 00220821 */  addu      $at, $at, $v0
-/* C62474 80241764 C4201DEC */  lwc1      $f0, 0x1dec($at)
+/* C62474 80241764 C4201DEC */  lwc1      $f0, %lo(D_800B1DEC)($at)
 /* C62478 80241768 460C0300 */  add.s     $f12, $f0, $f12
 .L8024176C:
 /* C6247C 8024176C 0C00A6C9 */  jal       clamp_angle
@@ -157,8 +157,8 @@ glabel func_80241630_C62340
 /* C62584 80241874 1440005D */  bnez      $v0, .L802419EC
 /* C62588 80241878 00000000 */   nop      
 /* C6258C 8024187C C6200038 */  lwc1      $f0, 0x38($s1)
-/* C62590 80241880 3C018024 */  lui       $at, 0x8024
-/* C62594 80241884 D42473D8 */  ldc1      $f4, 0x73d8($at)
+/* C62590 80241880 3C018024 */  lui       $at, %hi(D_802473D8)
+/* C62594 80241884 D42473D8 */  ldc1      $f4, %lo(D_802473D8)($at)
 /* C62598 80241888 46000021 */  cvt.d.s   $f0, $f0
 /* C6259C 8024188C 4620203C */  c.lt.d    $f4, $f0
 /* C625A0 80241890 00000000 */  nop       
@@ -170,8 +170,8 @@ glabel func_80241630_C62340
 /* C625B8 802418A8 E6200038 */  swc1      $f0, 0x38($s1)
 .L802418AC:
 /* C625BC 802418AC C6200038 */  lwc1      $f0, 0x38($s1)
-/* C625C0 802418B0 3C018024 */  lui       $at, 0x8024
-/* C625C4 802418B4 D42273E0 */  ldc1      $f2, 0x73e0($at)
+/* C625C0 802418B0 3C018024 */  lui       $at, %hi(D_802473E0)
+/* C625C4 802418B4 D42273E0 */  ldc1      $f2, %lo(D_802473E0)($at)
 /* C625C8 802418B8 46000021 */  cvt.d.s   $f0, $f0
 /* C625CC 802418BC 4622003C */  c.lt.d    $f0, $f2
 /* C625D0 802418C0 00000000 */  nop       
@@ -228,8 +228,8 @@ glabel func_80241630_C62340
 /* C6268C 8024197C 4600A386 */   mov.s    $f14, $f20
 /* C62690 80241980 46000586 */  mov.s     $f22, $f0
 /* C62694 80241984 C7A20038 */  lwc1      $f2, 0x38($sp)
-/* C62698 80241988 3C018024 */  lui       $at, 0x8024
-/* C6269C 8024198C D42073E8 */  ldc1      $f0, 0x73e8($at)
+/* C62698 80241988 3C018024 */  lui       $at, %hi(D_802473E8)
+/* C6269C 8024198C D42073E8 */  ldc1      $f0, %lo(D_802473E8)($at)
 /* C626A0 80241990 460010A1 */  cvt.d.s   $f2, $f2
 /* C626A4 80241994 4620103C */  c.lt.d    $f2, $f0
 /* C626A8 80241998 00000000 */  nop       
@@ -239,8 +239,8 @@ glabel func_80241630_C62340
 /* C626B8 802419A8 08090674 */  j         .L802419D0
 /* C626BC 802419AC 34C68000 */   ori      $a2, $a2, 0x8000
 .L802419B0:
-/* C626C0 802419B0 3C018024 */  lui       $at, 0x8024
-/* C626C4 802419B4 D42073F0 */  ldc1      $f0, 0x73f0($at)
+/* C626C0 802419B0 3C018024 */  lui       $at, %hi(D_802473F0)
+/* C626C4 802419B4 D42073F0 */  ldc1      $f0, %lo(D_802473F0)($at)
 /* C626C8 802419B8 4622003C */  c.lt.d    $f0, $f2
 /* C626CC 802419BC 00000000 */  nop       
 /* C626D0 802419C0 450000FA */  bc1f      .L80241DAC
@@ -296,8 +296,8 @@ glabel func_80241630_C62340
 /* C62790 80241A80 104000CA */  beqz      $v0, .L80241DAC
 /* C62794 80241A84 0280282D */   daddu    $a1, $s4, $zero
 /* C62798 80241A88 8EA20000 */  lw        $v0, ($s5)
-/* C6279C 80241A8C 3C018024 */  lui       $at, 0x8024
-/* C627A0 80241A90 D42273F8 */  ldc1      $f2, 0x73f8($at)
+/* C6279C 80241A8C 3C018024 */  lui       $at, %hi(D_802473F8)
+/* C627A0 80241A90 D42273F8 */  ldc1      $f2, %lo(D_802473F8)($at)
 /* C627A4 80241A94 C440002C */  lwc1      $f0, 0x2c($v0)
 /* C627A8 80241A98 C4460028 */  lwc1      $f6, 0x28($v0)
 /* C627AC 80241A9C C4440030 */  lwc1      $f4, 0x30($v0)
@@ -633,8 +633,8 @@ glabel func_80241630_C62340
 /* C62CA8 80241F98 44813000 */  mtc1      $at, $f6
 /* C62CAC 80241F9C 46000021 */  cvt.d.s   $f0, $f0
 /* C62CB0 80241FA0 E7A20020 */  swc1      $f2, 0x20($sp)
-/* C62CB4 80241FA4 3C018024 */  lui       $at, 0x8024
-/* C62CB8 80241FA8 D4227400 */  ldc1      $f2, 0x7400($at)
+/* C62CB4 80241FA4 3C018024 */  lui       $at, %hi(D_80247400)
+/* C62CB8 80241FA8 D4227400 */  ldc1      $f2, %lo(D_80247400)($at)
 /* C62CBC 80241FAC C6240040 */  lwc1      $f4, 0x40($s1)
 /* C62CC0 80241FB0 46220000 */  add.d     $f0, $f0, $f2
 /* C62CC4 80241FB4 E7A60038 */  swc1      $f6, 0x38($sp)
diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_8024259C_C632AC.s b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_8024259C_C632AC.s
index 97c8ab03a0..e439092d1a 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_8024259C_C632AC.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_8024259C_C632AC.s
@@ -4,8 +4,8 @@
 glabel func_8024259C_C632AC
 /* C632AC 8024259C 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* C632B0 802425A0 AFB00010 */  sw        $s0, 0x10($sp)
-/* C632B4 802425A4 3C108024 */  lui       $s0, 0x8024
-/* C632B8 802425A8 261041A0 */  addiu     $s0, $s0, 0x41a0
+/* C632B4 802425A4 3C108024 */  lui       $s0, %hi(D_802441A0)
+/* C632B8 802425A8 261041A0 */  addiu     $s0, $s0, %lo(D_802441A0)
 /* C632BC 802425AC AFBF0018 */  sw        $ra, 0x18($sp)
 /* C632C0 802425B0 AFB10014 */  sw        $s1, 0x14($sp)
 /* C632C4 802425B4 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_8024259C_C632AC
 /* C63328 80242618 28620010 */  slti      $v0, $v1, 0x10
 /* C6332C 8024261C 1440FFFA */  bnez      $v0, .L80242608
 /* C63330 80242620 24840004 */   addiu    $a0, $a0, 4
-/* C63334 80242624 3C108024 */  lui       $s0, 0x8024
-/* C63338 80242628 261041A0 */  addiu     $s0, $s0, 0x41a0
+/* C63334 80242624 3C108024 */  lui       $s0, %hi(D_802441A0)
+/* C63338 80242628 261041A0 */  addiu     $s0, $s0, %lo(D_802441A0)
 /* C6333C 8024262C 0C00AB4B */  jal       heap_free
 /* C63340 80242630 8E040000 */   lw       $a0, ($s0)
 /* C63344 80242634 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_802428E0_C635F0.s b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_802428E0_C635F0.s
index 34a3a9aabc..7643efaed9 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_802428E0_C635F0.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_802428E0_C635F0.s
@@ -6,11 +6,11 @@ glabel func_802428E0_C635F0
 /* C635F4 802428E4 AFBF0010 */  sw        $ra, 0x10($sp)
 /* C635F8 802428E8 10A00003 */  beqz      $a1, .L802428F8
 /* C635FC 802428EC 8C86000C */   lw       $a2, 0xc($a0)
-/* C63600 802428F0 3C018024 */  lui       $at, 0x8024
-/* C63604 802428F4 AC204204 */  sw        $zero, 0x4204($at)
+/* C63600 802428F0 3C018024 */  lui       $at, %hi(D_80244204)
+/* C63604 802428F4 AC204204 */  sw        $zero, %lo(D_80244204)($at)
 .L802428F8:
-/* C63608 802428F8 3C038024 */  lui       $v1, 0x8024
-/* C6360C 802428FC 24634204 */  addiu     $v1, $v1, 0x4204
+/* C63608 802428F8 3C038024 */  lui       $v1, %hi(D_80244204)
+/* C6360C 802428FC 24634204 */  addiu     $v1, $v1, %lo(D_80244204)
 /* C63610 80242900 8C620000 */  lw        $v0, ($v1)
 /* C63614 80242904 54400003 */  bnel      $v0, $zero, .L80242914
 /* C63618 80242908 AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_802428E0_C635F0
 /* C63620 80242910 0000102D */   daddu    $v0, $zero, $zero
 .L80242914:
 /* C63624 80242914 8CC50000 */  lw        $a1, ($a2)
-/* C63628 80242918 3C068024 */  lui       $a2, 0x8024
+/* C63628 80242918 3C068024 */  lui       $a2, %hi(D_80244208)
 /* C6362C 8024291C 0C0B2026 */  jal       set_variable
-/* C63630 80242920 8CC64208 */   lw       $a2, 0x4208($a2)
+/* C63630 80242920 8CC64208 */   lw       $a2, %lo(D_80244208)($a2)
 /* C63634 80242924 24020002 */  addiu     $v0, $zero, 2
 .L80242928:
 /* C63638 80242928 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242934_C63644.s b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242934_C63644.s
index d04a710c94..f9d9f09110 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242934_C63644.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242934_C63644.s
@@ -7,12 +7,12 @@ glabel func_80242934_C63644
 /* C6364C 8024293C 8C82000C */  lw        $v0, 0xc($a0)
 /* C63650 80242940 0C0B1EAF */  jal       get_variable
 /* C63654 80242944 8C450000 */   lw       $a1, ($v0)
-/* C63658 80242948 3C018024 */  lui       $at, 0x8024
-/* C6365C 8024294C AC224208 */  sw        $v0, 0x4208($at)
+/* C63658 80242948 3C018024 */  lui       $at, %hi(D_80244208)
+/* C6365C 8024294C AC224208 */  sw        $v0, %lo(D_80244208)($at)
 /* C63660 80242950 24020002 */  addiu     $v0, $zero, 2
 /* C63664 80242954 8FBF0010 */  lw        $ra, 0x10($sp)
 /* C63668 80242958 24030001 */  addiu     $v1, $zero, 1
-/* C6366C 8024295C 3C018024 */  lui       $at, 0x8024
-/* C63670 80242960 AC234204 */  sw        $v1, 0x4204($at)
+/* C6366C 8024295C 3C018024 */  lui       $at, %hi(D_80244204)
+/* C63670 80242960 AC234204 */  sw        $v1, %lo(D_80244204)($at)
 /* C63674 80242964 03E00008 */  jr        $ra
 /* C63678 80242968 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_8024296C_C6367C.s b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_8024296C_C6367C.s
index dd0a970f1c..d0b373a647 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_8024296C_C6367C.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_8024296C_C6367C.s
@@ -13,8 +13,8 @@ glabel func_8024296C_C6367C
 /* C6369C 8024298C 8C620000 */  lw        $v0, ($v1)
 /* C636A0 80242990 5040000A */  beql      $v0, $zero, .L802429BC
 /* C636A4 80242994 00041080 */   sll      $v0, $a0, 2
-/* C636A8 80242998 3C058024 */  lui       $a1, 0x8024
-/* C636AC 8024299C 24A57420 */  addiu     $a1, $a1, 0x7420
+/* C636A8 80242998 3C058024 */  lui       $a1, %hi(D_80247420)
+/* C636AC 8024299C 24A57420 */  addiu     $a1, $a1, %lo(D_80247420)
 .L802429A0:
 /* C636B0 802429A0 24630004 */  addiu     $v1, $v1, 4
 /* C636B4 802429A4 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_8024296C_C6367C
 /* C636C4 802429B4 24A50004 */   addiu    $a1, $a1, 4
 /* C636C8 802429B8 00041080 */  sll       $v0, $a0, 2
 .L802429BC:
-/* C636CC 802429BC 3C018024 */  lui       $at, 0x8024
+/* C636CC 802429BC 3C018024 */  lui       $at, %hi(D_80247420)
 /* C636D0 802429C0 00220821 */  addu      $at, $at, $v0
-/* C636D4 802429C4 AC207420 */  sw        $zero, 0x7420($at)
+/* C636D4 802429C4 AC207420 */  sw        $zero, %lo(D_80247420)($at)
 /* C636D8 802429C8 08090A7E */  j         .L802429F8
 /* C636DC 802429CC 00000000 */   nop      
 .L802429D0:
-/* C636E0 802429D0 3C038024 */  lui       $v1, 0x8024
-/* C636E4 802429D4 24637420 */  addiu     $v1, $v1, 0x7420
+/* C636E0 802429D0 3C038024 */  lui       $v1, %hi(D_80247420)
+/* C636E4 802429D4 24637420 */  addiu     $v1, $v1, %lo(D_80247420)
 /* C636E8 802429D8 0060282D */  daddu     $a1, $v1, $zero
 .L802429DC:
 /* C636EC 802429DC 24820010 */  addiu     $v0, $a0, 0x10
diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242C84_C63994.s b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242C84_C63994.s
index 1842e42174..9c1034f849 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242C84_C63994.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242C84_C63994.s
@@ -15,7 +15,7 @@ glabel func_80242C84_C63994
 /* C639BC 80242CAC 8FBF0014 */  lw        $ra, 0x14($sp)
 /* C639C0 80242CB0 8FB00010 */  lw        $s0, 0x10($sp)
 /* C639C4 80242CB4 24020002 */  addiu     $v0, $zero, 2
-/* C639C8 80242CB8 3C018024 */  lui       $at, 0x8024
-/* C639CC 80242CBC AC2375E4 */  sw        $v1, 0x75e4($at)
+/* C639C8 80242CB8 3C018024 */  lui       $at, %hi(D_802475E4)
+/* C639CC 80242CBC AC2375E4 */  sw        $v1, %lo(D_802475E4)($at)
 /* C639D0 80242CC0 03E00008 */  jr        $ra
 /* C639D4 80242CC4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242CC8_C639D8.s b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242CC8_C639D8.s
index 6abbed6865..20e6fc28bf 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242CC8_C639D8.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242CC8_C639D8.s
@@ -6,8 +6,8 @@ glabel func_80242CC8_C639D8
 /* C639DC 80242CCC AFBF0010 */  sw        $ra, 0x10($sp)
 /* C639E0 80242CD0 0C00EABB */  jal       get_npc_unsafe
 /* C639E4 80242CD4 8C84008C */   lw       $a0, 0x8c($a0)
-/* C639E8 80242CD8 3C038024 */  lui       $v1, 0x8024
-/* C639EC 80242CDC 8C6375E4 */  lw        $v1, 0x75e4($v1)
+/* C639E8 80242CD8 3C038024 */  lui       $v1, %hi(D_802475E4)
+/* C639EC 80242CDC 8C6375E4 */  lw        $v1, %lo(D_802475E4)($v1)
 /* C639F0 80242CE0 AC430028 */  sw        $v1, 0x28($v0)
 /* C639F4 80242CE4 8FBF0010 */  lw        $ra, 0x10($sp)
 /* C639F8 80242CE8 24020002 */  addiu     $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242D38_C63A48.s b/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242D38_C63A48.s
index 4107d94080..d7e0ec8d57 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242D38_C63A48.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242D38_C63A48.s
@@ -18,8 +18,8 @@ glabel func_80242D38_C63A48
 /* C63A7C 80242D6C AFBF0010 */   sw       $ra, 0x10($sp)
 /* C63A80 80242D70 0000302D */  daddu     $a2, $zero, $zero
 .L80242D74:
-/* C63A84 80242D74 3C018024 */  lui       $at, 0x8024
-/* C63A88 80242D78 D4207410 */  ldc1      $f0, 0x7410($at)
+/* C63A84 80242D74 3C018024 */  lui       $at, %hi(D_80247410)
+/* C63A88 80242D78 D4207410 */  ldc1      $f0, %lo(D_80247410)($at)
 /* C63A8C 80242D7C 4620103C */  c.lt.d    $f2, $f0
 /* C63A90 80242D80 00000000 */  nop       
 /* C63A94 80242D84 45030001 */  bc1tl     .L80242D8C
diff --git a/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_802404DC_C6860C.s b/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_802404DC_C6860C.s
index 97387f033e..fee76fa7bd 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_802404DC_C6860C.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_802404DC_C6860C.s
@@ -22,12 +22,12 @@ glabel func_802404DC_C6860C
 /* C68650 80240520 0040982D */  daddu     $s3, $v0, $zero
 /* C68654 80240524 0000B02D */  daddu     $s6, $zero, $zero
 /* C68658 80240528 02C0902D */  daddu     $s2, $s6, $zero
-/* C6865C 8024052C 3C148024 */  lui       $s4, 0x8024
-/* C68660 80240530 26941C48 */  addiu     $s4, $s4, 0x1c48
+/* C6865C 8024052C 3C148024 */  lui       $s4, %hi(D_80241C48)
+/* C68660 80240530 26941C48 */  addiu     $s4, $s4, %lo(D_80241C48)
 /* C68664 80240534 0260882D */  daddu     $s1, $s3, $zero
 /* C68668 80240538 8EA200B4 */  lw        $v0, 0xb4($s5)
-/* C6866C 8024053C 3C038024 */  lui       $v1, 0x8024
-/* C68670 80240540 24631C40 */  addiu     $v1, $v1, 0x1c40
+/* C6866C 8024053C 3C038024 */  lui       $v1, %hi(D_80241C40)
+/* C68670 80240540 24631C40 */  addiu     $v1, $v1, %lo(D_80241C40)
 /* C68674 80240544 AEB30078 */  sw        $s3, 0x78($s5)
 /* C68678 80240548 00021027 */  nor       $v0, $zero, $v0
 /* C6867C 8024054C 0002BFC2 */  srl       $s7, $v0, 0x1f
@@ -42,8 +42,8 @@ glabel func_802404DC_C6860C
 /* C6869C 8024056C 5040002E */  beql      $v0, $zero, .L80240628
 /* C686A0 80240570 26520001 */   addiu    $s2, $s2, 1
 /* C686A4 80240574 00101100 */  sll       $v0, $s0, 4
-/* C686A8 80240578 3C068009 */  lui       $a2, 0x8009
-/* C686AC 8024057C 24C6EF20 */  addiu     $a2, $a2, -0x10e0
+/* C686A8 80240578 3C068009 */  lui       $a2, %hi(D_8008EF20)
+/* C686AC 8024057C 24C6EF20 */  addiu     $a2, $a2, %lo(D_8008EF20)
 /* C686B0 80240580 00461021 */  addu      $v0, $v0, $a2
 /* C686B4 80240584 0200202D */  daddu     $a0, $s0, $zero
 /* C686B8 80240588 AE300108 */  sw        $s0, 0x108($s1)
@@ -54,15 +54,15 @@ glabel func_802404DC_C6860C
 /* C686CC 8024059C 0040202D */  daddu     $a0, $v0, $zero
 /* C686D0 802405A0 04800011 */  bltz      $a0, .L802405E8
 /* C686D4 802405A4 00101080 */   sll      $v0, $s0, 2
-/* C686D8 802405A8 3C06800F */  lui       $a2, 0x800f
-/* C686DC 802405AC 24C67F00 */  addiu     $a2, $a2, 0x7f00
+/* C686D8 802405A8 3C06800F */  lui       $a2, %hi(D_800F7F00)
+/* C686DC 802405AC 24C67F00 */  addiu     $a2, $a2, %lo(D_800F7F00)
 /* C686E0 802405B0 00461021 */  addu      $v0, $v0, $a2
 /* C686E4 802405B4 8C430000 */  lw        $v1, ($v0)
 /* C686E8 802405B8 24020001 */  addiu     $v0, $zero, 1
 /* C686EC 802405BC AE22018C */  sw        $v0, 0x18c($s1)
 /* C686F0 802405C0 00041080 */  sll       $v0, $a0, 2
-/* C686F4 802405C4 3C068024 */  lui       $a2, 0x8024
-/* C686F8 802405C8 24C61C58 */  addiu     $a2, $a2, 0x1c58
+/* C686F4 802405C4 3C068024 */  lui       $a2, %hi(D_80241C58)
+/* C686F8 802405C8 24C61C58 */  addiu     $a2, $a2, %lo(D_80241C58)
 /* C686FC 802405CC AE230000 */  sw        $v1, ($s1)
 /* C68700 802405D0 001218C0 */  sll       $v1, $s2, 3
 /* C68704 802405D4 00431021 */  addu      $v0, $v0, $v1
@@ -71,8 +71,8 @@ glabel func_802404DC_C6860C
 /* C68710 802405E0 08090183 */  j         .L8024060C
 /* C68714 802405E4 AE220294 */   sw       $v0, 0x294($s1)
 .L802405E8:
-/* C68718 802405E8 3C06800F */  lui       $a2, 0x800f
-/* C6871C 802405EC 24C67F40 */  addiu     $a2, $a2, 0x7f40
+/* C68718 802405E8 3C06800F */  lui       $a2, %hi(D_800F7F40)
+/* C6871C 802405EC 24C67F40 */  addiu     $a2, $a2, %lo(D_800F7F40)
 /* C68720 802405F0 00461021 */  addu      $v0, $v0, $a2
 /* C68724 802405F4 8C420000 */  lw        $v0, ($v0)
 /* C68728 802405F8 AE20018C */  sw        $zero, 0x18c($s1)
@@ -130,9 +130,9 @@ glabel func_802404DC_C6860C
 /* C687E0 802406B0 02621021 */  addu      $v0, $s3, $v0
 /* C687E4 802406B4 8C420108 */  lw        $v0, 0x108($v0)
 /* C687E8 802406B8 00021100 */  sll       $v0, $v0, 4
-/* C687EC 802406BC 3C038009 */  lui       $v1, 0x8009
+/* C687EC 802406BC 3C038009 */  lui       $v1, %hi(D_8008EF20)
 /* C687F0 802406C0 00621821 */  addu      $v1, $v1, $v0
-/* C687F4 802406C4 8C63EF20 */  lw        $v1, -0x10e0($v1)
+/* C687F4 802406C4 8C63EF20 */  lw        $v1, %lo(D_8008EF20)($v1)
 /* C687F8 802406C8 8EA20074 */  lw        $v0, 0x74($s5)
 /* C687FC 802406CC 2442FFFF */  addiu     $v0, $v0, -1
 /* C68800 802406D0 00021080 */  sll       $v0, $v0, 2
diff --git a/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240758_C68888.s b/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240758_C68888.s
index bfe0eaa7e8..48d3590bcf 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240758_C68888.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240758_C68888.s
@@ -7,9 +7,9 @@ glabel func_80240758_C68888
 /* C68890 80240760 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* C68894 80240764 AFBF0010 */  sw        $ra, 0x10($sp)
 /* C68898 80240768 00021100 */  sll       $v0, $v0, 4
-/* C6889C 8024076C 3C048009 */  lui       $a0, 0x8009
+/* C6889C 8024076C 3C048009 */  lui       $a0, %hi(D_8008EF20)
 /* C688A0 80240770 00822021 */  addu      $a0, $a0, $v0
-/* C688A4 80240774 8C84EF20 */  lw        $a0, -0x10e0($a0)
+/* C688A4 80240774 8C84EF20 */  lw        $a0, %lo(D_8008EF20)($a0)
 /* C688A8 80240778 0C0496CF */  jal       set_message_string
 /* C688AC 8024077C 0000282D */   daddu    $a1, $zero, $zero
 /* C688B0 80240780 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240910_C68A40.s b/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240910_C68A40.s
index 615d5ea539..218a9cc708 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240910_C68A40.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240910_C68A40.s
@@ -30,9 +30,9 @@ glabel func_80240910_C68A40
 /* C68AA4 80240974 000320C0 */  sll       $a0, $v1, 3
 /* C68AA8 80240978 00641821 */  addu      $v1, $v1, $a0
 /* C68AAC 8024097C 000318C0 */  sll       $v1, $v1, 3
-/* C68AB0 80240980 3C01800B */  lui       $at, 0x800b
+/* C68AB0 80240980 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* C68AB4 80240984 00230821 */  addu      $at, $at, $v1
-/* C68AB8 80240988 C42C1DEC */  lwc1      $f12, 0x1dec($at)
+/* C68AB8 80240988 C42C1DEC */  lwc1      $f12, %lo(D_800B1DEC)($at)
 /* C68ABC 8024098C 0C00A88D */  jal       sin_cos_deg
 /* C68AC0 80240990 0040A82D */   daddu    $s5, $v0, $zero
 /* C68AC4 80240994 1200005D */  beqz      $s0, .L80240B0C
@@ -79,8 +79,8 @@ glabel func_80240910_C68A40
 /* C68B64 80240A34 26100004 */   addiu    $s0, $s0, 4
 /* C68B68 80240A38 0000882D */  daddu     $s1, $zero, $zero
 /* C68B6C 80240A3C 0240802D */  daddu     $s0, $s2, $zero
-/* C68B70 80240A40 3C148024 */  lui       $s4, 0x8024
-/* C68B74 80240A44 26941C98 */  addiu     $s4, $s4, 0x1c98
+/* C68B70 80240A40 3C148024 */  lui       $s4, %hi(D_80241C98)
+/* C68B74 80240A44 26941C98 */  addiu     $s4, $s4, %lo(D_80241C98)
 /* C68B78 80240A48 3C014248 */  lui       $at, 0x4248
 /* C68B7C 80240A4C 4481A000 */  mtc1      $at, $f20
 /* C68B80 80240A50 24130044 */  addiu     $s3, $zero, 0x44
@@ -150,8 +150,8 @@ glabel func_80240910_C68A40
 /* C68C74 80240B44 00000000 */   nop      
 .L80240B48:
 /* C68C78 80240B48 0000882D */  daddu     $s1, $zero, $zero
-/* C68C7C 80240B4C 3C148024 */  lui       $s4, 0x8024
-/* C68C80 80240B50 26941C98 */  addiu     $s4, $s4, 0x1c98
+/* C68C7C 80240B4C 3C148024 */  lui       $s4, %hi(D_80241C98)
+/* C68C80 80240B50 26941C98 */  addiu     $s4, $s4, %lo(D_80241C98)
 /* C68C84 80240B54 24130020 */  addiu     $s3, $zero, 0x20
 /* C68C88 80240B58 3C064248 */  lui       $a2, 0x4248
 /* C68C8C 80240B5C 44800000 */  mtc1      $zero, $f0
@@ -197,8 +197,8 @@ glabel func_80240910_C68A40
 /* C68D28 80240BF8 AE400060 */   sw       $zero, 0x60($s2)
 .L80240BFC:
 /* C68D2C 80240BFC 0000882D */  daddu     $s1, $zero, $zero
-/* C68D30 80240C00 3C148024 */  lui       $s4, 0x8024
-/* C68D34 80240C04 26941C98 */  addiu     $s4, $s4, 0x1c98
+/* C68D30 80240C00 3C148024 */  lui       $s4, %hi(D_80241C98)
+/* C68D34 80240C04 26941C98 */  addiu     $s4, $s4, %lo(D_80241C98)
 /* C68D38 80240C08 24130020 */  addiu     $s3, $zero, 0x20
 /* C68D3C 80240C0C 0240802D */  daddu     $s0, $s2, $zero
 /* C68D40 80240C10 3C014248 */  lui       $at, 0x4248
diff --git a/asm/nonmatchings/world/area_kzn/kzn_04/C69180/func_80241050_C69180.s b/asm/nonmatchings/world/area_kzn/kzn_04/C69180/func_80241050_C69180.s
index 42740fe5b5..e9ebd3c84e 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_04/C69180/func_80241050_C69180.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_04/C69180/func_80241050_C69180.s
@@ -228,9 +228,9 @@ glabel func_80241050_C69180
 /* C694D8 802413A8 E6040028 */  swc1      $f4, 0x28($s0)
 /* C694DC 802413AC 00021080 */  sll       $v0, $v0, 2
 /* C694E0 802413B0 E7A00010 */  swc1      $f0, 0x10($sp)
-/* C694E4 802413B4 3C048024 */  lui       $a0, 0x8024
+/* C694E4 802413B4 3C048024 */  lui       $a0, %hi(D_802422F0)
 /* C694E8 802413B8 00822021 */  addu      $a0, $a0, $v0
-/* C694EC 802413BC 8C8422F0 */  lw        $a0, 0x22f0($a0)
+/* C694EC 802413BC 8C8422F0 */  lw        $a0, %lo(D_802422F0)($a0)
 /* C694F0 802413C0 8E060004 */  lw        $a2, 4($s0)
 /* C694F4 802413C4 8E070008 */  lw        $a3, 8($s0)
 /* C694F8 802413C8 0C052757 */  jal       play_sound_at_position
diff --git a/asm/nonmatchings/world/area_kzn/kzn_04/C69180/func_80241644_C69774.s b/asm/nonmatchings/world/area_kzn/kzn_04/C69180/func_80241644_C69774.s
index d305326f00..8de9bc5bcb 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_04/C69180/func_80241644_C69774.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_04/C69180/func_80241644_C69774.s
@@ -46,8 +46,8 @@ glabel func_80241644_C69774
 /* C6980C 802416DC 2402000A */  addiu     $v0, $zero, 0xa
 /* C69810 802416E0 1462001B */  bne       $v1, $v0, .L80241750
 /* C69814 802416E4 E6000010 */   swc1     $f0, 0x10($s0)
-/* C69818 802416E8 3C048024 */  lui       $a0, 0x8024
-/* C6981C 802416EC 2484231C */  addiu     $a0, $a0, 0x231c
+/* C69818 802416E8 3C048024 */  lui       $a0, %hi(D_8024231C)
+/* C6981C 802416EC 2484231C */  addiu     $a0, $a0, %lo(D_8024231C)
 /* C69820 802416F0 24050001 */  addiu     $a1, $zero, 1
 /* C69824 802416F4 0C0B0CF8 */  jal       start_script
 /* C69828 802416F8 0000302D */   daddu    $a2, $zero, $zero
diff --git a/asm/nonmatchings/world/area_kzn/kzn_06/C6CC30/func_80240310_C6CC30.s b/asm/nonmatchings/world/area_kzn/kzn_06/C6CC30/func_80240310_C6CC30.s
index a6828b93e6..9beb6c8c1c 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_06/C6CC30/func_80240310_C6CC30.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_06/C6CC30/func_80240310_C6CC30.s
@@ -11,9 +11,9 @@ glabel func_80240310_C6CC30
 /* C6CC48 80240328 3C0141C8 */  lui       $at, 0x41c8
 /* C6CC4C 8024032C 44810000 */  mtc1      $at, $f0
 /* C6CC50 80240330 00021080 */  sll       $v0, $v0, 2
-/* C6CC54 80240334 3C018024 */  lui       $at, 0x8024
+/* C6CC54 80240334 3C018024 */  lui       $at, %hi(D_80241120)
 /* C6CC58 80240338 00220821 */  addu      $at, $at, $v0
-/* C6CC5C 8024033C C4221120 */  lwc1      $f2, 0x1120($at)
+/* C6CC5C 8024033C C4221120 */  lwc1      $f2, %lo(D_80241120)($at)
 /* C6CC60 80240340 46001082 */  mul.s     $f2, $f2, $f0
 /* C6CC64 80240344 00000000 */  nop       
 /* C6CC68 80240348 C6200084 */  lwc1      $f0, 0x84($s1)
diff --git a/asm/nonmatchings/world/area_kzn/kzn_06/C6CD10/func_802403F0_C6CD10.s b/asm/nonmatchings/world/area_kzn/kzn_06/C6CD10/func_802403F0_C6CD10.s
index dcf9ac42f2..b56341bc21 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_06/C6CD10/func_802403F0_C6CD10.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_06/C6CD10/func_802403F0_C6CD10.s
@@ -61,8 +61,8 @@ glabel func_802403F0_C6CD10
 /* C6CDE0 802404C0 1440FFF7 */  bnez      $v0, .L802404A0
 /* C6CDE4 802404C4 26310004 */   addiu    $s1, $s1, 4
 .L802404C8:
-/* C6CDE8 802404C8 3C028024 */  lui       $v0, 0x8024
-/* C6CDEC 802404CC 24421370 */  addiu     $v0, $v0, 0x1370
+/* C6CDE8 802404C8 3C028024 */  lui       $v0, %hi(D_80241370)
+/* C6CDEC 802404CC 24421370 */  addiu     $v0, $v0, %lo(D_80241370)
 /* C6CDF0 802404D0 C4420000 */  lwc1      $f2, ($v0)
 /* C6CDF4 802404D4 3C013F80 */  lui       $at, 0x3f80
 /* C6CDF8 802404D8 44810000 */  mtc1      $at, $f0
@@ -128,8 +128,8 @@ glabel func_802403F0_C6CD10
 /* C6CED4 802405B4 3C05FD05 */  lui       $a1, 0xfd05
 /* C6CED8 802405B8 0C0B210B */  jal       get_float_variable
 /* C6CEDC 802405BC 34A50F80 */   ori      $a1, $a1, 0xf80
-/* C6CEE0 802405C0 3C018024 */  lui       $at, 0x8024
-/* C6CEE4 802405C4 D4221A00 */  ldc1      $f2, 0x1a00($at)
+/* C6CEE0 802405C0 3C018024 */  lui       $at, %hi(D_80241A00)
+/* C6CEE4 802405C4 D4221A00 */  ldc1      $f2, %lo(D_80241A00)($at)
 /* C6CEE8 802405C8 46000021 */  cvt.d.s   $f0, $f0
 /* C6CEEC 802405CC 46220002 */  mul.d     $f0, $f0, $f2
 /* C6CEF0 802405D0 00000000 */  nop       
@@ -154,8 +154,8 @@ glabel func_802403F0_C6CD10
 /* C6CF34 80240614 4481B000 */  mtc1      $at, $f22
 /* C6CF38 80240618 241103CA */  addiu     $s1, $zero, 0x3ca
 .L8024061C:
-/* C6CF3C 8024061C 3C108024 */  lui       $s0, 0x8024
-/* C6CF40 80240620 26101370 */  addiu     $s0, $s0, 0x1370
+/* C6CF3C 8024061C 3C108024 */  lui       $s0, %hi(D_80241370)
+/* C6CF40 80240620 26101370 */  addiu     $s0, $s0, %lo(D_80241370)
 /* C6CF44 80240624 C6000000 */  lwc1      $f0, ($s0)
 /* C6CF48 80240628 3C014040 */  lui       $at, 0x4040
 /* C6CF4C 8024062C 44816000 */  mtc1      $at, $f12
diff --git a/asm/nonmatchings/world/area_kzn/kzn_07/C6E330/func_80240000_C6E330.s b/asm/nonmatchings/world/area_kzn/kzn_07/C6E330/func_80240000_C6E330.s
index 571b743c77..91fbaa7ec6 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_07/C6E330/func_80240000_C6E330.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_07/C6E330/func_80240000_C6E330.s
@@ -61,8 +61,8 @@ glabel func_80240000_C6E330
 /* C6E400 802400D0 1440FFF7 */  bnez      $v0, .L802400B0
 /* C6E404 802400D4 26310004 */   addiu    $s1, $s1, 4
 .L802400D8:
-/* C6E408 802400D8 3C028024 */  lui       $v0, 0x8024
-/* C6E40C 802400DC 244223E0 */  addiu     $v0, $v0, 0x23e0
+/* C6E408 802400D8 3C028024 */  lui       $v0, %hi(D_802423E0)
+/* C6E40C 802400DC 244223E0 */  addiu     $v0, $v0, %lo(D_802423E0)
 /* C6E410 802400E0 C4420000 */  lwc1      $f2, ($v0)
 /* C6E414 802400E4 3C013F80 */  lui       $at, 0x3f80
 /* C6E418 802400E8 44810000 */  mtc1      $at, $f0
@@ -128,8 +128,8 @@ glabel func_80240000_C6E330
 /* C6E4F4 802401C4 3C05FD05 */  lui       $a1, 0xfd05
 /* C6E4F8 802401C8 0C0B210B */  jal       get_float_variable
 /* C6E4FC 802401CC 34A50F80 */   ori      $a1, $a1, 0xf80
-/* C6E500 802401D0 3C018024 */  lui       $at, 0x8024
-/* C6E504 802401D4 D4223080 */  ldc1      $f2, 0x3080($at)
+/* C6E500 802401D0 3C018024 */  lui       $at, %hi(D_80243080)
+/* C6E504 802401D4 D4223080 */  ldc1      $f2, %lo(D_80243080)($at)
 /* C6E508 802401D8 46000021 */  cvt.d.s   $f0, $f0
 /* C6E50C 802401DC 46220002 */  mul.d     $f0, $f0, $f2
 /* C6E510 802401E0 00000000 */  nop       
@@ -154,8 +154,8 @@ glabel func_80240000_C6E330
 /* C6E554 80240224 4481B000 */  mtc1      $at, $f22
 /* C6E558 80240228 241103CA */  addiu     $s1, $zero, 0x3ca
 .L8024022C:
-/* C6E55C 8024022C 3C108024 */  lui       $s0, 0x8024
-/* C6E560 80240230 261023E0 */  addiu     $s0, $s0, 0x23e0
+/* C6E55C 8024022C 3C108024 */  lui       $s0, %hi(D_802423E0)
+/* C6E560 80240230 261023E0 */  addiu     $s0, $s0, %lo(D_802423E0)
 /* C6E564 80240234 C6000000 */  lwc1      $f0, ($s0)
 /* C6E568 80240238 3C014040 */  lui       $at, 0x4040
 /* C6E56C 8024023C 44816000 */  mtc1      $at, $f12
diff --git a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80240720_C6EA50.s b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80240720_C6EA50.s
index 7b14965d30..78931ebd16 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80240720_C6EA50.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80240720_C6EA50.s
@@ -11,9 +11,9 @@ glabel func_80240720_C6EA50
 /* C6EA68 80240738 3C0141C8 */  lui       $at, 0x41c8
 /* C6EA6C 8024073C 44810000 */  mtc1      $at, $f0
 /* C6EA70 80240740 00021080 */  sll       $v0, $v0, 2
-/* C6EA74 80240744 3C018024 */  lui       $at, 0x8024
+/* C6EA74 80240744 3C018024 */  lui       $at, %hi(D_80242930)
 /* C6EA78 80240748 00220821 */  addu      $at, $at, $v0
-/* C6EA7C 8024074C C4222930 */  lwc1      $f2, 0x2930($at)
+/* C6EA7C 8024074C C4222930 */  lwc1      $f2, %lo(D_80242930)($at)
 /* C6EA80 80240750 46001082 */  mul.s     $f2, $f2, $f0
 /* C6EA84 80240754 00000000 */  nop       
 /* C6EA88 80240758 C6200084 */  lwc1      $f0, 0x84($s1)
diff --git a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80240820_C6EB50.s b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80240820_C6EB50.s
index f0958f1cb3..e7ba4b1a9d 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80240820_C6EB50.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80240820_C6EB50.s
@@ -87,8 +87,8 @@ glabel func_80240820_C6EB50
 /* C6EC90 80240960 08090262 */  j         .L80240988
 /* C6EC94 80240964 E6000018 */   swc1     $f0, 0x18($s0)
 .L80240968:
-/* C6EC98 80240968 3C018024 */  lui       $at, 0x8024
-/* C6EC9C 8024096C D4223090 */  ldc1      $f2, 0x3090($at)
+/* C6EC98 80240968 3C018024 */  lui       $at, %hi(D_80243090)
+/* C6EC9C 8024096C D4223090 */  ldc1      $f2, %lo(D_80243090)($at)
 /* C6ECA0 80240970 44820000 */  mtc1      $v0, $f0
 /* C6ECA4 80240974 00000000 */  nop       
 /* C6ECA8 80240978 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_802409D0_C6ED00.s b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_802409D0_C6ED00.s
index b40a1214bd..af429fe090 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_802409D0_C6ED00.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_802409D0_C6ED00.s
@@ -104,8 +104,8 @@ glabel func_802409D0_C6ED00
 /* C6EE84 80240B54 1040000A */  beqz      $v0, .L80240B80
 /* C6EE88 80240B58 4600C106 */   mov.s    $f4, $f24
 /* C6EE8C 80240B5C 4614C081 */  sub.s     $f2, $f24, $f20
-/* C6EE90 80240B60 3C018024 */  lui       $at, 0x8024
-/* C6EE94 80240B64 D4203098 */  ldc1      $f0, 0x3098($at)
+/* C6EE90 80240B60 3C018024 */  lui       $at, %hi(D_80243098)
+/* C6EE94 80240B64 D4203098 */  ldc1      $f0, %lo(D_80243098)($at)
 /* C6EE98 80240B68 460010A1 */  cvt.d.s   $f2, $f2
 /* C6EE9C 80240B6C 46201082 */  mul.d     $f2, $f2, $f0
 /* C6EEA0 80240B70 00000000 */  nop       
@@ -131,8 +131,8 @@ glabel func_802409D0_C6ED00
 /* C6EEEC 80240BBC C7A4002C */  lwc1      $f4, 0x2c($sp)
 /* C6EEF0 80240BC0 461A2100 */  add.s     $f4, $f4, $f26
 /* C6EEF4 80240BC4 46142081 */  sub.s     $f2, $f4, $f20
-/* C6EEF8 80240BC8 3C018024 */  lui       $at, 0x8024
-/* C6EEFC 80240BCC D42030A0 */  ldc1      $f0, 0x30a0($at)
+/* C6EEF8 80240BC8 3C018024 */  lui       $at, %hi(D_802430A0)
+/* C6EEFC 80240BCC D42030A0 */  ldc1      $f0, %lo(D_802430A0)($at)
 /* C6EF00 80240BD0 460010A1 */  cvt.d.s   $f2, $f2
 /* C6EF04 80240BD4 46201082 */  mul.d     $f2, $f2, $f0
 /* C6EF08 80240BD8 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241474_C6F7A4.s b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241474_C6F7A4.s
index 2612824851..5a388ecda8 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241474_C6F7A4.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241474_C6F7A4.s
@@ -15,9 +15,9 @@ glabel func_80241474_C6F7A4
 /* C6F7CC 8024149C 00031C00 */  sll       $v1, $v1, 0x10
 /* C6F7D0 802414A0 00031B83 */  sra       $v1, $v1, 0xe
 /* C6F7D4 802414A4 A444008E */  sh        $a0, 0x8e($v0)
-/* C6F7D8 802414A8 3C018024 */  lui       $at, 0x8024
+/* C6F7D8 802414A8 3C018024 */  lui       $at, %hi(D_80242B90)
 /* C6F7DC 802414AC 00230821 */  addu      $at, $at, $v1
-/* C6F7E0 802414B0 C4222B90 */  lwc1      $f2, 0x2b90($at)
+/* C6F7E0 802414B0 C4222B90 */  lwc1      $f2, %lo(D_80242B90)($at)
 /* C6F7E4 802414B4 8443008E */  lh        $v1, 0x8e($v0)
 /* C6F7E8 802414B8 46020000 */  add.s     $f0, $f0, $f2
 /* C6F7EC 802414BC 28630005 */  slti      $v1, $v1, 5
diff --git a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241B2C_C6FE5C.s b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241B2C_C6FE5C.s
index f872e97836..7fe27c568c 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241B2C_C6FE5C.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241B2C_C6FE5C.s
@@ -66,9 +66,9 @@ glabel func_80241B2C_C6FE5C
 /* C6FF48 80241C18 2C62000F */  sltiu     $v0, $v1, 0xf
 /* C6FF4C 80241C1C 10400034 */  beqz      $v0, .L80241CF0
 /* C6FF50 80241C20 00031080 */   sll      $v0, $v1, 2
-/* C6FF54 80241C24 3C018024 */  lui       $at, 0x8024
+/* C6FF54 80241C24 3C018024 */  lui       $at, %hi(D_802430A8)
 /* C6FF58 80241C28 00220821 */  addu      $at, $at, $v0
-/* C6FF5C 80241C2C 8C2230A8 */  lw        $v0, 0x30a8($at)
+/* C6FF5C 80241C2C 8C2230A8 */  lw        $v0, %lo(D_802430A8)($at)
 /* C6FF60 80241C30 00400008 */  jr        $v0
 /* C6FF64 80241C34 00000000 */   nop      
 /* C6FF68 80241C38 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241E48_C70178.s b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241E48_C70178.s
index e2877f7853..706c616ba0 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241E48_C70178.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241E48_C70178.s
@@ -142,8 +142,8 @@ glabel func_80241E48_C70178
 /* C70390 80242060 4500000A */  bc1f      .L8024208C
 /* C70394 80242064 00000000 */   nop      
 .L80242068:
-/* C70398 80242068 3C018024 */  lui       $at, 0x8024
-/* C7039C 8024206C D42230E8 */  ldc1      $f2, 0x30e8($at)
+/* C70398 80242068 3C018024 */  lui       $at, %hi(D_802430E8)
+/* C7039C 8024206C D42230E8 */  ldc1      $f2, %lo(D_802430E8)($at)
 /* C703A0 80242070 46003187 */  neg.s     $f6, $f6
 /* C703A4 80242074 46003021 */  cvt.d.s   $f0, $f6
 /* C703A8 80242078 46220002 */  mul.d     $f0, $f0, $f2
diff --git a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80242124_C70454.s b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80242124_C70454.s
index cf67ad9b02..dfec695b81 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80242124_C70454.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80242124_C70454.s
@@ -67,9 +67,9 @@ glabel func_80242124_C70454
 /* C70544 80242214 2C620015 */  sltiu     $v0, $v1, 0x15
 /* C70548 80242218 10400032 */  beqz      $v0, .L802422E4
 /* C7054C 8024221C 00031080 */   sll      $v0, $v1, 2
-/* C70550 80242220 3C018024 */  lui       $at, 0x8024
+/* C70550 80242220 3C018024 */  lui       $at, %hi(D_802430F0)
 /* C70554 80242224 00220821 */  addu      $at, $at, $v0
-/* C70558 80242228 8C2230F0 */  lw        $v0, 0x30f0($at)
+/* C70558 80242228 8C2230F0 */  lw        $v0, %lo(D_802430F0)($at)
 /* C7055C 8024222C 00400008 */  jr        $v0
 /* C70560 80242230 00000000 */   nop      
 /* C70564 80242234 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71480/func_80240000_C71480.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71480/func_80240000_C71480.s
index 3b60dfa74a..c774a80133 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_08/C71480/func_80240000_C71480.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71480/func_80240000_C71480.s
@@ -61,8 +61,8 @@ glabel func_80240000_C71480
 /* C71550 802400D0 1440FFF7 */  bnez      $v0, .L802400B0
 /* C71554 802400D4 26310004 */   addiu    $s1, $s1, 4
 .L802400D8:
-/* C71558 802400D8 3C028024 */  lui       $v0, 0x8024
-/* C7155C 802400DC 24424170 */  addiu     $v0, $v0, 0x4170
+/* C71558 802400D8 3C028024 */  lui       $v0, %hi(D_80244170)
+/* C7155C 802400DC 24424170 */  addiu     $v0, $v0, %lo(D_80244170)
 /* C71560 802400E0 C4420000 */  lwc1      $f2, ($v0)
 /* C71564 802400E4 3C013F80 */  lui       $at, 0x3f80
 /* C71568 802400E8 44810000 */  mtc1      $at, $f0
@@ -128,8 +128,8 @@ glabel func_80240000_C71480
 /* C71644 802401C4 3C05FD05 */  lui       $a1, 0xfd05
 /* C71648 802401C8 0C0B210B */  jal       get_float_variable
 /* C7164C 802401CC 34A50F80 */   ori      $a1, $a1, 0xf80
-/* C71650 802401D0 3C018024 */  lui       $at, 0x8024
-/* C71654 802401D4 D42255D0 */  ldc1      $f2, 0x55d0($at)
+/* C71650 802401D0 3C018024 */  lui       $at, %hi(D_802455D0)
+/* C71654 802401D4 D42255D0 */  ldc1      $f2, %lo(D_802455D0)($at)
 /* C71658 802401D8 46000021 */  cvt.d.s   $f0, $f0
 /* C7165C 802401DC 46220002 */  mul.d     $f0, $f0, $f2
 /* C71660 802401E0 00000000 */  nop       
@@ -154,8 +154,8 @@ glabel func_80240000_C71480
 /* C716A4 80240224 4481B000 */  mtc1      $at, $f22
 /* C716A8 80240228 241103CA */  addiu     $s1, $zero, 0x3ca
 .L8024022C:
-/* C716AC 8024022C 3C108024 */  lui       $s0, 0x8024
-/* C716B0 80240230 26104170 */  addiu     $s0, $s0, 0x4170
+/* C716AC 8024022C 3C108024 */  lui       $s0, %hi(D_80244170)
+/* C716B0 80240230 26104170 */  addiu     $s0, $s0, %lo(D_80244170)
 /* C716B4 80240234 C6000000 */  lwc1      $f0, ($s0)
 /* C716B8 80240238 3C014040 */  lui       $at, 0x4040
 /* C716BC 8024023C 44816000 */  mtc1      $at, $f12
diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71C10/func_80240790_C71C10.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71C10/func_80240790_C71C10.s
index ac25c7e1f5..ed1b24818e 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_08/C71C10/func_80240790_C71C10.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71C10/func_80240790_C71C10.s
@@ -4,8 +4,8 @@
 glabel func_80240790_C71C10
 /* C71C10 80240790 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* C71C14 80240794 AFB00010 */  sw        $s0, 0x10($sp)
-/* C71C18 80240798 3C108024 */  lui       $s0, 0x8024
-/* C71C1C 8024079C 26104BB0 */  addiu     $s0, $s0, 0x4bb0
+/* C71C18 80240798 3C108024 */  lui       $s0, %hi(D_80244BB0)
+/* C71C1C 8024079C 26104BB0 */  addiu     $s0, $s0, %lo(D_80244BB0)
 /* C71C20 802407A0 AFBF0018 */  sw        $ra, 0x18($sp)
 /* C71C24 802407A4 AFB10014 */  sw        $s1, 0x14($sp)
 /* C71C28 802407A8 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_80240790_C71C10
 /* C71C8C 8024080C 28620010 */  slti      $v0, $v1, 0x10
 /* C71C90 80240810 1440FFFA */  bnez      $v0, .L802407FC
 /* C71C94 80240814 24840004 */   addiu    $a0, $a0, 4
-/* C71C98 80240818 3C108024 */  lui       $s0, 0x8024
-/* C71C9C 8024081C 26104BB0 */  addiu     $s0, $s0, 0x4bb0
+/* C71C98 80240818 3C108024 */  lui       $s0, %hi(D_80244BB0)
+/* C71C9C 8024081C 26104BB0 */  addiu     $s0, $s0, %lo(D_80244BB0)
 /* C71CA0 80240820 0C00AB4B */  jal       heap_free
 /* C71CA4 80240824 8E040000 */   lw       $a0, ($s0)
 /* C71CA8 80240828 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80240A50_C71ED0.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80240A50_C71ED0.s
index 7a17d0a799..3d1e50c263 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80240A50_C71ED0.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80240A50_C71ED0.s
@@ -87,8 +87,8 @@ glabel func_80240A50_C71ED0
 /* C72010 80240B90 080902EE */  j         .L80240BB8
 /* C72014 80240B94 E6000018 */   swc1     $f0, 0x18($s0)
 .L80240B98:
-/* C72018 80240B98 3C018024 */  lui       $at, 0x8024
-/* C7201C 80240B9C D42255E0 */  ldc1      $f2, 0x55e0($at)
+/* C72018 80240B98 3C018024 */  lui       $at, %hi(D_802455E0)
+/* C7201C 80240B9C D42255E0 */  ldc1      $f2, %lo(D_802455E0)($at)
 /* C72020 80240BA0 44820000 */  mtc1      $v0, $f0
 /* C72024 80240BA4 00000000 */  nop       
 /* C72028 80240BA8 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80240C00_C72080.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80240C00_C72080.s
index 2e92dfa671..6cfdbfef16 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80240C00_C72080.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80240C00_C72080.s
@@ -104,8 +104,8 @@ glabel func_80240C00_C72080
 /* C72204 80240D84 1040000A */  beqz      $v0, .L80240DB0
 /* C72208 80240D88 4600C106 */   mov.s    $f4, $f24
 /* C7220C 80240D8C 4614C081 */  sub.s     $f2, $f24, $f20
-/* C72210 80240D90 3C018024 */  lui       $at, 0x8024
-/* C72214 80240D94 D42055E8 */  ldc1      $f0, 0x55e8($at)
+/* C72210 80240D90 3C018024 */  lui       $at, %hi(D_802455E8)
+/* C72214 80240D94 D42055E8 */  ldc1      $f0, %lo(D_802455E8)($at)
 /* C72218 80240D98 460010A1 */  cvt.d.s   $f2, $f2
 /* C7221C 80240D9C 46201082 */  mul.d     $f2, $f2, $f0
 /* C72220 80240DA0 00000000 */  nop       
@@ -131,8 +131,8 @@ glabel func_80240C00_C72080
 /* C7226C 80240DEC C7A4002C */  lwc1      $f4, 0x2c($sp)
 /* C72270 80240DF0 461A2100 */  add.s     $f4, $f4, $f26
 /* C72274 80240DF4 46142081 */  sub.s     $f2, $f4, $f20
-/* C72278 80240DF8 3C018024 */  lui       $at, 0x8024
-/* C7227C 80240DFC D42055F0 */  ldc1      $f0, 0x55f0($at)
+/* C72278 80240DF8 3C018024 */  lui       $at, %hi(D_802455F0)
+/* C7227C 80240DFC D42055F0 */  ldc1      $f0, %lo(D_802455F0)($at)
 /* C72280 80240E00 460010A1 */  cvt.d.s   $f2, $f2
 /* C72284 80240E04 46201082 */  mul.d     $f2, $f2, $f0
 /* C72288 80240E08 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802416A4_C72B24.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802416A4_C72B24.s
index e6aeadc061..733528f34c 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802416A4_C72B24.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802416A4_C72B24.s
@@ -15,9 +15,9 @@ glabel func_802416A4_C72B24
 /* C72B4C 802416CC 00031C00 */  sll       $v1, $v1, 0x10
 /* C72B50 802416D0 00031B83 */  sra       $v1, $v1, 0xe
 /* C72B54 802416D4 A444008E */  sh        $a0, 0x8e($v0)
-/* C72B58 802416D8 3C018024 */  lui       $at, 0x8024
+/* C72B58 802416D8 3C018024 */  lui       $at, %hi(D_80244DA0)
 /* C72B5C 802416DC 00230821 */  addu      $at, $at, $v1
-/* C72B60 802416E0 C4224DA0 */  lwc1      $f2, 0x4da0($at)
+/* C72B60 802416E0 C4224DA0 */  lwc1      $f2, %lo(D_80244DA0)($at)
 /* C72B64 802416E4 8443008E */  lh        $v1, 0x8e($v0)
 /* C72B68 802416E8 46020000 */  add.s     $f0, $f0, $f2
 /* C72B6C 802416EC 28630005 */  slti      $v1, $v1, 5
diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241D5C_C731DC.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241D5C_C731DC.s
index 79b5cce549..6c0e25e345 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241D5C_C731DC.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241D5C_C731DC.s
@@ -66,9 +66,9 @@ glabel func_80241D5C_C731DC
 /* C732C8 80241E48 2C62000F */  sltiu     $v0, $v1, 0xf
 /* C732CC 80241E4C 10400034 */  beqz      $v0, .L80241F20
 /* C732D0 80241E50 00031080 */   sll      $v0, $v1, 2
-/* C732D4 80241E54 3C018024 */  lui       $at, 0x8024
+/* C732D4 80241E54 3C018024 */  lui       $at, %hi(D_802455F8)
 /* C732D8 80241E58 00220821 */  addu      $at, $at, $v0
-/* C732DC 80241E5C 8C2255F8 */  lw        $v0, 0x55f8($at)
+/* C732DC 80241E5C 8C2255F8 */  lw        $v0, %lo(D_802455F8)($at)
 /* C732E0 80241E60 00400008 */  jr        $v0
 /* C732E4 80241E64 00000000 */   nop      
 /* C732E8 80241E68 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242078_C734F8.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242078_C734F8.s
index ea2bd96e46..4635c65b02 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242078_C734F8.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242078_C734F8.s
@@ -142,8 +142,8 @@ glabel func_80242078_C734F8
 /* C73710 80242290 4500000A */  bc1f      .L802422BC
 /* C73714 80242294 00000000 */   nop      
 .L80242298:
-/* C73718 80242298 3C018024 */  lui       $at, 0x8024
-/* C7371C 8024229C D4225638 */  ldc1      $f2, 0x5638($at)
+/* C73718 80242298 3C018024 */  lui       $at, %hi(D_80245638)
+/* C7371C 8024229C D4225638 */  ldc1      $f2, %lo(D_80245638)($at)
 /* C73720 802422A0 46003187 */  neg.s     $f6, $f6
 /* C73724 802422A4 46003021 */  cvt.d.s   $f0, $f6
 /* C73728 802422A8 46220002 */  mul.d     $f0, $f0, $f2
diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242354_C737D4.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242354_C737D4.s
index d6f7fffcbe..73ff0fecad 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242354_C737D4.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242354_C737D4.s
@@ -67,9 +67,9 @@ glabel func_80242354_C737D4
 /* C738C4 80242444 2C620015 */  sltiu     $v0, $v1, 0x15
 /* C738C8 80242448 10400032 */  beqz      $v0, .L80242514
 /* C738CC 8024244C 00031080 */   sll      $v0, $v1, 2
-/* C738D0 80242450 3C018024 */  lui       $at, 0x8024
+/* C738D0 80242450 3C018024 */  lui       $at, %hi(D_80245640)
 /* C738D4 80242454 00220821 */  addu      $at, $at, $v0
-/* C738D8 80242458 8C225640 */  lw        $v0, 0x5640($at)
+/* C738D8 80242458 8C225640 */  lw        $v0, %lo(D_80245640)($at)
 /* C738DC 8024245C 00400008 */  jr        $v0
 /* C738E0 80242460 00000000 */   nop      
 /* C738E4 80242464 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242744_C73BC4.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242744_C73BC4.s
index 474089ec19..0ed7125a2d 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242744_C73BC4.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242744_C73BC4.s
@@ -18,8 +18,8 @@ glabel func_80242744_C73BC4
 /* C73BF8 80242778 0040802D */  daddu     $s0, $v0, $zero
 /* C73BFC 8024277C 3C05800B */  lui       $a1, %hi(gCameras)
 /* C73C00 80242780 24A51D80 */  addiu     $a1, $a1, %lo(gCameras)
-/* C73C04 80242784 3C03800A */  lui       $v1, 0x800a
-/* C73C08 80242788 8463A634 */  lh        $v1, -0x59cc($v1)
+/* C73C04 80242784 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* C73C08 80242788 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* C73C0C 8024278C 00912021 */  addu      $a0, $a0, $s1
 /* C73C10 80242790 00031080 */  sll       $v0, $v1, 2
 /* C73C14 80242794 00431021 */  addu      $v0, $v0, $v1
@@ -54,8 +54,8 @@ glabel func_80242744_C73BC4
 /* C73C84 80242804 00000000 */   nop      
 /* C73C88 80242808 0C00A6C9 */  jal       clamp_angle
 /* C73C8C 8024280C 46000306 */   mov.s    $f12, $f0
-/* C73C90 80242810 3C018024 */  lui       $at, 0x8024
-/* C73C94 80242814 D4225698 */  ldc1      $f2, 0x5698($at)
+/* C73C90 80242810 3C018024 */  lui       $at, %hi(D_80245698)
+/* C73C94 80242814 D4225698 */  ldc1      $f2, %lo(D_80245698)($at)
 /* C73C98 80242818 46000021 */  cvt.d.s   $f0, $f0
 /* C73C9C 8024281C 4622003C */  c.lt.d    $f0, $f2
 /* C73CA0 80242820 00000000 */  nop       
@@ -97,8 +97,8 @@ glabel func_80242744_C73BC4
 /* C73D28 802428A8 45030001 */  bc1tl     .L802428B0
 /* C73D2C 802428AC 0000882D */   daddu    $s1, $zero, $zero
 .L802428B0:
-/* C73D30 802428B0 3C038011 */  lui       $v1, 0x8011
-/* C73D34 802428B4 8063EBB3 */  lb        $v1, -0x144d($v1)
+/* C73D30 802428B0 3C038011 */  lui       $v1, %hi(D_8010EBB3)
+/* C73D34 802428B4 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
 /* C73D38 802428B8 24020009 */  addiu     $v0, $zero, 9
 /* C73D3C 802428BC 50620001 */  beql      $v1, $v0, .L802428C4
 /* C73D40 802428C0 0000882D */   daddu    $s1, $zero, $zero
diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242B58_C73FD8.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242B58_C73FD8.s
index e082250bc0..5c55747692 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242B58_C73FD8.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242B58_C73FD8.s
@@ -100,9 +100,9 @@ glabel func_80242B58_C73FD8
 /* C7413C 80242CBC 2C620064 */  sltiu     $v0, $v1, 0x64
 /* C74140 80242CC0 10400048 */  beqz      $v0, .L80242DE4
 /* C74144 80242CC4 00031080 */   sll      $v0, $v1, 2
-/* C74148 80242CC8 3C018024 */  lui       $at, 0x8024
+/* C74148 80242CC8 3C018024 */  lui       $at, %hi(D_802456A0)
 /* C7414C 80242CCC 00220821 */  addu      $at, $at, $v0
-/* C74150 80242CD0 8C2256A0 */  lw        $v0, 0x56a0($at)
+/* C74150 80242CD0 8C2256A0 */  lw        $v0, %lo(D_802456A0)($at)
 /* C74154 80242CD4 00400008 */  jr        $v0
 /* C74158 80242CD8 00000000 */   nop      
 /* C7415C 80242CDC 0240202D */  daddu     $a0, $s2, $zero
diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242F74_C743F4.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242F74_C743F4.s
index ae5c5f71eb..797489a619 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242F74_C743F4.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242F74_C743F4.s
@@ -62,9 +62,9 @@ glabel func_80242F74_C743F4
 /* C744D4 80243054 000218C0 */  sll       $v1, $v0, 3
 /* C744D8 80243058 00431021 */  addu      $v0, $v0, $v1
 /* C744DC 8024305C 000210C0 */  sll       $v0, $v0, 3
-/* C744E0 80243060 3C01800B */  lui       $at, 0x800b
+/* C744E0 80243060 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* C744E4 80243064 00220821 */  addu      $at, $at, $v0
-/* C744E8 80243068 C4201DEC */  lwc1      $f0, 0x1dec($at)
+/* C744E8 80243068 C4201DEC */  lwc1      $f0, %lo(D_800B1DEC)($at)
 /* C744EC 8024306C 08090C2C */  j         .L802430B0
 /* C744F0 80243070 460C0301 */   sub.s    $f12, $f0, $f12
 .L80243074:
@@ -79,9 +79,9 @@ glabel func_80242F74_C743F4
 /* C74514 80243094 000218C0 */  sll       $v1, $v0, 3
 /* C74518 80243098 00431021 */  addu      $v0, $v0, $v1
 /* C7451C 8024309C 000210C0 */  sll       $v0, $v0, 3
-/* C74520 802430A0 3C01800B */  lui       $at, 0x800b
+/* C74520 802430A0 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* C74524 802430A4 00220821 */  addu      $at, $at, $v0
-/* C74528 802430A8 C4201DEC */  lwc1      $f0, 0x1dec($at)
+/* C74528 802430A8 C4201DEC */  lwc1      $f0, %lo(D_800B1DEC)($at)
 /* C7452C 802430AC 460C0300 */  add.s     $f12, $f0, $f12
 .L802430B0:
 /* C74530 802430B0 0C00A6C9 */  jal       clamp_angle
@@ -157,8 +157,8 @@ glabel func_80242F74_C743F4
 /* C74638 802431B8 1440005D */  bnez      $v0, .L80243330
 /* C7463C 802431BC 00000000 */   nop      
 /* C74640 802431C0 C6200038 */  lwc1      $f0, 0x38($s1)
-/* C74644 802431C4 3C018024 */  lui       $at, 0x8024
-/* C74648 802431C8 D4245830 */  ldc1      $f4, 0x5830($at)
+/* C74644 802431C4 3C018024 */  lui       $at, %hi(D_80245830)
+/* C74648 802431C8 D4245830 */  ldc1      $f4, %lo(D_80245830)($at)
 /* C7464C 802431CC 46000021 */  cvt.d.s   $f0, $f0
 /* C74650 802431D0 4620203C */  c.lt.d    $f4, $f0
 /* C74654 802431D4 00000000 */  nop       
@@ -170,8 +170,8 @@ glabel func_80242F74_C743F4
 /* C7466C 802431EC E6200038 */  swc1      $f0, 0x38($s1)
 .L802431F0:
 /* C74670 802431F0 C6200038 */  lwc1      $f0, 0x38($s1)
-/* C74674 802431F4 3C018024 */  lui       $at, 0x8024
-/* C74678 802431F8 D4225838 */  ldc1      $f2, 0x5838($at)
+/* C74674 802431F4 3C018024 */  lui       $at, %hi(D_80245838)
+/* C74678 802431F8 D4225838 */  ldc1      $f2, %lo(D_80245838)($at)
 /* C7467C 802431FC 46000021 */  cvt.d.s   $f0, $f0
 /* C74680 80243200 4622003C */  c.lt.d    $f0, $f2
 /* C74684 80243204 00000000 */  nop       
@@ -228,8 +228,8 @@ glabel func_80242F74_C743F4
 /* C74740 802432C0 4600A386 */   mov.s    $f14, $f20
 /* C74744 802432C4 46000586 */  mov.s     $f22, $f0
 /* C74748 802432C8 C7A20038 */  lwc1      $f2, 0x38($sp)
-/* C7474C 802432CC 3C018024 */  lui       $at, 0x8024
-/* C74750 802432D0 D4205840 */  ldc1      $f0, 0x5840($at)
+/* C7474C 802432CC 3C018024 */  lui       $at, %hi(D_80245840)
+/* C74750 802432D0 D4205840 */  ldc1      $f0, %lo(D_80245840)($at)
 /* C74754 802432D4 460010A1 */  cvt.d.s   $f2, $f2
 /* C74758 802432D8 4620103C */  c.lt.d    $f2, $f0
 /* C7475C 802432DC 00000000 */  nop       
@@ -239,8 +239,8 @@ glabel func_80242F74_C743F4
 /* C7476C 802432EC 08090CC5 */  j         .L80243314
 /* C74770 802432F0 34C68000 */   ori      $a2, $a2, 0x8000
 .L802432F4:
-/* C74774 802432F4 3C018024 */  lui       $at, 0x8024
-/* C74778 802432F8 D4205848 */  ldc1      $f0, 0x5848($at)
+/* C74774 802432F4 3C018024 */  lui       $at, %hi(D_80245848)
+/* C74778 802432F8 D4205848 */  ldc1      $f0, %lo(D_80245848)($at)
 /* C7477C 802432FC 4622003C */  c.lt.d    $f0, $f2
 /* C74780 80243300 00000000 */  nop       
 /* C74784 80243304 450000FA */  bc1f      .L802436F0
@@ -296,8 +296,8 @@ glabel func_80242F74_C743F4
 /* C74844 802433C4 104000CA */  beqz      $v0, .L802436F0
 /* C74848 802433C8 0280282D */   daddu    $a1, $s4, $zero
 /* C7484C 802433CC 8EA20000 */  lw        $v0, ($s5)
-/* C74850 802433D0 3C018024 */  lui       $at, 0x8024
-/* C74854 802433D4 D4225850 */  ldc1      $f2, 0x5850($at)
+/* C74850 802433D0 3C018024 */  lui       $at, %hi(D_80245850)
+/* C74854 802433D4 D4225850 */  ldc1      $f2, %lo(D_80245850)($at)
 /* C74858 802433D8 C440002C */  lwc1      $f0, 0x2c($v0)
 /* C7485C 802433DC C4460028 */  lwc1      $f6, 0x28($v0)
 /* C74860 802433E0 C4440030 */  lwc1      $f4, 0x30($v0)
@@ -633,8 +633,8 @@ glabel func_80242F74_C743F4
 /* C74D5C 802438DC 44813000 */  mtc1      $at, $f6
 /* C74D60 802438E0 46000021 */  cvt.d.s   $f0, $f0
 /* C74D64 802438E4 E7A20020 */  swc1      $f2, 0x20($sp)
-/* C74D68 802438E8 3C018024 */  lui       $at, 0x8024
-/* C74D6C 802438EC D4225858 */  ldc1      $f2, 0x5858($at)
+/* C74D68 802438E8 3C018024 */  lui       $at, %hi(D_80245858)
+/* C74D6C 802438EC D4225858 */  ldc1      $f2, %lo(D_80245858)($at)
 /* C74D70 802438F0 C6240040 */  lwc1      $f4, 0x40($s1)
 /* C74D74 802438F4 46220000 */  add.d     $f0, $f0, $f2
 /* C74D78 802438F8 E7A60038 */  swc1      $f6, 0x38($sp)
diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_802401CC_C76EAC.s b/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_802401CC_C76EAC.s
index 70b1634e72..ef6d60b1b3 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_802401CC_C76EAC.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_802401CC_C76EAC.s
@@ -22,12 +22,12 @@ glabel func_802401CC_C76EAC
 /* C76EF0 80240210 0040982D */  daddu     $s3, $v0, $zero
 /* C76EF4 80240214 0000B02D */  daddu     $s6, $zero, $zero
 /* C76EF8 80240218 02C0902D */  daddu     $s2, $s6, $zero
-/* C76EFC 8024021C 3C148024 */  lui       $s4, 0x8024
-/* C76F00 80240220 26943D08 */  addiu     $s4, $s4, 0x3d08
+/* C76EFC 8024021C 3C148024 */  lui       $s4, %hi(D_80243D08)
+/* C76F00 80240220 26943D08 */  addiu     $s4, $s4, %lo(D_80243D08)
 /* C76F04 80240224 0260882D */  daddu     $s1, $s3, $zero
 /* C76F08 80240228 8EA200B4 */  lw        $v0, 0xb4($s5)
-/* C76F0C 8024022C 3C038024 */  lui       $v1, 0x8024
-/* C76F10 80240230 24633D00 */  addiu     $v1, $v1, 0x3d00
+/* C76F0C 8024022C 3C038024 */  lui       $v1, %hi(D_80243D00)
+/* C76F10 80240230 24633D00 */  addiu     $v1, $v1, %lo(D_80243D00)
 /* C76F14 80240234 AEB30078 */  sw        $s3, 0x78($s5)
 /* C76F18 80240238 00021027 */  nor       $v0, $zero, $v0
 /* C76F1C 8024023C 0002BFC2 */  srl       $s7, $v0, 0x1f
@@ -42,8 +42,8 @@ glabel func_802401CC_C76EAC
 /* C76F3C 8024025C 5040002E */  beql      $v0, $zero, .L80240318
 /* C76F40 80240260 26520001 */   addiu    $s2, $s2, 1
 /* C76F44 80240264 00101100 */  sll       $v0, $s0, 4
-/* C76F48 80240268 3C068009 */  lui       $a2, 0x8009
-/* C76F4C 8024026C 24C6EF20 */  addiu     $a2, $a2, -0x10e0
+/* C76F48 80240268 3C068009 */  lui       $a2, %hi(D_8008EF20)
+/* C76F4C 8024026C 24C6EF20 */  addiu     $a2, $a2, %lo(D_8008EF20)
 /* C76F50 80240270 00461021 */  addu      $v0, $v0, $a2
 /* C76F54 80240274 0200202D */  daddu     $a0, $s0, $zero
 /* C76F58 80240278 AE300108 */  sw        $s0, 0x108($s1)
@@ -54,15 +54,15 @@ glabel func_802401CC_C76EAC
 /* C76F6C 8024028C 0040202D */  daddu     $a0, $v0, $zero
 /* C76F70 80240290 04800011 */  bltz      $a0, .L802402D8
 /* C76F74 80240294 00101080 */   sll      $v0, $s0, 2
-/* C76F78 80240298 3C06800F */  lui       $a2, 0x800f
-/* C76F7C 8024029C 24C67F00 */  addiu     $a2, $a2, 0x7f00
+/* C76F78 80240298 3C06800F */  lui       $a2, %hi(D_800F7F00)
+/* C76F7C 8024029C 24C67F00 */  addiu     $a2, $a2, %lo(D_800F7F00)
 /* C76F80 802402A0 00461021 */  addu      $v0, $v0, $a2
 /* C76F84 802402A4 8C430000 */  lw        $v1, ($v0)
 /* C76F88 802402A8 24020001 */  addiu     $v0, $zero, 1
 /* C76F8C 802402AC AE22018C */  sw        $v0, 0x18c($s1)
 /* C76F90 802402B0 00041080 */  sll       $v0, $a0, 2
-/* C76F94 802402B4 3C068024 */  lui       $a2, 0x8024
-/* C76F98 802402B8 24C63D18 */  addiu     $a2, $a2, 0x3d18
+/* C76F94 802402B4 3C068024 */  lui       $a2, %hi(D_80243D18)
+/* C76F98 802402B8 24C63D18 */  addiu     $a2, $a2, %lo(D_80243D18)
 /* C76F9C 802402BC AE230000 */  sw        $v1, ($s1)
 /* C76FA0 802402C0 001218C0 */  sll       $v1, $s2, 3
 /* C76FA4 802402C4 00431021 */  addu      $v0, $v0, $v1
@@ -71,8 +71,8 @@ glabel func_802401CC_C76EAC
 /* C76FB0 802402D0 080900BF */  j         .L802402FC
 /* C76FB4 802402D4 AE220294 */   sw       $v0, 0x294($s1)
 .L802402D8:
-/* C76FB8 802402D8 3C06800F */  lui       $a2, 0x800f
-/* C76FBC 802402DC 24C67F40 */  addiu     $a2, $a2, 0x7f40
+/* C76FB8 802402D8 3C06800F */  lui       $a2, %hi(D_800F7F40)
+/* C76FBC 802402DC 24C67F40 */  addiu     $a2, $a2, %lo(D_800F7F40)
 /* C76FC0 802402E0 00461021 */  addu      $v0, $v0, $a2
 /* C76FC4 802402E4 8C420000 */  lw        $v0, ($v0)
 /* C76FC8 802402E8 AE20018C */  sw        $zero, 0x18c($s1)
@@ -130,9 +130,9 @@ glabel func_802401CC_C76EAC
 /* C77080 802403A0 02621021 */  addu      $v0, $s3, $v0
 /* C77084 802403A4 8C420108 */  lw        $v0, 0x108($v0)
 /* C77088 802403A8 00021100 */  sll       $v0, $v0, 4
-/* C7708C 802403AC 3C038009 */  lui       $v1, 0x8009
+/* C7708C 802403AC 3C038009 */  lui       $v1, %hi(D_8008EF20)
 /* C77090 802403B0 00621821 */  addu      $v1, $v1, $v0
-/* C77094 802403B4 8C63EF20 */  lw        $v1, -0x10e0($v1)
+/* C77094 802403B4 8C63EF20 */  lw        $v1, %lo(D_8008EF20)($v1)
 /* C77098 802403B8 8EA20074 */  lw        $v0, 0x74($s5)
 /* C7709C 802403BC 2442FFFF */  addiu     $v0, $v0, -1
 /* C770A0 802403C0 00021080 */  sll       $v0, $v0, 2
diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240448_C77128.s b/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240448_C77128.s
index 82da4bb2f8..1cdae6f2a5 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240448_C77128.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240448_C77128.s
@@ -7,9 +7,9 @@ glabel func_80240448_C77128
 /* C77130 80240450 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* C77134 80240454 AFBF0010 */  sw        $ra, 0x10($sp)
 /* C77138 80240458 00021100 */  sll       $v0, $v0, 4
-/* C7713C 8024045C 3C048009 */  lui       $a0, 0x8009
+/* C7713C 8024045C 3C048009 */  lui       $a0, %hi(D_8008EF20)
 /* C77140 80240460 00822021 */  addu      $a0, $a0, $v0
-/* C77144 80240464 8C84EF20 */  lw        $a0, -0x10e0($a0)
+/* C77144 80240464 8C84EF20 */  lw        $a0, %lo(D_8008EF20)($a0)
 /* C77148 80240468 0C0496CF */  jal       set_message_string
 /* C7714C 8024046C 0000282D */   daddu    $a1, $zero, $zero
 /* C77150 80240470 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240600_C772E0.s b/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240600_C772E0.s
index 9947f93d3a..1daa6c6089 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240600_C772E0.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240600_C772E0.s
@@ -30,9 +30,9 @@ glabel func_80240600_C772E0
 /* C77344 80240664 000320C0 */  sll       $a0, $v1, 3
 /* C77348 80240668 00641821 */  addu      $v1, $v1, $a0
 /* C7734C 8024066C 000318C0 */  sll       $v1, $v1, 3
-/* C77350 80240670 3C01800B */  lui       $at, 0x800b
+/* C77350 80240670 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* C77354 80240674 00230821 */  addu      $at, $at, $v1
-/* C77358 80240678 C42C1DEC */  lwc1      $f12, 0x1dec($at)
+/* C77358 80240678 C42C1DEC */  lwc1      $f12, %lo(D_800B1DEC)($at)
 /* C7735C 8024067C 0C00A88D */  jal       sin_cos_deg
 /* C77360 80240680 0040A82D */   daddu    $s5, $v0, $zero
 /* C77364 80240684 1200005D */  beqz      $s0, .L802407FC
@@ -79,8 +79,8 @@ glabel func_80240600_C772E0
 /* C77404 80240724 26100004 */   addiu    $s0, $s0, 4
 /* C77408 80240728 0000882D */  daddu     $s1, $zero, $zero
 /* C7740C 8024072C 0240802D */  daddu     $s0, $s2, $zero
-/* C77410 80240730 3C148024 */  lui       $s4, 0x8024
-/* C77414 80240734 26943D58 */  addiu     $s4, $s4, 0x3d58
+/* C77410 80240730 3C148024 */  lui       $s4, %hi(D_80243D58)
+/* C77414 80240734 26943D58 */  addiu     $s4, $s4, %lo(D_80243D58)
 /* C77418 80240738 3C014248 */  lui       $at, 0x4248
 /* C7741C 8024073C 4481A000 */  mtc1      $at, $f20
 /* C77420 80240740 24130044 */  addiu     $s3, $zero, 0x44
@@ -150,8 +150,8 @@ glabel func_80240600_C772E0
 /* C77514 80240834 00000000 */   nop      
 .L80240838:
 /* C77518 80240838 0000882D */  daddu     $s1, $zero, $zero
-/* C7751C 8024083C 3C148024 */  lui       $s4, 0x8024
-/* C77520 80240840 26943D58 */  addiu     $s4, $s4, 0x3d58
+/* C7751C 8024083C 3C148024 */  lui       $s4, %hi(D_80243D58)
+/* C77520 80240840 26943D58 */  addiu     $s4, $s4, %lo(D_80243D58)
 /* C77524 80240844 24130020 */  addiu     $s3, $zero, 0x20
 /* C77528 80240848 3C064248 */  lui       $a2, 0x4248
 /* C7752C 8024084C 44800000 */  mtc1      $zero, $f0
@@ -197,8 +197,8 @@ glabel func_80240600_C772E0
 /* C775C8 802408E8 AE400060 */   sw       $zero, 0x60($s2)
 .L802408EC:
 /* C775CC 802408EC 0000882D */  daddu     $s1, $zero, $zero
-/* C775D0 802408F0 3C148024 */  lui       $s4, 0x8024
-/* C775D4 802408F4 26943D58 */  addiu     $s4, $s4, 0x3d58
+/* C775D0 802408F0 3C148024 */  lui       $s4, %hi(D_80243D58)
+/* C775D4 802408F4 26943D58 */  addiu     $s4, $s4, %lo(D_80243D58)
 /* C775D8 802408F8 24130020 */  addiu     $s3, $zero, 0x20
 /* C775DC 802408FC 0240802D */  daddu     $s0, $s2, $zero
 /* C775E0 80240900 3C014248 */  lui       $at, 0x4248
diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80241228_C77F08.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80241228_C77F08.s
index 29d8b067b6..25bfe6d0b1 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80241228_C77F08.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80241228_C77F08.s
@@ -18,8 +18,8 @@ glabel func_80241228_C77F08
 /* C77F3C 8024125C 0040802D */  daddu     $s0, $v0, $zero
 /* C77F40 80241260 3C05800B */  lui       $a1, %hi(gCameras)
 /* C77F44 80241264 24A51D80 */  addiu     $a1, $a1, %lo(gCameras)
-/* C77F48 80241268 3C03800A */  lui       $v1, 0x800a
-/* C77F4C 8024126C 8463A634 */  lh        $v1, -0x59cc($v1)
+/* C77F48 80241268 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* C77F4C 8024126C 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* C77F50 80241270 00912021 */  addu      $a0, $a0, $s1
 /* C77F54 80241274 00031080 */  sll       $v0, $v1, 2
 /* C77F58 80241278 00431021 */  addu      $v0, $v0, $v1
@@ -97,8 +97,8 @@ glabel func_80241228_C77F08
 /* C7806C 8024138C 45030001 */  bc1tl     .L80241394
 /* C78070 80241390 0000882D */   daddu    $s1, $zero, $zero
 .L80241394:
-/* C78074 80241394 3C038011 */  lui       $v1, 0x8011
-/* C78078 80241398 8063EBB3 */  lb        $v1, -0x144d($v1)
+/* C78074 80241394 3C038011 */  lui       $v1, %hi(D_8010EBB3)
+/* C78078 80241398 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
 /* C7807C 8024139C 24020009 */  addiu     $v0, $zero, 9
 /* C78080 802413A0 50620001 */  beql      $v1, $v0, .L802413A8
 /* C78084 802413A4 0000882D */   daddu    $s1, $zero, $zero
diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024163C_C7831C.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024163C_C7831C.s
index 16c4e99e83..2b3ad0ccee 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024163C_C7831C.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024163C_C7831C.s
@@ -100,9 +100,9 @@ glabel func_8024163C_C7831C
 /* C78480 802417A0 2C620064 */  sltiu     $v0, $v1, 0x64
 /* C78484 802417A4 10400048 */  beqz      $v0, .L802418C8
 /* C78488 802417A8 00031080 */   sll      $v0, $v1, 2
-/* C7848C 802417AC 3C018024 */  lui       $at, 0x8024
+/* C7848C 802417AC 3C018024 */  lui       $at, %hi(D_80247278)
 /* C78490 802417B0 00220821 */  addu      $at, $at, $v0
-/* C78494 802417B4 8C227278 */  lw        $v0, 0x7278($at)
+/* C78494 802417B4 8C227278 */  lw        $v0, %lo(D_80247278)($at)
 /* C78498 802417B8 00400008 */  jr        $v0
 /* C7849C 802417BC 00000000 */   nop      
 /* C784A0 802417C0 0240202D */  daddu     $a0, $s2, $zero
diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80241A58_C78738.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80241A58_C78738.s
index fd871418f6..37db2e4e56 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80241A58_C78738.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80241A58_C78738.s
@@ -62,9 +62,9 @@ glabel func_80241A58_C78738
 /* C78818 80241B38 000218C0 */  sll       $v1, $v0, 3
 /* C7881C 80241B3C 00431021 */  addu      $v0, $v0, $v1
 /* C78820 80241B40 000210C0 */  sll       $v0, $v0, 3
-/* C78824 80241B44 3C01800B */  lui       $at, 0x800b
+/* C78824 80241B44 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* C78828 80241B48 00220821 */  addu      $at, $at, $v0
-/* C7882C 80241B4C C4201DEC */  lwc1      $f0, 0x1dec($at)
+/* C7882C 80241B4C C4201DEC */  lwc1      $f0, %lo(D_800B1DEC)($at)
 /* C78830 80241B50 080906E5 */  j         .L80241B94
 /* C78834 80241B54 460C0301 */   sub.s    $f12, $f0, $f12
 .L80241B58:
@@ -79,9 +79,9 @@ glabel func_80241A58_C78738
 /* C78858 80241B78 000218C0 */  sll       $v1, $v0, 3
 /* C7885C 80241B7C 00431021 */  addu      $v0, $v0, $v1
 /* C78860 80241B80 000210C0 */  sll       $v0, $v0, 3
-/* C78864 80241B84 3C01800B */  lui       $at, 0x800b
+/* C78864 80241B84 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* C78868 80241B88 00220821 */  addu      $at, $at, $v0
-/* C7886C 80241B8C C4201DEC */  lwc1      $f0, 0x1dec($at)
+/* C7886C 80241B8C C4201DEC */  lwc1      $f0, %lo(D_800B1DEC)($at)
 /* C78870 80241B90 460C0300 */  add.s     $f12, $f0, $f12
 .L80241B94:
 /* C78874 80241B94 0C00A6C9 */  jal       clamp_angle
@@ -157,8 +157,8 @@ glabel func_80241A58_C78738
 /* C7897C 80241C9C 1440005D */  bnez      $v0, .L80241E14
 /* C78980 80241CA0 00000000 */   nop      
 /* C78984 80241CA4 C6200038 */  lwc1      $f0, 0x38($s1)
-/* C78988 80241CA8 3C018024 */  lui       $at, 0x8024
-/* C7898C 80241CAC D4247408 */  ldc1      $f4, 0x7408($at)
+/* C78988 80241CA8 3C018024 */  lui       $at, %hi(D_80247408)
+/* C7898C 80241CAC D4247408 */  ldc1      $f4, %lo(D_80247408)($at)
 /* C78990 80241CB0 46000021 */  cvt.d.s   $f0, $f0
 /* C78994 80241CB4 4620203C */  c.lt.d    $f4, $f0
 /* C78998 80241CB8 00000000 */  nop       
@@ -170,8 +170,8 @@ glabel func_80241A58_C78738
 /* C789B0 80241CD0 E6200038 */  swc1      $f0, 0x38($s1)
 .L80241CD4:
 /* C789B4 80241CD4 C6200038 */  lwc1      $f0, 0x38($s1)
-/* C789B8 80241CD8 3C018024 */  lui       $at, 0x8024
-/* C789BC 80241CDC D4227410 */  ldc1      $f2, 0x7410($at)
+/* C789B8 80241CD8 3C018024 */  lui       $at, %hi(D_80247410)
+/* C789BC 80241CDC D4227410 */  ldc1      $f2, %lo(D_80247410)($at)
 /* C789C0 80241CE0 46000021 */  cvt.d.s   $f0, $f0
 /* C789C4 80241CE4 4622003C */  c.lt.d    $f0, $f2
 /* C789C8 80241CE8 00000000 */  nop       
@@ -228,8 +228,8 @@ glabel func_80241A58_C78738
 /* C78A84 80241DA4 4600A386 */   mov.s    $f14, $f20
 /* C78A88 80241DA8 46000586 */  mov.s     $f22, $f0
 /* C78A8C 80241DAC C7A20038 */  lwc1      $f2, 0x38($sp)
-/* C78A90 80241DB0 3C018024 */  lui       $at, 0x8024
-/* C78A94 80241DB4 D4207418 */  ldc1      $f0, 0x7418($at)
+/* C78A90 80241DB0 3C018024 */  lui       $at, %hi(D_80247418)
+/* C78A94 80241DB4 D4207418 */  ldc1      $f0, %lo(D_80247418)($at)
 /* C78A98 80241DB8 460010A1 */  cvt.d.s   $f2, $f2
 /* C78A9C 80241DBC 4620103C */  c.lt.d    $f2, $f0
 /* C78AA0 80241DC0 00000000 */  nop       
@@ -239,8 +239,8 @@ glabel func_80241A58_C78738
 /* C78AB0 80241DD0 0809077E */  j         .L80241DF8
 /* C78AB4 80241DD4 34C68000 */   ori      $a2, $a2, 0x8000
 .L80241DD8:
-/* C78AB8 80241DD8 3C018024 */  lui       $at, 0x8024
-/* C78ABC 80241DDC D4207420 */  ldc1      $f0, 0x7420($at)
+/* C78AB8 80241DD8 3C018024 */  lui       $at, %hi(D_80247420)
+/* C78ABC 80241DDC D4207420 */  ldc1      $f0, %lo(D_80247420)($at)
 /* C78AC0 80241DE0 4622003C */  c.lt.d    $f0, $f2
 /* C78AC4 80241DE4 00000000 */  nop       
 /* C78AC8 80241DE8 450000FA */  bc1f      .L802421D4
@@ -296,8 +296,8 @@ glabel func_80241A58_C78738
 /* C78B88 80241EA8 104000CA */  beqz      $v0, .L802421D4
 /* C78B8C 80241EAC 0280282D */   daddu    $a1, $s4, $zero
 /* C78B90 80241EB0 8EA20000 */  lw        $v0, ($s5)
-/* C78B94 80241EB4 3C018024 */  lui       $at, 0x8024
-/* C78B98 80241EB8 D4227428 */  ldc1      $f2, 0x7428($at)
+/* C78B94 80241EB4 3C018024 */  lui       $at, %hi(D_80247428)
+/* C78B98 80241EB8 D4227428 */  ldc1      $f2, %lo(D_80247428)($at)
 /* C78B9C 80241EBC C440002C */  lwc1      $f0, 0x2c($v0)
 /* C78BA0 80241EC0 C4460028 */  lwc1      $f6, 0x28($v0)
 /* C78BA4 80241EC4 C4440030 */  lwc1      $f4, 0x30($v0)
@@ -633,8 +633,8 @@ glabel func_80241A58_C78738
 /* C790A0 802423C0 44813000 */  mtc1      $at, $f6
 /* C790A4 802423C4 46000021 */  cvt.d.s   $f0, $f0
 /* C790A8 802423C8 E7A20020 */  swc1      $f2, 0x20($sp)
-/* C790AC 802423CC 3C018024 */  lui       $at, 0x8024
-/* C790B0 802423D0 D4227430 */  ldc1      $f2, 0x7430($at)
+/* C790AC 802423CC 3C018024 */  lui       $at, %hi(D_80247430)
+/* C790B0 802423D0 D4227430 */  ldc1      $f2, %lo(D_80247430)($at)
 /* C790B4 802423D4 C6240040 */  lwc1      $f4, 0x40($s1)
 /* C790B8 802423D8 46220000 */  add.d     $f0, $f0, $f2
 /* C790BC 802423DC E7A60038 */  swc1      $f6, 0x38($sp)
diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242A40_C79720.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242A40_C79720.s
index ee4eba08f8..b349f12a8c 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242A40_C79720.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242A40_C79720.s
@@ -55,8 +55,8 @@ glabel func_80242A40_C79720
 /* C797DC 80242AFC 8C470030 */   lw       $a3, 0x30($v0)
 /* C797E0 80242B00 C6020018 */  lwc1      $f2, 0x18($s0)
 /* C797E4 80242B04 46020003 */  div.s     $f0, $f0, $f2
-/* C797E8 80242B08 3C018024 */  lui       $at, 0x8024
-/* C797EC 80242B0C D4227438 */  ldc1      $f2, 0x7438($at)
+/* C797E8 80242B08 3C018024 */  lui       $at, %hi(D_80247438)
+/* C797EC 80242B0C D4227438 */  ldc1      $f2, %lo(D_80247438)($at)
 /* C797F0 80242B10 46000021 */  cvt.d.s   $f0, $f0
 /* C797F4 80242B14 46220000 */  add.d     $f0, $f0, $f2
 /* C797F8 80242B18 4620010D */  trunc.w.d $f4, $f0
diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242D58_C79A38.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242D58_C79A38.s
index f627d344ca..ac988f24be 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242D58_C79A38.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242D58_C79A38.s
@@ -279,9 +279,9 @@ glabel func_80242D58_C79A38
 /* C79E24 80243144 2C620015 */  sltiu     $v0, $v1, 0x15
 /* C79E28 80243148 10400009 */  beqz      $v0, .L80243170
 /* C79E2C 8024314C 00031080 */   sll      $v0, $v1, 2
-/* C79E30 80243150 3C018024 */  lui       $at, 0x8024
+/* C79E30 80243150 3C018024 */  lui       $at, %hi(D_80247440)
 /* C79E34 80243154 00220821 */  addu      $at, $at, $v0
-/* C79E38 80243158 8C227440 */  lw        $v0, 0x7440($at)
+/* C79E38 80243158 8C227440 */  lw        $v0, %lo(D_80247440)($at)
 /* C79E3C 8024315C 00400008 */  jr        $v0
 /* C79E40 80243160 00000000 */   nop      
 /* C79E44 80243164 8E420028 */  lw        $v0, 0x28($s2)
diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802432AC_C79F8C.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802432AC_C79F8C.s
index cc8ed5f290..d569372ab5 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802432AC_C79F8C.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802432AC_C79F8C.s
@@ -4,8 +4,8 @@
 glabel func_802432AC_C79F8C
 /* C79F8C 802432AC 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* C79F90 802432B0 AFB00010 */  sw        $s0, 0x10($sp)
-/* C79F94 802432B4 3C108024 */  lui       $s0, 0x8024
-/* C79F98 802432B8 26105250 */  addiu     $s0, $s0, 0x5250
+/* C79F94 802432B4 3C108024 */  lui       $s0, %hi(D_80245250)
+/* C79F98 802432B8 26105250 */  addiu     $s0, $s0, %lo(D_80245250)
 /* C79F9C 802432BC AFBF0018 */  sw        $ra, 0x18($sp)
 /* C79FA0 802432C0 AFB10014 */  sw        $s1, 0x14($sp)
 /* C79FA4 802432C4 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_802432AC_C79F8C
 /* C7A008 80243328 28620010 */  slti      $v0, $v1, 0x10
 /* C7A00C 8024332C 1440FFFA */  bnez      $v0, .L80243318
 /* C7A010 80243330 24840004 */   addiu    $a0, $a0, 4
-/* C7A014 80243334 3C108024 */  lui       $s0, 0x8024
-/* C7A018 80243338 26105250 */  addiu     $s0, $s0, 0x5250
+/* C7A014 80243334 3C108024 */  lui       $s0, %hi(D_80245250)
+/* C7A018 80243338 26105250 */  addiu     $s0, $s0, %lo(D_80245250)
 /* C7A01C 8024333C 0C00AB4B */  jal       heap_free
 /* C7A020 80243340 8E040000 */   lw       $a0, ($s0)
 /* C7A024 80243344 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802435F0_C7A2D0.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802435F0_C7A2D0.s
index 56fa334f09..4697b916c2 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802435F0_C7A2D0.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802435F0_C7A2D0.s
@@ -6,11 +6,11 @@ glabel func_802435F0_C7A2D0
 /* C7A2D4 802435F4 AFBF0010 */  sw        $ra, 0x10($sp)
 /* C7A2D8 802435F8 10A00003 */  beqz      $a1, .L80243608
 /* C7A2DC 802435FC 8C86000C */   lw       $a2, 0xc($a0)
-/* C7A2E0 80243600 3C018024 */  lui       $at, 0x8024
-/* C7A2E4 80243604 AC2052B4 */  sw        $zero, 0x52b4($at)
+/* C7A2E0 80243600 3C018024 */  lui       $at, %hi(D_802452B4)
+/* C7A2E4 80243604 AC2052B4 */  sw        $zero, %lo(D_802452B4)($at)
 .L80243608:
-/* C7A2E8 80243608 3C038024 */  lui       $v1, 0x8024
-/* C7A2EC 8024360C 246352B4 */  addiu     $v1, $v1, 0x52b4
+/* C7A2E8 80243608 3C038024 */  lui       $v1, %hi(D_802452B4)
+/* C7A2EC 8024360C 246352B4 */  addiu     $v1, $v1, %lo(D_802452B4)
 /* C7A2F0 80243610 8C620000 */  lw        $v0, ($v1)
 /* C7A2F4 80243614 54400003 */  bnel      $v0, $zero, .L80243624
 /* C7A2F8 80243618 AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_802435F0_C7A2D0
 /* C7A300 80243620 0000102D */   daddu    $v0, $zero, $zero
 .L80243624:
 /* C7A304 80243624 8CC50000 */  lw        $a1, ($a2)
-/* C7A308 80243628 3C068024 */  lui       $a2, 0x8024
+/* C7A308 80243628 3C068024 */  lui       $a2, %hi(D_802452B8)
 /* C7A30C 8024362C 0C0B2026 */  jal       set_variable
-/* C7A310 80243630 8CC652B8 */   lw       $a2, 0x52b8($a2)
+/* C7A310 80243630 8CC652B8 */   lw       $a2, %lo(D_802452B8)($a2)
 /* C7A314 80243634 24020002 */  addiu     $v0, $zero, 2
 .L80243638:
 /* C7A318 80243638 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80243644_C7A324.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80243644_C7A324.s
index 2afad8b097..b7a90e049c 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80243644_C7A324.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80243644_C7A324.s
@@ -7,12 +7,12 @@ glabel func_80243644_C7A324
 /* C7A32C 8024364C 8C82000C */  lw        $v0, 0xc($a0)
 /* C7A330 80243650 0C0B1EAF */  jal       get_variable
 /* C7A334 80243654 8C450000 */   lw       $a1, ($v0)
-/* C7A338 80243658 3C018024 */  lui       $at, 0x8024
-/* C7A33C 8024365C AC2252B8 */  sw        $v0, 0x52b8($at)
+/* C7A338 80243658 3C018024 */  lui       $at, %hi(D_802452B8)
+/* C7A33C 8024365C AC2252B8 */  sw        $v0, %lo(D_802452B8)($at)
 /* C7A340 80243660 24020002 */  addiu     $v0, $zero, 2
 /* C7A344 80243664 8FBF0010 */  lw        $ra, 0x10($sp)
 /* C7A348 80243668 24030001 */  addiu     $v1, $zero, 1
-/* C7A34C 8024366C 3C018024 */  lui       $at, 0x8024
-/* C7A350 80243670 AC2352B4 */  sw        $v1, 0x52b4($at)
+/* C7A34C 8024366C 3C018024 */  lui       $at, %hi(D_802452B4)
+/* C7A350 80243670 AC2352B4 */  sw        $v1, %lo(D_802452B4)($at)
 /* C7A354 80243674 03E00008 */  jr        $ra
 /* C7A358 80243678 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024367C_C7A35C.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024367C_C7A35C.s
index ab3e38e199..33e2f3cfaa 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024367C_C7A35C.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024367C_C7A35C.s
@@ -13,8 +13,8 @@ glabel func_8024367C_C7A35C
 /* C7A37C 8024369C 8C620000 */  lw        $v0, ($v1)
 /* C7A380 802436A0 5040000A */  beql      $v0, $zero, .L802436CC
 /* C7A384 802436A4 00041080 */   sll      $v0, $a0, 2
-/* C7A388 802436A8 3C058024 */  lui       $a1, 0x8024
-/* C7A38C 802436AC 24A574A0 */  addiu     $a1, $a1, 0x74a0
+/* C7A388 802436A8 3C058024 */  lui       $a1, %hi(D_802474A0)
+/* C7A38C 802436AC 24A574A0 */  addiu     $a1, $a1, %lo(D_802474A0)
 .L802436B0:
 /* C7A390 802436B0 24630004 */  addiu     $v1, $v1, 4
 /* C7A394 802436B4 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_8024367C_C7A35C
 /* C7A3A4 802436C4 24A50004 */   addiu    $a1, $a1, 4
 /* C7A3A8 802436C8 00041080 */  sll       $v0, $a0, 2
 .L802436CC:
-/* C7A3AC 802436CC 3C018024 */  lui       $at, 0x8024
+/* C7A3AC 802436CC 3C018024 */  lui       $at, %hi(D_802474A0)
 /* C7A3B0 802436D0 00220821 */  addu      $at, $at, $v0
-/* C7A3B4 802436D4 AC2074A0 */  sw        $zero, 0x74a0($at)
+/* C7A3B4 802436D4 AC2074A0 */  sw        $zero, %lo(D_802474A0)($at)
 /* C7A3B8 802436D8 08090DC2 */  j         .L80243708
 /* C7A3BC 802436DC 00000000 */   nop      
 .L802436E0:
-/* C7A3C0 802436E0 3C038024 */  lui       $v1, 0x8024
-/* C7A3C4 802436E4 246374A0 */  addiu     $v1, $v1, 0x74a0
+/* C7A3C0 802436E0 3C038024 */  lui       $v1, %hi(D_802474A0)
+/* C7A3C4 802436E4 246374A0 */  addiu     $v1, $v1, %lo(D_802474A0)
 /* C7A3C8 802436E8 0060282D */  daddu     $a1, $v1, $zero
 .L802436EC:
 /* C7A3CC 802436EC 24820010 */  addiu     $v0, $a0, 0x10
diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80243994_C7A674.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80243994_C7A674.s
index d530510ae5..8c5c641cf9 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80243994_C7A674.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80243994_C7A674.s
@@ -15,7 +15,7 @@ glabel func_80243994_C7A674
 /* C7A69C 802439BC 8FBF0014 */  lw        $ra, 0x14($sp)
 /* C7A6A0 802439C0 8FB00010 */  lw        $s0, 0x10($sp)
 /* C7A6A4 802439C4 24020002 */  addiu     $v0, $zero, 2
-/* C7A6A8 802439C8 3C018024 */  lui       $at, 0x8024
-/* C7A6AC 802439CC AC237664 */  sw        $v1, 0x7664($at)
+/* C7A6A8 802439C8 3C018024 */  lui       $at, %hi(D_80247664)
+/* C7A6AC 802439CC AC237664 */  sw        $v1, %lo(D_80247664)($at)
 /* C7A6B0 802439D0 03E00008 */  jr        $ra
 /* C7A6B4 802439D4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802439D8_C7A6B8.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802439D8_C7A6B8.s
index 07cdd2edf4..4b2bcaf025 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802439D8_C7A6B8.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802439D8_C7A6B8.s
@@ -6,8 +6,8 @@ glabel func_802439D8_C7A6B8
 /* C7A6BC 802439DC AFBF0010 */  sw        $ra, 0x10($sp)
 /* C7A6C0 802439E0 0C00EABB */  jal       get_npc_unsafe
 /* C7A6C4 802439E4 8C84008C */   lw       $a0, 0x8c($a0)
-/* C7A6C8 802439E8 3C038024 */  lui       $v1, 0x8024
-/* C7A6CC 802439EC 8C637664 */  lw        $v1, 0x7664($v1)
+/* C7A6C8 802439E8 3C038024 */  lui       $v1, %hi(D_80247664)
+/* C7A6CC 802439EC 8C637664 */  lw        $v1, %lo(D_80247664)($v1)
 /* C7A6D0 802439F0 AC430028 */  sw        $v1, 0x28($v0)
 /* C7A6D4 802439F4 8FBF0010 */  lw        $ra, 0x10($sp)
 /* C7A6D8 802439F8 24020002 */  addiu     $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_802404EC_C7E66C.s b/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_802404EC_C7E66C.s
index 4d43abe11f..803fd09a9d 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_802404EC_C7E66C.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_802404EC_C7E66C.s
@@ -9,8 +9,8 @@ glabel func_802404EC_C7E66C
 /* C7E67C 802404FC F7B40018 */  sdc1      $f20, 0x18($sp)
 /* C7E680 80240500 C60C0090 */  lwc1      $f12, 0x90($s0)
 /* C7E684 80240504 46806320 */  cvt.s.w   $f12, $f12
-/* C7E688 80240508 3C018024 */  lui       $at, 0x8024
-/* C7E68C 8024050C D4342000 */  ldc1      $f20, 0x2000($at)
+/* C7E688 80240508 3C018024 */  lui       $at, %hi(D_80242000)
+/* C7E68C 8024050C D4342000 */  ldc1      $f20, %lo(D_80242000)($at)
 /* C7E690 80240510 46006307 */  neg.s     $f12, $f12
 /* C7E694 80240514 46006321 */  cvt.d.s   $f12, $f12
 /* C7E698 80240518 46346301 */  sub.d     $f12, $f12, $f20
@@ -27,8 +27,8 @@ glabel func_802404EC_C7E66C
 /* C7E6C4 80240544 46006307 */  neg.s     $f12, $f12
 /* C7E6C8 80240548 46006321 */  cvt.d.s   $f12, $f12
 /* C7E6CC 8024054C 46346301 */  sub.d     $f12, $f12, $f20
-/* C7E6D0 80240550 3C018024 */  lui       $at, 0x8024
-/* C7E6D4 80240554 D4222008 */  ldc1      $f2, 0x2008($at)
+/* C7E6D0 80240550 3C018024 */  lui       $at, %hi(D_80242008)
+/* C7E6D4 80240554 D4222008 */  ldc1      $f2, %lo(D_80242008)($at)
 /* C7E6D8 80240558 46220001 */  sub.d     $f0, $f0, $f2
 /* C7E6DC 8024055C 4620010D */  trunc.w.d $f4, $f0
 /* C7E6E0 80240560 E6040098 */  swc1      $f4, 0x98($s0)
diff --git a/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_802405A4_C7E724.s b/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_802405A4_C7E724.s
index f24df325c2..c496cd3c1f 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_802405A4_C7E724.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_802405A4_C7E724.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_802405A4_C7E724
-/* C7E724 802405A4 3C018024 */  lui       $at, 0x8024
-/* C7E728 802405A8 D4222010 */  ldc1      $f2, 0x2010($at)
+/* C7E724 802405A4 3C018024 */  lui       $at, %hi(D_80242010)
+/* C7E728 802405A8 D4222010 */  ldc1      $f2, %lo(D_80242010)($at)
 /* C7E72C 802405AC 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* C7E730 802405B0 AFB00010 */  sw        $s0, 0x10($sp)
 /* C7E734 802405B4 0080802D */  daddu     $s0, $a0, $zero
diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/C804B0/func_80240434_C805D4.s b/asm/nonmatchings/world/area_kzn/kzn_11/C804B0/func_80240434_C805D4.s
index 326fddf09b..6c184d03ff 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_11/C804B0/func_80240434_C805D4.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_11/C804B0/func_80240434_C805D4.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80240434_C805D4
-/* C805D4 80240434 3C038011 */  lui       $v1, 0x8011
-/* C805D8 80240438 8063EBB3 */  lb        $v1, -0x144d($v1)
+/* C805D4 80240434 3C038011 */  lui       $v1, %hi(D_8010EBB3)
+/* C805D8 80240438 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
 /* C805DC 8024043C 24020008 */  addiu     $v0, $zero, 8
 /* C805E0 80240440 54620003 */  bnel      $v1, $v0, .L80240450
 /* C805E4 80240444 AC8000A8 */   sw       $zero, 0xa8($a0)
diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80240460_C80600.s b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80240460_C80600.s
index d858ba65fa..44f907fd4d 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80240460_C80600.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80240460_C80600.s
@@ -87,8 +87,8 @@ glabel func_80240460_C80600
 /* C80740 802405A0 08090172 */  j         .L802405C8
 /* C80744 802405A4 E6000018 */   swc1     $f0, 0x18($s0)
 .L802405A8:
-/* C80748 802405A8 3C018024 */  lui       $at, 0x8024
-/* C8074C 802405AC D4225850 */  ldc1      $f2, 0x5850($at)
+/* C80748 802405A8 3C018024 */  lui       $at, %hi(D_80245850)
+/* C8074C 802405AC D4225850 */  ldc1      $f2, %lo(D_80245850)($at)
 /* C80750 802405B0 44820000 */  mtc1      $v0, $f0
 /* C80754 802405B4 00000000 */  nop       
 /* C80758 802405B8 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80240610_C807B0.s b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80240610_C807B0.s
index 1d686f0729..46d9d18964 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80240610_C807B0.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80240610_C807B0.s
@@ -104,8 +104,8 @@ glabel func_80240610_C807B0
 /* C80934 80240794 1040000A */  beqz      $v0, .L802407C0
 /* C80938 80240798 4600C106 */   mov.s    $f4, $f24
 /* C8093C 8024079C 4614C081 */  sub.s     $f2, $f24, $f20
-/* C80940 802407A0 3C018024 */  lui       $at, 0x8024
-/* C80944 802407A4 D4205858 */  ldc1      $f0, 0x5858($at)
+/* C80940 802407A0 3C018024 */  lui       $at, %hi(D_80245858)
+/* C80944 802407A4 D4205858 */  ldc1      $f0, %lo(D_80245858)($at)
 /* C80948 802407A8 460010A1 */  cvt.d.s   $f2, $f2
 /* C8094C 802407AC 46201082 */  mul.d     $f2, $f2, $f0
 /* C80950 802407B0 00000000 */  nop       
@@ -131,8 +131,8 @@ glabel func_80240610_C807B0
 /* C8099C 802407FC C7A4002C */  lwc1      $f4, 0x2c($sp)
 /* C809A0 80240800 461A2100 */  add.s     $f4, $f4, $f26
 /* C809A4 80240804 46142081 */  sub.s     $f2, $f4, $f20
-/* C809A8 80240808 3C018024 */  lui       $at, 0x8024
-/* C809AC 8024080C D4205860 */  ldc1      $f0, 0x5860($at)
+/* C809A8 80240808 3C018024 */  lui       $at, %hi(D_80245860)
+/* C809AC 8024080C D4205860 */  ldc1      $f0, %lo(D_80245860)($at)
 /* C809B0 80240810 460010A1 */  cvt.d.s   $f2, $f2
 /* C809B4 80240814 46201082 */  mul.d     $f2, $f2, $f0
 /* C809B8 80240818 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_802410B4_C81254.s b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_802410B4_C81254.s
index b5ee11c593..181b8cd6c2 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_802410B4_C81254.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_802410B4_C81254.s
@@ -15,9 +15,9 @@ glabel func_802410B4_C81254
 /* C8127C 802410DC 00031C00 */  sll       $v1, $v1, 0x10
 /* C81280 802410E0 00031B83 */  sra       $v1, $v1, 0xe
 /* C81284 802410E4 A444008E */  sh        $a0, 0x8e($v0)
-/* C81288 802410E8 3C018024 */  lui       $at, 0x8024
+/* C81288 802410E8 3C018024 */  lui       $at, %hi(D_802436D0)
 /* C8128C 802410EC 00230821 */  addu      $at, $at, $v1
-/* C81290 802410F0 C42236D0 */  lwc1      $f2, 0x36d0($at)
+/* C81290 802410F0 C42236D0 */  lwc1      $f2, %lo(D_802436D0)($at)
 /* C81294 802410F4 8443008E */  lh        $v1, 0x8e($v0)
 /* C81298 802410F8 46020000 */  add.s     $f0, $f0, $f2
 /* C8129C 802410FC 28630005 */  slti      $v1, $v1, 5
diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_8024176C_C8190C.s b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_8024176C_C8190C.s
index ba742d6018..99f78693bb 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_8024176C_C8190C.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_8024176C_C8190C.s
@@ -66,9 +66,9 @@ glabel func_8024176C_C8190C
 /* C819F8 80241858 2C62000F */  sltiu     $v0, $v1, 0xf
 /* C819FC 8024185C 10400034 */  beqz      $v0, .L80241930
 /* C81A00 80241860 00031080 */   sll      $v0, $v1, 2
-/* C81A04 80241864 3C018024 */  lui       $at, 0x8024
+/* C81A04 80241864 3C018024 */  lui       $at, %hi(D_80245868)
 /* C81A08 80241868 00220821 */  addu      $at, $at, $v0
-/* C81A0C 8024186C 8C225868 */  lw        $v0, 0x5868($at)
+/* C81A0C 8024186C 8C225868 */  lw        $v0, %lo(D_80245868)($at)
 /* C81A10 80241870 00400008 */  jr        $v0
 /* C81A14 80241874 00000000 */   nop      
 /* C81A18 80241878 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241A88_C81C28.s b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241A88_C81C28.s
index 192c06fd91..9455679ba0 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241A88_C81C28.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241A88_C81C28.s
@@ -142,8 +142,8 @@ glabel func_80241A88_C81C28
 /* C81E40 80241CA0 4500000A */  bc1f      .L80241CCC
 /* C81E44 80241CA4 00000000 */   nop      
 .L80241CA8:
-/* C81E48 80241CA8 3C018024 */  lui       $at, 0x8024
-/* C81E4C 80241CAC D42258A8 */  ldc1      $f2, 0x58a8($at)
+/* C81E48 80241CA8 3C018024 */  lui       $at, %hi(D_802458A8)
+/* C81E4C 80241CAC D42258A8 */  ldc1      $f2, %lo(D_802458A8)($at)
 /* C81E50 80241CB0 46003187 */  neg.s     $f6, $f6
 /* C81E54 80241CB4 46003021 */  cvt.d.s   $f0, $f6
 /* C81E58 80241CB8 46220002 */  mul.d     $f0, $f0, $f2
diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241D64_C81F04.s b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241D64_C81F04.s
index b1d29b8393..6814067049 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241D64_C81F04.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241D64_C81F04.s
@@ -67,9 +67,9 @@ glabel func_80241D64_C81F04
 /* C81FF4 80241E54 2C620015 */  sltiu     $v0, $v1, 0x15
 /* C81FF8 80241E58 10400032 */  beqz      $v0, .L80241F24
 /* C81FFC 80241E5C 00031080 */   sll      $v0, $v1, 2
-/* C82000 80241E60 3C018024 */  lui       $at, 0x8024
+/* C82000 80241E60 3C018024 */  lui       $at, %hi(D_802458B0)
 /* C82004 80241E64 00220821 */  addu      $at, $at, $v0
-/* C82008 80241E68 8C2258B0 */  lw        $v0, 0x58b0($at)
+/* C82008 80241E68 8C2258B0 */  lw        $v0, %lo(D_802458B0)($at)
 /* C8200C 80241E6C 00400008 */  jr        $v0
 /* C82010 80241E70 00000000 */   nop      
 /* C82014 80241E74 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241F4C_C820EC.s b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241F4C_C820EC.s
index 1720787c8e..9351912233 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241F4C_C820EC.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241F4C_C820EC.s
@@ -228,9 +228,9 @@ glabel func_80241F4C_C820EC
 /* C82444 802422A4 E6040028 */  swc1      $f4, 0x28($s0)
 /* C82448 802422A8 00021080 */  sll       $v0, $v0, 2
 /* C8244C 802422AC E7A00010 */  swc1      $f0, 0x10($sp)
-/* C82450 802422B0 3C048024 */  lui       $a0, 0x8024
+/* C82450 802422B0 3C048024 */  lui       $a0, %hi(D_802437B4)
 /* C82454 802422B4 00822021 */  addu      $a0, $a0, $v0
-/* C82458 802422B8 8C8437B4 */  lw        $a0, 0x37b4($a0)
+/* C82458 802422B8 8C8437B4 */  lw        $a0, %lo(D_802437B4)($a0)
 /* C8245C 802422BC 8E060004 */  lw        $a2, 4($s0)
 /* C82460 802422C0 8E070008 */  lw        $a3, 8($s0)
 /* C82464 802422C4 0C052757 */  jal       play_sound_at_position
diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80242540_C826E0.s b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80242540_C826E0.s
index b28744e28c..38ff1643d8 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80242540_C826E0.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80242540_C826E0.s
@@ -46,8 +46,8 @@ glabel func_80242540_C826E0
 /* C82778 802425D8 2402000A */  addiu     $v0, $zero, 0xa
 /* C8277C 802425DC 1462001B */  bne       $v1, $v0, .L8024264C
 /* C82780 802425E0 E6000010 */   swc1     $f0, 0x10($s0)
-/* C82784 802425E4 3C048024 */  lui       $a0, 0x8024
-/* C82788 802425E8 248437E0 */  addiu     $a0, $a0, 0x37e0
+/* C82784 802425E4 3C048024 */  lui       $a0, %hi(D_802437E0)
+/* C82788 802425E8 248437E0 */  addiu     $a0, $a0, %lo(D_802437E0)
 /* C8278C 802425EC 24050001 */  addiu     $a1, $zero, 1
 /* C82790 802425F0 0C0B0CF8 */  jal       start_script
 /* C82794 802425F4 0000302D */   daddu    $a2, $zero, $zero
diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80240518_C85FC8.s b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80240518_C85FC8.s
index df2bee84b8..1b66b0aa87 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80240518_C85FC8.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80240518_C85FC8.s
@@ -18,8 +18,8 @@ glabel func_80240518_C85FC8
 /* C85FFC 8024054C 0040802D */  daddu     $s0, $v0, $zero
 /* C86000 80240550 3C05800B */  lui       $a1, %hi(gCameras)
 /* C86004 80240554 24A51D80 */  addiu     $a1, $a1, %lo(gCameras)
-/* C86008 80240558 3C03800A */  lui       $v1, 0x800a
-/* C8600C 8024055C 8463A634 */  lh        $v1, -0x59cc($v1)
+/* C86008 80240558 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* C8600C 8024055C 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* C86010 80240560 00912021 */  addu      $a0, $a0, $s1
 /* C86014 80240564 00031080 */  sll       $v0, $v1, 2
 /* C86018 80240568 00431021 */  addu      $v0, $v0, $v1
@@ -54,8 +54,8 @@ glabel func_80240518_C85FC8
 /* C86088 802405D8 00000000 */   nop      
 /* C8608C 802405DC 0C00A6C9 */  jal       clamp_angle
 /* C86090 802405E0 46000306 */   mov.s    $f12, $f0
-/* C86094 802405E4 3C018024 */  lui       $at, 0x8024
-/* C86098 802405E8 D42263A0 */  ldc1      $f2, 0x63a0($at)
+/* C86094 802405E4 3C018024 */  lui       $at, %hi(D_802463A0)
+/* C86098 802405E8 D42263A0 */  ldc1      $f2, %lo(D_802463A0)($at)
 /* C8609C 802405EC 46000021 */  cvt.d.s   $f0, $f0
 /* C860A0 802405F0 4622003C */  c.lt.d    $f0, $f2
 /* C860A4 802405F4 00000000 */  nop       
@@ -97,8 +97,8 @@ glabel func_80240518_C85FC8
 /* C8612C 8024067C 45030001 */  bc1tl     .L80240684
 /* C86130 80240680 0000882D */   daddu    $s1, $zero, $zero
 .L80240684:
-/* C86134 80240684 3C038011 */  lui       $v1, 0x8011
-/* C86138 80240688 8063EBB3 */  lb        $v1, -0x144d($v1)
+/* C86134 80240684 3C038011 */  lui       $v1, %hi(D_8010EBB3)
+/* C86138 80240688 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
 /* C8613C 8024068C 24020009 */  addiu     $v0, $zero, 9
 /* C86140 80240690 50620001 */  beql      $v1, $v0, .L80240698
 /* C86144 80240694 0000882D */   daddu    $s1, $zero, $zero
diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024092C_C863DC.s b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024092C_C863DC.s
index fbeb7bf8d0..449f914d4c 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024092C_C863DC.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024092C_C863DC.s
@@ -100,9 +100,9 @@ glabel func_8024092C_C863DC
 /* C86540 80240A90 2C620064 */  sltiu     $v0, $v1, 0x64
 /* C86544 80240A94 10400048 */  beqz      $v0, .L80240BB8
 /* C86548 80240A98 00031080 */   sll      $v0, $v1, 2
-/* C8654C 80240A9C 3C018024 */  lui       $at, 0x8024
+/* C8654C 80240A9C 3C018024 */  lui       $at, %hi(D_802463A8)
 /* C86550 80240AA0 00220821 */  addu      $at, $at, $v0
-/* C86554 80240AA4 8C2263A8 */  lw        $v0, 0x63a8($at)
+/* C86554 80240AA4 8C2263A8 */  lw        $v0, %lo(D_802463A8)($at)
 /* C86558 80240AA8 00400008 */  jr        $v0
 /* C8655C 80240AAC 00000000 */   nop      
 /* C86560 80240AB0 0240202D */  daddu     $a0, $s2, $zero
diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80240D48_C867F8.s b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80240D48_C867F8.s
index 9f777cef70..8877377804 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80240D48_C867F8.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80240D48_C867F8.s
@@ -62,9 +62,9 @@ glabel func_80240D48_C867F8
 /* C868D8 80240E28 000218C0 */  sll       $v1, $v0, 3
 /* C868DC 80240E2C 00431021 */  addu      $v0, $v0, $v1
 /* C868E0 80240E30 000210C0 */  sll       $v0, $v0, 3
-/* C868E4 80240E34 3C01800B */  lui       $at, 0x800b
+/* C868E4 80240E34 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* C868E8 80240E38 00220821 */  addu      $at, $at, $v0
-/* C868EC 80240E3C C4201DEC */  lwc1      $f0, 0x1dec($at)
+/* C868EC 80240E3C C4201DEC */  lwc1      $f0, %lo(D_800B1DEC)($at)
 /* C868F0 80240E40 080903A1 */  j         .L80240E84
 /* C868F4 80240E44 460C0301 */   sub.s    $f12, $f0, $f12
 .L80240E48:
@@ -79,9 +79,9 @@ glabel func_80240D48_C867F8
 /* C86918 80240E68 000218C0 */  sll       $v1, $v0, 3
 /* C8691C 80240E6C 00431021 */  addu      $v0, $v0, $v1
 /* C86920 80240E70 000210C0 */  sll       $v0, $v0, 3
-/* C86924 80240E74 3C01800B */  lui       $at, 0x800b
+/* C86924 80240E74 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* C86928 80240E78 00220821 */  addu      $at, $at, $v0
-/* C8692C 80240E7C C4201DEC */  lwc1      $f0, 0x1dec($at)
+/* C8692C 80240E7C C4201DEC */  lwc1      $f0, %lo(D_800B1DEC)($at)
 /* C86930 80240E80 460C0300 */  add.s     $f12, $f0, $f12
 .L80240E84:
 /* C86934 80240E84 0C00A6C9 */  jal       clamp_angle
@@ -157,8 +157,8 @@ glabel func_80240D48_C867F8
 /* C86A3C 80240F8C 1440005D */  bnez      $v0, .L80241104
 /* C86A40 80240F90 00000000 */   nop      
 /* C86A44 80240F94 C6200038 */  lwc1      $f0, 0x38($s1)
-/* C86A48 80240F98 3C018024 */  lui       $at, 0x8024
-/* C86A4C 80240F9C D4246538 */  ldc1      $f4, 0x6538($at)
+/* C86A48 80240F98 3C018024 */  lui       $at, %hi(D_80246538)
+/* C86A4C 80240F9C D4246538 */  ldc1      $f4, %lo(D_80246538)($at)
 /* C86A50 80240FA0 46000021 */  cvt.d.s   $f0, $f0
 /* C86A54 80240FA4 4620203C */  c.lt.d    $f4, $f0
 /* C86A58 80240FA8 00000000 */  nop       
@@ -170,8 +170,8 @@ glabel func_80240D48_C867F8
 /* C86A70 80240FC0 E6200038 */  swc1      $f0, 0x38($s1)
 .L80240FC4:
 /* C86A74 80240FC4 C6200038 */  lwc1      $f0, 0x38($s1)
-/* C86A78 80240FC8 3C018024 */  lui       $at, 0x8024
-/* C86A7C 80240FCC D4226540 */  ldc1      $f2, 0x6540($at)
+/* C86A78 80240FC8 3C018024 */  lui       $at, %hi(D_80246540)
+/* C86A7C 80240FCC D4226540 */  ldc1      $f2, %lo(D_80246540)($at)
 /* C86A80 80240FD0 46000021 */  cvt.d.s   $f0, $f0
 /* C86A84 80240FD4 4622003C */  c.lt.d    $f0, $f2
 /* C86A88 80240FD8 00000000 */  nop       
@@ -228,8 +228,8 @@ glabel func_80240D48_C867F8
 /* C86B44 80241094 4600A386 */   mov.s    $f14, $f20
 /* C86B48 80241098 46000586 */  mov.s     $f22, $f0
 /* C86B4C 8024109C C7A20038 */  lwc1      $f2, 0x38($sp)
-/* C86B50 802410A0 3C018024 */  lui       $at, 0x8024
-/* C86B54 802410A4 D4206548 */  ldc1      $f0, 0x6548($at)
+/* C86B50 802410A0 3C018024 */  lui       $at, %hi(D_80246548)
+/* C86B54 802410A4 D4206548 */  ldc1      $f0, %lo(D_80246548)($at)
 /* C86B58 802410A8 460010A1 */  cvt.d.s   $f2, $f2
 /* C86B5C 802410AC 4620103C */  c.lt.d    $f2, $f0
 /* C86B60 802410B0 00000000 */  nop       
@@ -239,8 +239,8 @@ glabel func_80240D48_C867F8
 /* C86B70 802410C0 0809043A */  j         .L802410E8
 /* C86B74 802410C4 34C68000 */   ori      $a2, $a2, 0x8000
 .L802410C8:
-/* C86B78 802410C8 3C018024 */  lui       $at, 0x8024
-/* C86B7C 802410CC D4206550 */  ldc1      $f0, 0x6550($at)
+/* C86B78 802410C8 3C018024 */  lui       $at, %hi(D_80246550)
+/* C86B7C 802410CC D4206550 */  ldc1      $f0, %lo(D_80246550)($at)
 /* C86B80 802410D0 4622003C */  c.lt.d    $f0, $f2
 /* C86B84 802410D4 00000000 */  nop       
 /* C86B88 802410D8 450000FA */  bc1f      .L802414C4
@@ -296,8 +296,8 @@ glabel func_80240D48_C867F8
 /* C86C48 80241198 104000CA */  beqz      $v0, .L802414C4
 /* C86C4C 8024119C 0280282D */   daddu    $a1, $s4, $zero
 /* C86C50 802411A0 8EA20000 */  lw        $v0, ($s5)
-/* C86C54 802411A4 3C018024 */  lui       $at, 0x8024
-/* C86C58 802411A8 D4226558 */  ldc1      $f2, 0x6558($at)
+/* C86C54 802411A4 3C018024 */  lui       $at, %hi(D_80246558)
+/* C86C58 802411A8 D4226558 */  ldc1      $f2, %lo(D_80246558)($at)
 /* C86C5C 802411AC C440002C */  lwc1      $f0, 0x2c($v0)
 /* C86C60 802411B0 C4460028 */  lwc1      $f6, 0x28($v0)
 /* C86C64 802411B4 C4440030 */  lwc1      $f4, 0x30($v0)
@@ -633,8 +633,8 @@ glabel func_80240D48_C867F8
 /* C87160 802416B0 44813000 */  mtc1      $at, $f6
 /* C87164 802416B4 46000021 */  cvt.d.s   $f0, $f0
 /* C87168 802416B8 E7A20020 */  swc1      $f2, 0x20($sp)
-/* C8716C 802416BC 3C018024 */  lui       $at, 0x8024
-/* C87170 802416C0 D4226560 */  ldc1      $f2, 0x6560($at)
+/* C8716C 802416BC 3C018024 */  lui       $at, %hi(D_80246560)
+/* C87170 802416C0 D4226560 */  ldc1      $f2, %lo(D_80246560)($at)
 /* C87174 802416C4 C6240040 */  lwc1      $f4, 0x40($s1)
 /* C87178 802416C8 46220000 */  add.d     $f0, $f0, $f2
 /* C8717C 802416CC E7A60038 */  swc1      $f6, 0x38($sp)
diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80241D30_C877E0.s b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80241D30_C877E0.s
index 08e4432322..9701f864a1 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80241D30_C877E0.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80241D30_C877E0.s
@@ -55,8 +55,8 @@ glabel func_80241D30_C877E0
 /* C8789C 80241DEC 8C470030 */   lw       $a3, 0x30($v0)
 /* C878A0 80241DF0 C6020018 */  lwc1      $f2, 0x18($s0)
 /* C878A4 80241DF4 46020003 */  div.s     $f0, $f0, $f2
-/* C878A8 80241DF8 3C018024 */  lui       $at, 0x8024
-/* C878AC 80241DFC D4226568 */  ldc1      $f2, 0x6568($at)
+/* C878A8 80241DF8 3C018024 */  lui       $at, %hi(D_80246568)
+/* C878AC 80241DFC D4226568 */  ldc1      $f2, %lo(D_80246568)($at)
 /* C878B0 80241E00 46000021 */  cvt.d.s   $f0, $f0
 /* C878B4 80241E04 46220000 */  add.d     $f0, $f0, $f2
 /* C878B8 80241E08 4620010D */  trunc.w.d $f4, $f0
diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242048_C87AF8.s b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242048_C87AF8.s
index 199db472ef..95079955ed 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242048_C87AF8.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242048_C87AF8.s
@@ -279,9 +279,9 @@ glabel func_80242048_C87AF8
 /* C87EE4 80242434 2C620015 */  sltiu     $v0, $v1, 0x15
 /* C87EE8 80242438 10400009 */  beqz      $v0, .L80242460
 /* C87EEC 8024243C 00031080 */   sll      $v0, $v1, 2
-/* C87EF0 80242440 3C018024 */  lui       $at, 0x8024
+/* C87EF0 80242440 3C018024 */  lui       $at, %hi(D_80246570)
 /* C87EF4 80242444 00220821 */  addu      $at, $at, $v0
-/* C87EF8 80242448 8C226570 */  lw        $v0, 0x6570($at)
+/* C87EF8 80242448 8C226570 */  lw        $v0, %lo(D_80246570)($at)
 /* C87EFC 8024244C 00400008 */  jr        $v0
 /* C87F00 80242450 00000000 */   nop      
 /* C87F04 80242454 8E420028 */  lw        $v0, 0x28($s2)
diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024259C_C8804C.s b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024259C_C8804C.s
index 583adf9614..5df75d1810 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024259C_C8804C.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024259C_C8804C.s
@@ -4,8 +4,8 @@
 glabel func_8024259C_C8804C
 /* C8804C 8024259C 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* C88050 802425A0 AFB00010 */  sw        $s0, 0x10($sp)
-/* C88054 802425A4 3C108024 */  lui       $s0, 0x8024
-/* C88058 802425A8 26104074 */  addiu     $s0, $s0, 0x4074
+/* C88054 802425A4 3C108024 */  lui       $s0, %hi(D_80244074)
+/* C88058 802425A8 26104074 */  addiu     $s0, $s0, %lo(D_80244074)
 /* C8805C 802425AC AFBF0018 */  sw        $ra, 0x18($sp)
 /* C88060 802425B0 AFB10014 */  sw        $s1, 0x14($sp)
 /* C88064 802425B4 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_8024259C_C8804C
 /* C880C8 80242618 28620010 */  slti      $v0, $v1, 0x10
 /* C880CC 8024261C 1440FFFA */  bnez      $v0, .L80242608
 /* C880D0 80242620 24840004 */   addiu    $a0, $a0, 4
-/* C880D4 80242624 3C108024 */  lui       $s0, 0x8024
-/* C880D8 80242628 26104074 */  addiu     $s0, $s0, 0x4074
+/* C880D4 80242624 3C108024 */  lui       $s0, %hi(D_80244074)
+/* C880D8 80242628 26104074 */  addiu     $s0, $s0, %lo(D_80244074)
 /* C880DC 8024262C 0C00AB4B */  jal       heap_free
 /* C880E0 80242630 8E040000 */   lw       $a0, ($s0)
 /* C880E4 80242634 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_802428E0_C88390.s b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_802428E0_C88390.s
index 7aba5596e3..4fc4362a00 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_802428E0_C88390.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_802428E0_C88390.s
@@ -6,11 +6,11 @@ glabel func_802428E0_C88390
 /* C88394 802428E4 AFBF0010 */  sw        $ra, 0x10($sp)
 /* C88398 802428E8 10A00003 */  beqz      $a1, .L802428F8
 /* C8839C 802428EC 8C86000C */   lw       $a2, 0xc($a0)
-/* C883A0 802428F0 3C018024 */  lui       $at, 0x8024
-/* C883A4 802428F4 AC2040D8 */  sw        $zero, 0x40d8($at)
+/* C883A0 802428F0 3C018024 */  lui       $at, %hi(D_802440D8)
+/* C883A4 802428F4 AC2040D8 */  sw        $zero, %lo(D_802440D8)($at)
 .L802428F8:
-/* C883A8 802428F8 3C038024 */  lui       $v1, 0x8024
-/* C883AC 802428FC 246340D8 */  addiu     $v1, $v1, 0x40d8
+/* C883A8 802428F8 3C038024 */  lui       $v1, %hi(D_802440D8)
+/* C883AC 802428FC 246340D8 */  addiu     $v1, $v1, %lo(D_802440D8)
 /* C883B0 80242900 8C620000 */  lw        $v0, ($v1)
 /* C883B4 80242904 54400003 */  bnel      $v0, $zero, .L80242914
 /* C883B8 80242908 AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_802428E0_C88390
 /* C883C0 80242910 0000102D */   daddu    $v0, $zero, $zero
 .L80242914:
 /* C883C4 80242914 8CC50000 */  lw        $a1, ($a2)
-/* C883C8 80242918 3C068024 */  lui       $a2, 0x8024
+/* C883C8 80242918 3C068024 */  lui       $a2, %hi(D_802440DC)
 /* C883CC 8024291C 0C0B2026 */  jal       set_variable
-/* C883D0 80242920 8CC640DC */   lw       $a2, 0x40dc($a2)
+/* C883D0 80242920 8CC640DC */   lw       $a2, %lo(D_802440DC)($a2)
 /* C883D4 80242924 24020002 */  addiu     $v0, $zero, 2
 .L80242928:
 /* C883D8 80242928 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242934_C883E4.s b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242934_C883E4.s
index d8f6ab9855..82b3840767 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242934_C883E4.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242934_C883E4.s
@@ -7,12 +7,12 @@ glabel func_80242934_C883E4
 /* C883EC 8024293C 8C82000C */  lw        $v0, 0xc($a0)
 /* C883F0 80242940 0C0B1EAF */  jal       get_variable
 /* C883F4 80242944 8C450000 */   lw       $a1, ($v0)
-/* C883F8 80242948 3C018024 */  lui       $at, 0x8024
-/* C883FC 8024294C AC2240DC */  sw        $v0, 0x40dc($at)
+/* C883F8 80242948 3C018024 */  lui       $at, %hi(D_802440DC)
+/* C883FC 8024294C AC2240DC */  sw        $v0, %lo(D_802440DC)($at)
 /* C88400 80242950 24020002 */  addiu     $v0, $zero, 2
 /* C88404 80242954 8FBF0010 */  lw        $ra, 0x10($sp)
 /* C88408 80242958 24030001 */  addiu     $v1, $zero, 1
-/* C8840C 8024295C 3C018024 */  lui       $at, 0x8024
-/* C88410 80242960 AC2340D8 */  sw        $v1, 0x40d8($at)
+/* C8840C 8024295C 3C018024 */  lui       $at, %hi(D_802440D8)
+/* C88410 80242960 AC2340D8 */  sw        $v1, %lo(D_802440D8)($at)
 /* C88414 80242964 03E00008 */  jr        $ra
 /* C88418 80242968 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024296C_C8841C.s b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024296C_C8841C.s
index 86d8b2f529..4bed438edd 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024296C_C8841C.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024296C_C8841C.s
@@ -13,8 +13,8 @@ glabel func_8024296C_C8841C
 /* C8843C 8024298C 8C620000 */  lw        $v0, ($v1)
 /* C88440 80242990 5040000A */  beql      $v0, $zero, .L802429BC
 /* C88444 80242994 00041080 */   sll      $v0, $a0, 2
-/* C88448 80242998 3C058024 */  lui       $a1, 0x8024
-/* C8844C 8024299C 24A565F0 */  addiu     $a1, $a1, 0x65f0
+/* C88448 80242998 3C058024 */  lui       $a1, %hi(D_802465F0)
+/* C8844C 8024299C 24A565F0 */  addiu     $a1, $a1, %lo(D_802465F0)
 .L802429A0:
 /* C88450 802429A0 24630004 */  addiu     $v1, $v1, 4
 /* C88454 802429A4 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_8024296C_C8841C
 /* C88464 802429B4 24A50004 */   addiu    $a1, $a1, 4
 /* C88468 802429B8 00041080 */  sll       $v0, $a0, 2
 .L802429BC:
-/* C8846C 802429BC 3C018024 */  lui       $at, 0x8024
+/* C8846C 802429BC 3C018024 */  lui       $at, %hi(D_802465F0)
 /* C88470 802429C0 00220821 */  addu      $at, $at, $v0
-/* C88474 802429C4 AC2065F0 */  sw        $zero, 0x65f0($at)
+/* C88474 802429C4 AC2065F0 */  sw        $zero, %lo(D_802465F0)($at)
 /* C88478 802429C8 08090A7E */  j         .L802429F8
 /* C8847C 802429CC 00000000 */   nop      
 .L802429D0:
-/* C88480 802429D0 3C038024 */  lui       $v1, 0x8024
-/* C88484 802429D4 246365F0 */  addiu     $v1, $v1, 0x65f0
+/* C88480 802429D0 3C038024 */  lui       $v1, %hi(D_802465F0)
+/* C88484 802429D4 246365F0 */  addiu     $v1, $v1, %lo(D_802465F0)
 /* C88488 802429D8 0060282D */  daddu     $a1, $v1, $zero
 .L802429DC:
 /* C8848C 802429DC 24820010 */  addiu     $v0, $a0, 0x10
diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242C84_C88734.s b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242C84_C88734.s
index 9529281c77..7209a565de 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242C84_C88734.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242C84_C88734.s
@@ -15,7 +15,7 @@ glabel func_80242C84_C88734
 /* C8875C 80242CAC 8FBF0014 */  lw        $ra, 0x14($sp)
 /* C88760 80242CB0 8FB00010 */  lw        $s0, 0x10($sp)
 /* C88764 80242CB4 24020002 */  addiu     $v0, $zero, 2
-/* C88768 80242CB8 3C018024 */  lui       $at, 0x8024
-/* C8876C 80242CBC AC2367B4 */  sw        $v1, 0x67b4($at)
+/* C88768 80242CB8 3C018024 */  lui       $at, %hi(D_802467B4)
+/* C8876C 80242CBC AC2367B4 */  sw        $v1, %lo(D_802467B4)($at)
 /* C88770 80242CC0 03E00008 */  jr        $ra
 /* C88774 80242CC4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242CC8_C88778.s b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242CC8_C88778.s
index 4d99d87e09..ad05053bcd 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242CC8_C88778.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242CC8_C88778.s
@@ -6,8 +6,8 @@ glabel func_80242CC8_C88778
 /* C8877C 80242CCC AFBF0010 */  sw        $ra, 0x10($sp)
 /* C88780 80242CD0 0C00EABB */  jal       get_npc_unsafe
 /* C88784 80242CD4 8C84008C */   lw       $a0, 0x8c($a0)
-/* C88788 80242CD8 3C038024 */  lui       $v1, 0x8024
-/* C8878C 80242CDC 8C6367B4 */  lw        $v1, 0x67b4($v1)
+/* C88788 80242CD8 3C038024 */  lui       $v1, %hi(D_802467B4)
+/* C8878C 80242CDC 8C6367B4 */  lw        $v1, %lo(D_802467B4)($v1)
 /* C88790 80242CE0 AC430028 */  sw        $v1, 0x28($v0)
 /* C88794 80242CE4 8FBF0010 */  lw        $ra, 0x10($sp)
 /* C88798 80242CE8 24020002 */  addiu     $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80242EBC_C8896C.s b/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80242EBC_C8896C.s
index 78f664db91..d52907cc0a 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80242EBC_C8896C.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80242EBC_C8896C.s
@@ -9,8 +9,8 @@ glabel func_80242EBC_C8896C
 /* C8897C 80242ECC F7B40018 */  sdc1      $f20, 0x18($sp)
 /* C88980 80242ED0 C60C0090 */  lwc1      $f12, 0x90($s0)
 /* C88984 80242ED4 46806320 */  cvt.s.w   $f12, $f12
-/* C88988 80242ED8 3C018024 */  lui       $at, 0x8024
-/* C8898C 80242EDC D43465D0 */  ldc1      $f20, 0x65d0($at)
+/* C88988 80242ED8 3C018024 */  lui       $at, %hi(D_802465D0)
+/* C8898C 80242EDC D43465D0 */  ldc1      $f20, %lo(D_802465D0)($at)
 /* C88990 80242EE0 46006307 */  neg.s     $f12, $f12
 /* C88994 80242EE4 46006321 */  cvt.d.s   $f12, $f12
 /* C88998 80242EE8 46346301 */  sub.d     $f12, $f12, $f20
@@ -27,8 +27,8 @@ glabel func_80242EBC_C8896C
 /* C889C4 80242F14 46006307 */  neg.s     $f12, $f12
 /* C889C8 80242F18 46006321 */  cvt.d.s   $f12, $f12
 /* C889CC 80242F1C 46346301 */  sub.d     $f12, $f12, $f20
-/* C889D0 80242F20 3C018024 */  lui       $at, 0x8024
-/* C889D4 80242F24 D42265D8 */  ldc1      $f2, 0x65d8($at)
+/* C889D0 80242F20 3C018024 */  lui       $at, %hi(D_802465D8)
+/* C889D4 80242F24 D42265D8 */  ldc1      $f2, %lo(D_802465D8)($at)
 /* C889D8 80242F28 46220001 */  sub.d     $f0, $f0, $f2
 /* C889DC 80242F2C 4620010D */  trunc.w.d $f4, $f0
 /* C889E0 80242F30 E6040098 */  swc1      $f4, 0x98($s0)
diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80242F74_C88A24.s b/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80242F74_C88A24.s
index b0425e0b4e..d7e2584ed7 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80242F74_C88A24.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80242F74_C88A24.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80242F74_C88A24
-/* C88A24 80242F74 3C018024 */  lui       $at, 0x8024
-/* C88A28 80242F78 D42265E0 */  ldc1      $f2, 0x65e0($at)
+/* C88A24 80242F74 3C018024 */  lui       $at, %hi(D_802465E0)
+/* C88A28 80242F78 D42265E0 */  ldc1      $f2, %lo(D_802465E0)($at)
 /* C88A2C 80242F7C 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* C88A30 80242F80 AFB00010 */  sw        $s0, 0x10($sp)
 /* C88A34 80242F84 0080802D */  daddu     $s0, $a0, $zero
@@ -14,8 +14,8 @@ glabel func_80242F74_C88A24
 /* C88A48 80242F98 462010A0 */  cvt.s.d   $f2, $f2
 /* C88A4C 80242F9C 46021082 */  mul.s     $f2, $f2, $f2
 /* C88A50 80242FA0 00000000 */  nop       
-/* C88A54 80242FA4 3C018024 */  lui       $at, 0x8024
-/* C88A58 80242FA8 D42065E8 */  ldc1      $f0, 0x65e8($at)
+/* C88A54 80242FA4 3C018024 */  lui       $at, %hi(D_802465E8)
+/* C88A58 80242FA8 D42065E8 */  ldc1      $f0, %lo(D_802465E8)($at)
 /* C88A5C 80242FAC C604008C */  lwc1      $f4, 0x8c($s0)
 /* C88A60 80242FB0 46802121 */  cvt.d.w   $f4, $f4
 /* C88A64 80242FB4 46240001 */  sub.d     $f0, $f0, $f4
diff --git a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_802404B8_C8E068.s b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_802404B8_C8E068.s
index 594461b6f1..a3063b4eed 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_802404B8_C8E068.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_802404B8_C8E068.s
@@ -13,9 +13,9 @@ glabel func_802404B8_C8E068
 /* C8E088 802404D8 2C620005 */  sltiu     $v0, $v1, 5
 /* C8E08C 802404DC 1040008A */  beqz      $v0, .L80240708
 /* C8E090 802404E0 00031080 */   sll      $v0, $v1, 2
-/* C8E094 802404E4 3C018025 */  lui       $at, 0x8025
+/* C8E094 802404E4 3C018025 */  lui       $at, %hi(D_80248340)
 /* C8E098 802404E8 00220821 */  addu      $at, $at, $v0
-/* C8E09C 802404EC 8C228340 */  lw        $v0, -0x7cc0($at)
+/* C8E09C 802404EC 8C228340 */  lw        $v0, %lo(D_80248340)($at)
 /* C8E0A0 802404F0 00400008 */  jr        $v0
 /* C8E0A4 802404F4 00000000 */   nop      
 /* C8E0A8 802404F8 8E22003C */  lw        $v0, 0x3c($s1)
diff --git a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80240E2C_C8E9DC.s b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80240E2C_C8E9DC.s
index 87587e2f93..5c691d1fd6 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80240E2C_C8E9DC.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80240E2C_C8E9DC.s
@@ -3,8 +3,8 @@
 
 glabel func_80240E2C_C8E9DC
 /* C8E9DC 80240E2C 27BDFF70 */  addiu     $sp, $sp, -0x90
-/* C8E9E0 80240E30 3C038025 */  lui       $v1, 0x8025
-/* C8E9E4 80240E34 8C638380 */  lw        $v1, -0x7c80($v1)
+/* C8E9E0 80240E30 3C038025 */  lui       $v1, %hi(D_80248380)
+/* C8E9E4 80240E34 8C638380 */  lw        $v1, %lo(D_80248380)($v1)
 /* C8E9E8 80240E38 2402FFFF */  addiu     $v0, $zero, -1
 /* C8E9EC 80240E3C AFBF005C */  sw        $ra, 0x5c($sp)
 /* C8E9F0 80240E40 AFBE0058 */  sw        $fp, 0x58($sp)
@@ -82,8 +82,8 @@ glabel func_80240E2C_C8E9DC
 /* C8EAF4 80240F44 3C013FE0 */  lui       $at, 0x3fe0
 /* C8EAF8 80240F48 44814800 */  mtc1      $at, $f9
 /* C8EAFC 80240F4C 44804000 */  mtc1      $zero, $f8
-/* C8EB00 80240F50 3C018025 */  lui       $at, 0x8025
-/* C8EB04 80240F54 D4268370 */  ldc1      $f6, -0x7c90($at)
+/* C8EB00 80240F50 3C018025 */  lui       $at, %hi(D_80248370)
+/* C8EB04 80240F54 D4268370 */  ldc1      $f6, %lo(D_80248370)($at)
 .L80240F58:
 /* C8EB08 80240F58 16260004 */  bne       $s1, $a2, .L80240F6C
 /* C8EB0C 80240F5C 00851021 */   addu     $v0, $a0, $a1
@@ -128,12 +128,12 @@ glabel func_80240E2C_C8E9DC
 /* C8EB94 80240FE4 1440FFB1 */  bnez      $v0, .L80240EAC
 /* C8EB98 80240FE8 261001E0 */   addiu    $s0, $s0, 0x1e0
 /* C8EB9C 80240FEC 24020001 */  addiu     $v0, $zero, 1
-/* C8EBA0 80240FF0 3C018025 */  lui       $at, 0x8025
-/* C8EBA4 80240FF4 AC228380 */  sw        $v0, -0x7c80($at)
+/* C8EBA0 80240FF0 3C018025 */  lui       $at, %hi(D_80248380)
+/* C8EBA4 80240FF4 AC228380 */  sw        $v0, %lo(D_80248380)($at)
 /* C8EBA8 80240FF8 0000382D */  daddu     $a3, $zero, $zero
 .L80240FFC:
-/* C8EBAC 80240FFC 3C02800A */  lui       $v0, 0x800a
-/* C8EBB0 80241000 2442A66C */  addiu     $v0, $v0, -0x5994
+/* C8EBAC 80240FFC 3C02800A */  lui       $v0, %hi(D_8009A66C)
+/* C8EBB0 80241000 2442A66C */  addiu     $v0, $v0, %lo(D_8009A66C)
 /* C8EBB4 80241004 0040402D */  daddu     $t0, $v0, $zero
 /* C8EBB8 80241008 3C090100 */  lui       $t1, 0x100
 /* C8EBBC 8024100C 35294008 */  ori       $t1, $t1, 0x4008
@@ -151,10 +151,10 @@ glabel func_80240E2C_C8E9DC
 /* C8EBEC 8024103C 24620008 */  addiu     $v0, $v1, 8
 /* C8EBF0 80241040 AC800004 */  sw        $zero, 4($a0)
 /* C8EBF4 80241044 AD020000 */  sw        $v0, ($t0)
-/* C8EBF8 80241048 3C02DE00 */  lui       $v0, 0xde00
+/* C8EBF8 80241048 3C02DE00 */  lui       $v0, %hi(D_DE003AD8)
 /* C8EBFC 8024104C AC620000 */  sw        $v0, ($v1)
-/* C8EC00 80241050 3C028024 */  lui       $v0, 0x8024
-/* C8EC04 80241054 24423AD8 */  addiu     $v0, $v0, 0x3ad8
+/* C8EC00 80241050 3C028024 */  lui       $v0, %hi(D_80243AD8)
+/* C8EC04 80241054 24423AD8 */  addiu     $v0, $v0, %lo(D_DE003AD8)
 /* C8EC08 80241058 AC620004 */  sw        $v0, 4($v1)
 .L8024105C:
 /* C8EC0C 8024105C 0000202D */  daddu     $a0, $zero, $zero
@@ -355,8 +355,8 @@ glabel func_80240E2C_C8E9DC
 /* C8EEF8 80241348 252901E0 */  addiu     $t1, $t1, 0x1e0
 /* C8EEFC 8024134C 1440FF43 */  bnez      $v0, .L8024105C
 /* C8EF00 80241350 AFA90020 */   sw       $t1, 0x20($sp)
-/* C8EF04 80241354 3C03800A */  lui       $v1, 0x800a
-/* C8EF08 80241358 2463A66C */  addiu     $v1, $v1, -0x5994
+/* C8EF04 80241354 3C03800A */  lui       $v1, %hi(D_8009A66C)
+/* C8EF08 80241358 2463A66C */  addiu     $v1, $v1, %lo(D_8009A66C)
 /* C8EF0C 8024135C 8C620000 */  lw        $v0, ($v1)
 /* C8EF10 80241360 0040202D */  daddu     $a0, $v0, $zero
 /* C8EF14 80241364 24420008 */  addiu     $v0, $v0, 8
diff --git a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_802413C0_C8EF70.s b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_802413C0_C8EF70.s
index a1936ef072..60f09b5764 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_802413C0_C8EF70.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_802413C0_C8EF70.s
@@ -3,8 +3,8 @@
 
 glabel func_802413C0_C8EF70
 /* C8EF70 802413C0 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* C8EF74 802413C4 3C028024 */  lui       $v0, 0x8024
-/* C8EF78 802413C8 24420E2C */  addiu     $v0, $v0, 0xe2c
+/* C8EF74 802413C4 3C028024 */  lui       $v0, %hi(D_80240E2C)
+/* C8EF78 802413C8 24420E2C */  addiu     $v0, $v0, %lo(D_80240E2C)
 /* C8EF7C 802413CC AFA2001C */  sw        $v0, 0x1c($sp)
 /* C8EF80 802413D0 2402000A */  addiu     $v0, $zero, 0xa
 /* C8EF84 802413D4 AFA20014 */  sw        $v0, 0x14($sp)
diff --git a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_802413FC_C8EFAC.s b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_802413FC_C8EFAC.s
index ab021e08b5..2e9d9a9878 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_802413FC_C8EFAC.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_802413FC_C8EFAC.s
@@ -2,7 +2,7 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_802413FC_C8EFAC
-/* C8EFAC 802413FC 3C018025 */  lui       $at, 0x8025
-/* C8EFB0 80241400 AC208380 */  sw        $zero, -0x7c80($at)
+/* C8EFAC 802413FC 3C018025 */  lui       $at, %hi(D_80248380)
+/* C8EFB0 80241400 AC208380 */  sw        $zero, %lo(D_80248380)($at)
 /* C8EFB4 80241404 03E00008 */  jr        $ra
 /* C8EFB8 80241408 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_8024140C_C8EFBC.s b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_8024140C_C8EFBC.s
index 9afaa37ab8..e239b3f6cb 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_8024140C_C8EFBC.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_8024140C_C8EFBC.s
@@ -9,15 +9,15 @@ glabel func_8024140C_C8EFBC
 /* C8EFCC 8024141C 0C00AB39 */  jal       heap_malloc
 /* C8EFD0 80241420 24040780 */   addiu    $a0, $zero, 0x780
 /* C8EFD4 80241424 0200202D */  daddu     $a0, $s0, $zero
-/* C8EFD8 80241428 3C05FD05 */  lui       $a1, 0xfd05
+/* C8EFD8 80241428 3C05FD05 */  lui       $a1, %hi(D_FD0513C0)
 /* C8EFDC 8024142C 34A50F80 */  ori       $a1, $a1, 0xf80
 /* C8EFE0 80241430 0C0B2026 */  jal       set_variable
 /* C8EFE4 80241434 0040302D */   daddu    $a2, $v0, $zero
 /* C8EFE8 80241438 2402FFFF */  addiu     $v0, $zero, -1
-/* C8EFEC 8024143C 3C058024 */  lui       $a1, 0x8024
-/* C8EFF0 80241440 24A513C0 */  addiu     $a1, $a1, 0x13c0
-/* C8EFF4 80241444 3C018025 */  lui       $at, 0x8025
-/* C8EFF8 80241448 AC228380 */  sw        $v0, -0x7c80($at)
+/* C8EFEC 8024143C 3C058024 */  lui       $a1, %hi(D_802413C0)
+/* C8EFF0 80241440 24A513C0 */  addiu     $a1, $a1, %lo(D_FD0513C0)
+/* C8EFF4 80241444 3C018025 */  lui       $at, %hi(D_80248380)
+/* C8EFF8 80241448 AC228380 */  sw        $v0, %lo(D_80248380)($at)
 /* C8EFFC 8024144C 0C048C56 */  jal       bind_dynamic_entity_3
 /* C8F000 80241450 0000202D */   daddu    $a0, $zero, $zero
 /* C8F004 80241454 8FBF0014 */  lw        $ra, 0x14($sp)
diff --git a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241468_C8F018.s b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241468_C8F018.s
index 6a198429c1..c352e00697 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241468_C8F018.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241468_C8F018.s
@@ -4,8 +4,8 @@
 glabel func_80241468_C8F018
 /* C8F018 80241468 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* C8F01C 8024146C AFB00010 */  sw        $s0, 0x10($sp)
-/* C8F020 80241470 3C108024 */  lui       $s0, 0x8024
-/* C8F024 80241474 26103D74 */  addiu     $s0, $s0, 0x3d74
+/* C8F020 80241470 3C108024 */  lui       $s0, %hi(D_80243D74)
+/* C8F024 80241474 26103D74 */  addiu     $s0, $s0, %lo(D_80243D74)
 /* C8F028 80241478 AFBF0018 */  sw        $ra, 0x18($sp)
 /* C8F02C 8024147C AFB10014 */  sw        $s1, 0x14($sp)
 /* C8F030 80241480 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_80241468_C8F018
 /* C8F094 802414E4 28620010 */  slti      $v0, $v1, 0x10
 /* C8F098 802414E8 1440FFFA */  bnez      $v0, .L802414D4
 /* C8F09C 802414EC 24840004 */   addiu    $a0, $a0, 4
-/* C8F0A0 802414F0 3C108024 */  lui       $s0, 0x8024
-/* C8F0A4 802414F4 26103D74 */  addiu     $s0, $s0, 0x3d74
+/* C8F0A0 802414F0 3C108024 */  lui       $s0, %hi(D_80243D74)
+/* C8F0A4 802414F4 26103D74 */  addiu     $s0, $s0, %lo(D_80243D74)
 /* C8F0A8 802414F8 0C00AB4B */  jal       heap_free
 /* C8F0AC 802414FC 8E040000 */   lw       $a0, ($s0)
 /* C8F0B0 80241500 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_802417AC_C8F35C.s b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_802417AC_C8F35C.s
index 163de8e533..eeaf484d28 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_802417AC_C8F35C.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_802417AC_C8F35C.s
@@ -6,11 +6,11 @@ glabel func_802417AC_C8F35C
 /* C8F360 802417B0 AFBF0010 */  sw        $ra, 0x10($sp)
 /* C8F364 802417B4 10A00003 */  beqz      $a1, .L802417C4
 /* C8F368 802417B8 8C86000C */   lw       $a2, 0xc($a0)
-/* C8F36C 802417BC 3C018024 */  lui       $at, 0x8024
-/* C8F370 802417C0 AC203DD8 */  sw        $zero, 0x3dd8($at)
+/* C8F36C 802417BC 3C018024 */  lui       $at, %hi(D_80243DD8)
+/* C8F370 802417C0 AC203DD8 */  sw        $zero, %lo(D_80243DD8)($at)
 .L802417C4:
-/* C8F374 802417C4 3C038024 */  lui       $v1, 0x8024
-/* C8F378 802417C8 24633DD8 */  addiu     $v1, $v1, 0x3dd8
+/* C8F374 802417C4 3C038024 */  lui       $v1, %hi(D_80243DD8)
+/* C8F378 802417C8 24633DD8 */  addiu     $v1, $v1, %lo(D_80243DD8)
 /* C8F37C 802417CC 8C620000 */  lw        $v0, ($v1)
 /* C8F380 802417D0 54400003 */  bnel      $v0, $zero, .L802417E0
 /* C8F384 802417D4 AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_802417AC_C8F35C
 /* C8F38C 802417DC 0000102D */   daddu    $v0, $zero, $zero
 .L802417E0:
 /* C8F390 802417E0 8CC50000 */  lw        $a1, ($a2)
-/* C8F394 802417E4 3C068024 */  lui       $a2, 0x8024
+/* C8F394 802417E4 3C068024 */  lui       $a2, %hi(D_80243DDC)
 /* C8F398 802417E8 0C0B2026 */  jal       set_variable
-/* C8F39C 802417EC 8CC63DDC */   lw       $a2, 0x3ddc($a2)
+/* C8F39C 802417EC 8CC63DDC */   lw       $a2, %lo(D_80243DDC)($a2)
 /* C8F3A0 802417F0 24020002 */  addiu     $v0, $zero, 2
 .L802417F4:
 /* C8F3A4 802417F4 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241800_C8F3B0.s b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241800_C8F3B0.s
index 77e1012e2f..74a200ccf3 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241800_C8F3B0.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241800_C8F3B0.s
@@ -7,12 +7,12 @@ glabel func_80241800_C8F3B0
 /* C8F3B8 80241808 8C82000C */  lw        $v0, 0xc($a0)
 /* C8F3BC 8024180C 0C0B1EAF */  jal       get_variable
 /* C8F3C0 80241810 8C450000 */   lw       $a1, ($v0)
-/* C8F3C4 80241814 3C018024 */  lui       $at, 0x8024
-/* C8F3C8 80241818 AC223DDC */  sw        $v0, 0x3ddc($at)
+/* C8F3C4 80241814 3C018024 */  lui       $at, %hi(D_80243DDC)
+/* C8F3C8 80241818 AC223DDC */  sw        $v0, %lo(D_80243DDC)($at)
 /* C8F3CC 8024181C 24020002 */  addiu     $v0, $zero, 2
 /* C8F3D0 80241820 8FBF0010 */  lw        $ra, 0x10($sp)
 /* C8F3D4 80241824 24030001 */  addiu     $v1, $zero, 1
-/* C8F3D8 80241828 3C018024 */  lui       $at, 0x8024
-/* C8F3DC 8024182C AC233DD8 */  sw        $v1, 0x3dd8($at)
+/* C8F3D8 80241828 3C018024 */  lui       $at, %hi(D_80243DD8)
+/* C8F3DC 8024182C AC233DD8 */  sw        $v1, %lo(D_80243DD8)($at)
 /* C8F3E0 80241830 03E00008 */  jr        $ra
 /* C8F3E4 80241834 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241838_C8F3E8.s b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241838_C8F3E8.s
index 2aa1d1db01..74ec027416 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241838_C8F3E8.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241838_C8F3E8.s
@@ -13,8 +13,8 @@ glabel func_80241838_C8F3E8
 /* C8F408 80241858 8C620000 */  lw        $v0, ($v1)
 /* C8F40C 8024185C 5040000A */  beql      $v0, $zero, .L80241888
 /* C8F410 80241860 00041080 */   sll      $v0, $a0, 2
-/* C8F414 80241864 3C058025 */  lui       $a1, 0x8025
-/* C8F418 80241868 24A58388 */  addiu     $a1, $a1, -0x7c78
+/* C8F414 80241864 3C058025 */  lui       $a1, %hi(D_80248388)
+/* C8F418 80241868 24A58388 */  addiu     $a1, $a1, %lo(D_80248388)
 .L8024186C:
 /* C8F41C 8024186C 24630004 */  addiu     $v1, $v1, 4
 /* C8F420 80241870 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_80241838_C8F3E8
 /* C8F430 80241880 24A50004 */   addiu    $a1, $a1, 4
 /* C8F434 80241884 00041080 */  sll       $v0, $a0, 2
 .L80241888:
-/* C8F438 80241888 3C018025 */  lui       $at, 0x8025
+/* C8F438 80241888 3C018025 */  lui       $at, %hi(D_80248388)
 /* C8F43C 8024188C 00220821 */  addu      $at, $at, $v0
-/* C8F440 80241890 AC208388 */  sw        $zero, -0x7c78($at)
+/* C8F440 80241890 AC208388 */  sw        $zero, %lo(D_80248388)($at)
 /* C8F444 80241894 08090631 */  j         .L802418C4
 /* C8F448 80241898 00000000 */   nop      
 .L8024189C:
-/* C8F44C 8024189C 3C038025 */  lui       $v1, 0x8025
-/* C8F450 802418A0 24638388 */  addiu     $v1, $v1, -0x7c78
+/* C8F44C 8024189C 3C038025 */  lui       $v1, %hi(D_80248388)
+/* C8F450 802418A0 24638388 */  addiu     $v1, $v1, %lo(D_80248388)
 /* C8F454 802418A4 0060282D */  daddu     $a1, $v1, $zero
 .L802418A8:
 /* C8F458 802418A8 24820010 */  addiu     $v0, $a0, 0x10
diff --git a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241B50_C8F700.s b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241B50_C8F700.s
index 5fd7332104..89ae4ffe66 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241B50_C8F700.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241B50_C8F700.s
@@ -15,7 +15,7 @@ glabel func_80241B50_C8F700
 /* C8F728 80241B78 8FBF0014 */  lw        $ra, 0x14($sp)
 /* C8F72C 80241B7C 8FB00010 */  lw        $s0, 0x10($sp)
 /* C8F730 80241B80 24020002 */  addiu     $v0, $zero, 2
-/* C8F734 80241B84 3C018025 */  lui       $at, 0x8025
-/* C8F738 80241B88 AC23854C */  sw        $v1, -0x7ab4($at)
+/* C8F734 80241B84 3C018025 */  lui       $at, %hi(D_8024854C)
+/* C8F738 80241B88 AC23854C */  sw        $v1, %lo(D_8024854C)($at)
 /* C8F73C 80241B8C 03E00008 */  jr        $ra
 /* C8F740 80241B90 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241B94_C8F744.s b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241B94_C8F744.s
index 594fcdc083..c91a6d0731 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241B94_C8F744.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241B94_C8F744.s
@@ -6,8 +6,8 @@ glabel func_80241B94_C8F744
 /* C8F748 80241B98 AFBF0010 */  sw        $ra, 0x10($sp)
 /* C8F74C 80241B9C 0C00EABB */  jal       get_npc_unsafe
 /* C8F750 80241BA0 8C84008C */   lw       $a0, 0x8c($a0)
-/* C8F754 80241BA4 3C038025 */  lui       $v1, 0x8025
-/* C8F758 80241BA8 8C63854C */  lw        $v1, -0x7ab4($v1)
+/* C8F754 80241BA4 3C038025 */  lui       $v1, %hi(D_8024854C)
+/* C8F758 80241BA8 8C63854C */  lw        $v1, %lo(D_8024854C)($v1)
 /* C8F75C 80241BAC AC430028 */  sw        $v1, 0x28($v0)
 /* C8F760 80241BB0 8FBF0010 */  lw        $ra, 0x10($sp)
 /* C8F764 80241BB4 24020002 */  addiu     $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241BC0_C8F770.s b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241BC0_C8F770.s
index dc53419231..a7fd5ee8d6 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241BC0_C8F770.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241BC0_C8F770.s
@@ -33,8 +33,8 @@ glabel func_80241BC0_C8F770
 /* C8F7DC 80241C2C 08090743 */  j         .L80241D0C
 /* C8F7E0 80241C30 00000000 */   nop      
 .L80241C34:
-/* C8F7E4 80241C34 3C028024 */  lui       $v0, 0x8024
-/* C8F7E8 80241C38 24423BB8 */  addiu     $v0, $v0, 0x3bb8
+/* C8F7E4 80241C34 3C028024 */  lui       $v0, %hi(D_80243BB8)
+/* C8F7E8 80241C38 24423BB8 */  addiu     $v0, $v0, %lo(D_80243BB8)
 /* C8F7EC 80241C3C 00641821 */  addu      $v1, $v1, $a0
 /* C8F7F0 80241C40 00032080 */  sll       $a0, $v1, 2
 /* C8F7F4 80241C44 00822021 */  addu      $a0, $a0, $v0
@@ -47,8 +47,8 @@ glabel func_80241BC0_C8F770
 /* C8F810 80241C60 3C068020 */   lui      $a2, 0x8020
 .L80241C64:
 /* C8F814 80241C64 3C068020 */  lui       $a2, 0x8020
-/* C8F818 80241C68 3C028024 */  lui       $v0, 0x8024
-/* C8F81C 80241C6C 24423BB8 */  addiu     $v0, $v0, 0x3bb8
+/* C8F818 80241C68 3C028024 */  lui       $v0, %hi(D_80243BB8)
+/* C8F81C 80241C6C 24423BB8 */  addiu     $v0, $v0, %lo(D_80243BB8)
 /* C8F820 80241C70 00041840 */  sll       $v1, $a0, 1
 /* C8F824 80241C74 00641821 */  addu      $v1, $v1, $a0
 /* C8F828 80241C78 00032080 */  sll       $a0, $v1, 2
@@ -62,8 +62,8 @@ glabel func_80241BC0_C8F770
 /* C8F848 80241C98 34C64000 */   ori      $a2, $a2, 0x4000
 .L80241C9C:
 /* C8F84C 80241C9C 3C068020 */  lui       $a2, 0x8020
-/* C8F850 80241CA0 3C028024 */  lui       $v0, 0x8024
-/* C8F854 80241CA4 24423BB8 */  addiu     $v0, $v0, 0x3bb8
+/* C8F850 80241CA0 3C028024 */  lui       $v0, %hi(D_80243BB8)
+/* C8F854 80241CA4 24423BB8 */  addiu     $v0, $v0, %lo(D_80243BB8)
 /* C8F858 80241CA8 00041840 */  sll       $v1, $a0, 1
 /* C8F85C 80241CAC 00641821 */  addu      $v1, $v1, $a0
 /* C8F860 80241CB0 00032080 */  sll       $a0, $v1, 2
@@ -76,8 +76,8 @@ glabel func_80241BC0_C8F770
 /* C8F87C 80241CCC 08090741 */  j         .L80241D04
 /* C8F880 80241CD0 34C67000 */   ori      $a2, $a2, 0x7000
 .L80241CD4:
-/* C8F884 80241CD4 3C028024 */  lui       $v0, 0x8024
-/* C8F888 80241CD8 24423BB8 */  addiu     $v0, $v0, 0x3bb8
+/* C8F884 80241CD4 3C028024 */  lui       $v0, %hi(D_80243BB8)
+/* C8F888 80241CD8 24423BB8 */  addiu     $v0, $v0, %lo(D_80243BB8)
 /* C8F88C 80241CDC 00041840 */  sll       $v1, $a0, 1
 /* C8F890 80241CE0 00641821 */  addu      $v1, $v1, $a0
 /* C8F894 80241CE4 00032080 */  sll       $a0, $v1, 2
diff --git a/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_80240310_C96240.s b/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_80240310_C96240.s
index 78db0247bf..691a829efa 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_80240310_C96240.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_80240310_C96240.s
@@ -4,8 +4,8 @@
 glabel func_80240310_C96240
 /* C96240 80240310 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* C96244 80240314 AFB00010 */  sw        $s0, 0x10($sp)
-/* C96248 80240318 3C108024 */  lui       $s0, 0x8024
-/* C9624C 8024031C 26101780 */  addiu     $s0, $s0, 0x1780
+/* C96248 80240318 3C108024 */  lui       $s0, %hi(D_80241780)
+/* C9624C 8024031C 26101780 */  addiu     $s0, $s0, %lo(D_80241780)
 /* C96250 80240320 AFBF0018 */  sw        $ra, 0x18($sp)
 /* C96254 80240324 AFB10014 */  sw        $s1, 0x14($sp)
 /* C96258 80240328 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_80240310_C96240
 /* C962BC 8024038C 28620010 */  slti      $v0, $v1, 0x10
 /* C962C0 80240390 1440FFFA */  bnez      $v0, .L8024037C
 /* C962C4 80240394 24840004 */   addiu    $a0, $a0, 4
-/* C962C8 80240398 3C108024 */  lui       $s0, 0x8024
-/* C962CC 8024039C 26101780 */  addiu     $s0, $s0, 0x1780
+/* C962C8 80240398 3C108024 */  lui       $s0, %hi(D_80241780)
+/* C962CC 8024039C 26101780 */  addiu     $s0, $s0, %lo(D_80241780)
 /* C962D0 802403A0 0C00AB4B */  jal       heap_free
 /* C962D4 802403A4 8E040000 */   lw       $a0, ($s0)
 /* C962D8 802403A8 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_80240654_C96584.s b/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_80240654_C96584.s
index 8ad88f00e7..9b78f6fec4 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_80240654_C96584.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_80240654_C96584.s
@@ -6,11 +6,11 @@ glabel func_80240654_C96584
 /* C96588 80240658 AFBF0010 */  sw        $ra, 0x10($sp)
 /* C9658C 8024065C 10A00003 */  beqz      $a1, .L8024066C
 /* C96590 80240660 8C86000C */   lw       $a2, 0xc($a0)
-/* C96594 80240664 3C018024 */  lui       $at, 0x8024
-/* C96598 80240668 AC2017E4 */  sw        $zero, 0x17e4($at)
+/* C96594 80240664 3C018024 */  lui       $at, %hi(D_802417E4)
+/* C96598 80240668 AC2017E4 */  sw        $zero, %lo(D_802417E4)($at)
 .L8024066C:
-/* C9659C 8024066C 3C038024 */  lui       $v1, 0x8024
-/* C965A0 80240670 246317E4 */  addiu     $v1, $v1, 0x17e4
+/* C9659C 8024066C 3C038024 */  lui       $v1, %hi(D_802417E4)
+/* C965A0 80240670 246317E4 */  addiu     $v1, $v1, %lo(D_802417E4)
 /* C965A4 80240674 8C620000 */  lw        $v0, ($v1)
 /* C965A8 80240678 54400003 */  bnel      $v0, $zero, .L80240688
 /* C965AC 8024067C AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_80240654_C96584
 /* C965B4 80240684 0000102D */   daddu    $v0, $zero, $zero
 .L80240688:
 /* C965B8 80240688 8CC50000 */  lw        $a1, ($a2)
-/* C965BC 8024068C 3C068024 */  lui       $a2, 0x8024
+/* C965BC 8024068C 3C068024 */  lui       $a2, %hi(D_802417E8)
 /* C965C0 80240690 0C0B2026 */  jal       set_variable
-/* C965C4 80240694 8CC617E8 */   lw       $a2, 0x17e8($a2)
+/* C965C4 80240694 8CC617E8 */   lw       $a2, %lo(D_802417E8)($a2)
 /* C965C8 80240698 24020002 */  addiu     $v0, $zero, 2
 .L8024069C:
 /* C965CC 8024069C 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_802406A8_C965D8.s b/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_802406A8_C965D8.s
index 71313df522..5239ad9d91 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_802406A8_C965D8.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_802406A8_C965D8.s
@@ -7,12 +7,12 @@ glabel func_802406A8_C965D8
 /* C965E0 802406B0 8C82000C */  lw        $v0, 0xc($a0)
 /* C965E4 802406B4 0C0B1EAF */  jal       get_variable
 /* C965E8 802406B8 8C450000 */   lw       $a1, ($v0)
-/* C965EC 802406BC 3C018024 */  lui       $at, 0x8024
-/* C965F0 802406C0 AC2217E8 */  sw        $v0, 0x17e8($at)
+/* C965EC 802406BC 3C018024 */  lui       $at, %hi(D_802417E8)
+/* C965F0 802406C0 AC2217E8 */  sw        $v0, %lo(D_802417E8)($at)
 /* C965F4 802406C4 24020002 */  addiu     $v0, $zero, 2
 /* C965F8 802406C8 8FBF0010 */  lw        $ra, 0x10($sp)
 /* C965FC 802406CC 24030001 */  addiu     $v1, $zero, 1
-/* C96600 802406D0 3C018024 */  lui       $at, 0x8024
-/* C96604 802406D4 AC2317E4 */  sw        $v1, 0x17e4($at)
+/* C96600 802406D0 3C018024 */  lui       $at, %hi(D_802417E4)
+/* C96604 802406D4 AC2317E4 */  sw        $v1, %lo(D_802417E4)($at)
 /* C96608 802406D8 03E00008 */  jr        $ra
 /* C9660C 802406DC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_802406E0_C96610.s b/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_802406E0_C96610.s
index 81e80d8a0f..a1c6b6d57c 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_802406E0_C96610.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_802406E0_C96610.s
@@ -13,8 +13,8 @@ glabel func_802406E0_C96610
 /* C96630 80240700 8C620000 */  lw        $v0, ($v1)
 /* C96634 80240704 5040000A */  beql      $v0, $zero, .L80240730
 /* C96638 80240708 00041080 */   sll      $v0, $a0, 2
-/* C9663C 8024070C 3C058024 */  lui       $a1, 0x8024
-/* C96640 80240710 24A542D0 */  addiu     $a1, $a1, 0x42d0
+/* C9663C 8024070C 3C058024 */  lui       $a1, %hi(D_802442D0)
+/* C96640 80240710 24A542D0 */  addiu     $a1, $a1, %lo(D_802442D0)
 .L80240714:
 /* C96644 80240714 24630004 */  addiu     $v1, $v1, 4
 /* C96648 80240718 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_802406E0_C96610
 /* C96658 80240728 24A50004 */   addiu    $a1, $a1, 4
 /* C9665C 8024072C 00041080 */  sll       $v0, $a0, 2
 .L80240730:
-/* C96660 80240730 3C018024 */  lui       $at, 0x8024
+/* C96660 80240730 3C018024 */  lui       $at, %hi(D_802442D0)
 /* C96664 80240734 00220821 */  addu      $at, $at, $v0
-/* C96668 80240738 AC2042D0 */  sw        $zero, 0x42d0($at)
+/* C96668 80240738 AC2042D0 */  sw        $zero, %lo(D_802442D0)($at)
 /* C9666C 8024073C 080901DB */  j         .L8024076C
 /* C96670 80240740 00000000 */   nop      
 .L80240744:
-/* C96674 80240744 3C038024 */  lui       $v1, 0x8024
-/* C96678 80240748 246342D0 */  addiu     $v1, $v1, 0x42d0
+/* C96674 80240744 3C038024 */  lui       $v1, %hi(D_802442D0)
+/* C96678 80240748 246342D0 */  addiu     $v1, $v1, %lo(D_802442D0)
 /* C9667C 8024074C 0060282D */  daddu     $a1, $v1, $zero
 .L80240750:
 /* C96680 80240750 24820010 */  addiu     $v0, $a0, 0x10
diff --git a/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_802409F8_C96928.s b/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_802409F8_C96928.s
index 12f5e78621..54c71ad699 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_802409F8_C96928.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_802409F8_C96928.s
@@ -15,7 +15,7 @@ glabel func_802409F8_C96928
 /* C96950 80240A20 8FBF0014 */  lw        $ra, 0x14($sp)
 /* C96954 80240A24 8FB00010 */  lw        $s0, 0x10($sp)
 /* C96958 80240A28 24020002 */  addiu     $v0, $zero, 2
-/* C9695C 80240A2C 3C018024 */  lui       $at, 0x8024
-/* C96960 80240A30 AC234494 */  sw        $v1, 0x4494($at)
+/* C9695C 80240A2C 3C018024 */  lui       $at, %hi(D_80244494)
+/* C96960 80240A30 AC234494 */  sw        $v1, %lo(D_80244494)($at)
 /* C96964 80240A34 03E00008 */  jr        $ra
 /* C96968 80240A38 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_80240A3C_C9696C.s b/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_80240A3C_C9696C.s
index 49c7f10d66..679711d2b5 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_80240A3C_C9696C.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_80240A3C_C9696C.s
@@ -6,8 +6,8 @@ glabel func_80240A3C_C9696C
 /* C96970 80240A40 AFBF0010 */  sw        $ra, 0x10($sp)
 /* C96974 80240A44 0C00EABB */  jal       get_npc_unsafe
 /* C96978 80240A48 8C84008C */   lw       $a0, 0x8c($a0)
-/* C9697C 80240A4C 3C038024 */  lui       $v1, 0x8024
-/* C96980 80240A50 8C634494 */  lw        $v1, 0x4494($v1)
+/* C9697C 80240A4C 3C038024 */  lui       $v1, %hi(D_80244494)
+/* C96980 80240A50 8C634494 */  lw        $v1, %lo(D_80244494)($v1)
 /* C96984 80240A54 AC430028 */  sw        $v1, 0x28($v0)
 /* C96988 80240A58 8FBF0010 */  lw        $ra, 0x10($sp)
 /* C9698C 80240A5C 24020002 */  addiu     $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_kzn/kzn_23/C9C610/func_80240520_C9C820.s b/asm/nonmatchings/world/area_kzn/kzn_23/C9C610/func_80240520_C9C820.s
index 3378152538..61c52c89e1 100644
--- a/asm/nonmatchings/world/area_kzn/kzn_23/C9C610/func_80240520_C9C820.s
+++ b/asm/nonmatchings/world/area_kzn/kzn_23/C9C610/func_80240520_C9C820.s
@@ -41,8 +41,8 @@ glabel func_80240520_C9C820
 /* C9C8AC 802405AC 44811000 */  mtc1      $at, $f2
 /* C9C8B0 802405B0 00000000 */  nop       
 /* C9C8B4 802405B4 46001081 */  sub.s     $f2, $f2, $f0
-/* C9C8B8 802405B8 3C018024 */  lui       $at, 0x8024
-/* C9C8BC 802405BC D4201C10 */  ldc1      $f0, 0x1c10($at)
+/* C9C8B8 802405B8 3C018024 */  lui       $at, %hi(D_80241C10)
+/* C9C8BC 802405BC D4201C10 */  ldc1      $f0, %lo(D_80241C10)($at)
 /* C9C8C0 802405C0 460010A1 */  cvt.d.s   $f2, $f2
 /* C9C8C4 802405C4 46201082 */  mul.d     $f2, $f2, $f0
 /* C9C8C8 802405C8 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240630_7EB340.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240630_7EB340.s
index 51e4494438..1513ca9882 100644
--- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240630_7EB340.s
+++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240630_7EB340.s
@@ -4,8 +4,8 @@
 glabel func_80240630_7EB340
 /* 7EB340 80240630 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* 7EB344 80240634 AFB00010 */  sw        $s0, 0x10($sp)
-/* 7EB348 80240638 3C108024 */  lui       $s0, 0x8024
-/* 7EB34C 8024063C 26105DC0 */  addiu     $s0, $s0, 0x5dc0
+/* 7EB348 80240638 3C108024 */  lui       $s0, %hi(D_80245DC0)
+/* 7EB34C 8024063C 26105DC0 */  addiu     $s0, $s0, %lo(D_80245DC0)
 /* 7EB350 80240640 AFBF0018 */  sw        $ra, 0x18($sp)
 /* 7EB354 80240644 AFB10014 */  sw        $s1, 0x14($sp)
 /* 7EB358 80240648 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_80240630_7EB340
 /* 7EB3BC 802406AC 28620010 */  slti      $v0, $v1, 0x10
 /* 7EB3C0 802406B0 1440FFFA */  bnez      $v0, .L8024069C
 /* 7EB3C4 802406B4 24840004 */   addiu    $a0, $a0, 4
-/* 7EB3C8 802406B8 3C108024 */  lui       $s0, 0x8024
-/* 7EB3CC 802406BC 26105DC0 */  addiu     $s0, $s0, 0x5dc0
+/* 7EB3C8 802406B8 3C108024 */  lui       $s0, %hi(D_80245DC0)
+/* 7EB3CC 802406BC 26105DC0 */  addiu     $s0, $s0, %lo(D_80245DC0)
 /* 7EB3D0 802406C0 0C00AB4B */  jal       heap_free
 /* 7EB3D4 802406C4 8E040000 */   lw       $a0, ($s0)
 /* 7EB3D8 802406C8 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024076C_7EB47C.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024076C_7EB47C.s
index 59ae4e91b5..0da3ba35df 100644
--- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024076C_7EB47C.s
+++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024076C_7EB47C.s
@@ -90,8 +90,8 @@ glabel func_8024076C_7EB47C
 /* 7EB5C8 802408B8 0040802D */   daddu    $s0, $v0, $zero
 /* 7EB5CC 802408BC 0040282D */  daddu     $a1, $v0, $zero
 /* 7EB5D0 802408C0 0000182D */  daddu     $v1, $zero, $zero
-/* 7EB5D4 802408C4 3C068024 */  lui       $a2, 0x8024
-/* 7EB5D8 802408C8 24C65E64 */  addiu     $a2, $a2, 0x5e64
+/* 7EB5D4 802408C4 3C068024 */  lui       $a2, %hi(D_80245E64)
+/* 7EB5D8 802408C8 24C65E64 */  addiu     $a2, $a2, %lo(D_80245E64)
 /* 7EB5DC 802408CC 00C0202D */  daddu     $a0, $a2, $zero
 .L802408D0:
 /* 7EB5E0 802408D0 8C820000 */  lw        $v0, ($a0)
diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240990_7EB6A0.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240990_7EB6A0.s
index 310725a703..e173dddddc 100644
--- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240990_7EB6A0.s
+++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240990_7EB6A0.s
@@ -9,8 +9,8 @@ glabel func_80240990_7EB6A0
 /* 7EB6B0 802409A0 8C84014C */   lw       $a0, 0x14c($a0)
 /* 7EB6B4 802409A4 24040008 */  addiu     $a0, $zero, 8
 /* 7EB6B8 802409A8 0040802D */  daddu     $s0, $v0, $zero
-/* 7EB6BC 802409AC 3C028024 */  lui       $v0, 0x8024
-/* 7EB6C0 802409B0 244209FC */  addiu     $v0, $v0, 0x9fc
+/* 7EB6BC 802409AC 3C028024 */  lui       $v0, %hi(D_802409FC)
+/* 7EB6C0 802409B0 244209FC */  addiu     $v0, $v0, %lo(D_802409FC)
 /* 7EB6C4 802409B4 0C00AB39 */  jal       heap_malloc
 /* 7EB6C8 802409B8 AE020008 */   sw       $v0, 8($s0)
 /* 7EB6CC 802409BC 0040182D */  daddu     $v1, $v0, $zero
diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802409FC_7EB70C.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802409FC_7EB70C.s
index 97fbd0d5f4..a88fb2ebe0 100644
--- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802409FC_7EB70C.s
+++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802409FC_7EB70C.s
@@ -3,8 +3,8 @@
 
 glabel func_802409FC_7EB70C
 /* 7EB70C 802409FC 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 7EB710 80240A00 3C03800A */  lui       $v1, 0x800a
-/* 7EB714 80240A04 8463A634 */  lh        $v1, -0x59cc($v1)
+/* 7EB710 80240A00 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* 7EB714 80240A04 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* 7EB718 80240A08 3C05800B */  lui       $a1, %hi(gCameras)
 /* 7EB71C 80240A0C 24A51D80 */  addiu     $a1, $a1, %lo(gCameras)
 /* 7EB720 80240A10 AFBF0010 */  sw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240A5C_7EB76C.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240A5C_7EB76C.s
index 237de0f32b..57767bb714 100644
--- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240A5C_7EB76C.s
+++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240A5C_7EB76C.s
@@ -21,8 +21,8 @@ glabel func_80240A5C_7EB76C
 /* 7EB7AC 80240A9C 2414FFFC */  addiu     $s4, $zero, -4
 /* 7EB7B0 80240AA0 24130006 */  addiu     $s3, $zero, 6
 /* 7EB7B4 80240AA4 3C120080 */  lui       $s2, 0x80
-/* 7EB7B8 80240AA8 3C038015 */  lui       $v1, 0x8015
-/* 7EB7BC 80240AAC 8C6312F0 */  lw        $v1, 0x12f0($v1)
+/* 7EB7B8 80240AA8 3C038015 */  lui       $v1, %hi(D_801512F0)
+/* 7EB7BC 80240AAC 8C6312F0 */  lw        $v1, %lo(D_801512F0)($v1)
 /* 7EB7C0 80240AB0 24020001 */  addiu     $v0, $zero, 1
 /* 7EB7C4 80240AB4 0C046F97 */  jal       set_background_color_blend
 /* 7EB7C8 80240AB8 A0620000 */   sb       $v0, ($v1)
diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240BA8_7EB8B8.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240BA8_7EB8B8.s
index fb17887694..02f3e77bea 100644
--- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240BA8_7EB8B8.s
+++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240BA8_7EB8B8.s
@@ -49,8 +49,8 @@ glabel func_80240BA8_7EB8B8
 /* 7EB95C 80240C4C 2413FFFC */  addiu     $s3, $zero, -4
 /* 7EB960 80240C50 24120006 */  addiu     $s2, $zero, 6
 /* 7EB964 80240C54 3C11FF7F */  lui       $s1, 0xff7f
-/* 7EB968 80240C58 3C028015 */  lui       $v0, 0x8015
-/* 7EB96C 80240C5C 8C4212F0 */  lw        $v0, 0x12f0($v0)
+/* 7EB968 80240C58 3C028015 */  lui       $v0, %hi(D_801512F0)
+/* 7EB96C 80240C5C 8C4212F0 */  lw        $v0, %lo(D_801512F0)($v0)
 /* 7EB970 80240C60 3631FFFF */  ori       $s1, $s1, 0xffff
 /* 7EB974 80240C64 A0400000 */  sb        $zero, ($v0)
 .L80240C68:
diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240D1C_7EBA2C.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240D1C_7EBA2C.s
index 78b467d12a..e62ac1c3bf 100644
--- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240D1C_7EBA2C.s
+++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240D1C_7EBA2C.s
@@ -19,9 +19,9 @@ glabel func_80240D1C_7EBA2C
 /* 7EBA60 80240D50 34A502E0 */  ori       $a1, $a1, 0x2e0
 /* 7EBA64 80240D54 0C0B1EAF */  jal       get_variable
 /* 7EBA68 80240D58 0000202D */   daddu    $a0, $zero, $zero
-/* 7EBA6C 80240D5C 3C038024 */  lui       $v1, 0x8024
+/* 7EBA6C 80240D5C 3C038024 */  lui       $v1, %hi(D_80245E24)
 /* 7EBA70 80240D60 00621821 */  addu      $v1, $v1, $v0
-/* 7EBA74 80240D64 90635E24 */  lbu       $v1, 0x5e24($v1)
+/* 7EBA74 80240D64 90635E24 */  lbu       $v1, %lo(D_80245E24)($v1)
 /* 7EBA78 80240D68 8E220084 */  lw        $v0, 0x84($s1)
 /* 7EBA7C 80240D6C 54430006 */  bnel      $v0, $v1, .L80240D88
 /* 7EBA80 80240D70 AE200084 */   sw       $zero, 0x84($s1)
diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240DA0_7EBAB0.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240DA0_7EBAB0.s
index 05ce9b631e..2214f2ce63 100644
--- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240DA0_7EBAB0.s
+++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240DA0_7EBAB0.s
@@ -38,8 +38,8 @@ glabel func_80240DA0_7EBAB0
 /* 7EBB34 80240E24 0220202D */  daddu     $a0, $s1, $zero
 /* 7EBB38 80240E28 3C05F4AC */  lui       $a1, 0xf4ac
 /* 7EBB3C 80240E2C 34A5D481 */  ori       $a1, $a1, 0xd481
-/* 7EBB40 80240E30 3C108025 */  lui       $s0, 0x8025
-/* 7EBB44 80240E34 26105B90 */  addiu     $s0, $s0, 0x5b90
+/* 7EBB40 80240E30 3C108025 */  lui       $s0, %hi(D_80255B90)
+/* 7EBB44 80240E34 26105B90 */  addiu     $s0, $s0, %lo(D_80255B90)
 /* 7EBB48 80240E38 0C0B1EAF */  jal       get_variable
 /* 7EBB4C 80240E3C AE020000 */   sw       $v0, ($s0)
 /* 7EBB50 80240E40 0220202D */  daddu     $a0, $s1, $zero
@@ -66,8 +66,8 @@ glabel func_80240DA0_7EBAB0
 /* 7EBBA4 80240E94 0000202D */   daddu    $a0, $zero, $zero
 /* 7EBBA8 80240E98 0220202D */  daddu     $a0, $s1, $zero
 /* 7EBBAC 80240E9C 3C05F4AC */  lui       $a1, 0xf4ac
-/* 7EBBB0 80240EA0 3C018025 */  lui       $at, 0x8025
-/* 7EBBB4 80240EA4 AC225B94 */  sw        $v0, 0x5b94($at)
+/* 7EBBB0 80240EA0 3C018025 */  lui       $at, %hi(D_80255B94)
+/* 7EBBB4 80240EA4 AC225B94 */  sw        $v0, %lo(D_80255B94)($at)
 /* 7EBBB8 80240EA8 0C0B1EAF */  jal       get_variable
 /* 7EBBBC 80240EAC 34A5D481 */   ori      $a1, $a1, 0xd481
 /* 7EBBC0 80240EB0 0220202D */  daddu     $a0, $s1, $zero
@@ -98,16 +98,16 @@ glabel func_80240DA0_7EBAB0
 /* 7EBC24 80240F14 E7A00010 */   swc1     $f0, 0x10($sp)
 /* 7EBC28 80240F18 8E030000 */  lw        $v1, ($s0)
 /* 7EBC2C 80240F1C 8C64000C */  lw        $a0, 0xc($v1)
-/* 7EBC30 80240F20 3C018025 */  lui       $at, 0x8025
-/* 7EBC34 80240F24 AC225B98 */  sw        $v0, 0x5b98($at)
+/* 7EBC30 80240F20 3C018025 */  lui       $at, %hi(D_80255B98)
+/* 7EBC34 80240F24 AC225B98 */  sw        $v0, %lo(D_80255B98)($at)
 /* 7EBC38 80240F28 AC800018 */  sw        $zero, 0x18($a0)
 /* 7EBC3C 80240F2C AC800020 */  sw        $zero, 0x20($a0)
 /* 7EBC40 80240F30 AC800024 */  sw        $zero, 0x24($a0)
 /* 7EBC44 80240F34 AC800028 */  sw        $zero, 0x28($a0)
 /* 7EBC48 80240F38 AC80001C */  sw        $zero, 0x1c($a0)
 .L80240F3C:
-/* 7EBC4C 80240F3C 3C028025 */  lui       $v0, 0x8025
-/* 7EBC50 80240F40 8C425B90 */  lw        $v0, 0x5b90($v0)
+/* 7EBC4C 80240F3C 3C028025 */  lui       $v0, %hi(D_80255B90)
+/* 7EBC50 80240F40 8C425B90 */  lw        $v0, %lo(D_80255B90)($v0)
 /* 7EBC54 80240F44 8C44000C */  lw        $a0, 0xc($v0)
 /* 7EBC58 80240F48 8C820020 */  lw        $v0, 0x20($a0)
 /* 7EBC5C 80240F4C 8C830028 */  lw        $v1, 0x28($a0)
diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240FB8_7EBCC8.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240FB8_7EBCC8.s
index 53e4982c25..8a995f4a35 100644
--- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240FB8_7EBCC8.s
+++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240FB8_7EBCC8.s
@@ -5,19 +5,19 @@ glabel func_80240FB8_7EBCC8
 /* 7EBCC8 80240FB8 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 7EBCCC 80240FBC 10A0000B */  beqz      $a1, .L80240FEC
 /* 7EBCD0 80240FC0 AFBF0010 */   sw       $ra, 0x10($sp)
-/* 7EBCD4 80240FC4 3C038025 */  lui       $v1, 0x8025
-/* 7EBCD8 80240FC8 8C635B94 */  lw        $v1, 0x5b94($v1)
+/* 7EBCD4 80240FC4 3C038025 */  lui       $v1, %hi(D_80255B94)
+/* 7EBCD8 80240FC8 8C635B94 */  lw        $v1, %lo(D_80255B94)($v1)
 /* 7EBCDC 80240FCC 8C620000 */  lw        $v0, ($v1)
-/* 7EBCE0 80240FD0 3C048025 */  lui       $a0, 0x8025
-/* 7EBCE4 80240FD4 8C845B98 */  lw        $a0, 0x5b98($a0)
+/* 7EBCE0 80240FD0 3C048025 */  lui       $a0, %hi(D_80255B98)
+/* 7EBCE4 80240FD4 8C845B98 */  lw        $a0, %lo(D_80255B98)($a0)
 /* 7EBCE8 80240FD8 34420010 */  ori       $v0, $v0, 0x10
 /* 7EBCEC 80240FDC AC620000 */  sw        $v0, ($v1)
 /* 7EBCF0 80240FE0 8C820000 */  lw        $v0, ($a0)
 /* 7EBCF4 80240FE4 34420010 */  ori       $v0, $v0, 0x10
 /* 7EBCF8 80240FE8 AC820000 */  sw        $v0, ($a0)
 .L80240FEC:
-/* 7EBCFC 80240FEC 3C048025 */  lui       $a0, 0x8025
-/* 7EBD00 80240FF0 8C845B90 */  lw        $a0, 0x5b90($a0)
+/* 7EBCFC 80240FEC 3C048025 */  lui       $a0, %hi(D_80255B90)
+/* 7EBD00 80240FF0 8C845B90 */  lw        $a0, %lo(D_80255B90)($a0)
 /* 7EBD04 80240FF4 8C85000C */  lw        $a1, 0xc($a0)
 /* 7EBD08 80240FF8 8CA20018 */  lw        $v0, 0x18($a1)
 /* 7EBD0C 80240FFC 8CA30020 */  lw        $v1, 0x20($a1)
@@ -41,8 +41,8 @@ glabel func_80240FB8_7EBCC8
 .L80241044:
 /* 7EBD54 80241044 0C016914 */  jal       remove_effect
 /* 7EBD58 80241048 ACA00018 */   sw       $zero, 0x18($a1)
-/* 7EBD5C 8024104C 3C048025 */  lui       $a0, 0x8025
-/* 7EBD60 80241050 8C845B70 */  lw        $a0, 0x5b70($a0)
+/* 7EBD5C 8024104C 3C048025 */  lui       $a0, %hi(D_80255B70)
+/* 7EBD60 80241050 8C845B70 */  lw        $a0, %lo(D_80255B70)($a0)
 /* 7EBD64 80241054 0C048D70 */  jal       func_801235C0
 /* 7EBD68 80241058 00000000 */   nop      
 /* 7EBD6C 8024105C 24020002 */  addiu     $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024106C_7EBD7C.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024106C_7EBD7C.s
index e8556c9b02..bfa0af2245 100644
--- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024106C_7EBD7C.s
+++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024106C_7EBD7C.s
@@ -7,8 +7,8 @@ glabel func_8024106C_7EBD7C
 /* 7EBD84 80241074 8C82000C */  lw        $v0, 0xc($a0)
 /* 7EBD88 80241078 0C0B1EAF */  jal       get_variable
 /* 7EBD8C 8024107C 8C450000 */   lw       $a1, ($v0)
-/* 7EBD90 80241080 3C038025 */  lui       $v1, 0x8025
-/* 7EBD94 80241084 8C635B90 */  lw        $v1, 0x5b90($v1)
+/* 7EBD90 80241080 3C038025 */  lui       $v1, %hi(D_80255B90)
+/* 7EBD94 80241084 8C635B90 */  lw        $v1, %lo(D_80255B90)($v1)
 /* 7EBD98 80241088 8C63000C */  lw        $v1, 0xc($v1)
 /* 7EBD9C 8024108C AC620034 */  sw        $v0, 0x34($v1)
 /* 7EBDA0 80241090 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802410A0_7EBDB0.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802410A0_7EBDB0.s
index d52ea2fb76..2125c221e9 100644
--- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802410A0_7EBDB0.s
+++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802410A0_7EBDB0.s
@@ -8,8 +8,8 @@ glabel func_802410A0_7EBDB0
 /* 7EBDBC 802410AC 0C0B1EAF */  jal       get_variable
 /* 7EBDC0 802410B0 8C450000 */   lw       $a1, ($v0)
 /* 7EBDC4 802410B4 0040202D */  daddu     $a0, $v0, $zero
-/* 7EBDC8 802410B8 3C028025 */  lui       $v0, 0x8025
-/* 7EBDCC 802410BC 8C425B90 */  lw        $v0, 0x5b90($v0)
+/* 7EBDC8 802410B8 3C028025 */  lui       $v0, %hi(D_80255B90)
+/* 7EBDCC 802410BC 8C425B90 */  lw        $v0, %lo(D_80255B90)($v0)
 /* 7EBDD0 802410C0 24030001 */  addiu     $v1, $zero, 1
 /* 7EBDD4 802410C4 8C45000C */  lw        $a1, 0xc($v0)
 /* 7EBDD8 802410C8 1083000D */  beq       $a0, $v1, .L80241100
diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241120_7EBE30.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241120_7EBE30.s
index 53f1500e50..260db4dbd4 100644
--- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241120_7EBE30.s
+++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241120_7EBE30.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80241120_7EBE30
-/* 7EBE30 80241120 3C028025 */  lui       $v0, 0x8025
-/* 7EBE34 80241124 8C425B98 */  lw        $v0, 0x5b98($v0)
+/* 7EBE30 80241120 3C028025 */  lui       $v0, %hi(D_80255B98)
+/* 7EBE34 80241124 8C425B98 */  lw        $v0, %lo(D_80255B98)($v0)
 /* 7EBE38 80241128 8C42000C */  lw        $v0, 0xc($v0)
 /* 7EBE3C 8024112C AC40001C */  sw        $zero, 0x1c($v0)
 /* 7EBE40 80241130 03E00008 */  jr        $ra
diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241138_7EBE48.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241138_7EBE48.s
index a9d51ba431..788ba8f2c1 100644
--- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241138_7EBE48.s
+++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241138_7EBE48.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80241138_7EBE48
-/* 7EBE48 80241138 3C028025 */  lui       $v0, 0x8025
-/* 7EBE4C 8024113C 8C425B98 */  lw        $v0, 0x5b98($v0)
+/* 7EBE48 80241138 3C028025 */  lui       $v0, %hi(D_80255B98)
+/* 7EBE4C 8024113C 8C425B98 */  lw        $v0, %lo(D_80255B98)($v0)
 /* 7EBE50 80241140 8C43000C */  lw        $v1, 0xc($v0)
 /* 7EBE54 80241144 24020001 */  addiu     $v0, $zero, 1
 /* 7EBE58 80241148 AC62001C */  sw        $v0, 0x1c($v1)
diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241154_7EBE64.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241154_7EBE64.s
index 56518ab4fc..714df16c1d 100644
--- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241154_7EBE64.s
+++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241154_7EBE64.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80241154_7EBE64
-/* 7EBE64 80241154 3C028025 */  lui       $v0, 0x8025
-/* 7EBE68 80241158 8C425B98 */  lw        $v0, 0x5b98($v0)
+/* 7EBE64 80241154 3C028025 */  lui       $v0, %hi(D_80255B98)
+/* 7EBE68 80241158 8C425B98 */  lw        $v0, %lo(D_80255B98)($v0)
 /* 7EBE6C 8024115C 8C43000C */  lw        $v1, 0xc($v0)
 /* 7EBE70 80241160 24020002 */  addiu     $v0, $zero, 2
 /* 7EBE74 80241164 03E00008 */  jr        $ra
diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241628_7EC338.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241628_7EC338.s
index e304b78e9e..8eaf88051b 100644
--- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241628_7EC338.s
+++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241628_7EC338.s
@@ -3,8 +3,8 @@
 
 glabel func_80241628_7EC338
 /* 7EC338 80241628 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 7EC33C 8024162C 3C058025 */  lui       $a1, 0x8025
-/* 7EC340 80241630 8CA55B88 */  lw        $a1, 0x5b88($a1)
+/* 7EC33C 8024162C 3C058025 */  lui       $a1, %hi(D_80255B88)
+/* 7EC340 80241630 8CA55B88 */  lw        $a1, %lo(D_80255B88)($a1)
 /* 7EC344 80241634 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 7EC348 80241638 0C0B1EAF */  jal       get_variable
 /* 7EC34C 8024163C 0000202D */   daddu    $a0, $zero, $zero
diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241694_7EC3A4.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241694_7EC3A4.s
index 8eecc3f068..b71e4425b0 100644
--- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241694_7EC3A4.s
+++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241694_7EC3A4.s
@@ -3,14 +3,14 @@
 
 glabel func_80241694_7EC3A4
 /* 7EC3A4 80241694 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 7EC3A8 80241698 3C058024 */  lui       $a1, 0x8024
-/* 7EC3AC 8024169C 24A51628 */  addiu     $a1, $a1, 0x1628
+/* 7EC3A8 80241698 3C058024 */  lui       $a1, %hi(D_80241628)
+/* 7EC3AC 8024169C 24A51628 */  addiu     $a1, $a1, %lo(D_80241628)
 /* 7EC3B0 802416A0 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 7EC3B4 802416A4 0C048C8F */  jal       bind_dynamic_entity_7
 /* 7EC3B8 802416A8 0000202D */   daddu    $a0, $zero, $zero
 /* 7EC3BC 802416AC 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 7EC3C0 802416B0 3C018025 */  lui       $at, 0x8025
-/* 7EC3C4 802416B4 AC225B70 */  sw        $v0, 0x5b70($at)
+/* 7EC3C0 802416B0 3C018025 */  lui       $at, %hi(D_80255B70)
+/* 7EC3C4 802416B4 AC225B70 */  sw        $v0, %lo(D_80255B70)($at)
 /* 7EC3C8 802416B8 24020002 */  addiu     $v0, $zero, 2
 /* 7EC3CC 802416BC 03E00008 */  jr        $ra
 /* 7EC3D0 802416C0 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802418F0_7EC600.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802418F0_7EC600.s
index 31316d329d..bda65c74bb 100644
--- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802418F0_7EC600.s
+++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802418F0_7EC600.s
@@ -6,11 +6,11 @@ glabel func_802418F0_7EC600
 /* 7EC604 802418F4 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 7EC608 802418F8 10A00003 */  beqz      $a1, .L80241908
 /* 7EC60C 802418FC 8C86000C */   lw       $a2, 0xc($a0)
-/* 7EC610 80241900 3C018025 */  lui       $at, 0x8025
-/* 7EC614 80241904 AC2083E8 */  sw        $zero, -0x7c18($at)
+/* 7EC610 80241900 3C018025 */  lui       $at, %hi(D_802483E8)
+/* 7EC614 80241904 AC2083E8 */  sw        $zero, %lo(D_802483E8)($at)
 .L80241908:
-/* 7EC618 80241908 3C038025 */  lui       $v1, 0x8025
-/* 7EC61C 8024190C 246383E8 */  addiu     $v1, $v1, -0x7c18
+/* 7EC618 80241908 3C038025 */  lui       $v1, %hi(D_802483E8)
+/* 7EC61C 8024190C 246383E8 */  addiu     $v1, $v1, %lo(D_802483E8)
 /* 7EC620 80241910 8C620000 */  lw        $v0, ($v1)
 /* 7EC624 80241914 54400003 */  bnel      $v0, $zero, .L80241924
 /* 7EC628 80241918 AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_802418F0_7EC600
 /* 7EC630 80241920 0000102D */   daddu    $v0, $zero, $zero
 .L80241924:
 /* 7EC634 80241924 8CC50000 */  lw        $a1, ($a2)
-/* 7EC638 80241928 3C068025 */  lui       $a2, 0x8025
+/* 7EC638 80241928 3C068025 */  lui       $a2, %hi(D_802483EC)
 /* 7EC63C 8024192C 0C0B2026 */  jal       set_variable
-/* 7EC640 80241930 8CC683EC */   lw       $a2, -0x7c14($a2)
+/* 7EC640 80241930 8CC683EC */   lw       $a2, %lo(D_802483EC)($a2)
 /* 7EC644 80241934 24020002 */  addiu     $v0, $zero, 2
 .L80241938:
 /* 7EC648 80241938 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241944_7EC654.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241944_7EC654.s
index c6e7166936..e274bea2ab 100644
--- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241944_7EC654.s
+++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241944_7EC654.s
@@ -7,12 +7,12 @@ glabel func_80241944_7EC654
 /* 7EC65C 8024194C 8C82000C */  lw        $v0, 0xc($a0)
 /* 7EC660 80241950 0C0B1EAF */  jal       get_variable
 /* 7EC664 80241954 8C450000 */   lw       $a1, ($v0)
-/* 7EC668 80241958 3C018025 */  lui       $at, 0x8025
-/* 7EC66C 8024195C AC2283EC */  sw        $v0, -0x7c14($at)
+/* 7EC668 80241958 3C018025 */  lui       $at, %hi(D_802483EC)
+/* 7EC66C 8024195C AC2283EC */  sw        $v0, %lo(D_802483EC)($at)
 /* 7EC670 80241960 24020002 */  addiu     $v0, $zero, 2
 /* 7EC674 80241964 8FBF0010 */  lw        $ra, 0x10($sp)
 /* 7EC678 80241968 24030001 */  addiu     $v1, $zero, 1
-/* 7EC67C 8024196C 3C018025 */  lui       $at, 0x8025
-/* 7EC680 80241970 AC2383E8 */  sw        $v1, -0x7c18($at)
+/* 7EC67C 8024196C 3C018025 */  lui       $at, %hi(D_802483E8)
+/* 7EC680 80241970 AC2383E8 */  sw        $v1, %lo(D_802483E8)($at)
 /* 7EC684 80241974 03E00008 */  jr        $ra
 /* 7EC688 80241978 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024197C_7EC68C.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024197C_7EC68C.s
index 5bb1a5483c..17d5227e3b 100644
--- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024197C_7EC68C.s
+++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024197C_7EC68C.s
@@ -13,8 +13,8 @@ glabel func_8024197C_7EC68C
 /* 7EC6AC 8024199C 8C620000 */  lw        $v0, ($v1)
 /* 7EC6B0 802419A0 5040000A */  beql      $v0, $zero, .L802419CC
 /* 7EC6B4 802419A4 00041080 */   sll      $v0, $a0, 2
-/* 7EC6B8 802419A8 3C058025 */  lui       $a1, 0x8025
-/* 7EC6BC 802419AC 24A55BA0 */  addiu     $a1, $a1, 0x5ba0
+/* 7EC6B8 802419A8 3C058025 */  lui       $a1, %hi(D_80255BA0)
+/* 7EC6BC 802419AC 24A55BA0 */  addiu     $a1, $a1, %lo(D_80255BA0)
 .L802419B0:
 /* 7EC6C0 802419B0 24630004 */  addiu     $v1, $v1, 4
 /* 7EC6C4 802419B4 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_8024197C_7EC68C
 /* 7EC6D4 802419C4 24A50004 */   addiu    $a1, $a1, 4
 /* 7EC6D8 802419C8 00041080 */  sll       $v0, $a0, 2
 .L802419CC:
-/* 7EC6DC 802419CC 3C018025 */  lui       $at, 0x8025
+/* 7EC6DC 802419CC 3C018025 */  lui       $at, %hi(D_80255BA0)
 /* 7EC6E0 802419D0 00220821 */  addu      $at, $at, $v0
-/* 7EC6E4 802419D4 AC205BA0 */  sw        $zero, 0x5ba0($at)
+/* 7EC6E4 802419D4 AC205BA0 */  sw        $zero, %lo(D_80255BA0)($at)
 /* 7EC6E8 802419D8 08090682 */  j         .L80241A08
 /* 7EC6EC 802419DC 00000000 */   nop      
 .L802419E0:
-/* 7EC6F0 802419E0 3C038025 */  lui       $v1, 0x8025
-/* 7EC6F4 802419E4 24635BA0 */  addiu     $v1, $v1, 0x5ba0
+/* 7EC6F0 802419E0 3C038025 */  lui       $v1, %hi(D_80255BA0)
+/* 7EC6F4 802419E4 24635BA0 */  addiu     $v1, $v1, %lo(D_80255BA0)
 /* 7EC6F8 802419E8 0060282D */  daddu     $a1, $v1, $zero
 .L802419EC:
 /* 7EC6FC 802419EC 24820010 */  addiu     $v0, $a0, 0x10
diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241A18_7EC728.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241A18_7EC728.s
index 5ce03ef0a4..6c76ff1ded 100644
--- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241A18_7EC728.s
+++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241A18_7EC728.s
@@ -13,8 +13,8 @@ glabel func_80241A18_7EC728
 /* 7EC748 80241A38 8C620000 */  lw        $v0, ($v1)
 /* 7EC74C 80241A3C 5040000A */  beql      $v0, $zero, .L80241A68
 /* 7EC750 80241A40 00041080 */   sll      $v0, $a0, 2
-/* 7EC754 80241A44 3C058025 */  lui       $a1, 0x8025
-/* 7EC758 80241A48 24A55D68 */  addiu     $a1, $a1, 0x5d68
+/* 7EC754 80241A44 3C058025 */  lui       $a1, %hi(D_80255D68)
+/* 7EC758 80241A48 24A55D68 */  addiu     $a1, $a1, %lo(D_80255D68)
 .L80241A4C:
 /* 7EC75C 80241A4C 24630004 */  addiu     $v1, $v1, 4
 /* 7EC760 80241A50 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_80241A18_7EC728
 /* 7EC770 80241A60 24A50004 */   addiu    $a1, $a1, 4
 /* 7EC774 80241A64 00041080 */  sll       $v0, $a0, 2
 .L80241A68:
-/* 7EC778 80241A68 3C018025 */  lui       $at, 0x8025
+/* 7EC778 80241A68 3C018025 */  lui       $at, %hi(D_80255D68)
 /* 7EC77C 80241A6C 00220821 */  addu      $at, $at, $v0
-/* 7EC780 80241A70 AC205D68 */  sw        $zero, 0x5d68($at)
+/* 7EC780 80241A70 AC205D68 */  sw        $zero, %lo(D_80255D68)($at)
 /* 7EC784 80241A74 080906A9 */  j         .L80241AA4
 /* 7EC788 80241A78 00000000 */   nop      
 .L80241A7C:
-/* 7EC78C 80241A7C 3C038025 */  lui       $v1, 0x8025
-/* 7EC790 80241A80 24635D68 */  addiu     $v1, $v1, 0x5d68
+/* 7EC78C 80241A7C 3C038025 */  lui       $v1, %hi(D_80255D68)
+/* 7EC790 80241A80 24635D68 */  addiu     $v1, $v1, %lo(D_80255D68)
 /* 7EC794 80241A84 0060282D */  daddu     $a1, $v1, $zero
 .L80241A88:
 /* 7EC798 80241A88 24820080 */  addiu     $v0, $a0, 0x80
diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241D30_7ECA40.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241D30_7ECA40.s
index f5465103be..46145266e2 100644
--- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241D30_7ECA40.s
+++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241D30_7ECA40.s
@@ -15,7 +15,7 @@ glabel func_80241D30_7ECA40
 /* 7ECA68 80241D58 8FBF0014 */  lw        $ra, 0x14($sp)
 /* 7ECA6C 80241D5C 8FB00010 */  lw        $s0, 0x10($sp)
 /* 7ECA70 80241D60 24020002 */  addiu     $v0, $zero, 2
-/* 7ECA74 80241D64 3C018025 */  lui       $at, 0x8025
-/* 7ECA78 80241D68 AC235ED8 */  sw        $v1, 0x5ed8($at)
+/* 7ECA74 80241D64 3C018025 */  lui       $at, %hi(D_80255ED8)
+/* 7ECA78 80241D68 AC235ED8 */  sw        $v1, %lo(D_80255ED8)($at)
 /* 7ECA7C 80241D6C 03E00008 */  jr        $ra
 /* 7ECA80 80241D70 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241D74_7ECA84.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241D74_7ECA84.s
index 5cb40f3f9b..78fae68bc4 100644
--- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241D74_7ECA84.s
+++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241D74_7ECA84.s
@@ -6,8 +6,8 @@ glabel func_80241D74_7ECA84
 /* 7ECA88 80241D78 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 7ECA8C 80241D7C 0C00EABB */  jal       get_npc_unsafe
 /* 7ECA90 80241D80 8C84008C */   lw       $a0, 0x8c($a0)
-/* 7ECA94 80241D84 3C038025 */  lui       $v1, 0x8025
-/* 7ECA98 80241D88 8C635ED8 */  lw        $v1, 0x5ed8($v1)
+/* 7ECA94 80241D84 3C038025 */  lui       $v1, %hi(D_80255ED8)
+/* 7ECA98 80241D88 8C635ED8 */  lw        $v1, %lo(D_80255ED8)($v1)
 /* 7ECA9C 80241D8C AC430028 */  sw        $v1, 0x28($v0)
 /* 7ECAA0 80241D90 8FBF0010 */  lw        $ra, 0x10($sp)
 /* 7ECAA4 80241D94 24020002 */  addiu     $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241DA0_7ECAB0.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241DA0_7ECAB0.s
index 987773c95d..5eacc9dddc 100644
--- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241DA0_7ECAB0.s
+++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241DA0_7ECAB0.s
@@ -6,8 +6,8 @@ glabel func_80241DA0_7ECAB0
 /* 7ECAB4 80241DA4 AFB20018 */  sw        $s2, 0x18($sp)
 /* 7ECAB8 80241DA8 0080902D */  daddu     $s2, $a0, $zero
 /* 7ECABC 80241DAC AFB10014 */  sw        $s1, 0x14($sp)
-/* 7ECAC0 80241DB0 3C118025 */  lui       $s1, 0x8025
-/* 7ECAC4 80241DB4 26318F18 */  addiu     $s1, $s1, -0x70e8
+/* 7ECAC0 80241DB0 3C118025 */  lui       $s1, %hi(D_80248F18)
+/* 7ECAC4 80241DB4 26318F18 */  addiu     $s1, $s1, %lo(D_80248F18)
 /* 7ECAC8 80241DB8 AFB00010 */  sw        $s0, 0x10($sp)
 /* 7ECACC 80241DBC 0000802D */  daddu     $s0, $zero, $zero
 /* 7ECAD0 80241DC0 AFBF001C */  sw        $ra, 0x1c($sp)
diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241E04_7ECB14.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241E04_7ECB14.s
index 242d0959b1..98617d3e83 100644
--- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241E04_7ECB14.s
+++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241E04_7ECB14.s
@@ -8,8 +8,8 @@ glabel func_80241E04_7ECB14
 /* 7ECB20 80241E10 AFB10014 */  sw        $s1, 0x14($sp)
 /* 7ECB24 80241E14 0000882D */  daddu     $s1, $zero, $zero
 /* 7ECB28 80241E18 AFB00010 */  sw        $s0, 0x10($sp)
-/* 7ECB2C 80241E1C 3C108025 */  lui       $s0, 0x8025
-/* 7ECB30 80241E20 26108F20 */  addiu     $s0, $s0, -0x70e0
+/* 7ECB2C 80241E1C 3C108025 */  lui       $s0, %hi(D_80248F20)
+/* 7ECB30 80241E20 26108F20 */  addiu     $s0, $s0, %lo(D_80248F20)
 /* 7ECB34 80241E24 AFBF001C */  sw        $ra, 0x1c($sp)
 /* 7ECB38 80241E28 0240202D */  daddu     $a0, $s2, $zero
 .L80241E2C:
diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241E80_7ECB90.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241E80_7ECB90.s
index dc1a5b8033..500f424a56 100644
--- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241E80_7ECB90.s
+++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241E80_7ECB90.s
@@ -6,8 +6,8 @@ glabel func_80241E80_7ECB90
 /* 7ECB94 80241E84 AFB40020 */  sw        $s4, 0x20($sp)
 /* 7ECB98 80241E88 0080A02D */  daddu     $s4, $a0, $zero
 /* 7ECB9C 80241E8C AFB3001C */  sw        $s3, 0x1c($sp)
-/* 7ECBA0 80241E90 3C138025 */  lui       $s3, 0x8025
-/* 7ECBA4 80241E94 26738F18 */  addiu     $s3, $s3, -0x70e8
+/* 7ECBA0 80241E90 3C138025 */  lui       $s3, %hi(D_80248F18)
+/* 7ECBA4 80241E94 26738F18 */  addiu     $s3, $s3, %lo(D_80248F18)
 /* 7ECBA8 80241E98 AFB50024 */  sw        $s5, 0x24($sp)
 /* 7ECBAC 80241E9C 0000A82D */  daddu     $s5, $zero, $zero
 /* 7ECBB0 80241EA0 AFB20018 */  sw        $s2, 0x18($sp)
@@ -47,8 +47,8 @@ glabel func_80241E80_7ECB90
 .L80241F18:
 /* 7ECC28 80241F18 56A0001F */  bnel      $s5, $zero, .L80241F98
 /* 7ECC2C 80241F1C AE910084 */   sw       $s1, 0x84($s4)
-/* 7ECC30 80241F20 3C138025 */  lui       $s3, 0x8025
-/* 7ECC34 80241F24 26738F18 */  addiu     $s3, $s3, -0x70e8
+/* 7ECC30 80241F20 3C138025 */  lui       $s3, %hi(D_80248F18)
+/* 7ECC34 80241F24 26738F18 */  addiu     $s3, $s3, %lo(D_80248F18)
 /* 7ECC38 80241F28 1240001A */  beqz      $s2, .L80241F94
 /* 7ECC3C 80241F2C 0000882D */   daddu    $s1, $zero, $zero
 /* 7ECC40 80241F30 0C00A67F */  jal       rand_int
diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241FF0_7ECD00.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241FF0_7ECD00.s
index b147176401..5fa317950a 100644
--- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241FF0_7ECD00.s
+++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241FF0_7ECD00.s
@@ -10,8 +10,8 @@ glabel func_80241FF0_7ECD00
 /* 7ECD14 80242004 AFB10014 */  sw        $s1, 0x14($sp)
 /* 7ECD18 80242008 0240882D */  daddu     $s1, $s2, $zero
 /* 7ECD1C 8024200C AFB00010 */  sw        $s0, 0x10($sp)
-/* 7ECD20 80242010 3C108025 */  lui       $s0, 0x8025
-/* 7ECD24 80242014 26108F28 */  addiu     $s0, $s0, -0x70d8
+/* 7ECD20 80242010 3C108025 */  lui       $s0, %hi(D_80248F28)
+/* 7ECD24 80242014 26108F28 */  addiu     $s0, $s0, %lo(D_80248F28)
 /* 7ECD28 80242018 AFBF0020 */  sw        $ra, 0x20($sp)
 .L8024201C:
 /* 7ECD2C 8024201C 8E05FFF8 */  lw        $a1, -8($s0)
diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80242178_7ECE88.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80242178_7ECE88.s
index 07727a23ba..f9f791819d 100644
--- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80242178_7ECE88.s
+++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80242178_7ECE88.s
@@ -15,9 +15,9 @@ glabel func_80242178_7ECE88
 /* 7ECEB0 802421A0 3C04800B */  lui       $a0, %hi(gCurrentEncounter+0x28)
 /* 7ECEB4 802421A4 00832021 */  addu      $a0, $a0, $v1
 /* 7ECEB8 802421A8 8C840F38 */  lw        $a0, %lo(gCurrentEncounter+0x28)($a0)
-/* 7ECEBC 802421AC 3C038025 */  lui       $v1, 0x8025
+/* 7ECEBC 802421AC 3C038025 */  lui       $v1, %hi(D_8024A632)
 /* 7ECEC0 802421B0 00621821 */  addu      $v1, $v1, $v0
-/* 7ECEC4 802421B4 9463A632 */  lhu       $v1, -0x59ce($v1)
+/* 7ECEC4 802421B4 9463A632 */  lhu       $v1, %lo(D_8024A632)($v1)
 /* 7ECEC8 802421B8 A4830044 */  sh        $v1, 0x44($a0)
 /* 7ECECC 802421BC 8FBF0014 */  lw        $ra, 0x14($sp)
 /* 7ECED0 802421C0 8FB00010 */  lw        $s0, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ECFD0/func_802423F0_7ED100.s b/asm/nonmatchings/world/area_mac/mac_00/7ECFD0/func_802423F0_7ED100.s
index 171c7a04d9..7cc7a0ef08 100644
--- a/asm/nonmatchings/world/area_mac/mac_00/7ECFD0/func_802423F0_7ED100.s
+++ b/asm/nonmatchings/world/area_mac/mac_00/7ECFD0/func_802423F0_7ED100.s
@@ -16,8 +16,8 @@ glabel func_802423F0_7ED100
 /* 7ED12C 8024241C 3C07FFFD */  lui       $a3, 0xfffd
 /* 7ED130 80242420 34E7FEFF */  ori       $a3, $a3, 0xfeff
 /* 7ED134 80242424 AFB00010 */  sw        $s0, 0x10($sp)
-/* 7ED138 80242428 3C10800A */  lui       $s0, 0x800a
-/* 7ED13C 8024242C 2610A66C */  addiu     $s0, $s0, -0x5994
+/* 7ED138 80242428 3C10800A */  lui       $s0, %hi(D_8009A66C)
+/* 7ED13C 8024242C 2610A66C */  addiu     $s0, $s0, %lo(D_8009A66C)
 /* 7ED140 80242430 240400D6 */  addiu     $a0, $zero, 0xd6
 /* 7ED144 80242434 24030004 */  addiu     $v1, $zero, 4
 /* 7ED148 80242438 AFBF0020 */  sw        $ra, 0x20($sp)
diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242570_7ED280.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242570_7ED280.s
index 061c060748..8d56b510e6 100644
--- a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242570_7ED280.s
+++ b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242570_7ED280.s
@@ -69,8 +69,8 @@ glabel func_80242570_7ED280
 /* 7ED374 80242664 080909A3 */  j         .L8024268C
 /* 7ED378 80242668 E6800018 */   swc1     $f0, 0x18($s4)
 .L8024266C:
-/* 7ED37C 8024266C 3C018025 */  lui       $at, 0x8025
-/* 7ED380 80242670 D42259C0 */  ldc1      $f2, 0x59c0($at)
+/* 7ED37C 8024266C 3C018025 */  lui       $at, %hi(D_802559C0)
+/* 7ED380 80242670 D42259C0 */  ldc1      $f2, %lo(D_802559C0)($at)
 /* 7ED384 80242674 44820000 */  mtc1      $v0, $f0
 /* 7ED388 80242678 00000000 */  nop       
 /* 7ED38C 8024267C 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242BEC_7ED8FC.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242BEC_7ED8FC.s
index d70ce866d4..96a6d1ad19 100644
--- a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242BEC_7ED8FC.s
+++ b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242BEC_7ED8FC.s
@@ -33,8 +33,8 @@ glabel func_80242BEC_7ED8FC
 /* 7ED968 80242C58 08090B20 */  j         .L80242C80
 /* 7ED96C 80242C5C E4A00018 */   swc1     $f0, 0x18($a1)
 .L80242C60:
-/* 7ED970 80242C60 3C018025 */  lui       $at, 0x8025
-/* 7ED974 80242C64 D42259C8 */  ldc1      $f2, 0x59c8($at)
+/* 7ED970 80242C60 3C018025 */  lui       $at, %hi(D_802559C8)
+/* 7ED974 80242C64 D42259C8 */  ldc1      $f2, %lo(D_802559C8)($at)
 /* 7ED978 80242C68 44820000 */  mtc1      $v0, $f0
 /* 7ED97C 80242C6C 00000000 */  nop       
 /* 7ED980 80242C70 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243104_7EDE14.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243104_7EDE14.s
index 4709dd48a4..14b898afa8 100644
--- a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243104_7EDE14.s
+++ b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243104_7EDE14.s
@@ -124,9 +124,9 @@ glabel func_80243104_7EDE14
 /* 7EDFD8 802432C8 2C620064 */  sltiu     $v0, $v1, 0x64
 /* 7EDFDC 802432CC 10400042 */  beqz      $v0, .L802433D8
 /* 7EDFE0 802432D0 00031080 */   sll      $v0, $v1, 2
-/* 7EDFE4 802432D4 3C018025 */  lui       $at, 0x8025
+/* 7EDFE4 802432D4 3C018025 */  lui       $at, %hi(D_802559D0)
 /* 7EDFE8 802432D8 00220821 */  addu      $at, $at, $v0
-/* 7EDFEC 802432DC 8C2259D0 */  lw        $v0, 0x59d0($at)
+/* 7EDFEC 802432DC 8C2259D0 */  lw        $v0, %lo(D_802559D0)($at)
 /* 7EDFF0 802432E0 00400008 */  jr        $v0
 /* 7EDFF4 802432E4 00000000 */   nop      
 /* 7EDFF8 802432E8 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243400_7EE110.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243400_7EE110.s
index d3fc6622e1..f62fa27f59 100644
--- a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243400_7EE110.s
+++ b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243400_7EE110.s
@@ -4,8 +4,8 @@
 glabel func_80243400_7EE110
 /* 7EE110 80243400 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* 7EE114 80243404 AFB00010 */  sw        $s0, 0x10($sp)
-/* 7EE118 80243408 3C108025 */  lui       $s0, 0x8025
-/* 7EE11C 8024340C 2610ECE8 */  addiu     $s0, $s0, -0x1318
+/* 7EE118 80243408 3C108025 */  lui       $s0, %hi(D_8024ECE8)
+/* 7EE11C 8024340C 2610ECE8 */  addiu     $s0, $s0, %lo(D_8024ECE8)
 /* 7EE120 80243410 AFBF0018 */  sw        $ra, 0x18($sp)
 /* 7EE124 80243414 AFB10014 */  sw        $s1, 0x14($sp)
 /* 7EE128 80243418 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_80243400_7EE110
 /* 7EE18C 8024347C 28620010 */  slti      $v0, $v1, 0x10
 /* 7EE190 80243480 1440FFFA */  bnez      $v0, .L8024346C
 /* 7EE194 80243484 24840004 */   addiu    $a0, $a0, 4
-/* 7EE198 80243488 3C108025 */  lui       $s0, 0x8025
-/* 7EE19C 8024348C 2610ECE8 */  addiu     $s0, $s0, -0x1318
+/* 7EE198 80243488 3C108025 */  lui       $s0, %hi(D_8024ECE8)
+/* 7EE19C 8024348C 2610ECE8 */  addiu     $s0, $s0, %lo(D_8024ECE8)
 /* 7EE1A0 80243490 0C00AB4B */  jal       heap_free
 /* 7EE1A4 80243494 8E040000 */   lw       $a0, ($s0)
 /* 7EE1A8 80243498 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243744_7EE454.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243744_7EE454.s
index 37a1173b8b..37dc0fb588 100644
--- a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243744_7EE454.s
+++ b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243744_7EE454.s
@@ -6,11 +6,11 @@ glabel func_80243744_7EE454
 /* 7EE458 80243748 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 7EE45C 8024374C 10A00003 */  beqz      $a1, .L8024375C
 /* 7EE460 80243750 8C86000C */   lw       $a2, 0xc($a0)
-/* 7EE464 80243754 3C018025 */  lui       $at, 0x8025
-/* 7EE468 80243758 AC20ED4C */  sw        $zero, -0x12b4($at)
+/* 7EE464 80243754 3C018025 */  lui       $at, %hi(D_8024ED4C)
+/* 7EE468 80243758 AC20ED4C */  sw        $zero, %lo(D_8024ED4C)($at)
 .L8024375C:
-/* 7EE46C 8024375C 3C038025 */  lui       $v1, 0x8025
-/* 7EE470 80243760 2463ED4C */  addiu     $v1, $v1, -0x12b4
+/* 7EE46C 8024375C 3C038025 */  lui       $v1, %hi(D_8024ED4C)
+/* 7EE470 80243760 2463ED4C */  addiu     $v1, $v1, %lo(D_8024ED4C)
 /* 7EE474 80243764 8C620000 */  lw        $v0, ($v1)
 /* 7EE478 80243768 54400003 */  bnel      $v0, $zero, .L80243778
 /* 7EE47C 8024376C AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_80243744_7EE454
 /* 7EE484 80243774 0000102D */   daddu    $v0, $zero, $zero
 .L80243778:
 /* 7EE488 80243778 8CC50000 */  lw        $a1, ($a2)
-/* 7EE48C 8024377C 3C068025 */  lui       $a2, 0x8025
+/* 7EE48C 8024377C 3C068025 */  lui       $a2, %hi(D_8024ED50)
 /* 7EE490 80243780 0C0B2026 */  jal       set_variable
-/* 7EE494 80243784 8CC6ED50 */   lw       $a2, -0x12b0($a2)
+/* 7EE494 80243784 8CC6ED50 */   lw       $a2, %lo(D_8024ED50)($a2)
 /* 7EE498 80243788 24020002 */  addiu     $v0, $zero, 2
 .L8024378C:
 /* 7EE49C 8024378C 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243798_7EE4A8.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243798_7EE4A8.s
index de41ffce4f..c3ba44b6d1 100644
--- a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243798_7EE4A8.s
+++ b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243798_7EE4A8.s
@@ -7,12 +7,12 @@ glabel func_80243798_7EE4A8
 /* 7EE4B0 802437A0 8C82000C */  lw        $v0, 0xc($a0)
 /* 7EE4B4 802437A4 0C0B1EAF */  jal       get_variable
 /* 7EE4B8 802437A8 8C450000 */   lw       $a1, ($v0)
-/* 7EE4BC 802437AC 3C018025 */  lui       $at, 0x8025
-/* 7EE4C0 802437B0 AC22ED50 */  sw        $v0, -0x12b0($at)
+/* 7EE4BC 802437AC 3C018025 */  lui       $at, %hi(D_8024ED50)
+/* 7EE4C0 802437B0 AC22ED50 */  sw        $v0, %lo(D_8024ED50)($at)
 /* 7EE4C4 802437B4 24020002 */  addiu     $v0, $zero, 2
 /* 7EE4C8 802437B8 8FBF0010 */  lw        $ra, 0x10($sp)
 /* 7EE4CC 802437BC 24030001 */  addiu     $v1, $zero, 1
-/* 7EE4D0 802437C0 3C018025 */  lui       $at, 0x8025
-/* 7EE4D4 802437C4 AC23ED4C */  sw        $v1, -0x12b4($at)
+/* 7EE4D0 802437C0 3C018025 */  lui       $at, %hi(D_8024ED4C)
+/* 7EE4D4 802437C4 AC23ED4C */  sw        $v1, %lo(D_8024ED4C)($at)
 /* 7EE4D8 802437C8 03E00008 */  jr        $ra
 /* 7EE4DC 802437CC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_802437D0_7EE4E0.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_802437D0_7EE4E0.s
index 75c1dcee1a..6450f30910 100644
--- a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_802437D0_7EE4E0.s
+++ b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_802437D0_7EE4E0.s
@@ -13,8 +13,8 @@ glabel func_802437D0_7EE4E0
 /* 7EE500 802437F0 8C620000 */  lw        $v0, ($v1)
 /* 7EE504 802437F4 5040000A */  beql      $v0, $zero, .L80243820
 /* 7EE508 802437F8 00041080 */   sll      $v0, $a0, 2
-/* 7EE50C 802437FC 3C058025 */  lui       $a1, 0x8025
-/* 7EE510 80243800 24A55EE0 */  addiu     $a1, $a1, 0x5ee0
+/* 7EE50C 802437FC 3C058025 */  lui       $a1, %hi(D_80255EE0)
+/* 7EE510 80243800 24A55EE0 */  addiu     $a1, $a1, %lo(D_80255EE0)
 .L80243804:
 /* 7EE514 80243804 24630004 */  addiu     $v1, $v1, 4
 /* 7EE518 80243808 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_802437D0_7EE4E0
 /* 7EE528 80243818 24A50004 */   addiu    $a1, $a1, 4
 /* 7EE52C 8024381C 00041080 */  sll       $v0, $a0, 2
 .L80243820:
-/* 7EE530 80243820 3C018025 */  lui       $at, 0x8025
+/* 7EE530 80243820 3C018025 */  lui       $at, %hi(D_80255EE0)
 /* 7EE534 80243824 00220821 */  addu      $at, $at, $v0
-/* 7EE538 80243828 AC205EE0 */  sw        $zero, 0x5ee0($at)
+/* 7EE538 80243828 AC205EE0 */  sw        $zero, %lo(D_80255EE0)($at)
 /* 7EE53C 8024382C 08090E17 */  j         .L8024385C
 /* 7EE540 80243830 00000000 */   nop      
 .L80243834:
-/* 7EE544 80243834 3C038025 */  lui       $v1, 0x8025
-/* 7EE548 80243838 24635EE0 */  addiu     $v1, $v1, 0x5ee0
+/* 7EE544 80243834 3C038025 */  lui       $v1, %hi(D_80255EE0)
+/* 7EE548 80243838 24635EE0 */  addiu     $v1, $v1, %lo(D_80255EE0)
 /* 7EE54C 8024383C 0060282D */  daddu     $a1, $v1, $zero
 .L80243840:
 /* 7EE550 80243840 24820010 */  addiu     $v0, $a0, 0x10
diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243AE8_7EE7F8.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243AE8_7EE7F8.s
index c01490f9e8..d4bddf18fa 100644
--- a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243AE8_7EE7F8.s
+++ b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243AE8_7EE7F8.s
@@ -15,7 +15,7 @@ glabel func_80243AE8_7EE7F8
 /* 7EE820 80243B10 8FBF0014 */  lw        $ra, 0x14($sp)
 /* 7EE824 80243B14 8FB00010 */  lw        $s0, 0x10($sp)
 /* 7EE828 80243B18 24020002 */  addiu     $v0, $zero, 2
-/* 7EE82C 80243B1C 3C018025 */  lui       $at, 0x8025
-/* 7EE830 80243B20 AC2360A4 */  sw        $v1, 0x60a4($at)
+/* 7EE82C 80243B1C 3C018025 */  lui       $at, %hi(D_802560A4)
+/* 7EE830 80243B20 AC2360A4 */  sw        $v1, %lo(D_802560A4)($at)
 /* 7EE834 80243B24 03E00008 */  jr        $ra
 /* 7EE838 80243B28 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243B2C_7EE83C.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243B2C_7EE83C.s
index 28cc587af6..33de34eda9 100644
--- a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243B2C_7EE83C.s
+++ b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243B2C_7EE83C.s
@@ -6,8 +6,8 @@ glabel func_80243B2C_7EE83C
 /* 7EE840 80243B30 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 7EE844 80243B34 0C00EABB */  jal       get_npc_unsafe
 /* 7EE848 80243B38 8C84008C */   lw       $a0, 0x8c($a0)
-/* 7EE84C 80243B3C 3C038025 */  lui       $v1, 0x8025
-/* 7EE850 80243B40 8C6360A4 */  lw        $v1, 0x60a4($v1)
+/* 7EE84C 80243B3C 3C038025 */  lui       $v1, %hi(D_802560A4)
+/* 7EE850 80243B40 8C6360A4 */  lw        $v1, %lo(D_802560A4)($v1)
 /* 7EE854 80243B44 AC430028 */  sw        $v1, 0x28($v0)
 /* 7EE858 80243B48 8FBF0010 */  lw        $ra, 0x10($sp)
 /* 7EE85C 80243B4C 24020002 */  addiu     $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_mac/mac_01/800880/func_802400C8_800948.s b/asm/nonmatchings/world/area_mac/mac_01/800880/func_802400C8_800948.s
index b8e9d9dd73..ee6874da10 100644
--- a/asm/nonmatchings/world/area_mac/mac_01/800880/func_802400C8_800948.s
+++ b/asm/nonmatchings/world/area_mac/mac_01/800880/func_802400C8_800948.s
@@ -79,8 +79,8 @@ glabel func_802400C8_800948
 /* 800A64 802401E4 00111080 */  sll       $v0, $s1, 2
 /* 800A68 802401E8 02821021 */  addu      $v0, $s4, $v0
 /* 800A6C 802401EC 8C460000 */  lw        $a2, ($v0)
-/* 800A70 802401F0 3C078024 */  lui       $a3, 0x8024
-/* 800A74 802401F4 24E77F88 */  addiu     $a3, $a3, 0x7f88
+/* 800A70 802401F0 3C078024 */  lui       $a3, %hi(D_80247F88)
+/* 800A74 802401F4 24E77F88 */  addiu     $a3, $a3, %lo(D_80247F88)
 /* 800A78 802401F8 00061840 */  sll       $v1, $a2, 1
 /* 800A7C 802401FC 00661821 */  addu      $v1, $v1, $a2
 /* 800A80 80240200 00031880 */  sll       $v1, $v1, 2
@@ -147,8 +147,8 @@ glabel func_802400C8_800948
 /* 800B64 802402E4 0000882D */   daddu    $s1, $zero, $zero
 /* 800B68 802402E8 3C13F5DE */  lui       $s3, 0xf5de
 /* 800B6C 802402EC 367301A9 */  ori       $s3, $s3, 0x1a9
-/* 800B70 802402F0 3C168024 */  lui       $s6, 0x8024
-/* 800B74 802402F4 26D67F88 */  addiu     $s6, $s6, 0x7f88
+/* 800B70 802402F0 3C168024 */  lui       $s6, %hi(D_80247F88)
+/* 800B74 802402F4 26D67F88 */  addiu     $s6, $s6, %lo(D_80247F88)
 /* 800B78 802402F8 3C148008 */  lui       $s4, %hi(gItemTable)
 /* 800B7C 802402FC 269478E0 */  addiu     $s4, $s4, %lo(gItemTable)
 /* 800B80 80240300 8FB20054 */  lw        $s2, 0x54($sp)
diff --git a/asm/nonmatchings/world/area_mac/mac_01/800C40/func_802403C0_800C40.s b/asm/nonmatchings/world/area_mac/mac_01/800C40/func_802403C0_800C40.s
index 5b2041552f..73eeab4c8d 100644
--- a/asm/nonmatchings/world/area_mac/mac_01/800C40/func_802403C0_800C40.s
+++ b/asm/nonmatchings/world/area_mac/mac_01/800C40/func_802403C0_800C40.s
@@ -28,15 +28,15 @@ glabel func_802403C0_800C40
 /* 800C9C 8024041C C4600040 */  lwc1      $f0, 0x40($v1)
 /* 800CA0 80240420 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 800CA4 80240424 C4600044 */  lwc1      $f0, 0x44($v1)
-/* 800CA8 80240428 3C10800A */  lui       $s0, 0x800a
-/* 800CAC 8024042C 2610A674 */  addiu     $s0, $s0, -0x598c
+/* 800CA8 80240428 3C10800A */  lui       $s0, %hi(D_8009A674)
+/* 800CAC 8024042C 2610A674 */  addiu     $s0, $s0, %lo(D_8009A674)
 /* 800CB0 80240430 E7A00014 */  swc1      $f0, 0x14($sp)
 /* 800CB4 80240434 C4600048 */  lwc1      $f0, 0x48($v1)
 /* 800CB8 80240438 27A50090 */  addiu     $a1, $sp, 0x90
 /* 800CBC 8024043C E7A00018 */  swc1      $f0, 0x18($sp)
 /* 800CC0 80240440 C460004C */  lwc1      $f0, 0x4c($v1)
-/* 800CC4 80240444 3C048025 */  lui       $a0, 0x8025
-/* 800CC8 80240448 24848420 */  addiu     $a0, $a0, -0x7be0
+/* 800CC4 80240444 3C048025 */  lui       $a0, %hi(D_80248420)
+/* 800CC8 80240448 24848420 */  addiu     $a0, $a0, %lo(D_80248420)
 /* 800CCC 8024044C E7A0001C */  swc1      $f0, 0x1c($sp)
 /* 800CD0 80240450 8C820000 */  lw        $v0, ($a0)
 /* 800CD4 80240454 C46A0050 */  lwc1      $f10, 0x50($v1)
@@ -71,8 +71,8 @@ glabel func_802403C0_800C40
 /* 800D48 802404C8 3C091000 */  lui       $t1, 0x1000
 /* 800D4C 802404CC 35291000 */  ori       $t1, $t1, 0x1000
 /* 800D50 802404D0 3C08D9FF */  lui       $t0, 0xd9ff
-/* 800D54 802404D4 3C06800A */  lui       $a2, 0x800a
-/* 800D58 802404D8 24C6A66C */  addiu     $a2, $a2, -0x5994
+/* 800D54 802404D4 3C06800A */  lui       $a2, %hi(D_8009A66C)
+/* 800D58 802404D8 24C6A66C */  addiu     $a2, $a2, %lo(D_8009A66C)
 /* 800D5C 802404DC 3508FFFF */  ori       $t0, $t0, 0xffff
 /* 800D60 802404E0 8CC50000 */  lw        $a1, ($a2)
 /* 800D64 802404E4 8E040000 */  lw        $a0, ($s0)
diff --git a/asm/nonmatchings/world/area_mac/mac_01/800C40/func_802405E8_800E68.s b/asm/nonmatchings/world/area_mac/mac_01/800C40/func_802405E8_800E68.s
index 50e9e95e5b..e207450f61 100644
--- a/asm/nonmatchings/world/area_mac/mac_01/800C40/func_802405E8_800E68.s
+++ b/asm/nonmatchings/world/area_mac/mac_01/800C40/func_802405E8_800E68.s
@@ -3,8 +3,8 @@
 
 glabel func_802405E8_800E68
 /* 800E68 802405E8 3C05D9FB */  lui       $a1, 0xd9fb
-/* 800E6C 802405EC 3C04800A */  lui       $a0, 0x800a
-/* 800E70 802405F0 2484A66C */  addiu     $a0, $a0, -0x5994
+/* 800E6C 802405EC 3C04800A */  lui       $a0, %hi(D_8009A66C)
+/* 800E70 802405F0 2484A66C */  addiu     $a0, $a0, %lo(D_8009A66C)
 /* 800E74 802405F4 8C820000 */  lw        $v0, ($a0)
 /* 800E78 802405F8 34A5FFFF */  ori       $a1, $a1, 0xffff
 /* 800E7C 802405FC 0040182D */  daddu     $v1, $v0, $zero
diff --git a/asm/nonmatchings/world/area_mac/mac_01/800C40/func_80240628_800EA8.s b/asm/nonmatchings/world/area_mac/mac_01/800C40/func_80240628_800EA8.s
index 94a3c6c788..1b9c7b7a75 100644
--- a/asm/nonmatchings/world/area_mac/mac_01/800C40/func_80240628_800EA8.s
+++ b/asm/nonmatchings/world/area_mac/mac_01/800C40/func_80240628_800EA8.s
@@ -156,8 +156,8 @@ glabel func_80240628_800EA8
 /* 8010EC 8024086C 3652013F */  ori       $s2, $s2, 0x13f
 /* 8010F0 80240870 3C17FCFF */  lui       $s7, 0xfcff
 /* 8010F4 80240874 36F7FFFF */  ori       $s7, $s7, 0xffff
-/* 8010F8 80240878 3C14800A */  lui       $s4, 0x800a
-/* 8010FC 8024087C 2694A66C */  addiu     $s4, $s4, -0x5994
+/* 8010F8 80240878 3C14800A */  lui       $s4, %hi(D_8009A66C)
+/* 8010FC 8024087C 2694A66C */  addiu     $s4, $s4, %lo(D_8009A66C)
 /* 801100 80240880 8E910000 */  lw        $s1, ($s4)
 /* 801104 80240884 8602000E */  lh        $v0, 0xe($s0)
 /* 801108 80240888 3C04800A */  lui       $a0, %hi(nuGfxZBuffer)
@@ -187,8 +187,8 @@ glabel func_80240628_800EA8
 /* 801168 802408E8 3C03FFFD */  lui       $v1, 0xfffd
 /* 80116C 802408EC 3463FEFF */  ori       $v1, $v1, 0xfeff
 /* 801170 802408F0 3C05F8F0 */  lui       $a1, 0xf8f0
-/* 801174 802408F4 3C1E800A */  lui       $fp, 0x800a
-/* 801178 802408F8 27DEA64C */  addiu     $fp, $fp, -0x59b4
+/* 801174 802408F4 3C1E800A */  lui       $fp, %hi(D_8009A64C)
+/* 801178 802408F8 27DEA64C */  addiu     $fp, $fp, %lo(D_8009A64C)
 /* 80117C 802408FC 34A5F000 */  ori       $a1, $a1, 0xf000
 /* 801180 80240900 8E900000 */  lw        $s0, ($s4)
 /* 801184 80240904 8FC40000 */  lw        $a0, ($fp)
@@ -428,8 +428,8 @@ glabel func_80240628_800EA8
 /* 801518 80240C98 00621025 */  or        $v0, $v1, $v0
 /* 80151C 80240C9C AC820000 */  sw        $v0, ($a0)
 .L80240CA0:
-/* 801520 80240CA0 3C03800A */  lui       $v1, 0x800a
-/* 801524 80240CA4 2463A66C */  addiu     $v1, $v1, -0x5994
+/* 801520 80240CA0 3C03800A */  lui       $v1, %hi(D_8009A66C)
+/* 801524 80240CA4 2463A66C */  addiu     $v1, $v1, %lo(D_8009A66C)
 /* 801528 80240CA8 8C620000 */  lw        $v0, ($v1)
 /* 80152C 80240CAC 0040202D */  daddu     $a0, $v0, $zero
 /* 801530 80240CB0 24420008 */  addiu     $v0, $v0, 8
@@ -483,8 +483,8 @@ glabel func_80240628_800EA8
 .L80240D60:
 /* 8015E0 80240D60 AC820000 */  sw        $v0, ($a0)
 /* 8015E4 80240D64 3C0502BC */  lui       $a1, 0x2bc
-/* 8015E8 80240D68 3C03800A */  lui       $v1, 0x800a
-/* 8015EC 80240D6C 2463A66C */  addiu     $v1, $v1, -0x5994
+/* 8015E8 80240D68 3C03800A */  lui       $v1, %hi(D_8009A66C)
+/* 8015EC 80240D6C 2463A66C */  addiu     $v1, $v1, %lo(D_8009A66C)
 /* 8015F0 80240D70 8C620000 */  lw        $v0, ($v1)
 /* 8015F4 80240D74 34A502BC */  ori       $a1, $a1, 0x2bc
 /* 8015F8 80240D78 0040202D */  daddu     $a0, $v0, $zero
@@ -505,8 +505,8 @@ glabel func_80240628_800EA8
 /* 801630 80240DB0 3C08FFFE */  lui       $t0, 0xfffe
 /* 801634 80240DB4 3508793C */  ori       $t0, $t0, 0x793c
 /* 801638 80240DB8 3C0BE300 */  lui       $t3, 0xe300
-/* 80163C 80240DBC 3C04800A */  lui       $a0, 0x800a
-/* 801640 80240DC0 2484A66C */  addiu     $a0, $a0, -0x5994
+/* 80163C 80240DBC 3C04800A */  lui       $a0, %hi(D_8009A66C)
+/* 801640 80240DC0 2484A66C */  addiu     $a0, $a0, %lo(D_8009A66C)
 /* 801644 80240DC4 356B0C00 */  ori       $t3, $t3, 0xc00
 /* 801648 80240DC8 8C820000 */  lw        $v0, ($a0)
 /* 80164C 80240DCC 3C03E700 */  lui       $v1, 0xe700
diff --git a/asm/nonmatchings/world/area_mac/mac_01/801700/func_80240E80_801700.s b/asm/nonmatchings/world/area_mac/mac_01/801700/func_80240E80_801700.s
index 7efb4ee1c9..32331ec1d9 100644
--- a/asm/nonmatchings/world/area_mac/mac_01/801700/func_80240E80_801700.s
+++ b/asm/nonmatchings/world/area_mac/mac_01/801700/func_80240E80_801700.s
@@ -9,8 +9,8 @@ glabel func_80240E80_801700
 /* 801710 80240E90 AFBF0014 */  sw        $ra, 0x14($sp)
 /* 801714 80240E94 0C0B1EAF */  jal       get_variable
 /* 801718 80240E98 34A502DD */   ori      $a1, $a1, 0x2dd
-/* 80171C 80240E9C 3C048025 */  lui       $a0, 0x8025
-/* 801720 80240EA0 248485E8 */  addiu     $a0, $a0, -0x7a18
+/* 80171C 80240E9C 3C048025 */  lui       $a0, %hi(D_802485E8)
+/* 801720 80240EA0 248485E8 */  addiu     $a0, $a0, %lo(D_802485E8)
 /* 801724 80240EA4 00021840 */  sll       $v1, $v0, 1
 /* 801728 80240EA8 00621821 */  addu      $v1, $v1, $v0
 /* 80172C 80240EAC 00031880 */  sll       $v1, $v1, 2
diff --git a/asm/nonmatchings/world/area_mac/mac_01/801700/func_80240ED8_801758.s b/asm/nonmatchings/world/area_mac/mac_01/801700/func_80240ED8_801758.s
index 55491c68ba..fed4b1215b 100644
--- a/asm/nonmatchings/world/area_mac/mac_01/801700/func_80240ED8_801758.s
+++ b/asm/nonmatchings/world/area_mac/mac_01/801700/func_80240ED8_801758.s
@@ -10,8 +10,8 @@ glabel func_80240ED8_801758
 /* 80176C 80240EEC 0C0B1EAF */  jal       get_variable
 /* 801770 80240EF0 34A50180 */   ori      $a1, $a1, 0x180
 /* 801774 80240EF4 0040202D */  daddu     $a0, $v0, $zero
-/* 801778 80240EF8 3C038025 */  lui       $v1, 0x8025
-/* 80177C 80240EFC 24638714 */  addiu     $v1, $v1, -0x78ec
+/* 801778 80240EF8 3C038025 */  lui       $v1, %hi(D_80248714)
+/* 80177C 80240EFC 24638714 */  addiu     $v1, $v1, %lo(D_80248714)
 /* 801780 80240F00 24060019 */  addiu     $a2, $zero, 0x19
 .L80240F04:
 /* 801784 80240F04 8C620008 */  lw        $v0, 8($v1)
diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241080_801900.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241080_801900.s
index 27293983ea..f511657a95 100644
--- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241080_801900.s
+++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241080_801900.s
@@ -69,8 +69,8 @@ glabel func_80241080_801900
 /* 8019F4 80241174 08090467 */  j         .L8024119C
 /* 8019F8 80241178 E6800018 */   swc1     $f0, 0x18($s4)
 .L8024117C:
-/* 8019FC 8024117C 3C018026 */  lui       $at, 0x8026
-/* 801A00 80241180 D42226E0 */  ldc1      $f2, 0x26e0($at)
+/* 8019FC 8024117C 3C018026 */  lui       $at, %hi(D_802626E0)
+/* 801A00 80241180 D42226E0 */  ldc1      $f2, %lo(D_802626E0)($at)
 /* 801A04 80241184 44820000 */  mtc1      $v0, $f0
 /* 801A08 80241188 00000000 */  nop       
 /* 801A0C 8024118C 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802416FC_801F7C.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802416FC_801F7C.s
index a7e4a93abb..eb8e06e948 100644
--- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802416FC_801F7C.s
+++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802416FC_801F7C.s
@@ -33,8 +33,8 @@ glabel func_802416FC_801F7C
 /* 801FE8 80241768 080905E4 */  j         .L80241790
 /* 801FEC 8024176C E4A00018 */   swc1     $f0, 0x18($a1)
 .L80241770:
-/* 801FF0 80241770 3C018026 */  lui       $at, 0x8026
-/* 801FF4 80241774 D42226E8 */  ldc1      $f2, 0x26e8($at)
+/* 801FF0 80241770 3C018026 */  lui       $at, %hi(D_802626E8)
+/* 801FF4 80241774 D42226E8 */  ldc1      $f2, %lo(D_802626E8)($at)
 /* 801FF8 80241778 44820000 */  mtc1      $v0, $f0
 /* 801FFC 8024177C 00000000 */  nop       
 /* 802000 80241780 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241C14_802494.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241C14_802494.s
index e5a9771162..1a05fdf35a 100644
--- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241C14_802494.s
+++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241C14_802494.s
@@ -124,9 +124,9 @@ glabel func_80241C14_802494
 /* 802658 80241DD8 2C620064 */  sltiu     $v0, $v1, 0x64
 /* 80265C 80241DDC 10400042 */  beqz      $v0, .L80241EE8
 /* 802660 80241DE0 00031080 */   sll      $v0, $v1, 2
-/* 802664 80241DE4 3C018026 */  lui       $at, 0x8026
+/* 802664 80241DE4 3C018026 */  lui       $at, %hi(D_802626F0)
 /* 802668 80241DE8 00220821 */  addu      $at, $at, $v0
-/* 80266C 80241DEC 8C2226F0 */  lw        $v0, 0x26f0($at)
+/* 80266C 80241DEC 8C2226F0 */  lw        $v0, %lo(D_802626F0)($at)
 /* 802670 80241DF0 00400008 */  jr        $v0
 /* 802674 80241DF4 00000000 */   nop      
 /* 802678 80241DF8 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241F10_802790.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241F10_802790.s
index 2c56b777b9..79eb1ca31b 100644
--- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241F10_802790.s
+++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241F10_802790.s
@@ -4,8 +4,8 @@
 glabel func_80241F10_802790
 /* 802790 80241F10 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* 802794 80241F14 AFB00010 */  sw        $s0, 0x10($sp)
-/* 802798 80241F18 3C108025 */  lui       $s0, 0x8025
-/* 80279C 80241F1C 26108C30 */  addiu     $s0, $s0, -0x73d0
+/* 802798 80241F18 3C108025 */  lui       $s0, %hi(D_80248C30)
+/* 80279C 80241F1C 26108C30 */  addiu     $s0, $s0, %lo(D_80248C30)
 /* 8027A0 80241F20 AFBF0018 */  sw        $ra, 0x18($sp)
 /* 8027A4 80241F24 AFB10014 */  sw        $s1, 0x14($sp)
 /* 8027A8 80241F28 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_80241F10_802790
 /* 80280C 80241F8C 28620010 */  slti      $v0, $v1, 0x10
 /* 802810 80241F90 1440FFFA */  bnez      $v0, .L80241F7C
 /* 802814 80241F94 24840004 */   addiu    $a0, $a0, 4
-/* 802818 80241F98 3C108025 */  lui       $s0, 0x8025
-/* 80281C 80241F9C 26108C30 */  addiu     $s0, $s0, -0x73d0
+/* 802818 80241F98 3C108025 */  lui       $s0, %hi(D_80248C30)
+/* 80281C 80241F9C 26108C30 */  addiu     $s0, $s0, %lo(D_80248C30)
 /* 802820 80241FA0 0C00AB4B */  jal       heap_free
 /* 802824 80241FA4 8E040000 */   lw       $a0, ($s0)
 /* 802828 80241FA8 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024204C_8028CC.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024204C_8028CC.s
index 3db95b2f19..f9a0adbc0e 100644
--- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024204C_8028CC.s
+++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024204C_8028CC.s
@@ -90,8 +90,8 @@ glabel func_8024204C_8028CC
 /* 802A18 80242198 0040802D */   daddu    $s0, $v0, $zero
 /* 802A1C 8024219C 0040282D */  daddu     $a1, $v0, $zero
 /* 802A20 802421A0 0000182D */  daddu     $v1, $zero, $zero
-/* 802A24 802421A4 3C068025 */  lui       $a2, 0x8025
-/* 802A28 802421A8 24C68CD4 */  addiu     $a2, $a2, -0x732c
+/* 802A24 802421A4 3C068025 */  lui       $a2, %hi(D_80248CD4)
+/* 802A28 802421A8 24C68CD4 */  addiu     $a2, $a2, %lo(D_80248CD4)
 /* 802A2C 802421AC 00C0202D */  daddu     $a0, $a2, $zero
 .L802421B0:
 /* 802A30 802421B0 8C820000 */  lw        $v0, ($a0)
diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242270_802AF0.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242270_802AF0.s
index 7bdf355749..f08b9a12df 100644
--- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242270_802AF0.s
+++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242270_802AF0.s
@@ -9,8 +9,8 @@ glabel func_80242270_802AF0
 /* 802B00 80242280 8C84014C */   lw       $a0, 0x14c($a0)
 /* 802B04 80242284 24040008 */  addiu     $a0, $zero, 8
 /* 802B08 80242288 0040802D */  daddu     $s0, $v0, $zero
-/* 802B0C 8024228C 3C028024 */  lui       $v0, 0x8024
-/* 802B10 80242290 244222DC */  addiu     $v0, $v0, 0x22dc
+/* 802B0C 8024228C 3C028024 */  lui       $v0, %hi(D_802422DC)
+/* 802B10 80242290 244222DC */  addiu     $v0, $v0, %lo(D_802422DC)
 /* 802B14 80242294 0C00AB39 */  jal       heap_malloc
 /* 802B18 80242298 AE020008 */   sw       $v0, 8($s0)
 /* 802B1C 8024229C 0040182D */  daddu     $v1, $v0, $zero
diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802422DC_802B5C.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802422DC_802B5C.s
index 6ad481c87e..43e730d669 100644
--- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802422DC_802B5C.s
+++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802422DC_802B5C.s
@@ -3,8 +3,8 @@
 
 glabel func_802422DC_802B5C
 /* 802B5C 802422DC 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 802B60 802422E0 3C03800A */  lui       $v1, 0x800a
-/* 802B64 802422E4 8463A634 */  lh        $v1, -0x59cc($v1)
+/* 802B60 802422E0 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* 802B64 802422E4 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* 802B68 802422E8 3C05800B */  lui       $a1, %hi(gCameras)
 /* 802B6C 802422EC 24A51D80 */  addiu     $a1, $a1, %lo(gCameras)
 /* 802B70 802422F0 AFBF0010 */  sw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024233C_802BBC.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024233C_802BBC.s
index 2ac659374f..b0999b8cdd 100644
--- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024233C_802BBC.s
+++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024233C_802BBC.s
@@ -21,8 +21,8 @@ glabel func_8024233C_802BBC
 /* 802BFC 8024237C 2414FFFC */  addiu     $s4, $zero, -4
 /* 802C00 80242380 24130005 */  addiu     $s3, $zero, 5
 /* 802C04 80242384 3C120080 */  lui       $s2, 0x80
-/* 802C08 80242388 3C038015 */  lui       $v1, 0x8015
-/* 802C0C 8024238C 8C6312F0 */  lw        $v1, 0x12f0($v1)
+/* 802C08 80242388 3C038015 */  lui       $v1, %hi(D_801512F0)
+/* 802C0C 8024238C 8C6312F0 */  lw        $v1, %lo(D_801512F0)($v1)
 /* 802C10 80242390 24020001 */  addiu     $v0, $zero, 1
 /* 802C14 80242394 0C046F97 */  jal       set_background_color_blend
 /* 802C18 80242398 A0620000 */   sb       $v0, ($v1)
diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242488_802D08.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242488_802D08.s
index a4d4c5c7e2..1dc9576d23 100644
--- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242488_802D08.s
+++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242488_802D08.s
@@ -49,8 +49,8 @@ glabel func_80242488_802D08
 /* 802DAC 8024252C 2413FFFC */  addiu     $s3, $zero, -4
 /* 802DB0 80242530 24120005 */  addiu     $s2, $zero, 5
 /* 802DB4 80242534 3C11FF7F */  lui       $s1, 0xff7f
-/* 802DB8 80242538 3C028015 */  lui       $v0, 0x8015
-/* 802DBC 8024253C 8C4212F0 */  lw        $v0, 0x12f0($v0)
+/* 802DB8 80242538 3C028015 */  lui       $v0, %hi(D_801512F0)
+/* 802DBC 8024253C 8C4212F0 */  lw        $v0, %lo(D_801512F0)($v0)
 /* 802DC0 80242540 3631FFFF */  ori       $s1, $s1, 0xffff
 /* 802DC4 80242544 A0400000 */  sb        $zero, ($v0)
 .L80242548:
diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802425FC_802E7C.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802425FC_802E7C.s
index 008e4346ef..e936037c9c 100644
--- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802425FC_802E7C.s
+++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802425FC_802E7C.s
@@ -19,9 +19,9 @@ glabel func_802425FC_802E7C
 /* 802EB0 80242630 34A502E0 */  ori       $a1, $a1, 0x2e0
 /* 802EB4 80242634 0C0B1EAF */  jal       get_variable
 /* 802EB8 80242638 0000202D */   daddu    $a0, $zero, $zero
-/* 802EBC 8024263C 3C038025 */  lui       $v1, 0x8025
+/* 802EBC 8024263C 3C038025 */  lui       $v1, %hi(D_80248C94)
 /* 802EC0 80242640 00621821 */  addu      $v1, $v1, $v0
-/* 802EC4 80242644 90638C94 */  lbu       $v1, -0x736c($v1)
+/* 802EC4 80242644 90638C94 */  lbu       $v1, %lo(D_80248C94)($v1)
 /* 802EC8 80242648 8E220084 */  lw        $v0, 0x84($s1)
 /* 802ECC 8024264C 54430006 */  bnel      $v0, $v1, .L80242668
 /* 802ED0 80242650 AE200084 */   sw       $zero, 0x84($s1)
diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242680_802F00.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242680_802F00.s
index fdd262e53c..a2573d3054 100644
--- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242680_802F00.s
+++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242680_802F00.s
@@ -38,8 +38,8 @@ glabel func_80242680_802F00
 /* 802F84 80242704 0220202D */  daddu     $a0, $s1, $zero
 /* 802F88 80242708 3C05F4AC */  lui       $a1, 0xf4ac
 /* 802F8C 8024270C 34A5D481 */  ori       $a1, $a1, 0xd481
-/* 802F90 80242710 3C108026 */  lui       $s0, 0x8026
-/* 802F94 80242714 26102A60 */  addiu     $s0, $s0, 0x2a60
+/* 802F90 80242710 3C108026 */  lui       $s0, %hi(D_80262A60)
+/* 802F94 80242714 26102A60 */  addiu     $s0, $s0, %lo(D_80262A60)
 /* 802F98 80242718 0C0B1EAF */  jal       get_variable
 /* 802F9C 8024271C AE020000 */   sw       $v0, ($s0)
 /* 802FA0 80242720 0220202D */  daddu     $a0, $s1, $zero
@@ -66,8 +66,8 @@ glabel func_80242680_802F00
 /* 802FF4 80242774 0000202D */   daddu    $a0, $zero, $zero
 /* 802FF8 80242778 0220202D */  daddu     $a0, $s1, $zero
 /* 802FFC 8024277C 3C05F4AC */  lui       $a1, 0xf4ac
-/* 803000 80242780 3C018026 */  lui       $at, 0x8026
-/* 803004 80242784 AC222A64 */  sw        $v0, 0x2a64($at)
+/* 803000 80242780 3C018026 */  lui       $at, %hi(D_80262A64)
+/* 803004 80242784 AC222A64 */  sw        $v0, %lo(D_80262A64)($at)
 /* 803008 80242788 0C0B1EAF */  jal       get_variable
 /* 80300C 8024278C 34A5D481 */   ori      $a1, $a1, 0xd481
 /* 803010 80242790 0220202D */  daddu     $a0, $s1, $zero
@@ -98,16 +98,16 @@ glabel func_80242680_802F00
 /* 803074 802427F4 E7A00010 */   swc1     $f0, 0x10($sp)
 /* 803078 802427F8 8E030000 */  lw        $v1, ($s0)
 /* 80307C 802427FC 8C64000C */  lw        $a0, 0xc($v1)
-/* 803080 80242800 3C018026 */  lui       $at, 0x8026
-/* 803084 80242804 AC222A68 */  sw        $v0, 0x2a68($at)
+/* 803080 80242800 3C018026 */  lui       $at, %hi(D_80262A68)
+/* 803084 80242804 AC222A68 */  sw        $v0, %lo(D_80262A68)($at)
 /* 803088 80242808 AC800018 */  sw        $zero, 0x18($a0)
 /* 80308C 8024280C AC800020 */  sw        $zero, 0x20($a0)
 /* 803090 80242810 AC800024 */  sw        $zero, 0x24($a0)
 /* 803094 80242814 AC800028 */  sw        $zero, 0x28($a0)
 /* 803098 80242818 AC80001C */  sw        $zero, 0x1c($a0)
 .L8024281C:
-/* 80309C 8024281C 3C028026 */  lui       $v0, 0x8026
-/* 8030A0 80242820 8C422A60 */  lw        $v0, 0x2a60($v0)
+/* 80309C 8024281C 3C028026 */  lui       $v0, %hi(D_80262A60)
+/* 8030A0 80242820 8C422A60 */  lw        $v0, %lo(D_80262A60)($v0)
 /* 8030A4 80242824 8C44000C */  lw        $a0, 0xc($v0)
 /* 8030A8 80242828 8C820020 */  lw        $v0, 0x20($a0)
 /* 8030AC 8024282C 8C830028 */  lw        $v1, 0x28($a0)
diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242898_803118.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242898_803118.s
index 255a5ede7d..0215420c7b 100644
--- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242898_803118.s
+++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242898_803118.s
@@ -5,19 +5,19 @@ glabel func_80242898_803118
 /* 803118 80242898 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 80311C 8024289C 10A0000B */  beqz      $a1, .L802428CC
 /* 803120 802428A0 AFBF0010 */   sw       $ra, 0x10($sp)
-/* 803124 802428A4 3C038026 */  lui       $v1, 0x8026
-/* 803128 802428A8 8C632A64 */  lw        $v1, 0x2a64($v1)
+/* 803124 802428A4 3C038026 */  lui       $v1, %hi(D_80262A64)
+/* 803128 802428A8 8C632A64 */  lw        $v1, %lo(D_80262A64)($v1)
 /* 80312C 802428AC 8C620000 */  lw        $v0, ($v1)
-/* 803130 802428B0 3C048026 */  lui       $a0, 0x8026
-/* 803134 802428B4 8C842A68 */  lw        $a0, 0x2a68($a0)
+/* 803130 802428B0 3C048026 */  lui       $a0, %hi(D_80262A68)
+/* 803134 802428B4 8C842A68 */  lw        $a0, %lo(D_80262A68)($a0)
 /* 803138 802428B8 34420010 */  ori       $v0, $v0, 0x10
 /* 80313C 802428BC AC620000 */  sw        $v0, ($v1)
 /* 803140 802428C0 8C820000 */  lw        $v0, ($a0)
 /* 803144 802428C4 34420010 */  ori       $v0, $v0, 0x10
 /* 803148 802428C8 AC820000 */  sw        $v0, ($a0)
 .L802428CC:
-/* 80314C 802428CC 3C048026 */  lui       $a0, 0x8026
-/* 803150 802428D0 8C842A60 */  lw        $a0, 0x2a60($a0)
+/* 80314C 802428CC 3C048026 */  lui       $a0, %hi(D_80262A60)
+/* 803150 802428D0 8C842A60 */  lw        $a0, %lo(D_80262A60)($a0)
 /* 803154 802428D4 8C85000C */  lw        $a1, 0xc($a0)
 /* 803158 802428D8 8CA20018 */  lw        $v0, 0x18($a1)
 /* 80315C 802428DC 8CA30020 */  lw        $v1, 0x20($a1)
@@ -41,8 +41,8 @@ glabel func_80242898_803118
 .L80242924:
 /* 8031A4 80242924 0C016914 */  jal       remove_effect
 /* 8031A8 80242928 ACA00018 */   sw       $zero, 0x18($a1)
-/* 8031AC 8024292C 3C048026 */  lui       $a0, 0x8026
-/* 8031B0 80242930 8C842A40 */  lw        $a0, 0x2a40($a0)
+/* 8031AC 8024292C 3C048026 */  lui       $a0, %hi(D_80262A40)
+/* 8031B0 80242930 8C842A40 */  lw        $a0, %lo(D_80262A40)($a0)
 /* 8031B4 80242934 0C048D70 */  jal       func_801235C0
 /* 8031B8 80242938 00000000 */   nop      
 /* 8031BC 8024293C 24020002 */  addiu     $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024294C_8031CC.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024294C_8031CC.s
index 169a692dd6..151a74cf1b 100644
--- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024294C_8031CC.s
+++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024294C_8031CC.s
@@ -7,8 +7,8 @@ glabel func_8024294C_8031CC
 /* 8031D4 80242954 8C82000C */  lw        $v0, 0xc($a0)
 /* 8031D8 80242958 0C0B1EAF */  jal       get_variable
 /* 8031DC 8024295C 8C450000 */   lw       $a1, ($v0)
-/* 8031E0 80242960 3C038026 */  lui       $v1, 0x8026
-/* 8031E4 80242964 8C632A60 */  lw        $v1, 0x2a60($v1)
+/* 8031E0 80242960 3C038026 */  lui       $v1, %hi(D_80262A60)
+/* 8031E4 80242964 8C632A60 */  lw        $v1, %lo(D_80262A60)($v1)
 /* 8031E8 80242968 8C63000C */  lw        $v1, 0xc($v1)
 /* 8031EC 8024296C AC620034 */  sw        $v0, 0x34($v1)
 /* 8031F0 80242970 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242980_803200.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242980_803200.s
index 34f9a4235a..dfa56d9c84 100644
--- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242980_803200.s
+++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242980_803200.s
@@ -8,8 +8,8 @@ glabel func_80242980_803200
 /* 80320C 8024298C 0C0B1EAF */  jal       get_variable
 /* 803210 80242990 8C450000 */   lw       $a1, ($v0)
 /* 803214 80242994 0040202D */  daddu     $a0, $v0, $zero
-/* 803218 80242998 3C028026 */  lui       $v0, 0x8026
-/* 80321C 8024299C 8C422A60 */  lw        $v0, 0x2a60($v0)
+/* 803218 80242998 3C028026 */  lui       $v0, %hi(D_80262A60)
+/* 80321C 8024299C 8C422A60 */  lw        $v0, %lo(D_80262A60)($v0)
 /* 803220 802429A0 24030001 */  addiu     $v1, $zero, 1
 /* 803224 802429A4 8C45000C */  lw        $a1, 0xc($v0)
 /* 803228 802429A8 1083000D */  beq       $a0, $v1, .L802429E0
diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242A00_803280.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242A00_803280.s
index 7df9a2c8b5..05c793c27a 100644
--- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242A00_803280.s
+++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242A00_803280.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80242A00_803280
-/* 803280 80242A00 3C028026 */  lui       $v0, 0x8026
-/* 803284 80242A04 8C422A68 */  lw        $v0, 0x2a68($v0)
+/* 803280 80242A00 3C028026 */  lui       $v0, %hi(D_80262A68)
+/* 803284 80242A04 8C422A68 */  lw        $v0, %lo(D_80262A68)($v0)
 /* 803288 80242A08 8C42000C */  lw        $v0, 0xc($v0)
 /* 80328C 80242A0C AC40001C */  sw        $zero, 0x1c($v0)
 /* 803290 80242A10 03E00008 */  jr        $ra
diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242A18_803298.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242A18_803298.s
index eef7c9ecd0..9a8e4442e2 100644
--- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242A18_803298.s
+++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242A18_803298.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80242A18_803298
-/* 803298 80242A18 3C028026 */  lui       $v0, 0x8026
-/* 80329C 80242A1C 8C422A68 */  lw        $v0, 0x2a68($v0)
+/* 803298 80242A18 3C028026 */  lui       $v0, %hi(D_80262A68)
+/* 80329C 80242A1C 8C422A68 */  lw        $v0, %lo(D_80262A68)($v0)
 /* 8032A0 80242A20 8C43000C */  lw        $v1, 0xc($v0)
 /* 8032A4 80242A24 24020001 */  addiu     $v0, $zero, 1
 /* 8032A8 80242A28 AC62001C */  sw        $v0, 0x1c($v1)
diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242A34_8032B4.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242A34_8032B4.s
index 6f72c86550..61e2175eff 100644
--- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242A34_8032B4.s
+++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242A34_8032B4.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80242A34_8032B4
-/* 8032B4 80242A34 3C028026 */  lui       $v0, 0x8026
-/* 8032B8 80242A38 8C422A68 */  lw        $v0, 0x2a68($v0)
+/* 8032B4 80242A34 3C028026 */  lui       $v0, %hi(D_80262A68)
+/* 8032B8 80242A38 8C422A68 */  lw        $v0, %lo(D_80262A68)($v0)
 /* 8032BC 80242A3C 8C43000C */  lw        $v1, 0xc($v0)
 /* 8032C0 80242A40 24020002 */  addiu     $v0, $zero, 2
 /* 8032C4 80242A44 03E00008 */  jr        $ra
diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242F08_803788.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242F08_803788.s
index dc6ecc7305..5520dea49d 100644
--- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242F08_803788.s
+++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242F08_803788.s
@@ -3,8 +3,8 @@
 
 glabel func_80242F08_803788
 /* 803788 80242F08 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 80378C 80242F0C 3C058026 */  lui       $a1, 0x8026
-/* 803790 80242F10 8CA52A58 */  lw        $a1, 0x2a58($a1)
+/* 80378C 80242F0C 3C058026 */  lui       $a1, %hi(D_80262A58)
+/* 803790 80242F10 8CA52A58 */  lw        $a1, %lo(D_80262A58)($a1)
 /* 803794 80242F14 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 803798 80242F18 0C0B1EAF */  jal       get_variable
 /* 80379C 80242F1C 0000202D */   daddu    $a0, $zero, $zero
diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242F74_8037F4.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242F74_8037F4.s
index 9b557f86ac..81c89c5482 100644
--- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242F74_8037F4.s
+++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242F74_8037F4.s
@@ -3,14 +3,14 @@
 
 glabel func_80242F74_8037F4
 /* 8037F4 80242F74 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8037F8 80242F78 3C058024 */  lui       $a1, 0x8024
-/* 8037FC 80242F7C 24A52F08 */  addiu     $a1, $a1, 0x2f08
+/* 8037F8 80242F78 3C058024 */  lui       $a1, %hi(D_80242F08)
+/* 8037FC 80242F7C 24A52F08 */  addiu     $a1, $a1, %lo(D_80242F08)
 /* 803800 80242F80 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 803804 80242F84 0C048C8F */  jal       bind_dynamic_entity_7
 /* 803808 80242F88 0000202D */   daddu    $a0, $zero, $zero
 /* 80380C 80242F8C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 803810 80242F90 3C018026 */  lui       $at, 0x8026
-/* 803814 80242F94 AC222A40 */  sw        $v0, 0x2a40($at)
+/* 803810 80242F90 3C018026 */  lui       $at, %hi(D_80262A40)
+/* 803814 80242F94 AC222A40 */  sw        $v0, %lo(D_80262A40)($at)
 /* 803818 80242F98 24020002 */  addiu     $v0, $zero, 2
 /* 80381C 80242F9C 03E00008 */  jr        $ra
 /* 803820 80242FA0 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242FA4_803824.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242FA4_803824.s
index bcdc15d253..34d779a66f 100644
--- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242FA4_803824.s
+++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242FA4_803824.s
@@ -46,8 +46,8 @@ glabel func_80242FA4_803824
 /* 8038C8 80243048 27B30040 */  addiu     $s3, $sp, 0x40
 /* 8038CC 8024304C 0260202D */  daddu     $a0, $s3, $zero
 /* 8038D0 80243050 3C160001 */  lui       $s6, 1
-/* 8038D4 80243054 3C11800A */  lui       $s1, 0x800a
-/* 8038D8 80243058 2631A66C */  addiu     $s1, $s1, -0x5994
+/* 8038D4 80243054 3C11800A */  lui       $s1, %hi(D_8009A66C)
+/* 8038D8 80243058 2631A66C */  addiu     $s1, $s1, %lo(D_8009A66C)
 /* 8038DC 8024305C 36D61630 */  ori       $s6, $s6, 0x1630
 /* 8038E0 80243060 3C05E700 */  lui       $a1, 0xe700
 /* 8038E4 80243064 8E230000 */  lw        $v1, ($s1)
@@ -158,10 +158,10 @@ glabel func_80242FA4_803824
 /* 803A88 80243208 0C019D80 */  jal       guMtxCatF
 /* 803A8C 8024320C 0260302D */   daddu    $a2, $s3, $zero
 /* 803A90 80243210 0260202D */  daddu     $a0, $s3, $zero
-/* 803A94 80243214 3C108007 */  lui       $s0, 0x8007
-/* 803A98 80243218 261041F0 */  addiu     $s0, $s0, 0x41f0
-/* 803A9C 8024321C 3C14800A */  lui       $s4, 0x800a
-/* 803AA0 80243220 2694A674 */  addiu     $s4, $s4, -0x598c
+/* 803A94 80243214 3C108007 */  lui       $s0, %hi(D_800741F0)
+/* 803A98 80243218 261041F0 */  addiu     $s0, $s0, %lo(D_800741F0)
+/* 803A9C 8024321C 3C14800A */  lui       $s4, %hi(D_8009A674)
+/* 803AA0 80243220 2694A674 */  addiu     $s4, $s4, %lo(D_8009A674)
 /* 803AA4 80243224 96050000 */  lhu       $a1, ($s0)
 /* 803AA8 80243228 8E820000 */  lw        $v0, ($s4)
 /* 803AAC 8024322C 00052980 */  sll       $a1, $a1, 6
diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243380_803C00.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243380_803C00.s
index d0f1950f46..41d1cd840e 100644
--- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243380_803C00.s
+++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243380_803C00.s
@@ -53,8 +53,8 @@ glabel func_80243380_803C00
 /* 803CC0 80243440 0C04E9C1 */  jal       func_8013A704
 /* 803CC4 80243444 E6020018 */   swc1     $f2, 0x18($s0)
 /* 803CC8 80243448 0000202D */  daddu     $a0, $zero, $zero
-/* 803CCC 8024344C 3C058024 */  lui       $a1, 0x8024
-/* 803CD0 80243450 24A52FA4 */  addiu     $a1, $a1, 0x2fa4
+/* 803CCC 8024344C 3C058024 */  lui       $a1, %hi(D_80242FA4)
+/* 803CD0 80243450 24A52FA4 */  addiu     $a1, $a1, %lo(D_80242FA4)
 /* 803CD4 80243454 0C048C56 */  jal       bind_dynamic_entity_3
 /* 803CD8 80243458 AE020000 */   sw       $v0, ($s0)
 /* 803CDC 8024345C 0260202D */  daddu     $a0, $s3, $zero
diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243870_8040F0.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243870_8040F0.s
index 99b884632c..a016faafb2 100644
--- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243870_8040F0.s
+++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243870_8040F0.s
@@ -26,9 +26,9 @@ glabel func_80243870_8040F0
 /* 804144 802438C4 000320C0 */  sll       $a0, $v1, 3
 /* 804148 802438C8 00641821 */  addu      $v1, $v1, $a0
 /* 80414C 802438CC 000318C0 */  sll       $v1, $v1, 3
-/* 804150 802438D0 3C01800B */  lui       $at, 0x800b
+/* 804150 802438D0 3C01800B */  lui       $at, %hi(D_800B1D98)
 /* 804154 802438D4 00230821 */  addu      $at, $at, $v1
-/* 804158 802438D8 E4201D98 */  swc1      $f0, 0x1d98($at)
+/* 804158 802438D8 E4201D98 */  swc1      $f0, %lo(D_800B1D98)($at)
 /* 80415C 802438DC 8FBF0018 */  lw        $ra, 0x18($sp)
 /* 804160 802438E0 8FB10014 */  lw        $s1, 0x14($sp)
 /* 804164 802438E4 8FB00010 */  lw        $s0, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243CD4_804554.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243CD4_804554.s
index 542bd801c7..79fb2825af 100644
--- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243CD4_804554.s
+++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243CD4_804554.s
@@ -6,11 +6,11 @@ glabel func_80243CD4_804554
 /* 804558 80243CD8 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 80455C 80243CDC 10A00003 */  beqz      $a1, .L80243CEC
 /* 804560 80243CE0 8C86000C */   lw       $a2, 0xc($a0)
-/* 804564 80243CE4 3C018025 */  lui       $at, 0x8025
-/* 804568 80243CE8 AC20D944 */  sw        $zero, -0x26bc($at)
+/* 804564 80243CE4 3C018025 */  lui       $at, %hi(D_8024D944)
+/* 804568 80243CE8 AC20D944 */  sw        $zero, %lo(D_8024D944)($at)
 .L80243CEC:
-/* 80456C 80243CEC 3C038025 */  lui       $v1, 0x8025
-/* 804570 80243CF0 2463D944 */  addiu     $v1, $v1, -0x26bc
+/* 80456C 80243CEC 3C038025 */  lui       $v1, %hi(D_8024D944)
+/* 804570 80243CF0 2463D944 */  addiu     $v1, $v1, %lo(D_8024D944)
 /* 804574 80243CF4 8C620000 */  lw        $v0, ($v1)
 /* 804578 80243CF8 54400003 */  bnel      $v0, $zero, .L80243D08
 /* 80457C 80243CFC AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_80243CD4_804554
 /* 804584 80243D04 0000102D */   daddu    $v0, $zero, $zero
 .L80243D08:
 /* 804588 80243D08 8CC50000 */  lw        $a1, ($a2)
-/* 80458C 80243D0C 3C068025 */  lui       $a2, 0x8025
+/* 80458C 80243D0C 3C068025 */  lui       $a2, %hi(D_8024D948)
 /* 804590 80243D10 0C0B2026 */  jal       set_variable
-/* 804594 80243D14 8CC6D948 */   lw       $a2, -0x26b8($a2)
+/* 804594 80243D14 8CC6D948 */   lw       $a2, %lo(D_8024D948)($a2)
 /* 804598 80243D18 24020002 */  addiu     $v0, $zero, 2
 .L80243D1C:
 /* 80459C 80243D1C 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243D28_8045A8.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243D28_8045A8.s
index 1dbcf4832e..e285378fcc 100644
--- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243D28_8045A8.s
+++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243D28_8045A8.s
@@ -7,12 +7,12 @@ glabel func_80243D28_8045A8
 /* 8045B0 80243D30 8C82000C */  lw        $v0, 0xc($a0)
 /* 8045B4 80243D34 0C0B1EAF */  jal       get_variable
 /* 8045B8 80243D38 8C450000 */   lw       $a1, ($v0)
-/* 8045BC 80243D3C 3C018025 */  lui       $at, 0x8025
-/* 8045C0 80243D40 AC22D948 */  sw        $v0, -0x26b8($at)
+/* 8045BC 80243D3C 3C018025 */  lui       $at, %hi(D_8024D948)
+/* 8045C0 80243D40 AC22D948 */  sw        $v0, %lo(D_8024D948)($at)
 /* 8045C4 80243D44 24020002 */  addiu     $v0, $zero, 2
 /* 8045C8 80243D48 8FBF0010 */  lw        $ra, 0x10($sp)
 /* 8045CC 80243D4C 24030001 */  addiu     $v1, $zero, 1
-/* 8045D0 80243D50 3C018025 */  lui       $at, 0x8025
-/* 8045D4 80243D54 AC23D944 */  sw        $v1, -0x26bc($at)
+/* 8045D0 80243D50 3C018025 */  lui       $at, %hi(D_8024D944)
+/* 8045D4 80243D54 AC23D944 */  sw        $v1, %lo(D_8024D944)($at)
 /* 8045D8 80243D58 03E00008 */  jr        $ra
 /* 8045DC 80243D5C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243D60_8045E0.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243D60_8045E0.s
index 1797b6b9f8..99dccabec8 100644
--- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243D60_8045E0.s
+++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243D60_8045E0.s
@@ -13,8 +13,8 @@ glabel func_80243D60_8045E0
 /* 804600 80243D80 8C620000 */  lw        $v0, ($v1)
 /* 804604 80243D84 5040000A */  beql      $v0, $zero, .L80243DB0
 /* 804608 80243D88 00041080 */   sll      $v0, $a0, 2
-/* 80460C 80243D8C 3C058026 */  lui       $a1, 0x8026
-/* 804610 80243D90 24A52A70 */  addiu     $a1, $a1, 0x2a70
+/* 80460C 80243D8C 3C058026 */  lui       $a1, %hi(D_80262A70)
+/* 804610 80243D90 24A52A70 */  addiu     $a1, $a1, %lo(D_80262A70)
 .L80243D94:
 /* 804614 80243D94 24630004 */  addiu     $v1, $v1, 4
 /* 804618 80243D98 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_80243D60_8045E0
 /* 804628 80243DA8 24A50004 */   addiu    $a1, $a1, 4
 /* 80462C 80243DAC 00041080 */  sll       $v0, $a0, 2
 .L80243DB0:
-/* 804630 80243DB0 3C018026 */  lui       $at, 0x8026
+/* 804630 80243DB0 3C018026 */  lui       $at, %hi(D_80262A70)
 /* 804634 80243DB4 00220821 */  addu      $at, $at, $v0
-/* 804638 80243DB8 AC202A70 */  sw        $zero, 0x2a70($at)
+/* 804638 80243DB8 AC202A70 */  sw        $zero, %lo(D_80262A70)($at)
 /* 80463C 80243DBC 08090F7B */  j         .L80243DEC
 /* 804640 80243DC0 00000000 */   nop      
 .L80243DC4:
-/* 804644 80243DC4 3C038026 */  lui       $v1, 0x8026
-/* 804648 80243DC8 24632A70 */  addiu     $v1, $v1, 0x2a70
+/* 804644 80243DC4 3C038026 */  lui       $v1, %hi(D_80262A70)
+/* 804648 80243DC8 24632A70 */  addiu     $v1, $v1, %lo(D_80262A70)
 /* 80464C 80243DCC 0060282D */  daddu     $a1, $v1, $zero
 .L80243DD0:
 /* 804650 80243DD0 24820010 */  addiu     $v0, $a0, 0x10
diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244078_8048F8.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244078_8048F8.s
index 12f8207463..76f2528e83 100644
--- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244078_8048F8.s
+++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244078_8048F8.s
@@ -15,7 +15,7 @@ glabel func_80244078_8048F8
 /* 804920 802440A0 8FBF0014 */  lw        $ra, 0x14($sp)
 /* 804924 802440A4 8FB00010 */  lw        $s0, 0x10($sp)
 /* 804928 802440A8 24020002 */  addiu     $v0, $zero, 2
-/* 80492C 802440AC 3C018026 */  lui       $at, 0x8026
-/* 804930 802440B0 AC232C34 */  sw        $v1, 0x2c34($at)
+/* 80492C 802440AC 3C018026 */  lui       $at, %hi(D_80262C34)
+/* 804930 802440B0 AC232C34 */  sw        $v1, %lo(D_80262C34)($at)
 /* 804934 802440B4 03E00008 */  jr        $ra
 /* 804938 802440B8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802440BC_80493C.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802440BC_80493C.s
index e63f70c4cd..9f3a6a3788 100644
--- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802440BC_80493C.s
+++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802440BC_80493C.s
@@ -6,8 +6,8 @@ glabel func_802440BC_80493C
 /* 804940 802440C0 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 804944 802440C4 0C00EABB */  jal       get_npc_unsafe
 /* 804948 802440C8 8C84008C */   lw       $a0, 0x8c($a0)
-/* 80494C 802440CC 3C038026 */  lui       $v1, 0x8026
-/* 804950 802440D0 8C632C34 */  lw        $v1, 0x2c34($v1)
+/* 80494C 802440CC 3C038026 */  lui       $v1, %hi(D_80262C34)
+/* 804950 802440D0 8C632C34 */  lw        $v1, %lo(D_80262C34)($v1)
 /* 804954 802440D4 AC430028 */  sw        $v1, 0x28($v0)
 /* 804958 802440D8 8FBF0010 */  lw        $ra, 0x10($sp)
 /* 80495C 802440DC 24020002 */  addiu     $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244E90_805710.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244E90_805710.s
index fc8c76449d..02554dab48 100644
--- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244E90_805710.s
+++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244E90_805710.s
@@ -19,8 +19,8 @@ glabel func_80244E90_805710
 /* 805748 80244EC8 3C13F840 */  lui       $s3, 0xf840
 /* 80574C 80244ECC 36735C2C */  ori       $s3, $s3, 0x5c2c
 /* 805750 80244ED0 AFB10014 */  sw        $s1, 0x14($sp)
-/* 805754 80244ED4 3C118025 */  lui       $s1, 0x8025
-/* 805758 80244ED8 26316ADC */  addiu     $s1, $s1, 0x6adc
+/* 805754 80244ED4 3C118025 */  lui       $s1, %hi(D_80256ADC)
+/* 805758 80244ED8 26316ADC */  addiu     $s1, $s1, %lo(D_80256ADC)
 /* 80575C 80244EDC AFBF002C */  sw        $ra, 0x2c($sp)
 .L80244EE0:
 /* 805760 80244EE0 8E220000 */  lw        $v0, ($s1)
diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244F5C_8057DC.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244F5C_8057DC.s
index 74548a9584..e75321e1a8 100644
--- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244F5C_8057DC.s
+++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244F5C_8057DC.s
@@ -16,8 +16,8 @@ glabel func_80244F5C_8057DC
 /* 805808 80244F88 3C13F840 */  lui       $s3, 0xf840
 /* 80580C 80244F8C 36735C2C */  ori       $s3, $s3, 0x5c2c
 /* 805810 80244F90 AFB20018 */  sw        $s2, 0x18($sp)
-/* 805814 80244F94 3C128025 */  lui       $s2, 0x8025
-/* 805818 80244F98 26526ADC */  addiu     $s2, $s2, 0x6adc
+/* 805814 80244F94 3C128025 */  lui       $s2, %hi(D_80256ADC)
+/* 805818 80244F98 26526ADC */  addiu     $s2, $s2, %lo(D_80256ADC)
 /* 80581C 80244F9C AFBF0028 */  sw        $ra, 0x28($sp)
 .L80244FA0:
 /* 805820 80244FA0 8E420000 */  lw        $v0, ($s2)
diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80245018_805898.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80245018_805898.s
index 5e3dcf1c3e..31e14218ba 100644
--- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80245018_805898.s
+++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80245018_805898.s
@@ -2,7 +2,7 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80245018_805898
-/* 805898 80245018 3C018026 */  lui       $at, 0x8026
-/* 80589C 8024501C AC202F68 */  sw        $zero, 0x2f68($at)
+/* 805898 80245018 3C018026 */  lui       $at, %hi(D_80262F68)
+/* 80589C 8024501C AC202F68 */  sw        $zero, %lo(D_80262F68)($at)
 /* 8058A0 80245020 03E00008 */  jr        $ra
 /* 8058A4 80245024 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80245028_8058A8.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80245028_8058A8.s
index 9598b2a6a7..f6e15555c0 100644
--- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80245028_8058A8.s
+++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80245028_8058A8.s
@@ -6,8 +6,8 @@ glabel func_80245028_8058A8
 /* 8058AC 8024502C AFB70034 */  sw        $s7, 0x34($sp)
 /* 8058B0 80245030 0080B82D */  daddu     $s7, $a0, $zero
 /* 8058B4 80245034 AFBE0038 */  sw        $fp, 0x38($sp)
-/* 8058B8 80245038 3C1E8026 */  lui       $fp, 0x8026
-/* 8058BC 8024503C 27DE2C38 */  addiu     $fp, $fp, 0x2c38
+/* 8058B8 80245038 3C1E8026 */  lui       $fp, %hi(D_80262C38)
+/* 8058BC 8024503C 27DE2C38 */  addiu     $fp, $fp, %lo(D_80262C38)
 /* 8058C0 80245040 AFBF003C */  sw        $ra, 0x3c($sp)
 /* 8058C4 80245044 AFB60030 */  sw        $s6, 0x30($sp)
 /* 8058C8 80245048 AFB5002C */  sw        $s5, 0x2c($sp)
@@ -20,8 +20,8 @@ glabel func_80245028_8058A8
 /* 8058E4 80245064 0000B02D */  daddu     $s6, $zero, $zero
 /* 8058E8 80245068 24150001 */  addiu     $s5, $zero, 1
 /* 8058EC 8024506C 02A0282D */  daddu     $a1, $s5, $zero
-/* 8058F0 80245070 3C148009 */  lui       $s4, 0x8009
-/* 8058F4 80245074 2694EEC4 */  addiu     $s4, $s4, -0x113c
+/* 8058F0 80245070 3C148009 */  lui       $s4, %hi(D_8008EEC4)
+/* 8058F4 80245074 2694EEC4 */  addiu     $s4, $s4, %lo(D_8008EEC4)
 /* 8058F8 80245078 03C0882D */  daddu     $s1, $fp, $zero
 .L8024507C:
 /* 8058FC 8024507C 8E900000 */  lw        $s0, ($s4)
@@ -37,8 +37,8 @@ glabel func_80245028_8058A8
 /* 805924 802450A4 26B50001 */   addiu    $s5, $s5, 1
 /* 805928 802450A8 0200202D */  daddu     $a0, $s0, $zero
 /* 80592C 802450AC 00101100 */  sll       $v0, $s0, 4
-/* 805930 802450B0 3C068009 */  lui       $a2, 0x8009
-/* 805934 802450B4 24C6EF20 */  addiu     $a2, $a2, -0x10e0
+/* 805930 802450B0 3C068009 */  lui       $a2, %hi(D_8008EF20)
+/* 805934 802450B4 24C6EF20 */  addiu     $a2, $a2, %lo(D_8008EF20)
 /* 805938 802450B8 00469021 */  addu      $s2, $v0, $a2
 /* 80593C 802450BC 0C0913D7 */  jal       func_80244F5C_8057DC
 /* 805940 802450C0 AFA50010 */   sw       $a1, 0x10($sp)
@@ -47,8 +47,8 @@ glabel func_80245028_8058A8
 /* 80594C 802450CC 50600019 */  beql      $v1, $zero, .L80245134
 /* 805950 802450D0 26B50001 */   addiu    $s5, $s5, 1
 /* 805954 802450D4 00102080 */  sll       $a0, $s0, 2
-/* 805958 802450D8 3C06800F */  lui       $a2, 0x800f
-/* 80595C 802450DC 24C67F00 */  addiu     $a2, $a2, 0x7f00
+/* 805958 802450D8 3C06800F */  lui       $a2, %hi(D_800F7F00)
+/* 80595C 802450DC 24C67F00 */  addiu     $a2, $a2, %lo(D_800F7F00)
 /* 805960 802450E0 00861021 */  addu      $v0, $a0, $a2
 /* 805964 802450E4 8C420000 */  lw        $v0, ($v0)
 /* 805968 802450E8 AE300108 */  sw        $s0, 0x108($s1)
@@ -61,8 +61,8 @@ glabel func_80245028_8058A8
 /* 805984 80245104 82620015 */  lb        $v0, 0x15($s3)
 /* 805988 80245108 14650007 */  bne       $v1, $a1, .L80245128
 /* 80598C 8024510C AE220210 */   sw       $v0, 0x210($s1)
-/* 805990 80245110 3C06800F */  lui       $a2, 0x800f
-/* 805994 80245114 24C67F40 */  addiu     $a2, $a2, 0x7f40
+/* 805990 80245110 3C06800F */  lui       $a2, %hi(D_800F7F40)
+/* 805994 80245114 24C67F40 */  addiu     $a2, $a2, %lo(D_800F7F40)
 /* 805998 80245118 00861021 */  addu      $v0, $a0, $a2
 /* 80599C 8024511C AE20018C */  sw        $zero, 0x18c($s1)
 /* 8059A0 80245120 8C420000 */  lw        $v0, ($v0)
@@ -76,8 +76,8 @@ glabel func_80245028_8058A8
 /* 8059B8 80245138 1440FFD0 */  bnez      $v0, .L8024507C
 /* 8059BC 8024513C 26940004 */   addiu    $s4, $s4, 4
 /* 8059C0 80245140 03C0202D */  daddu     $a0, $fp, $zero
-/* 8059C4 80245144 3C038026 */  lui       $v1, 0x8026
-/* 8059C8 80245148 8C632F68 */  lw        $v1, 0x2f68($v1)
+/* 8059C4 80245144 3C038026 */  lui       $v1, %hi(D_80262F68)
+/* 8059C8 80245148 8C632F68 */  lw        $v1, %lo(D_80262F68)($v1)
 /* 8059CC 8024514C 2402000D */  addiu     $v0, $zero, 0xd
 /* 8059D0 80245150 AFC20318 */  sw        $v0, 0x318($fp)
 /* 8059D4 80245154 AFD60324 */  sw        $s6, 0x324($fp)
@@ -119,8 +119,8 @@ glabel func_80245028_8058A8
 /* 805A54 802451D4 8C500108 */  lw        $s0, 0x108($v0)
 /* 805A58 802451D8 24020002 */  addiu     $v0, $zero, 2
 /* 805A5C 802451DC 2463FFFF */  addiu     $v1, $v1, -1
-/* 805A60 802451E0 3C018026 */  lui       $at, 0x8026
-/* 805A64 802451E4 AC232F68 */  sw        $v1, 0x2f68($at)
+/* 805A60 802451E0 3C018026 */  lui       $at, %hi(D_80262F68)
+/* 805A64 802451E4 AC232F68 */  sw        $v1, %lo(D_80262F68)($at)
 /* 805A68 802451E8 0809147F */  j         .L802451FC
 /* 805A6C 802451EC AEF00088 */   sw       $s0, 0x88($s7)
 .L802451F0:
diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024522C_805AAC.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024522C_805AAC.s
index 26075f11b5..d53e2af3bf 100644
--- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024522C_805AAC.s
+++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024522C_805AAC.s
@@ -15,8 +15,8 @@ glabel func_8024522C_805AAC
 /* 805AD4 80245254 AFB1001C */  sw        $s1, 0x1c($sp)
 /* 805AD8 80245258 AFB00018 */  sw        $s0, 0x18($sp)
 /* 805ADC 8024525C 8EA700AC */  lw        $a3, 0xac($s5)
-/* 805AE0 80245260 3C168026 */  lui       $s6, 0x8026
-/* 805AE4 80245264 26D62C38 */  addiu     $s6, $s6, 0x2c38
+/* 805AE0 80245260 3C168026 */  lui       $s6, %hi(D_80262C38)
+/* 805AE4 80245264 26D62C38 */  addiu     $s6, $s6, %lo(D_80262C38)
 /* 805AE8 80245268 10A0003D */  beqz      $a1, .L80245360
 /* 805AEC 8024526C AFA70010 */   sw       $a3, 0x10($sp)
 /* 805AF0 80245270 0000A02D */  daddu     $s4, $zero, $zero
@@ -25,8 +25,8 @@ glabel func_8024522C_805AAC
 /* 805AFC 8024527C 37DE5C19 */  ori       $fp, $fp, 0x5c19
 /* 805B00 80245280 3C17F840 */  lui       $s7, 0xf840
 /* 805B04 80245284 36F75C2C */  ori       $s7, $s7, 0x5c2c
-/* 805B08 80245288 3C128025 */  lui       $s2, 0x8025
-/* 805B0C 8024528C 26526ADC */  addiu     $s2, $s2, 0x6adc
+/* 805B08 80245288 3C128025 */  lui       $s2, %hi(D_80256ADC)
+/* 805B0C 8024528C 26526ADC */  addiu     $s2, $s2, %lo(D_80256ADC)
 /* 805B10 80245290 02C0882D */  daddu     $s1, $s6, $zero
 .L80245294:
 /* 805B14 80245294 0000202D */  daddu     $a0, $zero, $zero
@@ -44,8 +44,8 @@ glabel func_8024522C_805AAC
 /* 805B44 802452C4 26730001 */   addiu    $s3, $s3, 1
 /* 805B48 802452C8 3C028009 */  lui       $v0, %hi(gItemTable+0xA84)
 /* 805B4C 802452CC 84428364 */  lh        $v0, %lo(gItemTable+0xA84)($v0)
-/* 805B50 802452D0 3C078009 */  lui       $a3, 0x8009
-/* 805B54 802452D4 24E7A680 */  addiu     $a3, $a3, -0x5980
+/* 805B50 802452D0 3C078009 */  lui       $a3, %hi(D_8008A680)
+/* 805B54 802452D4 24E7A680 */  addiu     $a3, $a3, %lo(D_8008A680)
 /* 805B58 802452D8 AE330108 */  sw        $s3, 0x108($s1)
 /* 805B5C 802452DC 8E430008 */  lw        $v1, 8($s2)
 /* 805B60 802452E0 000210C0 */  sll       $v0, $v0, 3
@@ -121,9 +121,9 @@ glabel func_8024522C_805AAC
 /* 805C58 802453D8 00451021 */  addu      $v0, $v0, $a1
 /* 805C5C 802453DC 00021080 */  sll       $v0, $v0, 2
 /* 805C60 802453E0 AEA50088 */  sw        $a1, 0x88($s5)
-/* 805C64 802453E4 3C018025 */  lui       $at, 0x8025
+/* 805C64 802453E4 3C018025 */  lui       $at, %hi(D_80256AEC)
 /* 805C68 802453E8 00220821 */  addu      $at, $at, $v0
-/* 805C6C 802453EC 8C226AEC */  lw        $v0, 0x6aec($at)
+/* 805C6C 802453EC 8C226AEC */  lw        $v0, %lo(D_80256AEC)($at)
 /* 805C70 802453F0 00A32821 */  addu      $a1, $a1, $v1
 /* 805C74 802453F4 0C0B2026 */  jal       set_variable
 /* 805C78 802453F8 AEA20084 */   sw       $v0, 0x84($s5)
diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80245488_805D08.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80245488_805D08.s
index a41a822f7c..86c45bea3c 100644
--- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80245488_805D08.s
+++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80245488_805D08.s
@@ -8,8 +8,8 @@ glabel func_80245488_805D08
 /* 805D14 80245494 0C0B1EAF */  jal       get_variable
 /* 805D18 80245498 8C450000 */   lw       $a1, ($v0)
 /* 805D1C 8024549C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 805D20 802454A0 3C018026 */  lui       $at, 0x8026
-/* 805D24 802454A4 AC228404 */  sw        $v0, -0x7bfc($at)
+/* 805D20 802454A0 3C018026 */  lui       $at, %hi(D_80258404)
+/* 805D24 802454A4 AC228404 */  sw        $v0, %lo(D_80258404)($at)
 /* 805D28 802454A8 24020002 */  addiu     $v0, $zero, 2
 /* 805D2C 802454AC 03E00008 */  jr        $ra
 /* 805D30 802454B0 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802454B4_805D34.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802454B4_805D34.s
index a3fbea0ffd..8159364cee 100644
--- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802454B4_805D34.s
+++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802454B4_805D34.s
@@ -5,8 +5,8 @@ glabel func_802454B4_805D34
 /* 805D34 802454B4 3C06FCFF */  lui       $a2, 0xfcff
 /* 805D38 802454B8 34C6C7FF */  ori       $a2, $a2, 0xc7ff
 /* 805D3C 802454BC 3C05FF8F */  lui       $a1, 0xff8f
-/* 805D40 802454C0 3C04800A */  lui       $a0, 0x800a
-/* 805D44 802454C4 2484A66C */  addiu     $a0, $a0, -0x5994
+/* 805D40 802454C0 3C04800A */  lui       $a0, %hi(D_8009A66C)
+/* 805D44 802454C4 2484A66C */  addiu     $a0, $a0, %lo(D_8009A66C)
 /* 805D48 802454C8 8C820000 */  lw        $v0, ($a0)
 /* 805D4C 802454CC 34A57FBF */  ori       $a1, $a1, 0x7fbf
 /* 805D50 802454D0 0040182D */  daddu     $v1, $v0, $zero
@@ -16,8 +16,8 @@ glabel func_802454B4_805D34
 /* 805D60 802454E0 AC650004 */  sw        $a1, 4($v1)
 /* 805D64 802454E4 24430008 */  addiu     $v1, $v0, 8
 /* 805D68 802454E8 AC830000 */  sw        $v1, ($a0)
-/* 805D6C 802454EC 3C048026 */  lui       $a0, 0x8026
-/* 805D70 802454F0 90848407 */  lbu       $a0, -0x7bf9($a0)
+/* 805D6C 802454EC 3C048026 */  lui       $a0, %hi(D_80258407)
+/* 805D70 802454F0 90848407 */  lbu       $a0, %lo(D_80258407)($a0)
 /* 805D74 802454F4 3C03FA00 */  lui       $v1, 0xfa00
 /* 805D78 802454F8 AC430000 */  sw        $v1, ($v0)
 /* 805D7C 802454FC 03E00008 */  jr        $ra
diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/pause_tabs_draw_stats_805418.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/pause_tabs_draw_stats_805418.s
index 79e7ff693f..b9cad9f73b 100644
--- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/pause_tabs_draw_stats_805418.s
+++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/pause_tabs_draw_stats_805418.s
@@ -71,8 +71,8 @@ glabel pause_tabs_draw_stats_805418
 /* 8054FC 80244C7C 1440FFDB */  bnez      $v0, .L80244BEC
 /* 805500 80244C80 24A50010 */   addiu    $a1, $a1, 0x10
 .L80244C84:
-/* 805504 80244C84 3C03800A */  lui       $v1, 0x800a
-/* 805508 80244C88 2463A66C */  addiu     $v1, $v1, -0x5994
+/* 805504 80244C84 3C03800A */  lui       $v1, %hi(D_8009A66C)
+/* 805508 80244C88 2463A66C */  addiu     $v1, $v1, %lo(D_8009A66C)
 /* 80550C 80244C8C 8C620000 */  lw        $v0, ($v1)
 /* 805510 80244C90 0000202D */  daddu     $a0, $zero, $zero
 /* 805514 80244C94 0040802D */  daddu     $s0, $v0, $zero
diff --git a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245550_805DD0.s b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245550_805DD0.s
index 5883d09ab0..a7e2297723 100644
--- a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245550_805DD0.s
+++ b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245550_805DD0.s
@@ -69,8 +69,8 @@ glabel func_80245550_805DD0
 /* 805EC4 80245644 0809159B */  j         .L8024566C
 /* 805EC8 80245648 E6800018 */   swc1     $f0, 0x18($s4)
 .L8024564C:
-/* 805ECC 8024564C 3C018026 */  lui       $at, 0x8026
-/* 805ED0 80245650 D4222890 */  ldc1      $f2, 0x2890($at)
+/* 805ECC 8024564C 3C018026 */  lui       $at, %hi(D_80262890)
+/* 805ED0 80245650 D4222890 */  ldc1      $f2, %lo(D_80262890)($at)
 /* 805ED4 80245654 44820000 */  mtc1      $v0, $f0
 /* 805ED8 80245658 00000000 */  nop       
 /* 805EDC 8024565C 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245BCC_80644C.s b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245BCC_80644C.s
index 73542040cc..20afdfa69e 100644
--- a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245BCC_80644C.s
+++ b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245BCC_80644C.s
@@ -33,8 +33,8 @@ glabel func_80245BCC_80644C
 /* 8064B8 80245C38 08091718 */  j         .L80245C60
 /* 8064BC 80245C3C E4A00018 */   swc1     $f0, 0x18($a1)
 .L80245C40:
-/* 8064C0 80245C40 3C018026 */  lui       $at, 0x8026
-/* 8064C4 80245C44 D4222898 */  ldc1      $f2, 0x2898($at)
+/* 8064C0 80245C40 3C018026 */  lui       $at, %hi(D_80262898)
+/* 8064C4 80245C44 D4222898 */  ldc1      $f2, %lo(D_80262898)($at)
 /* 8064C8 80245C48 44820000 */  mtc1      $v0, $f0
 /* 8064CC 80245C4C 00000000 */  nop       
 /* 8064D0 80245C50 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802460E4_806964.s b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802460E4_806964.s
index 907bf895e9..dbaa7ceb29 100644
--- a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802460E4_806964.s
+++ b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802460E4_806964.s
@@ -124,9 +124,9 @@ glabel func_802460E4_806964
 /* 806B28 802462A8 2C620064 */  sltiu     $v0, $v1, 0x64
 /* 806B2C 802462AC 10400042 */  beqz      $v0, .L802463B8
 /* 806B30 802462B0 00031080 */   sll      $v0, $v1, 2
-/* 806B34 802462B4 3C018026 */  lui       $at, 0x8026
+/* 806B34 802462B4 3C018026 */  lui       $at, %hi(D_802628A0)
 /* 806B38 802462B8 00220821 */  addu      $at, $at, $v0
-/* 806B3C 802462BC 8C2228A0 */  lw        $v0, 0x28a0($at)
+/* 806B3C 802462BC 8C2228A0 */  lw        $v0, %lo(D_802628A0)($at)
 /* 806B40 802462C0 00400008 */  jr        $v0
 /* 806B44 802462C4 00000000 */   nop      
 /* 806B48 802462C8 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240930_823BF0.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240930_823BF0.s
index 8fb7422c7d..fd576b385b 100644
--- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240930_823BF0.s
+++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240930_823BF0.s
@@ -69,8 +69,8 @@ glabel func_80240930_823BF0
 /* 823CE4 80240A24 08090293 */  j         .L80240A4C
 /* 823CE8 80240A28 E6800018 */   swc1     $f0, 0x18($s4)
 .L80240A2C:
-/* 823CEC 80240A2C 3C018025 */  lui       $at, 0x8025
-/* 823CF0 80240A30 D422E200 */  ldc1      $f2, -0x1e00($at)
+/* 823CEC 80240A2C 3C018025 */  lui       $at, %hi(D_8024E200)
+/* 823CF0 80240A30 D422E200 */  ldc1      $f2, %lo(D_8024E200)($at)
 /* 823CF4 80240A34 44820000 */  mtc1      $v0, $f0
 /* 823CF8 80240A38 00000000 */  nop       
 /* 823CFC 80240A3C 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240FAC_82426C.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240FAC_82426C.s
index 2381b96110..6b09622bf6 100644
--- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240FAC_82426C.s
+++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240FAC_82426C.s
@@ -33,8 +33,8 @@ glabel func_80240FAC_82426C
 /* 8242D8 80241018 08090410 */  j         .L80241040
 /* 8242DC 8024101C E4A00018 */   swc1     $f0, 0x18($a1)
 .L80241020:
-/* 8242E0 80241020 3C018025 */  lui       $at, 0x8025
-/* 8242E4 80241024 D422E208 */  ldc1      $f2, -0x1df8($at)
+/* 8242E0 80241020 3C018025 */  lui       $at, %hi(D_8024E208)
+/* 8242E4 80241024 D422E208 */  ldc1      $f2, %lo(D_8024E208)($at)
 /* 8242E8 80241028 44820000 */  mtc1      $v0, $f0
 /* 8242EC 8024102C 00000000 */  nop       
 /* 8242F0 80241030 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802414C4_824784.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802414C4_824784.s
index 040b3e162f..5012b95183 100644
--- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802414C4_824784.s
+++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802414C4_824784.s
@@ -124,9 +124,9 @@ glabel func_802414C4_824784
 /* 824948 80241688 2C620064 */  sltiu     $v0, $v1, 0x64
 /* 82494C 8024168C 10400042 */  beqz      $v0, .L80241798
 /* 824950 80241690 00031080 */   sll      $v0, $v1, 2
-/* 824954 80241694 3C018025 */  lui       $at, 0x8025
+/* 824954 80241694 3C018025 */  lui       $at, %hi(D_8024E210)
 /* 824958 80241698 00220821 */  addu      $at, $at, $v0
-/* 82495C 8024169C 8C22E210 */  lw        $v0, -0x1df0($at)
+/* 82495C 8024169C 8C22E210 */  lw        $v0, %lo(D_8024E210)($at)
 /* 824960 802416A0 00400008 */  jr        $v0
 /* 824964 802416A4 00000000 */   nop      
 /* 824968 802416A8 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802417C0_824A80.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802417C0_824A80.s
index 029723422e..1a2bdefb06 100644
--- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802417C0_824A80.s
+++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802417C0_824A80.s
@@ -4,8 +4,8 @@
 glabel func_802417C0_824A80
 /* 824A80 802417C0 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* 824A84 802417C4 AFB00010 */  sw        $s0, 0x10($sp)
-/* 824A88 802417C8 3C108024 */  lui       $s0, 0x8024
-/* 824A8C 802417CC 26106150 */  addiu     $s0, $s0, 0x6150
+/* 824A88 802417C8 3C108024 */  lui       $s0, %hi(D_80246150)
+/* 824A8C 802417CC 26106150 */  addiu     $s0, $s0, %lo(D_80246150)
 /* 824A90 802417D0 AFBF0018 */  sw        $ra, 0x18($sp)
 /* 824A94 802417D4 AFB10014 */  sw        $s1, 0x14($sp)
 /* 824A98 802417D8 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_802417C0_824A80
 /* 824AFC 8024183C 28620010 */  slti      $v0, $v1, 0x10
 /* 824B00 80241840 1440FFFA */  bnez      $v0, .L8024182C
 /* 824B04 80241844 24840004 */   addiu    $a0, $a0, 4
-/* 824B08 80241848 3C108024 */  lui       $s0, 0x8024
-/* 824B0C 8024184C 26106150 */  addiu     $s0, $s0, 0x6150
+/* 824B08 80241848 3C108024 */  lui       $s0, %hi(D_80246150)
+/* 824B0C 8024184C 26106150 */  addiu     $s0, $s0, %lo(D_80246150)
 /* 824B10 80241850 0C00AB4B */  jal       heap_free
 /* 824B14 80241854 8E040000 */   lw       $a0, ($s0)
 /* 824B18 80241858 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802418FC_824BBC.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802418FC_824BBC.s
index 0559311263..056712cefd 100644
--- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802418FC_824BBC.s
+++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802418FC_824BBC.s
@@ -90,8 +90,8 @@ glabel func_802418FC_824BBC
 /* 824D08 80241A48 0040802D */   daddu    $s0, $v0, $zero
 /* 824D0C 80241A4C 0040282D */  daddu     $a1, $v0, $zero
 /* 824D10 80241A50 0000182D */  daddu     $v1, $zero, $zero
-/* 824D14 80241A54 3C068024 */  lui       $a2, 0x8024
-/* 824D18 80241A58 24C661F4 */  addiu     $a2, $a2, 0x61f4
+/* 824D14 80241A54 3C068024 */  lui       $a2, %hi(D_802461F4)
+/* 824D18 80241A58 24C661F4 */  addiu     $a2, $a2, %lo(D_802461F4)
 /* 824D1C 80241A5C 00C0202D */  daddu     $a0, $a2, $zero
 .L80241A60:
 /* 824D20 80241A60 8C820000 */  lw        $v0, ($a0)
diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241B20_824DE0.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241B20_824DE0.s
index 5028313d7d..f3a127311c 100644
--- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241B20_824DE0.s
+++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241B20_824DE0.s
@@ -9,8 +9,8 @@ glabel func_80241B20_824DE0
 /* 824DF0 80241B30 8C84014C */   lw       $a0, 0x14c($a0)
 /* 824DF4 80241B34 24040008 */  addiu     $a0, $zero, 8
 /* 824DF8 80241B38 0040802D */  daddu     $s0, $v0, $zero
-/* 824DFC 80241B3C 3C028024 */  lui       $v0, 0x8024
-/* 824E00 80241B40 24421B8C */  addiu     $v0, $v0, 0x1b8c
+/* 824DFC 80241B3C 3C028024 */  lui       $v0, %hi(D_80241B8C)
+/* 824E00 80241B40 24421B8C */  addiu     $v0, $v0, %lo(D_80241B8C)
 /* 824E04 80241B44 0C00AB39 */  jal       heap_malloc
 /* 824E08 80241B48 AE020008 */   sw       $v0, 8($s0)
 /* 824E0C 80241B4C 0040182D */  daddu     $v1, $v0, $zero
diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241B8C_824E4C.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241B8C_824E4C.s
index a87214c000..ec1daa568c 100644
--- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241B8C_824E4C.s
+++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241B8C_824E4C.s
@@ -3,8 +3,8 @@
 
 glabel func_80241B8C_824E4C
 /* 824E4C 80241B8C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 824E50 80241B90 3C03800A */  lui       $v1, 0x800a
-/* 824E54 80241B94 8463A634 */  lh        $v1, -0x59cc($v1)
+/* 824E50 80241B90 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* 824E54 80241B94 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* 824E58 80241B98 3C05800B */  lui       $a1, %hi(gCameras)
 /* 824E5C 80241B9C 24A51D80 */  addiu     $a1, $a1, %lo(gCameras)
 /* 824E60 80241BA0 AFBF0010 */  sw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241BEC_824EAC.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241BEC_824EAC.s
index ac182dd815..a5b69fa012 100644
--- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241BEC_824EAC.s
+++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241BEC_824EAC.s
@@ -21,8 +21,8 @@ glabel func_80241BEC_824EAC
 /* 824EEC 80241C2C 2414FFFC */  addiu     $s4, $zero, -4
 /* 824EF0 80241C30 2413000C */  addiu     $s3, $zero, 0xc
 /* 824EF4 80241C34 3C120080 */  lui       $s2, 0x80
-/* 824EF8 80241C38 3C038015 */  lui       $v1, 0x8015
-/* 824EFC 80241C3C 8C6312F0 */  lw        $v1, 0x12f0($v1)
+/* 824EF8 80241C38 3C038015 */  lui       $v1, %hi(D_801512F0)
+/* 824EFC 80241C3C 8C6312F0 */  lw        $v1, %lo(D_801512F0)($v1)
 /* 824F00 80241C40 24020001 */  addiu     $v0, $zero, 1
 /* 824F04 80241C44 0C046F97 */  jal       set_background_color_blend
 /* 824F08 80241C48 A0620000 */   sb       $v0, ($v1)
diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241D38_824FF8.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241D38_824FF8.s
index 5003597b26..c16b674460 100644
--- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241D38_824FF8.s
+++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241D38_824FF8.s
@@ -49,8 +49,8 @@ glabel func_80241D38_824FF8
 /* 82509C 80241DDC 2413FFFC */  addiu     $s3, $zero, -4
 /* 8250A0 80241DE0 2412000C */  addiu     $s2, $zero, 0xc
 /* 8250A4 80241DE4 3C11FF7F */  lui       $s1, 0xff7f
-/* 8250A8 80241DE8 3C028015 */  lui       $v0, 0x8015
-/* 8250AC 80241DEC 8C4212F0 */  lw        $v0, 0x12f0($v0)
+/* 8250A8 80241DE8 3C028015 */  lui       $v0, %hi(D_801512F0)
+/* 8250AC 80241DEC 8C4212F0 */  lw        $v0, %lo(D_801512F0)($v0)
 /* 8250B0 80241DF0 3631FFFF */  ori       $s1, $s1, 0xffff
 /* 8250B4 80241DF4 A0400000 */  sb        $zero, ($v0)
 .L80241DF8:
diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241EAC_82516C.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241EAC_82516C.s
index 389e7f1e73..93db9c9090 100644
--- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241EAC_82516C.s
+++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241EAC_82516C.s
@@ -19,9 +19,9 @@ glabel func_80241EAC_82516C
 /* 8251A0 80241EE0 34A502E0 */  ori       $a1, $a1, 0x2e0
 /* 8251A4 80241EE4 0C0B1EAF */  jal       get_variable
 /* 8251A8 80241EE8 0000202D */   daddu    $a0, $zero, $zero
-/* 8251AC 80241EEC 3C038024 */  lui       $v1, 0x8024
+/* 8251AC 80241EEC 3C038024 */  lui       $v1, %hi(D_802461B4)
 /* 8251B0 80241EF0 00621821 */  addu      $v1, $v1, $v0
-/* 8251B4 80241EF4 906361B4 */  lbu       $v1, 0x61b4($v1)
+/* 8251B4 80241EF4 906361B4 */  lbu       $v1, %lo(D_802461B4)($v1)
 /* 8251B8 80241EF8 8E220084 */  lw        $v0, 0x84($s1)
 /* 8251BC 80241EFC 54430006 */  bnel      $v0, $v1, .L80241F18
 /* 8251C0 80241F00 AE200084 */   sw       $zero, 0x84($s1)
diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241F30_8251F0.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241F30_8251F0.s
index 57cbaf3fa1..29cc99a902 100644
--- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241F30_8251F0.s
+++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241F30_8251F0.s
@@ -38,8 +38,8 @@ glabel func_80241F30_8251F0
 /* 825274 80241FB4 0220202D */  daddu     $a0, $s1, $zero
 /* 825278 80241FB8 3C05F4AC */  lui       $a1, 0xf4ac
 /* 82527C 80241FBC 34A5D481 */  ori       $a1, $a1, 0xd481
-/* 825280 80241FC0 3C108025 */  lui       $s0, 0x8025
-/* 825284 80241FC4 2610E560 */  addiu     $s0, $s0, -0x1aa0
+/* 825280 80241FC0 3C108025 */  lui       $s0, %hi(D_8024E560)
+/* 825284 80241FC4 2610E560 */  addiu     $s0, $s0, %lo(D_8024E560)
 /* 825288 80241FC8 0C0B1EAF */  jal       get_variable
 /* 82528C 80241FCC AE020000 */   sw       $v0, ($s0)
 /* 825290 80241FD0 0220202D */  daddu     $a0, $s1, $zero
@@ -66,8 +66,8 @@ glabel func_80241F30_8251F0
 /* 8252E4 80242024 0000202D */   daddu    $a0, $zero, $zero
 /* 8252E8 80242028 0220202D */  daddu     $a0, $s1, $zero
 /* 8252EC 8024202C 3C05F4AC */  lui       $a1, 0xf4ac
-/* 8252F0 80242030 3C018025 */  lui       $at, 0x8025
-/* 8252F4 80242034 AC22E564 */  sw        $v0, -0x1a9c($at)
+/* 8252F0 80242030 3C018025 */  lui       $at, %hi(D_8024E564)
+/* 8252F4 80242034 AC22E564 */  sw        $v0, %lo(D_8024E564)($at)
 /* 8252F8 80242038 0C0B1EAF */  jal       get_variable
 /* 8252FC 8024203C 34A5D481 */   ori      $a1, $a1, 0xd481
 /* 825300 80242040 0220202D */  daddu     $a0, $s1, $zero
@@ -98,16 +98,16 @@ glabel func_80241F30_8251F0
 /* 825364 802420A4 E7A00010 */   swc1     $f0, 0x10($sp)
 /* 825368 802420A8 8E030000 */  lw        $v1, ($s0)
 /* 82536C 802420AC 8C64000C */  lw        $a0, 0xc($v1)
-/* 825370 802420B0 3C018025 */  lui       $at, 0x8025
-/* 825374 802420B4 AC22E568 */  sw        $v0, -0x1a98($at)
+/* 825370 802420B0 3C018025 */  lui       $at, %hi(D_8024E568)
+/* 825374 802420B4 AC22E568 */  sw        $v0, %lo(D_8024E568)($at)
 /* 825378 802420B8 AC800018 */  sw        $zero, 0x18($a0)
 /* 82537C 802420BC AC800020 */  sw        $zero, 0x20($a0)
 /* 825380 802420C0 AC800024 */  sw        $zero, 0x24($a0)
 /* 825384 802420C4 AC800028 */  sw        $zero, 0x28($a0)
 /* 825388 802420C8 AC80001C */  sw        $zero, 0x1c($a0)
 .L802420CC:
-/* 82538C 802420CC 3C028025 */  lui       $v0, 0x8025
-/* 825390 802420D0 8C42E560 */  lw        $v0, -0x1aa0($v0)
+/* 82538C 802420CC 3C028025 */  lui       $v0, %hi(D_8024E560)
+/* 825390 802420D0 8C42E560 */  lw        $v0, %lo(D_8024E560)($v0)
 /* 825394 802420D4 8C44000C */  lw        $a0, 0xc($v0)
 /* 825398 802420D8 8C820020 */  lw        $v0, 0x20($a0)
 /* 82539C 802420DC 8C830028 */  lw        $v1, 0x28($a0)
diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242148_825408.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242148_825408.s
index a724899ea5..92acebe21b 100644
--- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242148_825408.s
+++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242148_825408.s
@@ -5,19 +5,19 @@ glabel func_80242148_825408
 /* 825408 80242148 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 82540C 8024214C 10A0000B */  beqz      $a1, .L8024217C
 /* 825410 80242150 AFBF0010 */   sw       $ra, 0x10($sp)
-/* 825414 80242154 3C038025 */  lui       $v1, 0x8025
-/* 825418 80242158 8C63E564 */  lw        $v1, -0x1a9c($v1)
+/* 825414 80242154 3C038025 */  lui       $v1, %hi(D_8024E564)
+/* 825418 80242158 8C63E564 */  lw        $v1, %lo(D_8024E564)($v1)
 /* 82541C 8024215C 8C620000 */  lw        $v0, ($v1)
-/* 825420 80242160 3C048025 */  lui       $a0, 0x8025
-/* 825424 80242164 8C84E568 */  lw        $a0, -0x1a98($a0)
+/* 825420 80242160 3C048025 */  lui       $a0, %hi(D_8024E568)
+/* 825424 80242164 8C84E568 */  lw        $a0, %lo(D_8024E568)($a0)
 /* 825428 80242168 34420010 */  ori       $v0, $v0, 0x10
 /* 82542C 8024216C AC620000 */  sw        $v0, ($v1)
 /* 825430 80242170 8C820000 */  lw        $v0, ($a0)
 /* 825434 80242174 34420010 */  ori       $v0, $v0, 0x10
 /* 825438 80242178 AC820000 */  sw        $v0, ($a0)
 .L8024217C:
-/* 82543C 8024217C 3C048025 */  lui       $a0, 0x8025
-/* 825440 80242180 8C84E560 */  lw        $a0, -0x1aa0($a0)
+/* 82543C 8024217C 3C048025 */  lui       $a0, %hi(D_8024E560)
+/* 825440 80242180 8C84E560 */  lw        $a0, %lo(D_8024E560)($a0)
 /* 825444 80242184 8C85000C */  lw        $a1, 0xc($a0)
 /* 825448 80242188 8CA20018 */  lw        $v0, 0x18($a1)
 /* 82544C 8024218C 8CA30020 */  lw        $v1, 0x20($a1)
@@ -41,8 +41,8 @@ glabel func_80242148_825408
 .L802421D4:
 /* 825494 802421D4 0C016914 */  jal       remove_effect
 /* 825498 802421D8 ACA00018 */   sw       $zero, 0x18($a1)
-/* 82549C 802421DC 3C048025 */  lui       $a0, 0x8025
-/* 8254A0 802421E0 8C84E540 */  lw        $a0, -0x1ac0($a0)
+/* 82549C 802421DC 3C048025 */  lui       $a0, %hi(D_8024E540)
+/* 8254A0 802421E0 8C84E540 */  lw        $a0, %lo(D_8024E540)($a0)
 /* 8254A4 802421E4 0C048D70 */  jal       func_801235C0
 /* 8254A8 802421E8 00000000 */   nop      
 /* 8254AC 802421EC 24020002 */  addiu     $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802421FC_8254BC.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802421FC_8254BC.s
index 9260befec9..53754c5543 100644
--- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802421FC_8254BC.s
+++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802421FC_8254BC.s
@@ -7,8 +7,8 @@ glabel func_802421FC_8254BC
 /* 8254C4 80242204 8C82000C */  lw        $v0, 0xc($a0)
 /* 8254C8 80242208 0C0B1EAF */  jal       get_variable
 /* 8254CC 8024220C 8C450000 */   lw       $a1, ($v0)
-/* 8254D0 80242210 3C038025 */  lui       $v1, 0x8025
-/* 8254D4 80242214 8C63E560 */  lw        $v1, -0x1aa0($v1)
+/* 8254D0 80242210 3C038025 */  lui       $v1, %hi(D_8024E560)
+/* 8254D4 80242214 8C63E560 */  lw        $v1, %lo(D_8024E560)($v1)
 /* 8254D8 80242218 8C63000C */  lw        $v1, 0xc($v1)
 /* 8254DC 8024221C AC620034 */  sw        $v0, 0x34($v1)
 /* 8254E0 80242220 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242230_8254F0.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242230_8254F0.s
index 90f2340738..5f8a00bf86 100644
--- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242230_8254F0.s
+++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242230_8254F0.s
@@ -8,8 +8,8 @@ glabel func_80242230_8254F0
 /* 8254FC 8024223C 0C0B1EAF */  jal       get_variable
 /* 825500 80242240 8C450000 */   lw       $a1, ($v0)
 /* 825504 80242244 0040202D */  daddu     $a0, $v0, $zero
-/* 825508 80242248 3C028025 */  lui       $v0, 0x8025
-/* 82550C 8024224C 8C42E560 */  lw        $v0, -0x1aa0($v0)
+/* 825508 80242248 3C028025 */  lui       $v0, %hi(D_8024E560)
+/* 82550C 8024224C 8C42E560 */  lw        $v0, %lo(D_8024E560)($v0)
 /* 825510 80242250 24030001 */  addiu     $v1, $zero, 1
 /* 825514 80242254 8C45000C */  lw        $a1, 0xc($v0)
 /* 825518 80242258 1083000D */  beq       $a0, $v1, .L80242290
diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802422B0_825570.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802422B0_825570.s
index 5c07911687..d28b0012f7 100644
--- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802422B0_825570.s
+++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802422B0_825570.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_802422B0_825570
-/* 825570 802422B0 3C028025 */  lui       $v0, 0x8025
-/* 825574 802422B4 8C42E568 */  lw        $v0, -0x1a98($v0)
+/* 825570 802422B0 3C028025 */  lui       $v0, %hi(D_8024E568)
+/* 825574 802422B4 8C42E568 */  lw        $v0, %lo(D_8024E568)($v0)
 /* 825578 802422B8 8C42000C */  lw        $v0, 0xc($v0)
 /* 82557C 802422BC AC40001C */  sw        $zero, 0x1c($v0)
 /* 825580 802422C0 03E00008 */  jr        $ra
diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802422C8_825588.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802422C8_825588.s
index 18fff2d562..f02a05d57e 100644
--- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802422C8_825588.s
+++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802422C8_825588.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_802422C8_825588
-/* 825588 802422C8 3C028025 */  lui       $v0, 0x8025
-/* 82558C 802422CC 8C42E568 */  lw        $v0, -0x1a98($v0)
+/* 825588 802422C8 3C028025 */  lui       $v0, %hi(D_8024E568)
+/* 82558C 802422CC 8C42E568 */  lw        $v0, %lo(D_8024E568)($v0)
 /* 825590 802422D0 8C43000C */  lw        $v1, 0xc($v0)
 /* 825594 802422D4 24020001 */  addiu     $v0, $zero, 1
 /* 825598 802422D8 AC62001C */  sw        $v0, 0x1c($v1)
diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802422E4_8255A4.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802422E4_8255A4.s
index 73ef327240..e622e38af2 100644
--- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802422E4_8255A4.s
+++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802422E4_8255A4.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_802422E4_8255A4
-/* 8255A4 802422E4 3C028025 */  lui       $v0, 0x8025
-/* 8255A8 802422E8 8C42E568 */  lw        $v0, -0x1a98($v0)
+/* 8255A4 802422E4 3C028025 */  lui       $v0, %hi(D_8024E568)
+/* 8255A8 802422E8 8C42E568 */  lw        $v0, %lo(D_8024E568)($v0)
 /* 8255AC 802422EC 8C43000C */  lw        $v1, 0xc($v0)
 /* 8255B0 802422F0 24020002 */  addiu     $v0, $zero, 2
 /* 8255B4 802422F4 03E00008 */  jr        $ra
diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802427B8_825A78.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802427B8_825A78.s
index 496881ed55..92fde1b38b 100644
--- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802427B8_825A78.s
+++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802427B8_825A78.s
@@ -3,8 +3,8 @@
 
 glabel func_802427B8_825A78
 /* 825A78 802427B8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 825A7C 802427BC 3C058025 */  lui       $a1, 0x8025
-/* 825A80 802427C0 8CA5E558 */  lw        $a1, -0x1aa8($a1)
+/* 825A7C 802427BC 3C058025 */  lui       $a1, %hi(D_8024E558)
+/* 825A80 802427C0 8CA5E558 */  lw        $a1, %lo(D_8024E558)($a1)
 /* 825A84 802427C4 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 825A88 802427C8 0C0B1EAF */  jal       get_variable
 /* 825A8C 802427CC 0000202D */   daddu    $a0, $zero, $zero
diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242824_825AE4.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242824_825AE4.s
index b5859fa678..7b8134fc4a 100644
--- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242824_825AE4.s
+++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242824_825AE4.s
@@ -3,14 +3,14 @@
 
 glabel func_80242824_825AE4
 /* 825AE4 80242824 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 825AE8 80242828 3C058024 */  lui       $a1, 0x8024
-/* 825AEC 8024282C 24A527B8 */  addiu     $a1, $a1, 0x27b8
+/* 825AE8 80242828 3C058024 */  lui       $a1, %hi(D_802427B8)
+/* 825AEC 8024282C 24A527B8 */  addiu     $a1, $a1, %lo(D_802427B8)
 /* 825AF0 80242830 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 825AF4 80242834 0C048C8F */  jal       bind_dynamic_entity_7
 /* 825AF8 80242838 0000202D */   daddu    $a0, $zero, $zero
 /* 825AFC 8024283C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 825B00 80242840 3C018025 */  lui       $at, 0x8025
-/* 825B04 80242844 AC22E540 */  sw        $v0, -0x1ac0($at)
+/* 825B00 80242840 3C018025 */  lui       $at, %hi(D_8024E540)
+/* 825B04 80242844 AC22E540 */  sw        $v0, %lo(D_8024E540)($at)
 /* 825B08 80242848 24020002 */  addiu     $v0, $zero, 2
 /* 825B0C 8024284C 03E00008 */  jr        $ra
 /* 825B10 80242850 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242A80_825D40.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242A80_825D40.s
index ff64e21419..3ffaf8b560 100644
--- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242A80_825D40.s
+++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242A80_825D40.s
@@ -6,11 +6,11 @@ glabel func_80242A80_825D40
 /* 825D44 80242A84 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 825D48 80242A88 10A00003 */  beqz      $a1, .L80242A98
 /* 825D4C 80242A8C 8C86000C */   lw       $a2, 0xc($a0)
-/* 825D50 80242A90 3C018025 */  lui       $at, 0x8025
-/* 825D54 80242A94 AC208778 */  sw        $zero, -0x7888($at)
+/* 825D50 80242A90 3C018025 */  lui       $at, %hi(D_80248778)
+/* 825D54 80242A94 AC208778 */  sw        $zero, %lo(D_80248778)($at)
 .L80242A98:
-/* 825D58 80242A98 3C038025 */  lui       $v1, 0x8025
-/* 825D5C 80242A9C 24638778 */  addiu     $v1, $v1, -0x7888
+/* 825D58 80242A98 3C038025 */  lui       $v1, %hi(D_80248778)
+/* 825D5C 80242A9C 24638778 */  addiu     $v1, $v1, %lo(D_80248778)
 /* 825D60 80242AA0 8C620000 */  lw        $v0, ($v1)
 /* 825D64 80242AA4 54400003 */  bnel      $v0, $zero, .L80242AB4
 /* 825D68 80242AA8 AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_80242A80_825D40
 /* 825D70 80242AB0 0000102D */   daddu    $v0, $zero, $zero
 .L80242AB4:
 /* 825D74 80242AB4 8CC50000 */  lw        $a1, ($a2)
-/* 825D78 80242AB8 3C068025 */  lui       $a2, 0x8025
+/* 825D78 80242AB8 3C068025 */  lui       $a2, %hi(D_8024877C)
 /* 825D7C 80242ABC 0C0B2026 */  jal       set_variable
-/* 825D80 80242AC0 8CC6877C */   lw       $a2, -0x7884($a2)
+/* 825D80 80242AC0 8CC6877C */   lw       $a2, %lo(D_8024877C)($a2)
 /* 825D84 80242AC4 24020002 */  addiu     $v0, $zero, 2
 .L80242AC8:
 /* 825D88 80242AC8 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242AD4_825D94.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242AD4_825D94.s
index e815159a6a..448a089b70 100644
--- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242AD4_825D94.s
+++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242AD4_825D94.s
@@ -7,12 +7,12 @@ glabel func_80242AD4_825D94
 /* 825D9C 80242ADC 8C82000C */  lw        $v0, 0xc($a0)
 /* 825DA0 80242AE0 0C0B1EAF */  jal       get_variable
 /* 825DA4 80242AE4 8C450000 */   lw       $a1, ($v0)
-/* 825DA8 80242AE8 3C018025 */  lui       $at, 0x8025
-/* 825DAC 80242AEC AC22877C */  sw        $v0, -0x7884($at)
+/* 825DA8 80242AE8 3C018025 */  lui       $at, %hi(D_8024877C)
+/* 825DAC 80242AEC AC22877C */  sw        $v0, %lo(D_8024877C)($at)
 /* 825DB0 80242AF0 24020002 */  addiu     $v0, $zero, 2
 /* 825DB4 80242AF4 8FBF0010 */  lw        $ra, 0x10($sp)
 /* 825DB8 80242AF8 24030001 */  addiu     $v1, $zero, 1
-/* 825DBC 80242AFC 3C018025 */  lui       $at, 0x8025
-/* 825DC0 80242B00 AC238778 */  sw        $v1, -0x7888($at)
+/* 825DBC 80242AFC 3C018025 */  lui       $at, %hi(D_80248778)
+/* 825DC0 80242B00 AC238778 */  sw        $v1, %lo(D_80248778)($at)
 /* 825DC4 80242B04 03E00008 */  jr        $ra
 /* 825DC8 80242B08 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242B0C_825DCC.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242B0C_825DCC.s
index b97da38331..91100c0bc4 100644
--- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242B0C_825DCC.s
+++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242B0C_825DCC.s
@@ -13,8 +13,8 @@ glabel func_80242B0C_825DCC
 /* 825DEC 80242B2C 8C620000 */  lw        $v0, ($v1)
 /* 825DF0 80242B30 5040000A */  beql      $v0, $zero, .L80242B5C
 /* 825DF4 80242B34 00041080 */   sll      $v0, $a0, 2
-/* 825DF8 80242B38 3C058025 */  lui       $a1, 0x8025
-/* 825DFC 80242B3C 24A5E570 */  addiu     $a1, $a1, -0x1a90
+/* 825DF8 80242B38 3C058025 */  lui       $a1, %hi(D_8024E570)
+/* 825DFC 80242B3C 24A5E570 */  addiu     $a1, $a1, %lo(D_8024E570)
 .L80242B40:
 /* 825E00 80242B40 24630004 */  addiu     $v1, $v1, 4
 /* 825E04 80242B44 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_80242B0C_825DCC
 /* 825E14 80242B54 24A50004 */   addiu    $a1, $a1, 4
 /* 825E18 80242B58 00041080 */  sll       $v0, $a0, 2
 .L80242B5C:
-/* 825E1C 80242B5C 3C018025 */  lui       $at, 0x8025
+/* 825E1C 80242B5C 3C018025 */  lui       $at, %hi(D_8024E570)
 /* 825E20 80242B60 00220821 */  addu      $at, $at, $v0
-/* 825E24 80242B64 AC20E570 */  sw        $zero, -0x1a90($at)
+/* 825E24 80242B64 AC20E570 */  sw        $zero, %lo(D_8024E570)($at)
 /* 825E28 80242B68 08090AE6 */  j         .L80242B98
 /* 825E2C 80242B6C 00000000 */   nop      
 .L80242B70:
-/* 825E30 80242B70 3C038025 */  lui       $v1, 0x8025
-/* 825E34 80242B74 2463E570 */  addiu     $v1, $v1, -0x1a90
+/* 825E30 80242B70 3C038025 */  lui       $v1, %hi(D_8024E570)
+/* 825E34 80242B74 2463E570 */  addiu     $v1, $v1, %lo(D_8024E570)
 /* 825E38 80242B78 0060282D */  daddu     $a1, $v1, $zero
 .L80242B7C:
 /* 825E3C 80242B7C 24820010 */  addiu     $v0, $a0, 0x10
diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242BA8_825E68.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242BA8_825E68.s
index 2c55c7f12d..2ff960fcb4 100644
--- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242BA8_825E68.s
+++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242BA8_825E68.s
@@ -13,8 +13,8 @@ glabel func_80242BA8_825E68
 /* 825E88 80242BC8 8C620000 */  lw        $v0, ($v1)
 /* 825E8C 80242BCC 5040000A */  beql      $v0, $zero, .L80242BF8
 /* 825E90 80242BD0 00041080 */   sll      $v0, $a0, 2
-/* 825E94 80242BD4 3C058025 */  lui       $a1, 0x8025
-/* 825E98 80242BD8 24A5E738 */  addiu     $a1, $a1, -0x18c8
+/* 825E94 80242BD4 3C058025 */  lui       $a1, %hi(D_8024E738)
+/* 825E98 80242BD8 24A5E738 */  addiu     $a1, $a1, %lo(D_8024E738)
 .L80242BDC:
 /* 825E9C 80242BDC 24630004 */  addiu     $v1, $v1, 4
 /* 825EA0 80242BE0 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_80242BA8_825E68
 /* 825EB0 80242BF0 24A50004 */   addiu    $a1, $a1, 4
 /* 825EB4 80242BF4 00041080 */  sll       $v0, $a0, 2
 .L80242BF8:
-/* 825EB8 80242BF8 3C018025 */  lui       $at, 0x8025
+/* 825EB8 80242BF8 3C018025 */  lui       $at, %hi(D_8024E738)
 /* 825EBC 80242BFC 00220821 */  addu      $at, $at, $v0
-/* 825EC0 80242C00 AC20E738 */  sw        $zero, -0x18c8($at)
+/* 825EC0 80242C00 AC20E738 */  sw        $zero, %lo(D_8024E738)($at)
 /* 825EC4 80242C04 08090B0D */  j         .L80242C34
 /* 825EC8 80242C08 00000000 */   nop      
 .L80242C0C:
-/* 825ECC 80242C0C 3C038025 */  lui       $v1, 0x8025
-/* 825ED0 80242C10 2463E738 */  addiu     $v1, $v1, -0x18c8
+/* 825ECC 80242C0C 3C038025 */  lui       $v1, %hi(D_8024E738)
+/* 825ED0 80242C10 2463E738 */  addiu     $v1, $v1, %lo(D_8024E738)
 /* 825ED4 80242C14 0060282D */  daddu     $a1, $v1, $zero
 .L80242C18:
 /* 825ED8 80242C18 24820080 */  addiu     $v0, $a0, 0x80
diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242C44_825F04.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242C44_825F04.s
index a6368ab3b3..0501174988 100644
--- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242C44_825F04.s
+++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242C44_825F04.s
@@ -50,14 +50,14 @@ glabel func_80242C44_825F04
 /* 825FB4 80242CF4 00641823 */  subu      $v1, $v1, $a0
 /* 825FB8 80242CF8 00432023 */  subu      $a0, $v0, $v1
 /* 825FBC 80242CFC 00041080 */  sll       $v0, $a0, 2
-/* 825FC0 80242D00 3C068025 */  lui       $a2, 0x8025
+/* 825FC0 80242D00 3C068025 */  lui       $a2, %hi(D_8024909C)
 /* 825FC4 80242D04 00C23021 */  addu      $a2, $a2, $v0
-/* 825FC8 80242D08 8CC6909C */  lw        $a2, -0x6f64($a2)
+/* 825FC8 80242D08 8CC6909C */  lw        $a2, %lo(D_8024909C)($a2)
 /* 825FCC 80242D0C 08090B61 */  j         .L80242D84
 /* 825FD0 80242D10 0220202D */   daddu    $a0, $s1, $zero
 .L80242D14:
-/* 825FD4 80242D14 3C038025 */  lui       $v1, 0x8025
-/* 825FD8 80242D18 24638A98 */  addiu     $v1, $v1, -0x7568
+/* 825FD4 80242D14 3C038025 */  lui       $v1, %hi(D_80248A98)
+/* 825FD8 80242D18 24638A98 */  addiu     $v1, $v1, %lo(D_80248A98)
 .L80242D1C:
 /* 825FDC 80242D1C 8C620000 */  lw        $v0, ($v1)
 /* 825FE0 80242D20 10500006 */  beq       $v0, $s0, .L80242D3C
@@ -72,17 +72,17 @@ glabel func_80242C44_825F04
 /* 826000 80242D40 0000202D */   daddu    $a0, $zero, $zero
 /* 826004 80242D44 10A00005 */  beqz      $a1, .L80242D5C
 /* 826008 80242D48 00000000 */   nop      
-/* 82600C 80242D4C 3C018025 */  lui       $at, 0x8025
+/* 82600C 80242D4C 3C018025 */  lui       $at, %hi(D_80248CD0)
 /* 826010 80242D50 00240821 */  addu      $at, $at, $a0
 /* 826014 80242D54 08090B5A */  j         .L80242D68
-/* 826018 80242D58 80248CD0 */   lb       $a0, -0x7330($at)
+/* 826018 80242D58 80248CD0 */   lb       $a0, %lo(D_80248CD0)($at)
 .L80242D5C:
-/* 82601C 80242D5C 3C018025 */  lui       $at, 0x8025
+/* 82601C 80242D5C 3C018025 */  lui       $at, %hi(D_80248CB0)
 /* 826020 80242D60 00240821 */  addu      $at, $at, $a0
-/* 826024 80242D64 80248CB0 */  lb        $a0, -0x7350($at)
+/* 826024 80242D64 80248CB0 */  lb        $a0, %lo(D_80248CB0)($at)
 .L80242D68:
-/* 826028 80242D68 3C038025 */  lui       $v1, 0x8025
-/* 82602C 80242D6C 24638B10 */  addiu     $v1, $v1, -0x74f0
+/* 826028 80242D68 3C038025 */  lui       $v1, %hi(D_80248B10)
+/* 82602C 80242D6C 24638B10 */  addiu     $v1, $v1, %lo(D_80248B10)
 /* 826030 80242D70 000410C0 */  sll       $v0, $a0, 3
 /* 826034 80242D74 00431021 */  addu      $v0, $v0, $v1
 /* 826038 80242D78 8C500000 */  lw        $s0, ($v0)
diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242DBC_82607C.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242DBC_82607C.s
index 7e79bf5e5c..41eb73f0db 100644
--- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242DBC_82607C.s
+++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242DBC_82607C.s
@@ -23,8 +23,8 @@ glabel func_80242DBC_82607C
 /* 8260C4 80242E04 0040802D */   daddu    $s0, $v0, $zero
 /* 8260C8 80242E08 0040302D */  daddu     $a2, $v0, $zero
 /* 8260CC 80242E0C 0000282D */  daddu     $a1, $zero, $zero
-/* 8260D0 80242E10 3C038025 */  lui       $v1, 0x8025
-/* 8260D4 80242E14 24638A98 */  addiu     $v1, $v1, -0x7568
+/* 8260D0 80242E10 3C038025 */  lui       $v1, %hi(D_80248A98)
+/* 8260D4 80242E14 24638A98 */  addiu     $v1, $v1, %lo(D_80248A98)
 .L80242E18:
 /* 8260D8 80242E18 8C620000 */  lw        $v0, ($v1)
 /* 8260DC 80242E1C 10500006 */  beq       $v0, $s0, .L80242E38
@@ -35,8 +35,8 @@ glabel func_80242DBC_82607C
 /* 8260F0 80242E30 24630004 */   addiu    $v1, $v1, 4
 /* 8260F4 80242E34 0000202D */  daddu     $a0, $zero, $zero
 .L80242E38:
-/* 8260F8 80242E38 3C038025 */  lui       $v1, 0x8025
-/* 8260FC 80242E3C 24638A98 */  addiu     $v1, $v1, -0x7568
+/* 8260F8 80242E38 3C038025 */  lui       $v1, %hi(D_80248A98)
+/* 8260FC 80242E3C 24638A98 */  addiu     $v1, $v1, %lo(D_80248A98)
 .L80242E40:
 /* 826100 80242E40 8C620000 */  lw        $v0, ($v1)
 /* 826104 80242E44 10460006 */  beq       $v0, $a2, .L80242E60
@@ -66,17 +66,17 @@ glabel func_80242DBC_82607C
 /* 82615C 80242E9C 00441021 */  addu      $v0, $v0, $a0
 /* 826160 80242EA0 00A21021 */  addu      $v0, $a1, $v0
 .L80242EA4:
-/* 826164 80242EA4 3C038025 */  lui       $v1, 0x8025
+/* 826164 80242EA4 3C038025 */  lui       $v1, %hi(D_80248CF0)
 /* 826168 80242EA8 00621821 */  addu      $v1, $v1, $v0
-/* 82616C 80242EAC 80638CF0 */  lb        $v1, -0x7310($v1)
+/* 82616C 80242EAC 80638CF0 */  lb        $v1, %lo(D_80248CF0)($v1)
 .L80242EB0:
 /* 826170 80242EB0 04620001 */  bltzl     $v1, .L80242EB8
 /* 826174 80242EB4 0000182D */   daddu    $v1, $zero, $zero
 .L80242EB8:
 /* 826178 80242EB8 14600015 */  bnez      $v1, .L80242F10
 /* 82617C 80242EBC 0220202D */   daddu    $a0, $s1, $zero
-/* 826180 80242EC0 3C048025 */  lui       $a0, 0x8025
-/* 826184 80242EC4 2484903C */  addiu     $a0, $a0, -0x6fc4
+/* 826180 80242EC0 3C048025 */  lui       $a0, %hi(D_8024903C)
+/* 826184 80242EC4 2484903C */  addiu     $a0, $a0, %lo(D_8024903C)
 /* 826188 80242EC8 24870060 */  addiu     $a3, $a0, 0x60
 .L80242ECC:
 /* 82618C 80242ECC 8C850000 */  lw        $a1, ($a0)
@@ -100,8 +100,8 @@ glabel func_80242DBC_82607C
 /* 8261C8 80242F08 00000000 */   nop      
 /* 8261CC 80242F0C 0220202D */  daddu     $a0, $s1, $zero
 .L80242F10:
-/* 8261D0 80242F10 3C028025 */  lui       $v0, 0x8025
-/* 8261D4 80242F14 24428B10 */  addiu     $v0, $v0, -0x74f0
+/* 8261D0 80242F10 3C028025 */  lui       $v0, %hi(D_80248B10)
+/* 8261D4 80242F14 24428B10 */  addiu     $v0, $v0, %lo(D_80248B10)
 /* 8261D8 80242F18 000318C0 */  sll       $v1, $v1, 3
 /* 8261DC 80242F1C 00621821 */  addu      $v1, $v1, $v0
 /* 8261E0 80242F20 8C660004 */  lw        $a2, 4($v1)
diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242F60_826220.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242F60_826220.s
index 6425a40326..06cbf7e615 100644
--- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242F60_826220.s
+++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242F60_826220.s
@@ -9,8 +9,8 @@ glabel func_80242F60_826220
 /* 826230 80242F70 8C450000 */   lw       $a1, ($v0)
 /* 826234 80242F74 0040302D */  daddu     $a2, $v0, $zero
 /* 826238 80242F78 27A30010 */  addiu     $v1, $sp, 0x10
-/* 82623C 80242F7C 3C028025 */  lui       $v0, 0x8025
-/* 826240 80242F80 2442E3A0 */  addiu     $v0, $v0, -0x1c60
+/* 82623C 80242F7C 3C028025 */  lui       $v0, %hi(D_8024E3A0)
+/* 826240 80242F80 2442E3A0 */  addiu     $v0, $v0, %lo(D_8024E3A0)
 /* 826244 80242F84 244400D0 */  addiu     $a0, $v0, 0xd0
 .L80242F88:
 /* 826248 80242F88 8C470000 */  lw        $a3, ($v0)
@@ -25,8 +25,8 @@ glabel func_80242F60_826220
 /* 82626C 80242FAC 1444FFF6 */  bne       $v0, $a0, .L80242F88
 /* 826270 80242FB0 24630010 */   addiu    $v1, $v1, 0x10
 /* 826274 80242FB4 27A300E0 */  addiu     $v1, $sp, 0xe0
-/* 826278 80242FB8 3C028025 */  lui       $v0, 0x8025
-/* 82627C 80242FBC 2442E470 */  addiu     $v0, $v0, -0x1b90
+/* 826278 80242FB8 3C028025 */  lui       $v0, %hi(D_8024E470)
+/* 82627C 80242FBC 2442E470 */  addiu     $v0, $v0, %lo(D_8024E470)
 /* 826280 80242FC0 244400D0 */  addiu     $a0, $v0, 0xd0
 .L80242FC4:
 /* 826284 80242FC4 8C470000 */  lw        $a3, ($v0)
diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802430D0_826390.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802430D0_826390.s
index f3b380879d..4e54ea0f41 100644
--- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802430D0_826390.s
+++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802430D0_826390.s
@@ -3,8 +3,8 @@
 
 glabel func_802430D0_826390
 /* 826390 802430D0 2404005A */  addiu     $a0, $zero, 0x5a
-/* 826394 802430D4 3C038025 */  lui       $v1, 0x8025
-/* 826398 802430D8 2463EA10 */  addiu     $v1, $v1, -0x15f0
+/* 826394 802430D4 3C038025 */  lui       $v1, %hi(D_8024EA10)
+/* 826398 802430D8 2463EA10 */  addiu     $v1, $v1, %lo(D_8024EA10)
 /* 82639C 802430DC 240200DA */  addiu     $v0, $zero, 0xda
 .L802430E0:
 /* 8263A0 802430E0 AC620000 */  sw        $v0, ($v1)
@@ -12,7 +12,7 @@ glabel func_802430D0_826390
 /* 8263A8 802430E8 2484FFFF */  addiu     $a0, $a0, -1
 /* 8263AC 802430EC 0481FFFC */  bgez      $a0, .L802430E0
 /* 8263B0 802430F0 2442FFFF */   addiu    $v0, $v0, -1
-/* 8263B4 802430F4 3C018025 */  lui       $at, 0x8025
-/* 8263B8 802430F8 AC20EA14 */  sw        $zero, -0x15ec($at)
+/* 8263B4 802430F4 3C018025 */  lui       $at, %hi(D_8024EA14)
+/* 8263B8 802430F8 AC20EA14 */  sw        $zero, %lo(D_8024EA14)($at)
 /* 8263BC 802430FC 03E00008 */  jr        $ra
 /* 8263C0 80243100 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80243380_826640.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80243380_826640.s
index 1aba243679..c42897486b 100644
--- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80243380_826640.s
+++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80243380_826640.s
@@ -15,7 +15,7 @@ glabel func_80243380_826640
 /* 826668 802433A8 8FBF0014 */  lw        $ra, 0x14($sp)
 /* 82666C 802433AC 8FB00010 */  lw        $s0, 0x10($sp)
 /* 826670 802433B0 24020002 */  addiu     $v0, $zero, 2
-/* 826674 802433B4 3C018025 */  lui       $at, 0x8025
-/* 826678 802433B8 AC23EA18 */  sw        $v1, -0x15e8($at)
+/* 826674 802433B4 3C018025 */  lui       $at, %hi(D_8024EA18)
+/* 826678 802433B8 AC23EA18 */  sw        $v1, %lo(D_8024EA18)($at)
 /* 82667C 802433BC 03E00008 */  jr        $ra
 /* 826680 802433C0 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802433C4_826684.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802433C4_826684.s
index 349a9f113b..51a22dfedb 100644
--- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802433C4_826684.s
+++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802433C4_826684.s
@@ -6,8 +6,8 @@ glabel func_802433C4_826684
 /* 826688 802433C8 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 82668C 802433CC 0C00EABB */  jal       get_npc_unsafe
 /* 826690 802433D0 8C84008C */   lw       $a0, 0x8c($a0)
-/* 826694 802433D4 3C038025 */  lui       $v1, 0x8025
-/* 826698 802433D8 8C63EA18 */  lw        $v1, -0x15e8($v1)
+/* 826694 802433D4 3C038025 */  lui       $v1, %hi(D_8024EA18)
+/* 826698 802433D8 8C63EA18 */  lw        $v1, %lo(D_8024EA18)($v1)
 /* 82669C 802433DC AC430028 */  sw        $v1, 0x28($v0)
 /* 8266A0 802433E0 8FBF0010 */  lw        $ra, 0x10($sp)
 /* 8266A4 802433E4 24020002 */  addiu     $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802404B0_831CB0.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802404B0_831CB0.s
index dcba09f277..920df6c735 100644
--- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802404B0_831CB0.s
+++ b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802404B0_831CB0.s
@@ -4,8 +4,8 @@
 glabel func_802404B0_831CB0
 /* 831CB0 802404B0 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* 831CB4 802404B4 AFB00010 */  sw        $s0, 0x10($sp)
-/* 831CB8 802404B8 3C108024 */  lui       $s0, 0x8024
-/* 831CBC 802404BC 26106644 */  addiu     $s0, $s0, 0x6644
+/* 831CB8 802404B8 3C108024 */  lui       $s0, %hi(D_80246644)
+/* 831CBC 802404BC 26106644 */  addiu     $s0, $s0, %lo(D_80246644)
 /* 831CC0 802404C0 AFBF0018 */  sw        $ra, 0x18($sp)
 /* 831CC4 802404C4 AFB10014 */  sw        $s1, 0x14($sp)
 /* 831CC8 802404C8 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_802404B0_831CB0
 /* 831D2C 8024052C 28620010 */  slti      $v0, $v1, 0x10
 /* 831D30 80240530 1440FFFA */  bnez      $v0, .L8024051C
 /* 831D34 80240534 24840004 */   addiu    $a0, $a0, 4
-/* 831D38 80240538 3C108024 */  lui       $s0, 0x8024
-/* 831D3C 8024053C 26106644 */  addiu     $s0, $s0, 0x6644
+/* 831D38 80240538 3C108024 */  lui       $s0, %hi(D_80246644)
+/* 831D3C 8024053C 26106644 */  addiu     $s0, $s0, %lo(D_80246644)
 /* 831D40 80240540 0C00AB4B */  jal       heap_free
 /* 831D44 80240544 8E040000 */   lw       $a0, ($s0)
 /* 831D48 80240548 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802405EC_831DEC.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802405EC_831DEC.s
index 689c44cf40..3cb3d7ab2f 100644
--- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802405EC_831DEC.s
+++ b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802405EC_831DEC.s
@@ -90,8 +90,8 @@ glabel func_802405EC_831DEC
 /* 831F38 80240738 0040802D */   daddu    $s0, $v0, $zero
 /* 831F3C 8024073C 0040282D */  daddu     $a1, $v0, $zero
 /* 831F40 80240740 0000182D */  daddu     $v1, $zero, $zero
-/* 831F44 80240744 3C068024 */  lui       $a2, 0x8024
-/* 831F48 80240748 24C666E8 */  addiu     $a2, $a2, 0x66e8
+/* 831F44 80240744 3C068024 */  lui       $a2, %hi(D_802466E8)
+/* 831F48 80240748 24C666E8 */  addiu     $a2, $a2, %lo(D_802466E8)
 /* 831F4C 8024074C 00C0202D */  daddu     $a0, $a2, $zero
 .L80240750:
 /* 831F50 80240750 8C820000 */  lw        $v0, ($a0)
diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240810_832010.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240810_832010.s
index e546115914..b667b6e728 100644
--- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240810_832010.s
+++ b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240810_832010.s
@@ -9,8 +9,8 @@ glabel func_80240810_832010
 /* 832020 80240820 8C84014C */   lw       $a0, 0x14c($a0)
 /* 832024 80240824 24040008 */  addiu     $a0, $zero, 8
 /* 832028 80240828 0040802D */  daddu     $s0, $v0, $zero
-/* 83202C 8024082C 3C028024 */  lui       $v0, 0x8024
-/* 832030 80240830 2442087C */  addiu     $v0, $v0, 0x87c
+/* 83202C 8024082C 3C028024 */  lui       $v0, %hi(D_8024087C)
+/* 832030 80240830 2442087C */  addiu     $v0, $v0, %lo(D_8024087C)
 /* 832034 80240834 0C00AB39 */  jal       heap_malloc
 /* 832038 80240838 AE020008 */   sw       $v0, 8($s0)
 /* 83203C 8024083C 0040182D */  daddu     $v1, $v0, $zero
diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_8024087C_83207C.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_8024087C_83207C.s
index a7b06782ce..6d8a15b41a 100644
--- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_8024087C_83207C.s
+++ b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_8024087C_83207C.s
@@ -3,8 +3,8 @@
 
 glabel func_8024087C_83207C
 /* 83207C 8024087C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 832080 80240880 3C03800A */  lui       $v1, 0x800a
-/* 832084 80240884 8463A634 */  lh        $v1, -0x59cc($v1)
+/* 832080 80240880 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* 832084 80240884 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* 832088 80240888 3C05800B */  lui       $a1, %hi(gCameras)
 /* 83208C 8024088C 24A51D80 */  addiu     $a1, $a1, %lo(gCameras)
 /* 832090 80240890 AFBF0010 */  sw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802408DC_8320DC.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802408DC_8320DC.s
index d867fe70e1..4ed1bcea2a 100644
--- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802408DC_8320DC.s
+++ b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802408DC_8320DC.s
@@ -21,8 +21,8 @@ glabel func_802408DC_8320DC
 /* 83211C 8024091C 2414FFFC */  addiu     $s4, $zero, -4
 /* 832120 80240920 24130017 */  addiu     $s3, $zero, 0x17
 /* 832124 80240924 3C120080 */  lui       $s2, 0x80
-/* 832128 80240928 3C038015 */  lui       $v1, 0x8015
-/* 83212C 8024092C 8C6312F0 */  lw        $v1, 0x12f0($v1)
+/* 832128 80240928 3C038015 */  lui       $v1, %hi(D_801512F0)
+/* 83212C 8024092C 8C6312F0 */  lw        $v1, %lo(D_801512F0)($v1)
 /* 832130 80240930 24020001 */  addiu     $v0, $zero, 1
 /* 832134 80240934 0C046F97 */  jal       set_background_color_blend
 /* 832138 80240938 A0620000 */   sb       $v0, ($v1)
diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240A28_832228.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240A28_832228.s
index c3fb06cc4e..5c7ff78acf 100644
--- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240A28_832228.s
+++ b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240A28_832228.s
@@ -49,8 +49,8 @@ glabel func_80240A28_832228
 /* 8322CC 80240ACC 2413FFFC */  addiu     $s3, $zero, -4
 /* 8322D0 80240AD0 24120017 */  addiu     $s2, $zero, 0x17
 /* 8322D4 80240AD4 3C11FF7F */  lui       $s1, 0xff7f
-/* 8322D8 80240AD8 3C028015 */  lui       $v0, 0x8015
-/* 8322DC 80240ADC 8C4212F0 */  lw        $v0, 0x12f0($v0)
+/* 8322D8 80240AD8 3C028015 */  lui       $v0, %hi(D_801512F0)
+/* 8322DC 80240ADC 8C4212F0 */  lw        $v0, %lo(D_801512F0)($v0)
 /* 8322E0 80240AE0 3631FFFF */  ori       $s1, $s1, 0xffff
 /* 8322E4 80240AE4 A0400000 */  sb        $zero, ($v0)
 .L80240AE8:
diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240B9C_83239C.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240B9C_83239C.s
index 2899fb1d9b..8c839120cd 100644
--- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240B9C_83239C.s
+++ b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240B9C_83239C.s
@@ -19,9 +19,9 @@ glabel func_80240B9C_83239C
 /* 8323D0 80240BD0 34A502E0 */  ori       $a1, $a1, 0x2e0
 /* 8323D4 80240BD4 0C0B1EAF */  jal       get_variable
 /* 8323D8 80240BD8 0000202D */   daddu    $a0, $zero, $zero
-/* 8323DC 80240BDC 3C038024 */  lui       $v1, 0x8024
+/* 8323DC 80240BDC 3C038024 */  lui       $v1, %hi(D_802466A8)
 /* 8323E0 80240BE0 00621821 */  addu      $v1, $v1, $v0
-/* 8323E4 80240BE4 906366A8 */  lbu       $v1, 0x66a8($v1)
+/* 8323E4 80240BE4 906366A8 */  lbu       $v1, %lo(D_802466A8)($v1)
 /* 8323E8 80240BE8 8E220084 */  lw        $v0, 0x84($s1)
 /* 8323EC 80240BEC 54430006 */  bnel      $v0, $v1, .L80240C08
 /* 8323F0 80240BF0 AE200084 */   sw       $zero, 0x84($s1)
diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240C20_832420.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240C20_832420.s
index e949687777..d3c1c91d10 100644
--- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240C20_832420.s
+++ b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240C20_832420.s
@@ -66,8 +66,8 @@ glabel func_80240C20_832420
 /* 832514 80240D14 0000202D */   daddu    $a0, $zero, $zero
 /* 832518 80240D18 0220202D */  daddu     $a0, $s1, $zero
 /* 83251C 80240D1C 3C05F4AC */  lui       $a1, 0xf4ac
-/* 832520 80240D20 3C018025 */  lui       $at, 0x8025
-/* 832524 80240D24 AC2213F4 */  sw        $v0, 0x13f4($at)
+/* 832520 80240D20 3C018025 */  lui       $at, %hi(D_802513F4)
+/* 832524 80240D24 AC2213F4 */  sw        $v0, %lo(D_802513F4)($at)
 /* 832528 80240D28 0C0B1EAF */  jal       get_variable
 /* 83252C 80240D2C 34A5D481 */   ori      $a1, $a1, 0xd481
 /* 832530 80240D30 0220202D */  daddu     $a0, $s1, $zero
@@ -98,8 +98,8 @@ glabel func_80240C20_832420
 /* 832594 80240D94 E7A00010 */   swc1     $f0, 0x10($sp)
 /* 832598 80240D98 8E030000 */  lw        $v1, ($s0)
 /* 83259C 80240D9C 8C64000C */  lw        $a0, 0xc($v1)
-/* 8325A0 80240DA0 3C018025 */  lui       $at, 0x8025
-/* 8325A4 80240DA4 AC2213F8 */  sw        $v0, 0x13f8($at)
+/* 8325A0 80240DA0 3C018025 */  lui       $at, %hi(D_802513F8)
+/* 8325A4 80240DA4 AC2213F8 */  sw        $v0, %lo(D_802513F8)($at)
 /* 8325A8 80240DA8 AC800018 */  sw        $zero, 0x18($a0)
 /* 8325AC 80240DAC AC800020 */  sw        $zero, 0x20($a0)
 /* 8325B0 80240DB0 AC800024 */  sw        $zero, 0x24($a0)
diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240E38_832638.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240E38_832638.s
index 102a9bb4b2..5d8021041a 100644
--- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240E38_832638.s
+++ b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240E38_832638.s
@@ -5,11 +5,11 @@ glabel func_80240E38_832638
 /* 832638 80240E38 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 83263C 80240E3C 10A0000B */  beqz      $a1, .L80240E6C
 /* 832640 80240E40 AFBF0010 */   sw       $ra, 0x10($sp)
-/* 832644 80240E44 3C038025 */  lui       $v1, 0x8025
-/* 832648 80240E48 8C6313F4 */  lw        $v1, 0x13f4($v1)
+/* 832644 80240E44 3C038025 */  lui       $v1, %hi(D_802513F4)
+/* 832648 80240E48 8C6313F4 */  lw        $v1, %lo(D_802513F4)($v1)
 /* 83264C 80240E4C 8C620000 */  lw        $v0, ($v1)
-/* 832650 80240E50 3C048025 */  lui       $a0, 0x8025
-/* 832654 80240E54 8C8413F8 */  lw        $a0, 0x13f8($a0)
+/* 832650 80240E50 3C048025 */  lui       $a0, %hi(D_802513F8)
+/* 832654 80240E54 8C8413F8 */  lw        $a0, %lo(D_802513F8)($a0)
 /* 832658 80240E58 34420010 */  ori       $v0, $v0, 0x10
 /* 83265C 80240E5C AC620000 */  sw        $v0, ($v1)
 /* 832660 80240E60 8C820000 */  lw        $v0, ($a0)
@@ -41,8 +41,8 @@ glabel func_80240E38_832638
 .L80240EC4:
 /* 8326C4 80240EC4 0C016914 */  jal       remove_effect
 /* 8326C8 80240EC8 ACA00018 */   sw       $zero, 0x18($a1)
-/* 8326CC 80240ECC 3C048025 */  lui       $a0, 0x8025
-/* 8326D0 80240ED0 8C8413D0 */  lw        $a0, 0x13d0($a0)
+/* 8326CC 80240ECC 3C048025 */  lui       $a0, %hi(D_802513D0)
+/* 8326D0 80240ED0 8C8413D0 */  lw        $a0, %lo(D_802513D0)($a0)
 /* 8326D4 80240ED4 0C048D70 */  jal       func_801235C0
 /* 8326D8 80240ED8 00000000 */   nop      
 /* 8326DC 80240EDC 24020002 */  addiu     $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240FA0_8327A0.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240FA0_8327A0.s
index 3b9bde87a9..11311e5ed5 100644
--- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240FA0_8327A0.s
+++ b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240FA0_8327A0.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80240FA0_8327A0
-/* 8327A0 80240FA0 3C028025 */  lui       $v0, 0x8025
-/* 8327A4 80240FA4 8C4213F8 */  lw        $v0, 0x13f8($v0)
+/* 8327A0 80240FA0 3C028025 */  lui       $v0, %hi(D_802513F8)
+/* 8327A4 80240FA4 8C4213F8 */  lw        $v0, %lo(D_802513F8)($v0)
 /* 8327A8 80240FA8 8C42000C */  lw        $v0, 0xc($v0)
 /* 8327AC 80240FAC AC40001C */  sw        $zero, 0x1c($v0)
 /* 8327B0 80240FB0 03E00008 */  jr        $ra
diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240FB8_8327B8.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240FB8_8327B8.s
index 35d47c46a5..2bb8dd655e 100644
--- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240FB8_8327B8.s
+++ b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240FB8_8327B8.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80240FB8_8327B8
-/* 8327B8 80240FB8 3C028025 */  lui       $v0, 0x8025
-/* 8327BC 80240FBC 8C4213F8 */  lw        $v0, 0x13f8($v0)
+/* 8327B8 80240FB8 3C028025 */  lui       $v0, %hi(D_802513F8)
+/* 8327BC 80240FBC 8C4213F8 */  lw        $v0, %lo(D_802513F8)($v0)
 /* 8327C0 80240FC0 8C43000C */  lw        $v1, 0xc($v0)
 /* 8327C4 80240FC4 24020001 */  addiu     $v0, $zero, 1
 /* 8327C8 80240FC8 AC62001C */  sw        $v0, 0x1c($v1)
diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240FD4_8327D4.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240FD4_8327D4.s
index 4235da9fb1..e21a86812a 100644
--- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240FD4_8327D4.s
+++ b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240FD4_8327D4.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80240FD4_8327D4
-/* 8327D4 80240FD4 3C028025 */  lui       $v0, 0x8025
-/* 8327D8 80240FD8 8C4213F8 */  lw        $v0, 0x13f8($v0)
+/* 8327D4 80240FD4 3C028025 */  lui       $v0, %hi(D_802513F8)
+/* 8327D8 80240FD8 8C4213F8 */  lw        $v0, %lo(D_802513F8)($v0)
 /* 8327DC 80240FDC 8C43000C */  lw        $v1, 0xc($v0)
 /* 8327E0 80240FE0 24020002 */  addiu     $v0, $zero, 2
 /* 8327E4 80240FE4 03E00008 */  jr        $ra
diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802414A8_832CA8.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802414A8_832CA8.s
index 3a1166c421..22d8fdc35f 100644
--- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802414A8_832CA8.s
+++ b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802414A8_832CA8.s
@@ -3,8 +3,8 @@
 
 glabel func_802414A8_832CA8
 /* 832CA8 802414A8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 832CAC 802414AC 3C058025 */  lui       $a1, 0x8025
-/* 832CB0 802414B0 8CA513E8 */  lw        $a1, 0x13e8($a1)
+/* 832CAC 802414AC 3C058025 */  lui       $a1, %hi(D_802513E8)
+/* 832CB0 802414B0 8CA513E8 */  lw        $a1, %lo(D_802513E8)($a1)
 /* 832CB4 802414B4 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 832CB8 802414B8 0C0B1EAF */  jal       get_variable
 /* 832CBC 802414BC 0000202D */   daddu    $a0, $zero, $zero
diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241514_832D14.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241514_832D14.s
index a8dbeefe0e..cc777eddf3 100644
--- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241514_832D14.s
+++ b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241514_832D14.s
@@ -3,14 +3,14 @@
 
 glabel func_80241514_832D14
 /* 832D14 80241514 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 832D18 80241518 3C058024 */  lui       $a1, 0x8024
-/* 832D1C 8024151C 24A514A8 */  addiu     $a1, $a1, 0x14a8
+/* 832D18 80241518 3C058024 */  lui       $a1, %hi(D_802414A8)
+/* 832D1C 8024151C 24A514A8 */  addiu     $a1, $a1, %lo(D_802414A8)
 /* 832D20 80241520 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 832D24 80241524 0C048C8F */  jal       bind_dynamic_entity_7
 /* 832D28 80241528 0000202D */   daddu    $a0, $zero, $zero
 /* 832D2C 8024152C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 832D30 80241530 3C018025 */  lui       $at, 0x8025
-/* 832D34 80241534 AC2213D0 */  sw        $v0, 0x13d0($at)
+/* 832D30 80241530 3C018025 */  lui       $at, %hi(D_802513D0)
+/* 832D34 80241534 AC2213D0 */  sw        $v0, %lo(D_802513D0)($at)
 /* 832D38 80241538 24020002 */  addiu     $v0, $zero, 2
 /* 832D3C 8024153C 03E00008 */  jr        $ra
 /* 832D40 80241540 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241770_832F70.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241770_832F70.s
index d2c09d6979..d50810ca4a 100644
--- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241770_832F70.s
+++ b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241770_832F70.s
@@ -6,11 +6,11 @@ glabel func_80241770_832F70
 /* 832F74 80241774 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 832F78 80241778 10A00003 */  beqz      $a1, .L80241788
 /* 832F7C 8024177C 8C86000C */   lw       $a2, 0xc($a0)
-/* 832F80 80241780 3C018025 */  lui       $at, 0x8025
-/* 832F84 80241784 AC208C6C */  sw        $zero, -0x7394($at)
+/* 832F80 80241780 3C018025 */  lui       $at, %hi(D_80248C6C)
+/* 832F84 80241784 AC208C6C */  sw        $zero, %lo(D_80248C6C)($at)
 .L80241788:
-/* 832F88 80241788 3C038025 */  lui       $v1, 0x8025
-/* 832F8C 8024178C 24638C6C */  addiu     $v1, $v1, -0x7394
+/* 832F88 80241788 3C038025 */  lui       $v1, %hi(D_80248C6C)
+/* 832F8C 8024178C 24638C6C */  addiu     $v1, $v1, %lo(D_80248C6C)
 /* 832F90 80241790 8C620000 */  lw        $v0, ($v1)
 /* 832F94 80241794 54400003 */  bnel      $v0, $zero, .L802417A4
 /* 832F98 80241798 AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_80241770_832F70
 /* 832FA0 802417A0 0000102D */   daddu    $v0, $zero, $zero
 .L802417A4:
 /* 832FA4 802417A4 8CC50000 */  lw        $a1, ($a2)
-/* 832FA8 802417A8 3C068025 */  lui       $a2, 0x8025
+/* 832FA8 802417A8 3C068025 */  lui       $a2, %hi(D_80248C70)
 /* 832FAC 802417AC 0C0B2026 */  jal       set_variable
-/* 832FB0 802417B0 8CC68C70 */   lw       $a2, -0x7390($a2)
+/* 832FB0 802417B0 8CC68C70 */   lw       $a2, %lo(D_80248C70)($a2)
 /* 832FB4 802417B4 24020002 */  addiu     $v0, $zero, 2
 .L802417B8:
 /* 832FB8 802417B8 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802417C4_832FC4.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802417C4_832FC4.s
index c1590917fd..b378653181 100644
--- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802417C4_832FC4.s
+++ b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802417C4_832FC4.s
@@ -7,12 +7,12 @@ glabel func_802417C4_832FC4
 /* 832FCC 802417CC 8C82000C */  lw        $v0, 0xc($a0)
 /* 832FD0 802417D0 0C0B1EAF */  jal       get_variable
 /* 832FD4 802417D4 8C450000 */   lw       $a1, ($v0)
-/* 832FD8 802417D8 3C018025 */  lui       $at, 0x8025
-/* 832FDC 802417DC AC228C70 */  sw        $v0, -0x7390($at)
+/* 832FD8 802417D8 3C018025 */  lui       $at, %hi(D_80248C70)
+/* 832FDC 802417DC AC228C70 */  sw        $v0, %lo(D_80248C70)($at)
 /* 832FE0 802417E0 24020002 */  addiu     $v0, $zero, 2
 /* 832FE4 802417E4 8FBF0010 */  lw        $ra, 0x10($sp)
 /* 832FE8 802417E8 24030001 */  addiu     $v1, $zero, 1
-/* 832FEC 802417EC 3C018025 */  lui       $at, 0x8025
-/* 832FF0 802417F0 AC238C6C */  sw        $v1, -0x7394($at)
+/* 832FEC 802417EC 3C018025 */  lui       $at, %hi(D_80248C6C)
+/* 832FF0 802417F0 AC238C6C */  sw        $v1, %lo(D_80248C6C)($at)
 /* 832FF4 802417F4 03E00008 */  jr        $ra
 /* 832FF8 802417F8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802417FC_832FFC.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802417FC_832FFC.s
index 99a93e78ff..2ce3a15724 100644
--- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802417FC_832FFC.s
+++ b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802417FC_832FFC.s
@@ -13,8 +13,8 @@ glabel func_802417FC_832FFC
 /* 83301C 8024181C 8C620000 */  lw        $v0, ($v1)
 /* 833020 80241820 5040000A */  beql      $v0, $zero, .L8024184C
 /* 833024 80241824 00041080 */   sll      $v0, $a0, 2
-/* 833028 80241828 3C058025 */  lui       $a1, 0x8025
-/* 83302C 8024182C 24A51400 */  addiu     $a1, $a1, 0x1400
+/* 833028 80241828 3C058025 */  lui       $a1, %hi(D_80251400)
+/* 83302C 8024182C 24A51400 */  addiu     $a1, $a1, %lo(D_80251400)
 .L80241830:
 /* 833030 80241830 24630004 */  addiu     $v1, $v1, 4
 /* 833034 80241834 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_802417FC_832FFC
 /* 833044 80241844 24A50004 */   addiu    $a1, $a1, 4
 /* 833048 80241848 00041080 */  sll       $v0, $a0, 2
 .L8024184C:
-/* 83304C 8024184C 3C018025 */  lui       $at, 0x8025
+/* 83304C 8024184C 3C018025 */  lui       $at, %hi(D_80251400)
 /* 833050 80241850 00220821 */  addu      $at, $at, $v0
-/* 833054 80241854 AC201400 */  sw        $zero, 0x1400($at)
+/* 833054 80241854 AC201400 */  sw        $zero, %lo(D_80251400)($at)
 /* 833058 80241858 08090622 */  j         .L80241888
 /* 83305C 8024185C 00000000 */   nop      
 .L80241860:
-/* 833060 80241860 3C038025 */  lui       $v1, 0x8025
-/* 833064 80241864 24631400 */  addiu     $v1, $v1, 0x1400
+/* 833060 80241860 3C038025 */  lui       $v1, %hi(D_80251400)
+/* 833064 80241864 24631400 */  addiu     $v1, $v1, %lo(D_80251400)
 /* 833068 80241868 0060282D */  daddu     $a1, $v1, $zero
 .L8024186C:
 /* 83306C 8024186C 24820010 */  addiu     $v0, $a0, 0x10
diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241B14_833314.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241B14_833314.s
index d3389c39b4..a7cc4989c4 100644
--- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241B14_833314.s
+++ b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241B14_833314.s
@@ -15,7 +15,7 @@ glabel func_80241B14_833314
 /* 83333C 80241B3C 8FBF0014 */  lw        $ra, 0x14($sp)
 /* 833340 80241B40 8FB00010 */  lw        $s0, 0x10($sp)
 /* 833344 80241B44 24020002 */  addiu     $v0, $zero, 2
-/* 833348 80241B48 3C018025 */  lui       $at, 0x8025
-/* 83334C 80241B4C AC2315C4 */  sw        $v1, 0x15c4($at)
+/* 833348 80241B48 3C018025 */  lui       $at, %hi(D_802515C4)
+/* 83334C 80241B4C AC2315C4 */  sw        $v1, %lo(D_802515C4)($at)
 /* 833350 80241B50 03E00008 */  jr        $ra
 /* 833354 80241B54 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241B58_833358.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241B58_833358.s
index a9acb60cde..1fb9c7d45b 100644
--- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241B58_833358.s
+++ b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241B58_833358.s
@@ -6,8 +6,8 @@ glabel func_80241B58_833358
 /* 83335C 80241B5C AFBF0010 */  sw        $ra, 0x10($sp)
 /* 833360 80241B60 0C00EABB */  jal       get_npc_unsafe
 /* 833364 80241B64 8C84008C */   lw       $a0, 0x8c($a0)
-/* 833368 80241B68 3C038025 */  lui       $v1, 0x8025
-/* 83336C 80241B6C 8C6315C4 */  lw        $v1, 0x15c4($v1)
+/* 833368 80241B68 3C038025 */  lui       $v1, %hi(D_802515C4)
+/* 83336C 80241B6C 8C6315C4 */  lw        $v1, %lo(D_802515C4)($v1)
 /* 833370 80241B70 AC430028 */  sw        $v1, 0x28($v0)
 /* 833374 80241B74 8FBF0010 */  lw        $ra, 0x10($sp)
 /* 833378 80241B78 24020002 */  addiu     $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_mac/mac_03/833740/func_802427D0_833FD0.s b/asm/nonmatchings/world/area_mac/mac_03/833740/func_802427D0_833FD0.s
index 46412b0a42..38a371c003 100644
--- a/asm/nonmatchings/world/area_mac/mac_03/833740/func_802427D0_833FD0.s
+++ b/asm/nonmatchings/world/area_mac/mac_03/833740/func_802427D0_833FD0.s
@@ -13,8 +13,8 @@ glabel func_802427D0_833FD0
 /* 833FF0 802427F0 8E51000C */  lw        $s1, 0xc($s2)
 /* 833FF4 802427F4 0C0B1EAF */  jal       get_variable
 /* 833FF8 802427F8 34A5019E */   ori      $a1, $a1, 0x19e
-/* 833FFC 802427FC 3C038025 */  lui       $v1, 0x8025
-/* 834000 80242800 2463F800 */  addiu     $v1, $v1, -0x800
+/* 833FFC 802427FC 3C038025 */  lui       $v1, %hi(D_8024F800)
+/* 834000 80242800 2463F800 */  addiu     $v1, $v1, %lo(D_8024F800)
 /* 834004 80242804 00028040 */  sll       $s0, $v0, 1
 /* 834008 80242808 02028021 */  addu      $s0, $s0, $v0
 /* 83400C 8024280C 00108080 */  sll       $s0, $s0, 2
diff --git a/asm/nonmatchings/world/area_mac/mac_04/842BD0/func_80240000_842BD0.s b/asm/nonmatchings/world/area_mac/mac_04/842BD0/func_80240000_842BD0.s
index 0e76e23f17..6f9cf44312 100644
--- a/asm/nonmatchings/world/area_mac/mac_04/842BD0/func_80240000_842BD0.s
+++ b/asm/nonmatchings/world/area_mac/mac_04/842BD0/func_80240000_842BD0.s
@@ -10,11 +10,11 @@ glabel func_80240000_842BD0
 /* 842BE4 80240014 24020004 */  addiu     $v0, $zero, 4
 /* 842BE8 80240018 14620006 */  bne       $v1, $v0, .L80240034
 /* 842BEC 8024001C 00000000 */   nop      
-/* 842BF0 80240020 3C04800E */  lui       $a0, 0x800e
-/* 842BF4 80240024 24849668 */  addiu     $a0, $a0, -0x6998
-/* 842BF8 80240028 3C058025 */  lui       $a1, 0x8025
+/* 842BF0 80240020 3C04800E */  lui       $a0, %hi(D_800D9668)
+/* 842BF4 80240024 24849668 */  addiu     $a0, $a0, %lo(D_800D9668)
+/* 842BF8 80240028 3C058025 */  lui       $a1, %hi(D_8024F550)
 /* 842BFC 8024002C 0C01953C */  jal       sprintf
-/* 842C00 80240030 24A5F550 */   addiu    $a1, $a1, -0xab0
+/* 842C00 80240030 24A5F550 */   addiu    $a1, $a1, %lo(D_8024F550)
 .L80240034:
 /* 842C04 80240034 8FBF0010 */  lw        $ra, 0x10($sp)
 /* 842C08 80240038 0000102D */  daddu     $v0, $zero, $zero
diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240460_843030.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240460_843030.s
index 147d80cb0e..1fdcb9bd3a 100644
--- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240460_843030.s
+++ b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240460_843030.s
@@ -4,8 +4,8 @@
 glabel func_80240460_843030
 /* 843030 80240460 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* 843034 80240464 AFB00010 */  sw        $s0, 0x10($sp)
-/* 843038 80240468 3C108024 */  lui       $s0, 0x8024
-/* 84303C 8024046C 26103FE8 */  addiu     $s0, $s0, 0x3fe8
+/* 843038 80240468 3C108024 */  lui       $s0, %hi(D_80243FE8)
+/* 84303C 8024046C 26103FE8 */  addiu     $s0, $s0, %lo(D_80243FE8)
 /* 843040 80240470 AFBF0018 */  sw        $ra, 0x18($sp)
 /* 843044 80240474 AFB10014 */  sw        $s1, 0x14($sp)
 /* 843048 80240478 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_80240460_843030
 /* 8430AC 802404DC 28620010 */  slti      $v0, $v1, 0x10
 /* 8430B0 802404E0 1440FFFA */  bnez      $v0, .L802404CC
 /* 8430B4 802404E4 24840004 */   addiu    $a0, $a0, 4
-/* 8430B8 802404E8 3C108024 */  lui       $s0, 0x8024
-/* 8430BC 802404EC 26103FE8 */  addiu     $s0, $s0, 0x3fe8
+/* 8430B8 802404E8 3C108024 */  lui       $s0, %hi(D_80243FE8)
+/* 8430BC 802404EC 26103FE8 */  addiu     $s0, $s0, %lo(D_80243FE8)
 /* 8430C0 802404F0 0C00AB4B */  jal       heap_free
 /* 8430C4 802404F4 8E040000 */   lw       $a0, ($s0)
 /* 8430C8 802404F8 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024059C_84316C.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024059C_84316C.s
index 1f941534e2..e1d72c7422 100644
--- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024059C_84316C.s
+++ b/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024059C_84316C.s
@@ -90,8 +90,8 @@ glabel func_8024059C_84316C
 /* 8432B8 802406E8 0040802D */   daddu    $s0, $v0, $zero
 /* 8432BC 802406EC 0040282D */  daddu     $a1, $v0, $zero
 /* 8432C0 802406F0 0000182D */  daddu     $v1, $zero, $zero
-/* 8432C4 802406F4 3C068024 */  lui       $a2, 0x8024
-/* 8432C8 802406F8 24C6408C */  addiu     $a2, $a2, 0x408c
+/* 8432C4 802406F4 3C068024 */  lui       $a2, %hi(D_8024408C)
+/* 8432C8 802406F8 24C6408C */  addiu     $a2, $a2, %lo(D_8024408C)
 /* 8432CC 802406FC 00C0202D */  daddu     $a0, $a2, $zero
 .L80240700:
 /* 8432D0 80240700 8C820000 */  lw        $v0, ($a0)
diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_802407C0_843390.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_802407C0_843390.s
index d61a1aa388..7118e000f1 100644
--- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_802407C0_843390.s
+++ b/asm/nonmatchings/world/area_mac/mac_04/843030/func_802407C0_843390.s
@@ -9,8 +9,8 @@ glabel func_802407C0_843390
 /* 8433A0 802407D0 8C84014C */   lw       $a0, 0x14c($a0)
 /* 8433A4 802407D4 24040008 */  addiu     $a0, $zero, 8
 /* 8433A8 802407D8 0040802D */  daddu     $s0, $v0, $zero
-/* 8433AC 802407DC 3C028024 */  lui       $v0, 0x8024
-/* 8433B0 802407E0 2442082C */  addiu     $v0, $v0, 0x82c
+/* 8433AC 802407DC 3C028024 */  lui       $v0, %hi(D_8024082C)
+/* 8433B0 802407E0 2442082C */  addiu     $v0, $v0, %lo(D_8024082C)
 /* 8433B4 802407E4 0C00AB39 */  jal       heap_malloc
 /* 8433B8 802407E8 AE020008 */   sw       $v0, 8($s0)
 /* 8433BC 802407EC 0040182D */  daddu     $v1, $v0, $zero
diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024082C_8433FC.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024082C_8433FC.s
index b1d984ac9f..d024d8030b 100644
--- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024082C_8433FC.s
+++ b/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024082C_8433FC.s
@@ -3,8 +3,8 @@
 
 glabel func_8024082C_8433FC
 /* 8433FC 8024082C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 843400 80240830 3C03800A */  lui       $v1, 0x800a
-/* 843404 80240834 8463A634 */  lh        $v1, -0x59cc($v1)
+/* 843400 80240830 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* 843404 80240834 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* 843408 80240838 3C05800B */  lui       $a1, %hi(gCameras)
 /* 84340C 8024083C 24A51D80 */  addiu     $a1, $a1, %lo(gCameras)
 /* 843410 80240840 AFBF0010 */  sw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024088C_84345C.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024088C_84345C.s
index 736d2d82ed..f4df084646 100644
--- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024088C_84345C.s
+++ b/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024088C_84345C.s
@@ -21,8 +21,8 @@ glabel func_8024088C_84345C
 /* 84349C 802408CC 2414FFFC */  addiu     $s4, $zero, -4
 /* 8434A0 802408D0 24130014 */  addiu     $s3, $zero, 0x14
 /* 8434A4 802408D4 3C120080 */  lui       $s2, 0x80
-/* 8434A8 802408D8 3C038015 */  lui       $v1, 0x8015
-/* 8434AC 802408DC 8C6312F0 */  lw        $v1, 0x12f0($v1)
+/* 8434A8 802408D8 3C038015 */  lui       $v1, %hi(D_801512F0)
+/* 8434AC 802408DC 8C6312F0 */  lw        $v1, %lo(D_801512F0)($v1)
 /* 8434B0 802408E0 24020001 */  addiu     $v0, $zero, 1
 /* 8434B4 802408E4 0C046F97 */  jal       set_background_color_blend
 /* 8434B8 802408E8 A0620000 */   sb       $v0, ($v1)
diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_802409D8_8435A8.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_802409D8_8435A8.s
index 998d25689f..b620960a83 100644
--- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_802409D8_8435A8.s
+++ b/asm/nonmatchings/world/area_mac/mac_04/843030/func_802409D8_8435A8.s
@@ -49,8 +49,8 @@ glabel func_802409D8_8435A8
 /* 84364C 80240A7C 2413FFFC */  addiu     $s3, $zero, -4
 /* 843650 80240A80 24120014 */  addiu     $s2, $zero, 0x14
 /* 843654 80240A84 3C11FF7F */  lui       $s1, 0xff7f
-/* 843658 80240A88 3C028015 */  lui       $v0, 0x8015
-/* 84365C 80240A8C 8C4212F0 */  lw        $v0, 0x12f0($v0)
+/* 843658 80240A88 3C028015 */  lui       $v0, %hi(D_801512F0)
+/* 84365C 80240A8C 8C4212F0 */  lw        $v0, %lo(D_801512F0)($v0)
 /* 843660 80240A90 3631FFFF */  ori       $s1, $s1, 0xffff
 /* 843664 80240A94 A0400000 */  sb        $zero, ($v0)
 .L80240A98:
diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240B4C_84371C.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240B4C_84371C.s
index 5bd45a8ada..3c65c1cc2a 100644
--- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240B4C_84371C.s
+++ b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240B4C_84371C.s
@@ -19,9 +19,9 @@ glabel func_80240B4C_84371C
 /* 843750 80240B80 34A502E0 */  ori       $a1, $a1, 0x2e0
 /* 843754 80240B84 0C0B1EAF */  jal       get_variable
 /* 843758 80240B88 0000202D */   daddu    $a0, $zero, $zero
-/* 84375C 80240B8C 3C038024 */  lui       $v1, 0x8024
+/* 84375C 80240B8C 3C038024 */  lui       $v1, %hi(D_8024404C)
 /* 843760 80240B90 00621821 */  addu      $v1, $v1, $v0
-/* 843764 80240B94 9063404C */  lbu       $v1, 0x404c($v1)
+/* 843764 80240B94 9063404C */  lbu       $v1, %lo(D_8024404C)($v1)
 /* 843768 80240B98 8E220084 */  lw        $v0, 0x84($s1)
 /* 84376C 80240B9C 54430006 */  bnel      $v0, $v1, .L80240BB8
 /* 843770 80240BA0 AE200084 */   sw       $zero, 0x84($s1)
diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240BD0_8437A0.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240BD0_8437A0.s
index 1248d99ab7..b93cac1a9f 100644
--- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240BD0_8437A0.s
+++ b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240BD0_8437A0.s
@@ -38,8 +38,8 @@ glabel func_80240BD0_8437A0
 /* 843824 80240C54 0220202D */  daddu     $a0, $s1, $zero
 /* 843828 80240C58 3C05F4AC */  lui       $a1, 0xf4ac
 /* 84382C 80240C5C 34A5D481 */  ori       $a1, $a1, 0xd481
-/* 843830 80240C60 3C108025 */  lui       $s0, 0x8025
-/* 843834 80240C64 2610F5C0 */  addiu     $s0, $s0, -0xa40
+/* 843830 80240C60 3C108025 */  lui       $s0, %hi(D_8024F5C0)
+/* 843834 80240C64 2610F5C0 */  addiu     $s0, $s0, %lo(D_8024F5C0)
 /* 843838 80240C68 0C0B1EAF */  jal       get_variable
 /* 84383C 80240C6C AE020000 */   sw       $v0, ($s0)
 /* 843840 80240C70 0220202D */  daddu     $a0, $s1, $zero
@@ -66,8 +66,8 @@ glabel func_80240BD0_8437A0
 /* 843894 80240CC4 0000202D */   daddu    $a0, $zero, $zero
 /* 843898 80240CC8 0220202D */  daddu     $a0, $s1, $zero
 /* 84389C 80240CCC 3C05F4AC */  lui       $a1, 0xf4ac
-/* 8438A0 80240CD0 3C018025 */  lui       $at, 0x8025
-/* 8438A4 80240CD4 AC22F5C4 */  sw        $v0, -0xa3c($at)
+/* 8438A0 80240CD0 3C018025 */  lui       $at, %hi(D_8024F5C4)
+/* 8438A4 80240CD4 AC22F5C4 */  sw        $v0, %lo(D_8024F5C4)($at)
 /* 8438A8 80240CD8 0C0B1EAF */  jal       get_variable
 /* 8438AC 80240CDC 34A5D481 */   ori      $a1, $a1, 0xd481
 /* 8438B0 80240CE0 0220202D */  daddu     $a0, $s1, $zero
@@ -98,16 +98,16 @@ glabel func_80240BD0_8437A0
 /* 843914 80240D44 E7A00010 */   swc1     $f0, 0x10($sp)
 /* 843918 80240D48 8E030000 */  lw        $v1, ($s0)
 /* 84391C 80240D4C 8C64000C */  lw        $a0, 0xc($v1)
-/* 843920 80240D50 3C018025 */  lui       $at, 0x8025
-/* 843924 80240D54 AC22F5C8 */  sw        $v0, -0xa38($at)
+/* 843920 80240D50 3C018025 */  lui       $at, %hi(D_8024F5C8)
+/* 843924 80240D54 AC22F5C8 */  sw        $v0, %lo(D_8024F5C8)($at)
 /* 843928 80240D58 AC800018 */  sw        $zero, 0x18($a0)
 /* 84392C 80240D5C AC800020 */  sw        $zero, 0x20($a0)
 /* 843930 80240D60 AC800024 */  sw        $zero, 0x24($a0)
 /* 843934 80240D64 AC800028 */  sw        $zero, 0x28($a0)
 /* 843938 80240D68 AC80001C */  sw        $zero, 0x1c($a0)
 .L80240D6C:
-/* 84393C 80240D6C 3C028025 */  lui       $v0, 0x8025
-/* 843940 80240D70 8C42F5C0 */  lw        $v0, -0xa40($v0)
+/* 84393C 80240D6C 3C028025 */  lui       $v0, %hi(D_8024F5C0)
+/* 843940 80240D70 8C42F5C0 */  lw        $v0, %lo(D_8024F5C0)($v0)
 /* 843944 80240D74 8C44000C */  lw        $a0, 0xc($v0)
 /* 843948 80240D78 8C820020 */  lw        $v0, 0x20($a0)
 /* 84394C 80240D7C 8C830028 */  lw        $v1, 0x28($a0)
diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240DE8_8439B8.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240DE8_8439B8.s
index fd5db6a400..58315417c0 100644
--- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240DE8_8439B8.s
+++ b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240DE8_8439B8.s
@@ -5,19 +5,19 @@ glabel func_80240DE8_8439B8
 /* 8439B8 80240DE8 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 8439BC 80240DEC 10A0000B */  beqz      $a1, .L80240E1C
 /* 8439C0 80240DF0 AFBF0010 */   sw       $ra, 0x10($sp)
-/* 8439C4 80240DF4 3C038025 */  lui       $v1, 0x8025
-/* 8439C8 80240DF8 8C63F5C4 */  lw        $v1, -0xa3c($v1)
+/* 8439C4 80240DF4 3C038025 */  lui       $v1, %hi(D_8024F5C4)
+/* 8439C8 80240DF8 8C63F5C4 */  lw        $v1, %lo(D_8024F5C4)($v1)
 /* 8439CC 80240DFC 8C620000 */  lw        $v0, ($v1)
-/* 8439D0 80240E00 3C048025 */  lui       $a0, 0x8025
-/* 8439D4 80240E04 8C84F5C8 */  lw        $a0, -0xa38($a0)
+/* 8439D0 80240E00 3C048025 */  lui       $a0, %hi(D_8024F5C8)
+/* 8439D4 80240E04 8C84F5C8 */  lw        $a0, %lo(D_8024F5C8)($a0)
 /* 8439D8 80240E08 34420010 */  ori       $v0, $v0, 0x10
 /* 8439DC 80240E0C AC620000 */  sw        $v0, ($v1)
 /* 8439E0 80240E10 8C820000 */  lw        $v0, ($a0)
 /* 8439E4 80240E14 34420010 */  ori       $v0, $v0, 0x10
 /* 8439E8 80240E18 AC820000 */  sw        $v0, ($a0)
 .L80240E1C:
-/* 8439EC 80240E1C 3C048025 */  lui       $a0, 0x8025
-/* 8439F0 80240E20 8C84F5C0 */  lw        $a0, -0xa40($a0)
+/* 8439EC 80240E1C 3C048025 */  lui       $a0, %hi(D_8024F5C0)
+/* 8439F0 80240E20 8C84F5C0 */  lw        $a0, %lo(D_8024F5C0)($a0)
 /* 8439F4 80240E24 8C85000C */  lw        $a1, 0xc($a0)
 /* 8439F8 80240E28 8CA20018 */  lw        $v0, 0x18($a1)
 /* 8439FC 80240E2C 8CA30020 */  lw        $v1, 0x20($a1)
@@ -41,8 +41,8 @@ glabel func_80240DE8_8439B8
 .L80240E74:
 /* 843A44 80240E74 0C016914 */  jal       remove_effect
 /* 843A48 80240E78 ACA00018 */   sw       $zero, 0x18($a1)
-/* 843A4C 80240E7C 3C048025 */  lui       $a0, 0x8025
-/* 843A50 80240E80 8C84F5A0 */  lw        $a0, -0xa60($a0)
+/* 843A4C 80240E7C 3C048025 */  lui       $a0, %hi(D_8024F5A0)
+/* 843A50 80240E80 8C84F5A0 */  lw        $a0, %lo(D_8024F5A0)($a0)
 /* 843A54 80240E84 0C048D70 */  jal       func_801235C0
 /* 843A58 80240E88 00000000 */   nop      
 /* 843A5C 80240E8C 24020002 */  addiu     $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240E9C_843A6C.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240E9C_843A6C.s
index 3f9d29fca5..9cb7de8b3b 100644
--- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240E9C_843A6C.s
+++ b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240E9C_843A6C.s
@@ -7,8 +7,8 @@ glabel func_80240E9C_843A6C
 /* 843A74 80240EA4 8C82000C */  lw        $v0, 0xc($a0)
 /* 843A78 80240EA8 0C0B1EAF */  jal       get_variable
 /* 843A7C 80240EAC 8C450000 */   lw       $a1, ($v0)
-/* 843A80 80240EB0 3C038025 */  lui       $v1, 0x8025
-/* 843A84 80240EB4 8C63F5C0 */  lw        $v1, -0xa40($v1)
+/* 843A80 80240EB0 3C038025 */  lui       $v1, %hi(D_8024F5C0)
+/* 843A84 80240EB4 8C63F5C0 */  lw        $v1, %lo(D_8024F5C0)($v1)
 /* 843A88 80240EB8 8C63000C */  lw        $v1, 0xc($v1)
 /* 843A8C 80240EBC AC620034 */  sw        $v0, 0x34($v1)
 /* 843A90 80240EC0 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240ED0_843AA0.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240ED0_843AA0.s
index 4e0f74a57b..52f3ee1084 100644
--- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240ED0_843AA0.s
+++ b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240ED0_843AA0.s
@@ -8,8 +8,8 @@ glabel func_80240ED0_843AA0
 /* 843AAC 80240EDC 0C0B1EAF */  jal       get_variable
 /* 843AB0 80240EE0 8C450000 */   lw       $a1, ($v0)
 /* 843AB4 80240EE4 0040202D */  daddu     $a0, $v0, $zero
-/* 843AB8 80240EE8 3C028025 */  lui       $v0, 0x8025
-/* 843ABC 80240EEC 8C42F5C0 */  lw        $v0, -0xa40($v0)
+/* 843AB8 80240EE8 3C028025 */  lui       $v0, %hi(D_8024F5C0)
+/* 843ABC 80240EEC 8C42F5C0 */  lw        $v0, %lo(D_8024F5C0)($v0)
 /* 843AC0 80240EF0 24030001 */  addiu     $v1, $zero, 1
 /* 843AC4 80240EF4 8C45000C */  lw        $a1, 0xc($v0)
 /* 843AC8 80240EF8 1083000D */  beq       $a0, $v1, .L80240F30
diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240F50_843B20.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240F50_843B20.s
index 3cc3506b0b..5768be6254 100644
--- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240F50_843B20.s
+++ b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240F50_843B20.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80240F50_843B20
-/* 843B20 80240F50 3C028025 */  lui       $v0, 0x8025
-/* 843B24 80240F54 8C42F5C8 */  lw        $v0, -0xa38($v0)
+/* 843B20 80240F50 3C028025 */  lui       $v0, %hi(D_8024F5C8)
+/* 843B24 80240F54 8C42F5C8 */  lw        $v0, %lo(D_8024F5C8)($v0)
 /* 843B28 80240F58 8C42000C */  lw        $v0, 0xc($v0)
 /* 843B2C 80240F5C AC40001C */  sw        $zero, 0x1c($v0)
 /* 843B30 80240F60 03E00008 */  jr        $ra
diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240F68_843B38.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240F68_843B38.s
index 9e46d5d32d..6e7af14443 100644
--- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240F68_843B38.s
+++ b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240F68_843B38.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80240F68_843B38
-/* 843B38 80240F68 3C028025 */  lui       $v0, 0x8025
-/* 843B3C 80240F6C 8C42F5C8 */  lw        $v0, -0xa38($v0)
+/* 843B38 80240F68 3C028025 */  lui       $v0, %hi(D_8024F5C8)
+/* 843B3C 80240F6C 8C42F5C8 */  lw        $v0, %lo(D_8024F5C8)($v0)
 /* 843B40 80240F70 8C43000C */  lw        $v1, 0xc($v0)
 /* 843B44 80240F74 24020001 */  addiu     $v0, $zero, 1
 /* 843B48 80240F78 AC62001C */  sw        $v0, 0x1c($v1)
diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240F84_843B54.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240F84_843B54.s
index 36d7b37219..98604a6b1f 100644
--- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240F84_843B54.s
+++ b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240F84_843B54.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80240F84_843B54
-/* 843B54 80240F84 3C028025 */  lui       $v0, 0x8025
-/* 843B58 80240F88 8C42F5C8 */  lw        $v0, -0xa38($v0)
+/* 843B54 80240F84 3C028025 */  lui       $v0, %hi(D_8024F5C8)
+/* 843B58 80240F88 8C42F5C8 */  lw        $v0, %lo(D_8024F5C8)($v0)
 /* 843B5C 80240F8C 8C43000C */  lw        $v1, 0xc($v0)
 /* 843B60 80240F90 24020002 */  addiu     $v0, $zero, 2
 /* 843B64 80240F94 03E00008 */  jr        $ra
diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241458_844028.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241458_844028.s
index 3c5ffd571f..7f5f212a0b 100644
--- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241458_844028.s
+++ b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241458_844028.s
@@ -3,8 +3,8 @@
 
 glabel func_80241458_844028
 /* 844028 80241458 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 84402C 8024145C 3C058025 */  lui       $a1, 0x8025
-/* 844030 80241460 8CA5F5B8 */  lw        $a1, -0xa48($a1)
+/* 84402C 8024145C 3C058025 */  lui       $a1, %hi(D_8024F5B8)
+/* 844030 80241460 8CA5F5B8 */  lw        $a1, %lo(D_8024F5B8)($a1)
 /* 844034 80241464 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 844038 80241468 0C0B1EAF */  jal       get_variable
 /* 84403C 8024146C 0000202D */   daddu    $a0, $zero, $zero
diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_802414C4_844094.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_802414C4_844094.s
index e89262db0c..85b82638af 100644
--- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_802414C4_844094.s
+++ b/asm/nonmatchings/world/area_mac/mac_04/843030/func_802414C4_844094.s
@@ -3,14 +3,14 @@
 
 glabel func_802414C4_844094
 /* 844094 802414C4 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 844098 802414C8 3C058024 */  lui       $a1, 0x8024
-/* 84409C 802414CC 24A51458 */  addiu     $a1, $a1, 0x1458
+/* 844098 802414C8 3C058024 */  lui       $a1, %hi(D_80241458)
+/* 84409C 802414CC 24A51458 */  addiu     $a1, $a1, %lo(D_80241458)
 /* 8440A0 802414D0 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 8440A4 802414D4 0C048C8F */  jal       bind_dynamic_entity_7
 /* 8440A8 802414D8 0000202D */   daddu    $a0, $zero, $zero
 /* 8440AC 802414DC 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 8440B0 802414E0 3C018025 */  lui       $at, 0x8025
-/* 8440B4 802414E4 AC22F5A0 */  sw        $v0, -0xa60($at)
+/* 8440B0 802414E0 3C018025 */  lui       $at, %hi(D_8024F5A0)
+/* 8440B4 802414E4 AC22F5A0 */  sw        $v0, %lo(D_8024F5A0)($at)
 /* 8440B8 802414E8 24020002 */  addiu     $v0, $zero, 2
 /* 8440BC 802414EC 03E00008 */  jr        $ra
 /* 8440C0 802414F0 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241720_8442F0.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241720_8442F0.s
index afb00658eb..03036442b8 100644
--- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241720_8442F0.s
+++ b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241720_8442F0.s
@@ -6,11 +6,11 @@ glabel func_80241720_8442F0
 /* 8442F4 80241724 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 8442F8 80241728 10A00003 */  beqz      $a1, .L80241738
 /* 8442FC 8024172C 8C86000C */   lw       $a2, 0xc($a0)
-/* 844300 80241730 3C018024 */  lui       $at, 0x8024
-/* 844304 80241734 AC206610 */  sw        $zero, 0x6610($at)
+/* 844300 80241730 3C018024 */  lui       $at, %hi(D_80246610)
+/* 844304 80241734 AC206610 */  sw        $zero, %lo(D_80246610)($at)
 .L80241738:
-/* 844308 80241738 3C038024 */  lui       $v1, 0x8024
-/* 84430C 8024173C 24636610 */  addiu     $v1, $v1, 0x6610
+/* 844308 80241738 3C038024 */  lui       $v1, %hi(D_80246610)
+/* 84430C 8024173C 24636610 */  addiu     $v1, $v1, %lo(D_80246610)
 /* 844310 80241740 8C620000 */  lw        $v0, ($v1)
 /* 844314 80241744 54400003 */  bnel      $v0, $zero, .L80241754
 /* 844318 80241748 AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_80241720_8442F0
 /* 844320 80241750 0000102D */   daddu    $v0, $zero, $zero
 .L80241754:
 /* 844324 80241754 8CC50000 */  lw        $a1, ($a2)
-/* 844328 80241758 3C068024 */  lui       $a2, 0x8024
+/* 844328 80241758 3C068024 */  lui       $a2, %hi(D_80246614)
 /* 84432C 8024175C 0C0B2026 */  jal       set_variable
-/* 844330 80241760 8CC66614 */   lw       $a2, 0x6614($a2)
+/* 844330 80241760 8CC66614 */   lw       $a2, %lo(D_80246614)($a2)
 /* 844334 80241764 24020002 */  addiu     $v0, $zero, 2
 .L80241768:
 /* 844338 80241768 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241774_844344.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241774_844344.s
index 30e2e2159c..e79bf3feb4 100644
--- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241774_844344.s
+++ b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241774_844344.s
@@ -7,12 +7,12 @@ glabel func_80241774_844344
 /* 84434C 8024177C 8C82000C */  lw        $v0, 0xc($a0)
 /* 844350 80241780 0C0B1EAF */  jal       get_variable
 /* 844354 80241784 8C450000 */   lw       $a1, ($v0)
-/* 844358 80241788 3C018024 */  lui       $at, 0x8024
-/* 84435C 8024178C AC226614 */  sw        $v0, 0x6614($at)
+/* 844358 80241788 3C018024 */  lui       $at, %hi(D_80246614)
+/* 84435C 8024178C AC226614 */  sw        $v0, %lo(D_80246614)($at)
 /* 844360 80241790 24020002 */  addiu     $v0, $zero, 2
 /* 844364 80241794 8FBF0010 */  lw        $ra, 0x10($sp)
 /* 844368 80241798 24030001 */  addiu     $v1, $zero, 1
-/* 84436C 8024179C 3C018024 */  lui       $at, 0x8024
-/* 844370 802417A0 AC236610 */  sw        $v1, 0x6610($at)
+/* 84436C 8024179C 3C018024 */  lui       $at, %hi(D_80246610)
+/* 844370 802417A0 AC236610 */  sw        $v1, %lo(D_80246610)($at)
 /* 844374 802417A4 03E00008 */  jr        $ra
 /* 844378 802417A8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_802417AC_84437C.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_802417AC_84437C.s
index fa3bedd331..8b390c6dcb 100644
--- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_802417AC_84437C.s
+++ b/asm/nonmatchings/world/area_mac/mac_04/843030/func_802417AC_84437C.s
@@ -13,8 +13,8 @@ glabel func_802417AC_84437C
 /* 84439C 802417CC 8C620000 */  lw        $v0, ($v1)
 /* 8443A0 802417D0 5040000A */  beql      $v0, $zero, .L802417FC
 /* 8443A4 802417D4 00041080 */   sll      $v0, $a0, 2
-/* 8443A8 802417D8 3C058025 */  lui       $a1, 0x8025
-/* 8443AC 802417DC 24A5F5D0 */  addiu     $a1, $a1, -0xa30
+/* 8443A8 802417D8 3C058025 */  lui       $a1, %hi(D_8024F5D0)
+/* 8443AC 802417DC 24A5F5D0 */  addiu     $a1, $a1, %lo(D_8024F5D0)
 .L802417E0:
 /* 8443B0 802417E0 24630004 */  addiu     $v1, $v1, 4
 /* 8443B4 802417E4 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_802417AC_84437C
 /* 8443C4 802417F4 24A50004 */   addiu    $a1, $a1, 4
 /* 8443C8 802417F8 00041080 */  sll       $v0, $a0, 2
 .L802417FC:
-/* 8443CC 802417FC 3C018025 */  lui       $at, 0x8025
+/* 8443CC 802417FC 3C018025 */  lui       $at, %hi(D_8024F5D0)
 /* 8443D0 80241800 00220821 */  addu      $at, $at, $v0
-/* 8443D4 80241804 AC20F5D0 */  sw        $zero, -0xa30($at)
+/* 8443D4 80241804 AC20F5D0 */  sw        $zero, %lo(D_8024F5D0)($at)
 /* 8443D8 80241808 0809060E */  j         .L80241838
 /* 8443DC 8024180C 00000000 */   nop      
 .L80241810:
-/* 8443E0 80241810 3C038025 */  lui       $v1, 0x8025
-/* 8443E4 80241814 2463F5D0 */  addiu     $v1, $v1, -0xa30
+/* 8443E0 80241810 3C038025 */  lui       $v1, %hi(D_8024F5D0)
+/* 8443E4 80241814 2463F5D0 */  addiu     $v1, $v1, %lo(D_8024F5D0)
 /* 8443E8 80241818 0060282D */  daddu     $a1, $v1, $zero
 .L8024181C:
 /* 8443EC 8024181C 24820010 */  addiu     $v0, $a0, 0x10
diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241848_844418.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241848_844418.s
index 6d8b1232c1..9e9de8fbe9 100644
--- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241848_844418.s
+++ b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241848_844418.s
@@ -6,8 +6,8 @@ glabel func_80241848_844418
 /* 84441C 8024184C 00C0282D */  daddu     $a1, $a2, $zero
 /* 844420 80241850 3C088008 */  lui       $t0, %hi(gItemTable)
 /* 844424 80241854 250878E0 */  addiu     $t0, $t0, %lo(gItemTable)
-/* 844428 80241858 3C078009 */  lui       $a3, 0x8009
-/* 84442C 8024185C 24E7F060 */  addiu     $a3, $a3, -0xfa0
+/* 844428 80241858 3C078009 */  lui       $a3, %hi(D_8008F060)
+/* 84442C 8024185C 24E7F060 */  addiu     $a3, $a3, %lo(D_8008F060)
 /* 844430 80241860 3C048011 */  lui       $a0, %hi(gPlayerData)
 /* 844434 80241864 2484F290 */  addiu     $a0, $a0, %lo(gPlayerData)
 .L80241868:
diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_802419AC_84457C.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_802419AC_84457C.s
index 9d7f2f61f2..5d13e8d285 100644
--- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_802419AC_84457C.s
+++ b/asm/nonmatchings/world/area_mac/mac_04/843030/func_802419AC_84457C.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_802419AC_84457C
-/* 84457C 802419AC 3C038011 */  lui       $v1, 0x8011
-/* 844580 802419B0 8063EBB3 */  lb        $v1, -0x144d($v1)
+/* 84457C 802419AC 3C038011 */  lui       $v1, %hi(D_8010EBB3)
+/* 844580 802419B0 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
 /* 844584 802419B4 24020009 */  addiu     $v0, $zero, 9
 /* 844588 802419B8 54620003 */  bnel      $v1, $v0, .L802419C8
 /* 84458C 802419BC AC800084 */   sw       $zero, 0x84($a0)
diff --git a/asm/nonmatchings/world/area_mac/mac_04/844860/func_80241C90_844860.s b/asm/nonmatchings/world/area_mac/mac_04/844860/func_80241C90_844860.s
index e020a37c30..061fc9a2cc 100644
--- a/asm/nonmatchings/world/area_mac/mac_04/844860/func_80241C90_844860.s
+++ b/asm/nonmatchings/world/area_mac/mac_04/844860/func_80241C90_844860.s
@@ -10,8 +10,8 @@ glabel func_80241C90_844860
 /* 844874 80241CA4 2463EFC8 */  addiu     $v1, $v1, %lo(gPlayerStatus)
 /* 844878 80241CA8 AFBF0014 */  sw        $ra, 0x14($sp)
 /* 84487C 80241CAC 8C620004 */  lw        $v0, 4($v1)
-/* 844880 80241CB0 3C058024 */  lui       $a1, 0x8024
-/* 844884 80241CB4 24A51D30 */  addiu     $a1, $a1, 0x1d30
+/* 844880 80241CB0 3C058024 */  lui       $a1, %hi(D_80241D30)
+/* 844884 80241CB4 24A51D30 */  addiu     $a1, $a1, %lo(D_80241D30)
 /* 844888 80241CB8 34422000 */  ori       $v0, $v0, 0x2000
 /* 84488C 80241CBC 0C048C56 */  jal       bind_dynamic_entity_3
 /* 844890 80241CC0 AC620004 */   sw       $v0, 4($v1)
diff --git a/asm/nonmatchings/world/area_mac/mac_04/844860/func_80241D30_844900.s b/asm/nonmatchings/world/area_mac/mac_04/844860/func_80241D30_844900.s
index 866f054a7c..fb43473f58 100644
--- a/asm/nonmatchings/world/area_mac/mac_04/844860/func_80241D30_844900.s
+++ b/asm/nonmatchings/world/area_mac/mac_04/844860/func_80241D30_844900.s
@@ -3,8 +3,8 @@
 
 glabel func_80241D30_844900
 /* 844900 80241D30 27BDFFB8 */  addiu     $sp, $sp, -0x48
-/* 844904 80241D34 3C04800A */  lui       $a0, 0x800a
-/* 844908 80241D38 8484A634 */  lh        $a0, -0x59cc($a0)
+/* 844904 80241D34 3C04800A */  lui       $a0, %hi(D_8009A634)
+/* 844908 80241D38 8484A634 */  lh        $a0, %lo(D_8009A634)($a0)
 /* 84490C 80241D3C 27A20030 */  addiu     $v0, $sp, 0x30
 /* 844910 80241D40 AFA20010 */  sw        $v0, 0x10($sp)
 /* 844914 80241D44 27A20034 */  addiu     $v0, $sp, 0x34
@@ -23,8 +23,8 @@ glabel func_80241D30_844900
 /* 844948 80241D78 AFB00028 */  sw        $s0, 0x28($sp)
 /* 84494C 80241D7C 820300BE */  lb        $v1, 0xbe($s0)
 /* 844950 80241D80 8FA50038 */  lw        $a1, 0x38($sp)
-/* 844954 80241D84 3C028024 */  lui       $v0, 0x8024
-/* 844958 80241D88 24421DAC */  addiu     $v0, $v0, 0x1dac
+/* 844954 80241D84 3C028024 */  lui       $v0, %hi(D_80241DAC)
+/* 844958 80241D88 24421DAC */  addiu     $v0, $v0, %lo(D_80241DAC)
 /* 84495C 80241D8C AFA2002C */  sw        $v0, 0x2c($sp)
 /* 844960 80241D90 AFA30020 */  sw        $v1, 0x20($sp)
 /* 844964 80241D94 0C047644 */  jal       queue_render_task
diff --git a/asm/nonmatchings/world/area_mac/mac_04/844860/func_80241DAC_84497C.s b/asm/nonmatchings/world/area_mac/mac_04/844860/func_80241DAC_84497C.s
index 690b72393f..791613127a 100644
--- a/asm/nonmatchings/world/area_mac/mac_04/844860/func_80241DAC_84497C.s
+++ b/asm/nonmatchings/world/area_mac/mac_04/844860/func_80241DAC_84497C.s
@@ -23,8 +23,8 @@ glabel func_80241DAC_84497C
 /* 8449C4 80241DF4 4407B000 */  mfc1      $a3, $f22
 /* 8449C8 80241DF8 0C019EC8 */  jal       guRotateF
 /* 8449CC 80241DFC 46000506 */   mov.s    $f20, $f0
-/* 8449D0 80241E00 3C018025 */  lui       $at, 0x8025
-/* 8449D4 80241E04 D420F580 */  ldc1      $f0, -0xa80($at)
+/* 8449D0 80241E00 3C018025 */  lui       $at, %hi(D_8024F580)
+/* 8449D4 80241E04 D420F580 */  ldc1      $f0, %lo(D_8024F580)($at)
 /* 8449D8 80241E08 4600A521 */  cvt.d.s   $f20, $f20
 /* 8449DC 80241E0C 4620A502 */  mul.d     $f20, $f20, $f0
 /* 8449E0 80241E10 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240490_852600.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240490_852600.s
index 57d6c7536f..6f69c0633e 100644
--- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240490_852600.s
+++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240490_852600.s
@@ -69,8 +69,8 @@ glabel func_80240490_852600
 /* 8526F4 80240584 0809016B */  j         .L802405AC
 /* 8526F8 80240588 E6800018 */   swc1     $f0, 0x18($s4)
 .L8024058C:
-/* 8526FC 8024058C 3C018025 */  lui       $at, 0x8025
-/* 852700 80240590 D42227B0 */  ldc1      $f2, 0x27b0($at)
+/* 8526FC 8024058C 3C018025 */  lui       $at, %hi(D_802527B0)
+/* 852700 80240590 D42227B0 */  ldc1      $f2, %lo(D_802527B0)($at)
 /* 852704 80240594 44820000 */  mtc1      $v0, $f0
 /* 852708 80240598 00000000 */  nop       
 /* 85270C 8024059C 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240B0C_852C7C.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240B0C_852C7C.s
index 76c79004df..295fb54404 100644
--- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240B0C_852C7C.s
+++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240B0C_852C7C.s
@@ -33,8 +33,8 @@ glabel func_80240B0C_852C7C
 /* 852CE8 80240B78 080902E8 */  j         .L80240BA0
 /* 852CEC 80240B7C E4A00018 */   swc1     $f0, 0x18($a1)
 .L80240B80:
-/* 852CF0 80240B80 3C018025 */  lui       $at, 0x8025
-/* 852CF4 80240B84 D42227B8 */  ldc1      $f2, 0x27b8($at)
+/* 852CF0 80240B80 3C018025 */  lui       $at, %hi(D_802527B8)
+/* 852CF4 80240B84 D42227B8 */  ldc1      $f2, %lo(D_802527B8)($at)
 /* 852CF8 80240B88 44820000 */  mtc1      $v0, $f0
 /* 852CFC 80240B8C 00000000 */  nop       
 /* 852D00 80240B90 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241024_853194.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241024_853194.s
index c5318742a6..14ee0cf0cd 100644
--- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241024_853194.s
+++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241024_853194.s
@@ -124,9 +124,9 @@ glabel func_80241024_853194
 /* 853358 802411E8 2C620064 */  sltiu     $v0, $v1, 0x64
 /* 85335C 802411EC 10400042 */  beqz      $v0, .L802412F8
 /* 853360 802411F0 00031080 */   sll      $v0, $v1, 2
-/* 853364 802411F4 3C018025 */  lui       $at, 0x8025
+/* 853364 802411F4 3C018025 */  lui       $at, %hi(D_802527C0)
 /* 853368 802411F8 00220821 */  addu      $at, $at, $v0
-/* 85336C 802411FC 8C2227C0 */  lw        $v0, 0x27c0($at)
+/* 85336C 802411FC 8C2227C0 */  lw        $v0, %lo(D_802527C0)($at)
 /* 853370 80241200 00400008 */  jr        $v0
 /* 853374 80241204 00000000 */   nop      
 /* 853378 80241208 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241320_853490.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241320_853490.s
index ce1b039188..812d35af22 100644
--- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241320_853490.s
+++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241320_853490.s
@@ -4,8 +4,8 @@
 glabel func_80241320_853490
 /* 853490 80241320 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* 853494 80241324 AFB00010 */  sw        $s0, 0x10($sp)
-/* 853498 80241328 3C108024 */  lui       $s0, 0x8024
-/* 85349C 8024132C 261050B0 */  addiu     $s0, $s0, 0x50b0
+/* 853498 80241328 3C108024 */  lui       $s0, %hi(D_802450B0)
+/* 85349C 8024132C 261050B0 */  addiu     $s0, $s0, %lo(D_802450B0)
 /* 8534A0 80241330 AFBF0018 */  sw        $ra, 0x18($sp)
 /* 8534A4 80241334 AFB10014 */  sw        $s1, 0x14($sp)
 /* 8534A8 80241338 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_80241320_853490
 /* 85350C 8024139C 28620010 */  slti      $v0, $v1, 0x10
 /* 853510 802413A0 1440FFFA */  bnez      $v0, .L8024138C
 /* 853514 802413A4 24840004 */   addiu    $a0, $a0, 4
-/* 853518 802413A8 3C108024 */  lui       $s0, 0x8024
-/* 85351C 802413AC 261050B0 */  addiu     $s0, $s0, 0x50b0
+/* 853518 802413A8 3C108024 */  lui       $s0, %hi(D_802450B0)
+/* 85351C 802413AC 261050B0 */  addiu     $s0, $s0, %lo(D_802450B0)
 /* 853520 802413B0 0C00AB4B */  jal       heap_free
 /* 853524 802413B4 8E040000 */   lw       $a0, ($s0)
 /* 853528 802413B8 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024145C_8535CC.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024145C_8535CC.s
index bbdb778167..e20eb08ce7 100644
--- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024145C_8535CC.s
+++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024145C_8535CC.s
@@ -90,8 +90,8 @@ glabel func_8024145C_8535CC
 /* 853718 802415A8 0040802D */   daddu    $s0, $v0, $zero
 /* 85371C 802415AC 0040282D */  daddu     $a1, $v0, $zero
 /* 853720 802415B0 0000182D */  daddu     $v1, $zero, $zero
-/* 853724 802415B4 3C068024 */  lui       $a2, 0x8024
-/* 853728 802415B8 24C65154 */  addiu     $a2, $a2, 0x5154
+/* 853724 802415B4 3C068024 */  lui       $a2, %hi(D_80245154)
+/* 853728 802415B8 24C65154 */  addiu     $a2, $a2, %lo(D_80245154)
 /* 85372C 802415BC 00C0202D */  daddu     $a0, $a2, $zero
 .L802415C0:
 /* 853730 802415C0 8C820000 */  lw        $v0, ($a0)
diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241680_8537F0.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241680_8537F0.s
index 16e8f86150..34560faf5f 100644
--- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241680_8537F0.s
+++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241680_8537F0.s
@@ -9,8 +9,8 @@ glabel func_80241680_8537F0
 /* 853800 80241690 8C84014C */   lw       $a0, 0x14c($a0)
 /* 853804 80241694 24040008 */  addiu     $a0, $zero, 8
 /* 853808 80241698 0040802D */  daddu     $s0, $v0, $zero
-/* 85380C 8024169C 3C028024 */  lui       $v0, 0x8024
-/* 853810 802416A0 244216EC */  addiu     $v0, $v0, 0x16ec
+/* 85380C 8024169C 3C028024 */  lui       $v0, %hi(D_802416EC)
+/* 853810 802416A0 244216EC */  addiu     $v0, $v0, %lo(D_802416EC)
 /* 853814 802416A4 0C00AB39 */  jal       heap_malloc
 /* 853818 802416A8 AE020008 */   sw       $v0, 8($s0)
 /* 85381C 802416AC 0040182D */  daddu     $v1, $v0, $zero
diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_802416EC_85385C.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_802416EC_85385C.s
index 30e22a0f62..6c61b15ad9 100644
--- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_802416EC_85385C.s
+++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_802416EC_85385C.s
@@ -3,8 +3,8 @@
 
 glabel func_802416EC_85385C
 /* 85385C 802416EC 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 853860 802416F0 3C03800A */  lui       $v1, 0x800a
-/* 853864 802416F4 8463A634 */  lh        $v1, -0x59cc($v1)
+/* 853860 802416F0 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* 853864 802416F4 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* 853868 802416F8 3C05800B */  lui       $a1, %hi(gCameras)
 /* 85386C 802416FC 24A51D80 */  addiu     $a1, $a1, %lo(gCameras)
 /* 853870 80241700 AFBF0010 */  sw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024174C_8538BC.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024174C_8538BC.s
index 970b30afeb..0ddfb6df66 100644
--- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024174C_8538BC.s
+++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024174C_8538BC.s
@@ -21,8 +21,8 @@ glabel func_8024174C_8538BC
 /* 8538FC 8024178C 2414FFFC */  addiu     $s4, $zero, -4
 /* 853900 80241790 24130006 */  addiu     $s3, $zero, 6
 /* 853904 80241794 3C120080 */  lui       $s2, 0x80
-/* 853908 80241798 3C038015 */  lui       $v1, 0x8015
-/* 85390C 8024179C 8C6312F0 */  lw        $v1, 0x12f0($v1)
+/* 853908 80241798 3C038015 */  lui       $v1, %hi(D_801512F0)
+/* 85390C 8024179C 8C6312F0 */  lw        $v1, %lo(D_801512F0)($v1)
 /* 853910 802417A0 24020001 */  addiu     $v0, $zero, 1
 /* 853914 802417A4 0C046F97 */  jal       set_background_color_blend
 /* 853918 802417A8 A0620000 */   sb       $v0, ($v1)
diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241898_853A08.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241898_853A08.s
index 9f88e678b0..b04aa09657 100644
--- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241898_853A08.s
+++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241898_853A08.s
@@ -49,8 +49,8 @@ glabel func_80241898_853A08
 /* 853AAC 8024193C 2413FFFC */  addiu     $s3, $zero, -4
 /* 853AB0 80241940 24120006 */  addiu     $s2, $zero, 6
 /* 853AB4 80241944 3C11FF7F */  lui       $s1, 0xff7f
-/* 853AB8 80241948 3C028015 */  lui       $v0, 0x8015
-/* 853ABC 8024194C 8C4212F0 */  lw        $v0, 0x12f0($v0)
+/* 853AB8 80241948 3C028015 */  lui       $v0, %hi(D_801512F0)
+/* 853ABC 8024194C 8C4212F0 */  lw        $v0, %lo(D_801512F0)($v0)
 /* 853AC0 80241950 3631FFFF */  ori       $s1, $s1, 0xffff
 /* 853AC4 80241954 A0400000 */  sb        $zero, ($v0)
 .L80241958:
diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241A0C_853B7C.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241A0C_853B7C.s
index 78c9517d44..e5b43a4267 100644
--- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241A0C_853B7C.s
+++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241A0C_853B7C.s
@@ -19,9 +19,9 @@ glabel func_80241A0C_853B7C
 /* 853BB0 80241A40 34A502E0 */  ori       $a1, $a1, 0x2e0
 /* 853BB4 80241A44 0C0B1EAF */  jal       get_variable
 /* 853BB8 80241A48 0000202D */   daddu    $a0, $zero, $zero
-/* 853BBC 80241A4C 3C038024 */  lui       $v1, 0x8024
+/* 853BBC 80241A4C 3C038024 */  lui       $v1, %hi(D_80245114)
 /* 853BC0 80241A50 00621821 */  addu      $v1, $v1, $v0
-/* 853BC4 80241A54 90635114 */  lbu       $v1, 0x5114($v1)
+/* 853BC4 80241A54 90635114 */  lbu       $v1, %lo(D_80245114)($v1)
 /* 853BC8 80241A58 8E220084 */  lw        $v0, 0x84($s1)
 /* 853BCC 80241A5C 54430006 */  bnel      $v0, $v1, .L80241A78
 /* 853BD0 80241A60 AE200084 */   sw       $zero, 0x84($s1)
diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241A90_853C00.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241A90_853C00.s
index fe3041650a..d719db6cd6 100644
--- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241A90_853C00.s
+++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241A90_853C00.s
@@ -38,8 +38,8 @@ glabel func_80241A90_853C00
 /* 853C84 80241B14 0220202D */  daddu     $a0, $s1, $zero
 /* 853C88 80241B18 3C05F4AC */  lui       $a1, 0xf4ac
 /* 853C8C 80241B1C 34A5D481 */  ori       $a1, $a1, 0xd481
-/* 853C90 80241B20 3C108025 */  lui       $s0, 0x8025
-/* 853C94 80241B24 261029F0 */  addiu     $s0, $s0, 0x29f0
+/* 853C90 80241B20 3C108025 */  lui       $s0, %hi(D_802529F0)
+/* 853C94 80241B24 261029F0 */  addiu     $s0, $s0, %lo(D_802529F0)
 /* 853C98 80241B28 0C0B1EAF */  jal       get_variable
 /* 853C9C 80241B2C AE020000 */   sw       $v0, ($s0)
 /* 853CA0 80241B30 0220202D */  daddu     $a0, $s1, $zero
@@ -66,8 +66,8 @@ glabel func_80241A90_853C00
 /* 853CF4 80241B84 0000202D */   daddu    $a0, $zero, $zero
 /* 853CF8 80241B88 0220202D */  daddu     $a0, $s1, $zero
 /* 853CFC 80241B8C 3C05F4AC */  lui       $a1, 0xf4ac
-/* 853D00 80241B90 3C018025 */  lui       $at, 0x8025
-/* 853D04 80241B94 AC2229F4 */  sw        $v0, 0x29f4($at)
+/* 853D00 80241B90 3C018025 */  lui       $at, %hi(D_802529F4)
+/* 853D04 80241B94 AC2229F4 */  sw        $v0, %lo(D_802529F4)($at)
 /* 853D08 80241B98 0C0B1EAF */  jal       get_variable
 /* 853D0C 80241B9C 34A5D481 */   ori      $a1, $a1, 0xd481
 /* 853D10 80241BA0 0220202D */  daddu     $a0, $s1, $zero
@@ -98,16 +98,16 @@ glabel func_80241A90_853C00
 /* 853D74 80241C04 E7A00010 */   swc1     $f0, 0x10($sp)
 /* 853D78 80241C08 8E030000 */  lw        $v1, ($s0)
 /* 853D7C 80241C0C 8C64000C */  lw        $a0, 0xc($v1)
-/* 853D80 80241C10 3C018025 */  lui       $at, 0x8025
-/* 853D84 80241C14 AC2229F8 */  sw        $v0, 0x29f8($at)
+/* 853D80 80241C10 3C018025 */  lui       $at, %hi(D_802529F8)
+/* 853D84 80241C14 AC2229F8 */  sw        $v0, %lo(D_802529F8)($at)
 /* 853D88 80241C18 AC800018 */  sw        $zero, 0x18($a0)
 /* 853D8C 80241C1C AC800020 */  sw        $zero, 0x20($a0)
 /* 853D90 80241C20 AC800024 */  sw        $zero, 0x24($a0)
 /* 853D94 80241C24 AC800028 */  sw        $zero, 0x28($a0)
 /* 853D98 80241C28 AC80001C */  sw        $zero, 0x1c($a0)
 .L80241C2C:
-/* 853D9C 80241C2C 3C028025 */  lui       $v0, 0x8025
-/* 853DA0 80241C30 8C4229F0 */  lw        $v0, 0x29f0($v0)
+/* 853D9C 80241C2C 3C028025 */  lui       $v0, %hi(D_802529F0)
+/* 853DA0 80241C30 8C4229F0 */  lw        $v0, %lo(D_802529F0)($v0)
 /* 853DA4 80241C34 8C44000C */  lw        $a0, 0xc($v0)
 /* 853DA8 80241C38 8C820020 */  lw        $v0, 0x20($a0)
 /* 853DAC 80241C3C 8C830028 */  lw        $v1, 0x28($a0)
diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241CA8_853E18.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241CA8_853E18.s
index 456dde60ea..fe3f436510 100644
--- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241CA8_853E18.s
+++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241CA8_853E18.s
@@ -5,19 +5,19 @@ glabel func_80241CA8_853E18
 /* 853E18 80241CA8 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 853E1C 80241CAC 10A0000B */  beqz      $a1, .L80241CDC
 /* 853E20 80241CB0 AFBF0010 */   sw       $ra, 0x10($sp)
-/* 853E24 80241CB4 3C038025 */  lui       $v1, 0x8025
-/* 853E28 80241CB8 8C6329F4 */  lw        $v1, 0x29f4($v1)
+/* 853E24 80241CB4 3C038025 */  lui       $v1, %hi(D_802529F4)
+/* 853E28 80241CB8 8C6329F4 */  lw        $v1, %lo(D_802529F4)($v1)
 /* 853E2C 80241CBC 8C620000 */  lw        $v0, ($v1)
-/* 853E30 80241CC0 3C048025 */  lui       $a0, 0x8025
-/* 853E34 80241CC4 8C8429F8 */  lw        $a0, 0x29f8($a0)
+/* 853E30 80241CC0 3C048025 */  lui       $a0, %hi(D_802529F8)
+/* 853E34 80241CC4 8C8429F8 */  lw        $a0, %lo(D_802529F8)($a0)
 /* 853E38 80241CC8 34420010 */  ori       $v0, $v0, 0x10
 /* 853E3C 80241CCC AC620000 */  sw        $v0, ($v1)
 /* 853E40 80241CD0 8C820000 */  lw        $v0, ($a0)
 /* 853E44 80241CD4 34420010 */  ori       $v0, $v0, 0x10
 /* 853E48 80241CD8 AC820000 */  sw        $v0, ($a0)
 .L80241CDC:
-/* 853E4C 80241CDC 3C048025 */  lui       $a0, 0x8025
-/* 853E50 80241CE0 8C8429F0 */  lw        $a0, 0x29f0($a0)
+/* 853E4C 80241CDC 3C048025 */  lui       $a0, %hi(D_802529F0)
+/* 853E50 80241CE0 8C8429F0 */  lw        $a0, %lo(D_802529F0)($a0)
 /* 853E54 80241CE4 8C85000C */  lw        $a1, 0xc($a0)
 /* 853E58 80241CE8 8CA20018 */  lw        $v0, 0x18($a1)
 /* 853E5C 80241CEC 8CA30020 */  lw        $v1, 0x20($a1)
@@ -41,8 +41,8 @@ glabel func_80241CA8_853E18
 .L80241D34:
 /* 853EA4 80241D34 0C016914 */  jal       remove_effect
 /* 853EA8 80241D38 ACA00018 */   sw       $zero, 0x18($a1)
-/* 853EAC 80241D3C 3C048025 */  lui       $a0, 0x8025
-/* 853EB0 80241D40 8C8429D0 */  lw        $a0, 0x29d0($a0)
+/* 853EAC 80241D3C 3C048025 */  lui       $a0, %hi(D_802529D0)
+/* 853EB0 80241D40 8C8429D0 */  lw        $a0, %lo(D_802529D0)($a0)
 /* 853EB4 80241D44 0C048D70 */  jal       func_801235C0
 /* 853EB8 80241D48 00000000 */   nop      
 /* 853EBC 80241D4C 24020002 */  addiu     $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241D5C_853ECC.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241D5C_853ECC.s
index 939502f20f..204511bf34 100644
--- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241D5C_853ECC.s
+++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241D5C_853ECC.s
@@ -7,8 +7,8 @@ glabel func_80241D5C_853ECC
 /* 853ED4 80241D64 8C82000C */  lw        $v0, 0xc($a0)
 /* 853ED8 80241D68 0C0B1EAF */  jal       get_variable
 /* 853EDC 80241D6C 8C450000 */   lw       $a1, ($v0)
-/* 853EE0 80241D70 3C038025 */  lui       $v1, 0x8025
-/* 853EE4 80241D74 8C6329F0 */  lw        $v1, 0x29f0($v1)
+/* 853EE0 80241D70 3C038025 */  lui       $v1, %hi(D_802529F0)
+/* 853EE4 80241D74 8C6329F0 */  lw        $v1, %lo(D_802529F0)($v1)
 /* 853EE8 80241D78 8C63000C */  lw        $v1, 0xc($v1)
 /* 853EEC 80241D7C AC620034 */  sw        $v0, 0x34($v1)
 /* 853EF0 80241D80 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241D90_853F00.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241D90_853F00.s
index c68372ed4f..0e9bd67a9d 100644
--- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241D90_853F00.s
+++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241D90_853F00.s
@@ -8,8 +8,8 @@ glabel func_80241D90_853F00
 /* 853F0C 80241D9C 0C0B1EAF */  jal       get_variable
 /* 853F10 80241DA0 8C450000 */   lw       $a1, ($v0)
 /* 853F14 80241DA4 0040202D */  daddu     $a0, $v0, $zero
-/* 853F18 80241DA8 3C028025 */  lui       $v0, 0x8025
-/* 853F1C 80241DAC 8C4229F0 */  lw        $v0, 0x29f0($v0)
+/* 853F18 80241DA8 3C028025 */  lui       $v0, %hi(D_802529F0)
+/* 853F1C 80241DAC 8C4229F0 */  lw        $v0, %lo(D_802529F0)($v0)
 /* 853F20 80241DB0 24030001 */  addiu     $v1, $zero, 1
 /* 853F24 80241DB4 8C45000C */  lw        $a1, 0xc($v0)
 /* 853F28 80241DB8 1083000D */  beq       $a0, $v1, .L80241DF0
diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241E10_853F80.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241E10_853F80.s
index c56ec06f85..96585cb32c 100644
--- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241E10_853F80.s
+++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241E10_853F80.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80241E10_853F80
-/* 853F80 80241E10 3C028025 */  lui       $v0, 0x8025
-/* 853F84 80241E14 8C4229F8 */  lw        $v0, 0x29f8($v0)
+/* 853F80 80241E10 3C028025 */  lui       $v0, %hi(D_802529F8)
+/* 853F84 80241E14 8C4229F8 */  lw        $v0, %lo(D_802529F8)($v0)
 /* 853F88 80241E18 8C42000C */  lw        $v0, 0xc($v0)
 /* 853F8C 80241E1C AC40001C */  sw        $zero, 0x1c($v0)
 /* 853F90 80241E20 03E00008 */  jr        $ra
diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241E28_853F98.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241E28_853F98.s
index 2b5510ffa6..27b6999f9d 100644
--- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241E28_853F98.s
+++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241E28_853F98.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80241E28_853F98
-/* 853F98 80241E28 3C028025 */  lui       $v0, 0x8025
-/* 853F9C 80241E2C 8C4229F8 */  lw        $v0, 0x29f8($v0)
+/* 853F98 80241E28 3C028025 */  lui       $v0, %hi(D_802529F8)
+/* 853F9C 80241E2C 8C4229F8 */  lw        $v0, %lo(D_802529F8)($v0)
 /* 853FA0 80241E30 8C43000C */  lw        $v1, 0xc($v0)
 /* 853FA4 80241E34 24020001 */  addiu     $v0, $zero, 1
 /* 853FA8 80241E38 AC62001C */  sw        $v0, 0x1c($v1)
diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241E44_853FB4.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241E44_853FB4.s
index 8d18eea522..1d8503e375 100644
--- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241E44_853FB4.s
+++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241E44_853FB4.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80241E44_853FB4
-/* 853FB4 80241E44 3C028025 */  lui       $v0, 0x8025
-/* 853FB8 80241E48 8C4229F8 */  lw        $v0, 0x29f8($v0)
+/* 853FB4 80241E44 3C028025 */  lui       $v0, %hi(D_802529F8)
+/* 853FB8 80241E48 8C4229F8 */  lw        $v0, %lo(D_802529F8)($v0)
 /* 853FBC 80241E4C 8C43000C */  lw        $v1, 0xc($v0)
 /* 853FC0 80241E50 24020002 */  addiu     $v0, $zero, 2
 /* 853FC4 80241E54 03E00008 */  jr        $ra
diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242318_854488.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242318_854488.s
index 7ce3925f37..234a66f377 100644
--- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242318_854488.s
+++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242318_854488.s
@@ -3,8 +3,8 @@
 
 glabel func_80242318_854488
 /* 854488 80242318 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 85448C 8024231C 3C058025 */  lui       $a1, 0x8025
-/* 854490 80242320 8CA529E8 */  lw        $a1, 0x29e8($a1)
+/* 85448C 8024231C 3C058025 */  lui       $a1, %hi(D_802529E8)
+/* 854490 80242320 8CA529E8 */  lw        $a1, %lo(D_802529E8)($a1)
 /* 854494 80242324 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 854498 80242328 0C0B1EAF */  jal       get_variable
 /* 85449C 8024232C 0000202D */   daddu    $a0, $zero, $zero
diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242384_8544F4.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242384_8544F4.s
index a1a8389835..c16daa9de4 100644
--- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242384_8544F4.s
+++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242384_8544F4.s
@@ -3,14 +3,14 @@
 
 glabel func_80242384_8544F4
 /* 8544F4 80242384 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8544F8 80242388 3C058024 */  lui       $a1, 0x8024
-/* 8544FC 8024238C 24A52318 */  addiu     $a1, $a1, 0x2318
+/* 8544F8 80242388 3C058024 */  lui       $a1, %hi(D_80242318)
+/* 8544FC 8024238C 24A52318 */  addiu     $a1, $a1, %lo(D_80242318)
 /* 854500 80242390 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 854504 80242394 0C048C8F */  jal       bind_dynamic_entity_7
 /* 854508 80242398 0000202D */   daddu    $a0, $zero, $zero
 /* 85450C 8024239C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 854510 802423A0 3C018025 */  lui       $at, 0x8025
-/* 854514 802423A4 AC2229D0 */  sw        $v0, 0x29d0($at)
+/* 854510 802423A0 3C018025 */  lui       $at, %hi(D_802529D0)
+/* 854514 802423A4 AC2229D0 */  sw        $v0, %lo(D_802529D0)($at)
 /* 854518 802423A8 24020002 */  addiu     $v0, $zero, 2
 /* 85451C 802423AC 03E00008 */  jr        $ra
 /* 854520 802423B0 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_802425E0_854750.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_802425E0_854750.s
index e5caa98222..2cba331aa6 100644
--- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_802425E0_854750.s
+++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_802425E0_854750.s
@@ -6,11 +6,11 @@ glabel func_802425E0_854750
 /* 854754 802425E4 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 854758 802425E8 10A00003 */  beqz      $a1, .L802425F8
 /* 85475C 802425EC 8C86000C */   lw       $a2, 0xc($a0)
-/* 854760 802425F0 3C018024 */  lui       $at, 0x8024
-/* 854764 802425F4 AC2076D8 */  sw        $zero, 0x76d8($at)
+/* 854760 802425F0 3C018024 */  lui       $at, %hi(D_802476D8)
+/* 854764 802425F4 AC2076D8 */  sw        $zero, %lo(D_802476D8)($at)
 .L802425F8:
-/* 854768 802425F8 3C038024 */  lui       $v1, 0x8024
-/* 85476C 802425FC 246376D8 */  addiu     $v1, $v1, 0x76d8
+/* 854768 802425F8 3C038024 */  lui       $v1, %hi(D_802476D8)
+/* 85476C 802425FC 246376D8 */  addiu     $v1, $v1, %lo(D_802476D8)
 /* 854770 80242600 8C620000 */  lw        $v0, ($v1)
 /* 854774 80242604 54400003 */  bnel      $v0, $zero, .L80242614
 /* 854778 80242608 AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_802425E0_854750
 /* 854780 80242610 0000102D */   daddu    $v0, $zero, $zero
 .L80242614:
 /* 854784 80242614 8CC50000 */  lw        $a1, ($a2)
-/* 854788 80242618 3C068024 */  lui       $a2, 0x8024
+/* 854788 80242618 3C068024 */  lui       $a2, %hi(D_802476DC)
 /* 85478C 8024261C 0C0B2026 */  jal       set_variable
-/* 854790 80242620 8CC676DC */   lw       $a2, 0x76dc($a2)
+/* 854790 80242620 8CC676DC */   lw       $a2, %lo(D_802476DC)($a2)
 /* 854794 80242624 24020002 */  addiu     $v0, $zero, 2
 .L80242628:
 /* 854798 80242628 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242634_8547A4.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242634_8547A4.s
index 114ab93f34..41c4ae0387 100644
--- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242634_8547A4.s
+++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242634_8547A4.s
@@ -7,12 +7,12 @@ glabel func_80242634_8547A4
 /* 8547AC 8024263C 8C82000C */  lw        $v0, 0xc($a0)
 /* 8547B0 80242640 0C0B1EAF */  jal       get_variable
 /* 8547B4 80242644 8C450000 */   lw       $a1, ($v0)
-/* 8547B8 80242648 3C018024 */  lui       $at, 0x8024
-/* 8547BC 8024264C AC2276DC */  sw        $v0, 0x76dc($at)
+/* 8547B8 80242648 3C018024 */  lui       $at, %hi(D_802476DC)
+/* 8547BC 8024264C AC2276DC */  sw        $v0, %lo(D_802476DC)($at)
 /* 8547C0 80242650 24020002 */  addiu     $v0, $zero, 2
 /* 8547C4 80242654 8FBF0010 */  lw        $ra, 0x10($sp)
 /* 8547C8 80242658 24030001 */  addiu     $v1, $zero, 1
-/* 8547CC 8024265C 3C018024 */  lui       $at, 0x8024
-/* 8547D0 80242660 AC2376D8 */  sw        $v1, 0x76d8($at)
+/* 8547CC 8024265C 3C018024 */  lui       $at, %hi(D_802476D8)
+/* 8547D0 80242660 AC2376D8 */  sw        $v1, %lo(D_802476D8)($at)
 /* 8547D4 80242664 03E00008 */  jr        $ra
 /* 8547D8 80242668 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024266C_8547DC.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024266C_8547DC.s
index 082099d8b7..e30d77e883 100644
--- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024266C_8547DC.s
+++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024266C_8547DC.s
@@ -13,8 +13,8 @@ glabel func_8024266C_8547DC
 /* 8547FC 8024268C 8C620000 */  lw        $v0, ($v1)
 /* 854800 80242690 5040000A */  beql      $v0, $zero, .L802426BC
 /* 854804 80242694 00041080 */   sll      $v0, $a0, 2
-/* 854808 80242698 3C058025 */  lui       $a1, 0x8025
-/* 85480C 8024269C 24A52A00 */  addiu     $a1, $a1, 0x2a00
+/* 854808 80242698 3C058025 */  lui       $a1, %hi(D_80252A00)
+/* 85480C 8024269C 24A52A00 */  addiu     $a1, $a1, %lo(D_80252A00)
 .L802426A0:
 /* 854810 802426A0 24630004 */  addiu     $v1, $v1, 4
 /* 854814 802426A4 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_8024266C_8547DC
 /* 854824 802426B4 24A50004 */   addiu    $a1, $a1, 4
 /* 854828 802426B8 00041080 */  sll       $v0, $a0, 2
 .L802426BC:
-/* 85482C 802426BC 3C018025 */  lui       $at, 0x8025
+/* 85482C 802426BC 3C018025 */  lui       $at, %hi(D_80252A00)
 /* 854830 802426C0 00220821 */  addu      $at, $at, $v0
-/* 854834 802426C4 AC202A00 */  sw        $zero, 0x2a00($at)
+/* 854834 802426C4 AC202A00 */  sw        $zero, %lo(D_80252A00)($at)
 /* 854838 802426C8 080909BE */  j         .L802426F8
 /* 85483C 802426CC 00000000 */   nop      
 .L802426D0:
-/* 854840 802426D0 3C038025 */  lui       $v1, 0x8025
-/* 854844 802426D4 24632A00 */  addiu     $v1, $v1, 0x2a00
+/* 854840 802426D0 3C038025 */  lui       $v1, %hi(D_80252A00)
+/* 854844 802426D4 24632A00 */  addiu     $v1, $v1, %lo(D_80252A00)
 /* 854848 802426D8 0060282D */  daddu     $a1, $v1, $zero
 .L802426DC:
 /* 85484C 802426DC 24820010 */  addiu     $v0, $a0, 0x10
diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242708_854878.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242708_854878.s
index 2184854b07..ed10fd71a5 100644
--- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242708_854878.s
+++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242708_854878.s
@@ -13,8 +13,8 @@ glabel func_80242708_854878
 /* 854898 80242728 8C620000 */  lw        $v0, ($v1)
 /* 85489C 8024272C 5040000A */  beql      $v0, $zero, .L80242758
 /* 8548A0 80242730 00041080 */   sll      $v0, $a0, 2
-/* 8548A4 80242734 3C058025 */  lui       $a1, 0x8025
-/* 8548A8 80242738 24A52BC8 */  addiu     $a1, $a1, 0x2bc8
+/* 8548A4 80242734 3C058025 */  lui       $a1, %hi(D_80252BC8)
+/* 8548A8 80242738 24A52BC8 */  addiu     $a1, $a1, %lo(D_80252BC8)
 .L8024273C:
 /* 8548AC 8024273C 24630004 */  addiu     $v1, $v1, 4
 /* 8548B0 80242740 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_80242708_854878
 /* 8548C0 80242750 24A50004 */   addiu    $a1, $a1, 4
 /* 8548C4 80242754 00041080 */  sll       $v0, $a0, 2
 .L80242758:
-/* 8548C8 80242758 3C018025 */  lui       $at, 0x8025
+/* 8548C8 80242758 3C018025 */  lui       $at, %hi(D_80252BC8)
 /* 8548CC 8024275C 00220821 */  addu      $at, $at, $v0
-/* 8548D0 80242760 AC202BC8 */  sw        $zero, 0x2bc8($at)
+/* 8548D0 80242760 AC202BC8 */  sw        $zero, %lo(D_80252BC8)($at)
 /* 8548D4 80242764 080909E5 */  j         .L80242794
 /* 8548D8 80242768 00000000 */   nop      
 .L8024276C:
-/* 8548DC 8024276C 3C038025 */  lui       $v1, 0x8025
-/* 8548E0 80242770 24632BC8 */  addiu     $v1, $v1, 0x2bc8
+/* 8548DC 8024276C 3C038025 */  lui       $v1, %hi(D_80252BC8)
+/* 8548E0 80242770 24632BC8 */  addiu     $v1, $v1, %lo(D_80252BC8)
 /* 8548E4 80242774 0060282D */  daddu     $a1, $v1, $zero
 .L80242778:
 /* 8548E8 80242778 24820080 */  addiu     $v0, $a0, 0x80
diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242A20_854B90.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242A20_854B90.s
index c2bd2f3dd9..6ba48cf339 100644
--- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242A20_854B90.s
+++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242A20_854B90.s
@@ -15,7 +15,7 @@ glabel func_80242A20_854B90
 /* 854BB8 80242A48 8FBF0014 */  lw        $ra, 0x14($sp)
 /* 854BBC 80242A4C 8FB00010 */  lw        $s0, 0x10($sp)
 /* 854BC0 80242A50 24020002 */  addiu     $v0, $zero, 2
-/* 854BC4 80242A54 3C018025 */  lui       $at, 0x8025
-/* 854BC8 80242A58 AC232D38 */  sw        $v1, 0x2d38($at)
+/* 854BC4 80242A54 3C018025 */  lui       $at, %hi(D_80252D38)
+/* 854BC8 80242A58 AC232D38 */  sw        $v1, %lo(D_80252D38)($at)
 /* 854BCC 80242A5C 03E00008 */  jr        $ra
 /* 854BD0 80242A60 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242A64_854BD4.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242A64_854BD4.s
index b6ee9dcbbc..afee376f02 100644
--- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242A64_854BD4.s
+++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242A64_854BD4.s
@@ -6,8 +6,8 @@ glabel func_80242A64_854BD4
 /* 854BD8 80242A68 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 854BDC 80242A6C 0C00EABB */  jal       get_npc_unsafe
 /* 854BE0 80242A70 8C84008C */   lw       $a0, 0x8c($a0)
-/* 854BE4 80242A74 3C038025 */  lui       $v1, 0x8025
-/* 854BE8 80242A78 8C632D38 */  lw        $v1, 0x2d38($v1)
+/* 854BE4 80242A74 3C038025 */  lui       $v1, %hi(D_80252D38)
+/* 854BE8 80242A78 8C632D38 */  lw        $v1, %lo(D_80252D38)($v1)
 /* 854BEC 80242A7C AC430028 */  sw        $v1, 0x28($v0)
 /* 854BF0 80242A80 8FBF0010 */  lw        $ra, 0x10($sp)
 /* 854BF4 80242A84 24020002 */  addiu     $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242A90_854C00.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242A90_854C00.s
index 3c3a5e1861..74e74843a8 100644
--- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242A90_854C00.s
+++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242A90_854C00.s
@@ -30,9 +30,9 @@ glabel func_80242A90_854C00
 /* 854C64 80242AF4 2E220005 */  sltiu     $v0, $s1, 5
 /* 854C68 80242AF8 10400024 */  beqz      $v0, .L80242B8C
 /* 854C6C 80242AFC 00111080 */   sll      $v0, $s1, 2
-/* 854C70 80242B00 3C018025 */  lui       $at, 0x8025
+/* 854C70 80242B00 3C018025 */  lui       $at, %hi(D_80252950)
 /* 854C74 80242B04 00220821 */  addu      $at, $at, $v0
-/* 854C78 80242B08 8C222950 */  lw        $v0, 0x2950($at)
+/* 854C78 80242B08 8C222950 */  lw        $v0, %lo(D_80252950)($at)
 /* 854C7C 80242B0C 00400008 */  jr        $v0
 /* 854C80 80242B10 00000000 */   nop      
 /* 854C84 80242B14 3C01425C */  lui       $at, 0x425c
diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_802430B4_855224.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_802430B4_855224.s
index f12830fac7..86e6e2435f 100644
--- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_802430B4_855224.s
+++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_802430B4_855224.s
@@ -51,8 +51,8 @@ glabel func_802430B4_855224
 /* 8552DC 8024316C 00000000 */  nop       
 /* 8552E0 80243170 45000004 */  bc1f      .L80243184
 /* 8552E4 80243174 00000000 */   nop      
-/* 8552E8 80243178 3C108011 */  lui       $s0, 0x8011
-/* 8552EC 8024317C 8E10C978 */  lw        $s0, -0x3688($s0)
+/* 8552E8 80243178 3C108011 */  lui       $s0, %hi(D_8010C978)
+/* 8552EC 8024317C 8E10C978 */  lw        $s0, %lo(D_8010C978)($s0)
 .L80243180:
 /* 8552F0 80243180 0240202D */  daddu     $a0, $s2, $zero
 .L80243184:
diff --git a/asm/nonmatchings/world/area_mac/mac_05/855560/func_8024343C_8555AC.s b/asm/nonmatchings/world/area_mac/mac_05/855560/func_8024343C_8555AC.s
index 665639e1f0..b04a633273 100644
--- a/asm/nonmatchings/world/area_mac/mac_05/855560/func_8024343C_8555AC.s
+++ b/asm/nonmatchings/world/area_mac/mac_05/855560/func_8024343C_8555AC.s
@@ -25,8 +25,8 @@ glabel func_8024343C_8555AC
 /* 8555FC 8024348C 0040802D */  daddu     $s0, $v0, $zero
 /* 855600 80243490 12000034 */  beqz      $s0, .L80243564
 /* 855604 80243494 24020002 */   addiu    $v0, $zero, 2
-/* 855608 80243498 3C038025 */  lui       $v1, 0x8025
-/* 85560C 8024349C 24630A50 */  addiu     $v1, $v1, 0xa50
+/* 855608 80243498 3C038025 */  lui       $v1, %hi(D_80250A50)
+/* 85560C 8024349C 24630A50 */  addiu     $v1, $v1, %lo(D_80250A50)
 /* 855610 802434A0 8C640000 */  lw        $a0, ($v1)
 /* 855614 802434A4 24820004 */  addiu     $v0, $a0, 4
 /* 855618 802434A8 AC620000 */  sw        $v0, ($v1)
@@ -50,8 +50,8 @@ glabel func_8024343C_8555AC
 /* 85565C 802434EC 14620011 */  bne       $v1, $v0, .L80243534
 /* 855660 802434F0 0220202D */   daddu    $a0, $s1, $zero
 .L802434F4:
-/* 855664 802434F4 3C028025 */  lui       $v0, 0x8025
-/* 855668 802434F8 8C420A50 */  lw        $v0, 0xa50($v0)
+/* 855664 802434F4 3C028025 */  lui       $v0, %hi(D_80250A50)
+/* 855668 802434F8 8C420A50 */  lw        $v0, %lo(D_80250A50)($v0)
 /* 85566C 802434FC 44826000 */  mtc1      $v0, $f12
 /* 855670 80243500 00000000 */  nop       
 /* 855674 80243504 04410006 */  bgez      $v0, .L80243520
diff --git a/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243588_8556F8.s b/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243588_8556F8.s
index 4e6a0527ca..c34b071353 100644
--- a/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243588_8556F8.s
+++ b/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243588_8556F8.s
@@ -31,9 +31,9 @@ glabel func_80243588_8556F8
 /* 855760 802435F0 2C62000D */  sltiu     $v0, $v1, 0xd
 /* 855764 802435F4 1040000B */  beqz      $v0, .L80243624
 /* 855768 802435F8 00031080 */   sll      $v0, $v1, 2
-/* 85576C 802435FC 3C018025 */  lui       $at, 0x8025
+/* 85576C 802435FC 3C018025 */  lui       $at, %hi(D_80252970)
 /* 855770 80243600 00220821 */  addu      $at, $at, $v0
-/* 855774 80243604 8C222970 */  lw        $v0, 0x2970($at)
+/* 855774 80243604 8C222970 */  lw        $v0, %lo(D_80252970)($at)
 /* 855778 80243608 00400008 */  jr        $v0
 /* 85577C 8024360C 00000000 */   nop      
 /* 855780 80243610 8E020000 */  lw        $v0, ($s0)
diff --git a/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243800_855970.s b/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243800_855970.s
index 8bf7242982..b5548d018d 100644
--- a/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243800_855970.s
+++ b/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243800_855970.s
@@ -11,15 +11,15 @@ glabel func_80243800_855970
 /* 855988 80243818 AFB10024 */  sw        $s1, 0x24($sp)
 /* 85598C 8024381C 0C0470AC */  jal       func_8011C2B0
 /* 855990 80243820 AFB00020 */   sw       $s0, 0x20($sp)
-/* 855994 80243824 3C118025 */  lui       $s1, 0x8025
-/* 855998 80243828 26310A54 */  addiu     $s1, $s1, 0xa54
+/* 855994 80243824 3C118025 */  lui       $s1, %hi(D_80250A54)
+/* 855998 80243828 26310A54 */  addiu     $s1, $s1, %lo(D_80250A54)
 /* 85599C 8024382C 8FA40010 */  lw        $a0, 0x10($sp)
 /* 8559A0 80243830 8FA50014 */  lw        $a1, 0x14($sp)
 /* 8559A4 80243834 8FA60018 */  lw        $a2, 0x18($sp)
 /* 8559A8 80243838 0C090D62 */  jal       func_80243588_8556F8
 /* 8559AC 8024383C 0220382D */   daddu    $a3, $s1, $zero
-/* 8559B0 80243840 3C03800A */  lui       $v1, 0x800a
-/* 8559B4 80243844 2463A66C */  addiu     $v1, $v1, -0x5994
+/* 8559B0 80243840 3C03800A */  lui       $v1, %hi(D_8009A66C)
+/* 8559B4 80243844 2463A66C */  addiu     $v1, $v1, %lo(D_8009A66C)
 /* 8559B8 80243848 8C620000 */  lw        $v0, ($v1)
 /* 8559BC 8024384C 24040001 */  addiu     $a0, $zero, 1
 /* 8559C0 80243850 0040802D */  daddu     $s0, $v0, $zero
diff --git a/asm/nonmatchings/world/area_mac/mac_05/855560/func_802438A4_855A14.s b/asm/nonmatchings/world/area_mac/mac_05/855560/func_802438A4_855A14.s
index b4ce4c2aa2..b742c28908 100644
--- a/asm/nonmatchings/world/area_mac/mac_05/855560/func_802438A4_855A14.s
+++ b/asm/nonmatchings/world/area_mac/mac_05/855560/func_802438A4_855A14.s
@@ -11,15 +11,15 @@ glabel func_802438A4_855A14
 /* 855A2C 802438BC AFB10024 */  sw        $s1, 0x24($sp)
 /* 855A30 802438C0 0C0470AC */  jal       func_8011C2B0
 /* 855A34 802438C4 AFB00020 */   sw       $s0, 0x20($sp)
-/* 855A38 802438C8 3C118025 */  lui       $s1, 0x8025
-/* 855A3C 802438CC 26310A58 */  addiu     $s1, $s1, 0xa58
+/* 855A38 802438C8 3C118025 */  lui       $s1, %hi(D_80250A58)
+/* 855A3C 802438CC 26310A58 */  addiu     $s1, $s1, %lo(D_80250A58)
 /* 855A40 802438D0 8FA40010 */  lw        $a0, 0x10($sp)
 /* 855A44 802438D4 8FA50014 */  lw        $a1, 0x14($sp)
 /* 855A48 802438D8 8FA60018 */  lw        $a2, 0x18($sp)
 /* 855A4C 802438DC 0C090D62 */  jal       func_80243588_8556F8
 /* 855A50 802438E0 0220382D */   daddu    $a3, $s1, $zero
-/* 855A54 802438E4 3C03800A */  lui       $v1, 0x800a
-/* 855A58 802438E8 2463A66C */  addiu     $v1, $v1, -0x5994
+/* 855A54 802438E4 3C03800A */  lui       $v1, %hi(D_8009A66C)
+/* 855A58 802438E8 2463A66C */  addiu     $v1, $v1, %lo(D_8009A66C)
 /* 855A5C 802438EC 8C620000 */  lw        $v0, ($v1)
 /* 855A60 802438F0 24040002 */  addiu     $a0, $zero, 2
 /* 855A64 802438F4 0040802D */  daddu     $s0, $v0, $zero
diff --git a/asm/nonmatchings/world/area_mac/mac_05/855F20/func_80243DB0_855F20.s b/asm/nonmatchings/world/area_mac/mac_05/855F20/func_80243DB0_855F20.s
index ee2569fe9f..6bc9ba8fda 100644
--- a/asm/nonmatchings/world/area_mac/mac_05/855F20/func_80243DB0_855F20.s
+++ b/asm/nonmatchings/world/area_mac/mac_05/855F20/func_80243DB0_855F20.s
@@ -62,9 +62,9 @@ glabel func_80243DB0_855F20
 /* 855FF8 80243E88 1040001E */  beqz      $v0, .L80243F04
 /* 855FFC 80243E8C 46003001 */   sub.s    $f0, $f6, $f0
 /* 856000 80243E90 00031080 */  sll       $v0, $v1, 2
-/* 856004 80243E94 3C018025 */  lui       $at, 0x8025
+/* 856004 80243E94 3C018025 */  lui       $at, %hi(D_802529B0)
 /* 856008 80243E98 00220821 */  addu      $at, $at, $v0
-/* 85600C 80243E9C 8C2229B0 */  lw        $v0, 0x29b0($at)
+/* 85600C 80243E9C 8C2229B0 */  lw        $v0, %lo(D_802529B0)($at)
 /* 856010 80243EA0 00400008 */  jr        $v0
 /* 856014 80243EA4 00000000 */   nop      
 /* 856018 80243EA8 E4E60000 */  swc1      $f6, ($a3)
diff --git a/asm/nonmatchings/world/area_mac/mac_05/855F20/func_80243F0C_85607C.s b/asm/nonmatchings/world/area_mac/mac_05/855F20/func_80243F0C_85607C.s
index 1f62cb87ef..2eadb8fc4b 100644
--- a/asm/nonmatchings/world/area_mac/mac_05/855F20/func_80243F0C_85607C.s
+++ b/asm/nonmatchings/world/area_mac/mac_05/855F20/func_80243F0C_85607C.s
@@ -35,8 +35,8 @@ glabel func_80243F0C_85607C
 /* 8560F0 80243F80 468010A0 */  cvt.s.w   $f2, $f2
 /* 8560F4 80243F84 46020003 */  div.s     $f0, $f0, $f2
 /* 8560F8 80243F88 00111900 */  sll       $v1, $s1, 4
-/* 8560FC 80243F8C 3C018025 */  lui       $at, 0x8025
-/* 856100 80243F90 C4242744 */  lwc1      $f4, 0x2744($at)
+/* 8560FC 80243F8C 3C018025 */  lui       $at, %hi(D_80252744)
+/* 856100 80243F90 C4242744 */  lwc1      $f4, %lo(D_80252744)($at)
 /* 856104 80243F94 8FA2001C */  lw        $v0, 0x1c($sp)
 /* 856108 80243F98 46002300 */  add.s     $f12, $f4, $f0
 /* 85610C 80243F9C 00431021 */  addu      $v0, $v0, $v1
@@ -119,8 +119,8 @@ glabel func_80243F0C_85607C
 /* 856224 802440B4 1440FFAD */  bnez      $v0, .L80243F6C
 /* 856228 802440B8 00000000 */   nop      
 .L802440BC:
-/* 85622C 802440BC 3C03800A */  lui       $v1, 0x800a
-/* 856230 802440C0 2463A66C */  addiu     $v1, $v1, -0x5994
+/* 85622C 802440BC 3C03800A */  lui       $v1, %hi(D_8009A66C)
+/* 856230 802440C0 2463A66C */  addiu     $v1, $v1, %lo(D_8009A66C)
 /* 856234 802440C4 8C620000 */  lw        $v0, ($v1)
 /* 856238 802440C8 24040003 */  addiu     $a0, $zero, 3
 /* 85623C 802440CC 0040802D */  daddu     $s0, $v0, $zero
@@ -129,11 +129,11 @@ glabel func_80243F0C_85607C
 /* 856248 802440D8 3C02DE00 */  lui       $v0, 0xde00
 /* 85624C 802440DC 0C0470BB */  jal       func_8011C2EC
 /* 856250 802440E0 AE020000 */   sw       $v0, ($s0)
-/* 856254 802440E4 3C038025 */  lui       $v1, 0x8025
-/* 856258 802440E8 24632744 */  addiu     $v1, $v1, 0x2744
+/* 856254 802440E4 3C038025 */  lui       $v1, %hi(D_80252744)
+/* 856258 802440E8 24632744 */  addiu     $v1, $v1, %lo(D_80252744)
 /* 85625C 802440EC C4600000 */  lwc1      $f0, ($v1)
-/* 856260 802440F0 3C018025 */  lui       $at, 0x8025
-/* 856264 802440F4 D42229C8 */  ldc1      $f2, 0x29c8($at)
+/* 856260 802440F0 3C018025 */  lui       $at, %hi(D_802529C8)
+/* 856264 802440F4 D42229C8 */  ldc1      $f2, %lo(D_802529C8)($at)
 /* 856268 802440F8 46000021 */  cvt.d.s   $f0, $f0
 /* 85626C 802440FC 46220000 */  add.d     $f0, $f0, $f2
 /* 856270 80244100 AE020004 */  sw        $v0, 4($s0)
diff --git a/asm/nonmatchings/world/area_mac/mac_06/865000/func_8024050C_86504C.s b/asm/nonmatchings/world/area_mac/mac_06/865000/func_8024050C_86504C.s
index 68d37c1aab..ec2edf61c9 100644
--- a/asm/nonmatchings/world/area_mac/mac_06/865000/func_8024050C_86504C.s
+++ b/asm/nonmatchings/world/area_mac/mac_06/865000/func_8024050C_86504C.s
@@ -25,8 +25,8 @@ glabel func_8024050C_86504C
 /* 86509C 8024055C 0040802D */  daddu     $s0, $v0, $zero
 /* 8650A0 80240560 12000034 */  beqz      $s0, .L80240634
 /* 8650A4 80240564 24020002 */   addiu    $v0, $zero, 2
-/* 8650A8 80240568 3C038024 */  lui       $v1, 0x8024
-/* 8650AC 8024056C 24631B60 */  addiu     $v1, $v1, 0x1b60
+/* 8650A8 80240568 3C038024 */  lui       $v1, %hi(D_80241B60)
+/* 8650AC 8024056C 24631B60 */  addiu     $v1, $v1, %lo(D_80241B60)
 /* 8650B0 80240570 8C640000 */  lw        $a0, ($v1)
 /* 8650B4 80240574 24820004 */  addiu     $v0, $a0, 4
 /* 8650B8 80240578 AC620000 */  sw        $v0, ($v1)
@@ -50,8 +50,8 @@ glabel func_8024050C_86504C
 /* 8650FC 802405BC 14620011 */  bne       $v1, $v0, .L80240604
 /* 865100 802405C0 0220202D */   daddu    $a0, $s1, $zero
 .L802405C4:
-/* 865104 802405C4 3C028024 */  lui       $v0, 0x8024
-/* 865108 802405C8 8C421B60 */  lw        $v0, 0x1b60($v0)
+/* 865104 802405C4 3C028024 */  lui       $v0, %hi(D_80241B60)
+/* 865108 802405C8 8C421B60 */  lw        $v0, %lo(D_80241B60)($v0)
 /* 86510C 802405CC 44826000 */  mtc1      $v0, $f12
 /* 865110 802405D0 00000000 */  nop       
 /* 865114 802405D4 04410006 */  bgez      $v0, .L802405F0
diff --git a/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240658_865198.s b/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240658_865198.s
index 8ed973a8fe..240e54177e 100644
--- a/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240658_865198.s
+++ b/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240658_865198.s
@@ -31,9 +31,9 @@ glabel func_80240658_865198
 /* 865200 802406C0 2C62000D */  sltiu     $v0, $v1, 0xd
 /* 865204 802406C4 1040000B */  beqz      $v0, .L802406F4
 /* 865208 802406C8 00031080 */   sll      $v0, $v1, 2
-/* 86520C 802406CC 3C018024 */  lui       $at, 0x8024
+/* 86520C 802406CC 3C018024 */  lui       $at, %hi(D_80244910)
 /* 865210 802406D0 00220821 */  addu      $at, $at, $v0
-/* 865214 802406D4 8C224910 */  lw        $v0, 0x4910($at)
+/* 865214 802406D4 8C224910 */  lw        $v0, %lo(D_80244910)($at)
 /* 865218 802406D8 00400008 */  jr        $v0
 /* 86521C 802406DC 00000000 */   nop      
 /* 865220 802406E0 8E020000 */  lw        $v0, ($s0)
diff --git a/asm/nonmatchings/world/area_mac/mac_06/865000/func_802408D0_865410.s b/asm/nonmatchings/world/area_mac/mac_06/865000/func_802408D0_865410.s
index fc696806de..e803fbc3c7 100644
--- a/asm/nonmatchings/world/area_mac/mac_06/865000/func_802408D0_865410.s
+++ b/asm/nonmatchings/world/area_mac/mac_06/865000/func_802408D0_865410.s
@@ -11,15 +11,15 @@ glabel func_802408D0_865410
 /* 865428 802408E8 AFB10024 */  sw        $s1, 0x24($sp)
 /* 86542C 802408EC 0C0470AC */  jal       func_8011C2B0
 /* 865430 802408F0 AFB00020 */   sw       $s0, 0x20($sp)
-/* 865434 802408F4 3C118024 */  lui       $s1, 0x8024
-/* 865438 802408F8 26311B64 */  addiu     $s1, $s1, 0x1b64
+/* 865434 802408F4 3C118024 */  lui       $s1, %hi(D_80241B64)
+/* 865438 802408F8 26311B64 */  addiu     $s1, $s1, %lo(D_80241B64)
 /* 86543C 802408FC 8FA40010 */  lw        $a0, 0x10($sp)
 /* 865440 80240900 8FA50014 */  lw        $a1, 0x14($sp)
 /* 865444 80240904 8FA60018 */  lw        $a2, 0x18($sp)
 /* 865448 80240908 0C090196 */  jal       func_80240658_865198
 /* 86544C 8024090C 0220382D */   daddu    $a3, $s1, $zero
-/* 865450 80240910 3C03800A */  lui       $v1, 0x800a
-/* 865454 80240914 2463A66C */  addiu     $v1, $v1, -0x5994
+/* 865450 80240910 3C03800A */  lui       $v1, %hi(D_8009A66C)
+/* 865454 80240914 2463A66C */  addiu     $v1, $v1, %lo(D_8009A66C)
 /* 865458 80240918 8C620000 */  lw        $v0, ($v1)
 /* 86545C 8024091C 24040001 */  addiu     $a0, $zero, 1
 /* 865460 80240920 0040802D */  daddu     $s0, $v0, $zero
diff --git a/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240974_8654B4.s b/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240974_8654B4.s
index da4edfbdb6..3be69534ab 100644
--- a/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240974_8654B4.s
+++ b/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240974_8654B4.s
@@ -11,15 +11,15 @@ glabel func_80240974_8654B4
 /* 8654CC 8024098C AFB10024 */  sw        $s1, 0x24($sp)
 /* 8654D0 80240990 0C0470AC */  jal       func_8011C2B0
 /* 8654D4 80240994 AFB00020 */   sw       $s0, 0x20($sp)
-/* 8654D8 80240998 3C118024 */  lui       $s1, 0x8024
-/* 8654DC 8024099C 26311B68 */  addiu     $s1, $s1, 0x1b68
+/* 8654D8 80240998 3C118024 */  lui       $s1, %hi(D_80241B68)
+/* 8654DC 8024099C 26311B68 */  addiu     $s1, $s1, %lo(D_80241B68)
 /* 8654E0 802409A0 8FA40010 */  lw        $a0, 0x10($sp)
 /* 8654E4 802409A4 8FA50014 */  lw        $a1, 0x14($sp)
 /* 8654E8 802409A8 8FA60018 */  lw        $a2, 0x18($sp)
 /* 8654EC 802409AC 0C090196 */  jal       func_80240658_865198
 /* 8654F0 802409B0 0220382D */   daddu    $a3, $s1, $zero
-/* 8654F4 802409B4 3C03800A */  lui       $v1, 0x800a
-/* 8654F8 802409B8 2463A66C */  addiu     $v1, $v1, -0x5994
+/* 8654F4 802409B4 3C03800A */  lui       $v1, %hi(D_8009A66C)
+/* 8654F8 802409B8 2463A66C */  addiu     $v1, $v1, %lo(D_8009A66C)
 /* 8654FC 802409BC 8C620000 */  lw        $v0, ($v1)
 /* 865500 802409C0 24040002 */  addiu     $a0, $zero, 2
 /* 865504 802409C4 0040802D */  daddu     $s0, $v0, $zero
diff --git a/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_80240E80_8659C0.s b/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_80240E80_8659C0.s
index cf4ad8e0f6..6c8ceefa07 100644
--- a/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_80240E80_8659C0.s
+++ b/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_80240E80_8659C0.s
@@ -79,8 +79,8 @@ glabel func_80240E80_8659C0
 .L80240F94:
 /* 865AD4 80240F94 3C028011 */  lui       $v0, %hi(gPlayerStatus)
 /* 865AD8 80240F98 2442EFC8 */  addiu     $v0, $v0, %lo(gPlayerStatus)
-/* 865ADC 80240F9C 3C018024 */  lui       $at, 0x8024
-/* 865AE0 80240FA0 C4203434 */  lwc1      $f0, 0x3434($at)
+/* 865ADC 80240F9C 3C018024 */  lui       $at, %hi(D_80243434)
+/* 865AE0 80240FA0 C4203434 */  lwc1      $f0, %lo(D_80243434)($at)
 /* 865AE4 80240FA4 3C030001 */  lui       $v1, 1
 /* 865AE8 80240FA8 4600A000 */  add.s     $f0, $f20, $f0
 /* 865AEC 80240FAC E4580028 */  swc1      $f24, 0x28($v0)
diff --git a/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_80241098_865BD8.s b/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_80241098_865BD8.s
index 73d01b573f..0d85f225f1 100644
--- a/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_80241098_865BD8.s
+++ b/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_80241098_865BD8.s
@@ -10,8 +10,8 @@ glabel func_80241098_865BD8
 /* 865BEC 802410AC 8C500010 */  lw        $s0, 0x10($v0)
 /* 865BF0 802410B0 0C00EAD2 */  jal       get_npc_safe
 /* 865BF4 802410B4 0000202D */   daddu    $a0, $zero, $zero
-/* 865BF8 802410B8 3C048024 */  lui       $a0, 0x8024
-/* 865BFC 802410BC 2484343C */  addiu     $a0, $a0, 0x343c
+/* 865BF8 802410B8 3C048024 */  lui       $a0, %hi(D_8024343C)
+/* 865BFC 802410BC 2484343C */  addiu     $a0, $a0, %lo(D_8024343C)
 /* 865C00 802410C0 8C830000 */  lw        $v1, ($a0)
 /* 865C04 802410C4 1060000E */  beqz      $v1, .L80241100
 /* 865C08 802410C8 0040282D */   daddu    $a1, $v0, $zero
@@ -35,8 +35,8 @@ glabel func_80241098_865BD8
 /* 865C4C 8024110C 0809049F */  j         .L8024127C
 /* 865C50 80241110 AC820000 */   sw       $v0, ($a0)
 .L80241114:
-/* 865C54 80241114 3C048024 */  lui       $a0, 0x8024
-/* 865C58 80241118 24843440 */  addiu     $a0, $a0, 0x3440
+/* 865C54 80241114 3C048024 */  lui       $a0, %hi(D_80243440)
+/* 865C58 80241118 24843440 */  addiu     $a0, $a0, %lo(D_80243440)
 /* 865C5C 8024111C 8C830000 */  lw        $v1, ($a0)
 /* 865C60 80241120 28620096 */  slti      $v0, $v1, 0x96
 /* 865C64 80241124 14400003 */  bnez      $v0, .L80241134
@@ -53,18 +53,18 @@ glabel func_80241098_865BD8
 /* 865C88 80241148 34420009 */  ori       $v0, $v0, 9
 /* 865C8C 8024114C ACA20028 */  sw        $v0, 0x28($a1)
 /* 865C90 80241150 2402000B */  addiu     $v0, $zero, 0xb
-/* 865C94 80241154 3C018024 */  lui       $at, 0x8024
-/* 865C98 80241158 AC203434 */  sw        $zero, 0x3434($at)
+/* 865C94 80241154 3C018024 */  lui       $at, %hi(D_80243434)
+/* 865C98 80241158 AC203434 */  sw        $zero, %lo(D_80243434)($at)
 /* 865C9C 8024115C AC820000 */  sw        $v0, ($a0)
-/* 865CA0 80241160 3C018024 */  lui       $at, 0x8024
-/* 865CA4 80241164 E4203438 */  swc1      $f0, 0x3438($at)
+/* 865CA0 80241160 3C018024 */  lui       $at, %hi(D_80243438)
+/* 865CA4 80241164 E4203438 */  swc1      $f0, %lo(D_80243438)($at)
 /* 865CA8 80241168 080904A0 */  j         .L80241280
 /* 865CAC 8024116C 0000102D */   daddu    $v0, $zero, $zero
 .L80241170:
-/* 865CB0 80241170 3C028024 */  lui       $v0, 0x8024
-/* 865CB4 80241174 24423434 */  addiu     $v0, $v0, 0x3434
-/* 865CB8 80241178 3C038024 */  lui       $v1, 0x8024
-/* 865CBC 8024117C 24633438 */  addiu     $v1, $v1, 0x3438
+/* 865CB0 80241170 3C028024 */  lui       $v0, %hi(D_80243434)
+/* 865CB4 80241174 24423434 */  addiu     $v0, $v0, %lo(D_80243434)
+/* 865CB8 80241178 3C038024 */  lui       $v1, %hi(D_80243438)
+/* 865CBC 8024117C 24633438 */  addiu     $v1, $v1, %lo(D_80243438)
 /* 865CC0 80241180 C4400000 */  lwc1      $f0, ($v0)
 /* 865CC4 80241184 C4640000 */  lwc1      $f4, ($v1)
 /* 865CC8 80241188 46040000 */  add.s     $f0, $f0, $f4
@@ -100,21 +100,21 @@ glabel func_80241098_865BD8
 /* 865D34 802411F4 34630001 */  ori       $v1, $v1, 1
 /* 865D38 802411F8 14430021 */  bne       $v0, $v1, .L80241280
 /* 865D3C 802411FC 0000102D */   daddu    $v0, $zero, $zero
-/* 865D40 80241200 3C038024 */  lui       $v1, 0x8024
-/* 865D44 80241204 2463343C */  addiu     $v1, $v1, 0x343c
+/* 865D40 80241200 3C038024 */  lui       $v1, %hi(D_8024343C)
+/* 865D44 80241204 2463343C */  addiu     $v1, $v1, %lo(D_8024343C)
 /* 865D48 80241208 8C620000 */  lw        $v0, ($v1)
 /* 865D4C 8024120C 3C014080 */  lui       $at, 0x4080
 /* 865D50 80241210 44810000 */  mtc1      $at, $f0
 /* 865D54 80241214 24420001 */  addiu     $v0, $v0, 1
-/* 865D58 80241218 3C018024 */  lui       $at, 0x8024
-/* 865D5C 8024121C E4203438 */  swc1      $f0, 0x3438($at)
+/* 865D58 80241218 3C018024 */  lui       $at, %hi(D_80243438)
+/* 865D5C 8024121C E4203438 */  swc1      $f0, %lo(D_80243438)($at)
 /* 865D60 80241220 0809049F */  j         .L8024127C
 /* 865D64 80241224 AC620000 */   sw       $v0, ($v1)
 .L80241228:
-/* 865D68 80241228 3C028024 */  lui       $v0, 0x8024
-/* 865D6C 8024122C 24423434 */  addiu     $v0, $v0, 0x3434
-/* 865D70 80241230 3C038024 */  lui       $v1, 0x8024
-/* 865D74 80241234 24633438 */  addiu     $v1, $v1, 0x3438
+/* 865D68 80241228 3C028024 */  lui       $v0, %hi(D_80243434)
+/* 865D6C 8024122C 24423434 */  addiu     $v0, $v0, %lo(D_80243434)
+/* 865D70 80241230 3C038024 */  lui       $v1, %hi(D_80243438)
+/* 865D74 80241234 24633438 */  addiu     $v1, $v1, %lo(D_80243438)
 /* 865D78 80241238 C4400000 */  lwc1      $f0, ($v0)
 /* 865D7C 8024123C C4620000 */  lwc1      $f2, ($v1)
 /* 865D80 80241240 46020001 */  sub.s     $f0, $f0, $f2
diff --git a/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_80241388_865EC8.s b/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_80241388_865EC8.s
index d1ed2674c5..9cd606492d 100644
--- a/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_80241388_865EC8.s
+++ b/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_80241388_865EC8.s
@@ -143,8 +143,8 @@ glabel func_80241388_865EC8
 .L802415A0:
 /* 8660E0 802415A0 4616A001 */  sub.s     $f0, $f20, $f22
 .L802415A4:
-/* 8660E4 802415A4 3C018024 */  lui       $at, 0x8024
-/* 8660E8 802415A8 D4224968 */  ldc1      $f2, 0x4968($at)
+/* 8660E4 802415A4 3C018024 */  lui       $at, %hi(D_80244968)
+/* 8660E8 802415A8 D4224968 */  ldc1      $f2, %lo(D_80244968)($at)
 /* 8660EC 802415AC 46000021 */  cvt.d.s   $f0, $f0
 /* 8660F0 802415B0 46220002 */  mul.d     $f0, $f0, $f2
 /* 8660F4 802415B4 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_mac/machi/7E73A0/func_80240000_7E73A0.s b/asm/nonmatchings/world/area_mac/machi/7E73A0/func_80240000_7E73A0.s
index e9feda4933..e4559b7fb1 100644
--- a/asm/nonmatchings/world/area_mac/machi/7E73A0/func_80240000_7E73A0.s
+++ b/asm/nonmatchings/world/area_mac/machi/7E73A0/func_80240000_7E73A0.s
@@ -2,14 +2,14 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80240000_7E73A0
-/* 7E73A0 80240000 3C038024 */  lui       $v1, 0x8024
-/* 7E73A4 80240004 246307E0 */  addiu     $v1, $v1, 0x7e0
+/* 7E73A0 80240000 3C038024 */  lui       $v1, %hi(D_802407E0)
+/* 7E73A4 80240004 246307E0 */  addiu     $v1, $v1, %lo(D_802407E0)
 .L80240008:
 /* 7E73A8 80240008 8C620000 */  lw        $v0, ($v1)
 /* 7E73AC 8024000C 1440FFFE */  bnez      $v0, .L80240008
 /* 7E73B0 80240010 24630010 */   addiu    $v1, $v1, 0x10
-/* 7E73B4 80240014 3C038024 */  lui       $v1, 0x8024
-/* 7E73B8 80240018 246309F0 */  addiu     $v1, $v1, 0x9f0
+/* 7E73B4 80240014 3C038024 */  lui       $v1, %hi(D_802409F0)
+/* 7E73B8 80240018 246309F0 */  addiu     $v1, $v1, %lo(D_802409F0)
 .L8024001C:
 /* 7E73BC 8024001C 8C620000 */  lw        $v0, ($v1)
 /* 7E73C0 80240020 1440FFFE */  bnez      $v0, .L8024001C
diff --git a/asm/nonmatchings/world/area_mac/machi/7E7550/func_802401B0_7E7550.s b/asm/nonmatchings/world/area_mac/machi/7E7550/func_802401B0_7E7550.s
index c310ffa3e8..00597cfcb1 100644
--- a/asm/nonmatchings/world/area_mac/machi/7E7550/func_802401B0_7E7550.s
+++ b/asm/nonmatchings/world/area_mac/machi/7E7550/func_802401B0_7E7550.s
@@ -37,8 +37,8 @@ glabel func_802401B0_7E7550
 /* 7E75D0 80240230 24500032 */   addiu    $s0, $v0, 0x32
 /* 7E75D4 80240234 0240202D */  daddu     $a0, $s2, $zero
 /* 7E75D8 80240238 2405FFFF */  addiu     $a1, $zero, -1
-/* 7E75DC 8024023C 3C068024 */  lui       $a2, 0x8024
-/* 7E75E0 80240240 24C61180 */  addiu     $a2, $a2, 0x1180
+/* 7E75DC 8024023C 3C068024 */  lui       $a2, %hi(D_80241180)
+/* 7E75E0 80240240 24C61180 */  addiu     $a2, $a2, %lo(D_80241180)
 /* 7E75E4 80240244 4407B000 */  mfc1      $a3, $f22
 /* 7E75E8 80240248 080900AE */  j         .L802402B8
 /* 7E75EC 8024024C 24420064 */   addiu    $v0, $v0, 0x64
@@ -65,8 +65,8 @@ glabel func_802401B0_7E7550
 /* 7E763C 8024029C 24500032 */   addiu    $s0, $v0, 0x32
 /* 7E7640 802402A0 0240202D */  daddu     $a0, $s2, $zero
 /* 7E7644 802402A4 0220282D */  daddu     $a1, $s1, $zero
-/* 7E7648 802402A8 3C068024 */  lui       $a2, 0x8024
-/* 7E764C 802402AC 24C61180 */  addiu     $a2, $a2, 0x1180
+/* 7E7648 802402A8 3C068024 */  lui       $a2, %hi(D_80241180)
+/* 7E764C 802402AC 24C61180 */  addiu     $a2, $a2, %lo(D_80241180)
 /* 7E7650 802402B0 4407B000 */  mfc1      $a3, $f22
 /* 7E7654 802402B4 2442000A */  addiu     $v0, $v0, 0xa
 .L802402B8:
diff --git a/asm/nonmatchings/world/area_mac/machi/7E7850/func_802404B0_7E7850.s b/asm/nonmatchings/world/area_mac/machi/7E7850/func_802404B0_7E7850.s
index 91448d9e0e..78de8def7b 100644
--- a/asm/nonmatchings/world/area_mac/machi/7E7850/func_802404B0_7E7850.s
+++ b/asm/nonmatchings/world/area_mac/machi/7E7850/func_802404B0_7E7850.s
@@ -81,8 +81,8 @@ glabel func_802404B0_7E7850
 /* 7E7978 802405D8 AE220070 */   sw       $v0, 0x70($s1)
 .L802405DC:
 /* 7E797C 802405DC C4840060 */  lwc1      $f4, 0x60($a0)
-/* 7E7980 802405E0 3C018024 */  lui       $at, 0x8024
-/* 7E7984 802405E4 D42A3960 */  ldc1      $f10, 0x3960($at)
+/* 7E7980 802405E0 3C018024 */  lui       $at, %hi(D_80243960)
+/* 7E7984 802405E4 D42A3960 */  ldc1      $f10, %lo(D_80243960)($at)
 /* 7E7988 802405E8 46002121 */  cvt.d.s   $f4, $f4
 /* 7E798C 802405EC 462A2102 */  mul.d     $f4, $f4, $f10
 /* 7E7990 802405F0 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_802402E0_E0EA80.s b/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_802402E0_E0EA80.s
index a7013eb69c..d47784a2bc 100644
--- a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_802402E0_E0EA80.s
+++ b/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_802402E0_E0EA80.s
@@ -69,8 +69,8 @@ glabel func_802402E0_E0EA80
 /* E0EB74 802403D4 080900FF */  j         .L802403FC
 /* E0EB78 802403D8 E6800018 */   swc1     $f0, 0x18($s4)
 .L802403DC:
-/* E0EB7C 802403DC 3C018024 */  lui       $at, 0x8024
-/* E0EB80 802403E0 D4223DF0 */  ldc1      $f2, 0x3df0($at)
+/* E0EB7C 802403DC 3C018024 */  lui       $at, %hi(D_80243DF0)
+/* E0EB80 802403E0 D4223DF0 */  ldc1      $f2, %lo(D_80243DF0)($at)
 /* E0EB84 802403E4 44820000 */  mtc1      $v0, $f0
 /* E0EB88 802403E8 00000000 */  nop       
 /* E0EB8C 802403EC 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_8024095C_E0F0FC.s b/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_8024095C_E0F0FC.s
index c04453147c..f2f1857969 100644
--- a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_8024095C_E0F0FC.s
+++ b/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_8024095C_E0F0FC.s
@@ -33,8 +33,8 @@ glabel func_8024095C_E0F0FC
 /* E0F168 802409C8 0809027C */  j         .L802409F0
 /* E0F16C 802409CC E4A00018 */   swc1     $f0, 0x18($a1)
 .L802409D0:
-/* E0F170 802409D0 3C018024 */  lui       $at, 0x8024
-/* E0F174 802409D4 D4223DF8 */  ldc1      $f2, 0x3df8($at)
+/* E0F170 802409D0 3C018024 */  lui       $at, %hi(D_80243DF8)
+/* E0F174 802409D4 D4223DF8 */  ldc1      $f2, %lo(D_80243DF8)($at)
 /* E0F178 802409D8 44820000 */  mtc1      $v0, $f0
 /* E0F17C 802409DC 00000000 */  nop       
 /* E0F180 802409E0 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240E74_E0F614.s b/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240E74_E0F614.s
index 458f9e6414..9c2a82f222 100644
--- a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240E74_E0F614.s
+++ b/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240E74_E0F614.s
@@ -124,9 +124,9 @@ glabel func_80240E74_E0F614
 /* E0F7D8 80241038 2C620064 */  sltiu     $v0, $v1, 0x64
 /* E0F7DC 8024103C 10400042 */  beqz      $v0, .L80241148
 /* E0F7E0 80241040 00031080 */   sll      $v0, $v1, 2
-/* E0F7E4 80241044 3C018024 */  lui       $at, 0x8024
+/* E0F7E4 80241044 3C018024 */  lui       $at, %hi(D_80243E00)
 /* E0F7E8 80241048 00220821 */  addu      $at, $at, $v0
-/* E0F7EC 8024104C 8C223E00 */  lw        $v0, 0x3e00($at)
+/* E0F7EC 8024104C 8C223E00 */  lw        $v0, %lo(D_80243E00)($at)
 /* E0F7F0 80241050 00400008 */  jr        $v0
 /* E0F7F4 80241054 00000000 */   nop      
 /* E0F7F8 80241058 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_802411E0_E0F980.s b/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_802411E0_E0F980.s
index ea7660589d..51fb1ac6df 100644
--- a/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_802411E0_E0F980.s
+++ b/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_802411E0_E0F980.s
@@ -10,21 +10,21 @@ glabel func_802411E0_E0F980
 /* E0F994 802411F4 AFBF0034 */  sw        $ra, 0x34($sp)
 /* E0F998 802411F8 1A4000CB */  blez      $s2, .L80241528
 /* E0F99C 802411FC AFB00028 */   sw       $s0, 0x28($sp)
-/* E0F9A0 80241200 3C04800A */  lui       $a0, 0x800a
-/* E0F9A4 80241204 2484A66C */  addiu     $a0, $a0, -0x5994
+/* E0F9A0 80241200 3C04800A */  lui       $a0, %hi(D_8009A66C)
+/* E0F9A4 80241204 2484A66C */  addiu     $a0, $a0, %lo(D_8009A66C)
 /* E0F9A8 80241208 3C02DE00 */  lui       $v0, 0xde00
 /* E0F9AC 8024120C 44920000 */  mtc1      $s2, $f0
 /* E0F9B0 80241210 00000000 */  nop       
 /* E0F9B4 80241214 46800021 */  cvt.d.w   $f0, $f0
 /* E0F9B8 80241218 8C830000 */  lw        $v1, ($a0)
-/* E0F9BC 8024121C 3C018024 */  lui       $at, 0x8024
-/* E0F9C0 80241220 D4223F90 */  ldc1      $f2, 0x3f90($at)
+/* E0F9BC 8024121C 3C018024 */  lui       $at, %hi(D_80243F90)
+/* E0F9C0 80241220 D4223F90 */  ldc1      $f2, %lo(D_80243F90)($at)
 /* E0F9C4 80241224 0060282D */  daddu     $a1, $v1, $zero
 /* E0F9C8 80241228 24630008 */  addiu     $v1, $v1, 8
 /* E0F9CC 8024122C AC830000 */  sw        $v1, ($a0)
 /* E0F9D0 80241230 ACA20000 */  sw        $v0, ($a1)
-/* E0F9D4 80241234 3C028024 */  lui       $v0, 0x8024
-/* E0F9D8 80241238 24423C50 */  addiu     $v0, $v0, 0x3c50
+/* E0F9D4 80241234 3C028024 */  lui       $v0, %hi(D_80243C50)
+/* E0F9D8 80241238 24423C50 */  addiu     $v0, $v0, %lo(D_80243C50)
 /* E0F9DC 8024123C ACA20004 */  sw        $v0, 4($a1)
 /* E0F9E0 80241240 24620008 */  addiu     $v0, $v1, 8
 /* E0F9E4 80241244 AC820000 */  sw        $v0, ($a0)
@@ -65,16 +65,16 @@ glabel func_802411E0_E0F980
 /* E0FA68 802412C8 2404002D */  addiu     $a0, $zero, 0x2d
 /* E0FA6C 802412CC 24050032 */  addiu     $a1, $zero, 0x32
 /* E0FA70 802412D0 240600E6 */  addiu     $a2, $zero, 0xe6
-/* E0FA74 802412D4 3C08800A */  lui       $t0, 0x800a
-/* E0FA78 802412D8 2508A66C */  addiu     $t0, $t0, -0x5994
+/* E0FA74 802412D4 3C08800A */  lui       $t0, %hi(D_8009A66C)
+/* E0FA78 802412D8 2508A66C */  addiu     $t0, $t0, %lo(D_8009A66C)
 /* E0FA7C 802412DC 318200FF */  andi      $v0, $t4, 0xff
 /* E0FA80 802412E0 00491025 */  or        $v0, $v0, $t1
 /* E0FA84 802412E4 44921000 */  mtc1      $s2, $f2
 /* E0FA88 802412E8 00000000 */  nop       
 /* E0FA8C 802412EC 468010A1 */  cvt.d.w   $f2, $f2
 /* E0FA90 802412F0 8D030000 */  lw        $v1, ($t0)
-/* E0FA94 802412F4 3C018024 */  lui       $at, 0x8024
-/* E0FA98 802412F8 D4203F98 */  ldc1      $f0, 0x3f98($at)
+/* E0FA94 802412F4 3C018024 */  lui       $at, %hi(D_80243F98)
+/* E0FA98 802412F8 D4203F98 */  ldc1      $f0, %lo(D_80243F98)($at)
 /* E0FA9C 802412FC 24100001 */  addiu     $s0, $zero, 1
 /* E0FAA0 80241300 ADA20000 */  sw        $v0, ($t5)
 /* E0FAA4 80241304 0060102D */  daddu     $v0, $v1, $zero
diff --git a/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_80241540_E0FCE0.s b/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_80241540_E0FCE0.s
index 1233f6fda6..7b6c75f1cc 100644
--- a/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_80241540_E0FCE0.s
+++ b/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_80241540_E0FCE0.s
@@ -15,9 +15,9 @@ glabel func_80241540_E0FCE0
 /* E0FD08 80241568 2C620005 */  sltiu     $v0, $v1, 5
 /* E0FD0C 8024156C 1040004C */  beqz      $v0, .L802416A0
 /* E0FD10 80241570 00031080 */   sll      $v0, $v1, 2
-/* E0FD14 80241574 3C018024 */  lui       $at, 0x8024
+/* E0FD14 80241574 3C018024 */  lui       $at, %hi(D_80243FA0)
 /* E0FD18 80241578 00220821 */  addu      $at, $at, $v0
-/* E0FD1C 8024157C 8C223FA0 */  lw        $v0, 0x3fa0($at)
+/* E0FD1C 8024157C 8C223FA0 */  lw        $v0, %lo(D_80243FA0)($at)
 /* E0FD20 80241580 00400008 */  jr        $v0
 /* E0FD24 80241584 00000000 */   nop      
 /* E0FD28 80241588 2404021C */  addiu     $a0, $zero, 0x21c
diff --git a/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_802416C0_E0FE60.s b/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_802416C0_E0FE60.s
index 95b0cc2f47..0c105a2e51 100644
--- a/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_802416C0_E0FE60.s
+++ b/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_802416C0_E0FE60.s
@@ -5,8 +5,8 @@ glabel func_802416C0_E0FE60
 /* E0FE60 802416C0 27BDFFD8 */  addiu     $sp, $sp, -0x28
 /* E0FE64 802416C4 2402002D */  addiu     $v0, $zero, 0x2d
 /* E0FE68 802416C8 AFA20010 */  sw        $v0, 0x10($sp)
-/* E0FE6C 802416CC 3C028024 */  lui       $v0, 0x8024
-/* E0FE70 802416D0 24421540 */  addiu     $v0, $v0, 0x1540
+/* E0FE6C 802416CC 3C028024 */  lui       $v0, %hi(D_80241540)
+/* E0FE70 802416D0 24421540 */  addiu     $v0, $v0, %lo(D_80241540)
 /* E0FE74 802416D4 27A40010 */  addiu     $a0, $sp, 0x10
 /* E0FE78 802416D8 AFBF0020 */  sw        $ra, 0x20($sp)
 /* E0FE7C 802416DC AFA00018 */  sw        $zero, 0x18($sp)
diff --git a/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_802416F8_E0FE98.s b/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_802416F8_E0FE98.s
index 964ba79493..5fe4d9e85d 100644
--- a/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_802416F8_E0FE98.s
+++ b/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_802416F8_E0FE98.s
@@ -18,8 +18,8 @@ glabel func_802416F8_E0FE98
 /* E0FECC 8024172C 24040018 */   addiu    $a0, $zero, 0x18
 /* E0FED0 80241730 0040802D */  daddu     $s0, $v0, $zero
 /* E0FED4 80241734 0000202D */  daddu     $a0, $zero, $zero
-/* E0FED8 80241738 3C058024 */  lui       $a1, 0x8024
-/* E0FEDC 8024173C 24A516C0 */  addiu     $a1, $a1, 0x16c0
+/* E0FED8 80241738 3C058024 */  lui       $a1, %hi(D_802416C0)
+/* E0FEDC 8024173C 24A516C0 */  addiu     $a1, $a1, %lo(D_802416C0)
 /* E0FEE0 80241740 240200FF */  addiu     $v0, $zero, 0xff
 /* E0FEE4 80241744 AE300070 */  sw        $s0, 0x70($s1)
 /* E0FEE8 80241748 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_mgm/mgm_01/E12760/func_80240000_E12760.s b/asm/nonmatchings/world/area_mgm/mgm_01/E12760/func_80240000_E12760.s
index b7d7e2c9ae..85ee88b171 100644
--- a/asm/nonmatchings/world/area_mgm/mgm_01/E12760/func_80240000_E12760.s
+++ b/asm/nonmatchings/world/area_mgm/mgm_01/E12760/func_80240000_E12760.s
@@ -13,18 +13,18 @@ glabel func_80240000_E12760
 /* E12780 80240020 F7B40020 */  sdc1      $f20, 0x20($sp)
 /* E12784 80240024 8E260000 */  lw        $a2, ($s1)
 /* E12788 80240028 C4C40028 */  lwc1      $f4, 0x28($a2)
-/* E1278C 8024002C 3C018024 */  lui       $at, 0x8024
-/* E12790 80240030 D42235B0 */  ldc1      $f2, 0x35b0($at)
+/* E1278C 8024002C 3C018024 */  lui       $at, %hi(D_802435B0)
+/* E12790 80240030 D42235B0 */  ldc1      $f2, %lo(D_802435B0)($at)
 /* E12794 80240034 46002021 */  cvt.d.s   $f0, $f4
 /* E12798 80240038 4622003C */  c.lt.d    $f0, $f2
 /* E1279C 8024003C 00000000 */  nop       
 /* E127A0 80240040 45000003 */  bc1f      .L80240050
 /* E127A4 80240044 0080802D */   daddu    $s0, $a0, $zero
-/* E127A8 80240048 3C01C2BE */  lui       $at, 0xc2be
+/* E127A8 80240048 3C01C2BE */  lui       $at, %hi(D_C2BE35B8)
 /* E127AC 8024004C 44812000 */  mtc1      $at, $f4
 .L80240050:
-/* E127B0 80240050 3C018024 */  lui       $at, 0x8024
-/* E127B4 80240054 D42235B8 */  ldc1      $f2, 0x35b8($at)
+/* E127B0 80240050 3C018024 */  lui       $at, %hi(D_802435B8)
+/* E127B4 80240054 D42235B8 */  ldc1      $f2, %lo(D_C2BE35B8)($at)
 /* E127B8 80240058 46002021 */  cvt.d.s   $f0, $f4
 /* E127BC 8024005C 4620103C */  c.lt.d    $f2, $f0
 /* E127C0 80240060 00000000 */  nop       
@@ -56,17 +56,17 @@ glabel func_80240000_E12760
 /* E12820 802400C0 3C0142A0 */  lui       $at, 0x42a0
 /* E12824 802400C4 4481C000 */  mtc1      $at, $f24
 .L802400C8:
-/* E12828 802400C8 3C018024 */  lui       $at, 0x8024
-/* E1282C 802400CC D42035C0 */  ldc1      $f0, 0x35c0($at)
+/* E12828 802400C8 3C018024 */  lui       $at, %hi(D_802435C0)
+/* E1282C 802400CC D42035C0 */  ldc1      $f0, %lo(D_802435C0)($at)
 /* E12830 802400D0 4600C521 */  cvt.d.s   $f20, $f24
 /* E12834 802400D4 4620A502 */  mul.d     $f20, $f20, $f0
 /* E12838 802400D8 00000000 */  nop       
-/* E1283C 802400DC 3C018024 */  lui       $at, 0x8024
-/* E12840 802400E0 D42035C8 */  ldc1      $f0, 0x35c8($at)
+/* E1283C 802400DC 3C018024 */  lui       $at, %hi(D_802435C8)
+/* E12840 802400E0 D42035C8 */  ldc1      $f0, %lo(D_802435C8)($at)
 /* E12844 802400E4 4620A502 */  mul.d     $f20, $f20, $f0
 /* E12848 802400E8 00000000 */  nop       
-/* E1284C 802400EC 3C018024 */  lui       $at, 0x8024
-/* E12850 802400F0 D42035D0 */  ldc1      $f0, 0x35d0($at)
+/* E1284C 802400EC 3C018024 */  lui       $at, %hi(D_802435D0)
+/* E12850 802400F0 D42035D0 */  ldc1      $f0, %lo(D_802435D0)($at)
 /* E12854 802400F4 460025A1 */  cvt.d.s   $f22, $f4
 /* E12858 802400F8 4620B582 */  mul.d     $f22, $f22, $f0
 /* E1285C 802400FC 00000000 */  nop       
@@ -94,8 +94,8 @@ glabel func_80240000_E12760
 /* E128B4 80240154 34A53C83 */   ori      $a1, $a1, 0x3c83
 /* E128B8 80240158 8E230000 */  lw        $v1, ($s1)
 /* E128BC 8024015C C4600028 */  lwc1      $f0, 0x28($v1)
-/* E128C0 80240160 3C018024 */  lui       $at, 0x8024
-/* E128C4 80240164 D42235D8 */  ldc1      $f2, 0x35d8($at)
+/* E128C0 80240160 3C018024 */  lui       $at, %hi(D_802435D8)
+/* E128C4 80240164 D42235D8 */  ldc1      $f2, %lo(D_802435D8)($at)
 /* E128C8 80240168 46000021 */  cvt.d.s   $f0, $f0
 /* E128CC 8024016C 46220002 */  mul.d     $f0, $f0, $f2
 /* E128D0 80240170 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802403C4_E12B24.s b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802403C4_E12B24.s
index 2bcbd7aae1..eb3de467d7 100644
--- a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802403C4_E12B24.s
+++ b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802403C4_E12B24.s
@@ -5,8 +5,8 @@ glabel func_802403C4_E12B24
 /* E12B24 802403C4 27BDFFD8 */  addiu     $sp, $sp, -0x28
 /* E12B28 802403C8 2402002D */  addiu     $v0, $zero, 0x2d
 /* E12B2C 802403CC AFA20010 */  sw        $v0, 0x10($sp)
-/* E12B30 802403D0 3C028024 */  lui       $v0, 0x8024
-/* E12B34 802403D4 244201D0 */  addiu     $v0, $v0, 0x1d0
+/* E12B30 802403D0 3C028024 */  lui       $v0, %hi(D_802401D0)
+/* E12B34 802403D4 244201D0 */  addiu     $v0, $v0, %lo(D_802401D0)
 /* E12B38 802403D8 27A40010 */  addiu     $a0, $sp, 0x10
 /* E12B3C 802403DC AFBF0020 */  sw        $ra, 0x20($sp)
 /* E12B40 802403E0 AFA00018 */  sw        $zero, 0x18($sp)
diff --git a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_8024058C_E12CEC.s b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_8024058C_E12CEC.s
index 41f233445f..1e7d427106 100644
--- a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_8024058C_E12CEC.s
+++ b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_8024058C_E12CEC.s
@@ -23,16 +23,16 @@ glabel func_8024058C_E12CEC
 /* E12D34 802405D4 24020005 */  addiu     $v0, $zero, 5
 /* E12D38 802405D8 AE00008C */  sw        $zero, 0x8c($s0)
 /* E12D3C 802405DC AE020090 */  sw        $v0, 0x90($s0)
-/* E12D40 802405E0 3C028024 */  lui       $v0, 0x8024
+/* E12D40 802405E0 3C028024 */  lui       $v0, %hi(D_80241AC8)
 /* E12D44 802405E4 00431021 */  addu      $v0, $v0, $v1
-/* E12D48 802405E8 80421AC8 */  lb        $v0, 0x1ac8($v0)
+/* E12D48 802405E8 80421AC8 */  lb        $v0, %lo(D_80241AC8)($v0)
 /* E12D4C 802405EC 44820000 */  mtc1      $v0, $f0
 /* E12D50 802405F0 00000000 */  nop       
 /* E12D54 802405F4 46800020 */  cvt.s.w   $f0, $f0
 /* E12D58 802405F8 E6000094 */  swc1      $f0, 0x94($s0)
-/* E12D5C 802405FC 3C028024 */  lui       $v0, 0x8024
+/* E12D5C 802405FC 3C028024 */  lui       $v0, %hi(D_80241AD4)
 /* E12D60 80240600 00431021 */  addu      $v0, $v0, $v1
-/* E12D64 80240604 80421AD4 */  lb        $v0, 0x1ad4($v0)
+/* E12D64 80240604 80421AD4 */  lb        $v0, %lo(D_80241AD4)($v0)
 /* E12D68 80240608 3C01402E */  lui       $at, 0x402e
 /* E12D6C 8024060C 44811800 */  mtc1      $at, $f3
 /* E12D70 80240610 44801000 */  mtc1      $zero, $f2
@@ -45,9 +45,9 @@ glabel func_8024058C_E12CEC
 /* E12D8C 8024062C C6020094 */  lwc1      $f2, 0x94($s0)
 /* E12D90 80240630 46200020 */  cvt.s.d   $f0, $f0
 /* E12D94 80240634 E6000098 */  swc1      $f0, 0x98($s0)
-/* E12D98 80240638 3C018024 */  lui       $at, 0x8024
+/* E12D98 80240638 3C018024 */  lui       $at, %hi(D_80241AE0)
 /* E12D9C 8024063C 00230821 */  addu      $at, $at, $v1
-/* E12DA0 80240640 80231AE0 */  lb        $v1, 0x1ae0($at)
+/* E12DA0 80240640 80231AE0 */  lb        $v1, %lo(D_80241AE0)($at)
 /* E12DA4 80240644 3C013F80 */  lui       $at, 0x3f80
 /* E12DA8 80240648 44810000 */  mtc1      $at, $f0
 /* E12DAC 8024064C 46001106 */  mov.s     $f4, $f2
@@ -65,8 +65,8 @@ glabel func_8024058C_E12CEC
 /* E12DDC 8024067C 468010A0 */  cvt.s.w   $f2, $f2
 /* E12DE0 80240680 E602009C */  swc1      $f2, 0x9c($s0)
 /* E12DE4 80240684 46001186 */  mov.s     $f6, $f2
-/* E12DE8 80240688 3C018024 */  lui       $at, 0x8024
-/* E12DEC 8024068C D42235E0 */  ldc1      $f2, 0x35e0($at)
+/* E12DE8 80240688 3C018024 */  lui       $at, %hi(D_802435E0)
+/* E12DEC 8024068C D42235E0 */  ldc1      $f2, %lo(D_802435E0)($at)
 /* E12DF0 80240690 46000021 */  cvt.d.s   $f0, $f0
 /* E12DF4 80240694 E60400A4 */  swc1      $f4, 0xa4($s0)
 /* E12DF8 80240698 46003106 */  mov.s     $f4, $f6
diff --git a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802408EC_E1304C.s b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802408EC_E1304C.s
index 12ef6b5d42..2d56a593de 100644
--- a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802408EC_E1304C.s
+++ b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802408EC_E1304C.s
@@ -38,17 +38,17 @@ glabel func_802408EC_E1304C
 /* E130D0 80240970 3C0142DC */  lui       $at, 0x42dc
 /* E130D4 80240974 44812000 */  mtc1      $at, $f4
 /* E130D8 80240978 00021080 */  sll       $v0, $v0, 2
-/* E130DC 8024097C 3C018024 */  lui       $at, 0x8024
+/* E130DC 8024097C 3C018024 */  lui       $at, %hi(D_80241AEC)
 /* E130E0 80240980 00220821 */  addu      $at, $at, $v0
-/* E130E4 80240984 C4201AEC */  lwc1      $f0, 0x1aec($at)
+/* E130E4 80240984 C4201AEC */  lwc1      $f0, %lo(D_80241AEC)($at)
 /* E130E8 80240988 8C820084 */  lw        $v0, 0x84($a0)
 /* E130EC 8024098C 3C013F80 */  lui       $at, 0x3f80
 /* E130F0 80240990 44811000 */  mtc1      $at, $f2
 /* E130F4 80240994 00021080 */  sll       $v0, $v0, 2
 /* E130F8 80240998 E48000AC */  swc1      $f0, 0xac($a0)
-/* E130FC 8024099C 3C018024 */  lui       $at, 0x8024
+/* E130FC 8024099C 3C018024 */  lui       $at, %hi(D_80241B18)
 /* E13100 802409A0 00220821 */  addu      $at, $at, $v0
-/* E13104 802409A4 C4261B18 */  lwc1      $f6, 0x1b18($at)
+/* E13104 802409A4 C4261B18 */  lwc1      $f6, %lo(D_80241B18)($at)
 /* E13108 802409A8 3C0143B4 */  lui       $at, 0x43b4
 /* E1310C 802409AC 44810000 */  mtc1      $at, $f0
 /* E13110 802409B0 E48400B4 */  swc1      $f4, 0xb4($a0)
diff --git a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240DB8_E13518.s b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240DB8_E13518.s
index 4d82befa90..0007a782b0 100644
--- a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240DB8_E13518.s
+++ b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240DB8_E13518.s
@@ -37,16 +37,16 @@ glabel func_80240DB8_E13518
 /* E1358C 80240E2C 8E020084 */  lw        $v0, 0x84($s0)
 /* E13590 80240E30 3C05FE36 */  lui       $a1, 0xfe36
 /* E13594 80240E34 00021080 */  sll       $v0, $v0, 2
-/* E13598 80240E38 3C018024 */  lui       $at, 0x8024
+/* E13598 80240E38 3C018024 */  lui       $at, %hi(D_80241AEC)
 /* E1359C 80240E3C 00220821 */  addu      $at, $at, $v0
-/* E135A0 80240E40 C4201AEC */  lwc1      $f0, 0x1aec($at)
+/* E135A0 80240E40 C4201AEC */  lwc1      $f0, %lo(D_80241AEC)($at)
 /* E135A4 80240E44 8E020084 */  lw        $v0, 0x84($s0)
 /* E135A8 80240E48 8E060078 */  lw        $a2, 0x78($s0)
 /* E135AC 80240E4C 00021080 */  sll       $v0, $v0, 2
 /* E135B0 80240E50 E6000094 */  swc1      $f0, 0x94($s0)
-/* E135B4 80240E54 3C018024 */  lui       $at, 0x8024
+/* E135B4 80240E54 3C018024 */  lui       $at, %hi(D_80241B18)
 /* E135B8 80240E58 00220821 */  addu      $at, $at, $v0
-/* E135BC 80240E5C C4221B18 */  lwc1      $f2, 0x1b18($at)
+/* E135BC 80240E5C C4221B18 */  lwc1      $f2, %lo(D_80241B18)($at)
 /* E135C0 80240E60 3C0142DC */  lui       $at, 0x42dc
 /* E135C4 80240E64 44810000 */  mtc1      $at, $f0
 /* E135C8 80240E68 34A53C81 */  ori       $a1, $a1, 0x3c81
diff --git a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240F90_E136F0.s b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240F90_E136F0.s
index 6af066f472..10aca4b22f 100644
--- a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240F90_E136F0.s
+++ b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240F90_E136F0.s
@@ -12,12 +12,12 @@ glabel func_80240F90_E136F0
 /* E1370C 80240FAC 0C00FB3A */  jal       get_enemy
 /* E13710 80240FB0 AFB00018 */   sw       $s0, 0x18($sp)
 /* E13714 80240FB4 0000802D */  daddu     $s0, $zero, $zero
-/* E13718 80240FB8 3C148024 */  lui       $s4, 0x8024
-/* E1371C 80240FBC 26941AC8 */  addiu     $s4, $s4, 0x1ac8
-/* E13720 80240FC0 3C138024 */  lui       $s3, 0x8024
-/* E13724 80240FC4 26731AD4 */  addiu     $s3, $s3, 0x1ad4
-/* E13728 80240FC8 3C128024 */  lui       $s2, 0x8024
-/* E1372C 80240FCC 26521AE0 */  addiu     $s2, $s2, 0x1ae0
+/* E13718 80240FB8 3C148024 */  lui       $s4, %hi(D_80241AC8)
+/* E1371C 80240FBC 26941AC8 */  addiu     $s4, $s4, %lo(D_80241AC8)
+/* E13720 80240FC0 3C138024 */  lui       $s3, %hi(D_80241AD4)
+/* E13724 80240FC4 26731AD4 */  addiu     $s3, $s3, %lo(D_80241AD4)
+/* E13728 80240FC8 3C128024 */  lui       $s2, %hi(D_80241AE0)
+/* E1372C 80240FCC 26521AE0 */  addiu     $s2, $s2, %lo(D_80241AE0)
 /* E13730 80240FD0 8C510080 */  lw        $s1, 0x80($v0)
 .L80240FD4:
 /* E13734 80240FD4 8E220088 */  lw        $v0, 0x88($s1)
diff --git a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241234_E13994.s b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241234_E13994.s
index 723f3dd666..9c049733b9 100644
--- a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241234_E13994.s
+++ b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241234_E13994.s
@@ -16,8 +16,8 @@ glabel func_80241234_E13994
 /* E139C0 80241260 AFB1005C */   sw       $s1, 0x5c($sp)
 /* E139C4 80241264 27A30028 */  addiu     $v1, $sp, 0x28
 /* E139C8 80241268 8C540080 */  lw        $s4, 0x80($v0)
-/* E139CC 8024126C 3C028024 */  lui       $v0, 0x8024
-/* E139D0 80241270 244235E8 */  addiu     $v0, $v0, 0x35e8
+/* E139CC 8024126C 3C028024 */  lui       $v0, %hi(D_802435E8)
+/* E139D0 80241270 244235E8 */  addiu     $v0, $v0, %lo(D_802435E8)
 /* E139D4 80241274 24440020 */  addiu     $a0, $v0, 0x20
 .L80241278:
 /* E139D8 80241278 8C480000 */  lw        $t0, ($v0)
@@ -48,8 +48,8 @@ glabel func_80241234_E13994
 /* E13A38 802412D8 00041080 */  sll       $v0, $a0, 2
 /* E13A3C 802412DC 00622023 */  subu      $a0, $v1, $v0
 /* E13A40 802412E0 0000882D */  daddu     $s1, $zero, $zero
-/* E13A44 802412E4 3C058024 */  lui       $a1, 0x8024
-/* E13A48 802412E8 24A51B9C */  addiu     $a1, $a1, 0x1b9c
+/* E13A44 802412E4 3C058024 */  lui       $a1, %hi(D_80241B9C)
+/* E13A48 802412E8 24A51B9C */  addiu     $a1, $a1, %lo(D_80241B9C)
 /* E13A4C 802412EC 00041040 */  sll       $v0, $a0, 1
 /* E13A50 802412F0 00441021 */  addu      $v0, $v0, $a0
 /* E13A54 802412F4 00021080 */  sll       $v0, $v0, 2
@@ -114,15 +114,15 @@ glabel func_80241234_E13994
 /* E13B30 802413D0 2442FFFF */  addiu     $v0, $v0, -1
 /* E13B34 802413D4 1C400041 */  bgtz      $v0, .L802414DC
 /* E13B38 802413D8 AEA20070 */   sw       $v0, 0x70($s5)
-/* E13B3C 802413DC 3C138024 */  lui       $s3, 0x8024
-/* E13B40 802413E0 26731AC8 */  addiu     $s3, $s3, 0x1ac8
-/* E13B44 802413E4 3C128024 */  lui       $s2, 0x8024
-/* E13B48 802413E8 26521AD4 */  addiu     $s2, $s2, 0x1ad4
-/* E13B4C 802413EC 3C118024 */  lui       $s1, 0x8024
-/* E13B50 802413F0 26311AE0 */  addiu     $s1, $s1, 0x1ae0
+/* E13B3C 802413DC 3C138024 */  lui       $s3, %hi(D_80241AC8)
+/* E13B40 802413E0 26731AC8 */  addiu     $s3, $s3, %lo(D_80241AC8)
+/* E13B44 802413E4 3C128024 */  lui       $s2, %hi(D_80241AD4)
+/* E13B48 802413E8 26521AD4 */  addiu     $s2, $s2, %lo(D_80241AD4)
+/* E13B4C 802413EC 3C118024 */  lui       $s1, %hi(D_80241AE0)
+/* E13B50 802413F0 26311AE0 */  addiu     $s1, $s1, %lo(D_80241AE0)
 /* E13B54 802413F4 8EB00074 */  lw        $s0, 0x74($s5)
-/* E13B58 802413F8 3C04802F */  lui       $a0, 0x802f
-/* E13B5C 802413FC 2484A0C4 */  addiu     $a0, $a0, -0x5f3c
+/* E13B58 802413F8 3C04802F */  lui       $a0, %hi(D_802EA0C4)
+/* E13B5C 802413FC 2484A0C4 */  addiu     $a0, $a0, %lo(D_802EA0C4)
 /* E13B60 80241400 02139821 */  addu      $s3, $s0, $s3
 /* E13B64 80241404 02129021 */  addu      $s2, $s0, $s2
 /* E13B68 80241408 02118821 */  addu      $s1, $s0, $s1
diff --git a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241574_E13CD4.s b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241574_E13CD4.s
index 7f6c2ab07d..e1990fe78d 100644
--- a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241574_E13CD4.s
+++ b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241574_E13CD4.s
@@ -8,11 +8,11 @@ glabel func_80241574_E13CD4
 /* E13CE0 80241580 0000202D */   daddu    $a0, $zero, $zero
 /* E13CE4 80241584 0000302D */  daddu     $a2, $zero, $zero
 /* E13CE8 80241588 2407FFFF */  addiu     $a3, $zero, -1
-/* E13CEC 8024158C 3C058024 */  lui       $a1, 0x8024
-/* E13CF0 80241590 24A51B70 */  addiu     $a1, $a1, 0x1b70
+/* E13CEC 8024158C 3C058024 */  lui       $a1, %hi(D_80241B70)
+/* E13CF0 80241590 24A51B70 */  addiu     $a1, $a1, %lo(D_80241B70)
 /* E13CF4 80241594 8C420080 */  lw        $v0, 0x80($v0)
-/* E13CF8 80241598 3C048024 */  lui       $a0, 0x8024
-/* E13CFC 8024159C 24841B44 */  addiu     $a0, $a0, 0x1b44
+/* E13CF8 80241598 3C048024 */  lui       $a0, %hi(D_80241B44)
+/* E13CFC 8024159C 24841B44 */  addiu     $a0, $a0, %lo(D_80241B44)
 /* E13D00 802415A0 0040182D */  daddu     $v1, $v0, $zero
 /* E13D04 802415A4 AC60000C */  sw        $zero, 0xc($v1)
 /* E13D08 802415A8 AC600010 */  sw        $zero, 0x10($v1)
diff --git a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802415EC_E13D4C.s b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802415EC_E13D4C.s
index 7c037489bf..22b7cba59b 100644
--- a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802415EC_E13D4C.s
+++ b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802415EC_E13D4C.s
@@ -12,8 +12,8 @@ glabel func_802415EC_E13D4C
 /* E13D68 80241608 0C00AB0A */  jal       general_heap_malloc
 /* E13D6C 8024160C 0040882D */   daddu    $s1, $v0, $zero
 /* E13D70 80241610 0000202D */  daddu     $a0, $zero, $zero
-/* E13D74 80241614 3C058024 */  lui       $a1, 0x8024
-/* E13D78 80241618 24A503C4 */  addiu     $a1, $a1, 0x3c4
+/* E13D74 80241614 3C058024 */  lui       $a1, %hi(D_802403C4)
+/* E13D78 80241618 24A503C4 */  addiu     $a1, $a1, %lo(D_802403C4)
 /* E13D7C 8024161C 0040802D */  daddu     $s0, $v0, $zero
 /* E13D80 80241620 0C048C56 */  jal       bind_dynamic_entity_3
 /* E13D84 80241624 AE300080 */   sw       $s0, 0x80($s1)
diff --git a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802416F8_E13E58.s b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802416F8_E13E58.s
index a4161e932f..e02f6ee2e8 100644
--- a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802416F8_E13E58.s
+++ b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802416F8_E13E58.s
@@ -14,13 +14,13 @@ glabel func_802416F8_E13E58
 /* E13E7C 8024171C 26100001 */  addiu     $s0, $s0, 1
 /* E13E80 80241720 0C0496FA */  jal       set_message_value
 /* E13E84 80241724 0200202D */   daddu    $a0, $s0, $zero
-/* E13E88 80241728 3C048015 */  lui       $a0, 0x8015
-/* E13E8C 8024172C 2484C290 */  addiu     $a0, $a0, -0x3d70
+/* E13E88 80241728 3C048015 */  lui       $a0, %hi(D_8014C290)
+/* E13E8C 8024172C 2484C290 */  addiu     $a0, $a0, %lo(D_8014C290)
 /* E13E90 80241730 24020001 */  addiu     $v0, $zero, 1
 /* E13E94 80241734 16020003 */  bne       $s0, $v0, .L80241744
 /* E13E98 80241738 00000000 */   nop      
-/* E13E9C 8024173C 3C048015 */  lui       $a0, 0x8015
-/* E13EA0 80241740 2484C294 */  addiu     $a0, $a0, -0x3d6c
+/* E13E9C 8024173C 3C048015 */  lui       $a0, %hi(D_8014C294)
+/* E13EA0 80241740 2484C294 */  addiu     $a0, $a0, %lo(D_8014C294)
 .L80241744:
 /* E13EA4 80241744 0C0496CF */  jal       set_message_string
 /* E13EA8 80241748 24050001 */   addiu    $a1, $zero, 1
diff --git a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241780_E13EE0.s b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241780_E13EE0.s
index a8bd896ba2..e1834ded70 100644
--- a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241780_E13EE0.s
+++ b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241780_E13EE0.s
@@ -3,8 +3,8 @@
 
 glabel func_80241780_E13EE0
 /* E13EE0 80241780 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* E13EE4 80241784 3C048024 */  lui       $a0, 0x8024
-/* E13EE8 80241788 24843560 */  addiu     $a0, $a0, 0x3560
+/* E13EE4 80241784 3C048024 */  lui       $a0, %hi(D_80243560)
+/* E13EE8 80241788 24843560 */  addiu     $a0, $a0, %lo(D_80243560)
 /* E13EEC 8024178C AFBF0010 */  sw        $ra, 0x10($sp)
 /* E13EF0 80241790 0C0496CB */  jal       set_message_images
 /* E13EF4 80241794 00000000 */   nop      
diff --git a/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240000_E15D80.s b/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240000_E15D80.s
index 99057470e6..b5bc4bda2f 100644
--- a/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240000_E15D80.s
+++ b/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240000_E15D80.s
@@ -41,8 +41,8 @@ glabel func_80240000_E15D80
 /* E15E10 80240090 3C014028 */  lui       $at, 0x4028
 /* E15E14 80240094 44811800 */  mtc1      $at, $f3
 /* E15E18 80240098 44801000 */  mtc1      $zero, $f2
-/* E15E1C 8024009C 3C018025 */  lui       $at, 0x8025
-/* E15E20 802400A0 D42484E0 */  ldc1      $f4, -0x7b20($at)
+/* E15E1C 8024009C 3C018025 */  lui       $at, %hi(D_802484E0)
+/* E15E20 802400A0 D42484E0 */  ldc1      $f4, %lo(D_802484E0)($at)
 /* E15E24 802400A4 46220003 */  div.d     $f0, $f0, $f2
 /* E15E28 802400A8 46240002 */  mul.d     $f0, $f0, $f4
 /* E15E2C 802400AC 00000000 */  nop       
@@ -163,13 +163,13 @@ glabel func_80240000_E15D80
 /* E15FD8 80240258 02042023 */  subu      $a0, $s0, $a0
 /* E15FDC 8024025C 0C049DA7 */  jal       draw_number
 /* E15FE0 80240260 24A50041 */   addiu    $a1, $a1, 0x41
-/* E15FE4 80240264 3C048025 */  lui       $a0, 0x8025
-/* E15FE8 80240268 248482A0 */  addiu     $a0, $a0, -0x7d60
+/* E15FE4 80240264 3C048025 */  lui       $a0, %hi(D_802482A0)
+/* E15FE8 80240268 248482A0 */  addiu     $a0, $a0, %lo(D_802482A0)
 /* E15FEC 8024026C 24050020 */  addiu     $a1, $zero, 0x20
 /* E15FF0 80240270 00A0302D */  daddu     $a2, $a1, $zero
 /* E15FF4 80240274 24070002 */  addiu     $a3, $zero, 2
-/* E15FF8 80240278 3C028025 */  lui       $v0, 0x8025
-/* E15FFC 8024027C 244284A0 */  addiu     $v0, $v0, -0x7b60
+/* E15FF8 80240278 3C028025 */  lui       $v0, %hi(D_802484A0)
+/* E15FFC 8024027C 244284A0 */  addiu     $v0, $v0, %lo(D_802484A0)
 /* E16000 80240280 AFA00010 */  sw        $zero, 0x10($sp)
 /* E16004 80240284 AFA20014 */  sw        $v0, 0x14($sp)
 /* E16008 80240288 96430016 */  lhu       $v1, 0x16($s2)
diff --git a/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240430_E161B0.s b/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240430_E161B0.s
index 7da7001eaa..6abe29c059 100644
--- a/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240430_E161B0.s
+++ b/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240430_E161B0.s
@@ -5,8 +5,8 @@ glabel func_80240430_E161B0
 /* E161B0 80240430 27BDFFD8 */  addiu     $sp, $sp, -0x28
 /* E161B4 80240434 2402002D */  addiu     $v0, $zero, 0x2d
 /* E161B8 80240438 AFA20010 */  sw        $v0, 0x10($sp)
-/* E161BC 8024043C 3C028024 */  lui       $v0, 0x8024
-/* E161C0 80240440 24420000 */  addiu     $v0, $v0, 0
+/* E161BC 8024043C 3C028024 */  lui       $v0, %hi(D_80240000)
+/* E161C0 80240440 24420000 */  addiu     $v0, $v0, %lo(D_80240000)
 /* E161C4 80240444 27A40010 */  addiu     $a0, $sp, 0x10
 /* E161C8 80240448 AFBF0020 */  sw        $ra, 0x20($sp)
 /* E161CC 8024044C AFA00018 */  sw        $zero, 0x18($sp)
diff --git a/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240468_E161E8.s b/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240468_E161E8.s
index 8208bf8c9e..665f1e161a 100644
--- a/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240468_E161E8.s
+++ b/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240468_E161E8.s
@@ -13,12 +13,12 @@ glabel func_80240468_E161E8
 /* E16208 80240488 8C52006C */  lw        $s2, 0x6c($v0)
 /* E1620C 8024048C 12000026 */  beqz      $s0, .L80240528
 /* E16210 80240490 00000000 */   nop      
-/* E16214 80240494 3C058024 */  lui       $a1, 0x8024
-/* E16218 80240498 24A50430 */  addiu     $a1, $a1, 0x430
+/* E16214 80240494 3C058024 */  lui       $a1, %hi(D_80240430)
+/* E16218 80240498 24A50430 */  addiu     $a1, $a1, %lo(D_80240430)
 /* E1621C 8024049C 0C048C56 */  jal       bind_dynamic_entity_3
 /* E16220 802404A0 0000202D */   daddu    $a0, $zero, $zero
-/* E16224 802404A4 3C118011 */  lui       $s1, 0x8011
-/* E16228 802404A8 26318B28 */  addiu     $s1, $s1, -0x74d8
+/* E16224 802404A4 3C118011 */  lui       $s1, %hi(D_80108B28)
+/* E16228 802404A8 26318B28 */  addiu     $s1, $s1, %lo(D_80108B28)
 /* E1622C 802404AC 0220202D */  daddu     $a0, $s1, $zero
 /* E16230 802404B0 0C050529 */  jal       create_icon
 /* E16234 802404B4 AE420000 */   sw       $v0, ($s2)
@@ -38,8 +38,8 @@ glabel func_80240468_E161E8
 /* E1626C 802404EC 0200202D */  daddu     $a0, $s0, $zero
 /* E16270 802404F0 0C0511FF */  jal       set_menu_icon_script
 /* E16274 802404F4 0220282D */   daddu    $a1, $s1, $zero
-/* E16278 802404F8 3C048011 */  lui       $a0, 0x8011
-/* E1627C 802404FC 24848AFC */  addiu     $a0, $a0, -0x7504
+/* E16278 802404F8 3C048011 */  lui       $a0, %hi(D_80108AFC)
+/* E1627C 802404FC 24848AFC */  addiu     $a0, $a0, %lo(D_80108AFC)
 /* E16280 80240500 0C050529 */  jal       create_icon
 /* E16284 80240504 00000000 */   nop      
 /* E16288 80240508 0040802D */  daddu     $s0, $v0, $zero
diff --git a/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_802405D0_E16350.s b/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_802405D0_E16350.s
index 76f0a5816e..7e8e1fb93e 100644
--- a/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_802405D0_E16350.s
+++ b/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_802405D0_E16350.s
@@ -7,8 +7,8 @@ glabel func_802405D0_E16350
 /* E16358 802405D8 AFBF002C */  sw        $ra, 0x2c($sp)
 /* E1635C 802405DC 0C00FB3A */  jal       get_enemy
 /* E16360 802405E0 AFB00028 */   sw       $s0, 0x28($sp)
-/* E16364 802405E4 3C04802F */  lui       $a0, 0x802f
-/* E16368 802405E8 2484AFDC */  addiu     $a0, $a0, -0x5024
+/* E16364 802405E4 3C04802F */  lui       $a0, %hi(D_802EAFDC)
+/* E16368 802405E8 2484AFDC */  addiu     $a0, $a0, %lo(D_802EAFDC)
 /* E1636C 802405EC 8C50006C */  lw        $s0, 0x6c($v0)
 /* E16370 802405F0 3C028000 */  lui       $v0, 0x8000
 /* E16374 802405F4 24050163 */  addiu     $a1, $zero, 0x163
@@ -23,8 +23,8 @@ glabel func_802405D0_E16350
 /* E16398 80240618 0040202D */  daddu     $a0, $v0, $zero
 /* E1639C 8024061C 0C04417A */  jal       get_entity_by_index
 /* E163A0 80240620 AE04001C */   sw       $a0, 0x1c($s0)
-/* E163A4 80240624 3C038024 */  lui       $v1, 0x8024
-/* E163A8 80240628 24632A3C */  addiu     $v1, $v1, 0x2a3c
+/* E163A4 80240624 3C038024 */  lui       $v1, %hi(D_80242A3C)
+/* E163A8 80240628 24632A3C */  addiu     $v1, $v1, %lo(D_80242A3C)
 /* E163AC 8024062C AC430028 */  sw        $v1, 0x28($v0)
 /* E163B0 80240630 8FBF002C */  lw        $ra, 0x2c($sp)
 /* E163B4 80240634 8FB00028 */  lw        $s0, 0x28($sp)
diff --git a/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240790_E16510.s b/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240790_E16510.s
index 838e69023e..dd8e543058 100644
--- a/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240790_E16510.s
+++ b/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240790_E16510.s
@@ -26,8 +26,8 @@ glabel func_80240790_E16510
 /* E16564 802407E4 34635556 */  ori       $v1, $v1, 0x5556
 /* E16568 802407E8 00430018 */  mult      $v0, $v1
 /* E1656C 802407EC 0000802D */  daddu     $s0, $zero, $zero
-/* E16570 802407F0 3C068024 */  lui       $a2, 0x8024
-/* E16574 802407F4 24C6273C */  addiu     $a2, $a2, 0x273c
+/* E16570 802407F0 3C068024 */  lui       $a2, %hi(D_8024273C)
+/* E16574 802407F4 24C6273C */  addiu     $a2, $a2, %lo(D_8024273C)
 /* E16578 802407F8 27A50010 */  addiu     $a1, $sp, 0x10
 /* E1657C 802407FC 00021FC3 */  sra       $v1, $v0, 0x1f
 /* E16580 80240800 00004010 */  mfhi      $t0
@@ -95,10 +95,10 @@ glabel func_80240790_E16510
 /* E1666C 802408EC 1440FFDA */  bnez      $v0, .L80240858
 /* E16670 802408F0 2407FFFF */   addiu    $a3, $zero, -1
 /* E16674 802408F4 0000802D */  daddu     $s0, $zero, $zero
-/* E16678 802408F8 3C068024 */  lui       $a2, 0x8024
-/* E1667C 802408FC 24C6296C */  addiu     $a2, $a2, 0x296c
-/* E16680 80240900 3C058024 */  lui       $a1, 0x8024
-/* E16684 80240904 24A528E0 */  addiu     $a1, $a1, 0x28e0
+/* E16678 802408F8 3C068024 */  lui       $a2, %hi(D_8024296C)
+/* E1667C 802408FC 24C6296C */  addiu     $a2, $a2, %lo(D_8024296C)
+/* E16680 80240900 3C058024 */  lui       $a1, %hi(D_802428E0)
+/* E16684 80240904 24A528E0 */  addiu     $a1, $a1, %lo(D_802428E0)
 /* E16688 80240908 27A40010 */  addiu     $a0, $sp, 0x10
 /* E1668C 8024090C 02A0182D */  daddu     $v1, $s5, $zero
 .L80240910:
@@ -147,16 +147,16 @@ glabel func_80240790_E16510
 /* E1672C 802409AC 1440FFFA */  bnez      $v0, .L80240998
 /* E16730 802409B0 00000000 */   nop      
 /* E16734 802409B4 24100009 */  addiu     $s0, $zero, 9
-/* E16738 802409B8 3C028025 */  lui       $v0, 0x8025
-/* E1673C 802409BC 24428624 */  addiu     $v0, $v0, -0x79dc
+/* E16738 802409B8 3C028025 */  lui       $v0, %hi(D_80248624)
+/* E1673C 802409BC 24428624 */  addiu     $v0, $v0, %lo(D_80248624)
 .L802409C0:
 /* E16740 802409C0 AC400000 */  sw        $zero, ($v0)
 /* E16744 802409C4 2610FFFF */  addiu     $s0, $s0, -1
 /* E16748 802409C8 0601FFFD */  bgez      $s0, .L802409C0
 /* E1674C 802409CC 2442FFFC */   addiu    $v0, $v0, -4
 /* E16750 802409D0 24140001 */  addiu     $s4, $zero, 1
-/* E16754 802409D4 3C168025 */  lui       $s6, 0x8025
-/* E16758 802409D8 26D68600 */  addiu     $s6, $s6, -0x7a00
+/* E16754 802409D4 3C168025 */  lui       $s6, %hi(D_80248600)
+/* E16758 802409D8 26D68600 */  addiu     $s6, $s6, %lo(D_80248600)
 /* E1675C 802409DC 02A0982D */  daddu     $s3, $s5, $zero
 .L802409E0:
 /* E16760 802409E0 8E630034 */  lw        $v1, 0x34($s3)
@@ -265,9 +265,9 @@ glabel func_80240790_E16510
 /* E168D0 80240B50 AE420000 */   sw       $v0, ($s2)
 .L80240B54:
 /* E168D4 80240B54 AC940000 */  sw        $s4, ($a0)
-/* E168D8 80240B58 3C028024 */  lui       $v0, 0x8024
+/* E168D8 80240B58 3C028024 */  lui       $v0, %hi(D_802429F8)
 /* E168DC 80240B5C 00451021 */  addu      $v0, $v0, $a1
-/* E168E0 80240B60 8C4229F8 */  lw        $v0, 0x29f8($v0)
+/* E168E0 80240B60 8C4229F8 */  lw        $v0, %lo(D_802429F8)($v0)
 /* E168E4 80240B64 080902DC */  j         .L80240B70
 /* E168E8 80240B68 AE620044 */   sw       $v0, 0x44($s3)
 .L80240B6C:
diff --git a/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240BB0_E16930.s b/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240BB0_E16930.s
index 2c53b126e8..41591eaf44 100644
--- a/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240BB0_E16930.s
+++ b/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240BB0_E16930.s
@@ -57,9 +57,9 @@ glabel func_80240BB0_E16930
 /* E169FC 80240C7C 2C620042 */  sltiu     $v0, $v1, 0x42
 /* E16A00 80240C80 104003AD */  beqz      $v0, .L80241B38
 /* E16A04 80240C84 00031080 */   sll      $v0, $v1, 2
-/* E16A08 80240C88 3C018025 */  lui       $at, 0x8025
+/* E16A08 80240C88 3C018025 */  lui       $at, %hi(D_802484E8)
 /* E16A0C 80240C8C 00220821 */  addu      $at, $at, $v0
-/* E16A10 80240C90 8C2284E8 */  lw        $v0, -0x7b18($at)
+/* E16A10 80240C90 8C2284E8 */  lw        $v0, %lo(D_802484E8)($at)
 /* E16A14 80240C94 00400008 */  jr        $v0
 /* E16A18 80240C98 00000000 */   nop      
 /* E16A1C 80240C9C 240400D2 */  addiu     $a0, $zero, 0xd2
@@ -178,8 +178,8 @@ glabel func_80240BB0_E16930
 /* E16BD8 80240E58 08090547 */  j         .L8024151C
 /* E16BDC 80240E5C E660000C */   swc1     $f0, 0xc($s3)
 /* E16BE0 80240E60 8EA4000C */  lw        $a0, 0xc($s5)
-/* E16BE4 80240E64 3C058011 */  lui       $a1, 0x8011
-/* E16BE8 80240E68 24A58B28 */  addiu     $a1, $a1, -0x74d8
+/* E16BE4 80240E64 3C058011 */  lui       $a1, %hi(D_80108B28)
+/* E16BE8 80240E68 24A58B28 */  addiu     $a1, $a1, %lo(D_80108B28)
 /* E16BEC 80240E6C 0C0511FF */  jal       set_menu_icon_script
 /* E16BF0 80240E70 00000000 */   nop      
 /* E16BF4 80240E74 8EA4000C */  lw        $a0, 0xc($s5)
@@ -390,8 +390,8 @@ glabel func_80240BB0_E16930
 /* E16F28 802411A8 46200020 */  cvt.s.d   $f0, $f0
 /* E16F2C 802411AC E6600040 */  swc1      $f0, 0x40($s3)
 /* E16F30 802411B0 8EA4000C */  lw        $a0, 0xc($s5)
-/* E16F34 802411B4 3C058011 */  lui       $a1, 0x8011
-/* E16F38 802411B8 24A58B80 */  addiu     $a1, $a1, -0x7480
+/* E16F34 802411B4 3C058011 */  lui       $a1, %hi(D_80108B80)
+/* E16F38 802411B8 24A58B80 */  addiu     $a1, $a1, %lo(D_80108B80)
 /* E16F3C 802411BC 0C0511FF */  jal       set_menu_icon_script
 /* E16F40 802411C0 00000000 */   nop      
 /* E16F44 802411C4 8EA4000C */  lw        $a0, 0xc($s5)
@@ -437,8 +437,8 @@ glabel func_80240BB0_E16930
 /* E16FE0 80241260 2402000A */  addiu     $v0, $zero, 0xa
 /* E16FE4 80241264 A662008E */  sh        $v0, 0x8e($s3)
 /* E16FE8 80241268 8EA4000C */  lw        $a0, 0xc($s5)
-/* E16FEC 8024126C 3C058011 */  lui       $a1, 0x8011
-/* E16FF0 80241270 24A58B28 */  addiu     $a1, $a1, -0x74d8
+/* E16FEC 8024126C 3C058011 */  lui       $a1, %hi(D_80108B28)
+/* E16FF0 80241270 24A58B28 */  addiu     $a1, $a1, %lo(D_80108B28)
 /* E16FF4 80241274 0C0511FF */  jal       set_menu_icon_script
 /* E16FF8 80241278 2694001C */   addiu    $s4, $s4, 0x1c
 /* E16FFC 8024127C 8EA4000C */  lw        $a0, 0xc($s5)
diff --git a/asm/nonmatchings/world/area_mgm/mgm_02/E18150/func_802423D0_E18150.s b/asm/nonmatchings/world/area_mgm/mgm_02/E18150/func_802423D0_E18150.s
index b47a82f0c4..00d6ed8a82 100644
--- a/asm/nonmatchings/world/area_mgm/mgm_02/E18150/func_802423D0_E18150.s
+++ b/asm/nonmatchings/world/area_mgm/mgm_02/E18150/func_802423D0_E18150.s
@@ -3,8 +3,8 @@
 
 glabel func_802423D0_E18150
 /* E18150 802423D0 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* E18154 802423D4 3C048025 */  lui       $a0, 0x8025
-/* E18158 802423D8 248484C0 */  addiu     $a0, $a0, -0x7b40
+/* E18154 802423D4 3C048025 */  lui       $a0, %hi(D_802484C0)
+/* E18158 802423D8 248484C0 */  addiu     $a0, $a0, %lo(D_802484C0)
 /* E1815C 802423DC AFBF0010 */  sw        $ra, 0x10($sp)
 /* E18160 802423E0 0C0496CB */  jal       set_message_images
 /* E18164 802423E4 00000000 */   nop      
diff --git a/asm/nonmatchings/world/area_mim/mim_01/B934B0/func_80240070_B934B0.s b/asm/nonmatchings/world/area_mim/mim_01/B934B0/func_80240070_B934B0.s
index 73befe5835..1bcc6561ab 100644
--- a/asm/nonmatchings/world/area_mim/mim_01/B934B0/func_80240070_B934B0.s
+++ b/asm/nonmatchings/world/area_mim/mim_01/B934B0/func_80240070_B934B0.s
@@ -14,8 +14,8 @@ glabel func_80240070_B934B0
 /* B934D4 80240094 AFB20030 */  sw        $s2, 0x30($sp)
 /* B934D8 80240098 0080902D */  daddu     $s2, $a0, $zero
 /* B934DC 8024009C AFB1002C */  sw        $s1, 0x2c($sp)
-/* B934E0 802400A0 3C118024 */  lui       $s1, 0x8024
-/* B934E4 802400A4 263147C0 */  addiu     $s1, $s1, 0x47c0
+/* B934E0 802400A0 3C118024 */  lui       $s1, %hi(D_802447C0)
+/* B934E4 802400A4 263147C0 */  addiu     $s1, $s1, %lo(D_802447C0)
 /* B934E8 802400A8 AFBF0040 */  sw        $ra, 0x40($sp)
 /* B934EC 802400AC AFB00028 */  sw        $s0, 0x28($sp)
 /* B934F0 802400B0 F7BE0070 */  sdc1      $f30, 0x70($sp)
diff --git a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240708_B93B48.s b/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240708_B93B48.s
index 2f56ecf513..4ad5b0f584 100644
--- a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240708_B93B48.s
+++ b/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240708_B93B48.s
@@ -18,8 +18,8 @@ glabel func_80240708_B93B48
 /* B93B7C 8024073C 0040802D */  daddu     $s0, $v0, $zero
 /* B93B80 80240740 3C05800B */  lui       $a1, %hi(gCameras)
 /* B93B84 80240744 24A51D80 */  addiu     $a1, $a1, %lo(gCameras)
-/* B93B88 80240748 3C03800A */  lui       $v1, 0x800a
-/* B93B8C 8024074C 8463A634 */  lh        $v1, -0x59cc($v1)
+/* B93B88 80240748 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* B93B8C 8024074C 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* B93B90 80240750 00912021 */  addu      $a0, $a0, $s1
 /* B93B94 80240754 00031080 */  sll       $v0, $v1, 2
 /* B93B98 80240758 00431021 */  addu      $v0, $v0, $v1
@@ -54,8 +54,8 @@ glabel func_80240708_B93B48
 /* B93C08 802407C8 00000000 */   nop      
 /* B93C0C 802407CC 0C00A6C9 */  jal       clamp_angle
 /* B93C10 802407D0 46000306 */   mov.s    $f12, $f0
-/* B93C14 802407D4 3C018024 */  lui       $at, 0x8024
-/* B93C18 802407D8 D42245F0 */  ldc1      $f2, 0x45f0($at)
+/* B93C14 802407D4 3C018024 */  lui       $at, %hi(D_802445F0)
+/* B93C18 802407D8 D42245F0 */  ldc1      $f2, %lo(D_802445F0)($at)
 /* B93C1C 802407DC 46000021 */  cvt.d.s   $f0, $f0
 /* B93C20 802407E0 4622003C */  c.lt.d    $f0, $f2
 /* B93C24 802407E4 00000000 */  nop       
@@ -97,8 +97,8 @@ glabel func_80240708_B93B48
 /* B93CAC 8024086C 45030001 */  bc1tl     .L80240874
 /* B93CB0 80240870 0000882D */   daddu    $s1, $zero, $zero
 .L80240874:
-/* B93CB4 80240874 3C038011 */  lui       $v1, 0x8011
-/* B93CB8 80240878 8063EBB3 */  lb        $v1, -0x144d($v1)
+/* B93CB4 80240874 3C038011 */  lui       $v1, %hi(D_8010EBB3)
+/* B93CB8 80240878 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
 /* B93CBC 8024087C 24020009 */  addiu     $v0, $zero, 9
 /* B93CC0 80240880 50620001 */  beql      $v1, $v0, .L80240888
 /* B93CC4 80240884 0000882D */   daddu    $s1, $zero, $zero
diff --git a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240B1C_B93F5C.s b/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240B1C_B93F5C.s
index d7ebc9896d..55e7f096ac 100644
--- a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240B1C_B93F5C.s
+++ b/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240B1C_B93F5C.s
@@ -100,9 +100,9 @@ glabel func_80240B1C_B93F5C
 /* B940C0 80240C80 2C620064 */  sltiu     $v0, $v1, 0x64
 /* B940C4 80240C84 10400048 */  beqz      $v0, .L80240DA8
 /* B940C8 80240C88 00031080 */   sll      $v0, $v1, 2
-/* B940CC 80240C8C 3C018024 */  lui       $at, 0x8024
+/* B940CC 80240C8C 3C018024 */  lui       $at, %hi(D_802445F8)
 /* B940D0 80240C90 00220821 */  addu      $at, $at, $v0
-/* B940D4 80240C94 8C2245F8 */  lw        $v0, 0x45f8($at)
+/* B940D4 80240C94 8C2245F8 */  lw        $v0, %lo(D_802445F8)($at)
 /* B940D8 80240C98 00400008 */  jr        $v0
 /* B940DC 80240C9C 00000000 */   nop      
 /* B940E0 80240CA0 0240202D */  daddu     $a0, $s2, $zero
diff --git a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240F38_B94378.s b/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240F38_B94378.s
index 726a545931..ff44fc56a3 100644
--- a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240F38_B94378.s
+++ b/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240F38_B94378.s
@@ -62,9 +62,9 @@ glabel func_80240F38_B94378
 /* B94458 80241018 000218C0 */  sll       $v1, $v0, 3
 /* B9445C 8024101C 00431021 */  addu      $v0, $v0, $v1
 /* B94460 80241020 000210C0 */  sll       $v0, $v0, 3
-/* B94464 80241024 3C01800B */  lui       $at, 0x800b
+/* B94464 80241024 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* B94468 80241028 00220821 */  addu      $at, $at, $v0
-/* B9446C 8024102C C4201DEC */  lwc1      $f0, 0x1dec($at)
+/* B9446C 8024102C C4201DEC */  lwc1      $f0, %lo(D_800B1DEC)($at)
 /* B94470 80241030 0809041D */  j         .L80241074
 /* B94474 80241034 460C0301 */   sub.s    $f12, $f0, $f12
 .L80241038:
@@ -79,9 +79,9 @@ glabel func_80240F38_B94378
 /* B94498 80241058 000218C0 */  sll       $v1, $v0, 3
 /* B9449C 8024105C 00431021 */  addu      $v0, $v0, $v1
 /* B944A0 80241060 000210C0 */  sll       $v0, $v0, 3
-/* B944A4 80241064 3C01800B */  lui       $at, 0x800b
+/* B944A4 80241064 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* B944A8 80241068 00220821 */  addu      $at, $at, $v0
-/* B944AC 8024106C C4201DEC */  lwc1      $f0, 0x1dec($at)
+/* B944AC 8024106C C4201DEC */  lwc1      $f0, %lo(D_800B1DEC)($at)
 /* B944B0 80241070 460C0300 */  add.s     $f12, $f0, $f12
 .L80241074:
 /* B944B4 80241074 0C00A6C9 */  jal       clamp_angle
@@ -157,8 +157,8 @@ glabel func_80240F38_B94378
 /* B945BC 8024117C 1440005D */  bnez      $v0, .L802412F4
 /* B945C0 80241180 00000000 */   nop      
 /* B945C4 80241184 C6200038 */  lwc1      $f0, 0x38($s1)
-/* B945C8 80241188 3C018024 */  lui       $at, 0x8024
-/* B945CC 8024118C D4244788 */  ldc1      $f4, 0x4788($at)
+/* B945C8 80241188 3C018024 */  lui       $at, %hi(D_80244788)
+/* B945CC 8024118C D4244788 */  ldc1      $f4, %lo(D_80244788)($at)
 /* B945D0 80241190 46000021 */  cvt.d.s   $f0, $f0
 /* B945D4 80241194 4620203C */  c.lt.d    $f4, $f0
 /* B945D8 80241198 00000000 */  nop       
@@ -170,8 +170,8 @@ glabel func_80240F38_B94378
 /* B945F0 802411B0 E6200038 */  swc1      $f0, 0x38($s1)
 .L802411B4:
 /* B945F4 802411B4 C6200038 */  lwc1      $f0, 0x38($s1)
-/* B945F8 802411B8 3C018024 */  lui       $at, 0x8024
-/* B945FC 802411BC D4224790 */  ldc1      $f2, 0x4790($at)
+/* B945F8 802411B8 3C018024 */  lui       $at, %hi(D_80244790)
+/* B945FC 802411BC D4224790 */  ldc1      $f2, %lo(D_80244790)($at)
 /* B94600 802411C0 46000021 */  cvt.d.s   $f0, $f0
 /* B94604 802411C4 4622003C */  c.lt.d    $f0, $f2
 /* B94608 802411C8 00000000 */  nop       
@@ -228,8 +228,8 @@ glabel func_80240F38_B94378
 /* B946C4 80241284 4600A386 */   mov.s    $f14, $f20
 /* B946C8 80241288 46000586 */  mov.s     $f22, $f0
 /* B946CC 8024128C C7A20038 */  lwc1      $f2, 0x38($sp)
-/* B946D0 80241290 3C018024 */  lui       $at, 0x8024
-/* B946D4 80241294 D4204798 */  ldc1      $f0, 0x4798($at)
+/* B946D0 80241290 3C018024 */  lui       $at, %hi(D_80244798)
+/* B946D4 80241294 D4204798 */  ldc1      $f0, %lo(D_80244798)($at)
 /* B946D8 80241298 460010A1 */  cvt.d.s   $f2, $f2
 /* B946DC 8024129C 4620103C */  c.lt.d    $f2, $f0
 /* B946E0 802412A0 00000000 */  nop       
@@ -239,8 +239,8 @@ glabel func_80240F38_B94378
 /* B946F0 802412B0 080904B6 */  j         .L802412D8
 /* B946F4 802412B4 34C68000 */   ori      $a2, $a2, 0x8000
 .L802412B8:
-/* B946F8 802412B8 3C018024 */  lui       $at, 0x8024
-/* B946FC 802412BC D42047A0 */  ldc1      $f0, 0x47a0($at)
+/* B946F8 802412B8 3C018024 */  lui       $at, %hi(D_802447A0)
+/* B946FC 802412BC D42047A0 */  ldc1      $f0, %lo(D_802447A0)($at)
 /* B94700 802412C0 4622003C */  c.lt.d    $f0, $f2
 /* B94704 802412C4 00000000 */  nop       
 /* B94708 802412C8 450000FA */  bc1f      .L802416B4
@@ -296,8 +296,8 @@ glabel func_80240F38_B94378
 /* B947C8 80241388 104000CA */  beqz      $v0, .L802416B4
 /* B947CC 8024138C 0280282D */   daddu    $a1, $s4, $zero
 /* B947D0 80241390 8EA20000 */  lw        $v0, ($s5)
-/* B947D4 80241394 3C018024 */  lui       $at, 0x8024
-/* B947D8 80241398 D42247A8 */  ldc1      $f2, 0x47a8($at)
+/* B947D4 80241394 3C018024 */  lui       $at, %hi(D_802447A8)
+/* B947D8 80241398 D42247A8 */  ldc1      $f2, %lo(D_802447A8)($at)
 /* B947DC 8024139C C440002C */  lwc1      $f0, 0x2c($v0)
 /* B947E0 802413A0 C4460028 */  lwc1      $f6, 0x28($v0)
 /* B947E4 802413A4 C4440030 */  lwc1      $f4, 0x30($v0)
@@ -633,8 +633,8 @@ glabel func_80240F38_B94378
 /* B94CE0 802418A0 44813000 */  mtc1      $at, $f6
 /* B94CE4 802418A4 46000021 */  cvt.d.s   $f0, $f0
 /* B94CE8 802418A8 E7A20020 */  swc1      $f2, 0x20($sp)
-/* B94CEC 802418AC 3C018024 */  lui       $at, 0x8024
-/* B94CF0 802418B0 D42247B0 */  ldc1      $f2, 0x47b0($at)
+/* B94CEC 802418AC 3C018024 */  lui       $at, %hi(D_802447B0)
+/* B94CF0 802418B0 D42247B0 */  ldc1      $f2, %lo(D_802447B0)($at)
 /* B94CF4 802418B4 C6240040 */  lwc1      $f4, 0x40($s1)
 /* B94CF8 802418B8 46220000 */  add.d     $f0, $f0, $f2
 /* B94CFC 802418BC E7A60038 */  swc1      $f6, 0x38($sp)
diff --git a/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_802402A0_B97EA0.s b/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_802402A0_B97EA0.s
index 550bfb380b..ed023e9940 100644
--- a/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_802402A0_B97EA0.s
+++ b/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_802402A0_B97EA0.s
@@ -83,8 +83,8 @@ glabel func_802402A0_B97EA0
 /* B97FCC 802403CC 27A5002C */   addiu    $a1, $sp, 0x2c
 /* B97FD0 802403D0 C6000038 */  lwc1      $f0, 0x38($s0)
 /* B97FD4 802403D4 860200A6 */  lh        $v0, 0xa6($s0)
-/* B97FD8 802403D8 3C018024 */  lui       $at, 0x8024
-/* B97FDC 802403DC D4223830 */  ldc1      $f2, 0x3830($at)
+/* B97FD8 802403D8 3C018024 */  lui       $at, %hi(D_80243830)
+/* B97FDC 802403DC D4223830 */  ldc1      $f2, %lo(D_80243830)($at)
 /* B97FE0 802403E0 27A60030 */  addiu     $a2, $sp, 0x30
 /* B97FE4 802403E4 E7A0002C */  swc1      $f0, 0x2c($sp)
 /* B97FE8 802403E8 44820000 */  mtc1      $v0, $f0
diff --git a/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80240C60_B98860.s b/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80240C60_B98860.s
index 14b4634244..90542ddf9e 100644
--- a/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80240C60_B98860.s
+++ b/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80240C60_B98860.s
@@ -88,9 +88,9 @@ glabel func_80240C60_B98860
 /* B989A4 80240DA4 2C62000F */  sltiu     $v0, $v1, 0xf
 /* B989A8 80240DA8 1040002C */  beqz      $v0, .L80240E5C
 /* B989AC 80240DAC 00031080 */   sll      $v0, $v1, 2
-/* B989B0 80240DB0 3C018024 */  lui       $at, 0x8024
+/* B989B0 80240DB0 3C018024 */  lui       $at, %hi(D_80243838)
 /* B989B4 80240DB4 00220821 */  addu      $at, $at, $v0
-/* B989B8 80240DB8 8C223838 */  lw        $v0, 0x3838($at)
+/* B989B8 80240DB8 8C223838 */  lw        $v0, %lo(D_80243838)($at)
 /* B989BC 80240DBC 00400008 */  jr        $v0
 /* B989C0 80240DC0 00000000 */   nop      
 /* B989C4 80240DC4 0260202D */  daddu     $a0, $s3, $zero
diff --git a/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_802410B0_B98CB0.s b/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_802410B0_B98CB0.s
index ac447c65c1..66a4e93546 100644
--- a/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_802410B0_B98CB0.s
+++ b/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_802410B0_B98CB0.s
@@ -6,11 +6,11 @@ glabel func_802410B0_B98CB0
 /* B98CB4 802410B4 AFBF0010 */  sw        $ra, 0x10($sp)
 /* B98CB8 802410B8 10A00003 */  beqz      $a1, .L802410C8
 /* B98CBC 802410BC 8C86000C */   lw       $a2, 0xc($a0)
-/* B98CC0 802410C0 3C018024 */  lui       $at, 0x8024
-/* B98CC4 802410C4 AC2016AC */  sw        $zero, 0x16ac($at)
+/* B98CC0 802410C0 3C018024 */  lui       $at, %hi(D_802416AC)
+/* B98CC4 802410C4 AC2016AC */  sw        $zero, %lo(D_802416AC)($at)
 .L802410C8:
-/* B98CC8 802410C8 3C038024 */  lui       $v1, 0x8024
-/* B98CCC 802410CC 246316AC */  addiu     $v1, $v1, 0x16ac
+/* B98CC8 802410C8 3C038024 */  lui       $v1, %hi(D_802416AC)
+/* B98CCC 802410CC 246316AC */  addiu     $v1, $v1, %lo(D_802416AC)
 /* B98CD0 802410D0 8C620000 */  lw        $v0, ($v1)
 /* B98CD4 802410D4 54400003 */  bnel      $v0, $zero, .L802410E4
 /* B98CD8 802410D8 AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_802410B0_B98CB0
 /* B98CE0 802410E0 0000102D */   daddu    $v0, $zero, $zero
 .L802410E4:
 /* B98CE4 802410E4 8CC50000 */  lw        $a1, ($a2)
-/* B98CE8 802410E8 3C068024 */  lui       $a2, 0x8024
+/* B98CE8 802410E8 3C068024 */  lui       $a2, %hi(D_802416B0)
 /* B98CEC 802410EC 0C0B2026 */  jal       set_variable
-/* B98CF0 802410F0 8CC616B0 */   lw       $a2, 0x16b0($a2)
+/* B98CF0 802410F0 8CC616B0 */   lw       $a2, %lo(D_802416B0)($a2)
 /* B98CF4 802410F4 24020002 */  addiu     $v0, $zero, 2
 .L802410F8:
 /* B98CF8 802410F8 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80241104_B98D04.s b/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80241104_B98D04.s
index a0176a96d2..bafd3297da 100644
--- a/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80241104_B98D04.s
+++ b/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80241104_B98D04.s
@@ -7,12 +7,12 @@ glabel func_80241104_B98D04
 /* B98D0C 8024110C 8C82000C */  lw        $v0, 0xc($a0)
 /* B98D10 80241110 0C0B1EAF */  jal       get_variable
 /* B98D14 80241114 8C450000 */   lw       $a1, ($v0)
-/* B98D18 80241118 3C018024 */  lui       $at, 0x8024
-/* B98D1C 8024111C AC2216B0 */  sw        $v0, 0x16b0($at)
+/* B98D18 80241118 3C018024 */  lui       $at, %hi(D_802416B0)
+/* B98D1C 8024111C AC2216B0 */  sw        $v0, %lo(D_802416B0)($at)
 /* B98D20 80241120 24020002 */  addiu     $v0, $zero, 2
 /* B98D24 80241124 8FBF0010 */  lw        $ra, 0x10($sp)
 /* B98D28 80241128 24030001 */  addiu     $v1, $zero, 1
-/* B98D2C 8024112C 3C018024 */  lui       $at, 0x8024
-/* B98D30 80241130 AC2316AC */  sw        $v1, 0x16ac($at)
+/* B98D2C 8024112C 3C018024 */  lui       $at, %hi(D_802416AC)
+/* B98D30 80241130 AC2316AC */  sw        $v1, %lo(D_802416AC)($at)
 /* B98D34 80241134 03E00008 */  jr        $ra
 /* B98D38 80241138 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_8024113C_B98D3C.s b/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_8024113C_B98D3C.s
index 5bca9268ba..e60d5eebdf 100644
--- a/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_8024113C_B98D3C.s
+++ b/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_8024113C_B98D3C.s
@@ -13,8 +13,8 @@ glabel func_8024113C_B98D3C
 /* B98D5C 8024115C 8C620000 */  lw        $v0, ($v1)
 /* B98D60 80241160 5040000A */  beql      $v0, $zero, .L8024118C
 /* B98D64 80241164 00041080 */   sll      $v0, $a0, 2
-/* B98D68 80241168 3C058024 */  lui       $a1, 0x8024
-/* B98D6C 8024116C 24A53880 */  addiu     $a1, $a1, 0x3880
+/* B98D68 80241168 3C058024 */  lui       $a1, %hi(D_80243880)
+/* B98D6C 8024116C 24A53880 */  addiu     $a1, $a1, %lo(D_80243880)
 .L80241170:
 /* B98D70 80241170 24630004 */  addiu     $v1, $v1, 4
 /* B98D74 80241174 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_8024113C_B98D3C
 /* B98D84 80241184 24A50004 */   addiu    $a1, $a1, 4
 /* B98D88 80241188 00041080 */  sll       $v0, $a0, 2
 .L8024118C:
-/* B98D8C 8024118C 3C018024 */  lui       $at, 0x8024
+/* B98D8C 8024118C 3C018024 */  lui       $at, %hi(D_80243880)
 /* B98D90 80241190 00220821 */  addu      $at, $at, $v0
-/* B98D94 80241194 AC203880 */  sw        $zero, 0x3880($at)
+/* B98D94 80241194 AC203880 */  sw        $zero, %lo(D_80243880)($at)
 /* B98D98 80241198 08090472 */  j         .L802411C8
 /* B98D9C 8024119C 00000000 */   nop      
 .L802411A0:
-/* B98DA0 802411A0 3C038024 */  lui       $v1, 0x8024
-/* B98DA4 802411A4 24633880 */  addiu     $v1, $v1, 0x3880
+/* B98DA0 802411A0 3C038024 */  lui       $v1, %hi(D_80243880)
+/* B98DA4 802411A4 24633880 */  addiu     $v1, $v1, %lo(D_80243880)
 /* B98DA8 802411A8 0060282D */  daddu     $a1, $v1, $zero
 .L802411AC:
 /* B98DAC 802411AC 24820010 */  addiu     $v0, $a0, 0x10
diff --git a/asm/nonmatchings/world/area_mim/mim_03/B9B480/func_802400A0_B9B520.s b/asm/nonmatchings/world/area_mim/mim_03/B9B480/func_802400A0_B9B520.s
index 4f573ecf11..913b406d0f 100644
--- a/asm/nonmatchings/world/area_mim/mim_03/B9B480/func_802400A0_B9B520.s
+++ b/asm/nonmatchings/world/area_mim/mim_03/B9B480/func_802400A0_B9B520.s
@@ -14,8 +14,8 @@ glabel func_802400A0_B9B520
 /* B9B544 802400C4 AFB20030 */  sw        $s2, 0x30($sp)
 /* B9B548 802400C8 0080902D */  daddu     $s2, $a0, $zero
 /* B9B54C 802400CC AFB1002C */  sw        $s1, 0x2c($sp)
-/* B9B550 802400D0 3C118024 */  lui       $s1, 0x8024
-/* B9B554 802400D4 263124E0 */  addiu     $s1, $s1, 0x24e0
+/* B9B550 802400D0 3C118024 */  lui       $s1, %hi(D_802424E0)
+/* B9B554 802400D4 263124E0 */  addiu     $s1, $s1, %lo(D_802424E0)
 /* B9B558 802400D8 AFBF0040 */  sw        $ra, 0x40($sp)
 /* B9B55C 802400DC AFB00028 */  sw        $s0, 0x28($sp)
 /* B9B560 802400E0 F7BE0070 */  sdc1      $f30, 0x70($sp)
diff --git a/asm/nonmatchings/world/area_mim/mim_04/B9D9D0/func_80240070_B9D9D0.s b/asm/nonmatchings/world/area_mim/mim_04/B9D9D0/func_80240070_B9D9D0.s
index 69fca9d0de..6e8b32b33d 100644
--- a/asm/nonmatchings/world/area_mim/mim_04/B9D9D0/func_80240070_B9D9D0.s
+++ b/asm/nonmatchings/world/area_mim/mim_04/B9D9D0/func_80240070_B9D9D0.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80240070_B9D9D0
-/* B9D9D0 80240070 3C058024 */  lui       $a1, 0x8024
-/* B9D9D4 80240074 24A51530 */  addiu     $a1, $a1, 0x1530
+/* B9D9D0 80240070 3C058024 */  lui       $a1, %hi(D_80241530)
+/* B9D9D4 80240074 24A51530 */  addiu     $a1, $a1, %lo(D_80241530)
 /* B9D9D8 80240078 8CA30000 */  lw        $v1, ($a1)
 /* B9D9DC 8024007C 24040002 */  addiu     $a0, $zero, 2
 /* B9D9E0 80240080 10640012 */  beq       $v1, $a0, .L802400CC
@@ -23,13 +23,13 @@ glabel func_80240070_B9D9D0
 /* B9DA14 802400B4 08090057 */  j         .L8024015C
 /* B9DA18 802400B8 34420A01 */   ori      $v0, $v0, 0xa01
 .L802400BC:
-/* B9DA1C 802400BC 3C018024 */  lui       $at, 0x8024
-/* B9DA20 802400C0 AC201538 */  sw        $zero, 0x1538($at)
+/* B9DA1C 802400BC 3C018024 */  lui       $at, %hi(D_80241538)
+/* B9DA20 802400C0 AC201538 */  sw        $zero, %lo(D_80241538)($at)
 /* B9DA24 802400C4 08090055 */  j         .L80240154
 /* B9DA28 802400C8 ACA40000 */   sw       $a0, ($a1)
 .L802400CC:
-/* B9DA2C 802400CC 3C038024 */  lui       $v1, 0x8024
-/* B9DA30 802400D0 24631538 */  addiu     $v1, $v1, 0x1538
+/* B9DA2C 802400CC 3C038024 */  lui       $v1, %hi(D_80241538)
+/* B9DA30 802400D0 24631538 */  addiu     $v1, $v1, %lo(D_80241538)
 /* B9DA34 802400D4 8C620000 */  lw        $v0, ($v1)
 /* B9DA38 802400D8 2442000A */  addiu     $v0, $v0, 0xa
 /* B9DA3C 802400DC AC620000 */  sw        $v0, ($v1)
@@ -39,14 +39,14 @@ glabel func_80240070_B9D9D0
 /* B9DA4C 802400EC 240200FF */  addiu     $v0, $zero, 0xff
 /* B9DA50 802400F0 AC620000 */  sw        $v0, ($v1)
 /* B9DA54 802400F4 24020014 */  addiu     $v0, $zero, 0x14
-/* B9DA58 802400F8 3C018024 */  lui       $at, 0x8024
-/* B9DA5C 802400FC AC221534 */  sw        $v0, 0x1534($at)
+/* B9DA58 802400F8 3C018024 */  lui       $at, %hi(D_80241534)
+/* B9DA5C 802400FC AC221534 */  sw        $v0, %lo(D_80241534)($at)
 /* B9DA60 80240100 24020003 */  addiu     $v0, $zero, 3
 /* B9DA64 80240104 08090055 */  j         .L80240154
 /* B9DA68 80240108 ACA20000 */   sw       $v0, ($a1)
 .L8024010C:
-/* B9DA6C 8024010C 3C038024 */  lui       $v1, 0x8024
-/* B9DA70 80240110 24631534 */  addiu     $v1, $v1, 0x1534
+/* B9DA6C 8024010C 3C038024 */  lui       $v1, %hi(D_80241534)
+/* B9DA70 80240110 24631534 */  addiu     $v1, $v1, %lo(D_80241534)
 /* B9DA74 80240114 8C620000 */  lw        $v0, ($v1)
 /* B9DA78 80240118 2442FFFF */  addiu     $v0, $v0, -1
 /* B9DA7C 8024011C 0441000D */  bgez      $v0, .L80240154
@@ -56,8 +56,8 @@ glabel func_80240070_B9D9D0
 /* B9DA8C 8024012C 08090055 */  j         .L80240154
 /* B9DA90 80240130 ACA20000 */   sw       $v0, ($a1)
 .L80240134:
-/* B9DA94 80240134 3C038024 */  lui       $v1, 0x8024
-/* B9DA98 80240138 24631538 */  addiu     $v1, $v1, 0x1538
+/* B9DA94 80240134 3C038024 */  lui       $v1, %hi(D_80241538)
+/* B9DA98 80240138 24631538 */  addiu     $v1, $v1, %lo(D_80241538)
 /* B9DA9C 8024013C 8C620000 */  lw        $v0, ($v1)
 /* B9DAA0 80240140 2442FFF6 */  addiu     $v0, $v0, -0xa
 /* B9DAA4 80240144 04410003 */  bgez      $v0, .L80240154
@@ -74,8 +74,8 @@ glabel func_80240070_B9D9D0
 /* B9DAC4 80240164 3C08E200 */  lui       $t0, 0xe200
 /* B9DAC8 80240168 3508001C */  ori       $t0, $t0, 0x1c
 /* B9DACC 8024016C 3C07C810 */  lui       $a3, 0xc810
-/* B9DAD0 80240170 3C05800A */  lui       $a1, 0x800a
-/* B9DAD4 80240174 24A5A66C */  addiu     $a1, $a1, -0x5994
+/* B9DAD0 80240170 3C05800A */  lui       $a1, %hi(D_8009A66C)
+/* B9DAD4 80240174 24A5A66C */  addiu     $a1, $a1, %lo(D_8009A66C)
 /* B9DAD8 80240178 8CA30000 */  lw        $v1, ($a1)
 /* B9DADC 8024017C 34E74DD8 */  ori       $a3, $a3, 0x4dd8
 /* B9DAE0 80240180 0060202D */  daddu     $a0, $v1, $zero
@@ -86,8 +86,8 @@ glabel func_80240070_B9D9D0
 /* B9DAF4 80240194 AC820004 */  sw        $v0, 4($a0)
 /* B9DAF8 80240198 24620008 */  addiu     $v0, $v1, 8
 /* B9DAFC 8024019C ACA20000 */  sw        $v0, ($a1)
-/* B9DB00 802401A0 3C048024 */  lui       $a0, 0x8024
-/* B9DB04 802401A4 9084153B */  lbu       $a0, 0x153b($a0)
+/* B9DB00 802401A0 3C048024 */  lui       $a0, %hi(D_8024153B)
+/* B9DB04 802401A4 9084153B */  lbu       $a0, %lo(D_8024153B)($a0)
 /* B9DB08 802401A8 3C02FA00 */  lui       $v0, 0xfa00
 /* B9DB0C 802401AC AC620000 */  sw        $v0, ($v1)
 /* B9DB10 802401B0 24620010 */  addiu     $v0, $v1, 0x10
diff --git a/asm/nonmatchings/world/area_mim/mim_04/B9D9D0/func_802401DC_B9DB3C.s b/asm/nonmatchings/world/area_mim/mim_04/B9D9D0/func_802401DC_B9DB3C.s
index 2a4c6fd79a..5cfc9494f8 100644
--- a/asm/nonmatchings/world/area_mim/mim_04/B9D9D0/func_802401DC_B9DB3C.s
+++ b/asm/nonmatchings/world/area_mim/mim_04/B9D9D0/func_802401DC_B9DB3C.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_802401DC_B9DB3C
-/* B9DB3C 802401DC 3C038024 */  lui       $v1, 0x8024
-/* B9DB40 802401E0 24631530 */  addiu     $v1, $v1, 0x1530
+/* B9DB3C 802401DC 3C038024 */  lui       $v1, %hi(D_80241530)
+/* B9DB40 802401E0 24631530 */  addiu     $v1, $v1, %lo(D_80241530)
 /* B9DB44 802401E4 8C620000 */  lw        $v0, ($v1)
 /* B9DB48 802401E8 14400002 */  bnez      $v0, .L802401F4
 /* B9DB4C 802401EC 24020001 */   addiu    $v0, $zero, 1
diff --git a/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240430_B9DD90.s b/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240430_B9DD90.s
index 1d5eb50aaa..58d33b579d 100644
--- a/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240430_B9DD90.s
+++ b/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240430_B9DD90.s
@@ -83,8 +83,8 @@ glabel func_80240430_B9DD90
 /* B9DEBC 8024055C 27A5002C */   addiu    $a1, $sp, 0x2c
 /* B9DEC0 80240560 C6000038 */  lwc1      $f0, 0x38($s0)
 /* B9DEC4 80240564 860200A6 */  lh        $v0, 0xa6($s0)
-/* B9DEC8 80240568 3C018024 */  lui       $at, 0x8024
-/* B9DECC 8024056C D4222D80 */  ldc1      $f2, 0x2d80($at)
+/* B9DEC8 80240568 3C018024 */  lui       $at, %hi(D_80242D80)
+/* B9DECC 8024056C D4222D80 */  ldc1      $f2, %lo(D_80242D80)($at)
 /* B9DED0 80240570 27A60030 */  addiu     $a2, $sp, 0x30
 /* B9DED4 80240574 E7A0002C */  swc1      $f0, 0x2c($sp)
 /* B9DED8 80240578 44820000 */  mtc1      $v0, $f0
diff --git a/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240DF0_B9E750.s b/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240DF0_B9E750.s
index dff067074e..576be795cd 100644
--- a/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240DF0_B9E750.s
+++ b/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240DF0_B9E750.s
@@ -88,9 +88,9 @@ glabel func_80240DF0_B9E750
 /* B9E894 80240F34 2C62000F */  sltiu     $v0, $v1, 0xf
 /* B9E898 80240F38 1040002C */  beqz      $v0, .L80240FEC
 /* B9E89C 80240F3C 00031080 */   sll      $v0, $v1, 2
-/* B9E8A0 80240F40 3C018024 */  lui       $at, 0x8024
+/* B9E8A0 80240F40 3C018024 */  lui       $at, %hi(D_80242D88)
 /* B9E8A4 80240F44 00220821 */  addu      $at, $at, $v0
-/* B9E8A8 80240F48 8C222D88 */  lw        $v0, 0x2d88($at)
+/* B9E8A8 80240F48 8C222D88 */  lw        $v0, %lo(D_80242D88)($at)
 /* B9E8AC 80240F4C 00400008 */  jr        $v0
 /* B9E8B0 80240F50 00000000 */   nop      
 /* B9E8B4 80240F54 0260202D */  daddu     $a0, $s3, $zero
diff --git a/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80241014_B9E974.s b/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80241014_B9E974.s
index af0fbd273f..23c6b358f7 100644
--- a/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80241014_B9E974.s
+++ b/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80241014_B9E974.s
@@ -4,8 +4,8 @@
 glabel func_80241014_B9E974
 /* B9E974 80241014 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* B9E978 80241018 AFB00010 */  sw        $s0, 0x10($sp)
-/* B9E97C 8024101C 3C108024 */  lui       $s0, 0x8024
-/* B9E980 80241020 26102614 */  addiu     $s0, $s0, 0x2614
+/* B9E97C 8024101C 3C108024 */  lui       $s0, %hi(D_80242614)
+/* B9E980 80241020 26102614 */  addiu     $s0, $s0, %lo(D_80242614)
 /* B9E984 80241024 AFBF0018 */  sw        $ra, 0x18($sp)
 /* B9E988 80241028 AFB10014 */  sw        $s1, 0x14($sp)
 /* B9E98C 8024102C 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_80241014_B9E974
 /* B9E9F0 80241090 28620010 */  slti      $v0, $v1, 0x10
 /* B9E9F4 80241094 1440FFFA */  bnez      $v0, .L80241080
 /* B9E9F8 80241098 24840004 */   addiu    $a0, $a0, 4
-/* B9E9FC 8024109C 3C108024 */  lui       $s0, 0x8024
-/* B9EA00 802410A0 26102614 */  addiu     $s0, $s0, 0x2614
+/* B9E9FC 8024109C 3C108024 */  lui       $s0, %hi(D_80242614)
+/* B9EA00 802410A0 26102614 */  addiu     $s0, $s0, %lo(D_80242614)
 /* B9EA04 802410A4 0C00AB4B */  jal       heap_free
 /* B9EA08 802410A8 8E040000 */   lw       $a0, ($s0)
 /* B9EA0C 802410AC AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_80240278_BA09A8.s b/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_80240278_BA09A8.s
index 6497508616..6f7a92a4d7 100644
--- a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_80240278_BA09A8.s
+++ b/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_80240278_BA09A8.s
@@ -18,8 +18,8 @@ glabel func_80240278_BA09A8
 /* BA09DC 802402AC 0040802D */  daddu     $s0, $v0, $zero
 /* BA09E0 802402B0 3C05800B */  lui       $a1, %hi(gCameras)
 /* BA09E4 802402B4 24A51D80 */  addiu     $a1, $a1, %lo(gCameras)
-/* BA09E8 802402B8 3C03800A */  lui       $v1, 0x800a
-/* BA09EC 802402BC 8463A634 */  lh        $v1, -0x59cc($v1)
+/* BA09E8 802402B8 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* BA09EC 802402BC 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* BA09F0 802402C0 00912021 */  addu      $a0, $a0, $s1
 /* BA09F4 802402C4 00031080 */  sll       $v0, $v1, 2
 /* BA09F8 802402C8 00431021 */  addu      $v0, $v0, $v1
@@ -54,8 +54,8 @@ glabel func_80240278_BA09A8
 /* BA0A68 80240338 00000000 */   nop      
 /* BA0A6C 8024033C 0C00A6C9 */  jal       clamp_angle
 /* BA0A70 80240340 46000306 */   mov.s    $f12, $f0
-/* BA0A74 80240344 3C018024 */  lui       $at, 0x8024
-/* BA0A78 80240348 D4223E80 */  ldc1      $f2, 0x3e80($at)
+/* BA0A74 80240344 3C018024 */  lui       $at, %hi(D_80243E80)
+/* BA0A78 80240348 D4223E80 */  ldc1      $f2, %lo(D_80243E80)($at)
 /* BA0A7C 8024034C 46000021 */  cvt.d.s   $f0, $f0
 /* BA0A80 80240350 4622003C */  c.lt.d    $f0, $f2
 /* BA0A84 80240354 00000000 */  nop       
@@ -97,8 +97,8 @@ glabel func_80240278_BA09A8
 /* BA0B0C 802403DC 45030001 */  bc1tl     .L802403E4
 /* BA0B10 802403E0 0000882D */   daddu    $s1, $zero, $zero
 .L802403E4:
-/* BA0B14 802403E4 3C038011 */  lui       $v1, 0x8011
-/* BA0B18 802403E8 8063EBB3 */  lb        $v1, -0x144d($v1)
+/* BA0B14 802403E4 3C038011 */  lui       $v1, %hi(D_8010EBB3)
+/* BA0B18 802403E8 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
 /* BA0B1C 802403EC 24020009 */  addiu     $v0, $zero, 9
 /* BA0B20 802403F0 50620001 */  beql      $v1, $v0, .L802403F8
 /* BA0B24 802403F4 0000882D */   daddu    $s1, $zero, $zero
diff --git a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_8024068C_BA0DBC.s b/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_8024068C_BA0DBC.s
index dc3bbf7be9..b921b25217 100644
--- a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_8024068C_BA0DBC.s
+++ b/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_8024068C_BA0DBC.s
@@ -100,9 +100,9 @@ glabel func_8024068C_BA0DBC
 /* BA0F20 802407F0 2C620064 */  sltiu     $v0, $v1, 0x64
 /* BA0F24 802407F4 10400048 */  beqz      $v0, .L80240918
 /* BA0F28 802407F8 00031080 */   sll      $v0, $v1, 2
-/* BA0F2C 802407FC 3C018024 */  lui       $at, 0x8024
+/* BA0F2C 802407FC 3C018024 */  lui       $at, %hi(D_80243E88)
 /* BA0F30 80240800 00220821 */  addu      $at, $at, $v0
-/* BA0F34 80240804 8C223E88 */  lw        $v0, 0x3e88($at)
+/* BA0F34 80240804 8C223E88 */  lw        $v0, %lo(D_80243E88)($at)
 /* BA0F38 80240808 00400008 */  jr        $v0
 /* BA0F3C 8024080C 00000000 */   nop      
 /* BA0F40 80240810 0240202D */  daddu     $a0, $s2, $zero
diff --git a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_80240AA8_BA11D8.s b/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_80240AA8_BA11D8.s
index f3321551c0..1100f328bd 100644
--- a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_80240AA8_BA11D8.s
+++ b/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_80240AA8_BA11D8.s
@@ -62,9 +62,9 @@ glabel func_80240AA8_BA11D8
 /* BA12B8 80240B88 000218C0 */  sll       $v1, $v0, 3
 /* BA12BC 80240B8C 00431021 */  addu      $v0, $v0, $v1
 /* BA12C0 80240B90 000210C0 */  sll       $v0, $v0, 3
-/* BA12C4 80240B94 3C01800B */  lui       $at, 0x800b
+/* BA12C4 80240B94 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* BA12C8 80240B98 00220821 */  addu      $at, $at, $v0
-/* BA12CC 80240B9C C4201DEC */  lwc1      $f0, 0x1dec($at)
+/* BA12CC 80240B9C C4201DEC */  lwc1      $f0, %lo(D_800B1DEC)($at)
 /* BA12D0 80240BA0 080902F9 */  j         .L80240BE4
 /* BA12D4 80240BA4 460C0301 */   sub.s    $f12, $f0, $f12
 .L80240BA8:
@@ -79,9 +79,9 @@ glabel func_80240AA8_BA11D8
 /* BA12F8 80240BC8 000218C0 */  sll       $v1, $v0, 3
 /* BA12FC 80240BCC 00431021 */  addu      $v0, $v0, $v1
 /* BA1300 80240BD0 000210C0 */  sll       $v0, $v0, 3
-/* BA1304 80240BD4 3C01800B */  lui       $at, 0x800b
+/* BA1304 80240BD4 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* BA1308 80240BD8 00220821 */  addu      $at, $at, $v0
-/* BA130C 80240BDC C4201DEC */  lwc1      $f0, 0x1dec($at)
+/* BA130C 80240BDC C4201DEC */  lwc1      $f0, %lo(D_800B1DEC)($at)
 /* BA1310 80240BE0 460C0300 */  add.s     $f12, $f0, $f12
 .L80240BE4:
 /* BA1314 80240BE4 0C00A6C9 */  jal       clamp_angle
@@ -157,8 +157,8 @@ glabel func_80240AA8_BA11D8
 /* BA141C 80240CEC 1440005D */  bnez      $v0, .L80240E64
 /* BA1420 80240CF0 00000000 */   nop      
 /* BA1424 80240CF4 C6200038 */  lwc1      $f0, 0x38($s1)
-/* BA1428 80240CF8 3C018024 */  lui       $at, 0x8024
-/* BA142C 80240CFC D4244018 */  ldc1      $f4, 0x4018($at)
+/* BA1428 80240CF8 3C018024 */  lui       $at, %hi(D_80244018)
+/* BA142C 80240CFC D4244018 */  ldc1      $f4, %lo(D_80244018)($at)
 /* BA1430 80240D00 46000021 */  cvt.d.s   $f0, $f0
 /* BA1434 80240D04 4620203C */  c.lt.d    $f4, $f0
 /* BA1438 80240D08 00000000 */  nop       
@@ -170,8 +170,8 @@ glabel func_80240AA8_BA11D8
 /* BA1450 80240D20 E6200038 */  swc1      $f0, 0x38($s1)
 .L80240D24:
 /* BA1454 80240D24 C6200038 */  lwc1      $f0, 0x38($s1)
-/* BA1458 80240D28 3C018024 */  lui       $at, 0x8024
-/* BA145C 80240D2C D4224020 */  ldc1      $f2, 0x4020($at)
+/* BA1458 80240D28 3C018024 */  lui       $at, %hi(D_80244020)
+/* BA145C 80240D2C D4224020 */  ldc1      $f2, %lo(D_80244020)($at)
 /* BA1460 80240D30 46000021 */  cvt.d.s   $f0, $f0
 /* BA1464 80240D34 4622003C */  c.lt.d    $f0, $f2
 /* BA1468 80240D38 00000000 */  nop       
@@ -228,8 +228,8 @@ glabel func_80240AA8_BA11D8
 /* BA1524 80240DF4 4600A386 */   mov.s    $f14, $f20
 /* BA1528 80240DF8 46000586 */  mov.s     $f22, $f0
 /* BA152C 80240DFC C7A20038 */  lwc1      $f2, 0x38($sp)
-/* BA1530 80240E00 3C018024 */  lui       $at, 0x8024
-/* BA1534 80240E04 D4204028 */  ldc1      $f0, 0x4028($at)
+/* BA1530 80240E00 3C018024 */  lui       $at, %hi(D_80244028)
+/* BA1534 80240E04 D4204028 */  ldc1      $f0, %lo(D_80244028)($at)
 /* BA1538 80240E08 460010A1 */  cvt.d.s   $f2, $f2
 /* BA153C 80240E0C 4620103C */  c.lt.d    $f2, $f0
 /* BA1540 80240E10 00000000 */  nop       
@@ -239,8 +239,8 @@ glabel func_80240AA8_BA11D8
 /* BA1550 80240E20 08090392 */  j         .L80240E48
 /* BA1554 80240E24 34C68000 */   ori      $a2, $a2, 0x8000
 .L80240E28:
-/* BA1558 80240E28 3C018024 */  lui       $at, 0x8024
-/* BA155C 80240E2C D4204030 */  ldc1      $f0, 0x4030($at)
+/* BA1558 80240E28 3C018024 */  lui       $at, %hi(D_80244030)
+/* BA155C 80240E2C D4204030 */  ldc1      $f0, %lo(D_80244030)($at)
 /* BA1560 80240E30 4622003C */  c.lt.d    $f0, $f2
 /* BA1564 80240E34 00000000 */  nop       
 /* BA1568 80240E38 450000FA */  bc1f      .L80241224
@@ -296,8 +296,8 @@ glabel func_80240AA8_BA11D8
 /* BA1628 80240EF8 104000CA */  beqz      $v0, .L80241224
 /* BA162C 80240EFC 0280282D */   daddu    $a1, $s4, $zero
 /* BA1630 80240F00 8EA20000 */  lw        $v0, ($s5)
-/* BA1634 80240F04 3C018024 */  lui       $at, 0x8024
-/* BA1638 80240F08 D4224038 */  ldc1      $f2, 0x4038($at)
+/* BA1634 80240F04 3C018024 */  lui       $at, %hi(D_80244038)
+/* BA1638 80240F08 D4224038 */  ldc1      $f2, %lo(D_80244038)($at)
 /* BA163C 80240F0C C440002C */  lwc1      $f0, 0x2c($v0)
 /* BA1640 80240F10 C4460028 */  lwc1      $f6, 0x28($v0)
 /* BA1644 80240F14 C4440030 */  lwc1      $f4, 0x30($v0)
@@ -633,8 +633,8 @@ glabel func_80240AA8_BA11D8
 /* BA1B40 80241410 44813000 */  mtc1      $at, $f6
 /* BA1B44 80241414 46000021 */  cvt.d.s   $f0, $f0
 /* BA1B48 80241418 E7A20020 */  swc1      $f2, 0x20($sp)
-/* BA1B4C 8024141C 3C018024 */  lui       $at, 0x8024
-/* BA1B50 80241420 D4224040 */  ldc1      $f2, 0x4040($at)
+/* BA1B4C 8024141C 3C018024 */  lui       $at, %hi(D_80244040)
+/* BA1B50 80241420 D4224040 */  ldc1      $f2, %lo(D_80244040)($at)
 /* BA1B54 80241424 C6240040 */  lwc1      $f4, 0x40($s1)
 /* BA1B58 80241428 46220000 */  add.d     $f0, $f0, $f2
 /* BA1B5C 8024142C E7A60038 */  swc1      $f6, 0x38($sp)
diff --git a/asm/nonmatchings/world/area_mim/mim_06/BA47F0/func_80240070_BA47F0.s b/asm/nonmatchings/world/area_mim/mim_06/BA47F0/func_80240070_BA47F0.s
index cb6bc352a4..35b1e8f564 100644
--- a/asm/nonmatchings/world/area_mim/mim_06/BA47F0/func_80240070_BA47F0.s
+++ b/asm/nonmatchings/world/area_mim/mim_06/BA47F0/func_80240070_BA47F0.s
@@ -14,8 +14,8 @@ glabel func_80240070_BA47F0
 /* BA4814 80240094 AFB20030 */  sw        $s2, 0x30($sp)
 /* BA4818 80240098 0080902D */  daddu     $s2, $a0, $zero
 /* BA481C 8024009C AFB1002C */  sw        $s1, 0x2c($sp)
-/* BA4820 802400A0 3C118024 */  lui       $s1, 0x8024
-/* BA4824 802400A4 263159C0 */  addiu     $s1, $s1, 0x59c0
+/* BA4820 802400A0 3C118024 */  lui       $s1, %hi(D_802459C0)
+/* BA4824 802400A4 263159C0 */  addiu     $s1, $s1, %lo(D_802459C0)
 /* BA4828 802400A8 AFBF0040 */  sw        $ra, 0x40($sp)
 /* BA482C 802400AC AFB00028 */  sw        $s0, 0x28($sp)
 /* BA4830 802400B0 F7BE0070 */  sdc1      $f30, 0x70($sp)
diff --git a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240778_BA4EF8.s b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240778_BA4EF8.s
index 7909110eb4..fa9373fbb5 100644
--- a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240778_BA4EF8.s
+++ b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240778_BA4EF8.s
@@ -18,8 +18,8 @@ glabel func_80240778_BA4EF8
 /* BA4F2C 802407AC 0040802D */  daddu     $s0, $v0, $zero
 /* BA4F30 802407B0 3C05800B */  lui       $a1, %hi(gCameras)
 /* BA4F34 802407B4 24A51D80 */  addiu     $a1, $a1, %lo(gCameras)
-/* BA4F38 802407B8 3C03800A */  lui       $v1, 0x800a
-/* BA4F3C 802407BC 8463A634 */  lh        $v1, -0x59cc($v1)
+/* BA4F38 802407B8 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* BA4F3C 802407BC 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* BA4F40 802407C0 00912021 */  addu      $a0, $a0, $s1
 /* BA4F44 802407C4 00031080 */  sll       $v0, $v1, 2
 /* BA4F48 802407C8 00431021 */  addu      $v0, $v0, $v1
@@ -54,8 +54,8 @@ glabel func_80240778_BA4EF8
 /* BA4FB8 80240838 00000000 */   nop      
 /* BA4FBC 8024083C 0C00A6C9 */  jal       clamp_angle
 /* BA4FC0 80240840 46000306 */   mov.s    $f12, $f0
-/* BA4FC4 80240844 3C018024 */  lui       $at, 0x8024
-/* BA4FC8 80240848 D42257B0 */  ldc1      $f2, 0x57b0($at)
+/* BA4FC4 80240844 3C018024 */  lui       $at, %hi(D_802457B0)
+/* BA4FC8 80240848 D42257B0 */  ldc1      $f2, %lo(D_802457B0)($at)
 /* BA4FCC 8024084C 46000021 */  cvt.d.s   $f0, $f0
 /* BA4FD0 80240850 4622003C */  c.lt.d    $f0, $f2
 /* BA4FD4 80240854 00000000 */  nop       
@@ -97,8 +97,8 @@ glabel func_80240778_BA4EF8
 /* BA505C 802408DC 45030001 */  bc1tl     .L802408E4
 /* BA5060 802408E0 0000882D */   daddu    $s1, $zero, $zero
 .L802408E4:
-/* BA5064 802408E4 3C038011 */  lui       $v1, 0x8011
-/* BA5068 802408E8 8063EBB3 */  lb        $v1, -0x144d($v1)
+/* BA5064 802408E4 3C038011 */  lui       $v1, %hi(D_8010EBB3)
+/* BA5068 802408E8 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
 /* BA506C 802408EC 24020009 */  addiu     $v0, $zero, 9
 /* BA5070 802408F0 50620001 */  beql      $v1, $v0, .L802408F8
 /* BA5074 802408F4 0000882D */   daddu    $s1, $zero, $zero
diff --git a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240B8C_BA530C.s b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240B8C_BA530C.s
index f5ab104c5a..2b5325c81f 100644
--- a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240B8C_BA530C.s
+++ b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240B8C_BA530C.s
@@ -100,9 +100,9 @@ glabel func_80240B8C_BA530C
 /* BA5470 80240CF0 2C620064 */  sltiu     $v0, $v1, 0x64
 /* BA5474 80240CF4 10400048 */  beqz      $v0, .L80240E18
 /* BA5478 80240CF8 00031080 */   sll      $v0, $v1, 2
-/* BA547C 80240CFC 3C018024 */  lui       $at, 0x8024
+/* BA547C 80240CFC 3C018024 */  lui       $at, %hi(D_802457B8)
 /* BA5480 80240D00 00220821 */  addu      $at, $at, $v0
-/* BA5484 80240D04 8C2257B8 */  lw        $v0, 0x57b8($at)
+/* BA5484 80240D04 8C2257B8 */  lw        $v0, %lo(D_802457B8)($at)
 /* BA5488 80240D08 00400008 */  jr        $v0
 /* BA548C 80240D0C 00000000 */   nop      
 /* BA5490 80240D10 0240202D */  daddu     $a0, $s2, $zero
diff --git a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240FA8_BA5728.s b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240FA8_BA5728.s
index 93da91bd93..24ae106e01 100644
--- a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240FA8_BA5728.s
+++ b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240FA8_BA5728.s
@@ -62,9 +62,9 @@ glabel func_80240FA8_BA5728
 /* BA5808 80241088 000218C0 */  sll       $v1, $v0, 3
 /* BA580C 8024108C 00431021 */  addu      $v0, $v0, $v1
 /* BA5810 80241090 000210C0 */  sll       $v0, $v0, 3
-/* BA5814 80241094 3C01800B */  lui       $at, 0x800b
+/* BA5814 80241094 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* BA5818 80241098 00220821 */  addu      $at, $at, $v0
-/* BA581C 8024109C C4201DEC */  lwc1      $f0, 0x1dec($at)
+/* BA581C 8024109C C4201DEC */  lwc1      $f0, %lo(D_800B1DEC)($at)
 /* BA5820 802410A0 08090439 */  j         .L802410E4
 /* BA5824 802410A4 460C0301 */   sub.s    $f12, $f0, $f12
 .L802410A8:
@@ -79,9 +79,9 @@ glabel func_80240FA8_BA5728
 /* BA5848 802410C8 000218C0 */  sll       $v1, $v0, 3
 /* BA584C 802410CC 00431021 */  addu      $v0, $v0, $v1
 /* BA5850 802410D0 000210C0 */  sll       $v0, $v0, 3
-/* BA5854 802410D4 3C01800B */  lui       $at, 0x800b
+/* BA5854 802410D4 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* BA5858 802410D8 00220821 */  addu      $at, $at, $v0
-/* BA585C 802410DC C4201DEC */  lwc1      $f0, 0x1dec($at)
+/* BA585C 802410DC C4201DEC */  lwc1      $f0, %lo(D_800B1DEC)($at)
 /* BA5860 802410E0 460C0300 */  add.s     $f12, $f0, $f12
 .L802410E4:
 /* BA5864 802410E4 0C00A6C9 */  jal       clamp_angle
@@ -157,8 +157,8 @@ glabel func_80240FA8_BA5728
 /* BA596C 802411EC 1440005D */  bnez      $v0, .L80241364
 /* BA5970 802411F0 00000000 */   nop      
 /* BA5974 802411F4 C6200038 */  lwc1      $f0, 0x38($s1)
-/* BA5978 802411F8 3C018024 */  lui       $at, 0x8024
-/* BA597C 802411FC D4245948 */  ldc1      $f4, 0x5948($at)
+/* BA5978 802411F8 3C018024 */  lui       $at, %hi(D_80245948)
+/* BA597C 802411FC D4245948 */  ldc1      $f4, %lo(D_80245948)($at)
 /* BA5980 80241200 46000021 */  cvt.d.s   $f0, $f0
 /* BA5984 80241204 4620203C */  c.lt.d    $f4, $f0
 /* BA5988 80241208 00000000 */  nop       
@@ -170,8 +170,8 @@ glabel func_80240FA8_BA5728
 /* BA59A0 80241220 E6200038 */  swc1      $f0, 0x38($s1)
 .L80241224:
 /* BA59A4 80241224 C6200038 */  lwc1      $f0, 0x38($s1)
-/* BA59A8 80241228 3C018024 */  lui       $at, 0x8024
-/* BA59AC 8024122C D4225950 */  ldc1      $f2, 0x5950($at)
+/* BA59A8 80241228 3C018024 */  lui       $at, %hi(D_80245950)
+/* BA59AC 8024122C D4225950 */  ldc1      $f2, %lo(D_80245950)($at)
 /* BA59B0 80241230 46000021 */  cvt.d.s   $f0, $f0
 /* BA59B4 80241234 4622003C */  c.lt.d    $f0, $f2
 /* BA59B8 80241238 00000000 */  nop       
@@ -228,8 +228,8 @@ glabel func_80240FA8_BA5728
 /* BA5A74 802412F4 4600A386 */   mov.s    $f14, $f20
 /* BA5A78 802412F8 46000586 */  mov.s     $f22, $f0
 /* BA5A7C 802412FC C7A20038 */  lwc1      $f2, 0x38($sp)
-/* BA5A80 80241300 3C018024 */  lui       $at, 0x8024
-/* BA5A84 80241304 D4205958 */  ldc1      $f0, 0x5958($at)
+/* BA5A80 80241300 3C018024 */  lui       $at, %hi(D_80245958)
+/* BA5A84 80241304 D4205958 */  ldc1      $f0, %lo(D_80245958)($at)
 /* BA5A88 80241308 460010A1 */  cvt.d.s   $f2, $f2
 /* BA5A8C 8024130C 4620103C */  c.lt.d    $f2, $f0
 /* BA5A90 80241310 00000000 */  nop       
@@ -239,8 +239,8 @@ glabel func_80240FA8_BA5728
 /* BA5AA0 80241320 080904D2 */  j         .L80241348
 /* BA5AA4 80241324 34C68000 */   ori      $a2, $a2, 0x8000
 .L80241328:
-/* BA5AA8 80241328 3C018024 */  lui       $at, 0x8024
-/* BA5AAC 8024132C D4205960 */  ldc1      $f0, 0x5960($at)
+/* BA5AA8 80241328 3C018024 */  lui       $at, %hi(D_80245960)
+/* BA5AAC 8024132C D4205960 */  ldc1      $f0, %lo(D_80245960)($at)
 /* BA5AB0 80241330 4622003C */  c.lt.d    $f0, $f2
 /* BA5AB4 80241334 00000000 */  nop       
 /* BA5AB8 80241338 450000FA */  bc1f      .L80241724
@@ -296,8 +296,8 @@ glabel func_80240FA8_BA5728
 /* BA5B78 802413F8 104000CA */  beqz      $v0, .L80241724
 /* BA5B7C 802413FC 0280282D */   daddu    $a1, $s4, $zero
 /* BA5B80 80241400 8EA20000 */  lw        $v0, ($s5)
-/* BA5B84 80241404 3C018024 */  lui       $at, 0x8024
-/* BA5B88 80241408 D4225968 */  ldc1      $f2, 0x5968($at)
+/* BA5B84 80241404 3C018024 */  lui       $at, %hi(D_80245968)
+/* BA5B88 80241408 D4225968 */  ldc1      $f2, %lo(D_80245968)($at)
 /* BA5B8C 8024140C C440002C */  lwc1      $f0, 0x2c($v0)
 /* BA5B90 80241410 C4460028 */  lwc1      $f6, 0x28($v0)
 /* BA5B94 80241414 C4440030 */  lwc1      $f4, 0x30($v0)
@@ -633,8 +633,8 @@ glabel func_80240FA8_BA5728
 /* BA6090 80241910 44813000 */  mtc1      $at, $f6
 /* BA6094 80241914 46000021 */  cvt.d.s   $f0, $f0
 /* BA6098 80241918 E7A20020 */  swc1      $f2, 0x20($sp)
-/* BA609C 8024191C 3C018024 */  lui       $at, 0x8024
-/* BA60A0 80241920 D4225970 */  ldc1      $f2, 0x5970($at)
+/* BA609C 8024191C 3C018024 */  lui       $at, %hi(D_80245970)
+/* BA60A0 80241920 D4225970 */  ldc1      $f2, %lo(D_80245970)($at)
 /* BA60A4 80241924 C6240040 */  lwc1      $f4, 0x40($s1)
 /* BA60A8 80241928 46220000 */  add.d     $f0, $f0, $f2
 /* BA60AC 8024192C E7A60038 */  swc1      $f6, 0x38($sp)
diff --git a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80242144_BA68C4.s b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80242144_BA68C4.s
index 00bcefef84..2b1b658db7 100644
--- a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80242144_BA68C4.s
+++ b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80242144_BA68C4.s
@@ -83,8 +83,8 @@ glabel func_80242144_BA68C4
 /* BA69F0 80242270 27A5002C */   addiu    $a1, $sp, 0x2c
 /* BA69F4 80242274 C6000038 */  lwc1      $f0, 0x38($s0)
 /* BA69F8 80242278 860200A6 */  lh        $v0, 0xa6($s0)
-/* BA69FC 8024227C 3C018024 */  lui       $at, 0x8024
-/* BA6A00 80242280 D4225978 */  ldc1      $f2, 0x5978($at)
+/* BA69FC 8024227C 3C018024 */  lui       $at, %hi(D_80245978)
+/* BA6A00 80242280 D4225978 */  ldc1      $f2, %lo(D_80245978)($at)
 /* BA6A04 80242284 27A60030 */  addiu     $a2, $sp, 0x30
 /* BA6A08 80242288 E7A0002C */  swc1      $f0, 0x2c($sp)
 /* BA6A0C 8024228C 44820000 */  mtc1      $v0, $f0
diff --git a/asm/nonmatchings/world/area_mim/mim_07/BAA1B0/func_802400D8_BAA218.s b/asm/nonmatchings/world/area_mim/mim_07/BAA1B0/func_802400D8_BAA218.s
index c91ff99e04..cdffc95a20 100644
--- a/asm/nonmatchings/world/area_mim/mim_07/BAA1B0/func_802400D8_BAA218.s
+++ b/asm/nonmatchings/world/area_mim/mim_07/BAA1B0/func_802400D8_BAA218.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_802400D8_BAA218
-/* BAA218 802400D8 3C058024 */  lui       $a1, 0x8024
-/* BAA21C 802400DC 24A51680 */  addiu     $a1, $a1, 0x1680
+/* BAA218 802400D8 3C058024 */  lui       $a1, %hi(D_80241680)
+/* BAA21C 802400DC 24A51680 */  addiu     $a1, $a1, %lo(D_80241680)
 /* BAA220 802400E0 8CA30000 */  lw        $v1, ($a1)
 /* BAA224 802400E4 24040002 */  addiu     $a0, $zero, 2
 /* BAA228 802400E8 10640012 */  beq       $v1, $a0, .L80240134
@@ -23,13 +23,13 @@ glabel func_802400D8_BAA218
 /* BAA25C 8024011C 08090071 */  j         .L802401C4
 /* BAA260 80240120 34420A01 */   ori      $v0, $v0, 0xa01
 .L80240124:
-/* BAA264 80240124 3C018024 */  lui       $at, 0x8024
-/* BAA268 80240128 AC201688 */  sw        $zero, 0x1688($at)
+/* BAA264 80240124 3C018024 */  lui       $at, %hi(D_80241688)
+/* BAA268 80240128 AC201688 */  sw        $zero, %lo(D_80241688)($at)
 /* BAA26C 8024012C 0809006F */  j         .L802401BC
 /* BAA270 80240130 ACA40000 */   sw       $a0, ($a1)
 .L80240134:
-/* BAA274 80240134 3C038024 */  lui       $v1, 0x8024
-/* BAA278 80240138 24631688 */  addiu     $v1, $v1, 0x1688
+/* BAA274 80240134 3C038024 */  lui       $v1, %hi(D_80241688)
+/* BAA278 80240138 24631688 */  addiu     $v1, $v1, %lo(D_80241688)
 /* BAA27C 8024013C 8C620000 */  lw        $v0, ($v1)
 /* BAA280 80240140 2442000A */  addiu     $v0, $v0, 0xa
 /* BAA284 80240144 AC620000 */  sw        $v0, ($v1)
@@ -39,14 +39,14 @@ glabel func_802400D8_BAA218
 /* BAA294 80240154 240200FF */  addiu     $v0, $zero, 0xff
 /* BAA298 80240158 AC620000 */  sw        $v0, ($v1)
 /* BAA29C 8024015C 24020032 */  addiu     $v0, $zero, 0x32
-/* BAA2A0 80240160 3C018024 */  lui       $at, 0x8024
-/* BAA2A4 80240164 AC221684 */  sw        $v0, 0x1684($at)
+/* BAA2A0 80240160 3C018024 */  lui       $at, %hi(D_80241684)
+/* BAA2A4 80240164 AC221684 */  sw        $v0, %lo(D_80241684)($at)
 /* BAA2A8 80240168 24020003 */  addiu     $v0, $zero, 3
 /* BAA2AC 8024016C 0809006F */  j         .L802401BC
 /* BAA2B0 80240170 ACA20000 */   sw       $v0, ($a1)
 .L80240174:
-/* BAA2B4 80240174 3C038024 */  lui       $v1, 0x8024
-/* BAA2B8 80240178 24631684 */  addiu     $v1, $v1, 0x1684
+/* BAA2B4 80240174 3C038024 */  lui       $v1, %hi(D_80241684)
+/* BAA2B8 80240178 24631684 */  addiu     $v1, $v1, %lo(D_80241684)
 /* BAA2BC 8024017C 8C620000 */  lw        $v0, ($v1)
 /* BAA2C0 80240180 2442FFFF */  addiu     $v0, $v0, -1
 /* BAA2C4 80240184 0441000D */  bgez      $v0, .L802401BC
@@ -56,8 +56,8 @@ glabel func_802400D8_BAA218
 /* BAA2D4 80240194 0809006F */  j         .L802401BC
 /* BAA2D8 80240198 ACA20000 */   sw       $v0, ($a1)
 .L8024019C:
-/* BAA2DC 8024019C 3C038024 */  lui       $v1, 0x8024
-/* BAA2E0 802401A0 24631688 */  addiu     $v1, $v1, 0x1688
+/* BAA2DC 8024019C 3C038024 */  lui       $v1, %hi(D_80241688)
+/* BAA2E0 802401A0 24631688 */  addiu     $v1, $v1, %lo(D_80241688)
 /* BAA2E4 802401A4 8C620000 */  lw        $v0, ($v1)
 /* BAA2E8 802401A8 2442FFF9 */  addiu     $v0, $v0, -7
 /* BAA2EC 802401AC 04410003 */  bgez      $v0, .L802401BC
@@ -74,8 +74,8 @@ glabel func_802400D8_BAA218
 /* BAA30C 802401CC 3C08E200 */  lui       $t0, 0xe200
 /* BAA310 802401D0 3508001C */  ori       $t0, $t0, 0x1c
 /* BAA314 802401D4 3C07C810 */  lui       $a3, 0xc810
-/* BAA318 802401D8 3C05800A */  lui       $a1, 0x800a
-/* BAA31C 802401DC 24A5A66C */  addiu     $a1, $a1, -0x5994
+/* BAA318 802401D8 3C05800A */  lui       $a1, %hi(D_8009A66C)
+/* BAA31C 802401DC 24A5A66C */  addiu     $a1, $a1, %lo(D_8009A66C)
 /* BAA320 802401E0 8CA30000 */  lw        $v1, ($a1)
 /* BAA324 802401E4 34E74DD8 */  ori       $a3, $a3, 0x4dd8
 /* BAA328 802401E8 0060202D */  daddu     $a0, $v1, $zero
@@ -86,8 +86,8 @@ glabel func_802400D8_BAA218
 /* BAA33C 802401FC AC820004 */  sw        $v0, 4($a0)
 /* BAA340 80240200 24620008 */  addiu     $v0, $v1, 8
 /* BAA344 80240204 ACA20000 */  sw        $v0, ($a1)
-/* BAA348 80240208 3C048024 */  lui       $a0, 0x8024
-/* BAA34C 8024020C 9084168B */  lbu       $a0, 0x168b($a0)
+/* BAA348 80240208 3C048024 */  lui       $a0, %hi(D_8024168B)
+/* BAA34C 8024020C 9084168B */  lbu       $a0, %lo(D_8024168B)($a0)
 /* BAA350 80240210 3C02FA00 */  lui       $v0, 0xfa00
 /* BAA354 80240214 AC620000 */  sw        $v0, ($v1)
 /* BAA358 80240218 24620010 */  addiu     $v0, $v1, 0x10
diff --git a/asm/nonmatchings/world/area_mim/mim_07/BAA1B0/func_80240244_BAA384.s b/asm/nonmatchings/world/area_mim/mim_07/BAA1B0/func_80240244_BAA384.s
index a784ef51c9..f3c3c8f4a8 100644
--- a/asm/nonmatchings/world/area_mim/mim_07/BAA1B0/func_80240244_BAA384.s
+++ b/asm/nonmatchings/world/area_mim/mim_07/BAA1B0/func_80240244_BAA384.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80240244_BAA384
-/* BAA384 80240244 3C038024 */  lui       $v1, 0x8024
-/* BAA388 80240248 24631680 */  addiu     $v1, $v1, 0x1680
+/* BAA384 80240244 3C038024 */  lui       $v1, %hi(D_80241680)
+/* BAA388 80240248 24631680 */  addiu     $v1, $v1, %lo(D_80241680)
 /* BAA38C 8024024C 8C620000 */  lw        $v0, ($v1)
 /* BAA390 80240250 14400003 */  bnez      $v0, .L80240260
 /* BAA394 80240254 24020001 */   addiu    $v0, $zero, 1
diff --git a/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_802404A0_BAA5E0.s b/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_802404A0_BAA5E0.s
index 03d8e9f933..6a7b222f65 100644
--- a/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_802404A0_BAA5E0.s
+++ b/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_802404A0_BAA5E0.s
@@ -83,8 +83,8 @@ glabel func_802404A0_BAA5E0
 /* BAA70C 802405CC 27A5002C */   addiu    $a1, $sp, 0x2c
 /* BAA710 802405D0 C6000038 */  lwc1      $f0, 0x38($s0)
 /* BAA714 802405D4 860200A6 */  lh        $v0, 0xa6($s0)
-/* BAA718 802405D8 3C018024 */  lui       $at, 0x8024
-/* BAA71C 802405DC D42237B0 */  ldc1      $f2, 0x37b0($at)
+/* BAA718 802405D8 3C018024 */  lui       $at, %hi(D_802437B0)
+/* BAA71C 802405DC D42237B0 */  ldc1      $f2, %lo(D_802437B0)($at)
 /* BAA720 802405E0 27A60030 */  addiu     $a2, $sp, 0x30
 /* BAA724 802405E4 E7A0002C */  swc1      $f0, 0x2c($sp)
 /* BAA728 802405E8 44820000 */  mtc1      $v0, $f0
diff --git a/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_80240E60_BAAFA0.s b/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_80240E60_BAAFA0.s
index 1acc6229f8..3b418bf153 100644
--- a/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_80240E60_BAAFA0.s
+++ b/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_80240E60_BAAFA0.s
@@ -88,9 +88,9 @@ glabel func_80240E60_BAAFA0
 /* BAB0E4 80240FA4 2C62000F */  sltiu     $v0, $v1, 0xf
 /* BAB0E8 80240FA8 1040002C */  beqz      $v0, .L8024105C
 /* BAB0EC 80240FAC 00031080 */   sll      $v0, $v1, 2
-/* BAB0F0 80240FB0 3C018024 */  lui       $at, 0x8024
+/* BAB0F0 80240FB0 3C018024 */  lui       $at, %hi(D_802437B8)
 /* BAB0F4 80240FB4 00220821 */  addu      $at, $at, $v0
-/* BAB0F8 80240FB8 8C2237B8 */  lw        $v0, 0x37b8($at)
+/* BAB0F8 80240FB8 8C2237B8 */  lw        $v0, %lo(D_802437B8)($at)
 /* BAB0FC 80240FBC 00400008 */  jr        $v0
 /* BAB100 80240FC0 00000000 */   nop      
 /* BAB104 80240FC4 0260202D */  daddu     $a0, $s3, $zero
diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802400A0_BAD9E0.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802400A0_BAD9E0.s
index f936a9d18a..76d3d4a99d 100644
--- a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802400A0_BAD9E0.s
+++ b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802400A0_BAD9E0.s
@@ -87,8 +87,8 @@ glabel func_802400A0_BAD9E0
 /* BADB20 802401E0 08090082 */  j         .L80240208
 /* BADB24 802401E4 E6000018 */   swc1     $f0, 0x18($s0)
 .L802401E8:
-/* BADB28 802401E8 3C018024 */  lui       $at, 0x8024
-/* BADB2C 802401EC D42252A0 */  ldc1      $f2, 0x52a0($at)
+/* BADB28 802401E8 3C018024 */  lui       $at, %hi(D_802452A0)
+/* BADB2C 802401EC D42252A0 */  ldc1      $f2, %lo(D_802452A0)($at)
 /* BADB30 802401F0 44820000 */  mtc1      $v0, $f0
 /* BADB34 802401F4 00000000 */  nop       
 /* BADB38 802401F8 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240250_BADB90.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240250_BADB90.s
index 3b92ed6044..9a9694a5c5 100644
--- a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240250_BADB90.s
+++ b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240250_BADB90.s
@@ -104,8 +104,8 @@ glabel func_80240250_BADB90
 /* BADD14 802403D4 1040000A */  beqz      $v0, .L80240400
 /* BADD18 802403D8 4600C106 */   mov.s    $f4, $f24
 /* BADD1C 802403DC 4614C081 */  sub.s     $f2, $f24, $f20
-/* BADD20 802403E0 3C018024 */  lui       $at, 0x8024
-/* BADD24 802403E4 D42052A8 */  ldc1      $f0, 0x52a8($at)
+/* BADD20 802403E0 3C018024 */  lui       $at, %hi(D_802452A8)
+/* BADD24 802403E4 D42052A8 */  ldc1      $f0, %lo(D_802452A8)($at)
 /* BADD28 802403E8 460010A1 */  cvt.d.s   $f2, $f2
 /* BADD2C 802403EC 46201082 */  mul.d     $f2, $f2, $f0
 /* BADD30 802403F0 00000000 */  nop       
@@ -131,8 +131,8 @@ glabel func_80240250_BADB90
 /* BADD7C 8024043C C7A4002C */  lwc1      $f4, 0x2c($sp)
 /* BADD80 80240440 461A2100 */  add.s     $f4, $f4, $f26
 /* BADD84 80240444 46142081 */  sub.s     $f2, $f4, $f20
-/* BADD88 80240448 3C018024 */  lui       $at, 0x8024
-/* BADD8C 8024044C D42052B0 */  ldc1      $f0, 0x52b0($at)
+/* BADD88 80240448 3C018024 */  lui       $at, %hi(D_802452B0)
+/* BADD8C 8024044C D42052B0 */  ldc1      $f0, %lo(D_802452B0)($at)
 /* BADD90 80240450 460010A1 */  cvt.d.s   $f2, $f2
 /* BADD94 80240454 46201082 */  mul.d     $f2, $f2, $f0
 /* BADD98 80240458 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240CF4_BAE634.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240CF4_BAE634.s
index 993dba914a..aea2de1f9d 100644
--- a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240CF4_BAE634.s
+++ b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240CF4_BAE634.s
@@ -15,9 +15,9 @@ glabel func_80240CF4_BAE634
 /* BAE65C 80240D1C 00031C00 */  sll       $v1, $v1, 0x10
 /* BAE660 80240D20 00031B83 */  sra       $v1, $v1, 0xe
 /* BAE664 80240D24 A444008E */  sh        $a0, 0x8e($v0)
-/* BAE668 80240D28 3C018024 */  lui       $at, 0x8024
+/* BAE668 80240D28 3C018024 */  lui       $at, %hi(D_802443C0)
 /* BAE66C 80240D2C 00230821 */  addu      $at, $at, $v1
-/* BAE670 80240D30 C42243C0 */  lwc1      $f2, 0x43c0($at)
+/* BAE670 80240D30 C42243C0 */  lwc1      $f2, %lo(D_802443C0)($at)
 /* BAE674 80240D34 8443008E */  lh        $v1, 0x8e($v0)
 /* BAE678 80240D38 46020000 */  add.s     $f0, $f0, $f2
 /* BAE67C 80240D3C 28630005 */  slti      $v1, $v1, 5
diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802413AC_BAECEC.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802413AC_BAECEC.s
index be5e0a69c4..c4248ed0c8 100644
--- a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802413AC_BAECEC.s
+++ b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802413AC_BAECEC.s
@@ -66,9 +66,9 @@ glabel func_802413AC_BAECEC
 /* BAEDD8 80241498 2C62000F */  sltiu     $v0, $v1, 0xf
 /* BAEDDC 8024149C 10400034 */  beqz      $v0, .L80241570
 /* BAEDE0 802414A0 00031080 */   sll      $v0, $v1, 2
-/* BAEDE4 802414A4 3C018024 */  lui       $at, 0x8024
+/* BAEDE4 802414A4 3C018024 */  lui       $at, %hi(D_802452B8)
 /* BAEDE8 802414A8 00220821 */  addu      $at, $at, $v0
-/* BAEDEC 802414AC 8C2252B8 */  lw        $v0, 0x52b8($at)
+/* BAEDEC 802414AC 8C2252B8 */  lw        $v0, %lo(D_802452B8)($at)
 /* BAEDF0 802414B0 00400008 */  jr        $v0
 /* BAEDF4 802414B4 00000000 */   nop      
 /* BAEDF8 802414B8 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802417A0_BAF0E0.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802417A0_BAF0E0.s
index c79b72ac73..f216dd650e 100644
--- a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802417A0_BAF0E0.s
+++ b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802417A0_BAF0E0.s
@@ -18,8 +18,8 @@ glabel func_802417A0_BAF0E0
 /* BAF114 802417D4 0040802D */  daddu     $s0, $v0, $zero
 /* BAF118 802417D8 3C05800B */  lui       $a1, %hi(gCameras)
 /* BAF11C 802417DC 24A51D80 */  addiu     $a1, $a1, %lo(gCameras)
-/* BAF120 802417E0 3C03800A */  lui       $v1, 0x800a
-/* BAF124 802417E4 8463A634 */  lh        $v1, -0x59cc($v1)
+/* BAF120 802417E0 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* BAF124 802417E4 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* BAF128 802417E8 00912021 */  addu      $a0, $a0, $s1
 /* BAF12C 802417EC 00031080 */  sll       $v0, $v1, 2
 /* BAF130 802417F0 00431021 */  addu      $v0, $v0, $v1
@@ -54,8 +54,8 @@ glabel func_802417A0_BAF0E0
 /* BAF1A0 80241860 00000000 */   nop      
 /* BAF1A4 80241864 0C00A6C9 */  jal       clamp_angle
 /* BAF1A8 80241868 46000306 */   mov.s    $f12, $f0
-/* BAF1AC 8024186C 3C018024 */  lui       $at, 0x8024
-/* BAF1B0 80241870 D42252F8 */  ldc1      $f2, 0x52f8($at)
+/* BAF1AC 8024186C 3C018024 */  lui       $at, %hi(D_802452F8)
+/* BAF1B0 80241870 D42252F8 */  ldc1      $f2, %lo(D_802452F8)($at)
 /* BAF1B4 80241874 46000021 */  cvt.d.s   $f0, $f0
 /* BAF1B8 80241878 4622003C */  c.lt.d    $f0, $f2
 /* BAF1BC 8024187C 00000000 */  nop       
@@ -97,8 +97,8 @@ glabel func_802417A0_BAF0E0
 /* BAF244 80241904 45030001 */  bc1tl     .L8024190C
 /* BAF248 80241908 0000882D */   daddu    $s1, $zero, $zero
 .L8024190C:
-/* BAF24C 8024190C 3C038011 */  lui       $v1, 0x8011
-/* BAF250 80241910 8063EBB3 */  lb        $v1, -0x144d($v1)
+/* BAF24C 8024190C 3C038011 */  lui       $v1, %hi(D_8010EBB3)
+/* BAF250 80241910 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
 /* BAF254 80241914 24020009 */  addiu     $v0, $zero, 9
 /* BAF258 80241918 50620001 */  beql      $v1, $v0, .L80241920
 /* BAF25C 8024191C 0000882D */   daddu    $s1, $zero, $zero
diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241BB4_BAF4F4.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241BB4_BAF4F4.s
index 96c9f8504d..5e0eed3c72 100644
--- a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241BB4_BAF4F4.s
+++ b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241BB4_BAF4F4.s
@@ -100,9 +100,9 @@ glabel func_80241BB4_BAF4F4
 /* BAF658 80241D18 2C620064 */  sltiu     $v0, $v1, 0x64
 /* BAF65C 80241D1C 10400048 */  beqz      $v0, .L80241E40
 /* BAF660 80241D20 00031080 */   sll      $v0, $v1, 2
-/* BAF664 80241D24 3C018024 */  lui       $at, 0x8024
+/* BAF664 80241D24 3C018024 */  lui       $at, %hi(D_80245300)
 /* BAF668 80241D28 00220821 */  addu      $at, $at, $v0
-/* BAF66C 80241D2C 8C225300 */  lw        $v0, 0x5300($at)
+/* BAF66C 80241D2C 8C225300 */  lw        $v0, %lo(D_80245300)($at)
 /* BAF670 80241D30 00400008 */  jr        $v0
 /* BAF674 80241D34 00000000 */   nop      
 /* BAF678 80241D38 0240202D */  daddu     $a0, $s2, $zero
diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241FD0_BAF910.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241FD0_BAF910.s
index e514a8c449..d9dee7aaeb 100644
--- a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241FD0_BAF910.s
+++ b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241FD0_BAF910.s
@@ -62,9 +62,9 @@ glabel func_80241FD0_BAF910
 /* BAF9F0 802420B0 000218C0 */  sll       $v1, $v0, 3
 /* BAF9F4 802420B4 00431021 */  addu      $v0, $v0, $v1
 /* BAF9F8 802420B8 000210C0 */  sll       $v0, $v0, 3
-/* BAF9FC 802420BC 3C01800B */  lui       $at, 0x800b
+/* BAF9FC 802420BC 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* BAFA00 802420C0 00220821 */  addu      $at, $at, $v0
-/* BAFA04 802420C4 C4201DEC */  lwc1      $f0, 0x1dec($at)
+/* BAFA04 802420C4 C4201DEC */  lwc1      $f0, %lo(D_800B1DEC)($at)
 /* BAFA08 802420C8 08090843 */  j         .L8024210C
 /* BAFA0C 802420CC 460C0301 */   sub.s    $f12, $f0, $f12
 .L802420D0:
@@ -79,9 +79,9 @@ glabel func_80241FD0_BAF910
 /* BAFA30 802420F0 000218C0 */  sll       $v1, $v0, 3
 /* BAFA34 802420F4 00431021 */  addu      $v0, $v0, $v1
 /* BAFA38 802420F8 000210C0 */  sll       $v0, $v0, 3
-/* BAFA3C 802420FC 3C01800B */  lui       $at, 0x800b
+/* BAFA3C 802420FC 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* BAFA40 80242100 00220821 */  addu      $at, $at, $v0
-/* BAFA44 80242104 C4201DEC */  lwc1      $f0, 0x1dec($at)
+/* BAFA44 80242104 C4201DEC */  lwc1      $f0, %lo(D_800B1DEC)($at)
 /* BAFA48 80242108 460C0300 */  add.s     $f12, $f0, $f12
 .L8024210C:
 /* BAFA4C 8024210C 0C00A6C9 */  jal       clamp_angle
@@ -157,8 +157,8 @@ glabel func_80241FD0_BAF910
 /* BAFB54 80242214 1440005D */  bnez      $v0, .L8024238C
 /* BAFB58 80242218 00000000 */   nop      
 /* BAFB5C 8024221C C6200038 */  lwc1      $f0, 0x38($s1)
-/* BAFB60 80242220 3C018024 */  lui       $at, 0x8024
-/* BAFB64 80242224 D4245490 */  ldc1      $f4, 0x5490($at)
+/* BAFB60 80242220 3C018024 */  lui       $at, %hi(D_80245490)
+/* BAFB64 80242224 D4245490 */  ldc1      $f4, %lo(D_80245490)($at)
 /* BAFB68 80242228 46000021 */  cvt.d.s   $f0, $f0
 /* BAFB6C 8024222C 4620203C */  c.lt.d    $f4, $f0
 /* BAFB70 80242230 00000000 */  nop       
@@ -170,8 +170,8 @@ glabel func_80241FD0_BAF910
 /* BAFB88 80242248 E6200038 */  swc1      $f0, 0x38($s1)
 .L8024224C:
 /* BAFB8C 8024224C C6200038 */  lwc1      $f0, 0x38($s1)
-/* BAFB90 80242250 3C018024 */  lui       $at, 0x8024
-/* BAFB94 80242254 D4225498 */  ldc1      $f2, 0x5498($at)
+/* BAFB90 80242250 3C018024 */  lui       $at, %hi(D_80245498)
+/* BAFB94 80242254 D4225498 */  ldc1      $f2, %lo(D_80245498)($at)
 /* BAFB98 80242258 46000021 */  cvt.d.s   $f0, $f0
 /* BAFB9C 8024225C 4622003C */  c.lt.d    $f0, $f2
 /* BAFBA0 80242260 00000000 */  nop       
@@ -228,8 +228,8 @@ glabel func_80241FD0_BAF910
 /* BAFC5C 8024231C 4600A386 */   mov.s    $f14, $f20
 /* BAFC60 80242320 46000586 */  mov.s     $f22, $f0
 /* BAFC64 80242324 C7A20038 */  lwc1      $f2, 0x38($sp)
-/* BAFC68 80242328 3C018024 */  lui       $at, 0x8024
-/* BAFC6C 8024232C D42054A0 */  ldc1      $f0, 0x54a0($at)
+/* BAFC68 80242328 3C018024 */  lui       $at, %hi(D_802454A0)
+/* BAFC6C 8024232C D42054A0 */  ldc1      $f0, %lo(D_802454A0)($at)
 /* BAFC70 80242330 460010A1 */  cvt.d.s   $f2, $f2
 /* BAFC74 80242334 4620103C */  c.lt.d    $f2, $f0
 /* BAFC78 80242338 00000000 */  nop       
@@ -239,8 +239,8 @@ glabel func_80241FD0_BAF910
 /* BAFC88 80242348 080908DC */  j         .L80242370
 /* BAFC8C 8024234C 34C68000 */   ori      $a2, $a2, 0x8000
 .L80242350:
-/* BAFC90 80242350 3C018024 */  lui       $at, 0x8024
-/* BAFC94 80242354 D42054A8 */  ldc1      $f0, 0x54a8($at)
+/* BAFC90 80242350 3C018024 */  lui       $at, %hi(D_802454A8)
+/* BAFC94 80242354 D42054A8 */  ldc1      $f0, %lo(D_802454A8)($at)
 /* BAFC98 80242358 4622003C */  c.lt.d    $f0, $f2
 /* BAFC9C 8024235C 00000000 */  nop       
 /* BAFCA0 80242360 450000FA */  bc1f      .L8024274C
@@ -296,8 +296,8 @@ glabel func_80241FD0_BAF910
 /* BAFD60 80242420 104000CA */  beqz      $v0, .L8024274C
 /* BAFD64 80242424 0280282D */   daddu    $a1, $s4, $zero
 /* BAFD68 80242428 8EA20000 */  lw        $v0, ($s5)
-/* BAFD6C 8024242C 3C018024 */  lui       $at, 0x8024
-/* BAFD70 80242430 D42254B0 */  ldc1      $f2, 0x54b0($at)
+/* BAFD6C 8024242C 3C018024 */  lui       $at, %hi(D_802454B0)
+/* BAFD70 80242430 D42254B0 */  ldc1      $f2, %lo(D_802454B0)($at)
 /* BAFD74 80242434 C440002C */  lwc1      $f0, 0x2c($v0)
 /* BAFD78 80242438 C4460028 */  lwc1      $f6, 0x28($v0)
 /* BAFD7C 8024243C C4440030 */  lwc1      $f4, 0x30($v0)
@@ -633,8 +633,8 @@ glabel func_80241FD0_BAF910
 /* BB0278 80242938 44813000 */  mtc1      $at, $f6
 /* BB027C 8024293C 46000021 */  cvt.d.s   $f0, $f0
 /* BB0280 80242940 E7A20020 */  swc1      $f2, 0x20($sp)
-/* BB0284 80242944 3C018024 */  lui       $at, 0x8024
-/* BB0288 80242948 D42254B8 */  ldc1      $f2, 0x54b8($at)
+/* BB0284 80242944 3C018024 */  lui       $at, %hi(D_802454B8)
+/* BB0288 80242948 D42254B8 */  ldc1      $f2, %lo(D_802454B8)($at)
 /* BB028C 8024294C C6240040 */  lwc1      $f4, 0x40($s1)
 /* BB0290 80242950 46220000 */  add.d     $f0, $f0, $f2
 /* BB0294 80242954 E7A60038 */  swc1      $f6, 0x38($sp)
diff --git a/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_802402D0_BB30D0.s b/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_802402D0_BB30D0.s
index 4d837705a1..b96a99fd53 100644
--- a/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_802402D0_BB30D0.s
+++ b/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_802402D0_BB30D0.s
@@ -83,8 +83,8 @@ glabel func_802402D0_BB30D0
 /* BB31FC 802403FC 27A5002C */   addiu    $a1, $sp, 0x2c
 /* BB3200 80240400 C6000038 */  lwc1      $f0, 0x38($s0)
 /* BB3204 80240404 860200A6 */  lh        $v0, 0xa6($s0)
-/* BB3208 80240408 3C018024 */  lui       $at, 0x8024
-/* BB320C 8024040C D4222B90 */  ldc1      $f2, 0x2b90($at)
+/* BB3208 80240408 3C018024 */  lui       $at, %hi(D_80242B90)
+/* BB320C 8024040C D4222B90 */  ldc1      $f2, %lo(D_80242B90)($at)
 /* BB3210 80240410 27A60030 */  addiu     $a2, $sp, 0x30
 /* BB3214 80240414 E7A0002C */  swc1      $f0, 0x2c($sp)
 /* BB3218 80240418 44820000 */  mtc1      $v0, $f0
diff --git a/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_80240C90_BB3A90.s b/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_80240C90_BB3A90.s
index e2f3caeefe..ce95e04d0e 100644
--- a/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_80240C90_BB3A90.s
+++ b/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_80240C90_BB3A90.s
@@ -88,9 +88,9 @@ glabel func_80240C90_BB3A90
 /* BB3BD4 80240DD4 2C62000F */  sltiu     $v0, $v1, 0xf
 /* BB3BD8 80240DD8 1040002C */  beqz      $v0, .L80240E8C
 /* BB3BDC 80240DDC 00031080 */   sll      $v0, $v1, 2
-/* BB3BE0 80240DE0 3C018024 */  lui       $at, 0x8024
+/* BB3BE0 80240DE0 3C018024 */  lui       $at, %hi(D_80242B98)
 /* BB3BE4 80240DE4 00220821 */  addu      $at, $at, $v0
-/* BB3BE8 80240DE8 8C222B98 */  lw        $v0, 0x2b98($at)
+/* BB3BE8 80240DE8 8C222B98 */  lw        $v0, %lo(D_80242B98)($at)
 /* BB3BEC 80240DEC 00400008 */  jr        $v0
 /* BB3BF0 80240DF0 00000000 */   nop      
 /* BB3BF4 80240DF4 0260202D */  daddu     $a0, $s3, $zero
diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/delete_player_actor_9C6148.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/delete_player_actor_9C6148.s
index 7db4295853..6a9e9f47f6 100644
--- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/delete_player_actor_9C6148.s
+++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/delete_player_actor_9C6148.s
@@ -4,8 +4,8 @@
 glabel delete_player_actor_9C6148
 /* 9C6148 80240D68 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* 9C614C 80240D6C AFB00010 */  sw        $s0, 0x10($sp)
-/* 9C6150 80240D70 3C108024 */  lui       $s0, 0x8024
-/* 9C6154 80240D74 26105F44 */  addiu     $s0, $s0, 0x5f44
+/* 9C6150 80240D70 3C108024 */  lui       $s0, %hi(D_80245F44)
+/* 9C6154 80240D74 26105F44 */  addiu     $s0, $s0, %lo(D_80245F44)
 /* 9C6158 80240D78 AFBF0018 */  sw        $ra, 0x18($sp)
 /* 9C615C 80240D7C AFB10014 */  sw        $s1, 0x14($sp)
 /* 9C6160 80240D80 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel delete_player_actor_9C6148
 /* 9C61C4 80240DE4 28620010 */  slti      $v0, $v1, 0x10
 /* 9C61C8 80240DE8 1440FFFA */  bnez      $v0, .L80240DD4
 /* 9C61CC 80240DEC 24840004 */   addiu    $a0, $a0, 4
-/* 9C61D0 80240DF0 3C108024 */  lui       $s0, 0x8024
-/* 9C61D4 80240DF4 26105F44 */  addiu     $s0, $s0, 0x5f44
+/* 9C61D0 80240DF0 3C108024 */  lui       $s0, %hi(D_80245F44)
+/* 9C61D4 80240DF4 26105F44 */  addiu     $s0, $s0, %lo(D_80245F44)
 /* 9C61D8 80240DF8 0C00AB4B */  jal       heap_free
 /* 9C61DC 80240DFC 8E040000 */   lw       $a0, ($s0)
 /* 9C61E0 80240E00 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240000_9C53E0.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240000_9C53E0.s
index 4ab06c9987..fccf16234d 100644
--- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240000_9C53E0.s
+++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240000_9C53E0.s
@@ -35,8 +35,8 @@ glabel func_80240000_9C53E0
 /* 9C5454 80240074 08090027 */  j         .L8024009C
 /* 9C5458 80240078 E4800018 */   swc1     $f0, 0x18($a0)
 .L8024007C:
-/* 9C545C 8024007C 3C018025 */  lui       $at, 0x8025
-/* 9C5460 80240080 D4221A90 */  ldc1      $f2, 0x1a90($at)
+/* 9C545C 8024007C 3C018025 */  lui       $at, %hi(D_80251A90)
+/* 9C5460 80240080 D4221A90 */  ldc1      $f2, %lo(D_80251A90)($at)
 /* 9C5464 80240084 44820000 */  mtc1      $v0, $f0
 /* 9C5468 80240088 00000000 */  nop       
 /* 9C546C 8024008C 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240540_9C5920.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240540_9C5920.s
index 879bd1263b..cfd066fce4 100644
--- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240540_9C5920.s
+++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240540_9C5920.s
@@ -21,16 +21,16 @@ glabel func_80240540_9C5920
 /* 9C5960 80240580 04410009 */  bgez      $v0, .L802405A8
 /* 9C5964 80240584 00000000 */   nop      
 /* 9C5968 80240588 C640000C */  lwc1      $f0, 0xc($s2)
-/* 9C596C 8024058C 3C018025 */  lui       $at, 0x8025
-/* 9C5970 80240590 D4221A98 */  ldc1      $f2, 0x1a98($at)
+/* 9C596C 8024058C 3C018025 */  lui       $at, %hi(D_80251A98)
+/* 9C5970 80240590 D4221A98 */  ldc1      $f2, %lo(D_80251A98)($at)
 /* 9C5974 80240594 46000021 */  cvt.d.s   $f0, $f0
 /* 9C5978 80240598 46220002 */  mul.d     $f0, $f0, $f2
 /* 9C597C 8024059C 00000000 */  nop       
 /* 9C5980 802405A0 08090171 */  j         .L802405C4
 /* 9C5984 802405A4 46200020 */   cvt.s.d  $f0, $f0
 .L802405A8:
-/* 9C5988 802405A8 3C018025 */  lui       $at, 0x8025
-/* 9C598C 802405AC D4221AA0 */  ldc1      $f2, 0x1aa0($at)
+/* 9C5988 802405A8 3C018025 */  lui       $at, %hi(D_80251AA0)
+/* 9C598C 802405AC D4221AA0 */  ldc1      $f2, %lo(D_80251AA0)($at)
 /* 9C5990 802405B0 44820000 */  mtc1      $v0, $f0
 /* 9C5994 802405B4 00000000 */  nop       
 /* 9C5998 802405B8 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802407F4_9C5BD4.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802407F4_9C5BD4.s
index e055e94d78..a284211d18 100644
--- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802407F4_9C5BD4.s
+++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802407F4_9C5BD4.s
@@ -102,9 +102,9 @@ glabel func_802407F4_9C5BD4
 /* 9C5D44 80240964 2C620064 */  sltiu     $v0, $v1, 0x64
 /* 9C5D48 80240968 10400036 */  beqz      $v0, .L80240A44
 /* 9C5D4C 8024096C 00031080 */   sll      $v0, $v1, 2
-/* 9C5D50 80240970 3C018025 */  lui       $at, 0x8025
+/* 9C5D50 80240970 3C018025 */  lui       $at, %hi(D_80251AA8)
 /* 9C5D54 80240974 00220821 */  addu      $at, $at, $v0
-/* 9C5D58 80240978 8C221AA8 */  lw        $v0, 0x1aa8($at)
+/* 9C5D58 80240978 8C221AA8 */  lw        $v0, %lo(D_80251AA8)($at)
 /* 9C5D5C 8024097C 00400008 */  jr        $v0
 /* 9C5D60 80240980 00000000 */   nop      
 /* 9C5D64 80240984 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240B30_9C5F10.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240B30_9C5F10.s
index a203cf7371..76557dc278 100644
--- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240B30_9C5F10.s
+++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240B30_9C5F10.s
@@ -26,9 +26,9 @@ glabel func_80240B30_9C5F10
 /* 9C5F64 80240B84 000320C0 */  sll       $a0, $v1, 3
 /* 9C5F68 80240B88 00641821 */  addu      $v1, $v1, $a0
 /* 9C5F6C 80240B8C 000318C0 */  sll       $v1, $v1, 3
-/* 9C5F70 80240B90 3C01800B */  lui       $at, 0x800b
+/* 9C5F70 80240B90 3C01800B */  lui       $at, %hi(D_800B1D98)
 /* 9C5F74 80240B94 00230821 */  addu      $at, $at, $v1
-/* 9C5F78 80240B98 E4201D98 */  swc1      $f0, 0x1d98($at)
+/* 9C5F78 80240B98 E4201D98 */  swc1      $f0, %lo(D_800B1D98)($at)
 /* 9C5F7C 80240B9C 8FBF0018 */  lw        $ra, 0x18($sp)
 /* 9C5F80 80240BA0 8FB10014 */  lw        $s1, 0x14($sp)
 /* 9C5F84 80240BA4 8FB00010 */  lw        $s0, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240EA4_9C6284.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240EA4_9C6284.s
index 6d79d7d1d1..96c6b3b275 100644
--- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240EA4_9C6284.s
+++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240EA4_9C6284.s
@@ -90,8 +90,8 @@ glabel func_80240EA4_9C6284
 /* 9C63D0 80240FF0 0040802D */   daddu    $s0, $v0, $zero
 /* 9C63D4 80240FF4 0040282D */  daddu     $a1, $v0, $zero
 /* 9C63D8 80240FF8 0000182D */  daddu     $v1, $zero, $zero
-/* 9C63DC 80240FFC 3C068024 */  lui       $a2, 0x8024
-/* 9C63E0 80241000 24C65FE8 */  addiu     $a2, $a2, 0x5fe8
+/* 9C63DC 80240FFC 3C068024 */  lui       $a2, %hi(D_80245FE8)
+/* 9C63E0 80241000 24C65FE8 */  addiu     $a2, $a2, %lo(D_80245FE8)
 /* 9C63E4 80241004 00C0202D */  daddu     $a0, $a2, $zero
 .L80241008:
 /* 9C63E8 80241008 8C820000 */  lw        $v0, ($a0)
diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802410C8_9C64A8.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802410C8_9C64A8.s
index c41c9b3552..a28c805d9d 100644
--- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802410C8_9C64A8.s
+++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802410C8_9C64A8.s
@@ -9,8 +9,8 @@ glabel func_802410C8_9C64A8
 /* 9C64B8 802410D8 8C84014C */   lw       $a0, 0x14c($a0)
 /* 9C64BC 802410DC 24040008 */  addiu     $a0, $zero, 8
 /* 9C64C0 802410E0 0040802D */  daddu     $s0, $v0, $zero
-/* 9C64C4 802410E4 3C028024 */  lui       $v0, 0x8024
-/* 9C64C8 802410E8 24421134 */  addiu     $v0, $v0, 0x1134
+/* 9C64C4 802410E4 3C028024 */  lui       $v0, %hi(D_80241134)
+/* 9C64C8 802410E8 24421134 */  addiu     $v0, $v0, %lo(D_80241134)
 /* 9C64CC 802410EC 0C00AB39 */  jal       heap_malloc
 /* 9C64D0 802410F0 AE020008 */   sw       $v0, 8($s0)
 /* 9C64D4 802410F4 0040182D */  daddu     $v1, $v0, $zero
diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241134_9C6514.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241134_9C6514.s
index 30cdf9c232..236a2be377 100644
--- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241134_9C6514.s
+++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241134_9C6514.s
@@ -3,8 +3,8 @@
 
 glabel func_80241134_9C6514
 /* 9C6514 80241134 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 9C6518 80241138 3C03800A */  lui       $v1, 0x800a
-/* 9C651C 8024113C 8463A634 */  lh        $v1, -0x59cc($v1)
+/* 9C6518 80241138 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* 9C651C 8024113C 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* 9C6520 80241140 3C05800B */  lui       $a1, %hi(gCameras)
 /* 9C6524 80241144 24A51D80 */  addiu     $a1, $a1, %lo(gCameras)
 /* 9C6528 80241148 AFBF0010 */  sw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241194_9C6574.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241194_9C6574.s
index 6d5b73bc67..86e28d039e 100644
--- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241194_9C6574.s
+++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241194_9C6574.s
@@ -21,8 +21,8 @@ glabel func_80241194_9C6574
 /* 9C65B4 802411D4 2414FFFC */  addiu     $s4, $zero, -4
 /* 9C65B8 802411D8 2413000F */  addiu     $s3, $zero, 0xf
 /* 9C65BC 802411DC 3C120080 */  lui       $s2, 0x80
-/* 9C65C0 802411E0 3C038015 */  lui       $v1, 0x8015
-/* 9C65C4 802411E4 8C6312F0 */  lw        $v1, 0x12f0($v1)
+/* 9C65C0 802411E0 3C038015 */  lui       $v1, %hi(D_801512F0)
+/* 9C65C4 802411E4 8C6312F0 */  lw        $v1, %lo(D_801512F0)($v1)
 /* 9C65C8 802411E8 24020001 */  addiu     $v0, $zero, 1
 /* 9C65CC 802411EC 0C046F97 */  jal       set_background_color_blend
 /* 9C65D0 802411F0 A0620000 */   sb       $v0, ($v1)
diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802412E0_9C66C0.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802412E0_9C66C0.s
index 3340d9adf9..2f7f1efaf9 100644
--- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802412E0_9C66C0.s
+++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802412E0_9C66C0.s
@@ -49,8 +49,8 @@ glabel func_802412E0_9C66C0
 /* 9C6764 80241384 2413FFFC */  addiu     $s3, $zero, -4
 /* 9C6768 80241388 2412000F */  addiu     $s2, $zero, 0xf
 /* 9C676C 8024138C 3C11FF7F */  lui       $s1, 0xff7f
-/* 9C6770 80241390 3C028015 */  lui       $v0, 0x8015
-/* 9C6774 80241394 8C4212F0 */  lw        $v0, 0x12f0($v0)
+/* 9C6770 80241390 3C028015 */  lui       $v0, %hi(D_801512F0)
+/* 9C6774 80241394 8C4212F0 */  lw        $v0, %lo(D_801512F0)($v0)
 /* 9C6778 80241398 3631FFFF */  ori       $s1, $s1, 0xffff
 /* 9C677C 8024139C A0400000 */  sb        $zero, ($v0)
 .L802413A0:
diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241454_9C6834.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241454_9C6834.s
index 54d4e1d461..e6db29722c 100644
--- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241454_9C6834.s
+++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241454_9C6834.s
@@ -19,9 +19,9 @@ glabel func_80241454_9C6834
 /* 9C6868 80241488 34A502E0 */  ori       $a1, $a1, 0x2e0
 /* 9C686C 8024148C 0C0B1EAF */  jal       get_variable
 /* 9C6870 80241490 0000202D */   daddu    $a0, $zero, $zero
-/* 9C6874 80241494 3C038024 */  lui       $v1, 0x8024
+/* 9C6874 80241494 3C038024 */  lui       $v1, %hi(D_80245FA8)
 /* 9C6878 80241498 00621821 */  addu      $v1, $v1, $v0
-/* 9C687C 8024149C 90635FA8 */  lbu       $v1, 0x5fa8($v1)
+/* 9C687C 8024149C 90635FA8 */  lbu       $v1, %lo(D_80245FA8)($v1)
 /* 9C6880 802414A0 8E220084 */  lw        $v0, 0x84($s1)
 /* 9C6884 802414A4 54430006 */  bnel      $v0, $v1, .L802414C0
 /* 9C6888 802414A8 AE200084 */   sw       $zero, 0x84($s1)
diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802414D8_9C68B8.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802414D8_9C68B8.s
index 97d4835dcd..4e481c5d72 100644
--- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802414D8_9C68B8.s
+++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802414D8_9C68B8.s
@@ -38,8 +38,8 @@ glabel func_802414D8_9C68B8
 /* 9C693C 8024155C 0220202D */  daddu     $a0, $s1, $zero
 /* 9C6940 80241560 3C05F4AC */  lui       $a1, 0xf4ac
 /* 9C6944 80241564 34A5D481 */  ori       $a1, $a1, 0xd481
-/* 9C6948 80241568 3C108025 */  lui       $s0, 0x8025
-/* 9C694C 8024156C 26101C60 */  addiu     $s0, $s0, 0x1c60
+/* 9C6948 80241568 3C108025 */  lui       $s0, %hi(D_80251C60)
+/* 9C694C 8024156C 26101C60 */  addiu     $s0, $s0, %lo(D_80251C60)
 /* 9C6950 80241570 0C0B1EAF */  jal       get_variable
 /* 9C6954 80241574 AE020000 */   sw       $v0, ($s0)
 /* 9C6958 80241578 0220202D */  daddu     $a0, $s1, $zero
@@ -66,8 +66,8 @@ glabel func_802414D8_9C68B8
 /* 9C69AC 802415CC 0000202D */   daddu    $a0, $zero, $zero
 /* 9C69B0 802415D0 0220202D */  daddu     $a0, $s1, $zero
 /* 9C69B4 802415D4 3C05F4AC */  lui       $a1, 0xf4ac
-/* 9C69B8 802415D8 3C018025 */  lui       $at, 0x8025
-/* 9C69BC 802415DC AC221C64 */  sw        $v0, 0x1c64($at)
+/* 9C69B8 802415D8 3C018025 */  lui       $at, %hi(D_80251C64)
+/* 9C69BC 802415DC AC221C64 */  sw        $v0, %lo(D_80251C64)($at)
 /* 9C69C0 802415E0 0C0B1EAF */  jal       get_variable
 /* 9C69C4 802415E4 34A5D481 */   ori      $a1, $a1, 0xd481
 /* 9C69C8 802415E8 0220202D */  daddu     $a0, $s1, $zero
@@ -98,16 +98,16 @@ glabel func_802414D8_9C68B8
 /* 9C6A2C 8024164C E7A00010 */   swc1     $f0, 0x10($sp)
 /* 9C6A30 80241650 8E030000 */  lw        $v1, ($s0)
 /* 9C6A34 80241654 8C64000C */  lw        $a0, 0xc($v1)
-/* 9C6A38 80241658 3C018025 */  lui       $at, 0x8025
-/* 9C6A3C 8024165C AC221C68 */  sw        $v0, 0x1c68($at)
+/* 9C6A38 80241658 3C018025 */  lui       $at, %hi(D_80251C68)
+/* 9C6A3C 8024165C AC221C68 */  sw        $v0, %lo(D_80251C68)($at)
 /* 9C6A40 80241660 AC800018 */  sw        $zero, 0x18($a0)
 /* 9C6A44 80241664 AC800020 */  sw        $zero, 0x20($a0)
 /* 9C6A48 80241668 AC800024 */  sw        $zero, 0x24($a0)
 /* 9C6A4C 8024166C AC800028 */  sw        $zero, 0x28($a0)
 /* 9C6A50 80241670 AC80001C */  sw        $zero, 0x1c($a0)
 .L80241674:
-/* 9C6A54 80241674 3C028025 */  lui       $v0, 0x8025
-/* 9C6A58 80241678 8C421C60 */  lw        $v0, 0x1c60($v0)
+/* 9C6A54 80241674 3C028025 */  lui       $v0, %hi(D_80251C60)
+/* 9C6A58 80241678 8C421C60 */  lw        $v0, %lo(D_80251C60)($v0)
 /* 9C6A5C 8024167C 8C44000C */  lw        $a0, 0xc($v0)
 /* 9C6A60 80241680 8C820020 */  lw        $v0, 0x20($a0)
 /* 9C6A64 80241684 8C830028 */  lw        $v1, 0x28($a0)
diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802416F0_9C6AD0.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802416F0_9C6AD0.s
index 5a7f95aac1..3743ad5a6b 100644
--- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802416F0_9C6AD0.s
+++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802416F0_9C6AD0.s
@@ -5,19 +5,19 @@ glabel func_802416F0_9C6AD0
 /* 9C6AD0 802416F0 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 9C6AD4 802416F4 10A0000B */  beqz      $a1, .L80241724
 /* 9C6AD8 802416F8 AFBF0010 */   sw       $ra, 0x10($sp)
-/* 9C6ADC 802416FC 3C038025 */  lui       $v1, 0x8025
-/* 9C6AE0 80241700 8C631C64 */  lw        $v1, 0x1c64($v1)
+/* 9C6ADC 802416FC 3C038025 */  lui       $v1, %hi(D_80251C64)
+/* 9C6AE0 80241700 8C631C64 */  lw        $v1, %lo(D_80251C64)($v1)
 /* 9C6AE4 80241704 8C620000 */  lw        $v0, ($v1)
-/* 9C6AE8 80241708 3C048025 */  lui       $a0, 0x8025
-/* 9C6AEC 8024170C 8C841C68 */  lw        $a0, 0x1c68($a0)
+/* 9C6AE8 80241708 3C048025 */  lui       $a0, %hi(D_80251C68)
+/* 9C6AEC 8024170C 8C841C68 */  lw        $a0, %lo(D_80251C68)($a0)
 /* 9C6AF0 80241710 34420010 */  ori       $v0, $v0, 0x10
 /* 9C6AF4 80241714 AC620000 */  sw        $v0, ($v1)
 /* 9C6AF8 80241718 8C820000 */  lw        $v0, ($a0)
 /* 9C6AFC 8024171C 34420010 */  ori       $v0, $v0, 0x10
 /* 9C6B00 80241720 AC820000 */  sw        $v0, ($a0)
 .L80241724:
-/* 9C6B04 80241724 3C048025 */  lui       $a0, 0x8025
-/* 9C6B08 80241728 8C841C60 */  lw        $a0, 0x1c60($a0)
+/* 9C6B04 80241724 3C048025 */  lui       $a0, %hi(D_80251C60)
+/* 9C6B08 80241728 8C841C60 */  lw        $a0, %lo(D_80251C60)($a0)
 /* 9C6B0C 8024172C 8C85000C */  lw        $a1, 0xc($a0)
 /* 9C6B10 80241730 8CA20018 */  lw        $v0, 0x18($a1)
 /* 9C6B14 80241734 8CA30020 */  lw        $v1, 0x20($a1)
@@ -41,8 +41,8 @@ glabel func_802416F0_9C6AD0
 .L8024177C:
 /* 9C6B5C 8024177C 0C016914 */  jal       remove_effect
 /* 9C6B60 80241780 ACA00018 */   sw       $zero, 0x18($a1)
-/* 9C6B64 80241784 3C048025 */  lui       $a0, 0x8025
-/* 9C6B68 80241788 8C841C40 */  lw        $a0, 0x1c40($a0)
+/* 9C6B64 80241784 3C048025 */  lui       $a0, %hi(D_80251C40)
+/* 9C6B68 80241788 8C841C40 */  lw        $a0, %lo(D_80251C40)($a0)
 /* 9C6B6C 8024178C 0C048D70 */  jal       func_801235C0
 /* 9C6B70 80241790 00000000 */   nop      
 /* 9C6B74 80241794 24020002 */  addiu     $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802417A4_9C6B84.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802417A4_9C6B84.s
index 630b184a30..2001385ea9 100644
--- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802417A4_9C6B84.s
+++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802417A4_9C6B84.s
@@ -7,8 +7,8 @@ glabel func_802417A4_9C6B84
 /* 9C6B8C 802417AC 8C82000C */  lw        $v0, 0xc($a0)
 /* 9C6B90 802417B0 0C0B1EAF */  jal       get_variable
 /* 9C6B94 802417B4 8C450000 */   lw       $a1, ($v0)
-/* 9C6B98 802417B8 3C038025 */  lui       $v1, 0x8025
-/* 9C6B9C 802417BC 8C631C60 */  lw        $v1, 0x1c60($v1)
+/* 9C6B98 802417B8 3C038025 */  lui       $v1, %hi(D_80251C60)
+/* 9C6B9C 802417BC 8C631C60 */  lw        $v1, %lo(D_80251C60)($v1)
 /* 9C6BA0 802417C0 8C63000C */  lw        $v1, 0xc($v1)
 /* 9C6BA4 802417C4 AC620034 */  sw        $v0, 0x34($v1)
 /* 9C6BA8 802417C8 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802417D8_9C6BB8.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802417D8_9C6BB8.s
index f950dcf60b..9d2f9b437c 100644
--- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802417D8_9C6BB8.s
+++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802417D8_9C6BB8.s
@@ -8,8 +8,8 @@ glabel func_802417D8_9C6BB8
 /* 9C6BC4 802417E4 0C0B1EAF */  jal       get_variable
 /* 9C6BC8 802417E8 8C450000 */   lw       $a1, ($v0)
 /* 9C6BCC 802417EC 0040202D */  daddu     $a0, $v0, $zero
-/* 9C6BD0 802417F0 3C028025 */  lui       $v0, 0x8025
-/* 9C6BD4 802417F4 8C421C60 */  lw        $v0, 0x1c60($v0)
+/* 9C6BD0 802417F0 3C028025 */  lui       $v0, %hi(D_80251C60)
+/* 9C6BD4 802417F4 8C421C60 */  lw        $v0, %lo(D_80251C60)($v0)
 /* 9C6BD8 802417F8 24030001 */  addiu     $v1, $zero, 1
 /* 9C6BDC 802417FC 8C45000C */  lw        $a1, 0xc($v0)
 /* 9C6BE0 80241800 1083000D */  beq       $a0, $v1, .L80241838
diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241858_9C6C38.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241858_9C6C38.s
index d11a8d3c0a..f140d3b2fa 100644
--- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241858_9C6C38.s
+++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241858_9C6C38.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80241858_9C6C38
-/* 9C6C38 80241858 3C028025 */  lui       $v0, 0x8025
-/* 9C6C3C 8024185C 8C421C68 */  lw        $v0, 0x1c68($v0)
+/* 9C6C38 80241858 3C028025 */  lui       $v0, %hi(D_80251C68)
+/* 9C6C3C 8024185C 8C421C68 */  lw        $v0, %lo(D_80251C68)($v0)
 /* 9C6C40 80241860 8C42000C */  lw        $v0, 0xc($v0)
 /* 9C6C44 80241864 AC40001C */  sw        $zero, 0x1c($v0)
 /* 9C6C48 80241868 03E00008 */  jr        $ra
diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241870_9C6C50.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241870_9C6C50.s
index 9efb8f047d..8d313c13c5 100644
--- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241870_9C6C50.s
+++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241870_9C6C50.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80241870_9C6C50
-/* 9C6C50 80241870 3C028025 */  lui       $v0, 0x8025
-/* 9C6C54 80241874 8C421C68 */  lw        $v0, 0x1c68($v0)
+/* 9C6C50 80241870 3C028025 */  lui       $v0, %hi(D_80251C68)
+/* 9C6C54 80241874 8C421C68 */  lw        $v0, %lo(D_80251C68)($v0)
 /* 9C6C58 80241878 8C43000C */  lw        $v1, 0xc($v0)
 /* 9C6C5C 8024187C 24020001 */  addiu     $v0, $zero, 1
 /* 9C6C60 80241880 AC62001C */  sw        $v0, 0x1c($v1)
diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_8024188C_9C6C6C.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_8024188C_9C6C6C.s
index b3f362f38b..63e73c6a0f 100644
--- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_8024188C_9C6C6C.s
+++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_8024188C_9C6C6C.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_8024188C_9C6C6C
-/* 9C6C6C 8024188C 3C028025 */  lui       $v0, 0x8025
-/* 9C6C70 80241890 8C421C68 */  lw        $v0, 0x1c68($v0)
+/* 9C6C6C 8024188C 3C028025 */  lui       $v0, %hi(D_80251C68)
+/* 9C6C70 80241890 8C421C68 */  lw        $v0, %lo(D_80251C68)($v0)
 /* 9C6C74 80241894 8C43000C */  lw        $v1, 0xc($v0)
 /* 9C6C78 80241898 24020002 */  addiu     $v0, $zero, 2
 /* 9C6C7C 8024189C 03E00008 */  jr        $ra
diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241D60_9C7140.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241D60_9C7140.s
index 6c621cb6fb..739a7c0d75 100644
--- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241D60_9C7140.s
+++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241D60_9C7140.s
@@ -3,8 +3,8 @@
 
 glabel func_80241D60_9C7140
 /* 9C7140 80241D60 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 9C7144 80241D64 3C058025 */  lui       $a1, 0x8025
-/* 9C7148 80241D68 8CA51C58 */  lw        $a1, 0x1c58($a1)
+/* 9C7144 80241D64 3C058025 */  lui       $a1, %hi(D_80251C58)
+/* 9C7148 80241D68 8CA51C58 */  lw        $a1, %lo(D_80251C58)($a1)
 /* 9C714C 80241D6C AFBF0010 */  sw        $ra, 0x10($sp)
 /* 9C7150 80241D70 0C0B1EAF */  jal       get_variable
 /* 9C7154 80241D74 0000202D */   daddu    $a0, $zero, $zero
diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241DCC_9C71AC.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241DCC_9C71AC.s
index 3644496aec..5afacd3052 100644
--- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241DCC_9C71AC.s
+++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241DCC_9C71AC.s
@@ -3,14 +3,14 @@
 
 glabel func_80241DCC_9C71AC
 /* 9C71AC 80241DCC 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 9C71B0 80241DD0 3C058024 */  lui       $a1, 0x8024
-/* 9C71B4 80241DD4 24A51D60 */  addiu     $a1, $a1, 0x1d60
+/* 9C71B0 80241DD0 3C058024 */  lui       $a1, %hi(D_80241D60)
+/* 9C71B4 80241DD4 24A51D60 */  addiu     $a1, $a1, %lo(D_80241D60)
 /* 9C71B8 80241DD8 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 9C71BC 80241DDC 0C048C8F */  jal       bind_dynamic_entity_7
 /* 9C71C0 80241DE0 0000202D */   daddu    $a0, $zero, $zero
 /* 9C71C4 80241DE4 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 9C71C8 80241DE8 3C018025 */  lui       $at, 0x8025
-/* 9C71CC 80241DEC AC221C40 */  sw        $v0, 0x1c40($at)
+/* 9C71C8 80241DE8 3C018025 */  lui       $at, %hi(D_80251C40)
+/* 9C71CC 80241DEC AC221C40 */  sw        $v0, %lo(D_80251C40)($at)
 /* 9C71D0 80241DF0 24020002 */  addiu     $v0, $zero, 2
 /* 9C71D4 80241DF4 03E00008 */  jr        $ra
 /* 9C71D8 80241DF8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242028_9C7408.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242028_9C7408.s
index b9c55c8e32..3fdb505f62 100644
--- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242028_9C7408.s
+++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242028_9C7408.s
@@ -6,11 +6,11 @@ glabel func_80242028_9C7408
 /* 9C740C 8024202C AFBF0010 */  sw        $ra, 0x10($sp)
 /* 9C7410 80242030 10A00003 */  beqz      $a1, .L80242040
 /* 9C7414 80242034 8C86000C */   lw       $a2, 0xc($a0)
-/* 9C7418 80242038 3C018025 */  lui       $at, 0x8025
-/* 9C741C 8024203C AC20856C */  sw        $zero, -0x7a94($at)
+/* 9C7418 80242038 3C018025 */  lui       $at, %hi(D_8024856C)
+/* 9C741C 8024203C AC20856C */  sw        $zero, %lo(D_8024856C)($at)
 .L80242040:
-/* 9C7420 80242040 3C038025 */  lui       $v1, 0x8025
-/* 9C7424 80242044 2463856C */  addiu     $v1, $v1, -0x7a94
+/* 9C7420 80242040 3C038025 */  lui       $v1, %hi(D_8024856C)
+/* 9C7424 80242044 2463856C */  addiu     $v1, $v1, %lo(D_8024856C)
 /* 9C7428 80242048 8C620000 */  lw        $v0, ($v1)
 /* 9C742C 8024204C 54400003 */  bnel      $v0, $zero, .L8024205C
 /* 9C7430 80242050 AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_80242028_9C7408
 /* 9C7438 80242058 0000102D */   daddu    $v0, $zero, $zero
 .L8024205C:
 /* 9C743C 8024205C 8CC50000 */  lw        $a1, ($a2)
-/* 9C7440 80242060 3C068025 */  lui       $a2, 0x8025
+/* 9C7440 80242060 3C068025 */  lui       $a2, %hi(D_80248570)
 /* 9C7444 80242064 0C0B2026 */  jal       set_variable
-/* 9C7448 80242068 8CC68570 */   lw       $a2, -0x7a90($a2)
+/* 9C7448 80242068 8CC68570 */   lw       $a2, %lo(D_80248570)($a2)
 /* 9C744C 8024206C 24020002 */  addiu     $v0, $zero, 2
 .L80242070:
 /* 9C7450 80242070 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_8024207C_9C745C.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_8024207C_9C745C.s
index cacdd1d059..67839c3e00 100644
--- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_8024207C_9C745C.s
+++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_8024207C_9C745C.s
@@ -7,12 +7,12 @@ glabel func_8024207C_9C745C
 /* 9C7464 80242084 8C82000C */  lw        $v0, 0xc($a0)
 /* 9C7468 80242088 0C0B1EAF */  jal       get_variable
 /* 9C746C 8024208C 8C450000 */   lw       $a1, ($v0)
-/* 9C7470 80242090 3C018025 */  lui       $at, 0x8025
-/* 9C7474 80242094 AC228570 */  sw        $v0, -0x7a90($at)
+/* 9C7470 80242090 3C018025 */  lui       $at, %hi(D_80248570)
+/* 9C7474 80242094 AC228570 */  sw        $v0, %lo(D_80248570)($at)
 /* 9C7478 80242098 24020002 */  addiu     $v0, $zero, 2
 /* 9C747C 8024209C 8FBF0010 */  lw        $ra, 0x10($sp)
 /* 9C7480 802420A0 24030001 */  addiu     $v1, $zero, 1
-/* 9C7484 802420A4 3C018025 */  lui       $at, 0x8025
-/* 9C7488 802420A8 AC23856C */  sw        $v1, -0x7a94($at)
+/* 9C7484 802420A4 3C018025 */  lui       $at, %hi(D_8024856C)
+/* 9C7488 802420A8 AC23856C */  sw        $v1, %lo(D_8024856C)($at)
 /* 9C748C 802420AC 03E00008 */  jr        $ra
 /* 9C7490 802420B0 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802420B4_9C7494.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802420B4_9C7494.s
index b9d85fa277..738bdb1681 100644
--- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802420B4_9C7494.s
+++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802420B4_9C7494.s
@@ -13,8 +13,8 @@ glabel func_802420B4_9C7494
 /* 9C74B4 802420D4 8C620000 */  lw        $v0, ($v1)
 /* 9C74B8 802420D8 5040000A */  beql      $v0, $zero, .L80242104
 /* 9C74BC 802420DC 00041080 */   sll      $v0, $a0, 2
-/* 9C74C0 802420E0 3C058025 */  lui       $a1, 0x8025
-/* 9C74C4 802420E4 24A51C70 */  addiu     $a1, $a1, 0x1c70
+/* 9C74C0 802420E0 3C058025 */  lui       $a1, %hi(D_80251C70)
+/* 9C74C4 802420E4 24A51C70 */  addiu     $a1, $a1, %lo(D_80251C70)
 .L802420E8:
 /* 9C74C8 802420E8 24630004 */  addiu     $v1, $v1, 4
 /* 9C74CC 802420EC 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_802420B4_9C7494
 /* 9C74DC 802420FC 24A50004 */   addiu    $a1, $a1, 4
 /* 9C74E0 80242100 00041080 */  sll       $v0, $a0, 2
 .L80242104:
-/* 9C74E4 80242104 3C018025 */  lui       $at, 0x8025
+/* 9C74E4 80242104 3C018025 */  lui       $at, %hi(D_80251C70)
 /* 9C74E8 80242108 00220821 */  addu      $at, $at, $v0
-/* 9C74EC 8024210C AC201C70 */  sw        $zero, 0x1c70($at)
+/* 9C74EC 8024210C AC201C70 */  sw        $zero, %lo(D_80251C70)($at)
 /* 9C74F0 80242110 08090850 */  j         .L80242140
 /* 9C74F4 80242114 00000000 */   nop      
 .L80242118:
-/* 9C74F8 80242118 3C038025 */  lui       $v1, 0x8025
-/* 9C74FC 8024211C 24631C70 */  addiu     $v1, $v1, 0x1c70
+/* 9C74F8 80242118 3C038025 */  lui       $v1, %hi(D_80251C70)
+/* 9C74FC 8024211C 24631C70 */  addiu     $v1, $v1, %lo(D_80251C70)
 /* 9C7500 80242120 0060282D */  daddu     $a1, $v1, $zero
 .L80242124:
 /* 9C7504 80242124 24820010 */  addiu     $v0, $a0, 0x10
diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802423CC_9C77AC.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802423CC_9C77AC.s
index c920a609cc..67dbb0932d 100644
--- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802423CC_9C77AC.s
+++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802423CC_9C77AC.s
@@ -15,7 +15,7 @@ glabel func_802423CC_9C77AC
 /* 9C77D4 802423F4 8FBF0014 */  lw        $ra, 0x14($sp)
 /* 9C77D8 802423F8 8FB00010 */  lw        $s0, 0x10($sp)
 /* 9C77DC 802423FC 24020002 */  addiu     $v0, $zero, 2
-/* 9C77E0 80242400 3C018025 */  lui       $at, 0x8025
-/* 9C77E4 80242404 AC231E34 */  sw        $v1, 0x1e34($at)
+/* 9C77E0 80242400 3C018025 */  lui       $at, %hi(D_80251E34)
+/* 9C77E4 80242404 AC231E34 */  sw        $v1, %lo(D_80251E34)($at)
 /* 9C77E8 80242408 03E00008 */  jr        $ra
 /* 9C77EC 8024240C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242410_9C77F0.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242410_9C77F0.s
index 73ae6092f3..0a6d8da8b4 100644
--- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242410_9C77F0.s
+++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242410_9C77F0.s
@@ -6,8 +6,8 @@ glabel func_80242410_9C77F0
 /* 9C77F4 80242414 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 9C77F8 80242418 0C00EABB */  jal       get_npc_unsafe
 /* 9C77FC 8024241C 8C84008C */   lw       $a0, 0x8c($a0)
-/* 9C7800 80242420 3C038025 */  lui       $v1, 0x8025
-/* 9C7804 80242424 8C631E34 */  lw        $v1, 0x1e34($v1)
+/* 9C7800 80242420 3C038025 */  lui       $v1, %hi(D_80251E34)
+/* 9C7804 80242424 8C631E34 */  lw        $v1, %lo(D_80251E34)($v1)
 /* 9C7808 80242428 AC430028 */  sw        $v1, 0x28($v0)
 /* 9C780C 8024242C 8FBF0010 */  lw        $ra, 0x10($sp)
 /* 9C7810 80242430 24020002 */  addiu     $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_8024243C_9C781C.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_8024243C_9C781C.s
index 0b3a11c95d..a37d719acd 100644
--- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_8024243C_9C781C.s
+++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_8024243C_9C781C.s
@@ -27,9 +27,9 @@ glabel func_8024243C_9C781C
 /* 9C7874 80242494 00641821 */  addu      $v1, $v1, $a0
 /* 9C7878 80242498 000318C0 */  sll       $v1, $v1, 3
 /* 9C787C 8024249C 46020000 */  add.s     $f0, $f0, $f2
-/* 9C7880 802424A0 3C01800B */  lui       $at, 0x800b
+/* 9C7880 802424A0 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* 9C7884 802424A4 00230821 */  addu      $at, $at, $v1
-/* 9C7888 802424A8 C42C1DEC */  lwc1      $f12, 0x1dec($at)
+/* 9C7888 802424A8 C42C1DEC */  lwc1      $f12, %lo(D_800B1DEC)($at)
 /* 9C788C 802424AC 0C00A6C9 */  jal       clamp_angle
 /* 9C7890 802424B0 460C0301 */   sub.s    $f12, $f0, $f12
 /* 9C7894 802424B4 3C014387 */  lui       $at, 0x4387
diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242804_9C7BE4.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242804_9C7BE4.s
index cd27df90e0..07de5ed483 100644
--- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242804_9C7BE4.s
+++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242804_9C7BE4.s
@@ -8,8 +8,8 @@ glabel func_80242804_9C7BE4
 /* 9C7BF0 80242810 8C82000C */  lw        $v0, 0xc($a0)
 /* 9C7BF4 80242814 0C0B1EAF */  jal       get_variable
 /* 9C7BF8 80242818 8C450000 */   lw       $a1, ($v0)
-/* 9C7BFC 8024281C 3C038025 */  lui       $v1, 0x8025
-/* 9C7C00 80242820 24630810 */  addiu     $v1, $v1, 0x810
+/* 9C7BFC 8024281C 3C038025 */  lui       $v1, %hi(D_80250810)
+/* 9C7C00 80242820 24630810 */  addiu     $v1, $v1, %lo(D_80250810)
 /* 9C7C04 80242824 00028040 */  sll       $s0, $v0, 1
 /* 9C7C08 80242828 02038021 */  addu      $s0, $s0, $v1
 /* 9C7C0C 8024282C 0C015612 */  jal       func_80055848
diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242858_9C7C38.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242858_9C7C38.s
index 493120d346..334963dcd8 100644
--- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242858_9C7C38.s
+++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242858_9C7C38.s
@@ -9,9 +9,9 @@ glabel func_80242858_9C7C38
 /* 9C7C48 80242868 8C450000 */   lw       $a1, ($v0)
 /* 9C7C4C 8024286C 240505DC */  addiu     $a1, $zero, 0x5dc
 /* 9C7C50 80242870 00021040 */  sll       $v0, $v0, 1
-/* 9C7C54 80242874 3C048025 */  lui       $a0, 0x8025
+/* 9C7C54 80242874 3C048025 */  lui       $a0, %hi(D_80250810)
 /* 9C7C58 80242878 00822021 */  addu      $a0, $a0, $v0
-/* 9C7C5C 8024287C 84840810 */  lh        $a0, 0x810($a0)
+/* 9C7C5C 8024287C 84840810 */  lh        $a0, %lo(D_80250810)($a0)
 /* 9C7C60 80242880 0C01559B */  jal       func_8005566C
 /* 9C7C64 80242884 24060001 */   addiu    $a2, $zero, 1
 /* 9C7C68 80242888 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802428D8_9C7CB8.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802428D8_9C7CB8.s
index 81ede726e1..6001e7f780 100644
--- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802428D8_9C7CB8.s
+++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802428D8_9C7CB8.s
@@ -8,10 +8,10 @@ glabel func_802428D8_9C7CB8
 /* 9C7CC4 802428E4 0C0B1EAF */  jal       get_variable
 /* 9C7CC8 802428E8 8C450000 */   lw       $a1, ($v0)
 /* 9C7CCC 802428EC 00021040 */  sll       $v0, $v0, 1
-/* 9C7CD0 802428F0 3C048025 */  lui       $a0, 0x8025
+/* 9C7CD0 802428F0 3C048025 */  lui       $a0, %hi(D_80250810)
 /* 9C7CD4 802428F4 00822021 */  addu      $a0, $a0, $v0
 /* 9C7CD8 802428F8 0C015612 */  jal       func_80055848
-/* 9C7CDC 802428FC 84840810 */   lh       $a0, 0x810($a0)
+/* 9C7CDC 802428FC 84840810 */   lh       $a0, %lo(D_80250810)($a0)
 /* 9C7CE0 80242900 8FBF0010 */  lw        $ra, 0x10($sp)
 /* 9C7CE4 80242904 24020002 */  addiu     $v0, $zero, 2
 /* 9C7CE8 80242908 03E00008 */  jr        $ra
diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_802402E0_9D7300.s b/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_802402E0_9D7300.s
index ed29f61581..75c567ca02 100644
--- a/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_802402E0_9D7300.s
+++ b/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_802402E0_9D7300.s
@@ -4,8 +4,8 @@
 glabel func_802402E0_9D7300
 /* 9D7300 802402E0 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* 9D7304 802402E4 AFB00010 */  sw        $s0, 0x10($sp)
-/* 9D7308 802402E8 3C108024 */  lui       $s0, 0x8024
-/* 9D730C 802402EC 261053D0 */  addiu     $s0, $s0, 0x53d0
+/* 9D7308 802402E8 3C108024 */  lui       $s0, %hi(D_802453D0)
+/* 9D730C 802402EC 261053D0 */  addiu     $s0, $s0, %lo(D_802453D0)
 /* 9D7310 802402F0 AFBF0018 */  sw        $ra, 0x18($sp)
 /* 9D7314 802402F4 AFB10014 */  sw        $s1, 0x14($sp)
 /* 9D7318 802402F8 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_802402E0_9D7300
 /* 9D737C 8024035C 28620010 */  slti      $v0, $v1, 0x10
 /* 9D7380 80240360 1440FFFA */  bnez      $v0, .L8024034C
 /* 9D7384 80240364 24840004 */   addiu    $a0, $a0, 4
-/* 9D7388 80240368 3C108024 */  lui       $s0, 0x8024
-/* 9D738C 8024036C 261053D0 */  addiu     $s0, $s0, 0x53d0
+/* 9D7388 80240368 3C108024 */  lui       $s0, %hi(D_802453D0)
+/* 9D738C 8024036C 261053D0 */  addiu     $s0, $s0, %lo(D_802453D0)
 /* 9D7390 80240370 0C00AB4B */  jal       heap_free
 /* 9D7394 80240374 8E040000 */   lw       $a0, ($s0)
 /* 9D7398 80240378 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_80240624_9D7644.s b/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_80240624_9D7644.s
index dc7a8ad753..3ad68d311c 100644
--- a/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_80240624_9D7644.s
+++ b/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_80240624_9D7644.s
@@ -6,11 +6,11 @@ glabel func_80240624_9D7644
 /* 9D7648 80240628 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 9D764C 8024062C 10A00003 */  beqz      $a1, .L8024063C
 /* 9D7650 80240630 8C86000C */   lw       $a2, 0xc($a0)
-/* 9D7654 80240634 3C018024 */  lui       $at, 0x8024
-/* 9D7658 80240638 AC205434 */  sw        $zero, 0x5434($at)
+/* 9D7654 80240634 3C018024 */  lui       $at, %hi(D_80245434)
+/* 9D7658 80240638 AC205434 */  sw        $zero, %lo(D_80245434)($at)
 .L8024063C:
-/* 9D765C 8024063C 3C038024 */  lui       $v1, 0x8024
-/* 9D7660 80240640 24635434 */  addiu     $v1, $v1, 0x5434
+/* 9D765C 8024063C 3C038024 */  lui       $v1, %hi(D_80245434)
+/* 9D7660 80240640 24635434 */  addiu     $v1, $v1, %lo(D_80245434)
 /* 9D7664 80240644 8C620000 */  lw        $v0, ($v1)
 /* 9D7668 80240648 54400003 */  bnel      $v0, $zero, .L80240658
 /* 9D766C 8024064C AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_80240624_9D7644
 /* 9D7674 80240654 0000102D */   daddu    $v0, $zero, $zero
 .L80240658:
 /* 9D7678 80240658 8CC50000 */  lw        $a1, ($a2)
-/* 9D767C 8024065C 3C068024 */  lui       $a2, 0x8024
+/* 9D767C 8024065C 3C068024 */  lui       $a2, %hi(D_80245438)
 /* 9D7680 80240660 0C0B2026 */  jal       set_variable
-/* 9D7684 80240664 8CC65438 */   lw       $a2, 0x5438($a2)
+/* 9D7684 80240664 8CC65438 */   lw       $a2, %lo(D_80245438)($a2)
 /* 9D7688 80240668 24020002 */  addiu     $v0, $zero, 2
 .L8024066C:
 /* 9D768C 8024066C 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_80240678_9D7698.s b/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_80240678_9D7698.s
index b1ea2d2a01..92e7abf055 100644
--- a/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_80240678_9D7698.s
+++ b/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_80240678_9D7698.s
@@ -7,12 +7,12 @@ glabel func_80240678_9D7698
 /* 9D76A0 80240680 8C82000C */  lw        $v0, 0xc($a0)
 /* 9D76A4 80240684 0C0B1EAF */  jal       get_variable
 /* 9D76A8 80240688 8C450000 */   lw       $a1, ($v0)
-/* 9D76AC 8024068C 3C018024 */  lui       $at, 0x8024
-/* 9D76B0 80240690 AC225438 */  sw        $v0, 0x5438($at)
+/* 9D76AC 8024068C 3C018024 */  lui       $at, %hi(D_80245438)
+/* 9D76B0 80240690 AC225438 */  sw        $v0, %lo(D_80245438)($at)
 /* 9D76B4 80240694 24020002 */  addiu     $v0, $zero, 2
 /* 9D76B8 80240698 8FBF0010 */  lw        $ra, 0x10($sp)
 /* 9D76BC 8024069C 24030001 */  addiu     $v1, $zero, 1
-/* 9D76C0 802406A0 3C018024 */  lui       $at, 0x8024
-/* 9D76C4 802406A4 AC235434 */  sw        $v1, 0x5434($at)
+/* 9D76C0 802406A0 3C018024 */  lui       $at, %hi(D_80245434)
+/* 9D76C4 802406A4 AC235434 */  sw        $v1, %lo(D_80245434)($at)
 /* 9D76C8 802406A8 03E00008 */  jr        $ra
 /* 9D76CC 802406AC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_802406B0_9D76D0.s b/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_802406B0_9D76D0.s
index a61560de4f..51b298a1a0 100644
--- a/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_802406B0_9D76D0.s
+++ b/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_802406B0_9D76D0.s
@@ -13,8 +13,8 @@ glabel func_802406B0_9D76D0
 /* 9D76F0 802406D0 8C620000 */  lw        $v0, ($v1)
 /* 9D76F4 802406D4 5040000A */  beql      $v0, $zero, .L80240700
 /* 9D76F8 802406D8 00041080 */   sll      $v0, $a0, 2
-/* 9D76FC 802406DC 3C058025 */  lui       $a1, 0x8025
-/* 9D7700 802406E0 24A547D0 */  addiu     $a1, $a1, 0x47d0
+/* 9D76FC 802406DC 3C058025 */  lui       $a1, %hi(D_802547D0)
+/* 9D7700 802406E0 24A547D0 */  addiu     $a1, $a1, %lo(D_802547D0)
 .L802406E4:
 /* 9D7704 802406E4 24630004 */  addiu     $v1, $v1, 4
 /* 9D7708 802406E8 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_802406B0_9D76D0
 /* 9D7718 802406F8 24A50004 */   addiu    $a1, $a1, 4
 /* 9D771C 802406FC 00041080 */  sll       $v0, $a0, 2
 .L80240700:
-/* 9D7720 80240700 3C018025 */  lui       $at, 0x8025
+/* 9D7720 80240700 3C018025 */  lui       $at, %hi(D_802547D0)
 /* 9D7724 80240704 00220821 */  addu      $at, $at, $v0
-/* 9D7728 80240708 AC2047D0 */  sw        $zero, 0x47d0($at)
+/* 9D7728 80240708 AC2047D0 */  sw        $zero, %lo(D_802547D0)($at)
 /* 9D772C 8024070C 080901CF */  j         .L8024073C
 /* 9D7730 80240710 00000000 */   nop      
 .L80240714:
-/* 9D7734 80240714 3C038025 */  lui       $v1, 0x8025
-/* 9D7738 80240718 246347D0 */  addiu     $v1, $v1, 0x47d0
+/* 9D7734 80240714 3C038025 */  lui       $v1, %hi(D_802547D0)
+/* 9D7738 80240718 246347D0 */  addiu     $v1, $v1, %lo(D_802547D0)
 /* 9D773C 8024071C 0060282D */  daddu     $a1, $v1, $zero
 .L80240720:
 /* 9D7740 80240720 24820010 */  addiu     $v0, $a0, 0x10
diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80240A80_9D7AA0.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80240A80_9D7AA0.s
index 9611d44282..73d732bd6a 100644
--- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80240A80_9D7AA0.s
+++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80240A80_9D7AA0.s
@@ -69,8 +69,8 @@ glabel func_80240A80_9D7AA0
 /* 9D7B94 80240B74 080902E7 */  j         .L80240B9C
 /* 9D7B98 80240B78 E6800018 */   swc1     $f0, 0x18($s4)
 .L80240B7C:
-/* 9D7B9C 80240B7C 3C018025 */  lui       $at, 0x8025
-/* 9D7BA0 80240B80 D4224620 */  ldc1      $f2, 0x4620($at)
+/* 9D7B9C 80240B7C 3C018025 */  lui       $at, %hi(D_80254620)
+/* 9D7BA0 80240B80 D4224620 */  ldc1      $f2, %lo(D_80254620)($at)
 /* 9D7BA4 80240B84 44820000 */  mtc1      $v0, $f0
 /* 9D7BA8 80240B88 00000000 */  nop       
 /* 9D7BAC 80240B8C 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802410FC_9D811C.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802410FC_9D811C.s
index 0ae94b81d5..af9b0b671b 100644
--- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802410FC_9D811C.s
+++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802410FC_9D811C.s
@@ -33,8 +33,8 @@ glabel func_802410FC_9D811C
 /* 9D8188 80241168 08090464 */  j         .L80241190
 /* 9D818C 8024116C E4A00018 */   swc1     $f0, 0x18($a1)
 .L80241170:
-/* 9D8190 80241170 3C018025 */  lui       $at, 0x8025
-/* 9D8194 80241174 D4224628 */  ldc1      $f2, 0x4628($at)
+/* 9D8190 80241170 3C018025 */  lui       $at, %hi(D_80254628)
+/* 9D8194 80241174 D4224628 */  ldc1      $f2, %lo(D_80254628)($at)
 /* 9D8198 80241178 44820000 */  mtc1      $v0, $f0
 /* 9D819C 8024117C 00000000 */  nop       
 /* 9D81A0 80241180 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241614_9D8634.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241614_9D8634.s
index d0e173f86b..c5909e09ed 100644
--- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241614_9D8634.s
+++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241614_9D8634.s
@@ -124,9 +124,9 @@ glabel func_80241614_9D8634
 /* 9D87F8 802417D8 2C620064 */  sltiu     $v0, $v1, 0x64
 /* 9D87FC 802417DC 10400042 */  beqz      $v0, .L802418E8
 /* 9D8800 802417E0 00031080 */   sll      $v0, $v1, 2
-/* 9D8804 802417E4 3C018025 */  lui       $at, 0x8025
+/* 9D8804 802417E4 3C018025 */  lui       $at, %hi(D_80254630)
 /* 9D8808 802417E8 00220821 */  addu      $at, $at, $v0
-/* 9D880C 802417EC 8C224630 */  lw        $v0, 0x4630($at)
+/* 9D880C 802417EC 8C224630 */  lw        $v0, %lo(D_80254630)($at)
 /* 9D8810 802417F0 00400008 */  jr        $v0
 /* 9D8814 802417F4 00000000 */   nop      
 /* 9D8818 802417F8 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241910_9D8930.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241910_9D8930.s
index b79b85d6fa..7d216e6d28 100644
--- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241910_9D8930.s
+++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241910_9D8930.s
@@ -4,8 +4,8 @@
 glabel func_80241910_9D8930
 /* 9D8930 80241910 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* 9D8934 80241914 AFB00010 */  sw        $s0, 0x10($sp)
-/* 9D8938 80241918 3C108024 */  lui       $s0, 0x8024
-/* 9D893C 8024191C 261070C8 */  addiu     $s0, $s0, 0x70c8
+/* 9D8938 80241918 3C108024 */  lui       $s0, %hi(D_802470C8)
+/* 9D893C 8024191C 261070C8 */  addiu     $s0, $s0, %lo(D_802470C8)
 /* 9D8940 80241920 AFBF0018 */  sw        $ra, 0x18($sp)
 /* 9D8944 80241924 AFB10014 */  sw        $s1, 0x14($sp)
 /* 9D8948 80241928 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_80241910_9D8930
 /* 9D89AC 8024198C 28620010 */  slti      $v0, $v1, 0x10
 /* 9D89B0 80241990 1440FFFA */  bnez      $v0, .L8024197C
 /* 9D89B4 80241994 24840004 */   addiu    $a0, $a0, 4
-/* 9D89B8 80241998 3C108024 */  lui       $s0, 0x8024
-/* 9D89BC 8024199C 261070C8 */  addiu     $s0, $s0, 0x70c8
+/* 9D89B8 80241998 3C108024 */  lui       $s0, %hi(D_802470C8)
+/* 9D89BC 8024199C 261070C8 */  addiu     $s0, $s0, %lo(D_802470C8)
 /* 9D89C0 802419A0 0C00AB4B */  jal       heap_free
 /* 9D89C4 802419A4 8E040000 */   lw       $a0, ($s0)
 /* 9D89C8 802419A8 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241A4C_9D8A6C.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241A4C_9D8A6C.s
index 65aa42a0e6..9206132f83 100644
--- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241A4C_9D8A6C.s
+++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241A4C_9D8A6C.s
@@ -90,8 +90,8 @@ glabel func_80241A4C_9D8A6C
 /* 9D8BB8 80241B98 0040802D */   daddu    $s0, $v0, $zero
 /* 9D8BBC 80241B9C 0040282D */  daddu     $a1, $v0, $zero
 /* 9D8BC0 80241BA0 0000182D */  daddu     $v1, $zero, $zero
-/* 9D8BC4 80241BA4 3C068024 */  lui       $a2, 0x8024
-/* 9D8BC8 80241BA8 24C6716C */  addiu     $a2, $a2, 0x716c
+/* 9D8BC4 80241BA4 3C068024 */  lui       $a2, %hi(D_8024716C)
+/* 9D8BC8 80241BA8 24C6716C */  addiu     $a2, $a2, %lo(D_8024716C)
 /* 9D8BCC 80241BAC 00C0202D */  daddu     $a0, $a2, $zero
 .L80241BB0:
 /* 9D8BD0 80241BB0 8C820000 */  lw        $v0, ($a0)
diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241C70_9D8C90.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241C70_9D8C90.s
index d1d4e43f2f..5b73283065 100644
--- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241C70_9D8C90.s
+++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241C70_9D8C90.s
@@ -9,8 +9,8 @@ glabel func_80241C70_9D8C90
 /* 9D8CA0 80241C80 8C84014C */   lw       $a0, 0x14c($a0)
 /* 9D8CA4 80241C84 24040008 */  addiu     $a0, $zero, 8
 /* 9D8CA8 80241C88 0040802D */  daddu     $s0, $v0, $zero
-/* 9D8CAC 80241C8C 3C028024 */  lui       $v0, 0x8024
-/* 9D8CB0 80241C90 24421CDC */  addiu     $v0, $v0, 0x1cdc
+/* 9D8CAC 80241C8C 3C028024 */  lui       $v0, %hi(D_80241CDC)
+/* 9D8CB0 80241C90 24421CDC */  addiu     $v0, $v0, %lo(D_80241CDC)
 /* 9D8CB4 80241C94 0C00AB39 */  jal       heap_malloc
 /* 9D8CB8 80241C98 AE020008 */   sw       $v0, 8($s0)
 /* 9D8CBC 80241C9C 0040182D */  daddu     $v1, $v0, $zero
diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241CDC_9D8CFC.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241CDC_9D8CFC.s
index 54db506389..fa4e123c1b 100644
--- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241CDC_9D8CFC.s
+++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241CDC_9D8CFC.s
@@ -3,8 +3,8 @@
 
 glabel func_80241CDC_9D8CFC
 /* 9D8CFC 80241CDC 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 9D8D00 80241CE0 3C03800A */  lui       $v1, 0x800a
-/* 9D8D04 80241CE4 8463A634 */  lh        $v1, -0x59cc($v1)
+/* 9D8D00 80241CE0 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* 9D8D04 80241CE4 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* 9D8D08 80241CE8 3C05800B */  lui       $a1, %hi(gCameras)
 /* 9D8D0C 80241CEC 24A51D80 */  addiu     $a1, $a1, %lo(gCameras)
 /* 9D8D10 80241CF0 AFBF0010 */  sw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241D3C_9D8D5C.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241D3C_9D8D5C.s
index 306739c9c3..084a17775b 100644
--- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241D3C_9D8D5C.s
+++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241D3C_9D8D5C.s
@@ -21,8 +21,8 @@ glabel func_80241D3C_9D8D5C
 /* 9D8D9C 80241D7C 2414FFFC */  addiu     $s4, $zero, -4
 /* 9D8DA0 80241D80 24130013 */  addiu     $s3, $zero, 0x13
 /* 9D8DA4 80241D84 3C120080 */  lui       $s2, 0x80
-/* 9D8DA8 80241D88 3C038015 */  lui       $v1, 0x8015
-/* 9D8DAC 80241D8C 8C6312F0 */  lw        $v1, 0x12f0($v1)
+/* 9D8DA8 80241D88 3C038015 */  lui       $v1, %hi(D_801512F0)
+/* 9D8DAC 80241D8C 8C6312F0 */  lw        $v1, %lo(D_801512F0)($v1)
 /* 9D8DB0 80241D90 24020001 */  addiu     $v0, $zero, 1
 /* 9D8DB4 80241D94 0C046F97 */  jal       set_background_color_blend
 /* 9D8DB8 80241D98 A0620000 */   sb       $v0, ($v1)
diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241E88_9D8EA8.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241E88_9D8EA8.s
index 8d094fca89..6b24cbe719 100644
--- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241E88_9D8EA8.s
+++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241E88_9D8EA8.s
@@ -49,8 +49,8 @@ glabel func_80241E88_9D8EA8
 /* 9D8F4C 80241F2C 2413FFFC */  addiu     $s3, $zero, -4
 /* 9D8F50 80241F30 24120013 */  addiu     $s2, $zero, 0x13
 /* 9D8F54 80241F34 3C11FF7F */  lui       $s1, 0xff7f
-/* 9D8F58 80241F38 3C028015 */  lui       $v0, 0x8015
-/* 9D8F5C 80241F3C 8C4212F0 */  lw        $v0, 0x12f0($v0)
+/* 9D8F58 80241F38 3C028015 */  lui       $v0, %hi(D_801512F0)
+/* 9D8F5C 80241F3C 8C4212F0 */  lw        $v0, %lo(D_801512F0)($v0)
 /* 9D8F60 80241F40 3631FFFF */  ori       $s1, $s1, 0xffff
 /* 9D8F64 80241F44 A0400000 */  sb        $zero, ($v0)
 .L80241F48:
diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241FFC_9D901C.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241FFC_9D901C.s
index 6e37bd7830..e72b05f35c 100644
--- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241FFC_9D901C.s
+++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241FFC_9D901C.s
@@ -19,9 +19,9 @@ glabel func_80241FFC_9D901C
 /* 9D9050 80242030 34A502E0 */  ori       $a1, $a1, 0x2e0
 /* 9D9054 80242034 0C0B1EAF */  jal       get_variable
 /* 9D9058 80242038 0000202D */   daddu    $a0, $zero, $zero
-/* 9D905C 8024203C 3C038024 */  lui       $v1, 0x8024
+/* 9D905C 8024203C 3C038024 */  lui       $v1, %hi(D_8024712C)
 /* 9D9060 80242040 00621821 */  addu      $v1, $v1, $v0
-/* 9D9064 80242044 9063712C */  lbu       $v1, 0x712c($v1)
+/* 9D9064 80242044 9063712C */  lbu       $v1, %lo(D_8024712C)($v1)
 /* 9D9068 80242048 8E220084 */  lw        $v0, 0x84($s1)
 /* 9D906C 8024204C 54430006 */  bnel      $v0, $v1, .L80242068
 /* 9D9070 80242050 AE200084 */   sw       $zero, 0x84($s1)
diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242080_9D90A0.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242080_9D90A0.s
index cd756d7afd..1147a17fc6 100644
--- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242080_9D90A0.s
+++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242080_9D90A0.s
@@ -38,8 +38,8 @@ glabel func_80242080_9D90A0
 /* 9D9124 80242104 0220202D */  daddu     $a0, $s1, $zero
 /* 9D9128 80242108 3C05F4AC */  lui       $a1, 0xf4ac
 /* 9D912C 8024210C 34A5D481 */  ori       $a1, $a1, 0xd481
-/* 9D9130 80242110 3C108025 */  lui       $s0, 0x8025
-/* 9D9134 80242114 261049C0 */  addiu     $s0, $s0, 0x49c0
+/* 9D9130 80242110 3C108025 */  lui       $s0, %hi(D_802549C0)
+/* 9D9134 80242114 261049C0 */  addiu     $s0, $s0, %lo(D_802549C0)
 /* 9D9138 80242118 0C0B1EAF */  jal       get_variable
 /* 9D913C 8024211C AE020000 */   sw       $v0, ($s0)
 /* 9D9140 80242120 0220202D */  daddu     $a0, $s1, $zero
@@ -66,8 +66,8 @@ glabel func_80242080_9D90A0
 /* 9D9194 80242174 0000202D */   daddu    $a0, $zero, $zero
 /* 9D9198 80242178 0220202D */  daddu     $a0, $s1, $zero
 /* 9D919C 8024217C 3C05F4AC */  lui       $a1, 0xf4ac
-/* 9D91A0 80242180 3C018025 */  lui       $at, 0x8025
-/* 9D91A4 80242184 AC2249C4 */  sw        $v0, 0x49c4($at)
+/* 9D91A0 80242180 3C018025 */  lui       $at, %hi(D_802549C4)
+/* 9D91A4 80242184 AC2249C4 */  sw        $v0, %lo(D_802549C4)($at)
 /* 9D91A8 80242188 0C0B1EAF */  jal       get_variable
 /* 9D91AC 8024218C 34A5D481 */   ori      $a1, $a1, 0xd481
 /* 9D91B0 80242190 0220202D */  daddu     $a0, $s1, $zero
@@ -98,16 +98,16 @@ glabel func_80242080_9D90A0
 /* 9D9214 802421F4 E7A00010 */   swc1     $f0, 0x10($sp)
 /* 9D9218 802421F8 8E030000 */  lw        $v1, ($s0)
 /* 9D921C 802421FC 8C64000C */  lw        $a0, 0xc($v1)
-/* 9D9220 80242200 3C018025 */  lui       $at, 0x8025
-/* 9D9224 80242204 AC2249C8 */  sw        $v0, 0x49c8($at)
+/* 9D9220 80242200 3C018025 */  lui       $at, %hi(D_802549C8)
+/* 9D9224 80242204 AC2249C8 */  sw        $v0, %lo(D_802549C8)($at)
 /* 9D9228 80242208 AC800018 */  sw        $zero, 0x18($a0)
 /* 9D922C 8024220C AC800020 */  sw        $zero, 0x20($a0)
 /* 9D9230 80242210 AC800024 */  sw        $zero, 0x24($a0)
 /* 9D9234 80242214 AC800028 */  sw        $zero, 0x28($a0)
 /* 9D9238 80242218 AC80001C */  sw        $zero, 0x1c($a0)
 .L8024221C:
-/* 9D923C 8024221C 3C028025 */  lui       $v0, 0x8025
-/* 9D9240 80242220 8C4249C0 */  lw        $v0, 0x49c0($v0)
+/* 9D923C 8024221C 3C028025 */  lui       $v0, %hi(D_802549C0)
+/* 9D9240 80242220 8C4249C0 */  lw        $v0, %lo(D_802549C0)($v0)
 /* 9D9244 80242224 8C44000C */  lw        $a0, 0xc($v0)
 /* 9D9248 80242228 8C820020 */  lw        $v0, 0x20($a0)
 /* 9D924C 8024222C 8C830028 */  lw        $v1, 0x28($a0)
diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242298_9D92B8.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242298_9D92B8.s
index 86e2504a67..a15fe79d32 100644
--- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242298_9D92B8.s
+++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242298_9D92B8.s
@@ -5,19 +5,19 @@ glabel func_80242298_9D92B8
 /* 9D92B8 80242298 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 9D92BC 8024229C 10A0000B */  beqz      $a1, .L802422CC
 /* 9D92C0 802422A0 AFBF0010 */   sw       $ra, 0x10($sp)
-/* 9D92C4 802422A4 3C038025 */  lui       $v1, 0x8025
-/* 9D92C8 802422A8 8C6349C4 */  lw        $v1, 0x49c4($v1)
+/* 9D92C4 802422A4 3C038025 */  lui       $v1, %hi(D_802549C4)
+/* 9D92C8 802422A8 8C6349C4 */  lw        $v1, %lo(D_802549C4)($v1)
 /* 9D92CC 802422AC 8C620000 */  lw        $v0, ($v1)
-/* 9D92D0 802422B0 3C048025 */  lui       $a0, 0x8025
-/* 9D92D4 802422B4 8C8449C8 */  lw        $a0, 0x49c8($a0)
+/* 9D92D0 802422B0 3C048025 */  lui       $a0, %hi(D_802549C8)
+/* 9D92D4 802422B4 8C8449C8 */  lw        $a0, %lo(D_802549C8)($a0)
 /* 9D92D8 802422B8 34420010 */  ori       $v0, $v0, 0x10
 /* 9D92DC 802422BC AC620000 */  sw        $v0, ($v1)
 /* 9D92E0 802422C0 8C820000 */  lw        $v0, ($a0)
 /* 9D92E4 802422C4 34420010 */  ori       $v0, $v0, 0x10
 /* 9D92E8 802422C8 AC820000 */  sw        $v0, ($a0)
 .L802422CC:
-/* 9D92EC 802422CC 3C048025 */  lui       $a0, 0x8025
-/* 9D92F0 802422D0 8C8449C0 */  lw        $a0, 0x49c0($a0)
+/* 9D92EC 802422CC 3C048025 */  lui       $a0, %hi(D_802549C0)
+/* 9D92F0 802422D0 8C8449C0 */  lw        $a0, %lo(D_802549C0)($a0)
 /* 9D92F4 802422D4 8C85000C */  lw        $a1, 0xc($a0)
 /* 9D92F8 802422D8 8CA20018 */  lw        $v0, 0x18($a1)
 /* 9D92FC 802422DC 8CA30020 */  lw        $v1, 0x20($a1)
@@ -41,8 +41,8 @@ glabel func_80242298_9D92B8
 .L80242324:
 /* 9D9344 80242324 0C016914 */  jal       remove_effect
 /* 9D9348 80242328 ACA00018 */   sw       $zero, 0x18($a1)
-/* 9D934C 8024232C 3C048025 */  lui       $a0, 0x8025
-/* 9D9350 80242330 8C8449A0 */  lw        $a0, 0x49a0($a0)
+/* 9D934C 8024232C 3C048025 */  lui       $a0, %hi(D_802549A0)
+/* 9D9350 80242330 8C8449A0 */  lw        $a0, %lo(D_802549A0)($a0)
 /* 9D9354 80242334 0C048D70 */  jal       func_801235C0
 /* 9D9358 80242338 00000000 */   nop      
 /* 9D935C 8024233C 24020002 */  addiu     $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024234C_9D936C.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024234C_9D936C.s
index 3b47f6de51..7108dcf9e9 100644
--- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024234C_9D936C.s
+++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024234C_9D936C.s
@@ -7,8 +7,8 @@ glabel func_8024234C_9D936C
 /* 9D9374 80242354 8C82000C */  lw        $v0, 0xc($a0)
 /* 9D9378 80242358 0C0B1EAF */  jal       get_variable
 /* 9D937C 8024235C 8C450000 */   lw       $a1, ($v0)
-/* 9D9380 80242360 3C038025 */  lui       $v1, 0x8025
-/* 9D9384 80242364 8C6349C0 */  lw        $v1, 0x49c0($v1)
+/* 9D9380 80242360 3C038025 */  lui       $v1, %hi(D_802549C0)
+/* 9D9384 80242364 8C6349C0 */  lw        $v1, %lo(D_802549C0)($v1)
 /* 9D9388 80242368 8C63000C */  lw        $v1, 0xc($v1)
 /* 9D938C 8024236C AC620034 */  sw        $v0, 0x34($v1)
 /* 9D9390 80242370 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242380_9D93A0.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242380_9D93A0.s
index 17bf50779c..5dde5f1c7a 100644
--- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242380_9D93A0.s
+++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242380_9D93A0.s
@@ -8,8 +8,8 @@ glabel func_80242380_9D93A0
 /* 9D93AC 8024238C 0C0B1EAF */  jal       get_variable
 /* 9D93B0 80242390 8C450000 */   lw       $a1, ($v0)
 /* 9D93B4 80242394 0040202D */  daddu     $a0, $v0, $zero
-/* 9D93B8 80242398 3C028025 */  lui       $v0, 0x8025
-/* 9D93BC 8024239C 8C4249C0 */  lw        $v0, 0x49c0($v0)
+/* 9D93B8 80242398 3C028025 */  lui       $v0, %hi(D_802549C0)
+/* 9D93BC 8024239C 8C4249C0 */  lw        $v0, %lo(D_802549C0)($v0)
 /* 9D93C0 802423A0 24030001 */  addiu     $v1, $zero, 1
 /* 9D93C4 802423A4 8C45000C */  lw        $a1, 0xc($v0)
 /* 9D93C8 802423A8 1083000D */  beq       $a0, $v1, .L802423E0
diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242400_9D9420.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242400_9D9420.s
index 357151f730..cdd0fc7a4a 100644
--- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242400_9D9420.s
+++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242400_9D9420.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80242400_9D9420
-/* 9D9420 80242400 3C028025 */  lui       $v0, 0x8025
-/* 9D9424 80242404 8C4249C8 */  lw        $v0, 0x49c8($v0)
+/* 9D9420 80242400 3C028025 */  lui       $v0, %hi(D_802549C8)
+/* 9D9424 80242404 8C4249C8 */  lw        $v0, %lo(D_802549C8)($v0)
 /* 9D9428 80242408 8C42000C */  lw        $v0, 0xc($v0)
 /* 9D942C 8024240C AC40001C */  sw        $zero, 0x1c($v0)
 /* 9D9430 80242410 03E00008 */  jr        $ra
diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242418_9D9438.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242418_9D9438.s
index 85342688a7..00e2318f31 100644
--- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242418_9D9438.s
+++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242418_9D9438.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80242418_9D9438
-/* 9D9438 80242418 3C028025 */  lui       $v0, 0x8025
-/* 9D943C 8024241C 8C4249C8 */  lw        $v0, 0x49c8($v0)
+/* 9D9438 80242418 3C028025 */  lui       $v0, %hi(D_802549C8)
+/* 9D943C 8024241C 8C4249C8 */  lw        $v0, %lo(D_802549C8)($v0)
 /* 9D9440 80242420 8C43000C */  lw        $v1, 0xc($v0)
 /* 9D9444 80242424 24020001 */  addiu     $v0, $zero, 1
 /* 9D9448 80242428 AC62001C */  sw        $v0, 0x1c($v1)
diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242434_9D9454.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242434_9D9454.s
index b3fcfa7658..e672bf94ab 100644
--- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242434_9D9454.s
+++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242434_9D9454.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80242434_9D9454
-/* 9D9454 80242434 3C028025 */  lui       $v0, 0x8025
-/* 9D9458 80242438 8C4249C8 */  lw        $v0, 0x49c8($v0)
+/* 9D9454 80242434 3C028025 */  lui       $v0, %hi(D_802549C8)
+/* 9D9458 80242438 8C4249C8 */  lw        $v0, %lo(D_802549C8)($v0)
 /* 9D945C 8024243C 8C43000C */  lw        $v1, 0xc($v0)
 /* 9D9460 80242440 24020002 */  addiu     $v0, $zero, 2
 /* 9D9464 80242444 03E00008 */  jr        $ra
diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242908_9D9928.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242908_9D9928.s
index b98b3b0de0..958d65710a 100644
--- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242908_9D9928.s
+++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242908_9D9928.s
@@ -3,8 +3,8 @@
 
 glabel func_80242908_9D9928
 /* 9D9928 80242908 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 9D992C 8024290C 3C058025 */  lui       $a1, 0x8025
-/* 9D9930 80242910 8CA549B8 */  lw        $a1, 0x49b8($a1)
+/* 9D992C 8024290C 3C058025 */  lui       $a1, %hi(D_802549B8)
+/* 9D9930 80242910 8CA549B8 */  lw        $a1, %lo(D_802549B8)($a1)
 /* 9D9934 80242914 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 9D9938 80242918 0C0B1EAF */  jal       get_variable
 /* 9D993C 8024291C 0000202D */   daddu    $a0, $zero, $zero
diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242974_9D9994.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242974_9D9994.s
index 89976cbb6d..8cf4d8bd20 100644
--- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242974_9D9994.s
+++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242974_9D9994.s
@@ -3,14 +3,14 @@
 
 glabel func_80242974_9D9994
 /* 9D9994 80242974 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 9D9998 80242978 3C058024 */  lui       $a1, 0x8024
-/* 9D999C 8024297C 24A52908 */  addiu     $a1, $a1, 0x2908
+/* 9D9998 80242978 3C058024 */  lui       $a1, %hi(D_80242908)
+/* 9D999C 8024297C 24A52908 */  addiu     $a1, $a1, %lo(D_80242908)
 /* 9D99A0 80242980 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 9D99A4 80242984 0C048C8F */  jal       bind_dynamic_entity_7
 /* 9D99A8 80242988 0000202D */   daddu    $a0, $zero, $zero
 /* 9D99AC 8024298C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 9D99B0 80242990 3C018025 */  lui       $at, 0x8025
-/* 9D99B4 80242994 AC2249A0 */  sw        $v0, 0x49a0($at)
+/* 9D99B0 80242990 3C018025 */  lui       $at, %hi(D_802549A0)
+/* 9D99B4 80242994 AC2249A0 */  sw        $v0, %lo(D_802549A0)($at)
 /* 9D99B8 80242998 24020002 */  addiu     $v0, $zero, 2
 /* 9D99BC 8024299C 03E00008 */  jr        $ra
 /* 9D99C0 802429A0 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242BD0_9D9BF0.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242BD0_9D9BF0.s
index ee4edd8749..7a43980983 100644
--- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242BD0_9D9BF0.s
+++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242BD0_9D9BF0.s
@@ -6,11 +6,11 @@ glabel func_80242BD0_9D9BF0
 /* 9D9BF4 80242BD4 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 9D9BF8 80242BD8 10A00003 */  beqz      $a1, .L80242BE8
 /* 9D9BFC 80242BDC 8C86000C */   lw       $a2, 0xc($a0)
-/* 9D9C00 80242BE0 3C018025 */  lui       $at, 0x8025
-/* 9D9C04 80242BE4 AC2096F0 */  sw        $zero, -0x6910($at)
+/* 9D9C00 80242BE0 3C018025 */  lui       $at, %hi(D_802496F0)
+/* 9D9C04 80242BE4 AC2096F0 */  sw        $zero, %lo(D_802496F0)($at)
 .L80242BE8:
-/* 9D9C08 80242BE8 3C038025 */  lui       $v1, 0x8025
-/* 9D9C0C 80242BEC 246396F0 */  addiu     $v1, $v1, -0x6910
+/* 9D9C08 80242BE8 3C038025 */  lui       $v1, %hi(D_802496F0)
+/* 9D9C0C 80242BEC 246396F0 */  addiu     $v1, $v1, %lo(D_802496F0)
 /* 9D9C10 80242BF0 8C620000 */  lw        $v0, ($v1)
 /* 9D9C14 80242BF4 54400003 */  bnel      $v0, $zero, .L80242C04
 /* 9D9C18 80242BF8 AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_80242BD0_9D9BF0
 /* 9D9C20 80242C00 0000102D */   daddu    $v0, $zero, $zero
 .L80242C04:
 /* 9D9C24 80242C04 8CC50000 */  lw        $a1, ($a2)
-/* 9D9C28 80242C08 3C068025 */  lui       $a2, 0x8025
+/* 9D9C28 80242C08 3C068025 */  lui       $a2, %hi(D_802496F4)
 /* 9D9C2C 80242C0C 0C0B2026 */  jal       set_variable
-/* 9D9C30 80242C10 8CC696F4 */   lw       $a2, -0x690c($a2)
+/* 9D9C30 80242C10 8CC696F4 */   lw       $a2, %lo(D_802496F4)($a2)
 /* 9D9C34 80242C14 24020002 */  addiu     $v0, $zero, 2
 .L80242C18:
 /* 9D9C38 80242C18 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242C24_9D9C44.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242C24_9D9C44.s
index 04a8d93e4a..76c922347e 100644
--- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242C24_9D9C44.s
+++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242C24_9D9C44.s
@@ -7,12 +7,12 @@ glabel func_80242C24_9D9C44
 /* 9D9C4C 80242C2C 8C82000C */  lw        $v0, 0xc($a0)
 /* 9D9C50 80242C30 0C0B1EAF */  jal       get_variable
 /* 9D9C54 80242C34 8C450000 */   lw       $a1, ($v0)
-/* 9D9C58 80242C38 3C018025 */  lui       $at, 0x8025
-/* 9D9C5C 80242C3C AC2296F4 */  sw        $v0, -0x690c($at)
+/* 9D9C58 80242C38 3C018025 */  lui       $at, %hi(D_802496F4)
+/* 9D9C5C 80242C3C AC2296F4 */  sw        $v0, %lo(D_802496F4)($at)
 /* 9D9C60 80242C40 24020002 */  addiu     $v0, $zero, 2
 /* 9D9C64 80242C44 8FBF0010 */  lw        $ra, 0x10($sp)
 /* 9D9C68 80242C48 24030001 */  addiu     $v1, $zero, 1
-/* 9D9C6C 80242C4C 3C018025 */  lui       $at, 0x8025
-/* 9D9C70 80242C50 AC2396F0 */  sw        $v1, -0x6910($at)
+/* 9D9C6C 80242C4C 3C018025 */  lui       $at, %hi(D_802496F0)
+/* 9D9C70 80242C50 AC2396F0 */  sw        $v1, %lo(D_802496F0)($at)
 /* 9D9C74 80242C54 03E00008 */  jr        $ra
 /* 9D9C78 80242C58 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242C5C_9D9C7C.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242C5C_9D9C7C.s
index b164df16b0..63afd41c64 100644
--- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242C5C_9D9C7C.s
+++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242C5C_9D9C7C.s
@@ -13,8 +13,8 @@ glabel func_80242C5C_9D9C7C
 /* 9D9C9C 80242C7C 8C620000 */  lw        $v0, ($v1)
 /* 9D9CA0 80242C80 5040000A */  beql      $v0, $zero, .L80242CAC
 /* 9D9CA4 80242C84 00041080 */   sll      $v0, $a0, 2
-/* 9D9CA8 80242C88 3C058025 */  lui       $a1, 0x8025
-/* 9D9CAC 80242C8C 24A549D0 */  addiu     $a1, $a1, 0x49d0
+/* 9D9CA8 80242C88 3C058025 */  lui       $a1, %hi(D_802549D0)
+/* 9D9CAC 80242C8C 24A549D0 */  addiu     $a1, $a1, %lo(D_802549D0)
 .L80242C90:
 /* 9D9CB0 80242C90 24630004 */  addiu     $v1, $v1, 4
 /* 9D9CB4 80242C94 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_80242C5C_9D9C7C
 /* 9D9CC4 80242CA4 24A50004 */   addiu    $a1, $a1, 4
 /* 9D9CC8 80242CA8 00041080 */  sll       $v0, $a0, 2
 .L80242CAC:
-/* 9D9CCC 80242CAC 3C018025 */  lui       $at, 0x8025
+/* 9D9CCC 80242CAC 3C018025 */  lui       $at, %hi(D_802549D0)
 /* 9D9CD0 80242CB0 00220821 */  addu      $at, $at, $v0
-/* 9D9CD4 80242CB4 AC2049D0 */  sw        $zero, 0x49d0($at)
+/* 9D9CD4 80242CB4 AC2049D0 */  sw        $zero, %lo(D_802549D0)($at)
 /* 9D9CD8 80242CB8 08090B3A */  j         .L80242CE8
 /* 9D9CDC 80242CBC 00000000 */   nop      
 .L80242CC0:
-/* 9D9CE0 80242CC0 3C038025 */  lui       $v1, 0x8025
-/* 9D9CE4 80242CC4 246349D0 */  addiu     $v1, $v1, 0x49d0
+/* 9D9CE0 80242CC0 3C038025 */  lui       $v1, %hi(D_802549D0)
+/* 9D9CE4 80242CC4 246349D0 */  addiu     $v1, $v1, %lo(D_802549D0)
 /* 9D9CE8 80242CC8 0060282D */  daddu     $a1, $v1, $zero
 .L80242CCC:
 /* 9D9CEC 80242CCC 24820010 */  addiu     $v0, $a0, 0x10
diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242F74_9D9F94.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242F74_9D9F94.s
index 366119e77d..1be58a0fa1 100644
--- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242F74_9D9F94.s
+++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242F74_9D9F94.s
@@ -15,7 +15,7 @@ glabel func_80242F74_9D9F94
 /* 9D9FBC 80242F9C 8FBF0014 */  lw        $ra, 0x14($sp)
 /* 9D9FC0 80242FA0 8FB00010 */  lw        $s0, 0x10($sp)
 /* 9D9FC4 80242FA4 24020002 */  addiu     $v0, $zero, 2
-/* 9D9FC8 80242FA8 3C018025 */  lui       $at, 0x8025
-/* 9D9FCC 80242FAC AC234B94 */  sw        $v1, 0x4b94($at)
+/* 9D9FC8 80242FA8 3C018025 */  lui       $at, %hi(D_80254B94)
+/* 9D9FCC 80242FAC AC234B94 */  sw        $v1, %lo(D_80254B94)($at)
 /* 9D9FD0 80242FB0 03E00008 */  jr        $ra
 /* 9D9FD4 80242FB4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242FB8_9D9FD8.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242FB8_9D9FD8.s
index ddabbf9054..a3ee8e5415 100644
--- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242FB8_9D9FD8.s
+++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242FB8_9D9FD8.s
@@ -6,8 +6,8 @@ glabel func_80242FB8_9D9FD8
 /* 9D9FDC 80242FBC AFBF0010 */  sw        $ra, 0x10($sp)
 /* 9D9FE0 80242FC0 0C00EABB */  jal       get_npc_unsafe
 /* 9D9FE4 80242FC4 8C84008C */   lw       $a0, 0x8c($a0)
-/* 9D9FE8 80242FC8 3C038025 */  lui       $v1, 0x8025
-/* 9D9FEC 80242FCC 8C634B94 */  lw        $v1, 0x4b94($v1)
+/* 9D9FE8 80242FC8 3C038025 */  lui       $v1, %hi(D_80254B94)
+/* 9D9FEC 80242FCC 8C634B94 */  lw        $v1, %lo(D_80254B94)($v1)
 /* 9D9FF0 80242FD0 AC430028 */  sw        $v1, 0x28($v0)
 /* 9D9FF4 80242FD4 8FBF0010 */  lw        $ra, 0x10($sp)
 /* 9D9FF8 80242FD8 24020002 */  addiu     $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_802438D0_9DA8F0.s b/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_802438D0_9DA8F0.s
index eeddc41f91..9874e2bbb3 100644
--- a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_802438D0_9DA8F0.s
+++ b/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_802438D0_9DA8F0.s
@@ -3,8 +3,8 @@
 
 glabel func_802438D0_9DA8F0
 /* 9DA8F0 802438D0 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 9DA8F4 802438D4 3C048025 */  lui       $a0, 0x8025
-/* 9DA8F8 802438D8 248423B4 */  addiu     $a0, $a0, 0x23b4
+/* 9DA8F4 802438D4 3C048025 */  lui       $a0, %hi(D_802523B4)
+/* 9DA8F8 802438D8 248423B4 */  addiu     $a0, $a0, %lo(D_802523B4)
 /* 9DA8FC 802438DC AFBF0018 */  sw        $ra, 0x18($sp)
 /* 9DA900 802438E0 AFB10014 */  sw        $s1, 0x14($sp)
 /* 9DA904 802438E4 AFB00010 */  sw        $s0, 0x10($sp)
@@ -34,8 +34,8 @@ glabel func_802438D0_9DA8F0
 /* 9DA958 80243938 08090E69 */  j         .L802439A4
 /* 9DA95C 8024393C AC820000 */   sw       $v0, ($a0)
 .L80243940:
-/* 9DA960 80243940 3C108011 */  lui       $s0, 0x8011
-/* 9DA964 80243944 2610C930 */  addiu     $s0, $s0, -0x36d0
+/* 9DA960 80243940 3C108011 */  lui       $s0, %hi(D_8010C930)
+/* 9DA964 80243944 2610C930 */  addiu     $s0, $s0, %lo(D_8010C930)
 /* 9DA968 80243948 0C03BD17 */  jal       clear_partner_move_history
 /* 9DA96C 8024394C 8E040000 */   lw       $a0, ($s0)
 /* 9DA970 80243950 C6200028 */  lwc1      $f0, 0x28($s1)
diff --git a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243BEC_9DAC0C.s b/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243BEC_9DAC0C.s
index 012e104a4f..12cfd4d412 100644
--- a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243BEC_9DAC0C.s
+++ b/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243BEC_9DAC0C.s
@@ -6,11 +6,11 @@ glabel func_80243BEC_9DAC0C
 /* 9DAC10 80243BF0 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 9DAC14 80243BF4 10A00003 */  beqz      $a1, .L80243C04
 /* 9DAC18 80243BF8 8C86000C */   lw       $a2, 0xc($a0)
-/* 9DAC1C 80243BFC 3C018025 */  lui       $at, 0x8025
-/* 9DAC20 80243C00 AC202400 */  sw        $zero, 0x2400($at)
+/* 9DAC1C 80243BFC 3C018025 */  lui       $at, %hi(D_80252400)
+/* 9DAC20 80243C00 AC202400 */  sw        $zero, %lo(D_80252400)($at)
 .L80243C04:
-/* 9DAC24 80243C04 3C038025 */  lui       $v1, 0x8025
-/* 9DAC28 80243C08 24632400 */  addiu     $v1, $v1, 0x2400
+/* 9DAC24 80243C04 3C038025 */  lui       $v1, %hi(D_80252400)
+/* 9DAC28 80243C08 24632400 */  addiu     $v1, $v1, %lo(D_80252400)
 /* 9DAC2C 80243C0C 8C620000 */  lw        $v0, ($v1)
 /* 9DAC30 80243C10 54400003 */  bnel      $v0, $zero, .L80243C20
 /* 9DAC34 80243C14 AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_80243BEC_9DAC0C
 /* 9DAC3C 80243C1C 0000102D */   daddu    $v0, $zero, $zero
 .L80243C20:
 /* 9DAC40 80243C20 8CC50000 */  lw        $a1, ($a2)
-/* 9DAC44 80243C24 3C068025 */  lui       $a2, 0x8025
+/* 9DAC44 80243C24 3C068025 */  lui       $a2, %hi(D_80252404)
 /* 9DAC48 80243C28 0C0B2026 */  jal       set_variable
-/* 9DAC4C 80243C2C 8CC62404 */   lw       $a2, 0x2404($a2)
+/* 9DAC4C 80243C2C 8CC62404 */   lw       $a2, %lo(D_80252404)($a2)
 /* 9DAC50 80243C30 24020002 */  addiu     $v0, $zero, 2
 .L80243C34:
 /* 9DAC54 80243C34 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243C40_9DAC60.s b/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243C40_9DAC60.s
index 1bda53e17f..5af1ce402a 100644
--- a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243C40_9DAC60.s
+++ b/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243C40_9DAC60.s
@@ -7,12 +7,12 @@ glabel func_80243C40_9DAC60
 /* 9DAC68 80243C48 8C82000C */  lw        $v0, 0xc($a0)
 /* 9DAC6C 80243C4C 0C0B1EAF */  jal       get_variable
 /* 9DAC70 80243C50 8C450000 */   lw       $a1, ($v0)
-/* 9DAC74 80243C54 3C018025 */  lui       $at, 0x8025
-/* 9DAC78 80243C58 AC222404 */  sw        $v0, 0x2404($at)
+/* 9DAC74 80243C54 3C018025 */  lui       $at, %hi(D_80252404)
+/* 9DAC78 80243C58 AC222404 */  sw        $v0, %lo(D_80252404)($at)
 /* 9DAC7C 80243C5C 24020002 */  addiu     $v0, $zero, 2
 /* 9DAC80 80243C60 8FBF0010 */  lw        $ra, 0x10($sp)
 /* 9DAC84 80243C64 24030001 */  addiu     $v1, $zero, 1
-/* 9DAC88 80243C68 3C018025 */  lui       $at, 0x8025
-/* 9DAC8C 80243C6C AC232400 */  sw        $v1, 0x2400($at)
+/* 9DAC88 80243C68 3C018025 */  lui       $at, %hi(D_80252400)
+/* 9DAC8C 80243C6C AC232400 */  sw        $v1, %lo(D_80252400)($at)
 /* 9DAC90 80243C70 03E00008 */  jr        $ra
 /* 9DAC94 80243C74 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243C78_9DAC98.s b/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243C78_9DAC98.s
index 12be85eecf..dad4e97797 100644
--- a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243C78_9DAC98.s
+++ b/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243C78_9DAC98.s
@@ -13,8 +13,8 @@ glabel func_80243C78_9DAC98
 /* 9DACB8 80243C98 8C620000 */  lw        $v0, ($v1)
 /* 9DACBC 80243C9C 5040000A */  beql      $v0, $zero, .L80243CC8
 /* 9DACC0 80243CA0 00041080 */   sll      $v0, $a0, 2
-/* 9DACC4 80243CA4 3C058025 */  lui       $a1, 0x8025
-/* 9DACC8 80243CA8 24A54BA0 */  addiu     $a1, $a1, 0x4ba0
+/* 9DACC4 80243CA4 3C058025 */  lui       $a1, %hi(D_80254BA0)
+/* 9DACC8 80243CA8 24A54BA0 */  addiu     $a1, $a1, %lo(D_80254BA0)
 .L80243CAC:
 /* 9DACCC 80243CAC 24630004 */  addiu     $v1, $v1, 4
 /* 9DACD0 80243CB0 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_80243C78_9DAC98
 /* 9DACE0 80243CC0 24A50004 */   addiu    $a1, $a1, 4
 /* 9DACE4 80243CC4 00041080 */  sll       $v0, $a0, 2
 .L80243CC8:
-/* 9DACE8 80243CC8 3C018025 */  lui       $at, 0x8025
+/* 9DACE8 80243CC8 3C018025 */  lui       $at, %hi(D_80254BA0)
 /* 9DACEC 80243CCC 00220821 */  addu      $at, $at, $v0
-/* 9DACF0 80243CD0 AC204BA0 */  sw        $zero, 0x4ba0($at)
+/* 9DACF0 80243CD0 AC204BA0 */  sw        $zero, %lo(D_80254BA0)($at)
 /* 9DACF4 80243CD4 08090F41 */  j         .L80243D04
 /* 9DACF8 80243CD8 00000000 */   nop      
 .L80243CDC:
-/* 9DACFC 80243CDC 3C038025 */  lui       $v1, 0x8025
-/* 9DAD00 80243CE0 24634BA0 */  addiu     $v1, $v1, 0x4ba0
+/* 9DACFC 80243CDC 3C038025 */  lui       $v1, %hi(D_80254BA0)
+/* 9DAD00 80243CE0 24634BA0 */  addiu     $v1, $v1, %lo(D_80254BA0)
 /* 9DAD04 80243CE4 0060282D */  daddu     $a1, $v1, $zero
 .L80243CE8:
 /* 9DAD08 80243CE8 24820010 */  addiu     $v0, $a0, 0x10
diff --git a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243D14_9DAD34.s b/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243D14_9DAD34.s
index df471d5a9f..6a9530ee5c 100644
--- a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243D14_9DAD34.s
+++ b/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243D14_9DAD34.s
@@ -13,8 +13,8 @@ glabel func_80243D14_9DAD34
 /* 9DAD54 80243D34 8C620000 */  lw        $v0, ($v1)
 /* 9DAD58 80243D38 5040000A */  beql      $v0, $zero, .L80243D64
 /* 9DAD5C 80243D3C 00041080 */   sll      $v0, $a0, 2
-/* 9DAD60 80243D40 3C058025 */  lui       $a1, 0x8025
-/* 9DAD64 80243D44 24A54D68 */  addiu     $a1, $a1, 0x4d68
+/* 9DAD60 80243D40 3C058025 */  lui       $a1, %hi(D_80254D68)
+/* 9DAD64 80243D44 24A54D68 */  addiu     $a1, $a1, %lo(D_80254D68)
 .L80243D48:
 /* 9DAD68 80243D48 24630004 */  addiu     $v1, $v1, 4
 /* 9DAD6C 80243D4C 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_80243D14_9DAD34
 /* 9DAD7C 80243D5C 24A50004 */   addiu    $a1, $a1, 4
 /* 9DAD80 80243D60 00041080 */  sll       $v0, $a0, 2
 .L80243D64:
-/* 9DAD84 80243D64 3C018025 */  lui       $at, 0x8025
+/* 9DAD84 80243D64 3C018025 */  lui       $at, %hi(D_80254D68)
 /* 9DAD88 80243D68 00220821 */  addu      $at, $at, $v0
-/* 9DAD8C 80243D6C AC204D68 */  sw        $zero, 0x4d68($at)
+/* 9DAD8C 80243D6C AC204D68 */  sw        $zero, %lo(D_80254D68)($at)
 /* 9DAD90 80243D70 08090F68 */  j         .L80243DA0
 /* 9DAD94 80243D74 00000000 */   nop      
 .L80243D78:
-/* 9DAD98 80243D78 3C038025 */  lui       $v1, 0x8025
-/* 9DAD9C 80243D7C 24634D68 */  addiu     $v1, $v1, 0x4d68
+/* 9DAD98 80243D78 3C038025 */  lui       $v1, %hi(D_80254D68)
+/* 9DAD9C 80243D7C 24634D68 */  addiu     $v1, $v1, %lo(D_80254D68)
 /* 9DADA0 80243D80 0060282D */  daddu     $a1, $v1, $zero
 .L80243D84:
 /* 9DADA4 80243D84 24820080 */  addiu     $v0, $a0, 0x80
diff --git a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243DB0_9DADD0.s b/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243DB0_9DADD0.s
index 8e438f29e8..dabfc94e86 100644
--- a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243DB0_9DADD0.s
+++ b/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243DB0_9DADD0.s
@@ -4,8 +4,8 @@
 glabel func_80243DB0_9DADD0
 /* 9DADD0 80243DB0 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* 9DADD4 80243DB4 AFB00010 */  sw        $s0, 0x10($sp)
-/* 9DADD8 80243DB8 3C108025 */  lui       $s0, 0x8025
-/* 9DADDC 80243DBC 26102720 */  addiu     $s0, $s0, 0x2720
+/* 9DADD8 80243DB8 3C108025 */  lui       $s0, %hi(D_80252720)
+/* 9DADDC 80243DBC 26102720 */  addiu     $s0, $s0, %lo(D_80252720)
 /* 9DADE0 80243DC0 AFBF0018 */  sw        $ra, 0x18($sp)
 /* 9DADE4 80243DC4 AFB10014 */  sw        $s1, 0x14($sp)
 /* 9DADE8 80243DC8 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_80243DB0_9DADD0
 /* 9DAE4C 80243E2C 28620010 */  slti      $v0, $v1, 0x10
 /* 9DAE50 80243E30 1440FFFA */  bnez      $v0, .L80243E1C
 /* 9DAE54 80243E34 24840004 */   addiu    $a0, $a0, 4
-/* 9DAE58 80243E38 3C108025 */  lui       $s0, 0x8025
-/* 9DAE5C 80243E3C 26102720 */  addiu     $s0, $s0, 0x2720
+/* 9DAE58 80243E38 3C108025 */  lui       $s0, %hi(D_80252720)
+/* 9DAE5C 80243E3C 26102720 */  addiu     $s0, $s0, %lo(D_80252720)
 /* 9DAE60 80243E40 0C00AB4B */  jal       heap_free
 /* 9DAE64 80243E44 8E040000 */   lw       $a0, ($s0)
 /* 9DAE68 80243E48 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243F10_9DAF30.s b/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243F10_9DAF30.s
index 93fef7ee5b..63bf282f21 100644
--- a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243F10_9DAF30.s
+++ b/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243F10_9DAF30.s
@@ -8,8 +8,8 @@ glabel func_80243F10_9DAF30
 /* 9DAF3C 80243F1C AFB20018 */  sw        $s2, 0x18($sp)
 /* 9DAF40 80243F20 0000902D */  daddu     $s2, $zero, $zero
 /* 9DAF44 80243F24 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 9DAF48 80243F28 3C138025 */  lui       $s3, 0x8025
-/* 9DAF4C 80243F2C 26732784 */  addiu     $s3, $s3, 0x2784
+/* 9DAF48 80243F28 3C138025 */  lui       $s3, %hi(D_80252784)
+/* 9DAF4C 80243F2C 26732784 */  addiu     $s3, $s3, %lo(D_80252784)
 /* 9DAF50 80243F30 AFB10014 */  sw        $s1, 0x14($sp)
 /* 9DAF54 80243F34 0240882D */  daddu     $s1, $s2, $zero
 /* 9DAF58 80243F38 AFBF002C */  sw        $ra, 0x2c($sp)
@@ -56,8 +56,8 @@ glabel func_80243F10_9DAF30
 /* 9DAFEC 80243FCC 2644FFFF */   addiu    $a0, $s2, -1
 /* 9DAFF0 80243FD0 0040B02D */  daddu     $s6, $v0, $zero
 /* 9DAFF4 80243FD4 0000902D */  daddu     $s2, $zero, $zero
-/* 9DAFF8 80243FD8 3C138025 */  lui       $s3, 0x8025
-/* 9DAFFC 80243FDC 26732784 */  addiu     $s3, $s3, 0x2784
+/* 9DAFF8 80243FD8 3C138025 */  lui       $s3, %hi(D_80252784)
+/* 9DAFFC 80243FDC 26732784 */  addiu     $s3, $s3, %lo(D_80252784)
 /* 9DB000 80243FE0 0240882D */  daddu     $s1, $s2, $zero
 /* 9DB004 80243FE4 26700014 */  addiu     $s0, $s3, 0x14
 .L80243FE8:
diff --git a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80244078_9DB098.s b/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80244078_9DB098.s
index ea3d82bae2..46df665faf 100644
--- a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80244078_9DB098.s
+++ b/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80244078_9DB098.s
@@ -8,8 +8,8 @@ glabel func_80244078_9DB098
 /* 9DB0A4 80244084 AFB3001C */  sw        $s3, 0x1c($sp)
 /* 9DB0A8 80244088 0000982D */  daddu     $s3, $zero, $zero
 /* 9DB0AC 8024408C AFB20018 */  sw        $s2, 0x18($sp)
-/* 9DB0B0 80244090 3C128025 */  lui       $s2, 0x8025
-/* 9DB0B4 80244094 26522784 */  addiu     $s2, $s2, 0x2784
+/* 9DB0B0 80244090 3C128025 */  lui       $s2, %hi(D_80252784)
+/* 9DB0B4 80244094 26522784 */  addiu     $s2, $s2, %lo(D_80252784)
 /* 9DB0B8 80244098 AFBF0030 */  sw        $ra, 0x30($sp)
 /* 9DB0BC 8024409C AFB7002C */  sw        $s7, 0x2c($sp)
 /* 9DB0C0 802440A0 AFB60028 */  sw        $s6, 0x28($sp)
@@ -27,9 +27,9 @@ glabel func_80244078_9DB098
 /* 9DB0F0 802440D0 001510C0 */  sll       $v0, $s5, 3
 /* 9DB0F4 802440D4 00551023 */  subu      $v0, $v0, $s5
 /* 9DB0F8 802440D8 00021080 */  sll       $v0, $v0, 2
-/* 9DB0FC 802440DC 3C058025 */  lui       $a1, 0x8025
+/* 9DB0FC 802440DC 3C058025 */  lui       $a1, %hi(D_80252794)
 /* 9DB100 802440E0 00A22821 */  addu      $a1, $a1, $v0
-/* 9DB104 802440E4 8CA52794 */  lw        $a1, 0x2794($a1)
+/* 9DB104 802440E4 8CA52794 */  lw        $a1, %lo(D_80252794)($a1)
 /* 9DB108 802440E8 0C0B2026 */  jal       set_variable
 /* 9DB10C 802440EC 24060001 */   addiu    $a2, $zero, 1
 .L802440F0:
@@ -70,8 +70,8 @@ glabel func_80244078_9DB098
 /* 9DB18C 8024416C 2664FFFE */   addiu    $a0, $s3, -2
 /* 9DB190 80244170 0040B82D */  daddu     $s7, $v0, $zero
 /* 9DB194 80244174 0000982D */  daddu     $s3, $zero, $zero
-/* 9DB198 80244178 3C128025 */  lui       $s2, 0x8025
-/* 9DB19C 8024417C 26522784 */  addiu     $s2, $s2, 0x2784
+/* 9DB198 80244178 3C128025 */  lui       $s2, %hi(D_80252784)
+/* 9DB19C 8024417C 26522784 */  addiu     $s2, $s2, %lo(D_80252784)
 /* 9DB1A0 80244180 0260882D */  daddu     $s1, $s3, $zero
 /* 9DB1A4 80244184 26500014 */  addiu     $s0, $s2, 0x14
 .L80244188:
diff --git a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80244224_9DB244.s b/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80244224_9DB244.s
index 5918c163eb..2d20101a4b 100644
--- a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80244224_9DB244.s
+++ b/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80244224_9DB244.s
@@ -10,8 +10,8 @@ glabel func_80244224_9DB244
 /* 9DB258 80244238 0C0B1EAF */  jal       get_variable
 /* 9DB25C 8024423C 8C450000 */   lw       $a1, ($v0)
 /* 9DB260 80244240 2442FFFF */  addiu     $v0, $v0, -1
-/* 9DB264 80244244 3C048025 */  lui       $a0, 0x8025
-/* 9DB268 80244248 24842784 */  addiu     $a0, $a0, 0x2784
+/* 9DB264 80244244 3C048025 */  lui       $a0, %hi(D_80252784)
+/* 9DB268 80244248 24842784 */  addiu     $a0, $a0, %lo(D_80252784)
 /* 9DB26C 8024424C 000218C0 */  sll       $v1, $v0, 3
 /* 9DB270 80244250 00621823 */  subu      $v1, $v1, $v0
 /* 9DB274 80244254 00031880 */  sll       $v1, $v1, 2
diff --git a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80244288_9DB2A8.s b/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80244288_9DB2A8.s
index e21caa1352..18ae41cafa 100644
--- a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80244288_9DB2A8.s
+++ b/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80244288_9DB2A8.s
@@ -14,9 +14,9 @@ glabel func_80244288_9DB2A8
 /* 9DB2CC 802442AC 000218C0 */  sll       $v1, $v0, 3
 /* 9DB2D0 802442B0 00621823 */  subu      $v1, $v1, $v0
 /* 9DB2D4 802442B4 00031880 */  sll       $v1, $v1, 2
-/* 9DB2D8 802442B8 3C058025 */  lui       $a1, 0x8025
+/* 9DB2D8 802442B8 3C058025 */  lui       $a1, %hi(D_80252798)
 /* 9DB2DC 802442BC 00A32821 */  addu      $a1, $a1, $v1
-/* 9DB2E0 802442C0 8CA52798 */  lw        $a1, 0x2798($a1)
+/* 9DB2E0 802442C0 8CA52798 */  lw        $a1, %lo(D_80252798)($a1)
 /* 9DB2E4 802442C4 0C0B2026 */  jal       set_variable
 /* 9DB2E8 802442C8 24060001 */   addiu    $a2, $zero, 1
 /* 9DB2EC 802442CC 8FBF0014 */  lw        $ra, 0x14($sp)
diff --git a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_802442E0_9DB300.s b/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_802442E0_9DB300.s
index 399fb6bed3..337fd40fde 100644
--- a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_802442E0_9DB300.s
+++ b/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_802442E0_9DB300.s
@@ -13,12 +13,12 @@ glabel func_802442E0_9DB300
 /* 9DB320 80244300 000218C0 */  sll       $v1, $v0, 3
 /* 9DB324 80244304 00621823 */  subu      $v1, $v1, $v0
 /* 9DB328 80244308 00031880 */  sll       $v1, $v1, 2
-/* 9DB32C 8024430C 3C048025 */  lui       $a0, 0x8025
+/* 9DB32C 8024430C 3C048025 */  lui       $a0, %hi(D_8025279C)
 /* 9DB330 80244310 00832021 */  addu      $a0, $a0, $v1
-/* 9DB334 80244314 8C84279C */  lw        $a0, 0x279c($a0)
+/* 9DB334 80244314 8C84279C */  lw        $a0, %lo(D_8025279C)($a0)
 /* 9DB338 80244318 00041140 */  sll       $v0, $a0, 5
-/* 9DB33C 8024431C 3C018025 */  lui       $at, 0x8025
-/* 9DB340 80244320 AC2429B4 */  sw        $a0, 0x29b4($at)
+/* 9DB33C 8024431C 3C018025 */  lui       $at, %hi(D_802529B4)
+/* 9DB340 80244320 AC2429B4 */  sw        $a0, %lo(D_802529B4)($at)
 /* 9DB344 80244324 3C038008 */  lui       $v1, %hi(gItemTable+0x18)
 /* 9DB348 80244328 00621821 */  addu      $v1, $v1, $v0
 /* 9DB34C 8024432C 946378F8 */  lhu       $v1, %lo(gItemTable+0x18)($v1)
diff --git a/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_80240230_9EBA20.s b/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_80240230_9EBA20.s
index acaf8d1ddf..6937a646c7 100644
--- a/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_80240230_9EBA20.s
+++ b/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_80240230_9EBA20.s
@@ -83,8 +83,8 @@ glabel func_80240230_9EBA20
 /* 9EBB4C 8024035C 27A5002C */   addiu    $a1, $sp, 0x2c
 /* 9EBB50 80240360 C6000038 */  lwc1      $f0, 0x38($s0)
 /* 9EBB54 80240364 860200A6 */  lh        $v0, 0xa6($s0)
-/* 9EBB58 80240368 3C018024 */  lui       $at, 0x8024
-/* 9EBB5C 8024036C D42223B0 */  ldc1      $f2, 0x23b0($at)
+/* 9EBB58 80240368 3C018024 */  lui       $at, %hi(D_802423B0)
+/* 9EBB5C 8024036C D42223B0 */  ldc1      $f2, %lo(D_802423B0)($at)
 /* 9EBB60 80240370 27A60030 */  addiu     $a2, $sp, 0x30
 /* 9EBB64 80240374 E7A0002C */  swc1      $f0, 0x2c($sp)
 /* 9EBB68 80240378 44820000 */  mtc1      $v0, $f0
diff --git a/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_80240BF0_9EC3E0.s b/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_80240BF0_9EC3E0.s
index 14ae891fe0..289f0fdb50 100644
--- a/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_80240BF0_9EC3E0.s
+++ b/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_80240BF0_9EC3E0.s
@@ -88,9 +88,9 @@ glabel func_80240BF0_9EC3E0
 /* 9EC524 80240D34 2C62000F */  sltiu     $v0, $v1, 0xf
 /* 9EC528 80240D38 1040002C */  beqz      $v0, .L80240DEC
 /* 9EC52C 80240D3C 00031080 */   sll      $v0, $v1, 2
-/* 9EC530 80240D40 3C018024 */  lui       $at, 0x8024
+/* 9EC530 80240D40 3C018024 */  lui       $at, %hi(D_802423B8)
 /* 9EC534 80240D44 00220821 */  addu      $at, $at, $v0
-/* 9EC538 80240D48 8C2223B8 */  lw        $v0, 0x23b8($at)
+/* 9EC538 80240D48 8C2223B8 */  lw        $v0, %lo(D_802423B8)($at)
 /* 9EC53C 80240D4C 00400008 */  jr        $v0
 /* 9EC540 80240D50 00000000 */   nop      
 /* 9EC544 80240D54 0260202D */  daddu     $a0, $s3, $zero
diff --git a/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240314_9EDF04.s b/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240314_9EDF04.s
index d3915066b4..73906df298 100644
--- a/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240314_9EDF04.s
+++ b/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240314_9EDF04.s
@@ -24,8 +24,8 @@ glabel func_80240314_9EDF04
 /* 9EDF50 80240360 44823000 */  mtc1      $v0, $f6
 /* 9EDF54 80240364 00000000 */  nop       
 /* 9EDF58 80240368 468031A0 */  cvt.s.w   $f6, $f6
-/* 9EDF5C 8024036C 3C038024 */  lui       $v1, 0x8024
-/* 9EDF60 80240370 246313F8 */  addiu     $v1, $v1, 0x13f8
+/* 9EDF5C 8024036C 3C038024 */  lui       $v1, %hi(D_802413F8)
+/* 9EDF60 80240370 246313F8 */  addiu     $v1, $v1, %lo(D_802413F8)
 /* 9EDF64 80240374 44922000 */  mtc1      $s2, $f4
 /* 9EDF68 80240378 00000000 */  nop       
 /* 9EDF6C 8024037C 46802120 */  cvt.s.w   $f4, $f4
diff --git a/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_802403C0_9EDFB0.s b/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_802403C0_9EDFB0.s
index 51265b88a3..046d848ef7 100644
--- a/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_802403C0_9EDFB0.s
+++ b/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_802403C0_9EDFB0.s
@@ -21,8 +21,8 @@ glabel func_802403C0_9EDFB0
 /* 9EDFF0 80240400 8E050000 */  lw        $a1, ($s0)
 /* 9EDFF4 80240404 0C0B1EAF */  jal       get_variable
 /* 9EDFF8 80240408 0040802D */   daddu    $s0, $v0, $zero
-/* 9EDFFC 8024040C 3C038024 */  lui       $v1, 0x8024
-/* 9EE000 80240410 246313F8 */  addiu     $v1, $v1, 0x13f8
+/* 9EDFFC 8024040C 3C038024 */  lui       $v1, %hi(D_802413F8)
+/* 9EE000 80240410 246313F8 */  addiu     $v1, $v1, %lo(D_802413F8)
 /* 9EE004 80240414 06010002 */  bgez      $s0, .L80240420
 /* 9EE008 80240418 0040202D */   daddu    $a0, $v0, $zero
 /* 9EE00C 8024041C 2610000F */  addiu     $s0, $s0, 0xf
diff --git a/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_802404D0_9EE0C0.s b/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_802404D0_9EE0C0.s
index 4893c012ca..d6b7f0b9f2 100644
--- a/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_802404D0_9EE0C0.s
+++ b/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_802404D0_9EE0C0.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_802404D0_9EE0C0
-/* 9EE0C0 802404D0 3C028024 */  lui       $v0, 0x8024
-/* 9EE0C4 802404D4 244213F8 */  addiu     $v0, $v0, 0x13f8
+/* 9EE0C0 802404D0 3C028024 */  lui       $v0, %hi(D_802413F8)
+/* 9EE0C4 802404D4 244213F8 */  addiu     $v0, $v0, %lo(D_802413F8)
 /* 9EE0C8 802404D8 AC400000 */  sw        $zero, ($v0)
 /* 9EE0CC 802404DC AC400004 */  sw        $zero, 4($v0)
 /* 9EE0D0 802404E0 AC400008 */  sw        $zero, 8($v0)
diff --git a/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_8024051C_9EE10C.s b/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_8024051C_9EE10C.s
index a59a241438..87f28573f1 100644
--- a/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_8024051C_9EE10C.s
+++ b/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_8024051C_9EE10C.s
@@ -8,8 +8,8 @@ glabel func_8024051C_9EE10C
 /* 9EE118 80240528 0C0B1EAF */  jal       get_variable
 /* 9EE11C 8024052C 8C450000 */   lw       $a1, ($v0)
 /* 9EE120 80240530 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 9EE124 80240534 3C018024 */  lui       $at, 0x8024
-/* 9EE128 80240538 AC221438 */  sw        $v0, 0x1438($at)
+/* 9EE124 80240534 3C018024 */  lui       $at, %hi(D_80241438)
+/* 9EE128 80240538 AC221438 */  sw        $v0, %lo(D_80241438)($at)
 /* 9EE12C 8024053C 24020002 */  addiu     $v0, $zero, 2
 /* 9EE130 80240540 03E00008 */  jr        $ra
 /* 9EE134 80240544 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240548_9EE138.s b/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240548_9EE138.s
index aca6a5907d..84d4c6c097 100644
--- a/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240548_9EE138.s
+++ b/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240548_9EE138.s
@@ -8,8 +8,8 @@ glabel func_80240548_9EE138
 /* 9EE144 80240554 0C0B1EAF */  jal       get_variable
 /* 9EE148 80240558 8C450000 */   lw       $a1, ($v0)
 /* 9EE14C 8024055C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 9EE150 80240560 3C018024 */  lui       $at, 0x8024
-/* 9EE154 80240564 AC22143C */  sw        $v0, 0x143c($at)
+/* 9EE150 80240560 3C018024 */  lui       $at, %hi(D_8024143C)
+/* 9EE154 80240564 AC22143C */  sw        $v0, %lo(D_8024143C)($at)
 /* 9EE158 80240568 24020002 */  addiu     $v0, $zero, 2
 /* 9EE15C 8024056C 03E00008 */  jr        $ra
 /* 9EE160 80240570 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240574_9EE164.s b/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240574_9EE164.s
index 5e0d0e6d72..b668a558c3 100644
--- a/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240574_9EE164.s
+++ b/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240574_9EE164.s
@@ -18,9 +18,9 @@ glabel func_80240574_9EE164
 /* 9EE198 802405A8 00028840 */  sll       $s1, $v0, 1
 /* 9EE19C 802405AC 02228821 */  addu      $s1, $s1, $v0
 /* 9EE1A0 802405B0 00111080 */  sll       $v0, $s1, 2
-/* 9EE1A4 802405B4 3C068024 */  lui       $a2, 0x8024
+/* 9EE1A4 802405B4 3C068024 */  lui       $a2, %hi(D_80241440)
 /* 9EE1A8 802405B8 00C23021 */  addu      $a2, $a2, $v0
-/* 9EE1AC 802405BC 8CC61440 */  lw        $a2, 0x1440($a2)
+/* 9EE1AC 802405BC 8CC61440 */  lw        $a2, %lo(D_80241440)($a2)
 /* 9EE1B0 802405C0 8E130000 */  lw        $s3, ($s0)
 /* 9EE1B4 802405C4 8E100004 */  lw        $s0, 4($s0)
 /* 9EE1B8 802405C8 0C0B2026 */  jal       set_variable
@@ -28,17 +28,17 @@ glabel func_80240574_9EE164
 /* 9EE1C0 802405D0 0240202D */  daddu     $a0, $s2, $zero
 /* 9EE1C4 802405D4 26220001 */  addiu     $v0, $s1, 1
 /* 9EE1C8 802405D8 00021080 */  sll       $v0, $v0, 2
-/* 9EE1CC 802405DC 3C068024 */  lui       $a2, 0x8024
+/* 9EE1CC 802405DC 3C068024 */  lui       $a2, %hi(D_80241440)
 /* 9EE1D0 802405E0 00C23021 */  addu      $a2, $a2, $v0
-/* 9EE1D4 802405E4 8CC61440 */  lw        $a2, 0x1440($a2)
+/* 9EE1D4 802405E4 8CC61440 */  lw        $a2, %lo(D_80241440)($a2)
 /* 9EE1D8 802405E8 0C0B2026 */  jal       set_variable
 /* 9EE1DC 802405EC 0260282D */   daddu    $a1, $s3, $zero
 /* 9EE1E0 802405F0 0240202D */  daddu     $a0, $s2, $zero
 /* 9EE1E4 802405F4 26310002 */  addiu     $s1, $s1, 2
 /* 9EE1E8 802405F8 00118880 */  sll       $s1, $s1, 2
-/* 9EE1EC 802405FC 3C068024 */  lui       $a2, 0x8024
+/* 9EE1EC 802405FC 3C068024 */  lui       $a2, %hi(D_80241440)
 /* 9EE1F0 80240600 00D13021 */  addu      $a2, $a2, $s1
-/* 9EE1F4 80240604 8CC61440 */  lw        $a2, 0x1440($a2)
+/* 9EE1F4 80240604 8CC61440 */  lw        $a2, %lo(D_80241440)($a2)
 /* 9EE1F8 80240608 0C0B2026 */  jal       set_variable
 /* 9EE1FC 8024060C 0200282D */   daddu    $a1, $s0, $zero
 /* 9EE200 80240610 8FBF0020 */  lw        $ra, 0x20($sp)
diff --git a/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_802406C4_9EE2B4.s b/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_802406C4_9EE2B4.s
index b401be4b99..970ec2dc32 100644
--- a/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_802406C4_9EE2B4.s
+++ b/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_802406C4_9EE2B4.s
@@ -44,14 +44,14 @@ glabel func_802406C4_9EE2B4
 /* 9EE34C 8024075C 0C0B102B */  jal       kill_script_by_ID
 /* 9EE350 80240760 8E040084 */   lw       $a0, 0x84($s0)
 .L80240764:
-/* 9EE354 80240764 3C048024 */  lui       $a0, 0x8024
-/* 9EE358 80240768 24841470 */  addiu     $a0, $a0, 0x1470
+/* 9EE354 80240764 3C048024 */  lui       $a0, %hi(D_80241470)
+/* 9EE358 80240768 24841470 */  addiu     $a0, $a0, %lo(D_80241470)
 /* 9EE35C 8024076C 12400005 */  beqz      $s2, .L80240784
 /* 9EE360 80240770 24020001 */   addiu    $v0, $zero, 1
 /* 9EE364 80240774 16420004 */  bne       $s2, $v0, .L80240788
 /* 9EE368 80240778 24050001 */   addiu    $a1, $zero, 1
-/* 9EE36C 8024077C 3C048024 */  lui       $a0, 0x8024
-/* 9EE370 80240780 2484161C */  addiu     $a0, $a0, 0x161c
+/* 9EE36C 8024077C 3C048024 */  lui       $a0, %hi(D_8024161C)
+/* 9EE370 80240780 2484161C */  addiu     $a0, $a0, %lo(D_8024161C)
 .L80240784:
 /* 9EE374 80240784 24050001 */  addiu     $a1, $zero, 1
 .L80240788:
diff --git a/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240814_9EE404.s b/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240814_9EE404.s
index 82822b9d46..ced67981f5 100644
--- a/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240814_9EE404.s
+++ b/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240814_9EE404.s
@@ -3,8 +3,8 @@
 
 glabel func_80240814_9EE404
 /* 9EE404 80240814 27BDFF80 */  addiu     $sp, $sp, -0x80
-/* 9EE408 80240818 3C028024 */  lui       $v0, 0x8024
-/* 9EE40C 8024081C 244213F8 */  addiu     $v0, $v0, 0x13f8
+/* 9EE408 80240818 3C028024 */  lui       $v0, %hi(D_802413F8)
+/* 9EE40C 8024081C 244213F8 */  addiu     $v0, $v0, %lo(D_802413F8)
 /* 9EE410 80240820 AFBF0048 */  sw        $ra, 0x48($sp)
 /* 9EE414 80240824 AFB70044 */  sw        $s7, 0x44($sp)
 /* 9EE418 80240828 AFB60040 */  sw        $s6, 0x40($sp)
@@ -21,8 +21,8 @@ glabel func_80240814_9EE404
 /* 9EE444 80240854 F7B60058 */  sdc1      $f22, 0x58($sp)
 /* 9EE448 80240858 F7B40050 */  sdc1      $f20, 0x50($sp)
 /* 9EE44C 8024085C C44E0000 */  lwc1      $f14, ($v0)
-/* 9EE450 80240860 3C018024 */  lui       $at, 0x8024
-/* 9EE454 80240864 D4226E20 */  ldc1      $f2, 0x6e20($at)
+/* 9EE450 80240860 3C018024 */  lui       $at, %hi(D_80246E20)
+/* 9EE454 80240864 D4226E20 */  ldc1      $f2, %lo(D_80246E20)($at)
 /* 9EE458 80240868 44805000 */  mtc1      $zero, $f10
 /* 9EE45C 8024086C E7AE0020 */  swc1      $f14, 0x20($sp)
 /* 9EE460 80240870 C4400014 */  lwc1      $f0, 0x14($v0)
@@ -61,8 +61,8 @@ glabel func_80240814_9EE404
 /* 9EE4E0 802408F0 C440001C */  lwc1      $f0, 0x1c($v0)
 /* 9EE4E4 802408F4 46041083 */  div.s     $f2, $f2, $f4
 /* 9EE4E8 802408F8 46020000 */  add.s     $f0, $f0, $f2
-/* 9EE4EC 802408FC 3C018024 */  lui       $at, 0x8024
-/* 9EE4F0 80240900 D4226E28 */  ldc1      $f2, 0x6e28($at)
+/* 9EE4EC 802408FC 3C018024 */  lui       $at, %hi(D_80246E28)
+/* 9EE4F0 80240900 D4226E28 */  ldc1      $f2, %lo(D_80246E28)($at)
 /* 9EE4F4 80240904 46000021 */  cvt.d.s   $f0, $f0
 /* 9EE4F8 80240908 46220002 */  mul.d     $f0, $f0, $f2
 /* 9EE4FC 8024090C 00000000 */  nop       
@@ -106,8 +106,8 @@ glabel func_80240814_9EE404
 /* 9EE58C 8024099C C440001C */  lwc1      $f0, 0x1c($v0)
 /* 9EE590 802409A0 46041083 */  div.s     $f2, $f2, $f4
 /* 9EE594 802409A4 46020000 */  add.s     $f0, $f0, $f2
-/* 9EE598 802409A8 3C018024 */  lui       $at, 0x8024
-/* 9EE59C 802409AC D4226E30 */  ldc1      $f2, 0x6e30($at)
+/* 9EE598 802409A8 3C018024 */  lui       $at, %hi(D_80246E30)
+/* 9EE59C 802409AC D4226E30 */  ldc1      $f2, %lo(D_80246E30)($at)
 /* 9EE5A0 802409B0 46000021 */  cvt.d.s   $f0, $f0
 /* 9EE5A4 802409B4 46220002 */  mul.d     $f0, $f0, $f2
 /* 9EE5A8 802409B8 00000000 */  nop       
@@ -116,8 +116,8 @@ glabel func_80240814_9EE404
 /* 9EE5B4 802409C4 E440001C */  swc1      $f0, 0x1c($v0)
 /* 9EE5B8 802409C8 E4460020 */  swc1      $f6, 0x20($v0)
 .L802409CC:
-/* 9EE5BC 802409CC 3C108024 */  lui       $s0, 0x8024
-/* 9EE5C0 802409D0 261013F8 */  addiu     $s0, $s0, 0x13f8
+/* 9EE5BC 802409CC 3C108024 */  lui       $s0, %hi(D_802413F8)
+/* 9EE5C0 802409D0 261013F8 */  addiu     $s0, $s0, %lo(D_802413F8)
 /* 9EE5C4 802409D4 3C140001 */  lui       $s4, 1
 /* 9EE5C8 802409D8 C6000014 */  lwc1      $f0, 0x14($s0)
 /* 9EE5CC 802409DC 3C013FE0 */  lui       $at, 0x3fe0
@@ -126,21 +126,21 @@ glabel func_80240814_9EE404
 /* 9EE5D8 802409E8 46000021 */  cvt.d.s   $f0, $f0
 /* 9EE5DC 802409EC 46220002 */  mul.d     $f0, $f0, $f2
 /* 9EE5E0 802409F0 00000000 */  nop       
-/* 9EE5E4 802409F4 3C12800A */  lui       $s2, 0x800a
-/* 9EE5E8 802409F8 2652A66C */  addiu     $s2, $s2, -0x5994
+/* 9EE5E4 802409F4 3C12800A */  lui       $s2, %hi(D_8009A66C)
+/* 9EE5E8 802409F8 2652A66C */  addiu     $s2, $s2, %lo(D_8009A66C)
 /* 9EE5EC 802409FC 36941630 */  ori       $s4, $s4, 0x1630
 /* 9EE5F0 80240A00 3C02DE00 */  lui       $v0, 0xde00
-/* 9EE5F4 80240A04 3C118007 */  lui       $s1, 0x8007
-/* 9EE5F8 80240A08 263141F0 */  addiu     $s1, $s1, 0x41f0
+/* 9EE5F4 80240A04 3C118007 */  lui       $s1, %hi(D_800741F0)
+/* 9EE5F8 80240A08 263141F0 */  addiu     $s1, $s1, %lo(D_800741F0)
 /* 9EE5FC 80240A0C 8E430000 */  lw        $v1, ($s2)
-/* 9EE600 80240A10 3C13800A */  lui       $s3, 0x800a
-/* 9EE604 80240A14 2673A674 */  addiu     $s3, $s3, -0x598c
+/* 9EE600 80240A10 3C13800A */  lui       $s3, %hi(D_8009A674)
+/* 9EE604 80240A14 2673A674 */  addiu     $s3, $s3, %lo(D_8009A674)
 /* 9EE608 80240A18 0060202D */  daddu     $a0, $v1, $zero
 /* 9EE60C 80240A1C 46200020 */  cvt.s.d   $f0, $f0
 /* 9EE610 80240A20 E6000014 */  swc1      $f0, 0x14($s0)
 /* 9EE614 80240A24 AC820000 */  sw        $v0, ($a0)
-/* 9EE618 80240A28 3C028024 */  lui       $v0, 0x8024
-/* 9EE61C 80240A2C 24421768 */  addiu     $v0, $v0, 0x1768
+/* 9EE618 80240A28 3C028024 */  lui       $v0, %hi(D_80241768)
+/* 9EE61C 80240A2C 24421768 */  addiu     $v0, $v0, %lo(D_80241768)
 /* 9EE620 80240A30 AC820004 */  sw        $v0, 4($a0)
 /* 9EE624 80240A34 8E050000 */  lw        $a1, ($s0)
 /* 9EE628 80240A38 8E060004 */  lw        $a2, 4($s0)
@@ -194,8 +194,8 @@ glabel func_80240814_9EE404
 /* 9EE6E8 80240AF8 00000000 */  nop       
 /* 9EE6EC 80240AFC 0200B02D */  daddu     $s6, $s0, $zero
 /* 9EE6F0 80240B00 C7AE0020 */  lwc1      $f14, 0x20($sp)
-/* 9EE6F4 80240B04 3C178024 */  lui       $s7, 0x8024
-/* 9EE6F8 80240B08 26F71748 */  addiu     $s7, $s7, 0x1748
+/* 9EE6F4 80240B04 3C178024 */  lui       $s7, %hi(D_80241748)
+/* 9EE6F8 80240B08 26F71748 */  addiu     $s7, $s7, %lo(D_80241748)
 /* 9EE6FC 80240B0C 46007380 */  add.s     $f14, $f14, $f0
 /* 9EE700 80240B10 3C100001 */  lui       $s0, 1
 /* 9EE704 80240B14 36101630 */  ori       $s0, $s0, 0x1630
@@ -335,8 +335,8 @@ glabel func_80240814_9EE404
 /* 9EE918 80240D28 1440FFA0 */  bnez      $v0, .L80240BAC
 /* 9EE91C 80240D2C AC87000C */   sw       $a3, 0xc($a0)
 /* 9EE920 80240D30 3C03D838 */  lui       $v1, 0xd838
-/* 9EE924 80240D34 3C05800A */  lui       $a1, 0x800a
-/* 9EE928 80240D38 24A5A66C */  addiu     $a1, $a1, -0x5994
+/* 9EE924 80240D34 3C05800A */  lui       $a1, %hi(D_8009A66C)
+/* 9EE928 80240D38 24A5A66C */  addiu     $a1, $a1, %lo(D_8009A66C)
 /* 9EE92C 80240D3C 8CA20000 */  lw        $v0, ($a1)
 /* 9EE930 80240D40 34630002 */  ori       $v1, $v1, 2
 /* 9EE934 80240D44 0040202D */  daddu     $a0, $v0, $zero
@@ -345,10 +345,10 @@ glabel func_80240814_9EE404
 /* 9EE940 80240D50 AC830000 */  sw        $v1, ($a0)
 /* 9EE944 80240D54 24030040 */  addiu     $v1, $zero, 0x40
 /* 9EE948 80240D58 AC830004 */  sw        $v1, 4($a0)
-/* 9EE94C 80240D5C 3C03E700 */  lui       $v1, 0xe700
+/* 9EE94C 80240D5C 3C03E700 */  lui       $v1, %hi(D_E70013F8)
 /* 9EE950 80240D60 AC430000 */  sw        $v1, ($v0)
-/* 9EE954 80240D64 3C038024 */  lui       $v1, 0x8024
-/* 9EE958 80240D68 246313F8 */  addiu     $v1, $v1, 0x13f8
+/* 9EE954 80240D64 3C038024 */  lui       $v1, %hi(D_802413F8)
+/* 9EE958 80240D68 246313F8 */  addiu     $v1, $v1, %lo(D_E70013F8)
 /* 9EE95C 80240D6C AC400004 */  sw        $zero, 4($v0)
 /* 9EE960 80240D70 8C640040 */  lw        $a0, 0x40($v1)
 /* 9EE964 80240D74 24420008 */  addiu     $v0, $v0, 8
diff --git a/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240E4C_9EEA3C.s b/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240E4C_9EEA3C.s
index 4c6dbea629..751172aa4a 100644
--- a/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240E4C_9EEA3C.s
+++ b/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240E4C_9EEA3C.s
@@ -4,11 +4,11 @@
 glabel func_80240E4C_9EEA3C
 /* 9EEA3C 80240E4C 10A00003 */  beqz      $a1, .L80240E5C
 /* 9EEA40 80240E50 00000000 */   nop      
-/* 9EEA44 80240E54 3C018024 */  lui       $at, 0x8024
-/* 9EEA48 80240E58 AC203254 */  sw        $zero, 0x3254($at)
+/* 9EEA44 80240E54 3C018024 */  lui       $at, %hi(D_80243254)
+/* 9EEA48 80240E58 AC203254 */  sw        $zero, %lo(D_80243254)($at)
 .L80240E5C:
-/* 9EEA4C 80240E5C 3C028024 */  lui       $v0, 0x8024
-/* 9EEA50 80240E60 8C423254 */  lw        $v0, 0x3254($v0)
+/* 9EEA4C 80240E5C 3C028024 */  lui       $v0, %hi(D_80243254)
+/* 9EEA50 80240E60 8C423254 */  lw        $v0, %lo(D_80243254)($v0)
 /* 9EEA54 80240E64 0002102B */  sltu      $v0, $zero, $v0
 /* 9EEA58 80240E68 03E00008 */  jr        $ra
 /* 9EEA5C 80240E6C 00021040 */   sll      $v0, $v0, 1
diff --git a/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240E70_9EEA60.s b/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240E70_9EEA60.s
index 3d29d3d219..5196c6b43f 100644
--- a/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240E70_9EEA60.s
+++ b/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240E70_9EEA60.s
@@ -3,8 +3,8 @@
 
 glabel func_80240E70_9EEA60
 /* 9EEA60 80240E70 24020001 */  addiu     $v0, $zero, 1
-/* 9EEA64 80240E74 3C018024 */  lui       $at, 0x8024
-/* 9EEA68 80240E78 AC223254 */  sw        $v0, 0x3254($at)
+/* 9EEA64 80240E74 3C018024 */  lui       $at, %hi(D_80243254)
+/* 9EEA68 80240E78 AC223254 */  sw        $v0, %lo(D_80243254)($at)
 /* 9EEA6C 80240E7C 03E00008 */  jr        $ra
 /* 9EEA70 80240E80 24020002 */   addiu    $v0, $zero, 2
 /* 9EEA74 80240E84 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_nok/nok_04/9EEA80/func_80240E90_9EEA80.s b/asm/nonmatchings/world/area_nok/nok_04/9EEA80/func_80240E90_9EEA80.s
index 9bce1d94f6..dca1ecca31 100644
--- a/asm/nonmatchings/world/area_nok/nok_04/9EEA80/func_80240E90_9EEA80.s
+++ b/asm/nonmatchings/world/area_nok/nok_04/9EEA80/func_80240E90_9EEA80.s
@@ -3,8 +3,8 @@
 
 glabel func_80240E90_9EEA80
 /* 9EEA80 80240E90 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 9EEA84 80240E94 3C048024 */  lui       $a0, 0x8024
-/* 9EEA88 80240E98 24846E40 */  addiu     $a0, $a0, 0x6e40
+/* 9EEA84 80240E94 3C048024 */  lui       $a0, %hi(D_80246E40)
+/* 9EEA88 80240E98 24846E40 */  addiu     $a0, $a0, %lo(D_80246E40)
 /* 9EEA8C 80240E9C 27A50010 */  addiu     $a1, $sp, 0x10
 /* 9EEA90 80240EA0 AFBF0020 */  sw        $ra, 0x20($sp)
 /* 9EEA94 80240EA4 AFB1001C */  sw        $s1, 0x1c($sp)
@@ -12,16 +12,16 @@ glabel func_80240E90_9EEA80
 /* 9EEA9C 80240EAC AFB00018 */   sw       $s0, 0x18($sp)
 /* 9EEAA0 80240EB0 0040802D */  daddu     $s0, $v0, $zero
 /* 9EEAA4 80240EB4 0200202D */  daddu     $a0, $s0, $zero
-/* 9EEAA8 80240EB8 3C118024 */  lui       $s1, 0x8024
-/* 9EEAAC 80240EBC 26316E50 */  addiu     $s1, $s1, 0x6e50
+/* 9EEAA8 80240EB8 3C118024 */  lui       $s1, %hi(D_80246E50)
+/* 9EEAAC 80240EBC 26316E50 */  addiu     $s1, $s1, %lo(D_80246E50)
 /* 9EEAB0 80240EC0 0C01BB7C */  jal       decode_yay0
 /* 9EEAB4 80240EC4 0220282D */   daddu    $a1, $s1, $zero
 /* 9EEAB8 80240EC8 0C00AB1E */  jal       general_heap_free
 /* 9EEABC 80240ECC 0200202D */   daddu    $a0, $s0, $zero
 /* 9EEAC0 80240ED0 3C048025 */  lui       $a0, %hi(pause_partners_load_portrait)
 /* 9EEAC4 80240ED4 2484ADE0 */  addiu     $a0, $a0, %lo(pause_partners_load_portrait)
-/* 9EEAC8 80240ED8 3C028024 */  lui       $v0, 0x8024
-/* 9EEACC 80240EDC 24427050 */  addiu     $v0, $v0, 0x7050
+/* 9EEAC8 80240ED8 3C028024 */  lui       $v0, %hi(D_80247050)
+/* 9EEACC 80240EDC 24427050 */  addiu     $v0, $v0, %lo(D_80247050)
 /* 9EEAD0 80240EE0 AC820000 */  sw        $v0, ($a0)
 /* 9EEAD4 80240EE4 24020096 */  addiu     $v0, $zero, 0x96
 /* 9EEAD8 80240EE8 A4820008 */  sh        $v0, 8($a0)
diff --git a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_8024007C_9F4ABC.s b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_8024007C_9F4ABC.s
index c6b8997979..0e7abbfbb4 100644
--- a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_8024007C_9F4ABC.s
+++ b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_8024007C_9F4ABC.s
@@ -55,8 +55,8 @@ glabel func_8024007C_9F4ABC
 /* 9F4B78 80240138 8C470030 */   lw       $a3, 0x30($v0)
 /* 9F4B7C 8024013C C6020018 */  lwc1      $f2, 0x18($s0)
 /* 9F4B80 80240140 46020003 */  div.s     $f0, $f0, $f2
-/* 9F4B84 80240144 3C018024 */  lui       $at, 0x8024
-/* 9F4B88 80240148 D4225CF0 */  ldc1      $f2, 0x5cf0($at)
+/* 9F4B84 80240144 3C018024 */  lui       $at, %hi(D_80245CF0)
+/* 9F4B88 80240148 D4225CF0 */  ldc1      $f2, %lo(D_80245CF0)($at)
 /* 9F4B8C 8024014C 46000021 */  cvt.d.s   $f0, $f0
 /* 9F4B90 80240150 46220000 */  add.d     $f0, $f0, $f2
 /* 9F4B94 80240154 4620010D */  trunc.w.d $f4, $f0
diff --git a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80240394_9F4DD4.s b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80240394_9F4DD4.s
index ded9d8b413..1cdd8cf71d 100644
--- a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80240394_9F4DD4.s
+++ b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80240394_9F4DD4.s
@@ -279,9 +279,9 @@ glabel func_80240394_9F4DD4
 /* 9F51C0 80240780 2C620015 */  sltiu     $v0, $v1, 0x15
 /* 9F51C4 80240784 10400009 */  beqz      $v0, .L802407AC
 /* 9F51C8 80240788 00031080 */   sll      $v0, $v1, 2
-/* 9F51CC 8024078C 3C018024 */  lui       $at, 0x8024
+/* 9F51CC 8024078C 3C018024 */  lui       $at, %hi(D_80245CF8)
 /* 9F51D0 80240790 00220821 */  addu      $at, $at, $v0
-/* 9F51D4 80240794 8C225CF8 */  lw        $v0, 0x5cf8($at)
+/* 9F51D4 80240794 8C225CF8 */  lw        $v0, %lo(D_80245CF8)($at)
 /* 9F51D8 80240798 00400008 */  jr        $v0
 /* 9F51DC 8024079C 00000000 */   nop      
 /* 9F51E0 802407A0 8E420028 */  lw        $v0, 0x28($s2)
diff --git a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_802407D4_9F5214.s b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_802407D4_9F5214.s
index 9d3719d317..dbb7961fa0 100644
--- a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_802407D4_9F5214.s
+++ b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_802407D4_9F5214.s
@@ -87,8 +87,8 @@ glabel func_802407D4_9F5214
 /* 9F5354 80240914 0809024F */  j         .L8024093C
 /* 9F5358 80240918 E6000018 */   swc1     $f0, 0x18($s0)
 .L8024091C:
-/* 9F535C 8024091C 3C018024 */  lui       $at, 0x8024
-/* 9F5360 80240920 D4225D50 */  ldc1      $f2, 0x5d50($at)
+/* 9F535C 8024091C 3C018024 */  lui       $at, %hi(D_80245D50)
+/* 9F5360 80240920 D4225D50 */  ldc1      $f2, %lo(D_80245D50)($at)
 /* 9F5364 80240924 44820000 */  mtc1      $v0, $f0
 /* 9F5368 80240928 00000000 */  nop       
 /* 9F536C 8024092C 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80240984_9F53C4.s b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80240984_9F53C4.s
index f98ccdd6a8..1711ccc0c0 100644
--- a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80240984_9F53C4.s
+++ b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80240984_9F53C4.s
@@ -104,8 +104,8 @@ glabel func_80240984_9F53C4
 /* 9F5548 80240B08 1040000A */  beqz      $v0, .L80240B34
 /* 9F554C 80240B0C 4600C106 */   mov.s    $f4, $f24
 /* 9F5550 80240B10 4614C081 */  sub.s     $f2, $f24, $f20
-/* 9F5554 80240B14 3C018024 */  lui       $at, 0x8024
-/* 9F5558 80240B18 D4205D58 */  ldc1      $f0, 0x5d58($at)
+/* 9F5554 80240B14 3C018024 */  lui       $at, %hi(D_80245D58)
+/* 9F5558 80240B18 D4205D58 */  ldc1      $f0, %lo(D_80245D58)($at)
 /* 9F555C 80240B1C 460010A1 */  cvt.d.s   $f2, $f2
 /* 9F5560 80240B20 46201082 */  mul.d     $f2, $f2, $f0
 /* 9F5564 80240B24 00000000 */  nop       
@@ -131,8 +131,8 @@ glabel func_80240984_9F53C4
 /* 9F55B0 80240B70 C7A4002C */  lwc1      $f4, 0x2c($sp)
 /* 9F55B4 80240B74 461A2100 */  add.s     $f4, $f4, $f26
 /* 9F55B8 80240B78 46142081 */  sub.s     $f2, $f4, $f20
-/* 9F55BC 80240B7C 3C018024 */  lui       $at, 0x8024
-/* 9F55C0 80240B80 D4205D60 */  ldc1      $f0, 0x5d60($at)
+/* 9F55BC 80240B7C 3C018024 */  lui       $at, %hi(D_80245D60)
+/* 9F55C0 80240B80 D4205D60 */  ldc1      $f0, %lo(D_80245D60)($at)
 /* 9F55C4 80240B84 460010A1 */  cvt.d.s   $f2, $f2
 /* 9F55C8 80240B88 46201082 */  mul.d     $f2, $f2, $f0
 /* 9F55CC 80240B8C 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241428_9F5E68.s b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241428_9F5E68.s
index 497095c5a5..50c61f75f7 100644
--- a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241428_9F5E68.s
+++ b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241428_9F5E68.s
@@ -15,9 +15,9 @@ glabel func_80241428_9F5E68
 /* 9F5E90 80241450 00031C00 */  sll       $v1, $v1, 0x10
 /* 9F5E94 80241454 00031B83 */  sra       $v1, $v1, 0xe
 /* 9F5E98 80241458 A444008E */  sh        $a0, 0x8e($v0)
-/* 9F5E9C 8024145C 3C018024 */  lui       $at, 0x8024
+/* 9F5E9C 8024145C 3C018024 */  lui       $at, %hi(D_80242888)
 /* 9F5EA0 80241460 00230821 */  addu      $at, $at, $v1
-/* 9F5EA4 80241464 C4222888 */  lwc1      $f2, 0x2888($at)
+/* 9F5EA4 80241464 C4222888 */  lwc1      $f2, %lo(D_80242888)($at)
 /* 9F5EA8 80241468 8443008E */  lh        $v1, 0x8e($v0)
 /* 9F5EAC 8024146C 46020000 */  add.s     $f0, $f0, $f2
 /* 9F5EB0 80241470 28630005 */  slti      $v1, $v1, 5
diff --git a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241AE0_9F6520.s b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241AE0_9F6520.s
index ed8d84d103..37563950b0 100644
--- a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241AE0_9F6520.s
+++ b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241AE0_9F6520.s
@@ -66,9 +66,9 @@ glabel func_80241AE0_9F6520
 /* 9F660C 80241BCC 2C62000F */  sltiu     $v0, $v1, 0xf
 /* 9F6610 80241BD0 10400034 */  beqz      $v0, .L80241CA4
 /* 9F6614 80241BD4 00031080 */   sll      $v0, $v1, 2
-/* 9F6618 80241BD8 3C018024 */  lui       $at, 0x8024
+/* 9F6618 80241BD8 3C018024 */  lui       $at, %hi(D_80245D68)
 /* 9F661C 80241BDC 00220821 */  addu      $at, $at, $v0
-/* 9F6620 80241BE0 8C225D68 */  lw        $v0, 0x5d68($at)
+/* 9F6620 80241BE0 8C225D68 */  lw        $v0, %lo(D_80245D68)($at)
 /* 9F6624 80241BE4 00400008 */  jr        $v0
 /* 9F6628 80241BE8 00000000 */   nop      
 /* 9F662C 80241BEC 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802405EC_9FADDC.s b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802405EC_9FADDC.s
index ec64d70c27..69a68314c4 100644
--- a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802405EC_9FADDC.s
+++ b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802405EC_9FADDC.s
@@ -55,8 +55,8 @@ glabel func_802405EC_9FADDC
 /* 9FAE98 802406A8 8C470030 */   lw       $a3, 0x30($v0)
 /* 9FAE9C 802406AC C6020018 */  lwc1      $f2, 0x18($s0)
 /* 9FAEA0 802406B0 46020003 */  div.s     $f0, $f0, $f2
-/* 9FAEA4 802406B4 3C018024 */  lui       $at, 0x8024
-/* 9FAEA8 802406B8 D4225A70 */  ldc1      $f2, 0x5a70($at)
+/* 9FAEA4 802406B4 3C018024 */  lui       $at, %hi(D_80245A70)
+/* 9FAEA8 802406B8 D4225A70 */  ldc1      $f2, %lo(D_80245A70)($at)
 /* 9FAEAC 802406BC 46000021 */  cvt.d.s   $f0, $f0
 /* 9FAEB0 802406C0 46220000 */  add.d     $f0, $f0, $f2
 /* 9FAEB4 802406C4 4620010D */  trunc.w.d $f4, $f0
diff --git a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80240904_9FB0F4.s b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80240904_9FB0F4.s
index 63977fa540..2fd68b73d2 100644
--- a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80240904_9FB0F4.s
+++ b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80240904_9FB0F4.s
@@ -279,9 +279,9 @@ glabel func_80240904_9FB0F4
 /* 9FB4E0 80240CF0 2C620015 */  sltiu     $v0, $v1, 0x15
 /* 9FB4E4 80240CF4 10400009 */  beqz      $v0, .L80240D1C
 /* 9FB4E8 80240CF8 00031080 */   sll      $v0, $v1, 2
-/* 9FB4EC 80240CFC 3C018024 */  lui       $at, 0x8024
+/* 9FB4EC 80240CFC 3C018024 */  lui       $at, %hi(D_80245A78)
 /* 9FB4F0 80240D00 00220821 */  addu      $at, $at, $v0
-/* 9FB4F4 80240D04 8C225A78 */  lw        $v0, 0x5a78($at)
+/* 9FB4F4 80240D04 8C225A78 */  lw        $v0, %lo(D_80245A78)($at)
 /* 9FB4F8 80240D08 00400008 */  jr        $v0
 /* 9FB4FC 80240D0C 00000000 */   nop      
 /* 9FB500 80240D10 8E420028 */  lw        $v0, 0x28($s2)
diff --git a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802413C0_9FBBB0.s b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802413C0_9FBBB0.s
index af0dc077f9..d96a1b3d2f 100644
--- a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802413C0_9FBBB0.s
+++ b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802413C0_9FBBB0.s
@@ -33,8 +33,8 @@ glabel func_802413C0_9FBBB0
 /* 9FBC1C 8024142C 08090515 */  j         .L80241454
 /* 9FBC20 80241430 E4A00018 */   swc1     $f0, 0x18($a1)
 .L80241434:
-/* 9FBC24 80241434 3C018024 */  lui       $at, 0x8024
-/* 9FBC28 80241438 D4225AD8 */  ldc1      $f2, 0x5ad8($at)
+/* 9FBC24 80241434 3C018024 */  lui       $at, %hi(D_80245AD8)
+/* 9FBC28 80241438 D4225AD8 */  ldc1      $f2, %lo(D_80245AD8)($at)
 /* 9FBC2C 8024143C 44820000 */  mtc1      $v0, $f0
 /* 9FBC30 80241440 00000000 */  nop       
 /* 9FBC34 80241444 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802418D8_9FC0C8.s b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802418D8_9FC0C8.s
index ff38f254ee..f885fae1be 100644
--- a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802418D8_9FC0C8.s
+++ b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802418D8_9FC0C8.s
@@ -124,9 +124,9 @@ glabel func_802418D8_9FC0C8
 /* 9FC28C 80241A9C 2C620064 */  sltiu     $v0, $v1, 0x64
 /* 9FC290 80241AA0 10400042 */  beqz      $v0, .L80241BAC
 /* 9FC294 80241AA4 00031080 */   sll      $v0, $v1, 2
-/* 9FC298 80241AA8 3C018024 */  lui       $at, 0x8024
+/* 9FC298 80241AA8 3C018024 */  lui       $at, %hi(D_80245AE0)
 /* 9FC29C 80241AAC 00220821 */  addu      $at, $at, $v0
-/* 9FC2A0 80241AB0 8C225AE0 */  lw        $v0, 0x5ae0($at)
+/* 9FC2A0 80241AB0 8C225AE0 */  lw        $v0, %lo(D_80245AE0)($at)
 /* 9FC2A4 80241AB4 00400008 */  jr        $v0
 /* 9FC2A8 80241AB8 00000000 */   nop      
 /* 9FC2AC 80241ABC 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241BD4_9FC3C4.s b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241BD4_9FC3C4.s
index b39e4bd6e2..751baabc45 100644
--- a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241BD4_9FC3C4.s
+++ b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241BD4_9FC3C4.s
@@ -134,9 +134,9 @@ glabel func_80241BD4_9FC3C4
 /* 9FC5B0 80241DC0 2C620064 */  sltiu     $v0, $v1, 0x64
 /* 9FC5B4 80241DC4 1040003A */  beqz      $v0, .L80241EB0
 /* 9FC5B8 80241DC8 00031080 */   sll      $v0, $v1, 2
-/* 9FC5BC 80241DCC 3C018024 */  lui       $at, 0x8024
+/* 9FC5BC 80241DCC 3C018024 */  lui       $at, %hi(D_80245C70)
 /* 9FC5C0 80241DD0 00220821 */  addu      $at, $at, $v0
-/* 9FC5C4 80241DD4 8C225C70 */  lw        $v0, 0x5c70($at)
+/* 9FC5C4 80241DD4 8C225C70 */  lw        $v0, %lo(D_80245C70)($at)
 /* 9FC5C8 80241DD8 00400008 */  jr        $v0
 /* 9FC5CC 80241DDC 00000000 */   nop      
 /* 9FC5D0 80241DE0 0260202D */  daddu     $a0, $s3, $zero
diff --git a/asm/nonmatchings/world/area_nok/nok_12/9FC6D0/func_80241EE0_9FC6D0.s b/asm/nonmatchings/world/area_nok/nok_12/9FC6D0/func_80241EE0_9FC6D0.s
index bcff082999..7a7345d80d 100644
--- a/asm/nonmatchings/world/area_nok/nok_12/9FC6D0/func_80241EE0_9FC6D0.s
+++ b/asm/nonmatchings/world/area_nok/nok_12/9FC6D0/func_80241EE0_9FC6D0.s
@@ -3,8 +3,8 @@
 
 glabel func_80241EE0_9FC6D0
 /* 9FC6D0 80241EE0 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 9FC6D4 80241EE4 3C048024 */  lui       $a0, 0x8024
-/* 9FC6D8 80241EE8 248459CC */  addiu     $a0, $a0, 0x59cc
+/* 9FC6D4 80241EE4 3C048024 */  lui       $a0, %hi(D_802459CC)
+/* 9FC6D8 80241EE8 248459CC */  addiu     $a0, $a0, %lo(D_802459CC)
 /* 9FC6DC 80241EEC AFBF0018 */  sw        $ra, 0x18($sp)
 /* 9FC6E0 80241EF0 AFB10014 */  sw        $s1, 0x14($sp)
 /* 9FC6E4 80241EF4 AFB00010 */  sw        $s0, 0x10($sp)
@@ -34,8 +34,8 @@ glabel func_80241EE0_9FC6D0
 /* 9FC738 80241F48 080907ED */  j         .L80241FB4
 /* 9FC73C 80241F4C AC820000 */   sw       $v0, ($a0)
 .L80241F50:
-/* 9FC740 80241F50 3C108011 */  lui       $s0, 0x8011
-/* 9FC744 80241F54 2610C930 */  addiu     $s0, $s0, -0x36d0
+/* 9FC740 80241F50 3C108011 */  lui       $s0, %hi(D_8010C930)
+/* 9FC744 80241F54 2610C930 */  addiu     $s0, $s0, %lo(D_8010C930)
 /* 9FC748 80241F58 0C03BD17 */  jal       clear_partner_move_history
 /* 9FC74C 80241F5C 8E040000 */   lw       $a0, ($s0)
 /* 9FC750 80241F60 C6200028 */  lwc1      $f0, 0x28($s1)
diff --git a/asm/nonmatchings/world/area_nok/nok_12/9FC6D0/func_80241FD0_9FC7C0.s b/asm/nonmatchings/world/area_nok/nok_12/9FC6D0/func_80241FD0_9FC7C0.s
index 0537409180..5dc478d2c8 100644
--- a/asm/nonmatchings/world/area_nok/nok_12/9FC6D0/func_80241FD0_9FC7C0.s
+++ b/asm/nonmatchings/world/area_nok/nok_12/9FC6D0/func_80241FD0_9FC7C0.s
@@ -3,8 +3,8 @@
 
 glabel func_80241FD0_9FC7C0
 /* 9FC7C0 80241FD0 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 9FC7C4 80241FD4 3C048024 */  lui       $a0, 0x8024
-/* 9FC7C8 80241FD8 24845A14 */  addiu     $a0, $a0, 0x5a14
+/* 9FC7C4 80241FD4 3C048024 */  lui       $a0, %hi(D_80245A14)
+/* 9FC7C8 80241FD8 24845A14 */  addiu     $a0, $a0, %lo(D_80245A14)
 /* 9FC7CC 80241FDC AFBF0018 */  sw        $ra, 0x18($sp)
 /* 9FC7D0 80241FE0 AFB10014 */  sw        $s1, 0x14($sp)
 /* 9FC7D4 80241FE4 AFB00010 */  sw        $s0, 0x10($sp)
@@ -34,8 +34,8 @@ glabel func_80241FD0_9FC7C0
 /* 9FC828 80242038 08090829 */  j         .L802420A4
 /* 9FC82C 8024203C AC820000 */   sw       $v0, ($a0)
 .L80242040:
-/* 9FC830 80242040 3C108011 */  lui       $s0, 0x8011
-/* 9FC834 80242044 2610C930 */  addiu     $s0, $s0, -0x36d0
+/* 9FC830 80242040 3C108011 */  lui       $s0, %hi(D_8010C930)
+/* 9FC834 80242044 2610C930 */  addiu     $s0, $s0, %lo(D_8010C930)
 /* 9FC838 80242048 0C03BD17 */  jal       clear_partner_move_history
 /* 9FC83C 8024204C 8E040000 */   lw       $a0, ($s0)
 /* 9FC840 80242050 C6200028 */  lwc1      $f0, 0x28($s1)
diff --git a/asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240230_A00830.s b/asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240230_A00830.s
index 70ab430fdf..1c0e2f2a65 100644
--- a/asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240230_A00830.s
+++ b/asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240230_A00830.s
@@ -83,8 +83,8 @@ glabel func_80240230_A00830
 /* A0095C 8024035C 27A5002C */   addiu    $a1, $sp, 0x2c
 /* A00960 80240360 C6000038 */  lwc1      $f0, 0x38($s0)
 /* A00964 80240364 860200A6 */  lh        $v0, 0xa6($s0)
-/* A00968 80240368 3C018024 */  lui       $at, 0x8024
-/* A0096C 8024036C D42221D0 */  ldc1      $f2, 0x21d0($at)
+/* A00968 80240368 3C018024 */  lui       $at, %hi(D_802421D0)
+/* A0096C 8024036C D42221D0 */  ldc1      $f2, %lo(D_802421D0)($at)
 /* A00970 80240370 27A60030 */  addiu     $a2, $sp, 0x30
 /* A00974 80240374 E7A0002C */  swc1      $f0, 0x2c($sp)
 /* A00978 80240378 44820000 */  mtc1      $v0, $f0
diff --git a/asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240BF0_A011F0.s b/asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240BF0_A011F0.s
index 3170a7463f..364eabd6ce 100644
--- a/asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240BF0_A011F0.s
+++ b/asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240BF0_A011F0.s
@@ -88,9 +88,9 @@ glabel func_80240BF0_A011F0
 /* A01334 80240D34 2C62000F */  sltiu     $v0, $v1, 0xf
 /* A01338 80240D38 1040002C */  beqz      $v0, .L80240DEC
 /* A0133C 80240D3C 00031080 */   sll      $v0, $v1, 2
-/* A01340 80240D40 3C018024 */  lui       $at, 0x8024
+/* A01340 80240D40 3C018024 */  lui       $at, %hi(D_802421D8)
 /* A01344 80240D44 00220821 */  addu      $at, $at, $v0
-/* A01348 80240D48 8C2221D8 */  lw        $v0, 0x21d8($at)
+/* A01348 80240D48 8C2221D8 */  lw        $v0, %lo(D_802421D8)($at)
 /* A0134C 80240D4C 00400008 */  jr        $v0
 /* A01350 80240D50 00000000 */   nop      
 /* A01354 80240D54 0260202D */  daddu     $a0, $s3, $zero
diff --git a/asm/nonmatchings/world/area_nok/nok_13/A01420/func_80240E20_A01420.s b/asm/nonmatchings/world/area_nok/nok_13/A01420/func_80240E20_A01420.s
index 0d830a628f..6287254dec 100644
--- a/asm/nonmatchings/world/area_nok/nok_13/A01420/func_80240E20_A01420.s
+++ b/asm/nonmatchings/world/area_nok/nok_13/A01420/func_80240E20_A01420.s
@@ -49,9 +49,9 @@ glabel func_80240E20_A01420
 /* A014CC 80240ECC 2C620005 */  sltiu     $v0, $v1, 5
 /* A014D0 80240ED0 10400116 */  beqz      $v0, .L8024132C
 /* A014D4 80240ED4 00031080 */   sll      $v0, $v1, 2
-/* A014D8 80240ED8 3C018024 */  lui       $at, 0x8024
+/* A014D8 80240ED8 3C018024 */  lui       $at, %hi(D_80242220)
 /* A014DC 80240EDC 00220821 */  addu      $at, $at, $v0
-/* A014E0 80240EE0 8C222220 */  lw        $v0, 0x2220($at)
+/* A014E0 80240EE0 8C222220 */  lw        $v0, %lo(D_80242220)($at)
 /* A014E4 80240EE4 00400008 */  jr        $v0
 /* A014E8 80240EE8 00000000 */   nop      
 /* A014EC 80240EEC C60C0000 */  lwc1      $f12, ($s0)
diff --git a/asm/nonmatchings/world/area_nok/nok_13/A01420/func_802413CC_A019CC.s b/asm/nonmatchings/world/area_nok/nok_13/A01420/func_802413CC_A019CC.s
index 82499b87b5..88295f316e 100644
--- a/asm/nonmatchings/world/area_nok/nok_13/A01420/func_802413CC_A019CC.s
+++ b/asm/nonmatchings/world/area_nok/nok_13/A01420/func_802413CC_A019CC.s
@@ -22,8 +22,8 @@ glabel func_802413CC_A019CC
 /* A01A0C 8024140C 0809051B */  j         .L8024146C
 /* A01A10 80241410 00000000 */   nop      
 .L80241414:
-/* A01A14 80241414 3C048024 */  lui       $a0, 0x8024
-/* A01A18 80241418 24842134 */  addiu     $a0, $a0, 0x2134
+/* A01A14 80241414 3C048024 */  lui       $a0, %hi(D_80242134)
+/* A01A18 80241418 24842134 */  addiu     $a0, $a0, %lo(D_80242134)
 /* A01A1C 8024141C 0C0B0CF8 */  jal       start_script
 /* A01A20 80241420 0000302D */   daddu    $a2, $zero, $zero
 /* A01A24 80241424 08090520 */  j         .L80241480
@@ -46,8 +46,8 @@ glabel func_802413CC_A019CC
 /* A01A64 80241464 08090521 */  j         .L80241484
 /* A01A68 80241468 00000000 */   nop      
 .L8024146C:
-/* A01A6C 8024146C 3C048024 */  lui       $a0, 0x8024
-/* A01A70 80241470 24842134 */  addiu     $a0, $a0, 0x2134
+/* A01A6C 8024146C 3C048024 */  lui       $a0, %hi(D_80242134)
+/* A01A70 80241470 24842134 */  addiu     $a0, $a0, %lo(D_80242134)
 /* A01A74 80241474 0C0B0CF8 */  jal       start_script
 /* A01A78 80241478 0000302D */   daddu    $a2, $zero, $zero
 /* A01A7C 8024147C 24030011 */  addiu     $v1, $zero, 0x11
diff --git a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_8024023C_A02A7C.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_8024023C_A02A7C.s
index a7f2217718..0160a1c713 100644
--- a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_8024023C_A02A7C.s
+++ b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_8024023C_A02A7C.s
@@ -55,8 +55,8 @@ glabel func_8024023C_A02A7C
 /* A02B38 802402F8 8C470030 */   lw       $a3, 0x30($v0)
 /* A02B3C 802402FC C6020018 */  lwc1      $f2, 0x18($s0)
 /* A02B40 80240300 46020003 */  div.s     $f0, $f0, $f2
-/* A02B44 80240304 3C018024 */  lui       $at, 0x8024
-/* A02B48 80240308 D42245C0 */  ldc1      $f2, 0x45c0($at)
+/* A02B44 80240304 3C018024 */  lui       $at, %hi(D_802445C0)
+/* A02B48 80240308 D42245C0 */  ldc1      $f2, %lo(D_802445C0)($at)
 /* A02B4C 8024030C 46000021 */  cvt.d.s   $f0, $f0
 /* A02B50 80240310 46220000 */  add.d     $f0, $f0, $f2
 /* A02B54 80240314 4620010D */  trunc.w.d $f4, $f0
diff --git a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240554_A02D94.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240554_A02D94.s
index c0be6b89b3..7dda0243c1 100644
--- a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240554_A02D94.s
+++ b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240554_A02D94.s
@@ -279,9 +279,9 @@ glabel func_80240554_A02D94
 /* A03180 80240940 2C620015 */  sltiu     $v0, $v1, 0x15
 /* A03184 80240944 10400009 */  beqz      $v0, .L8024096C
 /* A03188 80240948 00031080 */   sll      $v0, $v1, 2
-/* A0318C 8024094C 3C018024 */  lui       $at, 0x8024
+/* A0318C 8024094C 3C018024 */  lui       $at, %hi(D_802445C8)
 /* A03190 80240950 00220821 */  addu      $at, $at, $v0
-/* A03194 80240954 8C2245C8 */  lw        $v0, 0x45c8($at)
+/* A03194 80240954 8C2245C8 */  lw        $v0, %lo(D_802445C8)($at)
 /* A03198 80240958 00400008 */  jr        $v0
 /* A0319C 8024095C 00000000 */   nop      
 /* A031A0 80240960 8E420028 */  lw        $v0, 0x28($s2)
diff --git a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240994_A031D4.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240994_A031D4.s
index 75a0a26d1e..6f2b5d880d 100644
--- a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240994_A031D4.s
+++ b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240994_A031D4.s
@@ -87,8 +87,8 @@ glabel func_80240994_A031D4
 /* A03314 80240AD4 080902BF */  j         .L80240AFC
 /* A03318 80240AD8 E6000018 */   swc1     $f0, 0x18($s0)
 .L80240ADC:
-/* A0331C 80240ADC 3C018024 */  lui       $at, 0x8024
-/* A03320 80240AE0 D4224620 */  ldc1      $f2, 0x4620($at)
+/* A0331C 80240ADC 3C018024 */  lui       $at, %hi(D_80244620)
+/* A03320 80240AE0 D4224620 */  ldc1      $f2, %lo(D_80244620)($at)
 /* A03324 80240AE4 44820000 */  mtc1      $v0, $f0
 /* A03328 80240AE8 00000000 */  nop       
 /* A0332C 80240AEC 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240B44_A03384.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240B44_A03384.s
index 3134bb23b5..f8ce314f57 100644
--- a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240B44_A03384.s
+++ b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240B44_A03384.s
@@ -104,8 +104,8 @@ glabel func_80240B44_A03384
 /* A03508 80240CC8 1040000A */  beqz      $v0, .L80240CF4
 /* A0350C 80240CCC 4600C106 */   mov.s    $f4, $f24
 /* A03510 80240CD0 4614C081 */  sub.s     $f2, $f24, $f20
-/* A03514 80240CD4 3C018024 */  lui       $at, 0x8024
-/* A03518 80240CD8 D4204628 */  ldc1      $f0, 0x4628($at)
+/* A03514 80240CD4 3C018024 */  lui       $at, %hi(D_80244628)
+/* A03518 80240CD8 D4204628 */  ldc1      $f0, %lo(D_80244628)($at)
 /* A0351C 80240CDC 460010A1 */  cvt.d.s   $f2, $f2
 /* A03520 80240CE0 46201082 */  mul.d     $f2, $f2, $f0
 /* A03524 80240CE4 00000000 */  nop       
@@ -131,8 +131,8 @@ glabel func_80240B44_A03384
 /* A03570 80240D30 C7A4002C */  lwc1      $f4, 0x2c($sp)
 /* A03574 80240D34 461A2100 */  add.s     $f4, $f4, $f26
 /* A03578 80240D38 46142081 */  sub.s     $f2, $f4, $f20
-/* A0357C 80240D3C 3C018024 */  lui       $at, 0x8024
-/* A03580 80240D40 D4204630 */  ldc1      $f0, 0x4630($at)
+/* A0357C 80240D3C 3C018024 */  lui       $at, %hi(D_80244630)
+/* A03580 80240D40 D4204630 */  ldc1      $f0, %lo(D_80244630)($at)
 /* A03584 80240D44 460010A1 */  cvt.d.s   $f2, $f2
 /* A03588 80240D48 46201082 */  mul.d     $f2, $f2, $f0
 /* A0358C 80240D4C 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802415E8_A03E28.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802415E8_A03E28.s
index 4552a284da..245dd6ea33 100644
--- a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802415E8_A03E28.s
+++ b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802415E8_A03E28.s
@@ -15,9 +15,9 @@ glabel func_802415E8_A03E28
 /* A03E50 80241610 00031C00 */  sll       $v1, $v1, 0x10
 /* A03E54 80241614 00031B83 */  sra       $v1, $v1, 0xe
 /* A03E58 80241618 A444008E */  sh        $a0, 0x8e($v0)
-/* A03E5C 8024161C 3C018024 */  lui       $at, 0x8024
+/* A03E5C 8024161C 3C018024 */  lui       $at, %hi(D_80243A18)
 /* A03E60 80241620 00230821 */  addu      $at, $at, $v1
-/* A03E64 80241624 C4223A18 */  lwc1      $f2, 0x3a18($at)
+/* A03E64 80241624 C4223A18 */  lwc1      $f2, %lo(D_80243A18)($at)
 /* A03E68 80241628 8443008E */  lh        $v1, 0x8e($v0)
 /* A03E6C 8024162C 46020000 */  add.s     $f0, $f0, $f2
 /* A03E70 80241630 28630005 */  slti      $v1, $v1, 5
diff --git a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241CA0_A044E0.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241CA0_A044E0.s
index 12884a8ecc..324066992e 100644
--- a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241CA0_A044E0.s
+++ b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241CA0_A044E0.s
@@ -66,9 +66,9 @@ glabel func_80241CA0_A044E0
 /* A045CC 80241D8C 2C62000F */  sltiu     $v0, $v1, 0xf
 /* A045D0 80241D90 10400034 */  beqz      $v0, .L80241E64
 /* A045D4 80241D94 00031080 */   sll      $v0, $v1, 2
-/* A045D8 80241D98 3C018024 */  lui       $at, 0x8024
+/* A045D8 80241D98 3C018024 */  lui       $at, %hi(D_80244638)
 /* A045DC 80241D9C 00220821 */  addu      $at, $at, $v0
-/* A045E0 80241DA0 8C224638 */  lw        $v0, 0x4638($at)
+/* A045E0 80241DA0 8C224638 */  lw        $v0, %lo(D_80244638)($at)
 /* A045E4 80241DA4 00400008 */  jr        $v0
 /* A045E8 80241DA8 00000000 */   nop      
 /* A045EC 80241DAC 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802421CC_A04A0C.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802421CC_A04A0C.s
index 40d8f3b597..ae5f820cb2 100644
--- a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802421CC_A04A0C.s
+++ b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802421CC_A04A0C.s
@@ -69,9 +69,9 @@ glabel func_802421CC_A04A0C
 /* A04B04 802422C4 2C620010 */  sltiu     $v0, $v1, 0x10
 /* A04B08 802422C8 1040004A */  beqz      $v0, .L802423F4
 /* A04B0C 802422CC 00031080 */   sll      $v0, $v1, 2
-/* A04B10 802422D0 3C018024 */  lui       $at, 0x8024
+/* A04B10 802422D0 3C018024 */  lui       $at, %hi(D_80244678)
 /* A04B14 802422D4 00220821 */  addu      $at, $at, $v0
-/* A04B18 802422D8 8C224678 */  lw        $v0, 0x4678($at)
+/* A04B18 802422D8 8C224678 */  lw        $v0, %lo(D_80244678)($at)
 /* A04B1C 802422DC 00400008 */  jr        $v0
 /* A04B20 802422E0 00000000 */   nop      
 /* A04B24 802422E4 0260202D */  daddu     $a0, $s3, $zero
diff --git a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_8024035C_A0725C.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_8024035C_A0725C.s
index a07481ba5b..2ce6e9b07c 100644
--- a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_8024035C_A0725C.s
+++ b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_8024035C_A0725C.s
@@ -55,8 +55,8 @@ glabel func_8024035C_A0725C
 /* A07318 80240418 8C470030 */   lw       $a3, 0x30($v0)
 /* A0731C 8024041C C6020018 */  lwc1      $f2, 0x18($s0)
 /* A07320 80240420 46020003 */  div.s     $f0, $f0, $f2
-/* A07324 80240424 3C018024 */  lui       $at, 0x8024
-/* A07328 80240428 D4224CF0 */  ldc1      $f2, 0x4cf0($at)
+/* A07324 80240424 3C018024 */  lui       $at, %hi(D_80244CF0)
+/* A07328 80240428 D4224CF0 */  ldc1      $f2, %lo(D_80244CF0)($at)
 /* A0732C 8024042C 46000021 */  cvt.d.s   $f0, $f0
 /* A07330 80240430 46220000 */  add.d     $f0, $f0, $f2
 /* A07334 80240434 4620010D */  trunc.w.d $f4, $f0
diff --git a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240674_A07574.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240674_A07574.s
index a7286e47c6..c31cf0ae6c 100644
--- a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240674_A07574.s
+++ b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240674_A07574.s
@@ -279,9 +279,9 @@ glabel func_80240674_A07574
 /* A07960 80240A60 2C620015 */  sltiu     $v0, $v1, 0x15
 /* A07964 80240A64 10400009 */  beqz      $v0, .L80240A8C
 /* A07968 80240A68 00031080 */   sll      $v0, $v1, 2
-/* A0796C 80240A6C 3C018024 */  lui       $at, 0x8024
+/* A0796C 80240A6C 3C018024 */  lui       $at, %hi(D_80244CF8)
 /* A07970 80240A70 00220821 */  addu      $at, $at, $v0
-/* A07974 80240A74 8C224CF8 */  lw        $v0, 0x4cf8($at)
+/* A07974 80240A74 8C224CF8 */  lw        $v0, %lo(D_80244CF8)($at)
 /* A07978 80240A78 00400008 */  jr        $v0
 /* A0797C 80240A7C 00000000 */   nop      
 /* A07980 80240A80 8E420028 */  lw        $v0, 0x28($s2)
diff --git a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240AB4_A079B4.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240AB4_A079B4.s
index 8641ec305b..b032ea45ca 100644
--- a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240AB4_A079B4.s
+++ b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240AB4_A079B4.s
@@ -87,8 +87,8 @@ glabel func_80240AB4_A079B4
 /* A07AF4 80240BF4 08090307 */  j         .L80240C1C
 /* A07AF8 80240BF8 E6000018 */   swc1     $f0, 0x18($s0)
 .L80240BFC:
-/* A07AFC 80240BFC 3C018024 */  lui       $at, 0x8024
-/* A07B00 80240C00 D4224D50 */  ldc1      $f2, 0x4d50($at)
+/* A07AFC 80240BFC 3C018024 */  lui       $at, %hi(D_80244D50)
+/* A07B00 80240C00 D4224D50 */  ldc1      $f2, %lo(D_80244D50)($at)
 /* A07B04 80240C04 44820000 */  mtc1      $v0, $f0
 /* A07B08 80240C08 00000000 */  nop       
 /* A07B0C 80240C0C 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240C64_A07B64.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240C64_A07B64.s
index a7f58380af..c001a8de6f 100644
--- a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240C64_A07B64.s
+++ b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240C64_A07B64.s
@@ -104,8 +104,8 @@ glabel func_80240C64_A07B64
 /* A07CE8 80240DE8 1040000A */  beqz      $v0, .L80240E14
 /* A07CEC 80240DEC 4600C106 */   mov.s    $f4, $f24
 /* A07CF0 80240DF0 4614C081 */  sub.s     $f2, $f24, $f20
-/* A07CF4 80240DF4 3C018024 */  lui       $at, 0x8024
-/* A07CF8 80240DF8 D4204D58 */  ldc1      $f0, 0x4d58($at)
+/* A07CF4 80240DF4 3C018024 */  lui       $at, %hi(D_80244D58)
+/* A07CF8 80240DF8 D4204D58 */  ldc1      $f0, %lo(D_80244D58)($at)
 /* A07CFC 80240DFC 460010A1 */  cvt.d.s   $f2, $f2
 /* A07D00 80240E00 46201082 */  mul.d     $f2, $f2, $f0
 /* A07D04 80240E04 00000000 */  nop       
@@ -131,8 +131,8 @@ glabel func_80240C64_A07B64
 /* A07D50 80240E50 C7A4002C */  lwc1      $f4, 0x2c($sp)
 /* A07D54 80240E54 461A2100 */  add.s     $f4, $f4, $f26
 /* A07D58 80240E58 46142081 */  sub.s     $f2, $f4, $f20
-/* A07D5C 80240E5C 3C018024 */  lui       $at, 0x8024
-/* A07D60 80240E60 D4204D60 */  ldc1      $f0, 0x4d60($at)
+/* A07D5C 80240E5C 3C018024 */  lui       $at, %hi(D_80244D60)
+/* A07D60 80240E60 D4204D60 */  ldc1      $f0, %lo(D_80244D60)($at)
 /* A07D64 80240E64 460010A1 */  cvt.d.s   $f2, $f2
 /* A07D68 80240E68 46201082 */  mul.d     $f2, $f2, $f0
 /* A07D6C 80240E6C 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241708_A08608.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241708_A08608.s
index d6f125cea8..0e968ae4cb 100644
--- a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241708_A08608.s
+++ b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241708_A08608.s
@@ -15,9 +15,9 @@ glabel func_80241708_A08608
 /* A08630 80241730 00031C00 */  sll       $v1, $v1, 0x10
 /* A08634 80241734 00031B83 */  sra       $v1, $v1, 0xe
 /* A08638 80241738 A444008E */  sh        $a0, 0x8e($v0)
-/* A0863C 8024173C 3C018024 */  lui       $at, 0x8024
+/* A0863C 8024173C 3C018024 */  lui       $at, %hi(D_80243D5C)
 /* A08640 80241740 00230821 */  addu      $at, $at, $v1
-/* A08644 80241744 C4223D5C */  lwc1      $f2, 0x3d5c($at)
+/* A08644 80241744 C4223D5C */  lwc1      $f2, %lo(D_80243D5C)($at)
 /* A08648 80241748 8443008E */  lh        $v1, 0x8e($v0)
 /* A0864C 8024174C 46020000 */  add.s     $f0, $f0, $f2
 /* A08650 80241750 28630005 */  slti      $v1, $v1, 5
diff --git a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241DC0_A08CC0.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241DC0_A08CC0.s
index bfa65b38a1..781f2809ca 100644
--- a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241DC0_A08CC0.s
+++ b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241DC0_A08CC0.s
@@ -66,9 +66,9 @@ glabel func_80241DC0_A08CC0
 /* A08DAC 80241EAC 2C62000F */  sltiu     $v0, $v1, 0xf
 /* A08DB0 80241EB0 10400034 */  beqz      $v0, .L80241F84
 /* A08DB4 80241EB4 00031080 */   sll      $v0, $v1, 2
-/* A08DB8 80241EB8 3C018024 */  lui       $at, 0x8024
+/* A08DB8 80241EB8 3C018024 */  lui       $at, %hi(D_80244D68)
 /* A08DBC 80241EBC 00220821 */  addu      $at, $at, $v0
-/* A08DC0 80241EC0 8C224D68 */  lw        $v0, 0x4d68($at)
+/* A08DC0 80241EC0 8C224D68 */  lw        $v0, %lo(D_80244D68)($at)
 /* A08DC4 80241EC4 00400008 */  jr        $v0
 /* A08DC8 80241EC8 00000000 */   nop      
 /* A08DCC 80241ECC 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802422EC_A091EC.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802422EC_A091EC.s
index 25d4fbbf9d..3a80426cc1 100644
--- a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802422EC_A091EC.s
+++ b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802422EC_A091EC.s
@@ -69,9 +69,9 @@ glabel func_802422EC_A091EC
 /* A092E4 802423E4 2C620010 */  sltiu     $v0, $v1, 0x10
 /* A092E8 802423E8 1040004A */  beqz      $v0, .L80242514
 /* A092EC 802423EC 00031080 */   sll      $v0, $v1, 2
-/* A092F0 802423F0 3C018024 */  lui       $at, 0x8024
+/* A092F0 802423F0 3C018024 */  lui       $at, %hi(D_80244DA8)
 /* A092F4 802423F4 00220821 */  addu      $at, $at, $v0
-/* A092F8 802423F8 8C224DA8 */  lw        $v0, 0x4da8($at)
+/* A092F8 802423F8 8C224DA8 */  lw        $v0, %lo(D_80244DA8)($at)
 /* A092FC 802423FC 00400008 */  jr        $v0
 /* A09300 80242400 00000000 */   nop      
 /* A09304 80242404 0260202D */  daddu     $a0, $s3, $zero
diff --git a/asm/nonmatchings/world/area_obk/obk_01/BBD1A0/func_80240038_BBD1D8.s b/asm/nonmatchings/world/area_obk/obk_01/BBD1A0/func_80240038_BBD1D8.s
index 3d32de06d5..de1cd69492 100644
--- a/asm/nonmatchings/world/area_obk/obk_01/BBD1A0/func_80240038_BBD1D8.s
+++ b/asm/nonmatchings/world/area_obk/obk_01/BBD1A0/func_80240038_BBD1D8.s
@@ -15,7 +15,7 @@ glabel func_80240038_BBD1D8
 /* BBD200 80240060 46800020 */  cvt.s.w   $f0, $f0
 /* BBD204 80240064 8FBF0010 */  lw        $ra, 0x10($sp)
 /* BBD208 80240068 24020002 */  addiu     $v0, $zero, 2
-/* BBD20C 8024006C 3C01800B */  lui       $at, 0x800b
-/* BBD210 80240070 E4201D98 */  swc1      $f0, 0x1d98($at)
+/* BBD20C 8024006C 3C01800B */  lui       $at, %hi(D_800B1D98)
+/* BBD210 80240070 E4201D98 */  swc1      $f0, %lo(D_800B1D98)($at)
 /* BBD214 80240074 03E00008 */  jr        $ra
 /* BBD218 80240078 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_obk/obk_01/BBD1A0/func_80240098_BBD238.s b/asm/nonmatchings/world/area_obk/obk_01/BBD1A0/func_80240098_BBD238.s
index 6efbf003b8..d279883618 100644
--- a/asm/nonmatchings/world/area_obk/obk_01/BBD1A0/func_80240098_BBD238.s
+++ b/asm/nonmatchings/world/area_obk/obk_01/BBD1A0/func_80240098_BBD238.s
@@ -24,8 +24,8 @@ glabel func_80240098_BBD238
 /* BBD284 802400E4 0000982D */  daddu     $s3, $zero, $zero
 /* BBD288 802400E8 AE910074 */  sw        $s1, 0x74($s4)
 /* BBD28C 802400EC 8E050000 */  lw        $a1, ($s0)
-/* BBD290 802400F0 3C108024 */  lui       $s0, 0x8024
-/* BBD294 802400F4 26101C58 */  addiu     $s0, $s0, 0x1c58
+/* BBD290 802400F0 3C108024 */  lui       $s0, %hi(D_80241C58)
+/* BBD294 802400F4 26101C58 */  addiu     $s0, $s0, %lo(D_80241C58)
 /* BBD298 802400F8 0C0B1EAF */  jal       get_variable
 /* BBD29C 802400FC 0220902D */   daddu    $s2, $s1, $zero
 /* BBD2A0 80240100 AE220008 */  sw        $v0, 8($s1)
@@ -77,9 +77,9 @@ glabel func_80240098_BBD238
 /* BBD34C 802401AC 2C62000C */  sltiu     $v0, $v1, 0xc
 /* BBD350 802401B0 10400076 */  beqz      $v0, .L8024038C
 /* BBD354 802401B4 00031080 */   sll      $v0, $v1, 2
-/* BBD358 802401B8 3C018024 */  lui       $at, 0x8024
+/* BBD358 802401B8 3C018024 */  lui       $at, %hi(D_802458C0)
 /* BBD35C 802401BC 00220821 */  addu      $at, $at, $v0
-/* BBD360 802401C0 8C2258C0 */  lw        $v0, 0x58c0($at)
+/* BBD360 802401C0 8C2258C0 */  lw        $v0, %lo(D_802458C0)($at)
 /* BBD364 802401C4 00400008 */  jr        $v0
 /* BBD368 802401C8 00000000 */   nop      
 /* BBD36C 802401CC 8E220008 */  lw        $v0, 8($s1)
diff --git a/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_802407E0_BBD980.s b/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_802407E0_BBD980.s
index 52c42ec114..add37d95ed 100644
--- a/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_802407E0_BBD980.s
+++ b/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_802407E0_BBD980.s
@@ -4,8 +4,8 @@
 glabel func_802407E0_BBD980
 /* BBD980 802407E0 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* BBD984 802407E4 AFB00010 */  sw        $s0, 0x10($sp)
-/* BBD988 802407E8 3C108024 */  lui       $s0, 0x8024
-/* BBD98C 802407EC 261040F0 */  addiu     $s0, $s0, 0x40f0
+/* BBD988 802407E8 3C108024 */  lui       $s0, %hi(D_802440F0)
+/* BBD98C 802407EC 261040F0 */  addiu     $s0, $s0, %lo(D_802440F0)
 /* BBD990 802407F0 AFBF0018 */  sw        $ra, 0x18($sp)
 /* BBD994 802407F4 AFB10014 */  sw        $s1, 0x14($sp)
 /* BBD998 802407F8 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_802407E0_BBD980
 /* BBD9FC 8024085C 28620010 */  slti      $v0, $v1, 0x10
 /* BBDA00 80240860 1440FFFA */  bnez      $v0, .L8024084C
 /* BBDA04 80240864 24840004 */   addiu    $a0, $a0, 4
-/* BBDA08 80240868 3C108024 */  lui       $s0, 0x8024
-/* BBDA0C 8024086C 261040F0 */  addiu     $s0, $s0, 0x40f0
+/* BBDA08 80240868 3C108024 */  lui       $s0, %hi(D_802440F0)
+/* BBDA0C 8024086C 261040F0 */  addiu     $s0, $s0, %lo(D_802440F0)
 /* BBDA10 80240870 0C00AB4B */  jal       heap_free
 /* BBDA14 80240874 8E040000 */   lw       $a0, ($s0)
 /* BBDA18 80240878 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240B24_BBDCC4.s b/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240B24_BBDCC4.s
index bc1cbb53a1..7897d52226 100644
--- a/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240B24_BBDCC4.s
+++ b/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240B24_BBDCC4.s
@@ -6,11 +6,11 @@ glabel func_80240B24_BBDCC4
 /* BBDCC8 80240B28 AFBF0010 */  sw        $ra, 0x10($sp)
 /* BBDCCC 80240B2C 10A00003 */  beqz      $a1, .L80240B3C
 /* BBDCD0 80240B30 8C86000C */   lw       $a2, 0xc($a0)
-/* BBDCD4 80240B34 3C018024 */  lui       $at, 0x8024
-/* BBDCD8 80240B38 AC204154 */  sw        $zero, 0x4154($at)
+/* BBDCD4 80240B34 3C018024 */  lui       $at, %hi(D_80244154)
+/* BBDCD8 80240B38 AC204154 */  sw        $zero, %lo(D_80244154)($at)
 .L80240B3C:
-/* BBDCDC 80240B3C 3C038024 */  lui       $v1, 0x8024
-/* BBDCE0 80240B40 24634154 */  addiu     $v1, $v1, 0x4154
+/* BBDCDC 80240B3C 3C038024 */  lui       $v1, %hi(D_80244154)
+/* BBDCE0 80240B40 24634154 */  addiu     $v1, $v1, %lo(D_80244154)
 /* BBDCE4 80240B44 8C620000 */  lw        $v0, ($v1)
 /* BBDCE8 80240B48 54400003 */  bnel      $v0, $zero, .L80240B58
 /* BBDCEC 80240B4C AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_80240B24_BBDCC4
 /* BBDCF4 80240B54 0000102D */   daddu    $v0, $zero, $zero
 .L80240B58:
 /* BBDCF8 80240B58 8CC50000 */  lw        $a1, ($a2)
-/* BBDCFC 80240B5C 3C068024 */  lui       $a2, 0x8024
+/* BBDCFC 80240B5C 3C068024 */  lui       $a2, %hi(D_80244158)
 /* BBDD00 80240B60 0C0B2026 */  jal       set_variable
-/* BBDD04 80240B64 8CC64158 */   lw       $a2, 0x4158($a2)
+/* BBDD04 80240B64 8CC64158 */   lw       $a2, %lo(D_80244158)($a2)
 /* BBDD08 80240B68 24020002 */  addiu     $v0, $zero, 2
 .L80240B6C:
 /* BBDD0C 80240B6C 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240B78_BBDD18.s b/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240B78_BBDD18.s
index 6bd28a215c..93ec8d9ea2 100644
--- a/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240B78_BBDD18.s
+++ b/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240B78_BBDD18.s
@@ -7,12 +7,12 @@ glabel func_80240B78_BBDD18
 /* BBDD20 80240B80 8C82000C */  lw        $v0, 0xc($a0)
 /* BBDD24 80240B84 0C0B1EAF */  jal       get_variable
 /* BBDD28 80240B88 8C450000 */   lw       $a1, ($v0)
-/* BBDD2C 80240B8C 3C018024 */  lui       $at, 0x8024
-/* BBDD30 80240B90 AC224158 */  sw        $v0, 0x4158($at)
+/* BBDD2C 80240B8C 3C018024 */  lui       $at, %hi(D_80244158)
+/* BBDD30 80240B90 AC224158 */  sw        $v0, %lo(D_80244158)($at)
 /* BBDD34 80240B94 24020002 */  addiu     $v0, $zero, 2
 /* BBDD38 80240B98 8FBF0010 */  lw        $ra, 0x10($sp)
 /* BBDD3C 80240B9C 24030001 */  addiu     $v1, $zero, 1
-/* BBDD40 80240BA0 3C018024 */  lui       $at, 0x8024
-/* BBDD44 80240BA4 AC234154 */  sw        $v1, 0x4154($at)
+/* BBDD40 80240BA0 3C018024 */  lui       $at, %hi(D_80244154)
+/* BBDD44 80240BA4 AC234154 */  sw        $v1, %lo(D_80244154)($at)
 /* BBDD48 80240BA8 03E00008 */  jr        $ra
 /* BBDD4C 80240BAC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240BB0_BBDD50.s b/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240BB0_BBDD50.s
index a263d867d1..664bd4576a 100644
--- a/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240BB0_BBDD50.s
+++ b/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240BB0_BBDD50.s
@@ -13,8 +13,8 @@ glabel func_80240BB0_BBDD50
 /* BBDD70 80240BD0 8C620000 */  lw        $v0, ($v1)
 /* BBDD74 80240BD4 5040000A */  beql      $v0, $zero, .L80240C00
 /* BBDD78 80240BD8 00041080 */   sll      $v0, $a0, 2
-/* BBDD7C 80240BDC 3C058024 */  lui       $a1, 0x8024
-/* BBDD80 80240BE0 24A558F0 */  addiu     $a1, $a1, 0x58f0
+/* BBDD7C 80240BDC 3C058024 */  lui       $a1, %hi(D_802458F0)
+/* BBDD80 80240BE0 24A558F0 */  addiu     $a1, $a1, %lo(D_802458F0)
 .L80240BE4:
 /* BBDD84 80240BE4 24630004 */  addiu     $v1, $v1, 4
 /* BBDD88 80240BE8 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_80240BB0_BBDD50
 /* BBDD98 80240BF8 24A50004 */   addiu    $a1, $a1, 4
 /* BBDD9C 80240BFC 00041080 */  sll       $v0, $a0, 2
 .L80240C00:
-/* BBDDA0 80240C00 3C018024 */  lui       $at, 0x8024
+/* BBDDA0 80240C00 3C018024 */  lui       $at, %hi(D_802458F0)
 /* BBDDA4 80240C04 00220821 */  addu      $at, $at, $v0
-/* BBDDA8 80240C08 AC2058F0 */  sw        $zero, 0x58f0($at)
+/* BBDDA8 80240C08 AC2058F0 */  sw        $zero, %lo(D_802458F0)($at)
 /* BBDDAC 80240C0C 0809030F */  j         .L80240C3C
 /* BBDDB0 80240C10 00000000 */   nop      
 .L80240C14:
-/* BBDDB4 80240C14 3C038024 */  lui       $v1, 0x8024
-/* BBDDB8 80240C18 246358F0 */  addiu     $v1, $v1, 0x58f0
+/* BBDDB4 80240C14 3C038024 */  lui       $v1, %hi(D_802458F0)
+/* BBDDB8 80240C18 246358F0 */  addiu     $v1, $v1, %lo(D_802458F0)
 /* BBDDBC 80240C1C 0060282D */  daddu     $a1, $v1, $zero
 .L80240C20:
 /* BBDDC0 80240C20 24820010 */  addiu     $v0, $a0, 0x10
diff --git a/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240EC8_BBE068.s b/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240EC8_BBE068.s
index 813d83659b..daead94852 100644
--- a/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240EC8_BBE068.s
+++ b/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240EC8_BBE068.s
@@ -15,7 +15,7 @@ glabel func_80240EC8_BBE068
 /* BBE090 80240EF0 8FBF0014 */  lw        $ra, 0x14($sp)
 /* BBE094 80240EF4 8FB00010 */  lw        $s0, 0x10($sp)
 /* BBE098 80240EF8 24020002 */  addiu     $v0, $zero, 2
-/* BBE09C 80240EFC 3C018024 */  lui       $at, 0x8024
-/* BBE0A0 80240F00 AC235AB4 */  sw        $v1, 0x5ab4($at)
+/* BBE09C 80240EFC 3C018024 */  lui       $at, %hi(D_80245AB4)
+/* BBE0A0 80240F00 AC235AB4 */  sw        $v1, %lo(D_80245AB4)($at)
 /* BBE0A4 80240F04 03E00008 */  jr        $ra
 /* BBE0A8 80240F08 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240F0C_BBE0AC.s b/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240F0C_BBE0AC.s
index 3753ac5355..e1ea491f0d 100644
--- a/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240F0C_BBE0AC.s
+++ b/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240F0C_BBE0AC.s
@@ -6,8 +6,8 @@ glabel func_80240F0C_BBE0AC
 /* BBE0B0 80240F10 AFBF0010 */  sw        $ra, 0x10($sp)
 /* BBE0B4 80240F14 0C00EABB */  jal       get_npc_unsafe
 /* BBE0B8 80240F18 8C84008C */   lw       $a0, 0x8c($a0)
-/* BBE0BC 80240F1C 3C038024 */  lui       $v1, 0x8024
-/* BBE0C0 80240F20 8C635AB4 */  lw        $v1, 0x5ab4($v1)
+/* BBE0BC 80240F1C 3C038024 */  lui       $v1, %hi(D_80245AB4)
+/* BBE0C0 80240F20 8C635AB4 */  lw        $v1, %lo(D_80245AB4)($v1)
 /* BBE0C4 80240F24 AC430028 */  sw        $v1, 0x28($v0)
 /* BBE0C8 80240F28 8FBF0010 */  lw        $ra, 0x10($sp)
 /* BBE0CC 80240F2C 24020002 */  addiu     $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80241094_BBE234.s b/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80241094_BBE234.s
index 6be26cc46b..9d376fa1f0 100644
--- a/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80241094_BBE234.s
+++ b/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80241094_BBE234.s
@@ -13,9 +13,9 @@ glabel func_80241094_BBE234
 /* BBE254 802410B4 0C00A67F */  jal       rand_int
 /* BBE258 802410B8 24040003 */   addiu    $a0, $zero, 3
 /* BBE25C 802410BC 00021040 */  sll       $v0, $v0, 1
-/* BBE260 802410C0 3C018024 */  lui       $at, 0x8024
+/* BBE260 802410C0 3C018024 */  lui       $at, %hi(D_80244A54)
 /* BBE264 802410C4 00220821 */  addu      $at, $at, $v0
-/* BBE268 802410C8 84224A54 */  lh        $v0, 0x4a54($at)
+/* BBE268 802410C8 84224A54 */  lh        $v0, %lo(D_80244A54)($at)
 /* BBE26C 802410CC 24040032 */  addiu     $a0, $zero, 0x32
 /* BBE270 802410D0 0C00A67F */  jal       rand_int
 /* BBE274 802410D4 AE220078 */   sw       $v0, 0x78($s1)
diff --git a/asm/nonmatchings/world/area_obk/obk_02/BC2A90/func_80240194_BC2C24.s b/asm/nonmatchings/world/area_obk/obk_02/BC2A90/func_80240194_BC2C24.s
index e5dddc3ca0..6327f2d536 100644
--- a/asm/nonmatchings/world/area_obk/obk_02/BC2A90/func_80240194_BC2C24.s
+++ b/asm/nonmatchings/world/area_obk/obk_02/BC2A90/func_80240194_BC2C24.s
@@ -13,9 +13,9 @@ glabel func_80240194_BC2C24
 /* BC2C44 802401B4 0C00A67F */  jal       rand_int
 /* BC2C48 802401B8 24040003 */   addiu    $a0, $zero, 3
 /* BC2C4C 802401BC 00021040 */  sll       $v0, $v0, 1
-/* BC2C50 802401C0 3C018024 */  lui       $at, 0x8024
+/* BC2C50 802401C0 3C018024 */  lui       $at, %hi(D_80240CBC)
 /* BC2C54 802401C4 00220821 */  addu      $at, $at, $v0
-/* BC2C58 802401C8 84220CBC */  lh        $v0, 0xcbc($at)
+/* BC2C58 802401C8 84220CBC */  lh        $v0, %lo(D_80240CBC)($at)
 /* BC2C5C 802401CC 24040032 */  addiu     $a0, $zero, 0x32
 /* BC2C60 802401D0 0C00A67F */  jal       rand_int
 /* BC2C64 802401D4 AE220078 */   sw       $v0, 0x78($s1)
diff --git a/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_80240170_BC43F0.s b/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_80240170_BC43F0.s
index 9c1382757b..a34d0fd3eb 100644
--- a/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_80240170_BC43F0.s
+++ b/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_80240170_BC43F0.s
@@ -4,8 +4,8 @@
 glabel func_80240170_BC43F0
 /* BC43F0 80240170 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* BC43F4 80240174 AFB00010 */  sw        $s0, 0x10($sp)
-/* BC43F8 80240178 3C108024 */  lui       $s0, 0x8024
-/* BC43FC 8024017C 26102ECC */  addiu     $s0, $s0, 0x2ecc
+/* BC43F8 80240178 3C108024 */  lui       $s0, %hi(D_80242ECC)
+/* BC43FC 8024017C 26102ECC */  addiu     $s0, $s0, %lo(D_80242ECC)
 /* BC4400 80240180 AFBF0018 */  sw        $ra, 0x18($sp)
 /* BC4404 80240184 AFB10014 */  sw        $s1, 0x14($sp)
 /* BC4408 80240188 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_80240170_BC43F0
 /* BC446C 802401EC 28620010 */  slti      $v0, $v1, 0x10
 /* BC4470 802401F0 1440FFFA */  bnez      $v0, .L802401DC
 /* BC4474 802401F4 24840004 */   addiu    $a0, $a0, 4
-/* BC4478 802401F8 3C108024 */  lui       $s0, 0x8024
-/* BC447C 802401FC 26102ECC */  addiu     $s0, $s0, 0x2ecc
+/* BC4478 802401F8 3C108024 */  lui       $s0, %hi(D_80242ECC)
+/* BC447C 802401FC 26102ECC */  addiu     $s0, $s0, %lo(D_80242ECC)
 /* BC4480 80240200 0C00AB4B */  jal       heap_free
 /* BC4484 80240204 8E040000 */   lw       $a0, ($s0)
 /* BC4488 80240208 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_802404B4_BC4734.s b/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_802404B4_BC4734.s
index d1329574e9..e595851c1b 100644
--- a/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_802404B4_BC4734.s
+++ b/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_802404B4_BC4734.s
@@ -6,11 +6,11 @@ glabel func_802404B4_BC4734
 /* BC4738 802404B8 AFBF0010 */  sw        $ra, 0x10($sp)
 /* BC473C 802404BC 10A00003 */  beqz      $a1, .L802404CC
 /* BC4740 802404C0 8C86000C */   lw       $a2, 0xc($a0)
-/* BC4744 802404C4 3C018024 */  lui       $at, 0x8024
-/* BC4748 802404C8 AC202F30 */  sw        $zero, 0x2f30($at)
+/* BC4744 802404C4 3C018024 */  lui       $at, %hi(D_80242F30)
+/* BC4748 802404C8 AC202F30 */  sw        $zero, %lo(D_80242F30)($at)
 .L802404CC:
-/* BC474C 802404CC 3C038024 */  lui       $v1, 0x8024
-/* BC4750 802404D0 24632F30 */  addiu     $v1, $v1, 0x2f30
+/* BC474C 802404CC 3C038024 */  lui       $v1, %hi(D_80242F30)
+/* BC4750 802404D0 24632F30 */  addiu     $v1, $v1, %lo(D_80242F30)
 /* BC4754 802404D4 8C620000 */  lw        $v0, ($v1)
 /* BC4758 802404D8 54400003 */  bnel      $v0, $zero, .L802404E8
 /* BC475C 802404DC AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_802404B4_BC4734
 /* BC4764 802404E4 0000102D */   daddu    $v0, $zero, $zero
 .L802404E8:
 /* BC4768 802404E8 8CC50000 */  lw        $a1, ($a2)
-/* BC476C 802404EC 3C068024 */  lui       $a2, 0x8024
+/* BC476C 802404EC 3C068024 */  lui       $a2, %hi(D_80242F34)
 /* BC4770 802404F0 0C0B2026 */  jal       set_variable
-/* BC4774 802404F4 8CC62F34 */   lw       $a2, 0x2f34($a2)
+/* BC4774 802404F4 8CC62F34 */   lw       $a2, %lo(D_80242F34)($a2)
 /* BC4778 802404F8 24020002 */  addiu     $v0, $zero, 2
 .L802404FC:
 /* BC477C 802404FC 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_80240508_BC4788.s b/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_80240508_BC4788.s
index 4418299a2e..791b04f52b 100644
--- a/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_80240508_BC4788.s
+++ b/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_80240508_BC4788.s
@@ -7,12 +7,12 @@ glabel func_80240508_BC4788
 /* BC4790 80240510 8C82000C */  lw        $v0, 0xc($a0)
 /* BC4794 80240514 0C0B1EAF */  jal       get_variable
 /* BC4798 80240518 8C450000 */   lw       $a1, ($v0)
-/* BC479C 8024051C 3C018024 */  lui       $at, 0x8024
-/* BC47A0 80240520 AC222F34 */  sw        $v0, 0x2f34($at)
+/* BC479C 8024051C 3C018024 */  lui       $at, %hi(D_80242F34)
+/* BC47A0 80240520 AC222F34 */  sw        $v0, %lo(D_80242F34)($at)
 /* BC47A4 80240524 24020002 */  addiu     $v0, $zero, 2
 /* BC47A8 80240528 8FBF0010 */  lw        $ra, 0x10($sp)
 /* BC47AC 8024052C 24030001 */  addiu     $v1, $zero, 1
-/* BC47B0 80240530 3C018024 */  lui       $at, 0x8024
-/* BC47B4 80240534 AC232F30 */  sw        $v1, 0x2f30($at)
+/* BC47B0 80240530 3C018024 */  lui       $at, %hi(D_80242F30)
+/* BC47B4 80240534 AC232F30 */  sw        $v1, %lo(D_80242F30)($at)
 /* BC47B8 80240538 03E00008 */  jr        $ra
 /* BC47BC 8024053C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_80240540_BC47C0.s b/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_80240540_BC47C0.s
index 71a654dd54..1d27668d60 100644
--- a/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_80240540_BC47C0.s
+++ b/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_80240540_BC47C0.s
@@ -13,8 +13,8 @@ glabel func_80240540_BC47C0
 /* BC47E0 80240560 8C620000 */  lw        $v0, ($v1)
 /* BC47E4 80240564 5040000A */  beql      $v0, $zero, .L80240590
 /* BC47E8 80240568 00041080 */   sll      $v0, $a0, 2
-/* BC47EC 8024056C 3C058024 */  lui       $a1, 0x8024
-/* BC47F0 80240570 24A53BE0 */  addiu     $a1, $a1, 0x3be0
+/* BC47EC 8024056C 3C058024 */  lui       $a1, %hi(D_80243BE0)
+/* BC47F0 80240570 24A53BE0 */  addiu     $a1, $a1, %lo(D_80243BE0)
 .L80240574:
 /* BC47F4 80240574 24630004 */  addiu     $v1, $v1, 4
 /* BC47F8 80240578 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_80240540_BC47C0
 /* BC4808 80240588 24A50004 */   addiu    $a1, $a1, 4
 /* BC480C 8024058C 00041080 */  sll       $v0, $a0, 2
 .L80240590:
-/* BC4810 80240590 3C018024 */  lui       $at, 0x8024
+/* BC4810 80240590 3C018024 */  lui       $at, %hi(D_80243BE0)
 /* BC4814 80240594 00220821 */  addu      $at, $at, $v0
-/* BC4818 80240598 AC203BE0 */  sw        $zero, 0x3be0($at)
+/* BC4818 80240598 AC203BE0 */  sw        $zero, %lo(D_80243BE0)($at)
 /* BC481C 8024059C 08090173 */  j         .L802405CC
 /* BC4820 802405A0 00000000 */   nop      
 .L802405A4:
-/* BC4824 802405A4 3C038024 */  lui       $v1, 0x8024
-/* BC4828 802405A8 24633BE0 */  addiu     $v1, $v1, 0x3be0
+/* BC4824 802405A4 3C038024 */  lui       $v1, %hi(D_80243BE0)
+/* BC4828 802405A8 24633BE0 */  addiu     $v1, $v1, %lo(D_80243BE0)
 /* BC482C 802405AC 0060282D */  daddu     $a1, $v1, $zero
 .L802405B0:
 /* BC4830 802405B0 24820010 */  addiu     $v0, $a0, 0x10
diff --git a/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_80240858_BC4AD8.s b/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_80240858_BC4AD8.s
index 5d7237fd30..0059b995b5 100644
--- a/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_80240858_BC4AD8.s
+++ b/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_80240858_BC4AD8.s
@@ -15,7 +15,7 @@ glabel func_80240858_BC4AD8
 /* BC4B00 80240880 8FBF0014 */  lw        $ra, 0x14($sp)
 /* BC4B04 80240884 8FB00010 */  lw        $s0, 0x10($sp)
 /* BC4B08 80240888 24020002 */  addiu     $v0, $zero, 2
-/* BC4B0C 8024088C 3C018024 */  lui       $at, 0x8024
-/* BC4B10 80240890 AC233DA4 */  sw        $v1, 0x3da4($at)
+/* BC4B0C 8024088C 3C018024 */  lui       $at, %hi(D_80243DA4)
+/* BC4B10 80240890 AC233DA4 */  sw        $v1, %lo(D_80243DA4)($at)
 /* BC4B14 80240894 03E00008 */  jr        $ra
 /* BC4B18 80240898 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_8024089C_BC4B1C.s b/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_8024089C_BC4B1C.s
index a628edd689..f5db21f426 100644
--- a/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_8024089C_BC4B1C.s
+++ b/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_8024089C_BC4B1C.s
@@ -6,8 +6,8 @@ glabel func_8024089C_BC4B1C
 /* BC4B20 802408A0 AFBF0010 */  sw        $ra, 0x10($sp)
 /* BC4B24 802408A4 0C00EABB */  jal       get_npc_unsafe
 /* BC4B28 802408A8 8C84008C */   lw       $a0, 0x8c($a0)
-/* BC4B2C 802408AC 3C038024 */  lui       $v1, 0x8024
-/* BC4B30 802408B0 8C633DA4 */  lw        $v1, 0x3da4($v1)
+/* BC4B2C 802408AC 3C038024 */  lui       $v1, %hi(D_80243DA4)
+/* BC4B30 802408B0 8C633DA4 */  lw        $v1, %lo(D_80243DA4)($v1)
 /* BC4B34 802408B4 AC430028 */  sw        $v1, 0x28($v0)
 /* BC4B38 802408B8 8FBF0010 */  lw        $ra, 0x10($sp)
 /* BC4B3C 802408BC 24020002 */  addiu     $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_obk/obk_03/BC4B50/func_802408D0_BC4B50.s b/asm/nonmatchings/world/area_obk/obk_03/BC4B50/func_802408D0_BC4B50.s
index 42b80e873c..cbe7f8fa56 100644
--- a/asm/nonmatchings/world/area_obk/obk_03/BC4B50/func_802408D0_BC4B50.s
+++ b/asm/nonmatchings/world/area_obk/obk_03/BC4B50/func_802408D0_BC4B50.s
@@ -98,8 +98,8 @@ glabel func_802408D0_BC4B50
 /* BC4CA8 80240A28 4500000D */  bc1f      .L80240A60
 /* BC4CAC 80240A2C 00000000 */   nop      
 /* BC4CB0 80240A30 C6600028 */  lwc1      $f0, 0x28($s3)
-/* BC4CB4 80240A34 3C018024 */  lui       $at, 0x8024
-/* BC4CB8 80240A38 D4223BD0 */  ldc1      $f2, 0x3bd0($at)
+/* BC4CB4 80240A34 3C018024 */  lui       $at, %hi(D_80243BD0)
+/* BC4CB8 80240A38 D4223BD0 */  ldc1      $f2, %lo(D_80243BD0)($at)
 /* BC4CBC 80240A3C 46000021 */  cvt.d.s   $f0, $f0
 /* BC4CC0 80240A40 46201081 */  sub.d     $f2, $f2, $f0
 /* BC4CC4 80240A44 3C014348 */  lui       $at, 0x4348
@@ -117,8 +117,8 @@ glabel func_802408D0_BC4B50
 /* BC4CF0 80240A70 E6200004 */  swc1      $f0, 4($s1)
 .L80240A74:
 /* BC4CF4 80240A74 C6600028 */  lwc1      $f0, 0x28($s3)
-/* BC4CF8 80240A78 3C018024 */  lui       $at, 0x8024
-/* BC4CFC 80240A7C D4243BD8 */  ldc1      $f4, 0x3bd8($at)
+/* BC4CF8 80240A78 3C018024 */  lui       $at, %hi(D_80243BD8)
+/* BC4CFC 80240A7C D4243BD8 */  ldc1      $f4, %lo(D_80243BD8)($at)
 /* BC4D00 80240A80 46000021 */  cvt.d.s   $f0, $f0
 /* BC4D04 80240A84 4624003E */  c.le.d    $f0, $f4
 /* BC4D08 80240A88 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240940_BC87A0.s b/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240940_BC87A0.s
index 7ad09025c8..86581c8ff1 100644
--- a/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240940_BC87A0.s
+++ b/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240940_BC87A0.s
@@ -4,8 +4,8 @@
 glabel func_80240940_BC87A0
 /* BC87A0 80240940 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* BC87A4 80240944 AFB00010 */  sw        $s0, 0x10($sp)
-/* BC87A8 80240948 3C108024 */  lui       $s0, 0x8024
-/* BC87AC 8024094C 26103A10 */  addiu     $s0, $s0, 0x3a10
+/* BC87A8 80240948 3C108024 */  lui       $s0, %hi(D_80243A10)
+/* BC87AC 8024094C 26103A10 */  addiu     $s0, $s0, %lo(D_80243A10)
 /* BC87B0 80240950 AFBF0018 */  sw        $ra, 0x18($sp)
 /* BC87B4 80240954 AFB10014 */  sw        $s1, 0x14($sp)
 /* BC87B8 80240958 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_80240940_BC87A0
 /* BC881C 802409BC 28620010 */  slti      $v0, $v1, 0x10
 /* BC8820 802409C0 1440FFFA */  bnez      $v0, .L802409AC
 /* BC8824 802409C4 24840004 */   addiu    $a0, $a0, 4
-/* BC8828 802409C8 3C108024 */  lui       $s0, 0x8024
-/* BC882C 802409CC 26103A10 */  addiu     $s0, $s0, 0x3a10
+/* BC8828 802409C8 3C108024 */  lui       $s0, %hi(D_80243A10)
+/* BC882C 802409CC 26103A10 */  addiu     $s0, $s0, %lo(D_80243A10)
 /* BC8830 802409D0 0C00AB4B */  jal       heap_free
 /* BC8834 802409D4 8E040000 */   lw       $a0, ($s0)
 /* BC8838 802409D8 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240A58_BC88B8.s b/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240A58_BC88B8.s
index 04476bf33e..213063966f 100644
--- a/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240A58_BC88B8.s
+++ b/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240A58_BC88B8.s
@@ -41,9 +41,9 @@ glabel func_80240A58_BC88B8
 /* BC8948 80240AE8 2C620008 */  sltiu     $v0, $v1, 8
 /* BC894C 80240AEC 10400039 */  beqz      $v0, .L80240BD4
 /* BC8950 80240AF0 00031080 */   sll      $v0, $v1, 2
-/* BC8954 80240AF4 3C018024 */  lui       $at, 0x8024
+/* BC8954 80240AF4 3C018024 */  lui       $at, %hi(D_802451D8)
 /* BC8958 80240AF8 00220821 */  addu      $at, $at, $v0
-/* BC895C 80240AFC 8C2251D8 */  lw        $v0, 0x51d8($at)
+/* BC895C 80240AFC 8C2251D8 */  lw        $v0, %lo(D_802451D8)($at)
 /* BC8960 80240B00 00400008 */  jr        $v0
 /* BC8964 80240B04 00000000 */   nop      
 /* BC8968 80240B08 0000202D */  daddu     $a0, $zero, $zero
diff --git a/asm/nonmatchings/world/area_obk/obk_05/BCD7D0/func_80240934_BCD994.s b/asm/nonmatchings/world/area_obk/obk_05/BCD7D0/func_80240934_BCD994.s
index 64b77e5b2e..06845dccd1 100644
--- a/asm/nonmatchings/world/area_obk/obk_05/BCD7D0/func_80240934_BCD994.s
+++ b/asm/nonmatchings/world/area_obk/obk_05/BCD7D0/func_80240934_BCD994.s
@@ -13,9 +13,9 @@ glabel func_80240934_BCD994
 /* BCD9B4 80240954 0C00A67F */  jal       rand_int
 /* BCD9B8 80240958 24040003 */   addiu    $a0, $zero, 3
 /* BCD9BC 8024095C 00021040 */  sll       $v0, $v0, 1
-/* BCD9C0 80240960 3C018024 */  lui       $at, 0x8024
+/* BCD9C0 80240960 3C018024 */  lui       $at, %hi(D_8024100C)
 /* BCD9C4 80240964 00220821 */  addu      $at, $at, $v0
-/* BCD9C8 80240968 8422100C */  lh        $v0, 0x100c($at)
+/* BCD9C8 80240968 8422100C */  lh        $v0, %lo(D_8024100C)($at)
 /* BCD9CC 8024096C 24040032 */  addiu     $a0, $zero, 0x32
 /* BCD9D0 80240970 0C00A67F */  jal       rand_int
 /* BCD9D4 80240974 AE220078 */   sw       $v0, 0x78($s1)
diff --git a/asm/nonmatchings/world/area_obk/obk_07/BCEBF0/func_80240000_BCEBF0.s b/asm/nonmatchings/world/area_obk/obk_07/BCEBF0/func_80240000_BCEBF0.s
index 084d19120c..466a0dbd36 100644
--- a/asm/nonmatchings/world/area_obk/obk_07/BCEBF0/func_80240000_BCEBF0.s
+++ b/asm/nonmatchings/world/area_obk/obk_07/BCEBF0/func_80240000_BCEBF0.s
@@ -4,8 +4,8 @@
 glabel func_80240000_BCEBF0
 /* BCEBF0 80240000 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* BCEBF4 80240004 AFB00010 */  sw        $s0, 0x10($sp)
-/* BCEBF8 80240008 3C108024 */  lui       $s0, 0x8024
-/* BCEBFC 8024000C 26101FB0 */  addiu     $s0, $s0, 0x1fb0
+/* BCEBF8 80240008 3C108024 */  lui       $s0, %hi(D_80241FB0)
+/* BCEBFC 8024000C 26101FB0 */  addiu     $s0, $s0, %lo(D_80241FB0)
 /* BCEC00 80240010 AFBF0018 */  sw        $ra, 0x18($sp)
 /* BCEC04 80240014 AFB10014 */  sw        $s1, 0x14($sp)
 /* BCEC08 80240018 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_80240000_BCEBF0
 /* BCEC6C 8024007C 28620010 */  slti      $v0, $v1, 0x10
 /* BCEC70 80240080 1440FFFA */  bnez      $v0, .L8024006C
 /* BCEC74 80240084 24840004 */   addiu    $a0, $a0, 4
-/* BCEC78 80240088 3C108024 */  lui       $s0, 0x8024
-/* BCEC7C 8024008C 26101FB0 */  addiu     $s0, $s0, 0x1fb0
+/* BCEC78 80240088 3C108024 */  lui       $s0, %hi(D_80241FB0)
+/* BCEC7C 8024008C 26101FB0 */  addiu     $s0, $s0, %lo(D_80241FB0)
 /* BCEC80 80240090 0C00AB4B */  jal       heap_free
 /* BCEC84 80240094 8E040000 */   lw       $a0, ($s0)
 /* BCEC88 80240098 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_obk/obk_07/BCEEB0/func_80240454_BCF044.s b/asm/nonmatchings/world/area_obk/obk_07/BCEEB0/func_80240454_BCF044.s
index 77b39b51a0..6c224e3309 100644
--- a/asm/nonmatchings/world/area_obk/obk_07/BCEEB0/func_80240454_BCF044.s
+++ b/asm/nonmatchings/world/area_obk/obk_07/BCEEB0/func_80240454_BCF044.s
@@ -13,9 +13,9 @@ glabel func_80240454_BCF044
 /* BCF064 80240474 0C00A67F */  jal       rand_int
 /* BCF068 80240478 24040003 */   addiu    $a0, $zero, 3
 /* BCF06C 8024047C 00021040 */  sll       $v0, $v0, 1
-/* BCF070 80240480 3C018024 */  lui       $at, 0x8024
+/* BCF070 80240480 3C018024 */  lui       $at, %hi(D_8024292C)
 /* BCF074 80240484 00220821 */  addu      $at, $at, $v0
-/* BCF078 80240488 8422292C */  lh        $v0, 0x292c($at)
+/* BCF078 80240488 8422292C */  lh        $v0, %lo(D_8024292C)($at)
 /* BCF07C 8024048C 24040032 */  addiu     $a0, $zero, 0x32
 /* BCF080 80240490 0C00A67F */  jal       rand_int
 /* BCF084 80240494 AE220078 */   sw       $v0, 0x78($s1)
diff --git a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80240564_BCF154.s b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80240564_BCF154.s
index 45506e9282..992f685201 100644
--- a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80240564_BCF154.s
+++ b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80240564_BCF154.s
@@ -133,8 +133,8 @@ glabel func_80240564_BCF154
 /* BCF328 80240738 01743021 */  addu      $a2, $t3, $s4
 /* BCF32C 8024073C 00062400 */  sll       $a0, $a2, 0x10
 /* BCF330 80240740 00042403 */  sra       $a0, $a0, 0x10
-/* BCF334 80240744 3C0B8024 */  lui       $t3, 0x8024
-/* BCF338 80240748 256B30A0 */  addiu     $t3, $t3, 0x30a0
+/* BCF334 80240744 3C0B8024 */  lui       $t3, %hi(D_802430A0)
+/* BCF338 80240748 256B30A0 */  addiu     $t3, $t3, %lo(D_802430A0)
 /* BCF33C 8024074C 02EB1021 */  addu      $v0, $s7, $t3
 /* BCF340 80240750 904A0000 */  lbu       $t2, ($v0)
 /* BCF344 80240754 02CB1021 */  addu      $v0, $s6, $t3
@@ -158,8 +158,8 @@ glabel func_80240564_BCF154
 /* BCF38C 8024079C 10400017 */  beqz      $v0, .L802407FC
 /* BCF390 802407A0 0220202D */   daddu    $a0, $s1, $zero
 /* BCF394 802407A4 0080302D */  daddu     $a2, $a0, $zero
-/* BCF398 802407A8 3C0B8024 */  lui       $t3, 0x8024
-/* BCF39C 802407AC 256B30C0 */  addiu     $t3, $t3, 0x30c0
+/* BCF398 802407A8 3C0B8024 */  lui       $t3, %hi(D_802430C0)
+/* BCF39C 802407AC 256B30C0 */  addiu     $t3, $t3, %lo(D_802430C0)
 /* BCF3A0 802407B0 02EB1021 */  addu      $v0, $s7, $t3
 /* BCF3A4 802407B4 904A0000 */  lbu       $t2, ($v0)
 /* BCF3A8 802407B8 02CB1021 */  addu      $v0, $s6, $t3
@@ -188,30 +188,30 @@ glabel func_80240564_BCF154
 /* BCF3FC 8024080C 24160002 */  addiu     $s6, $zero, 2
 /* BCF400 80240810 24130001 */  addiu     $s3, $zero, 1
 /* BCF404 80240814 8FAB006C */  lw        $t3, 0x6c($sp)
-/* BCF408 80240818 3C178024 */  lui       $s7, 0x8024
-/* BCF40C 8024081C 26F730B0 */  addiu     $s7, $s7, 0x30b0
+/* BCF408 80240818 3C178024 */  lui       $s7, %hi(D_802430B0)
+/* BCF40C 8024081C 26F730B0 */  addiu     $s7, $s7, %lo(D_802430B0)
 /* BCF410 80240820 000B1400 */  sll       $v0, $t3, 0x10
 /* BCF414 80240824 00021403 */  sra       $v0, $v0, 0x10
 /* BCF418 80240828 AFA20030 */  sw        $v0, 0x30($sp)
 /* BCF41C 8024082C 25620005 */  addiu     $v0, $t3, 5
 /* BCF420 80240830 00021400 */  sll       $v0, $v0, 0x10
 /* BCF424 80240834 00021403 */  sra       $v0, $v0, 0x10
-/* BCF428 80240838 3C0B8024 */  lui       $t3, 0x8024
-/* BCF42C 8024083C 256B30C0 */  addiu     $t3, $t3, 0x30c0
+/* BCF428 80240838 3C0B8024 */  lui       $t3, %hi(D_802430C0)
+/* BCF42C 8024083C 256B30C0 */  addiu     $t3, $t3, %lo(D_802430C0)
 /* BCF430 80240840 AFAB0038 */  sw        $t3, 0x38($sp)
 /* BCF434 80240844 240B0004 */  addiu     $t3, $zero, 4
 /* BCF438 80240848 AFA20034 */  sw        $v0, 0x34($sp)
 /* BCF43C 8024084C AFAB003C */  sw        $t3, 0x3c($sp)
 .L80240850:
-/* BCF440 80240850 3C0B8024 */  lui       $t3, 0x8024
-/* BCF444 80240854 256B30B0 */  addiu     $t3, $t3, 0x30b0
+/* BCF440 80240850 3C0B8024 */  lui       $t3, %hi(D_802430B0)
+/* BCF444 80240854 256B30B0 */  addiu     $t3, $t3, %lo(D_802430B0)
 /* BCF448 80240858 026B1021 */  addu      $v0, $s3, $t3
 /* BCF44C 8024085C 904A0000 */  lbu       $t2, ($v0)
 /* BCF450 80240860 8FAB003C */  lw        $t3, 0x3c($sp)
 /* BCF454 80240864 92E80000 */  lbu       $t0, ($s7)
 /* BCF458 80240868 02AB1021 */  addu      $v0, $s5, $t3
-/* BCF45C 8024086C 3C0B8024 */  lui       $t3, 0x8024
-/* BCF460 80240870 256B30B0 */  addiu     $t3, $t3, 0x30b0
+/* BCF45C 8024086C 3C0B8024 */  lui       $t3, %hi(D_802430B0)
+/* BCF460 80240870 256B30B0 */  addiu     $t3, $t3, %lo(D_802430B0)
 /* BCF464 80240874 8C450010 */  lw        $a1, 0x10($v0)
 /* BCF468 80240878 02CB1021 */  addu      $v0, $s6, $t3
 /* BCF46C 8024087C 90490000 */  lbu       $t1, ($v0)
@@ -279,8 +279,8 @@ glabel func_80240564_BCF154
 /* BCF550 80240960 0200202D */   daddu    $a0, $s0, $zero
 /* BCF554 80240964 0080302D */  daddu     $a2, $a0, $zero
 /* BCF558 80240968 0291A021 */  addu      $s4, $s4, $s1
-/* BCF55C 8024096C 3C0B8024 */  lui       $t3, 0x8024
-/* BCF560 80240970 256B30C0 */  addiu     $t3, $t3, 0x30c0
+/* BCF55C 8024096C 3C0B8024 */  lui       $t3, %hi(D_802430C0)
+/* BCF560 80240970 256B30C0 */  addiu     $t3, $t3, %lo(D_802430C0)
 /* BCF564 80240974 02CB4021 */  addu      $t0, $s6, $t3
 /* BCF568 80240978 26D60003 */  addiu     $s6, $s6, 3
 /* BCF56C 8024097C 026B1021 */  addu      $v0, $s3, $t3
diff --git a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80240A6C_BCF65C.s b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80240A6C_BCF65C.s
index d5b4632042..562f6c0b73 100644
--- a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80240A6C_BCF65C.s
+++ b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80240A6C_BCF65C.s
@@ -93,8 +93,8 @@ glabel func_80240A6C_BCF65C
 /* BCF7A8 80240BB8 00000000 */   nop      
 .L80240BBC:
 /* BCF7AC 80240BBC 8E24003C */  lw        $a0, 0x3c($s1)
-/* BCF7B0 80240BC0 3C058011 */  lui       $a1, 0x8011
-/* BCF7B4 80240BC4 24A58C34 */  addiu     $a1, $a1, -0x73cc
+/* BCF7B0 80240BC0 3C058011 */  lui       $a1, %hi(D_80108C34)
+/* BCF7B4 80240BC4 24A58C34 */  addiu     $a1, $a1, %lo(D_80108C34)
 /* BCF7B8 80240BC8 0C0511FF */  jal       set_menu_icon_script
 /* BCF7BC 80240BCC 00000000 */   nop      
 /* BCF7C0 80240BD0 2402000B */  addiu     $v0, $zero, 0xb
diff --git a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241130_BCFD20.s b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241130_BCFD20.s
index 0b64b3d04d..cf2d1b46af 100644
--- a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241130_BCFD20.s
+++ b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241130_BCFD20.s
@@ -3,8 +3,8 @@
 
 glabel func_80241130_BCFD20
 /* BCFD20 80241130 0000302D */  daddu     $a2, $zero, $zero
-/* BCFD24 80241134 3C058024 */  lui       $a1, 0x8024
-/* BCFD28 80241138 24A53090 */  addiu     $a1, $a1, 0x3090
+/* BCFD24 80241134 3C058024 */  lui       $a1, %hi(D_80243090)
+/* BCFD28 80241138 24A53090 */  addiu     $a1, $a1, %lo(D_80243090)
 .L8024113C:
 /* BCFD2C 8024113C 8CA30000 */  lw        $v1, ($a1)
 /* BCFD30 80241140 50600006 */  beql      $v1, $zero, .L8024115C
diff --git a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241168_BCFD58.s b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241168_BCFD58.s
index 83d8198aba..8a87acf54f 100644
--- a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241168_BCFD58.s
+++ b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241168_BCFD58.s
@@ -7,12 +7,12 @@ glabel func_80241168_BCFD58
 /* BCFD60 80241170 AFB10014 */  sw        $s1, 0x14($sp)
 /* BCFD64 80241174 0C090150 */  jal       func_80240540_BCF130
 /* BCFD68 80241178 AFB00010 */   sw       $s0, 0x10($sp)
-/* BCFD6C 8024117C 3C048024 */  lui       $a0, 0x8024
-/* BCFD70 80241180 24840A6C */  addiu     $a0, $a0, 0xa6c
+/* BCFD6C 8024117C 3C048024 */  lui       $a0, %hi(D_80240A6C)
+/* BCFD70 80241180 24840A6C */  addiu     $a0, $a0, %lo(D_80240A6C)
 /* BCFD74 80241184 3C06800A */  lui       $a2, %hi(D_8009A650)
 /* BCFD78 80241188 24C6A650 */  addiu     $a2, $a2, %lo(D_8009A650)
-/* BCFD7C 8024118C 3C058024 */  lui       $a1, 0x8024
-/* BCFD80 80241190 24A510C0 */  addiu     $a1, $a1, 0x10c0
+/* BCFD7C 8024118C 3C058024 */  lui       $a1, %hi(D_802410C0)
+/* BCFD80 80241190 24A510C0 */  addiu     $a1, $a1, %lo(D_802410C0)
 /* BCFD84 80241194 8CC30000 */  lw        $v1, ($a2)
 /* BCFD88 80241198 0040882D */  daddu     $s1, $v0, $zero
 /* BCFD8C 8024119C 34630010 */  ori       $v1, $v1, 0x10
@@ -42,8 +42,8 @@ glabel func_80241168_BCFD58
 /* BCFDE8 802411F8 2484FFFF */  addiu     $a0, $a0, -1
 /* BCFDEC 802411FC 0481FFFD */  bgez      $a0, .L802411F4
 /* BCFDF0 80241200 2463FFFC */   addiu    $v1, $v1, -4
-/* BCFDF4 80241204 3C048011 */  lui       $a0, 0x8011
-/* BCFDF8 80241208 24848B28 */  addiu     $a0, $a0, -0x74d8
+/* BCFDF4 80241204 3C048011 */  lui       $a0, %hi(D_80108B28)
+/* BCFDF8 80241208 24848B28 */  addiu     $a0, $a0, %lo(D_80108B28)
 /* BCFDFC 8024120C 3C013F80 */  lui       $at, 0x3f80
 /* BCFE00 80241210 44810000 */  mtc1      $at, $f0
 /* BCFE04 80241214 2402FFD0 */  addiu     $v0, $zero, -0x30
@@ -68,8 +68,8 @@ glabel func_80241168_BCFD58
 /* BCFE50 80241260 0200202D */  daddu     $a0, $s0, $zero
 /* BCFE54 80241264 0C051280 */  jal       set_icon_flags
 /* BCFE58 80241268 24050082 */   addiu    $a1, $zero, 0x82
-/* BCFE5C 8024126C 3C048011 */  lui       $a0, 0x8011
-/* BCFE60 80241270 24848AFC */  addiu     $a0, $a0, -0x7504
+/* BCFE5C 8024126C 3C048011 */  lui       $a0, %hi(D_80108AFC)
+/* BCFE60 80241270 24848AFC */  addiu     $a0, $a0, %lo(D_80108AFC)
 /* BCFE64 80241274 0C050529 */  jal       create_icon
 /* BCFE68 80241278 00000000 */   nop      
 /* BCFE6C 8024127C 0040802D */  daddu     $s0, $v0, $zero
@@ -85,8 +85,8 @@ glabel func_80241168_BCFD58
 /* BCFE94 802412A4 0200202D */  daddu     $a0, $s0, $zero
 /* BCFE98 802412A8 0C051280 */  jal       set_icon_flags
 /* BCFE9C 802412AC 24050082 */   addiu    $a1, $zero, 0x82
-/* BCFEA0 802412B0 3C048011 */  lui       $a0, 0x8011
-/* BCFEA4 802412B4 24849244 */  addiu     $a0, $a0, -0x6dbc
+/* BCFEA0 802412B0 3C048011 */  lui       $a0, %hi(D_80109244)
+/* BCFEA4 802412B4 24849244 */  addiu     $a0, $a0, %lo(D_80109244)
 /* BCFEA8 802412B8 0C050529 */  jal       create_icon
 /* BCFEAC 802412BC 00000000 */   nop      
 /* BCFEB0 802412C0 0040802D */  daddu     $s0, $v0, $zero
diff --git a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_8024130C_BCFEFC.s b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_8024130C_BCFEFC.s
index 1c566f2fde..6cccba31d1 100644
--- a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_8024130C_BCFEFC.s
+++ b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_8024130C_BCFEFC.s
@@ -12,9 +12,9 @@ glabel func_8024130C_BCFEFC
 /* BCFF18 80241328 00021080 */  sll       $v0, $v0, 2
 /* BCFF1C 8024132C 0080302D */  daddu     $a2, $a0, $zero
 /* BCFF20 80241330 AFA30010 */  sw        $v1, 0x10($sp)
-/* BCFF24 80241334 3C058024 */  lui       $a1, 0x8024
+/* BCFF24 80241334 3C058024 */  lui       $a1, %hi(D_80243098)
 /* BCFF28 80241338 00A22821 */  addu      $a1, $a1, $v0
-/* BCFF2C 8024133C 8CA53098 */  lw        $a1, 0x3098($a1)
+/* BCFF2C 8024133C 8CA53098 */  lw        $a1, %lo(D_80243098)($a1)
 /* BCFF30 80241340 0C052A46 */  jal       set_music_track
 /* BCFF34 80241344 240701F4 */   addiu    $a3, $zero, 0x1f4
 /* BCFF38 80241348 8FBF0018 */  lw        $ra, 0x18($sp)
diff --git a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241358_BCFF48.s b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241358_BCFF48.s
index 9837e1ef51..f8c3b90039 100644
--- a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241358_BCFF48.s
+++ b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241358_BCFF48.s
@@ -24,8 +24,8 @@ glabel func_80241358_BCFF48
 /* BCFF94 802413A4 0C0B1EAF */  jal       get_variable
 /* BCFF98 802413A8 AE020050 */   sw       $v0, 0x50($s0)
 /* BCFF9C 802413AC AE020054 */  sw        $v0, 0x54($s0)
-/* BCFFA0 802413B0 3C038016 */  lui       $v1, 0x8016
-/* BCFFA4 802413B4 8C639B08 */  lw        $v1, -0x64f8($v1)
+/* BCFFA0 802413B0 3C038016 */  lui       $v1, %hi(D_80159B08)
+/* BCFFA4 802413B4 8C639B08 */  lw        $v1, %lo(D_80159B08)($v1)
 /* BCFFA8 802413B8 AE03000C */  sw        $v1, 0xc($s0)
 /* BCFFAC 802413BC 8FBF0014 */  lw        $ra, 0x14($sp)
 /* BCFFB0 802413C0 8FB00010 */  lw        $s0, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_80240000_BD3870.s b/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_80240000_BD3870.s
index cf02c2730a..34d119d55f 100644
--- a/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_80240000_BD3870.s
+++ b/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_80240000_BD3870.s
@@ -46,8 +46,8 @@ glabel func_80240000_BD3870
 /* BD3914 802400A4 27B30040 */  addiu     $s3, $sp, 0x40
 /* BD3918 802400A8 0260202D */  daddu     $a0, $s3, $zero
 /* BD391C 802400AC 3C160001 */  lui       $s6, 1
-/* BD3920 802400B0 3C11800A */  lui       $s1, 0x800a
-/* BD3924 802400B4 2631A66C */  addiu     $s1, $s1, -0x5994
+/* BD3920 802400B0 3C11800A */  lui       $s1, %hi(D_8009A66C)
+/* BD3924 802400B4 2631A66C */  addiu     $s1, $s1, %lo(D_8009A66C)
 /* BD3928 802400B8 36D61630 */  ori       $s6, $s6, 0x1630
 /* BD392C 802400BC 3C05E700 */  lui       $a1, 0xe700
 /* BD3930 802400C0 8E230000 */  lw        $v1, ($s1)
@@ -158,10 +158,10 @@ glabel func_80240000_BD3870
 /* BD3AD4 80240264 0C019D80 */  jal       guMtxCatF
 /* BD3AD8 80240268 0260302D */   daddu    $a2, $s3, $zero
 /* BD3ADC 8024026C 0260202D */  daddu     $a0, $s3, $zero
-/* BD3AE0 80240270 3C108007 */  lui       $s0, 0x8007
-/* BD3AE4 80240274 261041F0 */  addiu     $s0, $s0, 0x41f0
-/* BD3AE8 80240278 3C14800A */  lui       $s4, 0x800a
-/* BD3AEC 8024027C 2694A674 */  addiu     $s4, $s4, -0x598c
+/* BD3AE0 80240270 3C108007 */  lui       $s0, %hi(D_800741F0)
+/* BD3AE4 80240274 261041F0 */  addiu     $s0, $s0, %lo(D_800741F0)
+/* BD3AE8 80240278 3C14800A */  lui       $s4, %hi(D_8009A674)
+/* BD3AEC 8024027C 2694A674 */  addiu     $s4, $s4, %lo(D_8009A674)
 /* BD3AF0 80240280 96050000 */  lhu       $a1, ($s0)
 /* BD3AF4 80240284 8E820000 */  lw        $v0, ($s4)
 /* BD3AF8 80240288 00052980 */  sll       $a1, $a1, 6
diff --git a/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_802403DC_BD3C4C.s b/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_802403DC_BD3C4C.s
index 304dea5507..415c369886 100644
--- a/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_802403DC_BD3C4C.s
+++ b/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_802403DC_BD3C4C.s
@@ -53,8 +53,8 @@ glabel func_802403DC_BD3C4C
 /* BD3D0C 8024049C 0C04E9C1 */  jal       func_8013A704
 /* BD3D10 802404A0 E6020018 */   swc1     $f2, 0x18($s0)
 /* BD3D14 802404A4 0000202D */  daddu     $a0, $zero, $zero
-/* BD3D18 802404A8 3C058024 */  lui       $a1, 0x8024
-/* BD3D1C 802404AC 24A50000 */  addiu     $a1, $a1, 0
+/* BD3D18 802404A8 3C058024 */  lui       $a1, %hi(D_80240000)
+/* BD3D1C 802404AC 24A50000 */  addiu     $a1, $a1, %lo(D_80240000)
 /* BD3D20 802404B0 0C048C56 */  jal       bind_dynamic_entity_3
 /* BD3D24 802404B4 AE020000 */   sw       $v0, ($s0)
 /* BD3D28 802404B8 0260202D */  daddu     $a0, $s3, $zero
diff --git a/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_80240AF0_BD4360.s b/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_80240AF0_BD4360.s
index 5080e3e267..7d99f915ba 100644
--- a/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_80240AF0_BD4360.s
+++ b/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_80240AF0_BD4360.s
@@ -16,9 +16,9 @@ glabel func_80240AF0_BD4360
 /* BD438C 80240B1C 2C62000E */  sltiu     $v0, $v1, 0xe
 /* BD4390 80240B20 10400058 */  beqz      $v0, .L80240C84
 /* BD4394 80240B24 00031080 */   sll      $v0, $v1, 2
-/* BD4398 80240B28 3C018024 */  lui       $at, 0x8024
+/* BD4398 80240B28 3C018024 */  lui       $at, %hi(D_80246EC8)
 /* BD439C 80240B2C 00220821 */  addu      $at, $at, $v0
-/* BD43A0 80240B30 8C226EC8 */  lw        $v0, 0x6ec8($at)
+/* BD43A0 80240B30 8C226EC8 */  lw        $v0, %lo(D_80246EC8)($at)
 /* BD43A4 80240B34 00400008 */  jr        $v0
 /* BD43A8 80240B38 00000000 */   nop      
 /* BD43AC 80240B3C 0220202D */  daddu     $a0, $s1, $zero
diff --git a/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_80240D10_BD4580.s b/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_80240D10_BD4580.s
index 71b4087edd..1573811c55 100644
--- a/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_80240D10_BD4580.s
+++ b/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_80240D10_BD4580.s
@@ -19,9 +19,9 @@ glabel func_80240D10_BD4580
 /* BD45B8 80240D48 8E330020 */  lw        $s3, 0x20($s1)
 /* BD45BC 80240D4C 10400099 */  beqz      $v0, .L80240FB4
 /* BD45C0 80240D50 00031080 */   sll      $v0, $v1, 2
-/* BD45C4 80240D54 3C018024 */  lui       $at, 0x8024
+/* BD45C4 80240D54 3C018024 */  lui       $at, %hi(D_80246F00)
 /* BD45C8 80240D58 00220821 */  addu      $at, $at, $v0
-/* BD45CC 80240D5C 8C226F00 */  lw        $v0, 0x6f00($at)
+/* BD45CC 80240D5C 8C226F00 */  lw        $v0, %lo(D_80246F00)($at)
 /* BD45D0 80240D60 00400008 */  jr        $v0
 /* BD45D4 80240D64 00000000 */   nop      
 /* BD45D8 80240D68 C620000C */  lwc1      $f0, 0xc($s1)
diff --git a/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_8024116C_BD49DC.s b/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_8024116C_BD49DC.s
index e0013fc035..dc4a721921 100644
--- a/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_8024116C_BD49DC.s
+++ b/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_8024116C_BD49DC.s
@@ -13,9 +13,9 @@ glabel func_8024116C_BD49DC
 /* BD49FC 8024118C 0C00A67F */  jal       rand_int
 /* BD4A00 80241190 24040003 */   addiu    $a0, $zero, 3
 /* BD4A04 80241194 00021040 */  sll       $v0, $v0, 1
-/* BD4A08 80241198 3C018024 */  lui       $at, 0x8024
+/* BD4A08 80241198 3C018024 */  lui       $at, %hi(D_80244FEC)
 /* BD4A0C 8024119C 00220821 */  addu      $at, $at, $v0
-/* BD4A10 802411A0 84224FEC */  lh        $v0, 0x4fec($at)
+/* BD4A10 802411A0 84224FEC */  lh        $v0, %lo(D_80244FEC)($at)
 /* BD4A14 802411A4 24040032 */  addiu     $a0, $zero, 0x32
 /* BD4A18 802411A8 0C00A67F */  jal       rand_int
 /* BD4A1C 802411AC AE220078 */   sw       $v0, 0x78($s1)
diff --git a/asm/nonmatchings/world/area_obk/obk_09/BDAB00/func_80240350_BDAB00.s b/asm/nonmatchings/world/area_obk/obk_09/BDAB00/func_80240350_BDAB00.s
index 51e9267d93..b0873cc962 100644
--- a/asm/nonmatchings/world/area_obk/obk_09/BDAB00/func_80240350_BDAB00.s
+++ b/asm/nonmatchings/world/area_obk/obk_09/BDAB00/func_80240350_BDAB00.s
@@ -3,8 +3,8 @@
 
 glabel func_80240350_BDAB00
 /* BDAB00 80240350 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* BDAB04 80240354 3C048024 */  lui       $a0, 0x8024
-/* BDAB08 80240358 248429E8 */  addiu     $a0, $a0, 0x29e8
+/* BDAB04 80240354 3C048024 */  lui       $a0, %hi(D_802429E8)
+/* BDAB08 80240358 248429E8 */  addiu     $a0, $a0, %lo(D_802429E8)
 /* BDAB0C 8024035C 27A50010 */  addiu     $a1, $sp, 0x10
 /* BDAB10 80240360 AFBF0020 */  sw        $ra, 0x20($sp)
 /* BDAB14 80240364 AFB1001C */  sw        $s1, 0x1c($sp)
@@ -12,16 +12,16 @@ glabel func_80240350_BDAB00
 /* BDAB1C 8024036C AFB00018 */   sw       $s0, 0x18($sp)
 /* BDAB20 80240370 0040802D */  daddu     $s0, $v0, $zero
 /* BDAB24 80240374 0200202D */  daddu     $a0, $s0, $zero
-/* BDAB28 80240378 3C118024 */  lui       $s1, 0x8024
-/* BDAB2C 8024037C 26312A00 */  addiu     $s1, $s1, 0x2a00
+/* BDAB28 80240378 3C118024 */  lui       $s1, %hi(D_80242A00)
+/* BDAB2C 8024037C 26312A00 */  addiu     $s1, $s1, %lo(D_80242A00)
 /* BDAB30 80240380 0C01BB7C */  jal       decode_yay0
 /* BDAB34 80240384 0220282D */   daddu    $a1, $s1, $zero
 /* BDAB38 80240388 0C00AB1E */  jal       general_heap_free
 /* BDAB3C 8024038C 0200202D */   daddu    $a0, $s0, $zero
-/* BDAB40 80240390 3C048024 */  lui       $a0, 0x8024
-/* BDAB44 80240394 24846990 */  addiu     $a0, $a0, 0x6990
-/* BDAB48 80240398 3C028024 */  lui       $v0, 0x8024
-/* BDAB4C 8024039C 24422C00 */  addiu     $v0, $v0, 0x2c00
+/* BDAB40 80240390 3C048024 */  lui       $a0, %hi(D_80246990)
+/* BDAB44 80240394 24846990 */  addiu     $a0, $a0, %lo(D_80246990)
+/* BDAB48 80240398 3C028024 */  lui       $v0, %hi(D_80242C00)
+/* BDAB4C 8024039C 24422C00 */  addiu     $v0, $v0, %lo(D_80242C00)
 /* BDAB50 802403A0 AC820000 */  sw        $v0, ($a0)
 /* BDAB54 802403A4 24020096 */  addiu     $v0, $zero, 0x96
 /* BDAB58 802403A8 A4820008 */  sh        $v0, 8($a0)
diff --git a/asm/nonmatchings/world/area_omo/omo_01/D9AEF0/func_80240000_D9AEF0.s b/asm/nonmatchings/world/area_omo/omo_01/D9AEF0/func_80240000_D9AEF0.s
index 366a13a838..86695dfa72 100644
--- a/asm/nonmatchings/world/area_omo/omo_01/D9AEF0/func_80240000_D9AEF0.s
+++ b/asm/nonmatchings/world/area_omo/omo_01/D9AEF0/func_80240000_D9AEF0.s
@@ -23,8 +23,8 @@ glabel func_80240000_D9AEF0
 /* D9AF38 80240048 26700008 */  addiu     $s0, $s3, 8
 /* D9AF3C 8024004C 3C014060 */  lui       $at, 0x4060
 /* D9AF40 80240050 4481A000 */  mtc1      $at, $f20
-/* D9AF44 80240054 3C128024 */  lui       $s2, 0x8024
-/* D9AF48 80240058 265212A0 */  addiu     $s2, $s2, 0x12a0
+/* D9AF44 80240054 3C128024 */  lui       $s2, %hi(D_802412A0)
+/* D9AF48 80240058 265212A0 */  addiu     $s2, $s2, %lo(D_802412A0)
 /* D9AF4C 8024005C AED30070 */  sw        $s3, 0x70($s6)
 .L80240060:
 /* D9AF50 80240060 8E440000 */  lw        $a0, ($s2)
diff --git a/asm/nonmatchings/world/area_omo/omo_01/D9B150/func_802409EC_D9B8DC.s b/asm/nonmatchings/world/area_omo/omo_01/D9B150/func_802409EC_D9B8DC.s
index c444f945db..3db71d6686 100644
--- a/asm/nonmatchings/world/area_omo/omo_01/D9B150/func_802409EC_D9B8DC.s
+++ b/asm/nonmatchings/world/area_omo/omo_01/D9B150/func_802409EC_D9B8DC.s
@@ -85,9 +85,9 @@ glabel func_802409EC_D9B8DC
 /* D9BA0C 80240B1C 2C620064 */  sltiu     $v0, $v1, 0x64
 /* D9BA10 80240B20 10400036 */  beqz      $v0, .L80240BFC
 /* D9BA14 80240B24 00031080 */   sll      $v0, $v1, 2
-/* D9BA18 80240B28 3C018024 */  lui       $at, 0x8024
+/* D9BA18 80240B28 3C018024 */  lui       $at, %hi(D_80242448)
 /* D9BA1C 80240B2C 00220821 */  addu      $at, $at, $v0
-/* D9BA20 80240B30 8C222448 */  lw        $v0, 0x2448($at)
+/* D9BA20 80240B30 8C222448 */  lw        $v0, %lo(D_80242448)($at)
 /* D9BA24 80240B34 00400008 */  jr        $v0
 /* D9BA28 80240B38 00000000 */   nop      
 /* D9BA2C 80240B3C 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240040_D9D510.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240040_D9D510.s
index 51070da404..e64ae84f01 100644
--- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240040_D9D510.s
+++ b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240040_D9D510.s
@@ -23,8 +23,8 @@ glabel func_80240040_D9D510
 /* D9D558 80240088 26700008 */  addiu     $s0, $s3, 8
 /* D9D55C 8024008C 3C014060 */  lui       $at, 0x4060
 /* D9D560 80240090 4481A000 */  mtc1      $at, $f20
-/* D9D564 80240094 3C128024 */  lui       $s2, 0x8024
-/* D9D568 80240098 265234F8 */  addiu     $s2, $s2, 0x34f8
+/* D9D564 80240094 3C128024 */  lui       $s2, %hi(D_802434F8)
+/* D9D568 80240098 265234F8 */  addiu     $s2, $s2, %lo(D_802434F8)
 /* D9D56C 8024009C AED30070 */  sw        $s3, 0x70($s6)
 .L802400A0:
 /* D9D570 802400A0 8E440000 */  lw        $a0, ($s2)
diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024043C_D9D90C.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024043C_D9D90C.s
index 76cfad929e..64605ab746 100644
--- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024043C_D9D90C.s
+++ b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024043C_D9D90C.s
@@ -22,8 +22,8 @@ glabel func_8024043C_D9D90C
 /* D9D950 80240480 0000982D */  daddu     $s3, $zero, $zero
 /* D9D954 80240484 AEE20070 */  sw        $v0, 0x70($s7)
 /* D9D958 80240488 0040882D */  daddu     $s1, $v0, $zero
-/* D9D95C 8024048C 3C148024 */  lui       $s4, 0x8024
-/* D9D960 80240490 26943580 */  addiu     $s4, $s4, 0x3580
+/* D9D95C 8024048C 3C148024 */  lui       $s4, %hi(D_80243580)
+/* D9D960 80240490 26943580 */  addiu     $s4, $s4, %lo(D_80243580)
 /* D9D964 80240494 3C014120 */  lui       $at, 0x4120
 /* D9D968 80240498 4481A000 */  mtc1      $at, $f20
 /* D9D96C 8024049C 26300088 */  addiu     $s0, $s1, 0x88
@@ -33,9 +33,9 @@ glabel func_8024043C_D9D90C
 /* D9D978 802404A8 AE02FFB8 */  sw        $v0, -0x48($s0)
 /* D9D97C 802404AC 0040202D */  daddu     $a0, $v0, $zero
 /* D9D980 802404B0 00131080 */  sll       $v0, $s3, 2
-/* D9D984 802404B4 3C018024 */  lui       $at, 0x8024
+/* D9D984 802404B4 3C018024 */  lui       $at, %hi(D_802435B0)
 /* D9D988 802404B8 00220821 */  addu      $at, $at, $v0
-/* D9D98C 802404BC 8C2235B0 */  lw        $v0, 0x35b0($at)
+/* D9D98C 802404BC 8C2235B0 */  lw        $v0, %lo(D_802435B0)($at)
 /* D9D990 802404C0 0C046C04 */  jal       get_model_list_index_from_tree_index
 /* D9D994 802404C4 AE02FFBC */   sw       $v0, -0x44($s0)
 /* D9D998 802404C8 0C046B4C */  jal       get_model_from_list_index
diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240970_D9DE40.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240970_D9DE40.s
index 0e6bb69349..ef301647d2 100644
--- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240970_D9DE40.s
+++ b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240970_D9DE40.s
@@ -11,8 +11,8 @@ glabel func_80240970_D9DE40
 /* D9DE58 80240988 0C00EABB */  jal       get_npc_unsafe
 /* D9DE5C 8024098C 86040008 */   lh       $a0, 8($s0)
 /* D9DE60 80240990 C4400018 */  lwc1      $f0, 0x18($v0)
-/* D9DE64 80240994 3C018024 */  lui       $at, 0x8024
-/* D9DE68 80240998 D4227870 */  ldc1      $f2, 0x7870($at)
+/* D9DE64 80240994 3C018024 */  lui       $at, %hi(D_80247870)
+/* D9DE68 80240998 D4227870 */  ldc1      $f2, %lo(D_80247870)($at)
 /* D9DE6C 8024099C 46000021 */  cvt.d.s   $f0, $f0
 /* D9DE70 802409A0 46220002 */  mul.d     $f0, $f0, $f2
 /* D9DE74 802409A4 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802409E0_D9DEB0.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802409E0_D9DEB0.s
index 8d36cfe3aa..3bc9b0392b 100644
--- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802409E0_D9DEB0.s
+++ b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802409E0_D9DEB0.s
@@ -35,8 +35,8 @@ glabel func_802409E0_D9DEB0
 /* D9DF24 80240A54 14400010 */  bnez      $v0, .L80240A98
 /* D9DF28 80240A58 00000000 */   nop      
 /* D9DF2C 80240A5C C6000018 */  lwc1      $f0, 0x18($s0)
-/* D9DF30 80240A60 3C018024 */  lui       $at, 0x8024
-/* D9DF34 80240A64 D4227878 */  ldc1      $f2, 0x7878($at)
+/* D9DF30 80240A60 3C018024 */  lui       $at, %hi(D_80247878)
+/* D9DF34 80240A64 D4227878 */  ldc1      $f2, %lo(D_80247878)($at)
 /* D9DF38 80240A68 46000021 */  cvt.d.s   $f0, $f0
 /* D9DF3C 80240A6C 46220002 */  mul.d     $f0, $f0, $f2
 /* D9DF40 80240A70 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240BA8_D9E078.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240BA8_D9E078.s
index e743d02dc2..d7c2f46f8c 100644
--- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240BA8_D9E078.s
+++ b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240BA8_D9E078.s
@@ -124,9 +124,9 @@ glabel func_80240BA8_D9E078
 /* D9E23C 80240D6C 2C620064 */  sltiu     $v0, $v1, 0x64
 /* D9E240 80240D70 10400050 */  beqz      $v0, .L80240EB4
 /* D9E244 80240D74 00031080 */   sll      $v0, $v1, 2
-/* D9E248 80240D78 3C018024 */  lui       $at, 0x8024
+/* D9E248 80240D78 3C018024 */  lui       $at, %hi(D_80247880)
 /* D9E24C 80240D7C 00220821 */  addu      $at, $at, $v0
-/* D9E250 80240D80 8C227880 */  lw        $v0, 0x7880($at)
+/* D9E250 80240D80 8C227880 */  lw        $v0, %lo(D_80247880)($at)
 /* D9E254 80240D84 00400008 */  jr        $v0
 /* D9E258 80240D88 00000000 */   nop      
 /* D9E25C 80240D8C 0260202D */  daddu     $a0, $s3, $zero
diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240EDC_D9E3AC.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240EDC_D9E3AC.s
index ae10398d49..88c2cd73f2 100644
--- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240EDC_D9E3AC.s
+++ b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240EDC_D9E3AC.s
@@ -35,8 +35,8 @@ glabel func_80240EDC_D9E3AC
 /* D9E420 80240F50 080903DE */  j         .L80240F78
 /* D9E424 80240F54 E4800018 */   swc1     $f0, 0x18($a0)
 .L80240F58:
-/* D9E428 80240F58 3C018024 */  lui       $at, 0x8024
-/* D9E42C 80240F5C D4227A10 */  ldc1      $f2, 0x7a10($at)
+/* D9E428 80240F58 3C018024 */  lui       $at, %hi(D_80247A10)
+/* D9E42C 80240F5C D4227A10 */  ldc1      $f2, %lo(D_80247A10)($at)
 /* D9E430 80240F60 44820000 */  mtc1      $v0, $f0
 /* D9E434 80240F64 00000000 */  nop       
 /* D9E438 80240F68 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024141C_D9E8EC.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024141C_D9E8EC.s
index 5959714936..43fafa8ac7 100644
--- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024141C_D9E8EC.s
+++ b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024141C_D9E8EC.s
@@ -21,16 +21,16 @@ glabel func_8024141C_D9E8EC
 /* D9E92C 8024145C 04410009 */  bgez      $v0, .L80241484
 /* D9E930 80241460 00000000 */   nop      
 /* D9E934 80241464 C640000C */  lwc1      $f0, 0xc($s2)
-/* D9E938 80241468 3C018024 */  lui       $at, 0x8024
-/* D9E93C 8024146C D4227A18 */  ldc1      $f2, 0x7a18($at)
+/* D9E938 80241468 3C018024 */  lui       $at, %hi(D_80247A18)
+/* D9E93C 8024146C D4227A18 */  ldc1      $f2, %lo(D_80247A18)($at)
 /* D9E940 80241470 46000021 */  cvt.d.s   $f0, $f0
 /* D9E944 80241474 46220002 */  mul.d     $f0, $f0, $f2
 /* D9E948 80241478 00000000 */  nop       
 /* D9E94C 8024147C 08090528 */  j         .L802414A0
 /* D9E950 80241480 46200020 */   cvt.s.d  $f0, $f0
 .L80241484:
-/* D9E954 80241484 3C018024 */  lui       $at, 0x8024
-/* D9E958 80241488 D4227A20 */  ldc1      $f2, 0x7a20($at)
+/* D9E954 80241484 3C018024 */  lui       $at, %hi(D_80247A20)
+/* D9E958 80241488 D4227A20 */  ldc1      $f2, %lo(D_80247A20)($at)
 /* D9E95C 8024148C 44820000 */  mtc1      $v0, $f0
 /* D9E960 80241490 00000000 */  nop       
 /* D9E964 80241494 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802416D0_D9EBA0.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802416D0_D9EBA0.s
index ddf0acce42..acf2663e43 100644
--- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802416D0_D9EBA0.s
+++ b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802416D0_D9EBA0.s
@@ -102,9 +102,9 @@ glabel func_802416D0_D9EBA0
 /* D9ED10 80241840 2C620064 */  sltiu     $v0, $v1, 0x64
 /* D9ED14 80241844 10400036 */  beqz      $v0, .L80241920
 /* D9ED18 80241848 00031080 */   sll      $v0, $v1, 2
-/* D9ED1C 8024184C 3C018024 */  lui       $at, 0x8024
+/* D9ED1C 8024184C 3C018024 */  lui       $at, %hi(D_80247A28)
 /* D9ED20 80241850 00220821 */  addu      $at, $at, $v0
-/* D9ED24 80241854 8C227A28 */  lw        $v0, 0x7a28($at)
+/* D9ED24 80241854 8C227A28 */  lw        $v0, %lo(D_80247A28)($at)
 /* D9ED28 80241858 00400008 */  jr        $v0
 /* D9ED2C 8024185C 00000000 */   nop      
 /* D9ED30 80241860 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241948_D9EE18.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241948_D9EE18.s
index 55cfde6609..ad8ba1dbbc 100644
--- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241948_D9EE18.s
+++ b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241948_D9EE18.s
@@ -13,8 +13,8 @@ glabel func_80241948_D9EE18
 /* D9EE38 80241968 AFB00010 */  sw        $s0, 0x10($sp)
 /* D9EE3C 8024196C F7B40028 */  sdc1      $f20, 0x28($sp)
 /* D9EE40 80241970 8E330148 */  lw        $s3, 0x148($s1)
-/* D9EE44 80241974 3C03800A */  lui       $v1, 0x800a
-/* D9EE48 80241978 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D9EE44 80241974 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D9EE48 80241978 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D9EE4C 8024197C 8E30000C */  lw        $s0, 0xc($s1)
 /* D9EE50 80241980 00031080 */  sll       $v0, $v1, 2
 /* D9EE54 80241984 00431021 */  addu      $v0, $v0, $v1
@@ -45,8 +45,8 @@ glabel func_80241948_D9EE18
 /* D9EEB8 802419E8 00000000 */   nop      
 /* D9EEBC 802419EC 0C00A6C9 */  jal       clamp_angle
 /* D9EEC0 802419F0 46000306 */   mov.s    $f12, $f0
-/* D9EEC4 802419F4 3C018024 */  lui       $at, 0x8024
-/* D9EEC8 802419F8 D4227BB8 */  ldc1      $f2, 0x7bb8($at)
+/* D9EEC4 802419F4 3C018024 */  lui       $at, %hi(D_80247BB8)
+/* D9EEC8 802419F8 D4227BB8 */  ldc1      $f2, %lo(D_80247BB8)($at)
 /* D9EECC 802419FC 46000021 */  cvt.d.s   $f0, $f0
 /* D9EED0 80241A00 4622003C */  c.lt.d    $f0, $f2
 /* D9EED4 80241A04 00000000 */  nop       
@@ -67,8 +67,8 @@ glabel func_80241948_D9EE18
 /* D9EF0C 80241A3C 0C00A70A */  jal       get_clamped_angle_diff
 /* D9EF10 80241A40 46000386 */   mov.s    $f14, $f0
 /* D9EF14 80241A44 46000005 */  abs.s     $f0, $f0
-/* D9EF18 80241A48 3C018024 */  lui       $at, 0x8024
-/* D9EF1C 80241A4C D4227BC0 */  ldc1      $f2, 0x7bc0($at)
+/* D9EF18 80241A48 3C018024 */  lui       $at, %hi(D_80247BC0)
+/* D9EF1C 80241A4C D4227BC0 */  ldc1      $f2, %lo(D_80247BC0)($at)
 /* D9EF20 80241A50 46000021 */  cvt.d.s   $f0, $f0
 /* D9EF24 80241A54 4620103C */  c.lt.d    $f2, $f0
 /* D9EF28 80241A58 00000000 */  nop       
@@ -89,8 +89,8 @@ glabel func_80241948_D9EE18
 /* D9EF64 80241A94 00000000 */  nop       
 /* D9EF68 80241A98 4501001F */  bc1t      .L80241B18
 /* D9EF6C 80241A9C 2402FFFF */   addiu    $v0, $zero, -1
-/* D9EF70 80241AA0 3C038011 */  lui       $v1, 0x8011
-/* D9EF74 80241AA4 8063EBB3 */  lb        $v1, -0x144d($v1)
+/* D9EF70 80241AA0 3C038011 */  lui       $v1, %hi(D_8010EBB3)
+/* D9EF74 80241AA4 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
 /* D9EF78 80241AA8 24020009 */  addiu     $v0, $zero, 9
 /* D9EF7C 80241AAC 10620019 */  beq       $v1, $v0, .L80241B14
 /* D9EF80 80241AB0 24020007 */   addiu    $v0, $zero, 7
diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802423E0_D9F8B0.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802423E0_D9F8B0.s
index 2470c7d6f6..3565fd99dc 100644
--- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802423E0_D9F8B0.s
+++ b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802423E0_D9F8B0.s
@@ -7,8 +7,8 @@ glabel func_802423E0_D9F8B0
 /* D9F8B8 802423E8 0080982D */  daddu     $s3, $a0, $zero
 /* D9F8BC 802423EC AFB40040 */  sw        $s4, 0x40($sp)
 /* D9F8C0 802423F0 0000A02D */  daddu     $s4, $zero, $zero
-/* D9F8C4 802423F4 3C03800A */  lui       $v1, 0x800a
-/* D9F8C8 802423F8 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D9F8C4 802423F4 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D9F8C8 802423F8 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D9F8CC 802423FC 3C04800B */  lui       $a0, %hi(gCameras)
 /* D9F8D0 80242400 24841D80 */  addiu     $a0, $a0, %lo(gCameras)
 /* D9F8D4 80242404 AFBF0044 */  sw        $ra, 0x44($sp)
@@ -80,12 +80,12 @@ glabel func_802423E0_D9F8B0
 /* D9F9C8 802424F8 C64C006C */  lwc1      $f12, 0x6c($s2)
 /* D9F9CC 802424FC 0C00A6C9 */  jal       clamp_angle
 /* D9F9D0 80242500 00000000 */   nop      
-/* D9F9D4 80242504 3C018024 */  lui       $at, 0x8024
-/* D9F9D8 80242508 D4387BC8 */  ldc1      $f24, 0x7bc8($at)
+/* D9F9D4 80242504 3C018024 */  lui       $at, %hi(D_80247BC8)
+/* D9F9D8 80242508 D4387BC8 */  ldc1      $f24, %lo(D_80247BC8)($at)
 /* D9F9DC 8024250C 46000521 */  cvt.d.s   $f20, $f0
 /* D9F9E0 80242510 4638A300 */  add.d     $f12, $f20, $f24
-/* D9F9E4 80242514 3C018024 */  lui       $at, 0x8024
-/* D9F9E8 80242518 D4367BD0 */  ldc1      $f22, 0x7bd0($at)
+/* D9F9E4 80242514 3C018024 */  lui       $at, %hi(D_80247BD0)
+/* D9F9E8 80242518 D4367BD0 */  ldc1      $f22, %lo(D_80247BD0)($at)
 /* D9F9EC 8024251C 0C00A6C9 */  jal       clamp_angle
 /* D9F9F0 80242520 46206320 */   cvt.s.d  $f12, $f12
 /* D9F9F4 80242524 4636A500 */  add.d     $f20, $f20, $f22
@@ -113,8 +113,8 @@ glabel func_802423E0_D9F8B0
 /* D9FA4C 8024257C E616000C */  swc1      $f22, 0xc($s0)
 .L80242580:
 /* D9FA50 80242580 C6000018 */  lwc1      $f0, 0x18($s0)
-/* D9FA54 80242584 3C018024 */  lui       $at, 0x8024
-/* D9FA58 80242588 D4227BD8 */  ldc1      $f2, 0x7bd8($at)
+/* D9FA54 80242584 3C018024 */  lui       $at, %hi(D_80247BD8)
+/* D9FA58 80242588 D4227BD8 */  ldc1      $f2, %lo(D_80247BD8)($at)
 /* D9FA5C 8024258C 46000021 */  cvt.d.s   $f0, $f0
 /* D9FA60 80242590 46220002 */  mul.d     $f0, $f0, $f2
 /* D9FA64 80242594 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024283C_D9FD0C.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024283C_D9FD0C.s
index c787a5b10a..e73e352aa8 100644
--- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024283C_D9FD0C.s
+++ b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024283C_D9FD0C.s
@@ -103,9 +103,9 @@ glabel func_8024283C_D9FD0C
 /* D9FE7C 802429AC 2C620064 */  sltiu     $v0, $v1, 0x64
 /* D9FE80 802429B0 10400060 */  beqz      $v0, .L80242B34
 /* D9FE84 802429B4 00031080 */   sll      $v0, $v1, 2
-/* D9FE88 802429B8 3C018024 */  lui       $at, 0x8024
+/* D9FE88 802429B8 3C018024 */  lui       $at, %hi(D_80247BE0)
 /* D9FE8C 802429BC 00220821 */  addu      $at, $at, $v0
-/* D9FE90 802429C0 8C227BE0 */  lw        $v0, 0x7be0($at)
+/* D9FE90 802429C0 8C227BE0 */  lw        $v0, %lo(D_80247BE0)($at)
 /* D9FE94 802429C4 00400008 */  jr        $v0
 /* D9FE98 802429C8 00000000 */   nop      
 /* D9FE9C 802429CC 0260202D */  daddu     $a0, $s3, $zero
diff --git a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240000_DAD400.s b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240000_DAD400.s
index a9d159adf6..0135e7f308 100644
--- a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240000_DAD400.s
+++ b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240000_DAD400.s
@@ -4,8 +4,8 @@
 glabel func_80240000_DAD400
 /* DAD400 80240000 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* DAD404 80240004 AFB00010 */  sw        $s0, 0x10($sp)
-/* DAD408 80240008 3C108024 */  lui       $s0, 0x8024
-/* DAD40C 8024000C 26102630 */  addiu     $s0, $s0, 0x2630
+/* DAD408 80240008 3C108024 */  lui       $s0, %hi(D_80242630)
+/* DAD40C 8024000C 26102630 */  addiu     $s0, $s0, %lo(D_80242630)
 /* DAD410 80240010 AFBF0018 */  sw        $ra, 0x18($sp)
 /* DAD414 80240014 AFB10014 */  sw        $s1, 0x14($sp)
 /* DAD418 80240018 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_80240000_DAD400
 /* DAD47C 8024007C 28620010 */  slti      $v0, $v1, 0x10
 /* DAD480 80240080 1440FFFA */  bnez      $v0, .L8024006C
 /* DAD484 80240084 24840004 */   addiu    $a0, $a0, 4
-/* DAD488 80240088 3C108024 */  lui       $s0, 0x8024
-/* DAD48C 8024008C 26102630 */  addiu     $s0, $s0, 0x2630
+/* DAD488 80240088 3C108024 */  lui       $s0, %hi(D_80242630)
+/* DAD48C 8024008C 26102630 */  addiu     $s0, $s0, %lo(D_80242630)
 /* DAD490 80240090 0C00AB4B */  jal       heap_free
 /* DAD494 80240094 8E040000 */   lw       $a0, ($s0)
 /* DAD498 80240098 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802403A0_DAD7A0.s b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802403A0_DAD7A0.s
index aa4358c41e..a2139124f7 100644
--- a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802403A0_DAD7A0.s
+++ b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802403A0_DAD7A0.s
@@ -87,8 +87,8 @@ glabel func_802403A0_DAD7A0
 /* DAD8E0 802404E0 08090142 */  j         .L80240508
 /* DAD8E4 802404E4 E6000018 */   swc1     $f0, 0x18($s0)
 .L802404E8:
-/* DAD8E8 802404E8 3C018024 */  lui       $at, 0x8024
-/* DAD8EC 802404EC D4224CB0 */  ldc1      $f2, 0x4cb0($at)
+/* DAD8E8 802404E8 3C018024 */  lui       $at, %hi(D_80244CB0)
+/* DAD8EC 802404EC D4224CB0 */  ldc1      $f2, %lo(D_80244CB0)($at)
 /* DAD8F0 802404F0 44820000 */  mtc1      $v0, $f0
 /* DAD8F4 802404F4 00000000 */  nop       
 /* DAD8F8 802404F8 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240550_DAD950.s b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240550_DAD950.s
index 7d80f92829..b4ff9eeaa2 100644
--- a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240550_DAD950.s
+++ b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240550_DAD950.s
@@ -104,8 +104,8 @@ glabel func_80240550_DAD950
 /* DADAD4 802406D4 1040000A */  beqz      $v0, .L80240700
 /* DADAD8 802406D8 4600C106 */   mov.s    $f4, $f24
 /* DADADC 802406DC 4614C081 */  sub.s     $f2, $f24, $f20
-/* DADAE0 802406E0 3C018024 */  lui       $at, 0x8024
-/* DADAE4 802406E4 D4204CB8 */  ldc1      $f0, 0x4cb8($at)
+/* DADAE0 802406E0 3C018024 */  lui       $at, %hi(D_80244CB8)
+/* DADAE4 802406E4 D4204CB8 */  ldc1      $f0, %lo(D_80244CB8)($at)
 /* DADAE8 802406E8 460010A1 */  cvt.d.s   $f2, $f2
 /* DADAEC 802406EC 46201082 */  mul.d     $f2, $f2, $f0
 /* DADAF0 802406F0 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240FF4_DAE3F4.s b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240FF4_DAE3F4.s
index e6e4374698..c1fbce1d63 100644
--- a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240FF4_DAE3F4.s
+++ b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240FF4_DAE3F4.s
@@ -15,9 +15,9 @@ glabel func_80240FF4_DAE3F4
 /* DAE41C 8024101C 00031C00 */  sll       $v1, $v1, 0x10
 /* DAE420 80241020 00031B83 */  sra       $v1, $v1, 0xe
 /* DAE424 80241024 A444008E */  sh        $a0, 0x8e($v0)
-/* DAE428 80241028 3C018024 */  lui       $at, 0x8024
+/* DAE428 80241028 3C018024 */  lui       $at, %hi(D_80242EF0)
 /* DAE42C 8024102C 00230821 */  addu      $at, $at, $v1
-/* DAE430 80241030 C4222EF0 */  lwc1      $f2, 0x2ef0($at)
+/* DAE430 80241030 C4222EF0 */  lwc1      $f2, %lo(D_80242EF0)($at)
 /* DAE434 80241034 8443008E */  lh        $v1, 0x8e($v0)
 /* DAE438 80241038 46020000 */  add.s     $f0, $f0, $f2
 /* DAE43C 8024103C 28630005 */  slti      $v1, $v1, 5
diff --git a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802416AC_DAEAAC.s b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802416AC_DAEAAC.s
index 426fe39fb6..1b3504cf27 100644
--- a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802416AC_DAEAAC.s
+++ b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802416AC_DAEAAC.s
@@ -66,9 +66,9 @@ glabel func_802416AC_DAEAAC
 /* DAEB98 80241798 2C62000F */  sltiu     $v0, $v1, 0xf
 /* DAEB9C 8024179C 10400034 */  beqz      $v0, .L80241870
 /* DAEBA0 802417A0 00031080 */   sll      $v0, $v1, 2
-/* DAEBA4 802417A4 3C018024 */  lui       $at, 0x8024
+/* DAEBA4 802417A4 3C018024 */  lui       $at, %hi(D_80244CC8)
 /* DAEBA8 802417A8 00220821 */  addu      $at, $at, $v0
-/* DAEBAC 802417AC 8C224CC8 */  lw        $v0, 0x4cc8($at)
+/* DAEBAC 802417AC 8C224CC8 */  lw        $v0, %lo(D_80244CC8)($at)
 /* DAEBB0 802417B0 00400008 */  jr        $v0
 /* DAEBB4 802417B4 00000000 */   nop      
 /* DAEBB8 802417B8 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241898_DAEC98.s b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241898_DAEC98.s
index b56d58032a..8024ae1cac 100644
--- a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241898_DAEC98.s
+++ b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241898_DAEC98.s
@@ -11,8 +11,8 @@ glabel func_80241898_DAEC98
 /* DAECB0 802418B0 0C00EABB */  jal       get_npc_unsafe
 /* DAECB4 802418B4 86040008 */   lh       $a0, 8($s0)
 /* DAECB8 802418B8 C4400018 */  lwc1      $f0, 0x18($v0)
-/* DAECBC 802418BC 3C018024 */  lui       $at, 0x8024
-/* DAECC0 802418C0 D4224D08 */  ldc1      $f2, 0x4d08($at)
+/* DAECBC 802418BC 3C018024 */  lui       $at, %hi(D_80244D08)
+/* DAECC0 802418C0 D4224D08 */  ldc1      $f2, %lo(D_80244D08)($at)
 /* DAECC4 802418C4 46000021 */  cvt.d.s   $f0, $f0
 /* DAECC8 802418C8 46220002 */  mul.d     $f0, $f0, $f2
 /* DAECCC 802418CC 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241908_DAED08.s b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241908_DAED08.s
index 3b63c3ad17..9be6ac355c 100644
--- a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241908_DAED08.s
+++ b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241908_DAED08.s
@@ -35,8 +35,8 @@ glabel func_80241908_DAED08
 /* DAED7C 8024197C 14400010 */  bnez      $v0, .L802419C0
 /* DAED80 80241980 00000000 */   nop      
 /* DAED84 80241984 C6000018 */  lwc1      $f0, 0x18($s0)
-/* DAED88 80241988 3C018024 */  lui       $at, 0x8024
-/* DAED8C 8024198C D4224D10 */  ldc1      $f2, 0x4d10($at)
+/* DAED88 80241988 3C018024 */  lui       $at, %hi(D_80244D10)
+/* DAED8C 8024198C D4224D10 */  ldc1      $f2, %lo(D_80244D10)($at)
 /* DAED90 80241990 46000021 */  cvt.d.s   $f0, $f0
 /* DAED94 80241994 46220002 */  mul.d     $f0, $f0, $f2
 /* DAED98 80241998 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241AD0_DAEED0.s b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241AD0_DAEED0.s
index f65e179a24..f614d7a69d 100644
--- a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241AD0_DAEED0.s
+++ b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241AD0_DAEED0.s
@@ -124,9 +124,9 @@ glabel func_80241AD0_DAEED0
 /* DAF094 80241C94 2C620064 */  sltiu     $v0, $v1, 0x64
 /* DAF098 80241C98 10400050 */  beqz      $v0, .L80241DDC
 /* DAF09C 80241C9C 00031080 */   sll      $v0, $v1, 2
-/* DAF0A0 80241CA0 3C018024 */  lui       $at, 0x8024
+/* DAF0A0 80241CA0 3C018024 */  lui       $at, %hi(D_80244D18)
 /* DAF0A4 80241CA4 00220821 */  addu      $at, $at, $v0
-/* DAF0A8 80241CA8 8C224D18 */  lw        $v0, 0x4d18($at)
+/* DAF0A8 80241CA8 8C224D18 */  lw        $v0, %lo(D_80244D18)($at)
 /* DAF0AC 80241CAC 00400008 */  jr        $v0
 /* DAF0B0 80241CB0 00000000 */   nop      
 /* DAF0B4 80241CB4 0260202D */  daddu     $a0, $s3, $zero
diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240000_DB22C0.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240000_DB22C0.s
index bb74a0fc6e..455af4e73a 100644
--- a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240000_DB22C0.s
+++ b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240000_DB22C0.s
@@ -11,8 +11,8 @@ glabel func_80240000_DB22C0
 /* DB22D8 80240018 0C00EABB */  jal       get_npc_unsafe
 /* DB22DC 8024001C 86040008 */   lh       $a0, 8($s0)
 /* DB22E0 80240020 C4400018 */  lwc1      $f0, 0x18($v0)
-/* DB22E4 80240024 3C018024 */  lui       $at, 0x8024
-/* DB22E8 80240028 D42252B0 */  ldc1      $f2, 0x52b0($at)
+/* DB22E4 80240024 3C018024 */  lui       $at, %hi(D_802452B0)
+/* DB22E8 80240028 D42252B0 */  ldc1      $f2, %lo(D_802452B0)($at)
 /* DB22EC 8024002C 46000021 */  cvt.d.s   $f0, $f0
 /* DB22F0 80240030 46220002 */  mul.d     $f0, $f0, $f2
 /* DB22F4 80240034 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240070_DB2330.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240070_DB2330.s
index 6beca31790..bd5cb83568 100644
--- a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240070_DB2330.s
+++ b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240070_DB2330.s
@@ -35,8 +35,8 @@ glabel func_80240070_DB2330
 /* DB23A4 802400E4 14400010 */  bnez      $v0, .L80240128
 /* DB23A8 802400E8 00000000 */   nop      
 /* DB23AC 802400EC C6000018 */  lwc1      $f0, 0x18($s0)
-/* DB23B0 802400F0 3C018024 */  lui       $at, 0x8024
-/* DB23B4 802400F4 D42252B8 */  ldc1      $f2, 0x52b8($at)
+/* DB23B0 802400F0 3C018024 */  lui       $at, %hi(D_802452B8)
+/* DB23B4 802400F4 D42252B8 */  ldc1      $f2, %lo(D_802452B8)($at)
 /* DB23B8 802400F8 46000021 */  cvt.d.s   $f0, $f0
 /* DB23BC 802400FC 46220002 */  mul.d     $f0, $f0, $f2
 /* DB23C0 80240100 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240238_DB24F8.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240238_DB24F8.s
index 506ead4eac..628cdb3330 100644
--- a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240238_DB24F8.s
+++ b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240238_DB24F8.s
@@ -124,9 +124,9 @@ glabel func_80240238_DB24F8
 /* DB26BC 802403FC 2C620064 */  sltiu     $v0, $v1, 0x64
 /* DB26C0 80240400 10400050 */  beqz      $v0, .L80240544
 /* DB26C4 80240404 00031080 */   sll      $v0, $v1, 2
-/* DB26C8 80240408 3C018024 */  lui       $at, 0x8024
+/* DB26C8 80240408 3C018024 */  lui       $at, %hi(D_802452C0)
 /* DB26CC 8024040C 00220821 */  addu      $at, $at, $v0
-/* DB26D0 80240410 8C2252C0 */  lw        $v0, 0x52c0($at)
+/* DB26D0 80240410 8C2252C0 */  lw        $v0, %lo(D_802452C0)($at)
 /* DB26D4 80240414 00400008 */  jr        $v0
 /* DB26D8 80240418 00000000 */   nop      
 /* DB26DC 8024041C 0260202D */  daddu     $a0, $s3, $zero
diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802405BC_DB287C.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802405BC_DB287C.s
index d487ef88b2..06f94308d6 100644
--- a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802405BC_DB287C.s
+++ b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802405BC_DB287C.s
@@ -89,12 +89,12 @@ glabel func_802405BC_DB287C
 /* DB29A4 802406E4 AE230028 */  sw        $v1, 0x28($s1)
 .L802406E8:
 /* DB29A8 802406E8 C6200048 */  lwc1      $f0, 0x48($s1)
-/* DB29AC 802406EC 3C018024 */  lui       $at, 0x8024
-/* DB29B0 802406F0 D4225450 */  ldc1      $f2, 0x5450($at)
+/* DB29AC 802406EC 3C018024 */  lui       $at, %hi(D_80245450)
+/* DB29B0 802406F0 D4225450 */  ldc1      $f2, %lo(D_80245450)($at)
 /* DB29B4 802406F4 46000021 */  cvt.d.s   $f0, $f0
 /* DB29B8 802406F8 46220000 */  add.d     $f0, $f0, $f2
-/* DB29BC 802406FC 3C018024 */  lui       $at, 0x8024
-/* DB29C0 80240700 D4225458 */  ldc1      $f2, 0x5458($at)
+/* DB29BC 802406FC 3C018024 */  lui       $at, %hi(D_80245458)
+/* DB29C0 80240700 D4225458 */  ldc1      $f2, %lo(D_80245458)($at)
 /* DB29C4 80240704 46200020 */  cvt.s.d   $f0, $f0
 /* DB29C8 80240708 E6200048 */  swc1      $f0, 0x48($s1)
 /* DB29CC 8024070C 46000021 */  cvt.d.s   $f0, $f0
diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240780_DB2A40.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240780_DB2A40.s
index 83321b551c..f4e9bc4ad2 100644
--- a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240780_DB2A40.s
+++ b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240780_DB2A40.s
@@ -124,9 +124,9 @@ glabel func_80240780_DB2A40
 /* DB2C04 80240944 2C620064 */  sltiu     $v0, $v1, 0x64
 /* DB2C08 80240948 10400038 */  beqz      $v0, .L80240A2C
 /* DB2C0C 8024094C 00031080 */   sll      $v0, $v1, 2
-/* DB2C10 80240950 3C018024 */  lui       $at, 0x8024
+/* DB2C10 80240950 3C018024 */  lui       $at, %hi(D_80245460)
 /* DB2C14 80240954 00220821 */  addu      $at, $at, $v0
-/* DB2C18 80240958 8C225460 */  lw        $v0, 0x5460($at)
+/* DB2C18 80240958 8C225460 */  lw        $v0, %lo(D_80245460)($at)
 /* DB2C1C 8024095C 00400008 */  jr        $v0
 /* DB2C20 80240960 00000000 */   nop      
 /* DB2C24 80240964 0260202D */  daddu     $a0, $s3, $zero
diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240A54_DB2D14.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240A54_DB2D14.s
index f3f724b1e7..89c7b48449 100644
--- a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240A54_DB2D14.s
+++ b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240A54_DB2D14.s
@@ -87,8 +87,8 @@ glabel func_80240A54_DB2D14
 /* DB2E54 80240B94 080902EF */  j         .L80240BBC
 /* DB2E58 80240B98 E6000018 */   swc1     $f0, 0x18($s0)
 .L80240B9C:
-/* DB2E5C 80240B9C 3C018024 */  lui       $at, 0x8024
-/* DB2E60 80240BA0 D42255F0 */  ldc1      $f2, 0x55f0($at)
+/* DB2E5C 80240B9C 3C018024 */  lui       $at, %hi(D_802455F0)
+/* DB2E60 80240BA0 D42255F0 */  ldc1      $f2, %lo(D_802455F0)($at)
 /* DB2E64 80240BA4 44820000 */  mtc1      $v0, $f0
 /* DB2E68 80240BA8 00000000 */  nop       
 /* DB2E6C 80240BAC 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240C04_DB2EC4.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240C04_DB2EC4.s
index c89ee7bb7b..494344ad78 100644
--- a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240C04_DB2EC4.s
+++ b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240C04_DB2EC4.s
@@ -104,8 +104,8 @@ glabel func_80240C04_DB2EC4
 /* DB3048 80240D88 1040000A */  beqz      $v0, .L80240DB4
 /* DB304C 80240D8C 4600C106 */   mov.s    $f4, $f24
 /* DB3050 80240D90 4614C081 */  sub.s     $f2, $f24, $f20
-/* DB3054 80240D94 3C018024 */  lui       $at, 0x8024
-/* DB3058 80240D98 D42055F8 */  ldc1      $f0, 0x55f8($at)
+/* DB3054 80240D94 3C018024 */  lui       $at, %hi(D_802455F8)
+/* DB3058 80240D98 D42055F8 */  ldc1      $f0, %lo(D_802455F8)($at)
 /* DB305C 80240D9C 460010A1 */  cvt.d.s   $f2, $f2
 /* DB3060 80240DA0 46201082 */  mul.d     $f2, $f2, $f0
 /* DB3064 80240DA4 00000000 */  nop       
@@ -131,8 +131,8 @@ glabel func_80240C04_DB2EC4
 /* DB30B0 80240DF0 C7A4002C */  lwc1      $f4, 0x2c($sp)
 /* DB30B4 80240DF4 461A2100 */  add.s     $f4, $f4, $f26
 /* DB30B8 80240DF8 46142081 */  sub.s     $f2, $f4, $f20
-/* DB30BC 80240DFC 3C018024 */  lui       $at, 0x8024
-/* DB30C0 80240E00 D4205600 */  ldc1      $f0, 0x5600($at)
+/* DB30BC 80240DFC 3C018024 */  lui       $at, %hi(D_80245600)
+/* DB30C0 80240E00 D4205600 */  ldc1      $f0, %lo(D_80245600)($at)
 /* DB30C4 80240E04 460010A1 */  cvt.d.s   $f2, $f2
 /* DB30C8 80240E08 46201082 */  mul.d     $f2, $f2, $f0
 /* DB30CC 80240E0C 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802416A8_DB3968.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802416A8_DB3968.s
index 067a4ef3c3..32fac8a129 100644
--- a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802416A8_DB3968.s
+++ b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802416A8_DB3968.s
@@ -15,9 +15,9 @@ glabel func_802416A8_DB3968
 /* DB3990 802416D0 00031C00 */  sll       $v1, $v1, 0x10
 /* DB3994 802416D4 00031B83 */  sra       $v1, $v1, 0xe
 /* DB3998 802416D8 A444008E */  sh        $a0, 0x8e($v0)
-/* DB399C 802416DC 3C018024 */  lui       $at, 0x8024
+/* DB399C 802416DC 3C018024 */  lui       $at, %hi(D_80242F88)
 /* DB39A0 802416E0 00230821 */  addu      $at, $at, $v1
-/* DB39A4 802416E4 C4222F88 */  lwc1      $f2, 0x2f88($at)
+/* DB39A4 802416E4 C4222F88 */  lwc1      $f2, %lo(D_80242F88)($at)
 /* DB39A8 802416E8 8443008E */  lh        $v1, 0x8e($v0)
 /* DB39AC 802416EC 46020000 */  add.s     $f0, $f0, $f2
 /* DB39B0 802416F0 28630005 */  slti      $v1, $v1, 5
diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241D60_DB4020.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241D60_DB4020.s
index 42ce993af6..e933d34ad5 100644
--- a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241D60_DB4020.s
+++ b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241D60_DB4020.s
@@ -66,9 +66,9 @@ glabel func_80241D60_DB4020
 /* DB410C 80241E4C 2C62000F */  sltiu     $v0, $v1, 0xf
 /* DB4110 80241E50 10400034 */  beqz      $v0, .L80241F24
 /* DB4114 80241E54 00031080 */   sll      $v0, $v1, 2
-/* DB4118 80241E58 3C018024 */  lui       $at, 0x8024
+/* DB4118 80241E58 3C018024 */  lui       $at, %hi(D_80245608)
 /* DB411C 80241E5C 00220821 */  addu      $at, $at, $v0
-/* DB4120 80241E60 8C225608 */  lw        $v0, 0x5608($at)
+/* DB4120 80241E60 8C225608 */  lw        $v0, %lo(D_80245608)($at)
 /* DB4124 80241E64 00400008 */  jr        $v0
 /* DB4128 80241E68 00000000 */   nop      
 /* DB412C 80241E6C 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80242178_DB4438.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80242178_DB4438.s
index af0da2a422..304868b3e8 100644
--- a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80242178_DB4438.s
+++ b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80242178_DB4438.s
@@ -6,11 +6,11 @@ glabel func_80242178_DB4438
 /* DB443C 8024217C AFBF0010 */  sw        $ra, 0x10($sp)
 /* DB4440 80242180 10A00003 */  beqz      $a1, .L80242190
 /* DB4444 80242184 8C86000C */   lw       $a2, 0xc($a0)
-/* DB4448 80242188 3C018024 */  lui       $at, 0x8024
-/* DB444C 8024218C AC203098 */  sw        $zero, 0x3098($at)
+/* DB4448 80242188 3C018024 */  lui       $at, %hi(D_80243098)
+/* DB444C 8024218C AC203098 */  sw        $zero, %lo(D_80243098)($at)
 .L80242190:
-/* DB4450 80242190 3C038024 */  lui       $v1, 0x8024
-/* DB4454 80242194 24633098 */  addiu     $v1, $v1, 0x3098
+/* DB4450 80242190 3C038024 */  lui       $v1, %hi(D_80243098)
+/* DB4454 80242194 24633098 */  addiu     $v1, $v1, %lo(D_80243098)
 /* DB4458 80242198 8C620000 */  lw        $v0, ($v1)
 /* DB445C 8024219C 54400003 */  bnel      $v0, $zero, .L802421AC
 /* DB4460 802421A0 AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_80242178_DB4438
 /* DB4468 802421A8 0000102D */   daddu    $v0, $zero, $zero
 .L802421AC:
 /* DB446C 802421AC 8CC50000 */  lw        $a1, ($a2)
-/* DB4470 802421B0 3C068024 */  lui       $a2, 0x8024
+/* DB4470 802421B0 3C068024 */  lui       $a2, %hi(D_8024309C)
 /* DB4474 802421B4 0C0B2026 */  jal       set_variable
-/* DB4478 802421B8 8CC6309C */   lw       $a2, 0x309c($a2)
+/* DB4478 802421B8 8CC6309C */   lw       $a2, %lo(D_8024309C)($a2)
 /* DB447C 802421BC 24020002 */  addiu     $v0, $zero, 2
 .L802421C0:
 /* DB4480 802421C0 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802421CC_DB448C.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802421CC_DB448C.s
index d349e23bdf..c113fa38ae 100644
--- a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802421CC_DB448C.s
+++ b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802421CC_DB448C.s
@@ -7,12 +7,12 @@ glabel func_802421CC_DB448C
 /* DB4494 802421D4 8C82000C */  lw        $v0, 0xc($a0)
 /* DB4498 802421D8 0C0B1EAF */  jal       get_variable
 /* DB449C 802421DC 8C450000 */   lw       $a1, ($v0)
-/* DB44A0 802421E0 3C018024 */  lui       $at, 0x8024
-/* DB44A4 802421E4 AC22309C */  sw        $v0, 0x309c($at)
+/* DB44A0 802421E0 3C018024 */  lui       $at, %hi(D_8024309C)
+/* DB44A4 802421E4 AC22309C */  sw        $v0, %lo(D_8024309C)($at)
 /* DB44A8 802421E8 24020002 */  addiu     $v0, $zero, 2
 /* DB44AC 802421EC 8FBF0010 */  lw        $ra, 0x10($sp)
 /* DB44B0 802421F0 24030001 */  addiu     $v1, $zero, 1
-/* DB44B4 802421F4 3C018024 */  lui       $at, 0x8024
-/* DB44B8 802421F8 AC233098 */  sw        $v1, 0x3098($at)
+/* DB44B4 802421F4 3C018024 */  lui       $at, %hi(D_80243098)
+/* DB44B8 802421F8 AC233098 */  sw        $v1, %lo(D_80243098)($at)
 /* DB44BC 802421FC 03E00008 */  jr        $ra
 /* DB44C0 80242200 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80242204_DB44C4.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80242204_DB44C4.s
index 7d4d7f99fa..4bafe05b12 100644
--- a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80242204_DB44C4.s
+++ b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80242204_DB44C4.s
@@ -13,8 +13,8 @@ glabel func_80242204_DB44C4
 /* DB44E4 80242224 8C620000 */  lw        $v0, ($v1)
 /* DB44E8 80242228 5040000A */  beql      $v0, $zero, .L80242254
 /* DB44EC 8024222C 00041080 */   sll      $v0, $a0, 2
-/* DB44F0 80242230 3C058024 */  lui       $a1, 0x8024
-/* DB44F4 80242234 24A55650 */  addiu     $a1, $a1, 0x5650
+/* DB44F0 80242230 3C058024 */  lui       $a1, %hi(D_80245650)
+/* DB44F4 80242234 24A55650 */  addiu     $a1, $a1, %lo(D_80245650)
 .L80242238:
 /* DB44F8 80242238 24630004 */  addiu     $v1, $v1, 4
 /* DB44FC 8024223C 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_80242204_DB44C4
 /* DB450C 8024224C 24A50004 */   addiu    $a1, $a1, 4
 /* DB4510 80242250 00041080 */  sll       $v0, $a0, 2
 .L80242254:
-/* DB4514 80242254 3C018024 */  lui       $at, 0x8024
+/* DB4514 80242254 3C018024 */  lui       $at, %hi(D_80245650)
 /* DB4518 80242258 00220821 */  addu      $at, $at, $v0
-/* DB451C 8024225C AC205650 */  sw        $zero, 0x5650($at)
+/* DB451C 8024225C AC205650 */  sw        $zero, %lo(D_80245650)($at)
 /* DB4520 80242260 080908A4 */  j         .L80242290
 /* DB4524 80242264 00000000 */   nop      
 .L80242268:
-/* DB4528 80242268 3C038024 */  lui       $v1, 0x8024
-/* DB452C 8024226C 24635650 */  addiu     $v1, $v1, 0x5650
+/* DB4528 80242268 3C038024 */  lui       $v1, %hi(D_80245650)
+/* DB452C 8024226C 24635650 */  addiu     $v1, $v1, %lo(D_80245650)
 /* DB4530 80242270 0060282D */  daddu     $a1, $v1, $zero
 .L80242274:
 /* DB4534 80242274 24820080 */  addiu     $v0, $a0, 0x80
diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80242328_DB45E8.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80242328_DB45E8.s
index 9ff592865a..52d29d1782 100644
--- a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80242328_DB45E8.s
+++ b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80242328_DB45E8.s
@@ -31,8 +31,8 @@ glabel func_80242328_DB45E8
 /* DB464C 8024238C 0C019EC8 */  jal       guRotateF
 /* DB4650 80242390 00C0382D */   daddu    $a3, $a2, $zero
 /* DB4654 80242394 C6000070 */  lwc1      $f0, 0x70($s0)
-/* DB4658 80242398 3C018024 */  lui       $at, 0x8024
-/* DB465C 8024239C D4225648 */  ldc1      $f2, 0x5648($at)
+/* DB4658 80242398 3C018024 */  lui       $at, %hi(D_80245648)
+/* DB465C 8024239C D4225648 */  ldc1      $f2, %lo(D_80245648)($at)
 /* DB4660 802423A0 46000021 */  cvt.d.s   $f0, $f0
 /* DB4664 802423A4 4620103E */  c.le.d    $f2, $f0
 /* DB4668 802423A8 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802423C8_DB4688.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802423C8_DB4688.s
index ba26dfa4dc..123098555c 100644
--- a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802423C8_DB4688.s
+++ b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802423C8_DB4688.s
@@ -3,8 +3,8 @@
 
 glabel func_802423C8_DB4688
 /* DB4688 802423C8 2404005A */  addiu     $a0, $zero, 0x5a
-/* DB468C 802423CC 3C038024 */  lui       $v1, 0x8024
-/* DB4690 802423D0 24635928 */  addiu     $v1, $v1, 0x5928
+/* DB468C 802423CC 3C038024 */  lui       $v1, %hi(D_80245928)
+/* DB4690 802423D0 24635928 */  addiu     $v1, $v1, %lo(D_80245928)
 /* DB4694 802423D4 240200DA */  addiu     $v0, $zero, 0xda
 .L802423D8:
 /* DB4698 802423D8 AC620000 */  sw        $v0, ($v1)
@@ -12,8 +12,8 @@ glabel func_802423C8_DB4688
 /* DB46A0 802423E0 2484FFFF */  addiu     $a0, $a0, -1
 /* DB46A4 802423E4 0481FFFC */  bgez      $a0, .L802423D8
 /* DB46A8 802423E8 2442FFFF */   addiu    $v0, $v0, -1
-/* DB46AC 802423EC 3C018024 */  lui       $at, 0x8024
-/* DB46B0 802423F0 AC20592C */  sw        $zero, 0x592c($at)
+/* DB46AC 802423EC 3C018024 */  lui       $at, %hi(D_8024592C)
+/* DB46B0 802423F0 AC20592C */  sw        $zero, %lo(D_8024592C)($at)
 /* DB46B4 802423F4 03E00008 */  jr        $ra
 /* DB46B8 802423F8 24020002 */   addiu    $v0, $zero, 2
 /* DB46BC 802423FC 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_omo/omo_06/DB8180/func_80240870_DB8180.s b/asm/nonmatchings/world/area_omo/omo_06/DB8180/func_80240870_DB8180.s
index 6a5810ba31..0ad5a8b0e9 100644
--- a/asm/nonmatchings/world/area_omo/omo_06/DB8180/func_80240870_DB8180.s
+++ b/asm/nonmatchings/world/area_omo/omo_06/DB8180/func_80240870_DB8180.s
@@ -4,8 +4,8 @@
 glabel func_80240870_DB8180
 /* DB8180 80240870 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* DB8184 80240874 AFB00010 */  sw        $s0, 0x10($sp)
-/* DB8188 80240878 3C108024 */  lui       $s0, 0x8024
-/* DB818C 8024087C 261056C0 */  addiu     $s0, $s0, 0x56c0
+/* DB8188 80240878 3C108024 */  lui       $s0, %hi(D_802456C0)
+/* DB818C 8024087C 261056C0 */  addiu     $s0, $s0, %lo(D_802456C0)
 /* DB8190 80240880 AFBF0018 */  sw        $ra, 0x18($sp)
 /* DB8194 80240884 AFB10014 */  sw        $s1, 0x14($sp)
 /* DB8198 80240888 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_80240870_DB8180
 /* DB81FC 802408EC 28620010 */  slti      $v0, $v1, 0x10
 /* DB8200 802408F0 1440FFFA */  bnez      $v0, .L802408DC
 /* DB8204 802408F4 24840004 */   addiu    $a0, $a0, 4
-/* DB8208 802408F8 3C108024 */  lui       $s0, 0x8024
-/* DB820C 802408FC 261056C0 */  addiu     $s0, $s0, 0x56c0
+/* DB8208 802408F8 3C108024 */  lui       $s0, %hi(D_802456C0)
+/* DB820C 802408FC 261056C0 */  addiu     $s0, $s0, %lo(D_802456C0)
 /* DB8210 80240900 0C00AB4B */  jal       heap_free
 /* DB8214 80240904 8E040000 */   lw       $a0, ($s0)
 /* DB8218 80240908 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240000_DBD2B0.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240000_DBD2B0.s
index dced7d0829..f2a660f989 100644
--- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240000_DBD2B0.s
+++ b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240000_DBD2B0.s
@@ -11,8 +11,8 @@ glabel func_80240000_DBD2B0
 /* DBD2C8 80240018 0C00EABB */  jal       get_npc_unsafe
 /* DBD2CC 8024001C 86040008 */   lh       $a0, 8($s0)
 /* DBD2D0 80240020 C4400018 */  lwc1      $f0, 0x18($v0)
-/* DBD2D4 80240024 3C018024 */  lui       $at, 0x8024
-/* DBD2D8 80240028 D4226BD0 */  ldc1      $f2, 0x6bd0($at)
+/* DBD2D4 80240024 3C018024 */  lui       $at, %hi(D_80246BD0)
+/* DBD2D8 80240028 D4226BD0 */  ldc1      $f2, %lo(D_80246BD0)($at)
 /* DBD2DC 8024002C 46000021 */  cvt.d.s   $f0, $f0
 /* DBD2E0 80240030 46220002 */  mul.d     $f0, $f0, $f2
 /* DBD2E4 80240034 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240070_DBD320.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240070_DBD320.s
index 3b73233f56..48a890cebf 100644
--- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240070_DBD320.s
+++ b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240070_DBD320.s
@@ -35,8 +35,8 @@ glabel func_80240070_DBD320
 /* DBD394 802400E4 14400010 */  bnez      $v0, .L80240128
 /* DBD398 802400E8 00000000 */   nop      
 /* DBD39C 802400EC C6000018 */  lwc1      $f0, 0x18($s0)
-/* DBD3A0 802400F0 3C018024 */  lui       $at, 0x8024
-/* DBD3A4 802400F4 D4226BD8 */  ldc1      $f2, 0x6bd8($at)
+/* DBD3A0 802400F0 3C018024 */  lui       $at, %hi(D_80246BD8)
+/* DBD3A4 802400F4 D4226BD8 */  ldc1      $f2, %lo(D_80246BD8)($at)
 /* DBD3A8 802400F8 46000021 */  cvt.d.s   $f0, $f0
 /* DBD3AC 802400FC 46220002 */  mul.d     $f0, $f0, $f2
 /* DBD3B0 80240100 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240238_DBD4E8.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240238_DBD4E8.s
index 74b11f3898..95e5a246ea 100644
--- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240238_DBD4E8.s
+++ b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240238_DBD4E8.s
@@ -124,9 +124,9 @@ glabel func_80240238_DBD4E8
 /* DBD6AC 802403FC 2C620064 */  sltiu     $v0, $v1, 0x64
 /* DBD6B0 80240400 10400050 */  beqz      $v0, .L80240544
 /* DBD6B4 80240404 00031080 */   sll      $v0, $v1, 2
-/* DBD6B8 80240408 3C018024 */  lui       $at, 0x8024
+/* DBD6B8 80240408 3C018024 */  lui       $at, %hi(D_80246BE0)
 /* DBD6BC 8024040C 00220821 */  addu      $at, $at, $v0
-/* DBD6C0 80240410 8C226BE0 */  lw        $v0, 0x6be0($at)
+/* DBD6C0 80240410 8C226BE0 */  lw        $v0, %lo(D_80246BE0)($at)
 /* DBD6C4 80240414 00400008 */  jr        $v0
 /* DBD6C8 80240418 00000000 */   nop      
 /* DBD6CC 8024041C 0260202D */  daddu     $a0, $s3, $zero
diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_8024056C_DBD81C.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_8024056C_DBD81C.s
index a484db9067..1205071b94 100644
--- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_8024056C_DBD81C.s
+++ b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_8024056C_DBD81C.s
@@ -69,8 +69,8 @@ glabel func_8024056C_DBD81C
 /* DBD910 80240660 080901A2 */  j         .L80240688
 /* DBD914 80240664 E6800018 */   swc1     $f0, 0x18($s4)
 .L80240668:
-/* DBD918 80240668 3C018024 */  lui       $at, 0x8024
-/* DBD91C 8024066C D4226D70 */  ldc1      $f2, 0x6d70($at)
+/* DBD918 80240668 3C018024 */  lui       $at, %hi(D_80246D70)
+/* DBD91C 8024066C D4226D70 */  ldc1      $f2, %lo(D_80246D70)($at)
 /* DBD920 80240670 44820000 */  mtc1      $v0, $f0
 /* DBD924 80240674 00000000 */  nop       
 /* DBD928 80240678 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240BE8_DBDE98.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240BE8_DBDE98.s
index 6142fbc12e..a7c0ce000f 100644
--- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240BE8_DBDE98.s
+++ b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240BE8_DBDE98.s
@@ -33,8 +33,8 @@ glabel func_80240BE8_DBDE98
 /* DBDF04 80240C54 0809031F */  j         .L80240C7C
 /* DBDF08 80240C58 E4A00018 */   swc1     $f0, 0x18($a1)
 .L80240C5C:
-/* DBDF0C 80240C5C 3C018024 */  lui       $at, 0x8024
-/* DBDF10 80240C60 D4226D78 */  ldc1      $f2, 0x6d78($at)
+/* DBDF0C 80240C5C 3C018024 */  lui       $at, %hi(D_80246D78)
+/* DBDF10 80240C60 D4226D78 */  ldc1      $f2, %lo(D_80246D78)($at)
 /* DBDF14 80240C64 44820000 */  mtc1      $v0, $f0
 /* DBDF18 80240C68 00000000 */  nop       
 /* DBDF1C 80240C6C 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241100_DBE3B0.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241100_DBE3B0.s
index 01ada6fa57..598e6744c3 100644
--- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241100_DBE3B0.s
+++ b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241100_DBE3B0.s
@@ -124,9 +124,9 @@ glabel func_80241100_DBE3B0
 /* DBE574 802412C4 2C620064 */  sltiu     $v0, $v1, 0x64
 /* DBE578 802412C8 10400042 */  beqz      $v0, .L802413D4
 /* DBE57C 802412CC 00031080 */   sll      $v0, $v1, 2
-/* DBE580 802412D0 3C018024 */  lui       $at, 0x8024
+/* DBE580 802412D0 3C018024 */  lui       $at, %hi(D_80246D80)
 /* DBE584 802412D4 00220821 */  addu      $at, $at, $v0
-/* DBE588 802412D8 8C226D80 */  lw        $v0, 0x6d80($at)
+/* DBE588 802412D8 8C226D80 */  lw        $v0, %lo(D_80246D80)($at)
 /* DBE58C 802412DC 00400008 */  jr        $v0
 /* DBE590 802412E0 00000000 */   nop      
 /* DBE594 802412E4 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_802413FC_DBE6AC.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_802413FC_DBE6AC.s
index 6b2abcdd55..31149461f1 100644
--- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_802413FC_DBE6AC.s
+++ b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_802413FC_DBE6AC.s
@@ -11,8 +11,8 @@ glabel func_802413FC_DBE6AC
 /* DBE6C4 80241414 0C00EABB */  jal       get_npc_unsafe
 /* DBE6C8 80241418 86040008 */   lh       $a0, 8($s0)
 /* DBE6CC 8024141C C4400018 */  lwc1      $f0, 0x18($v0)
-/* DBE6D0 80241420 3C018024 */  lui       $at, 0x8024
-/* DBE6D4 80241424 D4226F10 */  ldc1      $f2, 0x6f10($at)
+/* DBE6D0 80241420 3C018024 */  lui       $at, %hi(D_80246F10)
+/* DBE6D4 80241424 D4226F10 */  ldc1      $f2, %lo(D_80246F10)($at)
 /* DBE6D8 80241428 46000021 */  cvt.d.s   $f0, $f0
 /* DBE6DC 8024142C 46220002 */  mul.d     $f0, $f0, $f2
 /* DBE6E0 80241430 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_8024146C_DBE71C.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_8024146C_DBE71C.s
index 329348ba6c..23bee98ba0 100644
--- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_8024146C_DBE71C.s
+++ b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_8024146C_DBE71C.s
@@ -35,8 +35,8 @@ glabel func_8024146C_DBE71C
 /* DBE790 802414E0 14400010 */  bnez      $v0, .L80241524
 /* DBE794 802414E4 00000000 */   nop      
 /* DBE798 802414E8 C6000018 */  lwc1      $f0, 0x18($s0)
-/* DBE79C 802414EC 3C018024 */  lui       $at, 0x8024
-/* DBE7A0 802414F0 D4226F18 */  ldc1      $f2, 0x6f18($at)
+/* DBE79C 802414EC 3C018024 */  lui       $at, %hi(D_80246F18)
+/* DBE7A0 802414F0 D4226F18 */  ldc1      $f2, %lo(D_80246F18)($at)
 /* DBE7A4 802414F4 46000021 */  cvt.d.s   $f0, $f0
 /* DBE7A8 802414F8 46220002 */  mul.d     $f0, $f0, $f2
 /* DBE7AC 802414FC 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241634_DBE8E4.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241634_DBE8E4.s
index 2b7a5d1f04..e8b8227971 100644
--- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241634_DBE8E4.s
+++ b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241634_DBE8E4.s
@@ -124,9 +124,9 @@ glabel func_80241634_DBE8E4
 /* DBEAA8 802417F8 2C620064 */  sltiu     $v0, $v1, 0x64
 /* DBEAAC 802417FC 10400054 */  beqz      $v0, .L80241950
 /* DBEAB0 80241800 00031080 */   sll      $v0, $v1, 2
-/* DBEAB4 80241804 3C018024 */  lui       $at, 0x8024
+/* DBEAB4 80241804 3C018024 */  lui       $at, %hi(D_80246F20)
 /* DBEAB8 80241808 00220821 */  addu      $at, $at, $v0
-/* DBEABC 8024180C 8C226F20 */  lw        $v0, 0x6f20($at)
+/* DBEABC 8024180C 8C226F20 */  lw        $v0, %lo(D_80246F20)($at)
 /* DBEAC0 80241810 00400008 */  jr        $v0
 /* DBEAC4 80241814 00000000 */   nop      
 /* DBEAC8 80241818 0260202D */  daddu     $a0, $s3, $zero
diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241B28_DBEDD8.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241B28_DBEDD8.s
index 871cfcfb2a..891993ff14 100644
--- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241B28_DBEDD8.s
+++ b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241B28_DBEDD8.s
@@ -104,8 +104,8 @@ glabel func_80241B28_DBEDD8
 /* DBEF5C 80241CAC 1040000A */  beqz      $v0, .L80241CD8
 /* DBEF60 80241CB0 4600C106 */   mov.s    $f4, $f24
 /* DBEF64 80241CB4 4614C081 */  sub.s     $f2, $f24, $f20
-/* DBEF68 80241CB8 3C018024 */  lui       $at, 0x8024
-/* DBEF6C 80241CBC D42070B8 */  ldc1      $f0, 0x70b8($at)
+/* DBEF68 80241CB8 3C018024 */  lui       $at, %hi(D_802470B8)
+/* DBEF6C 80241CBC D42070B8 */  ldc1      $f0, %lo(D_802470B8)($at)
 /* DBEF70 80241CC0 460010A1 */  cvt.d.s   $f2, $f2
 /* DBEF74 80241CC4 46201082 */  mul.d     $f2, $f2, $f0
 /* DBEF78 80241CC8 00000000 */  nop       
@@ -131,8 +131,8 @@ glabel func_80241B28_DBEDD8
 /* DBEFC4 80241D14 C7A4002C */  lwc1      $f4, 0x2c($sp)
 /* DBEFC8 80241D18 461A2100 */  add.s     $f4, $f4, $f26
 /* DBEFCC 80241D1C 46142081 */  sub.s     $f2, $f4, $f20
-/* DBEFD0 80241D20 3C018024 */  lui       $at, 0x8024
-/* DBEFD4 80241D24 D42070C0 */  ldc1      $f0, 0x70c0($at)
+/* DBEFD0 80241D20 3C018024 */  lui       $at, %hi(D_802470C0)
+/* DBEFD4 80241D24 D42070C0 */  ldc1      $f0, %lo(D_802470C0)($at)
 /* DBEFD8 80241D28 460010A1 */  cvt.d.s   $f2, $f2
 /* DBEFDC 80241D2C 46201082 */  mul.d     $f2, $f2, $f0
 /* DBEFE0 80241D30 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_802425CC_DBF87C.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_802425CC_DBF87C.s
index 1c29a826cc..ce97393dc7 100644
--- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_802425CC_DBF87C.s
+++ b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_802425CC_DBF87C.s
@@ -15,9 +15,9 @@ glabel func_802425CC_DBF87C
 /* DBF8A4 802425F4 00031C00 */  sll       $v1, $v1, 0x10
 /* DBF8A8 802425F8 00031B83 */  sra       $v1, $v1, 0xe
 /* DBF8AC 802425FC A444008E */  sh        $a0, 0x8e($v0)
-/* DBF8B0 80242600 3C018024 */  lui       $at, 0x8024
+/* DBF8B0 80242600 3C018024 */  lui       $at, %hi(D_80243A14)
 /* DBF8B4 80242604 00230821 */  addu      $at, $at, $v1
-/* DBF8B8 80242608 C4223A14 */  lwc1      $f2, 0x3a14($at)
+/* DBF8B8 80242608 C4223A14 */  lwc1      $f2, %lo(D_80243A14)($at)
 /* DBF8BC 8024260C 8443008E */  lh        $v1, 0x8e($v0)
 /* DBF8C0 80242610 46020000 */  add.s     $f0, $f0, $f2
 /* DBF8C4 80242614 28630005 */  slti      $v1, $v1, 5
diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242C84_DBFF34.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242C84_DBFF34.s
index 2b43bc919b..447aee8387 100644
--- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242C84_DBFF34.s
+++ b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242C84_DBFF34.s
@@ -66,9 +66,9 @@ glabel func_80242C84_DBFF34
 /* DC0020 80242D70 2C62000F */  sltiu     $v0, $v1, 0xf
 /* DC0024 80242D74 10400034 */  beqz      $v0, .L80242E48
 /* DC0028 80242D78 00031080 */   sll      $v0, $v1, 2
-/* DC002C 80242D7C 3C018024 */  lui       $at, 0x8024
+/* DC002C 80242D7C 3C018024 */  lui       $at, %hi(D_802470C8)
 /* DC0030 80242D80 00220821 */  addu      $at, $at, $v0
-/* DC0034 80242D84 8C2270C8 */  lw        $v0, 0x70c8($at)
+/* DC0034 80242D84 8C2270C8 */  lw        $v0, %lo(D_802470C8)($at)
 /* DC0038 80242D88 00400008 */  jr        $v0
 /* DC003C 80242D8C 00000000 */   nop      
 /* DC0040 80242D90 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_80242F20_DC01D0.s b/asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_80242F20_DC01D0.s
index 839419466f..0c48beaa61 100644
--- a/asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_80242F20_DC01D0.s
+++ b/asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_80242F20_DC01D0.s
@@ -4,8 +4,8 @@
 glabel func_80242F20_DC01D0
 /* DC01D0 80242F20 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* DC01D4 80242F24 AFB00010 */  sw        $s0, 0x10($sp)
-/* DC01D8 80242F28 3C108024 */  lui       $s0, 0x8024
-/* DC01DC 80242F2C 26105E00 */  addiu     $s0, $s0, 0x5e00
+/* DC01D8 80242F28 3C108024 */  lui       $s0, %hi(D_80245E00)
+/* DC01DC 80242F2C 26105E00 */  addiu     $s0, $s0, %lo(D_80245E00)
 /* DC01E0 80242F30 AFBF0018 */  sw        $ra, 0x18($sp)
 /* DC01E4 80242F34 AFB10014 */  sw        $s1, 0x14($sp)
 /* DC01E8 80242F38 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_80242F20_DC01D0
 /* DC024C 80242F9C 28620010 */  slti      $v0, $v1, 0x10
 /* DC0250 80242FA0 1440FFFA */  bnez      $v0, .L80242F8C
 /* DC0254 80242FA4 24840004 */   addiu    $a0, $a0, 4
-/* DC0258 80242FA8 3C108024 */  lui       $s0, 0x8024
-/* DC025C 80242FAC 26105E00 */  addiu     $s0, $s0, 0x5e00
+/* DC0258 80242FA8 3C108024 */  lui       $s0, %hi(D_80245E00)
+/* DC025C 80242FAC 26105E00 */  addiu     $s0, $s0, %lo(D_80245E00)
 /* DC0260 80242FB0 0C00AB4B */  jal       heap_free
 /* DC0264 80242FB4 8E040000 */   lw       $a0, ($s0)
 /* DC0268 80242FB8 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_80240870_DC4C40.s b/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_80240870_DC4C40.s
index e52bb688a8..a5fe274633 100644
--- a/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_80240870_DC4C40.s
+++ b/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_80240870_DC4C40.s
@@ -11,8 +11,8 @@ glabel func_80240870_DC4C40
 /* DC4C58 80240888 0C00EABB */  jal       get_npc_unsafe
 /* DC4C5C 8024088C 86040008 */   lh       $a0, 8($s0)
 /* DC4C60 80240890 C4400018 */  lwc1      $f0, 0x18($v0)
-/* DC4C64 80240894 3C018025 */  lui       $at, 0x8025
-/* DC4C68 80240898 D4228760 */  ldc1      $f2, -0x78a0($at)
+/* DC4C64 80240894 3C018025 */  lui       $at, %hi(D_80248760)
+/* DC4C68 80240898 D4228760 */  ldc1      $f2, %lo(D_80248760)($at)
 /* DC4C6C 8024089C 46000021 */  cvt.d.s   $f0, $f0
 /* DC4C70 802408A0 46220002 */  mul.d     $f0, $f0, $f2
 /* DC4C74 802408A4 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_802408E0_DC4CB0.s b/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_802408E0_DC4CB0.s
index 64b6862132..c9fb02595b 100644
--- a/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_802408E0_DC4CB0.s
+++ b/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_802408E0_DC4CB0.s
@@ -35,8 +35,8 @@ glabel func_802408E0_DC4CB0
 /* DC4D24 80240954 14400010 */  bnez      $v0, .L80240998
 /* DC4D28 80240958 00000000 */   nop      
 /* DC4D2C 8024095C C6000018 */  lwc1      $f0, 0x18($s0)
-/* DC4D30 80240960 3C018025 */  lui       $at, 0x8025
-/* DC4D34 80240964 D4228768 */  ldc1      $f2, -0x7898($at)
+/* DC4D30 80240960 3C018025 */  lui       $at, %hi(D_80248768)
+/* DC4D34 80240964 D4228768 */  ldc1      $f2, %lo(D_80248768)($at)
 /* DC4D38 80240968 46000021 */  cvt.d.s   $f0, $f0
 /* DC4D3C 8024096C 46220002 */  mul.d     $f0, $f0, $f2
 /* DC4D40 80240970 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_80240AA8_DC4E78.s b/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_80240AA8_DC4E78.s
index 68470e0917..4e62038c1e 100644
--- a/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_80240AA8_DC4E78.s
+++ b/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_80240AA8_DC4E78.s
@@ -124,9 +124,9 @@ glabel func_80240AA8_DC4E78
 /* DC503C 80240C6C 2C620064 */  sltiu     $v0, $v1, 0x64
 /* DC5040 80240C70 10400050 */  beqz      $v0, .L80240DB4
 /* DC5044 80240C74 00031080 */   sll      $v0, $v1, 2
-/* DC5048 80240C78 3C018025 */  lui       $at, 0x8025
+/* DC5048 80240C78 3C018025 */  lui       $at, %hi(D_80248770)
 /* DC504C 80240C7C 00220821 */  addu      $at, $at, $v0
-/* DC5050 80240C80 8C228770 */  lw        $v0, -0x7890($at)
+/* DC5050 80240C80 8C228770 */  lw        $v0, %lo(D_80248770)($at)
 /* DC5054 80240C84 00400008 */  jr        $v0
 /* DC5058 80240C88 00000000 */   nop      
 /* DC505C 80240C8C 0260202D */  daddu     $a0, $s3, $zero
diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCCCD0/func_80240078_DCCD48.s b/asm/nonmatchings/world/area_omo/omo_09/DCCCD0/func_80240078_DCCD48.s
index 74d6e38726..c594e1e1f5 100644
--- a/asm/nonmatchings/world/area_omo/omo_09/DCCCD0/func_80240078_DCCD48.s
+++ b/asm/nonmatchings/world/area_omo/omo_09/DCCCD0/func_80240078_DCCD48.s
@@ -61,11 +61,11 @@ glabel func_80240078_DCCD48
 /* DCCE28 80240158 0040402D */  daddu     $t0, $v0, $zero
 /* DCCE2C 8024015C 0000302D */  daddu     $a2, $zero, $zero
 /* DCCE30 80240160 24050004 */  addiu     $a1, $zero, 4
-/* DCCE34 80240164 3C078024 */  lui       $a3, 0x8024
-/* DCCE38 80240168 24E73A90 */  addiu     $a3, $a3, 0x3a90
+/* DCCE34 80240164 3C078024 */  lui       $a3, %hi(D_80243A90)
+/* DCCE38 80240168 24E73A90 */  addiu     $a3, $a3, %lo(D_80243A90)
 /* DCCE3C 8024016C 00E0202D */  daddu     $a0, $a3, $zero
-/* DCCE40 80240170 3C038024 */  lui       $v1, 0x8024
-/* DCCE44 80240174 24633A80 */  addiu     $v1, $v1, 0x3a80
+/* DCCE40 80240170 3C038024 */  lui       $v1, %hi(D_80243A80)
+/* DCCE44 80240174 24633A80 */  addiu     $v1, $v1, %lo(D_80243A80)
 .L80240178:
 /* DCCE48 80240178 8C620000 */  lw        $v0, ($v1)
 /* DCCE4C 8024017C 55020007 */  bnel      $t0, $v0, .L8024019C
@@ -99,11 +99,11 @@ glabel func_80240078_DCCD48
 /* DCCEA8 802401D8 3C178016 */  lui       $s7, %hi(gCollisionStatus)
 /* DCCEAC 802401DC 26F7A550 */  addiu     $s7, $s7, %lo(gCollisionStatus)
 /* DCCEB0 802401E0 24120004 */  addiu     $s2, $zero, 4
-/* DCCEB4 802401E4 3C168024 */  lui       $s6, 0x8024
-/* DCCEB8 802401E8 26D63A90 */  addiu     $s6, $s6, 0x3a90
+/* DCCEB4 802401E4 3C168024 */  lui       $s6, %hi(D_80243A90)
+/* DCCEB8 802401E8 26D63A90 */  addiu     $s6, $s6, %lo(D_80243A90)
 /* DCCEBC 802401EC 02C0802D */  daddu     $s0, $s6, $zero
-/* DCCEC0 802401F0 3C118024 */  lui       $s1, 0x8024
-/* DCCEC4 802401F4 26313A80 */  addiu     $s1, $s1, 0x3a80
+/* DCCEC0 802401F0 3C118024 */  lui       $s1, %hi(D_80243A80)
+/* DCCEC4 802401F4 26313A80 */  addiu     $s1, $s1, %lo(D_80243A80)
 /* DCCEC8 802401F8 261E0020 */  addiu     $fp, $s0, 0x20
 .L802401FC:
 /* DCCECC 802401FC 86E20002 */  lh        $v0, 2($s7)
diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCCFA0/func_802402D0_DCCFA0.s b/asm/nonmatchings/world/area_omo/omo_09/DCCFA0/func_802402D0_DCCFA0.s
index cd66a49ac9..f565788a9f 100644
--- a/asm/nonmatchings/world/area_omo/omo_09/DCCFA0/func_802402D0_DCCFA0.s
+++ b/asm/nonmatchings/world/area_omo/omo_09/DCCFA0/func_802402D0_DCCFA0.s
@@ -45,9 +45,9 @@ glabel func_802402D0_DCCFA0
 /* DCD040 80240370 00031FC3 */  sra       $v1, $v1, 0x1f
 /* DCD044 80240374 00431023 */  subu      $v0, $v0, $v1
 /* DCD048 80240378 00021080 */  sll       $v0, $v0, 2
-/* DCD04C 8024037C 3C018024 */  lui       $at, 0x8024
+/* DCD04C 8024037C 3C018024 */  lui       $at, %hi(D_802451AC)
 /* DCD050 80240380 00220821 */  addu      $at, $at, $v0
-/* DCD054 80240384 8C2251AC */  lw        $v0, 0x51ac($at)
+/* DCD054 80240384 8C2251AC */  lw        $v0, %lo(D_802451AC)($at)
 /* DCD058 80240388 080900E5 */  j         .L80240394
 /* DCD05C 8024038C AFA20010 */   sw       $v0, 0x10($sp)
 .L80240390:
@@ -77,9 +77,9 @@ glabel func_802402D0_DCCFA0
 /* DCD0B8 802403E8 00431023 */  subu      $v0, $v0, $v1
 /* DCD0BC 802403EC 24420008 */  addiu     $v0, $v0, 8
 /* DCD0C0 802403F0 00021080 */  sll       $v0, $v0, 2
-/* DCD0C4 802403F4 3C018024 */  lui       $at, 0x8024
+/* DCD0C4 802403F4 3C018024 */  lui       $at, %hi(D_802451AC)
 /* DCD0C8 802403F8 00220821 */  addu      $at, $at, $v0
-/* DCD0CC 802403FC 8C2251AC */  lw        $v0, 0x51ac($at)
+/* DCD0CC 802403FC 8C2251AC */  lw        $v0, %lo(D_802451AC)($at)
 /* DCD0D0 80240400 08090103 */  j         .L8024040C
 /* DCD0D4 80240404 AFA20014 */   sw       $v0, 0x14($sp)
 .L80240408:
@@ -109,9 +109,9 @@ glabel func_802402D0_DCCFA0
 /* DCD130 80240460 00431023 */  subu      $v0, $v0, $v1
 /* DCD134 80240464 24420010 */  addiu     $v0, $v0, 0x10
 /* DCD138 80240468 00021080 */  sll       $v0, $v0, 2
-/* DCD13C 8024046C 3C018024 */  lui       $at, 0x8024
+/* DCD13C 8024046C 3C018024 */  lui       $at, %hi(D_802451AC)
 /* DCD140 80240470 00220821 */  addu      $at, $at, $v0
-/* DCD144 80240474 8C2251AC */  lw        $v0, 0x51ac($at)
+/* DCD144 80240474 8C2251AC */  lw        $v0, %lo(D_802451AC)($at)
 /* DCD148 80240478 08090121 */  j         .L80240484
 /* DCD14C 8024047C AFA20018 */   sw       $v0, 0x18($sp)
 .L80240480:
diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCCFA0/func_80240534_DCD204.s b/asm/nonmatchings/world/area_omo/omo_09/DCCFA0/func_80240534_DCD204.s
index 6decb04292..4a4d0b2126 100644
--- a/asm/nonmatchings/world/area_omo/omo_09/DCCFA0/func_80240534_DCD204.s
+++ b/asm/nonmatchings/world/area_omo/omo_09/DCCFA0/func_80240534_DCD204.s
@@ -18,8 +18,8 @@ glabel func_80240534_DCD204
 /* DCD238 80240568 0040802D */  daddu     $s0, $v0, $zero
 /* DCD23C 8024056C 3C0142C8 */  lui       $at, 0x42c8
 /* DCD240 80240570 4481A000 */  mtc1      $at, $f20
-/* DCD244 80240574 3C118024 */  lui       $s1, 0x8024
-/* DCD248 80240578 2631636C */  addiu     $s1, $s1, 0x636c
+/* DCD244 80240574 3C118024 */  lui       $s1, %hi(D_8024636C)
+/* DCD248 80240578 2631636C */  addiu     $s1, $s1, %lo(D_8024636C)
 /* DCD24C 8024057C AE900070 */  sw        $s0, 0x70($s4)
 .L80240580:
 /* DCD250 80240580 8E240000 */  lw        $a0, ($s1)
@@ -41,8 +41,8 @@ glabel func_80240534_DCD204
 /* DCD290 802405C0 26100004 */   addiu    $s0, $s0, 4
 .L802405C4:
 /* DCD294 802405C4 0000902D */  daddu     $s2, $zero, $zero
-/* DCD298 802405C8 3C138024 */  lui       $s3, 0x8024
-/* DCD29C 802405CC 2673636C */  addiu     $s3, $s3, 0x636c
+/* DCD298 802405C8 3C138024 */  lui       $s3, %hi(D_8024636C)
+/* DCD29C 802405CC 2673636C */  addiu     $s3, $s3, %lo(D_8024636C)
 /* DCD2A0 802405D0 3C013FA6 */  lui       $at, 0x3fa6
 /* DCD2A4 802405D4 34216666 */  ori       $at, $at, 0x6666
 /* DCD2A8 802405D8 4481A000 */  mtc1      $at, $f20
diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD3F0/func_80240720_DCD3F0.s b/asm/nonmatchings/world/area_omo/omo_09/DCD3F0/func_80240720_DCD3F0.s
index f069f0c45a..832f4a0bfd 100644
--- a/asm/nonmatchings/world/area_omo/omo_09/DCD3F0/func_80240720_DCD3F0.s
+++ b/asm/nonmatchings/world/area_omo/omo_09/DCD3F0/func_80240720_DCD3F0.s
@@ -4,8 +4,8 @@
 glabel func_80240720_DCD3F0
 /* DCD3F0 80240720 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* DCD3F4 80240724 AFB00010 */  sw        $s0, 0x10($sp)
-/* DCD3F8 80240728 3C108024 */  lui       $s0, 0x8024
-/* DCD3FC 8024072C 26107010 */  addiu     $s0, $s0, 0x7010
+/* DCD3F8 80240728 3C108024 */  lui       $s0, %hi(D_80247010)
+/* DCD3FC 8024072C 26107010 */  addiu     $s0, $s0, %lo(D_80247010)
 /* DCD400 80240730 AFBF0018 */  sw        $ra, 0x18($sp)
 /* DCD404 80240734 AFB10014 */  sw        $s1, 0x14($sp)
 /* DCD408 80240738 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_80240720_DCD3F0
 /* DCD46C 8024079C 28620010 */  slti      $v0, $v1, 0x10
 /* DCD470 802407A0 1440FFFA */  bnez      $v0, .L8024078C
 /* DCD474 802407A4 24840004 */   addiu    $a0, $a0, 4
-/* DCD478 802407A8 3C108024 */  lui       $s0, 0x8024
-/* DCD47C 802407AC 26107010 */  addiu     $s0, $s0, 0x7010
+/* DCD478 802407A8 3C108024 */  lui       $s0, %hi(D_80247010)
+/* DCD47C 802407AC 26107010 */  addiu     $s0, $s0, %lo(D_80247010)
 /* DCD480 802407B0 0C00AB4B */  jal       heap_free
 /* DCD484 802407B4 8E040000 */   lw       $a0, ($s0)
 /* DCD488 802407B8 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802409E0_DCD6B0.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802409E0_DCD6B0.s
index ae6db069fe..53955b2694 100644
--- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802409E0_DCD6B0.s
+++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802409E0_DCD6B0.s
@@ -11,8 +11,8 @@ glabel func_802409E0_DCD6B0
 /* DCD6C8 802409F8 0C00EABB */  jal       get_npc_unsafe
 /* DCD6CC 802409FC 86040008 */   lh       $a0, 8($s0)
 /* DCD6D0 80240A00 C4400018 */  lwc1      $f0, 0x18($v0)
-/* DCD6D4 80240A04 3C018025 */  lui       $at, 0x8025
-/* DCD6D8 80240A08 D422A630 */  ldc1      $f2, -0x59d0($at)
+/* DCD6D4 80240A04 3C018025 */  lui       $at, %hi(D_8024A630)
+/* DCD6D8 80240A08 D422A630 */  ldc1      $f2, %lo(D_8024A630)($at)
 /* DCD6DC 80240A0C 46000021 */  cvt.d.s   $f0, $f0
 /* DCD6E0 80240A10 46220002 */  mul.d     $f0, $f0, $f2
 /* DCD6E4 80240A14 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240A50_DCD720.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240A50_DCD720.s
index 04ee6a33c0..21af609798 100644
--- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240A50_DCD720.s
+++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240A50_DCD720.s
@@ -35,8 +35,8 @@ glabel func_80240A50_DCD720
 /* DCD794 80240AC4 14400010 */  bnez      $v0, .L80240B08
 /* DCD798 80240AC8 00000000 */   nop      
 /* DCD79C 80240ACC C6000018 */  lwc1      $f0, 0x18($s0)
-/* DCD7A0 80240AD0 3C018025 */  lui       $at, 0x8025
-/* DCD7A4 80240AD4 D422A638 */  ldc1      $f2, -0x59c8($at)
+/* DCD7A0 80240AD0 3C018025 */  lui       $at, %hi(D_8024A638)
+/* DCD7A4 80240AD4 D422A638 */  ldc1      $f2, %lo(D_8024A638)($at)
 /* DCD7A8 80240AD8 46000021 */  cvt.d.s   $f0, $f0
 /* DCD7AC 80240ADC 46220002 */  mul.d     $f0, $f0, $f2
 /* DCD7B0 80240AE0 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240C18_DCD8E8.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240C18_DCD8E8.s
index ffd39b1639..05e9c993c7 100644
--- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240C18_DCD8E8.s
+++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240C18_DCD8E8.s
@@ -124,9 +124,9 @@ glabel func_80240C18_DCD8E8
 /* DCDAAC 80240DDC 2C620064 */  sltiu     $v0, $v1, 0x64
 /* DCDAB0 80240DE0 10400050 */  beqz      $v0, .L80240F24
 /* DCDAB4 80240DE4 00031080 */   sll      $v0, $v1, 2
-/* DCDAB8 80240DE8 3C018025 */  lui       $at, 0x8025
+/* DCDAB8 80240DE8 3C018025 */  lui       $at, %hi(D_8024A640)
 /* DCDABC 80240DEC 00220821 */  addu      $at, $at, $v0
-/* DCDAC0 80240DF0 8C22A640 */  lw        $v0, -0x59c0($at)
+/* DCDAC0 80240DF0 8C22A640 */  lw        $v0, %lo(D_8024A640)($at)
 /* DCDAC4 80240DF4 00400008 */  jr        $v0
 /* DCDAC8 80240DF8 00000000 */   nop      
 /* DCDACC 80240DFC 0260202D */  daddu     $a0, $s3, $zero
diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240F4C_DCDC1C.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240F4C_DCDC1C.s
index 39c0d13c44..b46c3fd7f4 100644
--- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240F4C_DCDC1C.s
+++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240F4C_DCDC1C.s
@@ -69,8 +69,8 @@ glabel func_80240F4C_DCDC1C
 /* DCDD10 80241040 0809041A */  j         .L80241068
 /* DCDD14 80241044 E6800018 */   swc1     $f0, 0x18($s4)
 .L80241048:
-/* DCDD18 80241048 3C018025 */  lui       $at, 0x8025
-/* DCDD1C 8024104C D422A7D0 */  ldc1      $f2, -0x5830($at)
+/* DCDD18 80241048 3C018025 */  lui       $at, %hi(D_8024A7D0)
+/* DCDD1C 8024104C D422A7D0 */  ldc1      $f2, %lo(D_8024A7D0)($at)
 /* DCDD20 80241050 44820000 */  mtc1      $v0, $f0
 /* DCDD24 80241054 00000000 */  nop       
 /* DCDD28 80241058 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241AE0_DCE7B0.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241AE0_DCE7B0.s
index 1fe518d6b7..f9d8027a6a 100644
--- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241AE0_DCE7B0.s
+++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241AE0_DCE7B0.s
@@ -124,9 +124,9 @@ glabel func_80241AE0_DCE7B0
 /* DCE974 80241CA4 2C620064 */  sltiu     $v0, $v1, 0x64
 /* DCE978 80241CA8 10400042 */  beqz      $v0, .L80241DB4
 /* DCE97C 80241CAC 00031080 */   sll      $v0, $v1, 2
-/* DCE980 80241CB0 3C018025 */  lui       $at, 0x8025
+/* DCE980 80241CB0 3C018025 */  lui       $at, %hi(D_8024A7E0)
 /* DCE984 80241CB4 00220821 */  addu      $at, $at, $v0
-/* DCE988 80241CB8 8C22A7E0 */  lw        $v0, -0x5820($at)
+/* DCE988 80241CB8 8C22A7E0 */  lw        $v0, %lo(D_8024A7E0)($at)
 /* DCE98C 80241CBC 00400008 */  jr        $v0
 /* DCE990 80241CC0 00000000 */   nop      
 /* DCE994 80241CC4 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241DDC_DCEAAC.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241DDC_DCEAAC.s
index d1f6b2117e..cf297730a4 100644
--- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241DDC_DCEAAC.s
+++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241DDC_DCEAAC.s
@@ -11,8 +11,8 @@ glabel func_80241DDC_DCEAAC
 /* DCEAC4 80241DF4 0C00EABB */  jal       get_npc_unsafe
 /* DCEAC8 80241DF8 86040008 */   lh       $a0, 8($s0)
 /* DCEACC 80241DFC C4400018 */  lwc1      $f0, 0x18($v0)
-/* DCEAD0 80241E00 3C018025 */  lui       $at, 0x8025
-/* DCEAD4 80241E04 D422A970 */  ldc1      $f2, -0x5690($at)
+/* DCEAD0 80241E00 3C018025 */  lui       $at, %hi(D_8024A970)
+/* DCEAD4 80241E04 D422A970 */  ldc1      $f2, %lo(D_8024A970)($at)
 /* DCEAD8 80241E08 46000021 */  cvt.d.s   $f0, $f0
 /* DCEADC 80241E0C 46220002 */  mul.d     $f0, $f0, $f2
 /* DCEAE0 80241E10 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241E4C_DCEB1C.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241E4C_DCEB1C.s
index f362f80046..2fc04f57e2 100644
--- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241E4C_DCEB1C.s
+++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241E4C_DCEB1C.s
@@ -35,8 +35,8 @@ glabel func_80241E4C_DCEB1C
 /* DCEB90 80241EC0 14400010 */  bnez      $v0, .L80241F04
 /* DCEB94 80241EC4 00000000 */   nop      
 /* DCEB98 80241EC8 C6000018 */  lwc1      $f0, 0x18($s0)
-/* DCEB9C 80241ECC 3C018025 */  lui       $at, 0x8025
-/* DCEBA0 80241ED0 D422A978 */  ldc1      $f2, -0x5688($at)
+/* DCEB9C 80241ECC 3C018025 */  lui       $at, %hi(D_8024A978)
+/* DCEBA0 80241ED0 D422A978 */  ldc1      $f2, %lo(D_8024A978)($at)
 /* DCEBA4 80241ED4 46000021 */  cvt.d.s   $f0, $f0
 /* DCEBA8 80241ED8 46220002 */  mul.d     $f0, $f0, $f2
 /* DCEBAC 80241EDC 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242014_DCECE4.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242014_DCECE4.s
index 2151fcafdc..c50e0cef40 100644
--- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242014_DCECE4.s
+++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242014_DCECE4.s
@@ -124,9 +124,9 @@ glabel func_80242014_DCECE4
 /* DCEEA8 802421D8 2C620064 */  sltiu     $v0, $v1, 0x64
 /* DCEEAC 802421DC 10400054 */  beqz      $v0, .L80242330
 /* DCEEB0 802421E0 00031080 */   sll      $v0, $v1, 2
-/* DCEEB4 802421E4 3C018025 */  lui       $at, 0x8025
+/* DCEEB4 802421E4 3C018025 */  lui       $at, %hi(D_8024A980)
 /* DCEEB8 802421E8 00220821 */  addu      $at, $at, $v0
-/* DCEEBC 802421EC 8C22A980 */  lw        $v0, -0x5680($at)
+/* DCEEBC 802421EC 8C22A980 */  lw        $v0, %lo(D_8024A980)($at)
 /* DCEEC0 802421F0 00400008 */  jr        $v0
 /* DCEEC4 802421F4 00000000 */   nop      
 /* DCEEC8 802421F8 0260202D */  daddu     $a0, $s3, $zero
diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242358_DCF028.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242358_DCF028.s
index d22cc3ba79..22ad1713ac 100644
--- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242358_DCF028.s
+++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242358_DCF028.s
@@ -13,8 +13,8 @@ glabel func_80242358_DCF028
 /* DCF048 80242378 AFB00010 */  sw        $s0, 0x10($sp)
 /* DCF04C 8024237C F7B40028 */  sdc1      $f20, 0x28($sp)
 /* DCF050 80242380 8E330148 */  lw        $s3, 0x148($s1)
-/* DCF054 80242384 3C03800A */  lui       $v1, 0x800a
-/* DCF058 80242388 8463A634 */  lh        $v1, -0x59cc($v1)
+/* DCF054 80242384 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* DCF058 80242388 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* DCF05C 8024238C 8E30000C */  lw        $s0, 0xc($s1)
 /* DCF060 80242390 00031080 */  sll       $v0, $v1, 2
 /* DCF064 80242394 00431021 */  addu      $v0, $v0, $v1
@@ -45,8 +45,8 @@ glabel func_80242358_DCF028
 /* DCF0C8 802423F8 00000000 */   nop      
 /* DCF0CC 802423FC 0C00A6C9 */  jal       clamp_angle
 /* DCF0D0 80242400 46000306 */   mov.s    $f12, $f0
-/* DCF0D4 80242404 3C018025 */  lui       $at, 0x8025
-/* DCF0D8 80242408 D422AB10 */  ldc1      $f2, -0x54f0($at)
+/* DCF0D4 80242404 3C018025 */  lui       $at, %hi(D_8024AB10)
+/* DCF0D8 80242408 D422AB10 */  ldc1      $f2, %lo(D_8024AB10)($at)
 /* DCF0DC 8024240C 46000021 */  cvt.d.s   $f0, $f0
 /* DCF0E0 80242410 4622003C */  c.lt.d    $f0, $f2
 /* DCF0E4 80242414 00000000 */  nop       
@@ -67,8 +67,8 @@ glabel func_80242358_DCF028
 /* DCF11C 8024244C 0C00A70A */  jal       get_clamped_angle_diff
 /* DCF120 80242450 46000386 */   mov.s    $f14, $f0
 /* DCF124 80242454 46000005 */  abs.s     $f0, $f0
-/* DCF128 80242458 3C018025 */  lui       $at, 0x8025
-/* DCF12C 8024245C D422AB18 */  ldc1      $f2, -0x54e8($at)
+/* DCF128 80242458 3C018025 */  lui       $at, %hi(D_8024AB18)
+/* DCF12C 8024245C D422AB18 */  ldc1      $f2, %lo(D_8024AB18)($at)
 /* DCF130 80242460 46000021 */  cvt.d.s   $f0, $f0
 /* DCF134 80242464 4620103C */  c.lt.d    $f2, $f0
 /* DCF138 80242468 00000000 */  nop       
@@ -89,8 +89,8 @@ glabel func_80242358_DCF028
 /* DCF174 802424A4 00000000 */  nop       
 /* DCF178 802424A8 4501001F */  bc1t      .L80242528
 /* DCF17C 802424AC 2402FFFF */   addiu    $v0, $zero, -1
-/* DCF180 802424B0 3C038011 */  lui       $v1, 0x8011
-/* DCF184 802424B4 8063EBB3 */  lb        $v1, -0x144d($v1)
+/* DCF180 802424B0 3C038011 */  lui       $v1, %hi(D_8010EBB3)
+/* DCF184 802424B4 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
 /* DCF188 802424B8 24020009 */  addiu     $v0, $zero, 9
 /* DCF18C 802424BC 10620019 */  beq       $v1, $v0, .L80242524
 /* DCF190 802424C0 24020007 */   addiu    $v0, $zero, 7
diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242DF0_DCFAC0.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242DF0_DCFAC0.s
index ab8c55b01f..3e6998c1df 100644
--- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242DF0_DCFAC0.s
+++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242DF0_DCFAC0.s
@@ -7,8 +7,8 @@ glabel func_80242DF0_DCFAC0
 /* DCFAC8 80242DF8 0080982D */  daddu     $s3, $a0, $zero
 /* DCFACC 80242DFC AFB40040 */  sw        $s4, 0x40($sp)
 /* DCFAD0 80242E00 0000A02D */  daddu     $s4, $zero, $zero
-/* DCFAD4 80242E04 3C03800A */  lui       $v1, 0x800a
-/* DCFAD8 80242E08 8463A634 */  lh        $v1, -0x59cc($v1)
+/* DCFAD4 80242E04 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* DCFAD8 80242E08 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* DCFADC 80242E0C 3C04800B */  lui       $a0, %hi(gCameras)
 /* DCFAE0 80242E10 24841D80 */  addiu     $a0, $a0, %lo(gCameras)
 /* DCFAE4 80242E14 AFBF0044 */  sw        $ra, 0x44($sp)
@@ -80,12 +80,12 @@ glabel func_80242DF0_DCFAC0
 /* DCFBD8 80242F08 C64C006C */  lwc1      $f12, 0x6c($s2)
 /* DCFBDC 80242F0C 0C00A6C9 */  jal       clamp_angle
 /* DCFBE0 80242F10 00000000 */   nop      
-/* DCFBE4 80242F14 3C018025 */  lui       $at, 0x8025
-/* DCFBE8 80242F18 D438AB20 */  ldc1      $f24, -0x54e0($at)
+/* DCFBE4 80242F14 3C018025 */  lui       $at, %hi(D_8024AB20)
+/* DCFBE8 80242F18 D438AB20 */  ldc1      $f24, %lo(D_8024AB20)($at)
 /* DCFBEC 80242F1C 46000521 */  cvt.d.s   $f20, $f0
 /* DCFBF0 80242F20 4638A300 */  add.d     $f12, $f20, $f24
-/* DCFBF4 80242F24 3C018025 */  lui       $at, 0x8025
-/* DCFBF8 80242F28 D436AB28 */  ldc1      $f22, -0x54d8($at)
+/* DCFBF4 80242F24 3C018025 */  lui       $at, %hi(D_8024AB28)
+/* DCFBF8 80242F28 D436AB28 */  ldc1      $f22, %lo(D_8024AB28)($at)
 /* DCFBFC 80242F2C 0C00A6C9 */  jal       clamp_angle
 /* DCFC00 80242F30 46206320 */   cvt.s.d  $f12, $f12
 /* DCFC04 80242F34 4636A500 */  add.d     $f20, $f20, $f22
@@ -113,8 +113,8 @@ glabel func_80242DF0_DCFAC0
 /* DCFC5C 80242F8C E616000C */  swc1      $f22, 0xc($s0)
 .L80242F90:
 /* DCFC60 80242F90 C6000018 */  lwc1      $f0, 0x18($s0)
-/* DCFC64 80242F94 3C018025 */  lui       $at, 0x8025
-/* DCFC68 80242F98 D422AB30 */  ldc1      $f2, -0x54d0($at)
+/* DCFC64 80242F94 3C018025 */  lui       $at, %hi(D_8024AB30)
+/* DCFC68 80242F98 D422AB30 */  ldc1      $f2, %lo(D_8024AB30)($at)
 /* DCFC6C 80242F9C 46000021 */  cvt.d.s   $f0, $f0
 /* DCFC70 80242FA0 46220002 */  mul.d     $f0, $f0, $f2
 /* DCFC74 80242FA4 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024324C_DCFF1C.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024324C_DCFF1C.s
index 3c656f396f..02157f0698 100644
--- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024324C_DCFF1C.s
+++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024324C_DCFF1C.s
@@ -103,9 +103,9 @@ glabel func_8024324C_DCFF1C
 /* DD008C 802433BC 2C620064 */  sltiu     $v0, $v1, 0x64
 /* DD0090 802433C0 10400060 */  beqz      $v0, .L80243544
 /* DD0094 802433C4 00031080 */   sll      $v0, $v1, 2
-/* DD0098 802433C8 3C018025 */  lui       $at, 0x8025
+/* DD0098 802433C8 3C018025 */  lui       $at, %hi(D_8024AB38)
 /* DD009C 802433CC 00220821 */  addu      $at, $at, $v0
-/* DD00A0 802433D0 8C22AB38 */  lw        $v0, -0x54c8($at)
+/* DD00A0 802433D0 8C22AB38 */  lw        $v0, %lo(D_8024AB38)($at)
 /* DD00A4 802433D4 00400008 */  jr        $v0
 /* DD00A8 802433D8 00000000 */   nop      
 /* DD00AC 802433DC 0260202D */  daddu     $a0, $s3, $zero
diff --git a/asm/nonmatchings/world/area_omo/omo_11/DDC830/func_80240000_DDC830.s b/asm/nonmatchings/world/area_omo/omo_11/DDC830/func_80240000_DDC830.s
index 7bd46fd5aa..c5d3a9d86b 100644
--- a/asm/nonmatchings/world/area_omo/omo_11/DDC830/func_80240000_DDC830.s
+++ b/asm/nonmatchings/world/area_omo/omo_11/DDC830/func_80240000_DDC830.s
@@ -18,8 +18,8 @@ glabel func_80240000_DDC830
 /* DDC864 80240034 0040802D */  daddu     $s0, $v0, $zero
 /* DDC868 80240038 3C0142C8 */  lui       $at, 0x42c8
 /* DDC86C 8024003C 4481A000 */  mtc1      $at, $f20
-/* DDC870 80240040 3C118024 */  lui       $s1, 0x8024
-/* DDC874 80240044 26311740 */  addiu     $s1, $s1, 0x1740
+/* DDC870 80240040 3C118024 */  lui       $s1, %hi(D_80241740)
+/* DDC874 80240044 26311740 */  addiu     $s1, $s1, %lo(D_80241740)
 /* DDC878 80240048 AE900070 */  sw        $s0, 0x70($s4)
 .L8024004C:
 /* DDC87C 8024004C 8E240000 */  lw        $a0, ($s1)
@@ -41,8 +41,8 @@ glabel func_80240000_DDC830
 /* DDC8BC 8024008C 26100004 */   addiu    $s0, $s0, 4
 .L80240090:
 /* DDC8C0 80240090 0000902D */  daddu     $s2, $zero, $zero
-/* DDC8C4 80240094 3C138024 */  lui       $s3, 0x8024
-/* DDC8C8 80240098 26731740 */  addiu     $s3, $s3, 0x1740
+/* DDC8C4 80240094 3C138024 */  lui       $s3, %hi(D_80241740)
+/* DDC8C8 80240098 26731740 */  addiu     $s3, $s3, %lo(D_80241740)
 /* DDC8CC 8024009C 3C014040 */  lui       $at, 0x4040
 /* DDC8D0 802400A0 4481A000 */  mtc1      $at, $f20
 /* DDC8D4 802400A4 8E910070 */  lw        $s1, 0x70($s4)
diff --git a/asm/nonmatchings/world/area_omo/omo_11/DDC830/func_802401A0_DDC9D0.s b/asm/nonmatchings/world/area_omo/omo_11/DDC830/func_802401A0_DDC9D0.s
index c7c3212a6d..a65b9581d9 100644
--- a/asm/nonmatchings/world/area_omo/omo_11/DDC830/func_802401A0_DDC9D0.s
+++ b/asm/nonmatchings/world/area_omo/omo_11/DDC830/func_802401A0_DDC9D0.s
@@ -43,8 +43,8 @@ glabel func_802401A0_DDC9D0
 /* DDCA68 80240238 3C0742FA */  lui       $a3, 0x42fa
 /* DDCA6C 8024023C 3C01C2C8 */  lui       $at, 0xc2c8
 /* DDCA70 80240240 44810000 */  mtc1      $at, $f0
-/* DDCA74 80240244 3C148024 */  lui       $s4, 0x8024
-/* DDCA78 80240248 26941760 */  addiu     $s4, $s4, 0x1760
+/* DDCA74 80240244 3C148024 */  lui       $s4, %hi(D_80241760)
+/* DDCA78 80240248 26941760 */  addiu     $s4, $s4, %lo(D_80241760)
 /* DDCA7C 8024024C 0C052757 */  jal       play_sound_at_position
 /* DDCA80 80240250 E7A00010 */   swc1     $f0, 0x10($sp)
 /* DDCA84 80240254 0C00AB39 */  jal       heap_malloc
@@ -93,8 +93,8 @@ glabel func_802401A0_DDC9D0
 /* DDCB24 802402F4 1440FFF4 */  bnez      $v0, .L802402C8
 /* DDCB28 802402F8 0000282D */   daddu    $a1, $zero, $zero
 /* DDCB2C 802402FC 26310058 */  addiu     $s1, $s1, 0x58
-/* DDCB30 80240300 3C098024 */  lui       $t1, 0x8024
-/* DDCB34 80240304 25291760 */  addiu     $t1, $t1, 0x1760
+/* DDCB30 80240300 3C098024 */  lui       $t1, %hi(D_80241760)
+/* DDCB34 80240304 25291760 */  addiu     $t1, $t1, %lo(D_80241760)
 /* DDCB38 80240308 02A91021 */  addu      $v0, $s5, $t1
 /* DDCB3C 8024030C 8C440000 */  lw        $a0, ($v0)
 /* DDCB40 80240310 0C046C04 */  jal       get_model_list_index_from_tree_index
@@ -139,8 +139,8 @@ glabel func_802401A0_DDC9D0
 /* DDCBD0 802403A0 AFA90130 */  sw        $t1, 0x130($sp)
 /* DDCBD4 802403A4 8FA90170 */  lw        $t1, 0x170($sp)
 /* DDCBD8 802403A8 4480A000 */  mtc1      $zero, $f20
-/* DDCBDC 802403AC 3C138024 */  lui       $s3, 0x8024
-/* DDCBE0 802403B0 26731778 */  addiu     $s3, $s3, 0x1778
+/* DDCBDC 802403AC 3C138024 */  lui       $s3, %hi(D_80241778)
+/* DDCBE0 802403B0 26731778 */  addiu     $s3, $s3, %lo(D_80241778)
 /* DDCBE4 802403B4 AFA00134 */  sw        $zero, 0x134($sp)
 /* DDCBE8 802403B8 8D320070 */  lw        $s2, 0x70($t1)
 /* DDCBEC 802403BC 3C013F80 */  lui       $at, 0x3f80
@@ -148,10 +148,10 @@ glabel func_802401A0_DDC9D0
 /* DDCBF4 802403C4 26510014 */  addiu     $s1, $s2, 0x14
 .L802403C8:
 /* DDCBF8 802403C8 8FA90134 */  lw        $t1, 0x134($sp)
-/* DDCBFC 802403CC 3C048024 */  lui       $a0, 0x8024
+/* DDCBFC 802403CC 3C048024 */  lui       $a0, %hi(D_80241760)
 /* DDCC00 802403D0 00892021 */  addu      $a0, $a0, $t1
 /* DDCC04 802403D4 0C046C04 */  jal       get_model_list_index_from_tree_index
-/* DDCC08 802403D8 8C841760 */   lw       $a0, 0x1760($a0)
+/* DDCC08 802403D8 8C841760 */   lw       $a0, %lo(D_80241760)($a0)
 /* DDCC0C 802403DC 0C046B4C */  jal       get_model_from_list_index
 /* DDCC10 802403E0 0040202D */   daddu    $a0, $v0, $zero
 /* DDCC14 802403E4 0040802D */  daddu     $s0, $v0, $zero
@@ -299,8 +299,8 @@ glabel func_802401A0_DDC9D0
 /* DDCE38 80240608 E620FFF8 */  swc1      $f0, -8($s1)
 /* DDCE3C 8024060C E622FFFC */  swc1      $f2, -4($s1)
 /* DDCE40 80240610 E6240000 */  swc1      $f4, ($s1)
-/* DDCE44 80240614 3C098024 */  lui       $t1, 0x8024
-/* DDCE48 80240618 25291778 */  addiu     $t1, $t1, 0x1778
+/* DDCE44 80240614 3C098024 */  lui       $t1, %hi(D_80241778)
+/* DDCE48 80240618 25291778 */  addiu     $t1, $t1, %lo(D_80241778)
 /* DDCE4C 8024061C 25220018 */  addiu     $v0, $t1, 0x18
 /* DDCE50 80240620 0262102B */  sltu      $v0, $s3, $v0
 /* DDCE54 80240624 1440FF68 */  bnez      $v0, .L802403C8
@@ -344,8 +344,8 @@ glabel func_802401A0_DDC9D0
 /* DDCEEC 802406BC 24A51D80 */  addiu     $a1, $a1, %lo(gCameras)
 /* DDCEF0 802406C0 2408000E */  addiu     $t0, $zero, 0xe
 /* DDCEF4 802406C4 24070010 */  addiu     $a3, $zero, 0x10
-/* DDCEF8 802406C8 3C038024 */  lui       $v1, 0x8024
-/* DDCEFC 802406CC 24631778 */  addiu     $v1, $v1, 0x1778
+/* DDCEF8 802406C8 3C038024 */  lui       $v1, %hi(D_80241778)
+/* DDCEFC 802406CC 24631778 */  addiu     $v1, $v1, %lo(D_80241778)
 /* DDCF00 802406D0 3C068016 */  lui       $a2, %hi(gCollisionStatus+0x2)
 /* DDCF04 802406D4 84C6A552 */  lh        $a2, %lo(gCollisionStatus+0x2)($a2)
 .L802406D8:
diff --git a/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_8024095C_DDD18C.s b/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_8024095C_DDD18C.s
index dd8842da04..b8fd3d239e 100644
--- a/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_8024095C_DDD18C.s
+++ b/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_8024095C_DDD18C.s
@@ -22,12 +22,12 @@ glabel func_8024095C_DDD18C
 /* DDD1D0 802409A0 0040982D */  daddu     $s3, $v0, $zero
 /* DDD1D4 802409A4 0000B02D */  daddu     $s6, $zero, $zero
 /* DDD1D8 802409A8 02C0902D */  daddu     $s2, $s6, $zero
-/* DDD1DC 802409AC 3C148024 */  lui       $s4, 0x8024
-/* DDD1E0 802409B0 26941E48 */  addiu     $s4, $s4, 0x1e48
+/* DDD1DC 802409AC 3C148024 */  lui       $s4, %hi(D_80241E48)
+/* DDD1E0 802409B0 26941E48 */  addiu     $s4, $s4, %lo(D_80241E48)
 /* DDD1E4 802409B4 0260882D */  daddu     $s1, $s3, $zero
 /* DDD1E8 802409B8 8EA200B4 */  lw        $v0, 0xb4($s5)
-/* DDD1EC 802409BC 3C038024 */  lui       $v1, 0x8024
-/* DDD1F0 802409C0 24631E40 */  addiu     $v1, $v1, 0x1e40
+/* DDD1EC 802409BC 3C038024 */  lui       $v1, %hi(D_80241E40)
+/* DDD1F0 802409C0 24631E40 */  addiu     $v1, $v1, %lo(D_80241E40)
 /* DDD1F4 802409C4 AEB30078 */  sw        $s3, 0x78($s5)
 /* DDD1F8 802409C8 00021027 */  nor       $v0, $zero, $v0
 /* DDD1FC 802409CC 0002BFC2 */  srl       $s7, $v0, 0x1f
@@ -42,8 +42,8 @@ glabel func_8024095C_DDD18C
 /* DDD21C 802409EC 5040002E */  beql      $v0, $zero, .L80240AA8
 /* DDD220 802409F0 26520001 */   addiu    $s2, $s2, 1
 /* DDD224 802409F4 00101100 */  sll       $v0, $s0, 4
-/* DDD228 802409F8 3C068009 */  lui       $a2, 0x8009
-/* DDD22C 802409FC 24C6EF20 */  addiu     $a2, $a2, -0x10e0
+/* DDD228 802409F8 3C068009 */  lui       $a2, %hi(D_8008EF20)
+/* DDD22C 802409FC 24C6EF20 */  addiu     $a2, $a2, %lo(D_8008EF20)
 /* DDD230 80240A00 00461021 */  addu      $v0, $v0, $a2
 /* DDD234 80240A04 0200202D */  daddu     $a0, $s0, $zero
 /* DDD238 80240A08 AE300108 */  sw        $s0, 0x108($s1)
@@ -54,15 +54,15 @@ glabel func_8024095C_DDD18C
 /* DDD24C 80240A1C 0040202D */  daddu     $a0, $v0, $zero
 /* DDD250 80240A20 04800011 */  bltz      $a0, .L80240A68
 /* DDD254 80240A24 00101080 */   sll      $v0, $s0, 2
-/* DDD258 80240A28 3C06800F */  lui       $a2, 0x800f
-/* DDD25C 80240A2C 24C67F00 */  addiu     $a2, $a2, 0x7f00
+/* DDD258 80240A28 3C06800F */  lui       $a2, %hi(D_800F7F00)
+/* DDD25C 80240A2C 24C67F00 */  addiu     $a2, $a2, %lo(D_800F7F00)
 /* DDD260 80240A30 00461021 */  addu      $v0, $v0, $a2
 /* DDD264 80240A34 8C430000 */  lw        $v1, ($v0)
 /* DDD268 80240A38 24020001 */  addiu     $v0, $zero, 1
 /* DDD26C 80240A3C AE22018C */  sw        $v0, 0x18c($s1)
 /* DDD270 80240A40 00041080 */  sll       $v0, $a0, 2
-/* DDD274 80240A44 3C068024 */  lui       $a2, 0x8024
-/* DDD278 80240A48 24C61E58 */  addiu     $a2, $a2, 0x1e58
+/* DDD274 80240A44 3C068024 */  lui       $a2, %hi(D_80241E58)
+/* DDD278 80240A48 24C61E58 */  addiu     $a2, $a2, %lo(D_80241E58)
 /* DDD27C 80240A4C AE230000 */  sw        $v1, ($s1)
 /* DDD280 80240A50 001218C0 */  sll       $v1, $s2, 3
 /* DDD284 80240A54 00431021 */  addu      $v0, $v0, $v1
@@ -71,8 +71,8 @@ glabel func_8024095C_DDD18C
 /* DDD290 80240A60 080902A3 */  j         .L80240A8C
 /* DDD294 80240A64 AE220294 */   sw       $v0, 0x294($s1)
 .L80240A68:
-/* DDD298 80240A68 3C06800F */  lui       $a2, 0x800f
-/* DDD29C 80240A6C 24C67F40 */  addiu     $a2, $a2, 0x7f40
+/* DDD298 80240A68 3C06800F */  lui       $a2, %hi(D_800F7F40)
+/* DDD29C 80240A6C 24C67F40 */  addiu     $a2, $a2, %lo(D_800F7F40)
 /* DDD2A0 80240A70 00461021 */  addu      $v0, $v0, $a2
 /* DDD2A4 80240A74 8C420000 */  lw        $v0, ($v0)
 /* DDD2A8 80240A78 AE20018C */  sw        $zero, 0x18c($s1)
@@ -130,9 +130,9 @@ glabel func_8024095C_DDD18C
 /* DDD360 80240B30 02621021 */  addu      $v0, $s3, $v0
 /* DDD364 80240B34 8C420108 */  lw        $v0, 0x108($v0)
 /* DDD368 80240B38 00021100 */  sll       $v0, $v0, 4
-/* DDD36C 80240B3C 3C038009 */  lui       $v1, 0x8009
+/* DDD36C 80240B3C 3C038009 */  lui       $v1, %hi(D_8008EF20)
 /* DDD370 80240B40 00621821 */  addu      $v1, $v1, $v0
-/* DDD374 80240B44 8C63EF20 */  lw        $v1, -0x10e0($v1)
+/* DDD374 80240B44 8C63EF20 */  lw        $v1, %lo(D_8008EF20)($v1)
 /* DDD378 80240B48 8EA20074 */  lw        $v0, 0x74($s5)
 /* DDD37C 80240B4C 2442FFFF */  addiu     $v0, $v0, -1
 /* DDD380 80240B50 00021080 */  sll       $v0, $v0, 2
diff --git a/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240BD8_DDD408.s b/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240BD8_DDD408.s
index fcf58055c1..379be05431 100644
--- a/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240BD8_DDD408.s
+++ b/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240BD8_DDD408.s
@@ -7,9 +7,9 @@ glabel func_80240BD8_DDD408
 /* DDD410 80240BE0 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* DDD414 80240BE4 AFBF0010 */  sw        $ra, 0x10($sp)
 /* DDD418 80240BE8 00021100 */  sll       $v0, $v0, 4
-/* DDD41C 80240BEC 3C048009 */  lui       $a0, 0x8009
+/* DDD41C 80240BEC 3C048009 */  lui       $a0, %hi(D_8008EF20)
 /* DDD420 80240BF0 00822021 */  addu      $a0, $a0, $v0
-/* DDD424 80240BF4 8C84EF20 */  lw        $a0, -0x10e0($a0)
+/* DDD424 80240BF4 8C84EF20 */  lw        $a0, %lo(D_8008EF20)($a0)
 /* DDD428 80240BF8 0C0496CF */  jal       set_message_string
 /* DDD42C 80240BFC 0000282D */   daddu    $a1, $zero, $zero
 /* DDD430 80240C00 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240D90_DDD5C0.s b/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240D90_DDD5C0.s
index 0ae7d1fffa..e2b9eabcd3 100644
--- a/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240D90_DDD5C0.s
+++ b/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240D90_DDD5C0.s
@@ -30,9 +30,9 @@ glabel func_80240D90_DDD5C0
 /* DDD624 80240DF4 000320C0 */  sll       $a0, $v1, 3
 /* DDD628 80240DF8 00641821 */  addu      $v1, $v1, $a0
 /* DDD62C 80240DFC 000318C0 */  sll       $v1, $v1, 3
-/* DDD630 80240E00 3C01800B */  lui       $at, 0x800b
+/* DDD630 80240E00 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* DDD634 80240E04 00230821 */  addu      $at, $at, $v1
-/* DDD638 80240E08 C42C1DEC */  lwc1      $f12, 0x1dec($at)
+/* DDD638 80240E08 C42C1DEC */  lwc1      $f12, %lo(D_800B1DEC)($at)
 /* DDD63C 80240E0C 0C00A88D */  jal       sin_cos_deg
 /* DDD640 80240E10 0040A82D */   daddu    $s5, $v0, $zero
 /* DDD644 80240E14 1200005D */  beqz      $s0, .L80240F8C
@@ -79,8 +79,8 @@ glabel func_80240D90_DDD5C0
 /* DDD6E4 80240EB4 26100004 */   addiu    $s0, $s0, 4
 /* DDD6E8 80240EB8 0000882D */  daddu     $s1, $zero, $zero
 /* DDD6EC 80240EBC 0240802D */  daddu     $s0, $s2, $zero
-/* DDD6F0 80240EC0 3C148024 */  lui       $s4, 0x8024
-/* DDD6F4 80240EC4 26941E98 */  addiu     $s4, $s4, 0x1e98
+/* DDD6F0 80240EC0 3C148024 */  lui       $s4, %hi(D_80241E98)
+/* DDD6F4 80240EC4 26941E98 */  addiu     $s4, $s4, %lo(D_80241E98)
 /* DDD6F8 80240EC8 3C014248 */  lui       $at, 0x4248
 /* DDD6FC 80240ECC 4481A000 */  mtc1      $at, $f20
 /* DDD700 80240ED0 24130044 */  addiu     $s3, $zero, 0x44
@@ -150,8 +150,8 @@ glabel func_80240D90_DDD5C0
 /* DDD7F4 80240FC4 00000000 */   nop      
 .L80240FC8:
 /* DDD7F8 80240FC8 0000882D */  daddu     $s1, $zero, $zero
-/* DDD7FC 80240FCC 3C148024 */  lui       $s4, 0x8024
-/* DDD800 80240FD0 26941E98 */  addiu     $s4, $s4, 0x1e98
+/* DDD7FC 80240FCC 3C148024 */  lui       $s4, %hi(D_80241E98)
+/* DDD800 80240FD0 26941E98 */  addiu     $s4, $s4, %lo(D_80241E98)
 /* DDD804 80240FD4 24130020 */  addiu     $s3, $zero, 0x20
 /* DDD808 80240FD8 3C064248 */  lui       $a2, 0x4248
 /* DDD80C 80240FDC 44800000 */  mtc1      $zero, $f0
@@ -197,8 +197,8 @@ glabel func_80240D90_DDD5C0
 /* DDD8A8 80241078 AE400060 */   sw       $zero, 0x60($s2)
 .L8024107C:
 /* DDD8AC 8024107C 0000882D */  daddu     $s1, $zero, $zero
-/* DDD8B0 80241080 3C148024 */  lui       $s4, 0x8024
-/* DDD8B4 80241084 26941E98 */  addiu     $s4, $s4, 0x1e98
+/* DDD8B0 80241080 3C148024 */  lui       $s4, %hi(D_80241E98)
+/* DDD8B4 80241084 26941E98 */  addiu     $s4, $s4, %lo(D_80241E98)
 /* DDD8B8 80241088 24130020 */  addiu     $s3, $zero, 0x20
 /* DDD8BC 8024108C 0240802D */  daddu     $s0, $s2, $zero
 /* DDD8C0 80241090 3C014248 */  lui       $at, 0x4248
diff --git a/asm/nonmatchings/world/area_omo/omo_12/DDF730/func_80240420_DDF730.s b/asm/nonmatchings/world/area_omo/omo_12/DDF730/func_80240420_DDF730.s
index 37e799e8e3..29ea75b4ba 100644
--- a/asm/nonmatchings/world/area_omo/omo_12/DDF730/func_80240420_DDF730.s
+++ b/asm/nonmatchings/world/area_omo/omo_12/DDF730/func_80240420_DDF730.s
@@ -3,8 +3,8 @@
 
 glabel func_80240420_DDF730
 /* DDF730 80240420 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* DDF734 80240424 3C048024 */  lui       $a0, 0x8024
-/* DDF738 80240428 24843168 */  addiu     $a0, $a0, 0x3168
+/* DDF734 80240424 3C048024 */  lui       $a0, %hi(D_80243168)
+/* DDF738 80240428 24843168 */  addiu     $a0, $a0, %lo(D_80243168)
 /* DDF73C 8024042C 27A50010 */  addiu     $a1, $sp, 0x10
 /* DDF740 80240430 AFBF0020 */  sw        $ra, 0x20($sp)
 /* DDF744 80240434 AFB1001C */  sw        $s1, 0x1c($sp)
@@ -12,16 +12,16 @@ glabel func_80240420_DDF730
 /* DDF74C 8024043C AFB00018 */   sw       $s0, 0x18($sp)
 /* DDF750 80240440 0040802D */  daddu     $s0, $v0, $zero
 /* DDF754 80240444 0200202D */  daddu     $a0, $s0, $zero
-/* DDF758 80240448 3C118024 */  lui       $s1, 0x8024
-/* DDF75C 8024044C 26313190 */  addiu     $s1, $s1, 0x3190
+/* DDF758 80240448 3C118024 */  lui       $s1, %hi(D_80243190)
+/* DDF75C 8024044C 26313190 */  addiu     $s1, $s1, %lo(D_80243190)
 /* DDF760 80240450 0C01BB7C */  jal       decode_yay0
 /* DDF764 80240454 0220282D */   daddu    $a1, $s1, $zero
 /* DDF768 80240458 0C00AB1E */  jal       general_heap_free
 /* DDF76C 8024045C 0200202D */   daddu    $a0, $s0, $zero
-/* DDF770 80240460 3C048024 */  lui       $a0, 0x8024
-/* DDF774 80240464 24847120 */  addiu     $a0, $a0, 0x7120
-/* DDF778 80240468 3C028024 */  lui       $v0, 0x8024
-/* DDF77C 8024046C 24423390 */  addiu     $v0, $v0, 0x3390
+/* DDF770 80240460 3C048024 */  lui       $a0, %hi(D_80247120)
+/* DDF774 80240464 24847120 */  addiu     $a0, $a0, %lo(D_80247120)
+/* DDF778 80240468 3C028024 */  lui       $v0, %hi(D_80243390)
+/* DDF77C 8024046C 24423390 */  addiu     $v0, $v0, %lo(D_80243390)
 /* DDF780 80240470 AC820000 */  sw        $v0, ($a0)
 /* DDF784 80240474 24020096 */  addiu     $v0, $zero, 0x96
 /* DDF788 80240478 A4820008 */  sh        $v0, 8($a0)
diff --git a/asm/nonmatchings/world/area_omo/omo_13/DE2490/func_80240000_DE2490.s b/asm/nonmatchings/world/area_omo/omo_13/DE2490/func_80240000_DE2490.s
index 85e74f77a4..36f9fe8c60 100644
--- a/asm/nonmatchings/world/area_omo/omo_13/DE2490/func_80240000_DE2490.s
+++ b/asm/nonmatchings/world/area_omo/omo_13/DE2490/func_80240000_DE2490.s
@@ -23,8 +23,8 @@ glabel func_80240000_DE2490
 /* DE24D8 80240048 26700008 */  addiu     $s0, $s3, 8
 /* DE24DC 8024004C 3C014060 */  lui       $at, 0x4060
 /* DE24E0 80240050 4481A000 */  mtc1      $at, $f20
-/* DE24E4 80240054 3C128024 */  lui       $s2, 0x8024
-/* DE24E8 80240058 26521A78 */  addiu     $s2, $s2, 0x1a78
+/* DE24E4 80240054 3C128024 */  lui       $s2, %hi(D_80241A78)
+/* DE24E8 80240058 26521A78 */  addiu     $s2, $s2, %lo(D_80241A78)
 /* DE24EC 8024005C AED30070 */  sw        $s3, 0x70($s6)
 .L80240060:
 /* DE24F0 80240060 8E440000 */  lw        $a0, ($s2)
diff --git a/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240280_DE2710.s b/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240280_DE2710.s
index 12d76c5d94..8727da1aea 100644
--- a/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240280_DE2710.s
+++ b/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240280_DE2710.s
@@ -11,8 +11,8 @@ glabel func_80240280_DE2710
 /* DE2728 80240298 0C00EABB */  jal       get_npc_unsafe
 /* DE272C 8024029C 86040008 */   lh       $a0, 8($s0)
 /* DE2730 802402A0 C4400018 */  lwc1      $f0, 0x18($v0)
-/* DE2734 802402A4 3C018024 */  lui       $at, 0x8024
-/* DE2738 802402A8 D4222EE0 */  ldc1      $f2, 0x2ee0($at)
+/* DE2734 802402A4 3C018024 */  lui       $at, %hi(D_80242EE0)
+/* DE2738 802402A8 D4222EE0 */  ldc1      $f2, %lo(D_80242EE0)($at)
 /* DE273C 802402AC 46000021 */  cvt.d.s   $f0, $f0
 /* DE2740 802402B0 46220002 */  mul.d     $f0, $f0, $f2
 /* DE2744 802402B4 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_802402F0_DE2780.s b/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_802402F0_DE2780.s
index ca9119cb42..00b3a447cd 100644
--- a/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_802402F0_DE2780.s
+++ b/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_802402F0_DE2780.s
@@ -35,8 +35,8 @@ glabel func_802402F0_DE2780
 /* DE27F4 80240364 14400010 */  bnez      $v0, .L802403A8
 /* DE27F8 80240368 00000000 */   nop      
 /* DE27FC 8024036C C6000018 */  lwc1      $f0, 0x18($s0)
-/* DE2800 80240370 3C018024 */  lui       $at, 0x8024
-/* DE2804 80240374 D4222EE8 */  ldc1      $f2, 0x2ee8($at)
+/* DE2800 80240370 3C018024 */  lui       $at, %hi(D_80242EE8)
+/* DE2804 80240374 D4222EE8 */  ldc1      $f2, %lo(D_80242EE8)($at)
 /* DE2808 80240378 46000021 */  cvt.d.s   $f0, $f0
 /* DE280C 8024037C 46220002 */  mul.d     $f0, $f0, $f2
 /* DE2810 80240380 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_802404B8_DE2948.s b/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_802404B8_DE2948.s
index 5c9d53ebd1..25b5756840 100644
--- a/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_802404B8_DE2948.s
+++ b/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_802404B8_DE2948.s
@@ -124,9 +124,9 @@ glabel func_802404B8_DE2948
 /* DE2B0C 8024067C 2C620064 */  sltiu     $v0, $v1, 0x64
 /* DE2B10 80240680 10400050 */  beqz      $v0, .L802407C4
 /* DE2B14 80240684 00031080 */   sll      $v0, $v1, 2
-/* DE2B18 80240688 3C018024 */  lui       $at, 0x8024
+/* DE2B18 80240688 3C018024 */  lui       $at, %hi(D_80242EF0)
 /* DE2B1C 8024068C 00220821 */  addu      $at, $at, $v0
-/* DE2B20 80240690 8C222EF0 */  lw        $v0, 0x2ef0($at)
+/* DE2B20 80240690 8C222EF0 */  lw        $v0, %lo(D_80242EF0)($at)
 /* DE2B24 80240694 00400008 */  jr        $v0
 /* DE2B28 80240698 00000000 */   nop      
 /* DE2B2C 8024069C 0260202D */  daddu     $a0, $s3, $zero
diff --git a/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_8024083C_DE2CCC.s b/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_8024083C_DE2CCC.s
index 99d60fc244..4f2cb1d9c2 100644
--- a/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_8024083C_DE2CCC.s
+++ b/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_8024083C_DE2CCC.s
@@ -89,12 +89,12 @@ glabel func_8024083C_DE2CCC
 /* DE2DF4 80240964 AE230028 */  sw        $v1, 0x28($s1)
 .L80240968:
 /* DE2DF8 80240968 C6200048 */  lwc1      $f0, 0x48($s1)
-/* DE2DFC 8024096C 3C018024 */  lui       $at, 0x8024
-/* DE2E00 80240970 D4223080 */  ldc1      $f2, 0x3080($at)
+/* DE2DFC 8024096C 3C018024 */  lui       $at, %hi(D_80243080)
+/* DE2E00 80240970 D4223080 */  ldc1      $f2, %lo(D_80243080)($at)
 /* DE2E04 80240974 46000021 */  cvt.d.s   $f0, $f0
 /* DE2E08 80240978 46220000 */  add.d     $f0, $f0, $f2
-/* DE2E0C 8024097C 3C018024 */  lui       $at, 0x8024
-/* DE2E10 80240980 D4223088 */  ldc1      $f2, 0x3088($at)
+/* DE2E0C 8024097C 3C018024 */  lui       $at, %hi(D_80243088)
+/* DE2E10 80240980 D4223088 */  ldc1      $f2, %lo(D_80243088)($at)
 /* DE2E14 80240984 46200020 */  cvt.s.d   $f0, $f0
 /* DE2E18 80240988 E6200048 */  swc1      $f0, 0x48($s1)
 /* DE2E1C 8024098C 46000021 */  cvt.d.s   $f0, $f0
diff --git a/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240A00_DE2E90.s b/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240A00_DE2E90.s
index e7664647dc..62463260ff 100644
--- a/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240A00_DE2E90.s
+++ b/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240A00_DE2E90.s
@@ -124,9 +124,9 @@ glabel func_80240A00_DE2E90
 /* DE3054 80240BC4 2C620064 */  sltiu     $v0, $v1, 0x64
 /* DE3058 80240BC8 10400038 */  beqz      $v0, .L80240CAC
 /* DE305C 80240BCC 00031080 */   sll      $v0, $v1, 2
-/* DE3060 80240BD0 3C018024 */  lui       $at, 0x8024
+/* DE3060 80240BD0 3C018024 */  lui       $at, %hi(D_80243090)
 /* DE3064 80240BD4 00220821 */  addu      $at, $at, $v0
-/* DE3068 80240BD8 8C223090 */  lw        $v0, 0x3090($at)
+/* DE3068 80240BD8 8C223090 */  lw        $v0, %lo(D_80243090)($at)
 /* DE306C 80240BDC 00400008 */  jr        $v0
 /* DE3070 80240BE0 00000000 */   nop      
 /* DE3074 80240BE4 0260202D */  daddu     $a0, $s3, $zero
diff --git a/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240F00_DE3390.s b/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240F00_DE3390.s
index 40805a9a08..66878aef30 100644
--- a/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240F00_DE3390.s
+++ b/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240F00_DE3390.s
@@ -6,11 +6,11 @@ glabel func_80240F00_DE3390
 /* DE3394 80240F04 AFBF0010 */  sw        $ra, 0x10($sp)
 /* DE3398 80240F08 10A00003 */  beqz      $a1, .L80240F18
 /* DE339C 80240F0C 8C86000C */   lw       $a2, 0xc($a0)
-/* DE33A0 80240F10 3C018024 */  lui       $at, 0x8024
-/* DE33A4 80240F14 AC201C04 */  sw        $zero, 0x1c04($at)
+/* DE33A0 80240F10 3C018024 */  lui       $at, %hi(D_80241C04)
+/* DE33A4 80240F14 AC201C04 */  sw        $zero, %lo(D_80241C04)($at)
 .L80240F18:
-/* DE33A8 80240F18 3C038024 */  lui       $v1, 0x8024
-/* DE33AC 80240F1C 24631C04 */  addiu     $v1, $v1, 0x1c04
+/* DE33A8 80240F18 3C038024 */  lui       $v1, %hi(D_80241C04)
+/* DE33AC 80240F1C 24631C04 */  addiu     $v1, $v1, %lo(D_80241C04)
 /* DE33B0 80240F20 8C620000 */  lw        $v0, ($v1)
 /* DE33B4 80240F24 54400003 */  bnel      $v0, $zero, .L80240F34
 /* DE33B8 80240F28 AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_80240F00_DE3390
 /* DE33C0 80240F30 0000102D */   daddu    $v0, $zero, $zero
 .L80240F34:
 /* DE33C4 80240F34 8CC50000 */  lw        $a1, ($a2)
-/* DE33C8 80240F38 3C068024 */  lui       $a2, 0x8024
+/* DE33C8 80240F38 3C068024 */  lui       $a2, %hi(D_80241C08)
 /* DE33CC 80240F3C 0C0B2026 */  jal       set_variable
-/* DE33D0 80240F40 8CC61C08 */   lw       $a2, 0x1c08($a2)
+/* DE33D0 80240F40 8CC61C08 */   lw       $a2, %lo(D_80241C08)($a2)
 /* DE33D4 80240F44 24020002 */  addiu     $v0, $zero, 2
 .L80240F48:
 /* DE33D8 80240F48 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240F54_DE33E4.s b/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240F54_DE33E4.s
index 676bbab251..c29a428660 100644
--- a/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240F54_DE33E4.s
+++ b/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240F54_DE33E4.s
@@ -7,12 +7,12 @@ glabel func_80240F54_DE33E4
 /* DE33EC 80240F5C 8C82000C */  lw        $v0, 0xc($a0)
 /* DE33F0 80240F60 0C0B1EAF */  jal       get_variable
 /* DE33F4 80240F64 8C450000 */   lw       $a1, ($v0)
-/* DE33F8 80240F68 3C018024 */  lui       $at, 0x8024
-/* DE33FC 80240F6C AC221C08 */  sw        $v0, 0x1c08($at)
+/* DE33F8 80240F68 3C018024 */  lui       $at, %hi(D_80241C08)
+/* DE33FC 80240F6C AC221C08 */  sw        $v0, %lo(D_80241C08)($at)
 /* DE3400 80240F70 24020002 */  addiu     $v0, $zero, 2
 /* DE3404 80240F74 8FBF0010 */  lw        $ra, 0x10($sp)
 /* DE3408 80240F78 24030001 */  addiu     $v1, $zero, 1
-/* DE340C 80240F7C 3C018024 */  lui       $at, 0x8024
-/* DE3410 80240F80 AC231C04 */  sw        $v1, 0x1c04($at)
+/* DE340C 80240F7C 3C018024 */  lui       $at, %hi(D_80241C04)
+/* DE3410 80240F80 AC231C04 */  sw        $v1, %lo(D_80241C04)($at)
 /* DE3414 80240F84 03E00008 */  jr        $ra
 /* DE3418 80240F88 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240F8C_DE341C.s b/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240F8C_DE341C.s
index 8a7e5a9adf..28ece0d959 100644
--- a/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240F8C_DE341C.s
+++ b/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240F8C_DE341C.s
@@ -13,8 +13,8 @@ glabel func_80240F8C_DE341C
 /* DE343C 80240FAC 8C620000 */  lw        $v0, ($v1)
 /* DE3440 80240FB0 5040000A */  beql      $v0, $zero, .L80240FDC
 /* DE3444 80240FB4 00041080 */   sll      $v0, $a0, 2
-/* DE3448 80240FB8 3C058024 */  lui       $a1, 0x8024
-/* DE344C 80240FBC 24A53220 */  addiu     $a1, $a1, 0x3220
+/* DE3448 80240FB8 3C058024 */  lui       $a1, %hi(D_80243220)
+/* DE344C 80240FBC 24A53220 */  addiu     $a1, $a1, %lo(D_80243220)
 .L80240FC0:
 /* DE3450 80240FC0 24630004 */  addiu     $v1, $v1, 4
 /* DE3454 80240FC4 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_80240F8C_DE341C
 /* DE3464 80240FD4 24A50004 */   addiu    $a1, $a1, 4
 /* DE3468 80240FD8 00041080 */  sll       $v0, $a0, 2
 .L80240FDC:
-/* DE346C 80240FDC 3C018024 */  lui       $at, 0x8024
+/* DE346C 80240FDC 3C018024 */  lui       $at, %hi(D_80243220)
 /* DE3470 80240FE0 00220821 */  addu      $at, $at, $v0
-/* DE3474 80240FE4 AC203220 */  sw        $zero, 0x3220($at)
+/* DE3474 80240FE4 AC203220 */  sw        $zero, %lo(D_80243220)($at)
 /* DE3478 80240FE8 08090406 */  j         .L80241018
 /* DE347C 80240FEC 00000000 */   nop      
 .L80240FF0:
-/* DE3480 80240FF0 3C038024 */  lui       $v1, 0x8024
-/* DE3484 80240FF4 24633220 */  addiu     $v1, $v1, 0x3220
+/* DE3480 80240FF0 3C038024 */  lui       $v1, %hi(D_80243220)
+/* DE3484 80240FF4 24633220 */  addiu     $v1, $v1, %lo(D_80243220)
 /* DE3488 80240FF8 0060282D */  daddu     $a1, $v1, $zero
 .L80240FFC:
 /* DE348C 80240FFC 24820080 */  addiu     $v0, $a0, 0x80
diff --git a/asm/nonmatchings/world/area_omo/omo_13/DE36C0/func_80241230_DE36C0.s b/asm/nonmatchings/world/area_omo/omo_13/DE36C0/func_80241230_DE36C0.s
index 9cdcb9c990..be4081a1f5 100644
--- a/asm/nonmatchings/world/area_omo/omo_13/DE36C0/func_80241230_DE36C0.s
+++ b/asm/nonmatchings/world/area_omo/omo_13/DE36C0/func_80241230_DE36C0.s
@@ -4,8 +4,8 @@
 glabel func_80241230_DE36C0
 /* DE36C0 80241230 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* DE36C4 80241234 AFB00010 */  sw        $s0, 0x10($sp)
-/* DE36C8 80241238 3C108024 */  lui       $s0, 0x8024
-/* DE36CC 8024123C 26102C70 */  addiu     $s0, $s0, 0x2c70
+/* DE36C8 80241238 3C108024 */  lui       $s0, %hi(D_80242C70)
+/* DE36CC 8024123C 26102C70 */  addiu     $s0, $s0, %lo(D_80242C70)
 /* DE36D0 80241240 AFBF0018 */  sw        $ra, 0x18($sp)
 /* DE36D4 80241244 AFB10014 */  sw        $s1, 0x14($sp)
 /* DE36D8 80241248 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_80241230_DE36C0
 /* DE373C 802412AC 28620010 */  slti      $v0, $v1, 0x10
 /* DE3740 802412B0 1440FFFA */  bnez      $v0, .L8024129C
 /* DE3744 802412B4 24840004 */   addiu    $a0, $a0, 4
-/* DE3748 802412B8 3C108024 */  lui       $s0, 0x8024
-/* DE374C 802412BC 26102C70 */  addiu     $s0, $s0, 0x2c70
+/* DE3748 802412B8 3C108024 */  lui       $s0, %hi(D_80242C70)
+/* DE374C 802412BC 26102C70 */  addiu     $s0, $s0, %lo(D_80242C70)
 /* DE3750 802412C0 0C00AB4B */  jal       heap_free
 /* DE3754 802412C4 8E040000 */   lw       $a0, ($s0)
 /* DE3758 802412C8 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_omo/omo_14/DE5810/func_80240590_DE5C40.s b/asm/nonmatchings/world/area_omo/omo_14/DE5810/func_80240590_DE5C40.s
index 1e9fa5dab2..5fa46c4cad 100644
--- a/asm/nonmatchings/world/area_omo/omo_14/DE5810/func_80240590_DE5C40.s
+++ b/asm/nonmatchings/world/area_omo/omo_14/DE5810/func_80240590_DE5C40.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80240590_DE5C40
-/* DE5C40 80240590 3C038011 */  lui       $v1, 0x8011
-/* DE5C44 80240594 8063EBB3 */  lb        $v1, -0x144d($v1)
+/* DE5C40 80240590 3C038011 */  lui       $v1, %hi(D_8010EBB3)
+/* DE5C44 80240594 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
 /* DE5C48 80240598 24020006 */  addiu     $v0, $zero, 6
 /* DE5C4C 8024059C 54620003 */  bnel      $v1, $v0, .L802405AC
 /* DE5C50 802405A0 AC800088 */   sw       $zero, 0x88($a0)
diff --git a/asm/nonmatchings/world/area_omo/omo_15/DE8770/func_802401AC_DE891C.s b/asm/nonmatchings/world/area_omo/omo_15/DE8770/func_802401AC_DE891C.s
index e7fc18fcdb..9e13c3122d 100644
--- a/asm/nonmatchings/world/area_omo/omo_15/DE8770/func_802401AC_DE891C.s
+++ b/asm/nonmatchings/world/area_omo/omo_15/DE8770/func_802401AC_DE891C.s
@@ -13,9 +13,9 @@ glabel func_802401AC_DE891C
 /* DE893C 802401CC 2C620005 */  sltiu     $v0, $v1, 5
 /* DE8940 802401D0 1040008A */  beqz      $v0, .L802403FC
 /* DE8944 802401D4 00031080 */   sll      $v0, $v1, 2
-/* DE8948 802401D8 3C018024 */  lui       $at, 0x8024
+/* DE8948 802401D8 3C018024 */  lui       $at, %hi(D_80243730)
 /* DE894C 802401DC 00220821 */  addu      $at, $at, $v0
-/* DE8950 802401E0 8C223730 */  lw        $v0, 0x3730($at)
+/* DE8950 802401E0 8C223730 */  lw        $v0, %lo(D_80243730)($at)
 /* DE8954 802401E4 00400008 */  jr        $v0
 /* DE8958 802401E8 00000000 */   nop      
 /* DE895C 802401EC 8E22003C */  lw        $v0, 0x3c($s1)
diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240560_DEF400.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240560_DEF400.s
index ebb44522bd..fb0078bf48 100644
--- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240560_DEF400.s
+++ b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240560_DEF400.s
@@ -11,8 +11,8 @@ glabel func_80240560_DEF400
 /* DEF418 80240578 0C00EABB */  jal       get_npc_unsafe
 /* DEF41C 8024057C 86040008 */   lh       $a0, 8($s0)
 /* DEF420 80240580 C4400018 */  lwc1      $f0, 0x18($v0)
-/* DEF424 80240584 3C018024 */  lui       $at, 0x8024
-/* DEF428 80240588 D4227610 */  ldc1      $f2, 0x7610($at)
+/* DEF424 80240584 3C018024 */  lui       $at, %hi(D_80247610)
+/* DEF428 80240588 D4227610 */  ldc1      $f2, %lo(D_80247610)($at)
 /* DEF42C 8024058C 46000021 */  cvt.d.s   $f0, $f0
 /* DEF430 80240590 46220002 */  mul.d     $f0, $f0, $f2
 /* DEF434 80240594 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802405D0_DEF470.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802405D0_DEF470.s
index 00e73dc128..a1fb7dfe8e 100644
--- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802405D0_DEF470.s
+++ b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802405D0_DEF470.s
@@ -35,8 +35,8 @@ glabel func_802405D0_DEF470
 /* DEF4E4 80240644 14400010 */  bnez      $v0, .L80240688
 /* DEF4E8 80240648 00000000 */   nop      
 /* DEF4EC 8024064C C6000018 */  lwc1      $f0, 0x18($s0)
-/* DEF4F0 80240650 3C018024 */  lui       $at, 0x8024
-/* DEF4F4 80240654 D4227618 */  ldc1      $f2, 0x7618($at)
+/* DEF4F0 80240650 3C018024 */  lui       $at, %hi(D_80247618)
+/* DEF4F4 80240654 D4227618 */  ldc1      $f2, %lo(D_80247618)($at)
 /* DEF4F8 80240658 46000021 */  cvt.d.s   $f0, $f0
 /* DEF4FC 8024065C 46220002 */  mul.d     $f0, $f0, $f2
 /* DEF500 80240660 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240798_DEF638.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240798_DEF638.s
index 352f3a5e8f..91adcf6c4c 100644
--- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240798_DEF638.s
+++ b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240798_DEF638.s
@@ -124,9 +124,9 @@ glabel func_80240798_DEF638
 /* DEF7FC 8024095C 2C620064 */  sltiu     $v0, $v1, 0x64
 /* DEF800 80240960 10400050 */  beqz      $v0, .L80240AA4
 /* DEF804 80240964 00031080 */   sll      $v0, $v1, 2
-/* DEF808 80240968 3C018024 */  lui       $at, 0x8024
+/* DEF808 80240968 3C018024 */  lui       $at, %hi(D_80247620)
 /* DEF80C 8024096C 00220821 */  addu      $at, $at, $v0
-/* DEF810 80240970 8C227620 */  lw        $v0, 0x7620($at)
+/* DEF810 80240970 8C227620 */  lw        $v0, %lo(D_80247620)($at)
 /* DEF814 80240974 00400008 */  jr        $v0
 /* DEF818 80240978 00000000 */   nop      
 /* DEF81C 8024097C 0260202D */  daddu     $a0, $s3, $zero
diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240B1C_DEF9BC.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240B1C_DEF9BC.s
index c34dd13362..3d9e8ca54e 100644
--- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240B1C_DEF9BC.s
+++ b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240B1C_DEF9BC.s
@@ -89,12 +89,12 @@ glabel func_80240B1C_DEF9BC
 /* DEFAE4 80240C44 AE230028 */  sw        $v1, 0x28($s1)
 .L80240C48:
 /* DEFAE8 80240C48 C6200048 */  lwc1      $f0, 0x48($s1)
-/* DEFAEC 80240C4C 3C018024 */  lui       $at, 0x8024
-/* DEFAF0 80240C50 D42277B0 */  ldc1      $f2, 0x77b0($at)
+/* DEFAEC 80240C4C 3C018024 */  lui       $at, %hi(D_802477B0)
+/* DEFAF0 80240C50 D42277B0 */  ldc1      $f2, %lo(D_802477B0)($at)
 /* DEFAF4 80240C54 46000021 */  cvt.d.s   $f0, $f0
 /* DEFAF8 80240C58 46220000 */  add.d     $f0, $f0, $f2
-/* DEFAFC 80240C5C 3C018024 */  lui       $at, 0x8024
-/* DEFB00 80240C60 D42277B8 */  ldc1      $f2, 0x77b8($at)
+/* DEFAFC 80240C5C 3C018024 */  lui       $at, %hi(D_802477B8)
+/* DEFB00 80240C60 D42277B8 */  ldc1      $f2, %lo(D_802477B8)($at)
 /* DEFB04 80240C64 46200020 */  cvt.s.d   $f0, $f0
 /* DEFB08 80240C68 E6200048 */  swc1      $f0, 0x48($s1)
 /* DEFB0C 80240C6C 46000021 */  cvt.d.s   $f0, $f0
diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240CE0_DEFB80.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240CE0_DEFB80.s
index 08d7cc2607..b7bf1da4f9 100644
--- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240CE0_DEFB80.s
+++ b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240CE0_DEFB80.s
@@ -124,9 +124,9 @@ glabel func_80240CE0_DEFB80
 /* DEFD44 80240EA4 2C620064 */  sltiu     $v0, $v1, 0x64
 /* DEFD48 80240EA8 10400038 */  beqz      $v0, .L80240F8C
 /* DEFD4C 80240EAC 00031080 */   sll      $v0, $v1, 2
-/* DEFD50 80240EB0 3C018024 */  lui       $at, 0x8024
+/* DEFD50 80240EB0 3C018024 */  lui       $at, %hi(D_802477C0)
 /* DEFD54 80240EB4 00220821 */  addu      $at, $at, $v0
-/* DEFD58 80240EB8 8C2277C0 */  lw        $v0, 0x77c0($at)
+/* DEFD58 80240EB8 8C2277C0 */  lw        $v0, %lo(D_802477C0)($at)
 /* DEFD5C 80240EBC 00400008 */  jr        $v0
 /* DEFD60 80240EC0 00000000 */   nop      
 /* DEFD64 80240EC4 0260202D */  daddu     $a0, $s3, $zero
diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240FB4_DEFE54.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240FB4_DEFE54.s
index 78d38fe3ab..471fdd7763 100644
--- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240FB4_DEFE54.s
+++ b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240FB4_DEFE54.s
@@ -87,8 +87,8 @@ glabel func_80240FB4_DEFE54
 /* DEFF94 802410F4 08090447 */  j         .L8024111C
 /* DEFF98 802410F8 E6000018 */   swc1     $f0, 0x18($s0)
 .L802410FC:
-/* DEFF9C 802410FC 3C018024 */  lui       $at, 0x8024
-/* DEFFA0 80241100 D4227950 */  ldc1      $f2, 0x7950($at)
+/* DEFF9C 802410FC 3C018024 */  lui       $at, %hi(D_80247950)
+/* DEFFA0 80241100 D4227950 */  ldc1      $f2, %lo(D_80247950)($at)
 /* DEFFA4 80241104 44820000 */  mtc1      $v0, $f0
 /* DEFFA8 80241108 00000000 */  nop       
 /* DEFFAC 8024110C 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80241164_DF0004.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80241164_DF0004.s
index dcb7937604..d4e9063753 100644
--- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80241164_DF0004.s
+++ b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80241164_DF0004.s
@@ -104,8 +104,8 @@ glabel func_80241164_DF0004
 /* DF0188 802412E8 1040000A */  beqz      $v0, .L80241314
 /* DF018C 802412EC 4600C106 */   mov.s    $f4, $f24
 /* DF0190 802412F0 4614C081 */  sub.s     $f2, $f24, $f20
-/* DF0194 802412F4 3C018024 */  lui       $at, 0x8024
-/* DF0198 802412F8 D4207958 */  ldc1      $f0, 0x7958($at)
+/* DF0194 802412F4 3C018024 */  lui       $at, %hi(D_80247958)
+/* DF0198 802412F8 D4207958 */  ldc1      $f0, %lo(D_80247958)($at)
 /* DF019C 802412FC 460010A1 */  cvt.d.s   $f2, $f2
 /* DF01A0 80241300 46201082 */  mul.d     $f2, $f2, $f0
 /* DF01A4 80241304 00000000 */  nop       
@@ -131,8 +131,8 @@ glabel func_80241164_DF0004
 /* DF01F0 80241350 C7A4002C */  lwc1      $f4, 0x2c($sp)
 /* DF01F4 80241354 461A2100 */  add.s     $f4, $f4, $f26
 /* DF01F8 80241358 46142081 */  sub.s     $f2, $f4, $f20
-/* DF01FC 8024135C 3C018024 */  lui       $at, 0x8024
-/* DF0200 80241360 D4207960 */  ldc1      $f0, 0x7960($at)
+/* DF01FC 8024135C 3C018024 */  lui       $at, %hi(D_80247960)
+/* DF0200 80241360 D4207960 */  ldc1      $f0, %lo(D_80247960)($at)
 /* DF0204 80241364 460010A1 */  cvt.d.s   $f2, $f2
 /* DF0208 80241368 46201082 */  mul.d     $f2, $f2, $f0
 /* DF020C 8024136C 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80241C08_DF0AA8.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80241C08_DF0AA8.s
index 47254dd2e1..a9375edf69 100644
--- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80241C08_DF0AA8.s
+++ b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80241C08_DF0AA8.s
@@ -15,9 +15,9 @@ glabel func_80241C08_DF0AA8
 /* DF0AD0 80241C30 00031C00 */  sll       $v1, $v1, 0x10
 /* DF0AD4 80241C34 00031B83 */  sra       $v1, $v1, 0xe
 /* DF0AD8 80241C38 A444008E */  sh        $a0, 0x8e($v0)
-/* DF0ADC 80241C3C 3C018024 */  lui       $at, 0x8024
+/* DF0ADC 80241C3C 3C018024 */  lui       $at, %hi(D_80246184)
 /* DF0AE0 80241C40 00230821 */  addu      $at, $at, $v1
-/* DF0AE4 80241C44 C4226184 */  lwc1      $f2, 0x6184($at)
+/* DF0AE4 80241C44 C4226184 */  lwc1      $f2, %lo(D_80246184)($at)
 /* DF0AE8 80241C48 8443008E */  lh        $v1, 0x8e($v0)
 /* DF0AEC 80241C4C 46020000 */  add.s     $f0, $f0, $f2
 /* DF0AF0 80241C50 28630005 */  slti      $v1, $v1, 5
diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802422C0_DF1160.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802422C0_DF1160.s
index b238209bd1..59137fc836 100644
--- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802422C0_DF1160.s
+++ b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802422C0_DF1160.s
@@ -66,9 +66,9 @@ glabel func_802422C0_DF1160
 /* DF124C 802423AC 2C62000F */  sltiu     $v0, $v1, 0xf
 /* DF1250 802423B0 10400034 */  beqz      $v0, .L80242484
 /* DF1254 802423B4 00031080 */   sll      $v0, $v1, 2
-/* DF1258 802423B8 3C018024 */  lui       $at, 0x8024
+/* DF1258 802423B8 3C018024 */  lui       $at, %hi(D_80247968)
 /* DF125C 802423BC 00220821 */  addu      $at, $at, $v0
-/* DF1260 802423C0 8C227968 */  lw        $v0, 0x7968($at)
+/* DF1260 802423C0 8C227968 */  lw        $v0, %lo(D_80247968)($at)
 /* DF1264 802423C4 00400008 */  jr        $v0
 /* DF1268 802423C8 00000000 */   nop      
 /* DF126C 802423CC 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802424AC_DF134C.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802424AC_DF134C.s
index 9e1e27b7f1..7a1a0a0582 100644
--- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802424AC_DF134C.s
+++ b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802424AC_DF134C.s
@@ -13,8 +13,8 @@ glabel func_802424AC_DF134C
 /* DF136C 802424CC AFB00010 */  sw        $s0, 0x10($sp)
 /* DF1370 802424D0 F7B40028 */  sdc1      $f20, 0x28($sp)
 /* DF1374 802424D4 8E330148 */  lw        $s3, 0x148($s1)
-/* DF1378 802424D8 3C03800A */  lui       $v1, 0x800a
-/* DF137C 802424DC 8463A634 */  lh        $v1, -0x59cc($v1)
+/* DF1378 802424D8 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* DF137C 802424DC 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* DF1380 802424E0 8E30000C */  lw        $s0, 0xc($s1)
 /* DF1384 802424E4 00031080 */  sll       $v0, $v1, 2
 /* DF1388 802424E8 00431021 */  addu      $v0, $v0, $v1
@@ -45,8 +45,8 @@ glabel func_802424AC_DF134C
 /* DF13EC 8024254C 00000000 */   nop      
 /* DF13F0 80242550 0C00A6C9 */  jal       clamp_angle
 /* DF13F4 80242554 46000306 */   mov.s    $f12, $f0
-/* DF13F8 80242558 3C018024 */  lui       $at, 0x8024
-/* DF13FC 8024255C D42279A8 */  ldc1      $f2, 0x79a8($at)
+/* DF13F8 80242558 3C018024 */  lui       $at, %hi(D_802479A8)
+/* DF13FC 8024255C D42279A8 */  ldc1      $f2, %lo(D_802479A8)($at)
 /* DF1400 80242560 46000021 */  cvt.d.s   $f0, $f0
 /* DF1404 80242564 4622003C */  c.lt.d    $f0, $f2
 /* DF1408 80242568 00000000 */  nop       
@@ -67,8 +67,8 @@ glabel func_802424AC_DF134C
 /* DF1440 802425A0 0C00A70A */  jal       get_clamped_angle_diff
 /* DF1444 802425A4 46000386 */   mov.s    $f14, $f0
 /* DF1448 802425A8 46000005 */  abs.s     $f0, $f0
-/* DF144C 802425AC 3C018024 */  lui       $at, 0x8024
-/* DF1450 802425B0 D42279B0 */  ldc1      $f2, 0x79b0($at)
+/* DF144C 802425AC 3C018024 */  lui       $at, %hi(D_802479B0)
+/* DF1450 802425B0 D42279B0 */  ldc1      $f2, %lo(D_802479B0)($at)
 /* DF1454 802425B4 46000021 */  cvt.d.s   $f0, $f0
 /* DF1458 802425B8 4620103C */  c.lt.d    $f2, $f0
 /* DF145C 802425BC 00000000 */  nop       
@@ -89,8 +89,8 @@ glabel func_802424AC_DF134C
 /* DF1498 802425F8 00000000 */  nop       
 /* DF149C 802425FC 4501001F */  bc1t      .L8024267C
 /* DF14A0 80242600 2402FFFF */   addiu    $v0, $zero, -1
-/* DF14A4 80242604 3C038011 */  lui       $v1, 0x8011
-/* DF14A8 80242608 8063EBB3 */  lb        $v1, -0x144d($v1)
+/* DF14A4 80242604 3C038011 */  lui       $v1, %hi(D_8010EBB3)
+/* DF14A8 80242608 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
 /* DF14AC 8024260C 24020009 */  addiu     $v0, $zero, 9
 /* DF14B0 80242610 10620019 */  beq       $v1, $v0, .L80242678
 /* DF14B4 80242614 24020007 */   addiu    $v0, $zero, 7
diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80242F44_DF1DE4.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80242F44_DF1DE4.s
index 8a7d74c883..6305221963 100644
--- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80242F44_DF1DE4.s
+++ b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80242F44_DF1DE4.s
@@ -7,8 +7,8 @@ glabel func_80242F44_DF1DE4
 /* DF1DEC 80242F4C 0080982D */  daddu     $s3, $a0, $zero
 /* DF1DF0 80242F50 AFB40040 */  sw        $s4, 0x40($sp)
 /* DF1DF4 80242F54 0000A02D */  daddu     $s4, $zero, $zero
-/* DF1DF8 80242F58 3C03800A */  lui       $v1, 0x800a
-/* DF1DFC 80242F5C 8463A634 */  lh        $v1, -0x59cc($v1)
+/* DF1DF8 80242F58 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* DF1DFC 80242F5C 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* DF1E00 80242F60 3C04800B */  lui       $a0, %hi(gCameras)
 /* DF1E04 80242F64 24841D80 */  addiu     $a0, $a0, %lo(gCameras)
 /* DF1E08 80242F68 AFBF0044 */  sw        $ra, 0x44($sp)
@@ -80,12 +80,12 @@ glabel func_80242F44_DF1DE4
 /* DF1EFC 8024305C C64C006C */  lwc1      $f12, 0x6c($s2)
 /* DF1F00 80243060 0C00A6C9 */  jal       clamp_angle
 /* DF1F04 80243064 00000000 */   nop      
-/* DF1F08 80243068 3C018024 */  lui       $at, 0x8024
-/* DF1F0C 8024306C D43879B8 */  ldc1      $f24, 0x79b8($at)
+/* DF1F08 80243068 3C018024 */  lui       $at, %hi(D_802479B8)
+/* DF1F0C 8024306C D43879B8 */  ldc1      $f24, %lo(D_802479B8)($at)
 /* DF1F10 80243070 46000521 */  cvt.d.s   $f20, $f0
 /* DF1F14 80243074 4638A300 */  add.d     $f12, $f20, $f24
-/* DF1F18 80243078 3C018024 */  lui       $at, 0x8024
-/* DF1F1C 8024307C D43679C0 */  ldc1      $f22, 0x79c0($at)
+/* DF1F18 80243078 3C018024 */  lui       $at, %hi(D_802479C0)
+/* DF1F1C 8024307C D43679C0 */  ldc1      $f22, %lo(D_802479C0)($at)
 /* DF1F20 80243080 0C00A6C9 */  jal       clamp_angle
 /* DF1F24 80243084 46206320 */   cvt.s.d  $f12, $f12
 /* DF1F28 80243088 4636A500 */  add.d     $f20, $f20, $f22
@@ -113,8 +113,8 @@ glabel func_80242F44_DF1DE4
 /* DF1F80 802430E0 E616000C */  swc1      $f22, 0xc($s0)
 .L802430E4:
 /* DF1F84 802430E4 C6000018 */  lwc1      $f0, 0x18($s0)
-/* DF1F88 802430E8 3C018024 */  lui       $at, 0x8024
-/* DF1F8C 802430EC D42279C8 */  ldc1      $f2, 0x79c8($at)
+/* DF1F88 802430E8 3C018024 */  lui       $at, %hi(D_802479C8)
+/* DF1F8C 802430EC D42279C8 */  ldc1      $f2, %lo(D_802479C8)($at)
 /* DF1F90 802430F0 46000021 */  cvt.d.s   $f0, $f0
 /* DF1F94 802430F4 46220002 */  mul.d     $f0, $f0, $f2
 /* DF1F98 802430F8 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802433A0_DF2240.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802433A0_DF2240.s
index 191c53f074..9b91f79952 100644
--- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802433A0_DF2240.s
+++ b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802433A0_DF2240.s
@@ -103,9 +103,9 @@ glabel func_802433A0_DF2240
 /* DF23B0 80243510 2C620064 */  sltiu     $v0, $v1, 0x64
 /* DF23B4 80243514 10400060 */  beqz      $v0, .L80243698
 /* DF23B8 80243518 00031080 */   sll      $v0, $v1, 2
-/* DF23BC 8024351C 3C018024 */  lui       $at, 0x8024
+/* DF23BC 8024351C 3C018024 */  lui       $at, %hi(D_802479D0)
 /* DF23C0 80243520 00220821 */  addu      $at, $at, $v0
-/* DF23C4 80243524 8C2279D0 */  lw        $v0, 0x79d0($at)
+/* DF23C4 80243524 8C2279D0 */  lw        $v0, %lo(D_802479D0)($at)
 /* DF23C8 80243528 00400008 */  jr        $v0
 /* DF23CC 8024352C 00000000 */   nop      
 /* DF23D0 80243530 0260202D */  daddu     $a0, $s3, $zero
diff --git a/asm/nonmatchings/world/area_osr/osr_00/AACBB0/func_80240380_AACBB0.s b/asm/nonmatchings/world/area_osr/osr_00/AACBB0/func_80240380_AACBB0.s
index c42ee6b77e..f1b5bf337e 100644
--- a/asm/nonmatchings/world/area_osr/osr_00/AACBB0/func_80240380_AACBB0.s
+++ b/asm/nonmatchings/world/area_osr/osr_00/AACBB0/func_80240380_AACBB0.s
@@ -71,8 +71,8 @@ glabel func_80240380_AACBB0
 /* AACCA4 80240474 08090115 */  j         .L80240454
 /* AACCA8 80240478 00000000 */   nop      
 .L8024047C:
-/* AACCAC 8024047C 3C028015 */  lui       $v0, 0x8015
-/* AACCB0 80240480 8C4212F0 */  lw        $v0, 0x12f0($v0)
+/* AACCAC 8024047C 3C028015 */  lui       $v0, %hi(D_801512F0)
+/* AACCB0 80240480 8C4212F0 */  lw        $v0, %lo(D_801512F0)($v0)
 /* AACCB4 80240484 A0510000 */  sb        $s1, ($v0)
 .L80240488:
 /* AACCB8 80240488 24020002 */  addiu     $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_osr/osr_00/AACBB0/func_802406E0_AACF10.s b/asm/nonmatchings/world/area_osr/osr_00/AACBB0/func_802406E0_AACF10.s
index 5efde2859c..6ad6f57409 100644
--- a/asm/nonmatchings/world/area_osr/osr_00/AACBB0/func_802406E0_AACF10.s
+++ b/asm/nonmatchings/world/area_osr/osr_00/AACBB0/func_802406E0_AACF10.s
@@ -11,8 +11,8 @@ glabel func_802406E0_AACF10
 /* AACF28 802406F8 02042021 */  addu      $a0, $s0, $a0
 /* AACF2C 802406FC 24853D86 */  addiu     $a1, $a0, 0x3d86
 /* AACF30 80240700 AFB10014 */  sw        $s1, 0x14($sp)
-/* AACF34 80240704 3C118024 */  lui       $s1, 0x8024
-/* AACF38 80240708 263137C0 */  addiu     $s1, $s1, 0x37c0
+/* AACF34 80240704 3C118024 */  lui       $s1, %hi(D_802437C0)
+/* AACF38 80240708 263137C0 */  addiu     $s1, $s1, %lo(D_802437C0)
 /* AACF3C 8024070C AFBF0018 */  sw        $ra, 0x18($sp)
 /* AACF40 80240710 0C00A5CF */  jal       dma_copy
 /* AACF44 80240714 0220302D */   daddu    $a2, $s1, $zero
@@ -21,12 +21,12 @@ glabel func_802406E0_AACF10
 /* AACF50 80240720 02028021 */  addu      $s0, $s0, $v0
 /* AACF54 80240724 0200202D */  daddu     $a0, $s0, $zero
 /* AACF58 80240728 24850200 */  addiu     $a1, $a0, 0x200
-/* AACF5C 8024072C 3C108024 */  lui       $s0, 0x8024
-/* AACF60 80240730 26107548 */  addiu     $s0, $s0, 0x7548
+/* AACF5C 8024072C 3C108024 */  lui       $s0, %hi(D_80247548)
+/* AACF60 80240730 26107548 */  addiu     $s0, $s0, %lo(D_80247548)
 /* AACF64 80240734 0C00A5CF */  jal       dma_copy
 /* AACF68 80240738 0200302D */   daddu    $a2, $s0, $zero
-/* AACF6C 8024073C 3C048024 */  lui       $a0, 0x8024
-/* AACF70 80240740 24847750 */  addiu     $a0, $a0, 0x7750
+/* AACF6C 8024073C 3C048024 */  lui       $a0, %hi(D_80247750)
+/* AACF70 80240740 24847750 */  addiu     $a0, $a0, %lo(D_80247750)
 /* AACF74 80240744 24020096 */  addiu     $v0, $zero, 0x96
 /* AACF78 80240748 A4820008 */  sh        $v0, 8($a0)
 /* AACF7C 8024074C 24020069 */  addiu     $v0, $zero, 0x69
diff --git a/asm/nonmatchings/world/area_osr/osr_01/AAFFF0/func_80240000_AAFFF0.s b/asm/nonmatchings/world/area_osr/osr_01/AAFFF0/func_80240000_AAFFF0.s
index bcd7dd4657..6fc6b7812f 100644
--- a/asm/nonmatchings/world/area_osr/osr_01/AAFFF0/func_80240000_AAFFF0.s
+++ b/asm/nonmatchings/world/area_osr/osr_01/AAFFF0/func_80240000_AAFFF0.s
@@ -10,11 +10,11 @@ glabel func_80240000_AAFFF0
 /* AB0004 80240014 24020003 */  addiu     $v0, $zero, 3
 /* AB0008 80240018 14620006 */  bne       $v1, $v0, .L80240034
 /* AB000C 8024001C 00000000 */   nop      
-/* AB0010 80240020 3C04800E */  lui       $a0, 0x800e
-/* AB0014 80240024 24849668 */  addiu     $a0, $a0, -0x6998
-/* AB0018 80240028 3C058024 */  lui       $a1, 0x8024
+/* AB0010 80240020 3C04800E */  lui       $a0, %hi(D_800D9668)
+/* AB0014 80240024 24849668 */  addiu     $a0, $a0, %lo(D_800D9668)
+/* AB0018 80240028 3C058024 */  lui       $a1, %hi(D_80242160)
 /* AB001C 8024002C 0C01953C */  jal       sprintf
-/* AB0020 80240030 24A52160 */   addiu    $a1, $a1, 0x2160
+/* AB0020 80240030 24A52160 */   addiu    $a1, $a1, %lo(D_80242160)
 .L80240034:
 /* AB0024 80240034 8FBF0010 */  lw        $ra, 0x10($sp)
 /* AB0028 80240038 0000102D */  daddu     $v0, $zero, $zero
diff --git a/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_80240360_AB0350.s b/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_80240360_AB0350.s
index e6085bde07..da3c87f62a 100644
--- a/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_80240360_AB0350.s
+++ b/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_80240360_AB0350.s
@@ -4,8 +4,8 @@
 glabel func_80240360_AB0350
 /* AB0350 80240360 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* AB0354 80240364 AFB00010 */  sw        $s0, 0x10($sp)
-/* AB0358 80240368 3C108024 */  lui       $s0, 0x8024
-/* AB035C 8024036C 261011B8 */  addiu     $s0, $s0, 0x11b8
+/* AB0358 80240368 3C108024 */  lui       $s0, %hi(D_802411B8)
+/* AB035C 8024036C 261011B8 */  addiu     $s0, $s0, %lo(D_802411B8)
 /* AB0360 80240370 AFBF0018 */  sw        $ra, 0x18($sp)
 /* AB0364 80240374 AFB10014 */  sw        $s1, 0x14($sp)
 /* AB0368 80240378 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_80240360_AB0350
 /* AB03CC 802403DC 28620010 */  slti      $v0, $v1, 0x10
 /* AB03D0 802403E0 1440FFFA */  bnez      $v0, .L802403CC
 /* AB03D4 802403E4 24840004 */   addiu    $a0, $a0, 4
-/* AB03D8 802403E8 3C108024 */  lui       $s0, 0x8024
-/* AB03DC 802403EC 261011B8 */  addiu     $s0, $s0, 0x11b8
+/* AB03D8 802403E8 3C108024 */  lui       $s0, %hi(D_802411B8)
+/* AB03DC 802403EC 261011B8 */  addiu     $s0, $s0, %lo(D_802411B8)
 /* AB03E0 802403F0 0C00AB4B */  jal       heap_free
 /* AB03E4 802403F4 8E040000 */   lw       $a0, ($s0)
 /* AB03E8 802403F8 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_802406A4_AB0694.s b/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_802406A4_AB0694.s
index b3e193aa3e..ef77044311 100644
--- a/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_802406A4_AB0694.s
+++ b/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_802406A4_AB0694.s
@@ -6,11 +6,11 @@ glabel func_802406A4_AB0694
 /* AB0698 802406A8 AFBF0010 */  sw        $ra, 0x10($sp)
 /* AB069C 802406AC 10A00003 */  beqz      $a1, .L802406BC
 /* AB06A0 802406B0 8C86000C */   lw       $a2, 0xc($a0)
-/* AB06A4 802406B4 3C018024 */  lui       $at, 0x8024
-/* AB06A8 802406B8 AC20121C */  sw        $zero, 0x121c($at)
+/* AB06A4 802406B4 3C018024 */  lui       $at, %hi(D_8024121C)
+/* AB06A8 802406B8 AC20121C */  sw        $zero, %lo(D_8024121C)($at)
 .L802406BC:
-/* AB06AC 802406BC 3C038024 */  lui       $v1, 0x8024
-/* AB06B0 802406C0 2463121C */  addiu     $v1, $v1, 0x121c
+/* AB06AC 802406BC 3C038024 */  lui       $v1, %hi(D_8024121C)
+/* AB06B0 802406C0 2463121C */  addiu     $v1, $v1, %lo(D_8024121C)
 /* AB06B4 802406C4 8C620000 */  lw        $v0, ($v1)
 /* AB06B8 802406C8 54400003 */  bnel      $v0, $zero, .L802406D8
 /* AB06BC 802406CC AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_802406A4_AB0694
 /* AB06C4 802406D4 0000102D */   daddu    $v0, $zero, $zero
 .L802406D8:
 /* AB06C8 802406D8 8CC50000 */  lw        $a1, ($a2)
-/* AB06CC 802406DC 3C068024 */  lui       $a2, 0x8024
+/* AB06CC 802406DC 3C068024 */  lui       $a2, %hi(D_80241220)
 /* AB06D0 802406E0 0C0B2026 */  jal       set_variable
-/* AB06D4 802406E4 8CC61220 */   lw       $a2, 0x1220($a2)
+/* AB06D4 802406E4 8CC61220 */   lw       $a2, %lo(D_80241220)($a2)
 /* AB06D8 802406E8 24020002 */  addiu     $v0, $zero, 2
 .L802406EC:
 /* AB06DC 802406EC 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_802406F8_AB06E8.s b/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_802406F8_AB06E8.s
index 87438c4034..21da6b90ef 100644
--- a/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_802406F8_AB06E8.s
+++ b/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_802406F8_AB06E8.s
@@ -7,12 +7,12 @@ glabel func_802406F8_AB06E8
 /* AB06F0 80240700 8C82000C */  lw        $v0, 0xc($a0)
 /* AB06F4 80240704 0C0B1EAF */  jal       get_variable
 /* AB06F8 80240708 8C450000 */   lw       $a1, ($v0)
-/* AB06FC 8024070C 3C018024 */  lui       $at, 0x8024
-/* AB0700 80240710 AC221220 */  sw        $v0, 0x1220($at)
+/* AB06FC 8024070C 3C018024 */  lui       $at, %hi(D_80241220)
+/* AB0700 80240710 AC221220 */  sw        $v0, %lo(D_80241220)($at)
 /* AB0704 80240714 24020002 */  addiu     $v0, $zero, 2
 /* AB0708 80240718 8FBF0010 */  lw        $ra, 0x10($sp)
 /* AB070C 8024071C 24030001 */  addiu     $v1, $zero, 1
-/* AB0710 80240720 3C018024 */  lui       $at, 0x8024
-/* AB0714 80240724 AC23121C */  sw        $v1, 0x121c($at)
+/* AB0710 80240720 3C018024 */  lui       $at, %hi(D_8024121C)
+/* AB0714 80240724 AC23121C */  sw        $v1, %lo(D_8024121C)($at)
 /* AB0718 80240728 03E00008 */  jr        $ra
 /* AB071C 8024072C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_80240730_AB0720.s b/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_80240730_AB0720.s
index c7c6f7414a..29876148de 100644
--- a/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_80240730_AB0720.s
+++ b/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_80240730_AB0720.s
@@ -13,8 +13,8 @@ glabel func_80240730_AB0720
 /* AB0740 80240750 8C620000 */  lw        $v0, ($v1)
 /* AB0744 80240754 5040000A */  beql      $v0, $zero, .L80240780
 /* AB0748 80240758 00041080 */   sll      $v0, $a0, 2
-/* AB074C 8024075C 3C058024 */  lui       $a1, 0x8024
-/* AB0750 80240760 24A52180 */  addiu     $a1, $a1, 0x2180
+/* AB074C 8024075C 3C058024 */  lui       $a1, %hi(D_80242180)
+/* AB0750 80240760 24A52180 */  addiu     $a1, $a1, %lo(D_80242180)
 .L80240764:
 /* AB0754 80240764 24630004 */  addiu     $v1, $v1, 4
 /* AB0758 80240768 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_80240730_AB0720
 /* AB0768 80240778 24A50004 */   addiu    $a1, $a1, 4
 /* AB076C 8024077C 00041080 */  sll       $v0, $a0, 2
 .L80240780:
-/* AB0770 80240780 3C018024 */  lui       $at, 0x8024
+/* AB0770 80240780 3C018024 */  lui       $at, %hi(D_80242180)
 /* AB0774 80240784 00220821 */  addu      $at, $at, $v0
-/* AB0778 80240788 AC202180 */  sw        $zero, 0x2180($at)
+/* AB0778 80240788 AC202180 */  sw        $zero, %lo(D_80242180)($at)
 /* AB077C 8024078C 080901EF */  j         .L802407BC
 /* AB0780 80240790 00000000 */   nop      
 .L80240794:
-/* AB0784 80240794 3C038024 */  lui       $v1, 0x8024
-/* AB0788 80240798 24632180 */  addiu     $v1, $v1, 0x2180
+/* AB0784 80240794 3C038024 */  lui       $v1, %hi(D_80242180)
+/* AB0788 80240798 24632180 */  addiu     $v1, $v1, %lo(D_80242180)
 /* AB078C 8024079C 0060282D */  daddu     $a1, $v1, $zero
 .L802407A0:
 /* AB0790 802407A0 24820010 */  addiu     $v0, $a0, 0x10
diff --git a/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_80240A48_AB0A38.s b/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_80240A48_AB0A38.s
index 3eb7eb5412..0b977f9023 100644
--- a/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_80240A48_AB0A38.s
+++ b/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_80240A48_AB0A38.s
@@ -15,7 +15,7 @@ glabel func_80240A48_AB0A38
 /* AB0A60 80240A70 8FBF0014 */  lw        $ra, 0x14($sp)
 /* AB0A64 80240A74 8FB00010 */  lw        $s0, 0x10($sp)
 /* AB0A68 80240A78 24020002 */  addiu     $v0, $zero, 2
-/* AB0A6C 80240A7C 3C018024 */  lui       $at, 0x8024
-/* AB0A70 80240A80 AC232344 */  sw        $v1, 0x2344($at)
+/* AB0A6C 80240A7C 3C018024 */  lui       $at, %hi(D_80242344)
+/* AB0A70 80240A80 AC232344 */  sw        $v1, %lo(D_80242344)($at)
 /* AB0A74 80240A84 03E00008 */  jr        $ra
 /* AB0A78 80240A88 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_80240A8C_AB0A7C.s b/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_80240A8C_AB0A7C.s
index 89f13a180c..ecd3dabefc 100644
--- a/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_80240A8C_AB0A7C.s
+++ b/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_80240A8C_AB0A7C.s
@@ -6,8 +6,8 @@ glabel func_80240A8C_AB0A7C
 /* AB0A80 80240A90 AFBF0010 */  sw        $ra, 0x10($sp)
 /* AB0A84 80240A94 0C00EABB */  jal       get_npc_unsafe
 /* AB0A88 80240A98 8C84008C */   lw       $a0, 0x8c($a0)
-/* AB0A8C 80240A9C 3C038024 */  lui       $v1, 0x8024
-/* AB0A90 80240AA0 8C632344 */  lw        $v1, 0x2344($v1)
+/* AB0A8C 80240A9C 3C038024 */  lui       $v1, %hi(D_80242344)
+/* AB0A90 80240AA0 8C632344 */  lw        $v1, %lo(D_80242344)($v1)
 /* AB0A94 80240AA4 AC430028 */  sw        $v1, 0x28($v0)
 /* AB0A98 80240AA8 8FBF0010 */  lw        $ra, 0x10($sp)
 /* AB0A9C 80240AAC 24020002 */  addiu     $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_osr/osr_02/AB21D0/func_80240060_AB21D0.s b/asm/nonmatchings/world/area_osr/osr_02/AB21D0/func_80240060_AB21D0.s
index 2c1e88684c..d28a35dd1f 100644
--- a/asm/nonmatchings/world/area_osr/osr_02/AB21D0/func_80240060_AB21D0.s
+++ b/asm/nonmatchings/world/area_osr/osr_02/AB21D0/func_80240060_AB21D0.s
@@ -15,9 +15,9 @@ glabel func_80240060_AB21D0
 /* AB21F8 80240088 AE220078 */  sw        $v0, 0x78($s1)
 /* AB21FC 8024008C 2463FFFE */  addiu     $v1, $v1, -2
 /* AB2200 80240090 00031840 */  sll       $v1, $v1, 1
-/* AB2204 80240094 3C028024 */  lui       $v0, 0x8024
+/* AB2204 80240094 3C028024 */  lui       $v0, %hi(D_8024253C)
 /* AB2208 80240098 00431021 */  addu      $v0, $v0, $v1
-/* AB220C 8024009C 8442253C */  lh        $v0, 0x253c($v0)
+/* AB220C 8024009C 8442253C */  lh        $v0, %lo(D_8024253C)($v0)
 /* AB2210 802400A0 AE22007C */  sw        $v0, 0x7c($s1)
 .L802400A4:
 /* AB2214 802400A4 8E22007C */  lw        $v0, 0x7c($s1)
diff --git a/asm/nonmatchings/world/area_osr/osr_04/AB92B0/func_80240000_AB92B0.s b/asm/nonmatchings/world/area_osr/osr_04/AB92B0/func_80240000_AB92B0.s
index a296b8d1e4..87be2eb532 100644
--- a/asm/nonmatchings/world/area_osr/osr_04/AB92B0/func_80240000_AB92B0.s
+++ b/asm/nonmatchings/world/area_osr/osr_04/AB92B0/func_80240000_AB92B0.s
@@ -3,21 +3,21 @@
 
 glabel func_80240000_AB92B0
 /* AB92B0 80240000 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* AB92B4 80240004 3C04800E */  lui       $a0, 0x800e
-/* AB92B8 80240008 24849230 */  addiu     $a0, $a0, -0x6dd0
-/* AB92BC 8024000C 3C058024 */  lui       $a1, 0x8024
-/* AB92C0 80240010 24A51FB0 */  addiu     $a1, $a1, 0x1fb0
+/* AB92B4 80240004 3C04800E */  lui       $a0, %hi(D_800D9230)
+/* AB92B8 80240008 24849230 */  addiu     $a0, $a0, %lo(D_800D9230)
+/* AB92BC 8024000C 3C058024 */  lui       $a1, %hi(D_80241FB0)
+/* AB92C0 80240010 24A51FB0 */  addiu     $a1, $a1, %lo(D_80241FB0)
 /* AB92C4 80240014 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
 /* AB92C8 80240018 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
 /* AB92CC 8024001C 24020002 */  addiu     $v0, $zero, 2
 /* AB92D0 80240020 AFBF0010 */  sw        $ra, 0x10($sp)
 /* AB92D4 80240024 0C01953C */  jal       sprintf
 /* AB92D8 80240028 A0620084 */   sb       $v0, 0x84($v1)
-/* AB92DC 8024002C 3C04800E */  lui       $a0, 0x800e
-/* AB92E0 80240030 248491E0 */  addiu     $a0, $a0, -0x6e20
-/* AB92E4 80240034 3C058024 */  lui       $a1, 0x8024
+/* AB92DC 8024002C 3C04800E */  lui       $a0, %hi(D_800D91E0)
+/* AB92E0 80240030 248491E0 */  addiu     $a0, $a0, %lo(D_800D91E0)
+/* AB92E4 80240034 3C058024 */  lui       $a1, %hi(D_80241FC0)
 /* AB92E8 80240038 0C01953C */  jal       sprintf
-/* AB92EC 8024003C 24A51FC0 */   addiu    $a1, $a1, 0x1fc0
+/* AB92EC 8024003C 24A51FC0 */   addiu    $a1, $a1, %lo(D_80241FC0)
 /* AB92F0 80240040 8FBF0010 */  lw        $ra, 0x10($sp)
 /* AB92F4 80240044 0000102D */  daddu     $v0, $zero, $zero
 /* AB92F8 80240048 03E00008 */  jr        $ra
diff --git a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_802400EC_D4D12C.s b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_802400EC_D4D12C.s
index 58783d587a..246e58bdce 100644
--- a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_802400EC_D4D12C.s
+++ b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_802400EC_D4D12C.s
@@ -5,8 +5,8 @@ glabel func_802400EC_D4D12C
 /* D4D12C 802400EC 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* D4D130 802400F0 AFB00010 */  sw        $s0, 0x10($sp)
 /* D4D134 802400F4 0080802D */  daddu     $s0, $a0, $zero
-/* D4D138 802400F8 3C058024 */  lui       $a1, 0x8024
-/* D4D13C 802400FC 24A50128 */  addiu     $a1, $a1, 0x128
+/* D4D138 802400F8 3C058024 */  lui       $a1, %hi(D_80240128)
+/* D4D13C 802400FC 24A50128 */  addiu     $a1, $a1, %lo(D_80240128)
 /* D4D140 80240100 AFBF0014 */  sw        $ra, 0x14($sp)
 /* D4D144 80240104 0C048C56 */  jal       bind_dynamic_entity_3
 /* D4D148 80240108 0000202D */   daddu    $a0, $zero, $zero
diff --git a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240128_D4D168.s b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240128_D4D168.s
index 1c6461d0ec..3b70c6e93b 100644
--- a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240128_D4D168.s
+++ b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240128_D4D168.s
@@ -29,8 +29,8 @@ glabel func_80240128_D4D168
 /* D4D1C8 80240188 27A20034 */  addiu     $v0, $sp, 0x34
 /* D4D1CC 8024018C AFA20014 */  sw        $v0, 0x14($sp)
 /* D4D1D0 80240190 C6000030 */  lwc1      $f0, 0x30($s0)
-/* D4D1D4 80240194 3C04800A */  lui       $a0, 0x800a
-/* D4D1D8 80240198 8484A634 */  lh        $a0, -0x59cc($a0)
+/* D4D1D4 80240194 3C04800A */  lui       $a0, %hi(D_8009A634)
+/* D4D1D8 80240198 8484A634 */  lh        $a0, %lo(D_8009A634)($a0)
 /* D4D1DC 8024019C 46000007 */  neg.s     $f0, $f0
 /* D4D1E0 802401A0 44070000 */  mfc1      $a3, $f0
 /* D4D1E4 802401A4 27A20038 */  addiu     $v0, $sp, 0x38
@@ -67,8 +67,8 @@ glabel func_80240128_D4D168
 /* D4D25C 8024021C 54400022 */  bnel      $v0, $zero, .L802402A8
 /* D4D260 80240220 24110011 */   addiu    $s1, $zero, 0x11
 /* D4D264 80240224 9203000E */  lbu       $v1, 0xe($s0)
-/* D4D268 80240228 3C02802E */  lui       $v0, 0x802e
-/* D4D26C 8024022C 90429D70 */  lbu       $v0, -0x6290($v0)
+/* D4D268 80240228 3C02802E */  lui       $v0, %hi(D_802D9D70)
+/* D4D26C 8024022C 90429D70 */  lbu       $v0, %lo(D_802D9D70)($v0)
 /* D4D270 80240230 10620018 */  beq       $v1, $v0, .L80240294
 /* D4D274 80240234 2C6200FE */   sltiu    $v0, $v1, 0xfe
 /* D4D278 80240238 1040000B */  beqz      $v0, .L80240268
@@ -98,20 +98,20 @@ glabel func_80240128_D4D168
 /* D4D2D0 80240290 00000000 */   nop      
 .L80240294:
 /* D4D2D4 80240294 9202000E */  lbu       $v0, 0xe($s0)
-/* D4D2D8 80240298 3C01802E */  lui       $at, 0x802e
-/* D4D2DC 8024029C A0229D70 */  sb        $v0, -0x6290($at)
+/* D4D2D8 80240298 3C01802E */  lui       $at, %hi(D_802D9D70)
+/* D4D2DC 8024029C A0229D70 */  sb        $v0, %lo(D_802D9D70)($at)
 /* D4D2E0 802402A0 080900AD */  j         .L802402B4
 /* D4D2E4 802402A4 0240202D */   daddu    $a0, $s2, $zero
 .L802402A8:
-/* D4D2E8 802402A8 3C01802E */  lui       $at, 0x802e
-/* D4D2EC 802402AC A0209D70 */  sb        $zero, -0x6290($at)
+/* D4D2E8 802402A8 3C01802E */  lui       $at, %hi(D_802D9D70)
+/* D4D2EC 802402AC A0209D70 */  sb        $zero, %lo(D_802D9D70)($at)
 /* D4D2F0 802402B0 0240202D */  daddu     $a0, $s2, $zero
 .L802402B4:
 /* D4D2F4 802402B4 AC910000 */  sw        $s1, ($a0)
 /* D4D2F8 802402B8 AC900008 */  sw        $s0, 8($a0)
 /* D4D2FC 802402BC 8FA20038 */  lw        $v0, 0x38($sp)
-/* D4D300 802402C0 3C038024 */  lui       $v1, 0x8024
-/* D4D304 802402C4 246302F0 */  addiu     $v1, $v1, 0x2f0
+/* D4D300 802402C0 3C038024 */  lui       $v1, %hi(D_802402F0)
+/* D4D304 802402C4 246302F0 */  addiu     $v1, $v1, %lo(D_802402F0)
 /* D4D308 802402C8 AC83000C */  sw        $v1, 0xc($a0)
 /* D4D30C 802402CC 00021023 */  negu      $v0, $v0
 /* D4D310 802402D0 0C047644 */  jal       queue_render_task
diff --git a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_802402F0_D4D330.s b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_802402F0_D4D330.s
index 57bcb04abe..bf0f47449e 100644
--- a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_802402F0_D4D330.s
+++ b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_802402F0_D4D330.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_802402F0_D4D330
-/* D4D330 802402F0 3C03800A */  lui       $v1, 0x800a
-/* D4D334 802402F4 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D4D330 802402F0 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D4D334 802402F4 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D4D338 802402F8 3C07BF80 */  lui       $a3, 0xbf80
 /* D4D33C 802402FC 27BDFEC0 */  addiu     $sp, $sp, -0x140
 /* D4D340 80240300 F7B40128 */  sdc1      $f20, 0x128($sp)
@@ -22,9 +22,9 @@ glabel func_802402F0_D4D330
 /* D4D374 80240334 000218C0 */  sll       $v1, $v0, 3
 /* D4D378 80240338 00431021 */  addu      $v0, $v0, $v1
 /* D4D37C 8024033C 000210C0 */  sll       $v0, $v0, 3
-/* D4D380 80240340 3C01800B */  lui       $at, 0x800b
+/* D4D380 80240340 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* D4D384 80240344 00220821 */  addu      $at, $at, $v0
-/* D4D388 80240348 C4361DEC */  lwc1      $f22, 0x1dec($at)
+/* D4D388 80240348 C4361DEC */  lwc1      $f22, %lo(D_800B1DEC)($at)
 /* D4D38C 8024034C 4406A000 */  mfc1      $a2, $f20
 /* D4D390 80240350 4600B587 */  neg.s     $f22, $f22
 /* D4D394 80240354 4405B000 */  mfc1      $a1, $f22
diff --git a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_8024049C_D4D4DC.s b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_8024049C_D4D4DC.s
index 83a51d1099..8458a322bc 100644
--- a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_8024049C_D4D4DC.s
+++ b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_8024049C_D4D4DC.s
@@ -11,8 +11,8 @@ glabel func_8024049C_D4D4DC
 /* D4D4F4 802404B4 28420002 */   slti     $v0, $v0, 2
 /* D4D4F8 802404B8 1040000C */  beqz      $v0, .L802404EC
 /* D4D4FC 802404BC 00000000 */   nop      
-/* D4D500 802404C0 3C058024 */  lui       $a1, 0x8024
-/* D4D504 802404C4 24A50500 */  addiu     $a1, $a1, 0x500
+/* D4D500 802404C0 3C058024 */  lui       $a1, %hi(D_80240500)
+/* D4D504 802404C4 24A50500 */  addiu     $a1, $a1, %lo(D_80240500)
 /* D4D508 802404C8 0C048C56 */  jal       bind_dynamic_entity_3
 /* D4D50C 802404CC 0000202D */   daddu    $a0, $zero, $zero
 /* D4D510 802404D0 8E03013C */  lw        $v1, 0x13c($s0)
diff --git a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240500_D4D540.s b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240500_D4D540.s
index 3de97791b5..c9e1fc93bc 100644
--- a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240500_D4D540.s
+++ b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240500_D4D540.s
@@ -28,8 +28,8 @@ glabel func_80240500_D4D540
 /* D4D59C 8024055C 27A20038 */  addiu     $v0, $sp, 0x38
 /* D4D5A0 80240560 AFA20018 */  sw        $v0, 0x18($sp)
 /* D4D5A4 80240564 C600002C */  lwc1      $f0, 0x2c($s0)
-/* D4D5A8 80240568 3C04800A */  lui       $a0, 0x800a
-/* D4D5AC 8024056C 8484A634 */  lh        $a0, -0x59cc($a0)
+/* D4D5A8 80240568 3C04800A */  lui       $a0, %hi(D_8009A634)
+/* D4D5AC 8024056C 8484A634 */  lh        $a0, %lo(D_8009A634)($a0)
 /* D4D5B0 80240570 46000007 */  neg.s     $f0, $f0
 /* D4D5B4 80240574 44060000 */  mfc1      $a2, $f0
 /* D4D5B8 80240578 0C00B94E */  jal       get_screen_coords
@@ -44,8 +44,8 @@ glabel func_80240500_D4D540
 /* D4D5DC 8024059C 54400022 */  bnel      $v0, $zero, .L80240628
 /* D4D5E0 802405A0 24120011 */   addiu    $s2, $zero, 0x11
 /* D4D5E4 802405A4 9203000E */  lbu       $v1, 0xe($s0)
-/* D4D5E8 802405A8 3C02802E */  lui       $v0, 0x802e
-/* D4D5EC 802405AC 90429D71 */  lbu       $v0, -0x628f($v0)
+/* D4D5E8 802405A8 3C02802E */  lui       $v0, %hi(D_802D9D71)
+/* D4D5EC 802405AC 90429D71 */  lbu       $v0, %lo(D_802D9D71)($v0)
 /* D4D5F0 802405B0 10620018 */  beq       $v1, $v0, .L80240614
 /* D4D5F4 802405B4 2C6200FE */   sltiu    $v0, $v1, 0xfe
 /* D4D5F8 802405B8 1040000B */  beqz      $v0, .L802405E8
@@ -75,17 +75,17 @@ glabel func_80240500_D4D540
 /* D4D650 80240610 00000000 */   nop      
 .L80240614:
 /* D4D654 80240614 9202000E */  lbu       $v0, 0xe($s0)
-/* D4D658 80240618 3C01802E */  lui       $at, 0x802e
-/* D4D65C 8024061C A0229D71 */  sb        $v0, -0x628f($at)
+/* D4D658 80240618 3C01802E */  lui       $at, %hi(D_802D9D71)
+/* D4D65C 8024061C A0229D71 */  sb        $v0, %lo(D_802D9D71)($at)
 /* D4D660 80240620 0809018C */  j         .L80240630
 /* D4D664 80240624 00000000 */   nop      
 .L80240628:
-/* D4D668 80240628 3C01802E */  lui       $at, 0x802e
-/* D4D66C 8024062C A0209D71 */  sb        $zero, -0x628f($at)
+/* D4D668 80240628 3C01802E */  lui       $at, %hi(D_802D9D71)
+/* D4D66C 8024062C A0209D71 */  sb        $zero, %lo(D_802D9D71)($at)
 .L80240630:
 /* D4D670 80240630 8FA20038 */  lw        $v0, 0x38($sp)
-/* D4D674 80240634 3C048024 */  lui       $a0, 0x8024
-/* D4D678 80240638 24840870 */  addiu     $a0, $a0, 0x870
+/* D4D674 80240634 3C048024 */  lui       $a0, %hi(D_80240870)
+/* D4D678 80240638 24840870 */  addiu     $a0, $a0, %lo(D_80240870)
 /* D4D67C 8024063C AE320000 */  sw        $s2, ($s1)
 /* D4D680 80240640 AE300008 */  sw        $s0, 8($s1)
 /* D4D684 80240644 00021023 */  negu      $v0, $v0
@@ -95,8 +95,8 @@ glabel func_80240500_D4D540
 /* D4D694 80240654 00431024 */  and       $v0, $v0, $v1
 /* D4D698 80240658 54400004 */  bnel      $v0, $zero, .L8024066C
 /* D4D69C 8024065C AE24000C */   sw       $a0, 0xc($s1)
-/* D4D6A0 80240660 3C048024 */  lui       $a0, 0x8024
-/* D4D6A4 80240664 2484068C */  addiu     $a0, $a0, 0x68c
+/* D4D6A0 80240660 3C048024 */  lui       $a0, %hi(D_8024068C)
+/* D4D6A4 80240664 2484068C */  addiu     $a0, $a0, %lo(D_8024068C)
 /* D4D6A8 80240668 AE24000C */  sw        $a0, 0xc($s1)
 .L8024066C:
 /* D4D6AC 8024066C 0C047644 */  jal       queue_render_task
diff --git a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_8024068C_D4D6CC.s b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_8024068C_D4D6CC.s
index ba73f068f2..0e8bb8d999 100644
--- a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_8024068C_D4D6CC.s
+++ b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_8024068C_D4D6CC.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_8024068C_D4D6CC
-/* D4D6CC 8024068C 3C03800A */  lui       $v1, 0x800a
-/* D4D6D0 80240690 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D4D6CC 8024068C 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D4D6D0 80240690 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D4D6D4 80240694 3C07BF80 */  lui       $a3, 0xbf80
 /* D4D6D8 80240698 27BDFEC0 */  addiu     $sp, $sp, -0x140
 /* D4D6DC 8024069C F7B40128 */  sdc1      $f20, 0x128($sp)
@@ -22,9 +22,9 @@ glabel func_8024068C_D4D6CC
 /* D4D710 802406D0 000218C0 */  sll       $v1, $v0, 3
 /* D4D714 802406D4 00431021 */  addu      $v0, $v0, $v1
 /* D4D718 802406D8 000210C0 */  sll       $v0, $v0, 3
-/* D4D71C 802406DC 3C01800B */  lui       $at, 0x800b
+/* D4D71C 802406DC 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* D4D720 802406E0 00220821 */  addu      $at, $at, $v0
-/* D4D724 802406E4 C4361DEC */  lwc1      $f22, 0x1dec($at)
+/* D4D724 802406E4 C4361DEC */  lwc1      $f22, %lo(D_800B1DEC)($at)
 /* D4D728 802406E8 4406A000 */  mfc1      $a2, $f20
 /* D4D72C 802406EC 4600B587 */  neg.s     $f22, $f22
 /* D4D730 802406F0 4405B000 */  mfc1      $a1, $f22
diff --git a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240870_D4D8B0.s b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240870_D4D8B0.s
index 8f3047be97..5da863cc33 100644
--- a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240870_D4D8B0.s
+++ b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240870_D4D8B0.s
@@ -27,8 +27,8 @@ glabel func_80240870_D4D8B0
 /* D4D908 802408C8 F7B80160 */  sdc1      $f24, 0x160($sp)
 /* D4D90C 802408CC F7B40150 */  sdc1      $f20, 0x150($sp)
 .L802408D0:
-/* D4D910 802408D0 3C03800A */  lui       $v1, 0x800a
-/* D4D914 802408D4 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D4D910 802408D0 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D4D914 802408D4 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D4D918 802408D8 00031080 */  sll       $v0, $v1, 2
 /* D4D91C 802408DC 00431021 */  addu      $v0, $v0, $v1
 /* D4D920 802408E0 00021080 */  sll       $v0, $v0, 2
diff --git a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240D3C_D4DD7C.s b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240D3C_D4DD7C.s
index 97e521b0bd..deaff8d50e 100644
--- a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240D3C_D4DD7C.s
+++ b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240D3C_D4DD7C.s
@@ -25,13 +25,13 @@ glabel func_80240D3C_D4DD7C
 /* D4DDC8 80240D88 08090378 */  j         .L80240DE0
 /* D4DDCC 80240D8C 00000000 */   nop      
 .L80240D90:
-/* D4DDD0 80240D90 3C048024 */  lui       $a0, 0x8024
-/* D4DDD4 80240D94 24840E84 */  addiu     $a0, $a0, 0xe84
+/* D4DDD0 80240D90 3C048024 */  lui       $a0, %hi(D_80240E84)
+/* D4DDD4 80240D94 24840E84 */  addiu     $a0, $a0, %lo(D_80240E84)
 /* D4DDD8 80240D98 08090374 */  j         .L80240DD0
 /* D4DDDC 80240D9C 00000000 */   nop      
 .L80240DA0:
-/* D4DDE0 80240DA0 3C048024 */  lui       $a0, 0x8024
-/* D4DDE4 80240DA4 24840EEC */  addiu     $a0, $a0, 0xeec
+/* D4DDE0 80240DA0 3C048024 */  lui       $a0, %hi(D_80240EEC)
+/* D4DDE4 80240DA4 24840EEC */  addiu     $a0, $a0, %lo(D_80240EEC)
 /* D4DDE8 80240DA8 08090374 */  j         .L80240DD0
 /* D4DDEC 80240DAC 00000000 */   nop      
 .L80240DB0:
@@ -42,8 +42,8 @@ glabel func_80240D3C_D4DD7C
 /* D4DE00 80240DC0 10400007 */  beqz      $v0, .L80240DE0
 /* D4DE04 80240DC4 00000000 */   nop      
 .L80240DC8:
-/* D4DE08 80240DC8 3C048024 */  lui       $a0, 0x8024
-/* D4DE0C 80240DCC 24840EB8 */  addiu     $a0, $a0, 0xeb8
+/* D4DE08 80240DC8 3C048024 */  lui       $a0, %hi(D_80240EB8)
+/* D4DE0C 80240DCC 24840EB8 */  addiu     $a0, $a0, %lo(D_80240EB8)
 .L80240DD0:
 /* D4DE10 80240DD0 0C048C56 */  jal       bind_dynamic_entity_3
 /* D4DE14 80240DD4 0000282D */   daddu    $a1, $zero, $zero
diff --git a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_802411AC_D4E1EC.s b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_802411AC_D4E1EC.s
index 23ce0179e8..503bffa8a7 100644
--- a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_802411AC_D4E1EC.s
+++ b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_802411AC_D4E1EC.s
@@ -6,11 +6,11 @@ glabel func_802411AC_D4E1EC
 /* D4E1F0 802411B0 AFBF0010 */  sw        $ra, 0x10($sp)
 /* D4E1F4 802411B4 10A00003 */  beqz      $a1, .L802411C4
 /* D4E1F8 802411B8 8C86000C */   lw       $a2, 0xc($a0)
-/* D4E1FC 802411BC 3C018024 */  lui       $at, 0x8024
-/* D4E200 802411C0 AC201F94 */  sw        $zero, 0x1f94($at)
+/* D4E1FC 802411BC 3C018024 */  lui       $at, %hi(D_80241F94)
+/* D4E200 802411C0 AC201F94 */  sw        $zero, %lo(D_80241F94)($at)
 .L802411C4:
-/* D4E204 802411C4 3C038024 */  lui       $v1, 0x8024
-/* D4E208 802411C8 24631F94 */  addiu     $v1, $v1, 0x1f94
+/* D4E204 802411C4 3C038024 */  lui       $v1, %hi(D_80241F94)
+/* D4E208 802411C8 24631F94 */  addiu     $v1, $v1, %lo(D_80241F94)
 /* D4E20C 802411CC 8C620000 */  lw        $v0, ($v1)
 /* D4E210 802411D0 54400003 */  bnel      $v0, $zero, .L802411E0
 /* D4E214 802411D4 AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_802411AC_D4E1EC
 /* D4E21C 802411DC 0000102D */   daddu    $v0, $zero, $zero
 .L802411E0:
 /* D4E220 802411E0 8CC50000 */  lw        $a1, ($a2)
-/* D4E224 802411E4 3C068024 */  lui       $a2, 0x8024
+/* D4E224 802411E4 3C068024 */  lui       $a2, %hi(D_80241F98)
 /* D4E228 802411E8 0C0B2026 */  jal       set_variable
-/* D4E22C 802411EC 8CC61F98 */   lw       $a2, 0x1f98($a2)
+/* D4E22C 802411EC 8CC61F98 */   lw       $a2, %lo(D_80241F98)($a2)
 /* D4E230 802411F0 24020002 */  addiu     $v0, $zero, 2
 .L802411F4:
 /* D4E234 802411F4 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80241200_D4E240.s b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80241200_D4E240.s
index 75f0a5335e..45a03cdb3c 100644
--- a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80241200_D4E240.s
+++ b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80241200_D4E240.s
@@ -7,12 +7,12 @@ glabel func_80241200_D4E240
 /* D4E248 80241208 8C82000C */  lw        $v0, 0xc($a0)
 /* D4E24C 8024120C 0C0B1EAF */  jal       get_variable
 /* D4E250 80241210 8C450000 */   lw       $a1, ($v0)
-/* D4E254 80241214 3C018024 */  lui       $at, 0x8024
-/* D4E258 80241218 AC221F98 */  sw        $v0, 0x1f98($at)
+/* D4E254 80241214 3C018024 */  lui       $at, %hi(D_80241F98)
+/* D4E258 80241218 AC221F98 */  sw        $v0, %lo(D_80241F98)($at)
 /* D4E25C 8024121C 24020002 */  addiu     $v0, $zero, 2
 /* D4E260 80241220 8FBF0010 */  lw        $ra, 0x10($sp)
 /* D4E264 80241224 24030001 */  addiu     $v1, $zero, 1
-/* D4E268 80241228 3C018024 */  lui       $at, 0x8024
-/* D4E26C 8024122C AC231F94 */  sw        $v1, 0x1f94($at)
+/* D4E268 80241228 3C018024 */  lui       $at, %hi(D_80241F94)
+/* D4E26C 8024122C AC231F94 */  sw        $v1, %lo(D_80241F94)($at)
 /* D4E270 80241230 03E00008 */  jr        $ra
 /* D4E274 80241234 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80241238_D4E278.s b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80241238_D4E278.s
index c57e16fe05..a5983fe3a4 100644
--- a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80241238_D4E278.s
+++ b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80241238_D4E278.s
@@ -13,8 +13,8 @@ glabel func_80241238_D4E278
 /* D4E298 80241258 8C620000 */  lw        $v0, ($v1)
 /* D4E29C 8024125C 5040000A */  beql      $v0, $zero, .L80241288
 /* D4E2A0 80241260 00041080 */   sll      $v0, $a0, 2
-/* D4E2A4 80241264 3C058024 */  lui       $a1, 0x8024
-/* D4E2A8 80241268 24A52FB0 */  addiu     $a1, $a1, 0x2fb0
+/* D4E2A4 80241264 3C058024 */  lui       $a1, %hi(D_80242FB0)
+/* D4E2A8 80241268 24A52FB0 */  addiu     $a1, $a1, %lo(D_80242FB0)
 .L8024126C:
 /* D4E2AC 8024126C 24630004 */  addiu     $v1, $v1, 4
 /* D4E2B0 80241270 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_80241238_D4E278
 /* D4E2C0 80241280 24A50004 */   addiu    $a1, $a1, 4
 /* D4E2C4 80241284 00041080 */  sll       $v0, $a0, 2
 .L80241288:
-/* D4E2C8 80241288 3C018024 */  lui       $at, 0x8024
+/* D4E2C8 80241288 3C018024 */  lui       $at, %hi(D_80242FB0)
 /* D4E2CC 8024128C 00220821 */  addu      $at, $at, $v0
-/* D4E2D0 80241290 AC202FB0 */  sw        $zero, 0x2fb0($at)
+/* D4E2D0 80241290 AC202FB0 */  sw        $zero, %lo(D_80242FB0)($at)
 /* D4E2D4 80241294 080904B1 */  j         .L802412C4
 /* D4E2D8 80241298 00000000 */   nop      
 .L8024129C:
-/* D4E2DC 8024129C 3C038024 */  lui       $v1, 0x8024
-/* D4E2E0 802412A0 24632FB0 */  addiu     $v1, $v1, 0x2fb0
+/* D4E2DC 8024129C 3C038024 */  lui       $v1, %hi(D_80242FB0)
+/* D4E2E0 802412A0 24632FB0 */  addiu     $v1, $v1, %lo(D_80242FB0)
 /* D4E2E4 802412A4 0060282D */  daddu     $a1, $v1, $zero
 .L802412A8:
 /* D4E2E8 802412A8 24820010 */  addiu     $v0, $a0, 0x10
diff --git a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_802412D4_D4E314.s b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_802412D4_D4E314.s
index 37f33b126f..ebaf697d03 100644
--- a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_802412D4_D4E314.s
+++ b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_802412D4_D4E314.s
@@ -13,8 +13,8 @@ glabel func_802412D4_D4E314
 /* D4E334 802412F4 8C620000 */  lw        $v0, ($v1)
 /* D4E338 802412F8 5040000A */  beql      $v0, $zero, .L80241324
 /* D4E33C 802412FC 00041080 */   sll      $v0, $a0, 2
-/* D4E340 80241300 3C058024 */  lui       $a1, 0x8024
-/* D4E344 80241304 24A53178 */  addiu     $a1, $a1, 0x3178
+/* D4E340 80241300 3C058024 */  lui       $a1, %hi(D_80243178)
+/* D4E344 80241304 24A53178 */  addiu     $a1, $a1, %lo(D_80243178)
 .L80241308:
 /* D4E348 80241308 24630004 */  addiu     $v1, $v1, 4
 /* D4E34C 8024130C 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_802412D4_D4E314
 /* D4E35C 8024131C 24A50004 */   addiu    $a1, $a1, 4
 /* D4E360 80241320 00041080 */  sll       $v0, $a0, 2
 .L80241324:
-/* D4E364 80241324 3C018024 */  lui       $at, 0x8024
+/* D4E364 80241324 3C018024 */  lui       $at, %hi(D_80243178)
 /* D4E368 80241328 00220821 */  addu      $at, $at, $v0
-/* D4E36C 8024132C AC203178 */  sw        $zero, 0x3178($at)
+/* D4E36C 8024132C AC203178 */  sw        $zero, %lo(D_80243178)($at)
 /* D4E370 80241330 080904D8 */  j         .L80241360
 /* D4E374 80241334 00000000 */   nop      
 .L80241338:
-/* D4E378 80241338 3C038024 */  lui       $v1, 0x8024
-/* D4E37C 8024133C 24633178 */  addiu     $v1, $v1, 0x3178
+/* D4E378 80241338 3C038024 */  lui       $v1, %hi(D_80243178)
+/* D4E37C 8024133C 24633178 */  addiu     $v1, $v1, %lo(D_80243178)
 /* D4E380 80241340 0060282D */  daddu     $a1, $v1, $zero
 .L80241344:
 /* D4E384 80241344 24820080 */  addiu     $v0, $a0, 0x80
diff --git a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_802400EC_D500DC.s b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_802400EC_D500DC.s
index 438f8ca4a4..bafdded706 100644
--- a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_802400EC_D500DC.s
+++ b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_802400EC_D500DC.s
@@ -5,8 +5,8 @@ glabel func_802400EC_D500DC
 /* D500DC 802400EC 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* D500E0 802400F0 AFB00010 */  sw        $s0, 0x10($sp)
 /* D500E4 802400F4 0080802D */  daddu     $s0, $a0, $zero
-/* D500E8 802400F8 3C058024 */  lui       $a1, 0x8024
-/* D500EC 802400FC 24A50128 */  addiu     $a1, $a1, 0x128
+/* D500E8 802400F8 3C058024 */  lui       $a1, %hi(D_80240128)
+/* D500EC 802400FC 24A50128 */  addiu     $a1, $a1, %lo(D_80240128)
 /* D500F0 80240100 AFBF0014 */  sw        $ra, 0x14($sp)
 /* D500F4 80240104 0C048C56 */  jal       bind_dynamic_entity_3
 /* D500F8 80240108 0000202D */   daddu    $a0, $zero, $zero
diff --git a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240128_D50118.s b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240128_D50118.s
index b167f617da..e2f9e85c4d 100644
--- a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240128_D50118.s
+++ b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240128_D50118.s
@@ -29,8 +29,8 @@ glabel func_80240128_D50118
 /* D50178 80240188 27A20034 */  addiu     $v0, $sp, 0x34
 /* D5017C 8024018C AFA20014 */  sw        $v0, 0x14($sp)
 /* D50180 80240190 C6000030 */  lwc1      $f0, 0x30($s0)
-/* D50184 80240194 3C04800A */  lui       $a0, 0x800a
-/* D50188 80240198 8484A634 */  lh        $a0, -0x59cc($a0)
+/* D50184 80240194 3C04800A */  lui       $a0, %hi(D_8009A634)
+/* D50188 80240198 8484A634 */  lh        $a0, %lo(D_8009A634)($a0)
 /* D5018C 8024019C 46000007 */  neg.s     $f0, $f0
 /* D50190 802401A0 44070000 */  mfc1      $a3, $f0
 /* D50194 802401A4 27A20038 */  addiu     $v0, $sp, 0x38
@@ -67,8 +67,8 @@ glabel func_80240128_D50118
 /* D5020C 8024021C 54400022 */  bnel      $v0, $zero, .L802402A8
 /* D50210 80240220 24110011 */   addiu    $s1, $zero, 0x11
 /* D50214 80240224 9203000E */  lbu       $v1, 0xe($s0)
-/* D50218 80240228 3C02802E */  lui       $v0, 0x802e
-/* D5021C 8024022C 90429D70 */  lbu       $v0, -0x6290($v0)
+/* D50218 80240228 3C02802E */  lui       $v0, %hi(D_802D9D70)
+/* D5021C 8024022C 90429D70 */  lbu       $v0, %lo(D_802D9D70)($v0)
 /* D50220 80240230 10620018 */  beq       $v1, $v0, .L80240294
 /* D50224 80240234 2C6200FE */   sltiu    $v0, $v1, 0xfe
 /* D50228 80240238 1040000B */  beqz      $v0, .L80240268
@@ -98,20 +98,20 @@ glabel func_80240128_D50118
 /* D50280 80240290 00000000 */   nop      
 .L80240294:
 /* D50284 80240294 9202000E */  lbu       $v0, 0xe($s0)
-/* D50288 80240298 3C01802E */  lui       $at, 0x802e
-/* D5028C 8024029C A0229D70 */  sb        $v0, -0x6290($at)
+/* D50288 80240298 3C01802E */  lui       $at, %hi(D_802D9D70)
+/* D5028C 8024029C A0229D70 */  sb        $v0, %lo(D_802D9D70)($at)
 /* D50290 802402A0 080900AD */  j         .L802402B4
 /* D50294 802402A4 0240202D */   daddu    $a0, $s2, $zero
 .L802402A8:
-/* D50298 802402A8 3C01802E */  lui       $at, 0x802e
-/* D5029C 802402AC A0209D70 */  sb        $zero, -0x6290($at)
+/* D50298 802402A8 3C01802E */  lui       $at, %hi(D_802D9D70)
+/* D5029C 802402AC A0209D70 */  sb        $zero, %lo(D_802D9D70)($at)
 /* D502A0 802402B0 0240202D */  daddu     $a0, $s2, $zero
 .L802402B4:
 /* D502A4 802402B4 AC910000 */  sw        $s1, ($a0)
 /* D502A8 802402B8 AC900008 */  sw        $s0, 8($a0)
 /* D502AC 802402BC 8FA20038 */  lw        $v0, 0x38($sp)
-/* D502B0 802402C0 3C038024 */  lui       $v1, 0x8024
-/* D502B4 802402C4 246302F0 */  addiu     $v1, $v1, 0x2f0
+/* D502B0 802402C0 3C038024 */  lui       $v1, %hi(D_802402F0)
+/* D502B4 802402C4 246302F0 */  addiu     $v1, $v1, %lo(D_802402F0)
 /* D502B8 802402C8 AC83000C */  sw        $v1, 0xc($a0)
 /* D502BC 802402CC 00021023 */  negu      $v0, $v0
 /* D502C0 802402D0 0C047644 */  jal       queue_render_task
diff --git a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_802402F0_D502E0.s b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_802402F0_D502E0.s
index 4c33402cb9..b6fc2e5fad 100644
--- a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_802402F0_D502E0.s
+++ b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_802402F0_D502E0.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_802402F0_D502E0
-/* D502E0 802402F0 3C03800A */  lui       $v1, 0x800a
-/* D502E4 802402F4 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D502E0 802402F0 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D502E4 802402F4 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D502E8 802402F8 3C07BF80 */  lui       $a3, 0xbf80
 /* D502EC 802402FC 27BDFEC0 */  addiu     $sp, $sp, -0x140
 /* D502F0 80240300 F7B40128 */  sdc1      $f20, 0x128($sp)
@@ -22,9 +22,9 @@ glabel func_802402F0_D502E0
 /* D50324 80240334 000218C0 */  sll       $v1, $v0, 3
 /* D50328 80240338 00431021 */  addu      $v0, $v0, $v1
 /* D5032C 8024033C 000210C0 */  sll       $v0, $v0, 3
-/* D50330 80240340 3C01800B */  lui       $at, 0x800b
+/* D50330 80240340 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* D50334 80240344 00220821 */  addu      $at, $at, $v0
-/* D50338 80240348 C4361DEC */  lwc1      $f22, 0x1dec($at)
+/* D50338 80240348 C4361DEC */  lwc1      $f22, %lo(D_800B1DEC)($at)
 /* D5033C 8024034C 4406A000 */  mfc1      $a2, $f20
 /* D50340 80240350 4600B587 */  neg.s     $f22, $f22
 /* D50344 80240354 4405B000 */  mfc1      $a1, $f22
diff --git a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_8024049C_D5048C.s b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_8024049C_D5048C.s
index fd7c9411a8..5e24edf666 100644
--- a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_8024049C_D5048C.s
+++ b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_8024049C_D5048C.s
@@ -11,8 +11,8 @@ glabel func_8024049C_D5048C
 /* D504A4 802404B4 28420002 */   slti     $v0, $v0, 2
 /* D504A8 802404B8 1040000C */  beqz      $v0, .L802404EC
 /* D504AC 802404BC 00000000 */   nop      
-/* D504B0 802404C0 3C058024 */  lui       $a1, 0x8024
-/* D504B4 802404C4 24A50500 */  addiu     $a1, $a1, 0x500
+/* D504B0 802404C0 3C058024 */  lui       $a1, %hi(D_80240500)
+/* D504B4 802404C4 24A50500 */  addiu     $a1, $a1, %lo(D_80240500)
 /* D504B8 802404C8 0C048C56 */  jal       bind_dynamic_entity_3
 /* D504BC 802404CC 0000202D */   daddu    $a0, $zero, $zero
 /* D504C0 802404D0 8E03013C */  lw        $v1, 0x13c($s0)
diff --git a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240500_D504F0.s b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240500_D504F0.s
index 67ee85999b..b2068deb66 100644
--- a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240500_D504F0.s
+++ b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240500_D504F0.s
@@ -28,8 +28,8 @@ glabel func_80240500_D504F0
 /* D5054C 8024055C 27A20038 */  addiu     $v0, $sp, 0x38
 /* D50550 80240560 AFA20018 */  sw        $v0, 0x18($sp)
 /* D50554 80240564 C600002C */  lwc1      $f0, 0x2c($s0)
-/* D50558 80240568 3C04800A */  lui       $a0, 0x800a
-/* D5055C 8024056C 8484A634 */  lh        $a0, -0x59cc($a0)
+/* D50558 80240568 3C04800A */  lui       $a0, %hi(D_8009A634)
+/* D5055C 8024056C 8484A634 */  lh        $a0, %lo(D_8009A634)($a0)
 /* D50560 80240570 46000007 */  neg.s     $f0, $f0
 /* D50564 80240574 44060000 */  mfc1      $a2, $f0
 /* D50568 80240578 0C00B94E */  jal       get_screen_coords
@@ -44,8 +44,8 @@ glabel func_80240500_D504F0
 /* D5058C 8024059C 54400022 */  bnel      $v0, $zero, .L80240628
 /* D50590 802405A0 24120011 */   addiu    $s2, $zero, 0x11
 /* D50594 802405A4 9203000E */  lbu       $v1, 0xe($s0)
-/* D50598 802405A8 3C02802E */  lui       $v0, 0x802e
-/* D5059C 802405AC 90429D71 */  lbu       $v0, -0x628f($v0)
+/* D50598 802405A8 3C02802E */  lui       $v0, %hi(D_802D9D71)
+/* D5059C 802405AC 90429D71 */  lbu       $v0, %lo(D_802D9D71)($v0)
 /* D505A0 802405B0 10620018 */  beq       $v1, $v0, .L80240614
 /* D505A4 802405B4 2C6200FE */   sltiu    $v0, $v1, 0xfe
 /* D505A8 802405B8 1040000B */  beqz      $v0, .L802405E8
@@ -75,17 +75,17 @@ glabel func_80240500_D504F0
 /* D50600 80240610 00000000 */   nop      
 .L80240614:
 /* D50604 80240614 9202000E */  lbu       $v0, 0xe($s0)
-/* D50608 80240618 3C01802E */  lui       $at, 0x802e
-/* D5060C 8024061C A0229D71 */  sb        $v0, -0x628f($at)
+/* D50608 80240618 3C01802E */  lui       $at, %hi(D_802D9D71)
+/* D5060C 8024061C A0229D71 */  sb        $v0, %lo(D_802D9D71)($at)
 /* D50610 80240620 0809018C */  j         .L80240630
 /* D50614 80240624 00000000 */   nop      
 .L80240628:
-/* D50618 80240628 3C01802E */  lui       $at, 0x802e
-/* D5061C 8024062C A0209D71 */  sb        $zero, -0x628f($at)
+/* D50618 80240628 3C01802E */  lui       $at, %hi(D_802D9D71)
+/* D5061C 8024062C A0209D71 */  sb        $zero, %lo(D_802D9D71)($at)
 .L80240630:
 /* D50620 80240630 8FA20038 */  lw        $v0, 0x38($sp)
-/* D50624 80240634 3C048024 */  lui       $a0, 0x8024
-/* D50628 80240638 24840870 */  addiu     $a0, $a0, 0x870
+/* D50624 80240634 3C048024 */  lui       $a0, %hi(D_80240870)
+/* D50628 80240638 24840870 */  addiu     $a0, $a0, %lo(D_80240870)
 /* D5062C 8024063C AE320000 */  sw        $s2, ($s1)
 /* D50630 80240640 AE300008 */  sw        $s0, 8($s1)
 /* D50634 80240644 00021023 */  negu      $v0, $v0
@@ -95,8 +95,8 @@ glabel func_80240500_D504F0
 /* D50644 80240654 00431024 */  and       $v0, $v0, $v1
 /* D50648 80240658 54400004 */  bnel      $v0, $zero, .L8024066C
 /* D5064C 8024065C AE24000C */   sw       $a0, 0xc($s1)
-/* D50650 80240660 3C048024 */  lui       $a0, 0x8024
-/* D50654 80240664 2484068C */  addiu     $a0, $a0, 0x68c
+/* D50650 80240660 3C048024 */  lui       $a0, %hi(D_8024068C)
+/* D50654 80240664 2484068C */  addiu     $a0, $a0, %lo(D_8024068C)
 /* D50658 80240668 AE24000C */  sw        $a0, 0xc($s1)
 .L8024066C:
 /* D5065C 8024066C 0C047644 */  jal       queue_render_task
diff --git a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_8024068C_D5067C.s b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_8024068C_D5067C.s
index f9d5f1c2be..5764c5a20b 100644
--- a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_8024068C_D5067C.s
+++ b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_8024068C_D5067C.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_8024068C_D5067C
-/* D5067C 8024068C 3C03800A */  lui       $v1, 0x800a
-/* D50680 80240690 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D5067C 8024068C 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D50680 80240690 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D50684 80240694 3C07BF80 */  lui       $a3, 0xbf80
 /* D50688 80240698 27BDFEC0 */  addiu     $sp, $sp, -0x140
 /* D5068C 8024069C F7B40128 */  sdc1      $f20, 0x128($sp)
@@ -22,9 +22,9 @@ glabel func_8024068C_D5067C
 /* D506C0 802406D0 000218C0 */  sll       $v1, $v0, 3
 /* D506C4 802406D4 00431021 */  addu      $v0, $v0, $v1
 /* D506C8 802406D8 000210C0 */  sll       $v0, $v0, 3
-/* D506CC 802406DC 3C01800B */  lui       $at, 0x800b
+/* D506CC 802406DC 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* D506D0 802406E0 00220821 */  addu      $at, $at, $v0
-/* D506D4 802406E4 C4361DEC */  lwc1      $f22, 0x1dec($at)
+/* D506D4 802406E4 C4361DEC */  lwc1      $f22, %lo(D_800B1DEC)($at)
 /* D506D8 802406E8 4406A000 */  mfc1      $a2, $f20
 /* D506DC 802406EC 4600B587 */  neg.s     $f22, $f22
 /* D506E0 802406F0 4405B000 */  mfc1      $a1, $f22
diff --git a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240870_D50860.s b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240870_D50860.s
index 2f6c1b9877..ad17ad9dcb 100644
--- a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240870_D50860.s
+++ b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240870_D50860.s
@@ -27,8 +27,8 @@ glabel func_80240870_D50860
 /* D508B8 802408C8 F7B80160 */  sdc1      $f24, 0x160($sp)
 /* D508BC 802408CC F7B40150 */  sdc1      $f20, 0x150($sp)
 .L802408D0:
-/* D508C0 802408D0 3C03800A */  lui       $v1, 0x800a
-/* D508C4 802408D4 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D508C0 802408D0 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D508C4 802408D4 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D508C8 802408D8 00031080 */  sll       $v0, $v1, 2
 /* D508CC 802408DC 00431021 */  addu      $v0, $v0, $v1
 /* D508D0 802408E0 00021080 */  sll       $v0, $v0, 2
diff --git a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240D3C_D50D2C.s b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240D3C_D50D2C.s
index cf30699561..cb54debb32 100644
--- a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240D3C_D50D2C.s
+++ b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240D3C_D50D2C.s
@@ -25,13 +25,13 @@ glabel func_80240D3C_D50D2C
 /* D50D78 80240D88 08090378 */  j         .L80240DE0
 /* D50D7C 80240D8C 00000000 */   nop      
 .L80240D90:
-/* D50D80 80240D90 3C048024 */  lui       $a0, 0x8024
-/* D50D84 80240D94 24840E84 */  addiu     $a0, $a0, 0xe84
+/* D50D80 80240D90 3C048024 */  lui       $a0, %hi(D_80240E84)
+/* D50D84 80240D94 24840E84 */  addiu     $a0, $a0, %lo(D_80240E84)
 /* D50D88 80240D98 08090374 */  j         .L80240DD0
 /* D50D8C 80240D9C 00000000 */   nop      
 .L80240DA0:
-/* D50D90 80240DA0 3C048024 */  lui       $a0, 0x8024
-/* D50D94 80240DA4 24840EEC */  addiu     $a0, $a0, 0xeec
+/* D50D90 80240DA0 3C048024 */  lui       $a0, %hi(D_80240EEC)
+/* D50D94 80240DA4 24840EEC */  addiu     $a0, $a0, %lo(D_80240EEC)
 /* D50D98 80240DA8 08090374 */  j         .L80240DD0
 /* D50D9C 80240DAC 00000000 */   nop      
 .L80240DB0:
@@ -42,8 +42,8 @@ glabel func_80240D3C_D50D2C
 /* D50DB0 80240DC0 10400007 */  beqz      $v0, .L80240DE0
 /* D50DB4 80240DC4 00000000 */   nop      
 .L80240DC8:
-/* D50DB8 80240DC8 3C048024 */  lui       $a0, 0x8024
-/* D50DBC 80240DCC 24840EB8 */  addiu     $a0, $a0, 0xeb8
+/* D50DB8 80240DC8 3C048024 */  lui       $a0, %hi(D_80240EB8)
+/* D50DBC 80240DCC 24840EB8 */  addiu     $a0, $a0, %lo(D_80240EB8)
 .L80240DD0:
 /* D50DC0 80240DD0 0C048C56 */  jal       bind_dynamic_entity_3
 /* D50DC4 80240DD4 0000282D */   daddu    $a1, $zero, $zero
diff --git a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_8024114C_D5113C.s b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_8024114C_D5113C.s
index cc938450c9..5ab468ad51 100644
--- a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_8024114C_D5113C.s
+++ b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_8024114C_D5113C.s
@@ -6,11 +6,11 @@ glabel func_8024114C_D5113C
 /* D51140 80241150 AFBF0010 */  sw        $ra, 0x10($sp)
 /* D51144 80241154 10A00003 */  beqz      $a1, .L80241164
 /* D51148 80241158 8C86000C */   lw       $a2, 0xc($a0)
-/* D5114C 8024115C 3C018024 */  lui       $at, 0x8024
-/* D51150 80241160 AC202ACC */  sw        $zero, 0x2acc($at)
+/* D5114C 8024115C 3C018024 */  lui       $at, %hi(D_80242ACC)
+/* D51150 80241160 AC202ACC */  sw        $zero, %lo(D_80242ACC)($at)
 .L80241164:
-/* D51154 80241164 3C038024 */  lui       $v1, 0x8024
-/* D51158 80241168 24632ACC */  addiu     $v1, $v1, 0x2acc
+/* D51154 80241164 3C038024 */  lui       $v1, %hi(D_80242ACC)
+/* D51158 80241168 24632ACC */  addiu     $v1, $v1, %lo(D_80242ACC)
 /* D5115C 8024116C 8C620000 */  lw        $v0, ($v1)
 /* D51160 80241170 54400003 */  bnel      $v0, $zero, .L80241180
 /* D51164 80241174 AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_8024114C_D5113C
 /* D5116C 8024117C 0000102D */   daddu    $v0, $zero, $zero
 .L80241180:
 /* D51170 80241180 8CC50000 */  lw        $a1, ($a2)
-/* D51174 80241184 3C068024 */  lui       $a2, 0x8024
+/* D51174 80241184 3C068024 */  lui       $a2, %hi(D_80242AD0)
 /* D51178 80241188 0C0B2026 */  jal       set_variable
-/* D5117C 8024118C 8CC62AD0 */   lw       $a2, 0x2ad0($a2)
+/* D5117C 8024118C 8CC62AD0 */   lw       $a2, %lo(D_80242AD0)($a2)
 /* D51180 80241190 24020002 */  addiu     $v0, $zero, 2
 .L80241194:
 /* D51184 80241194 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_802411A0_D51190.s b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_802411A0_D51190.s
index 14b66f6b98..72651cfca7 100644
--- a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_802411A0_D51190.s
+++ b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_802411A0_D51190.s
@@ -7,12 +7,12 @@ glabel func_802411A0_D51190
 /* D51198 802411A8 8C82000C */  lw        $v0, 0xc($a0)
 /* D5119C 802411AC 0C0B1EAF */  jal       get_variable
 /* D511A0 802411B0 8C450000 */   lw       $a1, ($v0)
-/* D511A4 802411B4 3C018024 */  lui       $at, 0x8024
-/* D511A8 802411B8 AC222AD0 */  sw        $v0, 0x2ad0($at)
+/* D511A4 802411B4 3C018024 */  lui       $at, %hi(D_80242AD0)
+/* D511A8 802411B8 AC222AD0 */  sw        $v0, %lo(D_80242AD0)($at)
 /* D511AC 802411BC 24020002 */  addiu     $v0, $zero, 2
 /* D511B0 802411C0 8FBF0010 */  lw        $ra, 0x10($sp)
 /* D511B4 802411C4 24030001 */  addiu     $v1, $zero, 1
-/* D511B8 802411C8 3C018024 */  lui       $at, 0x8024
-/* D511BC 802411CC AC232ACC */  sw        $v1, 0x2acc($at)
+/* D511B8 802411C8 3C018024 */  lui       $at, %hi(D_80242ACC)
+/* D511BC 802411CC AC232ACC */  sw        $v1, %lo(D_80242ACC)($at)
 /* D511C0 802411D0 03E00008 */  jr        $ra
 /* D511C4 802411D4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_802411D8_D511C8.s b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_802411D8_D511C8.s
index ebee9ed0ac..5feb55367d 100644
--- a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_802411D8_D511C8.s
+++ b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_802411D8_D511C8.s
@@ -13,8 +13,8 @@ glabel func_802411D8_D511C8
 /* D511E8 802411F8 8C620000 */  lw        $v0, ($v1)
 /* D511EC 802411FC 5040000A */  beql      $v0, $zero, .L80241228
 /* D511F0 80241200 00041080 */   sll      $v0, $a0, 2
-/* D511F4 80241204 3C058024 */  lui       $a1, 0x8024
-/* D511F8 80241208 24A53CC0 */  addiu     $a1, $a1, 0x3cc0
+/* D511F4 80241204 3C058024 */  lui       $a1, %hi(D_80243CC0)
+/* D511F8 80241208 24A53CC0 */  addiu     $a1, $a1, %lo(D_80243CC0)
 .L8024120C:
 /* D511FC 8024120C 24630004 */  addiu     $v1, $v1, 4
 /* D51200 80241210 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_802411D8_D511C8
 /* D51210 80241220 24A50004 */   addiu    $a1, $a1, 4
 /* D51214 80241224 00041080 */  sll       $v0, $a0, 2
 .L80241228:
-/* D51218 80241228 3C018024 */  lui       $at, 0x8024
+/* D51218 80241228 3C018024 */  lui       $at, %hi(D_80243CC0)
 /* D5121C 8024122C 00220821 */  addu      $at, $at, $v0
-/* D51220 80241230 AC203CC0 */  sw        $zero, 0x3cc0($at)
+/* D51220 80241230 AC203CC0 */  sw        $zero, %lo(D_80243CC0)($at)
 /* D51224 80241234 08090499 */  j         .L80241264
 /* D51228 80241238 00000000 */   nop      
 .L8024123C:
-/* D5122C 8024123C 3C038024 */  lui       $v1, 0x8024
-/* D51230 80241240 24633CC0 */  addiu     $v1, $v1, 0x3cc0
+/* D5122C 8024123C 3C038024 */  lui       $v1, %hi(D_80243CC0)
+/* D51230 80241240 24633CC0 */  addiu     $v1, $v1, %lo(D_80243CC0)
 /* D51234 80241244 0060282D */  daddu     $a1, $v1, $zero
 .L80241248:
 /* D51238 80241248 24820010 */  addiu     $v0, $a0, 0x10
diff --git a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80241274_D51264.s b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80241274_D51264.s
index af3d1d79f8..f4688b35da 100644
--- a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80241274_D51264.s
+++ b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80241274_D51264.s
@@ -13,8 +13,8 @@ glabel func_80241274_D51264
 /* D51284 80241294 8C620000 */  lw        $v0, ($v1)
 /* D51288 80241298 5040000A */  beql      $v0, $zero, .L802412C4
 /* D5128C 8024129C 00041080 */   sll      $v0, $a0, 2
-/* D51290 802412A0 3C058024 */  lui       $a1, 0x8024
-/* D51294 802412A4 24A53E88 */  addiu     $a1, $a1, 0x3e88
+/* D51290 802412A0 3C058024 */  lui       $a1, %hi(D_80243E88)
+/* D51294 802412A4 24A53E88 */  addiu     $a1, $a1, %lo(D_80243E88)
 .L802412A8:
 /* D51298 802412A8 24630004 */  addiu     $v1, $v1, 4
 /* D5129C 802412AC 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_80241274_D51264
 /* D512AC 802412BC 24A50004 */   addiu    $a1, $a1, 4
 /* D512B0 802412C0 00041080 */  sll       $v0, $a0, 2
 .L802412C4:
-/* D512B4 802412C4 3C018024 */  lui       $at, 0x8024
+/* D512B4 802412C4 3C018024 */  lui       $at, %hi(D_80243E88)
 /* D512B8 802412C8 00220821 */  addu      $at, $at, $v0
-/* D512BC 802412CC AC203E88 */  sw        $zero, 0x3e88($at)
+/* D512BC 802412CC AC203E88 */  sw        $zero, %lo(D_80243E88)($at)
 /* D512C0 802412D0 080904C0 */  j         .L80241300
 /* D512C4 802412D4 00000000 */   nop      
 .L802412D8:
-/* D512C8 802412D8 3C038024 */  lui       $v1, 0x8024
-/* D512CC 802412DC 24633E88 */  addiu     $v1, $v1, 0x3e88
+/* D512C8 802412D8 3C038024 */  lui       $v1, %hi(D_80243E88)
+/* D512CC 802412DC 24633E88 */  addiu     $v1, $v1, %lo(D_80243E88)
 /* D512D0 802412E0 0060282D */  daddu     $a1, $v1, $zero
 .L802412E4:
 /* D512D4 802412E4 24820080 */  addiu     $v0, $a0, 0x80
diff --git a/asm/nonmatchings/world/area_pra/pra_04/D54840/func_802401B0_D54840.s b/asm/nonmatchings/world/area_pra/pra_04/D54840/func_802401B0_D54840.s
index f3cf635e8e..fe8481b33f 100644
--- a/asm/nonmatchings/world/area_pra/pra_04/D54840/func_802401B0_D54840.s
+++ b/asm/nonmatchings/world/area_pra/pra_04/D54840/func_802401B0_D54840.s
@@ -87,9 +87,9 @@ glabel func_802401B0_D54840
 /* D54980 802402F0 2C620010 */  sltiu     $v0, $v1, 0x10
 /* D54984 802402F4 10400185 */  beqz      $v0, .L8024090C
 /* D54988 802402F8 00031080 */   sll      $v0, $v1, 2
-/* D5498C 802402FC 3C018024 */  lui       $at, 0x8024
+/* D5498C 802402FC 3C018024 */  lui       $at, %hi(D_802414D0)
 /* D54990 80240300 00220821 */  addu      $at, $at, $v0
-/* D54994 80240304 8C2214D0 */  lw        $v0, 0x14d0($at)
+/* D54994 80240304 8C2214D0 */  lw        $v0, %lo(D_802414D0)($at)
 /* D54998 80240308 00400008 */  jr        $v0
 /* D5499C 8024030C 00000000 */   nop      
 /* D549A0 80240310 8E4200CC */  lw        $v0, 0xcc($s2)
@@ -171,8 +171,8 @@ glabel func_802401B0_D54840
 /* D54AC4 80240434 C6440070 */  lwc1      $f4, 0x70($s2)
 /* D54AC8 80240438 46802120 */  cvt.s.w   $f4, $f4
 /* D54ACC 8024043C 46040001 */  sub.s     $f0, $f0, $f4
-/* D54AD0 80240440 3C018024 */  lui       $at, 0x8024
-/* D54AD4 80240444 D4221510 */  ldc1      $f2, 0x1510($at)
+/* D54AD0 80240440 3C018024 */  lui       $at, %hi(D_80241510)
+/* D54AD4 80240444 D4221510 */  ldc1      $f2, %lo(D_80241510)($at)
 /* D54AD8 80240448 46000021 */  cvt.d.s   $f0, $f0
 /* D54ADC 8024044C 46220002 */  mul.d     $f0, $f0, $f2
 /* D54AE0 80240450 00000000 */  nop       
@@ -186,8 +186,8 @@ glabel func_802401B0_D54840
 /* D54AFC 8024046C C6A0002C */  lwc1      $f0, 0x2c($s5)
 /* D54B00 80240470 C622003C */  lwc1      $f2, 0x3c($s1)
 /* D54B04 80240474 46001081 */  sub.s     $f2, $f2, $f0
-/* D54B08 80240478 3C018024 */  lui       $at, 0x8024
-/* D54B0C 8024047C D4241518 */  ldc1      $f4, 0x1518($at)
+/* D54B08 80240478 3C018024 */  lui       $at, %hi(D_80241518)
+/* D54B0C 8024047C D4241518 */  ldc1      $f4, %lo(D_80241518)($at)
 /* D54B10 80240480 460010A1 */  cvt.d.s   $f2, $f2
 /* D54B14 80240484 46241082 */  mul.d     $f2, $f2, $f4
 /* D54B18 80240488 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_802400EC_D55C9C.s b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_802400EC_D55C9C.s
index 97acd58af9..24cceac940 100644
--- a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_802400EC_D55C9C.s
+++ b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_802400EC_D55C9C.s
@@ -5,8 +5,8 @@ glabel func_802400EC_D55C9C
 /* D55C9C 802400EC 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* D55CA0 802400F0 AFB00010 */  sw        $s0, 0x10($sp)
 /* D55CA4 802400F4 0080802D */  daddu     $s0, $a0, $zero
-/* D55CA8 802400F8 3C058024 */  lui       $a1, 0x8024
-/* D55CAC 802400FC 24A50128 */  addiu     $a1, $a1, 0x128
+/* D55CA8 802400F8 3C058024 */  lui       $a1, %hi(D_80240128)
+/* D55CAC 802400FC 24A50128 */  addiu     $a1, $a1, %lo(D_80240128)
 /* D55CB0 80240100 AFBF0014 */  sw        $ra, 0x14($sp)
 /* D55CB4 80240104 0C048C56 */  jal       bind_dynamic_entity_3
 /* D55CB8 80240108 0000202D */   daddu    $a0, $zero, $zero
diff --git a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240128_D55CD8.s b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240128_D55CD8.s
index 48d99e7a38..4544667a4d 100644
--- a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240128_D55CD8.s
+++ b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240128_D55CD8.s
@@ -29,8 +29,8 @@ glabel func_80240128_D55CD8
 /* D55D38 80240188 27A20034 */  addiu     $v0, $sp, 0x34
 /* D55D3C 8024018C AFA20014 */  sw        $v0, 0x14($sp)
 /* D55D40 80240190 C6000030 */  lwc1      $f0, 0x30($s0)
-/* D55D44 80240194 3C04800A */  lui       $a0, 0x800a
-/* D55D48 80240198 8484A634 */  lh        $a0, -0x59cc($a0)
+/* D55D44 80240194 3C04800A */  lui       $a0, %hi(D_8009A634)
+/* D55D48 80240198 8484A634 */  lh        $a0, %lo(D_8009A634)($a0)
 /* D55D4C 8024019C 46000007 */  neg.s     $f0, $f0
 /* D55D50 802401A0 44070000 */  mfc1      $a3, $f0
 /* D55D54 802401A4 27A20038 */  addiu     $v0, $sp, 0x38
@@ -67,8 +67,8 @@ glabel func_80240128_D55CD8
 /* D55DCC 8024021C 54400022 */  bnel      $v0, $zero, .L802402A8
 /* D55DD0 80240220 24110011 */   addiu    $s1, $zero, 0x11
 /* D55DD4 80240224 9203000E */  lbu       $v1, 0xe($s0)
-/* D55DD8 80240228 3C02802E */  lui       $v0, 0x802e
-/* D55DDC 8024022C 90429D70 */  lbu       $v0, -0x6290($v0)
+/* D55DD8 80240228 3C02802E */  lui       $v0, %hi(D_802D9D70)
+/* D55DDC 8024022C 90429D70 */  lbu       $v0, %lo(D_802D9D70)($v0)
 /* D55DE0 80240230 10620018 */  beq       $v1, $v0, .L80240294
 /* D55DE4 80240234 2C6200FE */   sltiu    $v0, $v1, 0xfe
 /* D55DE8 80240238 1040000B */  beqz      $v0, .L80240268
@@ -98,20 +98,20 @@ glabel func_80240128_D55CD8
 /* D55E40 80240290 00000000 */   nop      
 .L80240294:
 /* D55E44 80240294 9202000E */  lbu       $v0, 0xe($s0)
-/* D55E48 80240298 3C01802E */  lui       $at, 0x802e
-/* D55E4C 8024029C A0229D70 */  sb        $v0, -0x6290($at)
+/* D55E48 80240298 3C01802E */  lui       $at, %hi(D_802D9D70)
+/* D55E4C 8024029C A0229D70 */  sb        $v0, %lo(D_802D9D70)($at)
 /* D55E50 802402A0 080900AD */  j         .L802402B4
 /* D55E54 802402A4 0240202D */   daddu    $a0, $s2, $zero
 .L802402A8:
-/* D55E58 802402A8 3C01802E */  lui       $at, 0x802e
-/* D55E5C 802402AC A0209D70 */  sb        $zero, -0x6290($at)
+/* D55E58 802402A8 3C01802E */  lui       $at, %hi(D_802D9D70)
+/* D55E5C 802402AC A0209D70 */  sb        $zero, %lo(D_802D9D70)($at)
 /* D55E60 802402B0 0240202D */  daddu     $a0, $s2, $zero
 .L802402B4:
 /* D55E64 802402B4 AC910000 */  sw        $s1, ($a0)
 /* D55E68 802402B8 AC900008 */  sw        $s0, 8($a0)
 /* D55E6C 802402BC 8FA20038 */  lw        $v0, 0x38($sp)
-/* D55E70 802402C0 3C038024 */  lui       $v1, 0x8024
-/* D55E74 802402C4 246302F0 */  addiu     $v1, $v1, 0x2f0
+/* D55E70 802402C0 3C038024 */  lui       $v1, %hi(D_802402F0)
+/* D55E74 802402C4 246302F0 */  addiu     $v1, $v1, %lo(D_802402F0)
 /* D55E78 802402C8 AC83000C */  sw        $v1, 0xc($a0)
 /* D55E7C 802402CC 00021023 */  negu      $v0, $v0
 /* D55E80 802402D0 0C047644 */  jal       queue_render_task
diff --git a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_802402F0_D55EA0.s b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_802402F0_D55EA0.s
index 24994ffb19..5e1d4cd79b 100644
--- a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_802402F0_D55EA0.s
+++ b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_802402F0_D55EA0.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_802402F0_D55EA0
-/* D55EA0 802402F0 3C03800A */  lui       $v1, 0x800a
-/* D55EA4 802402F4 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D55EA0 802402F0 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D55EA4 802402F4 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D55EA8 802402F8 3C07BF80 */  lui       $a3, 0xbf80
 /* D55EAC 802402FC 27BDFEC0 */  addiu     $sp, $sp, -0x140
 /* D55EB0 80240300 F7B40128 */  sdc1      $f20, 0x128($sp)
@@ -22,9 +22,9 @@ glabel func_802402F0_D55EA0
 /* D55EE4 80240334 000218C0 */  sll       $v1, $v0, 3
 /* D55EE8 80240338 00431021 */  addu      $v0, $v0, $v1
 /* D55EEC 8024033C 000210C0 */  sll       $v0, $v0, 3
-/* D55EF0 80240340 3C01800B */  lui       $at, 0x800b
+/* D55EF0 80240340 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* D55EF4 80240344 00220821 */  addu      $at, $at, $v0
-/* D55EF8 80240348 C4361DEC */  lwc1      $f22, 0x1dec($at)
+/* D55EF8 80240348 C4361DEC */  lwc1      $f22, %lo(D_800B1DEC)($at)
 /* D55EFC 8024034C 4406A000 */  mfc1      $a2, $f20
 /* D55F00 80240350 4600B587 */  neg.s     $f22, $f22
 /* D55F04 80240354 4405B000 */  mfc1      $a1, $f22
diff --git a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_8024049C_D5604C.s b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_8024049C_D5604C.s
index a769b9aef7..c87b828f9d 100644
--- a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_8024049C_D5604C.s
+++ b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_8024049C_D5604C.s
@@ -11,8 +11,8 @@ glabel func_8024049C_D5604C
 /* D56064 802404B4 28420002 */   slti     $v0, $v0, 2
 /* D56068 802404B8 1040000C */  beqz      $v0, .L802404EC
 /* D5606C 802404BC 00000000 */   nop      
-/* D56070 802404C0 3C058024 */  lui       $a1, 0x8024
-/* D56074 802404C4 24A50500 */  addiu     $a1, $a1, 0x500
+/* D56070 802404C0 3C058024 */  lui       $a1, %hi(D_80240500)
+/* D56074 802404C4 24A50500 */  addiu     $a1, $a1, %lo(D_80240500)
 /* D56078 802404C8 0C048C56 */  jal       bind_dynamic_entity_3
 /* D5607C 802404CC 0000202D */   daddu    $a0, $zero, $zero
 /* D56080 802404D0 8E03013C */  lw        $v1, 0x13c($s0)
diff --git a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240500_D560B0.s b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240500_D560B0.s
index 1428bfe572..e796f23d49 100644
--- a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240500_D560B0.s
+++ b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240500_D560B0.s
@@ -28,8 +28,8 @@ glabel func_80240500_D560B0
 /* D5610C 8024055C 27A20038 */  addiu     $v0, $sp, 0x38
 /* D56110 80240560 AFA20018 */  sw        $v0, 0x18($sp)
 /* D56114 80240564 C600002C */  lwc1      $f0, 0x2c($s0)
-/* D56118 80240568 3C04800A */  lui       $a0, 0x800a
-/* D5611C 8024056C 8484A634 */  lh        $a0, -0x59cc($a0)
+/* D56118 80240568 3C04800A */  lui       $a0, %hi(D_8009A634)
+/* D5611C 8024056C 8484A634 */  lh        $a0, %lo(D_8009A634)($a0)
 /* D56120 80240570 46000007 */  neg.s     $f0, $f0
 /* D56124 80240574 44060000 */  mfc1      $a2, $f0
 /* D56128 80240578 0C00B94E */  jal       get_screen_coords
@@ -44,8 +44,8 @@ glabel func_80240500_D560B0
 /* D5614C 8024059C 54400022 */  bnel      $v0, $zero, .L80240628
 /* D56150 802405A0 24120011 */   addiu    $s2, $zero, 0x11
 /* D56154 802405A4 9203000E */  lbu       $v1, 0xe($s0)
-/* D56158 802405A8 3C02802E */  lui       $v0, 0x802e
-/* D5615C 802405AC 90429D71 */  lbu       $v0, -0x628f($v0)
+/* D56158 802405A8 3C02802E */  lui       $v0, %hi(D_802D9D71)
+/* D5615C 802405AC 90429D71 */  lbu       $v0, %lo(D_802D9D71)($v0)
 /* D56160 802405B0 10620018 */  beq       $v1, $v0, .L80240614
 /* D56164 802405B4 2C6200FE */   sltiu    $v0, $v1, 0xfe
 /* D56168 802405B8 1040000B */  beqz      $v0, .L802405E8
@@ -75,17 +75,17 @@ glabel func_80240500_D560B0
 /* D561C0 80240610 00000000 */   nop      
 .L80240614:
 /* D561C4 80240614 9202000E */  lbu       $v0, 0xe($s0)
-/* D561C8 80240618 3C01802E */  lui       $at, 0x802e
-/* D561CC 8024061C A0229D71 */  sb        $v0, -0x628f($at)
+/* D561C8 80240618 3C01802E */  lui       $at, %hi(D_802D9D71)
+/* D561CC 8024061C A0229D71 */  sb        $v0, %lo(D_802D9D71)($at)
 /* D561D0 80240620 0809018C */  j         .L80240630
 /* D561D4 80240624 00000000 */   nop      
 .L80240628:
-/* D561D8 80240628 3C01802E */  lui       $at, 0x802e
-/* D561DC 8024062C A0209D71 */  sb        $zero, -0x628f($at)
+/* D561D8 80240628 3C01802E */  lui       $at, %hi(D_802D9D71)
+/* D561DC 8024062C A0209D71 */  sb        $zero, %lo(D_802D9D71)($at)
 .L80240630:
 /* D561E0 80240630 8FA20038 */  lw        $v0, 0x38($sp)
-/* D561E4 80240634 3C048024 */  lui       $a0, 0x8024
-/* D561E8 80240638 24840870 */  addiu     $a0, $a0, 0x870
+/* D561E4 80240634 3C048024 */  lui       $a0, %hi(D_80240870)
+/* D561E8 80240638 24840870 */  addiu     $a0, $a0, %lo(D_80240870)
 /* D561EC 8024063C AE320000 */  sw        $s2, ($s1)
 /* D561F0 80240640 AE300008 */  sw        $s0, 8($s1)
 /* D561F4 80240644 00021023 */  negu      $v0, $v0
@@ -95,8 +95,8 @@ glabel func_80240500_D560B0
 /* D56204 80240654 00431024 */  and       $v0, $v0, $v1
 /* D56208 80240658 54400004 */  bnel      $v0, $zero, .L8024066C
 /* D5620C 8024065C AE24000C */   sw       $a0, 0xc($s1)
-/* D56210 80240660 3C048024 */  lui       $a0, 0x8024
-/* D56214 80240664 2484068C */  addiu     $a0, $a0, 0x68c
+/* D56210 80240660 3C048024 */  lui       $a0, %hi(D_8024068C)
+/* D56214 80240664 2484068C */  addiu     $a0, $a0, %lo(D_8024068C)
 /* D56218 80240668 AE24000C */  sw        $a0, 0xc($s1)
 .L8024066C:
 /* D5621C 8024066C 0C047644 */  jal       queue_render_task
diff --git a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_8024068C_D5623C.s b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_8024068C_D5623C.s
index 84a0167208..974e0cdb1b 100644
--- a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_8024068C_D5623C.s
+++ b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_8024068C_D5623C.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_8024068C_D5623C
-/* D5623C 8024068C 3C03800A */  lui       $v1, 0x800a
-/* D56240 80240690 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D5623C 8024068C 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D56240 80240690 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D56244 80240694 3C07BF80 */  lui       $a3, 0xbf80
 /* D56248 80240698 27BDFEC0 */  addiu     $sp, $sp, -0x140
 /* D5624C 8024069C F7B40128 */  sdc1      $f20, 0x128($sp)
@@ -22,9 +22,9 @@ glabel func_8024068C_D5623C
 /* D56280 802406D0 000218C0 */  sll       $v1, $v0, 3
 /* D56284 802406D4 00431021 */  addu      $v0, $v0, $v1
 /* D56288 802406D8 000210C0 */  sll       $v0, $v0, 3
-/* D5628C 802406DC 3C01800B */  lui       $at, 0x800b
+/* D5628C 802406DC 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* D56290 802406E0 00220821 */  addu      $at, $at, $v0
-/* D56294 802406E4 C4361DEC */  lwc1      $f22, 0x1dec($at)
+/* D56294 802406E4 C4361DEC */  lwc1      $f22, %lo(D_800B1DEC)($at)
 /* D56298 802406E8 4406A000 */  mfc1      $a2, $f20
 /* D5629C 802406EC 4600B587 */  neg.s     $f22, $f22
 /* D562A0 802406F0 4405B000 */  mfc1      $a1, $f22
diff --git a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240870_D56420.s b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240870_D56420.s
index 1c242f75a3..fe112e4bb0 100644
--- a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240870_D56420.s
+++ b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240870_D56420.s
@@ -27,8 +27,8 @@ glabel func_80240870_D56420
 /* D56478 802408C8 F7B80160 */  sdc1      $f24, 0x160($sp)
 /* D5647C 802408CC F7B40150 */  sdc1      $f20, 0x150($sp)
 .L802408D0:
-/* D56480 802408D0 3C03800A */  lui       $v1, 0x800a
-/* D56484 802408D4 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D56480 802408D0 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D56484 802408D4 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D56488 802408D8 00031080 */  sll       $v0, $v1, 2
 /* D5648C 802408DC 00431021 */  addu      $v0, $v0, $v1
 /* D56490 802408E0 00021080 */  sll       $v0, $v0, 2
diff --git a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240D3C_D568EC.s b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240D3C_D568EC.s
index 81e0896504..f7da2b8002 100644
--- a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240D3C_D568EC.s
+++ b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240D3C_D568EC.s
@@ -25,13 +25,13 @@ glabel func_80240D3C_D568EC
 /* D56938 80240D88 08090378 */  j         .L80240DE0
 /* D5693C 80240D8C 00000000 */   nop      
 .L80240D90:
-/* D56940 80240D90 3C048024 */  lui       $a0, 0x8024
-/* D56944 80240D94 24840E84 */  addiu     $a0, $a0, 0xe84
+/* D56940 80240D90 3C048024 */  lui       $a0, %hi(D_80240E84)
+/* D56944 80240D94 24840E84 */  addiu     $a0, $a0, %lo(D_80240E84)
 /* D56948 80240D98 08090374 */  j         .L80240DD0
 /* D5694C 80240D9C 00000000 */   nop      
 .L80240DA0:
-/* D56950 80240DA0 3C048024 */  lui       $a0, 0x8024
-/* D56954 80240DA4 24840EEC */  addiu     $a0, $a0, 0xeec
+/* D56950 80240DA0 3C048024 */  lui       $a0, %hi(D_80240EEC)
+/* D56954 80240DA4 24840EEC */  addiu     $a0, $a0, %lo(D_80240EEC)
 /* D56958 80240DA8 08090374 */  j         .L80240DD0
 /* D5695C 80240DAC 00000000 */   nop      
 .L80240DB0:
@@ -42,8 +42,8 @@ glabel func_80240D3C_D568EC
 /* D56970 80240DC0 10400007 */  beqz      $v0, .L80240DE0
 /* D56974 80240DC4 00000000 */   nop      
 .L80240DC8:
-/* D56978 80240DC8 3C048024 */  lui       $a0, 0x8024
-/* D5697C 80240DCC 24840EB8 */  addiu     $a0, $a0, 0xeb8
+/* D56978 80240DC8 3C048024 */  lui       $a0, %hi(D_80240EB8)
+/* D5697C 80240DCC 24840EB8 */  addiu     $a0, $a0, %lo(D_80240EB8)
 .L80240DD0:
 /* D56980 80240DD0 0C048C56 */  jal       bind_dynamic_entity_3
 /* D56984 80240DD4 0000282D */   daddu    $a1, $zero, $zero
diff --git a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240F20_D56AD0.s b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240F20_D56AD0.s
index 8c9f17584f..e455681c7d 100644
--- a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240F20_D56AD0.s
+++ b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240F20_D56AD0.s
@@ -4,8 +4,8 @@
 glabel func_80240F20_D56AD0
 /* D56AD0 80240F20 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* D56AD4 80240F24 AFB00010 */  sw        $s0, 0x10($sp)
-/* D56AD8 80240F28 3C108024 */  lui       $s0, 0x8024
-/* D56ADC 80240F2C 26101680 */  addiu     $s0, $s0, 0x1680
+/* D56AD8 80240F28 3C108024 */  lui       $s0, %hi(D_80241680)
+/* D56ADC 80240F2C 26101680 */  addiu     $s0, $s0, %lo(D_80241680)
 /* D56AE0 80240F30 AFBF0018 */  sw        $ra, 0x18($sp)
 /* D56AE4 80240F34 AFB10014 */  sw        $s1, 0x14($sp)
 /* D56AE8 80240F38 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_80240F20_D56AD0
 /* D56B4C 80240F9C 28620010 */  slti      $v0, $v1, 0x10
 /* D56B50 80240FA0 1440FFFA */  bnez      $v0, .L80240F8C
 /* D56B54 80240FA4 24840004 */   addiu    $a0, $a0, 4
-/* D56B58 80240FA8 3C108024 */  lui       $s0, 0x8024
-/* D56B5C 80240FAC 26101680 */  addiu     $s0, $s0, 0x1680
+/* D56B58 80240FA8 3C108024 */  lui       $s0, %hi(D_80241680)
+/* D56B5C 80240FAC 26101680 */  addiu     $s0, $s0, %lo(D_80241680)
 /* D56B60 80240FB0 0C00AB4B */  jal       heap_free
 /* D56B64 80240FB4 8E040000 */   lw       $a0, ($s0)
 /* D56B68 80240FB8 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240000_D57430.s b/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240000_D57430.s
index 6e11191e08..4309fc65b0 100644
--- a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240000_D57430.s
+++ b/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240000_D57430.s
@@ -3,21 +3,21 @@
 
 glabel func_80240000_D57430
 /* D57430 80240000 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D57434 80240004 3C04800E */  lui       $a0, 0x800e
-/* D57438 80240008 24849230 */  addiu     $a0, $a0, -0x6dd0
-/* D5743C 8024000C 3C058024 */  lui       $a1, 0x8024
-/* D57440 80240010 24A51430 */  addiu     $a1, $a1, 0x1430
+/* D57434 80240004 3C04800E */  lui       $a0, %hi(D_800D9230)
+/* D57438 80240008 24849230 */  addiu     $a0, $a0, %lo(D_800D9230)
+/* D5743C 8024000C 3C058024 */  lui       $a1, %hi(D_80241430)
+/* D57440 80240010 24A51430 */  addiu     $a1, $a1, %lo(D_80241430)
 /* D57444 80240014 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
 /* D57448 80240018 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
 /* D5744C 8024001C 24020001 */  addiu     $v0, $zero, 1
 /* D57450 80240020 AFBF0010 */  sw        $ra, 0x10($sp)
 /* D57454 80240024 0C01953C */  jal       sprintf
 /* D57458 80240028 A0620084 */   sb       $v0, 0x84($v1)
-/* D5745C 8024002C 3C04800E */  lui       $a0, 0x800e
-/* D57460 80240030 248491E0 */  addiu     $a0, $a0, -0x6e20
-/* D57464 80240034 3C058024 */  lui       $a1, 0x8024
+/* D5745C 8024002C 3C04800E */  lui       $a0, %hi(D_800D91E0)
+/* D57460 80240030 248491E0 */  addiu     $a0, $a0, %lo(D_800D91E0)
+/* D57464 80240034 3C058024 */  lui       $a1, %hi(D_80241440)
 /* D57468 80240038 0C01953C */  jal       sprintf
-/* D5746C 8024003C 24A51440 */   addiu    $a1, $a1, 0x1440
+/* D5746C 8024003C 24A51440 */   addiu    $a1, $a1, %lo(D_80241440)
 /* D57470 80240040 8FBF0010 */  lw        $ra, 0x10($sp)
 /* D57474 80240044 0000102D */  daddu     $v0, $zero, $zero
 /* D57478 80240048 03E00008 */  jr        $ra
diff --git a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_8024011C_D5754C.s b/asm/nonmatchings/world/area_pra/pra_06/D57430/func_8024011C_D5754C.s
index 673d8b0aa6..d830d6c6b5 100644
--- a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_8024011C_D5754C.s
+++ b/asm/nonmatchings/world/area_pra/pra_06/D57430/func_8024011C_D5754C.s
@@ -5,8 +5,8 @@ glabel func_8024011C_D5754C
 /* D5754C 8024011C 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* D57550 80240120 AFB00010 */  sw        $s0, 0x10($sp)
 /* D57554 80240124 0080802D */  daddu     $s0, $a0, $zero
-/* D57558 80240128 3C058024 */  lui       $a1, 0x8024
-/* D5755C 8024012C 24A50158 */  addiu     $a1, $a1, 0x158
+/* D57558 80240128 3C058024 */  lui       $a1, %hi(D_80240158)
+/* D5755C 8024012C 24A50158 */  addiu     $a1, $a1, %lo(D_80240158)
 /* D57560 80240130 AFBF0014 */  sw        $ra, 0x14($sp)
 /* D57564 80240134 0C048C56 */  jal       bind_dynamic_entity_3
 /* D57568 80240138 0000202D */   daddu    $a0, $zero, $zero
diff --git a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240158_D57588.s b/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240158_D57588.s
index 81305f1019..cf31927fd3 100644
--- a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240158_D57588.s
+++ b/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240158_D57588.s
@@ -29,8 +29,8 @@ glabel func_80240158_D57588
 /* D575E8 802401B8 27A20034 */  addiu     $v0, $sp, 0x34
 /* D575EC 802401BC AFA20014 */  sw        $v0, 0x14($sp)
 /* D575F0 802401C0 C6000030 */  lwc1      $f0, 0x30($s0)
-/* D575F4 802401C4 3C04800A */  lui       $a0, 0x800a
-/* D575F8 802401C8 8484A634 */  lh        $a0, -0x59cc($a0)
+/* D575F4 802401C4 3C04800A */  lui       $a0, %hi(D_8009A634)
+/* D575F8 802401C8 8484A634 */  lh        $a0, %lo(D_8009A634)($a0)
 /* D575FC 802401CC 46000007 */  neg.s     $f0, $f0
 /* D57600 802401D0 44070000 */  mfc1      $a3, $f0
 /* D57604 802401D4 27A20038 */  addiu     $v0, $sp, 0x38
@@ -67,8 +67,8 @@ glabel func_80240158_D57588
 /* D5767C 8024024C 54400022 */  bnel      $v0, $zero, .L802402D8
 /* D57680 80240250 24110011 */   addiu    $s1, $zero, 0x11
 /* D57684 80240254 9203000E */  lbu       $v1, 0xe($s0)
-/* D57688 80240258 3C02802E */  lui       $v0, 0x802e
-/* D5768C 8024025C 90429D70 */  lbu       $v0, -0x6290($v0)
+/* D57688 80240258 3C02802E */  lui       $v0, %hi(D_802D9D70)
+/* D5768C 8024025C 90429D70 */  lbu       $v0, %lo(D_802D9D70)($v0)
 /* D57690 80240260 10620018 */  beq       $v1, $v0, .L802402C4
 /* D57694 80240264 2C6200FE */   sltiu    $v0, $v1, 0xfe
 /* D57698 80240268 1040000B */  beqz      $v0, .L80240298
@@ -98,20 +98,20 @@ glabel func_80240158_D57588
 /* D576F0 802402C0 00000000 */   nop      
 .L802402C4:
 /* D576F4 802402C4 9202000E */  lbu       $v0, 0xe($s0)
-/* D576F8 802402C8 3C01802E */  lui       $at, 0x802e
-/* D576FC 802402CC A0229D70 */  sb        $v0, -0x6290($at)
+/* D576F8 802402C8 3C01802E */  lui       $at, %hi(D_802D9D70)
+/* D576FC 802402CC A0229D70 */  sb        $v0, %lo(D_802D9D70)($at)
 /* D57700 802402D0 080900B9 */  j         .L802402E4
 /* D57704 802402D4 0240202D */   daddu    $a0, $s2, $zero
 .L802402D8:
-/* D57708 802402D8 3C01802E */  lui       $at, 0x802e
-/* D5770C 802402DC A0209D70 */  sb        $zero, -0x6290($at)
+/* D57708 802402D8 3C01802E */  lui       $at, %hi(D_802D9D70)
+/* D5770C 802402DC A0209D70 */  sb        $zero, %lo(D_802D9D70)($at)
 /* D57710 802402E0 0240202D */  daddu     $a0, $s2, $zero
 .L802402E4:
 /* D57714 802402E4 AC910000 */  sw        $s1, ($a0)
 /* D57718 802402E8 AC900008 */  sw        $s0, 8($a0)
 /* D5771C 802402EC 8FA20038 */  lw        $v0, 0x38($sp)
-/* D57720 802402F0 3C038024 */  lui       $v1, 0x8024
-/* D57724 802402F4 24630320 */  addiu     $v1, $v1, 0x320
+/* D57720 802402F0 3C038024 */  lui       $v1, %hi(D_80240320)
+/* D57724 802402F4 24630320 */  addiu     $v1, $v1, %lo(D_80240320)
 /* D57728 802402F8 AC83000C */  sw        $v1, 0xc($a0)
 /* D5772C 802402FC 00021023 */  negu      $v0, $v0
 /* D57730 80240300 0C047644 */  jal       queue_render_task
diff --git a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240320_D57750.s b/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240320_D57750.s
index 693a422519..8fad80f8e1 100644
--- a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240320_D57750.s
+++ b/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240320_D57750.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80240320_D57750
-/* D57750 80240320 3C03800A */  lui       $v1, 0x800a
-/* D57754 80240324 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D57750 80240320 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D57754 80240324 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D57758 80240328 3C07BF80 */  lui       $a3, 0xbf80
 /* D5775C 8024032C 27BDFEC0 */  addiu     $sp, $sp, -0x140
 /* D57760 80240330 F7B40128 */  sdc1      $f20, 0x128($sp)
@@ -22,9 +22,9 @@ glabel func_80240320_D57750
 /* D57794 80240364 000218C0 */  sll       $v1, $v0, 3
 /* D57798 80240368 00431021 */  addu      $v0, $v0, $v1
 /* D5779C 8024036C 000210C0 */  sll       $v0, $v0, 3
-/* D577A0 80240370 3C01800B */  lui       $at, 0x800b
+/* D577A0 80240370 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* D577A4 80240374 00220821 */  addu      $at, $at, $v0
-/* D577A8 80240378 C4361DEC */  lwc1      $f22, 0x1dec($at)
+/* D577A8 80240378 C4361DEC */  lwc1      $f22, %lo(D_800B1DEC)($at)
 /* D577AC 8024037C 4406A000 */  mfc1      $a2, $f20
 /* D577B0 80240380 4600B587 */  neg.s     $f22, $f22
 /* D577B4 80240384 4405B000 */  mfc1      $a1, $f22
diff --git a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_802404CC_D578FC.s b/asm/nonmatchings/world/area_pra/pra_06/D57430/func_802404CC_D578FC.s
index a0c0ec47dc..353a1146eb 100644
--- a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_802404CC_D578FC.s
+++ b/asm/nonmatchings/world/area_pra/pra_06/D57430/func_802404CC_D578FC.s
@@ -11,8 +11,8 @@ glabel func_802404CC_D578FC
 /* D57914 802404E4 28420002 */   slti     $v0, $v0, 2
 /* D57918 802404E8 1040000C */  beqz      $v0, .L8024051C
 /* D5791C 802404EC 00000000 */   nop      
-/* D57920 802404F0 3C058024 */  lui       $a1, 0x8024
-/* D57924 802404F4 24A50530 */  addiu     $a1, $a1, 0x530
+/* D57920 802404F0 3C058024 */  lui       $a1, %hi(D_80240530)
+/* D57924 802404F4 24A50530 */  addiu     $a1, $a1, %lo(D_80240530)
 /* D57928 802404F8 0C048C56 */  jal       bind_dynamic_entity_3
 /* D5792C 802404FC 0000202D */   daddu    $a0, $zero, $zero
 /* D57930 80240500 8E03013C */  lw        $v1, 0x13c($s0)
diff --git a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240530_D57960.s b/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240530_D57960.s
index dbadf9de89..36c135bf05 100644
--- a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240530_D57960.s
+++ b/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240530_D57960.s
@@ -28,8 +28,8 @@ glabel func_80240530_D57960
 /* D579BC 8024058C 27A20038 */  addiu     $v0, $sp, 0x38
 /* D579C0 80240590 AFA20018 */  sw        $v0, 0x18($sp)
 /* D579C4 80240594 C600002C */  lwc1      $f0, 0x2c($s0)
-/* D579C8 80240598 3C04800A */  lui       $a0, 0x800a
-/* D579CC 8024059C 8484A634 */  lh        $a0, -0x59cc($a0)
+/* D579C8 80240598 3C04800A */  lui       $a0, %hi(D_8009A634)
+/* D579CC 8024059C 8484A634 */  lh        $a0, %lo(D_8009A634)($a0)
 /* D579D0 802405A0 46000007 */  neg.s     $f0, $f0
 /* D579D4 802405A4 44060000 */  mfc1      $a2, $f0
 /* D579D8 802405A8 0C00B94E */  jal       get_screen_coords
@@ -44,8 +44,8 @@ glabel func_80240530_D57960
 /* D579FC 802405CC 54400022 */  bnel      $v0, $zero, .L80240658
 /* D57A00 802405D0 24120011 */   addiu    $s2, $zero, 0x11
 /* D57A04 802405D4 9203000E */  lbu       $v1, 0xe($s0)
-/* D57A08 802405D8 3C02802E */  lui       $v0, 0x802e
-/* D57A0C 802405DC 90429D71 */  lbu       $v0, -0x628f($v0)
+/* D57A08 802405D8 3C02802E */  lui       $v0, %hi(D_802D9D71)
+/* D57A0C 802405DC 90429D71 */  lbu       $v0, %lo(D_802D9D71)($v0)
 /* D57A10 802405E0 10620018 */  beq       $v1, $v0, .L80240644
 /* D57A14 802405E4 2C6200FE */   sltiu    $v0, $v1, 0xfe
 /* D57A18 802405E8 1040000B */  beqz      $v0, .L80240618
@@ -75,17 +75,17 @@ glabel func_80240530_D57960
 /* D57A70 80240640 00000000 */   nop      
 .L80240644:
 /* D57A74 80240644 9202000E */  lbu       $v0, 0xe($s0)
-/* D57A78 80240648 3C01802E */  lui       $at, 0x802e
-/* D57A7C 8024064C A0229D71 */  sb        $v0, -0x628f($at)
+/* D57A78 80240648 3C01802E */  lui       $at, %hi(D_802D9D71)
+/* D57A7C 8024064C A0229D71 */  sb        $v0, %lo(D_802D9D71)($at)
 /* D57A80 80240650 08090198 */  j         .L80240660
 /* D57A84 80240654 00000000 */   nop      
 .L80240658:
-/* D57A88 80240658 3C01802E */  lui       $at, 0x802e
-/* D57A8C 8024065C A0209D71 */  sb        $zero, -0x628f($at)
+/* D57A88 80240658 3C01802E */  lui       $at, %hi(D_802D9D71)
+/* D57A8C 8024065C A0209D71 */  sb        $zero, %lo(D_802D9D71)($at)
 .L80240660:
 /* D57A90 80240660 8FA20038 */  lw        $v0, 0x38($sp)
-/* D57A94 80240664 3C048024 */  lui       $a0, 0x8024
-/* D57A98 80240668 248408A0 */  addiu     $a0, $a0, 0x8a0
+/* D57A94 80240664 3C048024 */  lui       $a0, %hi(D_802408A0)
+/* D57A98 80240668 248408A0 */  addiu     $a0, $a0, %lo(D_802408A0)
 /* D57A9C 8024066C AE320000 */  sw        $s2, ($s1)
 /* D57AA0 80240670 AE300008 */  sw        $s0, 8($s1)
 /* D57AA4 80240674 00021023 */  negu      $v0, $v0
@@ -95,8 +95,8 @@ glabel func_80240530_D57960
 /* D57AB4 80240684 00431024 */  and       $v0, $v0, $v1
 /* D57AB8 80240688 54400004 */  bnel      $v0, $zero, .L8024069C
 /* D57ABC 8024068C AE24000C */   sw       $a0, 0xc($s1)
-/* D57AC0 80240690 3C048024 */  lui       $a0, 0x8024
-/* D57AC4 80240694 248406BC */  addiu     $a0, $a0, 0x6bc
+/* D57AC0 80240690 3C048024 */  lui       $a0, %hi(D_802406BC)
+/* D57AC4 80240694 248406BC */  addiu     $a0, $a0, %lo(D_802406BC)
 /* D57AC8 80240698 AE24000C */  sw        $a0, 0xc($s1)
 .L8024069C:
 /* D57ACC 8024069C 0C047644 */  jal       queue_render_task
diff --git a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_802406BC_D57AEC.s b/asm/nonmatchings/world/area_pra/pra_06/D57430/func_802406BC_D57AEC.s
index 4b31282e74..dbaf01a844 100644
--- a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_802406BC_D57AEC.s
+++ b/asm/nonmatchings/world/area_pra/pra_06/D57430/func_802406BC_D57AEC.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_802406BC_D57AEC
-/* D57AEC 802406BC 3C03800A */  lui       $v1, 0x800a
-/* D57AF0 802406C0 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D57AEC 802406BC 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D57AF0 802406C0 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D57AF4 802406C4 3C07BF80 */  lui       $a3, 0xbf80
 /* D57AF8 802406C8 27BDFEC0 */  addiu     $sp, $sp, -0x140
 /* D57AFC 802406CC F7B40128 */  sdc1      $f20, 0x128($sp)
@@ -22,9 +22,9 @@ glabel func_802406BC_D57AEC
 /* D57B30 80240700 000218C0 */  sll       $v1, $v0, 3
 /* D57B34 80240704 00431021 */  addu      $v0, $v0, $v1
 /* D57B38 80240708 000210C0 */  sll       $v0, $v0, 3
-/* D57B3C 8024070C 3C01800B */  lui       $at, 0x800b
+/* D57B3C 8024070C 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* D57B40 80240710 00220821 */  addu      $at, $at, $v0
-/* D57B44 80240714 C4361DEC */  lwc1      $f22, 0x1dec($at)
+/* D57B44 80240714 C4361DEC */  lwc1      $f22, %lo(D_800B1DEC)($at)
 /* D57B48 80240718 4406A000 */  mfc1      $a2, $f20
 /* D57B4C 8024071C 4600B587 */  neg.s     $f22, $f22
 /* D57B50 80240720 4405B000 */  mfc1      $a1, $f22
diff --git a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_802408A0_D57CD0.s b/asm/nonmatchings/world/area_pra/pra_06/D57430/func_802408A0_D57CD0.s
index f793ebd9a2..2417ca0482 100644
--- a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_802408A0_D57CD0.s
+++ b/asm/nonmatchings/world/area_pra/pra_06/D57430/func_802408A0_D57CD0.s
@@ -27,8 +27,8 @@ glabel func_802408A0_D57CD0
 /* D57D28 802408F8 F7B80160 */  sdc1      $f24, 0x160($sp)
 /* D57D2C 802408FC F7B40150 */  sdc1      $f20, 0x150($sp)
 .L80240900:
-/* D57D30 80240900 3C03800A */  lui       $v1, 0x800a
-/* D57D34 80240904 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D57D30 80240900 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D57D34 80240904 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D57D38 80240908 00031080 */  sll       $v0, $v1, 2
 /* D57D3C 8024090C 00431021 */  addu      $v0, $v0, $v1
 /* D57D40 80240910 00021080 */  sll       $v0, $v0, 2
diff --git a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240D6C_D5819C.s b/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240D6C_D5819C.s
index 0fef7a95b6..a66d5cce59 100644
--- a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240D6C_D5819C.s
+++ b/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240D6C_D5819C.s
@@ -25,13 +25,13 @@ glabel func_80240D6C_D5819C
 /* D581E8 80240DB8 08090384 */  j         .L80240E10
 /* D581EC 80240DBC 00000000 */   nop      
 .L80240DC0:
-/* D581F0 80240DC0 3C048024 */  lui       $a0, 0x8024
-/* D581F4 80240DC4 24840EB4 */  addiu     $a0, $a0, 0xeb4
+/* D581F0 80240DC0 3C048024 */  lui       $a0, %hi(D_80240EB4)
+/* D581F4 80240DC4 24840EB4 */  addiu     $a0, $a0, %lo(D_80240EB4)
 /* D581F8 80240DC8 08090380 */  j         .L80240E00
 /* D581FC 80240DCC 00000000 */   nop      
 .L80240DD0:
-/* D58200 80240DD0 3C048024 */  lui       $a0, 0x8024
-/* D58204 80240DD4 24840F1C */  addiu     $a0, $a0, 0xf1c
+/* D58200 80240DD0 3C048024 */  lui       $a0, %hi(D_80240F1C)
+/* D58204 80240DD4 24840F1C */  addiu     $a0, $a0, %lo(D_80240F1C)
 /* D58208 80240DD8 08090380 */  j         .L80240E00
 /* D5820C 80240DDC 00000000 */   nop      
 .L80240DE0:
@@ -42,8 +42,8 @@ glabel func_80240D6C_D5819C
 /* D58220 80240DF0 10400007 */  beqz      $v0, .L80240E10
 /* D58224 80240DF4 00000000 */   nop      
 .L80240DF8:
-/* D58228 80240DF8 3C048024 */  lui       $a0, 0x8024
-/* D5822C 80240DFC 24840EE8 */  addiu     $a0, $a0, 0xee8
+/* D58228 80240DF8 3C048024 */  lui       $a0, %hi(D_80240EE8)
+/* D5822C 80240DFC 24840EE8 */  addiu     $a0, $a0, %lo(D_80240EE8)
 .L80240E00:
 /* D58230 80240E00 0C048C56 */  jal       bind_dynamic_entity_3
 /* D58234 80240E04 0000282D */   daddu    $a1, $zero, $zero
diff --git a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_802400EC_D5897C.s b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_802400EC_D5897C.s
index 46756d7d45..ad0726a390 100644
--- a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_802400EC_D5897C.s
+++ b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_802400EC_D5897C.s
@@ -5,8 +5,8 @@ glabel func_802400EC_D5897C
 /* D5897C 802400EC 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* D58980 802400F0 AFB00010 */  sw        $s0, 0x10($sp)
 /* D58984 802400F4 0080802D */  daddu     $s0, $a0, $zero
-/* D58988 802400F8 3C058024 */  lui       $a1, 0x8024
-/* D5898C 802400FC 24A50128 */  addiu     $a1, $a1, 0x128
+/* D58988 802400F8 3C058024 */  lui       $a1, %hi(D_80240128)
+/* D5898C 802400FC 24A50128 */  addiu     $a1, $a1, %lo(D_80240128)
 /* D58990 80240100 AFBF0014 */  sw        $ra, 0x14($sp)
 /* D58994 80240104 0C048C56 */  jal       bind_dynamic_entity_3
 /* D58998 80240108 0000202D */   daddu    $a0, $zero, $zero
diff --git a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240128_D589B8.s b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240128_D589B8.s
index b9258f4dad..fc803e1b35 100644
--- a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240128_D589B8.s
+++ b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240128_D589B8.s
@@ -29,8 +29,8 @@ glabel func_80240128_D589B8
 /* D58A18 80240188 27A20034 */  addiu     $v0, $sp, 0x34
 /* D58A1C 8024018C AFA20014 */  sw        $v0, 0x14($sp)
 /* D58A20 80240190 C6000030 */  lwc1      $f0, 0x30($s0)
-/* D58A24 80240194 3C04800A */  lui       $a0, 0x800a
-/* D58A28 80240198 8484A634 */  lh        $a0, -0x59cc($a0)
+/* D58A24 80240194 3C04800A */  lui       $a0, %hi(D_8009A634)
+/* D58A28 80240198 8484A634 */  lh        $a0, %lo(D_8009A634)($a0)
 /* D58A2C 8024019C 46000007 */  neg.s     $f0, $f0
 /* D58A30 802401A0 44070000 */  mfc1      $a3, $f0
 /* D58A34 802401A4 27A20038 */  addiu     $v0, $sp, 0x38
@@ -67,8 +67,8 @@ glabel func_80240128_D589B8
 /* D58AAC 8024021C 54400022 */  bnel      $v0, $zero, .L802402A8
 /* D58AB0 80240220 24110011 */   addiu    $s1, $zero, 0x11
 /* D58AB4 80240224 9203000E */  lbu       $v1, 0xe($s0)
-/* D58AB8 80240228 3C02802E */  lui       $v0, 0x802e
-/* D58ABC 8024022C 90429D70 */  lbu       $v0, -0x6290($v0)
+/* D58AB8 80240228 3C02802E */  lui       $v0, %hi(D_802D9D70)
+/* D58ABC 8024022C 90429D70 */  lbu       $v0, %lo(D_802D9D70)($v0)
 /* D58AC0 80240230 10620018 */  beq       $v1, $v0, .L80240294
 /* D58AC4 80240234 2C6200FE */   sltiu    $v0, $v1, 0xfe
 /* D58AC8 80240238 1040000B */  beqz      $v0, .L80240268
@@ -98,20 +98,20 @@ glabel func_80240128_D589B8
 /* D58B20 80240290 00000000 */   nop      
 .L80240294:
 /* D58B24 80240294 9202000E */  lbu       $v0, 0xe($s0)
-/* D58B28 80240298 3C01802E */  lui       $at, 0x802e
-/* D58B2C 8024029C A0229D70 */  sb        $v0, -0x6290($at)
+/* D58B28 80240298 3C01802E */  lui       $at, %hi(D_802D9D70)
+/* D58B2C 8024029C A0229D70 */  sb        $v0, %lo(D_802D9D70)($at)
 /* D58B30 802402A0 080900AD */  j         .L802402B4
 /* D58B34 802402A4 0240202D */   daddu    $a0, $s2, $zero
 .L802402A8:
-/* D58B38 802402A8 3C01802E */  lui       $at, 0x802e
-/* D58B3C 802402AC A0209D70 */  sb        $zero, -0x6290($at)
+/* D58B38 802402A8 3C01802E */  lui       $at, %hi(D_802D9D70)
+/* D58B3C 802402AC A0209D70 */  sb        $zero, %lo(D_802D9D70)($at)
 /* D58B40 802402B0 0240202D */  daddu     $a0, $s2, $zero
 .L802402B4:
 /* D58B44 802402B4 AC910000 */  sw        $s1, ($a0)
 /* D58B48 802402B8 AC900008 */  sw        $s0, 8($a0)
 /* D58B4C 802402BC 8FA20038 */  lw        $v0, 0x38($sp)
-/* D58B50 802402C0 3C038024 */  lui       $v1, 0x8024
-/* D58B54 802402C4 246302F0 */  addiu     $v1, $v1, 0x2f0
+/* D58B50 802402C0 3C038024 */  lui       $v1, %hi(D_802402F0)
+/* D58B54 802402C4 246302F0 */  addiu     $v1, $v1, %lo(D_802402F0)
 /* D58B58 802402C8 AC83000C */  sw        $v1, 0xc($a0)
 /* D58B5C 802402CC 00021023 */  negu      $v0, $v0
 /* D58B60 802402D0 0C047644 */  jal       queue_render_task
diff --git a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_802402F0_D58B80.s b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_802402F0_D58B80.s
index 1bc0c7b517..65186ff0bc 100644
--- a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_802402F0_D58B80.s
+++ b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_802402F0_D58B80.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_802402F0_D58B80
-/* D58B80 802402F0 3C03800A */  lui       $v1, 0x800a
-/* D58B84 802402F4 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D58B80 802402F0 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D58B84 802402F4 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D58B88 802402F8 3C07BF80 */  lui       $a3, 0xbf80
 /* D58B8C 802402FC 27BDFEC0 */  addiu     $sp, $sp, -0x140
 /* D58B90 80240300 F7B40128 */  sdc1      $f20, 0x128($sp)
@@ -22,9 +22,9 @@ glabel func_802402F0_D58B80
 /* D58BC4 80240334 000218C0 */  sll       $v1, $v0, 3
 /* D58BC8 80240338 00431021 */  addu      $v0, $v0, $v1
 /* D58BCC 8024033C 000210C0 */  sll       $v0, $v0, 3
-/* D58BD0 80240340 3C01800B */  lui       $at, 0x800b
+/* D58BD0 80240340 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* D58BD4 80240344 00220821 */  addu      $at, $at, $v0
-/* D58BD8 80240348 C4361DEC */  lwc1      $f22, 0x1dec($at)
+/* D58BD8 80240348 C4361DEC */  lwc1      $f22, %lo(D_800B1DEC)($at)
 /* D58BDC 8024034C 4406A000 */  mfc1      $a2, $f20
 /* D58BE0 80240350 4600B587 */  neg.s     $f22, $f22
 /* D58BE4 80240354 4405B000 */  mfc1      $a1, $f22
diff --git a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_8024049C_D58D2C.s b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_8024049C_D58D2C.s
index 643cbbe92b..a441c2eea5 100644
--- a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_8024049C_D58D2C.s
+++ b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_8024049C_D58D2C.s
@@ -11,8 +11,8 @@ glabel func_8024049C_D58D2C
 /* D58D44 802404B4 28420002 */   slti     $v0, $v0, 2
 /* D58D48 802404B8 1040000C */  beqz      $v0, .L802404EC
 /* D58D4C 802404BC 00000000 */   nop      
-/* D58D50 802404C0 3C058024 */  lui       $a1, 0x8024
-/* D58D54 802404C4 24A50500 */  addiu     $a1, $a1, 0x500
+/* D58D50 802404C0 3C058024 */  lui       $a1, %hi(D_80240500)
+/* D58D54 802404C4 24A50500 */  addiu     $a1, $a1, %lo(D_80240500)
 /* D58D58 802404C8 0C048C56 */  jal       bind_dynamic_entity_3
 /* D58D5C 802404CC 0000202D */   daddu    $a0, $zero, $zero
 /* D58D60 802404D0 8E03013C */  lw        $v1, 0x13c($s0)
diff --git a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240500_D58D90.s b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240500_D58D90.s
index 7cd05385bc..36f7ac21ab 100644
--- a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240500_D58D90.s
+++ b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240500_D58D90.s
@@ -28,8 +28,8 @@ glabel func_80240500_D58D90
 /* D58DEC 8024055C 27A20038 */  addiu     $v0, $sp, 0x38
 /* D58DF0 80240560 AFA20018 */  sw        $v0, 0x18($sp)
 /* D58DF4 80240564 C600002C */  lwc1      $f0, 0x2c($s0)
-/* D58DF8 80240568 3C04800A */  lui       $a0, 0x800a
-/* D58DFC 8024056C 8484A634 */  lh        $a0, -0x59cc($a0)
+/* D58DF8 80240568 3C04800A */  lui       $a0, %hi(D_8009A634)
+/* D58DFC 8024056C 8484A634 */  lh        $a0, %lo(D_8009A634)($a0)
 /* D58E00 80240570 46000007 */  neg.s     $f0, $f0
 /* D58E04 80240574 44060000 */  mfc1      $a2, $f0
 /* D58E08 80240578 0C00B94E */  jal       get_screen_coords
@@ -44,8 +44,8 @@ glabel func_80240500_D58D90
 /* D58E2C 8024059C 54400022 */  bnel      $v0, $zero, .L80240628
 /* D58E30 802405A0 24120011 */   addiu    $s2, $zero, 0x11
 /* D58E34 802405A4 9203000E */  lbu       $v1, 0xe($s0)
-/* D58E38 802405A8 3C02802E */  lui       $v0, 0x802e
-/* D58E3C 802405AC 90429D71 */  lbu       $v0, -0x628f($v0)
+/* D58E38 802405A8 3C02802E */  lui       $v0, %hi(D_802D9D71)
+/* D58E3C 802405AC 90429D71 */  lbu       $v0, %lo(D_802D9D71)($v0)
 /* D58E40 802405B0 10620018 */  beq       $v1, $v0, .L80240614
 /* D58E44 802405B4 2C6200FE */   sltiu    $v0, $v1, 0xfe
 /* D58E48 802405B8 1040000B */  beqz      $v0, .L802405E8
@@ -75,17 +75,17 @@ glabel func_80240500_D58D90
 /* D58EA0 80240610 00000000 */   nop      
 .L80240614:
 /* D58EA4 80240614 9202000E */  lbu       $v0, 0xe($s0)
-/* D58EA8 80240618 3C01802E */  lui       $at, 0x802e
-/* D58EAC 8024061C A0229D71 */  sb        $v0, -0x628f($at)
+/* D58EA8 80240618 3C01802E */  lui       $at, %hi(D_802D9D71)
+/* D58EAC 8024061C A0229D71 */  sb        $v0, %lo(D_802D9D71)($at)
 /* D58EB0 80240620 0809018C */  j         .L80240630
 /* D58EB4 80240624 00000000 */   nop      
 .L80240628:
-/* D58EB8 80240628 3C01802E */  lui       $at, 0x802e
-/* D58EBC 8024062C A0209D71 */  sb        $zero, -0x628f($at)
+/* D58EB8 80240628 3C01802E */  lui       $at, %hi(D_802D9D71)
+/* D58EBC 8024062C A0209D71 */  sb        $zero, %lo(D_802D9D71)($at)
 .L80240630:
 /* D58EC0 80240630 8FA20038 */  lw        $v0, 0x38($sp)
-/* D58EC4 80240634 3C048024 */  lui       $a0, 0x8024
-/* D58EC8 80240638 24840870 */  addiu     $a0, $a0, 0x870
+/* D58EC4 80240634 3C048024 */  lui       $a0, %hi(D_80240870)
+/* D58EC8 80240638 24840870 */  addiu     $a0, $a0, %lo(D_80240870)
 /* D58ECC 8024063C AE320000 */  sw        $s2, ($s1)
 /* D58ED0 80240640 AE300008 */  sw        $s0, 8($s1)
 /* D58ED4 80240644 00021023 */  negu      $v0, $v0
@@ -95,8 +95,8 @@ glabel func_80240500_D58D90
 /* D58EE4 80240654 00431024 */  and       $v0, $v0, $v1
 /* D58EE8 80240658 54400004 */  bnel      $v0, $zero, .L8024066C
 /* D58EEC 8024065C AE24000C */   sw       $a0, 0xc($s1)
-/* D58EF0 80240660 3C048024 */  lui       $a0, 0x8024
-/* D58EF4 80240664 2484068C */  addiu     $a0, $a0, 0x68c
+/* D58EF0 80240660 3C048024 */  lui       $a0, %hi(D_8024068C)
+/* D58EF4 80240664 2484068C */  addiu     $a0, $a0, %lo(D_8024068C)
 /* D58EF8 80240668 AE24000C */  sw        $a0, 0xc($s1)
 .L8024066C:
 /* D58EFC 8024066C 0C047644 */  jal       queue_render_task
diff --git a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_8024068C_D58F1C.s b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_8024068C_D58F1C.s
index 9f97564348..1f2b03f571 100644
--- a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_8024068C_D58F1C.s
+++ b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_8024068C_D58F1C.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_8024068C_D58F1C
-/* D58F1C 8024068C 3C03800A */  lui       $v1, 0x800a
-/* D58F20 80240690 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D58F1C 8024068C 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D58F20 80240690 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D58F24 80240694 3C07BF80 */  lui       $a3, 0xbf80
 /* D58F28 80240698 27BDFEC0 */  addiu     $sp, $sp, -0x140
 /* D58F2C 8024069C F7B40128 */  sdc1      $f20, 0x128($sp)
@@ -22,9 +22,9 @@ glabel func_8024068C_D58F1C
 /* D58F60 802406D0 000218C0 */  sll       $v1, $v0, 3
 /* D58F64 802406D4 00431021 */  addu      $v0, $v0, $v1
 /* D58F68 802406D8 000210C0 */  sll       $v0, $v0, 3
-/* D58F6C 802406DC 3C01800B */  lui       $at, 0x800b
+/* D58F6C 802406DC 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* D58F70 802406E0 00220821 */  addu      $at, $at, $v0
-/* D58F74 802406E4 C4361DEC */  lwc1      $f22, 0x1dec($at)
+/* D58F74 802406E4 C4361DEC */  lwc1      $f22, %lo(D_800B1DEC)($at)
 /* D58F78 802406E8 4406A000 */  mfc1      $a2, $f20
 /* D58F7C 802406EC 4600B587 */  neg.s     $f22, $f22
 /* D58F80 802406F0 4405B000 */  mfc1      $a1, $f22
diff --git a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240870_D59100.s b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240870_D59100.s
index d775ed23e3..ad1bb42592 100644
--- a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240870_D59100.s
+++ b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240870_D59100.s
@@ -27,8 +27,8 @@ glabel func_80240870_D59100
 /* D59158 802408C8 F7B80160 */  sdc1      $f24, 0x160($sp)
 /* D5915C 802408CC F7B40150 */  sdc1      $f20, 0x150($sp)
 .L802408D0:
-/* D59160 802408D0 3C03800A */  lui       $v1, 0x800a
-/* D59164 802408D4 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D59160 802408D0 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D59164 802408D4 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D59168 802408D8 00031080 */  sll       $v0, $v1, 2
 /* D5916C 802408DC 00431021 */  addu      $v0, $v0, $v1
 /* D59170 802408E0 00021080 */  sll       $v0, $v0, 2
diff --git a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240D3C_D595CC.s b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240D3C_D595CC.s
index a29a878a5b..8875b4737f 100644
--- a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240D3C_D595CC.s
+++ b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240D3C_D595CC.s
@@ -25,13 +25,13 @@ glabel func_80240D3C_D595CC
 /* D59618 80240D88 08090378 */  j         .L80240DE0
 /* D5961C 80240D8C 00000000 */   nop      
 .L80240D90:
-/* D59620 80240D90 3C048024 */  lui       $a0, 0x8024
-/* D59624 80240D94 24840E84 */  addiu     $a0, $a0, 0xe84
+/* D59620 80240D90 3C048024 */  lui       $a0, %hi(D_80240E84)
+/* D59624 80240D94 24840E84 */  addiu     $a0, $a0, %lo(D_80240E84)
 /* D59628 80240D98 08090374 */  j         .L80240DD0
 /* D5962C 80240D9C 00000000 */   nop      
 .L80240DA0:
-/* D59630 80240DA0 3C048024 */  lui       $a0, 0x8024
-/* D59634 80240DA4 24840EEC */  addiu     $a0, $a0, 0xeec
+/* D59630 80240DA0 3C048024 */  lui       $a0, %hi(D_80240EEC)
+/* D59634 80240DA4 24840EEC */  addiu     $a0, $a0, %lo(D_80240EEC)
 /* D59638 80240DA8 08090374 */  j         .L80240DD0
 /* D5963C 80240DAC 00000000 */   nop      
 .L80240DB0:
@@ -42,8 +42,8 @@ glabel func_80240D3C_D595CC
 /* D59650 80240DC0 10400007 */  beqz      $v0, .L80240DE0
 /* D59654 80240DC4 00000000 */   nop      
 .L80240DC8:
-/* D59658 80240DC8 3C048024 */  lui       $a0, 0x8024
-/* D5965C 80240DCC 24840EB8 */  addiu     $a0, $a0, 0xeb8
+/* D59658 80240DC8 3C048024 */  lui       $a0, %hi(D_80240EB8)
+/* D5965C 80240DCC 24840EB8 */  addiu     $a0, $a0, %lo(D_80240EB8)
 .L80240DD0:
 /* D59660 80240DD0 0C048C56 */  jal       bind_dynamic_entity_3
 /* D59664 80240DD4 0000282D */   daddu    $a1, $zero, $zero
diff --git a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_8024114C_D599DC.s b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_8024114C_D599DC.s
index f40362ae2b..7074ae2071 100644
--- a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_8024114C_D599DC.s
+++ b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_8024114C_D599DC.s
@@ -6,11 +6,11 @@ glabel func_8024114C_D599DC
 /* D599E0 80241150 AFBF0010 */  sw        $ra, 0x10($sp)
 /* D599E4 80241154 10A00003 */  beqz      $a1, .L80241164
 /* D599E8 80241158 8C86000C */   lw       $a2, 0xc($a0)
-/* D599EC 8024115C 3C018024 */  lui       $at, 0x8024
-/* D599F0 80241160 AC201D98 */  sw        $zero, 0x1d98($at)
+/* D599EC 8024115C 3C018024 */  lui       $at, %hi(D_80241D98)
+/* D599F0 80241160 AC201D98 */  sw        $zero, %lo(D_80241D98)($at)
 .L80241164:
-/* D599F4 80241164 3C038024 */  lui       $v1, 0x8024
-/* D599F8 80241168 24631D98 */  addiu     $v1, $v1, 0x1d98
+/* D599F4 80241164 3C038024 */  lui       $v1, %hi(D_80241D98)
+/* D599F8 80241168 24631D98 */  addiu     $v1, $v1, %lo(D_80241D98)
 /* D599FC 8024116C 8C620000 */  lw        $v0, ($v1)
 /* D59A00 80241170 54400003 */  bnel      $v0, $zero, .L80241180
 /* D59A04 80241174 AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_8024114C_D599DC
 /* D59A0C 8024117C 0000102D */   daddu    $v0, $zero, $zero
 .L80241180:
 /* D59A10 80241180 8CC50000 */  lw        $a1, ($a2)
-/* D59A14 80241184 3C068024 */  lui       $a2, 0x8024
+/* D59A14 80241184 3C068024 */  lui       $a2, %hi(D_80241D9C)
 /* D59A18 80241188 0C0B2026 */  jal       set_variable
-/* D59A1C 8024118C 8CC61D9C */   lw       $a2, 0x1d9c($a2)
+/* D59A1C 8024118C 8CC61D9C */   lw       $a2, %lo(D_80241D9C)($a2)
 /* D59A20 80241190 24020002 */  addiu     $v0, $zero, 2
 .L80241194:
 /* D59A24 80241194 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_802411A0_D59A30.s b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_802411A0_D59A30.s
index d5016f54fe..f4df1b0a70 100644
--- a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_802411A0_D59A30.s
+++ b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_802411A0_D59A30.s
@@ -7,12 +7,12 @@ glabel func_802411A0_D59A30
 /* D59A38 802411A8 8C82000C */  lw        $v0, 0xc($a0)
 /* D59A3C 802411AC 0C0B1EAF */  jal       get_variable
 /* D59A40 802411B0 8C450000 */   lw       $a1, ($v0)
-/* D59A44 802411B4 3C018024 */  lui       $at, 0x8024
-/* D59A48 802411B8 AC221D9C */  sw        $v0, 0x1d9c($at)
+/* D59A44 802411B4 3C018024 */  lui       $at, %hi(D_80241D9C)
+/* D59A48 802411B8 AC221D9C */  sw        $v0, %lo(D_80241D9C)($at)
 /* D59A4C 802411BC 24020002 */  addiu     $v0, $zero, 2
 /* D59A50 802411C0 8FBF0010 */  lw        $ra, 0x10($sp)
 /* D59A54 802411C4 24030001 */  addiu     $v1, $zero, 1
-/* D59A58 802411C8 3C018024 */  lui       $at, 0x8024
-/* D59A5C 802411CC AC231D98 */  sw        $v1, 0x1d98($at)
+/* D59A58 802411C8 3C018024 */  lui       $at, %hi(D_80241D98)
+/* D59A5C 802411CC AC231D98 */  sw        $v1, %lo(D_80241D98)($at)
 /* D59A60 802411D0 03E00008 */  jr        $ra
 /* D59A64 802411D4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_802411D8_D59A68.s b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_802411D8_D59A68.s
index a11428f82b..431d8b0722 100644
--- a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_802411D8_D59A68.s
+++ b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_802411D8_D59A68.s
@@ -13,8 +13,8 @@ glabel func_802411D8_D59A68
 /* D59A88 802411F8 8C620000 */  lw        $v0, ($v1)
 /* D59A8C 802411FC 5040000A */  beql      $v0, $zero, .L80241228
 /* D59A90 80241200 00041080 */   sll      $v0, $a0, 2
-/* D59A94 80241204 3C058024 */  lui       $a1, 0x8024
-/* D59A98 80241208 24A56A20 */  addiu     $a1, $a1, 0x6a20
+/* D59A94 80241204 3C058024 */  lui       $a1, %hi(D_80246A20)
+/* D59A98 80241208 24A56A20 */  addiu     $a1, $a1, %lo(D_80246A20)
 .L8024120C:
 /* D59A9C 8024120C 24630004 */  addiu     $v1, $v1, 4
 /* D59AA0 80241210 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_802411D8_D59A68
 /* D59AB0 80241220 24A50004 */   addiu    $a1, $a1, 4
 /* D59AB4 80241224 00041080 */  sll       $v0, $a0, 2
 .L80241228:
-/* D59AB8 80241228 3C018024 */  lui       $at, 0x8024
+/* D59AB8 80241228 3C018024 */  lui       $at, %hi(D_80246A20)
 /* D59ABC 8024122C 00220821 */  addu      $at, $at, $v0
-/* D59AC0 80241230 AC206A20 */  sw        $zero, 0x6a20($at)
+/* D59AC0 80241230 AC206A20 */  sw        $zero, %lo(D_80246A20)($at)
 /* D59AC4 80241234 08090499 */  j         .L80241264
 /* D59AC8 80241238 00000000 */   nop      
 .L8024123C:
-/* D59ACC 8024123C 3C038024 */  lui       $v1, 0x8024
-/* D59AD0 80241240 24636A20 */  addiu     $v1, $v1, 0x6a20
+/* D59ACC 8024123C 3C038024 */  lui       $v1, %hi(D_80246A20)
+/* D59AD0 80241240 24636A20 */  addiu     $v1, $v1, %lo(D_80246A20)
 /* D59AD4 80241244 0060282D */  daddu     $a1, $v1, $zero
 .L80241248:
 /* D59AD8 80241248 24820010 */  addiu     $v0, $a0, 0x10
diff --git a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80241274_D59B04.s b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80241274_D59B04.s
index 8f53f196ea..8d5d71e351 100644
--- a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80241274_D59B04.s
+++ b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80241274_D59B04.s
@@ -13,8 +13,8 @@ glabel func_80241274_D59B04
 /* D59B24 80241294 8C620000 */  lw        $v0, ($v1)
 /* D59B28 80241298 5040000A */  beql      $v0, $zero, .L802412C4
 /* D59B2C 8024129C 00041080 */   sll      $v0, $a0, 2
-/* D59B30 802412A0 3C058024 */  lui       $a1, 0x8024
-/* D59B34 802412A4 24A56BE8 */  addiu     $a1, $a1, 0x6be8
+/* D59B30 802412A0 3C058024 */  lui       $a1, %hi(D_80246BE8)
+/* D59B34 802412A4 24A56BE8 */  addiu     $a1, $a1, %lo(D_80246BE8)
 .L802412A8:
 /* D59B38 802412A8 24630004 */  addiu     $v1, $v1, 4
 /* D59B3C 802412AC 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_80241274_D59B04
 /* D59B4C 802412BC 24A50004 */   addiu    $a1, $a1, 4
 /* D59B50 802412C0 00041080 */  sll       $v0, $a0, 2
 .L802412C4:
-/* D59B54 802412C4 3C018024 */  lui       $at, 0x8024
+/* D59B54 802412C4 3C018024 */  lui       $at, %hi(D_80246BE8)
 /* D59B58 802412C8 00220821 */  addu      $at, $at, $v0
-/* D59B5C 802412CC AC206BE8 */  sw        $zero, 0x6be8($at)
+/* D59B5C 802412CC AC206BE8 */  sw        $zero, %lo(D_80246BE8)($at)
 /* D59B60 802412D0 080904C0 */  j         .L80241300
 /* D59B64 802412D4 00000000 */   nop      
 .L802412D8:
-/* D59B68 802412D8 3C038024 */  lui       $v1, 0x8024
-/* D59B6C 802412DC 24636BE8 */  addiu     $v1, $v1, 0x6be8
+/* D59B68 802412D8 3C038024 */  lui       $v1, %hi(D_80246BE8)
+/* D59B6C 802412DC 24636BE8 */  addiu     $v1, $v1, %lo(D_80246BE8)
 /* D59B70 802412E0 0060282D */  daddu     $a1, $v1, $zero
 .L802412E4:
 /* D59B74 802412E4 24820080 */  addiu     $v0, $a0, 0x80
diff --git a/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_802400EC_D5F39C.s b/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_802400EC_D5F39C.s
index 6783e0d425..646b5de5d7 100644
--- a/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_802400EC_D5F39C.s
+++ b/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_802400EC_D5F39C.s
@@ -5,8 +5,8 @@ glabel func_802400EC_D5F39C
 /* D5F39C 802400EC 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* D5F3A0 802400F0 AFB00010 */  sw        $s0, 0x10($sp)
 /* D5F3A4 802400F4 0080802D */  daddu     $s0, $a0, $zero
-/* D5F3A8 802400F8 3C058024 */  lui       $a1, 0x8024
-/* D5F3AC 802400FC 24A50128 */  addiu     $a1, $a1, 0x128
+/* D5F3A8 802400F8 3C058024 */  lui       $a1, %hi(D_80240128)
+/* D5F3AC 802400FC 24A50128 */  addiu     $a1, $a1, %lo(D_80240128)
 /* D5F3B0 80240100 AFBF0014 */  sw        $ra, 0x14($sp)
 /* D5F3B4 80240104 0C048C56 */  jal       bind_dynamic_entity_3
 /* D5F3B8 80240108 0000202D */   daddu    $a0, $zero, $zero
diff --git a/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240128_D5F3D8.s b/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240128_D5F3D8.s
index 5a904f6e69..b5dac58b14 100644
--- a/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240128_D5F3D8.s
+++ b/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240128_D5F3D8.s
@@ -29,8 +29,8 @@ glabel func_80240128_D5F3D8
 /* D5F438 80240188 27A20034 */  addiu     $v0, $sp, 0x34
 /* D5F43C 8024018C AFA20014 */  sw        $v0, 0x14($sp)
 /* D5F440 80240190 C6000030 */  lwc1      $f0, 0x30($s0)
-/* D5F444 80240194 3C04800A */  lui       $a0, 0x800a
-/* D5F448 80240198 8484A634 */  lh        $a0, -0x59cc($a0)
+/* D5F444 80240194 3C04800A */  lui       $a0, %hi(D_8009A634)
+/* D5F448 80240198 8484A634 */  lh        $a0, %lo(D_8009A634)($a0)
 /* D5F44C 8024019C 46000007 */  neg.s     $f0, $f0
 /* D5F450 802401A0 44070000 */  mfc1      $a3, $f0
 /* D5F454 802401A4 27A20038 */  addiu     $v0, $sp, 0x38
@@ -67,8 +67,8 @@ glabel func_80240128_D5F3D8
 /* D5F4CC 8024021C 54400022 */  bnel      $v0, $zero, .L802402A8
 /* D5F4D0 80240220 24110011 */   addiu    $s1, $zero, 0x11
 /* D5F4D4 80240224 9203000E */  lbu       $v1, 0xe($s0)
-/* D5F4D8 80240228 3C02802E */  lui       $v0, 0x802e
-/* D5F4DC 8024022C 90429D70 */  lbu       $v0, -0x6290($v0)
+/* D5F4D8 80240228 3C02802E */  lui       $v0, %hi(D_802D9D70)
+/* D5F4DC 8024022C 90429D70 */  lbu       $v0, %lo(D_802D9D70)($v0)
 /* D5F4E0 80240230 10620018 */  beq       $v1, $v0, .L80240294
 /* D5F4E4 80240234 2C6200FE */   sltiu    $v0, $v1, 0xfe
 /* D5F4E8 80240238 1040000B */  beqz      $v0, .L80240268
@@ -98,20 +98,20 @@ glabel func_80240128_D5F3D8
 /* D5F540 80240290 00000000 */   nop      
 .L80240294:
 /* D5F544 80240294 9202000E */  lbu       $v0, 0xe($s0)
-/* D5F548 80240298 3C01802E */  lui       $at, 0x802e
-/* D5F54C 8024029C A0229D70 */  sb        $v0, -0x6290($at)
+/* D5F548 80240298 3C01802E */  lui       $at, %hi(D_802D9D70)
+/* D5F54C 8024029C A0229D70 */  sb        $v0, %lo(D_802D9D70)($at)
 /* D5F550 802402A0 080900AD */  j         .L802402B4
 /* D5F554 802402A4 0240202D */   daddu    $a0, $s2, $zero
 .L802402A8:
-/* D5F558 802402A8 3C01802E */  lui       $at, 0x802e
-/* D5F55C 802402AC A0209D70 */  sb        $zero, -0x6290($at)
+/* D5F558 802402A8 3C01802E */  lui       $at, %hi(D_802D9D70)
+/* D5F55C 802402AC A0209D70 */  sb        $zero, %lo(D_802D9D70)($at)
 /* D5F560 802402B0 0240202D */  daddu     $a0, $s2, $zero
 .L802402B4:
 /* D5F564 802402B4 AC910000 */  sw        $s1, ($a0)
 /* D5F568 802402B8 AC900008 */  sw        $s0, 8($a0)
 /* D5F56C 802402BC 8FA20038 */  lw        $v0, 0x38($sp)
-/* D5F570 802402C0 3C038024 */  lui       $v1, 0x8024
-/* D5F574 802402C4 246302F0 */  addiu     $v1, $v1, 0x2f0
+/* D5F570 802402C0 3C038024 */  lui       $v1, %hi(D_802402F0)
+/* D5F574 802402C4 246302F0 */  addiu     $v1, $v1, %lo(D_802402F0)
 /* D5F578 802402C8 AC83000C */  sw        $v1, 0xc($a0)
 /* D5F57C 802402CC 00021023 */  negu      $v0, $v0
 /* D5F580 802402D0 0C047644 */  jal       queue_render_task
diff --git a/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_802402F0_D5F5A0.s b/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_802402F0_D5F5A0.s
index 3965020246..ef1ef2e1ac 100644
--- a/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_802402F0_D5F5A0.s
+++ b/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_802402F0_D5F5A0.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_802402F0_D5F5A0
-/* D5F5A0 802402F0 3C03800A */  lui       $v1, 0x800a
-/* D5F5A4 802402F4 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D5F5A0 802402F0 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D5F5A4 802402F4 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D5F5A8 802402F8 3C07BF80 */  lui       $a3, 0xbf80
 /* D5F5AC 802402FC 27BDFEC0 */  addiu     $sp, $sp, -0x140
 /* D5F5B0 80240300 F7B40128 */  sdc1      $f20, 0x128($sp)
@@ -22,9 +22,9 @@ glabel func_802402F0_D5F5A0
 /* D5F5E4 80240334 000218C0 */  sll       $v1, $v0, 3
 /* D5F5E8 80240338 00431021 */  addu      $v0, $v0, $v1
 /* D5F5EC 8024033C 000210C0 */  sll       $v0, $v0, 3
-/* D5F5F0 80240340 3C01800B */  lui       $at, 0x800b
+/* D5F5F0 80240340 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* D5F5F4 80240344 00220821 */  addu      $at, $at, $v0
-/* D5F5F8 80240348 C4361DEC */  lwc1      $f22, 0x1dec($at)
+/* D5F5F8 80240348 C4361DEC */  lwc1      $f22, %lo(D_800B1DEC)($at)
 /* D5F5FC 8024034C 4406A000 */  mfc1      $a2, $f20
 /* D5F600 80240350 4600B587 */  neg.s     $f22, $f22
 /* D5F604 80240354 4405B000 */  mfc1      $a1, $f22
diff --git a/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_8024049C_D5F74C.s b/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_8024049C_D5F74C.s
index d67a1d17f4..7291f46b88 100644
--- a/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_8024049C_D5F74C.s
+++ b/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_8024049C_D5F74C.s
@@ -11,8 +11,8 @@ glabel func_8024049C_D5F74C
 /* D5F764 802404B4 28420002 */   slti     $v0, $v0, 2
 /* D5F768 802404B8 1040000C */  beqz      $v0, .L802404EC
 /* D5F76C 802404BC 00000000 */   nop      
-/* D5F770 802404C0 3C058024 */  lui       $a1, 0x8024
-/* D5F774 802404C4 24A50500 */  addiu     $a1, $a1, 0x500
+/* D5F770 802404C0 3C058024 */  lui       $a1, %hi(D_80240500)
+/* D5F774 802404C4 24A50500 */  addiu     $a1, $a1, %lo(D_80240500)
 /* D5F778 802404C8 0C048C56 */  jal       bind_dynamic_entity_3
 /* D5F77C 802404CC 0000202D */   daddu    $a0, $zero, $zero
 /* D5F780 802404D0 8E03013C */  lw        $v1, 0x13c($s0)
diff --git a/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240500_D5F7B0.s b/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240500_D5F7B0.s
index fc3e983c46..0dabd451e7 100644
--- a/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240500_D5F7B0.s
+++ b/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240500_D5F7B0.s
@@ -28,8 +28,8 @@ glabel func_80240500_D5F7B0
 /* D5F80C 8024055C 27A20038 */  addiu     $v0, $sp, 0x38
 /* D5F810 80240560 AFA20018 */  sw        $v0, 0x18($sp)
 /* D5F814 80240564 C600002C */  lwc1      $f0, 0x2c($s0)
-/* D5F818 80240568 3C04800A */  lui       $a0, 0x800a
-/* D5F81C 8024056C 8484A634 */  lh        $a0, -0x59cc($a0)
+/* D5F818 80240568 3C04800A */  lui       $a0, %hi(D_8009A634)
+/* D5F81C 8024056C 8484A634 */  lh        $a0, %lo(D_8009A634)($a0)
 /* D5F820 80240570 46000007 */  neg.s     $f0, $f0
 /* D5F824 80240574 44060000 */  mfc1      $a2, $f0
 /* D5F828 80240578 0C00B94E */  jal       get_screen_coords
@@ -44,8 +44,8 @@ glabel func_80240500_D5F7B0
 /* D5F84C 8024059C 54400022 */  bnel      $v0, $zero, .L80240628
 /* D5F850 802405A0 24120011 */   addiu    $s2, $zero, 0x11
 /* D5F854 802405A4 9203000E */  lbu       $v1, 0xe($s0)
-/* D5F858 802405A8 3C02802E */  lui       $v0, 0x802e
-/* D5F85C 802405AC 90429D71 */  lbu       $v0, -0x628f($v0)
+/* D5F858 802405A8 3C02802E */  lui       $v0, %hi(D_802D9D71)
+/* D5F85C 802405AC 90429D71 */  lbu       $v0, %lo(D_802D9D71)($v0)
 /* D5F860 802405B0 10620018 */  beq       $v1, $v0, .L80240614
 /* D5F864 802405B4 2C6200FE */   sltiu    $v0, $v1, 0xfe
 /* D5F868 802405B8 1040000B */  beqz      $v0, .L802405E8
@@ -75,17 +75,17 @@ glabel func_80240500_D5F7B0
 /* D5F8C0 80240610 00000000 */   nop      
 .L80240614:
 /* D5F8C4 80240614 9202000E */  lbu       $v0, 0xe($s0)
-/* D5F8C8 80240618 3C01802E */  lui       $at, 0x802e
-/* D5F8CC 8024061C A0229D71 */  sb        $v0, -0x628f($at)
+/* D5F8C8 80240618 3C01802E */  lui       $at, %hi(D_802D9D71)
+/* D5F8CC 8024061C A0229D71 */  sb        $v0, %lo(D_802D9D71)($at)
 /* D5F8D0 80240620 0809018C */  j         .L80240630
 /* D5F8D4 80240624 00000000 */   nop      
 .L80240628:
-/* D5F8D8 80240628 3C01802E */  lui       $at, 0x802e
-/* D5F8DC 8024062C A0209D71 */  sb        $zero, -0x628f($at)
+/* D5F8D8 80240628 3C01802E */  lui       $at, %hi(D_802D9D71)
+/* D5F8DC 8024062C A0209D71 */  sb        $zero, %lo(D_802D9D71)($at)
 .L80240630:
 /* D5F8E0 80240630 8FA20038 */  lw        $v0, 0x38($sp)
-/* D5F8E4 80240634 3C048024 */  lui       $a0, 0x8024
-/* D5F8E8 80240638 24840870 */  addiu     $a0, $a0, 0x870
+/* D5F8E4 80240634 3C048024 */  lui       $a0, %hi(D_80240870)
+/* D5F8E8 80240638 24840870 */  addiu     $a0, $a0, %lo(D_80240870)
 /* D5F8EC 8024063C AE320000 */  sw        $s2, ($s1)
 /* D5F8F0 80240640 AE300008 */  sw        $s0, 8($s1)
 /* D5F8F4 80240644 00021023 */  negu      $v0, $v0
@@ -95,8 +95,8 @@ glabel func_80240500_D5F7B0
 /* D5F904 80240654 00431024 */  and       $v0, $v0, $v1
 /* D5F908 80240658 54400004 */  bnel      $v0, $zero, .L8024066C
 /* D5F90C 8024065C AE24000C */   sw       $a0, 0xc($s1)
-/* D5F910 80240660 3C048024 */  lui       $a0, 0x8024
-/* D5F914 80240664 2484068C */  addiu     $a0, $a0, 0x68c
+/* D5F910 80240660 3C048024 */  lui       $a0, %hi(D_8024068C)
+/* D5F914 80240664 2484068C */  addiu     $a0, $a0, %lo(D_8024068C)
 /* D5F918 80240668 AE24000C */  sw        $a0, 0xc($s1)
 .L8024066C:
 /* D5F91C 8024066C 0C047644 */  jal       queue_render_task
diff --git a/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_8024068C_D5F93C.s b/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_8024068C_D5F93C.s
index dbd730943b..608f5b96e8 100644
--- a/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_8024068C_D5F93C.s
+++ b/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_8024068C_D5F93C.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_8024068C_D5F93C
-/* D5F93C 8024068C 3C03800A */  lui       $v1, 0x800a
-/* D5F940 80240690 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D5F93C 8024068C 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D5F940 80240690 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D5F944 80240694 3C07BF80 */  lui       $a3, 0xbf80
 /* D5F948 80240698 27BDFEC0 */  addiu     $sp, $sp, -0x140
 /* D5F94C 8024069C F7B40128 */  sdc1      $f20, 0x128($sp)
@@ -22,9 +22,9 @@ glabel func_8024068C_D5F93C
 /* D5F980 802406D0 000218C0 */  sll       $v1, $v0, 3
 /* D5F984 802406D4 00431021 */  addu      $v0, $v0, $v1
 /* D5F988 802406D8 000210C0 */  sll       $v0, $v0, 3
-/* D5F98C 802406DC 3C01800B */  lui       $at, 0x800b
+/* D5F98C 802406DC 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* D5F990 802406E0 00220821 */  addu      $at, $at, $v0
-/* D5F994 802406E4 C4361DEC */  lwc1      $f22, 0x1dec($at)
+/* D5F994 802406E4 C4361DEC */  lwc1      $f22, %lo(D_800B1DEC)($at)
 /* D5F998 802406E8 4406A000 */  mfc1      $a2, $f20
 /* D5F99C 802406EC 4600B587 */  neg.s     $f22, $f22
 /* D5F9A0 802406F0 4405B000 */  mfc1      $a1, $f22
diff --git a/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240870_D5FB20.s b/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240870_D5FB20.s
index a48e1107be..4978ff842f 100644
--- a/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240870_D5FB20.s
+++ b/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240870_D5FB20.s
@@ -27,8 +27,8 @@ glabel func_80240870_D5FB20
 /* D5FB78 802408C8 F7B80160 */  sdc1      $f24, 0x160($sp)
 /* D5FB7C 802408CC F7B40150 */  sdc1      $f20, 0x150($sp)
 .L802408D0:
-/* D5FB80 802408D0 3C03800A */  lui       $v1, 0x800a
-/* D5FB84 802408D4 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D5FB80 802408D0 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D5FB84 802408D4 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D5FB88 802408D8 00031080 */  sll       $v0, $v1, 2
 /* D5FB8C 802408DC 00431021 */  addu      $v0, $v0, $v1
 /* D5FB90 802408E0 00021080 */  sll       $v0, $v0, 2
diff --git a/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240D3C_D5FFEC.s b/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240D3C_D5FFEC.s
index b5d8fda19a..c44af779a0 100644
--- a/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240D3C_D5FFEC.s
+++ b/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240D3C_D5FFEC.s
@@ -25,13 +25,13 @@ glabel func_80240D3C_D5FFEC
 /* D60038 80240D88 08090378 */  j         .L80240DE0
 /* D6003C 80240D8C 00000000 */   nop      
 .L80240D90:
-/* D60040 80240D90 3C048024 */  lui       $a0, 0x8024
-/* D60044 80240D94 24840E84 */  addiu     $a0, $a0, 0xe84
+/* D60040 80240D90 3C048024 */  lui       $a0, %hi(D_80240E84)
+/* D60044 80240D94 24840E84 */  addiu     $a0, $a0, %lo(D_80240E84)
 /* D60048 80240D98 08090374 */  j         .L80240DD0
 /* D6004C 80240D9C 00000000 */   nop      
 .L80240DA0:
-/* D60050 80240DA0 3C048024 */  lui       $a0, 0x8024
-/* D60054 80240DA4 24840EEC */  addiu     $a0, $a0, 0xeec
+/* D60050 80240DA0 3C048024 */  lui       $a0, %hi(D_80240EEC)
+/* D60054 80240DA4 24840EEC */  addiu     $a0, $a0, %lo(D_80240EEC)
 /* D60058 80240DA8 08090374 */  j         .L80240DD0
 /* D6005C 80240DAC 00000000 */   nop      
 .L80240DB0:
@@ -42,8 +42,8 @@ glabel func_80240D3C_D5FFEC
 /* D60070 80240DC0 10400007 */  beqz      $v0, .L80240DE0
 /* D60074 80240DC4 00000000 */   nop      
 .L80240DC8:
-/* D60078 80240DC8 3C048024 */  lui       $a0, 0x8024
-/* D6007C 80240DCC 24840EB8 */  addiu     $a0, $a0, 0xeb8
+/* D60078 80240DC8 3C048024 */  lui       $a0, %hi(D_80240EB8)
+/* D6007C 80240DCC 24840EB8 */  addiu     $a0, $a0, %lo(D_80240EB8)
 .L80240DD0:
 /* D60080 80240DD0 0C048C56 */  jal       bind_dynamic_entity_3
 /* D60084 80240DD4 0000282D */   daddu    $a1, $zero, $zero
diff --git a/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240F20_D601D0.s b/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240F20_D601D0.s
index 686ecfa028..ae45b453e6 100644
--- a/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240F20_D601D0.s
+++ b/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240F20_D601D0.s
@@ -87,9 +87,9 @@ glabel func_80240F20_D601D0
 /* D60310 80241060 2C620010 */  sltiu     $v0, $v1, 0x10
 /* D60314 80241064 10400185 */  beqz      $v0, .L8024167C
 /* D60318 80241068 00031080 */   sll      $v0, $v1, 2
-/* D6031C 8024106C 3C018024 */  lui       $at, 0x8024
+/* D6031C 8024106C 3C018024 */  lui       $at, %hi(D_80242200)
 /* D60320 80241070 00220821 */  addu      $at, $at, $v0
-/* D60324 80241074 8C222200 */  lw        $v0, 0x2200($at)
+/* D60324 80241074 8C222200 */  lw        $v0, %lo(D_80242200)($at)
 /* D60328 80241078 00400008 */  jr        $v0
 /* D6032C 8024107C 00000000 */   nop      
 /* D60330 80241080 8E4200CC */  lw        $v0, 0xcc($s2)
@@ -171,8 +171,8 @@ glabel func_80240F20_D601D0
 /* D60454 802411A4 C6440070 */  lwc1      $f4, 0x70($s2)
 /* D60458 802411A8 46802120 */  cvt.s.w   $f4, $f4
 /* D6045C 802411AC 46040001 */  sub.s     $f0, $f0, $f4
-/* D60460 802411B0 3C018024 */  lui       $at, 0x8024
-/* D60464 802411B4 D4222240 */  ldc1      $f2, 0x2240($at)
+/* D60460 802411B0 3C018024 */  lui       $at, %hi(D_80242240)
+/* D60464 802411B4 D4222240 */  ldc1      $f2, %lo(D_80242240)($at)
 /* D60468 802411B8 46000021 */  cvt.d.s   $f0, $f0
 /* D6046C 802411BC 46220002 */  mul.d     $f0, $f0, $f2
 /* D60470 802411C0 00000000 */  nop       
@@ -186,8 +186,8 @@ glabel func_80240F20_D601D0
 /* D6048C 802411DC C6A0002C */  lwc1      $f0, 0x2c($s5)
 /* D60490 802411E0 C622003C */  lwc1      $f2, 0x3c($s1)
 /* D60494 802411E4 46001081 */  sub.s     $f2, $f2, $f0
-/* D60498 802411E8 3C018024 */  lui       $at, 0x8024
-/* D6049C 802411EC D4242248 */  ldc1      $f4, 0x2248($at)
+/* D60498 802411E8 3C018024 */  lui       $at, %hi(D_80242248)
+/* D6049C 802411EC D4242248 */  ldc1      $f4, %lo(D_80242248)($at)
 /* D604A0 802411F0 460010A1 */  cvt.d.s   $f2, $f2
 /* D604A4 802411F4 46241082 */  mul.d     $f2, $f2, $f4
 /* D604A8 802411F8 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_802400EC_D615EC.s b/asm/nonmatchings/world/area_pra/pra_11/D61520/func_802400EC_D615EC.s
index 26aa57c14d..2aac8d8e12 100644
--- a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_802400EC_D615EC.s
+++ b/asm/nonmatchings/world/area_pra/pra_11/D61520/func_802400EC_D615EC.s
@@ -5,8 +5,8 @@ glabel func_802400EC_D615EC
 /* D615EC 802400EC 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* D615F0 802400F0 AFB00010 */  sw        $s0, 0x10($sp)
 /* D615F4 802400F4 0080802D */  daddu     $s0, $a0, $zero
-/* D615F8 802400F8 3C058024 */  lui       $a1, 0x8024
-/* D615FC 802400FC 24A50128 */  addiu     $a1, $a1, 0x128
+/* D615F8 802400F8 3C058024 */  lui       $a1, %hi(D_80240128)
+/* D615FC 802400FC 24A50128 */  addiu     $a1, $a1, %lo(D_80240128)
 /* D61600 80240100 AFBF0014 */  sw        $ra, 0x14($sp)
 /* D61604 80240104 0C048C56 */  jal       bind_dynamic_entity_3
 /* D61608 80240108 0000202D */   daddu    $a0, $zero, $zero
diff --git a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240128_D61628.s b/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240128_D61628.s
index 993c392e0c..64917be76c 100644
--- a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240128_D61628.s
+++ b/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240128_D61628.s
@@ -29,8 +29,8 @@ glabel func_80240128_D61628
 /* D61688 80240188 27A20034 */  addiu     $v0, $sp, 0x34
 /* D6168C 8024018C AFA20014 */  sw        $v0, 0x14($sp)
 /* D61690 80240190 C6000030 */  lwc1      $f0, 0x30($s0)
-/* D61694 80240194 3C04800A */  lui       $a0, 0x800a
-/* D61698 80240198 8484A634 */  lh        $a0, -0x59cc($a0)
+/* D61694 80240194 3C04800A */  lui       $a0, %hi(D_8009A634)
+/* D61698 80240198 8484A634 */  lh        $a0, %lo(D_8009A634)($a0)
 /* D6169C 8024019C 46000007 */  neg.s     $f0, $f0
 /* D616A0 802401A0 44070000 */  mfc1      $a3, $f0
 /* D616A4 802401A4 27A20038 */  addiu     $v0, $sp, 0x38
@@ -67,8 +67,8 @@ glabel func_80240128_D61628
 /* D6171C 8024021C 54400022 */  bnel      $v0, $zero, .L802402A8
 /* D61720 80240220 24110011 */   addiu    $s1, $zero, 0x11
 /* D61724 80240224 9203000E */  lbu       $v1, 0xe($s0)
-/* D61728 80240228 3C02802E */  lui       $v0, 0x802e
-/* D6172C 8024022C 90429D70 */  lbu       $v0, -0x6290($v0)
+/* D61728 80240228 3C02802E */  lui       $v0, %hi(D_802D9D70)
+/* D6172C 8024022C 90429D70 */  lbu       $v0, %lo(D_802D9D70)($v0)
 /* D61730 80240230 10620018 */  beq       $v1, $v0, .L80240294
 /* D61734 80240234 2C6200FE */   sltiu    $v0, $v1, 0xfe
 /* D61738 80240238 1040000B */  beqz      $v0, .L80240268
@@ -98,20 +98,20 @@ glabel func_80240128_D61628
 /* D61790 80240290 00000000 */   nop      
 .L80240294:
 /* D61794 80240294 9202000E */  lbu       $v0, 0xe($s0)
-/* D61798 80240298 3C01802E */  lui       $at, 0x802e
-/* D6179C 8024029C A0229D70 */  sb        $v0, -0x6290($at)
+/* D61798 80240298 3C01802E */  lui       $at, %hi(D_802D9D70)
+/* D6179C 8024029C A0229D70 */  sb        $v0, %lo(D_802D9D70)($at)
 /* D617A0 802402A0 080900AD */  j         .L802402B4
 /* D617A4 802402A4 0240202D */   daddu    $a0, $s2, $zero
 .L802402A8:
-/* D617A8 802402A8 3C01802E */  lui       $at, 0x802e
-/* D617AC 802402AC A0209D70 */  sb        $zero, -0x6290($at)
+/* D617A8 802402A8 3C01802E */  lui       $at, %hi(D_802D9D70)
+/* D617AC 802402AC A0209D70 */  sb        $zero, %lo(D_802D9D70)($at)
 /* D617B0 802402B0 0240202D */  daddu     $a0, $s2, $zero
 .L802402B4:
 /* D617B4 802402B4 AC910000 */  sw        $s1, ($a0)
 /* D617B8 802402B8 AC900008 */  sw        $s0, 8($a0)
 /* D617BC 802402BC 8FA20038 */  lw        $v0, 0x38($sp)
-/* D617C0 802402C0 3C038024 */  lui       $v1, 0x8024
-/* D617C4 802402C4 246302F0 */  addiu     $v1, $v1, 0x2f0
+/* D617C0 802402C0 3C038024 */  lui       $v1, %hi(D_802402F0)
+/* D617C4 802402C4 246302F0 */  addiu     $v1, $v1, %lo(D_802402F0)
 /* D617C8 802402C8 AC83000C */  sw        $v1, 0xc($a0)
 /* D617CC 802402CC 00021023 */  negu      $v0, $v0
 /* D617D0 802402D0 0C047644 */  jal       queue_render_task
diff --git a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_802402F0_D617F0.s b/asm/nonmatchings/world/area_pra/pra_11/D61520/func_802402F0_D617F0.s
index 7952f64ea0..23a38eda65 100644
--- a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_802402F0_D617F0.s
+++ b/asm/nonmatchings/world/area_pra/pra_11/D61520/func_802402F0_D617F0.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_802402F0_D617F0
-/* D617F0 802402F0 3C03800A */  lui       $v1, 0x800a
-/* D617F4 802402F4 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D617F0 802402F0 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D617F4 802402F4 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D617F8 802402F8 3C07BF80 */  lui       $a3, 0xbf80
 /* D617FC 802402FC 27BDFEC0 */  addiu     $sp, $sp, -0x140
 /* D61800 80240300 F7B40128 */  sdc1      $f20, 0x128($sp)
@@ -22,9 +22,9 @@ glabel func_802402F0_D617F0
 /* D61834 80240334 000218C0 */  sll       $v1, $v0, 3
 /* D61838 80240338 00431021 */  addu      $v0, $v0, $v1
 /* D6183C 8024033C 000210C0 */  sll       $v0, $v0, 3
-/* D61840 80240340 3C01800B */  lui       $at, 0x800b
+/* D61840 80240340 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* D61844 80240344 00220821 */  addu      $at, $at, $v0
-/* D61848 80240348 C4361DEC */  lwc1      $f22, 0x1dec($at)
+/* D61848 80240348 C4361DEC */  lwc1      $f22, %lo(D_800B1DEC)($at)
 /* D6184C 8024034C 4406A000 */  mfc1      $a2, $f20
 /* D61850 80240350 4600B587 */  neg.s     $f22, $f22
 /* D61854 80240354 4405B000 */  mfc1      $a1, $f22
diff --git a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_8024049C_D6199C.s b/asm/nonmatchings/world/area_pra/pra_11/D61520/func_8024049C_D6199C.s
index 2d6715c2bc..3f92eaa856 100644
--- a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_8024049C_D6199C.s
+++ b/asm/nonmatchings/world/area_pra/pra_11/D61520/func_8024049C_D6199C.s
@@ -11,8 +11,8 @@ glabel func_8024049C_D6199C
 /* D619B4 802404B4 28420002 */   slti     $v0, $v0, 2
 /* D619B8 802404B8 1040000C */  beqz      $v0, .L802404EC
 /* D619BC 802404BC 00000000 */   nop      
-/* D619C0 802404C0 3C058024 */  lui       $a1, 0x8024
-/* D619C4 802404C4 24A50500 */  addiu     $a1, $a1, 0x500
+/* D619C0 802404C0 3C058024 */  lui       $a1, %hi(D_80240500)
+/* D619C4 802404C4 24A50500 */  addiu     $a1, $a1, %lo(D_80240500)
 /* D619C8 802404C8 0C048C56 */  jal       bind_dynamic_entity_3
 /* D619CC 802404CC 0000202D */   daddu    $a0, $zero, $zero
 /* D619D0 802404D0 8E03013C */  lw        $v1, 0x13c($s0)
diff --git a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240500_D61A00.s b/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240500_D61A00.s
index b46640779a..f22923c825 100644
--- a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240500_D61A00.s
+++ b/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240500_D61A00.s
@@ -28,8 +28,8 @@ glabel func_80240500_D61A00
 /* D61A5C 8024055C 27A20038 */  addiu     $v0, $sp, 0x38
 /* D61A60 80240560 AFA20018 */  sw        $v0, 0x18($sp)
 /* D61A64 80240564 C600002C */  lwc1      $f0, 0x2c($s0)
-/* D61A68 80240568 3C04800A */  lui       $a0, 0x800a
-/* D61A6C 8024056C 8484A634 */  lh        $a0, -0x59cc($a0)
+/* D61A68 80240568 3C04800A */  lui       $a0, %hi(D_8009A634)
+/* D61A6C 8024056C 8484A634 */  lh        $a0, %lo(D_8009A634)($a0)
 /* D61A70 80240570 46000007 */  neg.s     $f0, $f0
 /* D61A74 80240574 44060000 */  mfc1      $a2, $f0
 /* D61A78 80240578 0C00B94E */  jal       get_screen_coords
@@ -44,8 +44,8 @@ glabel func_80240500_D61A00
 /* D61A9C 8024059C 54400022 */  bnel      $v0, $zero, .L80240628
 /* D61AA0 802405A0 24120011 */   addiu    $s2, $zero, 0x11
 /* D61AA4 802405A4 9203000E */  lbu       $v1, 0xe($s0)
-/* D61AA8 802405A8 3C02802E */  lui       $v0, 0x802e
-/* D61AAC 802405AC 90429D71 */  lbu       $v0, -0x628f($v0)
+/* D61AA8 802405A8 3C02802E */  lui       $v0, %hi(D_802D9D71)
+/* D61AAC 802405AC 90429D71 */  lbu       $v0, %lo(D_802D9D71)($v0)
 /* D61AB0 802405B0 10620018 */  beq       $v1, $v0, .L80240614
 /* D61AB4 802405B4 2C6200FE */   sltiu    $v0, $v1, 0xfe
 /* D61AB8 802405B8 1040000B */  beqz      $v0, .L802405E8
@@ -75,17 +75,17 @@ glabel func_80240500_D61A00
 /* D61B10 80240610 00000000 */   nop      
 .L80240614:
 /* D61B14 80240614 9202000E */  lbu       $v0, 0xe($s0)
-/* D61B18 80240618 3C01802E */  lui       $at, 0x802e
-/* D61B1C 8024061C A0229D71 */  sb        $v0, -0x628f($at)
+/* D61B18 80240618 3C01802E */  lui       $at, %hi(D_802D9D71)
+/* D61B1C 8024061C A0229D71 */  sb        $v0, %lo(D_802D9D71)($at)
 /* D61B20 80240620 0809018C */  j         .L80240630
 /* D61B24 80240624 00000000 */   nop      
 .L80240628:
-/* D61B28 80240628 3C01802E */  lui       $at, 0x802e
-/* D61B2C 8024062C A0209D71 */  sb        $zero, -0x628f($at)
+/* D61B28 80240628 3C01802E */  lui       $at, %hi(D_802D9D71)
+/* D61B2C 8024062C A0209D71 */  sb        $zero, %lo(D_802D9D71)($at)
 .L80240630:
 /* D61B30 80240630 8FA20038 */  lw        $v0, 0x38($sp)
-/* D61B34 80240634 3C048024 */  lui       $a0, 0x8024
-/* D61B38 80240638 24840870 */  addiu     $a0, $a0, 0x870
+/* D61B34 80240634 3C048024 */  lui       $a0, %hi(D_80240870)
+/* D61B38 80240638 24840870 */  addiu     $a0, $a0, %lo(D_80240870)
 /* D61B3C 8024063C AE320000 */  sw        $s2, ($s1)
 /* D61B40 80240640 AE300008 */  sw        $s0, 8($s1)
 /* D61B44 80240644 00021023 */  negu      $v0, $v0
@@ -95,8 +95,8 @@ glabel func_80240500_D61A00
 /* D61B54 80240654 00431024 */  and       $v0, $v0, $v1
 /* D61B58 80240658 54400004 */  bnel      $v0, $zero, .L8024066C
 /* D61B5C 8024065C AE24000C */   sw       $a0, 0xc($s1)
-/* D61B60 80240660 3C048024 */  lui       $a0, 0x8024
-/* D61B64 80240664 2484068C */  addiu     $a0, $a0, 0x68c
+/* D61B60 80240660 3C048024 */  lui       $a0, %hi(D_8024068C)
+/* D61B64 80240664 2484068C */  addiu     $a0, $a0, %lo(D_8024068C)
 /* D61B68 80240668 AE24000C */  sw        $a0, 0xc($s1)
 .L8024066C:
 /* D61B6C 8024066C 0C047644 */  jal       queue_render_task
diff --git a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_8024068C_D61B8C.s b/asm/nonmatchings/world/area_pra/pra_11/D61520/func_8024068C_D61B8C.s
index b903c7367e..0ce7af512e 100644
--- a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_8024068C_D61B8C.s
+++ b/asm/nonmatchings/world/area_pra/pra_11/D61520/func_8024068C_D61B8C.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_8024068C_D61B8C
-/* D61B8C 8024068C 3C03800A */  lui       $v1, 0x800a
-/* D61B90 80240690 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D61B8C 8024068C 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D61B90 80240690 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D61B94 80240694 3C07BF80 */  lui       $a3, 0xbf80
 /* D61B98 80240698 27BDFEC0 */  addiu     $sp, $sp, -0x140
 /* D61B9C 8024069C F7B40128 */  sdc1      $f20, 0x128($sp)
@@ -22,9 +22,9 @@ glabel func_8024068C_D61B8C
 /* D61BD0 802406D0 000218C0 */  sll       $v1, $v0, 3
 /* D61BD4 802406D4 00431021 */  addu      $v0, $v0, $v1
 /* D61BD8 802406D8 000210C0 */  sll       $v0, $v0, 3
-/* D61BDC 802406DC 3C01800B */  lui       $at, 0x800b
+/* D61BDC 802406DC 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* D61BE0 802406E0 00220821 */  addu      $at, $at, $v0
-/* D61BE4 802406E4 C4361DEC */  lwc1      $f22, 0x1dec($at)
+/* D61BE4 802406E4 C4361DEC */  lwc1      $f22, %lo(D_800B1DEC)($at)
 /* D61BE8 802406E8 4406A000 */  mfc1      $a2, $f20
 /* D61BEC 802406EC 4600B587 */  neg.s     $f22, $f22
 /* D61BF0 802406F0 4405B000 */  mfc1      $a1, $f22
diff --git a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240870_D61D70.s b/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240870_D61D70.s
index 8f786b524c..66b2c33477 100644
--- a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240870_D61D70.s
+++ b/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240870_D61D70.s
@@ -27,8 +27,8 @@ glabel func_80240870_D61D70
 /* D61DC8 802408C8 F7B80160 */  sdc1      $f24, 0x160($sp)
 /* D61DCC 802408CC F7B40150 */  sdc1      $f20, 0x150($sp)
 .L802408D0:
-/* D61DD0 802408D0 3C03800A */  lui       $v1, 0x800a
-/* D61DD4 802408D4 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D61DD0 802408D0 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D61DD4 802408D4 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D61DD8 802408D8 00031080 */  sll       $v0, $v1, 2
 /* D61DDC 802408DC 00431021 */  addu      $v0, $v0, $v1
 /* D61DE0 802408E0 00021080 */  sll       $v0, $v0, 2
diff --git a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240D3C_D6223C.s b/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240D3C_D6223C.s
index af766d8f74..629c05ae85 100644
--- a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240D3C_D6223C.s
+++ b/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240D3C_D6223C.s
@@ -25,13 +25,13 @@ glabel func_80240D3C_D6223C
 /* D62288 80240D88 08090378 */  j         .L80240DE0
 /* D6228C 80240D8C 00000000 */   nop      
 .L80240D90:
-/* D62290 80240D90 3C048024 */  lui       $a0, 0x8024
-/* D62294 80240D94 24840E84 */  addiu     $a0, $a0, 0xe84
+/* D62290 80240D90 3C048024 */  lui       $a0, %hi(D_80240E84)
+/* D62294 80240D94 24840E84 */  addiu     $a0, $a0, %lo(D_80240E84)
 /* D62298 80240D98 08090374 */  j         .L80240DD0
 /* D6229C 80240D9C 00000000 */   nop      
 .L80240DA0:
-/* D622A0 80240DA0 3C048024 */  lui       $a0, 0x8024
-/* D622A4 80240DA4 24840EEC */  addiu     $a0, $a0, 0xeec
+/* D622A0 80240DA0 3C048024 */  lui       $a0, %hi(D_80240EEC)
+/* D622A4 80240DA4 24840EEC */  addiu     $a0, $a0, %lo(D_80240EEC)
 /* D622A8 80240DA8 08090374 */  j         .L80240DD0
 /* D622AC 80240DAC 00000000 */   nop      
 .L80240DB0:
@@ -42,8 +42,8 @@ glabel func_80240D3C_D6223C
 /* D622C0 80240DC0 10400007 */  beqz      $v0, .L80240DE0
 /* D622C4 80240DC4 00000000 */   nop      
 .L80240DC8:
-/* D622C8 80240DC8 3C048024 */  lui       $a0, 0x8024
-/* D622CC 80240DCC 24840EB8 */  addiu     $a0, $a0, 0xeb8
+/* D622C8 80240DC8 3C048024 */  lui       $a0, %hi(D_80240EB8)
+/* D622CC 80240DCC 24840EB8 */  addiu     $a0, $a0, %lo(D_80240EB8)
 .L80240DD0:
 /* D622D0 80240DD0 0C048C56 */  jal       bind_dynamic_entity_3
 /* D622D4 80240DD4 0000282D */   daddu    $a1, $zero, $zero
diff --git a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240F20_D62420.s b/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240F20_D62420.s
index db83b53464..aea6643384 100644
--- a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240F20_D62420.s
+++ b/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240F20_D62420.s
@@ -4,8 +4,8 @@
 glabel func_80240F20_D62420
 /* D62420 80240F20 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* D62424 80240F24 AFB00010 */  sw        $s0, 0x10($sp)
-/* D62428 80240F28 3C108024 */  lui       $s0, 0x8024
-/* D6242C 80240F2C 26101610 */  addiu     $s0, $s0, 0x1610
+/* D62428 80240F28 3C108024 */  lui       $s0, %hi(D_80241610)
+/* D6242C 80240F2C 26101610 */  addiu     $s0, $s0, %lo(D_80241610)
 /* D62430 80240F30 AFBF0018 */  sw        $ra, 0x18($sp)
 /* D62434 80240F34 AFB10014 */  sw        $s1, 0x14($sp)
 /* D62438 80240F38 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_80240F20_D62420
 /* D6249C 80240F9C 28620010 */  slti      $v0, $v1, 0x10
 /* D624A0 80240FA0 1440FFFA */  bnez      $v0, .L80240F8C
 /* D624A4 80240FA4 24840004 */   addiu    $a0, $a0, 4
-/* D624A8 80240FA8 3C108024 */  lui       $s0, 0x8024
-/* D624AC 80240FAC 26101610 */  addiu     $s0, $s0, 0x1610
+/* D624A8 80240FA8 3C108024 */  lui       $s0, %hi(D_80241610)
+/* D624AC 80240FAC 26101610 */  addiu     $s0, $s0, %lo(D_80241610)
 /* D624B0 80240FB0 0C00AB4B */  jal       heap_free
 /* D624B4 80240FB4 8E040000 */   lw       $a0, ($s0)
 /* D624B8 80240FB8 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240000_D62D10.s b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240000_D62D10.s
index 6e9ab86ad5..01ecb741ea 100644
--- a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240000_D62D10.s
+++ b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240000_D62D10.s
@@ -3,21 +3,21 @@
 
 glabel func_80240000_D62D10
 /* D62D10 80240000 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D62D14 80240004 3C04800E */  lui       $a0, 0x800e
-/* D62D18 80240008 24849230 */  addiu     $a0, $a0, -0x6dd0
-/* D62D1C 8024000C 3C058024 */  lui       $a1, 0x8024
-/* D62D20 80240010 24A518A0 */  addiu     $a1, $a1, 0x18a0
+/* D62D14 80240004 3C04800E */  lui       $a0, %hi(D_800D9230)
+/* D62D18 80240008 24849230 */  addiu     $a0, $a0, %lo(D_800D9230)
+/* D62D1C 8024000C 3C058024 */  lui       $a1, %hi(D_802418A0)
+/* D62D20 80240010 24A518A0 */  addiu     $a1, $a1, %lo(D_802418A0)
 /* D62D24 80240014 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
 /* D62D28 80240018 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
 /* D62D2C 8024001C 24020001 */  addiu     $v0, $zero, 1
 /* D62D30 80240020 AFBF0010 */  sw        $ra, 0x10($sp)
 /* D62D34 80240024 0C01953C */  jal       sprintf
 /* D62D38 80240028 A0620084 */   sb       $v0, 0x84($v1)
-/* D62D3C 8024002C 3C04800E */  lui       $a0, 0x800e
-/* D62D40 80240030 248491E0 */  addiu     $a0, $a0, -0x6e20
-/* D62D44 80240034 3C058024 */  lui       $a1, 0x8024
+/* D62D3C 8024002C 3C04800E */  lui       $a0, %hi(D_800D91E0)
+/* D62D40 80240030 248491E0 */  addiu     $a0, $a0, %lo(D_800D91E0)
+/* D62D44 80240034 3C058024 */  lui       $a1, %hi(D_802418B0)
 /* D62D48 80240038 0C01953C */  jal       sprintf
-/* D62D4C 8024003C 24A518B0 */   addiu    $a1, $a1, 0x18b0
+/* D62D4C 8024003C 24A518B0 */   addiu    $a1, $a1, %lo(D_802418B0)
 /* D62D50 80240040 8FBF0010 */  lw        $ra, 0x10($sp)
 /* D62D54 80240044 0000102D */  daddu     $v0, $zero, $zero
 /* D62D58 80240048 03E00008 */  jr        $ra
diff --git a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_8024011C_D62E2C.s b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_8024011C_D62E2C.s
index aa7e658b6f..c7ed520aff 100644
--- a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_8024011C_D62E2C.s
+++ b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_8024011C_D62E2C.s
@@ -5,8 +5,8 @@ glabel func_8024011C_D62E2C
 /* D62E2C 8024011C 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* D62E30 80240120 AFB00010 */  sw        $s0, 0x10($sp)
 /* D62E34 80240124 0080802D */  daddu     $s0, $a0, $zero
-/* D62E38 80240128 3C058024 */  lui       $a1, 0x8024
-/* D62E3C 8024012C 24A50158 */  addiu     $a1, $a1, 0x158
+/* D62E38 80240128 3C058024 */  lui       $a1, %hi(D_80240158)
+/* D62E3C 8024012C 24A50158 */  addiu     $a1, $a1, %lo(D_80240158)
 /* D62E40 80240130 AFBF0014 */  sw        $ra, 0x14($sp)
 /* D62E44 80240134 0C048C56 */  jal       bind_dynamic_entity_3
 /* D62E48 80240138 0000202D */   daddu    $a0, $zero, $zero
diff --git a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240158_D62E68.s b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240158_D62E68.s
index 4230bd6dad..0f4e3f5dda 100644
--- a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240158_D62E68.s
+++ b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240158_D62E68.s
@@ -29,8 +29,8 @@ glabel func_80240158_D62E68
 /* D62EC8 802401B8 27A20034 */  addiu     $v0, $sp, 0x34
 /* D62ECC 802401BC AFA20014 */  sw        $v0, 0x14($sp)
 /* D62ED0 802401C0 C6000030 */  lwc1      $f0, 0x30($s0)
-/* D62ED4 802401C4 3C04800A */  lui       $a0, 0x800a
-/* D62ED8 802401C8 8484A634 */  lh        $a0, -0x59cc($a0)
+/* D62ED4 802401C4 3C04800A */  lui       $a0, %hi(D_8009A634)
+/* D62ED8 802401C8 8484A634 */  lh        $a0, %lo(D_8009A634)($a0)
 /* D62EDC 802401CC 46000007 */  neg.s     $f0, $f0
 /* D62EE0 802401D0 44070000 */  mfc1      $a3, $f0
 /* D62EE4 802401D4 27A20038 */  addiu     $v0, $sp, 0x38
@@ -67,8 +67,8 @@ glabel func_80240158_D62E68
 /* D62F5C 8024024C 54400022 */  bnel      $v0, $zero, .L802402D8
 /* D62F60 80240250 24110011 */   addiu    $s1, $zero, 0x11
 /* D62F64 80240254 9203000E */  lbu       $v1, 0xe($s0)
-/* D62F68 80240258 3C02802E */  lui       $v0, 0x802e
-/* D62F6C 8024025C 90429D70 */  lbu       $v0, -0x6290($v0)
+/* D62F68 80240258 3C02802E */  lui       $v0, %hi(D_802D9D70)
+/* D62F6C 8024025C 90429D70 */  lbu       $v0, %lo(D_802D9D70)($v0)
 /* D62F70 80240260 10620018 */  beq       $v1, $v0, .L802402C4
 /* D62F74 80240264 2C6200FE */   sltiu    $v0, $v1, 0xfe
 /* D62F78 80240268 1040000B */  beqz      $v0, .L80240298
@@ -98,20 +98,20 @@ glabel func_80240158_D62E68
 /* D62FD0 802402C0 00000000 */   nop      
 .L802402C4:
 /* D62FD4 802402C4 9202000E */  lbu       $v0, 0xe($s0)
-/* D62FD8 802402C8 3C01802E */  lui       $at, 0x802e
-/* D62FDC 802402CC A0229D70 */  sb        $v0, -0x6290($at)
+/* D62FD8 802402C8 3C01802E */  lui       $at, %hi(D_802D9D70)
+/* D62FDC 802402CC A0229D70 */  sb        $v0, %lo(D_802D9D70)($at)
 /* D62FE0 802402D0 080900B9 */  j         .L802402E4
 /* D62FE4 802402D4 0240202D */   daddu    $a0, $s2, $zero
 .L802402D8:
-/* D62FE8 802402D8 3C01802E */  lui       $at, 0x802e
-/* D62FEC 802402DC A0209D70 */  sb        $zero, -0x6290($at)
+/* D62FE8 802402D8 3C01802E */  lui       $at, %hi(D_802D9D70)
+/* D62FEC 802402DC A0209D70 */  sb        $zero, %lo(D_802D9D70)($at)
 /* D62FF0 802402E0 0240202D */  daddu     $a0, $s2, $zero
 .L802402E4:
 /* D62FF4 802402E4 AC910000 */  sw        $s1, ($a0)
 /* D62FF8 802402E8 AC900008 */  sw        $s0, 8($a0)
 /* D62FFC 802402EC 8FA20038 */  lw        $v0, 0x38($sp)
-/* D63000 802402F0 3C038024 */  lui       $v1, 0x8024
-/* D63004 802402F4 24630320 */  addiu     $v1, $v1, 0x320
+/* D63000 802402F0 3C038024 */  lui       $v1, %hi(D_80240320)
+/* D63004 802402F4 24630320 */  addiu     $v1, $v1, %lo(D_80240320)
 /* D63008 802402F8 AC83000C */  sw        $v1, 0xc($a0)
 /* D6300C 802402FC 00021023 */  negu      $v0, $v0
 /* D63010 80240300 0C047644 */  jal       queue_render_task
diff --git a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240320_D63030.s b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240320_D63030.s
index 332bcbb344..6160a8937f 100644
--- a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240320_D63030.s
+++ b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240320_D63030.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80240320_D63030
-/* D63030 80240320 3C03800A */  lui       $v1, 0x800a
-/* D63034 80240324 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D63030 80240320 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D63034 80240324 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D63038 80240328 3C07BF80 */  lui       $a3, 0xbf80
 /* D6303C 8024032C 27BDFEC0 */  addiu     $sp, $sp, -0x140
 /* D63040 80240330 F7B40128 */  sdc1      $f20, 0x128($sp)
@@ -22,9 +22,9 @@ glabel func_80240320_D63030
 /* D63074 80240364 000218C0 */  sll       $v1, $v0, 3
 /* D63078 80240368 00431021 */  addu      $v0, $v0, $v1
 /* D6307C 8024036C 000210C0 */  sll       $v0, $v0, 3
-/* D63080 80240370 3C01800B */  lui       $at, 0x800b
+/* D63080 80240370 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* D63084 80240374 00220821 */  addu      $at, $at, $v0
-/* D63088 80240378 C4361DEC */  lwc1      $f22, 0x1dec($at)
+/* D63088 80240378 C4361DEC */  lwc1      $f22, %lo(D_800B1DEC)($at)
 /* D6308C 8024037C 4406A000 */  mfc1      $a2, $f20
 /* D63090 80240380 4600B587 */  neg.s     $f22, $f22
 /* D63094 80240384 4405B000 */  mfc1      $a1, $f22
diff --git a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_802404CC_D631DC.s b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_802404CC_D631DC.s
index c55be8218c..6fe72ca280 100644
--- a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_802404CC_D631DC.s
+++ b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_802404CC_D631DC.s
@@ -11,8 +11,8 @@ glabel func_802404CC_D631DC
 /* D631F4 802404E4 28420002 */   slti     $v0, $v0, 2
 /* D631F8 802404E8 1040000C */  beqz      $v0, .L8024051C
 /* D631FC 802404EC 00000000 */   nop      
-/* D63200 802404F0 3C058024 */  lui       $a1, 0x8024
-/* D63204 802404F4 24A50530 */  addiu     $a1, $a1, 0x530
+/* D63200 802404F0 3C058024 */  lui       $a1, %hi(D_80240530)
+/* D63204 802404F4 24A50530 */  addiu     $a1, $a1, %lo(D_80240530)
 /* D63208 802404F8 0C048C56 */  jal       bind_dynamic_entity_3
 /* D6320C 802404FC 0000202D */   daddu    $a0, $zero, $zero
 /* D63210 80240500 8E03013C */  lw        $v1, 0x13c($s0)
diff --git a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240530_D63240.s b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240530_D63240.s
index 42f58b3db5..8b84046b82 100644
--- a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240530_D63240.s
+++ b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240530_D63240.s
@@ -28,8 +28,8 @@ glabel func_80240530_D63240
 /* D6329C 8024058C 27A20038 */  addiu     $v0, $sp, 0x38
 /* D632A0 80240590 AFA20018 */  sw        $v0, 0x18($sp)
 /* D632A4 80240594 C600002C */  lwc1      $f0, 0x2c($s0)
-/* D632A8 80240598 3C04800A */  lui       $a0, 0x800a
-/* D632AC 8024059C 8484A634 */  lh        $a0, -0x59cc($a0)
+/* D632A8 80240598 3C04800A */  lui       $a0, %hi(D_8009A634)
+/* D632AC 8024059C 8484A634 */  lh        $a0, %lo(D_8009A634)($a0)
 /* D632B0 802405A0 46000007 */  neg.s     $f0, $f0
 /* D632B4 802405A4 44060000 */  mfc1      $a2, $f0
 /* D632B8 802405A8 0C00B94E */  jal       get_screen_coords
@@ -44,8 +44,8 @@ glabel func_80240530_D63240
 /* D632DC 802405CC 54400022 */  bnel      $v0, $zero, .L80240658
 /* D632E0 802405D0 24120011 */   addiu    $s2, $zero, 0x11
 /* D632E4 802405D4 9203000E */  lbu       $v1, 0xe($s0)
-/* D632E8 802405D8 3C02802E */  lui       $v0, 0x802e
-/* D632EC 802405DC 90429D71 */  lbu       $v0, -0x628f($v0)
+/* D632E8 802405D8 3C02802E */  lui       $v0, %hi(D_802D9D71)
+/* D632EC 802405DC 90429D71 */  lbu       $v0, %lo(D_802D9D71)($v0)
 /* D632F0 802405E0 10620018 */  beq       $v1, $v0, .L80240644
 /* D632F4 802405E4 2C6200FE */   sltiu    $v0, $v1, 0xfe
 /* D632F8 802405E8 1040000B */  beqz      $v0, .L80240618
@@ -75,17 +75,17 @@ glabel func_80240530_D63240
 /* D63350 80240640 00000000 */   nop      
 .L80240644:
 /* D63354 80240644 9202000E */  lbu       $v0, 0xe($s0)
-/* D63358 80240648 3C01802E */  lui       $at, 0x802e
-/* D6335C 8024064C A0229D71 */  sb        $v0, -0x628f($at)
+/* D63358 80240648 3C01802E */  lui       $at, %hi(D_802D9D71)
+/* D6335C 8024064C A0229D71 */  sb        $v0, %lo(D_802D9D71)($at)
 /* D63360 80240650 08090198 */  j         .L80240660
 /* D63364 80240654 00000000 */   nop      
 .L80240658:
-/* D63368 80240658 3C01802E */  lui       $at, 0x802e
-/* D6336C 8024065C A0209D71 */  sb        $zero, -0x628f($at)
+/* D63368 80240658 3C01802E */  lui       $at, %hi(D_802D9D71)
+/* D6336C 8024065C A0209D71 */  sb        $zero, %lo(D_802D9D71)($at)
 .L80240660:
 /* D63370 80240660 8FA20038 */  lw        $v0, 0x38($sp)
-/* D63374 80240664 3C048024 */  lui       $a0, 0x8024
-/* D63378 80240668 248408A0 */  addiu     $a0, $a0, 0x8a0
+/* D63374 80240664 3C048024 */  lui       $a0, %hi(D_802408A0)
+/* D63378 80240668 248408A0 */  addiu     $a0, $a0, %lo(D_802408A0)
 /* D6337C 8024066C AE320000 */  sw        $s2, ($s1)
 /* D63380 80240670 AE300008 */  sw        $s0, 8($s1)
 /* D63384 80240674 00021023 */  negu      $v0, $v0
@@ -95,8 +95,8 @@ glabel func_80240530_D63240
 /* D63394 80240684 00431024 */  and       $v0, $v0, $v1
 /* D63398 80240688 54400004 */  bnel      $v0, $zero, .L8024069C
 /* D6339C 8024068C AE24000C */   sw       $a0, 0xc($s1)
-/* D633A0 80240690 3C048024 */  lui       $a0, 0x8024
-/* D633A4 80240694 248406BC */  addiu     $a0, $a0, 0x6bc
+/* D633A0 80240690 3C048024 */  lui       $a0, %hi(D_802406BC)
+/* D633A4 80240694 248406BC */  addiu     $a0, $a0, %lo(D_802406BC)
 /* D633A8 80240698 AE24000C */  sw        $a0, 0xc($s1)
 .L8024069C:
 /* D633AC 8024069C 0C047644 */  jal       queue_render_task
diff --git a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_802406BC_D633CC.s b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_802406BC_D633CC.s
index 72033ccd60..588015a554 100644
--- a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_802406BC_D633CC.s
+++ b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_802406BC_D633CC.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_802406BC_D633CC
-/* D633CC 802406BC 3C03800A */  lui       $v1, 0x800a
-/* D633D0 802406C0 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D633CC 802406BC 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D633D0 802406C0 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D633D4 802406C4 3C07BF80 */  lui       $a3, 0xbf80
 /* D633D8 802406C8 27BDFEC0 */  addiu     $sp, $sp, -0x140
 /* D633DC 802406CC F7B40128 */  sdc1      $f20, 0x128($sp)
@@ -22,9 +22,9 @@ glabel func_802406BC_D633CC
 /* D63410 80240700 000218C0 */  sll       $v1, $v0, 3
 /* D63414 80240704 00431021 */  addu      $v0, $v0, $v1
 /* D63418 80240708 000210C0 */  sll       $v0, $v0, 3
-/* D6341C 8024070C 3C01800B */  lui       $at, 0x800b
+/* D6341C 8024070C 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* D63420 80240710 00220821 */  addu      $at, $at, $v0
-/* D63424 80240714 C4361DEC */  lwc1      $f22, 0x1dec($at)
+/* D63424 80240714 C4361DEC */  lwc1      $f22, %lo(D_800B1DEC)($at)
 /* D63428 80240718 4406A000 */  mfc1      $a2, $f20
 /* D6342C 8024071C 4600B587 */  neg.s     $f22, $f22
 /* D63430 80240720 4405B000 */  mfc1      $a1, $f22
diff --git a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_802408A0_D635B0.s b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_802408A0_D635B0.s
index a25523c4ff..082d920ec9 100644
--- a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_802408A0_D635B0.s
+++ b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_802408A0_D635B0.s
@@ -27,8 +27,8 @@ glabel func_802408A0_D635B0
 /* D63608 802408F8 F7B80160 */  sdc1      $f24, 0x160($sp)
 /* D6360C 802408FC F7B40150 */  sdc1      $f20, 0x150($sp)
 .L80240900:
-/* D63610 80240900 3C03800A */  lui       $v1, 0x800a
-/* D63614 80240904 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D63610 80240900 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D63614 80240904 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D63618 80240908 00031080 */  sll       $v0, $v1, 2
 /* D6361C 8024090C 00431021 */  addu      $v0, $v0, $v1
 /* D63620 80240910 00021080 */  sll       $v0, $v0, 2
diff --git a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240D6C_D63A7C.s b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240D6C_D63A7C.s
index bd4cb77bd7..6de8bd74c9 100644
--- a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240D6C_D63A7C.s
+++ b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240D6C_D63A7C.s
@@ -25,13 +25,13 @@ glabel func_80240D6C_D63A7C
 /* D63AC8 80240DB8 08090384 */  j         .L80240E10
 /* D63ACC 80240DBC 00000000 */   nop      
 .L80240DC0:
-/* D63AD0 80240DC0 3C048024 */  lui       $a0, 0x8024
-/* D63AD4 80240DC4 24840EB4 */  addiu     $a0, $a0, 0xeb4
+/* D63AD0 80240DC0 3C048024 */  lui       $a0, %hi(D_80240EB4)
+/* D63AD4 80240DC4 24840EB4 */  addiu     $a0, $a0, %lo(D_80240EB4)
 /* D63AD8 80240DC8 08090380 */  j         .L80240E00
 /* D63ADC 80240DCC 00000000 */   nop      
 .L80240DD0:
-/* D63AE0 80240DD0 3C048024 */  lui       $a0, 0x8024
-/* D63AE4 80240DD4 24840F1C */  addiu     $a0, $a0, 0xf1c
+/* D63AE0 80240DD0 3C048024 */  lui       $a0, %hi(D_80240F1C)
+/* D63AE4 80240DD4 24840F1C */  addiu     $a0, $a0, %lo(D_80240F1C)
 /* D63AE8 80240DD8 08090380 */  j         .L80240E00
 /* D63AEC 80240DDC 00000000 */   nop      
 .L80240DE0:
@@ -42,8 +42,8 @@ glabel func_80240D6C_D63A7C
 /* D63B00 80240DF0 10400007 */  beqz      $v0, .L80240E10
 /* D63B04 80240DF4 00000000 */   nop      
 .L80240DF8:
-/* D63B08 80240DF8 3C048024 */  lui       $a0, 0x8024
-/* D63B0C 80240DFC 24840EE8 */  addiu     $a0, $a0, 0xee8
+/* D63B08 80240DF8 3C048024 */  lui       $a0, %hi(D_80240EE8)
+/* D63B0C 80240DFC 24840EE8 */  addiu     $a0, $a0, %lo(D_80240EE8)
 .L80240E00:
 /* D63B10 80240E00 0C048C56 */  jal       bind_dynamic_entity_3
 /* D63B14 80240E04 0000282D */   daddu    $a1, $zero, $zero
diff --git a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240F50_D63C60.s b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240F50_D63C60.s
index 2a0cf73324..0295fd9bbb 100644
--- a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240F50_D63C60.s
+++ b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240F50_D63C60.s
@@ -4,8 +4,8 @@
 glabel func_80240F50_D63C60
 /* D63C60 80240F50 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* D63C64 80240F54 AFB00010 */  sw        $s0, 0x10($sp)
-/* D63C68 80240F58 3C108024 */  lui       $s0, 0x8024
-/* D63C6C 80240F5C 261016B0 */  addiu     $s0, $s0, 0x16b0
+/* D63C68 80240F58 3C108024 */  lui       $s0, %hi(D_802416B0)
+/* D63C6C 80240F5C 261016B0 */  addiu     $s0, $s0, %lo(D_802416B0)
 /* D63C70 80240F60 AFBF0018 */  sw        $ra, 0x18($sp)
 /* D63C74 80240F64 AFB10014 */  sw        $s1, 0x14($sp)
 /* D63C78 80240F68 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_80240F50_D63C60
 /* D63CDC 80240FCC 28620010 */  slti      $v0, $v1, 0x10
 /* D63CE0 80240FD0 1440FFFA */  bnez      $v0, .L80240FBC
 /* D63CE4 80240FD4 24840004 */   addiu    $a0, $a0, 4
-/* D63CE8 80240FD8 3C108024 */  lui       $s0, 0x8024
-/* D63CEC 80240FDC 261016B0 */  addiu     $s0, $s0, 0x16b0
+/* D63CE8 80240FD8 3C108024 */  lui       $s0, %hi(D_802416B0)
+/* D63CEC 80240FDC 261016B0 */  addiu     $s0, $s0, %lo(D_802416B0)
 /* D63CF0 80240FE0 0C00AB4B */  jal       heap_free
 /* D63CF4 80240FE4 8E040000 */   lw       $a0, ($s0)
 /* D63CF8 80240FE8 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_802400EC_D646CC.s b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_802400EC_D646CC.s
index 28638884e7..93ff82a114 100644
--- a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_802400EC_D646CC.s
+++ b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_802400EC_D646CC.s
@@ -5,8 +5,8 @@ glabel func_802400EC_D646CC
 /* D646CC 802400EC 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* D646D0 802400F0 AFB00010 */  sw        $s0, 0x10($sp)
 /* D646D4 802400F4 0080802D */  daddu     $s0, $a0, $zero
-/* D646D8 802400F8 3C058024 */  lui       $a1, 0x8024
-/* D646DC 802400FC 24A50128 */  addiu     $a1, $a1, 0x128
+/* D646D8 802400F8 3C058024 */  lui       $a1, %hi(D_80240128)
+/* D646DC 802400FC 24A50128 */  addiu     $a1, $a1, %lo(D_80240128)
 /* D646E0 80240100 AFBF0014 */  sw        $ra, 0x14($sp)
 /* D646E4 80240104 0C048C56 */  jal       bind_dynamic_entity_3
 /* D646E8 80240108 0000202D */   daddu    $a0, $zero, $zero
diff --git a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240128_D64708.s b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240128_D64708.s
index 66f0bd6bc8..9c79c86106 100644
--- a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240128_D64708.s
+++ b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240128_D64708.s
@@ -29,8 +29,8 @@ glabel func_80240128_D64708
 /* D64768 80240188 27A20034 */  addiu     $v0, $sp, 0x34
 /* D6476C 8024018C AFA20014 */  sw        $v0, 0x14($sp)
 /* D64770 80240190 C6000030 */  lwc1      $f0, 0x30($s0)
-/* D64774 80240194 3C04800A */  lui       $a0, 0x800a
-/* D64778 80240198 8484A634 */  lh        $a0, -0x59cc($a0)
+/* D64774 80240194 3C04800A */  lui       $a0, %hi(D_8009A634)
+/* D64778 80240198 8484A634 */  lh        $a0, %lo(D_8009A634)($a0)
 /* D6477C 8024019C 46000007 */  neg.s     $f0, $f0
 /* D64780 802401A0 44070000 */  mfc1      $a3, $f0
 /* D64784 802401A4 27A20038 */  addiu     $v0, $sp, 0x38
@@ -67,8 +67,8 @@ glabel func_80240128_D64708
 /* D647FC 8024021C 54400022 */  bnel      $v0, $zero, .L802402A8
 /* D64800 80240220 24110011 */   addiu    $s1, $zero, 0x11
 /* D64804 80240224 9203000E */  lbu       $v1, 0xe($s0)
-/* D64808 80240228 3C02802E */  lui       $v0, 0x802e
-/* D6480C 8024022C 90429D70 */  lbu       $v0, -0x6290($v0)
+/* D64808 80240228 3C02802E */  lui       $v0, %hi(D_802D9D70)
+/* D6480C 8024022C 90429D70 */  lbu       $v0, %lo(D_802D9D70)($v0)
 /* D64810 80240230 10620018 */  beq       $v1, $v0, .L80240294
 /* D64814 80240234 2C6200FE */   sltiu    $v0, $v1, 0xfe
 /* D64818 80240238 1040000B */  beqz      $v0, .L80240268
@@ -98,20 +98,20 @@ glabel func_80240128_D64708
 /* D64870 80240290 00000000 */   nop      
 .L80240294:
 /* D64874 80240294 9202000E */  lbu       $v0, 0xe($s0)
-/* D64878 80240298 3C01802E */  lui       $at, 0x802e
-/* D6487C 8024029C A0229D70 */  sb        $v0, -0x6290($at)
+/* D64878 80240298 3C01802E */  lui       $at, %hi(D_802D9D70)
+/* D6487C 8024029C A0229D70 */  sb        $v0, %lo(D_802D9D70)($at)
 /* D64880 802402A0 080900AD */  j         .L802402B4
 /* D64884 802402A4 0240202D */   daddu    $a0, $s2, $zero
 .L802402A8:
-/* D64888 802402A8 3C01802E */  lui       $at, 0x802e
-/* D6488C 802402AC A0209D70 */  sb        $zero, -0x6290($at)
+/* D64888 802402A8 3C01802E */  lui       $at, %hi(D_802D9D70)
+/* D6488C 802402AC A0209D70 */  sb        $zero, %lo(D_802D9D70)($at)
 /* D64890 802402B0 0240202D */  daddu     $a0, $s2, $zero
 .L802402B4:
 /* D64894 802402B4 AC910000 */  sw        $s1, ($a0)
 /* D64898 802402B8 AC900008 */  sw        $s0, 8($a0)
 /* D6489C 802402BC 8FA20038 */  lw        $v0, 0x38($sp)
-/* D648A0 802402C0 3C038024 */  lui       $v1, 0x8024
-/* D648A4 802402C4 246302F0 */  addiu     $v1, $v1, 0x2f0
+/* D648A0 802402C0 3C038024 */  lui       $v1, %hi(D_802402F0)
+/* D648A4 802402C4 246302F0 */  addiu     $v1, $v1, %lo(D_802402F0)
 /* D648A8 802402C8 AC83000C */  sw        $v1, 0xc($a0)
 /* D648AC 802402CC 00021023 */  negu      $v0, $v0
 /* D648B0 802402D0 0C047644 */  jal       queue_render_task
diff --git a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_802402F0_D648D0.s b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_802402F0_D648D0.s
index 14209a7254..1a2c797919 100644
--- a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_802402F0_D648D0.s
+++ b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_802402F0_D648D0.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_802402F0_D648D0
-/* D648D0 802402F0 3C03800A */  lui       $v1, 0x800a
-/* D648D4 802402F4 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D648D0 802402F0 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D648D4 802402F4 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D648D8 802402F8 3C07BF80 */  lui       $a3, 0xbf80
 /* D648DC 802402FC 27BDFEC0 */  addiu     $sp, $sp, -0x140
 /* D648E0 80240300 F7B40128 */  sdc1      $f20, 0x128($sp)
@@ -22,9 +22,9 @@ glabel func_802402F0_D648D0
 /* D64914 80240334 000218C0 */  sll       $v1, $v0, 3
 /* D64918 80240338 00431021 */  addu      $v0, $v0, $v1
 /* D6491C 8024033C 000210C0 */  sll       $v0, $v0, 3
-/* D64920 80240340 3C01800B */  lui       $at, 0x800b
+/* D64920 80240340 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* D64924 80240344 00220821 */  addu      $at, $at, $v0
-/* D64928 80240348 C4361DEC */  lwc1      $f22, 0x1dec($at)
+/* D64928 80240348 C4361DEC */  lwc1      $f22, %lo(D_800B1DEC)($at)
 /* D6492C 8024034C 4406A000 */  mfc1      $a2, $f20
 /* D64930 80240350 4600B587 */  neg.s     $f22, $f22
 /* D64934 80240354 4405B000 */  mfc1      $a1, $f22
diff --git a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_8024049C_D64A7C.s b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_8024049C_D64A7C.s
index 49d3aeacf1..e7ba04672c 100644
--- a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_8024049C_D64A7C.s
+++ b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_8024049C_D64A7C.s
@@ -11,8 +11,8 @@ glabel func_8024049C_D64A7C
 /* D64A94 802404B4 28420002 */   slti     $v0, $v0, 2
 /* D64A98 802404B8 1040000C */  beqz      $v0, .L802404EC
 /* D64A9C 802404BC 00000000 */   nop      
-/* D64AA0 802404C0 3C058024 */  lui       $a1, 0x8024
-/* D64AA4 802404C4 24A50500 */  addiu     $a1, $a1, 0x500
+/* D64AA0 802404C0 3C058024 */  lui       $a1, %hi(D_80240500)
+/* D64AA4 802404C4 24A50500 */  addiu     $a1, $a1, %lo(D_80240500)
 /* D64AA8 802404C8 0C048C56 */  jal       bind_dynamic_entity_3
 /* D64AAC 802404CC 0000202D */   daddu    $a0, $zero, $zero
 /* D64AB0 802404D0 8E03013C */  lw        $v1, 0x13c($s0)
diff --git a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240500_D64AE0.s b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240500_D64AE0.s
index f3ebfd9cfd..678b11738c 100644
--- a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240500_D64AE0.s
+++ b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240500_D64AE0.s
@@ -28,8 +28,8 @@ glabel func_80240500_D64AE0
 /* D64B3C 8024055C 27A20038 */  addiu     $v0, $sp, 0x38
 /* D64B40 80240560 AFA20018 */  sw        $v0, 0x18($sp)
 /* D64B44 80240564 C600002C */  lwc1      $f0, 0x2c($s0)
-/* D64B48 80240568 3C04800A */  lui       $a0, 0x800a
-/* D64B4C 8024056C 8484A634 */  lh        $a0, -0x59cc($a0)
+/* D64B48 80240568 3C04800A */  lui       $a0, %hi(D_8009A634)
+/* D64B4C 8024056C 8484A634 */  lh        $a0, %lo(D_8009A634)($a0)
 /* D64B50 80240570 46000007 */  neg.s     $f0, $f0
 /* D64B54 80240574 44060000 */  mfc1      $a2, $f0
 /* D64B58 80240578 0C00B94E */  jal       get_screen_coords
@@ -44,8 +44,8 @@ glabel func_80240500_D64AE0
 /* D64B7C 8024059C 54400022 */  bnel      $v0, $zero, .L80240628
 /* D64B80 802405A0 24120011 */   addiu    $s2, $zero, 0x11
 /* D64B84 802405A4 9203000E */  lbu       $v1, 0xe($s0)
-/* D64B88 802405A8 3C02802E */  lui       $v0, 0x802e
-/* D64B8C 802405AC 90429D71 */  lbu       $v0, -0x628f($v0)
+/* D64B88 802405A8 3C02802E */  lui       $v0, %hi(D_802D9D71)
+/* D64B8C 802405AC 90429D71 */  lbu       $v0, %lo(D_802D9D71)($v0)
 /* D64B90 802405B0 10620018 */  beq       $v1, $v0, .L80240614
 /* D64B94 802405B4 2C6200FE */   sltiu    $v0, $v1, 0xfe
 /* D64B98 802405B8 1040000B */  beqz      $v0, .L802405E8
@@ -75,17 +75,17 @@ glabel func_80240500_D64AE0
 /* D64BF0 80240610 00000000 */   nop      
 .L80240614:
 /* D64BF4 80240614 9202000E */  lbu       $v0, 0xe($s0)
-/* D64BF8 80240618 3C01802E */  lui       $at, 0x802e
-/* D64BFC 8024061C A0229D71 */  sb        $v0, -0x628f($at)
+/* D64BF8 80240618 3C01802E */  lui       $at, %hi(D_802D9D71)
+/* D64BFC 8024061C A0229D71 */  sb        $v0, %lo(D_802D9D71)($at)
 /* D64C00 80240620 0809018C */  j         .L80240630
 /* D64C04 80240624 00000000 */   nop      
 .L80240628:
-/* D64C08 80240628 3C01802E */  lui       $at, 0x802e
-/* D64C0C 8024062C A0209D71 */  sb        $zero, -0x628f($at)
+/* D64C08 80240628 3C01802E */  lui       $at, %hi(D_802D9D71)
+/* D64C0C 8024062C A0209D71 */  sb        $zero, %lo(D_802D9D71)($at)
 .L80240630:
 /* D64C10 80240630 8FA20038 */  lw        $v0, 0x38($sp)
-/* D64C14 80240634 3C048024 */  lui       $a0, 0x8024
-/* D64C18 80240638 24840870 */  addiu     $a0, $a0, 0x870
+/* D64C14 80240634 3C048024 */  lui       $a0, %hi(D_80240870)
+/* D64C18 80240638 24840870 */  addiu     $a0, $a0, %lo(D_80240870)
 /* D64C1C 8024063C AE320000 */  sw        $s2, ($s1)
 /* D64C20 80240640 AE300008 */  sw        $s0, 8($s1)
 /* D64C24 80240644 00021023 */  negu      $v0, $v0
@@ -95,8 +95,8 @@ glabel func_80240500_D64AE0
 /* D64C34 80240654 00431024 */  and       $v0, $v0, $v1
 /* D64C38 80240658 54400004 */  bnel      $v0, $zero, .L8024066C
 /* D64C3C 8024065C AE24000C */   sw       $a0, 0xc($s1)
-/* D64C40 80240660 3C048024 */  lui       $a0, 0x8024
-/* D64C44 80240664 2484068C */  addiu     $a0, $a0, 0x68c
+/* D64C40 80240660 3C048024 */  lui       $a0, %hi(D_8024068C)
+/* D64C44 80240664 2484068C */  addiu     $a0, $a0, %lo(D_8024068C)
 /* D64C48 80240668 AE24000C */  sw        $a0, 0xc($s1)
 .L8024066C:
 /* D64C4C 8024066C 0C047644 */  jal       queue_render_task
diff --git a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_8024068C_D64C6C.s b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_8024068C_D64C6C.s
index ce94fe01eb..5b3cce023f 100644
--- a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_8024068C_D64C6C.s
+++ b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_8024068C_D64C6C.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_8024068C_D64C6C
-/* D64C6C 8024068C 3C03800A */  lui       $v1, 0x800a
-/* D64C70 80240690 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D64C6C 8024068C 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D64C70 80240690 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D64C74 80240694 3C07BF80 */  lui       $a3, 0xbf80
 /* D64C78 80240698 27BDFEC0 */  addiu     $sp, $sp, -0x140
 /* D64C7C 8024069C F7B40128 */  sdc1      $f20, 0x128($sp)
@@ -22,9 +22,9 @@ glabel func_8024068C_D64C6C
 /* D64CB0 802406D0 000218C0 */  sll       $v1, $v0, 3
 /* D64CB4 802406D4 00431021 */  addu      $v0, $v0, $v1
 /* D64CB8 802406D8 000210C0 */  sll       $v0, $v0, 3
-/* D64CBC 802406DC 3C01800B */  lui       $at, 0x800b
+/* D64CBC 802406DC 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* D64CC0 802406E0 00220821 */  addu      $at, $at, $v0
-/* D64CC4 802406E4 C4361DEC */  lwc1      $f22, 0x1dec($at)
+/* D64CC4 802406E4 C4361DEC */  lwc1      $f22, %lo(D_800B1DEC)($at)
 /* D64CC8 802406E8 4406A000 */  mfc1      $a2, $f20
 /* D64CCC 802406EC 4600B587 */  neg.s     $f22, $f22
 /* D64CD0 802406F0 4405B000 */  mfc1      $a1, $f22
diff --git a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240870_D64E50.s b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240870_D64E50.s
index f32e2b4f8a..3aebe888a6 100644
--- a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240870_D64E50.s
+++ b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240870_D64E50.s
@@ -27,8 +27,8 @@ glabel func_80240870_D64E50
 /* D64EA8 802408C8 F7B80160 */  sdc1      $f24, 0x160($sp)
 /* D64EAC 802408CC F7B40150 */  sdc1      $f20, 0x150($sp)
 .L802408D0:
-/* D64EB0 802408D0 3C03800A */  lui       $v1, 0x800a
-/* D64EB4 802408D4 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D64EB0 802408D0 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D64EB4 802408D4 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D64EB8 802408D8 00031080 */  sll       $v0, $v1, 2
 /* D64EBC 802408DC 00431021 */  addu      $v0, $v0, $v1
 /* D64EC0 802408E0 00021080 */  sll       $v0, $v0, 2
diff --git a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240D3C_D6531C.s b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240D3C_D6531C.s
index 9b5a4b9b4c..2a3005ccb3 100644
--- a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240D3C_D6531C.s
+++ b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240D3C_D6531C.s
@@ -25,13 +25,13 @@ glabel func_80240D3C_D6531C
 /* D65368 80240D88 08090378 */  j         .L80240DE0
 /* D6536C 80240D8C 00000000 */   nop      
 .L80240D90:
-/* D65370 80240D90 3C048024 */  lui       $a0, 0x8024
-/* D65374 80240D94 24840E84 */  addiu     $a0, $a0, 0xe84
+/* D65370 80240D90 3C048024 */  lui       $a0, %hi(D_80240E84)
+/* D65374 80240D94 24840E84 */  addiu     $a0, $a0, %lo(D_80240E84)
 /* D65378 80240D98 08090374 */  j         .L80240DD0
 /* D6537C 80240D9C 00000000 */   nop      
 .L80240DA0:
-/* D65380 80240DA0 3C048024 */  lui       $a0, 0x8024
-/* D65384 80240DA4 24840EEC */  addiu     $a0, $a0, 0xeec
+/* D65380 80240DA0 3C048024 */  lui       $a0, %hi(D_80240EEC)
+/* D65384 80240DA4 24840EEC */  addiu     $a0, $a0, %lo(D_80240EEC)
 /* D65388 80240DA8 08090374 */  j         .L80240DD0
 /* D6538C 80240DAC 00000000 */   nop      
 .L80240DB0:
@@ -42,8 +42,8 @@ glabel func_80240D3C_D6531C
 /* D653A0 80240DC0 10400007 */  beqz      $v0, .L80240DE0
 /* D653A4 80240DC4 00000000 */   nop      
 .L80240DC8:
-/* D653A8 80240DC8 3C048024 */  lui       $a0, 0x8024
-/* D653AC 80240DCC 24840EB8 */  addiu     $a0, $a0, 0xeb8
+/* D653A8 80240DC8 3C048024 */  lui       $a0, %hi(D_80240EB8)
+/* D653AC 80240DCC 24840EB8 */  addiu     $a0, $a0, %lo(D_80240EB8)
 .L80240DD0:
 /* D653B0 80240DD0 0C048C56 */  jal       bind_dynamic_entity_3
 /* D653B4 80240DD4 0000282D */   daddu    $a1, $zero, $zero
diff --git a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_8024114C_D6572C.s b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_8024114C_D6572C.s
index f914b699ac..97057ddbc2 100644
--- a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_8024114C_D6572C.s
+++ b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_8024114C_D6572C.s
@@ -6,11 +6,11 @@ glabel func_8024114C_D6572C
 /* D65730 80241150 AFBF0010 */  sw        $ra, 0x10($sp)
 /* D65734 80241154 10A00003 */  beqz      $a1, .L80241164
 /* D65738 80241158 8C86000C */   lw       $a2, 0xc($a0)
-/* D6573C 8024115C 3C018024 */  lui       $at, 0x8024
-/* D65740 80241160 AC2022CC */  sw        $zero, 0x22cc($at)
+/* D6573C 8024115C 3C018024 */  lui       $at, %hi(D_802422CC)
+/* D65740 80241160 AC2022CC */  sw        $zero, %lo(D_802422CC)($at)
 .L80241164:
-/* D65744 80241164 3C038024 */  lui       $v1, 0x8024
-/* D65748 80241168 246322CC */  addiu     $v1, $v1, 0x22cc
+/* D65744 80241164 3C038024 */  lui       $v1, %hi(D_802422CC)
+/* D65748 80241168 246322CC */  addiu     $v1, $v1, %lo(D_802422CC)
 /* D6574C 8024116C 8C620000 */  lw        $v0, ($v1)
 /* D65750 80241170 54400003 */  bnel      $v0, $zero, .L80241180
 /* D65754 80241174 AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_8024114C_D6572C
 /* D6575C 8024117C 0000102D */   daddu    $v0, $zero, $zero
 .L80241180:
 /* D65760 80241180 8CC50000 */  lw        $a1, ($a2)
-/* D65764 80241184 3C068024 */  lui       $a2, 0x8024
+/* D65764 80241184 3C068024 */  lui       $a2, %hi(D_802422D0)
 /* D65768 80241188 0C0B2026 */  jal       set_variable
-/* D6576C 8024118C 8CC622D0 */   lw       $a2, 0x22d0($a2)
+/* D6576C 8024118C 8CC622D0 */   lw       $a2, %lo(D_802422D0)($a2)
 /* D65770 80241190 24020002 */  addiu     $v0, $zero, 2
 .L80241194:
 /* D65774 80241194 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_802411A0_D65780.s b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_802411A0_D65780.s
index 3f99cba7da..c2c8ef9dae 100644
--- a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_802411A0_D65780.s
+++ b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_802411A0_D65780.s
@@ -7,12 +7,12 @@ glabel func_802411A0_D65780
 /* D65788 802411A8 8C82000C */  lw        $v0, 0xc($a0)
 /* D6578C 802411AC 0C0B1EAF */  jal       get_variable
 /* D65790 802411B0 8C450000 */   lw       $a1, ($v0)
-/* D65794 802411B4 3C018024 */  lui       $at, 0x8024
-/* D65798 802411B8 AC2222D0 */  sw        $v0, 0x22d0($at)
+/* D65794 802411B4 3C018024 */  lui       $at, %hi(D_802422D0)
+/* D65798 802411B8 AC2222D0 */  sw        $v0, %lo(D_802422D0)($at)
 /* D6579C 802411BC 24020002 */  addiu     $v0, $zero, 2
 /* D657A0 802411C0 8FBF0010 */  lw        $ra, 0x10($sp)
 /* D657A4 802411C4 24030001 */  addiu     $v1, $zero, 1
-/* D657A8 802411C8 3C018024 */  lui       $at, 0x8024
-/* D657AC 802411CC AC2322CC */  sw        $v1, 0x22cc($at)
+/* D657A8 802411C8 3C018024 */  lui       $at, %hi(D_802422CC)
+/* D657AC 802411CC AC2322CC */  sw        $v1, %lo(D_802422CC)($at)
 /* D657B0 802411D0 03E00008 */  jr        $ra
 /* D657B4 802411D4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_802411D8_D657B8.s b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_802411D8_D657B8.s
index 60ff537750..76588a93e1 100644
--- a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_802411D8_D657B8.s
+++ b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_802411D8_D657B8.s
@@ -13,8 +13,8 @@ glabel func_802411D8_D657B8
 /* D657D8 802411F8 8C620000 */  lw        $v0, ($v1)
 /* D657DC 802411FC 5040000A */  beql      $v0, $zero, .L80241228
 /* D657E0 80241200 00041080 */   sll      $v0, $a0, 2
-/* D657E4 80241204 3C058024 */  lui       $a1, 0x8024
-/* D657E8 80241208 24A53720 */  addiu     $a1, $a1, 0x3720
+/* D657E4 80241204 3C058024 */  lui       $a1, %hi(D_80243720)
+/* D657E8 80241208 24A53720 */  addiu     $a1, $a1, %lo(D_80243720)
 .L8024120C:
 /* D657EC 8024120C 24630004 */  addiu     $v1, $v1, 4
 /* D657F0 80241210 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_802411D8_D657B8
 /* D65800 80241220 24A50004 */   addiu    $a1, $a1, 4
 /* D65804 80241224 00041080 */  sll       $v0, $a0, 2
 .L80241228:
-/* D65808 80241228 3C018024 */  lui       $at, 0x8024
+/* D65808 80241228 3C018024 */  lui       $at, %hi(D_80243720)
 /* D6580C 8024122C 00220821 */  addu      $at, $at, $v0
-/* D65810 80241230 AC203720 */  sw        $zero, 0x3720($at)
+/* D65810 80241230 AC203720 */  sw        $zero, %lo(D_80243720)($at)
 /* D65814 80241234 08090499 */  j         .L80241264
 /* D65818 80241238 00000000 */   nop      
 .L8024123C:
-/* D6581C 8024123C 3C038024 */  lui       $v1, 0x8024
-/* D65820 80241240 24633720 */  addiu     $v1, $v1, 0x3720
+/* D6581C 8024123C 3C038024 */  lui       $v1, %hi(D_80243720)
+/* D65820 80241240 24633720 */  addiu     $v1, $v1, %lo(D_80243720)
 /* D65824 80241244 0060282D */  daddu     $a1, $v1, $zero
 .L80241248:
 /* D65828 80241248 24820010 */  addiu     $v0, $a0, 0x10
diff --git a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80241274_D65854.s b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80241274_D65854.s
index 5c7771654c..90c5fa68ff 100644
--- a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80241274_D65854.s
+++ b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80241274_D65854.s
@@ -13,8 +13,8 @@ glabel func_80241274_D65854
 /* D65874 80241294 8C620000 */  lw        $v0, ($v1)
 /* D65878 80241298 5040000A */  beql      $v0, $zero, .L802412C4
 /* D6587C 8024129C 00041080 */   sll      $v0, $a0, 2
-/* D65880 802412A0 3C058024 */  lui       $a1, 0x8024
-/* D65884 802412A4 24A538E8 */  addiu     $a1, $a1, 0x38e8
+/* D65880 802412A0 3C058024 */  lui       $a1, %hi(D_802438E8)
+/* D65884 802412A4 24A538E8 */  addiu     $a1, $a1, %lo(D_802438E8)
 .L802412A8:
 /* D65888 802412A8 24630004 */  addiu     $v1, $v1, 4
 /* D6588C 802412AC 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_80241274_D65854
 /* D6589C 802412BC 24A50004 */   addiu    $a1, $a1, 4
 /* D658A0 802412C0 00041080 */  sll       $v0, $a0, 2
 .L802412C4:
-/* D658A4 802412C4 3C018024 */  lui       $at, 0x8024
+/* D658A4 802412C4 3C018024 */  lui       $at, %hi(D_802438E8)
 /* D658A8 802412C8 00220821 */  addu      $at, $at, $v0
-/* D658AC 802412CC AC2038E8 */  sw        $zero, 0x38e8($at)
+/* D658AC 802412CC AC2038E8 */  sw        $zero, %lo(D_802438E8)($at)
 /* D658B0 802412D0 080904C0 */  j         .L80241300
 /* D658B4 802412D4 00000000 */   nop      
 .L802412D8:
-/* D658B8 802412D8 3C038024 */  lui       $v1, 0x8024
-/* D658BC 802412DC 246338E8 */  addiu     $v1, $v1, 0x38e8
+/* D658B8 802412D8 3C038024 */  lui       $v1, %hi(D_802438E8)
+/* D658BC 802412DC 246338E8 */  addiu     $v1, $v1, %lo(D_802438E8)
 /* D658C0 802412E0 0060282D */  daddu     $a1, $v1, $zero
 .L802412E4:
 /* D658C4 802412E4 24820080 */  addiu     $v0, $a0, 0x80
diff --git a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_802413D0_D659B0.s b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_802413D0_D659B0.s
index 2137587f27..457db02ef5 100644
--- a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_802413D0_D659B0.s
+++ b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_802413D0_D659B0.s
@@ -5,8 +5,8 @@ glabel func_802413D0_D659B0
 /* D659B0 802413D0 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* D659B4 802413D4 AFB00010 */  sw        $s0, 0x10($sp)
 /* D659B8 802413D8 0080802D */  daddu     $s0, $a0, $zero
-/* D659BC 802413DC 3C058024 */  lui       $a1, 0x8024
-/* D659C0 802413E0 24A5140C */  addiu     $a1, $a1, 0x140c
+/* D659BC 802413DC 3C058024 */  lui       $a1, %hi(D_8024140C)
+/* D659C0 802413E0 24A5140C */  addiu     $a1, $a1, %lo(D_8024140C)
 /* D659C4 802413E4 AFBF0014 */  sw        $ra, 0x14($sp)
 /* D659C8 802413E8 0C048C56 */  jal       bind_dynamic_entity_3
 /* D659CC 802413EC 0000202D */   daddu    $a0, $zero, $zero
diff --git a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_8024140C_D659EC.s b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_8024140C_D659EC.s
index 05bce9a683..0feb09bf28 100644
--- a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_8024140C_D659EC.s
+++ b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_8024140C_D659EC.s
@@ -16,8 +16,8 @@ glabel func_8024140C_D659EC
 /* D65A18 80241438 1060001B */  beqz      $v1, .L802414A8
 /* D65A1C 8024143C 0040802D */   daddu    $s0, $v0, $zero
 /* D65A20 80241440 C6000040 */  lwc1      $f0, 0x40($s0)
-/* D65A24 80241444 3C04800A */  lui       $a0, 0x800a
-/* D65A28 80241448 8484A634 */  lh        $a0, -0x59cc($a0)
+/* D65A24 80241444 3C04800A */  lui       $a0, %hi(D_8009A634)
+/* D65A28 80241448 8484A634 */  lh        $a0, %lo(D_8009A634)($a0)
 /* D65A2C 8024144C 27A20030 */  addiu     $v0, $sp, 0x30
 /* D65A30 80241450 AFA20010 */  sw        $v0, 0x10($sp)
 /* D65A34 80241454 27A20034 */  addiu     $v0, $sp, 0x34
@@ -33,8 +33,8 @@ glabel func_8024140C_D659EC
 /* D65A5C 8024147C 0220202D */  daddu     $a0, $s1, $zero
 /* D65A60 80241480 820500AA */  lb        $a1, 0xaa($s0)
 /* D65A64 80241484 8FA30038 */  lw        $v1, 0x38($sp)
-/* D65A68 80241488 3C028024 */  lui       $v0, 0x8024
-/* D65A6C 8024148C 244214BC */  addiu     $v0, $v0, 0x14bc
+/* D65A68 80241488 3C028024 */  lui       $v0, %hi(D_802414BC)
+/* D65A6C 8024148C 244214BC */  addiu     $v0, $v0, %lo(D_802414BC)
 /* D65A70 80241490 AFB00028 */  sw        $s0, 0x28($sp)
 /* D65A74 80241494 AFA2002C */  sw        $v0, 0x2c($sp)
 /* D65A78 80241498 00031823 */  negu      $v1, $v1
diff --git a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_802414BC_D65A9C.s b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_802414BC_D65A9C.s
index 3275827551..12b4de1f53 100644
--- a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_802414BC_D65A9C.s
+++ b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_802414BC_D65A9C.s
@@ -10,8 +10,8 @@ glabel func_802414BC_D65A9C
 /* D65AB0 802414D0 0C00E769 */  jal       func_80039DA4
 /* D65AB4 802414D4 0080882D */   daddu    $s1, $a0, $zero
 /* D65AB8 802414D8 44800000 */  mtc1      $zero, $f0
-/* D65ABC 802414DC 3C03800A */  lui       $v1, 0x800a
-/* D65AC0 802414E0 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D65ABC 802414DC 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D65AC0 802414E0 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D65AC4 802414E4 C6220034 */  lwc1      $f2, 0x34($s1)
 /* D65AC8 802414E8 00031080 */  sll       $v0, $v1, 2
 /* D65ACC 802414EC 00431021 */  addu      $v0, $v0, $v1
@@ -21,9 +21,9 @@ glabel func_802414BC_D65A9C
 /* D65ADC 802414FC 00431021 */  addu      $v0, $v0, $v1
 /* D65AE0 80241500 000210C0 */  sll       $v0, $v0, 3
 /* D65AE4 80241504 44060000 */  mfc1      $a2, $f0
-/* D65AE8 80241508 3C01800B */  lui       $at, 0x800b
+/* D65AE8 80241508 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* D65AEC 8024150C 00220821 */  addu      $at, $at, $v0
-/* D65AF0 80241510 C4201DEC */  lwc1      $f0, 0x1dec($at)
+/* D65AF0 80241510 C4201DEC */  lwc1      $f0, %lo(D_800B1DEC)($at)
 /* D65AF4 80241514 3C013F80 */  lui       $at, 0x3f80
 /* D65AF8 80241518 4481A000 */  mtc1      $at, $f20
 /* D65AFC 8024151C 46001080 */  add.s     $f2, $f2, $f0
diff --git a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_802400EC_D67DEC.s b/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_802400EC_D67DEC.s
index 5708677d15..a21cc4adf4 100644
--- a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_802400EC_D67DEC.s
+++ b/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_802400EC_D67DEC.s
@@ -5,8 +5,8 @@ glabel func_802400EC_D67DEC
 /* D67DEC 802400EC 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* D67DF0 802400F0 AFB00010 */  sw        $s0, 0x10($sp)
 /* D67DF4 802400F4 0080802D */  daddu     $s0, $a0, $zero
-/* D67DF8 802400F8 3C058024 */  lui       $a1, 0x8024
-/* D67DFC 802400FC 24A50128 */  addiu     $a1, $a1, 0x128
+/* D67DF8 802400F8 3C058024 */  lui       $a1, %hi(D_80240128)
+/* D67DFC 802400FC 24A50128 */  addiu     $a1, $a1, %lo(D_80240128)
 /* D67E00 80240100 AFBF0014 */  sw        $ra, 0x14($sp)
 /* D67E04 80240104 0C048C56 */  jal       bind_dynamic_entity_3
 /* D67E08 80240108 0000202D */   daddu    $a0, $zero, $zero
diff --git a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240128_D67E28.s b/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240128_D67E28.s
index d3c9059552..928dc4a2a6 100644
--- a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240128_D67E28.s
+++ b/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240128_D67E28.s
@@ -29,8 +29,8 @@ glabel func_80240128_D67E28
 /* D67E88 80240188 27A20034 */  addiu     $v0, $sp, 0x34
 /* D67E8C 8024018C AFA20014 */  sw        $v0, 0x14($sp)
 /* D67E90 80240190 C6000030 */  lwc1      $f0, 0x30($s0)
-/* D67E94 80240194 3C04800A */  lui       $a0, 0x800a
-/* D67E98 80240198 8484A634 */  lh        $a0, -0x59cc($a0)
+/* D67E94 80240194 3C04800A */  lui       $a0, %hi(D_8009A634)
+/* D67E98 80240198 8484A634 */  lh        $a0, %lo(D_8009A634)($a0)
 /* D67E9C 8024019C 46000007 */  neg.s     $f0, $f0
 /* D67EA0 802401A0 44070000 */  mfc1      $a3, $f0
 /* D67EA4 802401A4 27A20038 */  addiu     $v0, $sp, 0x38
@@ -67,8 +67,8 @@ glabel func_80240128_D67E28
 /* D67F1C 8024021C 54400022 */  bnel      $v0, $zero, .L802402A8
 /* D67F20 80240220 24110011 */   addiu    $s1, $zero, 0x11
 /* D67F24 80240224 9203000E */  lbu       $v1, 0xe($s0)
-/* D67F28 80240228 3C02802E */  lui       $v0, 0x802e
-/* D67F2C 8024022C 90429D70 */  lbu       $v0, -0x6290($v0)
+/* D67F28 80240228 3C02802E */  lui       $v0, %hi(D_802D9D70)
+/* D67F2C 8024022C 90429D70 */  lbu       $v0, %lo(D_802D9D70)($v0)
 /* D67F30 80240230 10620018 */  beq       $v1, $v0, .L80240294
 /* D67F34 80240234 2C6200FE */   sltiu    $v0, $v1, 0xfe
 /* D67F38 80240238 1040000B */  beqz      $v0, .L80240268
@@ -98,20 +98,20 @@ glabel func_80240128_D67E28
 /* D67F90 80240290 00000000 */   nop      
 .L80240294:
 /* D67F94 80240294 9202000E */  lbu       $v0, 0xe($s0)
-/* D67F98 80240298 3C01802E */  lui       $at, 0x802e
-/* D67F9C 8024029C A0229D70 */  sb        $v0, -0x6290($at)
+/* D67F98 80240298 3C01802E */  lui       $at, %hi(D_802D9D70)
+/* D67F9C 8024029C A0229D70 */  sb        $v0, %lo(D_802D9D70)($at)
 /* D67FA0 802402A0 080900AD */  j         .L802402B4
 /* D67FA4 802402A4 0240202D */   daddu    $a0, $s2, $zero
 .L802402A8:
-/* D67FA8 802402A8 3C01802E */  lui       $at, 0x802e
-/* D67FAC 802402AC A0209D70 */  sb        $zero, -0x6290($at)
+/* D67FA8 802402A8 3C01802E */  lui       $at, %hi(D_802D9D70)
+/* D67FAC 802402AC A0209D70 */  sb        $zero, %lo(D_802D9D70)($at)
 /* D67FB0 802402B0 0240202D */  daddu     $a0, $s2, $zero
 .L802402B4:
 /* D67FB4 802402B4 AC910000 */  sw        $s1, ($a0)
 /* D67FB8 802402B8 AC900008 */  sw        $s0, 8($a0)
 /* D67FBC 802402BC 8FA20038 */  lw        $v0, 0x38($sp)
-/* D67FC0 802402C0 3C038024 */  lui       $v1, 0x8024
-/* D67FC4 802402C4 246302F0 */  addiu     $v1, $v1, 0x2f0
+/* D67FC0 802402C0 3C038024 */  lui       $v1, %hi(D_802402F0)
+/* D67FC4 802402C4 246302F0 */  addiu     $v1, $v1, %lo(D_802402F0)
 /* D67FC8 802402C8 AC83000C */  sw        $v1, 0xc($a0)
 /* D67FCC 802402CC 00021023 */  negu      $v0, $v0
 /* D67FD0 802402D0 0C047644 */  jal       queue_render_task
diff --git a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_802402F0_D67FF0.s b/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_802402F0_D67FF0.s
index 6798643cbc..56311a56f5 100644
--- a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_802402F0_D67FF0.s
+++ b/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_802402F0_D67FF0.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_802402F0_D67FF0
-/* D67FF0 802402F0 3C03800A */  lui       $v1, 0x800a
-/* D67FF4 802402F4 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D67FF0 802402F0 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D67FF4 802402F4 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D67FF8 802402F8 3C07BF80 */  lui       $a3, 0xbf80
 /* D67FFC 802402FC 27BDFEC0 */  addiu     $sp, $sp, -0x140
 /* D68000 80240300 F7B40128 */  sdc1      $f20, 0x128($sp)
@@ -22,9 +22,9 @@ glabel func_802402F0_D67FF0
 /* D68034 80240334 000218C0 */  sll       $v1, $v0, 3
 /* D68038 80240338 00431021 */  addu      $v0, $v0, $v1
 /* D6803C 8024033C 000210C0 */  sll       $v0, $v0, 3
-/* D68040 80240340 3C01800B */  lui       $at, 0x800b
+/* D68040 80240340 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* D68044 80240344 00220821 */  addu      $at, $at, $v0
-/* D68048 80240348 C4361DEC */  lwc1      $f22, 0x1dec($at)
+/* D68048 80240348 C4361DEC */  lwc1      $f22, %lo(D_800B1DEC)($at)
 /* D6804C 8024034C 4406A000 */  mfc1      $a2, $f20
 /* D68050 80240350 4600B587 */  neg.s     $f22, $f22
 /* D68054 80240354 4405B000 */  mfc1      $a1, $f22
diff --git a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_8024049C_D6819C.s b/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_8024049C_D6819C.s
index cbfae4df8d..9186a7ced5 100644
--- a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_8024049C_D6819C.s
+++ b/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_8024049C_D6819C.s
@@ -11,8 +11,8 @@ glabel func_8024049C_D6819C
 /* D681B4 802404B4 28420002 */   slti     $v0, $v0, 2
 /* D681B8 802404B8 1040000C */  beqz      $v0, .L802404EC
 /* D681BC 802404BC 00000000 */   nop      
-/* D681C0 802404C0 3C058024 */  lui       $a1, 0x8024
-/* D681C4 802404C4 24A50500 */  addiu     $a1, $a1, 0x500
+/* D681C0 802404C0 3C058024 */  lui       $a1, %hi(D_80240500)
+/* D681C4 802404C4 24A50500 */  addiu     $a1, $a1, %lo(D_80240500)
 /* D681C8 802404C8 0C048C56 */  jal       bind_dynamic_entity_3
 /* D681CC 802404CC 0000202D */   daddu    $a0, $zero, $zero
 /* D681D0 802404D0 8E03013C */  lw        $v1, 0x13c($s0)
diff --git a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240500_D68200.s b/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240500_D68200.s
index 5c1528ee42..4e1b8dfa09 100644
--- a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240500_D68200.s
+++ b/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240500_D68200.s
@@ -28,8 +28,8 @@ glabel func_80240500_D68200
 /* D6825C 8024055C 27A20038 */  addiu     $v0, $sp, 0x38
 /* D68260 80240560 AFA20018 */  sw        $v0, 0x18($sp)
 /* D68264 80240564 C600002C */  lwc1      $f0, 0x2c($s0)
-/* D68268 80240568 3C04800A */  lui       $a0, 0x800a
-/* D6826C 8024056C 8484A634 */  lh        $a0, -0x59cc($a0)
+/* D68268 80240568 3C04800A */  lui       $a0, %hi(D_8009A634)
+/* D6826C 8024056C 8484A634 */  lh        $a0, %lo(D_8009A634)($a0)
 /* D68270 80240570 46000007 */  neg.s     $f0, $f0
 /* D68274 80240574 44060000 */  mfc1      $a2, $f0
 /* D68278 80240578 0C00B94E */  jal       get_screen_coords
@@ -44,8 +44,8 @@ glabel func_80240500_D68200
 /* D6829C 8024059C 54400022 */  bnel      $v0, $zero, .L80240628
 /* D682A0 802405A0 24120011 */   addiu    $s2, $zero, 0x11
 /* D682A4 802405A4 9203000E */  lbu       $v1, 0xe($s0)
-/* D682A8 802405A8 3C02802E */  lui       $v0, 0x802e
-/* D682AC 802405AC 90429D71 */  lbu       $v0, -0x628f($v0)
+/* D682A8 802405A8 3C02802E */  lui       $v0, %hi(D_802D9D71)
+/* D682AC 802405AC 90429D71 */  lbu       $v0, %lo(D_802D9D71)($v0)
 /* D682B0 802405B0 10620018 */  beq       $v1, $v0, .L80240614
 /* D682B4 802405B4 2C6200FE */   sltiu    $v0, $v1, 0xfe
 /* D682B8 802405B8 1040000B */  beqz      $v0, .L802405E8
@@ -75,17 +75,17 @@ glabel func_80240500_D68200
 /* D68310 80240610 00000000 */   nop      
 .L80240614:
 /* D68314 80240614 9202000E */  lbu       $v0, 0xe($s0)
-/* D68318 80240618 3C01802E */  lui       $at, 0x802e
-/* D6831C 8024061C A0229D71 */  sb        $v0, -0x628f($at)
+/* D68318 80240618 3C01802E */  lui       $at, %hi(D_802D9D71)
+/* D6831C 8024061C A0229D71 */  sb        $v0, %lo(D_802D9D71)($at)
 /* D68320 80240620 0809018C */  j         .L80240630
 /* D68324 80240624 00000000 */   nop      
 .L80240628:
-/* D68328 80240628 3C01802E */  lui       $at, 0x802e
-/* D6832C 8024062C A0209D71 */  sb        $zero, -0x628f($at)
+/* D68328 80240628 3C01802E */  lui       $at, %hi(D_802D9D71)
+/* D6832C 8024062C A0209D71 */  sb        $zero, %lo(D_802D9D71)($at)
 .L80240630:
 /* D68330 80240630 8FA20038 */  lw        $v0, 0x38($sp)
-/* D68334 80240634 3C048024 */  lui       $a0, 0x8024
-/* D68338 80240638 24840870 */  addiu     $a0, $a0, 0x870
+/* D68334 80240634 3C048024 */  lui       $a0, %hi(D_80240870)
+/* D68338 80240638 24840870 */  addiu     $a0, $a0, %lo(D_80240870)
 /* D6833C 8024063C AE320000 */  sw        $s2, ($s1)
 /* D68340 80240640 AE300008 */  sw        $s0, 8($s1)
 /* D68344 80240644 00021023 */  negu      $v0, $v0
@@ -95,8 +95,8 @@ glabel func_80240500_D68200
 /* D68354 80240654 00431024 */  and       $v0, $v0, $v1
 /* D68358 80240658 54400004 */  bnel      $v0, $zero, .L8024066C
 /* D6835C 8024065C AE24000C */   sw       $a0, 0xc($s1)
-/* D68360 80240660 3C048024 */  lui       $a0, 0x8024
-/* D68364 80240664 2484068C */  addiu     $a0, $a0, 0x68c
+/* D68360 80240660 3C048024 */  lui       $a0, %hi(D_8024068C)
+/* D68364 80240664 2484068C */  addiu     $a0, $a0, %lo(D_8024068C)
 /* D68368 80240668 AE24000C */  sw        $a0, 0xc($s1)
 .L8024066C:
 /* D6836C 8024066C 0C047644 */  jal       queue_render_task
diff --git a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_8024068C_D6838C.s b/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_8024068C_D6838C.s
index 0fd8e4a9fc..d643bc6b42 100644
--- a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_8024068C_D6838C.s
+++ b/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_8024068C_D6838C.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_8024068C_D6838C
-/* D6838C 8024068C 3C03800A */  lui       $v1, 0x800a
-/* D68390 80240690 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D6838C 8024068C 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D68390 80240690 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D68394 80240694 3C07BF80 */  lui       $a3, 0xbf80
 /* D68398 80240698 27BDFEC0 */  addiu     $sp, $sp, -0x140
 /* D6839C 8024069C F7B40128 */  sdc1      $f20, 0x128($sp)
@@ -22,9 +22,9 @@ glabel func_8024068C_D6838C
 /* D683D0 802406D0 000218C0 */  sll       $v1, $v0, 3
 /* D683D4 802406D4 00431021 */  addu      $v0, $v0, $v1
 /* D683D8 802406D8 000210C0 */  sll       $v0, $v0, 3
-/* D683DC 802406DC 3C01800B */  lui       $at, 0x800b
+/* D683DC 802406DC 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* D683E0 802406E0 00220821 */  addu      $at, $at, $v0
-/* D683E4 802406E4 C4361DEC */  lwc1      $f22, 0x1dec($at)
+/* D683E4 802406E4 C4361DEC */  lwc1      $f22, %lo(D_800B1DEC)($at)
 /* D683E8 802406E8 4406A000 */  mfc1      $a2, $f20
 /* D683EC 802406EC 4600B587 */  neg.s     $f22, $f22
 /* D683F0 802406F0 4405B000 */  mfc1      $a1, $f22
diff --git a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240870_D68570.s b/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240870_D68570.s
index 95c7062cf8..542d479908 100644
--- a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240870_D68570.s
+++ b/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240870_D68570.s
@@ -27,8 +27,8 @@ glabel func_80240870_D68570
 /* D685C8 802408C8 F7B80160 */  sdc1      $f24, 0x160($sp)
 /* D685CC 802408CC F7B40150 */  sdc1      $f20, 0x150($sp)
 .L802408D0:
-/* D685D0 802408D0 3C03800A */  lui       $v1, 0x800a
-/* D685D4 802408D4 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D685D0 802408D0 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D685D4 802408D4 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D685D8 802408D8 00031080 */  sll       $v0, $v1, 2
 /* D685DC 802408DC 00431021 */  addu      $v0, $v0, $v1
 /* D685E0 802408E0 00021080 */  sll       $v0, $v0, 2
diff --git a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240D3C_D68A3C.s b/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240D3C_D68A3C.s
index 756a258996..658339a42a 100644
--- a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240D3C_D68A3C.s
+++ b/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240D3C_D68A3C.s
@@ -25,13 +25,13 @@ glabel func_80240D3C_D68A3C
 /* D68A88 80240D88 08090378 */  j         .L80240DE0
 /* D68A8C 80240D8C 00000000 */   nop      
 .L80240D90:
-/* D68A90 80240D90 3C048024 */  lui       $a0, 0x8024
-/* D68A94 80240D94 24840E84 */  addiu     $a0, $a0, 0xe84
+/* D68A90 80240D90 3C048024 */  lui       $a0, %hi(D_80240E84)
+/* D68A94 80240D94 24840E84 */  addiu     $a0, $a0, %lo(D_80240E84)
 /* D68A98 80240D98 08090374 */  j         .L80240DD0
 /* D68A9C 80240D9C 00000000 */   nop      
 .L80240DA0:
-/* D68AA0 80240DA0 3C048024 */  lui       $a0, 0x8024
-/* D68AA4 80240DA4 24840EEC */  addiu     $a0, $a0, 0xeec
+/* D68AA0 80240DA0 3C048024 */  lui       $a0, %hi(D_80240EEC)
+/* D68AA4 80240DA4 24840EEC */  addiu     $a0, $a0, %lo(D_80240EEC)
 /* D68AA8 80240DA8 08090374 */  j         .L80240DD0
 /* D68AAC 80240DAC 00000000 */   nop      
 .L80240DB0:
@@ -42,8 +42,8 @@ glabel func_80240D3C_D68A3C
 /* D68AC0 80240DC0 10400007 */  beqz      $v0, .L80240DE0
 /* D68AC4 80240DC4 00000000 */   nop      
 .L80240DC8:
-/* D68AC8 80240DC8 3C048024 */  lui       $a0, 0x8024
-/* D68ACC 80240DCC 24840EB8 */  addiu     $a0, $a0, 0xeb8
+/* D68AC8 80240DC8 3C048024 */  lui       $a0, %hi(D_80240EB8)
+/* D68ACC 80240DCC 24840EB8 */  addiu     $a0, $a0, %lo(D_80240EB8)
 .L80240DD0:
 /* D68AD0 80240DD0 0C048C56 */  jal       bind_dynamic_entity_3
 /* D68AD4 80240DD4 0000282D */   daddu    $a1, $zero, $zero
diff --git a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240F20_D68C20.s b/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240F20_D68C20.s
index e0a141a9fd..5e31df5503 100644
--- a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240F20_D68C20.s
+++ b/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240F20_D68C20.s
@@ -4,8 +4,8 @@
 glabel func_80240F20_D68C20
 /* D68C20 80240F20 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* D68C24 80240F24 AFB00010 */  sw        $s0, 0x10($sp)
-/* D68C28 80240F28 3C108024 */  lui       $s0, 0x8024
-/* D68C2C 80240F2C 26101930 */  addiu     $s0, $s0, 0x1930
+/* D68C28 80240F28 3C108024 */  lui       $s0, %hi(D_80241930)
+/* D68C2C 80240F2C 26101930 */  addiu     $s0, $s0, %lo(D_80241930)
 /* D68C30 80240F30 AFBF0018 */  sw        $ra, 0x18($sp)
 /* D68C34 80240F34 AFB10014 */  sw        $s1, 0x14($sp)
 /* D68C38 80240F38 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_80240F20_D68C20
 /* D68C9C 80240F9C 28620010 */  slti      $v0, $v1, 0x10
 /* D68CA0 80240FA0 1440FFFA */  bnez      $v0, .L80240F8C
 /* D68CA4 80240FA4 24840004 */   addiu    $a0, $a0, 4
-/* D68CA8 80240FA8 3C108024 */  lui       $s0, 0x8024
-/* D68CAC 80240FAC 26101930 */  addiu     $s0, $s0, 0x1930
+/* D68CA8 80240FA8 3C108024 */  lui       $s0, %hi(D_80241930)
+/* D68CAC 80240FAC 26101930 */  addiu     $s0, $s0, %lo(D_80241930)
 /* D68CB0 80240FB0 0C00AB4B */  jal       heap_free
 /* D68CB4 80240FB4 8E040000 */   lw       $a0, ($s0)
 /* D68CB8 80240FB8 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_802400EC_D69C0C.s b/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_802400EC_D69C0C.s
index 7af4aefb96..1bef43c109 100644
--- a/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_802400EC_D69C0C.s
+++ b/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_802400EC_D69C0C.s
@@ -5,8 +5,8 @@ glabel func_802400EC_D69C0C
 /* D69C0C 802400EC 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* D69C10 802400F0 AFB00010 */  sw        $s0, 0x10($sp)
 /* D69C14 802400F4 0080802D */  daddu     $s0, $a0, $zero
-/* D69C18 802400F8 3C058024 */  lui       $a1, 0x8024
-/* D69C1C 802400FC 24A50128 */  addiu     $a1, $a1, 0x128
+/* D69C18 802400F8 3C058024 */  lui       $a1, %hi(D_80240128)
+/* D69C1C 802400FC 24A50128 */  addiu     $a1, $a1, %lo(D_80240128)
 /* D69C20 80240100 AFBF0014 */  sw        $ra, 0x14($sp)
 /* D69C24 80240104 0C048C56 */  jal       bind_dynamic_entity_3
 /* D69C28 80240108 0000202D */   daddu    $a0, $zero, $zero
diff --git a/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240128_D69C48.s b/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240128_D69C48.s
index 19191cd88a..42066eda33 100644
--- a/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240128_D69C48.s
+++ b/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240128_D69C48.s
@@ -29,8 +29,8 @@ glabel func_80240128_D69C48
 /* D69CA8 80240188 27A20034 */  addiu     $v0, $sp, 0x34
 /* D69CAC 8024018C AFA20014 */  sw        $v0, 0x14($sp)
 /* D69CB0 80240190 C6000030 */  lwc1      $f0, 0x30($s0)
-/* D69CB4 80240194 3C04800A */  lui       $a0, 0x800a
-/* D69CB8 80240198 8484A634 */  lh        $a0, -0x59cc($a0)
+/* D69CB4 80240194 3C04800A */  lui       $a0, %hi(D_8009A634)
+/* D69CB8 80240198 8484A634 */  lh        $a0, %lo(D_8009A634)($a0)
 /* D69CBC 8024019C 46000007 */  neg.s     $f0, $f0
 /* D69CC0 802401A0 44070000 */  mfc1      $a3, $f0
 /* D69CC4 802401A4 27A20038 */  addiu     $v0, $sp, 0x38
@@ -67,8 +67,8 @@ glabel func_80240128_D69C48
 /* D69D3C 8024021C 54400022 */  bnel      $v0, $zero, .L802402A8
 /* D69D40 80240220 24110011 */   addiu    $s1, $zero, 0x11
 /* D69D44 80240224 9203000E */  lbu       $v1, 0xe($s0)
-/* D69D48 80240228 3C02802E */  lui       $v0, 0x802e
-/* D69D4C 8024022C 90429D70 */  lbu       $v0, -0x6290($v0)
+/* D69D48 80240228 3C02802E */  lui       $v0, %hi(D_802D9D70)
+/* D69D4C 8024022C 90429D70 */  lbu       $v0, %lo(D_802D9D70)($v0)
 /* D69D50 80240230 10620018 */  beq       $v1, $v0, .L80240294
 /* D69D54 80240234 2C6200FE */   sltiu    $v0, $v1, 0xfe
 /* D69D58 80240238 1040000B */  beqz      $v0, .L80240268
@@ -98,20 +98,20 @@ glabel func_80240128_D69C48
 /* D69DB0 80240290 00000000 */   nop      
 .L80240294:
 /* D69DB4 80240294 9202000E */  lbu       $v0, 0xe($s0)
-/* D69DB8 80240298 3C01802E */  lui       $at, 0x802e
-/* D69DBC 8024029C A0229D70 */  sb        $v0, -0x6290($at)
+/* D69DB8 80240298 3C01802E */  lui       $at, %hi(D_802D9D70)
+/* D69DBC 8024029C A0229D70 */  sb        $v0, %lo(D_802D9D70)($at)
 /* D69DC0 802402A0 080900AD */  j         .L802402B4
 /* D69DC4 802402A4 0240202D */   daddu    $a0, $s2, $zero
 .L802402A8:
-/* D69DC8 802402A8 3C01802E */  lui       $at, 0x802e
-/* D69DCC 802402AC A0209D70 */  sb        $zero, -0x6290($at)
+/* D69DC8 802402A8 3C01802E */  lui       $at, %hi(D_802D9D70)
+/* D69DCC 802402AC A0209D70 */  sb        $zero, %lo(D_802D9D70)($at)
 /* D69DD0 802402B0 0240202D */  daddu     $a0, $s2, $zero
 .L802402B4:
 /* D69DD4 802402B4 AC910000 */  sw        $s1, ($a0)
 /* D69DD8 802402B8 AC900008 */  sw        $s0, 8($a0)
 /* D69DDC 802402BC 8FA20038 */  lw        $v0, 0x38($sp)
-/* D69DE0 802402C0 3C038024 */  lui       $v1, 0x8024
-/* D69DE4 802402C4 246302F0 */  addiu     $v1, $v1, 0x2f0
+/* D69DE0 802402C0 3C038024 */  lui       $v1, %hi(D_802402F0)
+/* D69DE4 802402C4 246302F0 */  addiu     $v1, $v1, %lo(D_802402F0)
 /* D69DE8 802402C8 AC83000C */  sw        $v1, 0xc($a0)
 /* D69DEC 802402CC 00021023 */  negu      $v0, $v0
 /* D69DF0 802402D0 0C047644 */  jal       queue_render_task
diff --git a/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_802402F0_D69E10.s b/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_802402F0_D69E10.s
index 0695d79439..69af6ffcd3 100644
--- a/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_802402F0_D69E10.s
+++ b/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_802402F0_D69E10.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_802402F0_D69E10
-/* D69E10 802402F0 3C03800A */  lui       $v1, 0x800a
-/* D69E14 802402F4 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D69E10 802402F0 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D69E14 802402F4 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D69E18 802402F8 3C07BF80 */  lui       $a3, 0xbf80
 /* D69E1C 802402FC 27BDFEC0 */  addiu     $sp, $sp, -0x140
 /* D69E20 80240300 F7B40128 */  sdc1      $f20, 0x128($sp)
@@ -22,9 +22,9 @@ glabel func_802402F0_D69E10
 /* D69E54 80240334 000218C0 */  sll       $v1, $v0, 3
 /* D69E58 80240338 00431021 */  addu      $v0, $v0, $v1
 /* D69E5C 8024033C 000210C0 */  sll       $v0, $v0, 3
-/* D69E60 80240340 3C01800B */  lui       $at, 0x800b
+/* D69E60 80240340 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* D69E64 80240344 00220821 */  addu      $at, $at, $v0
-/* D69E68 80240348 C4361DEC */  lwc1      $f22, 0x1dec($at)
+/* D69E68 80240348 C4361DEC */  lwc1      $f22, %lo(D_800B1DEC)($at)
 /* D69E6C 8024034C 4406A000 */  mfc1      $a2, $f20
 /* D69E70 80240350 4600B587 */  neg.s     $f22, $f22
 /* D69E74 80240354 4405B000 */  mfc1      $a1, $f22
diff --git a/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_8024049C_D69FBC.s b/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_8024049C_D69FBC.s
index ca61b6abe5..7d0c1187e9 100644
--- a/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_8024049C_D69FBC.s
+++ b/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_8024049C_D69FBC.s
@@ -11,8 +11,8 @@ glabel func_8024049C_D69FBC
 /* D69FD4 802404B4 28420002 */   slti     $v0, $v0, 2
 /* D69FD8 802404B8 1040000C */  beqz      $v0, .L802404EC
 /* D69FDC 802404BC 00000000 */   nop      
-/* D69FE0 802404C0 3C058024 */  lui       $a1, 0x8024
-/* D69FE4 802404C4 24A50500 */  addiu     $a1, $a1, 0x500
+/* D69FE0 802404C0 3C058024 */  lui       $a1, %hi(D_80240500)
+/* D69FE4 802404C4 24A50500 */  addiu     $a1, $a1, %lo(D_80240500)
 /* D69FE8 802404C8 0C048C56 */  jal       bind_dynamic_entity_3
 /* D69FEC 802404CC 0000202D */   daddu    $a0, $zero, $zero
 /* D69FF0 802404D0 8E03013C */  lw        $v1, 0x13c($s0)
diff --git a/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240500_D6A020.s b/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240500_D6A020.s
index 3feb2b1e67..25a865ed9e 100644
--- a/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240500_D6A020.s
+++ b/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240500_D6A020.s
@@ -28,8 +28,8 @@ glabel func_80240500_D6A020
 /* D6A07C 8024055C 27A20038 */  addiu     $v0, $sp, 0x38
 /* D6A080 80240560 AFA20018 */  sw        $v0, 0x18($sp)
 /* D6A084 80240564 C600002C */  lwc1      $f0, 0x2c($s0)
-/* D6A088 80240568 3C04800A */  lui       $a0, 0x800a
-/* D6A08C 8024056C 8484A634 */  lh        $a0, -0x59cc($a0)
+/* D6A088 80240568 3C04800A */  lui       $a0, %hi(D_8009A634)
+/* D6A08C 8024056C 8484A634 */  lh        $a0, %lo(D_8009A634)($a0)
 /* D6A090 80240570 46000007 */  neg.s     $f0, $f0
 /* D6A094 80240574 44060000 */  mfc1      $a2, $f0
 /* D6A098 80240578 0C00B94E */  jal       get_screen_coords
@@ -44,8 +44,8 @@ glabel func_80240500_D6A020
 /* D6A0BC 8024059C 54400022 */  bnel      $v0, $zero, .L80240628
 /* D6A0C0 802405A0 24120011 */   addiu    $s2, $zero, 0x11
 /* D6A0C4 802405A4 9203000E */  lbu       $v1, 0xe($s0)
-/* D6A0C8 802405A8 3C02802E */  lui       $v0, 0x802e
-/* D6A0CC 802405AC 90429D71 */  lbu       $v0, -0x628f($v0)
+/* D6A0C8 802405A8 3C02802E */  lui       $v0, %hi(D_802D9D71)
+/* D6A0CC 802405AC 90429D71 */  lbu       $v0, %lo(D_802D9D71)($v0)
 /* D6A0D0 802405B0 10620018 */  beq       $v1, $v0, .L80240614
 /* D6A0D4 802405B4 2C6200FE */   sltiu    $v0, $v1, 0xfe
 /* D6A0D8 802405B8 1040000B */  beqz      $v0, .L802405E8
@@ -75,17 +75,17 @@ glabel func_80240500_D6A020
 /* D6A130 80240610 00000000 */   nop      
 .L80240614:
 /* D6A134 80240614 9202000E */  lbu       $v0, 0xe($s0)
-/* D6A138 80240618 3C01802E */  lui       $at, 0x802e
-/* D6A13C 8024061C A0229D71 */  sb        $v0, -0x628f($at)
+/* D6A138 80240618 3C01802E */  lui       $at, %hi(D_802D9D71)
+/* D6A13C 8024061C A0229D71 */  sb        $v0, %lo(D_802D9D71)($at)
 /* D6A140 80240620 0809018C */  j         .L80240630
 /* D6A144 80240624 00000000 */   nop      
 .L80240628:
-/* D6A148 80240628 3C01802E */  lui       $at, 0x802e
-/* D6A14C 8024062C A0209D71 */  sb        $zero, -0x628f($at)
+/* D6A148 80240628 3C01802E */  lui       $at, %hi(D_802D9D71)
+/* D6A14C 8024062C A0209D71 */  sb        $zero, %lo(D_802D9D71)($at)
 .L80240630:
 /* D6A150 80240630 8FA20038 */  lw        $v0, 0x38($sp)
-/* D6A154 80240634 3C048024 */  lui       $a0, 0x8024
-/* D6A158 80240638 24840870 */  addiu     $a0, $a0, 0x870
+/* D6A154 80240634 3C048024 */  lui       $a0, %hi(D_80240870)
+/* D6A158 80240638 24840870 */  addiu     $a0, $a0, %lo(D_80240870)
 /* D6A15C 8024063C AE320000 */  sw        $s2, ($s1)
 /* D6A160 80240640 AE300008 */  sw        $s0, 8($s1)
 /* D6A164 80240644 00021023 */  negu      $v0, $v0
@@ -95,8 +95,8 @@ glabel func_80240500_D6A020
 /* D6A174 80240654 00431024 */  and       $v0, $v0, $v1
 /* D6A178 80240658 54400004 */  bnel      $v0, $zero, .L8024066C
 /* D6A17C 8024065C AE24000C */   sw       $a0, 0xc($s1)
-/* D6A180 80240660 3C048024 */  lui       $a0, 0x8024
-/* D6A184 80240664 2484068C */  addiu     $a0, $a0, 0x68c
+/* D6A180 80240660 3C048024 */  lui       $a0, %hi(D_8024068C)
+/* D6A184 80240664 2484068C */  addiu     $a0, $a0, %lo(D_8024068C)
 /* D6A188 80240668 AE24000C */  sw        $a0, 0xc($s1)
 .L8024066C:
 /* D6A18C 8024066C 0C047644 */  jal       queue_render_task
diff --git a/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_8024068C_D6A1AC.s b/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_8024068C_D6A1AC.s
index d0f6a4290e..99842dfb2b 100644
--- a/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_8024068C_D6A1AC.s
+++ b/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_8024068C_D6A1AC.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_8024068C_D6A1AC
-/* D6A1AC 8024068C 3C03800A */  lui       $v1, 0x800a
-/* D6A1B0 80240690 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D6A1AC 8024068C 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D6A1B0 80240690 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D6A1B4 80240694 3C07BF80 */  lui       $a3, 0xbf80
 /* D6A1B8 80240698 27BDFEC0 */  addiu     $sp, $sp, -0x140
 /* D6A1BC 8024069C F7B40128 */  sdc1      $f20, 0x128($sp)
@@ -22,9 +22,9 @@ glabel func_8024068C_D6A1AC
 /* D6A1F0 802406D0 000218C0 */  sll       $v1, $v0, 3
 /* D6A1F4 802406D4 00431021 */  addu      $v0, $v0, $v1
 /* D6A1F8 802406D8 000210C0 */  sll       $v0, $v0, 3
-/* D6A1FC 802406DC 3C01800B */  lui       $at, 0x800b
+/* D6A1FC 802406DC 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* D6A200 802406E0 00220821 */  addu      $at, $at, $v0
-/* D6A204 802406E4 C4361DEC */  lwc1      $f22, 0x1dec($at)
+/* D6A204 802406E4 C4361DEC */  lwc1      $f22, %lo(D_800B1DEC)($at)
 /* D6A208 802406E8 4406A000 */  mfc1      $a2, $f20
 /* D6A20C 802406EC 4600B587 */  neg.s     $f22, $f22
 /* D6A210 802406F0 4405B000 */  mfc1      $a1, $f22
diff --git a/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240870_D6A390.s b/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240870_D6A390.s
index c0e07c2807..252f1ce80a 100644
--- a/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240870_D6A390.s
+++ b/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240870_D6A390.s
@@ -27,8 +27,8 @@ glabel func_80240870_D6A390
 /* D6A3E8 802408C8 F7B80160 */  sdc1      $f24, 0x160($sp)
 /* D6A3EC 802408CC F7B40150 */  sdc1      $f20, 0x150($sp)
 .L802408D0:
-/* D6A3F0 802408D0 3C03800A */  lui       $v1, 0x800a
-/* D6A3F4 802408D4 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D6A3F0 802408D0 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D6A3F4 802408D4 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D6A3F8 802408D8 00031080 */  sll       $v0, $v1, 2
 /* D6A3FC 802408DC 00431021 */  addu      $v0, $v0, $v1
 /* D6A400 802408E0 00021080 */  sll       $v0, $v0, 2
diff --git a/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240D3C_D6A85C.s b/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240D3C_D6A85C.s
index e82be80eb5..663f64d05f 100644
--- a/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240D3C_D6A85C.s
+++ b/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240D3C_D6A85C.s
@@ -25,13 +25,13 @@ glabel func_80240D3C_D6A85C
 /* D6A8A8 80240D88 08090378 */  j         .L80240DE0
 /* D6A8AC 80240D8C 00000000 */   nop      
 .L80240D90:
-/* D6A8B0 80240D90 3C048024 */  lui       $a0, 0x8024
-/* D6A8B4 80240D94 24840E84 */  addiu     $a0, $a0, 0xe84
+/* D6A8B0 80240D90 3C048024 */  lui       $a0, %hi(D_80240E84)
+/* D6A8B4 80240D94 24840E84 */  addiu     $a0, $a0, %lo(D_80240E84)
 /* D6A8B8 80240D98 08090374 */  j         .L80240DD0
 /* D6A8BC 80240D9C 00000000 */   nop      
 .L80240DA0:
-/* D6A8C0 80240DA0 3C048024 */  lui       $a0, 0x8024
-/* D6A8C4 80240DA4 24840EEC */  addiu     $a0, $a0, 0xeec
+/* D6A8C0 80240DA0 3C048024 */  lui       $a0, %hi(D_80240EEC)
+/* D6A8C4 80240DA4 24840EEC */  addiu     $a0, $a0, %lo(D_80240EEC)
 /* D6A8C8 80240DA8 08090374 */  j         .L80240DD0
 /* D6A8CC 80240DAC 00000000 */   nop      
 .L80240DB0:
@@ -42,8 +42,8 @@ glabel func_80240D3C_D6A85C
 /* D6A8E0 80240DC0 10400007 */  beqz      $v0, .L80240DE0
 /* D6A8E4 80240DC4 00000000 */   nop      
 .L80240DC8:
-/* D6A8E8 80240DC8 3C048024 */  lui       $a0, 0x8024
-/* D6A8EC 80240DCC 24840EB8 */  addiu     $a0, $a0, 0xeb8
+/* D6A8E8 80240DC8 3C048024 */  lui       $a0, %hi(D_80240EB8)
+/* D6A8EC 80240DCC 24840EB8 */  addiu     $a0, $a0, %lo(D_80240EB8)
 .L80240DD0:
 /* D6A8F0 80240DD0 0C048C56 */  jal       bind_dynamic_entity_3
 /* D6A8F4 80240DD4 0000282D */   daddu    $a1, $zero, $zero
diff --git a/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_802400EC_D6B70C.s b/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_802400EC_D6B70C.s
index af4638d959..3a3a29d94f 100644
--- a/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_802400EC_D6B70C.s
+++ b/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_802400EC_D6B70C.s
@@ -5,8 +5,8 @@ glabel func_802400EC_D6B70C
 /* D6B70C 802400EC 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* D6B710 802400F0 AFB00010 */  sw        $s0, 0x10($sp)
 /* D6B714 802400F4 0080802D */  daddu     $s0, $a0, $zero
-/* D6B718 802400F8 3C058024 */  lui       $a1, 0x8024
-/* D6B71C 802400FC 24A50128 */  addiu     $a1, $a1, 0x128
+/* D6B718 802400F8 3C058024 */  lui       $a1, %hi(D_80240128)
+/* D6B71C 802400FC 24A50128 */  addiu     $a1, $a1, %lo(D_80240128)
 /* D6B720 80240100 AFBF0014 */  sw        $ra, 0x14($sp)
 /* D6B724 80240104 0C048C56 */  jal       bind_dynamic_entity_3
 /* D6B728 80240108 0000202D */   daddu    $a0, $zero, $zero
diff --git a/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240128_D6B748.s b/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240128_D6B748.s
index 2fb9e90fc9..f7db24b7dc 100644
--- a/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240128_D6B748.s
+++ b/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240128_D6B748.s
@@ -29,8 +29,8 @@ glabel func_80240128_D6B748
 /* D6B7A8 80240188 27A20034 */  addiu     $v0, $sp, 0x34
 /* D6B7AC 8024018C AFA20014 */  sw        $v0, 0x14($sp)
 /* D6B7B0 80240190 C6000030 */  lwc1      $f0, 0x30($s0)
-/* D6B7B4 80240194 3C04800A */  lui       $a0, 0x800a
-/* D6B7B8 80240198 8484A634 */  lh        $a0, -0x59cc($a0)
+/* D6B7B4 80240194 3C04800A */  lui       $a0, %hi(D_8009A634)
+/* D6B7B8 80240198 8484A634 */  lh        $a0, %lo(D_8009A634)($a0)
 /* D6B7BC 8024019C 46000007 */  neg.s     $f0, $f0
 /* D6B7C0 802401A0 44070000 */  mfc1      $a3, $f0
 /* D6B7C4 802401A4 27A20038 */  addiu     $v0, $sp, 0x38
@@ -67,8 +67,8 @@ glabel func_80240128_D6B748
 /* D6B83C 8024021C 54400022 */  bnel      $v0, $zero, .L802402A8
 /* D6B840 80240220 24110011 */   addiu    $s1, $zero, 0x11
 /* D6B844 80240224 9203000E */  lbu       $v1, 0xe($s0)
-/* D6B848 80240228 3C02802E */  lui       $v0, 0x802e
-/* D6B84C 8024022C 90429D70 */  lbu       $v0, -0x6290($v0)
+/* D6B848 80240228 3C02802E */  lui       $v0, %hi(D_802D9D70)
+/* D6B84C 8024022C 90429D70 */  lbu       $v0, %lo(D_802D9D70)($v0)
 /* D6B850 80240230 10620018 */  beq       $v1, $v0, .L80240294
 /* D6B854 80240234 2C6200FE */   sltiu    $v0, $v1, 0xfe
 /* D6B858 80240238 1040000B */  beqz      $v0, .L80240268
@@ -98,20 +98,20 @@ glabel func_80240128_D6B748
 /* D6B8B0 80240290 00000000 */   nop      
 .L80240294:
 /* D6B8B4 80240294 9202000E */  lbu       $v0, 0xe($s0)
-/* D6B8B8 80240298 3C01802E */  lui       $at, 0x802e
-/* D6B8BC 8024029C A0229D70 */  sb        $v0, -0x6290($at)
+/* D6B8B8 80240298 3C01802E */  lui       $at, %hi(D_802D9D70)
+/* D6B8BC 8024029C A0229D70 */  sb        $v0, %lo(D_802D9D70)($at)
 /* D6B8C0 802402A0 080900AD */  j         .L802402B4
 /* D6B8C4 802402A4 0240202D */   daddu    $a0, $s2, $zero
 .L802402A8:
-/* D6B8C8 802402A8 3C01802E */  lui       $at, 0x802e
-/* D6B8CC 802402AC A0209D70 */  sb        $zero, -0x6290($at)
+/* D6B8C8 802402A8 3C01802E */  lui       $at, %hi(D_802D9D70)
+/* D6B8CC 802402AC A0209D70 */  sb        $zero, %lo(D_802D9D70)($at)
 /* D6B8D0 802402B0 0240202D */  daddu     $a0, $s2, $zero
 .L802402B4:
 /* D6B8D4 802402B4 AC910000 */  sw        $s1, ($a0)
 /* D6B8D8 802402B8 AC900008 */  sw        $s0, 8($a0)
 /* D6B8DC 802402BC 8FA20038 */  lw        $v0, 0x38($sp)
-/* D6B8E0 802402C0 3C038024 */  lui       $v1, 0x8024
-/* D6B8E4 802402C4 246302F0 */  addiu     $v1, $v1, 0x2f0
+/* D6B8E0 802402C0 3C038024 */  lui       $v1, %hi(D_802402F0)
+/* D6B8E4 802402C4 246302F0 */  addiu     $v1, $v1, %lo(D_802402F0)
 /* D6B8E8 802402C8 AC83000C */  sw        $v1, 0xc($a0)
 /* D6B8EC 802402CC 00021023 */  negu      $v0, $v0
 /* D6B8F0 802402D0 0C047644 */  jal       queue_render_task
diff --git a/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_802402F0_D6B910.s b/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_802402F0_D6B910.s
index e05bcd5d64..3cd4668407 100644
--- a/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_802402F0_D6B910.s
+++ b/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_802402F0_D6B910.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_802402F0_D6B910
-/* D6B910 802402F0 3C03800A */  lui       $v1, 0x800a
-/* D6B914 802402F4 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D6B910 802402F0 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D6B914 802402F4 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D6B918 802402F8 3C07BF80 */  lui       $a3, 0xbf80
 /* D6B91C 802402FC 27BDFEC0 */  addiu     $sp, $sp, -0x140
 /* D6B920 80240300 F7B40128 */  sdc1      $f20, 0x128($sp)
@@ -22,9 +22,9 @@ glabel func_802402F0_D6B910
 /* D6B954 80240334 000218C0 */  sll       $v1, $v0, 3
 /* D6B958 80240338 00431021 */  addu      $v0, $v0, $v1
 /* D6B95C 8024033C 000210C0 */  sll       $v0, $v0, 3
-/* D6B960 80240340 3C01800B */  lui       $at, 0x800b
+/* D6B960 80240340 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* D6B964 80240344 00220821 */  addu      $at, $at, $v0
-/* D6B968 80240348 C4361DEC */  lwc1      $f22, 0x1dec($at)
+/* D6B968 80240348 C4361DEC */  lwc1      $f22, %lo(D_800B1DEC)($at)
 /* D6B96C 8024034C 4406A000 */  mfc1      $a2, $f20
 /* D6B970 80240350 4600B587 */  neg.s     $f22, $f22
 /* D6B974 80240354 4405B000 */  mfc1      $a1, $f22
diff --git a/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_8024049C_D6BABC.s b/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_8024049C_D6BABC.s
index ec75aa47d5..b42387a6d3 100644
--- a/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_8024049C_D6BABC.s
+++ b/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_8024049C_D6BABC.s
@@ -11,8 +11,8 @@ glabel func_8024049C_D6BABC
 /* D6BAD4 802404B4 28420002 */   slti     $v0, $v0, 2
 /* D6BAD8 802404B8 1040000C */  beqz      $v0, .L802404EC
 /* D6BADC 802404BC 00000000 */   nop      
-/* D6BAE0 802404C0 3C058024 */  lui       $a1, 0x8024
-/* D6BAE4 802404C4 24A50500 */  addiu     $a1, $a1, 0x500
+/* D6BAE0 802404C0 3C058024 */  lui       $a1, %hi(D_80240500)
+/* D6BAE4 802404C4 24A50500 */  addiu     $a1, $a1, %lo(D_80240500)
 /* D6BAE8 802404C8 0C048C56 */  jal       bind_dynamic_entity_3
 /* D6BAEC 802404CC 0000202D */   daddu    $a0, $zero, $zero
 /* D6BAF0 802404D0 8E03013C */  lw        $v1, 0x13c($s0)
diff --git a/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240500_D6BB20.s b/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240500_D6BB20.s
index 89130d77cb..afbf5aff56 100644
--- a/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240500_D6BB20.s
+++ b/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240500_D6BB20.s
@@ -28,8 +28,8 @@ glabel func_80240500_D6BB20
 /* D6BB7C 8024055C 27A20038 */  addiu     $v0, $sp, 0x38
 /* D6BB80 80240560 AFA20018 */  sw        $v0, 0x18($sp)
 /* D6BB84 80240564 C600002C */  lwc1      $f0, 0x2c($s0)
-/* D6BB88 80240568 3C04800A */  lui       $a0, 0x800a
-/* D6BB8C 8024056C 8484A634 */  lh        $a0, -0x59cc($a0)
+/* D6BB88 80240568 3C04800A */  lui       $a0, %hi(D_8009A634)
+/* D6BB8C 8024056C 8484A634 */  lh        $a0, %lo(D_8009A634)($a0)
 /* D6BB90 80240570 46000007 */  neg.s     $f0, $f0
 /* D6BB94 80240574 44060000 */  mfc1      $a2, $f0
 /* D6BB98 80240578 0C00B94E */  jal       get_screen_coords
@@ -44,8 +44,8 @@ glabel func_80240500_D6BB20
 /* D6BBBC 8024059C 54400022 */  bnel      $v0, $zero, .L80240628
 /* D6BBC0 802405A0 24120011 */   addiu    $s2, $zero, 0x11
 /* D6BBC4 802405A4 9203000E */  lbu       $v1, 0xe($s0)
-/* D6BBC8 802405A8 3C02802E */  lui       $v0, 0x802e
-/* D6BBCC 802405AC 90429D71 */  lbu       $v0, -0x628f($v0)
+/* D6BBC8 802405A8 3C02802E */  lui       $v0, %hi(D_802D9D71)
+/* D6BBCC 802405AC 90429D71 */  lbu       $v0, %lo(D_802D9D71)($v0)
 /* D6BBD0 802405B0 10620018 */  beq       $v1, $v0, .L80240614
 /* D6BBD4 802405B4 2C6200FE */   sltiu    $v0, $v1, 0xfe
 /* D6BBD8 802405B8 1040000B */  beqz      $v0, .L802405E8
@@ -75,17 +75,17 @@ glabel func_80240500_D6BB20
 /* D6BC30 80240610 00000000 */   nop      
 .L80240614:
 /* D6BC34 80240614 9202000E */  lbu       $v0, 0xe($s0)
-/* D6BC38 80240618 3C01802E */  lui       $at, 0x802e
-/* D6BC3C 8024061C A0229D71 */  sb        $v0, -0x628f($at)
+/* D6BC38 80240618 3C01802E */  lui       $at, %hi(D_802D9D71)
+/* D6BC3C 8024061C A0229D71 */  sb        $v0, %lo(D_802D9D71)($at)
 /* D6BC40 80240620 0809018C */  j         .L80240630
 /* D6BC44 80240624 00000000 */   nop      
 .L80240628:
-/* D6BC48 80240628 3C01802E */  lui       $at, 0x802e
-/* D6BC4C 8024062C A0209D71 */  sb        $zero, -0x628f($at)
+/* D6BC48 80240628 3C01802E */  lui       $at, %hi(D_802D9D71)
+/* D6BC4C 8024062C A0209D71 */  sb        $zero, %lo(D_802D9D71)($at)
 .L80240630:
 /* D6BC50 80240630 8FA20038 */  lw        $v0, 0x38($sp)
-/* D6BC54 80240634 3C048024 */  lui       $a0, 0x8024
-/* D6BC58 80240638 24840870 */  addiu     $a0, $a0, 0x870
+/* D6BC54 80240634 3C048024 */  lui       $a0, %hi(D_80240870)
+/* D6BC58 80240638 24840870 */  addiu     $a0, $a0, %lo(D_80240870)
 /* D6BC5C 8024063C AE320000 */  sw        $s2, ($s1)
 /* D6BC60 80240640 AE300008 */  sw        $s0, 8($s1)
 /* D6BC64 80240644 00021023 */  negu      $v0, $v0
@@ -95,8 +95,8 @@ glabel func_80240500_D6BB20
 /* D6BC74 80240654 00431024 */  and       $v0, $v0, $v1
 /* D6BC78 80240658 54400004 */  bnel      $v0, $zero, .L8024066C
 /* D6BC7C 8024065C AE24000C */   sw       $a0, 0xc($s1)
-/* D6BC80 80240660 3C048024 */  lui       $a0, 0x8024
-/* D6BC84 80240664 2484068C */  addiu     $a0, $a0, 0x68c
+/* D6BC80 80240660 3C048024 */  lui       $a0, %hi(D_8024068C)
+/* D6BC84 80240664 2484068C */  addiu     $a0, $a0, %lo(D_8024068C)
 /* D6BC88 80240668 AE24000C */  sw        $a0, 0xc($s1)
 .L8024066C:
 /* D6BC8C 8024066C 0C047644 */  jal       queue_render_task
diff --git a/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_8024068C_D6BCAC.s b/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_8024068C_D6BCAC.s
index 95c87cf21c..f89e3c8433 100644
--- a/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_8024068C_D6BCAC.s
+++ b/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_8024068C_D6BCAC.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_8024068C_D6BCAC
-/* D6BCAC 8024068C 3C03800A */  lui       $v1, 0x800a
-/* D6BCB0 80240690 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D6BCAC 8024068C 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D6BCB0 80240690 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D6BCB4 80240694 3C07BF80 */  lui       $a3, 0xbf80
 /* D6BCB8 80240698 27BDFEC0 */  addiu     $sp, $sp, -0x140
 /* D6BCBC 8024069C F7B40128 */  sdc1      $f20, 0x128($sp)
@@ -22,9 +22,9 @@ glabel func_8024068C_D6BCAC
 /* D6BCF0 802406D0 000218C0 */  sll       $v1, $v0, 3
 /* D6BCF4 802406D4 00431021 */  addu      $v0, $v0, $v1
 /* D6BCF8 802406D8 000210C0 */  sll       $v0, $v0, 3
-/* D6BCFC 802406DC 3C01800B */  lui       $at, 0x800b
+/* D6BCFC 802406DC 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* D6BD00 802406E0 00220821 */  addu      $at, $at, $v0
-/* D6BD04 802406E4 C4361DEC */  lwc1      $f22, 0x1dec($at)
+/* D6BD04 802406E4 C4361DEC */  lwc1      $f22, %lo(D_800B1DEC)($at)
 /* D6BD08 802406E8 4406A000 */  mfc1      $a2, $f20
 /* D6BD0C 802406EC 4600B587 */  neg.s     $f22, $f22
 /* D6BD10 802406F0 4405B000 */  mfc1      $a1, $f22
diff --git a/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240870_D6BE90.s b/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240870_D6BE90.s
index 5e14ae33eb..8c83e6f0a9 100644
--- a/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240870_D6BE90.s
+++ b/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240870_D6BE90.s
@@ -27,8 +27,8 @@ glabel func_80240870_D6BE90
 /* D6BEE8 802408C8 F7B80160 */  sdc1      $f24, 0x160($sp)
 /* D6BEEC 802408CC F7B40150 */  sdc1      $f20, 0x150($sp)
 .L802408D0:
-/* D6BEF0 802408D0 3C03800A */  lui       $v1, 0x800a
-/* D6BEF4 802408D4 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D6BEF0 802408D0 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D6BEF4 802408D4 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D6BEF8 802408D8 00031080 */  sll       $v0, $v1, 2
 /* D6BEFC 802408DC 00431021 */  addu      $v0, $v0, $v1
 /* D6BF00 802408E0 00021080 */  sll       $v0, $v0, 2
diff --git a/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240D3C_D6C35C.s b/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240D3C_D6C35C.s
index 3f9ae22fc0..f9c674ed3f 100644
--- a/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240D3C_D6C35C.s
+++ b/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240D3C_D6C35C.s
@@ -25,13 +25,13 @@ glabel func_80240D3C_D6C35C
 /* D6C3A8 80240D88 08090378 */  j         .L80240DE0
 /* D6C3AC 80240D8C 00000000 */   nop      
 .L80240D90:
-/* D6C3B0 80240D90 3C048024 */  lui       $a0, 0x8024
-/* D6C3B4 80240D94 24840E84 */  addiu     $a0, $a0, 0xe84
+/* D6C3B0 80240D90 3C048024 */  lui       $a0, %hi(D_80240E84)
+/* D6C3B4 80240D94 24840E84 */  addiu     $a0, $a0, %lo(D_80240E84)
 /* D6C3B8 80240D98 08090374 */  j         .L80240DD0
 /* D6C3BC 80240D9C 00000000 */   nop      
 .L80240DA0:
-/* D6C3C0 80240DA0 3C048024 */  lui       $a0, 0x8024
-/* D6C3C4 80240DA4 24840EEC */  addiu     $a0, $a0, 0xeec
+/* D6C3C0 80240DA0 3C048024 */  lui       $a0, %hi(D_80240EEC)
+/* D6C3C4 80240DA4 24840EEC */  addiu     $a0, $a0, %lo(D_80240EEC)
 /* D6C3C8 80240DA8 08090374 */  j         .L80240DD0
 /* D6C3CC 80240DAC 00000000 */   nop      
 .L80240DB0:
@@ -42,8 +42,8 @@ glabel func_80240D3C_D6C35C
 /* D6C3E0 80240DC0 10400007 */  beqz      $v0, .L80240DE0
 /* D6C3E4 80240DC4 00000000 */   nop      
 .L80240DC8:
-/* D6C3E8 80240DC8 3C048024 */  lui       $a0, 0x8024
-/* D6C3EC 80240DCC 24840EB8 */  addiu     $a0, $a0, 0xeb8
+/* D6C3E8 80240DC8 3C048024 */  lui       $a0, %hi(D_80240EB8)
+/* D6C3EC 80240DCC 24840EB8 */  addiu     $a0, $a0, %lo(D_80240EB8)
 .L80240DD0:
 /* D6C3F0 80240DD0 0C048C56 */  jal       bind_dynamic_entity_3
 /* D6C3F4 80240DD4 0000282D */   daddu    $a1, $zero, $zero
diff --git a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_802400EC_D6EA9C.s b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_802400EC_D6EA9C.s
index 1557409adf..808fde4cd3 100644
--- a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_802400EC_D6EA9C.s
+++ b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_802400EC_D6EA9C.s
@@ -5,8 +5,8 @@ glabel func_802400EC_D6EA9C
 /* D6EA9C 802400EC 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* D6EAA0 802400F0 AFB00010 */  sw        $s0, 0x10($sp)
 /* D6EAA4 802400F4 0080802D */  daddu     $s0, $a0, $zero
-/* D6EAA8 802400F8 3C058024 */  lui       $a1, 0x8024
-/* D6EAAC 802400FC 24A50128 */  addiu     $a1, $a1, 0x128
+/* D6EAA8 802400F8 3C058024 */  lui       $a1, %hi(D_80240128)
+/* D6EAAC 802400FC 24A50128 */  addiu     $a1, $a1, %lo(D_80240128)
 /* D6EAB0 80240100 AFBF0014 */  sw        $ra, 0x14($sp)
 /* D6EAB4 80240104 0C048C56 */  jal       bind_dynamic_entity_3
 /* D6EAB8 80240108 0000202D */   daddu    $a0, $zero, $zero
diff --git a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240128_D6EAD8.s b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240128_D6EAD8.s
index 77f4180b85..91f35099ee 100644
--- a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240128_D6EAD8.s
+++ b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240128_D6EAD8.s
@@ -29,8 +29,8 @@ glabel func_80240128_D6EAD8
 /* D6EB38 80240188 27A20034 */  addiu     $v0, $sp, 0x34
 /* D6EB3C 8024018C AFA20014 */  sw        $v0, 0x14($sp)
 /* D6EB40 80240190 C6000030 */  lwc1      $f0, 0x30($s0)
-/* D6EB44 80240194 3C04800A */  lui       $a0, 0x800a
-/* D6EB48 80240198 8484A634 */  lh        $a0, -0x59cc($a0)
+/* D6EB44 80240194 3C04800A */  lui       $a0, %hi(D_8009A634)
+/* D6EB48 80240198 8484A634 */  lh        $a0, %lo(D_8009A634)($a0)
 /* D6EB4C 8024019C 46000007 */  neg.s     $f0, $f0
 /* D6EB50 802401A0 44070000 */  mfc1      $a3, $f0
 /* D6EB54 802401A4 27A20038 */  addiu     $v0, $sp, 0x38
@@ -67,8 +67,8 @@ glabel func_80240128_D6EAD8
 /* D6EBCC 8024021C 54400022 */  bnel      $v0, $zero, .L802402A8
 /* D6EBD0 80240220 24110011 */   addiu    $s1, $zero, 0x11
 /* D6EBD4 80240224 9203000E */  lbu       $v1, 0xe($s0)
-/* D6EBD8 80240228 3C02802E */  lui       $v0, 0x802e
-/* D6EBDC 8024022C 90429D70 */  lbu       $v0, -0x6290($v0)
+/* D6EBD8 80240228 3C02802E */  lui       $v0, %hi(D_802D9D70)
+/* D6EBDC 8024022C 90429D70 */  lbu       $v0, %lo(D_802D9D70)($v0)
 /* D6EBE0 80240230 10620018 */  beq       $v1, $v0, .L80240294
 /* D6EBE4 80240234 2C6200FE */   sltiu    $v0, $v1, 0xfe
 /* D6EBE8 80240238 1040000B */  beqz      $v0, .L80240268
@@ -98,20 +98,20 @@ glabel func_80240128_D6EAD8
 /* D6EC40 80240290 00000000 */   nop      
 .L80240294:
 /* D6EC44 80240294 9202000E */  lbu       $v0, 0xe($s0)
-/* D6EC48 80240298 3C01802E */  lui       $at, 0x802e
-/* D6EC4C 8024029C A0229D70 */  sb        $v0, -0x6290($at)
+/* D6EC48 80240298 3C01802E */  lui       $at, %hi(D_802D9D70)
+/* D6EC4C 8024029C A0229D70 */  sb        $v0, %lo(D_802D9D70)($at)
 /* D6EC50 802402A0 080900AD */  j         .L802402B4
 /* D6EC54 802402A4 0240202D */   daddu    $a0, $s2, $zero
 .L802402A8:
-/* D6EC58 802402A8 3C01802E */  lui       $at, 0x802e
-/* D6EC5C 802402AC A0209D70 */  sb        $zero, -0x6290($at)
+/* D6EC58 802402A8 3C01802E */  lui       $at, %hi(D_802D9D70)
+/* D6EC5C 802402AC A0209D70 */  sb        $zero, %lo(D_802D9D70)($at)
 /* D6EC60 802402B0 0240202D */  daddu     $a0, $s2, $zero
 .L802402B4:
 /* D6EC64 802402B4 AC910000 */  sw        $s1, ($a0)
 /* D6EC68 802402B8 AC900008 */  sw        $s0, 8($a0)
 /* D6EC6C 802402BC 8FA20038 */  lw        $v0, 0x38($sp)
-/* D6EC70 802402C0 3C038024 */  lui       $v1, 0x8024
-/* D6EC74 802402C4 246302F0 */  addiu     $v1, $v1, 0x2f0
+/* D6EC70 802402C0 3C038024 */  lui       $v1, %hi(D_802402F0)
+/* D6EC74 802402C4 246302F0 */  addiu     $v1, $v1, %lo(D_802402F0)
 /* D6EC78 802402C8 AC83000C */  sw        $v1, 0xc($a0)
 /* D6EC7C 802402CC 00021023 */  negu      $v0, $v0
 /* D6EC80 802402D0 0C047644 */  jal       queue_render_task
diff --git a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_802402F0_D6ECA0.s b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_802402F0_D6ECA0.s
index 8617c7837e..7f2ab722e4 100644
--- a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_802402F0_D6ECA0.s
+++ b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_802402F0_D6ECA0.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_802402F0_D6ECA0
-/* D6ECA0 802402F0 3C03800A */  lui       $v1, 0x800a
-/* D6ECA4 802402F4 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D6ECA0 802402F0 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D6ECA4 802402F4 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D6ECA8 802402F8 3C07BF80 */  lui       $a3, 0xbf80
 /* D6ECAC 802402FC 27BDFEC0 */  addiu     $sp, $sp, -0x140
 /* D6ECB0 80240300 F7B40128 */  sdc1      $f20, 0x128($sp)
@@ -22,9 +22,9 @@ glabel func_802402F0_D6ECA0
 /* D6ECE4 80240334 000218C0 */  sll       $v1, $v0, 3
 /* D6ECE8 80240338 00431021 */  addu      $v0, $v0, $v1
 /* D6ECEC 8024033C 000210C0 */  sll       $v0, $v0, 3
-/* D6ECF0 80240340 3C01800B */  lui       $at, 0x800b
+/* D6ECF0 80240340 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* D6ECF4 80240344 00220821 */  addu      $at, $at, $v0
-/* D6ECF8 80240348 C4361DEC */  lwc1      $f22, 0x1dec($at)
+/* D6ECF8 80240348 C4361DEC */  lwc1      $f22, %lo(D_800B1DEC)($at)
 /* D6ECFC 8024034C 4406A000 */  mfc1      $a2, $f20
 /* D6ED00 80240350 4600B587 */  neg.s     $f22, $f22
 /* D6ED04 80240354 4405B000 */  mfc1      $a1, $f22
diff --git a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_8024049C_D6EE4C.s b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_8024049C_D6EE4C.s
index 9afb83ed4e..bf5138f851 100644
--- a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_8024049C_D6EE4C.s
+++ b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_8024049C_D6EE4C.s
@@ -11,8 +11,8 @@ glabel func_8024049C_D6EE4C
 /* D6EE64 802404B4 28420002 */   slti     $v0, $v0, 2
 /* D6EE68 802404B8 1040000C */  beqz      $v0, .L802404EC
 /* D6EE6C 802404BC 00000000 */   nop      
-/* D6EE70 802404C0 3C058024 */  lui       $a1, 0x8024
-/* D6EE74 802404C4 24A50500 */  addiu     $a1, $a1, 0x500
+/* D6EE70 802404C0 3C058024 */  lui       $a1, %hi(D_80240500)
+/* D6EE74 802404C4 24A50500 */  addiu     $a1, $a1, %lo(D_80240500)
 /* D6EE78 802404C8 0C048C56 */  jal       bind_dynamic_entity_3
 /* D6EE7C 802404CC 0000202D */   daddu    $a0, $zero, $zero
 /* D6EE80 802404D0 8E03013C */  lw        $v1, 0x13c($s0)
diff --git a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240500_D6EEB0.s b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240500_D6EEB0.s
index 32da49dedb..86c0483ca4 100644
--- a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240500_D6EEB0.s
+++ b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240500_D6EEB0.s
@@ -28,8 +28,8 @@ glabel func_80240500_D6EEB0
 /* D6EF0C 8024055C 27A20038 */  addiu     $v0, $sp, 0x38
 /* D6EF10 80240560 AFA20018 */  sw        $v0, 0x18($sp)
 /* D6EF14 80240564 C600002C */  lwc1      $f0, 0x2c($s0)
-/* D6EF18 80240568 3C04800A */  lui       $a0, 0x800a
-/* D6EF1C 8024056C 8484A634 */  lh        $a0, -0x59cc($a0)
+/* D6EF18 80240568 3C04800A */  lui       $a0, %hi(D_8009A634)
+/* D6EF1C 8024056C 8484A634 */  lh        $a0, %lo(D_8009A634)($a0)
 /* D6EF20 80240570 46000007 */  neg.s     $f0, $f0
 /* D6EF24 80240574 44060000 */  mfc1      $a2, $f0
 /* D6EF28 80240578 0C00B94E */  jal       get_screen_coords
@@ -44,8 +44,8 @@ glabel func_80240500_D6EEB0
 /* D6EF4C 8024059C 54400022 */  bnel      $v0, $zero, .L80240628
 /* D6EF50 802405A0 24120011 */   addiu    $s2, $zero, 0x11
 /* D6EF54 802405A4 9203000E */  lbu       $v1, 0xe($s0)
-/* D6EF58 802405A8 3C02802E */  lui       $v0, 0x802e
-/* D6EF5C 802405AC 90429D71 */  lbu       $v0, -0x628f($v0)
+/* D6EF58 802405A8 3C02802E */  lui       $v0, %hi(D_802D9D71)
+/* D6EF5C 802405AC 90429D71 */  lbu       $v0, %lo(D_802D9D71)($v0)
 /* D6EF60 802405B0 10620018 */  beq       $v1, $v0, .L80240614
 /* D6EF64 802405B4 2C6200FE */   sltiu    $v0, $v1, 0xfe
 /* D6EF68 802405B8 1040000B */  beqz      $v0, .L802405E8
@@ -75,17 +75,17 @@ glabel func_80240500_D6EEB0
 /* D6EFC0 80240610 00000000 */   nop      
 .L80240614:
 /* D6EFC4 80240614 9202000E */  lbu       $v0, 0xe($s0)
-/* D6EFC8 80240618 3C01802E */  lui       $at, 0x802e
-/* D6EFCC 8024061C A0229D71 */  sb        $v0, -0x628f($at)
+/* D6EFC8 80240618 3C01802E */  lui       $at, %hi(D_802D9D71)
+/* D6EFCC 8024061C A0229D71 */  sb        $v0, %lo(D_802D9D71)($at)
 /* D6EFD0 80240620 0809018C */  j         .L80240630
 /* D6EFD4 80240624 00000000 */   nop      
 .L80240628:
-/* D6EFD8 80240628 3C01802E */  lui       $at, 0x802e
-/* D6EFDC 8024062C A0209D71 */  sb        $zero, -0x628f($at)
+/* D6EFD8 80240628 3C01802E */  lui       $at, %hi(D_802D9D71)
+/* D6EFDC 8024062C A0209D71 */  sb        $zero, %lo(D_802D9D71)($at)
 .L80240630:
 /* D6EFE0 80240630 8FA20038 */  lw        $v0, 0x38($sp)
-/* D6EFE4 80240634 3C048024 */  lui       $a0, 0x8024
-/* D6EFE8 80240638 24840870 */  addiu     $a0, $a0, 0x870
+/* D6EFE4 80240634 3C048024 */  lui       $a0, %hi(D_80240870)
+/* D6EFE8 80240638 24840870 */  addiu     $a0, $a0, %lo(D_80240870)
 /* D6EFEC 8024063C AE320000 */  sw        $s2, ($s1)
 /* D6EFF0 80240640 AE300008 */  sw        $s0, 8($s1)
 /* D6EFF4 80240644 00021023 */  negu      $v0, $v0
@@ -95,8 +95,8 @@ glabel func_80240500_D6EEB0
 /* D6F004 80240654 00431024 */  and       $v0, $v0, $v1
 /* D6F008 80240658 54400004 */  bnel      $v0, $zero, .L8024066C
 /* D6F00C 8024065C AE24000C */   sw       $a0, 0xc($s1)
-/* D6F010 80240660 3C048024 */  lui       $a0, 0x8024
-/* D6F014 80240664 2484068C */  addiu     $a0, $a0, 0x68c
+/* D6F010 80240660 3C048024 */  lui       $a0, %hi(D_8024068C)
+/* D6F014 80240664 2484068C */  addiu     $a0, $a0, %lo(D_8024068C)
 /* D6F018 80240668 AE24000C */  sw        $a0, 0xc($s1)
 .L8024066C:
 /* D6F01C 8024066C 0C047644 */  jal       queue_render_task
diff --git a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_8024068C_D6F03C.s b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_8024068C_D6F03C.s
index 5de64a7418..0caf1db00b 100644
--- a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_8024068C_D6F03C.s
+++ b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_8024068C_D6F03C.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_8024068C_D6F03C
-/* D6F03C 8024068C 3C03800A */  lui       $v1, 0x800a
-/* D6F040 80240690 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D6F03C 8024068C 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D6F040 80240690 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D6F044 80240694 3C07BF80 */  lui       $a3, 0xbf80
 /* D6F048 80240698 27BDFEC0 */  addiu     $sp, $sp, -0x140
 /* D6F04C 8024069C F7B40128 */  sdc1      $f20, 0x128($sp)
@@ -22,9 +22,9 @@ glabel func_8024068C_D6F03C
 /* D6F080 802406D0 000218C0 */  sll       $v1, $v0, 3
 /* D6F084 802406D4 00431021 */  addu      $v0, $v0, $v1
 /* D6F088 802406D8 000210C0 */  sll       $v0, $v0, 3
-/* D6F08C 802406DC 3C01800B */  lui       $at, 0x800b
+/* D6F08C 802406DC 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* D6F090 802406E0 00220821 */  addu      $at, $at, $v0
-/* D6F094 802406E4 C4361DEC */  lwc1      $f22, 0x1dec($at)
+/* D6F094 802406E4 C4361DEC */  lwc1      $f22, %lo(D_800B1DEC)($at)
 /* D6F098 802406E8 4406A000 */  mfc1      $a2, $f20
 /* D6F09C 802406EC 4600B587 */  neg.s     $f22, $f22
 /* D6F0A0 802406F0 4405B000 */  mfc1      $a1, $f22
diff --git a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240870_D6F220.s b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240870_D6F220.s
index 60bafe9fe0..22e899e6ee 100644
--- a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240870_D6F220.s
+++ b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240870_D6F220.s
@@ -27,8 +27,8 @@ glabel func_80240870_D6F220
 /* D6F278 802408C8 F7B80160 */  sdc1      $f24, 0x160($sp)
 /* D6F27C 802408CC F7B40150 */  sdc1      $f20, 0x150($sp)
 .L802408D0:
-/* D6F280 802408D0 3C03800A */  lui       $v1, 0x800a
-/* D6F284 802408D4 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D6F280 802408D0 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D6F284 802408D4 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D6F288 802408D8 00031080 */  sll       $v0, $v1, 2
 /* D6F28C 802408DC 00431021 */  addu      $v0, $v0, $v1
 /* D6F290 802408E0 00021080 */  sll       $v0, $v0, 2
diff --git a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240D3C_D6F6EC.s b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240D3C_D6F6EC.s
index a4c1ccaee8..85b2ed8267 100644
--- a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240D3C_D6F6EC.s
+++ b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240D3C_D6F6EC.s
@@ -25,13 +25,13 @@ glabel func_80240D3C_D6F6EC
 /* D6F738 80240D88 08090378 */  j         .L80240DE0
 /* D6F73C 80240D8C 00000000 */   nop      
 .L80240D90:
-/* D6F740 80240D90 3C048024 */  lui       $a0, 0x8024
-/* D6F744 80240D94 24840E84 */  addiu     $a0, $a0, 0xe84
+/* D6F740 80240D90 3C048024 */  lui       $a0, %hi(D_80240E84)
+/* D6F744 80240D94 24840E84 */  addiu     $a0, $a0, %lo(D_80240E84)
 /* D6F748 80240D98 08090374 */  j         .L80240DD0
 /* D6F74C 80240D9C 00000000 */   nop      
 .L80240DA0:
-/* D6F750 80240DA0 3C048024 */  lui       $a0, 0x8024
-/* D6F754 80240DA4 24840EEC */  addiu     $a0, $a0, 0xeec
+/* D6F750 80240DA0 3C048024 */  lui       $a0, %hi(D_80240EEC)
+/* D6F754 80240DA4 24840EEC */  addiu     $a0, $a0, %lo(D_80240EEC)
 /* D6F758 80240DA8 08090374 */  j         .L80240DD0
 /* D6F75C 80240DAC 00000000 */   nop      
 .L80240DB0:
@@ -42,8 +42,8 @@ glabel func_80240D3C_D6F6EC
 /* D6F770 80240DC0 10400007 */  beqz      $v0, .L80240DE0
 /* D6F774 80240DC4 00000000 */   nop      
 .L80240DC8:
-/* D6F778 80240DC8 3C048024 */  lui       $a0, 0x8024
-/* D6F77C 80240DCC 24840EB8 */  addiu     $a0, $a0, 0xeb8
+/* D6F778 80240DC8 3C048024 */  lui       $a0, %hi(D_80240EB8)
+/* D6F77C 80240DCC 24840EB8 */  addiu     $a0, $a0, %lo(D_80240EB8)
 .L80240DD0:
 /* D6F780 80240DD0 0C048C56 */  jal       bind_dynamic_entity_3
 /* D6F784 80240DD4 0000282D */   daddu    $a1, $zero, $zero
diff --git a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_8024114C_D6FAFC.s b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_8024114C_D6FAFC.s
index e9b0bc30a3..10b2a07fa5 100644
--- a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_8024114C_D6FAFC.s
+++ b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_8024114C_D6FAFC.s
@@ -6,11 +6,11 @@ glabel func_8024114C_D6FAFC
 /* D6FB00 80241150 AFBF0010 */  sw        $ra, 0x10($sp)
 /* D6FB04 80241154 10A00003 */  beqz      $a1, .L80241164
 /* D6FB08 80241158 8C86000C */   lw       $a2, 0xc($a0)
-/* D6FB0C 8024115C 3C018024 */  lui       $at, 0x8024
-/* D6FB10 80241160 AC20219C */  sw        $zero, 0x219c($at)
+/* D6FB0C 8024115C 3C018024 */  lui       $at, %hi(D_8024219C)
+/* D6FB10 80241160 AC20219C */  sw        $zero, %lo(D_8024219C)($at)
 .L80241164:
-/* D6FB14 80241164 3C038024 */  lui       $v1, 0x8024
-/* D6FB18 80241168 2463219C */  addiu     $v1, $v1, 0x219c
+/* D6FB14 80241164 3C038024 */  lui       $v1, %hi(D_8024219C)
+/* D6FB18 80241168 2463219C */  addiu     $v1, $v1, %lo(D_8024219C)
 /* D6FB1C 8024116C 8C620000 */  lw        $v0, ($v1)
 /* D6FB20 80241170 54400003 */  bnel      $v0, $zero, .L80241180
 /* D6FB24 80241174 AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_8024114C_D6FAFC
 /* D6FB2C 8024117C 0000102D */   daddu    $v0, $zero, $zero
 .L80241180:
 /* D6FB30 80241180 8CC50000 */  lw        $a1, ($a2)
-/* D6FB34 80241184 3C068024 */  lui       $a2, 0x8024
+/* D6FB34 80241184 3C068024 */  lui       $a2, %hi(D_802421A0)
 /* D6FB38 80241188 0C0B2026 */  jal       set_variable
-/* D6FB3C 8024118C 8CC621A0 */   lw       $a2, 0x21a0($a2)
+/* D6FB3C 8024118C 8CC621A0 */   lw       $a2, %lo(D_802421A0)($a2)
 /* D6FB40 80241190 24020002 */  addiu     $v0, $zero, 2
 .L80241194:
 /* D6FB44 80241194 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_802411A0_D6FB50.s b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_802411A0_D6FB50.s
index 87f142d597..546ce55414 100644
--- a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_802411A0_D6FB50.s
+++ b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_802411A0_D6FB50.s
@@ -7,12 +7,12 @@ glabel func_802411A0_D6FB50
 /* D6FB58 802411A8 8C82000C */  lw        $v0, 0xc($a0)
 /* D6FB5C 802411AC 0C0B1EAF */  jal       get_variable
 /* D6FB60 802411B0 8C450000 */   lw       $a1, ($v0)
-/* D6FB64 802411B4 3C018024 */  lui       $at, 0x8024
-/* D6FB68 802411B8 AC2221A0 */  sw        $v0, 0x21a0($at)
+/* D6FB64 802411B4 3C018024 */  lui       $at, %hi(D_802421A0)
+/* D6FB68 802411B8 AC2221A0 */  sw        $v0, %lo(D_802421A0)($at)
 /* D6FB6C 802411BC 24020002 */  addiu     $v0, $zero, 2
 /* D6FB70 802411C0 8FBF0010 */  lw        $ra, 0x10($sp)
 /* D6FB74 802411C4 24030001 */  addiu     $v1, $zero, 1
-/* D6FB78 802411C8 3C018024 */  lui       $at, 0x8024
-/* D6FB7C 802411CC AC23219C */  sw        $v1, 0x219c($at)
+/* D6FB78 802411C8 3C018024 */  lui       $at, %hi(D_8024219C)
+/* D6FB7C 802411CC AC23219C */  sw        $v1, %lo(D_8024219C)($at)
 /* D6FB80 802411D0 03E00008 */  jr        $ra
 /* D6FB84 802411D4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_802411D8_D6FB88.s b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_802411D8_D6FB88.s
index f5de9c37cb..9a34e4c573 100644
--- a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_802411D8_D6FB88.s
+++ b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_802411D8_D6FB88.s
@@ -13,8 +13,8 @@ glabel func_802411D8_D6FB88
 /* D6FBA8 802411F8 8C620000 */  lw        $v0, ($v1)
 /* D6FBAC 802411FC 5040000A */  beql      $v0, $zero, .L80241228
 /* D6FBB0 80241200 00041080 */   sll      $v0, $a0, 2
-/* D6FBB4 80241204 3C058024 */  lui       $a1, 0x8024
-/* D6FBB8 80241208 24A579F0 */  addiu     $a1, $a1, 0x79f0
+/* D6FBB4 80241204 3C058024 */  lui       $a1, %hi(D_802479F0)
+/* D6FBB8 80241208 24A579F0 */  addiu     $a1, $a1, %lo(D_802479F0)
 .L8024120C:
 /* D6FBBC 8024120C 24630004 */  addiu     $v1, $v1, 4
 /* D6FBC0 80241210 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_802411D8_D6FB88
 /* D6FBD0 80241220 24A50004 */   addiu    $a1, $a1, 4
 /* D6FBD4 80241224 00041080 */  sll       $v0, $a0, 2
 .L80241228:
-/* D6FBD8 80241228 3C018024 */  lui       $at, 0x8024
+/* D6FBD8 80241228 3C018024 */  lui       $at, %hi(D_802479F0)
 /* D6FBDC 8024122C 00220821 */  addu      $at, $at, $v0
-/* D6FBE0 80241230 AC2079F0 */  sw        $zero, 0x79f0($at)
+/* D6FBE0 80241230 AC2079F0 */  sw        $zero, %lo(D_802479F0)($at)
 /* D6FBE4 80241234 08090499 */  j         .L80241264
 /* D6FBE8 80241238 00000000 */   nop      
 .L8024123C:
-/* D6FBEC 8024123C 3C038024 */  lui       $v1, 0x8024
-/* D6FBF0 80241240 246379F0 */  addiu     $v1, $v1, 0x79f0
+/* D6FBEC 8024123C 3C038024 */  lui       $v1, %hi(D_802479F0)
+/* D6FBF0 80241240 246379F0 */  addiu     $v1, $v1, %lo(D_802479F0)
 /* D6FBF4 80241244 0060282D */  daddu     $a1, $v1, $zero
 .L80241248:
 /* D6FBF8 80241248 24820010 */  addiu     $v0, $a0, 0x10
diff --git a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80241274_D6FC24.s b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80241274_D6FC24.s
index f370e6463e..699a12c7a7 100644
--- a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80241274_D6FC24.s
+++ b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80241274_D6FC24.s
@@ -13,8 +13,8 @@ glabel func_80241274_D6FC24
 /* D6FC44 80241294 8C620000 */  lw        $v0, ($v1)
 /* D6FC48 80241298 5040000A */  beql      $v0, $zero, .L802412C4
 /* D6FC4C 8024129C 00041080 */   sll      $v0, $a0, 2
-/* D6FC50 802412A0 3C058024 */  lui       $a1, 0x8024
-/* D6FC54 802412A4 24A57BB8 */  addiu     $a1, $a1, 0x7bb8
+/* D6FC50 802412A0 3C058024 */  lui       $a1, %hi(D_80247BB8)
+/* D6FC54 802412A4 24A57BB8 */  addiu     $a1, $a1, %lo(D_80247BB8)
 .L802412A8:
 /* D6FC58 802412A8 24630004 */  addiu     $v1, $v1, 4
 /* D6FC5C 802412AC 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_80241274_D6FC24
 /* D6FC6C 802412BC 24A50004 */   addiu    $a1, $a1, 4
 /* D6FC70 802412C0 00041080 */  sll       $v0, $a0, 2
 .L802412C4:
-/* D6FC74 802412C4 3C018024 */  lui       $at, 0x8024
+/* D6FC74 802412C4 3C018024 */  lui       $at, %hi(D_80247BB8)
 /* D6FC78 802412C8 00220821 */  addu      $at, $at, $v0
-/* D6FC7C 802412CC AC207BB8 */  sw        $zero, 0x7bb8($at)
+/* D6FC7C 802412CC AC207BB8 */  sw        $zero, %lo(D_80247BB8)($at)
 /* D6FC80 802412D0 080904C0 */  j         .L80241300
 /* D6FC84 802412D4 00000000 */   nop      
 .L802412D8:
-/* D6FC88 802412D8 3C038024 */  lui       $v1, 0x8024
-/* D6FC8C 802412DC 24637BB8 */  addiu     $v1, $v1, 0x7bb8
+/* D6FC88 802412D8 3C038024 */  lui       $v1, %hi(D_80247BB8)
+/* D6FC8C 802412DC 24637BB8 */  addiu     $v1, $v1, %lo(D_80247BB8)
 /* D6FC90 802412E0 0060282D */  daddu     $a1, $v1, $zero
 .L802412E4:
 /* D6FC94 802412E4 24820080 */  addiu     $v0, $a0, 0x80
diff --git a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_802414F4_D6FEA4.s b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_802414F4_D6FEA4.s
index 7140bfea31..bf52ca55e7 100644
--- a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_802414F4_D6FEA4.s
+++ b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_802414F4_D6FEA4.s
@@ -5,8 +5,8 @@ glabel func_802414F4_D6FEA4
 /* D6FEA4 802414F4 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* D6FEA8 802414F8 AFB00010 */  sw        $s0, 0x10($sp)
 /* D6FEAC 802414FC 0080802D */  daddu     $s0, $a0, $zero
-/* D6FEB0 80241500 3C058024 */  lui       $a1, 0x8024
-/* D6FEB4 80241504 24A51530 */  addiu     $a1, $a1, 0x1530
+/* D6FEB0 80241500 3C058024 */  lui       $a1, %hi(D_80241530)
+/* D6FEB4 80241504 24A51530 */  addiu     $a1, $a1, %lo(D_80241530)
 /* D6FEB8 80241508 AFBF0014 */  sw        $ra, 0x14($sp)
 /* D6FEBC 8024150C 0C048C56 */  jal       bind_dynamic_entity_3
 /* D6FEC0 80241510 0000202D */   daddu    $a0, $zero, $zero
diff --git a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80241530_D6FEE0.s b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80241530_D6FEE0.s
index fcd3168c4f..e2b1a958b7 100644
--- a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80241530_D6FEE0.s
+++ b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80241530_D6FEE0.s
@@ -16,8 +16,8 @@ glabel func_80241530_D6FEE0
 /* D6FF0C 8024155C 1060001B */  beqz      $v1, .L802415CC
 /* D6FF10 80241560 0040802D */   daddu    $s0, $v0, $zero
 /* D6FF14 80241564 C6000040 */  lwc1      $f0, 0x40($s0)
-/* D6FF18 80241568 3C04800A */  lui       $a0, 0x800a
-/* D6FF1C 8024156C 8484A634 */  lh        $a0, -0x59cc($a0)
+/* D6FF18 80241568 3C04800A */  lui       $a0, %hi(D_8009A634)
+/* D6FF1C 8024156C 8484A634 */  lh        $a0, %lo(D_8009A634)($a0)
 /* D6FF20 80241570 27A20030 */  addiu     $v0, $sp, 0x30
 /* D6FF24 80241574 AFA20010 */  sw        $v0, 0x10($sp)
 /* D6FF28 80241578 27A20034 */  addiu     $v0, $sp, 0x34
@@ -33,8 +33,8 @@ glabel func_80241530_D6FEE0
 /* D6FF50 802415A0 0220202D */  daddu     $a0, $s1, $zero
 /* D6FF54 802415A4 820500AA */  lb        $a1, 0xaa($s0)
 /* D6FF58 802415A8 8FA30038 */  lw        $v1, 0x38($sp)
-/* D6FF5C 802415AC 3C028024 */  lui       $v0, 0x8024
-/* D6FF60 802415B0 244215E0 */  addiu     $v0, $v0, 0x15e0
+/* D6FF5C 802415AC 3C028024 */  lui       $v0, %hi(D_802415E0)
+/* D6FF60 802415B0 244215E0 */  addiu     $v0, $v0, %lo(D_802415E0)
 /* D6FF64 802415B4 AFB00028 */  sw        $s0, 0x28($sp)
 /* D6FF68 802415B8 AFA2002C */  sw        $v0, 0x2c($sp)
 /* D6FF6C 802415BC 00031823 */  negu      $v1, $v1
diff --git a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_802415E0_D6FF90.s b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_802415E0_D6FF90.s
index d040e54b0f..45a08403ab 100644
--- a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_802415E0_D6FF90.s
+++ b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_802415E0_D6FF90.s
@@ -10,8 +10,8 @@ glabel func_802415E0_D6FF90
 /* D6FFA4 802415F4 0C00E769 */  jal       func_80039DA4
 /* D6FFA8 802415F8 0080882D */   daddu    $s1, $a0, $zero
 /* D6FFAC 802415FC 44800000 */  mtc1      $zero, $f0
-/* D6FFB0 80241600 3C03800A */  lui       $v1, 0x800a
-/* D6FFB4 80241604 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D6FFB0 80241600 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D6FFB4 80241604 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D6FFB8 80241608 C6220034 */  lwc1      $f2, 0x34($s1)
 /* D6FFBC 8024160C 00031080 */  sll       $v0, $v1, 2
 /* D6FFC0 80241610 00431021 */  addu      $v0, $v0, $v1
@@ -21,9 +21,9 @@ glabel func_802415E0_D6FF90
 /* D6FFD0 80241620 00431021 */  addu      $v0, $v0, $v1
 /* D6FFD4 80241624 000210C0 */  sll       $v0, $v0, 3
 /* D6FFD8 80241628 44060000 */  mfc1      $a2, $f0
-/* D6FFDC 8024162C 3C01800B */  lui       $at, 0x800b
+/* D6FFDC 8024162C 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* D6FFE0 80241630 00220821 */  addu      $at, $at, $v0
-/* D6FFE4 80241634 C4201DEC */  lwc1      $f0, 0x1dec($at)
+/* D6FFE4 80241634 C4201DEC */  lwc1      $f0, %lo(D_800B1DEC)($at)
 /* D6FFE8 80241638 3C013F80 */  lui       $at, 0x3f80
 /* D6FFEC 8024163C 4481A000 */  mtc1      $at, $f20
 /* D6FFF0 80241640 46001080 */  add.s     $f2, $f2, $f0
diff --git a/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_802400EC_D7648C.s b/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_802400EC_D7648C.s
index 239440b6c2..bb75f167fe 100644
--- a/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_802400EC_D7648C.s
+++ b/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_802400EC_D7648C.s
@@ -5,8 +5,8 @@ glabel func_802400EC_D7648C
 /* D7648C 802400EC 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* D76490 802400F0 AFB00010 */  sw        $s0, 0x10($sp)
 /* D76494 802400F4 0080802D */  daddu     $s0, $a0, $zero
-/* D76498 802400F8 3C058024 */  lui       $a1, 0x8024
-/* D7649C 802400FC 24A50128 */  addiu     $a1, $a1, 0x128
+/* D76498 802400F8 3C058024 */  lui       $a1, %hi(D_80240128)
+/* D7649C 802400FC 24A50128 */  addiu     $a1, $a1, %lo(D_80240128)
 /* D764A0 80240100 AFBF0014 */  sw        $ra, 0x14($sp)
 /* D764A4 80240104 0C048C56 */  jal       bind_dynamic_entity_3
 /* D764A8 80240108 0000202D */   daddu    $a0, $zero, $zero
diff --git a/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240128_D764C8.s b/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240128_D764C8.s
index 6a701983a1..2297522d00 100644
--- a/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240128_D764C8.s
+++ b/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240128_D764C8.s
@@ -29,8 +29,8 @@ glabel func_80240128_D764C8
 /* D76528 80240188 27A20034 */  addiu     $v0, $sp, 0x34
 /* D7652C 8024018C AFA20014 */  sw        $v0, 0x14($sp)
 /* D76530 80240190 C6000030 */  lwc1      $f0, 0x30($s0)
-/* D76534 80240194 3C04800A */  lui       $a0, 0x800a
-/* D76538 80240198 8484A634 */  lh        $a0, -0x59cc($a0)
+/* D76534 80240194 3C04800A */  lui       $a0, %hi(D_8009A634)
+/* D76538 80240198 8484A634 */  lh        $a0, %lo(D_8009A634)($a0)
 /* D7653C 8024019C 46000007 */  neg.s     $f0, $f0
 /* D76540 802401A0 44070000 */  mfc1      $a3, $f0
 /* D76544 802401A4 27A20038 */  addiu     $v0, $sp, 0x38
@@ -67,8 +67,8 @@ glabel func_80240128_D764C8
 /* D765BC 8024021C 54400022 */  bnel      $v0, $zero, .L802402A8
 /* D765C0 80240220 24110011 */   addiu    $s1, $zero, 0x11
 /* D765C4 80240224 9203000E */  lbu       $v1, 0xe($s0)
-/* D765C8 80240228 3C02802E */  lui       $v0, 0x802e
-/* D765CC 8024022C 90429D70 */  lbu       $v0, -0x6290($v0)
+/* D765C8 80240228 3C02802E */  lui       $v0, %hi(D_802D9D70)
+/* D765CC 8024022C 90429D70 */  lbu       $v0, %lo(D_802D9D70)($v0)
 /* D765D0 80240230 10620018 */  beq       $v1, $v0, .L80240294
 /* D765D4 80240234 2C6200FE */   sltiu    $v0, $v1, 0xfe
 /* D765D8 80240238 1040000B */  beqz      $v0, .L80240268
@@ -98,20 +98,20 @@ glabel func_80240128_D764C8
 /* D76630 80240290 00000000 */   nop      
 .L80240294:
 /* D76634 80240294 9202000E */  lbu       $v0, 0xe($s0)
-/* D76638 80240298 3C01802E */  lui       $at, 0x802e
-/* D7663C 8024029C A0229D70 */  sb        $v0, -0x6290($at)
+/* D76638 80240298 3C01802E */  lui       $at, %hi(D_802D9D70)
+/* D7663C 8024029C A0229D70 */  sb        $v0, %lo(D_802D9D70)($at)
 /* D76640 802402A0 080900AD */  j         .L802402B4
 /* D76644 802402A4 0240202D */   daddu    $a0, $s2, $zero
 .L802402A8:
-/* D76648 802402A8 3C01802E */  lui       $at, 0x802e
-/* D7664C 802402AC A0209D70 */  sb        $zero, -0x6290($at)
+/* D76648 802402A8 3C01802E */  lui       $at, %hi(D_802D9D70)
+/* D7664C 802402AC A0209D70 */  sb        $zero, %lo(D_802D9D70)($at)
 /* D76650 802402B0 0240202D */  daddu     $a0, $s2, $zero
 .L802402B4:
 /* D76654 802402B4 AC910000 */  sw        $s1, ($a0)
 /* D76658 802402B8 AC900008 */  sw        $s0, 8($a0)
 /* D7665C 802402BC 8FA20038 */  lw        $v0, 0x38($sp)
-/* D76660 802402C0 3C038024 */  lui       $v1, 0x8024
-/* D76664 802402C4 246302F0 */  addiu     $v1, $v1, 0x2f0
+/* D76660 802402C0 3C038024 */  lui       $v1, %hi(D_802402F0)
+/* D76664 802402C4 246302F0 */  addiu     $v1, $v1, %lo(D_802402F0)
 /* D76668 802402C8 AC83000C */  sw        $v1, 0xc($a0)
 /* D7666C 802402CC 00021023 */  negu      $v0, $v0
 /* D76670 802402D0 0C047644 */  jal       queue_render_task
diff --git a/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_802402F0_D76690.s b/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_802402F0_D76690.s
index ef0c889b7c..ed53d27add 100644
--- a/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_802402F0_D76690.s
+++ b/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_802402F0_D76690.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_802402F0_D76690
-/* D76690 802402F0 3C03800A */  lui       $v1, 0x800a
-/* D76694 802402F4 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D76690 802402F0 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D76694 802402F4 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D76698 802402F8 3C07BF80 */  lui       $a3, 0xbf80
 /* D7669C 802402FC 27BDFEC0 */  addiu     $sp, $sp, -0x140
 /* D766A0 80240300 F7B40128 */  sdc1      $f20, 0x128($sp)
@@ -22,9 +22,9 @@ glabel func_802402F0_D76690
 /* D766D4 80240334 000218C0 */  sll       $v1, $v0, 3
 /* D766D8 80240338 00431021 */  addu      $v0, $v0, $v1
 /* D766DC 8024033C 000210C0 */  sll       $v0, $v0, 3
-/* D766E0 80240340 3C01800B */  lui       $at, 0x800b
+/* D766E0 80240340 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* D766E4 80240344 00220821 */  addu      $at, $at, $v0
-/* D766E8 80240348 C4361DEC */  lwc1      $f22, 0x1dec($at)
+/* D766E8 80240348 C4361DEC */  lwc1      $f22, %lo(D_800B1DEC)($at)
 /* D766EC 8024034C 4406A000 */  mfc1      $a2, $f20
 /* D766F0 80240350 4600B587 */  neg.s     $f22, $f22
 /* D766F4 80240354 4405B000 */  mfc1      $a1, $f22
diff --git a/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_8024049C_D7683C.s b/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_8024049C_D7683C.s
index 1e62c5296b..53d2bd23f5 100644
--- a/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_8024049C_D7683C.s
+++ b/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_8024049C_D7683C.s
@@ -11,8 +11,8 @@ glabel func_8024049C_D7683C
 /* D76854 802404B4 28420002 */   slti     $v0, $v0, 2
 /* D76858 802404B8 1040000C */  beqz      $v0, .L802404EC
 /* D7685C 802404BC 00000000 */   nop      
-/* D76860 802404C0 3C058024 */  lui       $a1, 0x8024
-/* D76864 802404C4 24A50500 */  addiu     $a1, $a1, 0x500
+/* D76860 802404C0 3C058024 */  lui       $a1, %hi(D_80240500)
+/* D76864 802404C4 24A50500 */  addiu     $a1, $a1, %lo(D_80240500)
 /* D76868 802404C8 0C048C56 */  jal       bind_dynamic_entity_3
 /* D7686C 802404CC 0000202D */   daddu    $a0, $zero, $zero
 /* D76870 802404D0 8E03013C */  lw        $v1, 0x13c($s0)
diff --git a/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240500_D768A0.s b/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240500_D768A0.s
index c4dd29303b..392452eaaa 100644
--- a/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240500_D768A0.s
+++ b/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240500_D768A0.s
@@ -28,8 +28,8 @@ glabel func_80240500_D768A0
 /* D768FC 8024055C 27A20038 */  addiu     $v0, $sp, 0x38
 /* D76900 80240560 AFA20018 */  sw        $v0, 0x18($sp)
 /* D76904 80240564 C600002C */  lwc1      $f0, 0x2c($s0)
-/* D76908 80240568 3C04800A */  lui       $a0, 0x800a
-/* D7690C 8024056C 8484A634 */  lh        $a0, -0x59cc($a0)
+/* D76908 80240568 3C04800A */  lui       $a0, %hi(D_8009A634)
+/* D7690C 8024056C 8484A634 */  lh        $a0, %lo(D_8009A634)($a0)
 /* D76910 80240570 46000007 */  neg.s     $f0, $f0
 /* D76914 80240574 44060000 */  mfc1      $a2, $f0
 /* D76918 80240578 0C00B94E */  jal       get_screen_coords
@@ -44,8 +44,8 @@ glabel func_80240500_D768A0
 /* D7693C 8024059C 54400022 */  bnel      $v0, $zero, .L80240628
 /* D76940 802405A0 24120011 */   addiu    $s2, $zero, 0x11
 /* D76944 802405A4 9203000E */  lbu       $v1, 0xe($s0)
-/* D76948 802405A8 3C02802E */  lui       $v0, 0x802e
-/* D7694C 802405AC 90429D71 */  lbu       $v0, -0x628f($v0)
+/* D76948 802405A8 3C02802E */  lui       $v0, %hi(D_802D9D71)
+/* D7694C 802405AC 90429D71 */  lbu       $v0, %lo(D_802D9D71)($v0)
 /* D76950 802405B0 10620018 */  beq       $v1, $v0, .L80240614
 /* D76954 802405B4 2C6200FE */   sltiu    $v0, $v1, 0xfe
 /* D76958 802405B8 1040000B */  beqz      $v0, .L802405E8
@@ -75,17 +75,17 @@ glabel func_80240500_D768A0
 /* D769B0 80240610 00000000 */   nop      
 .L80240614:
 /* D769B4 80240614 9202000E */  lbu       $v0, 0xe($s0)
-/* D769B8 80240618 3C01802E */  lui       $at, 0x802e
-/* D769BC 8024061C A0229D71 */  sb        $v0, -0x628f($at)
+/* D769B8 80240618 3C01802E */  lui       $at, %hi(D_802D9D71)
+/* D769BC 8024061C A0229D71 */  sb        $v0, %lo(D_802D9D71)($at)
 /* D769C0 80240620 0809018C */  j         .L80240630
 /* D769C4 80240624 00000000 */   nop      
 .L80240628:
-/* D769C8 80240628 3C01802E */  lui       $at, 0x802e
-/* D769CC 8024062C A0209D71 */  sb        $zero, -0x628f($at)
+/* D769C8 80240628 3C01802E */  lui       $at, %hi(D_802D9D71)
+/* D769CC 8024062C A0209D71 */  sb        $zero, %lo(D_802D9D71)($at)
 .L80240630:
 /* D769D0 80240630 8FA20038 */  lw        $v0, 0x38($sp)
-/* D769D4 80240634 3C048024 */  lui       $a0, 0x8024
-/* D769D8 80240638 24840870 */  addiu     $a0, $a0, 0x870
+/* D769D4 80240634 3C048024 */  lui       $a0, %hi(D_80240870)
+/* D769D8 80240638 24840870 */  addiu     $a0, $a0, %lo(D_80240870)
 /* D769DC 8024063C AE320000 */  sw        $s2, ($s1)
 /* D769E0 80240640 AE300008 */  sw        $s0, 8($s1)
 /* D769E4 80240644 00021023 */  negu      $v0, $v0
@@ -95,8 +95,8 @@ glabel func_80240500_D768A0
 /* D769F4 80240654 00431024 */  and       $v0, $v0, $v1
 /* D769F8 80240658 54400004 */  bnel      $v0, $zero, .L8024066C
 /* D769FC 8024065C AE24000C */   sw       $a0, 0xc($s1)
-/* D76A00 80240660 3C048024 */  lui       $a0, 0x8024
-/* D76A04 80240664 2484068C */  addiu     $a0, $a0, 0x68c
+/* D76A00 80240660 3C048024 */  lui       $a0, %hi(D_8024068C)
+/* D76A04 80240664 2484068C */  addiu     $a0, $a0, %lo(D_8024068C)
 /* D76A08 80240668 AE24000C */  sw        $a0, 0xc($s1)
 .L8024066C:
 /* D76A0C 8024066C 0C047644 */  jal       queue_render_task
diff --git a/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_8024068C_D76A2C.s b/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_8024068C_D76A2C.s
index 5722dea5bf..3294175959 100644
--- a/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_8024068C_D76A2C.s
+++ b/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_8024068C_D76A2C.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_8024068C_D76A2C
-/* D76A2C 8024068C 3C03800A */  lui       $v1, 0x800a
-/* D76A30 80240690 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D76A2C 8024068C 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D76A30 80240690 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D76A34 80240694 3C07BF80 */  lui       $a3, 0xbf80
 /* D76A38 80240698 27BDFEC0 */  addiu     $sp, $sp, -0x140
 /* D76A3C 8024069C F7B40128 */  sdc1      $f20, 0x128($sp)
@@ -22,9 +22,9 @@ glabel func_8024068C_D76A2C
 /* D76A70 802406D0 000218C0 */  sll       $v1, $v0, 3
 /* D76A74 802406D4 00431021 */  addu      $v0, $v0, $v1
 /* D76A78 802406D8 000210C0 */  sll       $v0, $v0, 3
-/* D76A7C 802406DC 3C01800B */  lui       $at, 0x800b
+/* D76A7C 802406DC 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* D76A80 802406E0 00220821 */  addu      $at, $at, $v0
-/* D76A84 802406E4 C4361DEC */  lwc1      $f22, 0x1dec($at)
+/* D76A84 802406E4 C4361DEC */  lwc1      $f22, %lo(D_800B1DEC)($at)
 /* D76A88 802406E8 4406A000 */  mfc1      $a2, $f20
 /* D76A8C 802406EC 4600B587 */  neg.s     $f22, $f22
 /* D76A90 802406F0 4405B000 */  mfc1      $a1, $f22
diff --git a/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240870_D76C10.s b/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240870_D76C10.s
index 6eaf6acb1e..3636d74b52 100644
--- a/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240870_D76C10.s
+++ b/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240870_D76C10.s
@@ -27,8 +27,8 @@ glabel func_80240870_D76C10
 /* D76C68 802408C8 F7B80160 */  sdc1      $f24, 0x160($sp)
 /* D76C6C 802408CC F7B40150 */  sdc1      $f20, 0x150($sp)
 .L802408D0:
-/* D76C70 802408D0 3C03800A */  lui       $v1, 0x800a
-/* D76C74 802408D4 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D76C70 802408D0 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D76C74 802408D4 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D76C78 802408D8 00031080 */  sll       $v0, $v1, 2
 /* D76C7C 802408DC 00431021 */  addu      $v0, $v0, $v1
 /* D76C80 802408E0 00021080 */  sll       $v0, $v0, 2
diff --git a/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240D3C_D770DC.s b/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240D3C_D770DC.s
index 89cd213031..38e1766b6f 100644
--- a/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240D3C_D770DC.s
+++ b/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240D3C_D770DC.s
@@ -25,13 +25,13 @@ glabel func_80240D3C_D770DC
 /* D77128 80240D88 08090378 */  j         .L80240DE0
 /* D7712C 80240D8C 00000000 */   nop      
 .L80240D90:
-/* D77130 80240D90 3C048024 */  lui       $a0, 0x8024
-/* D77134 80240D94 24840E84 */  addiu     $a0, $a0, 0xe84
+/* D77130 80240D90 3C048024 */  lui       $a0, %hi(D_80240E84)
+/* D77134 80240D94 24840E84 */  addiu     $a0, $a0, %lo(D_80240E84)
 /* D77138 80240D98 08090374 */  j         .L80240DD0
 /* D7713C 80240D9C 00000000 */   nop      
 .L80240DA0:
-/* D77140 80240DA0 3C048024 */  lui       $a0, 0x8024
-/* D77144 80240DA4 24840EEC */  addiu     $a0, $a0, 0xeec
+/* D77140 80240DA0 3C048024 */  lui       $a0, %hi(D_80240EEC)
+/* D77144 80240DA4 24840EEC */  addiu     $a0, $a0, %lo(D_80240EEC)
 /* D77148 80240DA8 08090374 */  j         .L80240DD0
 /* D7714C 80240DAC 00000000 */   nop      
 .L80240DB0:
@@ -42,8 +42,8 @@ glabel func_80240D3C_D770DC
 /* D77160 80240DC0 10400007 */  beqz      $v0, .L80240DE0
 /* D77164 80240DC4 00000000 */   nop      
 .L80240DC8:
-/* D77168 80240DC8 3C048024 */  lui       $a0, 0x8024
-/* D7716C 80240DCC 24840EB8 */  addiu     $a0, $a0, 0xeb8
+/* D77168 80240DC8 3C048024 */  lui       $a0, %hi(D_80240EB8)
+/* D7716C 80240DCC 24840EB8 */  addiu     $a0, $a0, %lo(D_80240EB8)
 .L80240DD0:
 /* D77170 80240DD0 0C048C56 */  jal       bind_dynamic_entity_3
 /* D77174 80240DD4 0000282D */   daddu    $a1, $zero, $zero
diff --git a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240000_D799F0.s b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240000_D799F0.s
index 78798f1a2e..69e557d6fd 100644
--- a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240000_D799F0.s
+++ b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240000_D799F0.s
@@ -3,21 +3,21 @@
 
 glabel func_80240000_D799F0
 /* D799F0 80240000 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D799F4 80240004 3C04800E */  lui       $a0, 0x800e
-/* D799F8 80240008 24849230 */  addiu     $a0, $a0, -0x6dd0
-/* D799FC 8024000C 3C058024 */  lui       $a1, 0x8024
-/* D79A00 80240010 24A51880 */  addiu     $a1, $a1, 0x1880
+/* D799F4 80240004 3C04800E */  lui       $a0, %hi(D_800D9230)
+/* D799F8 80240008 24849230 */  addiu     $a0, $a0, %lo(D_800D9230)
+/* D799FC 8024000C 3C058024 */  lui       $a1, %hi(D_80241880)
+/* D79A00 80240010 24A51880 */  addiu     $a1, $a1, %lo(D_80241880)
 /* D79A04 80240014 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
 /* D79A08 80240018 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
 /* D79A0C 8024001C 24020001 */  addiu     $v0, $zero, 1
 /* D79A10 80240020 AFBF0010 */  sw        $ra, 0x10($sp)
 /* D79A14 80240024 0C01953C */  jal       sprintf
 /* D79A18 80240028 A0620084 */   sb       $v0, 0x84($v1)
-/* D79A1C 8024002C 3C04800E */  lui       $a0, 0x800e
-/* D79A20 80240030 248491E0 */  addiu     $a0, $a0, -0x6e20
-/* D79A24 80240034 3C058024 */  lui       $a1, 0x8024
+/* D79A1C 8024002C 3C04800E */  lui       $a0, %hi(D_800D91E0)
+/* D79A20 80240030 248491E0 */  addiu     $a0, $a0, %lo(D_800D91E0)
+/* D79A24 80240034 3C058024 */  lui       $a1, %hi(D_80241890)
 /* D79A28 80240038 0C01953C */  jal       sprintf
-/* D79A2C 8024003C 24A51890 */   addiu    $a1, $a1, 0x1890
+/* D79A2C 8024003C 24A51890 */   addiu    $a1, $a1, %lo(D_80241890)
 /* D79A30 80240040 8FBF0010 */  lw        $ra, 0x10($sp)
 /* D79A34 80240044 0000102D */  daddu     $v0, $zero, $zero
 /* D79A38 80240048 03E00008 */  jr        $ra
diff --git a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_8024011C_D79B0C.s b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_8024011C_D79B0C.s
index ced8241017..325534adac 100644
--- a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_8024011C_D79B0C.s
+++ b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_8024011C_D79B0C.s
@@ -5,8 +5,8 @@ glabel func_8024011C_D79B0C
 /* D79B0C 8024011C 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* D79B10 80240120 AFB00010 */  sw        $s0, 0x10($sp)
 /* D79B14 80240124 0080802D */  daddu     $s0, $a0, $zero
-/* D79B18 80240128 3C058024 */  lui       $a1, 0x8024
-/* D79B1C 8024012C 24A50158 */  addiu     $a1, $a1, 0x158
+/* D79B18 80240128 3C058024 */  lui       $a1, %hi(D_80240158)
+/* D79B1C 8024012C 24A50158 */  addiu     $a1, $a1, %lo(D_80240158)
 /* D79B20 80240130 AFBF0014 */  sw        $ra, 0x14($sp)
 /* D79B24 80240134 0C048C56 */  jal       bind_dynamic_entity_3
 /* D79B28 80240138 0000202D */   daddu    $a0, $zero, $zero
diff --git a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240158_D79B48.s b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240158_D79B48.s
index b7c047c6eb..40dc93e92f 100644
--- a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240158_D79B48.s
+++ b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240158_D79B48.s
@@ -29,8 +29,8 @@ glabel func_80240158_D79B48
 /* D79BA8 802401B8 27A20034 */  addiu     $v0, $sp, 0x34
 /* D79BAC 802401BC AFA20014 */  sw        $v0, 0x14($sp)
 /* D79BB0 802401C0 C6000030 */  lwc1      $f0, 0x30($s0)
-/* D79BB4 802401C4 3C04800A */  lui       $a0, 0x800a
-/* D79BB8 802401C8 8484A634 */  lh        $a0, -0x59cc($a0)
+/* D79BB4 802401C4 3C04800A */  lui       $a0, %hi(D_8009A634)
+/* D79BB8 802401C8 8484A634 */  lh        $a0, %lo(D_8009A634)($a0)
 /* D79BBC 802401CC 46000007 */  neg.s     $f0, $f0
 /* D79BC0 802401D0 44070000 */  mfc1      $a3, $f0
 /* D79BC4 802401D4 27A20038 */  addiu     $v0, $sp, 0x38
@@ -67,8 +67,8 @@ glabel func_80240158_D79B48
 /* D79C3C 8024024C 54400022 */  bnel      $v0, $zero, .L802402D8
 /* D79C40 80240250 24110011 */   addiu    $s1, $zero, 0x11
 /* D79C44 80240254 9203000E */  lbu       $v1, 0xe($s0)
-/* D79C48 80240258 3C02802E */  lui       $v0, 0x802e
-/* D79C4C 8024025C 90429D70 */  lbu       $v0, -0x6290($v0)
+/* D79C48 80240258 3C02802E */  lui       $v0, %hi(D_802D9D70)
+/* D79C4C 8024025C 90429D70 */  lbu       $v0, %lo(D_802D9D70)($v0)
 /* D79C50 80240260 10620018 */  beq       $v1, $v0, .L802402C4
 /* D79C54 80240264 2C6200FE */   sltiu    $v0, $v1, 0xfe
 /* D79C58 80240268 1040000B */  beqz      $v0, .L80240298
@@ -98,20 +98,20 @@ glabel func_80240158_D79B48
 /* D79CB0 802402C0 00000000 */   nop      
 .L802402C4:
 /* D79CB4 802402C4 9202000E */  lbu       $v0, 0xe($s0)
-/* D79CB8 802402C8 3C01802E */  lui       $at, 0x802e
-/* D79CBC 802402CC A0229D70 */  sb        $v0, -0x6290($at)
+/* D79CB8 802402C8 3C01802E */  lui       $at, %hi(D_802D9D70)
+/* D79CBC 802402CC A0229D70 */  sb        $v0, %lo(D_802D9D70)($at)
 /* D79CC0 802402D0 080900B9 */  j         .L802402E4
 /* D79CC4 802402D4 0240202D */   daddu    $a0, $s2, $zero
 .L802402D8:
-/* D79CC8 802402D8 3C01802E */  lui       $at, 0x802e
-/* D79CCC 802402DC A0209D70 */  sb        $zero, -0x6290($at)
+/* D79CC8 802402D8 3C01802E */  lui       $at, %hi(D_802D9D70)
+/* D79CCC 802402DC A0209D70 */  sb        $zero, %lo(D_802D9D70)($at)
 /* D79CD0 802402E0 0240202D */  daddu     $a0, $s2, $zero
 .L802402E4:
 /* D79CD4 802402E4 AC910000 */  sw        $s1, ($a0)
 /* D79CD8 802402E8 AC900008 */  sw        $s0, 8($a0)
 /* D79CDC 802402EC 8FA20038 */  lw        $v0, 0x38($sp)
-/* D79CE0 802402F0 3C038024 */  lui       $v1, 0x8024
-/* D79CE4 802402F4 24630320 */  addiu     $v1, $v1, 0x320
+/* D79CE0 802402F0 3C038024 */  lui       $v1, %hi(D_80240320)
+/* D79CE4 802402F4 24630320 */  addiu     $v1, $v1, %lo(D_80240320)
 /* D79CE8 802402F8 AC83000C */  sw        $v1, 0xc($a0)
 /* D79CEC 802402FC 00021023 */  negu      $v0, $v0
 /* D79CF0 80240300 0C047644 */  jal       queue_render_task
diff --git a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240320_D79D10.s b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240320_D79D10.s
index 3ae8511e66..d67a14d809 100644
--- a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240320_D79D10.s
+++ b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240320_D79D10.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80240320_D79D10
-/* D79D10 80240320 3C03800A */  lui       $v1, 0x800a
-/* D79D14 80240324 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D79D10 80240320 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D79D14 80240324 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D79D18 80240328 3C07BF80 */  lui       $a3, 0xbf80
 /* D79D1C 8024032C 27BDFEC0 */  addiu     $sp, $sp, -0x140
 /* D79D20 80240330 F7B40128 */  sdc1      $f20, 0x128($sp)
@@ -22,9 +22,9 @@ glabel func_80240320_D79D10
 /* D79D54 80240364 000218C0 */  sll       $v1, $v0, 3
 /* D79D58 80240368 00431021 */  addu      $v0, $v0, $v1
 /* D79D5C 8024036C 000210C0 */  sll       $v0, $v0, 3
-/* D79D60 80240370 3C01800B */  lui       $at, 0x800b
+/* D79D60 80240370 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* D79D64 80240374 00220821 */  addu      $at, $at, $v0
-/* D79D68 80240378 C4361DEC */  lwc1      $f22, 0x1dec($at)
+/* D79D68 80240378 C4361DEC */  lwc1      $f22, %lo(D_800B1DEC)($at)
 /* D79D6C 8024037C 4406A000 */  mfc1      $a2, $f20
 /* D79D70 80240380 4600B587 */  neg.s     $f22, $f22
 /* D79D74 80240384 4405B000 */  mfc1      $a1, $f22
diff --git a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_802404CC_D79EBC.s b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_802404CC_D79EBC.s
index de758fb9a4..5e4a40bf94 100644
--- a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_802404CC_D79EBC.s
+++ b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_802404CC_D79EBC.s
@@ -11,8 +11,8 @@ glabel func_802404CC_D79EBC
 /* D79ED4 802404E4 28420002 */   slti     $v0, $v0, 2
 /* D79ED8 802404E8 1040000C */  beqz      $v0, .L8024051C
 /* D79EDC 802404EC 00000000 */   nop      
-/* D79EE0 802404F0 3C058024 */  lui       $a1, 0x8024
-/* D79EE4 802404F4 24A50530 */  addiu     $a1, $a1, 0x530
+/* D79EE0 802404F0 3C058024 */  lui       $a1, %hi(D_80240530)
+/* D79EE4 802404F4 24A50530 */  addiu     $a1, $a1, %lo(D_80240530)
 /* D79EE8 802404F8 0C048C56 */  jal       bind_dynamic_entity_3
 /* D79EEC 802404FC 0000202D */   daddu    $a0, $zero, $zero
 /* D79EF0 80240500 8E03013C */  lw        $v1, 0x13c($s0)
diff --git a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240530_D79F20.s b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240530_D79F20.s
index f7675aff1d..2cc84dcfa8 100644
--- a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240530_D79F20.s
+++ b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240530_D79F20.s
@@ -28,8 +28,8 @@ glabel func_80240530_D79F20
 /* D79F7C 8024058C 27A20038 */  addiu     $v0, $sp, 0x38
 /* D79F80 80240590 AFA20018 */  sw        $v0, 0x18($sp)
 /* D79F84 80240594 C600002C */  lwc1      $f0, 0x2c($s0)
-/* D79F88 80240598 3C04800A */  lui       $a0, 0x800a
-/* D79F8C 8024059C 8484A634 */  lh        $a0, -0x59cc($a0)
+/* D79F88 80240598 3C04800A */  lui       $a0, %hi(D_8009A634)
+/* D79F8C 8024059C 8484A634 */  lh        $a0, %lo(D_8009A634)($a0)
 /* D79F90 802405A0 46000007 */  neg.s     $f0, $f0
 /* D79F94 802405A4 44060000 */  mfc1      $a2, $f0
 /* D79F98 802405A8 0C00B94E */  jal       get_screen_coords
@@ -44,8 +44,8 @@ glabel func_80240530_D79F20
 /* D79FBC 802405CC 54400022 */  bnel      $v0, $zero, .L80240658
 /* D79FC0 802405D0 24120011 */   addiu    $s2, $zero, 0x11
 /* D79FC4 802405D4 9203000E */  lbu       $v1, 0xe($s0)
-/* D79FC8 802405D8 3C02802E */  lui       $v0, 0x802e
-/* D79FCC 802405DC 90429D71 */  lbu       $v0, -0x628f($v0)
+/* D79FC8 802405D8 3C02802E */  lui       $v0, %hi(D_802D9D71)
+/* D79FCC 802405DC 90429D71 */  lbu       $v0, %lo(D_802D9D71)($v0)
 /* D79FD0 802405E0 10620018 */  beq       $v1, $v0, .L80240644
 /* D79FD4 802405E4 2C6200FE */   sltiu    $v0, $v1, 0xfe
 /* D79FD8 802405E8 1040000B */  beqz      $v0, .L80240618
@@ -75,17 +75,17 @@ glabel func_80240530_D79F20
 /* D7A030 80240640 00000000 */   nop      
 .L80240644:
 /* D7A034 80240644 9202000E */  lbu       $v0, 0xe($s0)
-/* D7A038 80240648 3C01802E */  lui       $at, 0x802e
-/* D7A03C 8024064C A0229D71 */  sb        $v0, -0x628f($at)
+/* D7A038 80240648 3C01802E */  lui       $at, %hi(D_802D9D71)
+/* D7A03C 8024064C A0229D71 */  sb        $v0, %lo(D_802D9D71)($at)
 /* D7A040 80240650 08090198 */  j         .L80240660
 /* D7A044 80240654 00000000 */   nop      
 .L80240658:
-/* D7A048 80240658 3C01802E */  lui       $at, 0x802e
-/* D7A04C 8024065C A0209D71 */  sb        $zero, -0x628f($at)
+/* D7A048 80240658 3C01802E */  lui       $at, %hi(D_802D9D71)
+/* D7A04C 8024065C A0209D71 */  sb        $zero, %lo(D_802D9D71)($at)
 .L80240660:
 /* D7A050 80240660 8FA20038 */  lw        $v0, 0x38($sp)
-/* D7A054 80240664 3C048024 */  lui       $a0, 0x8024
-/* D7A058 80240668 248408A0 */  addiu     $a0, $a0, 0x8a0
+/* D7A054 80240664 3C048024 */  lui       $a0, %hi(D_802408A0)
+/* D7A058 80240668 248408A0 */  addiu     $a0, $a0, %lo(D_802408A0)
 /* D7A05C 8024066C AE320000 */  sw        $s2, ($s1)
 /* D7A060 80240670 AE300008 */  sw        $s0, 8($s1)
 /* D7A064 80240674 00021023 */  negu      $v0, $v0
@@ -95,8 +95,8 @@ glabel func_80240530_D79F20
 /* D7A074 80240684 00431024 */  and       $v0, $v0, $v1
 /* D7A078 80240688 54400004 */  bnel      $v0, $zero, .L8024069C
 /* D7A07C 8024068C AE24000C */   sw       $a0, 0xc($s1)
-/* D7A080 80240690 3C048024 */  lui       $a0, 0x8024
-/* D7A084 80240694 248406BC */  addiu     $a0, $a0, 0x6bc
+/* D7A080 80240690 3C048024 */  lui       $a0, %hi(D_802406BC)
+/* D7A084 80240694 248406BC */  addiu     $a0, $a0, %lo(D_802406BC)
 /* D7A088 80240698 AE24000C */  sw        $a0, 0xc($s1)
 .L8024069C:
 /* D7A08C 8024069C 0C047644 */  jal       queue_render_task
diff --git a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_802406BC_D7A0AC.s b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_802406BC_D7A0AC.s
index 7c490021cd..46c899feec 100644
--- a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_802406BC_D7A0AC.s
+++ b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_802406BC_D7A0AC.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_802406BC_D7A0AC
-/* D7A0AC 802406BC 3C03800A */  lui       $v1, 0x800a
-/* D7A0B0 802406C0 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D7A0AC 802406BC 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D7A0B0 802406C0 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D7A0B4 802406C4 3C07BF80 */  lui       $a3, 0xbf80
 /* D7A0B8 802406C8 27BDFEC0 */  addiu     $sp, $sp, -0x140
 /* D7A0BC 802406CC F7B40128 */  sdc1      $f20, 0x128($sp)
@@ -22,9 +22,9 @@ glabel func_802406BC_D7A0AC
 /* D7A0F0 80240700 000218C0 */  sll       $v1, $v0, 3
 /* D7A0F4 80240704 00431021 */  addu      $v0, $v0, $v1
 /* D7A0F8 80240708 000210C0 */  sll       $v0, $v0, 3
-/* D7A0FC 8024070C 3C01800B */  lui       $at, 0x800b
+/* D7A0FC 8024070C 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* D7A100 80240710 00220821 */  addu      $at, $at, $v0
-/* D7A104 80240714 C4361DEC */  lwc1      $f22, 0x1dec($at)
+/* D7A104 80240714 C4361DEC */  lwc1      $f22, %lo(D_800B1DEC)($at)
 /* D7A108 80240718 4406A000 */  mfc1      $a2, $f20
 /* D7A10C 8024071C 4600B587 */  neg.s     $f22, $f22
 /* D7A110 80240720 4405B000 */  mfc1      $a1, $f22
diff --git a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_802408A0_D7A290.s b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_802408A0_D7A290.s
index 155cb7dd07..3d0ddf9bdc 100644
--- a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_802408A0_D7A290.s
+++ b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_802408A0_D7A290.s
@@ -27,8 +27,8 @@ glabel func_802408A0_D7A290
 /* D7A2E8 802408F8 F7B80160 */  sdc1      $f24, 0x160($sp)
 /* D7A2EC 802408FC F7B40150 */  sdc1      $f20, 0x150($sp)
 .L80240900:
-/* D7A2F0 80240900 3C03800A */  lui       $v1, 0x800a
-/* D7A2F4 80240904 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D7A2F0 80240900 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D7A2F4 80240904 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D7A2F8 80240908 00031080 */  sll       $v0, $v1, 2
 /* D7A2FC 8024090C 00431021 */  addu      $v0, $v0, $v1
 /* D7A300 80240910 00021080 */  sll       $v0, $v0, 2
diff --git a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240D6C_D7A75C.s b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240D6C_D7A75C.s
index 743cbefcb2..4c7f2ca0c2 100644
--- a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240D6C_D7A75C.s
+++ b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240D6C_D7A75C.s
@@ -25,13 +25,13 @@ glabel func_80240D6C_D7A75C
 /* D7A7A8 80240DB8 08090384 */  j         .L80240E10
 /* D7A7AC 80240DBC 00000000 */   nop      
 .L80240DC0:
-/* D7A7B0 80240DC0 3C048024 */  lui       $a0, 0x8024
-/* D7A7B4 80240DC4 24840EB4 */  addiu     $a0, $a0, 0xeb4
+/* D7A7B0 80240DC0 3C048024 */  lui       $a0, %hi(D_80240EB4)
+/* D7A7B4 80240DC4 24840EB4 */  addiu     $a0, $a0, %lo(D_80240EB4)
 /* D7A7B8 80240DC8 08090380 */  j         .L80240E00
 /* D7A7BC 80240DCC 00000000 */   nop      
 .L80240DD0:
-/* D7A7C0 80240DD0 3C048024 */  lui       $a0, 0x8024
-/* D7A7C4 80240DD4 24840F1C */  addiu     $a0, $a0, 0xf1c
+/* D7A7C0 80240DD0 3C048024 */  lui       $a0, %hi(D_80240F1C)
+/* D7A7C4 80240DD4 24840F1C */  addiu     $a0, $a0, %lo(D_80240F1C)
 /* D7A7C8 80240DD8 08090380 */  j         .L80240E00
 /* D7A7CC 80240DDC 00000000 */   nop      
 .L80240DE0:
@@ -42,8 +42,8 @@ glabel func_80240D6C_D7A75C
 /* D7A7E0 80240DF0 10400007 */  beqz      $v0, .L80240E10
 /* D7A7E4 80240DF4 00000000 */   nop      
 .L80240DF8:
-/* D7A7E8 80240DF8 3C048024 */  lui       $a0, 0x8024
-/* D7A7EC 80240DFC 24840EE8 */  addiu     $a0, $a0, 0xee8
+/* D7A7E8 80240DF8 3C048024 */  lui       $a0, %hi(D_80240EE8)
+/* D7A7EC 80240DFC 24840EE8 */  addiu     $a0, $a0, %lo(D_80240EE8)
 .L80240E00:
 /* D7A7F0 80240E00 0C048C56 */  jal       bind_dynamic_entity_3
 /* D7A7F4 80240E04 0000282D */   daddu    $a1, $zero, $zero
diff --git a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240F50_D7A940.s b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240F50_D7A940.s
index 6ce9b84c36..c092cd533a 100644
--- a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240F50_D7A940.s
+++ b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240F50_D7A940.s
@@ -4,8 +4,8 @@
 glabel func_80240F50_D7A940
 /* D7A940 80240F50 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* D7A944 80240F54 AFB00010 */  sw        $s0, 0x10($sp)
-/* D7A948 80240F58 3C108024 */  lui       $s0, 0x8024
-/* D7A94C 80240F5C 26101690 */  addiu     $s0, $s0, 0x1690
+/* D7A948 80240F58 3C108024 */  lui       $s0, %hi(D_80241690)
+/* D7A94C 80240F5C 26101690 */  addiu     $s0, $s0, %lo(D_80241690)
 /* D7A950 80240F60 AFBF0018 */  sw        $ra, 0x18($sp)
 /* D7A954 80240F64 AFB10014 */  sw        $s1, 0x14($sp)
 /* D7A958 80240F68 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_80240F50_D7A940
 /* D7A9BC 80240FCC 28620010 */  slti      $v0, $v1, 0x10
 /* D7A9C0 80240FD0 1440FFFA */  bnez      $v0, .L80240FBC
 /* D7A9C4 80240FD4 24840004 */   addiu    $a0, $a0, 4
-/* D7A9C8 80240FD8 3C108024 */  lui       $s0, 0x8024
-/* D7A9CC 80240FDC 26101690 */  addiu     $s0, $s0, 0x1690
+/* D7A9C8 80240FD8 3C108024 */  lui       $s0, %hi(D_80241690)
+/* D7A9CC 80240FDC 26101690 */  addiu     $s0, $s0, %lo(D_80241690)
 /* D7A9D0 80240FE0 0C00AB4B */  jal       heap_free
 /* D7A9D4 80240FE4 8E040000 */   lw       $a0, ($s0)
 /* D7A9D8 80240FE8 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240000_D7B2A0.s b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240000_D7B2A0.s
index f80fb120a4..f8d153007f 100644
--- a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240000_D7B2A0.s
+++ b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240000_D7B2A0.s
@@ -3,21 +3,21 @@
 
 glabel func_80240000_D7B2A0
 /* D7B2A0 80240000 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D7B2A4 80240004 3C04800E */  lui       $a0, 0x800e
-/* D7B2A8 80240008 24849230 */  addiu     $a0, $a0, -0x6dd0
-/* D7B2AC 8024000C 3C058024 */  lui       $a1, 0x8024
-/* D7B2B0 80240010 24A51880 */  addiu     $a1, $a1, 0x1880
+/* D7B2A4 80240004 3C04800E */  lui       $a0, %hi(D_800D9230)
+/* D7B2A8 80240008 24849230 */  addiu     $a0, $a0, %lo(D_800D9230)
+/* D7B2AC 8024000C 3C058024 */  lui       $a1, %hi(D_80241880)
+/* D7B2B0 80240010 24A51880 */  addiu     $a1, $a1, %lo(D_80241880)
 /* D7B2B4 80240014 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
 /* D7B2B8 80240018 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
 /* D7B2BC 8024001C 24020001 */  addiu     $v0, $zero, 1
 /* D7B2C0 80240020 AFBF0010 */  sw        $ra, 0x10($sp)
 /* D7B2C4 80240024 0C01953C */  jal       sprintf
 /* D7B2C8 80240028 A0620084 */   sb       $v0, 0x84($v1)
-/* D7B2CC 8024002C 3C04800E */  lui       $a0, 0x800e
-/* D7B2D0 80240030 248491E0 */  addiu     $a0, $a0, -0x6e20
-/* D7B2D4 80240034 3C058024 */  lui       $a1, 0x8024
+/* D7B2CC 8024002C 3C04800E */  lui       $a0, %hi(D_800D91E0)
+/* D7B2D0 80240030 248491E0 */  addiu     $a0, $a0, %lo(D_800D91E0)
+/* D7B2D4 80240034 3C058024 */  lui       $a1, %hi(D_80241890)
 /* D7B2D8 80240038 0C01953C */  jal       sprintf
-/* D7B2DC 8024003C 24A51890 */   addiu    $a1, $a1, 0x1890
+/* D7B2DC 8024003C 24A51890 */   addiu    $a1, $a1, %lo(D_80241890)
 /* D7B2E0 80240040 8FBF0010 */  lw        $ra, 0x10($sp)
 /* D7B2E4 80240044 0000102D */  daddu     $v0, $zero, $zero
 /* D7B2E8 80240048 03E00008 */  jr        $ra
diff --git a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_8024011C_D7B3BC.s b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_8024011C_D7B3BC.s
index 2783a0532e..3a25f5e8a3 100644
--- a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_8024011C_D7B3BC.s
+++ b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_8024011C_D7B3BC.s
@@ -5,8 +5,8 @@ glabel func_8024011C_D7B3BC
 /* D7B3BC 8024011C 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* D7B3C0 80240120 AFB00010 */  sw        $s0, 0x10($sp)
 /* D7B3C4 80240124 0080802D */  daddu     $s0, $a0, $zero
-/* D7B3C8 80240128 3C058024 */  lui       $a1, 0x8024
-/* D7B3CC 8024012C 24A50158 */  addiu     $a1, $a1, 0x158
+/* D7B3C8 80240128 3C058024 */  lui       $a1, %hi(D_80240158)
+/* D7B3CC 8024012C 24A50158 */  addiu     $a1, $a1, %lo(D_80240158)
 /* D7B3D0 80240130 AFBF0014 */  sw        $ra, 0x14($sp)
 /* D7B3D4 80240134 0C048C56 */  jal       bind_dynamic_entity_3
 /* D7B3D8 80240138 0000202D */   daddu    $a0, $zero, $zero
diff --git a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240158_D7B3F8.s b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240158_D7B3F8.s
index 3f168d0025..91b09b55f7 100644
--- a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240158_D7B3F8.s
+++ b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240158_D7B3F8.s
@@ -29,8 +29,8 @@ glabel func_80240158_D7B3F8
 /* D7B458 802401B8 27A20034 */  addiu     $v0, $sp, 0x34
 /* D7B45C 802401BC AFA20014 */  sw        $v0, 0x14($sp)
 /* D7B460 802401C0 C6000030 */  lwc1      $f0, 0x30($s0)
-/* D7B464 802401C4 3C04800A */  lui       $a0, 0x800a
-/* D7B468 802401C8 8484A634 */  lh        $a0, -0x59cc($a0)
+/* D7B464 802401C4 3C04800A */  lui       $a0, %hi(D_8009A634)
+/* D7B468 802401C8 8484A634 */  lh        $a0, %lo(D_8009A634)($a0)
 /* D7B46C 802401CC 46000007 */  neg.s     $f0, $f0
 /* D7B470 802401D0 44070000 */  mfc1      $a3, $f0
 /* D7B474 802401D4 27A20038 */  addiu     $v0, $sp, 0x38
@@ -67,8 +67,8 @@ glabel func_80240158_D7B3F8
 /* D7B4EC 8024024C 54400022 */  bnel      $v0, $zero, .L802402D8
 /* D7B4F0 80240250 24110011 */   addiu    $s1, $zero, 0x11
 /* D7B4F4 80240254 9203000E */  lbu       $v1, 0xe($s0)
-/* D7B4F8 80240258 3C02802E */  lui       $v0, 0x802e
-/* D7B4FC 8024025C 90429D70 */  lbu       $v0, -0x6290($v0)
+/* D7B4F8 80240258 3C02802E */  lui       $v0, %hi(D_802D9D70)
+/* D7B4FC 8024025C 90429D70 */  lbu       $v0, %lo(D_802D9D70)($v0)
 /* D7B500 80240260 10620018 */  beq       $v1, $v0, .L802402C4
 /* D7B504 80240264 2C6200FE */   sltiu    $v0, $v1, 0xfe
 /* D7B508 80240268 1040000B */  beqz      $v0, .L80240298
@@ -98,20 +98,20 @@ glabel func_80240158_D7B3F8
 /* D7B560 802402C0 00000000 */   nop      
 .L802402C4:
 /* D7B564 802402C4 9202000E */  lbu       $v0, 0xe($s0)
-/* D7B568 802402C8 3C01802E */  lui       $at, 0x802e
-/* D7B56C 802402CC A0229D70 */  sb        $v0, -0x6290($at)
+/* D7B568 802402C8 3C01802E */  lui       $at, %hi(D_802D9D70)
+/* D7B56C 802402CC A0229D70 */  sb        $v0, %lo(D_802D9D70)($at)
 /* D7B570 802402D0 080900B9 */  j         .L802402E4
 /* D7B574 802402D4 0240202D */   daddu    $a0, $s2, $zero
 .L802402D8:
-/* D7B578 802402D8 3C01802E */  lui       $at, 0x802e
-/* D7B57C 802402DC A0209D70 */  sb        $zero, -0x6290($at)
+/* D7B578 802402D8 3C01802E */  lui       $at, %hi(D_802D9D70)
+/* D7B57C 802402DC A0209D70 */  sb        $zero, %lo(D_802D9D70)($at)
 /* D7B580 802402E0 0240202D */  daddu     $a0, $s2, $zero
 .L802402E4:
 /* D7B584 802402E4 AC910000 */  sw        $s1, ($a0)
 /* D7B588 802402E8 AC900008 */  sw        $s0, 8($a0)
 /* D7B58C 802402EC 8FA20038 */  lw        $v0, 0x38($sp)
-/* D7B590 802402F0 3C038024 */  lui       $v1, 0x8024
-/* D7B594 802402F4 24630320 */  addiu     $v1, $v1, 0x320
+/* D7B590 802402F0 3C038024 */  lui       $v1, %hi(D_80240320)
+/* D7B594 802402F4 24630320 */  addiu     $v1, $v1, %lo(D_80240320)
 /* D7B598 802402F8 AC83000C */  sw        $v1, 0xc($a0)
 /* D7B59C 802402FC 00021023 */  negu      $v0, $v0
 /* D7B5A0 80240300 0C047644 */  jal       queue_render_task
diff --git a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240320_D7B5C0.s b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240320_D7B5C0.s
index d557abe367..05bf1cc9b2 100644
--- a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240320_D7B5C0.s
+++ b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240320_D7B5C0.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80240320_D7B5C0
-/* D7B5C0 80240320 3C03800A */  lui       $v1, 0x800a
-/* D7B5C4 80240324 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D7B5C0 80240320 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D7B5C4 80240324 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D7B5C8 80240328 3C07BF80 */  lui       $a3, 0xbf80
 /* D7B5CC 8024032C 27BDFEC0 */  addiu     $sp, $sp, -0x140
 /* D7B5D0 80240330 F7B40128 */  sdc1      $f20, 0x128($sp)
@@ -22,9 +22,9 @@ glabel func_80240320_D7B5C0
 /* D7B604 80240364 000218C0 */  sll       $v1, $v0, 3
 /* D7B608 80240368 00431021 */  addu      $v0, $v0, $v1
 /* D7B60C 8024036C 000210C0 */  sll       $v0, $v0, 3
-/* D7B610 80240370 3C01800B */  lui       $at, 0x800b
+/* D7B610 80240370 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* D7B614 80240374 00220821 */  addu      $at, $at, $v0
-/* D7B618 80240378 C4361DEC */  lwc1      $f22, 0x1dec($at)
+/* D7B618 80240378 C4361DEC */  lwc1      $f22, %lo(D_800B1DEC)($at)
 /* D7B61C 8024037C 4406A000 */  mfc1      $a2, $f20
 /* D7B620 80240380 4600B587 */  neg.s     $f22, $f22
 /* D7B624 80240384 4405B000 */  mfc1      $a1, $f22
diff --git a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_802404CC_D7B76C.s b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_802404CC_D7B76C.s
index 586514feed..944a8c0249 100644
--- a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_802404CC_D7B76C.s
+++ b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_802404CC_D7B76C.s
@@ -11,8 +11,8 @@ glabel func_802404CC_D7B76C
 /* D7B784 802404E4 28420002 */   slti     $v0, $v0, 2
 /* D7B788 802404E8 1040000C */  beqz      $v0, .L8024051C
 /* D7B78C 802404EC 00000000 */   nop      
-/* D7B790 802404F0 3C058024 */  lui       $a1, 0x8024
-/* D7B794 802404F4 24A50530 */  addiu     $a1, $a1, 0x530
+/* D7B790 802404F0 3C058024 */  lui       $a1, %hi(D_80240530)
+/* D7B794 802404F4 24A50530 */  addiu     $a1, $a1, %lo(D_80240530)
 /* D7B798 802404F8 0C048C56 */  jal       bind_dynamic_entity_3
 /* D7B79C 802404FC 0000202D */   daddu    $a0, $zero, $zero
 /* D7B7A0 80240500 8E03013C */  lw        $v1, 0x13c($s0)
diff --git a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240530_D7B7D0.s b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240530_D7B7D0.s
index 49a6b1ce81..aba631da1e 100644
--- a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240530_D7B7D0.s
+++ b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240530_D7B7D0.s
@@ -28,8 +28,8 @@ glabel func_80240530_D7B7D0
 /* D7B82C 8024058C 27A20038 */  addiu     $v0, $sp, 0x38
 /* D7B830 80240590 AFA20018 */  sw        $v0, 0x18($sp)
 /* D7B834 80240594 C600002C */  lwc1      $f0, 0x2c($s0)
-/* D7B838 80240598 3C04800A */  lui       $a0, 0x800a
-/* D7B83C 8024059C 8484A634 */  lh        $a0, -0x59cc($a0)
+/* D7B838 80240598 3C04800A */  lui       $a0, %hi(D_8009A634)
+/* D7B83C 8024059C 8484A634 */  lh        $a0, %lo(D_8009A634)($a0)
 /* D7B840 802405A0 46000007 */  neg.s     $f0, $f0
 /* D7B844 802405A4 44060000 */  mfc1      $a2, $f0
 /* D7B848 802405A8 0C00B94E */  jal       get_screen_coords
@@ -44,8 +44,8 @@ glabel func_80240530_D7B7D0
 /* D7B86C 802405CC 54400022 */  bnel      $v0, $zero, .L80240658
 /* D7B870 802405D0 24120011 */   addiu    $s2, $zero, 0x11
 /* D7B874 802405D4 9203000E */  lbu       $v1, 0xe($s0)
-/* D7B878 802405D8 3C02802E */  lui       $v0, 0x802e
-/* D7B87C 802405DC 90429D71 */  lbu       $v0, -0x628f($v0)
+/* D7B878 802405D8 3C02802E */  lui       $v0, %hi(D_802D9D71)
+/* D7B87C 802405DC 90429D71 */  lbu       $v0, %lo(D_802D9D71)($v0)
 /* D7B880 802405E0 10620018 */  beq       $v1, $v0, .L80240644
 /* D7B884 802405E4 2C6200FE */   sltiu    $v0, $v1, 0xfe
 /* D7B888 802405E8 1040000B */  beqz      $v0, .L80240618
@@ -75,17 +75,17 @@ glabel func_80240530_D7B7D0
 /* D7B8E0 80240640 00000000 */   nop      
 .L80240644:
 /* D7B8E4 80240644 9202000E */  lbu       $v0, 0xe($s0)
-/* D7B8E8 80240648 3C01802E */  lui       $at, 0x802e
-/* D7B8EC 8024064C A0229D71 */  sb        $v0, -0x628f($at)
+/* D7B8E8 80240648 3C01802E */  lui       $at, %hi(D_802D9D71)
+/* D7B8EC 8024064C A0229D71 */  sb        $v0, %lo(D_802D9D71)($at)
 /* D7B8F0 80240650 08090198 */  j         .L80240660
 /* D7B8F4 80240654 00000000 */   nop      
 .L80240658:
-/* D7B8F8 80240658 3C01802E */  lui       $at, 0x802e
-/* D7B8FC 8024065C A0209D71 */  sb        $zero, -0x628f($at)
+/* D7B8F8 80240658 3C01802E */  lui       $at, %hi(D_802D9D71)
+/* D7B8FC 8024065C A0209D71 */  sb        $zero, %lo(D_802D9D71)($at)
 .L80240660:
 /* D7B900 80240660 8FA20038 */  lw        $v0, 0x38($sp)
-/* D7B904 80240664 3C048024 */  lui       $a0, 0x8024
-/* D7B908 80240668 248408A0 */  addiu     $a0, $a0, 0x8a0
+/* D7B904 80240664 3C048024 */  lui       $a0, %hi(D_802408A0)
+/* D7B908 80240668 248408A0 */  addiu     $a0, $a0, %lo(D_802408A0)
 /* D7B90C 8024066C AE320000 */  sw        $s2, ($s1)
 /* D7B910 80240670 AE300008 */  sw        $s0, 8($s1)
 /* D7B914 80240674 00021023 */  negu      $v0, $v0
@@ -95,8 +95,8 @@ glabel func_80240530_D7B7D0
 /* D7B924 80240684 00431024 */  and       $v0, $v0, $v1
 /* D7B928 80240688 54400004 */  bnel      $v0, $zero, .L8024069C
 /* D7B92C 8024068C AE24000C */   sw       $a0, 0xc($s1)
-/* D7B930 80240690 3C048024 */  lui       $a0, 0x8024
-/* D7B934 80240694 248406BC */  addiu     $a0, $a0, 0x6bc
+/* D7B930 80240690 3C048024 */  lui       $a0, %hi(D_802406BC)
+/* D7B934 80240694 248406BC */  addiu     $a0, $a0, %lo(D_802406BC)
 /* D7B938 80240698 AE24000C */  sw        $a0, 0xc($s1)
 .L8024069C:
 /* D7B93C 8024069C 0C047644 */  jal       queue_render_task
diff --git a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_802406BC_D7B95C.s b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_802406BC_D7B95C.s
index f22564d240..cb43cd3912 100644
--- a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_802406BC_D7B95C.s
+++ b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_802406BC_D7B95C.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_802406BC_D7B95C
-/* D7B95C 802406BC 3C03800A */  lui       $v1, 0x800a
-/* D7B960 802406C0 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D7B95C 802406BC 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D7B960 802406C0 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D7B964 802406C4 3C07BF80 */  lui       $a3, 0xbf80
 /* D7B968 802406C8 27BDFEC0 */  addiu     $sp, $sp, -0x140
 /* D7B96C 802406CC F7B40128 */  sdc1      $f20, 0x128($sp)
@@ -22,9 +22,9 @@ glabel func_802406BC_D7B95C
 /* D7B9A0 80240700 000218C0 */  sll       $v1, $v0, 3
 /* D7B9A4 80240704 00431021 */  addu      $v0, $v0, $v1
 /* D7B9A8 80240708 000210C0 */  sll       $v0, $v0, 3
-/* D7B9AC 8024070C 3C01800B */  lui       $at, 0x800b
+/* D7B9AC 8024070C 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* D7B9B0 80240710 00220821 */  addu      $at, $at, $v0
-/* D7B9B4 80240714 C4361DEC */  lwc1      $f22, 0x1dec($at)
+/* D7B9B4 80240714 C4361DEC */  lwc1      $f22, %lo(D_800B1DEC)($at)
 /* D7B9B8 80240718 4406A000 */  mfc1      $a2, $f20
 /* D7B9BC 8024071C 4600B587 */  neg.s     $f22, $f22
 /* D7B9C0 80240720 4405B000 */  mfc1      $a1, $f22
diff --git a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_802408A0_D7BB40.s b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_802408A0_D7BB40.s
index 61df1ca3ff..27ec9cbaeb 100644
--- a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_802408A0_D7BB40.s
+++ b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_802408A0_D7BB40.s
@@ -27,8 +27,8 @@ glabel func_802408A0_D7BB40
 /* D7BB98 802408F8 F7B80160 */  sdc1      $f24, 0x160($sp)
 /* D7BB9C 802408FC F7B40150 */  sdc1      $f20, 0x150($sp)
 .L80240900:
-/* D7BBA0 80240900 3C03800A */  lui       $v1, 0x800a
-/* D7BBA4 80240904 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D7BBA0 80240900 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D7BBA4 80240904 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D7BBA8 80240908 00031080 */  sll       $v0, $v1, 2
 /* D7BBAC 8024090C 00431021 */  addu      $v0, $v0, $v1
 /* D7BBB0 80240910 00021080 */  sll       $v0, $v0, 2
diff --git a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240D6C_D7C00C.s b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240D6C_D7C00C.s
index 504d8e9614..58a47b1344 100644
--- a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240D6C_D7C00C.s
+++ b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240D6C_D7C00C.s
@@ -25,13 +25,13 @@ glabel func_80240D6C_D7C00C
 /* D7C058 80240DB8 08090384 */  j         .L80240E10
 /* D7C05C 80240DBC 00000000 */   nop      
 .L80240DC0:
-/* D7C060 80240DC0 3C048024 */  lui       $a0, 0x8024
-/* D7C064 80240DC4 24840EB4 */  addiu     $a0, $a0, 0xeb4
+/* D7C060 80240DC0 3C048024 */  lui       $a0, %hi(D_80240EB4)
+/* D7C064 80240DC4 24840EB4 */  addiu     $a0, $a0, %lo(D_80240EB4)
 /* D7C068 80240DC8 08090380 */  j         .L80240E00
 /* D7C06C 80240DCC 00000000 */   nop      
 .L80240DD0:
-/* D7C070 80240DD0 3C048024 */  lui       $a0, 0x8024
-/* D7C074 80240DD4 24840F1C */  addiu     $a0, $a0, 0xf1c
+/* D7C070 80240DD0 3C048024 */  lui       $a0, %hi(D_80240F1C)
+/* D7C074 80240DD4 24840F1C */  addiu     $a0, $a0, %lo(D_80240F1C)
 /* D7C078 80240DD8 08090380 */  j         .L80240E00
 /* D7C07C 80240DDC 00000000 */   nop      
 .L80240DE0:
@@ -42,8 +42,8 @@ glabel func_80240D6C_D7C00C
 /* D7C090 80240DF0 10400007 */  beqz      $v0, .L80240E10
 /* D7C094 80240DF4 00000000 */   nop      
 .L80240DF8:
-/* D7C098 80240DF8 3C048024 */  lui       $a0, 0x8024
-/* D7C09C 80240DFC 24840EE8 */  addiu     $a0, $a0, 0xee8
+/* D7C098 80240DF8 3C048024 */  lui       $a0, %hi(D_80240EE8)
+/* D7C09C 80240DFC 24840EE8 */  addiu     $a0, $a0, %lo(D_80240EE8)
 .L80240E00:
 /* D7C0A0 80240E00 0C048C56 */  jal       bind_dynamic_entity_3
 /* D7C0A4 80240E04 0000282D */   daddu    $a1, $zero, $zero
diff --git a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240F50_D7C1F0.s b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240F50_D7C1F0.s
index 7c70fb936f..220dd6aab1 100644
--- a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240F50_D7C1F0.s
+++ b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240F50_D7C1F0.s
@@ -4,8 +4,8 @@
 glabel func_80240F50_D7C1F0
 /* D7C1F0 80240F50 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* D7C1F4 80240F54 AFB00010 */  sw        $s0, 0x10($sp)
-/* D7C1F8 80240F58 3C108024 */  lui       $s0, 0x8024
-/* D7C1FC 80240F5C 26101690 */  addiu     $s0, $s0, 0x1690
+/* D7C1F8 80240F58 3C108024 */  lui       $s0, %hi(D_80241690)
+/* D7C1FC 80240F5C 26101690 */  addiu     $s0, $s0, %lo(D_80241690)
 /* D7C200 80240F60 AFBF0018 */  sw        $ra, 0x18($sp)
 /* D7C204 80240F64 AFB10014 */  sw        $s1, 0x14($sp)
 /* D7C208 80240F68 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_80240F50_D7C1F0
 /* D7C26C 80240FCC 28620010 */  slti      $v0, $v1, 0x10
 /* D7C270 80240FD0 1440FFFA */  bnez      $v0, .L80240FBC
 /* D7C274 80240FD4 24840004 */   addiu    $a0, $a0, 4
-/* D7C278 80240FD8 3C108024 */  lui       $s0, 0x8024
-/* D7C27C 80240FDC 26101690 */  addiu     $s0, $s0, 0x1690
+/* D7C278 80240FD8 3C108024 */  lui       $s0, %hi(D_80241690)
+/* D7C27C 80240FDC 26101690 */  addiu     $s0, $s0, %lo(D_80241690)
 /* D7C280 80240FE0 0C00AB4B */  jal       heap_free
 /* D7C284 80240FE4 8E040000 */   lw       $a0, ($s0)
 /* D7C288 80240FE8 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_802400EC_D7CC3C.s b/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_802400EC_D7CC3C.s
index 3ca38f336f..802f09d1ea 100644
--- a/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_802400EC_D7CC3C.s
+++ b/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_802400EC_D7CC3C.s
@@ -5,8 +5,8 @@ glabel func_802400EC_D7CC3C
 /* D7CC3C 802400EC 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* D7CC40 802400F0 AFB00010 */  sw        $s0, 0x10($sp)
 /* D7CC44 802400F4 0080802D */  daddu     $s0, $a0, $zero
-/* D7CC48 802400F8 3C058024 */  lui       $a1, 0x8024
-/* D7CC4C 802400FC 24A50128 */  addiu     $a1, $a1, 0x128
+/* D7CC48 802400F8 3C058024 */  lui       $a1, %hi(D_80240128)
+/* D7CC4C 802400FC 24A50128 */  addiu     $a1, $a1, %lo(D_80240128)
 /* D7CC50 80240100 AFBF0014 */  sw        $ra, 0x14($sp)
 /* D7CC54 80240104 0C048C56 */  jal       bind_dynamic_entity_3
 /* D7CC58 80240108 0000202D */   daddu    $a0, $zero, $zero
diff --git a/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240128_D7CC78.s b/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240128_D7CC78.s
index 43571232f4..71fc551e8d 100644
--- a/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240128_D7CC78.s
+++ b/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240128_D7CC78.s
@@ -29,8 +29,8 @@ glabel func_80240128_D7CC78
 /* D7CCD8 80240188 27A20034 */  addiu     $v0, $sp, 0x34
 /* D7CCDC 8024018C AFA20014 */  sw        $v0, 0x14($sp)
 /* D7CCE0 80240190 C6000030 */  lwc1      $f0, 0x30($s0)
-/* D7CCE4 80240194 3C04800A */  lui       $a0, 0x800a
-/* D7CCE8 80240198 8484A634 */  lh        $a0, -0x59cc($a0)
+/* D7CCE4 80240194 3C04800A */  lui       $a0, %hi(D_8009A634)
+/* D7CCE8 80240198 8484A634 */  lh        $a0, %lo(D_8009A634)($a0)
 /* D7CCEC 8024019C 46000007 */  neg.s     $f0, $f0
 /* D7CCF0 802401A0 44070000 */  mfc1      $a3, $f0
 /* D7CCF4 802401A4 27A20038 */  addiu     $v0, $sp, 0x38
@@ -67,8 +67,8 @@ glabel func_80240128_D7CC78
 /* D7CD6C 8024021C 54400022 */  bnel      $v0, $zero, .L802402A8
 /* D7CD70 80240220 24110011 */   addiu    $s1, $zero, 0x11
 /* D7CD74 80240224 9203000E */  lbu       $v1, 0xe($s0)
-/* D7CD78 80240228 3C02802E */  lui       $v0, 0x802e
-/* D7CD7C 8024022C 90429D70 */  lbu       $v0, -0x6290($v0)
+/* D7CD78 80240228 3C02802E */  lui       $v0, %hi(D_802D9D70)
+/* D7CD7C 8024022C 90429D70 */  lbu       $v0, %lo(D_802D9D70)($v0)
 /* D7CD80 80240230 10620018 */  beq       $v1, $v0, .L80240294
 /* D7CD84 80240234 2C6200FE */   sltiu    $v0, $v1, 0xfe
 /* D7CD88 80240238 1040000B */  beqz      $v0, .L80240268
@@ -98,20 +98,20 @@ glabel func_80240128_D7CC78
 /* D7CDE0 80240290 00000000 */   nop      
 .L80240294:
 /* D7CDE4 80240294 9202000E */  lbu       $v0, 0xe($s0)
-/* D7CDE8 80240298 3C01802E */  lui       $at, 0x802e
-/* D7CDEC 8024029C A0229D70 */  sb        $v0, -0x6290($at)
+/* D7CDE8 80240298 3C01802E */  lui       $at, %hi(D_802D9D70)
+/* D7CDEC 8024029C A0229D70 */  sb        $v0, %lo(D_802D9D70)($at)
 /* D7CDF0 802402A0 080900AD */  j         .L802402B4
 /* D7CDF4 802402A4 0240202D */   daddu    $a0, $s2, $zero
 .L802402A8:
-/* D7CDF8 802402A8 3C01802E */  lui       $at, 0x802e
-/* D7CDFC 802402AC A0209D70 */  sb        $zero, -0x6290($at)
+/* D7CDF8 802402A8 3C01802E */  lui       $at, %hi(D_802D9D70)
+/* D7CDFC 802402AC A0209D70 */  sb        $zero, %lo(D_802D9D70)($at)
 /* D7CE00 802402B0 0240202D */  daddu     $a0, $s2, $zero
 .L802402B4:
 /* D7CE04 802402B4 AC910000 */  sw        $s1, ($a0)
 /* D7CE08 802402B8 AC900008 */  sw        $s0, 8($a0)
 /* D7CE0C 802402BC 8FA20038 */  lw        $v0, 0x38($sp)
-/* D7CE10 802402C0 3C038024 */  lui       $v1, 0x8024
-/* D7CE14 802402C4 246302F0 */  addiu     $v1, $v1, 0x2f0
+/* D7CE10 802402C0 3C038024 */  lui       $v1, %hi(D_802402F0)
+/* D7CE14 802402C4 246302F0 */  addiu     $v1, $v1, %lo(D_802402F0)
 /* D7CE18 802402C8 AC83000C */  sw        $v1, 0xc($a0)
 /* D7CE1C 802402CC 00021023 */  negu      $v0, $v0
 /* D7CE20 802402D0 0C047644 */  jal       queue_render_task
diff --git a/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_802402F0_D7CE40.s b/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_802402F0_D7CE40.s
index f53b8f903b..d810201e43 100644
--- a/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_802402F0_D7CE40.s
+++ b/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_802402F0_D7CE40.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_802402F0_D7CE40
-/* D7CE40 802402F0 3C03800A */  lui       $v1, 0x800a
-/* D7CE44 802402F4 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D7CE40 802402F0 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D7CE44 802402F4 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D7CE48 802402F8 3C07BF80 */  lui       $a3, 0xbf80
 /* D7CE4C 802402FC 27BDFEC0 */  addiu     $sp, $sp, -0x140
 /* D7CE50 80240300 F7B40128 */  sdc1      $f20, 0x128($sp)
@@ -22,9 +22,9 @@ glabel func_802402F0_D7CE40
 /* D7CE84 80240334 000218C0 */  sll       $v1, $v0, 3
 /* D7CE88 80240338 00431021 */  addu      $v0, $v0, $v1
 /* D7CE8C 8024033C 000210C0 */  sll       $v0, $v0, 3
-/* D7CE90 80240340 3C01800B */  lui       $at, 0x800b
+/* D7CE90 80240340 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* D7CE94 80240344 00220821 */  addu      $at, $at, $v0
-/* D7CE98 80240348 C4361DEC */  lwc1      $f22, 0x1dec($at)
+/* D7CE98 80240348 C4361DEC */  lwc1      $f22, %lo(D_800B1DEC)($at)
 /* D7CE9C 8024034C 4406A000 */  mfc1      $a2, $f20
 /* D7CEA0 80240350 4600B587 */  neg.s     $f22, $f22
 /* D7CEA4 80240354 4405B000 */  mfc1      $a1, $f22
diff --git a/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_8024049C_D7CFEC.s b/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_8024049C_D7CFEC.s
index 87ca99794f..5bf0acc8de 100644
--- a/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_8024049C_D7CFEC.s
+++ b/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_8024049C_D7CFEC.s
@@ -11,8 +11,8 @@ glabel func_8024049C_D7CFEC
 /* D7D004 802404B4 28420002 */   slti     $v0, $v0, 2
 /* D7D008 802404B8 1040000C */  beqz      $v0, .L802404EC
 /* D7D00C 802404BC 00000000 */   nop      
-/* D7D010 802404C0 3C058024 */  lui       $a1, 0x8024
-/* D7D014 802404C4 24A50500 */  addiu     $a1, $a1, 0x500
+/* D7D010 802404C0 3C058024 */  lui       $a1, %hi(D_80240500)
+/* D7D014 802404C4 24A50500 */  addiu     $a1, $a1, %lo(D_80240500)
 /* D7D018 802404C8 0C048C56 */  jal       bind_dynamic_entity_3
 /* D7D01C 802404CC 0000202D */   daddu    $a0, $zero, $zero
 /* D7D020 802404D0 8E03013C */  lw        $v1, 0x13c($s0)
diff --git a/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240500_D7D050.s b/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240500_D7D050.s
index 10f62d2f18..e89a2b693b 100644
--- a/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240500_D7D050.s
+++ b/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240500_D7D050.s
@@ -28,8 +28,8 @@ glabel func_80240500_D7D050
 /* D7D0AC 8024055C 27A20038 */  addiu     $v0, $sp, 0x38
 /* D7D0B0 80240560 AFA20018 */  sw        $v0, 0x18($sp)
 /* D7D0B4 80240564 C600002C */  lwc1      $f0, 0x2c($s0)
-/* D7D0B8 80240568 3C04800A */  lui       $a0, 0x800a
-/* D7D0BC 8024056C 8484A634 */  lh        $a0, -0x59cc($a0)
+/* D7D0B8 80240568 3C04800A */  lui       $a0, %hi(D_8009A634)
+/* D7D0BC 8024056C 8484A634 */  lh        $a0, %lo(D_8009A634)($a0)
 /* D7D0C0 80240570 46000007 */  neg.s     $f0, $f0
 /* D7D0C4 80240574 44060000 */  mfc1      $a2, $f0
 /* D7D0C8 80240578 0C00B94E */  jal       get_screen_coords
@@ -44,8 +44,8 @@ glabel func_80240500_D7D050
 /* D7D0EC 8024059C 54400022 */  bnel      $v0, $zero, .L80240628
 /* D7D0F0 802405A0 24120011 */   addiu    $s2, $zero, 0x11
 /* D7D0F4 802405A4 9203000E */  lbu       $v1, 0xe($s0)
-/* D7D0F8 802405A8 3C02802E */  lui       $v0, 0x802e
-/* D7D0FC 802405AC 90429D71 */  lbu       $v0, -0x628f($v0)
+/* D7D0F8 802405A8 3C02802E */  lui       $v0, %hi(D_802D9D71)
+/* D7D0FC 802405AC 90429D71 */  lbu       $v0, %lo(D_802D9D71)($v0)
 /* D7D100 802405B0 10620018 */  beq       $v1, $v0, .L80240614
 /* D7D104 802405B4 2C6200FE */   sltiu    $v0, $v1, 0xfe
 /* D7D108 802405B8 1040000B */  beqz      $v0, .L802405E8
@@ -75,17 +75,17 @@ glabel func_80240500_D7D050
 /* D7D160 80240610 00000000 */   nop      
 .L80240614:
 /* D7D164 80240614 9202000E */  lbu       $v0, 0xe($s0)
-/* D7D168 80240618 3C01802E */  lui       $at, 0x802e
-/* D7D16C 8024061C A0229D71 */  sb        $v0, -0x628f($at)
+/* D7D168 80240618 3C01802E */  lui       $at, %hi(D_802D9D71)
+/* D7D16C 8024061C A0229D71 */  sb        $v0, %lo(D_802D9D71)($at)
 /* D7D170 80240620 0809018C */  j         .L80240630
 /* D7D174 80240624 00000000 */   nop      
 .L80240628:
-/* D7D178 80240628 3C01802E */  lui       $at, 0x802e
-/* D7D17C 8024062C A0209D71 */  sb        $zero, -0x628f($at)
+/* D7D178 80240628 3C01802E */  lui       $at, %hi(D_802D9D71)
+/* D7D17C 8024062C A0209D71 */  sb        $zero, %lo(D_802D9D71)($at)
 .L80240630:
 /* D7D180 80240630 8FA20038 */  lw        $v0, 0x38($sp)
-/* D7D184 80240634 3C048024 */  lui       $a0, 0x8024
-/* D7D188 80240638 24840870 */  addiu     $a0, $a0, 0x870
+/* D7D184 80240634 3C048024 */  lui       $a0, %hi(D_80240870)
+/* D7D188 80240638 24840870 */  addiu     $a0, $a0, %lo(D_80240870)
 /* D7D18C 8024063C AE320000 */  sw        $s2, ($s1)
 /* D7D190 80240640 AE300008 */  sw        $s0, 8($s1)
 /* D7D194 80240644 00021023 */  negu      $v0, $v0
@@ -95,8 +95,8 @@ glabel func_80240500_D7D050
 /* D7D1A4 80240654 00431024 */  and       $v0, $v0, $v1
 /* D7D1A8 80240658 54400004 */  bnel      $v0, $zero, .L8024066C
 /* D7D1AC 8024065C AE24000C */   sw       $a0, 0xc($s1)
-/* D7D1B0 80240660 3C048024 */  lui       $a0, 0x8024
-/* D7D1B4 80240664 2484068C */  addiu     $a0, $a0, 0x68c
+/* D7D1B0 80240660 3C048024 */  lui       $a0, %hi(D_8024068C)
+/* D7D1B4 80240664 2484068C */  addiu     $a0, $a0, %lo(D_8024068C)
 /* D7D1B8 80240668 AE24000C */  sw        $a0, 0xc($s1)
 .L8024066C:
 /* D7D1BC 8024066C 0C047644 */  jal       queue_render_task
diff --git a/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_8024068C_D7D1DC.s b/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_8024068C_D7D1DC.s
index d35092876c..cce7a0310a 100644
--- a/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_8024068C_D7D1DC.s
+++ b/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_8024068C_D7D1DC.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_8024068C_D7D1DC
-/* D7D1DC 8024068C 3C03800A */  lui       $v1, 0x800a
-/* D7D1E0 80240690 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D7D1DC 8024068C 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D7D1E0 80240690 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D7D1E4 80240694 3C07BF80 */  lui       $a3, 0xbf80
 /* D7D1E8 80240698 27BDFEC0 */  addiu     $sp, $sp, -0x140
 /* D7D1EC 8024069C F7B40128 */  sdc1      $f20, 0x128($sp)
@@ -22,9 +22,9 @@ glabel func_8024068C_D7D1DC
 /* D7D220 802406D0 000218C0 */  sll       $v1, $v0, 3
 /* D7D224 802406D4 00431021 */  addu      $v0, $v0, $v1
 /* D7D228 802406D8 000210C0 */  sll       $v0, $v0, 3
-/* D7D22C 802406DC 3C01800B */  lui       $at, 0x800b
+/* D7D22C 802406DC 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* D7D230 802406E0 00220821 */  addu      $at, $at, $v0
-/* D7D234 802406E4 C4361DEC */  lwc1      $f22, 0x1dec($at)
+/* D7D234 802406E4 C4361DEC */  lwc1      $f22, %lo(D_800B1DEC)($at)
 /* D7D238 802406E8 4406A000 */  mfc1      $a2, $f20
 /* D7D23C 802406EC 4600B587 */  neg.s     $f22, $f22
 /* D7D240 802406F0 4405B000 */  mfc1      $a1, $f22
diff --git a/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240870_D7D3C0.s b/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240870_D7D3C0.s
index d7c8dd0615..87c0e1eb6f 100644
--- a/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240870_D7D3C0.s
+++ b/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240870_D7D3C0.s
@@ -27,8 +27,8 @@ glabel func_80240870_D7D3C0
 /* D7D418 802408C8 F7B80160 */  sdc1      $f24, 0x160($sp)
 /* D7D41C 802408CC F7B40150 */  sdc1      $f20, 0x150($sp)
 .L802408D0:
-/* D7D420 802408D0 3C03800A */  lui       $v1, 0x800a
-/* D7D424 802408D4 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D7D420 802408D0 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D7D424 802408D4 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D7D428 802408D8 00031080 */  sll       $v0, $v1, 2
 /* D7D42C 802408DC 00431021 */  addu      $v0, $v0, $v1
 /* D7D430 802408E0 00021080 */  sll       $v0, $v0, 2
diff --git a/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240D3C_D7D88C.s b/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240D3C_D7D88C.s
index 89a05915a1..afc18d4c11 100644
--- a/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240D3C_D7D88C.s
+++ b/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240D3C_D7D88C.s
@@ -25,13 +25,13 @@ glabel func_80240D3C_D7D88C
 /* D7D8D8 80240D88 08090378 */  j         .L80240DE0
 /* D7D8DC 80240D8C 00000000 */   nop      
 .L80240D90:
-/* D7D8E0 80240D90 3C048024 */  lui       $a0, 0x8024
-/* D7D8E4 80240D94 24840E84 */  addiu     $a0, $a0, 0xe84
+/* D7D8E0 80240D90 3C048024 */  lui       $a0, %hi(D_80240E84)
+/* D7D8E4 80240D94 24840E84 */  addiu     $a0, $a0, %lo(D_80240E84)
 /* D7D8E8 80240D98 08090374 */  j         .L80240DD0
 /* D7D8EC 80240D9C 00000000 */   nop      
 .L80240DA0:
-/* D7D8F0 80240DA0 3C048024 */  lui       $a0, 0x8024
-/* D7D8F4 80240DA4 24840EEC */  addiu     $a0, $a0, 0xeec
+/* D7D8F0 80240DA0 3C048024 */  lui       $a0, %hi(D_80240EEC)
+/* D7D8F4 80240DA4 24840EEC */  addiu     $a0, $a0, %lo(D_80240EEC)
 /* D7D8F8 80240DA8 08090374 */  j         .L80240DD0
 /* D7D8FC 80240DAC 00000000 */   nop      
 .L80240DB0:
@@ -42,8 +42,8 @@ glabel func_80240D3C_D7D88C
 /* D7D910 80240DC0 10400007 */  beqz      $v0, .L80240DE0
 /* D7D914 80240DC4 00000000 */   nop      
 .L80240DC8:
-/* D7D918 80240DC8 3C048024 */  lui       $a0, 0x8024
-/* D7D91C 80240DCC 24840EB8 */  addiu     $a0, $a0, 0xeb8
+/* D7D918 80240DC8 3C048024 */  lui       $a0, %hi(D_80240EB8)
+/* D7D91C 80240DCC 24840EB8 */  addiu     $a0, $a0, %lo(D_80240EB8)
 .L80240DD0:
 /* D7D920 80240DD0 0C048C56 */  jal       bind_dynamic_entity_3
 /* D7D924 80240DD4 0000282D */   daddu    $a1, $zero, $zero
diff --git a/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_802410B0_D7DC00.s b/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_802410B0_D7DC00.s
index 3ca42422f5..69983bff84 100644
--- a/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_802410B0_D7DC00.s
+++ b/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_802410B0_D7DC00.s
@@ -60,8 +60,8 @@ glabel func_802410B0_D7DC00
 /* D7DCD8 80241188 0C0903C8 */  jal       func_80240F20_D7DA70
 /* D7DCDC 8024118C AFA20010 */   sw       $v0, 0x10($sp)
 .L80241190:
-/* D7DCE0 80241190 3C03800A */  lui       $v1, 0x800a
-/* D7DCE4 80241194 2463A66C */  addiu     $v1, $v1, -0x5994
+/* D7DCE0 80241190 3C03800A */  lui       $v1, %hi(D_8009A66C)
+/* D7DCE4 80241194 2463A66C */  addiu     $v1, $v1, %lo(D_8009A66C)
 /* D7DCE8 80241198 8C620000 */  lw        $v0, ($v1)
 /* D7DCEC 8024119C 0220202D */  daddu     $a0, $s1, $zero
 /* D7DCF0 802411A0 0040802D */  daddu     $s0, $v0, $zero
diff --git a/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_8024024C_D7EFAC.s b/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_8024024C_D7EFAC.s
index 20749badc0..0677399527 100644
--- a/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_8024024C_D7EFAC.s
+++ b/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_8024024C_D7EFAC.s
@@ -6,11 +6,11 @@ glabel func_8024024C_D7EFAC
 /* D7EFB0 80240250 AFBF0010 */  sw        $ra, 0x10($sp)
 /* D7EFB4 80240254 10A00003 */  beqz      $a1, .L80240264
 /* D7EFB8 80240258 8C86000C */   lw       $a2, 0xc($a0)
-/* D7EFBC 8024025C 3C018024 */  lui       $at, 0x8024
-/* D7EFC0 80240260 AC20119C */  sw        $zero, 0x119c($at)
+/* D7EFBC 8024025C 3C018024 */  lui       $at, %hi(D_8024119C)
+/* D7EFC0 80240260 AC20119C */  sw        $zero, %lo(D_8024119C)($at)
 .L80240264:
-/* D7EFC4 80240264 3C038024 */  lui       $v1, 0x8024
-/* D7EFC8 80240268 2463119C */  addiu     $v1, $v1, 0x119c
+/* D7EFC4 80240264 3C038024 */  lui       $v1, %hi(D_8024119C)
+/* D7EFC8 80240268 2463119C */  addiu     $v1, $v1, %lo(D_8024119C)
 /* D7EFCC 8024026C 8C620000 */  lw        $v0, ($v1)
 /* D7EFD0 80240270 54400003 */  bnel      $v0, $zero, .L80240280
 /* D7EFD4 80240274 AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_8024024C_D7EFAC
 /* D7EFDC 8024027C 0000102D */   daddu    $v0, $zero, $zero
 .L80240280:
 /* D7EFE0 80240280 8CC50000 */  lw        $a1, ($a2)
-/* D7EFE4 80240284 3C068024 */  lui       $a2, 0x8024
+/* D7EFE4 80240284 3C068024 */  lui       $a2, %hi(D_802411A0)
 /* D7EFE8 80240288 0C0B2026 */  jal       set_variable
-/* D7EFEC 8024028C 8CC611A0 */   lw       $a2, 0x11a0($a2)
+/* D7EFEC 8024028C 8CC611A0 */   lw       $a2, %lo(D_802411A0)($a2)
 /* D7EFF0 80240290 24020002 */  addiu     $v0, $zero, 2
 .L80240294:
 /* D7EFF4 80240294 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_802402A0_D7F000.s b/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_802402A0_D7F000.s
index c507d467c6..41aca60151 100644
--- a/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_802402A0_D7F000.s
+++ b/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_802402A0_D7F000.s
@@ -7,12 +7,12 @@ glabel func_802402A0_D7F000
 /* D7F008 802402A8 8C82000C */  lw        $v0, 0xc($a0)
 /* D7F00C 802402AC 0C0B1EAF */  jal       get_variable
 /* D7F010 802402B0 8C450000 */   lw       $a1, ($v0)
-/* D7F014 802402B4 3C018024 */  lui       $at, 0x8024
-/* D7F018 802402B8 AC2211A0 */  sw        $v0, 0x11a0($at)
+/* D7F014 802402B4 3C018024 */  lui       $at, %hi(D_802411A0)
+/* D7F018 802402B8 AC2211A0 */  sw        $v0, %lo(D_802411A0)($at)
 /* D7F01C 802402BC 24020002 */  addiu     $v0, $zero, 2
 /* D7F020 802402C0 8FBF0010 */  lw        $ra, 0x10($sp)
 /* D7F024 802402C4 24030001 */  addiu     $v1, $zero, 1
-/* D7F028 802402C8 3C018024 */  lui       $at, 0x8024
-/* D7F02C 802402CC AC23119C */  sw        $v1, 0x119c($at)
+/* D7F028 802402C8 3C018024 */  lui       $at, %hi(D_8024119C)
+/* D7F02C 802402CC AC23119C */  sw        $v1, %lo(D_8024119C)($at)
 /* D7F030 802402D0 03E00008 */  jr        $ra
 /* D7F034 802402D4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_802402D8_D7F038.s b/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_802402D8_D7F038.s
index 172f942807..c65575327c 100644
--- a/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_802402D8_D7F038.s
+++ b/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_802402D8_D7F038.s
@@ -13,8 +13,8 @@ glabel func_802402D8_D7F038
 /* D7F058 802402F8 8C620000 */  lw        $v0, ($v1)
 /* D7F05C 802402FC 5040000A */  beql      $v0, $zero, .L80240328
 /* D7F060 80240300 00041080 */   sll      $v0, $a0, 2
-/* D7F064 80240304 3C058024 */  lui       $a1, 0x8024
-/* D7F068 80240308 24A57CA0 */  addiu     $a1, $a1, 0x7ca0
+/* D7F064 80240304 3C058024 */  lui       $a1, %hi(D_80247CA0)
+/* D7F068 80240308 24A57CA0 */  addiu     $a1, $a1, %lo(D_80247CA0)
 .L8024030C:
 /* D7F06C 8024030C 24630004 */  addiu     $v1, $v1, 4
 /* D7F070 80240310 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_802402D8_D7F038
 /* D7F080 80240320 24A50004 */   addiu    $a1, $a1, 4
 /* D7F084 80240324 00041080 */  sll       $v0, $a0, 2
 .L80240328:
-/* D7F088 80240328 3C018024 */  lui       $at, 0x8024
+/* D7F088 80240328 3C018024 */  lui       $at, %hi(D_80247CA0)
 /* D7F08C 8024032C 00220821 */  addu      $at, $at, $v0
-/* D7F090 80240330 AC207CA0 */  sw        $zero, 0x7ca0($at)
+/* D7F090 80240330 AC207CA0 */  sw        $zero, %lo(D_80247CA0)($at)
 /* D7F094 80240334 080900D9 */  j         .L80240364
 /* D7F098 80240338 00000000 */   nop      
 .L8024033C:
-/* D7F09C 8024033C 3C038024 */  lui       $v1, 0x8024
-/* D7F0A0 80240340 24637CA0 */  addiu     $v1, $v1, 0x7ca0
+/* D7F09C 8024033C 3C038024 */  lui       $v1, %hi(D_80247CA0)
+/* D7F0A0 80240340 24637CA0 */  addiu     $v1, $v1, %lo(D_80247CA0)
 /* D7F0A4 80240344 0060282D */  daddu     $a1, $v1, $zero
 .L80240348:
 /* D7F0A8 80240348 24820010 */  addiu     $v0, $a0, 0x10
diff --git a/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_80240374_D7F0D4.s b/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_80240374_D7F0D4.s
index 7e9cbf9b0d..f4ff685962 100644
--- a/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_80240374_D7F0D4.s
+++ b/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_80240374_D7F0D4.s
@@ -13,8 +13,8 @@ glabel func_80240374_D7F0D4
 /* D7F0F4 80240394 8C620000 */  lw        $v0, ($v1)
 /* D7F0F8 80240398 5040000A */  beql      $v0, $zero, .L802403C4
 /* D7F0FC 8024039C 00041080 */   sll      $v0, $a0, 2
-/* D7F100 802403A0 3C058024 */  lui       $a1, 0x8024
-/* D7F104 802403A4 24A57E68 */  addiu     $a1, $a1, 0x7e68
+/* D7F100 802403A0 3C058024 */  lui       $a1, %hi(D_80247E68)
+/* D7F104 802403A4 24A57E68 */  addiu     $a1, $a1, %lo(D_80247E68)
 .L802403A8:
 /* D7F108 802403A8 24630004 */  addiu     $v1, $v1, 4
 /* D7F10C 802403AC 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_80240374_D7F0D4
 /* D7F11C 802403BC 24A50004 */   addiu    $a1, $a1, 4
 /* D7F120 802403C0 00041080 */  sll       $v0, $a0, 2
 .L802403C4:
-/* D7F124 802403C4 3C018024 */  lui       $at, 0x8024
+/* D7F124 802403C4 3C018024 */  lui       $at, %hi(D_80247E68)
 /* D7F128 802403C8 00220821 */  addu      $at, $at, $v0
-/* D7F12C 802403CC AC207E68 */  sw        $zero, 0x7e68($at)
+/* D7F12C 802403CC AC207E68 */  sw        $zero, %lo(D_80247E68)($at)
 /* D7F130 802403D0 08090100 */  j         .L80240400
 /* D7F134 802403D4 00000000 */   nop      
 .L802403D8:
-/* D7F138 802403D8 3C038024 */  lui       $v1, 0x8024
-/* D7F13C 802403DC 24637E68 */  addiu     $v1, $v1, 0x7e68
+/* D7F138 802403D8 3C038024 */  lui       $v1, %hi(D_80247E68)
+/* D7F13C 802403DC 24637E68 */  addiu     $v1, $v1, %lo(D_80247E68)
 /* D7F140 802403E0 0060282D */  daddu     $a1, $v1, $zero
 .L802403E4:
 /* D7F144 802403E4 24820080 */  addiu     $v0, $a0, 0x80
diff --git a/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240510_D7F270.s b/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240510_D7F270.s
index e07e610937..dddf8e5709 100644
--- a/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240510_D7F270.s
+++ b/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240510_D7F270.s
@@ -42,10 +42,10 @@ glabel func_80240510_D7F270
 /* D7F2FC 8024059C 28AA0055 */  slti      $t2, $a1, 0x55
 /* D7F300 802405A0 240BFFFF */  addiu     $t3, $zero, -1
 /* D7F304 802405A4 26050002 */  addiu     $a1, $s0, 2
-/* D7F308 802405A8 3C098024 */  lui       $t1, 0x8024
-/* D7F30C 802405AC 25292514 */  addiu     $t1, $t1, 0x2514
-/* D7F310 802405B0 3C088024 */  lui       $t0, 0x8024
-/* D7F314 802405B4 250824F0 */  addiu     $t0, $t0, 0x24f0
+/* D7F308 802405A8 3C098024 */  lui       $t1, %hi(D_80242514)
+/* D7F30C 802405AC 25292514 */  addiu     $t1, $t1, %lo(D_80242514)
+/* D7F310 802405B0 3C088024 */  lui       $t0, %hi(D_802424F0)
+/* D7F314 802405B4 250824F0 */  addiu     $t0, $t0, %lo(D_802424F0)
 .L802405B8:
 /* D7F318 802405B8 11400009 */  beqz      $t2, .L802405E0
 /* D7F31C 802405BC 00000000 */   nop      
@@ -171,8 +171,8 @@ glabel func_80240510_D7F270
 /* D7F4DC 8024077C 24630018 */   addiu    $v1, $v1, 0x18
 /* D7F4E0 80240780 0000482D */  daddu     $t1, $zero, $zero
 /* D7F4E4 80240784 0120382D */  daddu     $a3, $t1, $zero
-/* D7F4E8 80240788 3C0A8024 */  lui       $t2, 0x8024
-/* D7F4EC 8024078C 254A2538 */  addiu     $t2, $t2, 0x2538
+/* D7F4E8 80240788 3C0A8024 */  lui       $t2, %hi(D_80242538)
+/* D7F4EC 8024078C 254A2538 */  addiu     $t2, $t2, %lo(D_80242538)
 /* D7F4F0 80240790 0120402D */  daddu     $t0, $t1, $zero
 .L80240794:
 /* D7F4F4 80240794 0000302D */  daddu     $a2, $zero, $zero
diff --git a/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240E70_D7FBD0.s b/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240E70_D7FBD0.s
index 34e94550e5..9f7223536f 100644
--- a/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240E70_D7FBD0.s
+++ b/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240E70_D7FBD0.s
@@ -32,8 +32,8 @@ glabel func_80240E70_D7FBD0
 /* D7FC3C 80240EDC 0C0B2190 */  jal       set_float_variable
 /* D7FC40 80240EE0 34A53C81 */   ori      $a1, $a1, 0x3c81
 /* D7FC44 80240EE4 C60C0014 */  lwc1      $f12, 0x14($s0)
-/* D7FC48 80240EE8 3C018024 */  lui       $at, 0x8024
-/* D7FC4C 80240EEC D4207C90 */  ldc1      $f0, 0x7c90($at)
+/* D7FC48 80240EE8 3C018024 */  lui       $at, %hi(D_80247C90)
+/* D7FC4C 80240EEC D4207C90 */  ldc1      $f0, %lo(D_80247C90)($at)
 /* D7FC50 80240EF0 46006321 */  cvt.d.s   $f12, $f12
 /* D7FC54 80240EF4 46206300 */  add.d     $f12, $f12, $f0
 /* D7FC58 80240EF8 0C00A6C9 */  jal       clamp_angle
diff --git a/asm/nonmatchings/world/area_pra/pra_32/D86A20/func_802401CC_D86BCC.s b/asm/nonmatchings/world/area_pra/pra_32/D86A20/func_802401CC_D86BCC.s
index f405afefa0..cd8c515be0 100644
--- a/asm/nonmatchings/world/area_pra/pra_32/D86A20/func_802401CC_D86BCC.s
+++ b/asm/nonmatchings/world/area_pra/pra_32/D86A20/func_802401CC_D86BCC.s
@@ -13,9 +13,9 @@ glabel func_802401CC_D86BCC
 /* D86BEC 802401EC 2C620005 */  sltiu     $v0, $v1, 5
 /* D86BF0 802401F0 1040008A */  beqz      $v0, .L8024041C
 /* D86BF4 802401F4 00031080 */   sll      $v0, $v1, 2
-/* D86BF8 802401F8 3C018024 */  lui       $at, 0x8024
+/* D86BF8 802401F8 3C018024 */  lui       $at, %hi(D_80242CB0)
 /* D86BFC 802401FC 00220821 */  addu      $at, $at, $v0
-/* D86C00 80240200 8C222CB0 */  lw        $v0, 0x2cb0($at)
+/* D86C00 80240200 8C222CB0 */  lw        $v0, %lo(D_80242CB0)($at)
 /* D86C04 80240204 00400008 */  jr        $v0
 /* D86C08 80240208 00000000 */   nop      
 /* D86C0C 8024020C 8E22003C */  lw        $v0, 0x3c($s1)
diff --git a/asm/nonmatchings/world/area_pra/pra_33/D89700/func_802400EC_D897CC.s b/asm/nonmatchings/world/area_pra/pra_33/D89700/func_802400EC_D897CC.s
index c6cc1a8475..7e7aa779b2 100644
--- a/asm/nonmatchings/world/area_pra/pra_33/D89700/func_802400EC_D897CC.s
+++ b/asm/nonmatchings/world/area_pra/pra_33/D89700/func_802400EC_D897CC.s
@@ -5,8 +5,8 @@ glabel func_802400EC_D897CC
 /* D897CC 802400EC 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* D897D0 802400F0 AFB00010 */  sw        $s0, 0x10($sp)
 /* D897D4 802400F4 0080802D */  daddu     $s0, $a0, $zero
-/* D897D8 802400F8 3C058024 */  lui       $a1, 0x8024
-/* D897DC 802400FC 24A50128 */  addiu     $a1, $a1, 0x128
+/* D897D8 802400F8 3C058024 */  lui       $a1, %hi(D_80240128)
+/* D897DC 802400FC 24A50128 */  addiu     $a1, $a1, %lo(D_80240128)
 /* D897E0 80240100 AFBF0014 */  sw        $ra, 0x14($sp)
 /* D897E4 80240104 0C048C56 */  jal       bind_dynamic_entity_3
 /* D897E8 80240108 0000202D */   daddu    $a0, $zero, $zero
diff --git a/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240128_D89808.s b/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240128_D89808.s
index 28bcac6d90..72e4ef588e 100644
--- a/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240128_D89808.s
+++ b/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240128_D89808.s
@@ -29,8 +29,8 @@ glabel func_80240128_D89808
 /* D89868 80240188 27A20034 */  addiu     $v0, $sp, 0x34
 /* D8986C 8024018C AFA20014 */  sw        $v0, 0x14($sp)
 /* D89870 80240190 C6000030 */  lwc1      $f0, 0x30($s0)
-/* D89874 80240194 3C04800A */  lui       $a0, 0x800a
-/* D89878 80240198 8484A634 */  lh        $a0, -0x59cc($a0)
+/* D89874 80240194 3C04800A */  lui       $a0, %hi(D_8009A634)
+/* D89878 80240198 8484A634 */  lh        $a0, %lo(D_8009A634)($a0)
 /* D8987C 8024019C 46000007 */  neg.s     $f0, $f0
 /* D89880 802401A0 44070000 */  mfc1      $a3, $f0
 /* D89884 802401A4 27A20038 */  addiu     $v0, $sp, 0x38
@@ -67,8 +67,8 @@ glabel func_80240128_D89808
 /* D898FC 8024021C 54400022 */  bnel      $v0, $zero, .L802402A8
 /* D89900 80240220 24110011 */   addiu    $s1, $zero, 0x11
 /* D89904 80240224 9203000E */  lbu       $v1, 0xe($s0)
-/* D89908 80240228 3C02802E */  lui       $v0, 0x802e
-/* D8990C 8024022C 90429D70 */  lbu       $v0, -0x6290($v0)
+/* D89908 80240228 3C02802E */  lui       $v0, %hi(D_802D9D70)
+/* D8990C 8024022C 90429D70 */  lbu       $v0, %lo(D_802D9D70)($v0)
 /* D89910 80240230 10620018 */  beq       $v1, $v0, .L80240294
 /* D89914 80240234 2C6200FE */   sltiu    $v0, $v1, 0xfe
 /* D89918 80240238 1040000B */  beqz      $v0, .L80240268
@@ -98,20 +98,20 @@ glabel func_80240128_D89808
 /* D89970 80240290 00000000 */   nop      
 .L80240294:
 /* D89974 80240294 9202000E */  lbu       $v0, 0xe($s0)
-/* D89978 80240298 3C01802E */  lui       $at, 0x802e
-/* D8997C 8024029C A0229D70 */  sb        $v0, -0x6290($at)
+/* D89978 80240298 3C01802E */  lui       $at, %hi(D_802D9D70)
+/* D8997C 8024029C A0229D70 */  sb        $v0, %lo(D_802D9D70)($at)
 /* D89980 802402A0 080900AD */  j         .L802402B4
 /* D89984 802402A4 0240202D */   daddu    $a0, $s2, $zero
 .L802402A8:
-/* D89988 802402A8 3C01802E */  lui       $at, 0x802e
-/* D8998C 802402AC A0209D70 */  sb        $zero, -0x6290($at)
+/* D89988 802402A8 3C01802E */  lui       $at, %hi(D_802D9D70)
+/* D8998C 802402AC A0209D70 */  sb        $zero, %lo(D_802D9D70)($at)
 /* D89990 802402B0 0240202D */  daddu     $a0, $s2, $zero
 .L802402B4:
 /* D89994 802402B4 AC910000 */  sw        $s1, ($a0)
 /* D89998 802402B8 AC900008 */  sw        $s0, 8($a0)
 /* D8999C 802402BC 8FA20038 */  lw        $v0, 0x38($sp)
-/* D899A0 802402C0 3C038024 */  lui       $v1, 0x8024
-/* D899A4 802402C4 246302F0 */  addiu     $v1, $v1, 0x2f0
+/* D899A0 802402C0 3C038024 */  lui       $v1, %hi(D_802402F0)
+/* D899A4 802402C4 246302F0 */  addiu     $v1, $v1, %lo(D_802402F0)
 /* D899A8 802402C8 AC83000C */  sw        $v1, 0xc($a0)
 /* D899AC 802402CC 00021023 */  negu      $v0, $v0
 /* D899B0 802402D0 0C047644 */  jal       queue_render_task
diff --git a/asm/nonmatchings/world/area_pra/pra_33/D89700/func_802402F0_D899D0.s b/asm/nonmatchings/world/area_pra/pra_33/D89700/func_802402F0_D899D0.s
index 84f8188ccd..a42d325789 100644
--- a/asm/nonmatchings/world/area_pra/pra_33/D89700/func_802402F0_D899D0.s
+++ b/asm/nonmatchings/world/area_pra/pra_33/D89700/func_802402F0_D899D0.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_802402F0_D899D0
-/* D899D0 802402F0 3C03800A */  lui       $v1, 0x800a
-/* D899D4 802402F4 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D899D0 802402F0 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D899D4 802402F4 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D899D8 802402F8 3C07BF80 */  lui       $a3, 0xbf80
 /* D899DC 802402FC 27BDFEC0 */  addiu     $sp, $sp, -0x140
 /* D899E0 80240300 F7B40128 */  sdc1      $f20, 0x128($sp)
@@ -22,9 +22,9 @@ glabel func_802402F0_D899D0
 /* D89A14 80240334 000218C0 */  sll       $v1, $v0, 3
 /* D89A18 80240338 00431021 */  addu      $v0, $v0, $v1
 /* D89A1C 8024033C 000210C0 */  sll       $v0, $v0, 3
-/* D89A20 80240340 3C01800B */  lui       $at, 0x800b
+/* D89A20 80240340 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* D89A24 80240344 00220821 */  addu      $at, $at, $v0
-/* D89A28 80240348 C4361DEC */  lwc1      $f22, 0x1dec($at)
+/* D89A28 80240348 C4361DEC */  lwc1      $f22, %lo(D_800B1DEC)($at)
 /* D89A2C 8024034C 4406A000 */  mfc1      $a2, $f20
 /* D89A30 80240350 4600B587 */  neg.s     $f22, $f22
 /* D89A34 80240354 4405B000 */  mfc1      $a1, $f22
diff --git a/asm/nonmatchings/world/area_pra/pra_33/D89700/func_8024049C_D89B7C.s b/asm/nonmatchings/world/area_pra/pra_33/D89700/func_8024049C_D89B7C.s
index b4bc7f4376..e1015b220b 100644
--- a/asm/nonmatchings/world/area_pra/pra_33/D89700/func_8024049C_D89B7C.s
+++ b/asm/nonmatchings/world/area_pra/pra_33/D89700/func_8024049C_D89B7C.s
@@ -11,8 +11,8 @@ glabel func_8024049C_D89B7C
 /* D89B94 802404B4 28420002 */   slti     $v0, $v0, 2
 /* D89B98 802404B8 1040000C */  beqz      $v0, .L802404EC
 /* D89B9C 802404BC 00000000 */   nop      
-/* D89BA0 802404C0 3C058024 */  lui       $a1, 0x8024
-/* D89BA4 802404C4 24A50500 */  addiu     $a1, $a1, 0x500
+/* D89BA0 802404C0 3C058024 */  lui       $a1, %hi(D_80240500)
+/* D89BA4 802404C4 24A50500 */  addiu     $a1, $a1, %lo(D_80240500)
 /* D89BA8 802404C8 0C048C56 */  jal       bind_dynamic_entity_3
 /* D89BAC 802404CC 0000202D */   daddu    $a0, $zero, $zero
 /* D89BB0 802404D0 8E03013C */  lw        $v1, 0x13c($s0)
diff --git a/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240500_D89BE0.s b/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240500_D89BE0.s
index 44f3b9b3b2..660143cd55 100644
--- a/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240500_D89BE0.s
+++ b/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240500_D89BE0.s
@@ -28,8 +28,8 @@ glabel func_80240500_D89BE0
 /* D89C3C 8024055C 27A20038 */  addiu     $v0, $sp, 0x38
 /* D89C40 80240560 AFA20018 */  sw        $v0, 0x18($sp)
 /* D89C44 80240564 C600002C */  lwc1      $f0, 0x2c($s0)
-/* D89C48 80240568 3C04800A */  lui       $a0, 0x800a
-/* D89C4C 8024056C 8484A634 */  lh        $a0, -0x59cc($a0)
+/* D89C48 80240568 3C04800A */  lui       $a0, %hi(D_8009A634)
+/* D89C4C 8024056C 8484A634 */  lh        $a0, %lo(D_8009A634)($a0)
 /* D89C50 80240570 46000007 */  neg.s     $f0, $f0
 /* D89C54 80240574 44060000 */  mfc1      $a2, $f0
 /* D89C58 80240578 0C00B94E */  jal       get_screen_coords
@@ -44,8 +44,8 @@ glabel func_80240500_D89BE0
 /* D89C7C 8024059C 54400022 */  bnel      $v0, $zero, .L80240628
 /* D89C80 802405A0 24120011 */   addiu    $s2, $zero, 0x11
 /* D89C84 802405A4 9203000E */  lbu       $v1, 0xe($s0)
-/* D89C88 802405A8 3C02802E */  lui       $v0, 0x802e
-/* D89C8C 802405AC 90429D71 */  lbu       $v0, -0x628f($v0)
+/* D89C88 802405A8 3C02802E */  lui       $v0, %hi(D_802D9D71)
+/* D89C8C 802405AC 90429D71 */  lbu       $v0, %lo(D_802D9D71)($v0)
 /* D89C90 802405B0 10620018 */  beq       $v1, $v0, .L80240614
 /* D89C94 802405B4 2C6200FE */   sltiu    $v0, $v1, 0xfe
 /* D89C98 802405B8 1040000B */  beqz      $v0, .L802405E8
@@ -75,17 +75,17 @@ glabel func_80240500_D89BE0
 /* D89CF0 80240610 00000000 */   nop      
 .L80240614:
 /* D89CF4 80240614 9202000E */  lbu       $v0, 0xe($s0)
-/* D89CF8 80240618 3C01802E */  lui       $at, 0x802e
-/* D89CFC 8024061C A0229D71 */  sb        $v0, -0x628f($at)
+/* D89CF8 80240618 3C01802E */  lui       $at, %hi(D_802D9D71)
+/* D89CFC 8024061C A0229D71 */  sb        $v0, %lo(D_802D9D71)($at)
 /* D89D00 80240620 0809018C */  j         .L80240630
 /* D89D04 80240624 00000000 */   nop      
 .L80240628:
-/* D89D08 80240628 3C01802E */  lui       $at, 0x802e
-/* D89D0C 8024062C A0209D71 */  sb        $zero, -0x628f($at)
+/* D89D08 80240628 3C01802E */  lui       $at, %hi(D_802D9D71)
+/* D89D0C 8024062C A0209D71 */  sb        $zero, %lo(D_802D9D71)($at)
 .L80240630:
 /* D89D10 80240630 8FA20038 */  lw        $v0, 0x38($sp)
-/* D89D14 80240634 3C048024 */  lui       $a0, 0x8024
-/* D89D18 80240638 24840870 */  addiu     $a0, $a0, 0x870
+/* D89D14 80240634 3C048024 */  lui       $a0, %hi(D_80240870)
+/* D89D18 80240638 24840870 */  addiu     $a0, $a0, %lo(D_80240870)
 /* D89D1C 8024063C AE320000 */  sw        $s2, ($s1)
 /* D89D20 80240640 AE300008 */  sw        $s0, 8($s1)
 /* D89D24 80240644 00021023 */  negu      $v0, $v0
@@ -95,8 +95,8 @@ glabel func_80240500_D89BE0
 /* D89D34 80240654 00431024 */  and       $v0, $v0, $v1
 /* D89D38 80240658 54400004 */  bnel      $v0, $zero, .L8024066C
 /* D89D3C 8024065C AE24000C */   sw       $a0, 0xc($s1)
-/* D89D40 80240660 3C048024 */  lui       $a0, 0x8024
-/* D89D44 80240664 2484068C */  addiu     $a0, $a0, 0x68c
+/* D89D40 80240660 3C048024 */  lui       $a0, %hi(D_8024068C)
+/* D89D44 80240664 2484068C */  addiu     $a0, $a0, %lo(D_8024068C)
 /* D89D48 80240668 AE24000C */  sw        $a0, 0xc($s1)
 .L8024066C:
 /* D89D4C 8024066C 0C047644 */  jal       queue_render_task
diff --git a/asm/nonmatchings/world/area_pra/pra_33/D89700/func_8024068C_D89D6C.s b/asm/nonmatchings/world/area_pra/pra_33/D89700/func_8024068C_D89D6C.s
index 803f2b84f5..262c72d6a7 100644
--- a/asm/nonmatchings/world/area_pra/pra_33/D89700/func_8024068C_D89D6C.s
+++ b/asm/nonmatchings/world/area_pra/pra_33/D89700/func_8024068C_D89D6C.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_8024068C_D89D6C
-/* D89D6C 8024068C 3C03800A */  lui       $v1, 0x800a
-/* D89D70 80240690 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D89D6C 8024068C 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D89D70 80240690 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D89D74 80240694 3C07BF80 */  lui       $a3, 0xbf80
 /* D89D78 80240698 27BDFEC0 */  addiu     $sp, $sp, -0x140
 /* D89D7C 8024069C F7B40128 */  sdc1      $f20, 0x128($sp)
@@ -22,9 +22,9 @@ glabel func_8024068C_D89D6C
 /* D89DB0 802406D0 000218C0 */  sll       $v1, $v0, 3
 /* D89DB4 802406D4 00431021 */  addu      $v0, $v0, $v1
 /* D89DB8 802406D8 000210C0 */  sll       $v0, $v0, 3
-/* D89DBC 802406DC 3C01800B */  lui       $at, 0x800b
+/* D89DBC 802406DC 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* D89DC0 802406E0 00220821 */  addu      $at, $at, $v0
-/* D89DC4 802406E4 C4361DEC */  lwc1      $f22, 0x1dec($at)
+/* D89DC4 802406E4 C4361DEC */  lwc1      $f22, %lo(D_800B1DEC)($at)
 /* D89DC8 802406E8 4406A000 */  mfc1      $a2, $f20
 /* D89DCC 802406EC 4600B587 */  neg.s     $f22, $f22
 /* D89DD0 802406F0 4405B000 */  mfc1      $a1, $f22
diff --git a/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240870_D89F50.s b/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240870_D89F50.s
index f943474246..cc8fe64b73 100644
--- a/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240870_D89F50.s
+++ b/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240870_D89F50.s
@@ -27,8 +27,8 @@ glabel func_80240870_D89F50
 /* D89FA8 802408C8 F7B80160 */  sdc1      $f24, 0x160($sp)
 /* D89FAC 802408CC F7B40150 */  sdc1      $f20, 0x150($sp)
 .L802408D0:
-/* D89FB0 802408D0 3C03800A */  lui       $v1, 0x800a
-/* D89FB4 802408D4 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D89FB0 802408D0 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D89FB4 802408D4 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D89FB8 802408D8 00031080 */  sll       $v0, $v1, 2
 /* D89FBC 802408DC 00431021 */  addu      $v0, $v0, $v1
 /* D89FC0 802408E0 00021080 */  sll       $v0, $v0, 2
diff --git a/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240D3C_D8A41C.s b/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240D3C_D8A41C.s
index 0d8ef694ab..0f77f1526b 100644
--- a/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240D3C_D8A41C.s
+++ b/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240D3C_D8A41C.s
@@ -25,13 +25,13 @@ glabel func_80240D3C_D8A41C
 /* D8A468 80240D88 08090378 */  j         .L80240DE0
 /* D8A46C 80240D8C 00000000 */   nop      
 .L80240D90:
-/* D8A470 80240D90 3C048024 */  lui       $a0, 0x8024
-/* D8A474 80240D94 24840E84 */  addiu     $a0, $a0, 0xe84
+/* D8A470 80240D90 3C048024 */  lui       $a0, %hi(D_80240E84)
+/* D8A474 80240D94 24840E84 */  addiu     $a0, $a0, %lo(D_80240E84)
 /* D8A478 80240D98 08090374 */  j         .L80240DD0
 /* D8A47C 80240D9C 00000000 */   nop      
 .L80240DA0:
-/* D8A480 80240DA0 3C048024 */  lui       $a0, 0x8024
-/* D8A484 80240DA4 24840EEC */  addiu     $a0, $a0, 0xeec
+/* D8A480 80240DA0 3C048024 */  lui       $a0, %hi(D_80240EEC)
+/* D8A484 80240DA4 24840EEC */  addiu     $a0, $a0, %lo(D_80240EEC)
 /* D8A488 80240DA8 08090374 */  j         .L80240DD0
 /* D8A48C 80240DAC 00000000 */   nop      
 .L80240DB0:
@@ -42,8 +42,8 @@ glabel func_80240D3C_D8A41C
 /* D8A4A0 80240DC0 10400007 */  beqz      $v0, .L80240DE0
 /* D8A4A4 80240DC4 00000000 */   nop      
 .L80240DC8:
-/* D8A4A8 80240DC8 3C048024 */  lui       $a0, 0x8024
-/* D8A4AC 80240DCC 24840EB8 */  addiu     $a0, $a0, 0xeb8
+/* D8A4A8 80240DC8 3C048024 */  lui       $a0, %hi(D_80240EB8)
+/* D8A4AC 80240DCC 24840EB8 */  addiu     $a0, $a0, %lo(D_80240EB8)
 .L80240DD0:
 /* D8A4B0 80240DD0 0C048C56 */  jal       bind_dynamic_entity_3
 /* D8A4B4 80240DD4 0000282D */   daddu    $a1, $zero, $zero
diff --git a/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_802400EC_D8B49C.s b/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_802400EC_D8B49C.s
index 369575dc88..6fa2137b90 100644
--- a/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_802400EC_D8B49C.s
+++ b/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_802400EC_D8B49C.s
@@ -5,8 +5,8 @@ glabel func_802400EC_D8B49C
 /* D8B49C 802400EC 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* D8B4A0 802400F0 AFB00010 */  sw        $s0, 0x10($sp)
 /* D8B4A4 802400F4 0080802D */  daddu     $s0, $a0, $zero
-/* D8B4A8 802400F8 3C058024 */  lui       $a1, 0x8024
-/* D8B4AC 802400FC 24A50128 */  addiu     $a1, $a1, 0x128
+/* D8B4A8 802400F8 3C058024 */  lui       $a1, %hi(D_80240128)
+/* D8B4AC 802400FC 24A50128 */  addiu     $a1, $a1, %lo(D_80240128)
 /* D8B4B0 80240100 AFBF0014 */  sw        $ra, 0x14($sp)
 /* D8B4B4 80240104 0C048C56 */  jal       bind_dynamic_entity_3
 /* D8B4B8 80240108 0000202D */   daddu    $a0, $zero, $zero
diff --git a/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240128_D8B4D8.s b/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240128_D8B4D8.s
index 9814c5e0da..339d085339 100644
--- a/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240128_D8B4D8.s
+++ b/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240128_D8B4D8.s
@@ -29,8 +29,8 @@ glabel func_80240128_D8B4D8
 /* D8B538 80240188 27A20034 */  addiu     $v0, $sp, 0x34
 /* D8B53C 8024018C AFA20014 */  sw        $v0, 0x14($sp)
 /* D8B540 80240190 C6000030 */  lwc1      $f0, 0x30($s0)
-/* D8B544 80240194 3C04800A */  lui       $a0, 0x800a
-/* D8B548 80240198 8484A634 */  lh        $a0, -0x59cc($a0)
+/* D8B544 80240194 3C04800A */  lui       $a0, %hi(D_8009A634)
+/* D8B548 80240198 8484A634 */  lh        $a0, %lo(D_8009A634)($a0)
 /* D8B54C 8024019C 46000007 */  neg.s     $f0, $f0
 /* D8B550 802401A0 44070000 */  mfc1      $a3, $f0
 /* D8B554 802401A4 27A20038 */  addiu     $v0, $sp, 0x38
@@ -67,8 +67,8 @@ glabel func_80240128_D8B4D8
 /* D8B5CC 8024021C 54400022 */  bnel      $v0, $zero, .L802402A8
 /* D8B5D0 80240220 24110011 */   addiu    $s1, $zero, 0x11
 /* D8B5D4 80240224 9203000E */  lbu       $v1, 0xe($s0)
-/* D8B5D8 80240228 3C02802E */  lui       $v0, 0x802e
-/* D8B5DC 8024022C 90429D70 */  lbu       $v0, -0x6290($v0)
+/* D8B5D8 80240228 3C02802E */  lui       $v0, %hi(D_802D9D70)
+/* D8B5DC 8024022C 90429D70 */  lbu       $v0, %lo(D_802D9D70)($v0)
 /* D8B5E0 80240230 10620018 */  beq       $v1, $v0, .L80240294
 /* D8B5E4 80240234 2C6200FE */   sltiu    $v0, $v1, 0xfe
 /* D8B5E8 80240238 1040000B */  beqz      $v0, .L80240268
@@ -98,20 +98,20 @@ glabel func_80240128_D8B4D8
 /* D8B640 80240290 00000000 */   nop      
 .L80240294:
 /* D8B644 80240294 9202000E */  lbu       $v0, 0xe($s0)
-/* D8B648 80240298 3C01802E */  lui       $at, 0x802e
-/* D8B64C 8024029C A0229D70 */  sb        $v0, -0x6290($at)
+/* D8B648 80240298 3C01802E */  lui       $at, %hi(D_802D9D70)
+/* D8B64C 8024029C A0229D70 */  sb        $v0, %lo(D_802D9D70)($at)
 /* D8B650 802402A0 080900AD */  j         .L802402B4
 /* D8B654 802402A4 0240202D */   daddu    $a0, $s2, $zero
 .L802402A8:
-/* D8B658 802402A8 3C01802E */  lui       $at, 0x802e
-/* D8B65C 802402AC A0209D70 */  sb        $zero, -0x6290($at)
+/* D8B658 802402A8 3C01802E */  lui       $at, %hi(D_802D9D70)
+/* D8B65C 802402AC A0209D70 */  sb        $zero, %lo(D_802D9D70)($at)
 /* D8B660 802402B0 0240202D */  daddu     $a0, $s2, $zero
 .L802402B4:
 /* D8B664 802402B4 AC910000 */  sw        $s1, ($a0)
 /* D8B668 802402B8 AC900008 */  sw        $s0, 8($a0)
 /* D8B66C 802402BC 8FA20038 */  lw        $v0, 0x38($sp)
-/* D8B670 802402C0 3C038024 */  lui       $v1, 0x8024
-/* D8B674 802402C4 246302F0 */  addiu     $v1, $v1, 0x2f0
+/* D8B670 802402C0 3C038024 */  lui       $v1, %hi(D_802402F0)
+/* D8B674 802402C4 246302F0 */  addiu     $v1, $v1, %lo(D_802402F0)
 /* D8B678 802402C8 AC83000C */  sw        $v1, 0xc($a0)
 /* D8B67C 802402CC 00021023 */  negu      $v0, $v0
 /* D8B680 802402D0 0C047644 */  jal       queue_render_task
diff --git a/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_802402F0_D8B6A0.s b/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_802402F0_D8B6A0.s
index 5950892ede..9dfbab3564 100644
--- a/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_802402F0_D8B6A0.s
+++ b/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_802402F0_D8B6A0.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_802402F0_D8B6A0
-/* D8B6A0 802402F0 3C03800A */  lui       $v1, 0x800a
-/* D8B6A4 802402F4 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D8B6A0 802402F0 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D8B6A4 802402F4 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D8B6A8 802402F8 3C07BF80 */  lui       $a3, 0xbf80
 /* D8B6AC 802402FC 27BDFEC0 */  addiu     $sp, $sp, -0x140
 /* D8B6B0 80240300 F7B40128 */  sdc1      $f20, 0x128($sp)
@@ -22,9 +22,9 @@ glabel func_802402F0_D8B6A0
 /* D8B6E4 80240334 000218C0 */  sll       $v1, $v0, 3
 /* D8B6E8 80240338 00431021 */  addu      $v0, $v0, $v1
 /* D8B6EC 8024033C 000210C0 */  sll       $v0, $v0, 3
-/* D8B6F0 80240340 3C01800B */  lui       $at, 0x800b
+/* D8B6F0 80240340 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* D8B6F4 80240344 00220821 */  addu      $at, $at, $v0
-/* D8B6F8 80240348 C4361DEC */  lwc1      $f22, 0x1dec($at)
+/* D8B6F8 80240348 C4361DEC */  lwc1      $f22, %lo(D_800B1DEC)($at)
 /* D8B6FC 8024034C 4406A000 */  mfc1      $a2, $f20
 /* D8B700 80240350 4600B587 */  neg.s     $f22, $f22
 /* D8B704 80240354 4405B000 */  mfc1      $a1, $f22
diff --git a/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_8024049C_D8B84C.s b/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_8024049C_D8B84C.s
index 1b217f5f03..dea1993047 100644
--- a/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_8024049C_D8B84C.s
+++ b/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_8024049C_D8B84C.s
@@ -11,8 +11,8 @@ glabel func_8024049C_D8B84C
 /* D8B864 802404B4 28420002 */   slti     $v0, $v0, 2
 /* D8B868 802404B8 1040000C */  beqz      $v0, .L802404EC
 /* D8B86C 802404BC 00000000 */   nop      
-/* D8B870 802404C0 3C058024 */  lui       $a1, 0x8024
-/* D8B874 802404C4 24A50500 */  addiu     $a1, $a1, 0x500
+/* D8B870 802404C0 3C058024 */  lui       $a1, %hi(D_80240500)
+/* D8B874 802404C4 24A50500 */  addiu     $a1, $a1, %lo(D_80240500)
 /* D8B878 802404C8 0C048C56 */  jal       bind_dynamic_entity_3
 /* D8B87C 802404CC 0000202D */   daddu    $a0, $zero, $zero
 /* D8B880 802404D0 8E03013C */  lw        $v1, 0x13c($s0)
diff --git a/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240500_D8B8B0.s b/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240500_D8B8B0.s
index bc6f63c393..064692f230 100644
--- a/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240500_D8B8B0.s
+++ b/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240500_D8B8B0.s
@@ -28,8 +28,8 @@ glabel func_80240500_D8B8B0
 /* D8B90C 8024055C 27A20038 */  addiu     $v0, $sp, 0x38
 /* D8B910 80240560 AFA20018 */  sw        $v0, 0x18($sp)
 /* D8B914 80240564 C600002C */  lwc1      $f0, 0x2c($s0)
-/* D8B918 80240568 3C04800A */  lui       $a0, 0x800a
-/* D8B91C 8024056C 8484A634 */  lh        $a0, -0x59cc($a0)
+/* D8B918 80240568 3C04800A */  lui       $a0, %hi(D_8009A634)
+/* D8B91C 8024056C 8484A634 */  lh        $a0, %lo(D_8009A634)($a0)
 /* D8B920 80240570 46000007 */  neg.s     $f0, $f0
 /* D8B924 80240574 44060000 */  mfc1      $a2, $f0
 /* D8B928 80240578 0C00B94E */  jal       get_screen_coords
@@ -44,8 +44,8 @@ glabel func_80240500_D8B8B0
 /* D8B94C 8024059C 54400022 */  bnel      $v0, $zero, .L80240628
 /* D8B950 802405A0 24120011 */   addiu    $s2, $zero, 0x11
 /* D8B954 802405A4 9203000E */  lbu       $v1, 0xe($s0)
-/* D8B958 802405A8 3C02802E */  lui       $v0, 0x802e
-/* D8B95C 802405AC 90429D71 */  lbu       $v0, -0x628f($v0)
+/* D8B958 802405A8 3C02802E */  lui       $v0, %hi(D_802D9D71)
+/* D8B95C 802405AC 90429D71 */  lbu       $v0, %lo(D_802D9D71)($v0)
 /* D8B960 802405B0 10620018 */  beq       $v1, $v0, .L80240614
 /* D8B964 802405B4 2C6200FE */   sltiu    $v0, $v1, 0xfe
 /* D8B968 802405B8 1040000B */  beqz      $v0, .L802405E8
@@ -75,17 +75,17 @@ glabel func_80240500_D8B8B0
 /* D8B9C0 80240610 00000000 */   nop      
 .L80240614:
 /* D8B9C4 80240614 9202000E */  lbu       $v0, 0xe($s0)
-/* D8B9C8 80240618 3C01802E */  lui       $at, 0x802e
-/* D8B9CC 8024061C A0229D71 */  sb        $v0, -0x628f($at)
+/* D8B9C8 80240618 3C01802E */  lui       $at, %hi(D_802D9D71)
+/* D8B9CC 8024061C A0229D71 */  sb        $v0, %lo(D_802D9D71)($at)
 /* D8B9D0 80240620 0809018C */  j         .L80240630
 /* D8B9D4 80240624 00000000 */   nop      
 .L80240628:
-/* D8B9D8 80240628 3C01802E */  lui       $at, 0x802e
-/* D8B9DC 8024062C A0209D71 */  sb        $zero, -0x628f($at)
+/* D8B9D8 80240628 3C01802E */  lui       $at, %hi(D_802D9D71)
+/* D8B9DC 8024062C A0209D71 */  sb        $zero, %lo(D_802D9D71)($at)
 .L80240630:
 /* D8B9E0 80240630 8FA20038 */  lw        $v0, 0x38($sp)
-/* D8B9E4 80240634 3C048024 */  lui       $a0, 0x8024
-/* D8B9E8 80240638 24840870 */  addiu     $a0, $a0, 0x870
+/* D8B9E4 80240634 3C048024 */  lui       $a0, %hi(D_80240870)
+/* D8B9E8 80240638 24840870 */  addiu     $a0, $a0, %lo(D_80240870)
 /* D8B9EC 8024063C AE320000 */  sw        $s2, ($s1)
 /* D8B9F0 80240640 AE300008 */  sw        $s0, 8($s1)
 /* D8B9F4 80240644 00021023 */  negu      $v0, $v0
@@ -95,8 +95,8 @@ glabel func_80240500_D8B8B0
 /* D8BA04 80240654 00431024 */  and       $v0, $v0, $v1
 /* D8BA08 80240658 54400004 */  bnel      $v0, $zero, .L8024066C
 /* D8BA0C 8024065C AE24000C */   sw       $a0, 0xc($s1)
-/* D8BA10 80240660 3C048024 */  lui       $a0, 0x8024
-/* D8BA14 80240664 2484068C */  addiu     $a0, $a0, 0x68c
+/* D8BA10 80240660 3C048024 */  lui       $a0, %hi(D_8024068C)
+/* D8BA14 80240664 2484068C */  addiu     $a0, $a0, %lo(D_8024068C)
 /* D8BA18 80240668 AE24000C */  sw        $a0, 0xc($s1)
 .L8024066C:
 /* D8BA1C 8024066C 0C047644 */  jal       queue_render_task
diff --git a/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_8024068C_D8BA3C.s b/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_8024068C_D8BA3C.s
index 45ac554b08..ac819e83ce 100644
--- a/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_8024068C_D8BA3C.s
+++ b/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_8024068C_D8BA3C.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_8024068C_D8BA3C
-/* D8BA3C 8024068C 3C03800A */  lui       $v1, 0x800a
-/* D8BA40 80240690 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D8BA3C 8024068C 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D8BA40 80240690 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D8BA44 80240694 3C07BF80 */  lui       $a3, 0xbf80
 /* D8BA48 80240698 27BDFEC0 */  addiu     $sp, $sp, -0x140
 /* D8BA4C 8024069C F7B40128 */  sdc1      $f20, 0x128($sp)
@@ -22,9 +22,9 @@ glabel func_8024068C_D8BA3C
 /* D8BA80 802406D0 000218C0 */  sll       $v1, $v0, 3
 /* D8BA84 802406D4 00431021 */  addu      $v0, $v0, $v1
 /* D8BA88 802406D8 000210C0 */  sll       $v0, $v0, 3
-/* D8BA8C 802406DC 3C01800B */  lui       $at, 0x800b
+/* D8BA8C 802406DC 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* D8BA90 802406E0 00220821 */  addu      $at, $at, $v0
-/* D8BA94 802406E4 C4361DEC */  lwc1      $f22, 0x1dec($at)
+/* D8BA94 802406E4 C4361DEC */  lwc1      $f22, %lo(D_800B1DEC)($at)
 /* D8BA98 802406E8 4406A000 */  mfc1      $a2, $f20
 /* D8BA9C 802406EC 4600B587 */  neg.s     $f22, $f22
 /* D8BAA0 802406F0 4405B000 */  mfc1      $a1, $f22
diff --git a/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240870_D8BC20.s b/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240870_D8BC20.s
index 34d5f553c6..ff5cedc24b 100644
--- a/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240870_D8BC20.s
+++ b/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240870_D8BC20.s
@@ -27,8 +27,8 @@ glabel func_80240870_D8BC20
 /* D8BC78 802408C8 F7B80160 */  sdc1      $f24, 0x160($sp)
 /* D8BC7C 802408CC F7B40150 */  sdc1      $f20, 0x150($sp)
 .L802408D0:
-/* D8BC80 802408D0 3C03800A */  lui       $v1, 0x800a
-/* D8BC84 802408D4 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D8BC80 802408D0 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D8BC84 802408D4 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D8BC88 802408D8 00031080 */  sll       $v0, $v1, 2
 /* D8BC8C 802408DC 00431021 */  addu      $v0, $v0, $v1
 /* D8BC90 802408E0 00021080 */  sll       $v0, $v0, 2
diff --git a/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240D3C_D8C0EC.s b/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240D3C_D8C0EC.s
index eb6139a2be..b9daa9dc99 100644
--- a/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240D3C_D8C0EC.s
+++ b/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240D3C_D8C0EC.s
@@ -25,13 +25,13 @@ glabel func_80240D3C_D8C0EC
 /* D8C138 80240D88 08090378 */  j         .L80240DE0
 /* D8C13C 80240D8C 00000000 */   nop      
 .L80240D90:
-/* D8C140 80240D90 3C048024 */  lui       $a0, 0x8024
-/* D8C144 80240D94 24840E84 */  addiu     $a0, $a0, 0xe84
+/* D8C140 80240D90 3C048024 */  lui       $a0, %hi(D_80240E84)
+/* D8C144 80240D94 24840E84 */  addiu     $a0, $a0, %lo(D_80240E84)
 /* D8C148 80240D98 08090374 */  j         .L80240DD0
 /* D8C14C 80240D9C 00000000 */   nop      
 .L80240DA0:
-/* D8C150 80240DA0 3C048024 */  lui       $a0, 0x8024
-/* D8C154 80240DA4 24840EEC */  addiu     $a0, $a0, 0xeec
+/* D8C150 80240DA0 3C048024 */  lui       $a0, %hi(D_80240EEC)
+/* D8C154 80240DA4 24840EEC */  addiu     $a0, $a0, %lo(D_80240EEC)
 /* D8C158 80240DA8 08090374 */  j         .L80240DD0
 /* D8C15C 80240DAC 00000000 */   nop      
 .L80240DB0:
@@ -42,8 +42,8 @@ glabel func_80240D3C_D8C0EC
 /* D8C170 80240DC0 10400007 */  beqz      $v0, .L80240DE0
 /* D8C174 80240DC4 00000000 */   nop      
 .L80240DC8:
-/* D8C178 80240DC8 3C048024 */  lui       $a0, 0x8024
-/* D8C17C 80240DCC 24840EB8 */  addiu     $a0, $a0, 0xeb8
+/* D8C178 80240DC8 3C048024 */  lui       $a0, %hi(D_80240EB8)
+/* D8C17C 80240DCC 24840EB8 */  addiu     $a0, $a0, %lo(D_80240EB8)
 .L80240DD0:
 /* D8C180 80240DD0 0C048C56 */  jal       bind_dynamic_entity_3
 /* D8C184 80240DD4 0000282D */   daddu    $a1, $zero, $zero
diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802400EC_D8D33C.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802400EC_D8D33C.s
index 01f0e994b6..ad7485ec78 100644
--- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802400EC_D8D33C.s
+++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802400EC_D8D33C.s
@@ -5,8 +5,8 @@ glabel func_802400EC_D8D33C
 /* D8D33C 802400EC 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* D8D340 802400F0 AFB00010 */  sw        $s0, 0x10($sp)
 /* D8D344 802400F4 0080802D */  daddu     $s0, $a0, $zero
-/* D8D348 802400F8 3C058024 */  lui       $a1, 0x8024
-/* D8D34C 802400FC 24A50128 */  addiu     $a1, $a1, 0x128
+/* D8D348 802400F8 3C058024 */  lui       $a1, %hi(D_80240128)
+/* D8D34C 802400FC 24A50128 */  addiu     $a1, $a1, %lo(D_80240128)
 /* D8D350 80240100 AFBF0014 */  sw        $ra, 0x14($sp)
 /* D8D354 80240104 0C048C56 */  jal       bind_dynamic_entity_3
 /* D8D358 80240108 0000202D */   daddu    $a0, $zero, $zero
diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240128_D8D378.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240128_D8D378.s
index 50ab3e55de..0ddd8e3883 100644
--- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240128_D8D378.s
+++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240128_D8D378.s
@@ -29,8 +29,8 @@ glabel func_80240128_D8D378
 /* D8D3D8 80240188 27A20034 */  addiu     $v0, $sp, 0x34
 /* D8D3DC 8024018C AFA20014 */  sw        $v0, 0x14($sp)
 /* D8D3E0 80240190 C6000030 */  lwc1      $f0, 0x30($s0)
-/* D8D3E4 80240194 3C04800A */  lui       $a0, 0x800a
-/* D8D3E8 80240198 8484A634 */  lh        $a0, -0x59cc($a0)
+/* D8D3E4 80240194 3C04800A */  lui       $a0, %hi(D_8009A634)
+/* D8D3E8 80240198 8484A634 */  lh        $a0, %lo(D_8009A634)($a0)
 /* D8D3EC 8024019C 46000007 */  neg.s     $f0, $f0
 /* D8D3F0 802401A0 44070000 */  mfc1      $a3, $f0
 /* D8D3F4 802401A4 27A20038 */  addiu     $v0, $sp, 0x38
@@ -67,8 +67,8 @@ glabel func_80240128_D8D378
 /* D8D46C 8024021C 54400022 */  bnel      $v0, $zero, .L802402A8
 /* D8D470 80240220 24110011 */   addiu    $s1, $zero, 0x11
 /* D8D474 80240224 9203000E */  lbu       $v1, 0xe($s0)
-/* D8D478 80240228 3C02802E */  lui       $v0, 0x802e
-/* D8D47C 8024022C 90429D70 */  lbu       $v0, -0x6290($v0)
+/* D8D478 80240228 3C02802E */  lui       $v0, %hi(D_802D9D70)
+/* D8D47C 8024022C 90429D70 */  lbu       $v0, %lo(D_802D9D70)($v0)
 /* D8D480 80240230 10620018 */  beq       $v1, $v0, .L80240294
 /* D8D484 80240234 2C6200FE */   sltiu    $v0, $v1, 0xfe
 /* D8D488 80240238 1040000B */  beqz      $v0, .L80240268
@@ -98,20 +98,20 @@ glabel func_80240128_D8D378
 /* D8D4E0 80240290 00000000 */   nop      
 .L80240294:
 /* D8D4E4 80240294 9202000E */  lbu       $v0, 0xe($s0)
-/* D8D4E8 80240298 3C01802E */  lui       $at, 0x802e
-/* D8D4EC 8024029C A0229D70 */  sb        $v0, -0x6290($at)
+/* D8D4E8 80240298 3C01802E */  lui       $at, %hi(D_802D9D70)
+/* D8D4EC 8024029C A0229D70 */  sb        $v0, %lo(D_802D9D70)($at)
 /* D8D4F0 802402A0 080900AD */  j         .L802402B4
 /* D8D4F4 802402A4 0240202D */   daddu    $a0, $s2, $zero
 .L802402A8:
-/* D8D4F8 802402A8 3C01802E */  lui       $at, 0x802e
-/* D8D4FC 802402AC A0209D70 */  sb        $zero, -0x6290($at)
+/* D8D4F8 802402A8 3C01802E */  lui       $at, %hi(D_802D9D70)
+/* D8D4FC 802402AC A0209D70 */  sb        $zero, %lo(D_802D9D70)($at)
 /* D8D500 802402B0 0240202D */  daddu     $a0, $s2, $zero
 .L802402B4:
 /* D8D504 802402B4 AC910000 */  sw        $s1, ($a0)
 /* D8D508 802402B8 AC900008 */  sw        $s0, 8($a0)
 /* D8D50C 802402BC 8FA20038 */  lw        $v0, 0x38($sp)
-/* D8D510 802402C0 3C038024 */  lui       $v1, 0x8024
-/* D8D514 802402C4 246302F0 */  addiu     $v1, $v1, 0x2f0
+/* D8D510 802402C0 3C038024 */  lui       $v1, %hi(D_802402F0)
+/* D8D514 802402C4 246302F0 */  addiu     $v1, $v1, %lo(D_802402F0)
 /* D8D518 802402C8 AC83000C */  sw        $v1, 0xc($a0)
 /* D8D51C 802402CC 00021023 */  negu      $v0, $v0
 /* D8D520 802402D0 0C047644 */  jal       queue_render_task
diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802402F0_D8D540.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802402F0_D8D540.s
index dd91de712f..648673cc39 100644
--- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802402F0_D8D540.s
+++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802402F0_D8D540.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_802402F0_D8D540
-/* D8D540 802402F0 3C03800A */  lui       $v1, 0x800a
-/* D8D544 802402F4 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D8D540 802402F0 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D8D544 802402F4 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D8D548 802402F8 3C07BF80 */  lui       $a3, 0xbf80
 /* D8D54C 802402FC 27BDFEC0 */  addiu     $sp, $sp, -0x140
 /* D8D550 80240300 F7B40128 */  sdc1      $f20, 0x128($sp)
@@ -22,9 +22,9 @@ glabel func_802402F0_D8D540
 /* D8D584 80240334 000218C0 */  sll       $v1, $v0, 3
 /* D8D588 80240338 00431021 */  addu      $v0, $v0, $v1
 /* D8D58C 8024033C 000210C0 */  sll       $v0, $v0, 3
-/* D8D590 80240340 3C01800B */  lui       $at, 0x800b
+/* D8D590 80240340 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* D8D594 80240344 00220821 */  addu      $at, $at, $v0
-/* D8D598 80240348 C4361DEC */  lwc1      $f22, 0x1dec($at)
+/* D8D598 80240348 C4361DEC */  lwc1      $f22, %lo(D_800B1DEC)($at)
 /* D8D59C 8024034C 4406A000 */  mfc1      $a2, $f20
 /* D8D5A0 80240350 4600B587 */  neg.s     $f22, $f22
 /* D8D5A4 80240354 4405B000 */  mfc1      $a1, $f22
diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_8024049C_D8D6EC.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_8024049C_D8D6EC.s
index 82f5f1d2a4..28e2a7ea51 100644
--- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_8024049C_D8D6EC.s
+++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_8024049C_D8D6EC.s
@@ -11,8 +11,8 @@ glabel func_8024049C_D8D6EC
 /* D8D704 802404B4 28420002 */   slti     $v0, $v0, 2
 /* D8D708 802404B8 1040000C */  beqz      $v0, .L802404EC
 /* D8D70C 802404BC 00000000 */   nop      
-/* D8D710 802404C0 3C058024 */  lui       $a1, 0x8024
-/* D8D714 802404C4 24A50500 */  addiu     $a1, $a1, 0x500
+/* D8D710 802404C0 3C058024 */  lui       $a1, %hi(D_80240500)
+/* D8D714 802404C4 24A50500 */  addiu     $a1, $a1, %lo(D_80240500)
 /* D8D718 802404C8 0C048C56 */  jal       bind_dynamic_entity_3
 /* D8D71C 802404CC 0000202D */   daddu    $a0, $zero, $zero
 /* D8D720 802404D0 8E03013C */  lw        $v1, 0x13c($s0)
diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240500_D8D750.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240500_D8D750.s
index 63cf4672c6..028ada2b18 100644
--- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240500_D8D750.s
+++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240500_D8D750.s
@@ -28,8 +28,8 @@ glabel func_80240500_D8D750
 /* D8D7AC 8024055C 27A20038 */  addiu     $v0, $sp, 0x38
 /* D8D7B0 80240560 AFA20018 */  sw        $v0, 0x18($sp)
 /* D8D7B4 80240564 C600002C */  lwc1      $f0, 0x2c($s0)
-/* D8D7B8 80240568 3C04800A */  lui       $a0, 0x800a
-/* D8D7BC 8024056C 8484A634 */  lh        $a0, -0x59cc($a0)
+/* D8D7B8 80240568 3C04800A */  lui       $a0, %hi(D_8009A634)
+/* D8D7BC 8024056C 8484A634 */  lh        $a0, %lo(D_8009A634)($a0)
 /* D8D7C0 80240570 46000007 */  neg.s     $f0, $f0
 /* D8D7C4 80240574 44060000 */  mfc1      $a2, $f0
 /* D8D7C8 80240578 0C00B94E */  jal       get_screen_coords
@@ -44,8 +44,8 @@ glabel func_80240500_D8D750
 /* D8D7EC 8024059C 54400022 */  bnel      $v0, $zero, .L80240628
 /* D8D7F0 802405A0 24120011 */   addiu    $s2, $zero, 0x11
 /* D8D7F4 802405A4 9203000E */  lbu       $v1, 0xe($s0)
-/* D8D7F8 802405A8 3C02802E */  lui       $v0, 0x802e
-/* D8D7FC 802405AC 90429D71 */  lbu       $v0, -0x628f($v0)
+/* D8D7F8 802405A8 3C02802E */  lui       $v0, %hi(D_802D9D71)
+/* D8D7FC 802405AC 90429D71 */  lbu       $v0, %lo(D_802D9D71)($v0)
 /* D8D800 802405B0 10620018 */  beq       $v1, $v0, .L80240614
 /* D8D804 802405B4 2C6200FE */   sltiu    $v0, $v1, 0xfe
 /* D8D808 802405B8 1040000B */  beqz      $v0, .L802405E8
@@ -75,17 +75,17 @@ glabel func_80240500_D8D750
 /* D8D860 80240610 00000000 */   nop      
 .L80240614:
 /* D8D864 80240614 9202000E */  lbu       $v0, 0xe($s0)
-/* D8D868 80240618 3C01802E */  lui       $at, 0x802e
-/* D8D86C 8024061C A0229D71 */  sb        $v0, -0x628f($at)
+/* D8D868 80240618 3C01802E */  lui       $at, %hi(D_802D9D71)
+/* D8D86C 8024061C A0229D71 */  sb        $v0, %lo(D_802D9D71)($at)
 /* D8D870 80240620 0809018C */  j         .L80240630
 /* D8D874 80240624 00000000 */   nop      
 .L80240628:
-/* D8D878 80240628 3C01802E */  lui       $at, 0x802e
-/* D8D87C 8024062C A0209D71 */  sb        $zero, -0x628f($at)
+/* D8D878 80240628 3C01802E */  lui       $at, %hi(D_802D9D71)
+/* D8D87C 8024062C A0209D71 */  sb        $zero, %lo(D_802D9D71)($at)
 .L80240630:
 /* D8D880 80240630 8FA20038 */  lw        $v0, 0x38($sp)
-/* D8D884 80240634 3C048024 */  lui       $a0, 0x8024
-/* D8D888 80240638 24840870 */  addiu     $a0, $a0, 0x870
+/* D8D884 80240634 3C048024 */  lui       $a0, %hi(D_80240870)
+/* D8D888 80240638 24840870 */  addiu     $a0, $a0, %lo(D_80240870)
 /* D8D88C 8024063C AE320000 */  sw        $s2, ($s1)
 /* D8D890 80240640 AE300008 */  sw        $s0, 8($s1)
 /* D8D894 80240644 00021023 */  negu      $v0, $v0
@@ -95,8 +95,8 @@ glabel func_80240500_D8D750
 /* D8D8A4 80240654 00431024 */  and       $v0, $v0, $v1
 /* D8D8A8 80240658 54400004 */  bnel      $v0, $zero, .L8024066C
 /* D8D8AC 8024065C AE24000C */   sw       $a0, 0xc($s1)
-/* D8D8B0 80240660 3C048024 */  lui       $a0, 0x8024
-/* D8D8B4 80240664 2484068C */  addiu     $a0, $a0, 0x68c
+/* D8D8B0 80240660 3C048024 */  lui       $a0, %hi(D_8024068C)
+/* D8D8B4 80240664 2484068C */  addiu     $a0, $a0, %lo(D_8024068C)
 /* D8D8B8 80240668 AE24000C */  sw        $a0, 0xc($s1)
 .L8024066C:
 /* D8D8BC 8024066C 0C047644 */  jal       queue_render_task
diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_8024068C_D8D8DC.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_8024068C_D8D8DC.s
index 860deac038..83a9405bcf 100644
--- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_8024068C_D8D8DC.s
+++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_8024068C_D8D8DC.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_8024068C_D8D8DC
-/* D8D8DC 8024068C 3C03800A */  lui       $v1, 0x800a
-/* D8D8E0 80240690 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D8D8DC 8024068C 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D8D8E0 80240690 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D8D8E4 80240694 3C07BF80 */  lui       $a3, 0xbf80
 /* D8D8E8 80240698 27BDFEC0 */  addiu     $sp, $sp, -0x140
 /* D8D8EC 8024069C F7B40128 */  sdc1      $f20, 0x128($sp)
@@ -22,9 +22,9 @@ glabel func_8024068C_D8D8DC
 /* D8D920 802406D0 000218C0 */  sll       $v1, $v0, 3
 /* D8D924 802406D4 00431021 */  addu      $v0, $v0, $v1
 /* D8D928 802406D8 000210C0 */  sll       $v0, $v0, 3
-/* D8D92C 802406DC 3C01800B */  lui       $at, 0x800b
+/* D8D92C 802406DC 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* D8D930 802406E0 00220821 */  addu      $at, $at, $v0
-/* D8D934 802406E4 C4361DEC */  lwc1      $f22, 0x1dec($at)
+/* D8D934 802406E4 C4361DEC */  lwc1      $f22, %lo(D_800B1DEC)($at)
 /* D8D938 802406E8 4406A000 */  mfc1      $a2, $f20
 /* D8D93C 802406EC 4600B587 */  neg.s     $f22, $f22
 /* D8D940 802406F0 4405B000 */  mfc1      $a1, $f22
diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240870_D8DAC0.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240870_D8DAC0.s
index a38b37d07c..a3c4fed4b8 100644
--- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240870_D8DAC0.s
+++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240870_D8DAC0.s
@@ -27,8 +27,8 @@ glabel func_80240870_D8DAC0
 /* D8DB18 802408C8 F7B80160 */  sdc1      $f24, 0x160($sp)
 /* D8DB1C 802408CC F7B40150 */  sdc1      $f20, 0x150($sp)
 .L802408D0:
-/* D8DB20 802408D0 3C03800A */  lui       $v1, 0x800a
-/* D8DB24 802408D4 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D8DB20 802408D0 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D8DB24 802408D4 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D8DB28 802408D8 00031080 */  sll       $v0, $v1, 2
 /* D8DB2C 802408DC 00431021 */  addu      $v0, $v0, $v1
 /* D8DB30 802408E0 00021080 */  sll       $v0, $v0, 2
diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240D3C_D8DF8C.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240D3C_D8DF8C.s
index 6cfa0a9f95..493b3c40cb 100644
--- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240D3C_D8DF8C.s
+++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240D3C_D8DF8C.s
@@ -25,13 +25,13 @@ glabel func_80240D3C_D8DF8C
 /* D8DFD8 80240D88 08090378 */  j         .L80240DE0
 /* D8DFDC 80240D8C 00000000 */   nop      
 .L80240D90:
-/* D8DFE0 80240D90 3C048024 */  lui       $a0, 0x8024
-/* D8DFE4 80240D94 24840E84 */  addiu     $a0, $a0, 0xe84
+/* D8DFE0 80240D90 3C048024 */  lui       $a0, %hi(D_80240E84)
+/* D8DFE4 80240D94 24840E84 */  addiu     $a0, $a0, %lo(D_80240E84)
 /* D8DFE8 80240D98 08090374 */  j         .L80240DD0
 /* D8DFEC 80240D9C 00000000 */   nop      
 .L80240DA0:
-/* D8DFF0 80240DA0 3C048024 */  lui       $a0, 0x8024
-/* D8DFF4 80240DA4 24840EEC */  addiu     $a0, $a0, 0xeec
+/* D8DFF0 80240DA0 3C048024 */  lui       $a0, %hi(D_80240EEC)
+/* D8DFF4 80240DA4 24840EEC */  addiu     $a0, $a0, %lo(D_80240EEC)
 /* D8DFF8 80240DA8 08090374 */  j         .L80240DD0
 /* D8DFFC 80240DAC 00000000 */   nop      
 .L80240DB0:
@@ -42,8 +42,8 @@ glabel func_80240D3C_D8DF8C
 /* D8E010 80240DC0 10400007 */  beqz      $v0, .L80240DE0
 /* D8E014 80240DC4 00000000 */   nop      
 .L80240DC8:
-/* D8E018 80240DC8 3C048024 */  lui       $a0, 0x8024
-/* D8E01C 80240DCC 24840EB8 */  addiu     $a0, $a0, 0xeb8
+/* D8E018 80240DC8 3C048024 */  lui       $a0, %hi(D_80240EB8)
+/* D8E01C 80240DCC 24840EB8 */  addiu     $a0, $a0, %lo(D_80240EB8)
 .L80240DD0:
 /* D8E020 80240DD0 0C048C56 */  jal       bind_dynamic_entity_3
 /* D8E024 80240DD4 0000282D */   daddu    $a1, $zero, $zero
diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240F20_D8E170.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240F20_D8E170.s
index c2fdc05fe9..56877f24ba 100644
--- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240F20_D8E170.s
+++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240F20_D8E170.s
@@ -69,8 +69,8 @@ glabel func_80240F20_D8E170
 /* D8E264 80241014 0809040F */  j         .L8024103C
 /* D8E268 80241018 E6800018 */   swc1     $f0, 0x18($s4)
 .L8024101C:
-/* D8E26C 8024101C 3C018024 */  lui       $at, 0x8024
-/* D8E270 80241020 D4223FE0 */  ldc1      $f2, 0x3fe0($at)
+/* D8E26C 8024101C 3C018024 */  lui       $at, %hi(D_80243FE0)
+/* D8E270 80241020 D4223FE0 */  ldc1      $f2, %lo(D_80243FE0)($at)
 /* D8E274 80241024 44820000 */  mtc1      $v0, $f0
 /* D8E278 80241028 00000000 */  nop       
 /* D8E27C 8024102C 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_8024159C_D8E7EC.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_8024159C_D8E7EC.s
index 1d3b09ac3b..5ed7bfba4d 100644
--- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_8024159C_D8E7EC.s
+++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_8024159C_D8E7EC.s
@@ -33,8 +33,8 @@ glabel func_8024159C_D8E7EC
 /* D8E858 80241608 0809058C */  j         .L80241630
 /* D8E85C 8024160C E4A00018 */   swc1     $f0, 0x18($a1)
 .L80241610:
-/* D8E860 80241610 3C018024 */  lui       $at, 0x8024
-/* D8E864 80241614 D4223FE8 */  ldc1      $f2, 0x3fe8($at)
+/* D8E860 80241610 3C018024 */  lui       $at, %hi(D_80243FE8)
+/* D8E864 80241614 D4223FE8 */  ldc1      $f2, %lo(D_80243FE8)($at)
 /* D8E868 80241618 44820000 */  mtc1      $v0, $f0
 /* D8E86C 8024161C 00000000 */  nop       
 /* D8E870 80241620 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241AB4_D8ED04.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241AB4_D8ED04.s
index 9eaf5b5758..04191f3889 100644
--- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241AB4_D8ED04.s
+++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241AB4_D8ED04.s
@@ -124,9 +124,9 @@ glabel func_80241AB4_D8ED04
 /* D8EEC8 80241C78 2C620064 */  sltiu     $v0, $v1, 0x64
 /* D8EECC 80241C7C 10400042 */  beqz      $v0, .L80241D88
 /* D8EED0 80241C80 00031080 */   sll      $v0, $v1, 2
-/* D8EED4 80241C84 3C018024 */  lui       $at, 0x8024
+/* D8EED4 80241C84 3C018024 */  lui       $at, %hi(D_80243FF0)
 /* D8EED8 80241C88 00220821 */  addu      $at, $at, $v0
-/* D8EEDC 80241C8C 8C223FF0 */  lw        $v0, 0x3ff0($at)
+/* D8EEDC 80241C8C 8C223FF0 */  lw        $v0, %lo(D_80243FF0)($at)
 /* D8EEE0 80241C90 00400008 */  jr        $v0
 /* D8EEE4 80241C94 00000000 */   nop      
 /* D8EEE8 80241C98 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241FB8_D8F208.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241FB8_D8F208.s
index 0130e677ef..101a04f84f 100644
--- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241FB8_D8F208.s
+++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241FB8_D8F208.s
@@ -18,8 +18,8 @@ glabel func_80241FB8_D8F208
 /* D8F23C 80241FEC 0040802D */  daddu     $s0, $v0, $zero
 /* D8F240 80241FF0 3C05800B */  lui       $a1, %hi(gCameras)
 /* D8F244 80241FF4 24A51D80 */  addiu     $a1, $a1, %lo(gCameras)
-/* D8F248 80241FF8 3C03800A */  lui       $v1, 0x800a
-/* D8F24C 80241FFC 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D8F248 80241FF8 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D8F24C 80241FFC 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D8F250 80242000 00912021 */  addu      $a0, $a0, $s1
 /* D8F254 80242004 00031080 */  sll       $v0, $v1, 2
 /* D8F258 80242008 00431021 */  addu      $v0, $v0, $v1
@@ -54,8 +54,8 @@ glabel func_80241FB8_D8F208
 /* D8F2C8 80242078 00000000 */   nop      
 /* D8F2CC 8024207C 0C00A6C9 */  jal       clamp_angle
 /* D8F2D0 80242080 46000306 */   mov.s    $f12, $f0
-/* D8F2D4 80242084 3C018024 */  lui       $at, 0x8024
-/* D8F2D8 80242088 D4224180 */  ldc1      $f2, 0x4180($at)
+/* D8F2D4 80242084 3C018024 */  lui       $at, %hi(D_80244180)
+/* D8F2D8 80242088 D4224180 */  ldc1      $f2, %lo(D_80244180)($at)
 /* D8F2DC 8024208C 46000021 */  cvt.d.s   $f0, $f0
 /* D8F2E0 80242090 4622003C */  c.lt.d    $f0, $f2
 /* D8F2E4 80242094 00000000 */  nop       
@@ -97,8 +97,8 @@ glabel func_80241FB8_D8F208
 /* D8F36C 8024211C 45030001 */  bc1tl     .L80242124
 /* D8F370 80242120 0000882D */   daddu    $s1, $zero, $zero
 .L80242124:
-/* D8F374 80242124 3C038011 */  lui       $v1, 0x8011
-/* D8F378 80242128 8063EBB3 */  lb        $v1, -0x144d($v1)
+/* D8F374 80242124 3C038011 */  lui       $v1, %hi(D_8010EBB3)
+/* D8F378 80242128 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
 /* D8F37C 8024212C 24020009 */  addiu     $v0, $zero, 9
 /* D8F380 80242130 50620001 */  beql      $v1, $v0, .L80242138
 /* D8F384 80242134 0000882D */   daddu    $s1, $zero, $zero
diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802423CC_D8F61C.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802423CC_D8F61C.s
index 3cb37821b8..3fa4009528 100644
--- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802423CC_D8F61C.s
+++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802423CC_D8F61C.s
@@ -100,9 +100,9 @@ glabel func_802423CC_D8F61C
 /* D8F780 80242530 2C620064 */  sltiu     $v0, $v1, 0x64
 /* D8F784 80242534 1040004E */  beqz      $v0, .L80242670
 /* D8F788 80242538 00031080 */   sll      $v0, $v1, 2
-/* D8F78C 8024253C 3C018024 */  lui       $at, 0x8024
+/* D8F78C 8024253C 3C018024 */  lui       $at, %hi(D_80244188)
 /* D8F790 80242540 00220821 */  addu      $at, $at, $v0
-/* D8F794 80242544 8C224188 */  lw        $v0, 0x4188($at)
+/* D8F794 80242544 8C224188 */  lw        $v0, %lo(D_80244188)($at)
 /* D8F798 80242548 00400008 */  jr        $v0
 /* D8F79C 8024254C 00000000 */   nop      
 /* D8F7A0 80242550 0240202D */  daddu     $a0, $s2, $zero
diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80242698_D8F8E8.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80242698_D8F8E8.s
index 2bdff50278..4e39bc260f 100644
--- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80242698_D8F8E8.s
+++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80242698_D8F8E8.s
@@ -100,9 +100,9 @@ glabel func_80242698_D8F8E8
 /* D8FA4C 802427FC 2C620064 */  sltiu     $v0, $v1, 0x64
 /* D8FA50 80242800 10400048 */  beqz      $v0, .L80242924
 /* D8FA54 80242804 00031080 */   sll      $v0, $v1, 2
-/* D8FA58 80242808 3C018024 */  lui       $at, 0x8024
+/* D8FA58 80242808 3C018024 */  lui       $at, %hi(D_80244318)
 /* D8FA5C 8024280C 00220821 */  addu      $at, $at, $v0
-/* D8FA60 80242810 8C224318 */  lw        $v0, 0x4318($at)
+/* D8FA60 80242810 8C224318 */  lw        $v0, %lo(D_80244318)($at)
 /* D8FA64 80242814 00400008 */  jr        $v0
 /* D8FA68 80242818 00000000 */   nop      
 /* D8FA6C 8024281C 0240202D */  daddu     $a0, $s2, $zero
diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8FBA0/func_80242950_D8FBA0.s b/asm/nonmatchings/world/area_pra/pra_35/D8FBA0/func_80242950_D8FBA0.s
index 4660cc589a..216a72c9c8 100644
--- a/asm/nonmatchings/world/area_pra/pra_35/D8FBA0/func_80242950_D8FBA0.s
+++ b/asm/nonmatchings/world/area_pra/pra_35/D8FBA0/func_80242950_D8FBA0.s
@@ -4,8 +4,8 @@
 glabel func_80242950_D8FBA0
 /* D8FBA0 80242950 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* D8FBA4 80242954 AFB00010 */  sw        $s0, 0x10($sp)
-/* D8FBA8 80242958 3C108024 */  lui       $s0, 0x8024
-/* D8FBAC 8024295C 26103DE0 */  addiu     $s0, $s0, 0x3de0
+/* D8FBA8 80242958 3C108024 */  lui       $s0, %hi(D_80243DE0)
+/* D8FBAC 8024295C 26103DE0 */  addiu     $s0, $s0, %lo(D_80243DE0)
 /* D8FBB0 80242960 AFBF0018 */  sw        $ra, 0x18($sp)
 /* D8FBB4 80242964 AFB10014 */  sw        $s1, 0x14($sp)
 /* D8FBB8 80242968 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_80242950_D8FBA0
 /* D8FC1C 802429CC 28620010 */  slti      $v0, $v1, 0x10
 /* D8FC20 802429D0 1440FFFA */  bnez      $v0, .L802429BC
 /* D8FC24 802429D4 24840004 */   addiu    $a0, $a0, 4
-/* D8FC28 802429D8 3C108024 */  lui       $s0, 0x8024
-/* D8FC2C 802429DC 26103DE0 */  addiu     $s0, $s0, 0x3de0
+/* D8FC28 802429D8 3C108024 */  lui       $s0, %hi(D_80243DE0)
+/* D8FC2C 802429DC 26103DE0 */  addiu     $s0, $s0, %lo(D_80243DE0)
 /* D8FC30 802429E0 0C00AB4B */  jal       heap_free
 /* D8FC34 802429E4 8E040000 */   lw       $a0, ($s0)
 /* D8FC38 802429E8 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240000_D91700.s b/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240000_D91700.s
index 0d9569b6b1..dc12381322 100644
--- a/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240000_D91700.s
+++ b/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240000_D91700.s
@@ -3,21 +3,21 @@
 
 glabel func_80240000_D91700
 /* D91700 80240000 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D91704 80240004 3C04800E */  lui       $a0, 0x800e
-/* D91708 80240008 24849230 */  addiu     $a0, $a0, -0x6dd0
-/* D9170C 8024000C 3C058024 */  lui       $a1, 0x8024
-/* D91710 80240010 24A51810 */  addiu     $a1, $a1, 0x1810
+/* D91704 80240004 3C04800E */  lui       $a0, %hi(D_800D9230)
+/* D91708 80240008 24849230 */  addiu     $a0, $a0, %lo(D_800D9230)
+/* D9170C 8024000C 3C058024 */  lui       $a1, %hi(D_80241810)
+/* D91710 80240010 24A51810 */  addiu     $a1, $a1, %lo(D_80241810)
 /* D91714 80240014 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
 /* D91718 80240018 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
 /* D9171C 8024001C 24020001 */  addiu     $v0, $zero, 1
 /* D91720 80240020 AFBF0010 */  sw        $ra, 0x10($sp)
 /* D91724 80240024 0C01953C */  jal       sprintf
 /* D91728 80240028 A0620084 */   sb       $v0, 0x84($v1)
-/* D9172C 8024002C 3C04800E */  lui       $a0, 0x800e
-/* D91730 80240030 248491E0 */  addiu     $a0, $a0, -0x6e20
-/* D91734 80240034 3C058024 */  lui       $a1, 0x8024
+/* D9172C 8024002C 3C04800E */  lui       $a0, %hi(D_800D91E0)
+/* D91730 80240030 248491E0 */  addiu     $a0, $a0, %lo(D_800D91E0)
+/* D91734 80240034 3C058024 */  lui       $a1, %hi(D_80241820)
 /* D91738 80240038 0C01953C */  jal       sprintf
-/* D9173C 8024003C 24A51820 */   addiu    $a1, $a1, 0x1820
+/* D9173C 8024003C 24A51820 */   addiu    $a1, $a1, %lo(D_80241820)
 /* D91740 80240040 8FBF0010 */  lw        $ra, 0x10($sp)
 /* D91744 80240044 0000102D */  daddu     $v0, $zero, $zero
 /* D91748 80240048 03E00008 */  jr        $ra
diff --git a/asm/nonmatchings/world/area_pra/pra_36/D91700/func_8024011C_D9181C.s b/asm/nonmatchings/world/area_pra/pra_36/D91700/func_8024011C_D9181C.s
index 62876a5b28..69c7a4677e 100644
--- a/asm/nonmatchings/world/area_pra/pra_36/D91700/func_8024011C_D9181C.s
+++ b/asm/nonmatchings/world/area_pra/pra_36/D91700/func_8024011C_D9181C.s
@@ -5,8 +5,8 @@ glabel func_8024011C_D9181C
 /* D9181C 8024011C 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* D91820 80240120 AFB00010 */  sw        $s0, 0x10($sp)
 /* D91824 80240124 0080802D */  daddu     $s0, $a0, $zero
-/* D91828 80240128 3C058024 */  lui       $a1, 0x8024
-/* D9182C 8024012C 24A50158 */  addiu     $a1, $a1, 0x158
+/* D91828 80240128 3C058024 */  lui       $a1, %hi(D_80240158)
+/* D9182C 8024012C 24A50158 */  addiu     $a1, $a1, %lo(D_80240158)
 /* D91830 80240130 AFBF0014 */  sw        $ra, 0x14($sp)
 /* D91834 80240134 0C048C56 */  jal       bind_dynamic_entity_3
 /* D91838 80240138 0000202D */   daddu    $a0, $zero, $zero
diff --git a/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240158_D91858.s b/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240158_D91858.s
index e82db74e5b..2c45a3f225 100644
--- a/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240158_D91858.s
+++ b/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240158_D91858.s
@@ -29,8 +29,8 @@ glabel func_80240158_D91858
 /* D918B8 802401B8 27A20034 */  addiu     $v0, $sp, 0x34
 /* D918BC 802401BC AFA20014 */  sw        $v0, 0x14($sp)
 /* D918C0 802401C0 C6000030 */  lwc1      $f0, 0x30($s0)
-/* D918C4 802401C4 3C04800A */  lui       $a0, 0x800a
-/* D918C8 802401C8 8484A634 */  lh        $a0, -0x59cc($a0)
+/* D918C4 802401C4 3C04800A */  lui       $a0, %hi(D_8009A634)
+/* D918C8 802401C8 8484A634 */  lh        $a0, %lo(D_8009A634)($a0)
 /* D918CC 802401CC 46000007 */  neg.s     $f0, $f0
 /* D918D0 802401D0 44070000 */  mfc1      $a3, $f0
 /* D918D4 802401D4 27A20038 */  addiu     $v0, $sp, 0x38
@@ -67,8 +67,8 @@ glabel func_80240158_D91858
 /* D9194C 8024024C 54400022 */  bnel      $v0, $zero, .L802402D8
 /* D91950 80240250 24110011 */   addiu    $s1, $zero, 0x11
 /* D91954 80240254 9203000E */  lbu       $v1, 0xe($s0)
-/* D91958 80240258 3C02802E */  lui       $v0, 0x802e
-/* D9195C 8024025C 90429D70 */  lbu       $v0, -0x6290($v0)
+/* D91958 80240258 3C02802E */  lui       $v0, %hi(D_802D9D70)
+/* D9195C 8024025C 90429D70 */  lbu       $v0, %lo(D_802D9D70)($v0)
 /* D91960 80240260 10620018 */  beq       $v1, $v0, .L802402C4
 /* D91964 80240264 2C6200FE */   sltiu    $v0, $v1, 0xfe
 /* D91968 80240268 1040000B */  beqz      $v0, .L80240298
@@ -98,20 +98,20 @@ glabel func_80240158_D91858
 /* D919C0 802402C0 00000000 */   nop      
 .L802402C4:
 /* D919C4 802402C4 9202000E */  lbu       $v0, 0xe($s0)
-/* D919C8 802402C8 3C01802E */  lui       $at, 0x802e
-/* D919CC 802402CC A0229D70 */  sb        $v0, -0x6290($at)
+/* D919C8 802402C8 3C01802E */  lui       $at, %hi(D_802D9D70)
+/* D919CC 802402CC A0229D70 */  sb        $v0, %lo(D_802D9D70)($at)
 /* D919D0 802402D0 080900B9 */  j         .L802402E4
 /* D919D4 802402D4 0240202D */   daddu    $a0, $s2, $zero
 .L802402D8:
-/* D919D8 802402D8 3C01802E */  lui       $at, 0x802e
-/* D919DC 802402DC A0209D70 */  sb        $zero, -0x6290($at)
+/* D919D8 802402D8 3C01802E */  lui       $at, %hi(D_802D9D70)
+/* D919DC 802402DC A0209D70 */  sb        $zero, %lo(D_802D9D70)($at)
 /* D919E0 802402E0 0240202D */  daddu     $a0, $s2, $zero
 .L802402E4:
 /* D919E4 802402E4 AC910000 */  sw        $s1, ($a0)
 /* D919E8 802402E8 AC900008 */  sw        $s0, 8($a0)
 /* D919EC 802402EC 8FA20038 */  lw        $v0, 0x38($sp)
-/* D919F0 802402F0 3C038024 */  lui       $v1, 0x8024
-/* D919F4 802402F4 24630320 */  addiu     $v1, $v1, 0x320
+/* D919F0 802402F0 3C038024 */  lui       $v1, %hi(D_80240320)
+/* D919F4 802402F4 24630320 */  addiu     $v1, $v1, %lo(D_80240320)
 /* D919F8 802402F8 AC83000C */  sw        $v1, 0xc($a0)
 /* D919FC 802402FC 00021023 */  negu      $v0, $v0
 /* D91A00 80240300 0C047644 */  jal       queue_render_task
diff --git a/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240320_D91A20.s b/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240320_D91A20.s
index e9ccb8280d..aafef2f47b 100644
--- a/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240320_D91A20.s
+++ b/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240320_D91A20.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80240320_D91A20
-/* D91A20 80240320 3C03800A */  lui       $v1, 0x800a
-/* D91A24 80240324 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D91A20 80240320 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D91A24 80240324 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D91A28 80240328 3C07BF80 */  lui       $a3, 0xbf80
 /* D91A2C 8024032C 27BDFEC0 */  addiu     $sp, $sp, -0x140
 /* D91A30 80240330 F7B40128 */  sdc1      $f20, 0x128($sp)
@@ -22,9 +22,9 @@ glabel func_80240320_D91A20
 /* D91A64 80240364 000218C0 */  sll       $v1, $v0, 3
 /* D91A68 80240368 00431021 */  addu      $v0, $v0, $v1
 /* D91A6C 8024036C 000210C0 */  sll       $v0, $v0, 3
-/* D91A70 80240370 3C01800B */  lui       $at, 0x800b
+/* D91A70 80240370 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* D91A74 80240374 00220821 */  addu      $at, $at, $v0
-/* D91A78 80240378 C4361DEC */  lwc1      $f22, 0x1dec($at)
+/* D91A78 80240378 C4361DEC */  lwc1      $f22, %lo(D_800B1DEC)($at)
 /* D91A7C 8024037C 4406A000 */  mfc1      $a2, $f20
 /* D91A80 80240380 4600B587 */  neg.s     $f22, $f22
 /* D91A84 80240384 4405B000 */  mfc1      $a1, $f22
diff --git a/asm/nonmatchings/world/area_pra/pra_36/D91700/func_802404CC_D91BCC.s b/asm/nonmatchings/world/area_pra/pra_36/D91700/func_802404CC_D91BCC.s
index 77c4128b8b..3c323aeb73 100644
--- a/asm/nonmatchings/world/area_pra/pra_36/D91700/func_802404CC_D91BCC.s
+++ b/asm/nonmatchings/world/area_pra/pra_36/D91700/func_802404CC_D91BCC.s
@@ -11,8 +11,8 @@ glabel func_802404CC_D91BCC
 /* D91BE4 802404E4 28420002 */   slti     $v0, $v0, 2
 /* D91BE8 802404E8 1040000C */  beqz      $v0, .L8024051C
 /* D91BEC 802404EC 00000000 */   nop      
-/* D91BF0 802404F0 3C058024 */  lui       $a1, 0x8024
-/* D91BF4 802404F4 24A50530 */  addiu     $a1, $a1, 0x530
+/* D91BF0 802404F0 3C058024 */  lui       $a1, %hi(D_80240530)
+/* D91BF4 802404F4 24A50530 */  addiu     $a1, $a1, %lo(D_80240530)
 /* D91BF8 802404F8 0C048C56 */  jal       bind_dynamic_entity_3
 /* D91BFC 802404FC 0000202D */   daddu    $a0, $zero, $zero
 /* D91C00 80240500 8E03013C */  lw        $v1, 0x13c($s0)
diff --git a/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240530_D91C30.s b/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240530_D91C30.s
index fcaf000306..63b2f3a542 100644
--- a/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240530_D91C30.s
+++ b/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240530_D91C30.s
@@ -28,8 +28,8 @@ glabel func_80240530_D91C30
 /* D91C8C 8024058C 27A20038 */  addiu     $v0, $sp, 0x38
 /* D91C90 80240590 AFA20018 */  sw        $v0, 0x18($sp)
 /* D91C94 80240594 C600002C */  lwc1      $f0, 0x2c($s0)
-/* D91C98 80240598 3C04800A */  lui       $a0, 0x800a
-/* D91C9C 8024059C 8484A634 */  lh        $a0, -0x59cc($a0)
+/* D91C98 80240598 3C04800A */  lui       $a0, %hi(D_8009A634)
+/* D91C9C 8024059C 8484A634 */  lh        $a0, %lo(D_8009A634)($a0)
 /* D91CA0 802405A0 46000007 */  neg.s     $f0, $f0
 /* D91CA4 802405A4 44060000 */  mfc1      $a2, $f0
 /* D91CA8 802405A8 0C00B94E */  jal       get_screen_coords
@@ -44,8 +44,8 @@ glabel func_80240530_D91C30
 /* D91CCC 802405CC 54400022 */  bnel      $v0, $zero, .L80240658
 /* D91CD0 802405D0 24120011 */   addiu    $s2, $zero, 0x11
 /* D91CD4 802405D4 9203000E */  lbu       $v1, 0xe($s0)
-/* D91CD8 802405D8 3C02802E */  lui       $v0, 0x802e
-/* D91CDC 802405DC 90429D71 */  lbu       $v0, -0x628f($v0)
+/* D91CD8 802405D8 3C02802E */  lui       $v0, %hi(D_802D9D71)
+/* D91CDC 802405DC 90429D71 */  lbu       $v0, %lo(D_802D9D71)($v0)
 /* D91CE0 802405E0 10620018 */  beq       $v1, $v0, .L80240644
 /* D91CE4 802405E4 2C6200FE */   sltiu    $v0, $v1, 0xfe
 /* D91CE8 802405E8 1040000B */  beqz      $v0, .L80240618
@@ -75,17 +75,17 @@ glabel func_80240530_D91C30
 /* D91D40 80240640 00000000 */   nop      
 .L80240644:
 /* D91D44 80240644 9202000E */  lbu       $v0, 0xe($s0)
-/* D91D48 80240648 3C01802E */  lui       $at, 0x802e
-/* D91D4C 8024064C A0229D71 */  sb        $v0, -0x628f($at)
+/* D91D48 80240648 3C01802E */  lui       $at, %hi(D_802D9D71)
+/* D91D4C 8024064C A0229D71 */  sb        $v0, %lo(D_802D9D71)($at)
 /* D91D50 80240650 08090198 */  j         .L80240660
 /* D91D54 80240654 00000000 */   nop      
 .L80240658:
-/* D91D58 80240658 3C01802E */  lui       $at, 0x802e
-/* D91D5C 8024065C A0209D71 */  sb        $zero, -0x628f($at)
+/* D91D58 80240658 3C01802E */  lui       $at, %hi(D_802D9D71)
+/* D91D5C 8024065C A0209D71 */  sb        $zero, %lo(D_802D9D71)($at)
 .L80240660:
 /* D91D60 80240660 8FA20038 */  lw        $v0, 0x38($sp)
-/* D91D64 80240664 3C048024 */  lui       $a0, 0x8024
-/* D91D68 80240668 248408A0 */  addiu     $a0, $a0, 0x8a0
+/* D91D64 80240664 3C048024 */  lui       $a0, %hi(D_802408A0)
+/* D91D68 80240668 248408A0 */  addiu     $a0, $a0, %lo(D_802408A0)
 /* D91D6C 8024066C AE320000 */  sw        $s2, ($s1)
 /* D91D70 80240670 AE300008 */  sw        $s0, 8($s1)
 /* D91D74 80240674 00021023 */  negu      $v0, $v0
@@ -95,8 +95,8 @@ glabel func_80240530_D91C30
 /* D91D84 80240684 00431024 */  and       $v0, $v0, $v1
 /* D91D88 80240688 54400004 */  bnel      $v0, $zero, .L8024069C
 /* D91D8C 8024068C AE24000C */   sw       $a0, 0xc($s1)
-/* D91D90 80240690 3C048024 */  lui       $a0, 0x8024
-/* D91D94 80240694 248406BC */  addiu     $a0, $a0, 0x6bc
+/* D91D90 80240690 3C048024 */  lui       $a0, %hi(D_802406BC)
+/* D91D94 80240694 248406BC */  addiu     $a0, $a0, %lo(D_802406BC)
 /* D91D98 80240698 AE24000C */  sw        $a0, 0xc($s1)
 .L8024069C:
 /* D91D9C 8024069C 0C047644 */  jal       queue_render_task
diff --git a/asm/nonmatchings/world/area_pra/pra_36/D91700/func_802406BC_D91DBC.s b/asm/nonmatchings/world/area_pra/pra_36/D91700/func_802406BC_D91DBC.s
index 24de2adffc..19bd7ee747 100644
--- a/asm/nonmatchings/world/area_pra/pra_36/D91700/func_802406BC_D91DBC.s
+++ b/asm/nonmatchings/world/area_pra/pra_36/D91700/func_802406BC_D91DBC.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_802406BC_D91DBC
-/* D91DBC 802406BC 3C03800A */  lui       $v1, 0x800a
-/* D91DC0 802406C0 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D91DBC 802406BC 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D91DC0 802406C0 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D91DC4 802406C4 3C07BF80 */  lui       $a3, 0xbf80
 /* D91DC8 802406C8 27BDFEC0 */  addiu     $sp, $sp, -0x140
 /* D91DCC 802406CC F7B40128 */  sdc1      $f20, 0x128($sp)
@@ -22,9 +22,9 @@ glabel func_802406BC_D91DBC
 /* D91E00 80240700 000218C0 */  sll       $v1, $v0, 3
 /* D91E04 80240704 00431021 */  addu      $v0, $v0, $v1
 /* D91E08 80240708 000210C0 */  sll       $v0, $v0, 3
-/* D91E0C 8024070C 3C01800B */  lui       $at, 0x800b
+/* D91E0C 8024070C 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* D91E10 80240710 00220821 */  addu      $at, $at, $v0
-/* D91E14 80240714 C4361DEC */  lwc1      $f22, 0x1dec($at)
+/* D91E14 80240714 C4361DEC */  lwc1      $f22, %lo(D_800B1DEC)($at)
 /* D91E18 80240718 4406A000 */  mfc1      $a2, $f20
 /* D91E1C 8024071C 4600B587 */  neg.s     $f22, $f22
 /* D91E20 80240720 4405B000 */  mfc1      $a1, $f22
diff --git a/asm/nonmatchings/world/area_pra/pra_36/D91700/func_802408A0_D91FA0.s b/asm/nonmatchings/world/area_pra/pra_36/D91700/func_802408A0_D91FA0.s
index 475a4d3f79..0e71ef4ee6 100644
--- a/asm/nonmatchings/world/area_pra/pra_36/D91700/func_802408A0_D91FA0.s
+++ b/asm/nonmatchings/world/area_pra/pra_36/D91700/func_802408A0_D91FA0.s
@@ -27,8 +27,8 @@ glabel func_802408A0_D91FA0
 /* D91FF8 802408F8 F7B80160 */  sdc1      $f24, 0x160($sp)
 /* D91FFC 802408FC F7B40150 */  sdc1      $f20, 0x150($sp)
 .L80240900:
-/* D92000 80240900 3C03800A */  lui       $v1, 0x800a
-/* D92004 80240904 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D92000 80240900 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D92004 80240904 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D92008 80240908 00031080 */  sll       $v0, $v1, 2
 /* D9200C 8024090C 00431021 */  addu      $v0, $v0, $v1
 /* D92010 80240910 00021080 */  sll       $v0, $v0, 2
diff --git a/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240D6C_D9246C.s b/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240D6C_D9246C.s
index 0bbdcff77d..ce55025da7 100644
--- a/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240D6C_D9246C.s
+++ b/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240D6C_D9246C.s
@@ -25,13 +25,13 @@ glabel func_80240D6C_D9246C
 /* D924B8 80240DB8 08090384 */  j         .L80240E10
 /* D924BC 80240DBC 00000000 */   nop      
 .L80240DC0:
-/* D924C0 80240DC0 3C048024 */  lui       $a0, 0x8024
-/* D924C4 80240DC4 24840EB4 */  addiu     $a0, $a0, 0xeb4
+/* D924C0 80240DC0 3C048024 */  lui       $a0, %hi(D_80240EB4)
+/* D924C4 80240DC4 24840EB4 */  addiu     $a0, $a0, %lo(D_80240EB4)
 /* D924C8 80240DC8 08090380 */  j         .L80240E00
 /* D924CC 80240DCC 00000000 */   nop      
 .L80240DD0:
-/* D924D0 80240DD0 3C048024 */  lui       $a0, 0x8024
-/* D924D4 80240DD4 24840F1C */  addiu     $a0, $a0, 0xf1c
+/* D924D0 80240DD0 3C048024 */  lui       $a0, %hi(D_80240F1C)
+/* D924D4 80240DD4 24840F1C */  addiu     $a0, $a0, %lo(D_80240F1C)
 /* D924D8 80240DD8 08090380 */  j         .L80240E00
 /* D924DC 80240DDC 00000000 */   nop      
 .L80240DE0:
@@ -42,8 +42,8 @@ glabel func_80240D6C_D9246C
 /* D924F0 80240DF0 10400007 */  beqz      $v0, .L80240E10
 /* D924F4 80240DF4 00000000 */   nop      
 .L80240DF8:
-/* D924F8 80240DF8 3C048024 */  lui       $a0, 0x8024
-/* D924FC 80240DFC 24840EE8 */  addiu     $a0, $a0, 0xee8
+/* D924F8 80240DF8 3C048024 */  lui       $a0, %hi(D_80240EE8)
+/* D924FC 80240DFC 24840EE8 */  addiu     $a0, $a0, %lo(D_80240EE8)
 .L80240E00:
 /* D92500 80240E00 0C048C56 */  jal       bind_dynamic_entity_3
 /* D92504 80240E04 0000282D */   daddu    $a1, $zero, $zero
diff --git a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240000_D92F40.s b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240000_D92F40.s
index 55b680a461..ff536a8597 100644
--- a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240000_D92F40.s
+++ b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240000_D92F40.s
@@ -3,21 +3,21 @@
 
 glabel func_80240000_D92F40
 /* D92F40 80240000 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D92F44 80240004 3C04800E */  lui       $a0, 0x800e
-/* D92F48 80240008 24849230 */  addiu     $a0, $a0, -0x6dd0
-/* D92F4C 8024000C 3C058024 */  lui       $a1, 0x8024
-/* D92F50 80240010 24A524E0 */  addiu     $a1, $a1, 0x24e0
+/* D92F44 80240004 3C04800E */  lui       $a0, %hi(D_800D9230)
+/* D92F48 80240008 24849230 */  addiu     $a0, $a0, %lo(D_800D9230)
+/* D92F4C 8024000C 3C058024 */  lui       $a1, %hi(D_802424E0)
+/* D92F50 80240010 24A524E0 */  addiu     $a1, $a1, %lo(D_802424E0)
 /* D92F54 80240014 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
 /* D92F58 80240018 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
 /* D92F5C 8024001C 24020001 */  addiu     $v0, $zero, 1
 /* D92F60 80240020 AFBF0010 */  sw        $ra, 0x10($sp)
 /* D92F64 80240024 0C01953C */  jal       sprintf
 /* D92F68 80240028 A0620084 */   sb       $v0, 0x84($v1)
-/* D92F6C 8024002C 3C04800E */  lui       $a0, 0x800e
-/* D92F70 80240030 248491E0 */  addiu     $a0, $a0, -0x6e20
-/* D92F74 80240034 3C058024 */  lui       $a1, 0x8024
+/* D92F6C 8024002C 3C04800E */  lui       $a0, %hi(D_800D91E0)
+/* D92F70 80240030 248491E0 */  addiu     $a0, $a0, %lo(D_800D91E0)
+/* D92F74 80240034 3C058024 */  lui       $a1, %hi(D_802424F0)
 /* D92F78 80240038 0C01953C */  jal       sprintf
-/* D92F7C 8024003C 24A524F0 */   addiu    $a1, $a1, 0x24f0
+/* D92F7C 8024003C 24A524F0 */   addiu    $a1, $a1, %lo(D_802424F0)
 /* D92F80 80240040 8FBF0010 */  lw        $ra, 0x10($sp)
 /* D92F84 80240044 0000102D */  daddu     $v0, $zero, $zero
 /* D92F88 80240048 03E00008 */  jr        $ra
diff --git a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024011C_D9305C.s b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024011C_D9305C.s
index c12624a85e..eb5da8089a 100644
--- a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024011C_D9305C.s
+++ b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024011C_D9305C.s
@@ -5,8 +5,8 @@ glabel func_8024011C_D9305C
 /* D9305C 8024011C 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* D93060 80240120 AFB00010 */  sw        $s0, 0x10($sp)
 /* D93064 80240124 0080802D */  daddu     $s0, $a0, $zero
-/* D93068 80240128 3C058024 */  lui       $a1, 0x8024
-/* D9306C 8024012C 24A50158 */  addiu     $a1, $a1, 0x158
+/* D93068 80240128 3C058024 */  lui       $a1, %hi(D_80240158)
+/* D9306C 8024012C 24A50158 */  addiu     $a1, $a1, %lo(D_80240158)
 /* D93070 80240130 AFBF0014 */  sw        $ra, 0x14($sp)
 /* D93074 80240134 0C048C56 */  jal       bind_dynamic_entity_3
 /* D93078 80240138 0000202D */   daddu    $a0, $zero, $zero
diff --git a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240158_D93098.s b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240158_D93098.s
index 9b6cf66e65..514ca3c288 100644
--- a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240158_D93098.s
+++ b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240158_D93098.s
@@ -29,8 +29,8 @@ glabel func_80240158_D93098
 /* D930F8 802401B8 27A20034 */  addiu     $v0, $sp, 0x34
 /* D930FC 802401BC AFA20014 */  sw        $v0, 0x14($sp)
 /* D93100 802401C0 C6000030 */  lwc1      $f0, 0x30($s0)
-/* D93104 802401C4 3C04800A */  lui       $a0, 0x800a
-/* D93108 802401C8 8484A634 */  lh        $a0, -0x59cc($a0)
+/* D93104 802401C4 3C04800A */  lui       $a0, %hi(D_8009A634)
+/* D93108 802401C8 8484A634 */  lh        $a0, %lo(D_8009A634)($a0)
 /* D9310C 802401CC 46000007 */  neg.s     $f0, $f0
 /* D93110 802401D0 44070000 */  mfc1      $a3, $f0
 /* D93114 802401D4 27A20038 */  addiu     $v0, $sp, 0x38
@@ -67,8 +67,8 @@ glabel func_80240158_D93098
 /* D9318C 8024024C 54400022 */  bnel      $v0, $zero, .L802402D8
 /* D93190 80240250 24110011 */   addiu    $s1, $zero, 0x11
 /* D93194 80240254 9203000E */  lbu       $v1, 0xe($s0)
-/* D93198 80240258 3C02802E */  lui       $v0, 0x802e
-/* D9319C 8024025C 90429D70 */  lbu       $v0, -0x6290($v0)
+/* D93198 80240258 3C02802E */  lui       $v0, %hi(D_802D9D70)
+/* D9319C 8024025C 90429D70 */  lbu       $v0, %lo(D_802D9D70)($v0)
 /* D931A0 80240260 10620018 */  beq       $v1, $v0, .L802402C4
 /* D931A4 80240264 2C6200FE */   sltiu    $v0, $v1, 0xfe
 /* D931A8 80240268 1040000B */  beqz      $v0, .L80240298
@@ -98,20 +98,20 @@ glabel func_80240158_D93098
 /* D93200 802402C0 00000000 */   nop      
 .L802402C4:
 /* D93204 802402C4 9202000E */  lbu       $v0, 0xe($s0)
-/* D93208 802402C8 3C01802E */  lui       $at, 0x802e
-/* D9320C 802402CC A0229D70 */  sb        $v0, -0x6290($at)
+/* D93208 802402C8 3C01802E */  lui       $at, %hi(D_802D9D70)
+/* D9320C 802402CC A0229D70 */  sb        $v0, %lo(D_802D9D70)($at)
 /* D93210 802402D0 080900B9 */  j         .L802402E4
 /* D93214 802402D4 0240202D */   daddu    $a0, $s2, $zero
 .L802402D8:
-/* D93218 802402D8 3C01802E */  lui       $at, 0x802e
-/* D9321C 802402DC A0209D70 */  sb        $zero, -0x6290($at)
+/* D93218 802402D8 3C01802E */  lui       $at, %hi(D_802D9D70)
+/* D9321C 802402DC A0209D70 */  sb        $zero, %lo(D_802D9D70)($at)
 /* D93220 802402E0 0240202D */  daddu     $a0, $s2, $zero
 .L802402E4:
 /* D93224 802402E4 AC910000 */  sw        $s1, ($a0)
 /* D93228 802402E8 AC900008 */  sw        $s0, 8($a0)
 /* D9322C 802402EC 8FA20038 */  lw        $v0, 0x38($sp)
-/* D93230 802402F0 3C038024 */  lui       $v1, 0x8024
-/* D93234 802402F4 24630320 */  addiu     $v1, $v1, 0x320
+/* D93230 802402F0 3C038024 */  lui       $v1, %hi(D_80240320)
+/* D93234 802402F4 24630320 */  addiu     $v1, $v1, %lo(D_80240320)
 /* D93238 802402F8 AC83000C */  sw        $v1, 0xc($a0)
 /* D9323C 802402FC 00021023 */  negu      $v0, $v0
 /* D93240 80240300 0C047644 */  jal       queue_render_task
diff --git a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240320_D93260.s b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240320_D93260.s
index a49931f928..40d352f07f 100644
--- a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240320_D93260.s
+++ b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240320_D93260.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80240320_D93260
-/* D93260 80240320 3C03800A */  lui       $v1, 0x800a
-/* D93264 80240324 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D93260 80240320 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D93264 80240324 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D93268 80240328 3C07BF80 */  lui       $a3, 0xbf80
 /* D9326C 8024032C 27BDFEC0 */  addiu     $sp, $sp, -0x140
 /* D93270 80240330 F7B40128 */  sdc1      $f20, 0x128($sp)
@@ -22,9 +22,9 @@ glabel func_80240320_D93260
 /* D932A4 80240364 000218C0 */  sll       $v1, $v0, 3
 /* D932A8 80240368 00431021 */  addu      $v0, $v0, $v1
 /* D932AC 8024036C 000210C0 */  sll       $v0, $v0, 3
-/* D932B0 80240370 3C01800B */  lui       $at, 0x800b
+/* D932B0 80240370 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* D932B4 80240374 00220821 */  addu      $at, $at, $v0
-/* D932B8 80240378 C4361DEC */  lwc1      $f22, 0x1dec($at)
+/* D932B8 80240378 C4361DEC */  lwc1      $f22, %lo(D_800B1DEC)($at)
 /* D932BC 8024037C 4406A000 */  mfc1      $a2, $f20
 /* D932C0 80240380 4600B587 */  neg.s     $f22, $f22
 /* D932C4 80240384 4405B000 */  mfc1      $a1, $f22
diff --git a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_802404CC_D9340C.s b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_802404CC_D9340C.s
index 7e1df09ed3..ffaa151c34 100644
--- a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_802404CC_D9340C.s
+++ b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_802404CC_D9340C.s
@@ -11,8 +11,8 @@ glabel func_802404CC_D9340C
 /* D93424 802404E4 28420002 */   slti     $v0, $v0, 2
 /* D93428 802404E8 1040000C */  beqz      $v0, .L8024051C
 /* D9342C 802404EC 00000000 */   nop      
-/* D93430 802404F0 3C058024 */  lui       $a1, 0x8024
-/* D93434 802404F4 24A50530 */  addiu     $a1, $a1, 0x530
+/* D93430 802404F0 3C058024 */  lui       $a1, %hi(D_80240530)
+/* D93434 802404F4 24A50530 */  addiu     $a1, $a1, %lo(D_80240530)
 /* D93438 802404F8 0C048C56 */  jal       bind_dynamic_entity_3
 /* D9343C 802404FC 0000202D */   daddu    $a0, $zero, $zero
 /* D93440 80240500 8E03013C */  lw        $v1, 0x13c($s0)
diff --git a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240530_D93470.s b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240530_D93470.s
index cfd19f893e..da69982655 100644
--- a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240530_D93470.s
+++ b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240530_D93470.s
@@ -28,8 +28,8 @@ glabel func_80240530_D93470
 /* D934CC 8024058C 27A20038 */  addiu     $v0, $sp, 0x38
 /* D934D0 80240590 AFA20018 */  sw        $v0, 0x18($sp)
 /* D934D4 80240594 C600002C */  lwc1      $f0, 0x2c($s0)
-/* D934D8 80240598 3C04800A */  lui       $a0, 0x800a
-/* D934DC 8024059C 8484A634 */  lh        $a0, -0x59cc($a0)
+/* D934D8 80240598 3C04800A */  lui       $a0, %hi(D_8009A634)
+/* D934DC 8024059C 8484A634 */  lh        $a0, %lo(D_8009A634)($a0)
 /* D934E0 802405A0 46000007 */  neg.s     $f0, $f0
 /* D934E4 802405A4 44060000 */  mfc1      $a2, $f0
 /* D934E8 802405A8 0C00B94E */  jal       get_screen_coords
@@ -44,8 +44,8 @@ glabel func_80240530_D93470
 /* D9350C 802405CC 54400022 */  bnel      $v0, $zero, .L80240658
 /* D93510 802405D0 24120011 */   addiu    $s2, $zero, 0x11
 /* D93514 802405D4 9203000E */  lbu       $v1, 0xe($s0)
-/* D93518 802405D8 3C02802E */  lui       $v0, 0x802e
-/* D9351C 802405DC 90429D71 */  lbu       $v0, -0x628f($v0)
+/* D93518 802405D8 3C02802E */  lui       $v0, %hi(D_802D9D71)
+/* D9351C 802405DC 90429D71 */  lbu       $v0, %lo(D_802D9D71)($v0)
 /* D93520 802405E0 10620018 */  beq       $v1, $v0, .L80240644
 /* D93524 802405E4 2C6200FE */   sltiu    $v0, $v1, 0xfe
 /* D93528 802405E8 1040000B */  beqz      $v0, .L80240618
@@ -75,17 +75,17 @@ glabel func_80240530_D93470
 /* D93580 80240640 00000000 */   nop      
 .L80240644:
 /* D93584 80240644 9202000E */  lbu       $v0, 0xe($s0)
-/* D93588 80240648 3C01802E */  lui       $at, 0x802e
-/* D9358C 8024064C A0229D71 */  sb        $v0, -0x628f($at)
+/* D93588 80240648 3C01802E */  lui       $at, %hi(D_802D9D71)
+/* D9358C 8024064C A0229D71 */  sb        $v0, %lo(D_802D9D71)($at)
 /* D93590 80240650 08090198 */  j         .L80240660
 /* D93594 80240654 00000000 */   nop      
 .L80240658:
-/* D93598 80240658 3C01802E */  lui       $at, 0x802e
-/* D9359C 8024065C A0209D71 */  sb        $zero, -0x628f($at)
+/* D93598 80240658 3C01802E */  lui       $at, %hi(D_802D9D71)
+/* D9359C 8024065C A0209D71 */  sb        $zero, %lo(D_802D9D71)($at)
 .L80240660:
 /* D935A0 80240660 8FA20038 */  lw        $v0, 0x38($sp)
-/* D935A4 80240664 3C048024 */  lui       $a0, 0x8024
-/* D935A8 80240668 248408A0 */  addiu     $a0, $a0, 0x8a0
+/* D935A4 80240664 3C048024 */  lui       $a0, %hi(D_802408A0)
+/* D935A8 80240668 248408A0 */  addiu     $a0, $a0, %lo(D_802408A0)
 /* D935AC 8024066C AE320000 */  sw        $s2, ($s1)
 /* D935B0 80240670 AE300008 */  sw        $s0, 8($s1)
 /* D935B4 80240674 00021023 */  negu      $v0, $v0
@@ -95,8 +95,8 @@ glabel func_80240530_D93470
 /* D935C4 80240684 00431024 */  and       $v0, $v0, $v1
 /* D935C8 80240688 54400004 */  bnel      $v0, $zero, .L8024069C
 /* D935CC 8024068C AE24000C */   sw       $a0, 0xc($s1)
-/* D935D0 80240690 3C048024 */  lui       $a0, 0x8024
-/* D935D4 80240694 248406BC */  addiu     $a0, $a0, 0x6bc
+/* D935D0 80240690 3C048024 */  lui       $a0, %hi(D_802406BC)
+/* D935D4 80240694 248406BC */  addiu     $a0, $a0, %lo(D_802406BC)
 /* D935D8 80240698 AE24000C */  sw        $a0, 0xc($s1)
 .L8024069C:
 /* D935DC 8024069C 0C047644 */  jal       queue_render_task
diff --git a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_802406BC_D935FC.s b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_802406BC_D935FC.s
index 9ecfb102a5..bd3c98ce66 100644
--- a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_802406BC_D935FC.s
+++ b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_802406BC_D935FC.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_802406BC_D935FC
-/* D935FC 802406BC 3C03800A */  lui       $v1, 0x800a
-/* D93600 802406C0 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D935FC 802406BC 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D93600 802406C0 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D93604 802406C4 3C07BF80 */  lui       $a3, 0xbf80
 /* D93608 802406C8 27BDFEC0 */  addiu     $sp, $sp, -0x140
 /* D9360C 802406CC F7B40128 */  sdc1      $f20, 0x128($sp)
@@ -22,9 +22,9 @@ glabel func_802406BC_D935FC
 /* D93640 80240700 000218C0 */  sll       $v1, $v0, 3
 /* D93644 80240704 00431021 */  addu      $v0, $v0, $v1
 /* D93648 80240708 000210C0 */  sll       $v0, $v0, 3
-/* D9364C 8024070C 3C01800B */  lui       $at, 0x800b
+/* D9364C 8024070C 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* D93650 80240710 00220821 */  addu      $at, $at, $v0
-/* D93654 80240714 C4361DEC */  lwc1      $f22, 0x1dec($at)
+/* D93654 80240714 C4361DEC */  lwc1      $f22, %lo(D_800B1DEC)($at)
 /* D93658 80240718 4406A000 */  mfc1      $a2, $f20
 /* D9365C 8024071C 4600B587 */  neg.s     $f22, $f22
 /* D93660 80240720 4405B000 */  mfc1      $a1, $f22
diff --git a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_802408A0_D937E0.s b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_802408A0_D937E0.s
index d80ddf7775..76e4a31ce1 100644
--- a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_802408A0_D937E0.s
+++ b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_802408A0_D937E0.s
@@ -27,8 +27,8 @@ glabel func_802408A0_D937E0
 /* D93838 802408F8 F7B80160 */  sdc1      $f24, 0x160($sp)
 /* D9383C 802408FC F7B40150 */  sdc1      $f20, 0x150($sp)
 .L80240900:
-/* D93840 80240900 3C03800A */  lui       $v1, 0x800a
-/* D93844 80240904 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D93840 80240900 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D93844 80240904 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D93848 80240908 00031080 */  sll       $v0, $v1, 2
 /* D9384C 8024090C 00431021 */  addu      $v0, $v0, $v1
 /* D93850 80240910 00021080 */  sll       $v0, $v0, 2
diff --git a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240D6C_D93CAC.s b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240D6C_D93CAC.s
index 1658f17140..b9986f92ca 100644
--- a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240D6C_D93CAC.s
+++ b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240D6C_D93CAC.s
@@ -25,13 +25,13 @@ glabel func_80240D6C_D93CAC
 /* D93CF8 80240DB8 08090384 */  j         .L80240E10
 /* D93CFC 80240DBC 00000000 */   nop      
 .L80240DC0:
-/* D93D00 80240DC0 3C048024 */  lui       $a0, 0x8024
-/* D93D04 80240DC4 24840EB4 */  addiu     $a0, $a0, 0xeb4
+/* D93D00 80240DC0 3C048024 */  lui       $a0, %hi(D_80240EB4)
+/* D93D04 80240DC4 24840EB4 */  addiu     $a0, $a0, %lo(D_80240EB4)
 /* D93D08 80240DC8 08090380 */  j         .L80240E00
 /* D93D0C 80240DCC 00000000 */   nop      
 .L80240DD0:
-/* D93D10 80240DD0 3C048024 */  lui       $a0, 0x8024
-/* D93D14 80240DD4 24840F1C */  addiu     $a0, $a0, 0xf1c
+/* D93D10 80240DD0 3C048024 */  lui       $a0, %hi(D_80240F1C)
+/* D93D14 80240DD4 24840F1C */  addiu     $a0, $a0, %lo(D_80240F1C)
 /* D93D18 80240DD8 08090380 */  j         .L80240E00
 /* D93D1C 80240DDC 00000000 */   nop      
 .L80240DE0:
@@ -42,8 +42,8 @@ glabel func_80240D6C_D93CAC
 /* D93D30 80240DF0 10400007 */  beqz      $v0, .L80240E10
 /* D93D34 80240DF4 00000000 */   nop      
 .L80240DF8:
-/* D93D38 80240DF8 3C048024 */  lui       $a0, 0x8024
-/* D93D3C 80240DFC 24840EE8 */  addiu     $a0, $a0, 0xee8
+/* D93D38 80240DF8 3C048024 */  lui       $a0, %hi(D_80240EE8)
+/* D93D3C 80240DFC 24840EE8 */  addiu     $a0, $a0, %lo(D_80240EE8)
 .L80240E00:
 /* D93D40 80240E00 0C048C56 */  jal       bind_dynamic_entity_3
 /* D93D44 80240E04 0000282D */   daddu    $a1, $zero, $zero
diff --git a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80241158_D94098.s b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80241158_D94098.s
index b48d5f11fc..228d6b5ab4 100644
--- a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80241158_D94098.s
+++ b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80241158_D94098.s
@@ -18,8 +18,8 @@ glabel func_80241158_D94098
 /* D940CC 8024118C 0040802D */  daddu     $s0, $v0, $zero
 /* D940D0 80241190 3C05800B */  lui       $a1, %hi(gCameras)
 /* D940D4 80241194 24A51D80 */  addiu     $a1, $a1, %lo(gCameras)
-/* D940D8 80241198 3C03800A */  lui       $v1, 0x800a
-/* D940DC 8024119C 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D940D8 80241198 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D940DC 8024119C 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D940E0 802411A0 00912021 */  addu      $a0, $a0, $s1
 /* D940E4 802411A4 00031080 */  sll       $v0, $v1, 2
 /* D940E8 802411A8 00431021 */  addu      $v0, $v0, $v1
@@ -54,8 +54,8 @@ glabel func_80241158_D94098
 /* D94158 80241218 00000000 */   nop      
 /* D9415C 8024121C 0C00A6C9 */  jal       clamp_angle
 /* D94160 80241220 46000306 */   mov.s    $f12, $f0
-/* D94164 80241224 3C018024 */  lui       $at, 0x8024
-/* D94168 80241228 D4222510 */  ldc1      $f2, 0x2510($at)
+/* D94164 80241224 3C018024 */  lui       $at, %hi(D_80242510)
+/* D94168 80241228 D4222510 */  ldc1      $f2, %lo(D_80242510)($at)
 /* D9416C 8024122C 46000021 */  cvt.d.s   $f0, $f0
 /* D94170 80241230 4622003C */  c.lt.d    $f0, $f2
 /* D94174 80241234 00000000 */  nop       
@@ -97,8 +97,8 @@ glabel func_80241158_D94098
 /* D941FC 802412BC 45030001 */  bc1tl     .L802412C4
 /* D94200 802412C0 0000882D */   daddu    $s1, $zero, $zero
 .L802412C4:
-/* D94204 802412C4 3C038011 */  lui       $v1, 0x8011
-/* D94208 802412C8 8063EBB3 */  lb        $v1, -0x144d($v1)
+/* D94204 802412C4 3C038011 */  lui       $v1, %hi(D_8010EBB3)
+/* D94208 802412C8 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
 /* D9420C 802412CC 24020009 */  addiu     $v0, $zero, 9
 /* D94210 802412D0 50620001 */  beql      $v1, $v0, .L802412D8
 /* D94214 802412D4 0000882D */   daddu    $s1, $zero, $zero
diff --git a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024156C_D944AC.s b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024156C_D944AC.s
index 7cd70069ec..6f01384c95 100644
--- a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024156C_D944AC.s
+++ b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024156C_D944AC.s
@@ -100,9 +100,9 @@ glabel func_8024156C_D944AC
 /* D94610 802416D0 2C620064 */  sltiu     $v0, $v1, 0x64
 /* D94614 802416D4 10400048 */  beqz      $v0, .L802417F8
 /* D94618 802416D8 00031080 */   sll      $v0, $v1, 2
-/* D9461C 802416DC 3C018024 */  lui       $at, 0x8024
+/* D9461C 802416DC 3C018024 */  lui       $at, %hi(D_80242518)
 /* D94620 802416E0 00220821 */  addu      $at, $at, $v0
-/* D94624 802416E4 8C222518 */  lw        $v0, 0x2518($at)
+/* D94624 802416E4 8C222518 */  lw        $v0, %lo(D_80242518)($at)
 /* D94628 802416E8 00400008 */  jr        $v0
 /* D9462C 802416EC 00000000 */   nop      
 /* D94630 802416F0 0240202D */  daddu     $a0, $s2, $zero
diff --git a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240000_D955F0.s b/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240000_D955F0.s
index acfb66c22d..fd58d99e93 100644
--- a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240000_D955F0.s
+++ b/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240000_D955F0.s
@@ -3,21 +3,21 @@
 
 glabel func_80240000_D955F0
 /* D955F0 80240000 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D955F4 80240004 3C04800E */  lui       $a0, 0x800e
-/* D955F8 80240008 24849230 */  addiu     $a0, $a0, -0x6dd0
-/* D955FC 8024000C 3C058024 */  lui       $a1, 0x8024
-/* D95600 80240010 24A52220 */  addiu     $a1, $a1, 0x2220
+/* D955F4 80240004 3C04800E */  lui       $a0, %hi(D_800D9230)
+/* D955F8 80240008 24849230 */  addiu     $a0, $a0, %lo(D_800D9230)
+/* D955FC 8024000C 3C058024 */  lui       $a1, %hi(D_80242220)
+/* D95600 80240010 24A52220 */  addiu     $a1, $a1, %lo(D_80242220)
 /* D95604 80240014 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
 /* D95608 80240018 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
 /* D9560C 8024001C 24020001 */  addiu     $v0, $zero, 1
 /* D95610 80240020 AFBF0010 */  sw        $ra, 0x10($sp)
 /* D95614 80240024 0C01953C */  jal       sprintf
 /* D95618 80240028 A0620084 */   sb       $v0, 0x84($v1)
-/* D9561C 8024002C 3C04800E */  lui       $a0, 0x800e
-/* D95620 80240030 248491E0 */  addiu     $a0, $a0, -0x6e20
-/* D95624 80240034 3C058024 */  lui       $a1, 0x8024
+/* D9561C 8024002C 3C04800E */  lui       $a0, %hi(D_800D91E0)
+/* D95620 80240030 248491E0 */  addiu     $a0, $a0, %lo(D_800D91E0)
+/* D95624 80240034 3C058024 */  lui       $a1, %hi(D_80242230)
 /* D95628 80240038 0C01953C */  jal       sprintf
-/* D9562C 8024003C 24A52230 */   addiu    $a1, $a1, 0x2230
+/* D9562C 8024003C 24A52230 */   addiu    $a1, $a1, %lo(D_80242230)
 /* D95630 80240040 8FBF0010 */  lw        $ra, 0x10($sp)
 /* D95634 80240044 0000102D */  daddu     $v0, $zero, $zero
 /* D95638 80240048 03E00008 */  jr        $ra
diff --git a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_8024011C_D9570C.s b/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_8024011C_D9570C.s
index e379e1c522..5418993d2b 100644
--- a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_8024011C_D9570C.s
+++ b/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_8024011C_D9570C.s
@@ -5,8 +5,8 @@ glabel func_8024011C_D9570C
 /* D9570C 8024011C 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* D95710 80240120 AFB00010 */  sw        $s0, 0x10($sp)
 /* D95714 80240124 0080802D */  daddu     $s0, $a0, $zero
-/* D95718 80240128 3C058024 */  lui       $a1, 0x8024
-/* D9571C 8024012C 24A50158 */  addiu     $a1, $a1, 0x158
+/* D95718 80240128 3C058024 */  lui       $a1, %hi(D_80240158)
+/* D9571C 8024012C 24A50158 */  addiu     $a1, $a1, %lo(D_80240158)
 /* D95720 80240130 AFBF0014 */  sw        $ra, 0x14($sp)
 /* D95724 80240134 0C048C56 */  jal       bind_dynamic_entity_3
 /* D95728 80240138 0000202D */   daddu    $a0, $zero, $zero
diff --git a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240158_D95748.s b/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240158_D95748.s
index ebe8fe76b4..466fb51ffd 100644
--- a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240158_D95748.s
+++ b/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240158_D95748.s
@@ -29,8 +29,8 @@ glabel func_80240158_D95748
 /* D957A8 802401B8 27A20034 */  addiu     $v0, $sp, 0x34
 /* D957AC 802401BC AFA20014 */  sw        $v0, 0x14($sp)
 /* D957B0 802401C0 C6000030 */  lwc1      $f0, 0x30($s0)
-/* D957B4 802401C4 3C04800A */  lui       $a0, 0x800a
-/* D957B8 802401C8 8484A634 */  lh        $a0, -0x59cc($a0)
+/* D957B4 802401C4 3C04800A */  lui       $a0, %hi(D_8009A634)
+/* D957B8 802401C8 8484A634 */  lh        $a0, %lo(D_8009A634)($a0)
 /* D957BC 802401CC 46000007 */  neg.s     $f0, $f0
 /* D957C0 802401D0 44070000 */  mfc1      $a3, $f0
 /* D957C4 802401D4 27A20038 */  addiu     $v0, $sp, 0x38
@@ -67,8 +67,8 @@ glabel func_80240158_D95748
 /* D9583C 8024024C 54400022 */  bnel      $v0, $zero, .L802402D8
 /* D95840 80240250 24110011 */   addiu    $s1, $zero, 0x11
 /* D95844 80240254 9203000E */  lbu       $v1, 0xe($s0)
-/* D95848 80240258 3C02802E */  lui       $v0, 0x802e
-/* D9584C 8024025C 90429D70 */  lbu       $v0, -0x6290($v0)
+/* D95848 80240258 3C02802E */  lui       $v0, %hi(D_802D9D70)
+/* D9584C 8024025C 90429D70 */  lbu       $v0, %lo(D_802D9D70)($v0)
 /* D95850 80240260 10620018 */  beq       $v1, $v0, .L802402C4
 /* D95854 80240264 2C6200FE */   sltiu    $v0, $v1, 0xfe
 /* D95858 80240268 1040000B */  beqz      $v0, .L80240298
@@ -98,20 +98,20 @@ glabel func_80240158_D95748
 /* D958B0 802402C0 00000000 */   nop      
 .L802402C4:
 /* D958B4 802402C4 9202000E */  lbu       $v0, 0xe($s0)
-/* D958B8 802402C8 3C01802E */  lui       $at, 0x802e
-/* D958BC 802402CC A0229D70 */  sb        $v0, -0x6290($at)
+/* D958B8 802402C8 3C01802E */  lui       $at, %hi(D_802D9D70)
+/* D958BC 802402CC A0229D70 */  sb        $v0, %lo(D_802D9D70)($at)
 /* D958C0 802402D0 080900B9 */  j         .L802402E4
 /* D958C4 802402D4 0240202D */   daddu    $a0, $s2, $zero
 .L802402D8:
-/* D958C8 802402D8 3C01802E */  lui       $at, 0x802e
-/* D958CC 802402DC A0209D70 */  sb        $zero, -0x6290($at)
+/* D958C8 802402D8 3C01802E */  lui       $at, %hi(D_802D9D70)
+/* D958CC 802402DC A0209D70 */  sb        $zero, %lo(D_802D9D70)($at)
 /* D958D0 802402E0 0240202D */  daddu     $a0, $s2, $zero
 .L802402E4:
 /* D958D4 802402E4 AC910000 */  sw        $s1, ($a0)
 /* D958D8 802402E8 AC900008 */  sw        $s0, 8($a0)
 /* D958DC 802402EC 8FA20038 */  lw        $v0, 0x38($sp)
-/* D958E0 802402F0 3C038024 */  lui       $v1, 0x8024
-/* D958E4 802402F4 24630320 */  addiu     $v1, $v1, 0x320
+/* D958E0 802402F0 3C038024 */  lui       $v1, %hi(D_80240320)
+/* D958E4 802402F4 24630320 */  addiu     $v1, $v1, %lo(D_80240320)
 /* D958E8 802402F8 AC83000C */  sw        $v1, 0xc($a0)
 /* D958EC 802402FC 00021023 */  negu      $v0, $v0
 /* D958F0 80240300 0C047644 */  jal       queue_render_task
diff --git a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240320_D95910.s b/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240320_D95910.s
index ac2f1770bb..7ab44cfe38 100644
--- a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240320_D95910.s
+++ b/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240320_D95910.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80240320_D95910
-/* D95910 80240320 3C03800A */  lui       $v1, 0x800a
-/* D95914 80240324 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D95910 80240320 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D95914 80240324 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D95918 80240328 3C07BF80 */  lui       $a3, 0xbf80
 /* D9591C 8024032C 27BDFEC0 */  addiu     $sp, $sp, -0x140
 /* D95920 80240330 F7B40128 */  sdc1      $f20, 0x128($sp)
@@ -22,9 +22,9 @@ glabel func_80240320_D95910
 /* D95954 80240364 000218C0 */  sll       $v1, $v0, 3
 /* D95958 80240368 00431021 */  addu      $v0, $v0, $v1
 /* D9595C 8024036C 000210C0 */  sll       $v0, $v0, 3
-/* D95960 80240370 3C01800B */  lui       $at, 0x800b
+/* D95960 80240370 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* D95964 80240374 00220821 */  addu      $at, $at, $v0
-/* D95968 80240378 C4361DEC */  lwc1      $f22, 0x1dec($at)
+/* D95968 80240378 C4361DEC */  lwc1      $f22, %lo(D_800B1DEC)($at)
 /* D9596C 8024037C 4406A000 */  mfc1      $a2, $f20
 /* D95970 80240380 4600B587 */  neg.s     $f22, $f22
 /* D95974 80240384 4405B000 */  mfc1      $a1, $f22
diff --git a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_802404CC_D95ABC.s b/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_802404CC_D95ABC.s
index f6d321235e..82d3e2ecd4 100644
--- a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_802404CC_D95ABC.s
+++ b/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_802404CC_D95ABC.s
@@ -11,8 +11,8 @@ glabel func_802404CC_D95ABC
 /* D95AD4 802404E4 28420002 */   slti     $v0, $v0, 2
 /* D95AD8 802404E8 1040000C */  beqz      $v0, .L8024051C
 /* D95ADC 802404EC 00000000 */   nop      
-/* D95AE0 802404F0 3C058024 */  lui       $a1, 0x8024
-/* D95AE4 802404F4 24A50530 */  addiu     $a1, $a1, 0x530
+/* D95AE0 802404F0 3C058024 */  lui       $a1, %hi(D_80240530)
+/* D95AE4 802404F4 24A50530 */  addiu     $a1, $a1, %lo(D_80240530)
 /* D95AE8 802404F8 0C048C56 */  jal       bind_dynamic_entity_3
 /* D95AEC 802404FC 0000202D */   daddu    $a0, $zero, $zero
 /* D95AF0 80240500 8E03013C */  lw        $v1, 0x13c($s0)
diff --git a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240530_D95B20.s b/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240530_D95B20.s
index 59ac42bc72..c0f5d4fb0b 100644
--- a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240530_D95B20.s
+++ b/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240530_D95B20.s
@@ -28,8 +28,8 @@ glabel func_80240530_D95B20
 /* D95B7C 8024058C 27A20038 */  addiu     $v0, $sp, 0x38
 /* D95B80 80240590 AFA20018 */  sw        $v0, 0x18($sp)
 /* D95B84 80240594 C600002C */  lwc1      $f0, 0x2c($s0)
-/* D95B88 80240598 3C04800A */  lui       $a0, 0x800a
-/* D95B8C 8024059C 8484A634 */  lh        $a0, -0x59cc($a0)
+/* D95B88 80240598 3C04800A */  lui       $a0, %hi(D_8009A634)
+/* D95B8C 8024059C 8484A634 */  lh        $a0, %lo(D_8009A634)($a0)
 /* D95B90 802405A0 46000007 */  neg.s     $f0, $f0
 /* D95B94 802405A4 44060000 */  mfc1      $a2, $f0
 /* D95B98 802405A8 0C00B94E */  jal       get_screen_coords
@@ -44,8 +44,8 @@ glabel func_80240530_D95B20
 /* D95BBC 802405CC 54400022 */  bnel      $v0, $zero, .L80240658
 /* D95BC0 802405D0 24120011 */   addiu    $s2, $zero, 0x11
 /* D95BC4 802405D4 9203000E */  lbu       $v1, 0xe($s0)
-/* D95BC8 802405D8 3C02802E */  lui       $v0, 0x802e
-/* D95BCC 802405DC 90429D71 */  lbu       $v0, -0x628f($v0)
+/* D95BC8 802405D8 3C02802E */  lui       $v0, %hi(D_802D9D71)
+/* D95BCC 802405DC 90429D71 */  lbu       $v0, %lo(D_802D9D71)($v0)
 /* D95BD0 802405E0 10620018 */  beq       $v1, $v0, .L80240644
 /* D95BD4 802405E4 2C6200FE */   sltiu    $v0, $v1, 0xfe
 /* D95BD8 802405E8 1040000B */  beqz      $v0, .L80240618
@@ -75,17 +75,17 @@ glabel func_80240530_D95B20
 /* D95C30 80240640 00000000 */   nop      
 .L80240644:
 /* D95C34 80240644 9202000E */  lbu       $v0, 0xe($s0)
-/* D95C38 80240648 3C01802E */  lui       $at, 0x802e
-/* D95C3C 8024064C A0229D71 */  sb        $v0, -0x628f($at)
+/* D95C38 80240648 3C01802E */  lui       $at, %hi(D_802D9D71)
+/* D95C3C 8024064C A0229D71 */  sb        $v0, %lo(D_802D9D71)($at)
 /* D95C40 80240650 08090198 */  j         .L80240660
 /* D95C44 80240654 00000000 */   nop      
 .L80240658:
-/* D95C48 80240658 3C01802E */  lui       $at, 0x802e
-/* D95C4C 8024065C A0209D71 */  sb        $zero, -0x628f($at)
+/* D95C48 80240658 3C01802E */  lui       $at, %hi(D_802D9D71)
+/* D95C4C 8024065C A0209D71 */  sb        $zero, %lo(D_802D9D71)($at)
 .L80240660:
 /* D95C50 80240660 8FA20038 */  lw        $v0, 0x38($sp)
-/* D95C54 80240664 3C048024 */  lui       $a0, 0x8024
-/* D95C58 80240668 248408A0 */  addiu     $a0, $a0, 0x8a0
+/* D95C54 80240664 3C048024 */  lui       $a0, %hi(D_802408A0)
+/* D95C58 80240668 248408A0 */  addiu     $a0, $a0, %lo(D_802408A0)
 /* D95C5C 8024066C AE320000 */  sw        $s2, ($s1)
 /* D95C60 80240670 AE300008 */  sw        $s0, 8($s1)
 /* D95C64 80240674 00021023 */  negu      $v0, $v0
@@ -95,8 +95,8 @@ glabel func_80240530_D95B20
 /* D95C74 80240684 00431024 */  and       $v0, $v0, $v1
 /* D95C78 80240688 54400004 */  bnel      $v0, $zero, .L8024069C
 /* D95C7C 8024068C AE24000C */   sw       $a0, 0xc($s1)
-/* D95C80 80240690 3C048024 */  lui       $a0, 0x8024
-/* D95C84 80240694 248406BC */  addiu     $a0, $a0, 0x6bc
+/* D95C80 80240690 3C048024 */  lui       $a0, %hi(D_802406BC)
+/* D95C84 80240694 248406BC */  addiu     $a0, $a0, %lo(D_802406BC)
 /* D95C88 80240698 AE24000C */  sw        $a0, 0xc($s1)
 .L8024069C:
 /* D95C8C 8024069C 0C047644 */  jal       queue_render_task
diff --git a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_802406BC_D95CAC.s b/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_802406BC_D95CAC.s
index 0cd22f2c7d..45290b04e0 100644
--- a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_802406BC_D95CAC.s
+++ b/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_802406BC_D95CAC.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_802406BC_D95CAC
-/* D95CAC 802406BC 3C03800A */  lui       $v1, 0x800a
-/* D95CB0 802406C0 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D95CAC 802406BC 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D95CB0 802406C0 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D95CB4 802406C4 3C07BF80 */  lui       $a3, 0xbf80
 /* D95CB8 802406C8 27BDFEC0 */  addiu     $sp, $sp, -0x140
 /* D95CBC 802406CC F7B40128 */  sdc1      $f20, 0x128($sp)
@@ -22,9 +22,9 @@ glabel func_802406BC_D95CAC
 /* D95CF0 80240700 000218C0 */  sll       $v1, $v0, 3
 /* D95CF4 80240704 00431021 */  addu      $v0, $v0, $v1
 /* D95CF8 80240708 000210C0 */  sll       $v0, $v0, 3
-/* D95CFC 8024070C 3C01800B */  lui       $at, 0x800b
+/* D95CFC 8024070C 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* D95D00 80240710 00220821 */  addu      $at, $at, $v0
-/* D95D04 80240714 C4361DEC */  lwc1      $f22, 0x1dec($at)
+/* D95D04 80240714 C4361DEC */  lwc1      $f22, %lo(D_800B1DEC)($at)
 /* D95D08 80240718 4406A000 */  mfc1      $a2, $f20
 /* D95D0C 8024071C 4600B587 */  neg.s     $f22, $f22
 /* D95D10 80240720 4405B000 */  mfc1      $a1, $f22
diff --git a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_802408A0_D95E90.s b/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_802408A0_D95E90.s
index 32f61fcd0c..6ad4059a75 100644
--- a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_802408A0_D95E90.s
+++ b/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_802408A0_D95E90.s
@@ -27,8 +27,8 @@ glabel func_802408A0_D95E90
 /* D95EE8 802408F8 F7B80160 */  sdc1      $f24, 0x160($sp)
 /* D95EEC 802408FC F7B40150 */  sdc1      $f20, 0x150($sp)
 .L80240900:
-/* D95EF0 80240900 3C03800A */  lui       $v1, 0x800a
-/* D95EF4 80240904 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D95EF0 80240900 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D95EF4 80240904 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D95EF8 80240908 00031080 */  sll       $v0, $v1, 2
 /* D95EFC 8024090C 00431021 */  addu      $v0, $v0, $v1
 /* D95F00 80240910 00021080 */  sll       $v0, $v0, 2
diff --git a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240D6C_D9635C.s b/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240D6C_D9635C.s
index d09e4a6241..4c6daf0925 100644
--- a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240D6C_D9635C.s
+++ b/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240D6C_D9635C.s
@@ -25,13 +25,13 @@ glabel func_80240D6C_D9635C
 /* D963A8 80240DB8 08090384 */  j         .L80240E10
 /* D963AC 80240DBC 00000000 */   nop      
 .L80240DC0:
-/* D963B0 80240DC0 3C048024 */  lui       $a0, 0x8024
-/* D963B4 80240DC4 24840EB4 */  addiu     $a0, $a0, 0xeb4
+/* D963B0 80240DC0 3C048024 */  lui       $a0, %hi(D_80240EB4)
+/* D963B4 80240DC4 24840EB4 */  addiu     $a0, $a0, %lo(D_80240EB4)
 /* D963B8 80240DC8 08090380 */  j         .L80240E00
 /* D963BC 80240DCC 00000000 */   nop      
 .L80240DD0:
-/* D963C0 80240DD0 3C048024 */  lui       $a0, 0x8024
-/* D963C4 80240DD4 24840F1C */  addiu     $a0, $a0, 0xf1c
+/* D963C0 80240DD0 3C048024 */  lui       $a0, %hi(D_80240F1C)
+/* D963C4 80240DD4 24840F1C */  addiu     $a0, $a0, %lo(D_80240F1C)
 /* D963C8 80240DD8 08090380 */  j         .L80240E00
 /* D963CC 80240DDC 00000000 */   nop      
 .L80240DE0:
@@ -42,8 +42,8 @@ glabel func_80240D6C_D9635C
 /* D963E0 80240DF0 10400007 */  beqz      $v0, .L80240E10
 /* D963E4 80240DF4 00000000 */   nop      
 .L80240DF8:
-/* D963E8 80240DF8 3C048024 */  lui       $a0, 0x8024
-/* D963EC 80240DFC 24840EE8 */  addiu     $a0, $a0, 0xee8
+/* D963E8 80240DF8 3C048024 */  lui       $a0, %hi(D_80240EE8)
+/* D963EC 80240DFC 24840EE8 */  addiu     $a0, $a0, %lo(D_80240EE8)
 .L80240E00:
 /* D963F0 80240E00 0C048C56 */  jal       bind_dynamic_entity_3
 /* D963F4 80240E04 0000282D */   daddu    $a1, $zero, $zero
diff --git a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240F50_D96540.s b/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240F50_D96540.s
index a30271a155..7b2d26c6d2 100644
--- a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240F50_D96540.s
+++ b/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240F50_D96540.s
@@ -87,9 +87,9 @@ glabel func_80240F50_D96540
 /* D96680 80241090 2C620010 */  sltiu     $v0, $v1, 0x10
 /* D96684 80241094 10400185 */  beqz      $v0, .L802416AC
 /* D96688 80241098 00031080 */   sll      $v0, $v1, 2
-/* D9668C 8024109C 3C018024 */  lui       $at, 0x8024
+/* D9668C 8024109C 3C018024 */  lui       $at, %hi(D_80242250)
 /* D96690 802410A0 00220821 */  addu      $at, $at, $v0
-/* D96694 802410A4 8C222250 */  lw        $v0, 0x2250($at)
+/* D96694 802410A4 8C222250 */  lw        $v0, %lo(D_80242250)($at)
 /* D96698 802410A8 00400008 */  jr        $v0
 /* D9669C 802410AC 00000000 */   nop      
 /* D966A0 802410B0 8E4200CC */  lw        $v0, 0xcc($s2)
@@ -171,8 +171,8 @@ glabel func_80240F50_D96540
 /* D967C4 802411D4 C6440070 */  lwc1      $f4, 0x70($s2)
 /* D967C8 802411D8 46802120 */  cvt.s.w   $f4, $f4
 /* D967CC 802411DC 46040001 */  sub.s     $f0, $f0, $f4
-/* D967D0 802411E0 3C018024 */  lui       $at, 0x8024
-/* D967D4 802411E4 D4222290 */  ldc1      $f2, 0x2290($at)
+/* D967D0 802411E0 3C018024 */  lui       $at, %hi(D_80242290)
+/* D967D4 802411E4 D4222290 */  ldc1      $f2, %lo(D_80242290)($at)
 /* D967D8 802411E8 46000021 */  cvt.d.s   $f0, $f0
 /* D967DC 802411EC 46220002 */  mul.d     $f0, $f0, $f2
 /* D967E0 802411F0 00000000 */  nop       
@@ -186,8 +186,8 @@ glabel func_80240F50_D96540
 /* D967FC 8024120C C6A0002C */  lwc1      $f0, 0x2c($s5)
 /* D96800 80241210 C622003C */  lwc1      $f2, 0x3c($s1)
 /* D96804 80241214 46001081 */  sub.s     $f2, $f2, $f0
-/* D96808 80241218 3C018024 */  lui       $at, 0x8024
-/* D9680C 8024121C D4242298 */  ldc1      $f4, 0x2298($at)
+/* D96808 80241218 3C018024 */  lui       $at, %hi(D_80242298)
+/* D9680C 8024121C D4242298 */  ldc1      $f4, %lo(D_80242298)($at)
 /* D96810 80241220 460010A1 */  cvt.d.s   $f2, $f2
 /* D96814 80241224 46241082 */  mul.d     $f2, $f2, $f4
 /* D96818 80241228 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240000_D97890.s b/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240000_D97890.s
index 63144eef4d..429fb6d72a 100644
--- a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240000_D97890.s
+++ b/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240000_D97890.s
@@ -3,21 +3,21 @@
 
 glabel func_80240000_D97890
 /* D97890 80240000 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D97894 80240004 3C04800E */  lui       $a0, 0x800e
-/* D97898 80240008 24849230 */  addiu     $a0, $a0, -0x6dd0
-/* D9789C 8024000C 3C058024 */  lui       $a1, 0x8024
-/* D978A0 80240010 24A520A0 */  addiu     $a1, $a1, 0x20a0
+/* D97894 80240004 3C04800E */  lui       $a0, %hi(D_800D9230)
+/* D97898 80240008 24849230 */  addiu     $a0, $a0, %lo(D_800D9230)
+/* D9789C 8024000C 3C058024 */  lui       $a1, %hi(D_802420A0)
+/* D978A0 80240010 24A520A0 */  addiu     $a1, $a1, %lo(D_802420A0)
 /* D978A4 80240014 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
 /* D978A8 80240018 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
 /* D978AC 8024001C 24020001 */  addiu     $v0, $zero, 1
 /* D978B0 80240020 AFBF0010 */  sw        $ra, 0x10($sp)
 /* D978B4 80240024 0C01953C */  jal       sprintf
 /* D978B8 80240028 A0620084 */   sb       $v0, 0x84($v1)
-/* D978BC 8024002C 3C04800E */  lui       $a0, 0x800e
-/* D978C0 80240030 248491E0 */  addiu     $a0, $a0, -0x6e20
-/* D978C4 80240034 3C058024 */  lui       $a1, 0x8024
+/* D978BC 8024002C 3C04800E */  lui       $a0, %hi(D_800D91E0)
+/* D978C0 80240030 248491E0 */  addiu     $a0, $a0, %lo(D_800D91E0)
+/* D978C4 80240034 3C058024 */  lui       $a1, %hi(D_802420B0)
 /* D978C8 80240038 0C01953C */  jal       sprintf
-/* D978CC 8024003C 24A520B0 */   addiu    $a1, $a1, 0x20b0
+/* D978CC 8024003C 24A520B0 */   addiu    $a1, $a1, %lo(D_802420B0)
 /* D978D0 80240040 8FBF0010 */  lw        $ra, 0x10($sp)
 /* D978D4 80240044 0000102D */  daddu     $v0, $zero, $zero
 /* D978D8 80240048 03E00008 */  jr        $ra
diff --git a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_8024011C_D979AC.s b/asm/nonmatchings/world/area_pra/pra_39/D97890/func_8024011C_D979AC.s
index 34a3cc9db9..20e047124e 100644
--- a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_8024011C_D979AC.s
+++ b/asm/nonmatchings/world/area_pra/pra_39/D97890/func_8024011C_D979AC.s
@@ -5,8 +5,8 @@ glabel func_8024011C_D979AC
 /* D979AC 8024011C 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* D979B0 80240120 AFB00010 */  sw        $s0, 0x10($sp)
 /* D979B4 80240124 0080802D */  daddu     $s0, $a0, $zero
-/* D979B8 80240128 3C058024 */  lui       $a1, 0x8024
-/* D979BC 8024012C 24A50158 */  addiu     $a1, $a1, 0x158
+/* D979B8 80240128 3C058024 */  lui       $a1, %hi(D_80240158)
+/* D979BC 8024012C 24A50158 */  addiu     $a1, $a1, %lo(D_80240158)
 /* D979C0 80240130 AFBF0014 */  sw        $ra, 0x14($sp)
 /* D979C4 80240134 0C048C56 */  jal       bind_dynamic_entity_3
 /* D979C8 80240138 0000202D */   daddu    $a0, $zero, $zero
diff --git a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240158_D979E8.s b/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240158_D979E8.s
index bd8e2fe0e2..7f86622b19 100644
--- a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240158_D979E8.s
+++ b/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240158_D979E8.s
@@ -29,8 +29,8 @@ glabel func_80240158_D979E8
 /* D97A48 802401B8 27A20034 */  addiu     $v0, $sp, 0x34
 /* D97A4C 802401BC AFA20014 */  sw        $v0, 0x14($sp)
 /* D97A50 802401C0 C6000030 */  lwc1      $f0, 0x30($s0)
-/* D97A54 802401C4 3C04800A */  lui       $a0, 0x800a
-/* D97A58 802401C8 8484A634 */  lh        $a0, -0x59cc($a0)
+/* D97A54 802401C4 3C04800A */  lui       $a0, %hi(D_8009A634)
+/* D97A58 802401C8 8484A634 */  lh        $a0, %lo(D_8009A634)($a0)
 /* D97A5C 802401CC 46000007 */  neg.s     $f0, $f0
 /* D97A60 802401D0 44070000 */  mfc1      $a3, $f0
 /* D97A64 802401D4 27A20038 */  addiu     $v0, $sp, 0x38
@@ -67,8 +67,8 @@ glabel func_80240158_D979E8
 /* D97ADC 8024024C 54400022 */  bnel      $v0, $zero, .L802402D8
 /* D97AE0 80240250 24110011 */   addiu    $s1, $zero, 0x11
 /* D97AE4 80240254 9203000E */  lbu       $v1, 0xe($s0)
-/* D97AE8 80240258 3C02802E */  lui       $v0, 0x802e
-/* D97AEC 8024025C 90429D70 */  lbu       $v0, -0x6290($v0)
+/* D97AE8 80240258 3C02802E */  lui       $v0, %hi(D_802D9D70)
+/* D97AEC 8024025C 90429D70 */  lbu       $v0, %lo(D_802D9D70)($v0)
 /* D97AF0 80240260 10620018 */  beq       $v1, $v0, .L802402C4
 /* D97AF4 80240264 2C6200FE */   sltiu    $v0, $v1, 0xfe
 /* D97AF8 80240268 1040000B */  beqz      $v0, .L80240298
@@ -98,20 +98,20 @@ glabel func_80240158_D979E8
 /* D97B50 802402C0 00000000 */   nop      
 .L802402C4:
 /* D97B54 802402C4 9202000E */  lbu       $v0, 0xe($s0)
-/* D97B58 802402C8 3C01802E */  lui       $at, 0x802e
-/* D97B5C 802402CC A0229D70 */  sb        $v0, -0x6290($at)
+/* D97B58 802402C8 3C01802E */  lui       $at, %hi(D_802D9D70)
+/* D97B5C 802402CC A0229D70 */  sb        $v0, %lo(D_802D9D70)($at)
 /* D97B60 802402D0 080900B9 */  j         .L802402E4
 /* D97B64 802402D4 0240202D */   daddu    $a0, $s2, $zero
 .L802402D8:
-/* D97B68 802402D8 3C01802E */  lui       $at, 0x802e
-/* D97B6C 802402DC A0209D70 */  sb        $zero, -0x6290($at)
+/* D97B68 802402D8 3C01802E */  lui       $at, %hi(D_802D9D70)
+/* D97B6C 802402DC A0209D70 */  sb        $zero, %lo(D_802D9D70)($at)
 /* D97B70 802402E0 0240202D */  daddu     $a0, $s2, $zero
 .L802402E4:
 /* D97B74 802402E4 AC910000 */  sw        $s1, ($a0)
 /* D97B78 802402E8 AC900008 */  sw        $s0, 8($a0)
 /* D97B7C 802402EC 8FA20038 */  lw        $v0, 0x38($sp)
-/* D97B80 802402F0 3C038024 */  lui       $v1, 0x8024
-/* D97B84 802402F4 24630320 */  addiu     $v1, $v1, 0x320
+/* D97B80 802402F0 3C038024 */  lui       $v1, %hi(D_80240320)
+/* D97B84 802402F4 24630320 */  addiu     $v1, $v1, %lo(D_80240320)
 /* D97B88 802402F8 AC83000C */  sw        $v1, 0xc($a0)
 /* D97B8C 802402FC 00021023 */  negu      $v0, $v0
 /* D97B90 80240300 0C047644 */  jal       queue_render_task
diff --git a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240320_D97BB0.s b/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240320_D97BB0.s
index 37ef8d6714..aee169a4c4 100644
--- a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240320_D97BB0.s
+++ b/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240320_D97BB0.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80240320_D97BB0
-/* D97BB0 80240320 3C03800A */  lui       $v1, 0x800a
-/* D97BB4 80240324 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D97BB0 80240320 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D97BB4 80240324 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D97BB8 80240328 3C07BF80 */  lui       $a3, 0xbf80
 /* D97BBC 8024032C 27BDFEC0 */  addiu     $sp, $sp, -0x140
 /* D97BC0 80240330 F7B40128 */  sdc1      $f20, 0x128($sp)
@@ -22,9 +22,9 @@ glabel func_80240320_D97BB0
 /* D97BF4 80240364 000218C0 */  sll       $v1, $v0, 3
 /* D97BF8 80240368 00431021 */  addu      $v0, $v0, $v1
 /* D97BFC 8024036C 000210C0 */  sll       $v0, $v0, 3
-/* D97C00 80240370 3C01800B */  lui       $at, 0x800b
+/* D97C00 80240370 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* D97C04 80240374 00220821 */  addu      $at, $at, $v0
-/* D97C08 80240378 C4361DEC */  lwc1      $f22, 0x1dec($at)
+/* D97C08 80240378 C4361DEC */  lwc1      $f22, %lo(D_800B1DEC)($at)
 /* D97C0C 8024037C 4406A000 */  mfc1      $a2, $f20
 /* D97C10 80240380 4600B587 */  neg.s     $f22, $f22
 /* D97C14 80240384 4405B000 */  mfc1      $a1, $f22
diff --git a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_802404CC_D97D5C.s b/asm/nonmatchings/world/area_pra/pra_39/D97890/func_802404CC_D97D5C.s
index 9e1ec2cbc6..5e55b54ff8 100644
--- a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_802404CC_D97D5C.s
+++ b/asm/nonmatchings/world/area_pra/pra_39/D97890/func_802404CC_D97D5C.s
@@ -11,8 +11,8 @@ glabel func_802404CC_D97D5C
 /* D97D74 802404E4 28420002 */   slti     $v0, $v0, 2
 /* D97D78 802404E8 1040000C */  beqz      $v0, .L8024051C
 /* D97D7C 802404EC 00000000 */   nop      
-/* D97D80 802404F0 3C058024 */  lui       $a1, 0x8024
-/* D97D84 802404F4 24A50530 */  addiu     $a1, $a1, 0x530
+/* D97D80 802404F0 3C058024 */  lui       $a1, %hi(D_80240530)
+/* D97D84 802404F4 24A50530 */  addiu     $a1, $a1, %lo(D_80240530)
 /* D97D88 802404F8 0C048C56 */  jal       bind_dynamic_entity_3
 /* D97D8C 802404FC 0000202D */   daddu    $a0, $zero, $zero
 /* D97D90 80240500 8E03013C */  lw        $v1, 0x13c($s0)
diff --git a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240530_D97DC0.s b/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240530_D97DC0.s
index 91ae438748..2bf13ce0ba 100644
--- a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240530_D97DC0.s
+++ b/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240530_D97DC0.s
@@ -28,8 +28,8 @@ glabel func_80240530_D97DC0
 /* D97E1C 8024058C 27A20038 */  addiu     $v0, $sp, 0x38
 /* D97E20 80240590 AFA20018 */  sw        $v0, 0x18($sp)
 /* D97E24 80240594 C600002C */  lwc1      $f0, 0x2c($s0)
-/* D97E28 80240598 3C04800A */  lui       $a0, 0x800a
-/* D97E2C 8024059C 8484A634 */  lh        $a0, -0x59cc($a0)
+/* D97E28 80240598 3C04800A */  lui       $a0, %hi(D_8009A634)
+/* D97E2C 8024059C 8484A634 */  lh        $a0, %lo(D_8009A634)($a0)
 /* D97E30 802405A0 46000007 */  neg.s     $f0, $f0
 /* D97E34 802405A4 44060000 */  mfc1      $a2, $f0
 /* D97E38 802405A8 0C00B94E */  jal       get_screen_coords
@@ -44,8 +44,8 @@ glabel func_80240530_D97DC0
 /* D97E5C 802405CC 54400022 */  bnel      $v0, $zero, .L80240658
 /* D97E60 802405D0 24120011 */   addiu    $s2, $zero, 0x11
 /* D97E64 802405D4 9203000E */  lbu       $v1, 0xe($s0)
-/* D97E68 802405D8 3C02802E */  lui       $v0, 0x802e
-/* D97E6C 802405DC 90429D71 */  lbu       $v0, -0x628f($v0)
+/* D97E68 802405D8 3C02802E */  lui       $v0, %hi(D_802D9D71)
+/* D97E6C 802405DC 90429D71 */  lbu       $v0, %lo(D_802D9D71)($v0)
 /* D97E70 802405E0 10620018 */  beq       $v1, $v0, .L80240644
 /* D97E74 802405E4 2C6200FE */   sltiu    $v0, $v1, 0xfe
 /* D97E78 802405E8 1040000B */  beqz      $v0, .L80240618
@@ -75,17 +75,17 @@ glabel func_80240530_D97DC0
 /* D97ED0 80240640 00000000 */   nop      
 .L80240644:
 /* D97ED4 80240644 9202000E */  lbu       $v0, 0xe($s0)
-/* D97ED8 80240648 3C01802E */  lui       $at, 0x802e
-/* D97EDC 8024064C A0229D71 */  sb        $v0, -0x628f($at)
+/* D97ED8 80240648 3C01802E */  lui       $at, %hi(D_802D9D71)
+/* D97EDC 8024064C A0229D71 */  sb        $v0, %lo(D_802D9D71)($at)
 /* D97EE0 80240650 08090198 */  j         .L80240660
 /* D97EE4 80240654 00000000 */   nop      
 .L80240658:
-/* D97EE8 80240658 3C01802E */  lui       $at, 0x802e
-/* D97EEC 8024065C A0209D71 */  sb        $zero, -0x628f($at)
+/* D97EE8 80240658 3C01802E */  lui       $at, %hi(D_802D9D71)
+/* D97EEC 8024065C A0209D71 */  sb        $zero, %lo(D_802D9D71)($at)
 .L80240660:
 /* D97EF0 80240660 8FA20038 */  lw        $v0, 0x38($sp)
-/* D97EF4 80240664 3C048024 */  lui       $a0, 0x8024
-/* D97EF8 80240668 248408A0 */  addiu     $a0, $a0, 0x8a0
+/* D97EF4 80240664 3C048024 */  lui       $a0, %hi(D_802408A0)
+/* D97EF8 80240668 248408A0 */  addiu     $a0, $a0, %lo(D_802408A0)
 /* D97EFC 8024066C AE320000 */  sw        $s2, ($s1)
 /* D97F00 80240670 AE300008 */  sw        $s0, 8($s1)
 /* D97F04 80240674 00021023 */  negu      $v0, $v0
@@ -95,8 +95,8 @@ glabel func_80240530_D97DC0
 /* D97F14 80240684 00431024 */  and       $v0, $v0, $v1
 /* D97F18 80240688 54400004 */  bnel      $v0, $zero, .L8024069C
 /* D97F1C 8024068C AE24000C */   sw       $a0, 0xc($s1)
-/* D97F20 80240690 3C048024 */  lui       $a0, 0x8024
-/* D97F24 80240694 248406BC */  addiu     $a0, $a0, 0x6bc
+/* D97F20 80240690 3C048024 */  lui       $a0, %hi(D_802406BC)
+/* D97F24 80240694 248406BC */  addiu     $a0, $a0, %lo(D_802406BC)
 /* D97F28 80240698 AE24000C */  sw        $a0, 0xc($s1)
 .L8024069C:
 /* D97F2C 8024069C 0C047644 */  jal       queue_render_task
diff --git a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_802406BC_D97F4C.s b/asm/nonmatchings/world/area_pra/pra_39/D97890/func_802406BC_D97F4C.s
index bc7429ab0a..3be023dbee 100644
--- a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_802406BC_D97F4C.s
+++ b/asm/nonmatchings/world/area_pra/pra_39/D97890/func_802406BC_D97F4C.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_802406BC_D97F4C
-/* D97F4C 802406BC 3C03800A */  lui       $v1, 0x800a
-/* D97F50 802406C0 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D97F4C 802406BC 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D97F50 802406C0 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D97F54 802406C4 3C07BF80 */  lui       $a3, 0xbf80
 /* D97F58 802406C8 27BDFEC0 */  addiu     $sp, $sp, -0x140
 /* D97F5C 802406CC F7B40128 */  sdc1      $f20, 0x128($sp)
@@ -22,9 +22,9 @@ glabel func_802406BC_D97F4C
 /* D97F90 80240700 000218C0 */  sll       $v1, $v0, 3
 /* D97F94 80240704 00431021 */  addu      $v0, $v0, $v1
 /* D97F98 80240708 000210C0 */  sll       $v0, $v0, 3
-/* D97F9C 8024070C 3C01800B */  lui       $at, 0x800b
+/* D97F9C 8024070C 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* D97FA0 80240710 00220821 */  addu      $at, $at, $v0
-/* D97FA4 80240714 C4361DEC */  lwc1      $f22, 0x1dec($at)
+/* D97FA4 80240714 C4361DEC */  lwc1      $f22, %lo(D_800B1DEC)($at)
 /* D97FA8 80240718 4406A000 */  mfc1      $a2, $f20
 /* D97FAC 8024071C 4600B587 */  neg.s     $f22, $f22
 /* D97FB0 80240720 4405B000 */  mfc1      $a1, $f22
diff --git a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_802408A0_D98130.s b/asm/nonmatchings/world/area_pra/pra_39/D97890/func_802408A0_D98130.s
index 7eb2b2464d..f981ff4a2c 100644
--- a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_802408A0_D98130.s
+++ b/asm/nonmatchings/world/area_pra/pra_39/D97890/func_802408A0_D98130.s
@@ -27,8 +27,8 @@ glabel func_802408A0_D98130
 /* D98188 802408F8 F7B80160 */  sdc1      $f24, 0x160($sp)
 /* D9818C 802408FC F7B40150 */  sdc1      $f20, 0x150($sp)
 .L80240900:
-/* D98190 80240900 3C03800A */  lui       $v1, 0x800a
-/* D98194 80240904 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D98190 80240900 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D98194 80240904 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D98198 80240908 00031080 */  sll       $v0, $v1, 2
 /* D9819C 8024090C 00431021 */  addu      $v0, $v0, $v1
 /* D981A0 80240910 00021080 */  sll       $v0, $v0, 2
diff --git a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240D6C_D985FC.s b/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240D6C_D985FC.s
index 3c5320ff8d..cc0a898034 100644
--- a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240D6C_D985FC.s
+++ b/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240D6C_D985FC.s
@@ -25,13 +25,13 @@ glabel func_80240D6C_D985FC
 /* D98648 80240DB8 08090384 */  j         .L80240E10
 /* D9864C 80240DBC 00000000 */   nop      
 .L80240DC0:
-/* D98650 80240DC0 3C048024 */  lui       $a0, 0x8024
-/* D98654 80240DC4 24840EB4 */  addiu     $a0, $a0, 0xeb4
+/* D98650 80240DC0 3C048024 */  lui       $a0, %hi(D_80240EB4)
+/* D98654 80240DC4 24840EB4 */  addiu     $a0, $a0, %lo(D_80240EB4)
 /* D98658 80240DC8 08090380 */  j         .L80240E00
 /* D9865C 80240DCC 00000000 */   nop      
 .L80240DD0:
-/* D98660 80240DD0 3C048024 */  lui       $a0, 0x8024
-/* D98664 80240DD4 24840F1C */  addiu     $a0, $a0, 0xf1c
+/* D98660 80240DD0 3C048024 */  lui       $a0, %hi(D_80240F1C)
+/* D98664 80240DD4 24840F1C */  addiu     $a0, $a0, %lo(D_80240F1C)
 /* D98668 80240DD8 08090380 */  j         .L80240E00
 /* D9866C 80240DDC 00000000 */   nop      
 .L80240DE0:
@@ -42,8 +42,8 @@ glabel func_80240D6C_D985FC
 /* D98680 80240DF0 10400007 */  beqz      $v0, .L80240E10
 /* D98684 80240DF4 00000000 */   nop      
 .L80240DF8:
-/* D98688 80240DF8 3C048024 */  lui       $a0, 0x8024
-/* D9868C 80240DFC 24840EE8 */  addiu     $a0, $a0, 0xee8
+/* D98688 80240DF8 3C048024 */  lui       $a0, %hi(D_80240EE8)
+/* D9868C 80240DFC 24840EE8 */  addiu     $a0, $a0, %lo(D_80240EE8)
 .L80240E00:
 /* D98690 80240E00 0C048C56 */  jal       bind_dynamic_entity_3
 /* D98694 80240E04 0000282D */   daddu    $a1, $zero, $zero
diff --git a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240F50_D987E0.s b/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240F50_D987E0.s
index 08bc600713..d6b8039045 100644
--- a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240F50_D987E0.s
+++ b/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240F50_D987E0.s
@@ -87,9 +87,9 @@ glabel func_80240F50_D987E0
 /* D98920 80241090 2C620010 */  sltiu     $v0, $v1, 0x10
 /* D98924 80241094 10400185 */  beqz      $v0, .L802416AC
 /* D98928 80241098 00031080 */   sll      $v0, $v1, 2
-/* D9892C 8024109C 3C018024 */  lui       $at, 0x8024
+/* D9892C 8024109C 3C018024 */  lui       $at, %hi(D_802420D0)
 /* D98930 802410A0 00220821 */  addu      $at, $at, $v0
-/* D98934 802410A4 8C2220D0 */  lw        $v0, 0x20d0($at)
+/* D98934 802410A4 8C2220D0 */  lw        $v0, %lo(D_802420D0)($at)
 /* D98938 802410A8 00400008 */  jr        $v0
 /* D9893C 802410AC 00000000 */   nop      
 /* D98940 802410B0 8E4200CC */  lw        $v0, 0xcc($s2)
@@ -171,8 +171,8 @@ glabel func_80240F50_D987E0
 /* D98A64 802411D4 C6440070 */  lwc1      $f4, 0x70($s2)
 /* D98A68 802411D8 46802120 */  cvt.s.w   $f4, $f4
 /* D98A6C 802411DC 46040001 */  sub.s     $f0, $f0, $f4
-/* D98A70 802411E0 3C018024 */  lui       $at, 0x8024
-/* D98A74 802411E4 D4222110 */  ldc1      $f2, 0x2110($at)
+/* D98A70 802411E0 3C018024 */  lui       $at, %hi(D_80242110)
+/* D98A74 802411E4 D4222110 */  ldc1      $f2, %lo(D_80242110)($at)
 /* D98A78 802411E8 46000021 */  cvt.d.s   $f0, $f0
 /* D98A7C 802411EC 46220002 */  mul.d     $f0, $f0, $f2
 /* D98A80 802411F0 00000000 */  nop       
@@ -186,8 +186,8 @@ glabel func_80240F50_D987E0
 /* D98A9C 8024120C C6A0002C */  lwc1      $f0, 0x2c($s5)
 /* D98AA0 80241210 C622003C */  lwc1      $f2, 0x3c($s1)
 /* D98AA4 80241214 46001081 */  sub.s     $f2, $f2, $f0
-/* D98AA8 80241218 3C018024 */  lui       $at, 0x8024
-/* D98AAC 8024121C D4242118 */  ldc1      $f4, 0x2118($at)
+/* D98AA8 80241218 3C018024 */  lui       $at, %hi(D_80242118)
+/* D98AAC 8024121C D4242118 */  ldc1      $f4, %lo(D_80242118)($at)
 /* D98AB0 80241220 460010A1 */  cvt.d.s   $f2, $f2
 /* D98AB4 80241224 46241082 */  mul.d     $f2, $f2, $f4
 /* D98AB8 80241228 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_802400EC_D99A9C.s b/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_802400EC_D99A9C.s
index 8dbca5517d..a933c92fd2 100644
--- a/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_802400EC_D99A9C.s
+++ b/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_802400EC_D99A9C.s
@@ -5,8 +5,8 @@ glabel func_802400EC_D99A9C
 /* D99A9C 802400EC 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* D99AA0 802400F0 AFB00010 */  sw        $s0, 0x10($sp)
 /* D99AA4 802400F4 0080802D */  daddu     $s0, $a0, $zero
-/* D99AA8 802400F8 3C058024 */  lui       $a1, 0x8024
-/* D99AAC 802400FC 24A50128 */  addiu     $a1, $a1, 0x128
+/* D99AA8 802400F8 3C058024 */  lui       $a1, %hi(D_80240128)
+/* D99AAC 802400FC 24A50128 */  addiu     $a1, $a1, %lo(D_80240128)
 /* D99AB0 80240100 AFBF0014 */  sw        $ra, 0x14($sp)
 /* D99AB4 80240104 0C048C56 */  jal       bind_dynamic_entity_3
 /* D99AB8 80240108 0000202D */   daddu    $a0, $zero, $zero
diff --git a/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240128_D99AD8.s b/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240128_D99AD8.s
index c66e70cd62..28b8061c33 100644
--- a/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240128_D99AD8.s
+++ b/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240128_D99AD8.s
@@ -29,8 +29,8 @@ glabel func_80240128_D99AD8
 /* D99B38 80240188 27A20034 */  addiu     $v0, $sp, 0x34
 /* D99B3C 8024018C AFA20014 */  sw        $v0, 0x14($sp)
 /* D99B40 80240190 C6000030 */  lwc1      $f0, 0x30($s0)
-/* D99B44 80240194 3C04800A */  lui       $a0, 0x800a
-/* D99B48 80240198 8484A634 */  lh        $a0, -0x59cc($a0)
+/* D99B44 80240194 3C04800A */  lui       $a0, %hi(D_8009A634)
+/* D99B48 80240198 8484A634 */  lh        $a0, %lo(D_8009A634)($a0)
 /* D99B4C 8024019C 46000007 */  neg.s     $f0, $f0
 /* D99B50 802401A0 44070000 */  mfc1      $a3, $f0
 /* D99B54 802401A4 27A20038 */  addiu     $v0, $sp, 0x38
@@ -67,8 +67,8 @@ glabel func_80240128_D99AD8
 /* D99BCC 8024021C 54400022 */  bnel      $v0, $zero, .L802402A8
 /* D99BD0 80240220 24110011 */   addiu    $s1, $zero, 0x11
 /* D99BD4 80240224 9203000E */  lbu       $v1, 0xe($s0)
-/* D99BD8 80240228 3C02802E */  lui       $v0, 0x802e
-/* D99BDC 8024022C 90429D70 */  lbu       $v0, -0x6290($v0)
+/* D99BD8 80240228 3C02802E */  lui       $v0, %hi(D_802D9D70)
+/* D99BDC 8024022C 90429D70 */  lbu       $v0, %lo(D_802D9D70)($v0)
 /* D99BE0 80240230 10620018 */  beq       $v1, $v0, .L80240294
 /* D99BE4 80240234 2C6200FE */   sltiu    $v0, $v1, 0xfe
 /* D99BE8 80240238 1040000B */  beqz      $v0, .L80240268
@@ -98,20 +98,20 @@ glabel func_80240128_D99AD8
 /* D99C40 80240290 00000000 */   nop      
 .L80240294:
 /* D99C44 80240294 9202000E */  lbu       $v0, 0xe($s0)
-/* D99C48 80240298 3C01802E */  lui       $at, 0x802e
-/* D99C4C 8024029C A0229D70 */  sb        $v0, -0x6290($at)
+/* D99C48 80240298 3C01802E */  lui       $at, %hi(D_802D9D70)
+/* D99C4C 8024029C A0229D70 */  sb        $v0, %lo(D_802D9D70)($at)
 /* D99C50 802402A0 080900AD */  j         .L802402B4
 /* D99C54 802402A4 0240202D */   daddu    $a0, $s2, $zero
 .L802402A8:
-/* D99C58 802402A8 3C01802E */  lui       $at, 0x802e
-/* D99C5C 802402AC A0209D70 */  sb        $zero, -0x6290($at)
+/* D99C58 802402A8 3C01802E */  lui       $at, %hi(D_802D9D70)
+/* D99C5C 802402AC A0209D70 */  sb        $zero, %lo(D_802D9D70)($at)
 /* D99C60 802402B0 0240202D */  daddu     $a0, $s2, $zero
 .L802402B4:
 /* D99C64 802402B4 AC910000 */  sw        $s1, ($a0)
 /* D99C68 802402B8 AC900008 */  sw        $s0, 8($a0)
 /* D99C6C 802402BC 8FA20038 */  lw        $v0, 0x38($sp)
-/* D99C70 802402C0 3C038024 */  lui       $v1, 0x8024
-/* D99C74 802402C4 246302F0 */  addiu     $v1, $v1, 0x2f0
+/* D99C70 802402C0 3C038024 */  lui       $v1, %hi(D_802402F0)
+/* D99C74 802402C4 246302F0 */  addiu     $v1, $v1, %lo(D_802402F0)
 /* D99C78 802402C8 AC83000C */  sw        $v1, 0xc($a0)
 /* D99C7C 802402CC 00021023 */  negu      $v0, $v0
 /* D99C80 802402D0 0C047644 */  jal       queue_render_task
diff --git a/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_802402F0_D99CA0.s b/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_802402F0_D99CA0.s
index 139c4df6ce..6c1585927c 100644
--- a/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_802402F0_D99CA0.s
+++ b/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_802402F0_D99CA0.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_802402F0_D99CA0
-/* D99CA0 802402F0 3C03800A */  lui       $v1, 0x800a
-/* D99CA4 802402F4 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D99CA0 802402F0 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D99CA4 802402F4 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D99CA8 802402F8 3C07BF80 */  lui       $a3, 0xbf80
 /* D99CAC 802402FC 27BDFEC0 */  addiu     $sp, $sp, -0x140
 /* D99CB0 80240300 F7B40128 */  sdc1      $f20, 0x128($sp)
@@ -22,9 +22,9 @@ glabel func_802402F0_D99CA0
 /* D99CE4 80240334 000218C0 */  sll       $v1, $v0, 3
 /* D99CE8 80240338 00431021 */  addu      $v0, $v0, $v1
 /* D99CEC 8024033C 000210C0 */  sll       $v0, $v0, 3
-/* D99CF0 80240340 3C01800B */  lui       $at, 0x800b
+/* D99CF0 80240340 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* D99CF4 80240344 00220821 */  addu      $at, $at, $v0
-/* D99CF8 80240348 C4361DEC */  lwc1      $f22, 0x1dec($at)
+/* D99CF8 80240348 C4361DEC */  lwc1      $f22, %lo(D_800B1DEC)($at)
 /* D99CFC 8024034C 4406A000 */  mfc1      $a2, $f20
 /* D99D00 80240350 4600B587 */  neg.s     $f22, $f22
 /* D99D04 80240354 4405B000 */  mfc1      $a1, $f22
diff --git a/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_8024049C_D99E4C.s b/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_8024049C_D99E4C.s
index facf4f92e2..62b757c204 100644
--- a/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_8024049C_D99E4C.s
+++ b/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_8024049C_D99E4C.s
@@ -11,8 +11,8 @@ glabel func_8024049C_D99E4C
 /* D99E64 802404B4 28420002 */   slti     $v0, $v0, 2
 /* D99E68 802404B8 1040000C */  beqz      $v0, .L802404EC
 /* D99E6C 802404BC 00000000 */   nop      
-/* D99E70 802404C0 3C058024 */  lui       $a1, 0x8024
-/* D99E74 802404C4 24A50500 */  addiu     $a1, $a1, 0x500
+/* D99E70 802404C0 3C058024 */  lui       $a1, %hi(D_80240500)
+/* D99E74 802404C4 24A50500 */  addiu     $a1, $a1, %lo(D_80240500)
 /* D99E78 802404C8 0C048C56 */  jal       bind_dynamic_entity_3
 /* D99E7C 802404CC 0000202D */   daddu    $a0, $zero, $zero
 /* D99E80 802404D0 8E03013C */  lw        $v1, 0x13c($s0)
diff --git a/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240500_D99EB0.s b/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240500_D99EB0.s
index a1bfc96f5c..26be70f83f 100644
--- a/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240500_D99EB0.s
+++ b/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240500_D99EB0.s
@@ -28,8 +28,8 @@ glabel func_80240500_D99EB0
 /* D99F0C 8024055C 27A20038 */  addiu     $v0, $sp, 0x38
 /* D99F10 80240560 AFA20018 */  sw        $v0, 0x18($sp)
 /* D99F14 80240564 C600002C */  lwc1      $f0, 0x2c($s0)
-/* D99F18 80240568 3C04800A */  lui       $a0, 0x800a
-/* D99F1C 8024056C 8484A634 */  lh        $a0, -0x59cc($a0)
+/* D99F18 80240568 3C04800A */  lui       $a0, %hi(D_8009A634)
+/* D99F1C 8024056C 8484A634 */  lh        $a0, %lo(D_8009A634)($a0)
 /* D99F20 80240570 46000007 */  neg.s     $f0, $f0
 /* D99F24 80240574 44060000 */  mfc1      $a2, $f0
 /* D99F28 80240578 0C00B94E */  jal       get_screen_coords
@@ -44,8 +44,8 @@ glabel func_80240500_D99EB0
 /* D99F4C 8024059C 54400022 */  bnel      $v0, $zero, .L80240628
 /* D99F50 802405A0 24120011 */   addiu    $s2, $zero, 0x11
 /* D99F54 802405A4 9203000E */  lbu       $v1, 0xe($s0)
-/* D99F58 802405A8 3C02802E */  lui       $v0, 0x802e
-/* D99F5C 802405AC 90429D71 */  lbu       $v0, -0x628f($v0)
+/* D99F58 802405A8 3C02802E */  lui       $v0, %hi(D_802D9D71)
+/* D99F5C 802405AC 90429D71 */  lbu       $v0, %lo(D_802D9D71)($v0)
 /* D99F60 802405B0 10620018 */  beq       $v1, $v0, .L80240614
 /* D99F64 802405B4 2C6200FE */   sltiu    $v0, $v1, 0xfe
 /* D99F68 802405B8 1040000B */  beqz      $v0, .L802405E8
@@ -75,17 +75,17 @@ glabel func_80240500_D99EB0
 /* D99FC0 80240610 00000000 */   nop      
 .L80240614:
 /* D99FC4 80240614 9202000E */  lbu       $v0, 0xe($s0)
-/* D99FC8 80240618 3C01802E */  lui       $at, 0x802e
-/* D99FCC 8024061C A0229D71 */  sb        $v0, -0x628f($at)
+/* D99FC8 80240618 3C01802E */  lui       $at, %hi(D_802D9D71)
+/* D99FCC 8024061C A0229D71 */  sb        $v0, %lo(D_802D9D71)($at)
 /* D99FD0 80240620 0809018C */  j         .L80240630
 /* D99FD4 80240624 00000000 */   nop      
 .L80240628:
-/* D99FD8 80240628 3C01802E */  lui       $at, 0x802e
-/* D99FDC 8024062C A0209D71 */  sb        $zero, -0x628f($at)
+/* D99FD8 80240628 3C01802E */  lui       $at, %hi(D_802D9D71)
+/* D99FDC 8024062C A0209D71 */  sb        $zero, %lo(D_802D9D71)($at)
 .L80240630:
 /* D99FE0 80240630 8FA20038 */  lw        $v0, 0x38($sp)
-/* D99FE4 80240634 3C048024 */  lui       $a0, 0x8024
-/* D99FE8 80240638 24840870 */  addiu     $a0, $a0, 0x870
+/* D99FE4 80240634 3C048024 */  lui       $a0, %hi(D_80240870)
+/* D99FE8 80240638 24840870 */  addiu     $a0, $a0, %lo(D_80240870)
 /* D99FEC 8024063C AE320000 */  sw        $s2, ($s1)
 /* D99FF0 80240640 AE300008 */  sw        $s0, 8($s1)
 /* D99FF4 80240644 00021023 */  negu      $v0, $v0
@@ -95,8 +95,8 @@ glabel func_80240500_D99EB0
 /* D9A004 80240654 00431024 */  and       $v0, $v0, $v1
 /* D9A008 80240658 54400004 */  bnel      $v0, $zero, .L8024066C
 /* D9A00C 8024065C AE24000C */   sw       $a0, 0xc($s1)
-/* D9A010 80240660 3C048024 */  lui       $a0, 0x8024
-/* D9A014 80240664 2484068C */  addiu     $a0, $a0, 0x68c
+/* D9A010 80240660 3C048024 */  lui       $a0, %hi(D_8024068C)
+/* D9A014 80240664 2484068C */  addiu     $a0, $a0, %lo(D_8024068C)
 /* D9A018 80240668 AE24000C */  sw        $a0, 0xc($s1)
 .L8024066C:
 /* D9A01C 8024066C 0C047644 */  jal       queue_render_task
diff --git a/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_8024068C_D9A03C.s b/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_8024068C_D9A03C.s
index 8cdd003dc8..4f3aefc3a0 100644
--- a/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_8024068C_D9A03C.s
+++ b/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_8024068C_D9A03C.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_8024068C_D9A03C
-/* D9A03C 8024068C 3C03800A */  lui       $v1, 0x800a
-/* D9A040 80240690 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D9A03C 8024068C 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D9A040 80240690 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D9A044 80240694 3C07BF80 */  lui       $a3, 0xbf80
 /* D9A048 80240698 27BDFEC0 */  addiu     $sp, $sp, -0x140
 /* D9A04C 8024069C F7B40128 */  sdc1      $f20, 0x128($sp)
@@ -22,9 +22,9 @@ glabel func_8024068C_D9A03C
 /* D9A080 802406D0 000218C0 */  sll       $v1, $v0, 3
 /* D9A084 802406D4 00431021 */  addu      $v0, $v0, $v1
 /* D9A088 802406D8 000210C0 */  sll       $v0, $v0, 3
-/* D9A08C 802406DC 3C01800B */  lui       $at, 0x800b
+/* D9A08C 802406DC 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* D9A090 802406E0 00220821 */  addu      $at, $at, $v0
-/* D9A094 802406E4 C4361DEC */  lwc1      $f22, 0x1dec($at)
+/* D9A094 802406E4 C4361DEC */  lwc1      $f22, %lo(D_800B1DEC)($at)
 /* D9A098 802406E8 4406A000 */  mfc1      $a2, $f20
 /* D9A09C 802406EC 4600B587 */  neg.s     $f22, $f22
 /* D9A0A0 802406F0 4405B000 */  mfc1      $a1, $f22
diff --git a/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240870_D9A220.s b/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240870_D9A220.s
index 183e65dd40..1222d2b0da 100644
--- a/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240870_D9A220.s
+++ b/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240870_D9A220.s
@@ -27,8 +27,8 @@ glabel func_80240870_D9A220
 /* D9A278 802408C8 F7B80160 */  sdc1      $f24, 0x160($sp)
 /* D9A27C 802408CC F7B40150 */  sdc1      $f20, 0x150($sp)
 .L802408D0:
-/* D9A280 802408D0 3C03800A */  lui       $v1, 0x800a
-/* D9A284 802408D4 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D9A280 802408D0 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D9A284 802408D4 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D9A288 802408D8 00031080 */  sll       $v0, $v1, 2
 /* D9A28C 802408DC 00431021 */  addu      $v0, $v0, $v1
 /* D9A290 802408E0 00021080 */  sll       $v0, $v0, 2
diff --git a/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240D3C_D9A6EC.s b/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240D3C_D9A6EC.s
index 015fb79d0b..d604d39017 100644
--- a/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240D3C_D9A6EC.s
+++ b/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240D3C_D9A6EC.s
@@ -25,13 +25,13 @@ glabel func_80240D3C_D9A6EC
 /* D9A738 80240D88 08090378 */  j         .L80240DE0
 /* D9A73C 80240D8C 00000000 */   nop      
 .L80240D90:
-/* D9A740 80240D90 3C048024 */  lui       $a0, 0x8024
-/* D9A744 80240D94 24840E84 */  addiu     $a0, $a0, 0xe84
+/* D9A740 80240D90 3C048024 */  lui       $a0, %hi(D_80240E84)
+/* D9A744 80240D94 24840E84 */  addiu     $a0, $a0, %lo(D_80240E84)
 /* D9A748 80240D98 08090374 */  j         .L80240DD0
 /* D9A74C 80240D9C 00000000 */   nop      
 .L80240DA0:
-/* D9A750 80240DA0 3C048024 */  lui       $a0, 0x8024
-/* D9A754 80240DA4 24840EEC */  addiu     $a0, $a0, 0xeec
+/* D9A750 80240DA0 3C048024 */  lui       $a0, %hi(D_80240EEC)
+/* D9A754 80240DA4 24840EEC */  addiu     $a0, $a0, %lo(D_80240EEC)
 /* D9A758 80240DA8 08090374 */  j         .L80240DD0
 /* D9A75C 80240DAC 00000000 */   nop      
 .L80240DB0:
@@ -42,8 +42,8 @@ glabel func_80240D3C_D9A6EC
 /* D9A770 80240DC0 10400007 */  beqz      $v0, .L80240DE0
 /* D9A774 80240DC4 00000000 */   nop      
 .L80240DC8:
-/* D9A778 80240DC8 3C048024 */  lui       $a0, 0x8024
-/* D9A77C 80240DCC 24840EB8 */  addiu     $a0, $a0, 0xeb8
+/* D9A778 80240DC8 3C048024 */  lui       $a0, %hi(D_80240EB8)
+/* D9A77C 80240DCC 24840EB8 */  addiu     $a0, $a0, %lo(D_80240EB8)
 .L80240DD0:
 /* D9A780 80240DD0 0C048C56 */  jal       bind_dynamic_entity_3
 /* D9A784 80240DD4 0000282D */   daddu    $a1, $zero, $zero
diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024053C_CF80AC.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024053C_CF80AC.s
index b401737155..8d1c5dfa3b 100644
--- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024053C_CF80AC.s
+++ b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024053C_CF80AC.s
@@ -6,11 +6,11 @@ glabel func_8024053C_CF80AC
 /* CF80B0 80240540 AFBF0010 */  sw        $ra, 0x10($sp)
 /* CF80B4 80240544 10A00003 */  beqz      $a1, .L80240554
 /* CF80B8 80240548 8C86000C */   lw       $a2, 0xc($a0)
-/* CF80BC 8024054C 3C018024 */  lui       $at, 0x8024
-/* CF80C0 80240550 AC2032D0 */  sw        $zero, 0x32d0($at)
+/* CF80BC 8024054C 3C018024 */  lui       $at, %hi(D_802432D0)
+/* CF80C0 80240550 AC2032D0 */  sw        $zero, %lo(D_802432D0)($at)
 .L80240554:
-/* CF80C4 80240554 3C038024 */  lui       $v1, 0x8024
-/* CF80C8 80240558 246332D0 */  addiu     $v1, $v1, 0x32d0
+/* CF80C4 80240554 3C038024 */  lui       $v1, %hi(D_802432D0)
+/* CF80C8 80240558 246332D0 */  addiu     $v1, $v1, %lo(D_802432D0)
 /* CF80CC 8024055C 8C620000 */  lw        $v0, ($v1)
 /* CF80D0 80240560 54400003 */  bnel      $v0, $zero, .L80240570
 /* CF80D4 80240564 AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_8024053C_CF80AC
 /* CF80DC 8024056C 0000102D */   daddu    $v0, $zero, $zero
 .L80240570:
 /* CF80E0 80240570 8CC50000 */  lw        $a1, ($a2)
-/* CF80E4 80240574 3C068024 */  lui       $a2, 0x8024
+/* CF80E4 80240574 3C068024 */  lui       $a2, %hi(D_802432D4)
 /* CF80E8 80240578 0C0B2026 */  jal       set_variable
-/* CF80EC 8024057C 8CC632D4 */   lw       $a2, 0x32d4($a2)
+/* CF80EC 8024057C 8CC632D4 */   lw       $a2, %lo(D_802432D4)($a2)
 /* CF80F0 80240580 24020002 */  addiu     $v0, $zero, 2
 .L80240584:
 /* CF80F4 80240584 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240590_CF8100.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240590_CF8100.s
index 2d7fa2b4ac..656cb863c9 100644
--- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240590_CF8100.s
+++ b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240590_CF8100.s
@@ -7,12 +7,12 @@ glabel func_80240590_CF8100
 /* CF8108 80240598 8C82000C */  lw        $v0, 0xc($a0)
 /* CF810C 8024059C 0C0B1EAF */  jal       get_variable
 /* CF8110 802405A0 8C450000 */   lw       $a1, ($v0)
-/* CF8114 802405A4 3C018024 */  lui       $at, 0x8024
-/* CF8118 802405A8 AC2232D4 */  sw        $v0, 0x32d4($at)
+/* CF8114 802405A4 3C018024 */  lui       $at, %hi(D_802432D4)
+/* CF8118 802405A8 AC2232D4 */  sw        $v0, %lo(D_802432D4)($at)
 /* CF811C 802405AC 24020002 */  addiu     $v0, $zero, 2
 /* CF8120 802405B0 8FBF0010 */  lw        $ra, 0x10($sp)
 /* CF8124 802405B4 24030001 */  addiu     $v1, $zero, 1
-/* CF8128 802405B8 3C018024 */  lui       $at, 0x8024
-/* CF812C 802405BC AC2332D0 */  sw        $v1, 0x32d0($at)
+/* CF8128 802405B8 3C018024 */  lui       $at, %hi(D_802432D0)
+/* CF812C 802405BC AC2332D0 */  sw        $v1, %lo(D_802432D0)($at)
 /* CF8130 802405C0 03E00008 */  jr        $ra
 /* CF8134 802405C4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_802405C8_CF8138.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_802405C8_CF8138.s
index 93409d509e..754d57c1ee 100644
--- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_802405C8_CF8138.s
+++ b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_802405C8_CF8138.s
@@ -13,8 +13,8 @@ glabel func_802405C8_CF8138
 /* CF8158 802405E8 8C620000 */  lw        $v0, ($v1)
 /* CF815C 802405EC 5040000A */  beql      $v0, $zero, .L80240618
 /* CF8160 802405F0 00041080 */   sll      $v0, $a0, 2
-/* CF8164 802405F4 3C058025 */  lui       $a1, 0x8025
-/* CF8168 802405F8 24A5DBC0 */  addiu     $a1, $a1, -0x2440
+/* CF8164 802405F4 3C058025 */  lui       $a1, %hi(D_8024DBC0)
+/* CF8168 802405F8 24A5DBC0 */  addiu     $a1, $a1, %lo(D_8024DBC0)
 .L802405FC:
 /* CF816C 802405FC 24630004 */  addiu     $v1, $v1, 4
 /* CF8170 80240600 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_802405C8_CF8138
 /* CF8180 80240610 24A50004 */   addiu    $a1, $a1, 4
 /* CF8184 80240614 00041080 */  sll       $v0, $a0, 2
 .L80240618:
-/* CF8188 80240618 3C018025 */  lui       $at, 0x8025
+/* CF8188 80240618 3C018025 */  lui       $at, %hi(D_8024DBC0)
 /* CF818C 8024061C 00220821 */  addu      $at, $at, $v0
-/* CF8190 80240620 AC20DBC0 */  sw        $zero, -0x2440($at)
+/* CF8190 80240620 AC20DBC0 */  sw        $zero, %lo(D_8024DBC0)($at)
 /* CF8194 80240624 08090195 */  j         .L80240654
 /* CF8198 80240628 00000000 */   nop      
 .L8024062C:
-/* CF819C 8024062C 3C038025 */  lui       $v1, 0x8025
-/* CF81A0 80240630 2463DBC0 */  addiu     $v1, $v1, -0x2440
+/* CF819C 8024062C 3C038025 */  lui       $v1, %hi(D_8024DBC0)
+/* CF81A0 80240630 2463DBC0 */  addiu     $v1, $v1, %lo(D_8024DBC0)
 /* CF81A4 80240634 0060282D */  daddu     $a1, $v1, $zero
 .L80240638:
 /* CF81A8 80240638 24820010 */  addiu     $v0, $a0, 0x10
diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240664_CF81D4.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240664_CF81D4.s
index 1155d84013..e94ca619c2 100644
--- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240664_CF81D4.s
+++ b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240664_CF81D4.s
@@ -13,8 +13,8 @@ glabel func_80240664_CF81D4
 /* CF81F4 80240684 8C620000 */  lw        $v0, ($v1)
 /* CF81F8 80240688 5040000A */  beql      $v0, $zero, .L802406B4
 /* CF81FC 8024068C 00041080 */   sll      $v0, $a0, 2
-/* CF8200 80240690 3C058025 */  lui       $a1, 0x8025
-/* CF8204 80240694 24A5DD88 */  addiu     $a1, $a1, -0x2278
+/* CF8200 80240690 3C058025 */  lui       $a1, %hi(D_8024DD88)
+/* CF8204 80240694 24A5DD88 */  addiu     $a1, $a1, %lo(D_8024DD88)
 .L80240698:
 /* CF8208 80240698 24630004 */  addiu     $v1, $v1, 4
 /* CF820C 8024069C 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_80240664_CF81D4
 /* CF821C 802406AC 24A50004 */   addiu    $a1, $a1, 4
 /* CF8220 802406B0 00041080 */  sll       $v0, $a0, 2
 .L802406B4:
-/* CF8224 802406B4 3C018025 */  lui       $at, 0x8025
+/* CF8224 802406B4 3C018025 */  lui       $at, %hi(D_8024DD88)
 /* CF8228 802406B8 00220821 */  addu      $at, $at, $v0
-/* CF822C 802406BC AC20DD88 */  sw        $zero, -0x2278($at)
+/* CF822C 802406BC AC20DD88 */  sw        $zero, %lo(D_8024DD88)($at)
 /* CF8230 802406C0 080901BC */  j         .L802406F0
 /* CF8234 802406C4 00000000 */   nop      
 .L802406C8:
-/* CF8238 802406C8 3C038025 */  lui       $v1, 0x8025
-/* CF823C 802406CC 2463DD88 */  addiu     $v1, $v1, -0x2278
+/* CF8238 802406C8 3C038025 */  lui       $v1, %hi(D_8024DD88)
+/* CF823C 802406CC 2463DD88 */  addiu     $v1, $v1, %lo(D_8024DD88)
 /* CF8240 802406D0 0060282D */  daddu     $a1, $v1, $zero
 .L802406D4:
 /* CF8244 802406D4 24820080 */  addiu     $v0, $a0, 0x80
diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240700_CF8270.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240700_CF8270.s
index 0d4e425745..c3e9cdb20e 100644
--- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240700_CF8270.s
+++ b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240700_CF8270.s
@@ -4,8 +4,8 @@
 glabel func_80240700_CF8270
 /* CF8270 80240700 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* CF8274 80240704 AFB00010 */  sw        $s0, 0x10($sp)
-/* CF8278 80240708 3C108024 */  lui       $s0, 0x8024
-/* CF827C 8024070C 261035F0 */  addiu     $s0, $s0, 0x35f0
+/* CF8278 80240708 3C108024 */  lui       $s0, %hi(D_802435F0)
+/* CF827C 8024070C 261035F0 */  addiu     $s0, $s0, %lo(D_802435F0)
 /* CF8280 80240710 AFBF0018 */  sw        $ra, 0x18($sp)
 /* CF8284 80240714 AFB10014 */  sw        $s1, 0x14($sp)
 /* CF8288 80240718 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_80240700_CF8270
 /* CF82EC 8024077C 28620010 */  slti      $v0, $v1, 0x10
 /* CF82F0 80240780 1440FFFA */  bnez      $v0, .L8024076C
 /* CF82F4 80240784 24840004 */   addiu    $a0, $a0, 4
-/* CF82F8 80240788 3C108024 */  lui       $s0, 0x8024
-/* CF82FC 8024078C 261035F0 */  addiu     $s0, $s0, 0x35f0
+/* CF82F8 80240788 3C108024 */  lui       $s0, %hi(D_802435F0)
+/* CF82FC 8024078C 261035F0 */  addiu     $s0, $s0, %lo(D_802435F0)
 /* CF8300 80240790 0C00AB4B */  jal       heap_free
 /* CF8304 80240794 8E040000 */   lw       $a0, ($s0)
 /* CF8308 80240798 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024083C_CF83AC.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024083C_CF83AC.s
index 75704cbdd6..48f6757534 100644
--- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024083C_CF83AC.s
+++ b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024083C_CF83AC.s
@@ -90,8 +90,8 @@ glabel func_8024083C_CF83AC
 /* CF84F8 80240988 0040802D */   daddu    $s0, $v0, $zero
 /* CF84FC 8024098C 0040282D */  daddu     $a1, $v0, $zero
 /* CF8500 80240990 0000182D */  daddu     $v1, $zero, $zero
-/* CF8504 80240994 3C068024 */  lui       $a2, 0x8024
-/* CF8508 80240998 24C6373C */  addiu     $a2, $a2, 0x373c
+/* CF8504 80240994 3C068024 */  lui       $a2, %hi(D_8024373C)
+/* CF8508 80240998 24C6373C */  addiu     $a2, $a2, %lo(D_8024373C)
 /* CF850C 8024099C 00C0202D */  daddu     $a0, $a2, $zero
 .L802409A0:
 /* CF8510 802409A0 8C820000 */  lw        $v0, ($a0)
diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240A60_CF85D0.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240A60_CF85D0.s
index b449a731d6..355c9989c7 100644
--- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240A60_CF85D0.s
+++ b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240A60_CF85D0.s
@@ -9,8 +9,8 @@ glabel func_80240A60_CF85D0
 /* CF85E0 80240A70 8C84014C */   lw       $a0, 0x14c($a0)
 /* CF85E4 80240A74 24040008 */  addiu     $a0, $zero, 8
 /* CF85E8 80240A78 0040802D */  daddu     $s0, $v0, $zero
-/* CF85EC 80240A7C 3C028024 */  lui       $v0, 0x8024
-/* CF85F0 80240A80 24420ACC */  addiu     $v0, $v0, 0xacc
+/* CF85EC 80240A7C 3C028024 */  lui       $v0, %hi(D_80240ACC)
+/* CF85F0 80240A80 24420ACC */  addiu     $v0, $v0, %lo(D_80240ACC)
 /* CF85F4 80240A84 0C00AB39 */  jal       heap_malloc
 /* CF85F8 80240A88 AE020008 */   sw       $v0, 8($s0)
 /* CF85FC 80240A8C 0040182D */  daddu     $v1, $v0, $zero
diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240ACC_CF863C.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240ACC_CF863C.s
index d35f41fc70..eb160eb6e0 100644
--- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240ACC_CF863C.s
+++ b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240ACC_CF863C.s
@@ -3,8 +3,8 @@
 
 glabel func_80240ACC_CF863C
 /* CF863C 80240ACC 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* CF8640 80240AD0 3C03800A */  lui       $v1, 0x800a
-/* CF8644 80240AD4 8463A634 */  lh        $v1, -0x59cc($v1)
+/* CF8640 80240AD0 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* CF8644 80240AD4 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* CF8648 80240AD8 3C05800B */  lui       $a1, %hi(gCameras)
 /* CF864C 80240ADC 24A51D80 */  addiu     $a1, $a1, %lo(gCameras)
 /* CF8650 80240AE0 AFBF0010 */  sw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240B2C_CF869C.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240B2C_CF869C.s
index c5a5eb3f66..eb0da5befc 100644
--- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240B2C_CF869C.s
+++ b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240B2C_CF869C.s
@@ -21,8 +21,8 @@ glabel func_80240B2C_CF869C
 /* CF86DC 80240B6C 2414FFFC */  addiu     $s4, $zero, -4
 /* CF86E0 80240B70 2413000E */  addiu     $s3, $zero, 0xe
 /* CF86E4 80240B74 3C120080 */  lui       $s2, 0x80
-/* CF86E8 80240B78 3C038015 */  lui       $v1, 0x8015
-/* CF86EC 80240B7C 8C6312F0 */  lw        $v1, 0x12f0($v1)
+/* CF86E8 80240B78 3C038015 */  lui       $v1, %hi(D_801512F0)
+/* CF86EC 80240B7C 8C6312F0 */  lw        $v1, %lo(D_801512F0)($v1)
 /* CF86F0 80240B80 24020001 */  addiu     $v0, $zero, 1
 /* CF86F4 80240B84 0C046F97 */  jal       set_background_color_blend
 /* CF86F8 80240B88 A0620000 */   sb       $v0, ($v1)
diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240C78_CF87E8.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240C78_CF87E8.s
index 20513571b3..377447e524 100644
--- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240C78_CF87E8.s
+++ b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240C78_CF87E8.s
@@ -49,8 +49,8 @@ glabel func_80240C78_CF87E8
 /* CF888C 80240D1C 2413FFFC */  addiu     $s3, $zero, -4
 /* CF8890 80240D20 2412000E */  addiu     $s2, $zero, 0xe
 /* CF8894 80240D24 3C11FF7F */  lui       $s1, 0xff7f
-/* CF8898 80240D28 3C028015 */  lui       $v0, 0x8015
-/* CF889C 80240D2C 8C4212F0 */  lw        $v0, 0x12f0($v0)
+/* CF8898 80240D28 3C028015 */  lui       $v0, %hi(D_801512F0)
+/* CF889C 80240D2C 8C4212F0 */  lw        $v0, %lo(D_801512F0)($v0)
 /* CF88A0 80240D30 3631FFFF */  ori       $s1, $s1, 0xffff
 /* CF88A4 80240D34 A0400000 */  sb        $zero, ($v0)
 .L80240D38:
diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240DEC_CF895C.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240DEC_CF895C.s
index afb8b827a9..4cc083ea92 100644
--- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240DEC_CF895C.s
+++ b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240DEC_CF895C.s
@@ -19,9 +19,9 @@ glabel func_80240DEC_CF895C
 /* CF8990 80240E20 34A502E0 */  ori       $a1, $a1, 0x2e0
 /* CF8994 80240E24 0C0B1EAF */  jal       get_variable
 /* CF8998 80240E28 0000202D */   daddu    $a0, $zero, $zero
-/* CF899C 80240E2C 3C038024 */  lui       $v1, 0x8024
+/* CF899C 80240E2C 3C038024 */  lui       $v1, %hi(D_802436FC)
 /* CF89A0 80240E30 00621821 */  addu      $v1, $v1, $v0
-/* CF89A4 80240E34 906336FC */  lbu       $v1, 0x36fc($v1)
+/* CF89A4 80240E34 906336FC */  lbu       $v1, %lo(D_802436FC)($v1)
 /* CF89A8 80240E38 8E220084 */  lw        $v0, 0x84($s1)
 /* CF89AC 80240E3C 54430006 */  bnel      $v0, $v1, .L80240E58
 /* CF89B0 80240E40 AE200084 */   sw       $zero, 0x84($s1)
diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240E70_CF89E0.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240E70_CF89E0.s
index 93a9e803ea..4d4d57de2a 100644
--- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240E70_CF89E0.s
+++ b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240E70_CF89E0.s
@@ -38,8 +38,8 @@ glabel func_80240E70_CF89E0
 /* CF8A64 80240EF4 0220202D */  daddu     $a0, $s1, $zero
 /* CF8A68 80240EF8 3C05F4AC */  lui       $a1, 0xf4ac
 /* CF8A6C 80240EFC 34A5D481 */  ori       $a1, $a1, 0xd481
-/* CF8A70 80240F00 3C108025 */  lui       $s0, 0x8025
-/* CF8A74 80240F04 2610DF18 */  addiu     $s0, $s0, -0x20e8
+/* CF8A70 80240F00 3C108025 */  lui       $s0, %hi(D_8024DF18)
+/* CF8A74 80240F04 2610DF18 */  addiu     $s0, $s0, %lo(D_8024DF18)
 /* CF8A78 80240F08 0C0B1EAF */  jal       get_variable
 /* CF8A7C 80240F0C AE020000 */   sw       $v0, ($s0)
 /* CF8A80 80240F10 0220202D */  daddu     $a0, $s1, $zero
@@ -66,8 +66,8 @@ glabel func_80240E70_CF89E0
 /* CF8AD4 80240F64 0000202D */   daddu    $a0, $zero, $zero
 /* CF8AD8 80240F68 0220202D */  daddu     $a0, $s1, $zero
 /* CF8ADC 80240F6C 3C05F4AC */  lui       $a1, 0xf4ac
-/* CF8AE0 80240F70 3C018025 */  lui       $at, 0x8025
-/* CF8AE4 80240F74 AC22DF1C */  sw        $v0, -0x20e4($at)
+/* CF8AE0 80240F70 3C018025 */  lui       $at, %hi(D_8024DF1C)
+/* CF8AE4 80240F74 AC22DF1C */  sw        $v0, %lo(D_8024DF1C)($at)
 /* CF8AE8 80240F78 0C0B1EAF */  jal       get_variable
 /* CF8AEC 80240F7C 34A5D481 */   ori      $a1, $a1, 0xd481
 /* CF8AF0 80240F80 0220202D */  daddu     $a0, $s1, $zero
@@ -98,16 +98,16 @@ glabel func_80240E70_CF89E0
 /* CF8B54 80240FE4 E7A00010 */   swc1     $f0, 0x10($sp)
 /* CF8B58 80240FE8 8E030000 */  lw        $v1, ($s0)
 /* CF8B5C 80240FEC 8C64000C */  lw        $a0, 0xc($v1)
-/* CF8B60 80240FF0 3C018025 */  lui       $at, 0x8025
-/* CF8B64 80240FF4 AC22DF20 */  sw        $v0, -0x20e0($at)
+/* CF8B60 80240FF0 3C018025 */  lui       $at, %hi(D_8024DF20)
+/* CF8B64 80240FF4 AC22DF20 */  sw        $v0, %lo(D_8024DF20)($at)
 /* CF8B68 80240FF8 AC800018 */  sw        $zero, 0x18($a0)
 /* CF8B6C 80240FFC AC800020 */  sw        $zero, 0x20($a0)
 /* CF8B70 80241000 AC800024 */  sw        $zero, 0x24($a0)
 /* CF8B74 80241004 AC800028 */  sw        $zero, 0x28($a0)
 /* CF8B78 80241008 AC80001C */  sw        $zero, 0x1c($a0)
 .L8024100C:
-/* CF8B7C 8024100C 3C028025 */  lui       $v0, 0x8025
-/* CF8B80 80241010 8C42DF18 */  lw        $v0, -0x20e8($v0)
+/* CF8B7C 8024100C 3C028025 */  lui       $v0, %hi(D_8024DF18)
+/* CF8B80 80241010 8C42DF18 */  lw        $v0, %lo(D_8024DF18)($v0)
 /* CF8B84 80241014 8C44000C */  lw        $a0, 0xc($v0)
 /* CF8B88 80241018 8C820020 */  lw        $v0, 0x20($a0)
 /* CF8B8C 8024101C 8C830028 */  lw        $v1, 0x28($a0)
diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241088_CF8BF8.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241088_CF8BF8.s
index 91e0fb86a6..6d1a62130e 100644
--- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241088_CF8BF8.s
+++ b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241088_CF8BF8.s
@@ -5,19 +5,19 @@ glabel func_80241088_CF8BF8
 /* CF8BF8 80241088 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* CF8BFC 8024108C 10A0000B */  beqz      $a1, .L802410BC
 /* CF8C00 80241090 AFBF0010 */   sw       $ra, 0x10($sp)
-/* CF8C04 80241094 3C038025 */  lui       $v1, 0x8025
-/* CF8C08 80241098 8C63DF1C */  lw        $v1, -0x20e4($v1)
+/* CF8C04 80241094 3C038025 */  lui       $v1, %hi(D_8024DF1C)
+/* CF8C08 80241098 8C63DF1C */  lw        $v1, %lo(D_8024DF1C)($v1)
 /* CF8C0C 8024109C 8C620000 */  lw        $v0, ($v1)
-/* CF8C10 802410A0 3C048025 */  lui       $a0, 0x8025
-/* CF8C14 802410A4 8C84DF20 */  lw        $a0, -0x20e0($a0)
+/* CF8C10 802410A0 3C048025 */  lui       $a0, %hi(D_8024DF20)
+/* CF8C14 802410A4 8C84DF20 */  lw        $a0, %lo(D_8024DF20)($a0)
 /* CF8C18 802410A8 34420010 */  ori       $v0, $v0, 0x10
 /* CF8C1C 802410AC AC620000 */  sw        $v0, ($v1)
 /* CF8C20 802410B0 8C820000 */  lw        $v0, ($a0)
 /* CF8C24 802410B4 34420010 */  ori       $v0, $v0, 0x10
 /* CF8C28 802410B8 AC820000 */  sw        $v0, ($a0)
 .L802410BC:
-/* CF8C2C 802410BC 3C048025 */  lui       $a0, 0x8025
-/* CF8C30 802410C0 8C84DF18 */  lw        $a0, -0x20e8($a0)
+/* CF8C2C 802410BC 3C048025 */  lui       $a0, %hi(D_8024DF18)
+/* CF8C30 802410C0 8C84DF18 */  lw        $a0, %lo(D_8024DF18)($a0)
 /* CF8C34 802410C4 8C85000C */  lw        $a1, 0xc($a0)
 /* CF8C38 802410C8 8CA20018 */  lw        $v0, 0x18($a1)
 /* CF8C3C 802410CC 8CA30020 */  lw        $v1, 0x20($a1)
@@ -41,8 +41,8 @@ glabel func_80241088_CF8BF8
 .L80241114:
 /* CF8C84 80241114 0C016914 */  jal       remove_effect
 /* CF8C88 80241118 ACA00018 */   sw       $zero, 0x18($a1)
-/* CF8C8C 8024111C 3C048025 */  lui       $a0, 0x8025
-/* CF8C90 80241120 8C84DEF8 */  lw        $a0, -0x2108($a0)
+/* CF8C8C 8024111C 3C048025 */  lui       $a0, %hi(D_8024DEF8)
+/* CF8C90 80241120 8C84DEF8 */  lw        $a0, %lo(D_8024DEF8)($a0)
 /* CF8C94 80241124 0C048D70 */  jal       func_801235C0
 /* CF8C98 80241128 00000000 */   nop      
 /* CF8C9C 8024112C 24020002 */  addiu     $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024113C_CF8CAC.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024113C_CF8CAC.s
index d734fbeb0f..f74a8cdfaf 100644
--- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024113C_CF8CAC.s
+++ b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024113C_CF8CAC.s
@@ -7,8 +7,8 @@ glabel func_8024113C_CF8CAC
 /* CF8CB4 80241144 8C82000C */  lw        $v0, 0xc($a0)
 /* CF8CB8 80241148 0C0B1EAF */  jal       get_variable
 /* CF8CBC 8024114C 8C450000 */   lw       $a1, ($v0)
-/* CF8CC0 80241150 3C038025 */  lui       $v1, 0x8025
-/* CF8CC4 80241154 8C63DF18 */  lw        $v1, -0x20e8($v1)
+/* CF8CC0 80241150 3C038025 */  lui       $v1, %hi(D_8024DF18)
+/* CF8CC4 80241154 8C63DF18 */  lw        $v1, %lo(D_8024DF18)($v1)
 /* CF8CC8 80241158 8C63000C */  lw        $v1, 0xc($v1)
 /* CF8CCC 8024115C AC620034 */  sw        $v0, 0x34($v1)
 /* CF8CD0 80241160 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241170_CF8CE0.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241170_CF8CE0.s
index fd42da8ef7..13d44e0a79 100644
--- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241170_CF8CE0.s
+++ b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241170_CF8CE0.s
@@ -8,8 +8,8 @@ glabel func_80241170_CF8CE0
 /* CF8CEC 8024117C 0C0B1EAF */  jal       get_variable
 /* CF8CF0 80241180 8C450000 */   lw       $a1, ($v0)
 /* CF8CF4 80241184 0040202D */  daddu     $a0, $v0, $zero
-/* CF8CF8 80241188 3C028025 */  lui       $v0, 0x8025
-/* CF8CFC 8024118C 8C42DF18 */  lw        $v0, -0x20e8($v0)
+/* CF8CF8 80241188 3C028025 */  lui       $v0, %hi(D_8024DF18)
+/* CF8CFC 8024118C 8C42DF18 */  lw        $v0, %lo(D_8024DF18)($v0)
 /* CF8D00 80241190 24030001 */  addiu     $v1, $zero, 1
 /* CF8D04 80241194 8C45000C */  lw        $a1, 0xc($v0)
 /* CF8D08 80241198 1083000D */  beq       $a0, $v1, .L802411D0
diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_802411F0_CF8D60.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_802411F0_CF8D60.s
index af537c7ca8..85a3a90e5c 100644
--- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_802411F0_CF8D60.s
+++ b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_802411F0_CF8D60.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_802411F0_CF8D60
-/* CF8D60 802411F0 3C028025 */  lui       $v0, 0x8025
-/* CF8D64 802411F4 8C42DF20 */  lw        $v0, -0x20e0($v0)
+/* CF8D60 802411F0 3C028025 */  lui       $v0, %hi(D_8024DF20)
+/* CF8D64 802411F4 8C42DF20 */  lw        $v0, %lo(D_8024DF20)($v0)
 /* CF8D68 802411F8 8C42000C */  lw        $v0, 0xc($v0)
 /* CF8D6C 802411FC AC40001C */  sw        $zero, 0x1c($v0)
 /* CF8D70 80241200 03E00008 */  jr        $ra
diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241208_CF8D78.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241208_CF8D78.s
index e5d3c23a88..1ddc87c027 100644
--- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241208_CF8D78.s
+++ b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241208_CF8D78.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80241208_CF8D78
-/* CF8D78 80241208 3C028025 */  lui       $v0, 0x8025
-/* CF8D7C 8024120C 8C42DF20 */  lw        $v0, -0x20e0($v0)
+/* CF8D78 80241208 3C028025 */  lui       $v0, %hi(D_8024DF20)
+/* CF8D7C 8024120C 8C42DF20 */  lw        $v0, %lo(D_8024DF20)($v0)
 /* CF8D80 80241210 8C43000C */  lw        $v1, 0xc($v0)
 /* CF8D84 80241214 24020001 */  addiu     $v0, $zero, 1
 /* CF8D88 80241218 AC62001C */  sw        $v0, 0x1c($v1)
diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241224_CF8D94.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241224_CF8D94.s
index ecf660d0db..3c8ae5da3c 100644
--- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241224_CF8D94.s
+++ b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241224_CF8D94.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80241224_CF8D94
-/* CF8D94 80241224 3C028025 */  lui       $v0, 0x8025
-/* CF8D98 80241228 8C42DF20 */  lw        $v0, -0x20e0($v0)
+/* CF8D94 80241224 3C028025 */  lui       $v0, %hi(D_8024DF20)
+/* CF8D98 80241228 8C42DF20 */  lw        $v0, %lo(D_8024DF20)($v0)
 /* CF8D9C 8024122C 8C43000C */  lw        $v1, 0xc($v0)
 /* CF8DA0 80241230 24020002 */  addiu     $v0, $zero, 2
 /* CF8DA4 80241234 03E00008 */  jr        $ra
diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_802416F8_CF9268.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_802416F8_CF9268.s
index bdba73fd8b..0cb5c2e9c6 100644
--- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_802416F8_CF9268.s
+++ b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_802416F8_CF9268.s
@@ -3,8 +3,8 @@
 
 glabel func_802416F8_CF9268
 /* CF9268 802416F8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* CF926C 802416FC 3C058025 */  lui       $a1, 0x8025
-/* CF9270 80241700 8CA5DF10 */  lw        $a1, -0x20f0($a1)
+/* CF926C 802416FC 3C058025 */  lui       $a1, %hi(D_8024DF10)
+/* CF9270 80241700 8CA5DF10 */  lw        $a1, %lo(D_8024DF10)($a1)
 /* CF9274 80241704 AFBF0010 */  sw        $ra, 0x10($sp)
 /* CF9278 80241708 0C0B1EAF */  jal       get_variable
 /* CF927C 8024170C 0000202D */   daddu    $a0, $zero, $zero
diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241764_CF92D4.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241764_CF92D4.s
index b5cae0653b..b614f7899e 100644
--- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241764_CF92D4.s
+++ b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241764_CF92D4.s
@@ -3,14 +3,14 @@
 
 glabel func_80241764_CF92D4
 /* CF92D4 80241764 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* CF92D8 80241768 3C058024 */  lui       $a1, 0x8024
-/* CF92DC 8024176C 24A516F8 */  addiu     $a1, $a1, 0x16f8
+/* CF92D8 80241768 3C058024 */  lui       $a1, %hi(D_802416F8)
+/* CF92DC 8024176C 24A516F8 */  addiu     $a1, $a1, %lo(D_802416F8)
 /* CF92E0 80241770 AFBF0010 */  sw        $ra, 0x10($sp)
 /* CF92E4 80241774 0C048C8F */  jal       bind_dynamic_entity_7
 /* CF92E8 80241778 0000202D */   daddu    $a0, $zero, $zero
 /* CF92EC 8024177C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* CF92F0 80241780 3C018025 */  lui       $at, 0x8025
-/* CF92F4 80241784 AC22DEF8 */  sw        $v0, -0x2108($at)
+/* CF92F0 80241780 3C018025 */  lui       $at, %hi(D_8024DEF8)
+/* CF92F4 80241784 AC22DEF8 */  sw        $v0, %lo(D_8024DEF8)($at)
 /* CF92F8 80241788 24020002 */  addiu     $v0, $zero, 2
 /* CF92FC 8024178C 03E00008 */  jr        $ra
 /* CF9300 80241790 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241A10_CF9580.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241A10_CF9580.s
index 32fc33f0a3..6a70c793d0 100644
--- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241A10_CF9580.s
+++ b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241A10_CF9580.s
@@ -15,7 +15,7 @@ glabel func_80241A10_CF9580
 /* CF95A8 80241A38 8FBF0014 */  lw        $ra, 0x14($sp)
 /* CF95AC 80241A3C 8FB00010 */  lw        $s0, 0x10($sp)
 /* CF95B0 80241A40 24020002 */  addiu     $v0, $zero, 2
-/* CF95B4 80241A44 3C018025 */  lui       $at, 0x8025
-/* CF95B8 80241A48 AC23DF24 */  sw        $v1, -0x20dc($at)
+/* CF95B4 80241A44 3C018025 */  lui       $at, %hi(D_8024DF24)
+/* CF95B8 80241A48 AC23DF24 */  sw        $v1, %lo(D_8024DF24)($at)
 /* CF95BC 80241A4C 03E00008 */  jr        $ra
 /* CF95C0 80241A50 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241A54_CF95C4.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241A54_CF95C4.s
index bf1175c475..4915b82485 100644
--- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241A54_CF95C4.s
+++ b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241A54_CF95C4.s
@@ -6,8 +6,8 @@ glabel func_80241A54_CF95C4
 /* CF95C8 80241A58 AFBF0010 */  sw        $ra, 0x10($sp)
 /* CF95CC 80241A5C 0C00EABB */  jal       get_npc_unsafe
 /* CF95D0 80241A60 8C84008C */   lw       $a0, 0x8c($a0)
-/* CF95D4 80241A64 3C038025 */  lui       $v1, 0x8025
-/* CF95D8 80241A68 8C63DF24 */  lw        $v1, -0x20dc($v1)
+/* CF95D4 80241A64 3C038025 */  lui       $v1, %hi(D_8024DF24)
+/* CF95D8 80241A68 8C63DF24 */  lw        $v1, %lo(D_8024DF24)($v1)
 /* CF95DC 80241A6C AC430028 */  sw        $v1, 0x28($v0)
 /* CF95E0 80241A70 8FBF0010 */  lw        $ra, 0x10($sp)
 /* CF95E4 80241A74 24020002 */  addiu     $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241C90_CF9800.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241C90_CF9800.s
index eadfd28f40..a1df8b9f11 100644
--- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241C90_CF9800.s
+++ b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241C90_CF9800.s
@@ -4,8 +4,8 @@
 glabel func_80241C90_CF9800
 /* CF9800 80241C90 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* CF9804 80241C94 AFB00010 */  sw        $s0, 0x10($sp)
-/* CF9808 80241C98 3C108025 */  lui       $s0, 0x8025
-/* CF980C 80241C9C 2610D8F0 */  addiu     $s0, $s0, -0x2710
+/* CF9808 80241C98 3C108025 */  lui       $s0, %hi(D_8024D8F0)
+/* CF980C 80241C9C 2610D8F0 */  addiu     $s0, $s0, %lo(D_8024D8F0)
 /* CF9810 80241CA0 AFBF0018 */  sw        $ra, 0x18($sp)
 /* CF9814 80241CA4 AFB10014 */  sw        $s1, 0x14($sp)
 /* CF9818 80241CA8 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_80241C90_CF9800
 /* CF987C 80241D0C 28620010 */  slti      $v0, $v1, 0x10
 /* CF9880 80241D10 1440FFFA */  bnez      $v0, .L80241CFC
 /* CF9884 80241D14 24840004 */   addiu    $a0, $a0, 4
-/* CF9888 80241D18 3C108025 */  lui       $s0, 0x8025
-/* CF988C 80241D1C 2610D8F0 */  addiu     $s0, $s0, -0x2710
+/* CF9888 80241D18 3C108025 */  lui       $s0, %hi(D_8024D8F0)
+/* CF988C 80241D1C 2610D8F0 */  addiu     $s0, $s0, %lo(D_8024D8F0)
 /* CF9890 80241D20 0C00AB4B */  jal       heap_free
 /* CF9894 80241D24 8E040000 */   lw       $a0, ($s0)
 /* CF9898 80241D28 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/begin_battle_D06948.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/begin_battle_D06948.s
index c37d6ec0c2..73a1c25d06 100644
--- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/begin_battle_D06948.s
+++ b/asm/nonmatchings/world/area_sam/sam_02/D05F60/begin_battle_D06948.s
@@ -19,9 +19,9 @@ glabel begin_battle_D06948
 /* D0697C 8024124C 34A502E0 */  ori       $a1, $a1, 0x2e0
 /* D06980 80241250 0C0B1EAF */  jal       get_variable
 /* D06984 80241254 0000202D */   daddu    $a0, $zero, $zero
-/* D06988 80241258 3C038024 */  lui       $v1, 0x8024
+/* D06988 80241258 3C038024 */  lui       $v1, %hi(D_80246BC4)
 /* D0698C 8024125C 00621821 */  addu      $v1, $v1, $v0
-/* D06990 80241260 90636BC4 */  lbu       $v1, 0x6bc4($v1)
+/* D06990 80241260 90636BC4 */  lbu       $v1, %lo(D_80246BC4)($v1)
 /* D06994 80241264 8E220084 */  lw        $v0, 0x84($s1)
 /* D06998 80241268 54430006 */  bnel      $v0, $v1, .L80241284
 /* D0699C 8024126C AE200084 */   sw       $zero, 0x84($s1)
diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802408F4_D06024.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802408F4_D06024.s
index 912ab57902..66671c0400 100644
--- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802408F4_D06024.s
+++ b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802408F4_D06024.s
@@ -26,9 +26,9 @@ glabel func_802408F4_D06024
 /* D06078 80240948 000320C0 */  sll       $a0, $v1, 3
 /* D0607C 8024094C 00641821 */  addu      $v1, $v1, $a0
 /* D06080 80240950 000318C0 */  sll       $v1, $v1, 3
-/* D06084 80240954 3C01800B */  lui       $at, 0x800b
+/* D06084 80240954 3C01800B */  lui       $at, %hi(D_800B1D98)
 /* D06088 80240958 00230821 */  addu      $at, $at, $v1
-/* D0608C 8024095C E4201D98 */  swc1      $f0, 0x1d98($at)
+/* D0608C 8024095C E4201D98 */  swc1      $f0, %lo(D_800B1D98)($at)
 /* D06090 80240960 8FBF0018 */  lw        $ra, 0x18($sp)
 /* D06094 80240964 8FB10014 */  lw        $s1, 0x14($sp)
 /* D06098 80240968 8FB00010 */  lw        $s0, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240B2C_D0625C.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240B2C_D0625C.s
index 9e2f111f13..c4ee1a9d4b 100644
--- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240B2C_D0625C.s
+++ b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240B2C_D0625C.s
@@ -4,8 +4,8 @@
 glabel func_80240B2C_D0625C
 /* D0625C 80240B2C 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* D06260 80240B30 AFB00010 */  sw        $s0, 0x10($sp)
-/* D06264 80240B34 3C108024 */  lui       $s0, 0x8024
-/* D06268 80240B38 26106B60 */  addiu     $s0, $s0, 0x6b60
+/* D06264 80240B34 3C108024 */  lui       $s0, %hi(D_80246B60)
+/* D06268 80240B38 26106B60 */  addiu     $s0, $s0, %lo(D_80246B60)
 /* D0626C 80240B3C AFBF0018 */  sw        $ra, 0x18($sp)
 /* D06270 80240B40 AFB10014 */  sw        $s1, 0x14($sp)
 /* D06274 80240B44 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_80240B2C_D0625C
 /* D062D8 80240BA8 28620010 */  slti      $v0, $v1, 0x10
 /* D062DC 80240BAC 1440FFFA */  bnez      $v0, .L80240B98
 /* D062E0 80240BB0 24840004 */   addiu    $a0, $a0, 4
-/* D062E4 80240BB4 3C108024 */  lui       $s0, 0x8024
-/* D062E8 80240BB8 26106B60 */  addiu     $s0, $s0, 0x6b60
+/* D062E4 80240BB4 3C108024 */  lui       $s0, %hi(D_80246B60)
+/* D062E8 80240BB8 26106B60 */  addiu     $s0, $s0, %lo(D_80246B60)
 /* D062EC 80240BBC 0C00AB4B */  jal       heap_free
 /* D062F0 80240BC0 8E040000 */   lw       $a0, ($s0)
 /* D062F4 80240BC4 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240C68_D06398.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240C68_D06398.s
index b31321e694..9691e02625 100644
--- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240C68_D06398.s
+++ b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240C68_D06398.s
@@ -90,8 +90,8 @@ glabel func_80240C68_D06398
 /* D064E4 80240DB4 0040802D */   daddu    $s0, $v0, $zero
 /* D064E8 80240DB8 0040282D */  daddu     $a1, $v0, $zero
 /* D064EC 80240DBC 0000182D */  daddu     $v1, $zero, $zero
-/* D064F0 80240DC0 3C068024 */  lui       $a2, 0x8024
-/* D064F4 80240DC4 24C66C04 */  addiu     $a2, $a2, 0x6c04
+/* D064F0 80240DC0 3C068024 */  lui       $a2, %hi(D_80246C04)
+/* D064F4 80240DC4 24C66C04 */  addiu     $a2, $a2, %lo(D_80246C04)
 /* D064F8 80240DC8 00C0202D */  daddu     $a0, $a2, $zero
 .L80240DCC:
 /* D064FC 80240DCC 8C820000 */  lw        $v0, ($a0)
diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240E8C_D065BC.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240E8C_D065BC.s
index c840fd0368..f96c4183dd 100644
--- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240E8C_D065BC.s
+++ b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240E8C_D065BC.s
@@ -9,8 +9,8 @@ glabel func_80240E8C_D065BC
 /* D065CC 80240E9C 8C84014C */   lw       $a0, 0x14c($a0)
 /* D065D0 80240EA0 24040008 */  addiu     $a0, $zero, 8
 /* D065D4 80240EA4 0040802D */  daddu     $s0, $v0, $zero
-/* D065D8 80240EA8 3C028024 */  lui       $v0, 0x8024
-/* D065DC 80240EAC 24420EF8 */  addiu     $v0, $v0, 0xef8
+/* D065D8 80240EA8 3C028024 */  lui       $v0, %hi(D_80240EF8)
+/* D065DC 80240EAC 24420EF8 */  addiu     $v0, $v0, %lo(D_80240EF8)
 /* D065E0 80240EB0 0C00AB39 */  jal       heap_malloc
 /* D065E4 80240EB4 AE020008 */   sw       $v0, 8($s0)
 /* D065E8 80240EB8 0040182D */  daddu     $v1, $v0, $zero
diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240EF8_D06628.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240EF8_D06628.s
index 7af892f679..feeb594212 100644
--- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240EF8_D06628.s
+++ b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240EF8_D06628.s
@@ -3,8 +3,8 @@
 
 glabel func_80240EF8_D06628
 /* D06628 80240EF8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D0662C 80240EFC 3C03800A */  lui       $v1, 0x800a
-/* D06630 80240F00 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D0662C 80240EFC 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D06630 80240F00 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D06634 80240F04 3C05800B */  lui       $a1, %hi(gCameras)
 /* D06638 80240F08 24A51D80 */  addiu     $a1, $a1, %lo(gCameras)
 /* D0663C 80240F0C AFBF0010 */  sw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240F58_D06688.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240F58_D06688.s
index 279ce6a6c8..8dc8e415e8 100644
--- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240F58_D06688.s
+++ b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240F58_D06688.s
@@ -21,8 +21,8 @@ glabel func_80240F58_D06688
 /* D066C8 80240F98 2414FFFC */  addiu     $s4, $zero, -4
 /* D066CC 80240F9C 24130008 */  addiu     $s3, $zero, 8
 /* D066D0 80240FA0 3C120080 */  lui       $s2, 0x80
-/* D066D4 80240FA4 3C038015 */  lui       $v1, 0x8015
-/* D066D8 80240FA8 8C6312F0 */  lw        $v1, 0x12f0($v1)
+/* D066D4 80240FA4 3C038015 */  lui       $v1, %hi(D_801512F0)
+/* D066D8 80240FA8 8C6312F0 */  lw        $v1, %lo(D_801512F0)($v1)
 /* D066DC 80240FAC 24020001 */  addiu     $v0, $zero, 1
 /* D066E0 80240FB0 0C046F97 */  jal       set_background_color_blend
 /* D066E4 80240FB4 A0620000 */   sb       $v0, ($v1)
diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802410A4_D067D4.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802410A4_D067D4.s
index 9b29db2790..2d10796fd1 100644
--- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802410A4_D067D4.s
+++ b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802410A4_D067D4.s
@@ -49,8 +49,8 @@ glabel func_802410A4_D067D4
 /* D06878 80241148 2413FFFC */  addiu     $s3, $zero, -4
 /* D0687C 8024114C 24120008 */  addiu     $s2, $zero, 8
 /* D06880 80241150 3C11FF7F */  lui       $s1, 0xff7f
-/* D06884 80241154 3C028015 */  lui       $v0, 0x8015
-/* D06888 80241158 8C4212F0 */  lw        $v0, 0x12f0($v0)
+/* D06884 80241154 3C028015 */  lui       $v0, %hi(D_801512F0)
+/* D06888 80241158 8C4212F0 */  lw        $v0, %lo(D_801512F0)($v0)
 /* D0688C 8024115C 3631FFFF */  ori       $s1, $s1, 0xffff
 /* D06890 80241160 A0400000 */  sb        $zero, ($v0)
 .L80241164:
diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_8024129C_D069CC.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_8024129C_D069CC.s
index 34aae16205..e12e0854b8 100644
--- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_8024129C_D069CC.s
+++ b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_8024129C_D069CC.s
@@ -38,8 +38,8 @@ glabel func_8024129C_D069CC
 /* D06A50 80241320 0220202D */  daddu     $a0, $s1, $zero
 /* D06A54 80241324 3C05F4AC */  lui       $a1, 0xf4ac
 /* D06A58 80241328 34A5D481 */  ori       $a1, $a1, 0xd481
-/* D06A5C 8024132C 3C108025 */  lui       $s0, 0x8025
-/* D06A60 80241330 2610B9B0 */  addiu     $s0, $s0, -0x4650
+/* D06A5C 8024132C 3C108025 */  lui       $s0, %hi(D_8024B9B0)
+/* D06A60 80241330 2610B9B0 */  addiu     $s0, $s0, %lo(D_8024B9B0)
 /* D06A64 80241334 0C0B1EAF */  jal       get_variable
 /* D06A68 80241338 AE020000 */   sw       $v0, ($s0)
 /* D06A6C 8024133C 0220202D */  daddu     $a0, $s1, $zero
@@ -66,8 +66,8 @@ glabel func_8024129C_D069CC
 /* D06AC0 80241390 0000202D */   daddu    $a0, $zero, $zero
 /* D06AC4 80241394 0220202D */  daddu     $a0, $s1, $zero
 /* D06AC8 80241398 3C05F4AC */  lui       $a1, 0xf4ac
-/* D06ACC 8024139C 3C018025 */  lui       $at, 0x8025
-/* D06AD0 802413A0 AC22B9B4 */  sw        $v0, -0x464c($at)
+/* D06ACC 8024139C 3C018025 */  lui       $at, %hi(D_8024B9B4)
+/* D06AD0 802413A0 AC22B9B4 */  sw        $v0, %lo(D_8024B9B4)($at)
 /* D06AD4 802413A4 0C0B1EAF */  jal       get_variable
 /* D06AD8 802413A8 34A5D481 */   ori      $a1, $a1, 0xd481
 /* D06ADC 802413AC 0220202D */  daddu     $a0, $s1, $zero
@@ -98,16 +98,16 @@ glabel func_8024129C_D069CC
 /* D06B40 80241410 E7A00010 */   swc1     $f0, 0x10($sp)
 /* D06B44 80241414 8E030000 */  lw        $v1, ($s0)
 /* D06B48 80241418 8C64000C */  lw        $a0, 0xc($v1)
-/* D06B4C 8024141C 3C018025 */  lui       $at, 0x8025
-/* D06B50 80241420 AC22B9B8 */  sw        $v0, -0x4648($at)
+/* D06B4C 8024141C 3C018025 */  lui       $at, %hi(D_8024B9B8)
+/* D06B50 80241420 AC22B9B8 */  sw        $v0, %lo(D_8024B9B8)($at)
 /* D06B54 80241424 AC800018 */  sw        $zero, 0x18($a0)
 /* D06B58 80241428 AC800020 */  sw        $zero, 0x20($a0)
 /* D06B5C 8024142C AC800024 */  sw        $zero, 0x24($a0)
 /* D06B60 80241430 AC800028 */  sw        $zero, 0x28($a0)
 /* D06B64 80241434 AC80001C */  sw        $zero, 0x1c($a0)
 .L80241438:
-/* D06B68 80241438 3C028025 */  lui       $v0, 0x8025
-/* D06B6C 8024143C 8C42B9B0 */  lw        $v0, -0x4650($v0)
+/* D06B68 80241438 3C028025 */  lui       $v0, %hi(D_8024B9B0)
+/* D06B6C 8024143C 8C42B9B0 */  lw        $v0, %lo(D_8024B9B0)($v0)
 /* D06B70 80241440 8C44000C */  lw        $a0, 0xc($v0)
 /* D06B74 80241444 8C820020 */  lw        $v0, 0x20($a0)
 /* D06B78 80241448 8C830028 */  lw        $v1, 0x28($a0)
diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802414B4_D06BE4.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802414B4_D06BE4.s
index 6b69371017..f4a8c65a7f 100644
--- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802414B4_D06BE4.s
+++ b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802414B4_D06BE4.s
@@ -5,19 +5,19 @@ glabel func_802414B4_D06BE4
 /* D06BE4 802414B4 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* D06BE8 802414B8 10A0000B */  beqz      $a1, .L802414E8
 /* D06BEC 802414BC AFBF0010 */   sw       $ra, 0x10($sp)
-/* D06BF0 802414C0 3C038025 */  lui       $v1, 0x8025
-/* D06BF4 802414C4 8C63B9B4 */  lw        $v1, -0x464c($v1)
+/* D06BF0 802414C0 3C038025 */  lui       $v1, %hi(D_8024B9B4)
+/* D06BF4 802414C4 8C63B9B4 */  lw        $v1, %lo(D_8024B9B4)($v1)
 /* D06BF8 802414C8 8C620000 */  lw        $v0, ($v1)
-/* D06BFC 802414CC 3C048025 */  lui       $a0, 0x8025
-/* D06C00 802414D0 8C84B9B8 */  lw        $a0, -0x4648($a0)
+/* D06BFC 802414CC 3C048025 */  lui       $a0, %hi(D_8024B9B8)
+/* D06C00 802414D0 8C84B9B8 */  lw        $a0, %lo(D_8024B9B8)($a0)
 /* D06C04 802414D4 34420010 */  ori       $v0, $v0, 0x10
 /* D06C08 802414D8 AC620000 */  sw        $v0, ($v1)
 /* D06C0C 802414DC 8C820000 */  lw        $v0, ($a0)
 /* D06C10 802414E0 34420010 */  ori       $v0, $v0, 0x10
 /* D06C14 802414E4 AC820000 */  sw        $v0, ($a0)
 .L802414E8:
-/* D06C18 802414E8 3C048025 */  lui       $a0, 0x8025
-/* D06C1C 802414EC 8C84B9B0 */  lw        $a0, -0x4650($a0)
+/* D06C18 802414E8 3C048025 */  lui       $a0, %hi(D_8024B9B0)
+/* D06C1C 802414EC 8C84B9B0 */  lw        $a0, %lo(D_8024B9B0)($a0)
 /* D06C20 802414F0 8C85000C */  lw        $a1, 0xc($a0)
 /* D06C24 802414F4 8CA20018 */  lw        $v0, 0x18($a1)
 /* D06C28 802414F8 8CA30020 */  lw        $v1, 0x20($a1)
@@ -41,8 +41,8 @@ glabel func_802414B4_D06BE4
 .L80241540:
 /* D06C70 80241540 0C016914 */  jal       remove_effect
 /* D06C74 80241544 ACA00018 */   sw       $zero, 0x18($a1)
-/* D06C78 80241548 3C048025 */  lui       $a0, 0x8025
-/* D06C7C 8024154C 8C84B990 */  lw        $a0, -0x4670($a0)
+/* D06C78 80241548 3C048025 */  lui       $a0, %hi(D_8024B990)
+/* D06C7C 8024154C 8C84B990 */  lw        $a0, %lo(D_8024B990)($a0)
 /* D06C80 80241550 0C048D70 */  jal       func_801235C0
 /* D06C84 80241554 00000000 */   nop      
 /* D06C88 80241558 24020002 */  addiu     $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241568_D06C98.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241568_D06C98.s
index 3a13f04b6b..b6af611b89 100644
--- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241568_D06C98.s
+++ b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241568_D06C98.s
@@ -7,8 +7,8 @@ glabel func_80241568_D06C98
 /* D06CA0 80241570 8C82000C */  lw        $v0, 0xc($a0)
 /* D06CA4 80241574 0C0B1EAF */  jal       get_variable
 /* D06CA8 80241578 8C450000 */   lw       $a1, ($v0)
-/* D06CAC 8024157C 3C038025 */  lui       $v1, 0x8025
-/* D06CB0 80241580 8C63B9B0 */  lw        $v1, -0x4650($v1)
+/* D06CAC 8024157C 3C038025 */  lui       $v1, %hi(D_8024B9B0)
+/* D06CB0 80241580 8C63B9B0 */  lw        $v1, %lo(D_8024B9B0)($v1)
 /* D06CB4 80241584 8C63000C */  lw        $v1, 0xc($v1)
 /* D06CB8 80241588 AC620034 */  sw        $v0, 0x34($v1)
 /* D06CBC 8024158C 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_8024159C_D06CCC.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_8024159C_D06CCC.s
index 10e2a8cf9c..bdc1bbe6a7 100644
--- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_8024159C_D06CCC.s
+++ b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_8024159C_D06CCC.s
@@ -8,8 +8,8 @@ glabel func_8024159C_D06CCC
 /* D06CD8 802415A8 0C0B1EAF */  jal       get_variable
 /* D06CDC 802415AC 8C450000 */   lw       $a1, ($v0)
 /* D06CE0 802415B0 0040202D */  daddu     $a0, $v0, $zero
-/* D06CE4 802415B4 3C028025 */  lui       $v0, 0x8025
-/* D06CE8 802415B8 8C42B9B0 */  lw        $v0, -0x4650($v0)
+/* D06CE4 802415B4 3C028025 */  lui       $v0, %hi(D_8024B9B0)
+/* D06CE8 802415B8 8C42B9B0 */  lw        $v0, %lo(D_8024B9B0)($v0)
 /* D06CEC 802415BC 24030001 */  addiu     $v1, $zero, 1
 /* D06CF0 802415C0 8C45000C */  lw        $a1, 0xc($v0)
 /* D06CF4 802415C4 1083000D */  beq       $a0, $v1, .L802415FC
diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_8024161C_D06D4C.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_8024161C_D06D4C.s
index 2dd5c7023e..aedfbd9c5b 100644
--- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_8024161C_D06D4C.s
+++ b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_8024161C_D06D4C.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_8024161C_D06D4C
-/* D06D4C 8024161C 3C028025 */  lui       $v0, 0x8025
-/* D06D50 80241620 8C42B9B8 */  lw        $v0, -0x4648($v0)
+/* D06D4C 8024161C 3C028025 */  lui       $v0, %hi(D_8024B9B8)
+/* D06D50 80241620 8C42B9B8 */  lw        $v0, %lo(D_8024B9B8)($v0)
 /* D06D54 80241624 8C42000C */  lw        $v0, 0xc($v0)
 /* D06D58 80241628 AC40001C */  sw        $zero, 0x1c($v0)
 /* D06D5C 8024162C 03E00008 */  jr        $ra
diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241634_D06D64.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241634_D06D64.s
index 20cbb34169..2db063a459 100644
--- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241634_D06D64.s
+++ b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241634_D06D64.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80241634_D06D64
-/* D06D64 80241634 3C028025 */  lui       $v0, 0x8025
-/* D06D68 80241638 8C42B9B8 */  lw        $v0, -0x4648($v0)
+/* D06D64 80241634 3C028025 */  lui       $v0, %hi(D_8024B9B8)
+/* D06D68 80241638 8C42B9B8 */  lw        $v0, %lo(D_8024B9B8)($v0)
 /* D06D6C 8024163C 8C43000C */  lw        $v1, 0xc($v0)
 /* D06D70 80241640 24020001 */  addiu     $v0, $zero, 1
 /* D06D74 80241644 AC62001C */  sw        $v0, 0x1c($v1)
diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241650_D06D80.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241650_D06D80.s
index 26be5e8d21..99be28edad 100644
--- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241650_D06D80.s
+++ b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241650_D06D80.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80241650_D06D80
-/* D06D80 80241650 3C028025 */  lui       $v0, 0x8025
-/* D06D84 80241654 8C42B9B8 */  lw        $v0, -0x4648($v0)
+/* D06D80 80241650 3C028025 */  lui       $v0, %hi(D_8024B9B8)
+/* D06D84 80241654 8C42B9B8 */  lw        $v0, %lo(D_8024B9B8)($v0)
 /* D06D88 80241658 8C43000C */  lw        $v1, 0xc($v0)
 /* D06D8C 8024165C 24020002 */  addiu     $v0, $zero, 2
 /* D06D90 80241660 03E00008 */  jr        $ra
diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241B24_D07254.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241B24_D07254.s
index 9fc791d43c..9c3ff0eb17 100644
--- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241B24_D07254.s
+++ b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241B24_D07254.s
@@ -3,8 +3,8 @@
 
 glabel func_80241B24_D07254
 /* D07254 80241B24 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D07258 80241B28 3C058025 */  lui       $a1, 0x8025
-/* D0725C 80241B2C 8CA5B9A8 */  lw        $a1, -0x4658($a1)
+/* D07258 80241B28 3C058025 */  lui       $a1, %hi(D_8024B9A8)
+/* D0725C 80241B2C 8CA5B9A8 */  lw        $a1, %lo(D_8024B9A8)($a1)
 /* D07260 80241B30 AFBF0010 */  sw        $ra, 0x10($sp)
 /* D07264 80241B34 0C0B1EAF */  jal       get_variable
 /* D07268 80241B38 0000202D */   daddu    $a0, $zero, $zero
diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241B90_D072C0.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241B90_D072C0.s
index 04b79cc2f6..47bdde6773 100644
--- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241B90_D072C0.s
+++ b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241B90_D072C0.s
@@ -3,14 +3,14 @@
 
 glabel func_80241B90_D072C0
 /* D072C0 80241B90 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D072C4 80241B94 3C058024 */  lui       $a1, 0x8024
-/* D072C8 80241B98 24A51B24 */  addiu     $a1, $a1, 0x1b24
+/* D072C4 80241B94 3C058024 */  lui       $a1, %hi(D_80241B24)
+/* D072C8 80241B98 24A51B24 */  addiu     $a1, $a1, %lo(D_80241B24)
 /* D072CC 80241B9C AFBF0010 */  sw        $ra, 0x10($sp)
 /* D072D0 80241BA0 0C048C8F */  jal       bind_dynamic_entity_7
 /* D072D4 80241BA4 0000202D */   daddu    $a0, $zero, $zero
 /* D072D8 80241BA8 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D072DC 80241BAC 3C018025 */  lui       $at, 0x8025
-/* D072E0 80241BB0 AC22B990 */  sw        $v0, -0x4670($at)
+/* D072DC 80241BAC 3C018025 */  lui       $at, %hi(D_8024B990)
+/* D072E0 80241BB0 AC22B990 */  sw        $v0, %lo(D_8024B990)($at)
 /* D072E4 80241BB4 24020002 */  addiu     $v0, $zero, 2
 /* D072E8 80241BB8 03E00008 */  jr        $ra
 /* D072EC 80241BBC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_80240258_D11318.s b/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_80240258_D11318.s
index 28cfe09a91..441f5aafe0 100644
--- a/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_80240258_D11318.s
+++ b/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_80240258_D11318.s
@@ -18,8 +18,8 @@ glabel func_80240258_D11318
 /* D1134C 8024028C 0040802D */  daddu     $s0, $v0, $zero
 /* D11350 80240290 3C05800B */  lui       $a1, %hi(gCameras)
 /* D11354 80240294 24A51D80 */  addiu     $a1, $a1, %lo(gCameras)
-/* D11358 80240298 3C03800A */  lui       $v1, 0x800a
-/* D1135C 8024029C 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D11358 80240298 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D1135C 8024029C 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D11360 802402A0 00912021 */  addu      $a0, $a0, $s1
 /* D11364 802402A4 00031080 */  sll       $v0, $v1, 2
 /* D11368 802402A8 00431021 */  addu      $v0, $v0, $v1
@@ -54,8 +54,8 @@ glabel func_80240258_D11318
 /* D113D8 80240318 00000000 */   nop      
 /* D113DC 8024031C 0C00A6C9 */  jal       clamp_angle
 /* D113E0 80240320 46000306 */   mov.s    $f12, $f0
-/* D113E4 80240324 3C018024 */  lui       $at, 0x8024
-/* D113E8 80240328 D4222370 */  ldc1      $f2, 0x2370($at)
+/* D113E4 80240324 3C018024 */  lui       $at, %hi(D_80242370)
+/* D113E8 80240328 D4222370 */  ldc1      $f2, %lo(D_80242370)($at)
 /* D113EC 8024032C 46000021 */  cvt.d.s   $f0, $f0
 /* D113F0 80240330 4622003C */  c.lt.d    $f0, $f2
 /* D113F4 80240334 00000000 */  nop       
@@ -97,8 +97,8 @@ glabel func_80240258_D11318
 /* D1147C 802403BC 45030001 */  bc1tl     .L802403C4
 /* D11480 802403C0 0000882D */   daddu    $s1, $zero, $zero
 .L802403C4:
-/* D11484 802403C4 3C038011 */  lui       $v1, 0x8011
-/* D11488 802403C8 8063EBB3 */  lb        $v1, -0x144d($v1)
+/* D11484 802403C4 3C038011 */  lui       $v1, %hi(D_8010EBB3)
+/* D11488 802403C8 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
 /* D1148C 802403CC 24020009 */  addiu     $v0, $zero, 9
 /* D11490 802403D0 50620001 */  beql      $v1, $v0, .L802403D8
 /* D11494 802403D4 0000882D */   daddu    $s1, $zero, $zero
diff --git a/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_8024066C_D1172C.s b/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_8024066C_D1172C.s
index 58e63e9dfb..8906b2e7a6 100644
--- a/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_8024066C_D1172C.s
+++ b/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_8024066C_D1172C.s
@@ -100,9 +100,9 @@ glabel func_8024066C_D1172C
 /* D11890 802407D0 2C620064 */  sltiu     $v0, $v1, 0x64
 /* D11894 802407D4 10400048 */  beqz      $v0, .L802408F8
 /* D11898 802407D8 00031080 */   sll      $v0, $v1, 2
-/* D1189C 802407DC 3C018024 */  lui       $at, 0x8024
+/* D1189C 802407DC 3C018024 */  lui       $at, %hi(D_80242378)
 /* D118A0 802407E0 00220821 */  addu      $at, $at, $v0
-/* D118A4 802407E4 8C222378 */  lw        $v0, 0x2378($at)
+/* D118A4 802407E4 8C222378 */  lw        $v0, %lo(D_80242378)($at)
 /* D118A8 802407E8 00400008 */  jr        $v0
 /* D118AC 802407EC 00000000 */   nop      
 /* D118B0 802407F0 0240202D */  daddu     $a0, $s2, $zero
diff --git a/asm/nonmatchings/world/area_sam/sam_04/D138E0/func_8024053C_D13B0C.s b/asm/nonmatchings/world/area_sam/sam_04/D138E0/func_8024053C_D13B0C.s
index aee3181563..d8cf108bde 100644
--- a/asm/nonmatchings/world/area_sam/sam_04/D138E0/func_8024053C_D13B0C.s
+++ b/asm/nonmatchings/world/area_sam/sam_04/D138E0/func_8024053C_D13B0C.s
@@ -6,11 +6,11 @@ glabel func_8024053C_D13B0C
 /* D13B10 80240540 AFBF0010 */  sw        $ra, 0x10($sp)
 /* D13B14 80240544 10A00003 */  beqz      $a1, .L80240554
 /* D13B18 80240548 8C86000C */   lw       $a2, 0xc($a0)
-/* D13B1C 8024054C 3C018024 */  lui       $at, 0x8024
-/* D13B20 80240550 AC20387C */  sw        $zero, 0x387c($at)
+/* D13B1C 8024054C 3C018024 */  lui       $at, %hi(D_8024387C)
+/* D13B20 80240550 AC20387C */  sw        $zero, %lo(D_8024387C)($at)
 .L80240554:
-/* D13B24 80240554 3C038024 */  lui       $v1, 0x8024
-/* D13B28 80240558 2463387C */  addiu     $v1, $v1, 0x387c
+/* D13B24 80240554 3C038024 */  lui       $v1, %hi(D_8024387C)
+/* D13B28 80240558 2463387C */  addiu     $v1, $v1, %lo(D_8024387C)
 /* D13B2C 8024055C 8C620000 */  lw        $v0, ($v1)
 /* D13B30 80240560 54400003 */  bnel      $v0, $zero, .L80240570
 /* D13B34 80240564 AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_8024053C_D13B0C
 /* D13B3C 8024056C 0000102D */   daddu    $v0, $zero, $zero
 .L80240570:
 /* D13B40 80240570 8CC50000 */  lw        $a1, ($a2)
-/* D13B44 80240574 3C068024 */  lui       $a2, 0x8024
+/* D13B44 80240574 3C068024 */  lui       $a2, %hi(D_80243880)
 /* D13B48 80240578 0C0B2026 */  jal       set_variable
-/* D13B4C 8024057C 8CC63880 */   lw       $a2, 0x3880($a2)
+/* D13B4C 8024057C 8CC63880 */   lw       $a2, %lo(D_80243880)($a2)
 /* D13B50 80240580 24020002 */  addiu     $v0, $zero, 2
 .L80240584:
 /* D13B54 80240584 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_sam/sam_04/D138E0/func_80240590_D13B60.s b/asm/nonmatchings/world/area_sam/sam_04/D138E0/func_80240590_D13B60.s
index 52d4fec4ab..b96f0de615 100644
--- a/asm/nonmatchings/world/area_sam/sam_04/D138E0/func_80240590_D13B60.s
+++ b/asm/nonmatchings/world/area_sam/sam_04/D138E0/func_80240590_D13B60.s
@@ -7,12 +7,12 @@ glabel func_80240590_D13B60
 /* D13B68 80240598 8C82000C */  lw        $v0, 0xc($a0)
 /* D13B6C 8024059C 0C0B1EAF */  jal       get_variable
 /* D13B70 802405A0 8C450000 */   lw       $a1, ($v0)
-/* D13B74 802405A4 3C018024 */  lui       $at, 0x8024
-/* D13B78 802405A8 AC223880 */  sw        $v0, 0x3880($at)
+/* D13B74 802405A4 3C018024 */  lui       $at, %hi(D_80243880)
+/* D13B78 802405A8 AC223880 */  sw        $v0, %lo(D_80243880)($at)
 /* D13B7C 802405AC 24020002 */  addiu     $v0, $zero, 2
 /* D13B80 802405B0 8FBF0010 */  lw        $ra, 0x10($sp)
 /* D13B84 802405B4 24030001 */  addiu     $v1, $zero, 1
-/* D13B88 802405B8 3C018024 */  lui       $at, 0x8024
-/* D13B8C 802405BC AC23387C */  sw        $v1, 0x387c($at)
+/* D13B88 802405B8 3C018024 */  lui       $at, %hi(D_8024387C)
+/* D13B8C 802405BC AC23387C */  sw        $v1, %lo(D_8024387C)($at)
 /* D13B90 802405C0 03E00008 */  jr        $ra
 /* D13B94 802405C4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_sam/sam_04/D138E0/func_802405C8_D13B98.s b/asm/nonmatchings/world/area_sam/sam_04/D138E0/func_802405C8_D13B98.s
index 1c3bbfcd25..db0297b4c3 100644
--- a/asm/nonmatchings/world/area_sam/sam_04/D138E0/func_802405C8_D13B98.s
+++ b/asm/nonmatchings/world/area_sam/sam_04/D138E0/func_802405C8_D13B98.s
@@ -13,8 +13,8 @@ glabel func_802405C8_D13B98
 /* D13BB8 802405E8 8C620000 */  lw        $v0, ($v1)
 /* D13BBC 802405EC 5040000A */  beql      $v0, $zero, .L80240618
 /* D13BC0 802405F0 00041080 */   sll      $v0, $a0, 2
-/* D13BC4 802405F4 3C058024 */  lui       $a1, 0x8024
-/* D13BC8 802405F8 24A55210 */  addiu     $a1, $a1, 0x5210
+/* D13BC4 802405F4 3C058024 */  lui       $a1, %hi(D_80245210)
+/* D13BC8 802405F8 24A55210 */  addiu     $a1, $a1, %lo(D_80245210)
 .L802405FC:
 /* D13BCC 802405FC 24630004 */  addiu     $v1, $v1, 4
 /* D13BD0 80240600 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_802405C8_D13B98
 /* D13BE0 80240610 24A50004 */   addiu    $a1, $a1, 4
 /* D13BE4 80240614 00041080 */  sll       $v0, $a0, 2
 .L80240618:
-/* D13BE8 80240618 3C018024 */  lui       $at, 0x8024
+/* D13BE8 80240618 3C018024 */  lui       $at, %hi(D_80245210)
 /* D13BEC 8024061C 00220821 */  addu      $at, $at, $v0
-/* D13BF0 80240620 AC205210 */  sw        $zero, 0x5210($at)
+/* D13BF0 80240620 AC205210 */  sw        $zero, %lo(D_80245210)($at)
 /* D13BF4 80240624 08090195 */  j         .L80240654
 /* D13BF8 80240628 00000000 */   nop      
 .L8024062C:
-/* D13BFC 8024062C 3C038024 */  lui       $v1, 0x8024
-/* D13C00 80240630 24635210 */  addiu     $v1, $v1, 0x5210
+/* D13BFC 8024062C 3C038024 */  lui       $v1, %hi(D_80245210)
+/* D13C00 80240630 24635210 */  addiu     $v1, $v1, %lo(D_80245210)
 /* D13C04 80240634 0060282D */  daddu     $a1, $v1, $zero
 .L80240638:
 /* D13C08 80240638 24820010 */  addiu     $v0, $a0, 0x10
diff --git a/asm/nonmatchings/world/area_sam/sam_04/D138E0/func_80240664_D13C34.s b/asm/nonmatchings/world/area_sam/sam_04/D138E0/func_80240664_D13C34.s
index 2db003f144..1691e68a2d 100644
--- a/asm/nonmatchings/world/area_sam/sam_04/D138E0/func_80240664_D13C34.s
+++ b/asm/nonmatchings/world/area_sam/sam_04/D138E0/func_80240664_D13C34.s
@@ -13,8 +13,8 @@ glabel func_80240664_D13C34
 /* D13C54 80240684 8C620000 */  lw        $v0, ($v1)
 /* D13C58 80240688 5040000A */  beql      $v0, $zero, .L802406B4
 /* D13C5C 8024068C 00041080 */   sll      $v0, $a0, 2
-/* D13C60 80240690 3C058024 */  lui       $a1, 0x8024
-/* D13C64 80240694 24A553D8 */  addiu     $a1, $a1, 0x53d8
+/* D13C60 80240690 3C058024 */  lui       $a1, %hi(D_802453D8)
+/* D13C64 80240694 24A553D8 */  addiu     $a1, $a1, %lo(D_802453D8)
 .L80240698:
 /* D13C68 80240698 24630004 */  addiu     $v1, $v1, 4
 /* D13C6C 8024069C 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_80240664_D13C34
 /* D13C7C 802406AC 24A50004 */   addiu    $a1, $a1, 4
 /* D13C80 802406B0 00041080 */  sll       $v0, $a0, 2
 .L802406B4:
-/* D13C84 802406B4 3C018024 */  lui       $at, 0x8024
+/* D13C84 802406B4 3C018024 */  lui       $at, %hi(D_802453D8)
 /* D13C88 802406B8 00220821 */  addu      $at, $at, $v0
-/* D13C8C 802406BC AC2053D8 */  sw        $zero, 0x53d8($at)
+/* D13C8C 802406BC AC2053D8 */  sw        $zero, %lo(D_802453D8)($at)
 /* D13C90 802406C0 080901BC */  j         .L802406F0
 /* D13C94 802406C4 00000000 */   nop      
 .L802406C8:
-/* D13C98 802406C8 3C038024 */  lui       $v1, 0x8024
-/* D13C9C 802406CC 246353D8 */  addiu     $v1, $v1, 0x53d8
+/* D13C98 802406C8 3C038024 */  lui       $v1, %hi(D_802453D8)
+/* D13C9C 802406CC 246353D8 */  addiu     $v1, $v1, %lo(D_802453D8)
 /* D13CA0 802406D0 0060282D */  daddu     $a1, $v1, $zero
 .L802406D4:
 /* D13CA4 802406D4 24820080 */  addiu     $v0, $a0, 0x80
diff --git a/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80240208_D189E8.s b/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80240208_D189E8.s
index ac3555908a..8fe17cac32 100644
--- a/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80240208_D189E8.s
+++ b/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80240208_D189E8.s
@@ -18,8 +18,8 @@ glabel func_80240208_D189E8
 /* D18A1C 8024023C 0040802D */  daddu     $s0, $v0, $zero
 /* D18A20 80240240 3C05800B */  lui       $a1, %hi(gCameras)
 /* D18A24 80240244 24A51D80 */  addiu     $a1, $a1, %lo(gCameras)
-/* D18A28 80240248 3C03800A */  lui       $v1, 0x800a
-/* D18A2C 8024024C 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D18A28 80240248 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D18A2C 8024024C 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D18A30 80240250 00912021 */  addu      $a0, $a0, $s1
 /* D18A34 80240254 00031080 */  sll       $v0, $v1, 2
 /* D18A38 80240258 00431021 */  addu      $v0, $v0, $v1
@@ -54,8 +54,8 @@ glabel func_80240208_D189E8
 /* D18AA8 802402C8 00000000 */   nop      
 /* D18AAC 802402CC 0C00A6C9 */  jal       clamp_angle
 /* D18AB0 802402D0 46000306 */   mov.s    $f12, $f0
-/* D18AB4 802402D4 3C018024 */  lui       $at, 0x8024
-/* D18AB8 802402D8 D42274E0 */  ldc1      $f2, 0x74e0($at)
+/* D18AB4 802402D4 3C018024 */  lui       $at, %hi(D_802474E0)
+/* D18AB8 802402D8 D42274E0 */  ldc1      $f2, %lo(D_802474E0)($at)
 /* D18ABC 802402DC 46000021 */  cvt.d.s   $f0, $f0
 /* D18AC0 802402E0 4622003C */  c.lt.d    $f0, $f2
 /* D18AC4 802402E4 00000000 */  nop       
@@ -97,8 +97,8 @@ glabel func_80240208_D189E8
 /* D18B4C 8024036C 45030001 */  bc1tl     .L80240374
 /* D18B50 80240370 0000882D */   daddu    $s1, $zero, $zero
 .L80240374:
-/* D18B54 80240374 3C038011 */  lui       $v1, 0x8011
-/* D18B58 80240378 8063EBB3 */  lb        $v1, -0x144d($v1)
+/* D18B54 80240374 3C038011 */  lui       $v1, %hi(D_8010EBB3)
+/* D18B58 80240378 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
 /* D18B5C 8024037C 24020009 */  addiu     $v0, $zero, 9
 /* D18B60 80240380 50620001 */  beql      $v1, $v0, .L80240388
 /* D18B64 80240384 0000882D */   daddu    $s1, $zero, $zero
diff --git a/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_8024061C_D18DFC.s b/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_8024061C_D18DFC.s
index b74643b5eb..87cde5c1ec 100644
--- a/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_8024061C_D18DFC.s
+++ b/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_8024061C_D18DFC.s
@@ -100,9 +100,9 @@ glabel func_8024061C_D18DFC
 /* D18F60 80240780 2C620064 */  sltiu     $v0, $v1, 0x64
 /* D18F64 80240784 10400048 */  beqz      $v0, .L802408A8
 /* D18F68 80240788 00031080 */   sll      $v0, $v1, 2
-/* D18F6C 8024078C 3C018024 */  lui       $at, 0x8024
+/* D18F6C 8024078C 3C018024 */  lui       $at, %hi(D_802474E8)
 /* D18F70 80240790 00220821 */  addu      $at, $at, $v0
-/* D18F74 80240794 8C2274E8 */  lw        $v0, 0x74e8($at)
+/* D18F74 80240794 8C2274E8 */  lw        $v0, %lo(D_802474E8)($at)
 /* D18F78 80240798 00400008 */  jr        $v0
 /* D18F7C 8024079C 00000000 */   nop      
 /* D18F80 802407A0 0240202D */  daddu     $a0, $s2, $zero
diff --git a/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80240A38_D19218.s b/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80240A38_D19218.s
index 76229013e5..4d7a224c83 100644
--- a/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80240A38_D19218.s
+++ b/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80240A38_D19218.s
@@ -62,9 +62,9 @@ glabel func_80240A38_D19218
 /* D192F8 80240B18 000218C0 */  sll       $v1, $v0, 3
 /* D192FC 80240B1C 00431021 */  addu      $v0, $v0, $v1
 /* D19300 80240B20 000210C0 */  sll       $v0, $v0, 3
-/* D19304 80240B24 3C01800B */  lui       $at, 0x800b
+/* D19304 80240B24 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* D19308 80240B28 00220821 */  addu      $at, $at, $v0
-/* D1930C 80240B2C C4201DEC */  lwc1      $f0, 0x1dec($at)
+/* D1930C 80240B2C C4201DEC */  lwc1      $f0, %lo(D_800B1DEC)($at)
 /* D19310 80240B30 080902DD */  j         .L80240B74
 /* D19314 80240B34 460C0301 */   sub.s    $f12, $f0, $f12
 .L80240B38:
@@ -79,9 +79,9 @@ glabel func_80240A38_D19218
 /* D19338 80240B58 000218C0 */  sll       $v1, $v0, 3
 /* D1933C 80240B5C 00431021 */  addu      $v0, $v0, $v1
 /* D19340 80240B60 000210C0 */  sll       $v0, $v0, 3
-/* D19344 80240B64 3C01800B */  lui       $at, 0x800b
+/* D19344 80240B64 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* D19348 80240B68 00220821 */  addu      $at, $at, $v0
-/* D1934C 80240B6C C4201DEC */  lwc1      $f0, 0x1dec($at)
+/* D1934C 80240B6C C4201DEC */  lwc1      $f0, %lo(D_800B1DEC)($at)
 /* D19350 80240B70 460C0300 */  add.s     $f12, $f0, $f12
 .L80240B74:
 /* D19354 80240B74 0C00A6C9 */  jal       clamp_angle
@@ -157,8 +157,8 @@ glabel func_80240A38_D19218
 /* D1945C 80240C7C 1440005D */  bnez      $v0, .L80240DF4
 /* D19460 80240C80 00000000 */   nop      
 /* D19464 80240C84 C6200038 */  lwc1      $f0, 0x38($s1)
-/* D19468 80240C88 3C018024 */  lui       $at, 0x8024
-/* D1946C 80240C8C D4247678 */  ldc1      $f4, 0x7678($at)
+/* D19468 80240C88 3C018024 */  lui       $at, %hi(D_80247678)
+/* D1946C 80240C8C D4247678 */  ldc1      $f4, %lo(D_80247678)($at)
 /* D19470 80240C90 46000021 */  cvt.d.s   $f0, $f0
 /* D19474 80240C94 4620203C */  c.lt.d    $f4, $f0
 /* D19478 80240C98 00000000 */  nop       
@@ -170,8 +170,8 @@ glabel func_80240A38_D19218
 /* D19490 80240CB0 E6200038 */  swc1      $f0, 0x38($s1)
 .L80240CB4:
 /* D19494 80240CB4 C6200038 */  lwc1      $f0, 0x38($s1)
-/* D19498 80240CB8 3C018024 */  lui       $at, 0x8024
-/* D1949C 80240CBC D4227680 */  ldc1      $f2, 0x7680($at)
+/* D19498 80240CB8 3C018024 */  lui       $at, %hi(D_80247680)
+/* D1949C 80240CBC D4227680 */  ldc1      $f2, %lo(D_80247680)($at)
 /* D194A0 80240CC0 46000021 */  cvt.d.s   $f0, $f0
 /* D194A4 80240CC4 4622003C */  c.lt.d    $f0, $f2
 /* D194A8 80240CC8 00000000 */  nop       
@@ -228,8 +228,8 @@ glabel func_80240A38_D19218
 /* D19564 80240D84 4600A386 */   mov.s    $f14, $f20
 /* D19568 80240D88 46000586 */  mov.s     $f22, $f0
 /* D1956C 80240D8C C7A20038 */  lwc1      $f2, 0x38($sp)
-/* D19570 80240D90 3C018024 */  lui       $at, 0x8024
-/* D19574 80240D94 D4207688 */  ldc1      $f0, 0x7688($at)
+/* D19570 80240D90 3C018024 */  lui       $at, %hi(D_80247688)
+/* D19574 80240D94 D4207688 */  ldc1      $f0, %lo(D_80247688)($at)
 /* D19578 80240D98 460010A1 */  cvt.d.s   $f2, $f2
 /* D1957C 80240D9C 4620103C */  c.lt.d    $f2, $f0
 /* D19580 80240DA0 00000000 */  nop       
@@ -239,8 +239,8 @@ glabel func_80240A38_D19218
 /* D19590 80240DB0 08090376 */  j         .L80240DD8
 /* D19594 80240DB4 34C68000 */   ori      $a2, $a2, 0x8000
 .L80240DB8:
-/* D19598 80240DB8 3C018024 */  lui       $at, 0x8024
-/* D1959C 80240DBC D4207690 */  ldc1      $f0, 0x7690($at)
+/* D19598 80240DB8 3C018024 */  lui       $at, %hi(D_80247690)
+/* D1959C 80240DBC D4207690 */  ldc1      $f0, %lo(D_80247690)($at)
 /* D195A0 80240DC0 4622003C */  c.lt.d    $f0, $f2
 /* D195A4 80240DC4 00000000 */  nop       
 /* D195A8 80240DC8 450000FA */  bc1f      .L802411B4
@@ -296,8 +296,8 @@ glabel func_80240A38_D19218
 /* D19668 80240E88 104000CA */  beqz      $v0, .L802411B4
 /* D1966C 80240E8C 0280282D */   daddu    $a1, $s4, $zero
 /* D19670 80240E90 8EA20000 */  lw        $v0, ($s5)
-/* D19674 80240E94 3C018024 */  lui       $at, 0x8024
-/* D19678 80240E98 D4227698 */  ldc1      $f2, 0x7698($at)
+/* D19674 80240E94 3C018024 */  lui       $at, %hi(D_80247698)
+/* D19678 80240E98 D4227698 */  ldc1      $f2, %lo(D_80247698)($at)
 /* D1967C 80240E9C C440002C */  lwc1      $f0, 0x2c($v0)
 /* D19680 80240EA0 C4460028 */  lwc1      $f6, 0x28($v0)
 /* D19684 80240EA4 C4440030 */  lwc1      $f4, 0x30($v0)
@@ -633,8 +633,8 @@ glabel func_80240A38_D19218
 /* D19B80 802413A0 44813000 */  mtc1      $at, $f6
 /* D19B84 802413A4 46000021 */  cvt.d.s   $f0, $f0
 /* D19B88 802413A8 E7A20020 */  swc1      $f2, 0x20($sp)
-/* D19B8C 802413AC 3C018024 */  lui       $at, 0x8024
-/* D19B90 802413B0 D42276A0 */  ldc1      $f2, 0x76a0($at)
+/* D19B8C 802413AC 3C018024 */  lui       $at, %hi(D_802476A0)
+/* D19B90 802413B0 D42276A0 */  ldc1      $f2, %lo(D_802476A0)($at)
 /* D19B94 802413B4 C6240040 */  lwc1      $f4, 0x40($s1)
 /* D19B98 802413B8 46220000 */  add.d     $f0, $f0, $f2
 /* D19B9C 802413BC E7A60038 */  swc1      $f6, 0x38($sp)
diff --git a/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_802419A4_D1A184.s b/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_802419A4_D1A184.s
index 43456b728d..255ecf0526 100644
--- a/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_802419A4_D1A184.s
+++ b/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_802419A4_D1A184.s
@@ -217,8 +217,8 @@ glabel func_802419A4_D1A184
 /* D1A4A8 80241CC8 AFA20018 */  sw        $v0, 0x18($sp)
 .L80241CCC:
 /* D1A4AC 80241CCC 8EC40024 */  lw        $a0, 0x24($s6)
-/* D1A4B0 80241CD0 3C078024 */  lui       $a3, 0x8024
-/* D1A4B4 80241CD4 24E72F90 */  addiu     $a3, $a3, 0x2f90
+/* D1A4B0 80241CD0 3C078024 */  lui       $a3, %hi(D_80242F90)
+/* D1A4B4 80241CD4 24E72F90 */  addiu     $a3, $a3, %lo(D_80242F90)
 .L80241CD8:
 /* D1A4B8 80241CD8 0C0B79E0 */  jal       func_802DE780
 /* D1A4BC 80241CDC 00000000 */   nop      
diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80240550_D203E0.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80240550_D203E0.s
index 3b974202d0..aca0335c85 100644
--- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80240550_D203E0.s
+++ b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80240550_D203E0.s
@@ -87,8 +87,8 @@ glabel func_80240550_D203E0
 /* D20520 80240690 080901AE */  j         .L802406B8
 /* D20524 80240694 E6000018 */   swc1     $f0, 0x18($s0)
 .L80240698:
-/* D20528 80240698 3C018025 */  lui       $at, 0x8025
-/* D2052C 8024069C D422BE40 */  ldc1      $f2, -0x41c0($at)
+/* D20528 80240698 3C018025 */  lui       $at, %hi(D_8024BE40)
+/* D2052C 8024069C D422BE40 */  ldc1      $f2, %lo(D_8024BE40)($at)
 /* D20530 802406A0 44820000 */  mtc1      $v0, $f0
 /* D20534 802406A4 00000000 */  nop       
 /* D20538 802406A8 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80240700_D20590.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80240700_D20590.s
index 84a09e1e54..e0020a296a 100644
--- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80240700_D20590.s
+++ b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80240700_D20590.s
@@ -104,8 +104,8 @@ glabel func_80240700_D20590
 /* D20714 80240884 1040000A */  beqz      $v0, .L802408B0
 /* D20718 80240888 4600C106 */   mov.s    $f4, $f24
 /* D2071C 8024088C 4614C081 */  sub.s     $f2, $f24, $f20
-/* D20720 80240890 3C018025 */  lui       $at, 0x8025
-/* D20724 80240894 D420BE48 */  ldc1      $f0, -0x41b8($at)
+/* D20720 80240890 3C018025 */  lui       $at, %hi(D_8024BE48)
+/* D20724 80240894 D420BE48 */  ldc1      $f0, %lo(D_8024BE48)($at)
 /* D20728 80240898 460010A1 */  cvt.d.s   $f2, $f2
 /* D2072C 8024089C 46201082 */  mul.d     $f2, $f2, $f0
 /* D20730 802408A0 00000000 */  nop       
@@ -131,8 +131,8 @@ glabel func_80240700_D20590
 /* D2077C 802408EC C7A4002C */  lwc1      $f4, 0x2c($sp)
 /* D20780 802408F0 461A2100 */  add.s     $f4, $f4, $f26
 /* D20784 802408F4 46142081 */  sub.s     $f2, $f4, $f20
-/* D20788 802408F8 3C018025 */  lui       $at, 0x8025
-/* D2078C 802408FC D420BE50 */  ldc1      $f0, -0x41b0($at)
+/* D20788 802408F8 3C018025 */  lui       $at, %hi(D_8024BE50)
+/* D2078C 802408FC D420BE50 */  ldc1      $f0, %lo(D_8024BE50)($at)
 /* D20790 80240900 460010A1 */  cvt.d.s   $f2, $f2
 /* D20794 80240904 46201082 */  mul.d     $f2, $f2, $f0
 /* D20798 80240908 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_802411A4_D21034.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_802411A4_D21034.s
index 654f0c54ec..f06d69404a 100644
--- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_802411A4_D21034.s
+++ b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_802411A4_D21034.s
@@ -15,9 +15,9 @@ glabel func_802411A4_D21034
 /* D2105C 802411CC 00031C00 */  sll       $v1, $v1, 0x10
 /* D21060 802411D0 00031B83 */  sra       $v1, $v1, 0xe
 /* D21064 802411D4 A444008E */  sh        $a0, 0x8e($v0)
-/* D21068 802411D8 3C018024 */  lui       $at, 0x8024
+/* D21068 802411D8 3C018024 */  lui       $at, %hi(D_802441B8)
 /* D2106C 802411DC 00230821 */  addu      $at, $at, $v1
-/* D21070 802411E0 C42241B8 */  lwc1      $f2, 0x41b8($at)
+/* D21070 802411E0 C42241B8 */  lwc1      $f2, %lo(D_802441B8)($at)
 /* D21074 802411E4 8443008E */  lh        $v1, 0x8e($v0)
 /* D21078 802411E8 46020000 */  add.s     $f0, $f0, $f2
 /* D2107C 802411EC 28630005 */  slti      $v1, $v1, 5
diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024185C_D216EC.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024185C_D216EC.s
index 2718a6047a..222681131d 100644
--- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024185C_D216EC.s
+++ b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024185C_D216EC.s
@@ -66,9 +66,9 @@ glabel func_8024185C_D216EC
 /* D217D8 80241948 2C62000F */  sltiu     $v0, $v1, 0xf
 /* D217DC 8024194C 10400034 */  beqz      $v0, .L80241A20
 /* D217E0 80241950 00031080 */   sll      $v0, $v1, 2
-/* D217E4 80241954 3C018025 */  lui       $at, 0x8025
+/* D217E4 80241954 3C018025 */  lui       $at, %hi(D_8024BE58)
 /* D217E8 80241958 00220821 */  addu      $at, $at, $v0
-/* D217EC 8024195C 8C22BE58 */  lw        $v0, -0x41a8($at)
+/* D217EC 8024195C 8C22BE58 */  lw        $v0, %lo(D_8024BE58)($at)
 /* D217F0 80241960 00400008 */  jr        $v0
 /* D217F4 80241964 00000000 */   nop      
 /* D217F8 80241968 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241A48_D218D8.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241A48_D218D8.s
index ba8ad6694d..cbc757d2f5 100644
--- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241A48_D218D8.s
+++ b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241A48_D218D8.s
@@ -4,8 +4,8 @@
 glabel func_80241A48_D218D8
 /* D218D8 80241A48 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* D218DC 80241A4C AFB00010 */  sw        $s0, 0x10($sp)
-/* D218E0 80241A50 3C108024 */  lui       $s0, 0x8024
-/* D218E4 80241A54 261043D0 */  addiu     $s0, $s0, 0x43d0
+/* D218E0 80241A50 3C108024 */  lui       $s0, %hi(D_802443D0)
+/* D218E4 80241A54 261043D0 */  addiu     $s0, $s0, %lo(D_802443D0)
 /* D218E8 80241A58 AFBF0018 */  sw        $ra, 0x18($sp)
 /* D218EC 80241A5C AFB10014 */  sw        $s1, 0x14($sp)
 /* D218F0 80241A60 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_80241A48_D218D8
 /* D21954 80241AC4 28620010 */  slti      $v0, $v1, 0x10
 /* D21958 80241AC8 1440FFFA */  bnez      $v0, .L80241AB4
 /* D2195C 80241ACC 24840004 */   addiu    $a0, $a0, 4
-/* D21960 80241AD0 3C108024 */  lui       $s0, 0x8024
-/* D21964 80241AD4 261043D0 */  addiu     $s0, $s0, 0x43d0
+/* D21960 80241AD0 3C108024 */  lui       $s0, %hi(D_802443D0)
+/* D21964 80241AD4 261043D0 */  addiu     $s0, $s0, %lo(D_802443D0)
 /* D21968 80241AD8 0C00AB4B */  jal       heap_free
 /* D2196C 80241ADC 8E040000 */   lw       $a0, ($s0)
 /* D21970 80241AE0 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241D8C_D21C1C.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241D8C_D21C1C.s
index a791ef96e7..ab3a3f658b 100644
--- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241D8C_D21C1C.s
+++ b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241D8C_D21C1C.s
@@ -6,11 +6,11 @@ glabel func_80241D8C_D21C1C
 /* D21C20 80241D90 AFBF0010 */  sw        $ra, 0x10($sp)
 /* D21C24 80241D94 10A00003 */  beqz      $a1, .L80241DA4
 /* D21C28 80241D98 8C86000C */   lw       $a2, 0xc($a0)
-/* D21C2C 80241D9C 3C018024 */  lui       $at, 0x8024
-/* D21C30 80241DA0 AC204434 */  sw        $zero, 0x4434($at)
+/* D21C2C 80241D9C 3C018024 */  lui       $at, %hi(D_80244434)
+/* D21C30 80241DA0 AC204434 */  sw        $zero, %lo(D_80244434)($at)
 .L80241DA4:
-/* D21C34 80241DA4 3C038024 */  lui       $v1, 0x8024
-/* D21C38 80241DA8 24634434 */  addiu     $v1, $v1, 0x4434
+/* D21C34 80241DA4 3C038024 */  lui       $v1, %hi(D_80244434)
+/* D21C38 80241DA8 24634434 */  addiu     $v1, $v1, %lo(D_80244434)
 /* D21C3C 80241DAC 8C620000 */  lw        $v0, ($v1)
 /* D21C40 80241DB0 54400003 */  bnel      $v0, $zero, .L80241DC0
 /* D21C44 80241DB4 AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_80241D8C_D21C1C
 /* D21C4C 80241DBC 0000102D */   daddu    $v0, $zero, $zero
 .L80241DC0:
 /* D21C50 80241DC0 8CC50000 */  lw        $a1, ($a2)
-/* D21C54 80241DC4 3C068024 */  lui       $a2, 0x8024
+/* D21C54 80241DC4 3C068024 */  lui       $a2, %hi(D_80244438)
 /* D21C58 80241DC8 0C0B2026 */  jal       set_variable
-/* D21C5C 80241DCC 8CC64438 */   lw       $a2, 0x4438($a2)
+/* D21C5C 80241DCC 8CC64438 */   lw       $a2, %lo(D_80244438)($a2)
 /* D21C60 80241DD0 24020002 */  addiu     $v0, $zero, 2
 .L80241DD4:
 /* D21C64 80241DD4 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241DE0_D21C70.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241DE0_D21C70.s
index 65eda04237..0e80c1f67c 100644
--- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241DE0_D21C70.s
+++ b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241DE0_D21C70.s
@@ -7,12 +7,12 @@ glabel func_80241DE0_D21C70
 /* D21C78 80241DE8 8C82000C */  lw        $v0, 0xc($a0)
 /* D21C7C 80241DEC 0C0B1EAF */  jal       get_variable
 /* D21C80 80241DF0 8C450000 */   lw       $a1, ($v0)
-/* D21C84 80241DF4 3C018024 */  lui       $at, 0x8024
-/* D21C88 80241DF8 AC224438 */  sw        $v0, 0x4438($at)
+/* D21C84 80241DF4 3C018024 */  lui       $at, %hi(D_80244438)
+/* D21C88 80241DF8 AC224438 */  sw        $v0, %lo(D_80244438)($at)
 /* D21C8C 80241DFC 24020002 */  addiu     $v0, $zero, 2
 /* D21C90 80241E00 8FBF0010 */  lw        $ra, 0x10($sp)
 /* D21C94 80241E04 24030001 */  addiu     $v1, $zero, 1
-/* D21C98 80241E08 3C018024 */  lui       $at, 0x8024
-/* D21C9C 80241E0C AC234434 */  sw        $v1, 0x4434($at)
+/* D21C98 80241E08 3C018024 */  lui       $at, %hi(D_80244434)
+/* D21C9C 80241E0C AC234434 */  sw        $v1, %lo(D_80244434)($at)
 /* D21CA0 80241E10 03E00008 */  jr        $ra
 /* D21CA4 80241E14 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241E18_D21CA8.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241E18_D21CA8.s
index 60293759d9..86f4214c44 100644
--- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241E18_D21CA8.s
+++ b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241E18_D21CA8.s
@@ -13,8 +13,8 @@ glabel func_80241E18_D21CA8
 /* D21CC8 80241E38 8C620000 */  lw        $v0, ($v1)
 /* D21CCC 80241E3C 5040000A */  beql      $v0, $zero, .L80241E68
 /* D21CD0 80241E40 00041080 */   sll      $v0, $a0, 2
-/* D21CD4 80241E44 3C058025 */  lui       $a1, 0x8025
-/* D21CD8 80241E48 24A5BEA0 */  addiu     $a1, $a1, -0x4160
+/* D21CD4 80241E44 3C058025 */  lui       $a1, %hi(D_8024BEA0)
+/* D21CD8 80241E48 24A5BEA0 */  addiu     $a1, $a1, %lo(D_8024BEA0)
 .L80241E4C:
 /* D21CDC 80241E4C 24630004 */  addiu     $v1, $v1, 4
 /* D21CE0 80241E50 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_80241E18_D21CA8
 /* D21CF0 80241E60 24A50004 */   addiu    $a1, $a1, 4
 /* D21CF4 80241E64 00041080 */  sll       $v0, $a0, 2
 .L80241E68:
-/* D21CF8 80241E68 3C018025 */  lui       $at, 0x8025
+/* D21CF8 80241E68 3C018025 */  lui       $at, %hi(D_8024BEA0)
 /* D21CFC 80241E6C 00220821 */  addu      $at, $at, $v0
-/* D21D00 80241E70 AC20BEA0 */  sw        $zero, -0x4160($at)
+/* D21D00 80241E70 AC20BEA0 */  sw        $zero, %lo(D_8024BEA0)($at)
 /* D21D04 80241E74 080907A9 */  j         .L80241EA4
 /* D21D08 80241E78 00000000 */   nop      
 .L80241E7C:
-/* D21D0C 80241E7C 3C038025 */  lui       $v1, 0x8025
-/* D21D10 80241E80 2463BEA0 */  addiu     $v1, $v1, -0x4160
+/* D21D0C 80241E7C 3C038025 */  lui       $v1, %hi(D_8024BEA0)
+/* D21D10 80241E80 2463BEA0 */  addiu     $v1, $v1, %lo(D_8024BEA0)
 /* D21D14 80241E84 0060282D */  daddu     $a1, $v1, $zero
 .L80241E88:
 /* D21D18 80241E88 24820010 */  addiu     $v0, $a0, 0x10
diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241EB4_D21D44.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241EB4_D21D44.s
index 8114c9a287..067578307c 100644
--- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241EB4_D21D44.s
+++ b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241EB4_D21D44.s
@@ -13,8 +13,8 @@ glabel func_80241EB4_D21D44
 /* D21D64 80241ED4 8C620000 */  lw        $v0, ($v1)
 /* D21D68 80241ED8 5040000A */  beql      $v0, $zero, .L80241F04
 /* D21D6C 80241EDC 00041080 */   sll      $v0, $a0, 2
-/* D21D70 80241EE0 3C058025 */  lui       $a1, 0x8025
-/* D21D74 80241EE4 24A5C068 */  addiu     $a1, $a1, -0x3f98
+/* D21D70 80241EE0 3C058025 */  lui       $a1, %hi(D_8024C068)
+/* D21D74 80241EE4 24A5C068 */  addiu     $a1, $a1, %lo(D_8024C068)
 .L80241EE8:
 /* D21D78 80241EE8 24630004 */  addiu     $v1, $v1, 4
 /* D21D7C 80241EEC 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_80241EB4_D21D44
 /* D21D8C 80241EFC 24A50004 */   addiu    $a1, $a1, 4
 /* D21D90 80241F00 00041080 */  sll       $v0, $a0, 2
 .L80241F04:
-/* D21D94 80241F04 3C018025 */  lui       $at, 0x8025
+/* D21D94 80241F04 3C018025 */  lui       $at, %hi(D_8024C068)
 /* D21D98 80241F08 00220821 */  addu      $at, $at, $v0
-/* D21D9C 80241F0C AC20C068 */  sw        $zero, -0x3f98($at)
+/* D21D9C 80241F0C AC20C068 */  sw        $zero, %lo(D_8024C068)($at)
 /* D21DA0 80241F10 080907D0 */  j         .L80241F40
 /* D21DA4 80241F14 00000000 */   nop      
 .L80241F18:
-/* D21DA8 80241F18 3C038025 */  lui       $v1, 0x8025
-/* D21DAC 80241F1C 2463C068 */  addiu     $v1, $v1, -0x3f98
+/* D21DA8 80241F18 3C038025 */  lui       $v1, %hi(D_8024C068)
+/* D21DAC 80241F1C 2463C068 */  addiu     $v1, $v1, %lo(D_8024C068)
 /* D21DB0 80241F20 0060282D */  daddu     $a1, $v1, $zero
 .L80241F24:
 /* D21DB4 80241F24 24820080 */  addiu     $v0, $a0, 0x80
diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242014_D21EA4.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242014_D21EA4.s
index e330cdda4a..5b25e18c12 100644
--- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242014_D21EA4.s
+++ b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242014_D21EA4.s
@@ -26,9 +26,9 @@ glabel func_80242014_D21EA4
 /* D21EF8 80242068 000320C0 */  sll       $a0, $v1, 3
 /* D21EFC 8024206C 00641821 */  addu      $v1, $v1, $a0
 /* D21F00 80242070 000318C0 */  sll       $v1, $v1, 3
-/* D21F04 80242074 3C01800B */  lui       $at, 0x800b
+/* D21F04 80242074 3C01800B */  lui       $at, %hi(D_800B1D98)
 /* D21F08 80242078 00230821 */  addu      $at, $at, $v1
-/* D21F0C 8024207C E4201D98 */  swc1      $f0, 0x1d98($at)
+/* D21F0C 8024207C E4201D98 */  swc1      $f0, %lo(D_800B1D98)($at)
 /* D21F10 80242080 8FBF0018 */  lw        $ra, 0x18($sp)
 /* D21F14 80242084 8FB10014 */  lw        $s1, 0x14($sp)
 /* D21F18 80242088 8FB00010 */  lw        $s0, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_802424C8_D22358.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_802424C8_D22358.s
index 43da178d04..19b9911da1 100644
--- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_802424C8_D22358.s
+++ b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_802424C8_D22358.s
@@ -15,7 +15,7 @@ glabel func_802424C8_D22358
 /* D22380 802424F0 8FBF0014 */  lw        $ra, 0x14($sp)
 /* D22384 802424F4 8FB00010 */  lw        $s0, 0x10($sp)
 /* D22388 802424F8 24020002 */  addiu     $v0, $zero, 2
-/* D2238C 802424FC 3C018025 */  lui       $at, 0x8025
-/* D22390 80242500 AC23C1D8 */  sw        $v1, -0x3e28($at)
+/* D2238C 802424FC 3C018025 */  lui       $at, %hi(D_8024C1D8)
+/* D22390 80242500 AC23C1D8 */  sw        $v1, %lo(D_8024C1D8)($at)
 /* D22394 80242504 03E00008 */  jr        $ra
 /* D22398 80242508 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024250C_D2239C.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024250C_D2239C.s
index 0aaf16f76a..1386233260 100644
--- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024250C_D2239C.s
+++ b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024250C_D2239C.s
@@ -6,8 +6,8 @@ glabel func_8024250C_D2239C
 /* D223A0 80242510 AFBF0010 */  sw        $ra, 0x10($sp)
 /* D223A4 80242514 0C00EABB */  jal       get_npc_unsafe
 /* D223A8 80242518 8C84008C */   lw       $a0, 0x8c($a0)
-/* D223AC 8024251C 3C038025 */  lui       $v1, 0x8025
-/* D223B0 80242520 8C63C1D8 */  lw        $v1, -0x3e28($v1)
+/* D223AC 8024251C 3C038025 */  lui       $v1, %hi(D_8024C1D8)
+/* D223B0 80242520 8C63C1D8 */  lw        $v1, %lo(D_8024C1D8)($v1)
 /* D223B4 80242524 AC430028 */  sw        $v1, 0x28($v0)
 /* D223B8 80242528 8FBF0010 */  lw        $ra, 0x10($sp)
 /* D223BC 8024252C 24020002 */  addiu     $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240000_D2BD30.s b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240000_D2BD30.s
index 2c3a263af6..74c532acd0 100644
--- a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240000_D2BD30.s
+++ b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240000_D2BD30.s
@@ -24,8 +24,8 @@ glabel func_80240000_D2BD30
 /* D2BD7C 8024004C 0000982D */  daddu     $s3, $zero, $zero
 /* D2BD80 80240050 AEE20070 */  sw        $v0, 0x70($s7)
 /* D2BD84 80240054 0040882D */  daddu     $s1, $v0, $zero
-/* D2BD88 80240058 3C148024 */  lui       $s4, 0x8024
-/* D2BD8C 8024005C 269424C0 */  addiu     $s4, $s4, 0x24c0
+/* D2BD88 80240058 3C148024 */  lui       $s4, %hi(D_802424C0)
+/* D2BD8C 8024005C 269424C0 */  addiu     $s4, $s4, %lo(D_802424C0)
 /* D2BD90 80240060 2630003C */  addiu     $s0, $s1, 0x3c
 /* D2BD94 80240064 AEE00074 */  sw        $zero, 0x74($s7)
 .L80240068:
@@ -130,10 +130,10 @@ glabel func_80240000_D2BD30
 /* D2BF14 802401E4 26300024 */  addiu     $s0, $s1, 0x24
 /* D2BF18 802401E8 00131080 */  sll       $v0, $s3, 2
 .L802401EC:
-/* D2BF1C 802401EC 3C048024 */  lui       $a0, 0x8024
+/* D2BF1C 802401EC 3C048024 */  lui       $a0, %hi(D_802424C0)
 /* D2BF20 802401F0 00822021 */  addu      $a0, $a0, $v0
 /* D2BF24 802401F4 0C046C04 */  jal       get_model_list_index_from_tree_index
-/* D2BF28 802401F8 8C8424C0 */   lw       $a0, 0x24c0($a0)
+/* D2BF28 802401F8 8C8424C0 */   lw       $a0, %lo(D_802424C0)($a0)
 /* D2BF2C 802401FC 0C046B4C */  jal       get_model_from_list_index
 /* D2BF30 80240200 0040202D */   daddu    $a0, $v0, $zero
 /* D2BF34 80240204 8E230000 */  lw        $v1, ($s1)
diff --git a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240858_D2C588.s b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240858_D2C588.s
index 19d58b9f1d..de44d33000 100644
--- a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240858_D2C588.s
+++ b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240858_D2C588.s
@@ -18,8 +18,8 @@ glabel func_80240858_D2C588
 /* D2C5BC 8024088C 0040802D */  daddu     $s0, $v0, $zero
 /* D2C5C0 80240890 3C05800B */  lui       $a1, %hi(gCameras)
 /* D2C5C4 80240894 24A51D80 */  addiu     $a1, $a1, %lo(gCameras)
-/* D2C5C8 80240898 3C03800A */  lui       $v1, 0x800a
-/* D2C5CC 8024089C 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D2C5C8 80240898 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D2C5CC 8024089C 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D2C5D0 802408A0 00912021 */  addu      $a0, $a0, $s1
 /* D2C5D4 802408A4 00031080 */  sll       $v0, $v1, 2
 /* D2C5D8 802408A8 00431021 */  addu      $v0, $v0, $v1
@@ -54,8 +54,8 @@ glabel func_80240858_D2C588
 /* D2C648 80240918 00000000 */   nop      
 /* D2C64C 8024091C 0C00A6C9 */  jal       clamp_angle
 /* D2C650 80240920 46000306 */   mov.s    $f12, $f0
-/* D2C654 80240924 3C018024 */  lui       $at, 0x8024
-/* D2C658 80240928 D4223D80 */  ldc1      $f2, 0x3d80($at)
+/* D2C654 80240924 3C018024 */  lui       $at, %hi(D_80243D80)
+/* D2C658 80240928 D4223D80 */  ldc1      $f2, %lo(D_80243D80)($at)
 /* D2C65C 8024092C 46000021 */  cvt.d.s   $f0, $f0
 /* D2C660 80240930 4622003C */  c.lt.d    $f0, $f2
 /* D2C664 80240934 00000000 */  nop       
@@ -97,8 +97,8 @@ glabel func_80240858_D2C588
 /* D2C6EC 802409BC 45030001 */  bc1tl     .L802409C4
 /* D2C6F0 802409C0 0000882D */   daddu    $s1, $zero, $zero
 .L802409C4:
-/* D2C6F4 802409C4 3C038011 */  lui       $v1, 0x8011
-/* D2C6F8 802409C8 8063EBB3 */  lb        $v1, -0x144d($v1)
+/* D2C6F4 802409C4 3C038011 */  lui       $v1, %hi(D_8010EBB3)
+/* D2C6F8 802409C8 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
 /* D2C6FC 802409CC 24020009 */  addiu     $v0, $zero, 9
 /* D2C700 802409D0 50620001 */  beql      $v1, $v0, .L802409D8
 /* D2C704 802409D4 0000882D */   daddu    $s1, $zero, $zero
diff --git a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240C6C_D2C99C.s b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240C6C_D2C99C.s
index 2c91055019..ddd8e6df3e 100644
--- a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240C6C_D2C99C.s
+++ b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240C6C_D2C99C.s
@@ -100,9 +100,9 @@ glabel func_80240C6C_D2C99C
 /* D2CB00 80240DD0 2C620064 */  sltiu     $v0, $v1, 0x64
 /* D2CB04 80240DD4 10400048 */  beqz      $v0, .L80240EF8
 /* D2CB08 80240DD8 00031080 */   sll      $v0, $v1, 2
-/* D2CB0C 80240DDC 3C018024 */  lui       $at, 0x8024
+/* D2CB0C 80240DDC 3C018024 */  lui       $at, %hi(D_80243D88)
 /* D2CB10 80240DE0 00220821 */  addu      $at, $at, $v0
-/* D2CB14 80240DE4 8C223D88 */  lw        $v0, 0x3d88($at)
+/* D2CB14 80240DE4 8C223D88 */  lw        $v0, %lo(D_80243D88)($at)
 /* D2CB18 80240DE8 00400008 */  jr        $v0
 /* D2CB1C 80240DEC 00000000 */   nop      
 /* D2CB20 80240DF0 0240202D */  daddu     $a0, $s2, $zero
diff --git a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241088_D2CDB8.s b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241088_D2CDB8.s
index 94b08e0255..d6523be847 100644
--- a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241088_D2CDB8.s
+++ b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241088_D2CDB8.s
@@ -62,9 +62,9 @@ glabel func_80241088_D2CDB8
 /* D2CE98 80241168 000218C0 */  sll       $v1, $v0, 3
 /* D2CE9C 8024116C 00431021 */  addu      $v0, $v0, $v1
 /* D2CEA0 80241170 000210C0 */  sll       $v0, $v0, 3
-/* D2CEA4 80241174 3C01800B */  lui       $at, 0x800b
+/* D2CEA4 80241174 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* D2CEA8 80241178 00220821 */  addu      $at, $at, $v0
-/* D2CEAC 8024117C C4201DEC */  lwc1      $f0, 0x1dec($at)
+/* D2CEAC 8024117C C4201DEC */  lwc1      $f0, %lo(D_800B1DEC)($at)
 /* D2CEB0 80241180 08090471 */  j         .L802411C4
 /* D2CEB4 80241184 460C0301 */   sub.s    $f12, $f0, $f12
 .L80241188:
@@ -79,9 +79,9 @@ glabel func_80241088_D2CDB8
 /* D2CED8 802411A8 000218C0 */  sll       $v1, $v0, 3
 /* D2CEDC 802411AC 00431021 */  addu      $v0, $v0, $v1
 /* D2CEE0 802411B0 000210C0 */  sll       $v0, $v0, 3
-/* D2CEE4 802411B4 3C01800B */  lui       $at, 0x800b
+/* D2CEE4 802411B4 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* D2CEE8 802411B8 00220821 */  addu      $at, $at, $v0
-/* D2CEEC 802411BC C4201DEC */  lwc1      $f0, 0x1dec($at)
+/* D2CEEC 802411BC C4201DEC */  lwc1      $f0, %lo(D_800B1DEC)($at)
 /* D2CEF0 802411C0 460C0300 */  add.s     $f12, $f0, $f12
 .L802411C4:
 /* D2CEF4 802411C4 0C00A6C9 */  jal       clamp_angle
@@ -157,8 +157,8 @@ glabel func_80241088_D2CDB8
 /* D2CFFC 802412CC 1440005D */  bnez      $v0, .L80241444
 /* D2D000 802412D0 00000000 */   nop      
 /* D2D004 802412D4 C6200038 */  lwc1      $f0, 0x38($s1)
-/* D2D008 802412D8 3C018024 */  lui       $at, 0x8024
-/* D2D00C 802412DC D4243F18 */  ldc1      $f4, 0x3f18($at)
+/* D2D008 802412D8 3C018024 */  lui       $at, %hi(D_80243F18)
+/* D2D00C 802412DC D4243F18 */  ldc1      $f4, %lo(D_80243F18)($at)
 /* D2D010 802412E0 46000021 */  cvt.d.s   $f0, $f0
 /* D2D014 802412E4 4620203C */  c.lt.d    $f4, $f0
 /* D2D018 802412E8 00000000 */  nop       
@@ -170,8 +170,8 @@ glabel func_80241088_D2CDB8
 /* D2D030 80241300 E6200038 */  swc1      $f0, 0x38($s1)
 .L80241304:
 /* D2D034 80241304 C6200038 */  lwc1      $f0, 0x38($s1)
-/* D2D038 80241308 3C018024 */  lui       $at, 0x8024
-/* D2D03C 8024130C D4223F20 */  ldc1      $f2, 0x3f20($at)
+/* D2D038 80241308 3C018024 */  lui       $at, %hi(D_80243F20)
+/* D2D03C 8024130C D4223F20 */  ldc1      $f2, %lo(D_80243F20)($at)
 /* D2D040 80241310 46000021 */  cvt.d.s   $f0, $f0
 /* D2D044 80241314 4622003C */  c.lt.d    $f0, $f2
 /* D2D048 80241318 00000000 */  nop       
@@ -228,8 +228,8 @@ glabel func_80241088_D2CDB8
 /* D2D104 802413D4 4600A386 */   mov.s    $f14, $f20
 /* D2D108 802413D8 46000586 */  mov.s     $f22, $f0
 /* D2D10C 802413DC C7A20038 */  lwc1      $f2, 0x38($sp)
-/* D2D110 802413E0 3C018024 */  lui       $at, 0x8024
-/* D2D114 802413E4 D4203F28 */  ldc1      $f0, 0x3f28($at)
+/* D2D110 802413E0 3C018024 */  lui       $at, %hi(D_80243F28)
+/* D2D114 802413E4 D4203F28 */  ldc1      $f0, %lo(D_80243F28)($at)
 /* D2D118 802413E8 460010A1 */  cvt.d.s   $f2, $f2
 /* D2D11C 802413EC 4620103C */  c.lt.d    $f2, $f0
 /* D2D120 802413F0 00000000 */  nop       
@@ -239,8 +239,8 @@ glabel func_80241088_D2CDB8
 /* D2D130 80241400 0809050A */  j         .L80241428
 /* D2D134 80241404 34C68000 */   ori      $a2, $a2, 0x8000
 .L80241408:
-/* D2D138 80241408 3C018024 */  lui       $at, 0x8024
-/* D2D13C 8024140C D4203F30 */  ldc1      $f0, 0x3f30($at)
+/* D2D138 80241408 3C018024 */  lui       $at, %hi(D_80243F30)
+/* D2D13C 8024140C D4203F30 */  ldc1      $f0, %lo(D_80243F30)($at)
 /* D2D140 80241410 4622003C */  c.lt.d    $f0, $f2
 /* D2D144 80241414 00000000 */  nop       
 /* D2D148 80241418 450000FA */  bc1f      .L80241804
@@ -296,8 +296,8 @@ glabel func_80241088_D2CDB8
 /* D2D208 802414D8 104000CA */  beqz      $v0, .L80241804
 /* D2D20C 802414DC 0280282D */   daddu    $a1, $s4, $zero
 /* D2D210 802414E0 8EA20000 */  lw        $v0, ($s5)
-/* D2D214 802414E4 3C018024 */  lui       $at, 0x8024
-/* D2D218 802414E8 D4223F38 */  ldc1      $f2, 0x3f38($at)
+/* D2D214 802414E4 3C018024 */  lui       $at, %hi(D_80243F38)
+/* D2D218 802414E8 D4223F38 */  ldc1      $f2, %lo(D_80243F38)($at)
 /* D2D21C 802414EC C440002C */  lwc1      $f0, 0x2c($v0)
 /* D2D220 802414F0 C4460028 */  lwc1      $f6, 0x28($v0)
 /* D2D224 802414F4 C4440030 */  lwc1      $f4, 0x30($v0)
@@ -633,8 +633,8 @@ glabel func_80241088_D2CDB8
 /* D2D720 802419F0 44813000 */  mtc1      $at, $f6
 /* D2D724 802419F4 46000021 */  cvt.d.s   $f0, $f0
 /* D2D728 802419F8 E7A20020 */  swc1      $f2, 0x20($sp)
-/* D2D72C 802419FC 3C018024 */  lui       $at, 0x8024
-/* D2D730 80241A00 D4223F40 */  ldc1      $f2, 0x3f40($at)
+/* D2D72C 802419FC 3C018024 */  lui       $at, %hi(D_80243F40)
+/* D2D730 80241A00 D4223F40 */  ldc1      $f2, %lo(D_80243F40)($at)
 /* D2D734 80241A04 C6240040 */  lwc1      $f4, 0x40($s1)
 /* D2D738 80241A08 46220000 */  add.d     $f0, $f0, $f2
 /* D2D73C 80241A0C E7A60038 */  swc1      $f6, 0x38($sp)
diff --git a/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_802401CC_D2FE4C.s b/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_802401CC_D2FE4C.s
index 09ab02bcfd..413e0d9a68 100644
--- a/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_802401CC_D2FE4C.s
+++ b/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_802401CC_D2FE4C.s
@@ -22,12 +22,12 @@ glabel func_802401CC_D2FE4C
 /* D2FE90 80240210 0040982D */  daddu     $s3, $v0, $zero
 /* D2FE94 80240214 0000B02D */  daddu     $s6, $zero, $zero
 /* D2FE98 80240218 02C0902D */  daddu     $s2, $s6, $zero
-/* D2FE9C 8024021C 3C148024 */  lui       $s4, 0x8024
-/* D2FEA0 80240220 26941AE8 */  addiu     $s4, $s4, 0x1ae8
+/* D2FE9C 8024021C 3C148024 */  lui       $s4, %hi(D_80241AE8)
+/* D2FEA0 80240220 26941AE8 */  addiu     $s4, $s4, %lo(D_80241AE8)
 /* D2FEA4 80240224 0260882D */  daddu     $s1, $s3, $zero
 /* D2FEA8 80240228 8EA200B4 */  lw        $v0, 0xb4($s5)
-/* D2FEAC 8024022C 3C038024 */  lui       $v1, 0x8024
-/* D2FEB0 80240230 24631AE0 */  addiu     $v1, $v1, 0x1ae0
+/* D2FEAC 8024022C 3C038024 */  lui       $v1, %hi(D_80241AE0)
+/* D2FEB0 80240230 24631AE0 */  addiu     $v1, $v1, %lo(D_80241AE0)
 /* D2FEB4 80240234 AEB30078 */  sw        $s3, 0x78($s5)
 /* D2FEB8 80240238 00021027 */  nor       $v0, $zero, $v0
 /* D2FEBC 8024023C 0002BFC2 */  srl       $s7, $v0, 0x1f
@@ -42,8 +42,8 @@ glabel func_802401CC_D2FE4C
 /* D2FEDC 8024025C 5040002E */  beql      $v0, $zero, .L80240318
 /* D2FEE0 80240260 26520001 */   addiu    $s2, $s2, 1
 /* D2FEE4 80240264 00101100 */  sll       $v0, $s0, 4
-/* D2FEE8 80240268 3C068009 */  lui       $a2, 0x8009
-/* D2FEEC 8024026C 24C6EF20 */  addiu     $a2, $a2, -0x10e0
+/* D2FEE8 80240268 3C068009 */  lui       $a2, %hi(D_8008EF20)
+/* D2FEEC 8024026C 24C6EF20 */  addiu     $a2, $a2, %lo(D_8008EF20)
 /* D2FEF0 80240270 00461021 */  addu      $v0, $v0, $a2
 /* D2FEF4 80240274 0200202D */  daddu     $a0, $s0, $zero
 /* D2FEF8 80240278 AE300108 */  sw        $s0, 0x108($s1)
@@ -54,15 +54,15 @@ glabel func_802401CC_D2FE4C
 /* D2FF0C 8024028C 0040202D */  daddu     $a0, $v0, $zero
 /* D2FF10 80240290 04800011 */  bltz      $a0, .L802402D8
 /* D2FF14 80240294 00101080 */   sll      $v0, $s0, 2
-/* D2FF18 80240298 3C06800F */  lui       $a2, 0x800f
-/* D2FF1C 8024029C 24C67F00 */  addiu     $a2, $a2, 0x7f00
+/* D2FF18 80240298 3C06800F */  lui       $a2, %hi(D_800F7F00)
+/* D2FF1C 8024029C 24C67F00 */  addiu     $a2, $a2, %lo(D_800F7F00)
 /* D2FF20 802402A0 00461021 */  addu      $v0, $v0, $a2
 /* D2FF24 802402A4 8C430000 */  lw        $v1, ($v0)
 /* D2FF28 802402A8 24020001 */  addiu     $v0, $zero, 1
 /* D2FF2C 802402AC AE22018C */  sw        $v0, 0x18c($s1)
 /* D2FF30 802402B0 00041080 */  sll       $v0, $a0, 2
-/* D2FF34 802402B4 3C068024 */  lui       $a2, 0x8024
-/* D2FF38 802402B8 24C61AF8 */  addiu     $a2, $a2, 0x1af8
+/* D2FF34 802402B4 3C068024 */  lui       $a2, %hi(D_80241AF8)
+/* D2FF38 802402B8 24C61AF8 */  addiu     $a2, $a2, %lo(D_80241AF8)
 /* D2FF3C 802402BC AE230000 */  sw        $v1, ($s1)
 /* D2FF40 802402C0 001218C0 */  sll       $v1, $s2, 3
 /* D2FF44 802402C4 00431021 */  addu      $v0, $v0, $v1
@@ -71,8 +71,8 @@ glabel func_802401CC_D2FE4C
 /* D2FF50 802402D0 080900BF */  j         .L802402FC
 /* D2FF54 802402D4 AE220294 */   sw       $v0, 0x294($s1)
 .L802402D8:
-/* D2FF58 802402D8 3C06800F */  lui       $a2, 0x800f
-/* D2FF5C 802402DC 24C67F40 */  addiu     $a2, $a2, 0x7f40
+/* D2FF58 802402D8 3C06800F */  lui       $a2, %hi(D_800F7F40)
+/* D2FF5C 802402DC 24C67F40 */  addiu     $a2, $a2, %lo(D_800F7F40)
 /* D2FF60 802402E0 00461021 */  addu      $v0, $v0, $a2
 /* D2FF64 802402E4 8C420000 */  lw        $v0, ($v0)
 /* D2FF68 802402E8 AE20018C */  sw        $zero, 0x18c($s1)
@@ -130,9 +130,9 @@ glabel func_802401CC_D2FE4C
 /* D30020 802403A0 02621021 */  addu      $v0, $s3, $v0
 /* D30024 802403A4 8C420108 */  lw        $v0, 0x108($v0)
 /* D30028 802403A8 00021100 */  sll       $v0, $v0, 4
-/* D3002C 802403AC 3C038009 */  lui       $v1, 0x8009
+/* D3002C 802403AC 3C038009 */  lui       $v1, %hi(D_8008EF20)
 /* D30030 802403B0 00621821 */  addu      $v1, $v1, $v0
-/* D30034 802403B4 8C63EF20 */  lw        $v1, -0x10e0($v1)
+/* D30034 802403B4 8C63EF20 */  lw        $v1, %lo(D_8008EF20)($v1)
 /* D30038 802403B8 8EA20074 */  lw        $v0, 0x74($s5)
 /* D3003C 802403BC 2442FFFF */  addiu     $v0, $v0, -1
 /* D30040 802403C0 00021080 */  sll       $v0, $v0, 2
diff --git a/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240448_D300C8.s b/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240448_D300C8.s
index 4b92b691f8..713cc736da 100644
--- a/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240448_D300C8.s
+++ b/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240448_D300C8.s
@@ -7,9 +7,9 @@ glabel func_80240448_D300C8
 /* D300D0 80240450 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* D300D4 80240454 AFBF0010 */  sw        $ra, 0x10($sp)
 /* D300D8 80240458 00021100 */  sll       $v0, $v0, 4
-/* D300DC 8024045C 3C048009 */  lui       $a0, 0x8009
+/* D300DC 8024045C 3C048009 */  lui       $a0, %hi(D_8008EF20)
 /* D300E0 80240460 00822021 */  addu      $a0, $a0, $v0
-/* D300E4 80240464 8C84EF20 */  lw        $a0, -0x10e0($a0)
+/* D300E4 80240464 8C84EF20 */  lw        $a0, %lo(D_8008EF20)($a0)
 /* D300E8 80240468 0C0496CF */  jal       set_message_string
 /* D300EC 8024046C 0000282D */   daddu    $a1, $zero, $zero
 /* D300F0 80240470 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240600_D30280.s b/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240600_D30280.s
index a99d15a245..64d3a2af18 100644
--- a/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240600_D30280.s
+++ b/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240600_D30280.s
@@ -30,9 +30,9 @@ glabel func_80240600_D30280
 /* D302E4 80240664 000320C0 */  sll       $a0, $v1, 3
 /* D302E8 80240668 00641821 */  addu      $v1, $v1, $a0
 /* D302EC 8024066C 000318C0 */  sll       $v1, $v1, 3
-/* D302F0 80240670 3C01800B */  lui       $at, 0x800b
+/* D302F0 80240670 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* D302F4 80240674 00230821 */  addu      $at, $at, $v1
-/* D302F8 80240678 C42C1DEC */  lwc1      $f12, 0x1dec($at)
+/* D302F8 80240678 C42C1DEC */  lwc1      $f12, %lo(D_800B1DEC)($at)
 /* D302FC 8024067C 0C00A88D */  jal       sin_cos_deg
 /* D30300 80240680 0040A82D */   daddu    $s5, $v0, $zero
 /* D30304 80240684 1200005D */  beqz      $s0, .L802407FC
@@ -79,8 +79,8 @@ glabel func_80240600_D30280
 /* D303A4 80240724 26100004 */   addiu    $s0, $s0, 4
 /* D303A8 80240728 0000882D */  daddu     $s1, $zero, $zero
 /* D303AC 8024072C 0240802D */  daddu     $s0, $s2, $zero
-/* D303B0 80240730 3C148024 */  lui       $s4, 0x8024
-/* D303B4 80240734 26941B38 */  addiu     $s4, $s4, 0x1b38
+/* D303B0 80240730 3C148024 */  lui       $s4, %hi(D_80241B38)
+/* D303B4 80240734 26941B38 */  addiu     $s4, $s4, %lo(D_80241B38)
 /* D303B8 80240738 3C014248 */  lui       $at, 0x4248
 /* D303BC 8024073C 4481A000 */  mtc1      $at, $f20
 /* D303C0 80240740 24130044 */  addiu     $s3, $zero, 0x44
@@ -150,8 +150,8 @@ glabel func_80240600_D30280
 /* D304B4 80240834 00000000 */   nop      
 .L80240838:
 /* D304B8 80240838 0000882D */  daddu     $s1, $zero, $zero
-/* D304BC 8024083C 3C148024 */  lui       $s4, 0x8024
-/* D304C0 80240840 26941B38 */  addiu     $s4, $s4, 0x1b38
+/* D304BC 8024083C 3C148024 */  lui       $s4, %hi(D_80241B38)
+/* D304C0 80240840 26941B38 */  addiu     $s4, $s4, %lo(D_80241B38)
 /* D304C4 80240844 24130020 */  addiu     $s3, $zero, 0x20
 /* D304C8 80240848 3C064248 */  lui       $a2, 0x4248
 /* D304CC 8024084C 44800000 */  mtc1      $zero, $f0
@@ -197,8 +197,8 @@ glabel func_80240600_D30280
 /* D30568 802408E8 AE400060 */   sw       $zero, 0x60($s2)
 .L802408EC:
 /* D3056C 802408EC 0000882D */  daddu     $s1, $zero, $zero
-/* D30570 802408F0 3C148024 */  lui       $s4, 0x8024
-/* D30574 802408F4 26941B38 */  addiu     $s4, $s4, 0x1b38
+/* D30570 802408F0 3C148024 */  lui       $s4, %hi(D_80241B38)
+/* D30574 802408F4 26941B38 */  addiu     $s4, $s4, %lo(D_80241B38)
 /* D30578 802408F8 24130020 */  addiu     $s3, $zero, 0x20
 /* D3057C 802408FC 0240802D */  daddu     $s0, $s2, $zero
 /* D30580 80240900 3C014248 */  lui       $at, 0x4248
diff --git a/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_80240F48_D30BC8.s b/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_80240F48_D30BC8.s
index addbe27bd5..d1141492fe 100644
--- a/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_80240F48_D30BC8.s
+++ b/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_80240F48_D30BC8.s
@@ -18,8 +18,8 @@ glabel func_80240F48_D30BC8
 /* D30BFC 80240F7C 0040802D */  daddu     $s0, $v0, $zero
 /* D30C00 80240F80 3C05800B */  lui       $a1, %hi(gCameras)
 /* D30C04 80240F84 24A51D80 */  addiu     $a1, $a1, %lo(gCameras)
-/* D30C08 80240F88 3C03800A */  lui       $v1, 0x800a
-/* D30C0C 80240F8C 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D30C08 80240F88 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D30C0C 80240F8C 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D30C10 80240F90 00912021 */  addu      $a0, $a0, $s1
 /* D30C14 80240F94 00031080 */  sll       $v0, $v1, 2
 /* D30C18 80240F98 00431021 */  addu      $v0, $v0, $v1
@@ -54,8 +54,8 @@ glabel func_80240F48_D30BC8
 /* D30C88 80241008 00000000 */   nop      
 /* D30C8C 8024100C 0C00A6C9 */  jal       clamp_angle
 /* D30C90 80241010 46000306 */   mov.s    $f12, $f0
-/* D30C94 80241014 3C018024 */  lui       $at, 0x8024
-/* D30C98 80241018 D42264D0 */  ldc1      $f2, 0x64d0($at)
+/* D30C94 80241014 3C018024 */  lui       $at, %hi(D_802464D0)
+/* D30C98 80241018 D42264D0 */  ldc1      $f2, %lo(D_802464D0)($at)
 /* D30C9C 8024101C 46000021 */  cvt.d.s   $f0, $f0
 /* D30CA0 80241020 4622003C */  c.lt.d    $f0, $f2
 /* D30CA4 80241024 00000000 */  nop       
@@ -97,8 +97,8 @@ glabel func_80240F48_D30BC8
 /* D30D2C 802410AC 45030001 */  bc1tl     .L802410B4
 /* D30D30 802410B0 0000882D */   daddu    $s1, $zero, $zero
 .L802410B4:
-/* D30D34 802410B4 3C038011 */  lui       $v1, 0x8011
-/* D30D38 802410B8 8063EBB3 */  lb        $v1, -0x144d($v1)
+/* D30D34 802410B4 3C038011 */  lui       $v1, %hi(D_8010EBB3)
+/* D30D38 802410B8 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
 /* D30D3C 802410BC 24020009 */  addiu     $v0, $zero, 9
 /* D30D40 802410C0 50620001 */  beql      $v1, $v0, .L802410C8
 /* D30D44 802410C4 0000882D */   daddu    $s1, $zero, $zero
diff --git a/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_8024135C_D30FDC.s b/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_8024135C_D30FDC.s
index a68b09443f..e28d030f92 100644
--- a/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_8024135C_D30FDC.s
+++ b/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_8024135C_D30FDC.s
@@ -100,9 +100,9 @@ glabel func_8024135C_D30FDC
 /* D31140 802414C0 2C620064 */  sltiu     $v0, $v1, 0x64
 /* D31144 802414C4 10400048 */  beqz      $v0, .L802415E8
 /* D31148 802414C8 00031080 */   sll      $v0, $v1, 2
-/* D3114C 802414CC 3C018024 */  lui       $at, 0x8024
+/* D3114C 802414CC 3C018024 */  lui       $at, %hi(D_802464D8)
 /* D31150 802414D0 00220821 */  addu      $at, $at, $v0
-/* D31154 802414D4 8C2264D8 */  lw        $v0, 0x64d8($at)
+/* D31154 802414D4 8C2264D8 */  lw        $v0, %lo(D_802464D8)($at)
 /* D31158 802414D8 00400008 */  jr        $v0
 /* D3115C 802414DC 00000000 */   nop      
 /* D31160 802414E0 0240202D */  daddu     $a0, $s2, $zero
diff --git a/asm/nonmatchings/world/area_sam/sam_09/D362F0/func_80240000_D362F0.s b/asm/nonmatchings/world/area_sam/sam_09/D362F0/func_80240000_D362F0.s
index 2ed89d23f7..5045acba9d 100644
--- a/asm/nonmatchings/world/area_sam/sam_09/D362F0/func_80240000_D362F0.s
+++ b/asm/nonmatchings/world/area_sam/sam_09/D362F0/func_80240000_D362F0.s
@@ -4,8 +4,8 @@
 glabel func_80240000_D362F0
 /* D362F0 80240000 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* D362F4 80240004 AFB00010 */  sw        $s0, 0x10($sp)
-/* D362F8 80240008 3C108024 */  lui       $s0, 0x8024
-/* D362FC 8024000C 261006C0 */  addiu     $s0, $s0, 0x6c0
+/* D362F8 80240008 3C108024 */  lui       $s0, %hi(D_802406C0)
+/* D362FC 8024000C 261006C0 */  addiu     $s0, $s0, %lo(D_802406C0)
 /* D36300 80240010 AFBF0018 */  sw        $ra, 0x18($sp)
 /* D36304 80240014 AFB10014 */  sw        $s1, 0x14($sp)
 /* D36308 80240018 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_80240000_D362F0
 /* D3636C 8024007C 28620010 */  slti      $v0, $v1, 0x10
 /* D36370 80240080 1440FFFA */  bnez      $v0, .L8024006C
 /* D36374 80240084 24840004 */   addiu    $a0, $a0, 4
-/* D36378 80240088 3C108024 */  lui       $s0, 0x8024
-/* D3637C 8024008C 261006C0 */  addiu     $s0, $s0, 0x6c0
+/* D36378 80240088 3C108024 */  lui       $s0, %hi(D_802406C0)
+/* D3637C 8024008C 261006C0 */  addiu     $s0, $s0, %lo(D_802406C0)
 /* D36380 80240090 0C00AB4B */  jal       heap_free
 /* D36384 80240094 8E040000 */   lw       $a0, ($s0)
 /* D36388 80240098 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_sam/sam_10/D37800/func_80240000_D37800.s b/asm/nonmatchings/world/area_sam/sam_10/D37800/func_80240000_D37800.s
index a2e96b5228..9e2eaf753d 100644
--- a/asm/nonmatchings/world/area_sam/sam_10/D37800/func_80240000_D37800.s
+++ b/asm/nonmatchings/world/area_sam/sam_10/D37800/func_80240000_D37800.s
@@ -4,8 +4,8 @@
 glabel func_80240000_D37800
 /* D37800 80240000 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* D37804 80240004 AFB00010 */  sw        $s0, 0x10($sp)
-/* D37808 80240008 3C108024 */  lui       $s0, 0x8024
-/* D3780C 8024000C 26101040 */  addiu     $s0, $s0, 0x1040
+/* D37808 80240008 3C108024 */  lui       $s0, %hi(D_80241040)
+/* D3780C 8024000C 26101040 */  addiu     $s0, $s0, %lo(D_80241040)
 /* D37810 80240010 AFBF0018 */  sw        $ra, 0x18($sp)
 /* D37814 80240014 AFB10014 */  sw        $s1, 0x14($sp)
 /* D37818 80240018 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_80240000_D37800
 /* D3787C 8024007C 28620010 */  slti      $v0, $v1, 0x10
 /* D37880 80240080 1440FFFA */  bnez      $v0, .L8024006C
 /* D37884 80240084 24840004 */   addiu    $a0, $a0, 4
-/* D37888 80240088 3C108024 */  lui       $s0, 0x8024
-/* D3788C 8024008C 26101040 */  addiu     $s0, $s0, 0x1040
+/* D37888 80240088 3C108024 */  lui       $s0, %hi(D_80241040)
+/* D3788C 8024008C 26101040 */  addiu     $s0, $s0, %lo(D_80241040)
 /* D37890 80240090 0C00AB4B */  jal       heap_free
 /* D37894 80240094 8E040000 */   lw       $a0, ($s0)
 /* D37898 80240098 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_802405D8_D37DD8.s b/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_802405D8_D37DD8.s
index 387cf40836..42d0c747a8 100644
--- a/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_802405D8_D37DD8.s
+++ b/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_802405D8_D37DD8.s
@@ -18,8 +18,8 @@ glabel func_802405D8_D37DD8
 /* D37E0C 8024060C 0040802D */  daddu     $s0, $v0, $zero
 /* D37E10 80240610 3C05800B */  lui       $a1, %hi(gCameras)
 /* D37E14 80240614 24A51D80 */  addiu     $a1, $a1, %lo(gCameras)
-/* D37E18 80240618 3C03800A */  lui       $v1, 0x800a
-/* D37E1C 8024061C 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D37E18 80240618 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D37E1C 8024061C 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D37E20 80240620 00912021 */  addu      $a0, $a0, $s1
 /* D37E24 80240624 00031080 */  sll       $v0, $v1, 2
 /* D37E28 80240628 00431021 */  addu      $v0, $v0, $v1
@@ -54,8 +54,8 @@ glabel func_802405D8_D37DD8
 /* D37E98 80240698 00000000 */   nop      
 /* D37E9C 8024069C 0C00A6C9 */  jal       clamp_angle
 /* D37EA0 802406A0 46000306 */   mov.s    $f12, $f0
-/* D37EA4 802406A4 3C018024 */  lui       $at, 0x8024
-/* D37EA8 802406A8 D4222C30 */  ldc1      $f2, 0x2c30($at)
+/* D37EA4 802406A4 3C018024 */  lui       $at, %hi(D_80242C30)
+/* D37EA8 802406A8 D4222C30 */  ldc1      $f2, %lo(D_80242C30)($at)
 /* D37EAC 802406AC 46000021 */  cvt.d.s   $f0, $f0
 /* D37EB0 802406B0 4622003C */  c.lt.d    $f0, $f2
 /* D37EB4 802406B4 00000000 */  nop       
@@ -97,8 +97,8 @@ glabel func_802405D8_D37DD8
 /* D37F3C 8024073C 45030001 */  bc1tl     .L80240744
 /* D37F40 80240740 0000882D */   daddu    $s1, $zero, $zero
 .L80240744:
-/* D37F44 80240744 3C038011 */  lui       $v1, 0x8011
-/* D37F48 80240748 8063EBB3 */  lb        $v1, -0x144d($v1)
+/* D37F44 80240744 3C038011 */  lui       $v1, %hi(D_8010EBB3)
+/* D37F48 80240748 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
 /* D37F4C 8024074C 24020009 */  addiu     $v0, $zero, 9
 /* D37F50 80240750 50620001 */  beql      $v1, $v0, .L80240758
 /* D37F54 80240754 0000882D */   daddu    $s1, $zero, $zero
diff --git a/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_802409EC_D381EC.s b/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_802409EC_D381EC.s
index 5f8dd0c10f..2f7f87c546 100644
--- a/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_802409EC_D381EC.s
+++ b/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_802409EC_D381EC.s
@@ -100,9 +100,9 @@ glabel func_802409EC_D381EC
 /* D38350 80240B50 2C620064 */  sltiu     $v0, $v1, 0x64
 /* D38354 80240B54 10400048 */  beqz      $v0, .L80240C78
 /* D38358 80240B58 00031080 */   sll      $v0, $v1, 2
-/* D3835C 80240B5C 3C018024 */  lui       $at, 0x8024
+/* D3835C 80240B5C 3C018024 */  lui       $at, %hi(D_80242C38)
 /* D38360 80240B60 00220821 */  addu      $at, $at, $v0
-/* D38364 80240B64 8C222C38 */  lw        $v0, 0x2c38($at)
+/* D38364 80240B64 8C222C38 */  lw        $v0, %lo(D_80242C38)($at)
 /* D38368 80240B68 00400008 */  jr        $v0
 /* D3836C 80240B6C 00000000 */   nop      
 /* D38370 80240B70 0240202D */  daddu     $a0, $s2, $zero
diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3A930/func_80240360_D3A930.s b/asm/nonmatchings/world/area_sam/sam_11/D3A930/func_80240360_D3A930.s
index a19823dd01..72f748a979 100644
--- a/asm/nonmatchings/world/area_sam/sam_11/D3A930/func_80240360_D3A930.s
+++ b/asm/nonmatchings/world/area_sam/sam_11/D3A930/func_80240360_D3A930.s
@@ -58,13 +58,13 @@ glabel func_80240360_D3A930
 /* D3A9F0 80240420 0080302D */   daddu    $a2, $a0, $zero
 /* D3A9F4 80240424 240600FF */  addiu     $a2, $zero, 0xff
 /* D3A9F8 80240428 93A20013 */  lbu       $v0, 0x13($sp)
-/* D3A9FC 8024042C 3C038024 */  lui       $v1, 0x8024
-/* D3AA00 80240430 8C633CC0 */  lw        $v1, 0x3cc0($v1)
+/* D3A9FC 8024042C 3C038024 */  lui       $v1, %hi(D_80243CC0)
+/* D3AA00 80240430 8C633CC0 */  lw        $v1, %lo(D_80243CC0)($v1)
 /* D3AA04 80240434 00C23023 */  subu      $a2, $a2, $v0
 /* D3AA08 80240438 00660018 */  mult      $v1, $a2
 /* D3AA0C 8024043C 00001812 */  mflo      $v1
-/* D3AA10 80240440 3C058024 */  lui       $a1, 0x8024
-/* D3AA14 80240444 8CA53CC4 */  lw        $a1, 0x3cc4($a1)
+/* D3AA10 80240440 3C058024 */  lui       $a1, %hi(D_80243CC4)
+/* D3AA14 80240444 8CA53CC4 */  lw        $a1, %lo(D_80243CC4)($a1)
 /* D3AA18 80240448 00A60018 */  mult      $a1, $a2
 /* D3AA1C 8024044C 00002812 */  mflo      $a1
 /* D3AA20 80240450 3C078080 */  lui       $a3, 0x8080
@@ -75,8 +75,8 @@ glabel func_80240360_D3A930
 /* D3AA34 80240464 00000000 */  nop       
 /* D3AA38 80240468 00A70018 */  mult      $a1, $a3
 /* D3AA3C 8024046C 00004010 */  mfhi      $t0
-/* D3AA40 80240470 3C048024 */  lui       $a0, 0x8024
-/* D3AA44 80240474 8C843CC8 */  lw        $a0, 0x3cc8($a0)
+/* D3AA40 80240470 3C048024 */  lui       $a0, %hi(D_80243CC8)
+/* D3AA44 80240474 8C843CC8 */  lw        $a0, %lo(D_80243CC8)($a0)
 /* D3AA48 80240478 00860018 */  mult      $a0, $a2
 /* D3AA4C 8024047C 01431021 */  addu      $v0, $t2, $v1
 /* D3AA50 80240480 000211C3 */  sra       $v0, $v0, 7
diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802407D0_D3ADA0.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802407D0_D3ADA0.s
index 714a1912a2..81ffd39f80 100644
--- a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802407D0_D3ADA0.s
+++ b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802407D0_D3ADA0.s
@@ -4,8 +4,8 @@
 glabel func_802407D0_D3ADA0
 /* D3ADA0 802407D0 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* D3ADA4 802407D4 AFB00010 */  sw        $s0, 0x10($sp)
-/* D3ADA8 802407D8 3C108024 */  lui       $s0, 0x8024
-/* D3ADAC 802407DC 26104F78 */  addiu     $s0, $s0, 0x4f78
+/* D3ADA8 802407D8 3C108024 */  lui       $s0, %hi(D_80244F78)
+/* D3ADAC 802407DC 26104F78 */  addiu     $s0, $s0, %lo(D_80244F78)
 /* D3ADB0 802407E0 AFBF0018 */  sw        $ra, 0x18($sp)
 /* D3ADB4 802407E4 AFB10014 */  sw        $s1, 0x14($sp)
 /* D3ADB8 802407E8 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_802407D0_D3ADA0
 /* D3AE1C 8024084C 28620010 */  slti      $v0, $v1, 0x10
 /* D3AE20 80240850 1440FFFA */  bnez      $v0, .L8024083C
 /* D3AE24 80240854 24840004 */   addiu    $a0, $a0, 4
-/* D3AE28 80240858 3C108024 */  lui       $s0, 0x8024
-/* D3AE2C 8024085C 26104F78 */  addiu     $s0, $s0, 0x4f78
+/* D3AE28 80240858 3C108024 */  lui       $s0, %hi(D_80244F78)
+/* D3AE2C 8024085C 26104F78 */  addiu     $s0, $s0, %lo(D_80244F78)
 /* D3AE30 80240860 0C00AB4B */  jal       heap_free
 /* D3AE34 80240864 8E040000 */   lw       $a0, ($s0)
 /* D3AE38 80240868 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_8024090C_D3AEDC.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_8024090C_D3AEDC.s
index d797b24a9e..4ac63a3a14 100644
--- a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_8024090C_D3AEDC.s
+++ b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_8024090C_D3AEDC.s
@@ -90,8 +90,8 @@ glabel func_8024090C_D3AEDC
 /* D3B028 80240A58 0040802D */   daddu    $s0, $v0, $zero
 /* D3B02C 80240A5C 0040282D */  daddu     $a1, $v0, $zero
 /* D3B030 80240A60 0000182D */  daddu     $v1, $zero, $zero
-/* D3B034 80240A64 3C068024 */  lui       $a2, 0x8024
-/* D3B038 80240A68 24C6501C */  addiu     $a2, $a2, 0x501c
+/* D3B034 80240A64 3C068024 */  lui       $a2, %hi(D_8024501C)
+/* D3B038 80240A68 24C6501C */  addiu     $a2, $a2, %lo(D_8024501C)
 /* D3B03C 80240A6C 00C0202D */  daddu     $a0, $a2, $zero
 .L80240A70:
 /* D3B040 80240A70 8C820000 */  lw        $v0, ($a0)
diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240B30_D3B100.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240B30_D3B100.s
index 6158341e25..0d2ec58dd3 100644
--- a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240B30_D3B100.s
+++ b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240B30_D3B100.s
@@ -9,8 +9,8 @@ glabel func_80240B30_D3B100
 /* D3B110 80240B40 8C84014C */   lw       $a0, 0x14c($a0)
 /* D3B114 80240B44 24040008 */  addiu     $a0, $zero, 8
 /* D3B118 80240B48 0040802D */  daddu     $s0, $v0, $zero
-/* D3B11C 80240B4C 3C028024 */  lui       $v0, 0x8024
-/* D3B120 80240B50 24420B9C */  addiu     $v0, $v0, 0xb9c
+/* D3B11C 80240B4C 3C028024 */  lui       $v0, %hi(D_80240B9C)
+/* D3B120 80240B50 24420B9C */  addiu     $v0, $v0, %lo(D_80240B9C)
 /* D3B124 80240B54 0C00AB39 */  jal       heap_malloc
 /* D3B128 80240B58 AE020008 */   sw       $v0, 8($s0)
 /* D3B12C 80240B5C 0040182D */  daddu     $v1, $v0, $zero
diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240B9C_D3B16C.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240B9C_D3B16C.s
index 1d2163a0f6..61373bbffe 100644
--- a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240B9C_D3B16C.s
+++ b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240B9C_D3B16C.s
@@ -3,8 +3,8 @@
 
 glabel func_80240B9C_D3B16C
 /* D3B16C 80240B9C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D3B170 80240BA0 3C03800A */  lui       $v1, 0x800a
-/* D3B174 80240BA4 8463A634 */  lh        $v1, -0x59cc($v1)
+/* D3B170 80240BA0 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* D3B174 80240BA4 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* D3B178 80240BA8 3C05800B */  lui       $a1, %hi(gCameras)
 /* D3B17C 80240BAC 24A51D80 */  addiu     $a1, $a1, %lo(gCameras)
 /* D3B180 80240BB0 AFBF0010 */  sw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240BFC_D3B1CC.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240BFC_D3B1CC.s
index 552332fbf0..4d6f6288f7 100644
--- a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240BFC_D3B1CC.s
+++ b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240BFC_D3B1CC.s
@@ -21,8 +21,8 @@ glabel func_80240BFC_D3B1CC
 /* D3B20C 80240C3C 2414FFFC */  addiu     $s4, $zero, -4
 /* D3B210 80240C40 24130011 */  addiu     $s3, $zero, 0x11
 /* D3B214 80240C44 3C120080 */  lui       $s2, 0x80
-/* D3B218 80240C48 3C038015 */  lui       $v1, 0x8015
-/* D3B21C 80240C4C 8C6312F0 */  lw        $v1, 0x12f0($v1)
+/* D3B218 80240C48 3C038015 */  lui       $v1, %hi(D_801512F0)
+/* D3B21C 80240C4C 8C6312F0 */  lw        $v1, %lo(D_801512F0)($v1)
 /* D3B220 80240C50 24020001 */  addiu     $v0, $zero, 1
 /* D3B224 80240C54 0C046F97 */  jal       set_background_color_blend
 /* D3B228 80240C58 A0620000 */   sb       $v0, ($v1)
diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240D48_D3B318.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240D48_D3B318.s
index 3475747959..f5b6e0983d 100644
--- a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240D48_D3B318.s
+++ b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240D48_D3B318.s
@@ -49,8 +49,8 @@ glabel func_80240D48_D3B318
 /* D3B3BC 80240DEC 2413FFFC */  addiu     $s3, $zero, -4
 /* D3B3C0 80240DF0 24120011 */  addiu     $s2, $zero, 0x11
 /* D3B3C4 80240DF4 3C11FF7F */  lui       $s1, 0xff7f
-/* D3B3C8 80240DF8 3C028015 */  lui       $v0, 0x8015
-/* D3B3CC 80240DFC 8C4212F0 */  lw        $v0, 0x12f0($v0)
+/* D3B3C8 80240DF8 3C028015 */  lui       $v0, %hi(D_801512F0)
+/* D3B3CC 80240DFC 8C4212F0 */  lw        $v0, %lo(D_801512F0)($v0)
 /* D3B3D0 80240E00 3631FFFF */  ori       $s1, $s1, 0xffff
 /* D3B3D4 80240E04 A0400000 */  sb        $zero, ($v0)
 .L80240E08:
diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240EBC_D3B48C.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240EBC_D3B48C.s
index 90aa8e6fdb..45edd738ec 100644
--- a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240EBC_D3B48C.s
+++ b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240EBC_D3B48C.s
@@ -19,9 +19,9 @@ glabel func_80240EBC_D3B48C
 /* D3B4C0 80240EF0 34A502E0 */  ori       $a1, $a1, 0x2e0
 /* D3B4C4 80240EF4 0C0B1EAF */  jal       get_variable
 /* D3B4C8 80240EF8 0000202D */   daddu    $a0, $zero, $zero
-/* D3B4CC 80240EFC 3C038024 */  lui       $v1, 0x8024
+/* D3B4CC 80240EFC 3C038024 */  lui       $v1, %hi(D_80244FDC)
 /* D3B4D0 80240F00 00621821 */  addu      $v1, $v1, $v0
-/* D3B4D4 80240F04 90634FDC */  lbu       $v1, 0x4fdc($v1)
+/* D3B4D4 80240F04 90634FDC */  lbu       $v1, %lo(D_80244FDC)($v1)
 /* D3B4D8 80240F08 8E220084 */  lw        $v0, 0x84($s1)
 /* D3B4DC 80240F0C 54430006 */  bnel      $v0, $v1, .L80240F28
 /* D3B4E0 80240F10 AE200084 */   sw       $zero, 0x84($s1)
diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240F40_D3B510.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240F40_D3B510.s
index ef4c1b93c6..f32e3a37e8 100644
--- a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240F40_D3B510.s
+++ b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240F40_D3B510.s
@@ -38,8 +38,8 @@ glabel func_80240F40_D3B510
 /* D3B594 80240FC4 0220202D */  daddu     $a0, $s1, $zero
 /* D3B598 80240FC8 3C05F4AC */  lui       $a1, 0xf4ac
 /* D3B59C 80240FCC 34A5D481 */  ori       $a1, $a1, 0xd481
-/* D3B5A0 80240FD0 3C108025 */  lui       $s0, 0x8025
-/* D3B5A4 80240FD4 26101470 */  addiu     $s0, $s0, 0x1470
+/* D3B5A0 80240FD0 3C108025 */  lui       $s0, %hi(D_80251470)
+/* D3B5A4 80240FD4 26101470 */  addiu     $s0, $s0, %lo(D_80251470)
 /* D3B5A8 80240FD8 0C0B1EAF */  jal       get_variable
 /* D3B5AC 80240FDC AE020000 */   sw       $v0, ($s0)
 /* D3B5B0 80240FE0 0220202D */  daddu     $a0, $s1, $zero
@@ -66,8 +66,8 @@ glabel func_80240F40_D3B510
 /* D3B604 80241034 0000202D */   daddu    $a0, $zero, $zero
 /* D3B608 80241038 0220202D */  daddu     $a0, $s1, $zero
 /* D3B60C 8024103C 3C05F4AC */  lui       $a1, 0xf4ac
-/* D3B610 80241040 3C018025 */  lui       $at, 0x8025
-/* D3B614 80241044 AC221474 */  sw        $v0, 0x1474($at)
+/* D3B610 80241040 3C018025 */  lui       $at, %hi(D_80251474)
+/* D3B614 80241044 AC221474 */  sw        $v0, %lo(D_80251474)($at)
 /* D3B618 80241048 0C0B1EAF */  jal       get_variable
 /* D3B61C 8024104C 34A5D481 */   ori      $a1, $a1, 0xd481
 /* D3B620 80241050 0220202D */  daddu     $a0, $s1, $zero
@@ -98,16 +98,16 @@ glabel func_80240F40_D3B510
 /* D3B684 802410B4 E7A00010 */   swc1     $f0, 0x10($sp)
 /* D3B688 802410B8 8E030000 */  lw        $v1, ($s0)
 /* D3B68C 802410BC 8C64000C */  lw        $a0, 0xc($v1)
-/* D3B690 802410C0 3C018025 */  lui       $at, 0x8025
-/* D3B694 802410C4 AC221478 */  sw        $v0, 0x1478($at)
+/* D3B690 802410C0 3C018025 */  lui       $at, %hi(D_80251478)
+/* D3B694 802410C4 AC221478 */  sw        $v0, %lo(D_80251478)($at)
 /* D3B698 802410C8 AC800018 */  sw        $zero, 0x18($a0)
 /* D3B69C 802410CC AC800020 */  sw        $zero, 0x20($a0)
 /* D3B6A0 802410D0 AC800024 */  sw        $zero, 0x24($a0)
 /* D3B6A4 802410D4 AC800028 */  sw        $zero, 0x28($a0)
 /* D3B6A8 802410D8 AC80001C */  sw        $zero, 0x1c($a0)
 .L802410DC:
-/* D3B6AC 802410DC 3C028025 */  lui       $v0, 0x8025
-/* D3B6B0 802410E0 8C421470 */  lw        $v0, 0x1470($v0)
+/* D3B6AC 802410DC 3C028025 */  lui       $v0, %hi(D_80251470)
+/* D3B6B0 802410E0 8C421470 */  lw        $v0, %lo(D_80251470)($v0)
 /* D3B6B4 802410E4 8C44000C */  lw        $a0, 0xc($v0)
 /* D3B6B8 802410E8 8C820020 */  lw        $v0, 0x20($a0)
 /* D3B6BC 802410EC 8C830028 */  lw        $v1, 0x28($a0)
diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241158_D3B728.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241158_D3B728.s
index 91b0c9beb3..14706a7e67 100644
--- a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241158_D3B728.s
+++ b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241158_D3B728.s
@@ -5,19 +5,19 @@ glabel func_80241158_D3B728
 /* D3B728 80241158 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* D3B72C 8024115C 10A0000B */  beqz      $a1, .L8024118C
 /* D3B730 80241160 AFBF0010 */   sw       $ra, 0x10($sp)
-/* D3B734 80241164 3C038025 */  lui       $v1, 0x8025
-/* D3B738 80241168 8C631474 */  lw        $v1, 0x1474($v1)
+/* D3B734 80241164 3C038025 */  lui       $v1, %hi(D_80251474)
+/* D3B738 80241168 8C631474 */  lw        $v1, %lo(D_80251474)($v1)
 /* D3B73C 8024116C 8C620000 */  lw        $v0, ($v1)
-/* D3B740 80241170 3C048025 */  lui       $a0, 0x8025
-/* D3B744 80241174 8C841478 */  lw        $a0, 0x1478($a0)
+/* D3B740 80241170 3C048025 */  lui       $a0, %hi(D_80251478)
+/* D3B744 80241174 8C841478 */  lw        $a0, %lo(D_80251478)($a0)
 /* D3B748 80241178 34420010 */  ori       $v0, $v0, 0x10
 /* D3B74C 8024117C AC620000 */  sw        $v0, ($v1)
 /* D3B750 80241180 8C820000 */  lw        $v0, ($a0)
 /* D3B754 80241184 34420010 */  ori       $v0, $v0, 0x10
 /* D3B758 80241188 AC820000 */  sw        $v0, ($a0)
 .L8024118C:
-/* D3B75C 8024118C 3C048025 */  lui       $a0, 0x8025
-/* D3B760 80241190 8C841470 */  lw        $a0, 0x1470($a0)
+/* D3B75C 8024118C 3C048025 */  lui       $a0, %hi(D_80251470)
+/* D3B760 80241190 8C841470 */  lw        $a0, %lo(D_80251470)($a0)
 /* D3B764 80241194 8C85000C */  lw        $a1, 0xc($a0)
 /* D3B768 80241198 8CA20018 */  lw        $v0, 0x18($a1)
 /* D3B76C 8024119C 8CA30020 */  lw        $v1, 0x20($a1)
@@ -41,8 +41,8 @@ glabel func_80241158_D3B728
 .L802411E4:
 /* D3B7B4 802411E4 0C016914 */  jal       remove_effect
 /* D3B7B8 802411E8 ACA00018 */   sw       $zero, 0x18($a1)
-/* D3B7BC 802411EC 3C048025 */  lui       $a0, 0x8025
-/* D3B7C0 802411F0 8C841450 */  lw        $a0, 0x1450($a0)
+/* D3B7BC 802411EC 3C048025 */  lui       $a0, %hi(D_80251450)
+/* D3B7C0 802411F0 8C841450 */  lw        $a0, %lo(D_80251450)($a0)
 /* D3B7C4 802411F4 0C048D70 */  jal       func_801235C0
 /* D3B7C8 802411F8 00000000 */   nop      
 /* D3B7CC 802411FC 24020002 */  addiu     $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_8024120C_D3B7DC.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_8024120C_D3B7DC.s
index e22e1314c8..732c476cd8 100644
--- a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_8024120C_D3B7DC.s
+++ b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_8024120C_D3B7DC.s
@@ -7,8 +7,8 @@ glabel func_8024120C_D3B7DC
 /* D3B7E4 80241214 8C82000C */  lw        $v0, 0xc($a0)
 /* D3B7E8 80241218 0C0B1EAF */  jal       get_variable
 /* D3B7EC 8024121C 8C450000 */   lw       $a1, ($v0)
-/* D3B7F0 80241220 3C038025 */  lui       $v1, 0x8025
-/* D3B7F4 80241224 8C631470 */  lw        $v1, 0x1470($v1)
+/* D3B7F0 80241220 3C038025 */  lui       $v1, %hi(D_80251470)
+/* D3B7F4 80241224 8C631470 */  lw        $v1, %lo(D_80251470)($v1)
 /* D3B7F8 80241228 8C63000C */  lw        $v1, 0xc($v1)
 /* D3B7FC 8024122C AC620034 */  sw        $v0, 0x34($v1)
 /* D3B800 80241230 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241240_D3B810.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241240_D3B810.s
index ee0cd0c0b3..ce53800cb3 100644
--- a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241240_D3B810.s
+++ b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241240_D3B810.s
@@ -8,8 +8,8 @@ glabel func_80241240_D3B810
 /* D3B81C 8024124C 0C0B1EAF */  jal       get_variable
 /* D3B820 80241250 8C450000 */   lw       $a1, ($v0)
 /* D3B824 80241254 0040202D */  daddu     $a0, $v0, $zero
-/* D3B828 80241258 3C028025 */  lui       $v0, 0x8025
-/* D3B82C 8024125C 8C421470 */  lw        $v0, 0x1470($v0)
+/* D3B828 80241258 3C028025 */  lui       $v0, %hi(D_80251470)
+/* D3B82C 8024125C 8C421470 */  lw        $v0, %lo(D_80251470)($v0)
 /* D3B830 80241260 24030001 */  addiu     $v1, $zero, 1
 /* D3B834 80241264 8C45000C */  lw        $a1, 0xc($v0)
 /* D3B838 80241268 1083000D */  beq       $a0, $v1, .L802412A0
diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802412C0_D3B890.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802412C0_D3B890.s
index acfae4aa06..9b7e8b4db5 100644
--- a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802412C0_D3B890.s
+++ b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802412C0_D3B890.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_802412C0_D3B890
-/* D3B890 802412C0 3C028025 */  lui       $v0, 0x8025
-/* D3B894 802412C4 8C421478 */  lw        $v0, 0x1478($v0)
+/* D3B890 802412C0 3C028025 */  lui       $v0, %hi(D_80251478)
+/* D3B894 802412C4 8C421478 */  lw        $v0, %lo(D_80251478)($v0)
 /* D3B898 802412C8 8C42000C */  lw        $v0, 0xc($v0)
 /* D3B89C 802412CC AC40001C */  sw        $zero, 0x1c($v0)
 /* D3B8A0 802412D0 03E00008 */  jr        $ra
diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802412D8_D3B8A8.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802412D8_D3B8A8.s
index d6a9fd59ec..e223ecc990 100644
--- a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802412D8_D3B8A8.s
+++ b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802412D8_D3B8A8.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_802412D8_D3B8A8
-/* D3B8A8 802412D8 3C028025 */  lui       $v0, 0x8025
-/* D3B8AC 802412DC 8C421478 */  lw        $v0, 0x1478($v0)
+/* D3B8A8 802412D8 3C028025 */  lui       $v0, %hi(D_80251478)
+/* D3B8AC 802412DC 8C421478 */  lw        $v0, %lo(D_80251478)($v0)
 /* D3B8B0 802412E0 8C43000C */  lw        $v1, 0xc($v0)
 /* D3B8B4 802412E4 24020001 */  addiu     $v0, $zero, 1
 /* D3B8B8 802412E8 AC62001C */  sw        $v0, 0x1c($v1)
diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802412F4_D3B8C4.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802412F4_D3B8C4.s
index 1ebc073f1f..8f678ea32c 100644
--- a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802412F4_D3B8C4.s
+++ b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802412F4_D3B8C4.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_802412F4_D3B8C4
-/* D3B8C4 802412F4 3C028025 */  lui       $v0, 0x8025
-/* D3B8C8 802412F8 8C421478 */  lw        $v0, 0x1478($v0)
+/* D3B8C4 802412F4 3C028025 */  lui       $v0, %hi(D_80251478)
+/* D3B8C8 802412F8 8C421478 */  lw        $v0, %lo(D_80251478)($v0)
 /* D3B8CC 802412FC 8C43000C */  lw        $v1, 0xc($v0)
 /* D3B8D0 80241300 24020002 */  addiu     $v0, $zero, 2
 /* D3B8D4 80241304 03E00008 */  jr        $ra
diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802417C8_D3BD98.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802417C8_D3BD98.s
index 0d6ae21bb9..5066e106e5 100644
--- a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802417C8_D3BD98.s
+++ b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802417C8_D3BD98.s
@@ -3,8 +3,8 @@
 
 glabel func_802417C8_D3BD98
 /* D3BD98 802417C8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D3BD9C 802417CC 3C058025 */  lui       $a1, 0x8025
-/* D3BDA0 802417D0 8CA51468 */  lw        $a1, 0x1468($a1)
+/* D3BD9C 802417CC 3C058025 */  lui       $a1, %hi(D_80251468)
+/* D3BDA0 802417D0 8CA51468 */  lw        $a1, %lo(D_80251468)($a1)
 /* D3BDA4 802417D4 AFBF0010 */  sw        $ra, 0x10($sp)
 /* D3BDA8 802417D8 0C0B1EAF */  jal       get_variable
 /* D3BDAC 802417DC 0000202D */   daddu    $a0, $zero, $zero
diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241834_D3BE04.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241834_D3BE04.s
index 1b9bb018f6..29a2a7dba8 100644
--- a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241834_D3BE04.s
+++ b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241834_D3BE04.s
@@ -3,14 +3,14 @@
 
 glabel func_80241834_D3BE04
 /* D3BE04 80241834 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D3BE08 80241838 3C058024 */  lui       $a1, 0x8024
-/* D3BE0C 8024183C 24A517C8 */  addiu     $a1, $a1, 0x17c8
+/* D3BE08 80241838 3C058024 */  lui       $a1, %hi(D_802417C8)
+/* D3BE0C 8024183C 24A517C8 */  addiu     $a1, $a1, %lo(D_802417C8)
 /* D3BE10 80241840 AFBF0010 */  sw        $ra, 0x10($sp)
 /* D3BE14 80241844 0C048C8F */  jal       bind_dynamic_entity_7
 /* D3BE18 80241848 0000202D */   daddu    $a0, $zero, $zero
 /* D3BE1C 8024184C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D3BE20 80241850 3C018025 */  lui       $at, 0x8025
-/* D3BE24 80241854 AC221450 */  sw        $v0, 0x1450($at)
+/* D3BE20 80241850 3C018025 */  lui       $at, %hi(D_80251450)
+/* D3BE24 80241854 AC221450 */  sw        $v0, %lo(D_80251450)($at)
 /* D3BE28 80241858 24020002 */  addiu     $v0, $zero, 2
 /* D3BE2C 8024185C 03E00008 */  jr        $ra
 /* D3BE30 80241860 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241DAC_D3C37C.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241DAC_D3C37C.s
index 279ac4baf8..f99ee12d0a 100644
--- a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241DAC_D3C37C.s
+++ b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241DAC_D3C37C.s
@@ -6,8 +6,8 @@ glabel func_80241DAC_D3C37C
 /* D3C380 80241DB0 F7BC0048 */  sdc1      $f28, 0x48($sp)
 /* D3C384 80241DB4 4480E000 */  mtc1      $zero, $f28
 /* D3C388 80241DB8 F7BA0040 */  sdc1      $f26, 0x40($sp)
-/* D3C38C 80241DBC 3C018025 */  lui       $at, 0x8025
-/* D3C390 80241DC0 D43A1430 */  ldc1      $f26, 0x1430($at)
+/* D3C38C 80241DBC 3C018025 */  lui       $at, %hi(D_80251430)
+/* D3C390 80241DC0 D43A1430 */  ldc1      $f26, %lo(D_80251430)($at)
 /* D3C394 80241DC4 AFB1001C */  sw        $s1, 0x1c($sp)
 /* D3C398 80241DC8 0000882D */  daddu     $s1, $zero, $zero
 /* D3C39C 80241DCC AFB20020 */  sw        $s2, 0x20($sp)
@@ -79,8 +79,8 @@ glabel func_80241DAC_D3C37C
 /* D3C4A0 80241ED0 2404000A */  addiu     $a0, $zero, 0xa
 /* D3C4A4 80241ED4 0C00A67F */  jal       rand_int
 /* D3C4A8 80241ED8 E45C0044 */   swc1     $f28, 0x44($v0)
-/* D3C4AC 80241EDC 3C018025 */  lui       $at, 0x8025
-/* D3C4B0 80241EE0 D4221438 */  ldc1      $f2, 0x1438($at)
+/* D3C4AC 80241EDC 3C018025 */  lui       $at, %hi(D_80251438)
+/* D3C4B0 80241EE0 D4221438 */  ldc1      $f2, %lo(D_80251438)($at)
 /* D3C4B4 80241EE4 44820000 */  mtc1      $v0, $f0
 /* D3C4B8 80241EE8 00000000 */  nop       
 /* D3C4BC 80241EEC 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80242074_D3C644.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80242074_D3C644.s
index ef76d5208e..0aa185918a 100644
--- a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80242074_D3C644.s
+++ b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80242074_D3C644.s
@@ -51,8 +51,8 @@ glabel func_80242074_D3C644
 /* D3C6FC 8024212C 00000000 */  nop       
 /* D3C700 80242130 45000004 */  bc1f      .L80242144
 /* D3C704 80242134 00000000 */   nop      
-/* D3C708 80242138 3C108011 */  lui       $s0, 0x8011
-/* D3C70C 8024213C 8E10C978 */  lw        $s0, -0x3688($s0)
+/* D3C708 80242138 3C108011 */  lui       $s0, %hi(D_8010C978)
+/* D3C70C 8024213C 8E10C978 */  lw        $s0, %lo(D_8010C978)($s0)
 .L80242140:
 /* D3C710 80242140 0240202D */  daddu     $a0, $s2, $zero
 .L80242144:
diff --git a/asm/nonmatchings/world/area_sbk/sbk_02/92A2B0/func_80240040_92A2F0.s b/asm/nonmatchings/world/area_sbk/sbk_02/92A2B0/func_80240040_92A2F0.s
index 2ae2723580..c4626053f8 100644
--- a/asm/nonmatchings/world/area_sbk/sbk_02/92A2B0/func_80240040_92A2F0.s
+++ b/asm/nonmatchings/world/area_sbk/sbk_02/92A2B0/func_80240040_92A2F0.s
@@ -71,8 +71,8 @@ glabel func_80240040_92A2F0
 /* 92A3E4 80240134 08090045 */  j         .L80240114
 /* 92A3E8 80240138 00000000 */   nop      
 .L8024013C:
-/* 92A3EC 8024013C 3C028015 */  lui       $v0, 0x8015
-/* 92A3F0 80240140 8C4212F0 */  lw        $v0, 0x12f0($v0)
+/* 92A3EC 8024013C 3C028015 */  lui       $v0, %hi(D_801512F0)
+/* 92A3F0 80240140 8C4212F0 */  lw        $v0, %lo(D_801512F0)($v0)
 /* 92A3F4 80240144 A0510000 */  sb        $s1, ($v0)
 .L80240148:
 /* 92A3F8 80240148 24020002 */  addiu     $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_sbk/sbk_02/92A2B0/func_80240364_92A614.s b/asm/nonmatchings/world/area_sbk/sbk_02/92A2B0/func_80240364_92A614.s
index a2452f8b58..a1df45ebc2 100644
--- a/asm/nonmatchings/world/area_sbk/sbk_02/92A2B0/func_80240364_92A614.s
+++ b/asm/nonmatchings/world/area_sbk/sbk_02/92A2B0/func_80240364_92A614.s
@@ -9,77 +9,77 @@ glabel func_80240364_92A614
 /* 92A624 80240374 AFB00018 */  sw        $s0, 0x18($sp)
 /* 92A628 80240378 10A0003B */  beqz      $a1, .L80240468
 /* 92A62C 8024037C 8E30000C */   lw       $s0, 0xc($s1)
-/* 92A630 80240380 3C048024 */  lui       $a0, 0x8024
-/* 92A634 80240384 24845600 */  addiu     $a0, $a0, 0x5600
-/* 92A638 80240388 3C058024 */  lui       $a1, 0x8024
-/* 92A63C 8024038C 24A55601 */  addiu     $a1, $a1, 0x5601
-/* 92A640 80240390 3C068024 */  lui       $a2, 0x8024
-/* 92A644 80240394 24C65602 */  addiu     $a2, $a2, 0x5602
-/* 92A648 80240398 3C078024 */  lui       $a3, 0x8024
-/* 92A64C 8024039C 24E75603 */  addiu     $a3, $a3, 0x5603
-/* 92A650 802403A0 3C028024 */  lui       $v0, 0x8024
-/* 92A654 802403A4 24425604 */  addiu     $v0, $v0, 0x5604
+/* 92A630 80240380 3C048024 */  lui       $a0, %hi(D_80245600)
+/* 92A634 80240384 24845600 */  addiu     $a0, $a0, %lo(D_80245600)
+/* 92A638 80240388 3C058024 */  lui       $a1, %hi(D_80245601)
+/* 92A63C 8024038C 24A55601 */  addiu     $a1, $a1, %lo(D_80245601)
+/* 92A640 80240390 3C068024 */  lui       $a2, %hi(D_80245602)
+/* 92A644 80240394 24C65602 */  addiu     $a2, $a2, %lo(D_80245602)
+/* 92A648 80240398 3C078024 */  lui       $a3, %hi(D_80245603)
+/* 92A64C 8024039C 24E75603 */  addiu     $a3, $a3, %lo(D_80245603)
+/* 92A650 802403A0 3C028024 */  lui       $v0, %hi(D_80245604)
+/* 92A654 802403A4 24425604 */  addiu     $v0, $v0, %lo(D_80245604)
 /* 92A658 802403A8 AFA20010 */  sw        $v0, 0x10($sp)
-/* 92A65C 802403AC 3C028024 */  lui       $v0, 0x8024
-/* 92A660 802403B0 24425605 */  addiu     $v0, $v0, 0x5605
+/* 92A65C 802403AC 3C028024 */  lui       $v0, %hi(D_80245605)
+/* 92A660 802403B0 24425605 */  addiu     $v0, $v0, %lo(D_80245605)
 /* 92A664 802403B4 0C046FF5 */  jal       func_8011BFD4
 /* 92A668 802403B8 AFA20014 */   sw       $v0, 0x14($sp)
 /* 92A66C 802403BC 8E050000 */  lw        $a1, ($s0)
 /* 92A670 802403C0 26100004 */  addiu     $s0, $s0, 4
 /* 92A674 802403C4 0C0B1EAF */  jal       get_variable
 /* 92A678 802403C8 0220202D */   daddu    $a0, $s1, $zero
-/* 92A67C 802403CC 3C018024 */  lui       $at, 0x8024
-/* 92A680 802403D0 AC225608 */  sw        $v0, 0x5608($at)
+/* 92A67C 802403CC 3C018024 */  lui       $at, %hi(D_80245608)
+/* 92A680 802403D0 AC225608 */  sw        $v0, %lo(D_80245608)($at)
 /* 92A684 802403D4 8E050000 */  lw        $a1, ($s0)
 /* 92A688 802403D8 26100004 */  addiu     $s0, $s0, 4
 /* 92A68C 802403DC 0C0B1EAF */  jal       get_variable
 /* 92A690 802403E0 0220202D */   daddu    $a0, $s1, $zero
-/* 92A694 802403E4 3C018024 */  lui       $at, 0x8024
-/* 92A698 802403E8 AC22560C */  sw        $v0, 0x560c($at)
+/* 92A694 802403E4 3C018024 */  lui       $at, %hi(D_8024560C)
+/* 92A698 802403E8 AC22560C */  sw        $v0, %lo(D_8024560C)($at)
 /* 92A69C 802403EC 8E050000 */  lw        $a1, ($s0)
 /* 92A6A0 802403F0 26100004 */  addiu     $s0, $s0, 4
 /* 92A6A4 802403F4 0C0B1EAF */  jal       get_variable
 /* 92A6A8 802403F8 0220202D */   daddu    $a0, $s1, $zero
-/* 92A6AC 802403FC 3C018024 */  lui       $at, 0x8024
-/* 92A6B0 80240400 AC225610 */  sw        $v0, 0x5610($at)
+/* 92A6AC 802403FC 3C018024 */  lui       $at, %hi(D_80245610)
+/* 92A6B0 80240400 AC225610 */  sw        $v0, %lo(D_80245610)($at)
 /* 92A6B4 80240404 8E050000 */  lw        $a1, ($s0)
 /* 92A6B8 80240408 26100004 */  addiu     $s0, $s0, 4
 /* 92A6BC 8024040C 0C0B1EAF */  jal       get_variable
 /* 92A6C0 80240410 0220202D */   daddu    $a0, $s1, $zero
-/* 92A6C4 80240414 3C018024 */  lui       $at, 0x8024
-/* 92A6C8 80240418 AC225614 */  sw        $v0, 0x5614($at)
+/* 92A6C4 80240414 3C018024 */  lui       $at, %hi(D_80245614)
+/* 92A6C8 80240418 AC225614 */  sw        $v0, %lo(D_80245614)($at)
 /* 92A6CC 8024041C 8E050000 */  lw        $a1, ($s0)
 /* 92A6D0 80240420 26100004 */  addiu     $s0, $s0, 4
 /* 92A6D4 80240424 0C0B1EAF */  jal       get_variable
 /* 92A6D8 80240428 0220202D */   daddu    $a0, $s1, $zero
-/* 92A6DC 8024042C 3C018024 */  lui       $at, 0x8024
-/* 92A6E0 80240430 AC225618 */  sw        $v0, 0x5618($at)
+/* 92A6DC 8024042C 3C018024 */  lui       $at, %hi(D_80245618)
+/* 92A6E0 80240430 AC225618 */  sw        $v0, %lo(D_80245618)($at)
 /* 92A6E4 80240434 8E050000 */  lw        $a1, ($s0)
 /* 92A6E8 80240438 26100004 */  addiu     $s0, $s0, 4
 /* 92A6EC 8024043C 0C0B1EAF */  jal       get_variable
 /* 92A6F0 80240440 0220202D */   daddu    $a0, $s1, $zero
-/* 92A6F4 80240444 3C018024 */  lui       $at, 0x8024
-/* 92A6F8 80240448 AC22561C */  sw        $v0, 0x561c($at)
+/* 92A6F4 80240444 3C018024 */  lui       $at, %hi(D_8024561C)
+/* 92A6F8 80240448 AC22561C */  sw        $v0, %lo(D_8024561C)($at)
 /* 92A6FC 8024044C 8E050000 */  lw        $a1, ($s0)
 /* 92A700 80240450 0C0B1EAF */  jal       get_variable
 /* 92A704 80240454 0220202D */   daddu    $a0, $s1, $zero
-/* 92A708 80240458 3C018024 */  lui       $at, 0x8024
-/* 92A70C 8024045C AC225620 */  sw        $v0, 0x5620($at)
-/* 92A710 80240460 3C018024 */  lui       $at, 0x8024
-/* 92A714 80240464 AC205624 */  sw        $zero, 0x5624($at)
+/* 92A708 80240458 3C018024 */  lui       $at, %hi(D_80245620)
+/* 92A70C 8024045C AC225620 */  sw        $v0, %lo(D_80245620)($at)
+/* 92A710 80240460 3C018024 */  lui       $at, %hi(D_80245624)
+/* 92A714 80240464 AC205624 */  sw        $zero, %lo(D_80245624)($at)
 .L80240468:
-/* 92A718 80240468 3C118024 */  lui       $s1, 0x8024
-/* 92A71C 8024046C 26315620 */  addiu     $s1, $s1, 0x5620
+/* 92A718 80240468 3C118024 */  lui       $s1, %hi(D_80245620)
+/* 92A71C 8024046C 26315620 */  addiu     $s1, $s1, %lo(D_80245620)
 /* 92A720 80240470 8E2F0000 */  lw        $t7, ($s1)
 /* 92A724 80240474 19E00088 */  blez      $t7, .L80240698
 /* 92A728 80240478 00000000 */   nop      
-/* 92A72C 8024047C 3C108024 */  lui       $s0, 0x8024
-/* 92A730 80240480 26105624 */  addiu     $s0, $s0, 0x5624
+/* 92A72C 8024047C 3C108024 */  lui       $s0, %hi(D_80245624)
+/* 92A730 80240480 26105624 */  addiu     $s0, $s0, %lo(D_80245624)
 /* 92A734 80240484 8E030000 */  lw        $v1, ($s0)
-/* 92A738 80240488 3C048024 */  lui       $a0, 0x8024
-/* 92A73C 8024048C 90845600 */  lbu       $a0, 0x5600($a0)
-/* 92A740 80240490 3C028024 */  lui       $v0, 0x8024
-/* 92A744 80240494 8C425608 */  lw        $v0, 0x5608($v0)
+/* 92A738 80240488 3C048024 */  lui       $a0, %hi(D_80245600)
+/* 92A73C 8024048C 90845600 */  lbu       $a0, %lo(D_80245600)($a0)
+/* 92A740 80240490 3C028024 */  lui       $v0, %hi(D_80245608)
+/* 92A744 80240494 8C425608 */  lw        $v0, %lo(D_80245608)($v0)
 /* 92A748 80240498 24630001 */  addiu     $v1, $v1, 1
 /* 92A74C 8024049C 00441023 */  subu      $v0, $v0, $a0
 /* 92A750 802404A0 00430018 */  mult      $v0, $v1
@@ -97,10 +97,10 @@ glabel func_80240364_92A614
 /* 92A77C 802404CC 0006000D */  break     6
 .L802404D0:
 /* 92A780 802404D0 00007012 */   mflo     $t6
-/* 92A784 802404D4 3C058024 */  lui       $a1, 0x8024
-/* 92A788 802404D8 90A55601 */  lbu       $a1, 0x5601($a1)
-/* 92A78C 802404DC 3C028024 */  lui       $v0, 0x8024
-/* 92A790 802404E0 8C42560C */  lw        $v0, 0x560c($v0)
+/* 92A784 802404D4 3C058024 */  lui       $a1, %hi(D_80245601)
+/* 92A788 802404D8 90A55601 */  lbu       $a1, %lo(D_80245601)($a1)
+/* 92A78C 802404DC 3C028024 */  lui       $v0, %hi(D_8024560C)
+/* 92A790 802404E0 8C42560C */  lw        $v0, %lo(D_8024560C)($v0)
 /* 92A794 802404E4 00451023 */  subu      $v0, $v0, $a1
 /* 92A798 802404E8 00430018 */  mult      $v0, $v1
 /* 92A79C 802404EC 00004012 */  mflo      $t0
@@ -117,10 +117,10 @@ glabel func_80240364_92A614
 /* 92A7C4 80240514 0006000D */  break     6
 .L80240518:
 /* 92A7C8 80240518 00006812 */   mflo     $t5
-/* 92A7CC 8024051C 3C068024 */  lui       $a2, 0x8024
-/* 92A7D0 80240520 90C65602 */  lbu       $a2, 0x5602($a2)
-/* 92A7D4 80240524 3C028024 */  lui       $v0, 0x8024
-/* 92A7D8 80240528 8C425610 */  lw        $v0, 0x5610($v0)
+/* 92A7CC 8024051C 3C068024 */  lui       $a2, %hi(D_80245602)
+/* 92A7D0 80240520 90C65602 */  lbu       $a2, %lo(D_80245602)($a2)
+/* 92A7D4 80240524 3C028024 */  lui       $v0, %hi(D_80245610)
+/* 92A7D8 80240528 8C425610 */  lw        $v0, %lo(D_80245610)($v0)
 /* 92A7DC 8024052C 00461023 */  subu      $v0, $v0, $a2
 /* 92A7E0 80240530 00430018 */  mult      $v0, $v1
 /* 92A7E4 80240534 00004012 */  mflo      $t0
@@ -137,10 +137,10 @@ glabel func_80240364_92A614
 /* 92A80C 8024055C 0006000D */  break     6
 .L80240560:
 /* 92A810 80240560 00006012 */   mflo     $t4
-/* 92A814 80240564 3C078024 */  lui       $a3, 0x8024
-/* 92A818 80240568 90E75603 */  lbu       $a3, 0x5603($a3)
-/* 92A81C 8024056C 3C028024 */  lui       $v0, 0x8024
-/* 92A820 80240570 8C425614 */  lw        $v0, 0x5614($v0)
+/* 92A814 80240564 3C078024 */  lui       $a3, %hi(D_80245603)
+/* 92A818 80240568 90E75603 */  lbu       $a3, %lo(D_80245603)($a3)
+/* 92A81C 8024056C 3C028024 */  lui       $v0, %hi(D_80245614)
+/* 92A820 80240570 8C425614 */  lw        $v0, %lo(D_80245614)($v0)
 /* 92A824 80240574 00471023 */  subu      $v0, $v0, $a3
 /* 92A828 80240578 00430018 */  mult      $v0, $v1
 /* 92A82C 8024057C 00004012 */  mflo      $t0
@@ -157,10 +157,10 @@ glabel func_80240364_92A614
 /* 92A854 802405A4 0006000D */  break     6
 .L802405A8:
 /* 92A858 802405A8 00005812 */   mflo     $t3
-/* 92A85C 802405AC 3C098024 */  lui       $t1, 0x8024
-/* 92A860 802405B0 91295604 */  lbu       $t1, 0x5604($t1)
-/* 92A864 802405B4 3C028024 */  lui       $v0, 0x8024
-/* 92A868 802405B8 8C425618 */  lw        $v0, 0x5618($v0)
+/* 92A85C 802405AC 3C098024 */  lui       $t1, %hi(D_80245604)
+/* 92A860 802405B0 91295604 */  lbu       $t1, %lo(D_80245604)($t1)
+/* 92A864 802405B4 3C028024 */  lui       $v0, %hi(D_80245618)
+/* 92A868 802405B8 8C425618 */  lw        $v0, %lo(D_80245618)($v0)
 /* 92A86C 802405BC 00491023 */  subu      $v0, $v0, $t1
 /* 92A870 802405C0 00430018 */  mult      $v0, $v1
 /* 92A874 802405C4 00004012 */  mflo      $t0
@@ -177,10 +177,10 @@ glabel func_80240364_92A614
 /* 92A89C 802405EC 0006000D */  break     6
 .L802405F0:
 /* 92A8A0 802405F0 00005012 */   mflo     $t2
-/* 92A8A4 802405F4 3C088024 */  lui       $t0, 0x8024
-/* 92A8A8 802405F8 91085605 */  lbu       $t0, 0x5605($t0)
-/* 92A8AC 802405FC 3C028024 */  lui       $v0, 0x8024
-/* 92A8B0 80240600 8C42561C */  lw        $v0, 0x561c($v0)
+/* 92A8A4 802405F4 3C088024 */  lui       $t0, %hi(D_80245605)
+/* 92A8A8 802405F8 91085605 */  lbu       $t0, %lo(D_80245605)($t0)
+/* 92A8AC 802405FC 3C028024 */  lui       $v0, %hi(D_8024561C)
+/* 92A8B0 80240600 8C42561C */  lw        $v0, %lo(D_8024561C)($v0)
 /* 92A8B4 80240604 00481023 */  subu      $v0, $v0, $t0
 /* 92A8B8 80240608 00430018 */  mult      $v0, $v1
 /* 92A8BC 8024060C 0000C812 */  mflo      $t9
@@ -221,18 +221,18 @@ glabel func_80240364_92A614
 /* 92A940 80240690 080901B6 */  j         .L802406D8
 /* 92A944 80240694 24020002 */   addiu    $v0, $zero, 2
 .L80240698:
-/* 92A948 80240698 3C028024 */  lui       $v0, 0x8024
-/* 92A94C 8024069C 9042561B */  lbu       $v0, 0x561b($v0)
-/* 92A950 802406A0 3C048024 */  lui       $a0, 0x8024
-/* 92A954 802406A4 9084560B */  lbu       $a0, 0x560b($a0)
-/* 92A958 802406A8 3C058024 */  lui       $a1, 0x8024
-/* 92A95C 802406AC 90A5560F */  lbu       $a1, 0x560f($a1)
-/* 92A960 802406B0 3C068024 */  lui       $a2, 0x8024
-/* 92A964 802406B4 90C65613 */  lbu       $a2, 0x5613($a2)
-/* 92A968 802406B8 3C078024 */  lui       $a3, 0x8024
-/* 92A96C 802406BC 90E75617 */  lbu       $a3, 0x5617($a3)
-/* 92A970 802406C0 3C038024 */  lui       $v1, 0x8024
-/* 92A974 802406C4 9063561F */  lbu       $v1, 0x561f($v1)
+/* 92A948 80240698 3C028024 */  lui       $v0, %hi(D_8024561B)
+/* 92A94C 8024069C 9042561B */  lbu       $v0, %lo(D_8024561B)($v0)
+/* 92A950 802406A0 3C048024 */  lui       $a0, %hi(D_8024560B)
+/* 92A954 802406A4 9084560B */  lbu       $a0, %lo(D_8024560B)($a0)
+/* 92A958 802406A8 3C058024 */  lui       $a1, %hi(D_8024560F)
+/* 92A95C 802406AC 90A5560F */  lbu       $a1, %lo(D_8024560F)($a1)
+/* 92A960 802406B0 3C068024 */  lui       $a2, %hi(D_80245613)
+/* 92A964 802406B4 90C65613 */  lbu       $a2, %lo(D_80245613)($a2)
+/* 92A968 802406B8 3C078024 */  lui       $a3, %hi(D_80245617)
+/* 92A96C 802406BC 90E75617 */  lbu       $a3, %lo(D_80245617)($a3)
+/* 92A970 802406C0 3C038024 */  lui       $v1, %hi(D_8024561F)
+/* 92A974 802406C4 9063561F */  lbu       $v1, %lo(D_8024561F)($v1)
 /* 92A978 802406C8 AFA20010 */  sw        $v0, 0x10($sp)
 /* 92A97C 802406CC 0C046FE6 */  jal       func_8011BF98
 /* 92A980 802406D0 AFA30014 */   sw       $v1, 0x14($sp)
diff --git a/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_8024091C_92ABCC.s b/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_8024091C_92ABCC.s
index 6b1067f2ff..ecb9fa03a7 100644
--- a/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_8024091C_92ABCC.s
+++ b/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_8024091C_92ABCC.s
@@ -6,11 +6,11 @@ glabel func_8024091C_92ABCC
 /* 92ABD0 80240920 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 92ABD4 80240924 10A00003 */  beqz      $a1, .L80240934
 /* 92ABD8 80240928 8C86000C */   lw       $a2, 0xc($a0)
-/* 92ABDC 8024092C 3C018024 */  lui       $at, 0x8024
-/* 92ABE0 80240930 AC20404C */  sw        $zero, 0x404c($at)
+/* 92ABDC 8024092C 3C018024 */  lui       $at, %hi(D_8024404C)
+/* 92ABE0 80240930 AC20404C */  sw        $zero, %lo(D_8024404C)($at)
 .L80240934:
-/* 92ABE4 80240934 3C038024 */  lui       $v1, 0x8024
-/* 92ABE8 80240938 2463404C */  addiu     $v1, $v1, 0x404c
+/* 92ABE4 80240934 3C038024 */  lui       $v1, %hi(D_8024404C)
+/* 92ABE8 80240938 2463404C */  addiu     $v1, $v1, %lo(D_8024404C)
 /* 92ABEC 8024093C 8C620000 */  lw        $v0, ($v1)
 /* 92ABF0 80240940 54400003 */  bnel      $v0, $zero, .L80240950
 /* 92ABF4 80240944 AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_8024091C_92ABCC
 /* 92ABFC 8024094C 0000102D */   daddu    $v0, $zero, $zero
 .L80240950:
 /* 92AC00 80240950 8CC50000 */  lw        $a1, ($a2)
-/* 92AC04 80240954 3C068024 */  lui       $a2, 0x8024
+/* 92AC04 80240954 3C068024 */  lui       $a2, %hi(D_80244050)
 /* 92AC08 80240958 0C0B2026 */  jal       set_variable
-/* 92AC0C 8024095C 8CC64050 */   lw       $a2, 0x4050($a2)
+/* 92AC0C 8024095C 8CC64050 */   lw       $a2, %lo(D_80244050)($a2)
 /* 92AC10 80240960 24020002 */  addiu     $v0, $zero, 2
 .L80240964:
 /* 92AC14 80240964 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_80240970_92AC20.s b/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_80240970_92AC20.s
index fa2eb68b90..4b2d785546 100644
--- a/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_80240970_92AC20.s
+++ b/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_80240970_92AC20.s
@@ -7,12 +7,12 @@ glabel func_80240970_92AC20
 /* 92AC28 80240978 8C82000C */  lw        $v0, 0xc($a0)
 /* 92AC2C 8024097C 0C0B1EAF */  jal       get_variable
 /* 92AC30 80240980 8C450000 */   lw       $a1, ($v0)
-/* 92AC34 80240984 3C018024 */  lui       $at, 0x8024
-/* 92AC38 80240988 AC224050 */  sw        $v0, 0x4050($at)
+/* 92AC34 80240984 3C018024 */  lui       $at, %hi(D_80244050)
+/* 92AC38 80240988 AC224050 */  sw        $v0, %lo(D_80244050)($at)
 /* 92AC3C 8024098C 24020002 */  addiu     $v0, $zero, 2
 /* 92AC40 80240990 8FBF0010 */  lw        $ra, 0x10($sp)
 /* 92AC44 80240994 24030001 */  addiu     $v1, $zero, 1
-/* 92AC48 80240998 3C018024 */  lui       $at, 0x8024
-/* 92AC4C 8024099C AC23404C */  sw        $v1, 0x404c($at)
+/* 92AC48 80240998 3C018024 */  lui       $at, %hi(D_8024404C)
+/* 92AC4C 8024099C AC23404C */  sw        $v1, %lo(D_8024404C)($at)
 /* 92AC50 802409A0 03E00008 */  jr        $ra
 /* 92AC54 802409A4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_802409A8_92AC58.s b/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_802409A8_92AC58.s
index 0a40679cf7..7003b9ad1a 100644
--- a/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_802409A8_92AC58.s
+++ b/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_802409A8_92AC58.s
@@ -13,8 +13,8 @@ glabel func_802409A8_92AC58
 /* 92AC78 802409C8 8C620000 */  lw        $v0, ($v1)
 /* 92AC7C 802409CC 5040000A */  beql      $v0, $zero, .L802409F8
 /* 92AC80 802409D0 00041080 */   sll      $v0, $a0, 2
-/* 92AC84 802409D4 3C058024 */  lui       $a1, 0x8024
-/* 92AC88 802409D8 24A55630 */  addiu     $a1, $a1, 0x5630
+/* 92AC84 802409D4 3C058024 */  lui       $a1, %hi(D_80245630)
+/* 92AC88 802409D8 24A55630 */  addiu     $a1, $a1, %lo(D_80245630)
 .L802409DC:
 /* 92AC8C 802409DC 24630004 */  addiu     $v1, $v1, 4
 /* 92AC90 802409E0 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_802409A8_92AC58
 /* 92ACA0 802409F0 24A50004 */   addiu    $a1, $a1, 4
 /* 92ACA4 802409F4 00041080 */  sll       $v0, $a0, 2
 .L802409F8:
-/* 92ACA8 802409F8 3C018024 */  lui       $at, 0x8024
+/* 92ACA8 802409F8 3C018024 */  lui       $at, %hi(D_80245630)
 /* 92ACAC 802409FC 00220821 */  addu      $at, $at, $v0
-/* 92ACB0 80240A00 AC205630 */  sw        $zero, 0x5630($at)
+/* 92ACB0 80240A00 AC205630 */  sw        $zero, %lo(D_80245630)($at)
 /* 92ACB4 80240A04 0809028D */  j         .L80240A34
 /* 92ACB8 80240A08 00000000 */   nop      
 .L80240A0C:
-/* 92ACBC 80240A0C 3C038024 */  lui       $v1, 0x8024
-/* 92ACC0 80240A10 24635630 */  addiu     $v1, $v1, 0x5630
+/* 92ACBC 80240A0C 3C038024 */  lui       $v1, %hi(D_80245630)
+/* 92ACC0 80240A10 24635630 */  addiu     $v1, $v1, %lo(D_80245630)
 /* 92ACC4 80240A14 0060282D */  daddu     $a1, $v1, $zero
 .L80240A18:
 /* 92ACC8 80240A18 24820080 */  addiu     $v0, $a0, 0x80
diff --git a/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_80240A44_92ACF4.s b/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_80240A44_92ACF4.s
index 0a40809781..e8de7b8787 100644
--- a/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_80240A44_92ACF4.s
+++ b/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_80240A44_92ACF4.s
@@ -4,8 +4,8 @@
 glabel func_80240A44_92ACF4
 /* 92ACF4 80240A44 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* 92ACF8 80240A48 AFB00010 */  sw        $s0, 0x10($sp)
-/* 92ACFC 80240A4C 3C108024 */  lui       $s0, 0x8024
-/* 92AD00 80240A50 261041D8 */  addiu     $s0, $s0, 0x41d8
+/* 92ACFC 80240A4C 3C108024 */  lui       $s0, %hi(D_802441D8)
+/* 92AD00 80240A50 261041D8 */  addiu     $s0, $s0, %lo(D_802441D8)
 /* 92AD04 80240A54 AFBF0018 */  sw        $ra, 0x18($sp)
 /* 92AD08 80240A58 AFB10014 */  sw        $s1, 0x14($sp)
 /* 92AD0C 80240A5C 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_80240A44_92ACF4
 /* 92AD70 80240AC0 28620010 */  slti      $v0, $v1, 0x10
 /* 92AD74 80240AC4 1440FFFA */  bnez      $v0, .L80240AB0
 /* 92AD78 80240AC8 24840004 */   addiu    $a0, $a0, 4
-/* 92AD7C 80240ACC 3C108024 */  lui       $s0, 0x8024
-/* 92AD80 80240AD0 261041D8 */  addiu     $s0, $s0, 0x41d8
+/* 92AD7C 80240ACC 3C108024 */  lui       $s0, %hi(D_802441D8)
+/* 92AD80 80240AD0 261041D8 */  addiu     $s0, $s0, %lo(D_802441D8)
 /* 92AD84 80240AD4 0C00AB4B */  jal       heap_free
 /* 92AD88 80240AD8 8E040000 */   lw       $a0, ($s0)
 /* 92AD8C 80240ADC AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240040_93F5F0.s b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240040_93F5F0.s
index eb961720e7..d137a327bd 100644
--- a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240040_93F5F0.s
+++ b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240040_93F5F0.s
@@ -71,8 +71,8 @@ glabel func_80240040_93F5F0
 /* 93F6E4 80240134 08090045 */  j         .L80240114
 /* 93F6E8 80240138 00000000 */   nop      
 .L8024013C:
-/* 93F6EC 8024013C 3C028015 */  lui       $v0, 0x8015
-/* 93F6F0 80240140 8C4212F0 */  lw        $v0, 0x12f0($v0)
+/* 93F6EC 8024013C 3C028015 */  lui       $v0, %hi(D_801512F0)
+/* 93F6F0 80240140 8C4212F0 */  lw        $v0, %lo(D_801512F0)($v0)
 /* 93F6F4 80240144 A0510000 */  sb        $s1, ($v0)
 .L80240148:
 /* 93F6F8 80240148 24020002 */  addiu     $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240370_93F920.s b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240370_93F920.s
index 40907aa1e7..695df809c1 100644
--- a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240370_93F920.s
+++ b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240370_93F920.s
@@ -35,8 +35,8 @@ glabel func_80240370_93F920
 /* 93F994 802403E4 08090103 */  j         .L8024040C
 /* 93F998 802403E8 E4800018 */   swc1     $f0, 0x18($a0)
 .L802403EC:
-/* 93F99C 802403EC 3C018024 */  lui       $at, 0x8024
-/* 93F9A0 802403F0 D42248A0 */  ldc1      $f2, 0x48a0($at)
+/* 93F99C 802403EC 3C018024 */  lui       $at, %hi(D_802448A0)
+/* 93F9A0 802403F0 D42248A0 */  ldc1      $f2, %lo(D_802448A0)($at)
 /* 93F9A4 802403F4 44820000 */  mtc1      $v0, $f0
 /* 93F9A8 802403F8 00000000 */  nop       
 /* 93F9AC 802403FC 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_802408B0_93FE60.s b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_802408B0_93FE60.s
index d291e04527..0cee1449f0 100644
--- a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_802408B0_93FE60.s
+++ b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_802408B0_93FE60.s
@@ -21,16 +21,16 @@ glabel func_802408B0_93FE60
 /* 93FEA0 802408F0 04410009 */  bgez      $v0, .L80240918
 /* 93FEA4 802408F4 00000000 */   nop      
 /* 93FEA8 802408F8 C640000C */  lwc1      $f0, 0xc($s2)
-/* 93FEAC 802408FC 3C018024 */  lui       $at, 0x8024
-/* 93FEB0 80240900 D42248A8 */  ldc1      $f2, 0x48a8($at)
+/* 93FEAC 802408FC 3C018024 */  lui       $at, %hi(D_802448A8)
+/* 93FEB0 80240900 D42248A8 */  ldc1      $f2, %lo(D_802448A8)($at)
 /* 93FEB4 80240904 46000021 */  cvt.d.s   $f0, $f0
 /* 93FEB8 80240908 46220002 */  mul.d     $f0, $f0, $f2
 /* 93FEBC 8024090C 00000000 */  nop       
 /* 93FEC0 80240910 0809024D */  j         .L80240934
 /* 93FEC4 80240914 46200020 */   cvt.s.d  $f0, $f0
 .L80240918:
-/* 93FEC8 80240918 3C018024 */  lui       $at, 0x8024
-/* 93FECC 8024091C D42248B0 */  ldc1      $f2, 0x48b0($at)
+/* 93FEC8 80240918 3C018024 */  lui       $at, %hi(D_802448B0)
+/* 93FECC 8024091C D42248B0 */  ldc1      $f2, %lo(D_802448B0)($at)
 /* 93FED0 80240920 44820000 */  mtc1      $v0, $f0
 /* 93FED4 80240924 00000000 */  nop       
 /* 93FED8 80240928 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240B64_940114.s b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240B64_940114.s
index 368e8e3f24..f75892e167 100644
--- a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240B64_940114.s
+++ b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240B64_940114.s
@@ -102,9 +102,9 @@ glabel func_80240B64_940114
 /* 940284 80240CD4 2C620064 */  sltiu     $v0, $v1, 0x64
 /* 940288 80240CD8 10400036 */  beqz      $v0, .L80240DB4
 /* 94028C 80240CDC 00031080 */   sll      $v0, $v1, 2
-/* 940290 80240CE0 3C018024 */  lui       $at, 0x8024
+/* 940290 80240CE0 3C018024 */  lui       $at, %hi(D_802448B8)
 /* 940294 80240CE4 00220821 */  addu      $at, $at, $v0
-/* 940298 80240CE8 8C2248B8 */  lw        $v0, 0x48b8($at)
+/* 940298 80240CE8 8C2248B8 */  lw        $v0, %lo(D_802448B8)($at)
 /* 94029C 80240CEC 00400008 */  jr        $v0
 /* 9402A0 80240CF0 00000000 */   nop      
 /* 9402A4 80240CF4 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240DDC_94038C.s b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240DDC_94038C.s
index 0d26abe3ff..81ba434c98 100644
--- a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240DDC_94038C.s
+++ b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240DDC_94038C.s
@@ -4,8 +4,8 @@
 glabel func_80240DDC_94038C
 /* 94038C 80240DDC 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* 940390 80240DE0 AFB00010 */  sw        $s0, 0x10($sp)
-/* 940394 80240DE4 3C108024 */  lui       $s0, 0x8024
-/* 940398 80240DE8 26101FF4 */  addiu     $s0, $s0, 0x1ff4
+/* 940394 80240DE4 3C108024 */  lui       $s0, %hi(D_80241FF4)
+/* 940398 80240DE8 26101FF4 */  addiu     $s0, $s0, %lo(D_80241FF4)
 /* 94039C 80240DEC AFBF0018 */  sw        $ra, 0x18($sp)
 /* 9403A0 80240DF0 AFB10014 */  sw        $s1, 0x14($sp)
 /* 9403A4 80240DF4 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_80240DDC_94038C
 /* 940408 80240E58 28620010 */  slti      $v0, $v1, 0x10
 /* 94040C 80240E5C 1440FFFA */  bnez      $v0, .L80240E48
 /* 940410 80240E60 24840004 */   addiu    $a0, $a0, 4
-/* 940414 80240E64 3C108024 */  lui       $s0, 0x8024
-/* 940418 80240E68 26101FF4 */  addiu     $s0, $s0, 0x1ff4
+/* 940414 80240E64 3C108024 */  lui       $s0, %hi(D_80241FF4)
+/* 940418 80240E68 26101FF4 */  addiu     $s0, $s0, %lo(D_80241FF4)
 /* 94041C 80240E6C 0C00AB4B */  jal       heap_free
 /* 940420 80240E70 8E040000 */   lw       $a0, ($s0)
 /* 940424 80240E74 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80241120_9406D0.s b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80241120_9406D0.s
index 161636c6a4..36b2dd2fb5 100644
--- a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80241120_9406D0.s
+++ b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80241120_9406D0.s
@@ -6,11 +6,11 @@ glabel func_80241120_9406D0
 /* 9406D4 80241124 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 9406D8 80241128 10A00003 */  beqz      $a1, .L80241138
 /* 9406DC 8024112C 8C86000C */   lw       $a2, 0xc($a0)
-/* 9406E0 80241130 3C018024 */  lui       $at, 0x8024
-/* 9406E4 80241134 AC202058 */  sw        $zero, 0x2058($at)
+/* 9406E0 80241130 3C018024 */  lui       $at, %hi(D_80242058)
+/* 9406E4 80241134 AC202058 */  sw        $zero, %lo(D_80242058)($at)
 .L80241138:
-/* 9406E8 80241138 3C038024 */  lui       $v1, 0x8024
-/* 9406EC 8024113C 24632058 */  addiu     $v1, $v1, 0x2058
+/* 9406E8 80241138 3C038024 */  lui       $v1, %hi(D_80242058)
+/* 9406EC 8024113C 24632058 */  addiu     $v1, $v1, %lo(D_80242058)
 /* 9406F0 80241140 8C620000 */  lw        $v0, ($v1)
 /* 9406F4 80241144 54400003 */  bnel      $v0, $zero, .L80241154
 /* 9406F8 80241148 AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_80241120_9406D0
 /* 940700 80241150 0000102D */   daddu    $v0, $zero, $zero
 .L80241154:
 /* 940704 80241154 8CC50000 */  lw        $a1, ($a2)
-/* 940708 80241158 3C068024 */  lui       $a2, 0x8024
+/* 940708 80241158 3C068024 */  lui       $a2, %hi(D_8024205C)
 /* 94070C 8024115C 0C0B2026 */  jal       set_variable
-/* 940710 80241160 8CC6205C */   lw       $a2, 0x205c($a2)
+/* 940710 80241160 8CC6205C */   lw       $a2, %lo(D_8024205C)($a2)
 /* 940714 80241164 24020002 */  addiu     $v0, $zero, 2
 .L80241168:
 /* 940718 80241168 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80241174_940724.s b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80241174_940724.s
index f92d89f012..21057b599f 100644
--- a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80241174_940724.s
+++ b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80241174_940724.s
@@ -7,12 +7,12 @@ glabel func_80241174_940724
 /* 94072C 8024117C 8C82000C */  lw        $v0, 0xc($a0)
 /* 940730 80241180 0C0B1EAF */  jal       get_variable
 /* 940734 80241184 8C450000 */   lw       $a1, ($v0)
-/* 940738 80241188 3C018024 */  lui       $at, 0x8024
-/* 94073C 8024118C AC22205C */  sw        $v0, 0x205c($at)
+/* 940738 80241188 3C018024 */  lui       $at, %hi(D_8024205C)
+/* 94073C 8024118C AC22205C */  sw        $v0, %lo(D_8024205C)($at)
 /* 940740 80241190 24020002 */  addiu     $v0, $zero, 2
 /* 940744 80241194 8FBF0010 */  lw        $ra, 0x10($sp)
 /* 940748 80241198 24030001 */  addiu     $v1, $zero, 1
-/* 94074C 8024119C 3C018024 */  lui       $at, 0x8024
-/* 940750 802411A0 AC232058 */  sw        $v1, 0x2058($at)
+/* 94074C 8024119C 3C018024 */  lui       $at, %hi(D_80242058)
+/* 940750 802411A0 AC232058 */  sw        $v1, %lo(D_80242058)($at)
 /* 940754 802411A4 03E00008 */  jr        $ra
 /* 940758 802411A8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80241248_9407F8.s b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80241248_9407F8.s
index c295db235a..fc2b93a385 100644
--- a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80241248_9407F8.s
+++ b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80241248_9407F8.s
@@ -13,8 +13,8 @@ glabel func_80241248_9407F8
 /* 940818 80241268 8C620000 */  lw        $v0, ($v1)
 /* 94081C 8024126C 5040000A */  beql      $v0, $zero, .L80241298
 /* 940820 80241270 00041080 */   sll      $v0, $a0, 2
-/* 940824 80241274 3C058024 */  lui       $a1, 0x8024
-/* 940828 80241278 24A54C18 */  addiu     $a1, $a1, 0x4c18
+/* 940824 80241274 3C058024 */  lui       $a1, %hi(D_80244C18)
+/* 940828 80241278 24A54C18 */  addiu     $a1, $a1, %lo(D_80244C18)
 .L8024127C:
 /* 94082C 8024127C 24630004 */  addiu     $v1, $v1, 4
 /* 940830 80241280 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_80241248_9407F8
 /* 940840 80241290 24A50004 */   addiu    $a1, $a1, 4
 /* 940844 80241294 00041080 */  sll       $v0, $a0, 2
 .L80241298:
-/* 940848 80241298 3C018024 */  lui       $at, 0x8024
+/* 940848 80241298 3C018024 */  lui       $at, %hi(D_80244C18)
 /* 94084C 8024129C 00220821 */  addu      $at, $at, $v0
-/* 940850 802412A0 AC204C18 */  sw        $zero, 0x4c18($at)
+/* 940850 802412A0 AC204C18 */  sw        $zero, %lo(D_80244C18)($at)
 /* 940854 802412A4 080904B5 */  j         .L802412D4
 /* 940858 802412A8 00000000 */   nop      
 .L802412AC:
-/* 94085C 802412AC 3C038024 */  lui       $v1, 0x8024
-/* 940860 802412B0 24634C18 */  addiu     $v1, $v1, 0x4c18
+/* 94085C 802412AC 3C038024 */  lui       $v1, %hi(D_80244C18)
+/* 940860 802412B0 24634C18 */  addiu     $v1, $v1, %lo(D_80244C18)
 /* 940864 802412B4 0060282D */  daddu     $a1, $v1, $zero
 .L802412B8:
 /* 940868 802412B8 24820080 */  addiu     $v0, $a0, 0x80
diff --git a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80241560_940B10.s b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80241560_940B10.s
index 488f9f5b5a..86bad5eee8 100644
--- a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80241560_940B10.s
+++ b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80241560_940B10.s
@@ -15,7 +15,7 @@ glabel func_80241560_940B10
 /* 940B38 80241588 8FBF0014 */  lw        $ra, 0x14($sp)
 /* 940B3C 8024158C 8FB00010 */  lw        $s0, 0x10($sp)
 /* 940B40 80241590 24020002 */  addiu     $v0, $zero, 2
-/* 940B44 80241594 3C018024 */  lui       $at, 0x8024
-/* 940B48 80241598 AC234D88 */  sw        $v1, 0x4d88($at)
+/* 940B44 80241594 3C018024 */  lui       $at, %hi(D_80244D88)
+/* 940B48 80241598 AC234D88 */  sw        $v1, %lo(D_80244D88)($at)
 /* 940B4C 8024159C 03E00008 */  jr        $ra
 /* 940B50 802415A0 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_802415A4_940B54.s b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_802415A4_940B54.s
index f5c2820f6c..532167f7a6 100644
--- a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_802415A4_940B54.s
+++ b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_802415A4_940B54.s
@@ -6,8 +6,8 @@ glabel func_802415A4_940B54
 /* 940B58 802415A8 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 940B5C 802415AC 0C00EABB */  jal       get_npc_unsafe
 /* 940B60 802415B0 8C84008C */   lw       $a0, 0x8c($a0)
-/* 940B64 802415B4 3C038024 */  lui       $v1, 0x8024
-/* 940B68 802415B8 8C634D88 */  lw        $v1, 0x4d88($v1)
+/* 940B64 802415B4 3C038024 */  lui       $v1, %hi(D_80244D88)
+/* 940B68 802415B8 8C634D88 */  lw        $v1, %lo(D_80244D88)($v1)
 /* 940B6C 802415BC AC430028 */  sw        $v1, 0x28($v0)
 /* 940B70 802415C0 8FBF0010 */  lw        $ra, 0x10($sp)
 /* 940B74 802415C4 24020002 */  addiu     $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_80240040_945F10.s b/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_80240040_945F10.s
index ff0b4d4dd8..67b0d9eee3 100644
--- a/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_80240040_945F10.s
+++ b/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_80240040_945F10.s
@@ -4,8 +4,8 @@
 glabel func_80240040_945F10
 /* 945F10 80240040 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* 945F14 80240044 AFB00010 */  sw        $s0, 0x10($sp)
-/* 945F18 80240048 3C108024 */  lui       $s0, 0x8024
-/* 945F1C 8024004C 26100D9C */  addiu     $s0, $s0, 0xd9c
+/* 945F18 80240048 3C108024 */  lui       $s0, %hi(D_80240D9C)
+/* 945F1C 8024004C 26100D9C */  addiu     $s0, $s0, %lo(D_80240D9C)
 /* 945F20 80240050 AFBF0018 */  sw        $ra, 0x18($sp)
 /* 945F24 80240054 AFB10014 */  sw        $s1, 0x14($sp)
 /* 945F28 80240058 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_80240040_945F10
 /* 945F8C 802400BC 28620010 */  slti      $v0, $v1, 0x10
 /* 945F90 802400C0 1440FFFA */  bnez      $v0, .L802400AC
 /* 945F94 802400C4 24840004 */   addiu    $a0, $a0, 4
-/* 945F98 802400C8 3C108024 */  lui       $s0, 0x8024
-/* 945F9C 802400CC 26100D9C */  addiu     $s0, $s0, 0xd9c
+/* 945F98 802400C8 3C108024 */  lui       $s0, %hi(D_80240D9C)
+/* 945F9C 802400CC 26100D9C */  addiu     $s0, $s0, %lo(D_80240D9C)
 /* 945FA0 802400D0 0C00AB4B */  jal       heap_free
 /* 945FA4 802400D4 8E040000 */   lw       $a0, ($s0)
 /* 945FA8 802400D8 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_80240384_946254.s b/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_80240384_946254.s
index 315281c672..4eb2aeb9d7 100644
--- a/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_80240384_946254.s
+++ b/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_80240384_946254.s
@@ -6,11 +6,11 @@ glabel func_80240384_946254
 /* 946258 80240388 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 94625C 8024038C 10A00003 */  beqz      $a1, .L8024039C
 /* 946260 80240390 8C86000C */   lw       $a2, 0xc($a0)
-/* 946264 80240394 3C018024 */  lui       $at, 0x8024
-/* 946268 80240398 AC200E00 */  sw        $zero, 0xe00($at)
+/* 946264 80240394 3C018024 */  lui       $at, %hi(D_80240E00)
+/* 946268 80240398 AC200E00 */  sw        $zero, %lo(D_80240E00)($at)
 .L8024039C:
-/* 94626C 8024039C 3C038024 */  lui       $v1, 0x8024
-/* 946270 802403A0 24630E00 */  addiu     $v1, $v1, 0xe00
+/* 94626C 8024039C 3C038024 */  lui       $v1, %hi(D_80240E00)
+/* 946270 802403A0 24630E00 */  addiu     $v1, $v1, %lo(D_80240E00)
 /* 946274 802403A4 8C620000 */  lw        $v0, ($v1)
 /* 946278 802403A8 54400003 */  bnel      $v0, $zero, .L802403B8
 /* 94627C 802403AC AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_80240384_946254
 /* 946284 802403B4 0000102D */   daddu    $v0, $zero, $zero
 .L802403B8:
 /* 946288 802403B8 8CC50000 */  lw        $a1, ($a2)
-/* 94628C 802403BC 3C068024 */  lui       $a2, 0x8024
+/* 94628C 802403BC 3C068024 */  lui       $a2, %hi(D_80240E04)
 /* 946290 802403C0 0C0B2026 */  jal       set_variable
-/* 946294 802403C4 8CC60E04 */   lw       $a2, 0xe04($a2)
+/* 946294 802403C4 8CC60E04 */   lw       $a2, %lo(D_80240E04)($a2)
 /* 946298 802403C8 24020002 */  addiu     $v0, $zero, 2
 .L802403CC:
 /* 94629C 802403CC 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_802403D8_9462A8.s b/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_802403D8_9462A8.s
index c2f05f265e..23098014bd 100644
--- a/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_802403D8_9462A8.s
+++ b/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_802403D8_9462A8.s
@@ -7,12 +7,12 @@ glabel func_802403D8_9462A8
 /* 9462B0 802403E0 8C82000C */  lw        $v0, 0xc($a0)
 /* 9462B4 802403E4 0C0B1EAF */  jal       get_variable
 /* 9462B8 802403E8 8C450000 */   lw       $a1, ($v0)
-/* 9462BC 802403EC 3C018024 */  lui       $at, 0x8024
-/* 9462C0 802403F0 AC220E04 */  sw        $v0, 0xe04($at)
+/* 9462BC 802403EC 3C018024 */  lui       $at, %hi(D_80240E04)
+/* 9462C0 802403F0 AC220E04 */  sw        $v0, %lo(D_80240E04)($at)
 /* 9462C4 802403F4 24020002 */  addiu     $v0, $zero, 2
 /* 9462C8 802403F8 8FBF0010 */  lw        $ra, 0x10($sp)
 /* 9462CC 802403FC 24030001 */  addiu     $v1, $zero, 1
-/* 9462D0 80240400 3C018024 */  lui       $at, 0x8024
-/* 9462D4 80240404 AC230E00 */  sw        $v1, 0xe00($at)
+/* 9462D0 80240400 3C018024 */  lui       $at, %hi(D_80240E00)
+/* 9462D4 80240404 AC230E00 */  sw        $v1, %lo(D_80240E00)($at)
 /* 9462D8 80240408 03E00008 */  jr        $ra
 /* 9462DC 8024040C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_80240410_9462E0.s b/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_80240410_9462E0.s
index 1a55a67b5f..4d24628ecb 100644
--- a/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_80240410_9462E0.s
+++ b/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_80240410_9462E0.s
@@ -13,8 +13,8 @@ glabel func_80240410_9462E0
 /* 946300 80240430 8C620000 */  lw        $v0, ($v1)
 /* 946304 80240434 5040000A */  beql      $v0, $zero, .L80240460
 /* 946308 80240438 00041080 */   sll      $v0, $a0, 2
-/* 94630C 8024043C 3C058024 */  lui       $a1, 0x8024
-/* 946310 80240440 24A527E0 */  addiu     $a1, $a1, 0x27e0
+/* 94630C 8024043C 3C058024 */  lui       $a1, %hi(D_802427E0)
+/* 946310 80240440 24A527E0 */  addiu     $a1, $a1, %lo(D_802427E0)
 .L80240444:
 /* 946314 80240444 24630004 */  addiu     $v1, $v1, 4
 /* 946318 80240448 24840001 */  addiu     $a0, $a0, 1
@@ -24,14 +24,14 @@ glabel func_80240410_9462E0
 /* 946328 80240458 24A50004 */   addiu    $a1, $a1, 4
 /* 94632C 8024045C 00041080 */  sll       $v0, $a0, 2
 .L80240460:
-/* 946330 80240460 3C018024 */  lui       $at, 0x8024
+/* 946330 80240460 3C018024 */  lui       $at, %hi(D_802427E0)
 /* 946334 80240464 00220821 */  addu      $at, $at, $v0
-/* 946338 80240468 AC2027E0 */  sw        $zero, 0x27e0($at)
+/* 946338 80240468 AC2027E0 */  sw        $zero, %lo(D_802427E0)($at)
 /* 94633C 8024046C 08090127 */  j         .L8024049C
 /* 946340 80240470 00000000 */   nop      
 .L80240474:
-/* 946344 80240474 3C038024 */  lui       $v1, 0x8024
-/* 946348 80240478 246327E0 */  addiu     $v1, $v1, 0x27e0
+/* 946344 80240474 3C038024 */  lui       $v1, %hi(D_802427E0)
+/* 946348 80240478 246327E0 */  addiu     $v1, $v1, %lo(D_802427E0)
 /* 94634C 8024047C 0060282D */  daddu     $a1, $v1, $zero
 .L80240480:
 /* 946350 80240480 24820010 */  addiu     $v0, $a0, 0x10
diff --git a/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_80240728_9465F8.s b/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_80240728_9465F8.s
index 556ce6ae93..a799a17177 100644
--- a/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_80240728_9465F8.s
+++ b/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_80240728_9465F8.s
@@ -15,7 +15,7 @@ glabel func_80240728_9465F8
 /* 946620 80240750 8FBF0014 */  lw        $ra, 0x14($sp)
 /* 946624 80240754 8FB00010 */  lw        $s0, 0x10($sp)
 /* 946628 80240758 24020002 */  addiu     $v0, $zero, 2
-/* 94662C 8024075C 3C018024 */  lui       $at, 0x8024
-/* 946630 80240760 AC2329A4 */  sw        $v1, 0x29a4($at)
+/* 94662C 8024075C 3C018024 */  lui       $at, %hi(D_802429A4)
+/* 946630 80240760 AC2329A4 */  sw        $v1, %lo(D_802429A4)($at)
 /* 946634 80240764 03E00008 */  jr        $ra
 /* 946638 80240768 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_8024076C_94663C.s b/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_8024076C_94663C.s
index fa1d4b5c0c..083196709c 100644
--- a/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_8024076C_94663C.s
+++ b/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_8024076C_94663C.s
@@ -6,8 +6,8 @@ glabel func_8024076C_94663C
 /* 946640 80240770 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 946644 80240774 0C00EABB */  jal       get_npc_unsafe
 /* 946648 80240778 8C84008C */   lw       $a0, 0x8c($a0)
-/* 94664C 8024077C 3C038024 */  lui       $v1, 0x8024
-/* 946650 80240780 8C6329A4 */  lw        $v1, 0x29a4($v1)
+/* 94664C 8024077C 3C038024 */  lui       $v1, %hi(D_802429A4)
+/* 946650 80240780 8C6329A4 */  lw        $v1, %lo(D_802429A4)($v1)
 /* 946654 80240784 AC430028 */  sw        $v1, 0x28($v0)
 /* 946658 80240788 8FBF0010 */  lw        $ra, 0x10($sp)
 /* 94665C 8024078C 24020002 */  addiu     $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_8024024C_95420C.s b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_8024024C_95420C.s
index 7704bc58db..0431ec42ec 100644
--- a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_8024024C_95420C.s
+++ b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_8024024C_95420C.s
@@ -22,12 +22,12 @@ glabel func_8024024C_95420C
 /* 954250 80240290 0040982D */  daddu     $s3, $v0, $zero
 /* 954254 80240294 0000B02D */  daddu     $s6, $zero, $zero
 /* 954258 80240298 02C0902D */  daddu     $s2, $s6, $zero
-/* 95425C 8024029C 3C148024 */  lui       $s4, 0x8024
-/* 954260 802402A0 26941438 */  addiu     $s4, $s4, 0x1438
+/* 95425C 8024029C 3C148024 */  lui       $s4, %hi(D_80241438)
+/* 954260 802402A0 26941438 */  addiu     $s4, $s4, %lo(D_80241438)
 /* 954264 802402A4 0260882D */  daddu     $s1, $s3, $zero
 /* 954268 802402A8 8EA200B4 */  lw        $v0, 0xb4($s5)
-/* 95426C 802402AC 3C038024 */  lui       $v1, 0x8024
-/* 954270 802402B0 24631430 */  addiu     $v1, $v1, 0x1430
+/* 95426C 802402AC 3C038024 */  lui       $v1, %hi(D_80241430)
+/* 954270 802402B0 24631430 */  addiu     $v1, $v1, %lo(D_80241430)
 /* 954274 802402B4 AEB30078 */  sw        $s3, 0x78($s5)
 /* 954278 802402B8 00021027 */  nor       $v0, $zero, $v0
 /* 95427C 802402BC 0002BFC2 */  srl       $s7, $v0, 0x1f
@@ -42,8 +42,8 @@ glabel func_8024024C_95420C
 /* 95429C 802402DC 5040002E */  beql      $v0, $zero, .L80240398
 /* 9542A0 802402E0 26520001 */   addiu    $s2, $s2, 1
 /* 9542A4 802402E4 00101100 */  sll       $v0, $s0, 4
-/* 9542A8 802402E8 3C068009 */  lui       $a2, 0x8009
-/* 9542AC 802402EC 24C6EF20 */  addiu     $a2, $a2, -0x10e0
+/* 9542A8 802402E8 3C068009 */  lui       $a2, %hi(D_8008EF20)
+/* 9542AC 802402EC 24C6EF20 */  addiu     $a2, $a2, %lo(D_8008EF20)
 /* 9542B0 802402F0 00461021 */  addu      $v0, $v0, $a2
 /* 9542B4 802402F4 0200202D */  daddu     $a0, $s0, $zero
 /* 9542B8 802402F8 AE300108 */  sw        $s0, 0x108($s1)
@@ -54,15 +54,15 @@ glabel func_8024024C_95420C
 /* 9542CC 8024030C 0040202D */  daddu     $a0, $v0, $zero
 /* 9542D0 80240310 04800011 */  bltz      $a0, .L80240358
 /* 9542D4 80240314 00101080 */   sll      $v0, $s0, 2
-/* 9542D8 80240318 3C06800F */  lui       $a2, 0x800f
-/* 9542DC 8024031C 24C67F00 */  addiu     $a2, $a2, 0x7f00
+/* 9542D8 80240318 3C06800F */  lui       $a2, %hi(D_800F7F00)
+/* 9542DC 8024031C 24C67F00 */  addiu     $a2, $a2, %lo(D_800F7F00)
 /* 9542E0 80240320 00461021 */  addu      $v0, $v0, $a2
 /* 9542E4 80240324 8C430000 */  lw        $v1, ($v0)
 /* 9542E8 80240328 24020001 */  addiu     $v0, $zero, 1
 /* 9542EC 8024032C AE22018C */  sw        $v0, 0x18c($s1)
 /* 9542F0 80240330 00041080 */  sll       $v0, $a0, 2
-/* 9542F4 80240334 3C068024 */  lui       $a2, 0x8024
-/* 9542F8 80240338 24C61448 */  addiu     $a2, $a2, 0x1448
+/* 9542F4 80240334 3C068024 */  lui       $a2, %hi(D_80241448)
+/* 9542F8 80240338 24C61448 */  addiu     $a2, $a2, %lo(D_80241448)
 /* 9542FC 8024033C AE230000 */  sw        $v1, ($s1)
 /* 954300 80240340 001218C0 */  sll       $v1, $s2, 3
 /* 954304 80240344 00431021 */  addu      $v0, $v0, $v1
@@ -71,8 +71,8 @@ glabel func_8024024C_95420C
 /* 954310 80240350 080900DF */  j         .L8024037C
 /* 954314 80240354 AE220294 */   sw       $v0, 0x294($s1)
 .L80240358:
-/* 954318 80240358 3C06800F */  lui       $a2, 0x800f
-/* 95431C 8024035C 24C67F40 */  addiu     $a2, $a2, 0x7f40
+/* 954318 80240358 3C06800F */  lui       $a2, %hi(D_800F7F40)
+/* 95431C 8024035C 24C67F40 */  addiu     $a2, $a2, %lo(D_800F7F40)
 /* 954320 80240360 00461021 */  addu      $v0, $v0, $a2
 /* 954324 80240364 8C420000 */  lw        $v0, ($v0)
 /* 954328 80240368 AE20018C */  sw        $zero, 0x18c($s1)
@@ -130,9 +130,9 @@ glabel func_8024024C_95420C
 /* 9543E0 80240420 02621021 */  addu      $v0, $s3, $v0
 /* 9543E4 80240424 8C420108 */  lw        $v0, 0x108($v0)
 /* 9543E8 80240428 00021100 */  sll       $v0, $v0, 4
-/* 9543EC 8024042C 3C038009 */  lui       $v1, 0x8009
+/* 9543EC 8024042C 3C038009 */  lui       $v1, %hi(D_8008EF20)
 /* 9543F0 80240430 00621821 */  addu      $v1, $v1, $v0
-/* 9543F4 80240434 8C63EF20 */  lw        $v1, -0x10e0($v1)
+/* 9543F4 80240434 8C63EF20 */  lw        $v1, %lo(D_8008EF20)($v1)
 /* 9543F8 80240438 8EA20074 */  lw        $v0, 0x74($s5)
 /* 9543FC 8024043C 2442FFFF */  addiu     $v0, $v0, -1
 /* 954400 80240440 00021080 */  sll       $v0, $v0, 2
diff --git a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802404C8_954488.s b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802404C8_954488.s
index 44ffb326cc..99d15f5035 100644
--- a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802404C8_954488.s
+++ b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802404C8_954488.s
@@ -7,9 +7,9 @@ glabel func_802404C8_954488
 /* 954490 802404D0 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 954494 802404D4 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 954498 802404D8 00021100 */  sll       $v0, $v0, 4
-/* 95449C 802404DC 3C048009 */  lui       $a0, 0x8009
+/* 95449C 802404DC 3C048009 */  lui       $a0, %hi(D_8008EF20)
 /* 9544A0 802404E0 00822021 */  addu      $a0, $a0, $v0
-/* 9544A4 802404E4 8C84EF20 */  lw        $a0, -0x10e0($a0)
+/* 9544A4 802404E4 8C84EF20 */  lw        $a0, %lo(D_8008EF20)($a0)
 /* 9544A8 802404E8 0C0496CF */  jal       set_message_string
 /* 9544AC 802404EC 0000282D */   daddu    $a1, $zero, $zero
 /* 9544B0 802404F0 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240680_954640.s b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240680_954640.s
index 4286fb49f2..685ce2022f 100644
--- a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240680_954640.s
+++ b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240680_954640.s
@@ -30,9 +30,9 @@ glabel func_80240680_954640
 /* 9546A4 802406E4 000320C0 */  sll       $a0, $v1, 3
 /* 9546A8 802406E8 00641821 */  addu      $v1, $v1, $a0
 /* 9546AC 802406EC 000318C0 */  sll       $v1, $v1, 3
-/* 9546B0 802406F0 3C01800B */  lui       $at, 0x800b
+/* 9546B0 802406F0 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* 9546B4 802406F4 00230821 */  addu      $at, $at, $v1
-/* 9546B8 802406F8 C42C1DEC */  lwc1      $f12, 0x1dec($at)
+/* 9546B8 802406F8 C42C1DEC */  lwc1      $f12, %lo(D_800B1DEC)($at)
 /* 9546BC 802406FC 0C00A88D */  jal       sin_cos_deg
 /* 9546C0 80240700 0040A82D */   daddu    $s5, $v0, $zero
 /* 9546C4 80240704 1200005D */  beqz      $s0, .L8024087C
@@ -79,8 +79,8 @@ glabel func_80240680_954640
 /* 954764 802407A4 26100004 */   addiu    $s0, $s0, 4
 /* 954768 802407A8 0000882D */  daddu     $s1, $zero, $zero
 /* 95476C 802407AC 0240802D */  daddu     $s0, $s2, $zero
-/* 954770 802407B0 3C148024 */  lui       $s4, 0x8024
-/* 954774 802407B4 26941488 */  addiu     $s4, $s4, 0x1488
+/* 954770 802407B0 3C148024 */  lui       $s4, %hi(D_80241488)
+/* 954774 802407B4 26941488 */  addiu     $s4, $s4, %lo(D_80241488)
 /* 954778 802407B8 3C014248 */  lui       $at, 0x4248
 /* 95477C 802407BC 4481A000 */  mtc1      $at, $f20
 /* 954780 802407C0 24130044 */  addiu     $s3, $zero, 0x44
@@ -150,8 +150,8 @@ glabel func_80240680_954640
 /* 954874 802408B4 00000000 */   nop      
 .L802408B8:
 /* 954878 802408B8 0000882D */  daddu     $s1, $zero, $zero
-/* 95487C 802408BC 3C148024 */  lui       $s4, 0x8024
-/* 954880 802408C0 26941488 */  addiu     $s4, $s4, 0x1488
+/* 95487C 802408BC 3C148024 */  lui       $s4, %hi(D_80241488)
+/* 954880 802408C0 26941488 */  addiu     $s4, $s4, %lo(D_80241488)
 /* 954884 802408C4 24130020 */  addiu     $s3, $zero, 0x20
 /* 954888 802408C8 3C064248 */  lui       $a2, 0x4248
 /* 95488C 802408CC 44800000 */  mtc1      $zero, $f0
@@ -197,8 +197,8 @@ glabel func_80240680_954640
 /* 954928 80240968 AE400060 */   sw       $zero, 0x60($s2)
 .L8024096C:
 /* 95492C 8024096C 0000882D */  daddu     $s1, $zero, $zero
-/* 954930 80240970 3C148024 */  lui       $s4, 0x8024
-/* 954934 80240974 26941488 */  addiu     $s4, $s4, 0x1488
+/* 954930 80240970 3C148024 */  lui       $s4, %hi(D_80241488)
+/* 954934 80240974 26941488 */  addiu     $s4, $s4, %lo(D_80241488)
 /* 954938 80240978 24130020 */  addiu     $s3, $zero, 0x20
 /* 95493C 8024097C 0240802D */  daddu     $s0, $s2, $zero
 /* 954940 80240980 3C014248 */  lui       $at, 0x4248
diff --git a/asm/nonmatchings/world/area_tik/tik_01/869EE0/func_80240A30_869EE0.s b/asm/nonmatchings/world/area_tik/tik_01/869EE0/func_80240A30_869EE0.s
index a304b0b80f..91edf12f6f 100644
--- a/asm/nonmatchings/world/area_tik/tik_01/869EE0/func_80240A30_869EE0.s
+++ b/asm/nonmatchings/world/area_tik/tik_01/869EE0/func_80240A30_869EE0.s
@@ -15,9 +15,9 @@ glabel func_80240A30_869EE0
 /* 869F08 80240A58 3C04800B */  lui       $a0, %hi(gCurrentEncounter+0x28)
 /* 869F0C 80240A5C 00832021 */  addu      $a0, $a0, $v1
 /* 869F10 80240A60 8C840F38 */  lw        $a0, %lo(gCurrentEncounter+0x28)($a0)
-/* 869F14 80240A64 3C038024 */  lui       $v1, 0x8024
+/* 869F14 80240A64 3C038024 */  lui       $v1, %hi(D_80242B7E)
 /* 869F18 80240A68 00621821 */  addu      $v1, $v1, $v0
-/* 869F1C 80240A6C 94632B7E */  lhu       $v1, 0x2b7e($v1)
+/* 869F1C 80240A6C 94632B7E */  lhu       $v1, %lo(D_80242B7E)($v1)
 /* 869F20 80240A70 A4830044 */  sh        $v1, 0x44($a0)
 /* 869F24 80240A74 8FBF0014 */  lw        $ra, 0x14($sp)
 /* 869F28 80240A78 8FB00010 */  lw        $s0, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_tik/tik_02/86CA50/func_80240310_86CA50.s b/asm/nonmatchings/world/area_tik/tik_02/86CA50/func_80240310_86CA50.s
index 7db8eace56..0d8e2e6bb1 100644
--- a/asm/nonmatchings/world/area_tik/tik_02/86CA50/func_80240310_86CA50.s
+++ b/asm/nonmatchings/world/area_tik/tik_02/86CA50/func_80240310_86CA50.s
@@ -4,8 +4,8 @@
 glabel func_80240310_86CA50
 /* 86CA50 80240310 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* 86CA54 80240314 AFB00010 */  sw        $s0, 0x10($sp)
-/* 86CA58 80240318 3C108024 */  lui       $s0, 0x8024
-/* 86CA5C 8024031C 261010C0 */  addiu     $s0, $s0, 0x10c0
+/* 86CA58 80240318 3C108024 */  lui       $s0, %hi(D_802410C0)
+/* 86CA5C 8024031C 261010C0 */  addiu     $s0, $s0, %lo(D_802410C0)
 /* 86CA60 80240320 AFBF0018 */  sw        $ra, 0x18($sp)
 /* 86CA64 80240324 AFB10014 */  sw        $s1, 0x14($sp)
 /* 86CA68 80240328 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_80240310_86CA50
 /* 86CACC 8024038C 28620010 */  slti      $v0, $v1, 0x10
 /* 86CAD0 80240390 1440FFFA */  bnez      $v0, .L8024037C
 /* 86CAD4 80240394 24840004 */   addiu    $a0, $a0, 4
-/* 86CAD8 80240398 3C108024 */  lui       $s0, 0x8024
-/* 86CADC 8024039C 261010C0 */  addiu     $s0, $s0, 0x10c0
+/* 86CAD8 80240398 3C108024 */  lui       $s0, %hi(D_802410C0)
+/* 86CADC 8024039C 261010C0 */  addiu     $s0, $s0, %lo(D_802410C0)
 /* 86CAE0 802403A0 0C00AB4B */  jal       heap_free
 /* 86CAE4 802403A4 8E040000 */   lw       $a0, ($s0)
 /* 86CAE8 802403A8 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_tik/tik_02/86CD10/func_80240940_86D080.s b/asm/nonmatchings/world/area_tik/tik_02/86CD10/func_80240940_86D080.s
index e6b187648d..6bc73f2401 100644
--- a/asm/nonmatchings/world/area_tik/tik_02/86CD10/func_80240940_86D080.s
+++ b/asm/nonmatchings/world/area_tik/tik_02/86CD10/func_80240940_86D080.s
@@ -15,9 +15,9 @@ glabel func_80240940_86D080
 /* 86D0A8 80240968 3C04800B */  lui       $a0, %hi(gCurrentEncounter+0x28)
 /* 86D0AC 8024096C 00832021 */  addu      $a0, $a0, $v1
 /* 86D0B0 80240970 8C840F38 */  lw        $a0, %lo(gCurrentEncounter+0x28)($a0)
-/* 86D0B4 80240974 3C038024 */  lui       $v1, 0x8024
+/* 86D0B4 80240974 3C038024 */  lui       $v1, %hi(D_80241BAE)
 /* 86D0B8 80240978 00621821 */  addu      $v1, $v1, $v0
-/* 86D0BC 8024097C 94631BAE */  lhu       $v1, 0x1bae($v1)
+/* 86D0BC 8024097C 94631BAE */  lhu       $v1, %lo(D_80241BAE)($v1)
 /* 86D0C0 80240980 A4830044 */  sh        $v1, 0x44($a0)
 /* 86D0C4 80240984 8FBF0014 */  lw        $ra, 0x14($sp)
 /* 86D0C8 80240988 8FB00010 */  lw        $s0, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_tik/tik_03/86F0F0/func_80240960_86F460.s b/asm/nonmatchings/world/area_tik/tik_03/86F0F0/func_80240960_86F460.s
index ef174d85b9..ef6942c696 100644
--- a/asm/nonmatchings/world/area_tik/tik_03/86F0F0/func_80240960_86F460.s
+++ b/asm/nonmatchings/world/area_tik/tik_03/86F0F0/func_80240960_86F460.s
@@ -9,8 +9,8 @@ glabel func_80240960_86F460
 /* 86F470 80240970 84A5A552 */  lh        $a1, %lo(gCollisionStatus+0x2)($a1)
 /* 86F474 80240974 2407000E */  addiu     $a3, $zero, 0xe
 /* 86F478 80240978 24060010 */  addiu     $a2, $zero, 0x10
-/* 86F47C 8024097C 3C038024 */  lui       $v1, 0x8024
-/* 86F480 80240980 24632930 */  addiu     $v1, $v1, 0x2930
+/* 86F47C 8024097C 3C038024 */  lui       $v1, %hi(D_80242930)
+/* 86F480 80240980 24632930 */  addiu     $v1, $v1, %lo(D_80242930)
 .L80240984:
 /* 86F484 80240984 8C620000 */  lw        $v0, ($v1)
 /* 86F488 80240988 54A20008 */  bnel      $a1, $v0, .L802409AC
diff --git a/asm/nonmatchings/world/area_tik/tik_03/86F0F0/func_802409E0_86F4E0.s b/asm/nonmatchings/world/area_tik/tik_03/86F0F0/func_802409E0_86F4E0.s
index 088fe72ccc..a47dbe6a20 100644
--- a/asm/nonmatchings/world/area_tik/tik_03/86F0F0/func_802409E0_86F4E0.s
+++ b/asm/nonmatchings/world/area_tik/tik_03/86F0F0/func_802409E0_86F4E0.s
@@ -3,8 +3,8 @@
 
 glabel func_802409E0_86F4E0
 /* 86F4E0 802409E0 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 86F4E4 802409E4 3C048024 */  lui       $a0, 0x8024
-/* 86F4E8 802409E8 24842EBC */  addiu     $a0, $a0, 0x2ebc
+/* 86F4E4 802409E4 3C048024 */  lui       $a0, %hi(D_80242EBC)
+/* 86F4E8 802409E8 24842EBC */  addiu     $a0, $a0, %lo(D_80242EBC)
 /* 86F4EC 802409EC AFBF0018 */  sw        $ra, 0x18($sp)
 /* 86F4F0 802409F0 AFB10014 */  sw        $s1, 0x14($sp)
 /* 86F4F4 802409F4 AFB00010 */  sw        $s0, 0x10($sp)
@@ -33,8 +33,8 @@ glabel func_802409E0_86F4E0
 /* 86F544 80240A44 080902AC */  j         .L80240AB0
 /* 86F548 80240A48 AC820000 */   sw       $v0, ($a0)
 .L80240A4C:
-/* 86F54C 80240A4C 3C108011 */  lui       $s0, 0x8011
-/* 86F550 80240A50 2610C930 */  addiu     $s0, $s0, -0x36d0
+/* 86F54C 80240A4C 3C108011 */  lui       $s0, %hi(D_8010C930)
+/* 86F550 80240A50 2610C930 */  addiu     $s0, $s0, %lo(D_8010C930)
 /* 86F554 80240A54 0C03BD17 */  jal       clear_partner_move_history
 /* 86F558 80240A58 8E040000 */   lw       $a0, ($s0)
 /* 86F55C 80240A5C C6200028 */  lwc1      $f0, 0x28($s1)
diff --git a/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_80240680_875440.s b/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_80240680_875440.s
index 6a026ebf9d..14f9aa1f2c 100644
--- a/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_80240680_875440.s
+++ b/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_80240680_875440.s
@@ -4,8 +4,8 @@
 glabel func_80240680_875440
 /* 875440 80240680 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* 875444 80240684 AFB00010 */  sw        $s0, 0x10($sp)
-/* 875448 80240688 3C108024 */  lui       $s0, 0x8024
-/* 87544C 8024068C 26101800 */  addiu     $s0, $s0, 0x1800
+/* 875448 80240688 3C108024 */  lui       $s0, %hi(D_80241800)
+/* 87544C 8024068C 26101800 */  addiu     $s0, $s0, %lo(D_80241800)
 /* 875450 80240690 AFBF0018 */  sw        $ra, 0x18($sp)
 /* 875454 80240694 AFB10014 */  sw        $s1, 0x14($sp)
 /* 875458 80240698 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_80240680_875440
 /* 8754BC 802406FC 28620010 */  slti      $v0, $v1, 0x10
 /* 8754C0 80240700 1440FFFA */  bnez      $v0, .L802406EC
 /* 8754C4 80240704 24840004 */   addiu    $a0, $a0, 4
-/* 8754C8 80240708 3C108024 */  lui       $s0, 0x8024
-/* 8754CC 8024070C 26101800 */  addiu     $s0, $s0, 0x1800
+/* 8754C8 80240708 3C108024 */  lui       $s0, %hi(D_80241800)
+/* 8754CC 8024070C 26101800 */  addiu     $s0, $s0, %lo(D_80241800)
 /* 8754D0 80240710 0C00AB4B */  jal       heap_free
 /* 8754D4 80240714 8E040000 */   lw       $a0, ($s0)
 /* 8754D8 80240718 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802404AC_87A08C.s b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802404AC_87A08C.s
index d3ef88e321..77a9ab90a3 100644
--- a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802404AC_87A08C.s
+++ b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802404AC_87A08C.s
@@ -22,12 +22,12 @@ glabel func_802404AC_87A08C
 /* 87A0D0 802404F0 0040982D */  daddu     $s3, $v0, $zero
 /* 87A0D4 802404F4 0000B02D */  daddu     $s6, $zero, $zero
 /* 87A0D8 802404F8 02C0902D */  daddu     $s2, $s6, $zero
-/* 87A0DC 802404FC 3C148024 */  lui       $s4, 0x8024
-/* 87A0E0 80240500 269439F8 */  addiu     $s4, $s4, 0x39f8
+/* 87A0DC 802404FC 3C148024 */  lui       $s4, %hi(D_802439F8)
+/* 87A0E0 80240500 269439F8 */  addiu     $s4, $s4, %lo(D_802439F8)
 /* 87A0E4 80240504 0260882D */  daddu     $s1, $s3, $zero
 /* 87A0E8 80240508 8EA200B4 */  lw        $v0, 0xb4($s5)
-/* 87A0EC 8024050C 3C038024 */  lui       $v1, 0x8024
-/* 87A0F0 80240510 246339F0 */  addiu     $v1, $v1, 0x39f0
+/* 87A0EC 8024050C 3C038024 */  lui       $v1, %hi(D_802439F0)
+/* 87A0F0 80240510 246339F0 */  addiu     $v1, $v1, %lo(D_802439F0)
 /* 87A0F4 80240514 AEB30078 */  sw        $s3, 0x78($s5)
 /* 87A0F8 80240518 00021027 */  nor       $v0, $zero, $v0
 /* 87A0FC 8024051C 0002BFC2 */  srl       $s7, $v0, 0x1f
@@ -42,8 +42,8 @@ glabel func_802404AC_87A08C
 /* 87A11C 8024053C 5040002E */  beql      $v0, $zero, .L802405F8
 /* 87A120 80240540 26520001 */   addiu    $s2, $s2, 1
 /* 87A124 80240544 00101100 */  sll       $v0, $s0, 4
-/* 87A128 80240548 3C068009 */  lui       $a2, 0x8009
-/* 87A12C 8024054C 24C6EF20 */  addiu     $a2, $a2, -0x10e0
+/* 87A128 80240548 3C068009 */  lui       $a2, %hi(D_8008EF20)
+/* 87A12C 8024054C 24C6EF20 */  addiu     $a2, $a2, %lo(D_8008EF20)
 /* 87A130 80240550 00461021 */  addu      $v0, $v0, $a2
 /* 87A134 80240554 0200202D */  daddu     $a0, $s0, $zero
 /* 87A138 80240558 AE300108 */  sw        $s0, 0x108($s1)
@@ -54,15 +54,15 @@ glabel func_802404AC_87A08C
 /* 87A14C 8024056C 0040202D */  daddu     $a0, $v0, $zero
 /* 87A150 80240570 04800011 */  bltz      $a0, .L802405B8
 /* 87A154 80240574 00101080 */   sll      $v0, $s0, 2
-/* 87A158 80240578 3C06800F */  lui       $a2, 0x800f
-/* 87A15C 8024057C 24C67F00 */  addiu     $a2, $a2, 0x7f00
+/* 87A158 80240578 3C06800F */  lui       $a2, %hi(D_800F7F00)
+/* 87A15C 8024057C 24C67F00 */  addiu     $a2, $a2, %lo(D_800F7F00)
 /* 87A160 80240580 00461021 */  addu      $v0, $v0, $a2
 /* 87A164 80240584 8C430000 */  lw        $v1, ($v0)
 /* 87A168 80240588 24020001 */  addiu     $v0, $zero, 1
 /* 87A16C 8024058C AE22018C */  sw        $v0, 0x18c($s1)
 /* 87A170 80240590 00041080 */  sll       $v0, $a0, 2
-/* 87A174 80240594 3C068024 */  lui       $a2, 0x8024
-/* 87A178 80240598 24C63A08 */  addiu     $a2, $a2, 0x3a08
+/* 87A174 80240594 3C068024 */  lui       $a2, %hi(D_80243A08)
+/* 87A178 80240598 24C63A08 */  addiu     $a2, $a2, %lo(D_80243A08)
 /* 87A17C 8024059C AE230000 */  sw        $v1, ($s1)
 /* 87A180 802405A0 001218C0 */  sll       $v1, $s2, 3
 /* 87A184 802405A4 00431021 */  addu      $v0, $v0, $v1
@@ -71,8 +71,8 @@ glabel func_802404AC_87A08C
 /* 87A190 802405B0 08090177 */  j         .L802405DC
 /* 87A194 802405B4 AE220294 */   sw       $v0, 0x294($s1)
 .L802405B8:
-/* 87A198 802405B8 3C06800F */  lui       $a2, 0x800f
-/* 87A19C 802405BC 24C67F40 */  addiu     $a2, $a2, 0x7f40
+/* 87A198 802405B8 3C06800F */  lui       $a2, %hi(D_800F7F40)
+/* 87A19C 802405BC 24C67F40 */  addiu     $a2, $a2, %lo(D_800F7F40)
 /* 87A1A0 802405C0 00461021 */  addu      $v0, $v0, $a2
 /* 87A1A4 802405C4 8C420000 */  lw        $v0, ($v0)
 /* 87A1A8 802405C8 AE20018C */  sw        $zero, 0x18c($s1)
@@ -130,9 +130,9 @@ glabel func_802404AC_87A08C
 /* 87A260 80240680 02621021 */  addu      $v0, $s3, $v0
 /* 87A264 80240684 8C420108 */  lw        $v0, 0x108($v0)
 /* 87A268 80240688 00021100 */  sll       $v0, $v0, 4
-/* 87A26C 8024068C 3C038009 */  lui       $v1, 0x8009
+/* 87A26C 8024068C 3C038009 */  lui       $v1, %hi(D_8008EF20)
 /* 87A270 80240690 00621821 */  addu      $v1, $v1, $v0
-/* 87A274 80240694 8C63EF20 */  lw        $v1, -0x10e0($v1)
+/* 87A274 80240694 8C63EF20 */  lw        $v1, %lo(D_8008EF20)($v1)
 /* 87A278 80240698 8EA20074 */  lw        $v0, 0x74($s5)
 /* 87A27C 8024069C 2442FFFF */  addiu     $v0, $v0, -1
 /* 87A280 802406A0 00021080 */  sll       $v0, $v0, 2
diff --git a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240728_87A308.s b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240728_87A308.s
index 31dd9f6013..ffe575e64b 100644
--- a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240728_87A308.s
+++ b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240728_87A308.s
@@ -7,9 +7,9 @@ glabel func_80240728_87A308
 /* 87A310 80240730 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 87A314 80240734 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 87A318 80240738 00021100 */  sll       $v0, $v0, 4
-/* 87A31C 8024073C 3C048009 */  lui       $a0, 0x8009
+/* 87A31C 8024073C 3C048009 */  lui       $a0, %hi(D_8008EF20)
 /* 87A320 80240740 00822021 */  addu      $a0, $a0, $v0
-/* 87A324 80240744 8C84EF20 */  lw        $a0, -0x10e0($a0)
+/* 87A324 80240744 8C84EF20 */  lw        $a0, %lo(D_8008EF20)($a0)
 /* 87A328 80240748 0C0496CF */  jal       set_message_string
 /* 87A32C 8024074C 0000282D */   daddu    $a1, $zero, $zero
 /* 87A330 80240750 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802408E0_87A4C0.s b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802408E0_87A4C0.s
index 13f862197e..5657cb6c88 100644
--- a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802408E0_87A4C0.s
+++ b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802408E0_87A4C0.s
@@ -30,9 +30,9 @@ glabel func_802408E0_87A4C0
 /* 87A524 80240944 000320C0 */  sll       $a0, $v1, 3
 /* 87A528 80240948 00641821 */  addu      $v1, $v1, $a0
 /* 87A52C 8024094C 000318C0 */  sll       $v1, $v1, 3
-/* 87A530 80240950 3C01800B */  lui       $at, 0x800b
+/* 87A530 80240950 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* 87A534 80240954 00230821 */  addu      $at, $at, $v1
-/* 87A538 80240958 C42C1DEC */  lwc1      $f12, 0x1dec($at)
+/* 87A538 80240958 C42C1DEC */  lwc1      $f12, %lo(D_800B1DEC)($at)
 /* 87A53C 8024095C 0C00A88D */  jal       sin_cos_deg
 /* 87A540 80240960 0040A82D */   daddu    $s5, $v0, $zero
 /* 87A544 80240964 1200005D */  beqz      $s0, .L80240ADC
@@ -79,8 +79,8 @@ glabel func_802408E0_87A4C0
 /* 87A5E4 80240A04 26100004 */   addiu    $s0, $s0, 4
 /* 87A5E8 80240A08 0000882D */  daddu     $s1, $zero, $zero
 /* 87A5EC 80240A0C 0240802D */  daddu     $s0, $s2, $zero
-/* 87A5F0 80240A10 3C148024 */  lui       $s4, 0x8024
-/* 87A5F4 80240A14 26943A48 */  addiu     $s4, $s4, 0x3a48
+/* 87A5F0 80240A10 3C148024 */  lui       $s4, %hi(D_80243A48)
+/* 87A5F4 80240A14 26943A48 */  addiu     $s4, $s4, %lo(D_80243A48)
 /* 87A5F8 80240A18 3C014248 */  lui       $at, 0x4248
 /* 87A5FC 80240A1C 4481A000 */  mtc1      $at, $f20
 /* 87A600 80240A20 24130044 */  addiu     $s3, $zero, 0x44
@@ -150,8 +150,8 @@ glabel func_802408E0_87A4C0
 /* 87A6F4 80240B14 00000000 */   nop      
 .L80240B18:
 /* 87A6F8 80240B18 0000882D */  daddu     $s1, $zero, $zero
-/* 87A6FC 80240B1C 3C148024 */  lui       $s4, 0x8024
-/* 87A700 80240B20 26943A48 */  addiu     $s4, $s4, 0x3a48
+/* 87A6FC 80240B1C 3C148024 */  lui       $s4, %hi(D_80243A48)
+/* 87A700 80240B20 26943A48 */  addiu     $s4, $s4, %lo(D_80243A48)
 /* 87A704 80240B24 24130020 */  addiu     $s3, $zero, 0x20
 /* 87A708 80240B28 3C064248 */  lui       $a2, 0x4248
 /* 87A70C 80240B2C 44800000 */  mtc1      $zero, $f0
@@ -197,8 +197,8 @@ glabel func_802408E0_87A4C0
 /* 87A7A8 80240BC8 AE400060 */   sw       $zero, 0x60($s2)
 .L80240BCC:
 /* 87A7AC 80240BCC 0000882D */  daddu     $s1, $zero, $zero
-/* 87A7B0 80240BD0 3C148024 */  lui       $s4, 0x8024
-/* 87A7B4 80240BD4 26943A48 */  addiu     $s4, $s4, 0x3a48
+/* 87A7B0 80240BD0 3C148024 */  lui       $s4, %hi(D_80243A48)
+/* 87A7B4 80240BD4 26943A48 */  addiu     $s4, $s4, %lo(D_80243A48)
 /* 87A7B8 80240BD8 24130020 */  addiu     $s3, $zero, 0x20
 /* 87A7BC 80240BDC 0240802D */  daddu     $s0, $s2, $zero
 /* 87A7C0 80240BE0 3C014248 */  lui       $at, 0x4248
diff --git a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80241390_87AF70.s b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80241390_87AF70.s
index ec07555d4f..5030fbb90c 100644
--- a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80241390_87AF70.s
+++ b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80241390_87AF70.s
@@ -9,8 +9,8 @@ glabel func_80241390_87AF70
 /* 87AF80 802413A0 84A5A552 */  lh        $a1, %lo(gCollisionStatus+0x2)($a1)
 /* 87AF84 802413A4 2407000E */  addiu     $a3, $zero, 0xe
 /* 87AF88 802413A8 24060010 */  addiu     $a2, $zero, 0x10
-/* 87AF8C 802413AC 3C038024 */  lui       $v1, 0x8024
-/* 87AF90 802413B0 246349B0 */  addiu     $v1, $v1, 0x49b0
+/* 87AF8C 802413AC 3C038024 */  lui       $v1, %hi(D_802449B0)
+/* 87AF90 802413B0 246349B0 */  addiu     $v1, $v1, %lo(D_802449B0)
 .L802413B4:
 /* 87AF94 802413B4 8C620000 */  lw        $v0, ($v1)
 /* 87AF98 802413B8 54A20008 */  bnel      $a1, $v0, .L802413DC
diff --git a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802413F0_87AFD0.s b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802413F0_87AFD0.s
index 78574e2870..d197481477 100644
--- a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802413F0_87AFD0.s
+++ b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802413F0_87AFD0.s
@@ -87,8 +87,8 @@ glabel func_802413F0_87AFD0
 /* 87B110 80241530 08090556 */  j         .L80241558
 /* 87B114 80241534 E6000018 */   swc1     $f0, 0x18($s0)
 .L80241538:
-/* 87B118 80241538 3C018024 */  lui       $at, 0x8024
-/* 87B11C 8024153C D42251B0 */  ldc1      $f2, 0x51b0($at)
+/* 87B118 80241538 3C018024 */  lui       $at, %hi(D_802451B0)
+/* 87B11C 8024153C D42251B0 */  ldc1      $f2, %lo(D_802451B0)($at)
 /* 87B120 80241540 44820000 */  mtc1      $v0, $f0
 /* 87B124 80241544 00000000 */  nop       
 /* 87B128 80241548 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802415A0_87B180.s b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802415A0_87B180.s
index a9edf57b9b..ecd848dbb4 100644
--- a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802415A0_87B180.s
+++ b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802415A0_87B180.s
@@ -104,8 +104,8 @@ glabel func_802415A0_87B180
 /* 87B304 80241724 1040000A */  beqz      $v0, .L80241750
 /* 87B308 80241728 4600C106 */   mov.s    $f4, $f24
 /* 87B30C 8024172C 4614C081 */  sub.s     $f2, $f24, $f20
-/* 87B310 80241730 3C018024 */  lui       $at, 0x8024
-/* 87B314 80241734 D42051B8 */  ldc1      $f0, 0x51b8($at)
+/* 87B310 80241730 3C018024 */  lui       $at, %hi(D_802451B8)
+/* 87B314 80241734 D42051B8 */  ldc1      $f0, %lo(D_802451B8)($at)
 /* 87B318 80241738 460010A1 */  cvt.d.s   $f2, $f2
 /* 87B31C 8024173C 46201082 */  mul.d     $f2, $f2, $f0
 /* 87B320 80241740 00000000 */  nop       
@@ -131,8 +131,8 @@ glabel func_802415A0_87B180
 /* 87B36C 8024178C C7A4002C */  lwc1      $f4, 0x2c($sp)
 /* 87B370 80241790 461A2100 */  add.s     $f4, $f4, $f26
 /* 87B374 80241794 46142081 */  sub.s     $f2, $f4, $f20
-/* 87B378 80241798 3C018024 */  lui       $at, 0x8024
-/* 87B37C 8024179C D42051C0 */  ldc1      $f0, 0x51c0($at)
+/* 87B378 80241798 3C018024 */  lui       $at, %hi(D_802451C0)
+/* 87B37C 8024179C D42051C0 */  ldc1      $f0, %lo(D_802451C0)($at)
 /* 87B380 802417A0 460010A1 */  cvt.d.s   $f2, $f2
 /* 87B384 802417A4 46201082 */  mul.d     $f2, $f2, $f0
 /* 87B388 802417A8 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80242044_87BC24.s b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80242044_87BC24.s
index c5669cd93f..3d440f81ce 100644
--- a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80242044_87BC24.s
+++ b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80242044_87BC24.s
@@ -15,9 +15,9 @@ glabel func_80242044_87BC24
 /* 87BC4C 8024206C 00031C00 */  sll       $v1, $v1, 0x10
 /* 87BC50 80242070 00031B83 */  sra       $v1, $v1, 0xe
 /* 87BC54 80242074 A444008E */  sh        $a0, 0x8e($v0)
-/* 87BC58 80242078 3C018024 */  lui       $at, 0x8024
+/* 87BC58 80242078 3C018024 */  lui       $at, %hi(D_80244CB0)
 /* 87BC5C 8024207C 00230821 */  addu      $at, $at, $v1
-/* 87BC60 80242080 C4224CB0 */  lwc1      $f2, 0x4cb0($at)
+/* 87BC60 80242080 C4224CB0 */  lwc1      $f2, %lo(D_80244CB0)($at)
 /* 87BC64 80242084 8443008E */  lh        $v1, 0x8e($v0)
 /* 87BC68 80242088 46020000 */  add.s     $f0, $f0, $f2
 /* 87BC6C 8024208C 28630005 */  slti      $v1, $v1, 5
diff --git a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802426FC_87C2DC.s b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802426FC_87C2DC.s
index 19857105ff..4eff0fa8ff 100644
--- a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802426FC_87C2DC.s
+++ b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802426FC_87C2DC.s
@@ -66,9 +66,9 @@ glabel func_802426FC_87C2DC
 /* 87C3C8 802427E8 2C62000F */  sltiu     $v0, $v1, 0xf
 /* 87C3CC 802427EC 10400034 */  beqz      $v0, .L802428C0
 /* 87C3D0 802427F0 00031080 */   sll      $v0, $v1, 2
-/* 87C3D4 802427F4 3C018024 */  lui       $at, 0x8024
+/* 87C3D4 802427F4 3C018024 */  lui       $at, %hi(D_802451C8)
 /* 87C3D8 802427F8 00220821 */  addu      $at, $at, $v0
-/* 87C3DC 802427FC 8C2251C8 */  lw        $v0, 0x51c8($at)
+/* 87C3DC 802427FC 8C2251C8 */  lw        $v0, %lo(D_802451C8)($at)
 /* 87C3E0 80242800 00400008 */  jr        $v0
 /* 87C3E4 80242804 00000000 */   nop      
 /* 87C3E8 80242808 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_tik/tik_08/87F820/func_80240A5C_87F84C.s b/asm/nonmatchings/world/area_tik/tik_08/87F820/func_80240A5C_87F84C.s
index be91c4398a..9987688d9c 100644
--- a/asm/nonmatchings/world/area_tik/tik_08/87F820/func_80240A5C_87F84C.s
+++ b/asm/nonmatchings/world/area_tik/tik_08/87F820/func_80240A5C_87F84C.s
@@ -15,9 +15,9 @@ glabel func_80240A5C_87F84C
 /* 87F874 80240A84 3C04800B */  lui       $a0, %hi(gCurrentEncounter+0x28)
 /* 87F878 80240A88 00832021 */  addu      $a0, $a0, $v1
 /* 87F87C 80240A8C 8C840F38 */  lw        $a0, %lo(gCurrentEncounter+0x28)($a0)
-/* 87F880 80240A90 3C038024 */  lui       $v1, 0x8024
+/* 87F880 80240A90 3C038024 */  lui       $v1, %hi(D_80242C0E)
 /* 87F884 80240A94 00621821 */  addu      $v1, $v1, $v0
-/* 87F888 80240A98 94632C0E */  lhu       $v1, 0x2c0e($v1)
+/* 87F888 80240A98 94632C0E */  lhu       $v1, %lo(D_80242C0E)($v1)
 /* 87F88C 80240A9C A4830044 */  sh        $v1, 0x44($a0)
 /* 87F890 80240AA0 8FBF0014 */  lw        $ra, 0x14($sp)
 /* 87F894 80240AA4 8FB00010 */  lw        $s0, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240AAC_882C6C.s b/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240AAC_882C6C.s
index 721a2918aa..d98733ac71 100644
--- a/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240AAC_882C6C.s
+++ b/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240AAC_882C6C.s
@@ -55,8 +55,8 @@ glabel func_80240AAC_882C6C
 /* 882D28 80240B68 8C470030 */   lw       $a3, 0x30($v0)
 /* 882D2C 80240B6C C6020018 */  lwc1      $f2, 0x18($s0)
 /* 882D30 80240B70 46020003 */  div.s     $f0, $f0, $f2
-/* 882D34 80240B74 3C018024 */  lui       $at, 0x8024
-/* 882D38 80240B78 D42241A0 */  ldc1      $f2, 0x41a0($at)
+/* 882D34 80240B74 3C018024 */  lui       $at, %hi(D_802441A0)
+/* 882D38 80240B78 D42241A0 */  ldc1      $f2, %lo(D_802441A0)($at)
 /* 882D3C 80240B7C 46000021 */  cvt.d.s   $f0, $f0
 /* 882D40 80240B80 46220000 */  add.d     $f0, $f0, $f2
 /* 882D44 80240B84 4620010D */  trunc.w.d $f4, $f0
diff --git a/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240DC4_882F84.s b/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240DC4_882F84.s
index d809d03d8c..ff9eaba6cd 100644
--- a/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240DC4_882F84.s
+++ b/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240DC4_882F84.s
@@ -279,9 +279,9 @@ glabel func_80240DC4_882F84
 /* 883370 802411B0 2C620015 */  sltiu     $v0, $v1, 0x15
 /* 883374 802411B4 10400009 */  beqz      $v0, .L802411DC
 /* 883378 802411B8 00031080 */   sll      $v0, $v1, 2
-/* 88337C 802411BC 3C018024 */  lui       $at, 0x8024
+/* 88337C 802411BC 3C018024 */  lui       $at, %hi(D_802441A8)
 /* 883380 802411C0 00220821 */  addu      $at, $at, $v0
-/* 883384 802411C4 8C2241A8 */  lw        $v0, 0x41a8($at)
+/* 883384 802411C4 8C2241A8 */  lw        $v0, %lo(D_802441A8)($at)
 /* 883388 802411C8 00400008 */  jr        $v0
 /* 88338C 802411CC 00000000 */   nop      
 /* 883390 802411D0 8E420028 */  lw        $v0, 0x28($s2)
diff --git a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_8024084C_886C0C.s b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_8024084C_886C0C.s
index 99f3a59b93..2efbaa9705 100644
--- a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_8024084C_886C0C.s
+++ b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_8024084C_886C0C.s
@@ -22,12 +22,12 @@ glabel func_8024084C_886C0C
 /* 886C50 80240890 0040982D */  daddu     $s3, $v0, $zero
 /* 886C54 80240894 0000B02D */  daddu     $s6, $zero, $zero
 /* 886C58 80240898 02C0902D */  daddu     $s2, $s6, $zero
-/* 886C5C 8024089C 3C148024 */  lui       $s4, 0x8024
-/* 886C60 802408A0 26942038 */  addiu     $s4, $s4, 0x2038
+/* 886C5C 8024089C 3C148024 */  lui       $s4, %hi(D_80242038)
+/* 886C60 802408A0 26942038 */  addiu     $s4, $s4, %lo(D_80242038)
 /* 886C64 802408A4 0260882D */  daddu     $s1, $s3, $zero
 /* 886C68 802408A8 8EA200B4 */  lw        $v0, 0xb4($s5)
-/* 886C6C 802408AC 3C038024 */  lui       $v1, 0x8024
-/* 886C70 802408B0 24632030 */  addiu     $v1, $v1, 0x2030
+/* 886C6C 802408AC 3C038024 */  lui       $v1, %hi(D_80242030)
+/* 886C70 802408B0 24632030 */  addiu     $v1, $v1, %lo(D_80242030)
 /* 886C74 802408B4 AEB30078 */  sw        $s3, 0x78($s5)
 /* 886C78 802408B8 00021027 */  nor       $v0, $zero, $v0
 /* 886C7C 802408BC 0002BFC2 */  srl       $s7, $v0, 0x1f
@@ -42,8 +42,8 @@ glabel func_8024084C_886C0C
 /* 886C9C 802408DC 5040002E */  beql      $v0, $zero, .L80240998
 /* 886CA0 802408E0 26520001 */   addiu    $s2, $s2, 1
 /* 886CA4 802408E4 00101100 */  sll       $v0, $s0, 4
-/* 886CA8 802408E8 3C068009 */  lui       $a2, 0x8009
-/* 886CAC 802408EC 24C6EF20 */  addiu     $a2, $a2, -0x10e0
+/* 886CA8 802408E8 3C068009 */  lui       $a2, %hi(D_8008EF20)
+/* 886CAC 802408EC 24C6EF20 */  addiu     $a2, $a2, %lo(D_8008EF20)
 /* 886CB0 802408F0 00461021 */  addu      $v0, $v0, $a2
 /* 886CB4 802408F4 0200202D */  daddu     $a0, $s0, $zero
 /* 886CB8 802408F8 AE300108 */  sw        $s0, 0x108($s1)
@@ -54,15 +54,15 @@ glabel func_8024084C_886C0C
 /* 886CCC 8024090C 0040202D */  daddu     $a0, $v0, $zero
 /* 886CD0 80240910 04800011 */  bltz      $a0, .L80240958
 /* 886CD4 80240914 00101080 */   sll      $v0, $s0, 2
-/* 886CD8 80240918 3C06800F */  lui       $a2, 0x800f
-/* 886CDC 8024091C 24C67F00 */  addiu     $a2, $a2, 0x7f00
+/* 886CD8 80240918 3C06800F */  lui       $a2, %hi(D_800F7F00)
+/* 886CDC 8024091C 24C67F00 */  addiu     $a2, $a2, %lo(D_800F7F00)
 /* 886CE0 80240920 00461021 */  addu      $v0, $v0, $a2
 /* 886CE4 80240924 8C430000 */  lw        $v1, ($v0)
 /* 886CE8 80240928 24020001 */  addiu     $v0, $zero, 1
 /* 886CEC 8024092C AE22018C */  sw        $v0, 0x18c($s1)
 /* 886CF0 80240930 00041080 */  sll       $v0, $a0, 2
-/* 886CF4 80240934 3C068024 */  lui       $a2, 0x8024
-/* 886CF8 80240938 24C62048 */  addiu     $a2, $a2, 0x2048
+/* 886CF4 80240934 3C068024 */  lui       $a2, %hi(D_80242048)
+/* 886CF8 80240938 24C62048 */  addiu     $a2, $a2, %lo(D_80242048)
 /* 886CFC 8024093C AE230000 */  sw        $v1, ($s1)
 /* 886D00 80240940 001218C0 */  sll       $v1, $s2, 3
 /* 886D04 80240944 00431021 */  addu      $v0, $v0, $v1
@@ -71,8 +71,8 @@ glabel func_8024084C_886C0C
 /* 886D10 80240950 0809025F */  j         .L8024097C
 /* 886D14 80240954 AE220294 */   sw       $v0, 0x294($s1)
 .L80240958:
-/* 886D18 80240958 3C06800F */  lui       $a2, 0x800f
-/* 886D1C 8024095C 24C67F40 */  addiu     $a2, $a2, 0x7f40
+/* 886D18 80240958 3C06800F */  lui       $a2, %hi(D_800F7F40)
+/* 886D1C 8024095C 24C67F40 */  addiu     $a2, $a2, %lo(D_800F7F40)
 /* 886D20 80240960 00461021 */  addu      $v0, $v0, $a2
 /* 886D24 80240964 8C420000 */  lw        $v0, ($v0)
 /* 886D28 80240968 AE20018C */  sw        $zero, 0x18c($s1)
@@ -130,9 +130,9 @@ glabel func_8024084C_886C0C
 /* 886DE0 80240A20 02621021 */  addu      $v0, $s3, $v0
 /* 886DE4 80240A24 8C420108 */  lw        $v0, 0x108($v0)
 /* 886DE8 80240A28 00021100 */  sll       $v0, $v0, 4
-/* 886DEC 80240A2C 3C038009 */  lui       $v1, 0x8009
+/* 886DEC 80240A2C 3C038009 */  lui       $v1, %hi(D_8008EF20)
 /* 886DF0 80240A30 00621821 */  addu      $v1, $v1, $v0
-/* 886DF4 80240A34 8C63EF20 */  lw        $v1, -0x10e0($v1)
+/* 886DF4 80240A34 8C63EF20 */  lw        $v1, %lo(D_8008EF20)($v1)
 /* 886DF8 80240A38 8EA20074 */  lw        $v0, 0x74($s5)
 /* 886DFC 80240A3C 2442FFFF */  addiu     $v0, $v0, -1
 /* 886E00 80240A40 00021080 */  sll       $v0, $v0, 2
diff --git a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240AC8_886E88.s b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240AC8_886E88.s
index 848ec6f9a2..f6fb405623 100644
--- a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240AC8_886E88.s
+++ b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240AC8_886E88.s
@@ -7,9 +7,9 @@ glabel func_80240AC8_886E88
 /* 886E90 80240AD0 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 886E94 80240AD4 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 886E98 80240AD8 00021100 */  sll       $v0, $v0, 4
-/* 886E9C 80240ADC 3C048009 */  lui       $a0, 0x8009
+/* 886E9C 80240ADC 3C048009 */  lui       $a0, %hi(D_8008EF20)
 /* 886EA0 80240AE0 00822021 */  addu      $a0, $a0, $v0
-/* 886EA4 80240AE4 8C84EF20 */  lw        $a0, -0x10e0($a0)
+/* 886EA4 80240AE4 8C84EF20 */  lw        $a0, %lo(D_8008EF20)($a0)
 /* 886EA8 80240AE8 0C0496CF */  jal       set_message_string
 /* 886EAC 80240AEC 0000282D */   daddu    $a1, $zero, $zero
 /* 886EB0 80240AF0 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240C80_887040.s b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240C80_887040.s
index e84b47a9ce..97d22df069 100644
--- a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240C80_887040.s
+++ b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240C80_887040.s
@@ -30,9 +30,9 @@ glabel func_80240C80_887040
 /* 8870A4 80240CE4 000320C0 */  sll       $a0, $v1, 3
 /* 8870A8 80240CE8 00641821 */  addu      $v1, $v1, $a0
 /* 8870AC 80240CEC 000318C0 */  sll       $v1, $v1, 3
-/* 8870B0 80240CF0 3C01800B */  lui       $at, 0x800b
+/* 8870B0 80240CF0 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* 8870B4 80240CF4 00230821 */  addu      $at, $at, $v1
-/* 8870B8 80240CF8 C42C1DEC */  lwc1      $f12, 0x1dec($at)
+/* 8870B8 80240CF8 C42C1DEC */  lwc1      $f12, %lo(D_800B1DEC)($at)
 /* 8870BC 80240CFC 0C00A88D */  jal       sin_cos_deg
 /* 8870C0 80240D00 0040A82D */   daddu    $s5, $v0, $zero
 /* 8870C4 80240D04 1200005D */  beqz      $s0, .L80240E7C
@@ -79,8 +79,8 @@ glabel func_80240C80_887040
 /* 887164 80240DA4 26100004 */   addiu    $s0, $s0, 4
 /* 887168 80240DA8 0000882D */  daddu     $s1, $zero, $zero
 /* 88716C 80240DAC 0240802D */  daddu     $s0, $s2, $zero
-/* 887170 80240DB0 3C148024 */  lui       $s4, 0x8024
-/* 887174 80240DB4 26942088 */  addiu     $s4, $s4, 0x2088
+/* 887170 80240DB0 3C148024 */  lui       $s4, %hi(D_80242088)
+/* 887174 80240DB4 26942088 */  addiu     $s4, $s4, %lo(D_80242088)
 /* 887178 80240DB8 3C014248 */  lui       $at, 0x4248
 /* 88717C 80240DBC 4481A000 */  mtc1      $at, $f20
 /* 887180 80240DC0 24130044 */  addiu     $s3, $zero, 0x44
@@ -150,8 +150,8 @@ glabel func_80240C80_887040
 /* 887274 80240EB4 00000000 */   nop      
 .L80240EB8:
 /* 887278 80240EB8 0000882D */  daddu     $s1, $zero, $zero
-/* 88727C 80240EBC 3C148024 */  lui       $s4, 0x8024
-/* 887280 80240EC0 26942088 */  addiu     $s4, $s4, 0x2088
+/* 88727C 80240EBC 3C148024 */  lui       $s4, %hi(D_80242088)
+/* 887280 80240EC0 26942088 */  addiu     $s4, $s4, %lo(D_80242088)
 /* 887284 80240EC4 24130020 */  addiu     $s3, $zero, 0x20
 /* 887288 80240EC8 3C064248 */  lui       $a2, 0x4248
 /* 88728C 80240ECC 44800000 */  mtc1      $zero, $f0
@@ -197,8 +197,8 @@ glabel func_80240C80_887040
 /* 887328 80240F68 AE400060 */   sw       $zero, 0x60($s2)
 .L80240F6C:
 /* 88732C 80240F6C 0000882D */  daddu     $s1, $zero, $zero
-/* 887330 80240F70 3C148024 */  lui       $s4, 0x8024
-/* 887334 80240F74 26942088 */  addiu     $s4, $s4, 0x2088
+/* 887330 80240F70 3C148024 */  lui       $s4, %hi(D_80242088)
+/* 887334 80240F74 26942088 */  addiu     $s4, $s4, %lo(D_80242088)
 /* 887338 80240F78 24130020 */  addiu     $s3, $zero, 0x20
 /* 88733C 80240F7C 0240802D */  daddu     $s0, $s2, $zero
 /* 887340 80240F80 3C014248 */  lui       $at, 0x4248
diff --git a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240960_889530.s b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240960_889530.s
index f5050a126d..c339d01cf8 100644
--- a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240960_889530.s
+++ b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240960_889530.s
@@ -4,8 +4,8 @@
 glabel func_80240960_889530
 /* 889530 80240960 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* 889534 80240964 AFB00010 */  sw        $s0, 0x10($sp)
-/* 889538 80240968 3C108024 */  lui       $s0, 0x8024
-/* 88953C 8024096C 26103C40 */  addiu     $s0, $s0, 0x3c40
+/* 889538 80240968 3C108024 */  lui       $s0, %hi(D_80243C40)
+/* 88953C 8024096C 26103C40 */  addiu     $s0, $s0, %lo(D_80243C40)
 /* 889540 80240970 AFBF0018 */  sw        $ra, 0x18($sp)
 /* 889544 80240974 AFB10014 */  sw        $s1, 0x14($sp)
 /* 889548 80240978 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_80240960_889530
 /* 8895AC 802409DC 28620010 */  slti      $v0, $v1, 0x10
 /* 8895B0 802409E0 1440FFFA */  bnez      $v0, .L802409CC
 /* 8895B4 802409E4 24840004 */   addiu    $a0, $a0, 4
-/* 8895B8 802409E8 3C108024 */  lui       $s0, 0x8024
-/* 8895BC 802409EC 26103C40 */  addiu     $s0, $s0, 0x3c40
+/* 8895B8 802409E8 3C108024 */  lui       $s0, %hi(D_80243C40)
+/* 8895BC 802409EC 26103C40 */  addiu     $s0, $s0, %lo(D_80243C40)
 /* 8895C0 802409F0 0C00AB4B */  jal       heap_free
 /* 8895C4 802409F4 8E040000 */   lw       $a0, ($s0)
 /* 8895C8 802409F8 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240DE8_8899B8.s b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240DE8_8899B8.s
index 6bbecc0c49..f66f74fd3b 100644
--- a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240DE8_8899B8.s
+++ b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240DE8_8899B8.s
@@ -22,12 +22,12 @@ glabel func_80240DE8_8899B8
 /* 8899FC 80240E2C 0040982D */  daddu     $s3, $v0, $zero
 /* 889A00 80240E30 0000B02D */  daddu     $s6, $zero, $zero
 /* 889A04 80240E34 02C0902D */  daddu     $s2, $s6, $zero
-/* 889A08 80240E38 3C148024 */  lui       $s4, 0x8024
-/* 889A0C 80240E3C 26943CB4 */  addiu     $s4, $s4, 0x3cb4
+/* 889A08 80240E38 3C148024 */  lui       $s4, %hi(D_80243CB4)
+/* 889A0C 80240E3C 26943CB4 */  addiu     $s4, $s4, %lo(D_80243CB4)
 /* 889A10 80240E40 0260882D */  daddu     $s1, $s3, $zero
 /* 889A14 80240E44 8EA200B4 */  lw        $v0, 0xb4($s5)
-/* 889A18 80240E48 3C038024 */  lui       $v1, 0x8024
-/* 889A1C 80240E4C 24633CAC */  addiu     $v1, $v1, 0x3cac
+/* 889A18 80240E48 3C038024 */  lui       $v1, %hi(D_80243CAC)
+/* 889A1C 80240E4C 24633CAC */  addiu     $v1, $v1, %lo(D_80243CAC)
 /* 889A20 80240E50 AEB30078 */  sw        $s3, 0x78($s5)
 /* 889A24 80240E54 00021027 */  nor       $v0, $zero, $v0
 /* 889A28 80240E58 0002BFC2 */  srl       $s7, $v0, 0x1f
@@ -42,8 +42,8 @@ glabel func_80240DE8_8899B8
 /* 889A48 80240E78 5040002E */  beql      $v0, $zero, .L80240F34
 /* 889A4C 80240E7C 26520001 */   addiu    $s2, $s2, 1
 /* 889A50 80240E80 00101100 */  sll       $v0, $s0, 4
-/* 889A54 80240E84 3C068009 */  lui       $a2, 0x8009
-/* 889A58 80240E88 24C6EF20 */  addiu     $a2, $a2, -0x10e0
+/* 889A54 80240E84 3C068009 */  lui       $a2, %hi(D_8008EF20)
+/* 889A58 80240E88 24C6EF20 */  addiu     $a2, $a2, %lo(D_8008EF20)
 /* 889A5C 80240E8C 00461021 */  addu      $v0, $v0, $a2
 /* 889A60 80240E90 0200202D */  daddu     $a0, $s0, $zero
 /* 889A64 80240E94 AE300108 */  sw        $s0, 0x108($s1)
@@ -54,15 +54,15 @@ glabel func_80240DE8_8899B8
 /* 889A78 80240EA8 0040202D */  daddu     $a0, $v0, $zero
 /* 889A7C 80240EAC 04800011 */  bltz      $a0, .L80240EF4
 /* 889A80 80240EB0 00101080 */   sll      $v0, $s0, 2
-/* 889A84 80240EB4 3C06800F */  lui       $a2, 0x800f
-/* 889A88 80240EB8 24C67F00 */  addiu     $a2, $a2, 0x7f00
+/* 889A84 80240EB4 3C06800F */  lui       $a2, %hi(D_800F7F00)
+/* 889A88 80240EB8 24C67F00 */  addiu     $a2, $a2, %lo(D_800F7F00)
 /* 889A8C 80240EBC 00461021 */  addu      $v0, $v0, $a2
 /* 889A90 80240EC0 8C430000 */  lw        $v1, ($v0)
 /* 889A94 80240EC4 24020001 */  addiu     $v0, $zero, 1
 /* 889A98 80240EC8 AE22018C */  sw        $v0, 0x18c($s1)
 /* 889A9C 80240ECC 00041080 */  sll       $v0, $a0, 2
-/* 889AA0 80240ED0 3C068024 */  lui       $a2, 0x8024
-/* 889AA4 80240ED4 24C63CC4 */  addiu     $a2, $a2, 0x3cc4
+/* 889AA0 80240ED0 3C068024 */  lui       $a2, %hi(D_80243CC4)
+/* 889AA4 80240ED4 24C63CC4 */  addiu     $a2, $a2, %lo(D_80243CC4)
 /* 889AA8 80240ED8 AE230000 */  sw        $v1, ($s1)
 /* 889AAC 80240EDC 001218C0 */  sll       $v1, $s2, 3
 /* 889AB0 80240EE0 00431021 */  addu      $v0, $v0, $v1
@@ -71,8 +71,8 @@ glabel func_80240DE8_8899B8
 /* 889ABC 80240EEC 080903C6 */  j         .L80240F18
 /* 889AC0 80240EF0 AE220294 */   sw       $v0, 0x294($s1)
 .L80240EF4:
-/* 889AC4 80240EF4 3C06800F */  lui       $a2, 0x800f
-/* 889AC8 80240EF8 24C67F40 */  addiu     $a2, $a2, 0x7f40
+/* 889AC4 80240EF4 3C06800F */  lui       $a2, %hi(D_800F7F40)
+/* 889AC8 80240EF8 24C67F40 */  addiu     $a2, $a2, %lo(D_800F7F40)
 /* 889ACC 80240EFC 00461021 */  addu      $v0, $v0, $a2
 /* 889AD0 80240F00 8C420000 */  lw        $v0, ($v0)
 /* 889AD4 80240F04 AE20018C */  sw        $zero, 0x18c($s1)
@@ -130,9 +130,9 @@ glabel func_80240DE8_8899B8
 /* 889B8C 80240FBC 02621021 */  addu      $v0, $s3, $v0
 /* 889B90 80240FC0 8C420108 */  lw        $v0, 0x108($v0)
 /* 889B94 80240FC4 00021100 */  sll       $v0, $v0, 4
-/* 889B98 80240FC8 3C038009 */  lui       $v1, 0x8009
+/* 889B98 80240FC8 3C038009 */  lui       $v1, %hi(D_8008EF20)
 /* 889B9C 80240FCC 00621821 */  addu      $v1, $v1, $v0
-/* 889BA0 80240FD0 8C63EF20 */  lw        $v1, -0x10e0($v1)
+/* 889BA0 80240FD0 8C63EF20 */  lw        $v1, %lo(D_8008EF20)($v1)
 /* 889BA4 80240FD4 8EA20074 */  lw        $v0, 0x74($s5)
 /* 889BA8 80240FD8 2442FFFF */  addiu     $v0, $v0, -1
 /* 889BAC 80240FDC 00021080 */  sll       $v0, $v0, 2
diff --git a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241064_889C34.s b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241064_889C34.s
index 1d3b0c3706..9feb25b8fe 100644
--- a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241064_889C34.s
+++ b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241064_889C34.s
@@ -7,9 +7,9 @@ glabel func_80241064_889C34
 /* 889C3C 8024106C 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 889C40 80241070 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 889C44 80241074 00021100 */  sll       $v0, $v0, 4
-/* 889C48 80241078 3C048009 */  lui       $a0, 0x8009
+/* 889C48 80241078 3C048009 */  lui       $a0, %hi(D_8008EF20)
 /* 889C4C 8024107C 00822021 */  addu      $a0, $a0, $v0
-/* 889C50 80241080 8C84EF20 */  lw        $a0, -0x10e0($a0)
+/* 889C50 80241080 8C84EF20 */  lw        $a0, %lo(D_8008EF20)($a0)
 /* 889C54 80241084 0C0496CF */  jal       set_message_string
 /* 889C58 80241088 0000282D */   daddu    $a1, $zero, $zero
 /* 889C5C 8024108C 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_8024121C_889DEC.s b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_8024121C_889DEC.s
index 4c450c5fbd..a32af41332 100644
--- a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_8024121C_889DEC.s
+++ b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_8024121C_889DEC.s
@@ -30,9 +30,9 @@ glabel func_8024121C_889DEC
 /* 889E50 80241280 000320C0 */  sll       $a0, $v1, 3
 /* 889E54 80241284 00641821 */  addu      $v1, $v1, $a0
 /* 889E58 80241288 000318C0 */  sll       $v1, $v1, 3
-/* 889E5C 8024128C 3C01800B */  lui       $at, 0x800b
+/* 889E5C 8024128C 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* 889E60 80241290 00230821 */  addu      $at, $at, $v1
-/* 889E64 80241294 C42C1DEC */  lwc1      $f12, 0x1dec($at)
+/* 889E64 80241294 C42C1DEC */  lwc1      $f12, %lo(D_800B1DEC)($at)
 /* 889E68 80241298 0C00A88D */  jal       sin_cos_deg
 /* 889E6C 8024129C 0040A82D */   daddu    $s5, $v0, $zero
 /* 889E70 802412A0 1200005D */  beqz      $s0, .L80241418
@@ -79,8 +79,8 @@ glabel func_8024121C_889DEC
 /* 889F10 80241340 26100004 */   addiu    $s0, $s0, 4
 /* 889F14 80241344 0000882D */  daddu     $s1, $zero, $zero
 /* 889F18 80241348 0240802D */  daddu     $s0, $s2, $zero
-/* 889F1C 8024134C 3C148024 */  lui       $s4, 0x8024
-/* 889F20 80241350 26943D04 */  addiu     $s4, $s4, 0x3d04
+/* 889F1C 8024134C 3C148024 */  lui       $s4, %hi(D_80243D04)
+/* 889F20 80241350 26943D04 */  addiu     $s4, $s4, %lo(D_80243D04)
 /* 889F24 80241354 3C014248 */  lui       $at, 0x4248
 /* 889F28 80241358 4481A000 */  mtc1      $at, $f20
 /* 889F2C 8024135C 24130044 */  addiu     $s3, $zero, 0x44
@@ -150,8 +150,8 @@ glabel func_8024121C_889DEC
 /* 88A020 80241450 00000000 */   nop      
 .L80241454:
 /* 88A024 80241454 0000882D */  daddu     $s1, $zero, $zero
-/* 88A028 80241458 3C148024 */  lui       $s4, 0x8024
-/* 88A02C 8024145C 26943D04 */  addiu     $s4, $s4, 0x3d04
+/* 88A028 80241458 3C148024 */  lui       $s4, %hi(D_80243D04)
+/* 88A02C 8024145C 26943D04 */  addiu     $s4, $s4, %lo(D_80243D04)
 /* 88A030 80241460 24130020 */  addiu     $s3, $zero, 0x20
 /* 88A034 80241464 3C064248 */  lui       $a2, 0x4248
 /* 88A038 80241468 44800000 */  mtc1      $zero, $f0
@@ -197,8 +197,8 @@ glabel func_8024121C_889DEC
 /* 88A0D4 80241504 AE400060 */   sw       $zero, 0x60($s2)
 .L80241508:
 /* 88A0D8 80241508 0000882D */  daddu     $s1, $zero, $zero
-/* 88A0DC 8024150C 3C148024 */  lui       $s4, 0x8024
-/* 88A0E0 80241510 26943D04 */  addiu     $s4, $s4, 0x3d04
+/* 88A0DC 8024150C 3C148024 */  lui       $s4, %hi(D_80243D04)
+/* 88A0E0 80241510 26943D04 */  addiu     $s4, $s4, %lo(D_80243D04)
 /* 88A0E4 80241514 24130020 */  addiu     $s3, $zero, 0x20
 /* 88A0E8 80241518 0240802D */  daddu     $s0, $s2, $zero
 /* 88A0EC 8024151C 3C014248 */  lui       $at, 0x4248
diff --git a/asm/nonmatchings/world/area_tik/tik_12/88A530/func_802419DC_88A5AC.s b/asm/nonmatchings/world/area_tik/tik_12/88A530/func_802419DC_88A5AC.s
index 749f49cd00..68c402a3e5 100644
--- a/asm/nonmatchings/world/area_tik/tik_12/88A530/func_802419DC_88A5AC.s
+++ b/asm/nonmatchings/world/area_tik/tik_12/88A530/func_802419DC_88A5AC.s
@@ -55,8 +55,8 @@ glabel func_802419DC_88A5AC
 /* 88A668 80241A98 8C470030 */   lw       $a3, 0x30($v0)
 /* 88A66C 80241A9C C6020018 */  lwc1      $f2, 0x18($s0)
 /* 88A670 80241AA0 46020003 */  div.s     $f0, $f0, $f2
-/* 88A674 80241AA4 3C018024 */  lui       $at, 0x8024
-/* 88A678 80241AA8 D42249D0 */  ldc1      $f2, 0x49d0($at)
+/* 88A674 80241AA4 3C018024 */  lui       $at, %hi(D_802449D0)
+/* 88A678 80241AA8 D42249D0 */  ldc1      $f2, %lo(D_802449D0)($at)
 /* 88A67C 80241AAC 46000021 */  cvt.d.s   $f0, $f0
 /* 88A680 80241AB0 46220000 */  add.d     $f0, $f0, $f2
 /* 88A684 80241AB4 4620010D */  trunc.w.d $f4, $f0
diff --git a/asm/nonmatchings/world/area_tik/tik_12/88A530/func_80241CF4_88A8C4.s b/asm/nonmatchings/world/area_tik/tik_12/88A530/func_80241CF4_88A8C4.s
index e9337672ec..99a1972fe9 100644
--- a/asm/nonmatchings/world/area_tik/tik_12/88A530/func_80241CF4_88A8C4.s
+++ b/asm/nonmatchings/world/area_tik/tik_12/88A530/func_80241CF4_88A8C4.s
@@ -279,9 +279,9 @@ glabel func_80241CF4_88A8C4
 /* 88ACB0 802420E0 2C620015 */  sltiu     $v0, $v1, 0x15
 /* 88ACB4 802420E4 10400009 */  beqz      $v0, .L8024210C
 /* 88ACB8 802420E8 00031080 */   sll      $v0, $v1, 2
-/* 88ACBC 802420EC 3C018024 */  lui       $at, 0x8024
+/* 88ACBC 802420EC 3C018024 */  lui       $at, %hi(D_802449D8)
 /* 88ACC0 802420F0 00220821 */  addu      $at, $at, $v0
-/* 88ACC4 802420F4 8C2249D8 */  lw        $v0, 0x49d8($at)
+/* 88ACC4 802420F4 8C2249D8 */  lw        $v0, %lo(D_802449D8)($at)
 /* 88ACC8 802420F8 00400008 */  jr        $v0
 /* 88ACCC 802420FC 00000000 */   nop      
 /* 88ACD0 80242100 8E420028 */  lw        $v0, 0x28($s2)
diff --git a/asm/nonmatchings/world/area_tik/tik_15/890190/func_80240960_890500.s b/asm/nonmatchings/world/area_tik/tik_15/890190/func_80240960_890500.s
index 00990681c9..6d981e2596 100644
--- a/asm/nonmatchings/world/area_tik/tik_15/890190/func_80240960_890500.s
+++ b/asm/nonmatchings/world/area_tik/tik_15/890190/func_80240960_890500.s
@@ -4,8 +4,8 @@
 glabel func_80240960_890500
 /* 890500 80240960 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* 890504 80240964 AFB00010 */  sw        $s0, 0x10($sp)
-/* 890508 80240968 3C108024 */  lui       $s0, 0x8024
-/* 89050C 8024096C 26102758 */  addiu     $s0, $s0, 0x2758
+/* 890508 80240968 3C108024 */  lui       $s0, %hi(D_80242758)
+/* 89050C 8024096C 26102758 */  addiu     $s0, $s0, %lo(D_80242758)
 /* 890510 80240970 AFBF0018 */  sw        $ra, 0x18($sp)
 /* 890514 80240974 AFB10014 */  sw        $s1, 0x14($sp)
 /* 890518 80240978 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_80240960_890500
 /* 89057C 802409DC 28620010 */  slti      $v0, $v1, 0x10
 /* 890580 802409E0 1440FFFA */  bnez      $v0, .L802409CC
 /* 890584 802409E4 24840004 */   addiu    $a0, $a0, 4
-/* 890588 802409E8 3C108024 */  lui       $s0, 0x8024
-/* 89058C 802409EC 26102758 */  addiu     $s0, $s0, 0x2758
+/* 890588 802409E8 3C108024 */  lui       $s0, %hi(D_80242758)
+/* 89058C 802409EC 26102758 */  addiu     $s0, $s0, %lo(D_80242758)
 /* 890590 802409F0 0C00AB4B */  jal       heap_free
 /* 890594 802409F4 8E040000 */   lw       $a0, ($s0)
 /* 890598 802409F8 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_tik/tik_15/890190/func_80240A78_890618.s b/asm/nonmatchings/world/area_tik/tik_15/890190/func_80240A78_890618.s
index 4b890f80dd..b013c3f1d2 100644
--- a/asm/nonmatchings/world/area_tik/tik_15/890190/func_80240A78_890618.s
+++ b/asm/nonmatchings/world/area_tik/tik_15/890190/func_80240A78_890618.s
@@ -3,8 +3,8 @@
 
 glabel func_80240A78_890618
 /* 890618 80240A78 8C820084 */  lw        $v0, 0x84($a0)
-/* 89061C 80240A7C 3C038024 */  lui       $v1, 0x8024
-/* 890620 80240A80 246327BC */  addiu     $v1, $v1, 0x27bc
+/* 89061C 80240A7C 3C038024 */  lui       $v1, %hi(D_802427BC)
+/* 890620 80240A80 246327BC */  addiu     $v1, $v1, %lo(D_802427BC)
 /* 890624 80240A84 000210C0 */  sll       $v0, $v0, 3
 /* 890628 80240A88 00431021 */  addu      $v0, $v0, $v1
 /* 89062C 80240A8C 8C430000 */  lw        $v1, ($v0)
diff --git a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_802401FC_892C1C.s b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_802401FC_892C1C.s
index 063c8c91e1..58f0a9cae9 100644
--- a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_802401FC_892C1C.s
+++ b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_802401FC_892C1C.s
@@ -22,12 +22,12 @@ glabel func_802401FC_892C1C
 /* 892C60 80240240 0040982D */  daddu     $s3, $v0, $zero
 /* 892C64 80240244 0000B02D */  daddu     $s6, $zero, $zero
 /* 892C68 80240248 02C0902D */  daddu     $s2, $s6, $zero
-/* 892C6C 8024024C 3C148024 */  lui       $s4, 0x8024
-/* 892C70 80240250 26941428 */  addiu     $s4, $s4, 0x1428
+/* 892C6C 8024024C 3C148024 */  lui       $s4, %hi(D_80241428)
+/* 892C70 80240250 26941428 */  addiu     $s4, $s4, %lo(D_80241428)
 /* 892C74 80240254 0260882D */  daddu     $s1, $s3, $zero
 /* 892C78 80240258 8EA200B4 */  lw        $v0, 0xb4($s5)
-/* 892C7C 8024025C 3C038024 */  lui       $v1, 0x8024
-/* 892C80 80240260 24631420 */  addiu     $v1, $v1, 0x1420
+/* 892C7C 8024025C 3C038024 */  lui       $v1, %hi(D_80241420)
+/* 892C80 80240260 24631420 */  addiu     $v1, $v1, %lo(D_80241420)
 /* 892C84 80240264 AEB30078 */  sw        $s3, 0x78($s5)
 /* 892C88 80240268 00021027 */  nor       $v0, $zero, $v0
 /* 892C8C 8024026C 0002BFC2 */  srl       $s7, $v0, 0x1f
@@ -42,8 +42,8 @@ glabel func_802401FC_892C1C
 /* 892CAC 8024028C 5040002E */  beql      $v0, $zero, .L80240348
 /* 892CB0 80240290 26520001 */   addiu    $s2, $s2, 1
 /* 892CB4 80240294 00101100 */  sll       $v0, $s0, 4
-/* 892CB8 80240298 3C068009 */  lui       $a2, 0x8009
-/* 892CBC 8024029C 24C6EF20 */  addiu     $a2, $a2, -0x10e0
+/* 892CB8 80240298 3C068009 */  lui       $a2, %hi(D_8008EF20)
+/* 892CBC 8024029C 24C6EF20 */  addiu     $a2, $a2, %lo(D_8008EF20)
 /* 892CC0 802402A0 00461021 */  addu      $v0, $v0, $a2
 /* 892CC4 802402A4 0200202D */  daddu     $a0, $s0, $zero
 /* 892CC8 802402A8 AE300108 */  sw        $s0, 0x108($s1)
@@ -54,15 +54,15 @@ glabel func_802401FC_892C1C
 /* 892CDC 802402BC 0040202D */  daddu     $a0, $v0, $zero
 /* 892CE0 802402C0 04800011 */  bltz      $a0, .L80240308
 /* 892CE4 802402C4 00101080 */   sll      $v0, $s0, 2
-/* 892CE8 802402C8 3C06800F */  lui       $a2, 0x800f
-/* 892CEC 802402CC 24C67F00 */  addiu     $a2, $a2, 0x7f00
+/* 892CE8 802402C8 3C06800F */  lui       $a2, %hi(D_800F7F00)
+/* 892CEC 802402CC 24C67F00 */  addiu     $a2, $a2, %lo(D_800F7F00)
 /* 892CF0 802402D0 00461021 */  addu      $v0, $v0, $a2
 /* 892CF4 802402D4 8C430000 */  lw        $v1, ($v0)
 /* 892CF8 802402D8 24020001 */  addiu     $v0, $zero, 1
 /* 892CFC 802402DC AE22018C */  sw        $v0, 0x18c($s1)
 /* 892D00 802402E0 00041080 */  sll       $v0, $a0, 2
-/* 892D04 802402E4 3C068024 */  lui       $a2, 0x8024
-/* 892D08 802402E8 24C61438 */  addiu     $a2, $a2, 0x1438
+/* 892D04 802402E4 3C068024 */  lui       $a2, %hi(D_80241438)
+/* 892D08 802402E8 24C61438 */  addiu     $a2, $a2, %lo(D_80241438)
 /* 892D0C 802402EC AE230000 */  sw        $v1, ($s1)
 /* 892D10 802402F0 001218C0 */  sll       $v1, $s2, 3
 /* 892D14 802402F4 00431021 */  addu      $v0, $v0, $v1
@@ -71,8 +71,8 @@ glabel func_802401FC_892C1C
 /* 892D20 80240300 080900CB */  j         .L8024032C
 /* 892D24 80240304 AE220294 */   sw       $v0, 0x294($s1)
 .L80240308:
-/* 892D28 80240308 3C06800F */  lui       $a2, 0x800f
-/* 892D2C 8024030C 24C67F40 */  addiu     $a2, $a2, 0x7f40
+/* 892D28 80240308 3C06800F */  lui       $a2, %hi(D_800F7F40)
+/* 892D2C 8024030C 24C67F40 */  addiu     $a2, $a2, %lo(D_800F7F40)
 /* 892D30 80240310 00461021 */  addu      $v0, $v0, $a2
 /* 892D34 80240314 8C420000 */  lw        $v0, ($v0)
 /* 892D38 80240318 AE20018C */  sw        $zero, 0x18c($s1)
@@ -130,9 +130,9 @@ glabel func_802401FC_892C1C
 /* 892DF0 802403D0 02621021 */  addu      $v0, $s3, $v0
 /* 892DF4 802403D4 8C420108 */  lw        $v0, 0x108($v0)
 /* 892DF8 802403D8 00021100 */  sll       $v0, $v0, 4
-/* 892DFC 802403DC 3C038009 */  lui       $v1, 0x8009
+/* 892DFC 802403DC 3C038009 */  lui       $v1, %hi(D_8008EF20)
 /* 892E00 802403E0 00621821 */  addu      $v1, $v1, $v0
-/* 892E04 802403E4 8C63EF20 */  lw        $v1, -0x10e0($v1)
+/* 892E04 802403E4 8C63EF20 */  lw        $v1, %lo(D_8008EF20)($v1)
 /* 892E08 802403E8 8EA20074 */  lw        $v0, 0x74($s5)
 /* 892E0C 802403EC 2442FFFF */  addiu     $v0, $v0, -1
 /* 892E10 802403F0 00021080 */  sll       $v0, $v0, 2
diff --git a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240478_892E98.s b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240478_892E98.s
index fa7adf807c..1702a4ae75 100644
--- a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240478_892E98.s
+++ b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240478_892E98.s
@@ -7,9 +7,9 @@ glabel func_80240478_892E98
 /* 892EA0 80240480 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 892EA4 80240484 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 892EA8 80240488 00021100 */  sll       $v0, $v0, 4
-/* 892EAC 8024048C 3C048009 */  lui       $a0, 0x8009
+/* 892EAC 8024048C 3C048009 */  lui       $a0, %hi(D_8008EF20)
 /* 892EB0 80240490 00822021 */  addu      $a0, $a0, $v0
-/* 892EB4 80240494 8C84EF20 */  lw        $a0, -0x10e0($a0)
+/* 892EB4 80240494 8C84EF20 */  lw        $a0, %lo(D_8008EF20)($a0)
 /* 892EB8 80240498 0C0496CF */  jal       set_message_string
 /* 892EBC 8024049C 0000282D */   daddu    $a1, $zero, $zero
 /* 892EC0 802404A0 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240630_893050.s b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240630_893050.s
index f43bbf9620..ce0915f2f4 100644
--- a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240630_893050.s
+++ b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240630_893050.s
@@ -30,9 +30,9 @@ glabel func_80240630_893050
 /* 8930B4 80240694 000320C0 */  sll       $a0, $v1, 3
 /* 8930B8 80240698 00641821 */  addu      $v1, $v1, $a0
 /* 8930BC 8024069C 000318C0 */  sll       $v1, $v1, 3
-/* 8930C0 802406A0 3C01800B */  lui       $at, 0x800b
+/* 8930C0 802406A0 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* 8930C4 802406A4 00230821 */  addu      $at, $at, $v1
-/* 8930C8 802406A8 C42C1DEC */  lwc1      $f12, 0x1dec($at)
+/* 8930C8 802406A8 C42C1DEC */  lwc1      $f12, %lo(D_800B1DEC)($at)
 /* 8930CC 802406AC 0C00A88D */  jal       sin_cos_deg
 /* 8930D0 802406B0 0040A82D */   daddu    $s5, $v0, $zero
 /* 8930D4 802406B4 1200005D */  beqz      $s0, .L8024082C
@@ -79,8 +79,8 @@ glabel func_80240630_893050
 /* 893174 80240754 26100004 */   addiu    $s0, $s0, 4
 /* 893178 80240758 0000882D */  daddu     $s1, $zero, $zero
 /* 89317C 8024075C 0240802D */  daddu     $s0, $s2, $zero
-/* 893180 80240760 3C148024 */  lui       $s4, 0x8024
-/* 893184 80240764 26941478 */  addiu     $s4, $s4, 0x1478
+/* 893180 80240760 3C148024 */  lui       $s4, %hi(D_80241478)
+/* 893184 80240764 26941478 */  addiu     $s4, $s4, %lo(D_80241478)
 /* 893188 80240768 3C014248 */  lui       $at, 0x4248
 /* 89318C 8024076C 4481A000 */  mtc1      $at, $f20
 /* 893190 80240770 24130044 */  addiu     $s3, $zero, 0x44
@@ -150,8 +150,8 @@ glabel func_80240630_893050
 /* 893284 80240864 00000000 */   nop      
 .L80240868:
 /* 893288 80240868 0000882D */  daddu     $s1, $zero, $zero
-/* 89328C 8024086C 3C148024 */  lui       $s4, 0x8024
-/* 893290 80240870 26941478 */  addiu     $s4, $s4, 0x1478
+/* 89328C 8024086C 3C148024 */  lui       $s4, %hi(D_80241478)
+/* 893290 80240870 26941478 */  addiu     $s4, $s4, %lo(D_80241478)
 /* 893294 80240874 24130020 */  addiu     $s3, $zero, 0x20
 /* 893298 80240878 3C064248 */  lui       $a2, 0x4248
 /* 89329C 8024087C 44800000 */  mtc1      $zero, $f0
@@ -197,8 +197,8 @@ glabel func_80240630_893050
 /* 893338 80240918 AE400060 */   sw       $zero, 0x60($s2)
 .L8024091C:
 /* 89333C 8024091C 0000882D */  daddu     $s1, $zero, $zero
-/* 893340 80240920 3C148024 */  lui       $s4, 0x8024
-/* 893344 80240924 26941478 */  addiu     $s4, $s4, 0x1478
+/* 893340 80240920 3C148024 */  lui       $s4, %hi(D_80241478)
+/* 893344 80240924 26941478 */  addiu     $s4, $s4, %lo(D_80241478)
 /* 893348 80240928 24130020 */  addiu     $s3, $zero, 0x20
 /* 89334C 8024092C 0240802D */  daddu     $s0, $s2, $zero
 /* 893350 80240930 3C014248 */  lui       $at, 0x4248
diff --git a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_802407BC_897D9C.s b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_802407BC_897D9C.s
index cebe10267e..ca2b1d2f86 100644
--- a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_802407BC_897D9C.s
+++ b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_802407BC_897D9C.s
@@ -22,12 +22,12 @@ glabel func_802407BC_897D9C
 /* 897DE0 80240800 0040982D */  daddu     $s3, $v0, $zero
 /* 897DE4 80240804 0000B02D */  daddu     $s6, $zero, $zero
 /* 897DE8 80240808 02C0902D */  daddu     $s2, $s6, $zero
-/* 897DEC 8024080C 3C148024 */  lui       $s4, 0x8024
-/* 897DF0 80240810 269426B8 */  addiu     $s4, $s4, 0x26b8
+/* 897DEC 8024080C 3C148024 */  lui       $s4, %hi(D_802426B8)
+/* 897DF0 80240810 269426B8 */  addiu     $s4, $s4, %lo(D_802426B8)
 /* 897DF4 80240814 0260882D */  daddu     $s1, $s3, $zero
 /* 897DF8 80240818 8EA200B4 */  lw        $v0, 0xb4($s5)
-/* 897DFC 8024081C 3C038024 */  lui       $v1, 0x8024
-/* 897E00 80240820 246326B0 */  addiu     $v1, $v1, 0x26b0
+/* 897DFC 8024081C 3C038024 */  lui       $v1, %hi(D_802426B0)
+/* 897E00 80240820 246326B0 */  addiu     $v1, $v1, %lo(D_802426B0)
 /* 897E04 80240824 AEB30078 */  sw        $s3, 0x78($s5)
 /* 897E08 80240828 00021027 */  nor       $v0, $zero, $v0
 /* 897E0C 8024082C 0002BFC2 */  srl       $s7, $v0, 0x1f
@@ -42,8 +42,8 @@ glabel func_802407BC_897D9C
 /* 897E2C 8024084C 5040002E */  beql      $v0, $zero, .L80240908
 /* 897E30 80240850 26520001 */   addiu    $s2, $s2, 1
 /* 897E34 80240854 00101100 */  sll       $v0, $s0, 4
-/* 897E38 80240858 3C068009 */  lui       $a2, 0x8009
-/* 897E3C 8024085C 24C6EF20 */  addiu     $a2, $a2, -0x10e0
+/* 897E38 80240858 3C068009 */  lui       $a2, %hi(D_8008EF20)
+/* 897E3C 8024085C 24C6EF20 */  addiu     $a2, $a2, %lo(D_8008EF20)
 /* 897E40 80240860 00461021 */  addu      $v0, $v0, $a2
 /* 897E44 80240864 0200202D */  daddu     $a0, $s0, $zero
 /* 897E48 80240868 AE300108 */  sw        $s0, 0x108($s1)
@@ -54,15 +54,15 @@ glabel func_802407BC_897D9C
 /* 897E5C 8024087C 0040202D */  daddu     $a0, $v0, $zero
 /* 897E60 80240880 04800011 */  bltz      $a0, .L802408C8
 /* 897E64 80240884 00101080 */   sll      $v0, $s0, 2
-/* 897E68 80240888 3C06800F */  lui       $a2, 0x800f
-/* 897E6C 8024088C 24C67F00 */  addiu     $a2, $a2, 0x7f00
+/* 897E68 80240888 3C06800F */  lui       $a2, %hi(D_800F7F00)
+/* 897E6C 8024088C 24C67F00 */  addiu     $a2, $a2, %lo(D_800F7F00)
 /* 897E70 80240890 00461021 */  addu      $v0, $v0, $a2
 /* 897E74 80240894 8C430000 */  lw        $v1, ($v0)
 /* 897E78 80240898 24020001 */  addiu     $v0, $zero, 1
 /* 897E7C 8024089C AE22018C */  sw        $v0, 0x18c($s1)
 /* 897E80 802408A0 00041080 */  sll       $v0, $a0, 2
-/* 897E84 802408A4 3C068024 */  lui       $a2, 0x8024
-/* 897E88 802408A8 24C626C8 */  addiu     $a2, $a2, 0x26c8
+/* 897E84 802408A4 3C068024 */  lui       $a2, %hi(D_802426C8)
+/* 897E88 802408A8 24C626C8 */  addiu     $a2, $a2, %lo(D_802426C8)
 /* 897E8C 802408AC AE230000 */  sw        $v1, ($s1)
 /* 897E90 802408B0 001218C0 */  sll       $v1, $s2, 3
 /* 897E94 802408B4 00431021 */  addu      $v0, $v0, $v1
@@ -71,8 +71,8 @@ glabel func_802407BC_897D9C
 /* 897EA0 802408C0 0809023B */  j         .L802408EC
 /* 897EA4 802408C4 AE220294 */   sw       $v0, 0x294($s1)
 .L802408C8:
-/* 897EA8 802408C8 3C06800F */  lui       $a2, 0x800f
-/* 897EAC 802408CC 24C67F40 */  addiu     $a2, $a2, 0x7f40
+/* 897EA8 802408C8 3C06800F */  lui       $a2, %hi(D_800F7F40)
+/* 897EAC 802408CC 24C67F40 */  addiu     $a2, $a2, %lo(D_800F7F40)
 /* 897EB0 802408D0 00461021 */  addu      $v0, $v0, $a2
 /* 897EB4 802408D4 8C420000 */  lw        $v0, ($v0)
 /* 897EB8 802408D8 AE20018C */  sw        $zero, 0x18c($s1)
@@ -130,9 +130,9 @@ glabel func_802407BC_897D9C
 /* 897F70 80240990 02621021 */  addu      $v0, $s3, $v0
 /* 897F74 80240994 8C420108 */  lw        $v0, 0x108($v0)
 /* 897F78 80240998 00021100 */  sll       $v0, $v0, 4
-/* 897F7C 8024099C 3C038009 */  lui       $v1, 0x8009
+/* 897F7C 8024099C 3C038009 */  lui       $v1, %hi(D_8008EF20)
 /* 897F80 802409A0 00621821 */  addu      $v1, $v1, $v0
-/* 897F84 802409A4 8C63EF20 */  lw        $v1, -0x10e0($v1)
+/* 897F84 802409A4 8C63EF20 */  lw        $v1, %lo(D_8008EF20)($v1)
 /* 897F88 802409A8 8EA20074 */  lw        $v0, 0x74($s5)
 /* 897F8C 802409AC 2442FFFF */  addiu     $v0, $v0, -1
 /* 897F90 802409B0 00021080 */  sll       $v0, $v0, 2
diff --git a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240A38_898018.s b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240A38_898018.s
index 5e8d297207..200dcd223a 100644
--- a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240A38_898018.s
+++ b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240A38_898018.s
@@ -7,9 +7,9 @@ glabel func_80240A38_898018
 /* 898020 80240A40 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 898024 80240A44 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 898028 80240A48 00021100 */  sll       $v0, $v0, 4
-/* 89802C 80240A4C 3C048009 */  lui       $a0, 0x8009
+/* 89802C 80240A4C 3C048009 */  lui       $a0, %hi(D_8008EF20)
 /* 898030 80240A50 00822021 */  addu      $a0, $a0, $v0
-/* 898034 80240A54 8C84EF20 */  lw        $a0, -0x10e0($a0)
+/* 898034 80240A54 8C84EF20 */  lw        $a0, %lo(D_8008EF20)($a0)
 /* 898038 80240A58 0C0496CF */  jal       set_message_string
 /* 89803C 80240A5C 0000282D */   daddu    $a1, $zero, $zero
 /* 898040 80240A60 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240BF0_8981D0.s b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240BF0_8981D0.s
index 8e14dc6796..ec84efe2a8 100644
--- a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240BF0_8981D0.s
+++ b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240BF0_8981D0.s
@@ -30,9 +30,9 @@ glabel func_80240BF0_8981D0
 /* 898234 80240C54 000320C0 */  sll       $a0, $v1, 3
 /* 898238 80240C58 00641821 */  addu      $v1, $v1, $a0
 /* 89823C 80240C5C 000318C0 */  sll       $v1, $v1, 3
-/* 898240 80240C60 3C01800B */  lui       $at, 0x800b
+/* 898240 80240C60 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* 898244 80240C64 00230821 */  addu      $at, $at, $v1
-/* 898248 80240C68 C42C1DEC */  lwc1      $f12, 0x1dec($at)
+/* 898248 80240C68 C42C1DEC */  lwc1      $f12, %lo(D_800B1DEC)($at)
 /* 89824C 80240C6C 0C00A88D */  jal       sin_cos_deg
 /* 898250 80240C70 0040A82D */   daddu    $s5, $v0, $zero
 /* 898254 80240C74 1200005D */  beqz      $s0, .L80240DEC
@@ -79,8 +79,8 @@ glabel func_80240BF0_8981D0
 /* 8982F4 80240D14 26100004 */   addiu    $s0, $s0, 4
 /* 8982F8 80240D18 0000882D */  daddu     $s1, $zero, $zero
 /* 8982FC 80240D1C 0240802D */  daddu     $s0, $s2, $zero
-/* 898300 80240D20 3C148024 */  lui       $s4, 0x8024
-/* 898304 80240D24 26942708 */  addiu     $s4, $s4, 0x2708
+/* 898300 80240D20 3C148024 */  lui       $s4, %hi(D_80242708)
+/* 898304 80240D24 26942708 */  addiu     $s4, $s4, %lo(D_80242708)
 /* 898308 80240D28 3C014248 */  lui       $at, 0x4248
 /* 89830C 80240D2C 4481A000 */  mtc1      $at, $f20
 /* 898310 80240D30 24130044 */  addiu     $s3, $zero, 0x44
@@ -150,8 +150,8 @@ glabel func_80240BF0_8981D0
 /* 898404 80240E24 00000000 */   nop      
 .L80240E28:
 /* 898408 80240E28 0000882D */  daddu     $s1, $zero, $zero
-/* 89840C 80240E2C 3C148024 */  lui       $s4, 0x8024
-/* 898410 80240E30 26942708 */  addiu     $s4, $s4, 0x2708
+/* 89840C 80240E2C 3C148024 */  lui       $s4, %hi(D_80242708)
+/* 898410 80240E30 26942708 */  addiu     $s4, $s4, %lo(D_80242708)
 /* 898414 80240E34 24130020 */  addiu     $s3, $zero, 0x20
 /* 898418 80240E38 3C064248 */  lui       $a2, 0x4248
 /* 89841C 80240E3C 44800000 */  mtc1      $zero, $f0
@@ -197,8 +197,8 @@ glabel func_80240BF0_8981D0
 /* 8984B8 80240ED8 AE400060 */   sw       $zero, 0x60($s2)
 .L80240EDC:
 /* 8984BC 80240EDC 0000882D */  daddu     $s1, $zero, $zero
-/* 8984C0 80240EE0 3C148024 */  lui       $s4, 0x8024
-/* 8984C4 80240EE4 26942708 */  addiu     $s4, $s4, 0x2708
+/* 8984C0 80240EE0 3C148024 */  lui       $s4, %hi(D_80242708)
+/* 8984C4 80240EE4 26942708 */  addiu     $s4, $s4, %lo(D_80242708)
 /* 8984C8 80240EE8 24130020 */  addiu     $s3, $zero, 0x20
 /* 8984CC 80240EEC 0240802D */  daddu     $s0, $s2, $zero
 /* 8984D0 80240EF0 3C014248 */  lui       $at, 0x4248
diff --git a/asm/nonmatchings/world/area_tik/tik_20/89ACB0/func_802409DC_89AD2C.s b/asm/nonmatchings/world/area_tik/tik_20/89ACB0/func_802409DC_89AD2C.s
index 7a82126f33..4ff000ae98 100644
--- a/asm/nonmatchings/world/area_tik/tik_20/89ACB0/func_802409DC_89AD2C.s
+++ b/asm/nonmatchings/world/area_tik/tik_20/89ACB0/func_802409DC_89AD2C.s
@@ -55,8 +55,8 @@ glabel func_802409DC_89AD2C
 /* 89ADE8 80240A98 8C470030 */   lw       $a3, 0x30($v0)
 /* 89ADEC 80240A9C C6020018 */  lwc1      $f2, 0x18($s0)
 /* 89ADF0 80240AA0 46020003 */  div.s     $f0, $f0, $f2
-/* 89ADF4 80240AA4 3C018024 */  lui       $at, 0x8024
-/* 89ADF8 80240AA8 D42233F0 */  ldc1      $f2, 0x33f0($at)
+/* 89ADF4 80240AA4 3C018024 */  lui       $at, %hi(D_802433F0)
+/* 89ADF8 80240AA8 D42233F0 */  ldc1      $f2, %lo(D_802433F0)($at)
 /* 89ADFC 80240AAC 46000021 */  cvt.d.s   $f0, $f0
 /* 89AE00 80240AB0 46220000 */  add.d     $f0, $f0, $f2
 /* 89AE04 80240AB4 4620010D */  trunc.w.d $f4, $f0
diff --git a/asm/nonmatchings/world/area_tik/tik_20/89ACB0/func_80240CF4_89B044.s b/asm/nonmatchings/world/area_tik/tik_20/89ACB0/func_80240CF4_89B044.s
index 9a4a7060e9..42f27bcd4e 100644
--- a/asm/nonmatchings/world/area_tik/tik_20/89ACB0/func_80240CF4_89B044.s
+++ b/asm/nonmatchings/world/area_tik/tik_20/89ACB0/func_80240CF4_89B044.s
@@ -279,9 +279,9 @@ glabel func_80240CF4_89B044
 /* 89B430 802410E0 2C620015 */  sltiu     $v0, $v1, 0x15
 /* 89B434 802410E4 10400009 */  beqz      $v0, .L8024110C
 /* 89B438 802410E8 00031080 */   sll      $v0, $v1, 2
-/* 89B43C 802410EC 3C018024 */  lui       $at, 0x8024
+/* 89B43C 802410EC 3C018024 */  lui       $at, %hi(D_802433F8)
 /* 89B440 802410F0 00220821 */  addu      $at, $at, $v0
-/* 89B444 802410F4 8C2233F8 */  lw        $v0, 0x33f8($at)
+/* 89B444 802410F4 8C2233F8 */  lw        $v0, %lo(D_802433F8)($at)
 /* 89B448 802410F8 00400008 */  jr        $v0
 /* 89B44C 802410FC 00000000 */   nop      
 /* 89B450 80241100 8E420028 */  lw        $v0, 0x28($s2)
diff --git a/asm/nonmatchings/world/area_tik/tik_23/8A2D30/func_802409DC_8A2DAC.s b/asm/nonmatchings/world/area_tik/tik_23/8A2D30/func_802409DC_8A2DAC.s
index f4e9776ede..4adace309a 100644
--- a/asm/nonmatchings/world/area_tik/tik_23/8A2D30/func_802409DC_8A2DAC.s
+++ b/asm/nonmatchings/world/area_tik/tik_23/8A2D30/func_802409DC_8A2DAC.s
@@ -55,8 +55,8 @@ glabel func_802409DC_8A2DAC
 /* 8A2E68 80240A98 8C470030 */   lw       $a3, 0x30($v0)
 /* 8A2E6C 80240A9C C6020018 */  lwc1      $f2, 0x18($s0)
 /* 8A2E70 80240AA0 46020003 */  div.s     $f0, $f0, $f2
-/* 8A2E74 80240AA4 3C018024 */  lui       $at, 0x8024
-/* 8A2E78 80240AA8 D4223650 */  ldc1      $f2, 0x3650($at)
+/* 8A2E74 80240AA4 3C018024 */  lui       $at, %hi(D_80243650)
+/* 8A2E78 80240AA8 D4223650 */  ldc1      $f2, %lo(D_80243650)($at)
 /* 8A2E7C 80240AAC 46000021 */  cvt.d.s   $f0, $f0
 /* 8A2E80 80240AB0 46220000 */  add.d     $f0, $f0, $f2
 /* 8A2E84 80240AB4 4620010D */  trunc.w.d $f4, $f0
diff --git a/asm/nonmatchings/world/area_tik/tik_23/8A2D30/func_80240CF4_8A30C4.s b/asm/nonmatchings/world/area_tik/tik_23/8A2D30/func_80240CF4_8A30C4.s
index ca99fd24e2..1538d70411 100644
--- a/asm/nonmatchings/world/area_tik/tik_23/8A2D30/func_80240CF4_8A30C4.s
+++ b/asm/nonmatchings/world/area_tik/tik_23/8A2D30/func_80240CF4_8A30C4.s
@@ -279,9 +279,9 @@ glabel func_80240CF4_8A30C4
 /* 8A34B0 802410E0 2C620015 */  sltiu     $v0, $v1, 0x15
 /* 8A34B4 802410E4 10400009 */  beqz      $v0, .L8024110C
 /* 8A34B8 802410E8 00031080 */   sll      $v0, $v1, 2
-/* 8A34BC 802410EC 3C018024 */  lui       $at, 0x8024
+/* 8A34BC 802410EC 3C018024 */  lui       $at, %hi(D_80243658)
 /* 8A34C0 802410F0 00220821 */  addu      $at, $at, $v0
-/* 8A34C4 802410F4 8C223658 */  lw        $v0, 0x3658($at)
+/* 8A34C4 802410F4 8C223658 */  lw        $v0, %lo(D_80243658)($at)
 /* 8A34C8 802410F8 00400008 */  jr        $v0
 /* 8A34CC 802410FC 00000000 */   nop      
 /* 8A34D0 80241100 8E420028 */  lw        $v0, 0x28($s2)
diff --git a/asm/nonmatchings/world/area_tik/tik_24/8A5A80/func_80240000_8A5A80.s b/asm/nonmatchings/world/area_tik/tik_24/8A5A80/func_80240000_8A5A80.s
index 302ef9038f..eb1b82d75d 100644
--- a/asm/nonmatchings/world/area_tik/tik_24/8A5A80/func_80240000_8A5A80.s
+++ b/asm/nonmatchings/world/area_tik/tik_24/8A5A80/func_80240000_8A5A80.s
@@ -3,18 +3,18 @@
 
 glabel func_80240000_8A5A80
 /* 8A5A80 80240000 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8A5A84 80240004 3C04800E */  lui       $a0, 0x800e
-/* 8A5A88 80240008 24849230 */  addiu     $a0, $a0, -0x6dd0
-/* 8A5A8C 8024000C 3C058024 */  lui       $a1, 0x8024
-/* 8A5A90 80240010 24A52470 */  addiu     $a1, $a1, 0x2470
+/* 8A5A84 80240004 3C04800E */  lui       $a0, %hi(D_800D9230)
+/* 8A5A88 80240008 24849230 */  addiu     $a0, $a0, %lo(D_800D9230)
+/* 8A5A8C 8024000C 3C058024 */  lui       $a1, %hi(D_80242470)
+/* 8A5A90 80240010 24A52470 */  addiu     $a1, $a1, %lo(D_80242470)
 /* 8A5A94 80240014 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 8A5A98 80240018 0C01953C */  jal       sprintf
 /* 8A5A9C 8024001C 00000000 */   nop      
-/* 8A5AA0 80240020 3C04800E */  lui       $a0, 0x800e
-/* 8A5AA4 80240024 248491E0 */  addiu     $a0, $a0, -0x6e20
-/* 8A5AA8 80240028 3C058024 */  lui       $a1, 0x8024
+/* 8A5AA0 80240020 3C04800E */  lui       $a0, %hi(D_800D91E0)
+/* 8A5AA4 80240024 248491E0 */  addiu     $a0, $a0, %lo(D_800D91E0)
+/* 8A5AA8 80240028 3C058024 */  lui       $a1, %hi(D_80242480)
 /* 8A5AAC 8024002C 0C01953C */  jal       sprintf
-/* 8A5AB0 80240030 24A52480 */   addiu    $a1, $a1, 0x2480
+/* 8A5AB0 80240030 24A52480 */   addiu    $a1, $a1, %lo(D_80242480)
 /* 8A5AB4 80240034 8FBF0010 */  lw        $ra, 0x10($sp)
 /* 8A5AB8 80240038 0000102D */  daddu     $v0, $zero, $zero
 /* 8A5ABC 8024003C 03E00008 */  jr        $ra
diff --git a/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_8024074C_8A61CC.s b/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_8024074C_8A61CC.s
index 9826ce72ea..451d6ce77b 100644
--- a/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_8024074C_8A61CC.s
+++ b/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_8024074C_8A61CC.s
@@ -55,8 +55,8 @@ glabel func_8024074C_8A61CC
 /* 8A6288 80240808 8C470030 */   lw       $a3, 0x30($v0)
 /* 8A628C 8024080C C6020018 */  lwc1      $f2, 0x18($s0)
 /* 8A6290 80240810 46020003 */  div.s     $f0, $f0, $f2
-/* 8A6294 80240814 3C018024 */  lui       $at, 0x8024
-/* 8A6298 80240818 D42224A0 */  ldc1      $f2, 0x24a0($at)
+/* 8A6294 80240814 3C018024 */  lui       $at, %hi(D_802424A0)
+/* 8A6298 80240818 D42224A0 */  ldc1      $f2, %lo(D_802424A0)($at)
 /* 8A629C 8024081C 46000021 */  cvt.d.s   $f0, $f0
 /* 8A62A0 80240820 46220000 */  add.d     $f0, $f0, $f2
 /* 8A62A4 80240824 4620010D */  trunc.w.d $f4, $f0
diff --git a/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_80240A64_8A64E4.s b/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_80240A64_8A64E4.s
index 8c33c5a932..9b23102e70 100644
--- a/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_80240A64_8A64E4.s
+++ b/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_80240A64_8A64E4.s
@@ -279,9 +279,9 @@ glabel func_80240A64_8A64E4
 /* 8A68D0 80240E50 2C620015 */  sltiu     $v0, $v1, 0x15
 /* 8A68D4 80240E54 10400009 */  beqz      $v0, .L80240E7C
 /* 8A68D8 80240E58 00031080 */   sll      $v0, $v1, 2
-/* 8A68DC 80240E5C 3C018024 */  lui       $at, 0x8024
+/* 8A68DC 80240E5C 3C018024 */  lui       $at, %hi(D_802424A8)
 /* 8A68E0 80240E60 00220821 */  addu      $at, $at, $v0
-/* 8A68E4 80240E64 8C2224A8 */  lw        $v0, 0x24a8($at)
+/* 8A68E4 80240E64 8C2224A8 */  lw        $v0, %lo(D_802424A8)($at)
 /* 8A68E8 80240E68 00400008 */  jr        $v0
 /* 8A68EC 80240E6C 00000000 */   nop      
 /* 8A68F0 80240E70 8E420028 */  lw        $v0, 0x28($s2)
diff --git a/asm/nonmatchings/world/area_trd/trd_00/999F80/func_80240310_999F80.s b/asm/nonmatchings/world/area_trd/trd_00/999F80/func_80240310_999F80.s
index cae8ed90fe..4168849032 100644
--- a/asm/nonmatchings/world/area_trd/trd_00/999F80/func_80240310_999F80.s
+++ b/asm/nonmatchings/world/area_trd/trd_00/999F80/func_80240310_999F80.s
@@ -4,8 +4,8 @@
 glabel func_80240310_999F80
 /* 999F80 80240310 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* 999F84 80240314 AFB00010 */  sw        $s0, 0x10($sp)
-/* 999F88 80240318 3C108024 */  lui       $s0, 0x8024
-/* 999F8C 8024031C 26101340 */  addiu     $s0, $s0, 0x1340
+/* 999F88 80240318 3C108024 */  lui       $s0, %hi(D_80241340)
+/* 999F8C 8024031C 26101340 */  addiu     $s0, $s0, %lo(D_80241340)
 /* 999F90 80240320 AFBF0018 */  sw        $ra, 0x18($sp)
 /* 999F94 80240324 AFB10014 */  sw        $s1, 0x14($sp)
 /* 999F98 80240328 8E020000 */  lw        $v0, ($s0)
@@ -39,8 +39,8 @@ glabel func_80240310_999F80
 /* 999FFC 8024038C 28620010 */  slti      $v0, $v1, 0x10
 /* 99A000 80240390 1440FFFA */  bnez      $v0, .L8024037C
 /* 99A004 80240394 24840004 */   addiu    $a0, $a0, 4
-/* 99A008 80240398 3C108024 */  lui       $s0, 0x8024
-/* 99A00C 8024039C 26101340 */  addiu     $s0, $s0, 0x1340
+/* 99A008 80240398 3C108024 */  lui       $s0, %hi(D_80241340)
+/* 99A00C 8024039C 26101340 */  addiu     $s0, $s0, %lo(D_80241340)
 /* 99A010 802403A0 0C00AB4B */  jal       heap_free
 /* 99A014 802403A4 8E040000 */   lw       $a0, ($s0)
 /* 99A018 802403A8 AE000000 */  sw        $zero, ($s0)
diff --git a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_8024046C_99CDFC.s b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_8024046C_99CDFC.s
index 9f432b184f..95f899d59e 100644
--- a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_8024046C_99CDFC.s
+++ b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_8024046C_99CDFC.s
@@ -55,8 +55,8 @@ glabel func_8024046C_99CDFC
 /* 99CEB8 80240528 8C470030 */   lw       $a3, 0x30($v0)
 /* 99CEBC 8024052C C6020018 */  lwc1      $f2, 0x18($s0)
 /* 99CEC0 80240530 46020003 */  div.s     $f0, $f0, $f2
-/* 99CEC4 80240534 3C018024 */  lui       $at, 0x8024
-/* 99CEC8 80240538 D4224440 */  ldc1      $f2, 0x4440($at)
+/* 99CEC4 80240534 3C018024 */  lui       $at, %hi(D_80244440)
+/* 99CEC8 80240538 D4224440 */  ldc1      $f2, %lo(D_80244440)($at)
 /* 99CECC 8024053C 46000021 */  cvt.d.s   $f0, $f0
 /* 99CED0 80240540 46220000 */  add.d     $f0, $f0, $f2
 /* 99CED4 80240544 4620010D */  trunc.w.d $f4, $f0
diff --git a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240784_99D114.s b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240784_99D114.s
index 5b9006e042..fe2245969a 100644
--- a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240784_99D114.s
+++ b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240784_99D114.s
@@ -279,9 +279,9 @@ glabel func_80240784_99D114
 /* 99D500 80240B70 2C620015 */  sltiu     $v0, $v1, 0x15
 /* 99D504 80240B74 10400009 */  beqz      $v0, .L80240B9C
 /* 99D508 80240B78 00031080 */   sll      $v0, $v1, 2
-/* 99D50C 80240B7C 3C018024 */  lui       $at, 0x8024
+/* 99D50C 80240B7C 3C018024 */  lui       $at, %hi(D_80244448)
 /* 99D510 80240B80 00220821 */  addu      $at, $at, $v0
-/* 99D514 80240B84 8C224448 */  lw        $v0, 0x4448($at)
+/* 99D514 80240B84 8C224448 */  lw        $v0, %lo(D_80244448)($at)
 /* 99D518 80240B88 00400008 */  jr        $v0
 /* 99D51C 80240B8C 00000000 */   nop      
 /* 99D520 80240B90 8E420028 */  lw        $v0, 0x28($s2)
diff --git a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240BC4_99D554.s b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240BC4_99D554.s
index 947fcfe064..f14a35ebc8 100644
--- a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240BC4_99D554.s
+++ b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240BC4_99D554.s
@@ -35,8 +35,8 @@ glabel func_80240BC4_99D554
 /* 99D5C8 80240C38 08090318 */  j         .L80240C60
 /* 99D5CC 80240C3C E4800018 */   swc1     $f0, 0x18($a0)
 .L80240C40:
-/* 99D5D0 80240C40 3C018024 */  lui       $at, 0x8024
-/* 99D5D4 80240C44 D42244A0 */  ldc1      $f2, 0x44a0($at)
+/* 99D5D0 80240C40 3C018024 */  lui       $at, %hi(D_802444A0)
+/* 99D5D4 80240C44 D42244A0 */  ldc1      $f2, %lo(D_802444A0)($at)
 /* 99D5D8 80240C48 44820000 */  mtc1      $v0, $f0
 /* 99D5DC 80240C4C 00000000 */  nop       
 /* 99D5E0 80240C50 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80241104_99DA94.s b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80241104_99DA94.s
index 641a27328b..235a3bc7ea 100644
--- a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80241104_99DA94.s
+++ b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80241104_99DA94.s
@@ -21,16 +21,16 @@ glabel func_80241104_99DA94
 /* 99DAD4 80241144 04410009 */  bgez      $v0, .L8024116C
 /* 99DAD8 80241148 00000000 */   nop      
 /* 99DADC 8024114C C640000C */  lwc1      $f0, 0xc($s2)
-/* 99DAE0 80241150 3C018024 */  lui       $at, 0x8024
-/* 99DAE4 80241154 D42244A8 */  ldc1      $f2, 0x44a8($at)
+/* 99DAE0 80241150 3C018024 */  lui       $at, %hi(D_802444A8)
+/* 99DAE4 80241154 D42244A8 */  ldc1      $f2, %lo(D_802444A8)($at)
 /* 99DAE8 80241158 46000021 */  cvt.d.s   $f0, $f0
 /* 99DAEC 8024115C 46220002 */  mul.d     $f0, $f0, $f2
 /* 99DAF0 80241160 00000000 */  nop       
 /* 99DAF4 80241164 08090462 */  j         .L80241188
 /* 99DAF8 80241168 46200020 */   cvt.s.d  $f0, $f0
 .L8024116C:
-/* 99DAFC 8024116C 3C018024 */  lui       $at, 0x8024
-/* 99DB00 80241170 D42244B0 */  ldc1      $f2, 0x44b0($at)
+/* 99DAFC 8024116C 3C018024 */  lui       $at, %hi(D_802444B0)
+/* 99DB00 80241170 D42244B0 */  ldc1      $f2, %lo(D_802444B0)($at)
 /* 99DB04 80241174 44820000 */  mtc1      $v0, $f0
 /* 99DB08 80241178 00000000 */  nop       
 /* 99DB0C 8024117C 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802413B8_99DD48.s b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802413B8_99DD48.s
index b6a7588135..f22657e88b 100644
--- a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802413B8_99DD48.s
+++ b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802413B8_99DD48.s
@@ -102,9 +102,9 @@ glabel func_802413B8_99DD48
 /* 99DEB8 80241528 2C620064 */  sltiu     $v0, $v1, 0x64
 /* 99DEBC 8024152C 10400036 */  beqz      $v0, .L80241608
 /* 99DEC0 80241530 00031080 */   sll      $v0, $v1, 2
-/* 99DEC4 80241534 3C018024 */  lui       $at, 0x8024
+/* 99DEC4 80241534 3C018024 */  lui       $at, %hi(D_802444B8)
 /* 99DEC8 80241538 00220821 */  addu      $at, $at, $v0
-/* 99DECC 8024153C 8C2244B8 */  lw        $v0, 0x44b8($at)
+/* 99DECC 8024153C 8C2244B8 */  lw        $v0, %lo(D_802444B8)($at)
 /* 99DED0 80241540 00400008 */  jr        $v0
 /* 99DED4 80241544 00000000 */   nop      
 /* 99DED8 80241548 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_8024015C_9A113C.s b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_8024015C_9A113C.s
index 1137592803..ef5b8cc5c1 100644
--- a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_8024015C_9A113C.s
+++ b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_8024015C_9A113C.s
@@ -55,8 +55,8 @@ glabel func_8024015C_9A113C
 /* 9A11F8 80240218 8C470030 */   lw       $a3, 0x30($v0)
 /* 9A11FC 8024021C C6020018 */  lwc1      $f2, 0x18($s0)
 /* 9A1200 80240220 46020003 */  div.s     $f0, $f0, $f2
-/* 9A1204 80240224 3C018024 */  lui       $at, 0x8024
-/* 9A1208 80240228 D42232E0 */  ldc1      $f2, 0x32e0($at)
+/* 9A1204 80240224 3C018024 */  lui       $at, %hi(D_802432E0)
+/* 9A1208 80240228 D42232E0 */  ldc1      $f2, %lo(D_802432E0)($at)
 /* 9A120C 8024022C 46000021 */  cvt.d.s   $f0, $f0
 /* 9A1210 80240230 46220000 */  add.d     $f0, $f0, $f2
 /* 9A1214 80240234 4620010D */  trunc.w.d $f4, $f0
diff --git a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240474_9A1454.s b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240474_9A1454.s
index f028890797..5801119de4 100644
--- a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240474_9A1454.s
+++ b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240474_9A1454.s
@@ -279,9 +279,9 @@ glabel func_80240474_9A1454
 /* 9A1840 80240860 2C620015 */  sltiu     $v0, $v1, 0x15
 /* 9A1844 80240864 10400009 */  beqz      $v0, .L8024088C
 /* 9A1848 80240868 00031080 */   sll      $v0, $v1, 2
-/* 9A184C 8024086C 3C018024 */  lui       $at, 0x8024
+/* 9A184C 8024086C 3C018024 */  lui       $at, %hi(D_802432E8)
 /* 9A1850 80240870 00220821 */  addu      $at, $at, $v0
-/* 9A1854 80240874 8C2232E8 */  lw        $v0, 0x32e8($at)
+/* 9A1854 80240874 8C2232E8 */  lw        $v0, %lo(D_802432E8)($at)
 /* 9A1858 80240878 00400008 */  jr        $v0
 /* 9A185C 8024087C 00000000 */   nop      
 /* 9A1860 80240880 8E420028 */  lw        $v0, 0x28($s2)
diff --git a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_802408B4_9A1894.s b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_802408B4_9A1894.s
index f2ae9d0ae5..79c8d82f67 100644
--- a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_802408B4_9A1894.s
+++ b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_802408B4_9A1894.s
@@ -69,8 +69,8 @@ glabel func_802408B4_9A1894
 /* 9A1988 802409A8 08090274 */  j         .L802409D0
 /* 9A198C 802409AC E6800018 */   swc1     $f0, 0x18($s4)
 .L802409B0:
-/* 9A1990 802409B0 3C018024 */  lui       $at, 0x8024
-/* 9A1994 802409B4 D4223340 */  ldc1      $f2, 0x3340($at)
+/* 9A1990 802409B0 3C018024 */  lui       $at, %hi(D_80243340)
+/* 9A1994 802409B4 D4223340 */  ldc1      $f2, %lo(D_80243340)($at)
 /* 9A1998 802409B8 44820000 */  mtc1      $v0, $f0
 /* 9A199C 802409BC 00000000 */  nop       
 /* 9A19A0 802409C0 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240F30_9A1F10.s b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240F30_9A1F10.s
index 63401084bd..995213335b 100644
--- a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240F30_9A1F10.s
+++ b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240F30_9A1F10.s
@@ -33,8 +33,8 @@ glabel func_80240F30_9A1F10
 /* 9A1F7C 80240F9C 080903F1 */  j         .L80240FC4
 /* 9A1F80 80240FA0 E4A00018 */   swc1     $f0, 0x18($a1)
 .L80240FA4:
-/* 9A1F84 80240FA4 3C018024 */  lui       $at, 0x8024
-/* 9A1F88 80240FA8 D4223348 */  ldc1      $f2, 0x3348($at)
+/* 9A1F84 80240FA4 3C018024 */  lui       $at, %hi(D_80243348)
+/* 9A1F88 80240FA8 D4223348 */  ldc1      $f2, %lo(D_80243348)($at)
 /* 9A1F8C 80240FAC 44820000 */  mtc1      $v0, $f0
 /* 9A1F90 80240FB0 00000000 */  nop       
 /* 9A1F94 80240FB4 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241448_9A2428.s b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241448_9A2428.s
index 20edc05cad..bf43225d8f 100644
--- a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241448_9A2428.s
+++ b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241448_9A2428.s
@@ -124,9 +124,9 @@ glabel func_80241448_9A2428
 /* 9A25EC 8024160C 2C620064 */  sltiu     $v0, $v1, 0x64
 /* 9A25F0 80241610 10400042 */  beqz      $v0, .L8024171C
 /* 9A25F4 80241614 00031080 */   sll      $v0, $v1, 2
-/* 9A25F8 80241618 3C018024 */  lui       $at, 0x8024
+/* 9A25F8 80241618 3C018024 */  lui       $at, %hi(D_80243350)
 /* 9A25FC 8024161C 00220821 */  addu      $at, $at, $v0
-/* 9A2600 80241620 8C223350 */  lw        $v0, 0x3350($at)
+/* 9A2600 80241620 8C223350 */  lw        $v0, %lo(D_80243350)($at)
 /* 9A2604 80241624 00400008 */  jr        $v0
 /* 9A2608 80241628 00000000 */   nop      
 /* 9A260C 8024162C 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241744_9A2724.s b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241744_9A2724.s
index 0b32e7d094..0f6bed39c5 100644
--- a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241744_9A2724.s
+++ b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241744_9A2724.s
@@ -134,9 +134,9 @@ glabel func_80241744_9A2724
 /* 9A2910 80241930 2C620064 */  sltiu     $v0, $v1, 0x64
 /* 9A2914 80241934 1040003A */  beqz      $v0, .L80241A20
 /* 9A2918 80241938 00031080 */   sll      $v0, $v1, 2
-/* 9A291C 8024193C 3C018024 */  lui       $at, 0x8024
+/* 9A291C 8024193C 3C018024 */  lui       $at, %hi(D_802434E0)
 /* 9A2920 80241940 00220821 */  addu      $at, $at, $v0
-/* 9A2924 80241944 8C2234E0 */  lw        $v0, 0x34e0($at)
+/* 9A2924 80241944 8C2234E0 */  lw        $v0, %lo(D_802434E0)($at)
 /* 9A2928 80241948 00400008 */  jr        $v0
 /* 9A292C 8024194C 00000000 */   nop      
 /* 9A2930 80241950 0260202D */  daddu     $a0, $s3, $zero
diff --git a/asm/nonmatchings/world/area_trd/trd_03/9A46F0/func_8024011C_9A476C.s b/asm/nonmatchings/world/area_trd/trd_03/9A46F0/func_8024011C_9A476C.s
index ddec172aea..e569c337e1 100644
--- a/asm/nonmatchings/world/area_trd/trd_03/9A46F0/func_8024011C_9A476C.s
+++ b/asm/nonmatchings/world/area_trd/trd_03/9A46F0/func_8024011C_9A476C.s
@@ -55,8 +55,8 @@ glabel func_8024011C_9A476C
 /* 9A4828 802401D8 8C470030 */   lw       $a3, 0x30($v0)
 /* 9A482C 802401DC C6020018 */  lwc1      $f2, 0x18($s0)
 /* 9A4830 802401E0 46020003 */  div.s     $f0, $f0, $f2
-/* 9A4834 802401E4 3C018024 */  lui       $at, 0x8024
-/* 9A4838 802401E8 D4223D40 */  ldc1      $f2, 0x3d40($at)
+/* 9A4834 802401E4 3C018024 */  lui       $at, %hi(D_80243D40)
+/* 9A4838 802401E8 D4223D40 */  ldc1      $f2, %lo(D_80243D40)($at)
 /* 9A483C 802401EC 46000021 */  cvt.d.s   $f0, $f0
 /* 9A4840 802401F0 46220000 */  add.d     $f0, $f0, $f2
 /* 9A4844 802401F4 4620010D */  trunc.w.d $f4, $f0
diff --git a/asm/nonmatchings/world/area_trd/trd_03/9A46F0/func_80240434_9A4A84.s b/asm/nonmatchings/world/area_trd/trd_03/9A46F0/func_80240434_9A4A84.s
index f3c5f2627c..0a669b5e70 100644
--- a/asm/nonmatchings/world/area_trd/trd_03/9A46F0/func_80240434_9A4A84.s
+++ b/asm/nonmatchings/world/area_trd/trd_03/9A46F0/func_80240434_9A4A84.s
@@ -279,9 +279,9 @@ glabel func_80240434_9A4A84
 /* 9A4E70 80240820 2C620015 */  sltiu     $v0, $v1, 0x15
 /* 9A4E74 80240824 10400009 */  beqz      $v0, .L8024084C
 /* 9A4E78 80240828 00031080 */   sll      $v0, $v1, 2
-/* 9A4E7C 8024082C 3C018024 */  lui       $at, 0x8024
+/* 9A4E7C 8024082C 3C018024 */  lui       $at, %hi(D_80243D48)
 /* 9A4E80 80240830 00220821 */  addu      $at, $at, $v0
-/* 9A4E84 80240834 8C223D48 */  lw        $v0, 0x3d48($at)
+/* 9A4E84 80240834 8C223D48 */  lw        $v0, %lo(D_80243D48)($at)
 /* 9A4E88 80240838 00400008 */  jr        $v0
 /* 9A4E8C 8024083C 00000000 */   nop      
 /* 9A4E90 80240840 8E420028 */  lw        $v0, 0x28($s2)
diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_8024052C_9A891C.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_8024052C_9A891C.s
index eb42d0f4ab..c23641f507 100644
--- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_8024052C_9A891C.s
+++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_8024052C_9A891C.s
@@ -55,8 +55,8 @@ glabel func_8024052C_9A891C
 /* 9A89D8 802405E8 8C470030 */   lw       $a3, 0x30($v0)
 /* 9A89DC 802405EC C6020018 */  lwc1      $f2, 0x18($s0)
 /* 9A89E0 802405F0 46020003 */  div.s     $f0, $f0, $f2
-/* 9A89E4 802405F4 3C018024 */  lui       $at, 0x8024
-/* 9A89E8 802405F8 D4225EE0 */  ldc1      $f2, 0x5ee0($at)
+/* 9A89E4 802405F4 3C018024 */  lui       $at, %hi(D_80245EE0)
+/* 9A89E8 802405F8 D4225EE0 */  ldc1      $f2, %lo(D_80245EE0)($at)
 /* 9A89EC 802405FC 46000021 */  cvt.d.s   $f0, $f0
 /* 9A89F0 80240600 46220000 */  add.d     $f0, $f0, $f2
 /* 9A89F4 80240604 4620010D */  trunc.w.d $f4, $f0
diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80240844_9A8C34.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80240844_9A8C34.s
index 0f488f6de1..aa2a0bb835 100644
--- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80240844_9A8C34.s
+++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80240844_9A8C34.s
@@ -279,9 +279,9 @@ glabel func_80240844_9A8C34
 /* 9A9020 80240C30 2C620015 */  sltiu     $v0, $v1, 0x15
 /* 9A9024 80240C34 10400009 */  beqz      $v0, .L80240C5C
 /* 9A9028 80240C38 00031080 */   sll      $v0, $v1, 2
-/* 9A902C 80240C3C 3C018024 */  lui       $at, 0x8024
+/* 9A902C 80240C3C 3C018024 */  lui       $at, %hi(D_80245EE8)
 /* 9A9030 80240C40 00220821 */  addu      $at, $at, $v0
-/* 9A9034 80240C44 8C225EE8 */  lw        $v0, 0x5ee8($at)
+/* 9A9034 80240C44 8C225EE8 */  lw        $v0, %lo(D_80245EE8)($at)
 /* 9A9038 80240C48 00400008 */  jr        $v0
 /* 9A903C 80240C4C 00000000 */   nop      
 /* 9A9040 80240C50 8E420028 */  lw        $v0, 0x28($s2)
diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80240C84_9A9074.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80240C84_9A9074.s
index 2193b27779..42a72a60e2 100644
--- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80240C84_9A9074.s
+++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80240C84_9A9074.s
@@ -69,8 +69,8 @@ glabel func_80240C84_9A9074
 /* 9A9168 80240D78 08090368 */  j         .L80240DA0
 /* 9A916C 80240D7C E6800018 */   swc1     $f0, 0x18($s4)
 .L80240D80:
-/* 9A9170 80240D80 3C018024 */  lui       $at, 0x8024
-/* 9A9174 80240D84 D4225F40 */  ldc1      $f2, 0x5f40($at)
+/* 9A9170 80240D80 3C018024 */  lui       $at, %hi(D_80245F40)
+/* 9A9174 80240D84 D4225F40 */  ldc1      $f2, %lo(D_80245F40)($at)
 /* 9A9178 80240D88 44820000 */  mtc1      $v0, $f0
 /* 9A917C 80240D8C 00000000 */  nop       
 /* 9A9180 80240D90 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241300_9A96F0.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241300_9A96F0.s
index 412efb1079..7617d24979 100644
--- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241300_9A96F0.s
+++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241300_9A96F0.s
@@ -33,8 +33,8 @@ glabel func_80241300_9A96F0
 /* 9A975C 8024136C 080904E5 */  j         .L80241394
 /* 9A9760 80241370 E4A00018 */   swc1     $f0, 0x18($a1)
 .L80241374:
-/* 9A9764 80241374 3C018024 */  lui       $at, 0x8024
-/* 9A9768 80241378 D4225F48 */  ldc1      $f2, 0x5f48($at)
+/* 9A9764 80241374 3C018024 */  lui       $at, %hi(D_80245F48)
+/* 9A9768 80241378 D4225F48 */  ldc1      $f2, %lo(D_80245F48)($at)
 /* 9A976C 8024137C 44820000 */  mtc1      $v0, $f0
 /* 9A9770 80241380 00000000 */  nop       
 /* 9A9774 80241384 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241818_9A9C08.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241818_9A9C08.s
index cc3e36566e..f0f35a9e43 100644
--- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241818_9A9C08.s
+++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241818_9A9C08.s
@@ -124,9 +124,9 @@ glabel func_80241818_9A9C08
 /* 9A9DCC 802419DC 2C620064 */  sltiu     $v0, $v1, 0x64
 /* 9A9DD0 802419E0 10400042 */  beqz      $v0, .L80241AEC
 /* 9A9DD4 802419E4 00031080 */   sll      $v0, $v1, 2
-/* 9A9DD8 802419E8 3C018024 */  lui       $at, 0x8024
+/* 9A9DD8 802419E8 3C018024 */  lui       $at, %hi(D_80245F50)
 /* 9A9DDC 802419EC 00220821 */  addu      $at, $at, $v0
-/* 9A9DE0 802419F0 8C225F50 */  lw        $v0, 0x5f50($at)
+/* 9A9DE0 802419F0 8C225F50 */  lw        $v0, %lo(D_80245F50)($at)
 /* 9A9DE4 802419F4 00400008 */  jr        $v0
 /* 9A9DE8 802419F8 00000000 */   nop      
 /* 9A9DEC 802419FC 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241B14_9A9F04.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241B14_9A9F04.s
index fdade50ea2..d5b41d6c27 100644
--- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241B14_9A9F04.s
+++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241B14_9A9F04.s
@@ -134,9 +134,9 @@ glabel func_80241B14_9A9F04
 /* 9AA0F0 80241D00 2C620064 */  sltiu     $v0, $v1, 0x64
 /* 9AA0F4 80241D04 1040003A */  beqz      $v0, .L80241DF0
 /* 9AA0F8 80241D08 00031080 */   sll      $v0, $v1, 2
-/* 9AA0FC 80241D0C 3C018024 */  lui       $at, 0x8024
+/* 9AA0FC 80241D0C 3C018024 */  lui       $at, %hi(D_802460E0)
 /* 9AA100 80241D10 00220821 */  addu      $at, $at, $v0
-/* 9AA104 80241D14 8C2260E0 */  lw        $v0, 0x60e0($at)
+/* 9AA104 80241D14 8C2260E0 */  lw        $v0, %lo(D_802460E0)($at)
 /* 9AA108 80241D18 00400008 */  jr        $v0
 /* 9AA10C 80241D1C 00000000 */   nop      
 /* 9AA110 80241D20 0260202D */  daddu     $a0, $s3, $zero
diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241E18_9AA208.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241E18_9AA208.s
index 80ede58581..2c125d40de 100644
--- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241E18_9AA208.s
+++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241E18_9AA208.s
@@ -87,8 +87,8 @@ glabel func_80241E18_9AA208
 /* 9AA348 80241F58 080907E0 */  j         .L80241F80
 /* 9AA34C 80241F5C E6000018 */   swc1     $f0, 0x18($s0)
 .L80241F60:
-/* 9AA350 80241F60 3C018024 */  lui       $at, 0x8024
-/* 9AA354 80241F64 D4226270 */  ldc1      $f2, 0x6270($at)
+/* 9AA350 80241F60 3C018024 */  lui       $at, %hi(D_80246270)
+/* 9AA354 80241F64 D4226270 */  ldc1      $f2, %lo(D_80246270)($at)
 /* 9AA358 80241F68 44820000 */  mtc1      $v0, $f0
 /* 9AA35C 80241F6C 00000000 */  nop       
 /* 9AA360 80241F70 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241FC8_9AA3B8.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241FC8_9AA3B8.s
index 7b241fa4c1..cb22764b0b 100644
--- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241FC8_9AA3B8.s
+++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241FC8_9AA3B8.s
@@ -104,8 +104,8 @@ glabel func_80241FC8_9AA3B8
 /* 9AA53C 8024214C 1040000A */  beqz      $v0, .L80242178
 /* 9AA540 80242150 4600C106 */   mov.s    $f4, $f24
 /* 9AA544 80242154 4614C081 */  sub.s     $f2, $f24, $f20
-/* 9AA548 80242158 3C018024 */  lui       $at, 0x8024
-/* 9AA54C 8024215C D4206278 */  ldc1      $f0, 0x6278($at)
+/* 9AA548 80242158 3C018024 */  lui       $at, %hi(D_80246278)
+/* 9AA54C 8024215C D4206278 */  ldc1      $f0, %lo(D_80246278)($at)
 /* 9AA550 80242160 460010A1 */  cvt.d.s   $f2, $f2
 /* 9AA554 80242164 46201082 */  mul.d     $f2, $f2, $f0
 /* 9AA558 80242168 00000000 */  nop       
@@ -131,8 +131,8 @@ glabel func_80241FC8_9AA3B8
 /* 9AA5A4 802421B4 C7A4002C */  lwc1      $f4, 0x2c($sp)
 /* 9AA5A8 802421B8 461A2100 */  add.s     $f4, $f4, $f26
 /* 9AA5AC 802421BC 46142081 */  sub.s     $f2, $f4, $f20
-/* 9AA5B0 802421C0 3C018024 */  lui       $at, 0x8024
-/* 9AA5B4 802421C4 D4206280 */  ldc1      $f0, 0x6280($at)
+/* 9AA5B0 802421C0 3C018024 */  lui       $at, %hi(D_80246280)
+/* 9AA5B4 802421C4 D4206280 */  ldc1      $f0, %lo(D_80246280)($at)
 /* 9AA5B8 802421C8 460010A1 */  cvt.d.s   $f2, $f2
 /* 9AA5BC 802421CC 46201082 */  mul.d     $f2, $f2, $f0
 /* 9AA5C0 802421D0 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80242A6C_9AAE5C.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80242A6C_9AAE5C.s
index 85af73b5d4..56a3d8e736 100644
--- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80242A6C_9AAE5C.s
+++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80242A6C_9AAE5C.s
@@ -15,9 +15,9 @@ glabel func_80242A6C_9AAE5C
 /* 9AAE84 80242A94 00031C00 */  sll       $v1, $v1, 0x10
 /* 9AAE88 80242A98 00031B83 */  sra       $v1, $v1, 0xe
 /* 9AAE8C 80242A9C A444008E */  sh        $a0, 0x8e($v0)
-/* 9AAE90 80242AA0 3C018024 */  lui       $at, 0x8024
+/* 9AAE90 80242AA0 3C018024 */  lui       $at, %hi(D_802456F4)
 /* 9AAE94 80242AA4 00230821 */  addu      $at, $at, $v1
-/* 9AAE98 80242AA8 C42256F4 */  lwc1      $f2, 0x56f4($at)
+/* 9AAE98 80242AA8 C42256F4 */  lwc1      $f2, %lo(D_802456F4)($at)
 /* 9AAE9C 80242AAC 8443008E */  lh        $v1, 0x8e($v0)
 /* 9AAEA0 80242AB0 46020000 */  add.s     $f0, $f0, $f2
 /* 9AAEA4 80242AB4 28630005 */  slti      $v1, $v1, 5
diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243124_9AB514.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243124_9AB514.s
index ac1d6b2baf..dffd4c7b98 100644
--- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243124_9AB514.s
+++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243124_9AB514.s
@@ -66,9 +66,9 @@ glabel func_80243124_9AB514
 /* 9AB600 80243210 2C62000F */  sltiu     $v0, $v1, 0xf
 /* 9AB604 80243214 10400034 */  beqz      $v0, .L802432E8
 /* 9AB608 80243218 00031080 */   sll      $v0, $v1, 2
-/* 9AB60C 8024321C 3C018024 */  lui       $at, 0x8024
+/* 9AB60C 8024321C 3C018024 */  lui       $at, %hi(D_80246288)
 /* 9AB610 80243220 00220821 */  addu      $at, $at, $v0
-/* 9AB614 80243224 8C226288 */  lw        $v0, 0x6288($at)
+/* 9AB614 80243224 8C226288 */  lw        $v0, %lo(D_80246288)($at)
 /* 9AB618 80243228 00400008 */  jr        $v0
 /* 9AB61C 8024322C 00000000 */   nop      
 /* 9AB620 80243230 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243650_9ABA40.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243650_9ABA40.s
index 919c2b6efd..1e20581252 100644
--- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243650_9ABA40.s
+++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243650_9ABA40.s
@@ -69,9 +69,9 @@ glabel func_80243650_9ABA40
 /* 9ABB38 80243748 2C620010 */  sltiu     $v0, $v1, 0x10
 /* 9ABB3C 8024374C 1040004A */  beqz      $v0, .L80243878
 /* 9ABB40 80243750 00031080 */   sll      $v0, $v1, 2
-/* 9ABB44 80243754 3C018024 */  lui       $at, 0x8024
+/* 9ABB44 80243754 3C018024 */  lui       $at, %hi(D_802462C8)
 /* 9ABB48 80243758 00220821 */  addu      $at, $at, $v0
-/* 9ABB4C 8024375C 8C2262C8 */  lw        $v0, 0x62c8($at)
+/* 9ABB4C 8024375C 8C2262C8 */  lw        $v0, %lo(D_802462C8)($at)
 /* 9ABB50 80243760 00400008 */  jr        $v0
 /* 9ABB54 80243764 00000000 */   nop      
 /* 9ABB58 80243768 0260202D */  daddu     $a0, $s3, $zero
diff --git a/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240020_9AE720.s b/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240020_9AE720.s
index bfd5bc4745..2c9c4846f2 100644
--- a/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240020_9AE720.s
+++ b/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240020_9AE720.s
@@ -38,8 +38,8 @@ glabel func_80240020_9AE720
 /* 9AE7A4 802400A4 AFB500D4 */  sw        $s5, 0xd4($sp)
 /* 9AE7A8 802400A8 3C150001 */  lui       $s5, 1
 /* 9AE7AC 802400AC AFB100C4 */  sw        $s1, 0xc4($sp)
-/* 9AE7B0 802400B0 3C11800A */  lui       $s1, 0x800a
-/* 9AE7B4 802400B4 2631A66C */  addiu     $s1, $s1, -0x5994
+/* 9AE7B0 802400B0 3C11800A */  lui       $s1, %hi(D_8009A66C)
+/* 9AE7B4 802400B4 2631A66C */  addiu     $s1, $s1, %lo(D_8009A66C)
 /* 9AE7B8 802400B8 36B51630 */  ori       $s5, $s5, 0x1630
 /* 9AE7BC 802400BC AFBF00D8 */  sw        $ra, 0xd8($sp)
 /* 9AE7C0 802400C0 F7B600E8 */  sdc1      $f22, 0xe8($sp)
@@ -97,8 +97,8 @@ glabel func_80240020_9AE720
 /* 9AE890 80240190 AC500048 */  sw        $s0, 0x48($v0)
 /* 9AE894 80240194 AC43004C */  sw        $v1, 0x4c($v0)
 /* 9AE898 80240198 AC530050 */  sw        $s3, 0x50($v0)
-/* 9AE89C 8024019C 3C138024 */  lui       $s3, 0x8024
-/* 9AE8A0 802401A0 26733090 */  addiu     $s3, $s3, 0x3090
+/* 9AE89C 8024019C 3C138024 */  lui       $s3, %hi(D_80243090)
+/* 9AE8A0 802401A0 26733090 */  addiu     $s3, $s3, %lo(D_80243090)
 /* 9AE8A4 802401A4 24430058 */  addiu     $v1, $v0, 0x58
 /* 9AE8A8 802401A8 AC400054 */  sw        $zero, 0x54($v0)
 /* 9AE8AC 802401AC AC540058 */  sw        $s4, 0x58($v0)
@@ -154,10 +154,10 @@ glabel func_80240020_9AE720
 /* 9AE974 80240274 0C019D80 */  jal       guMtxCatF
 /* 9AE978 80240278 0240302D */   daddu    $a2, $s2, $zero
 /* 9AE97C 8024027C 0240202D */  daddu     $a0, $s2, $zero
-/* 9AE980 80240280 3C108007 */  lui       $s0, 0x8007
-/* 9AE984 80240284 261041F0 */  addiu     $s0, $s0, 0x41f0
-/* 9AE988 80240288 3C12800A */  lui       $s2, 0x800a
-/* 9AE98C 8024028C 2652A674 */  addiu     $s2, $s2, -0x598c
+/* 9AE980 80240280 3C108007 */  lui       $s0, %hi(D_800741F0)
+/* 9AE984 80240284 261041F0 */  addiu     $s0, $s0, %lo(D_800741F0)
+/* 9AE988 80240288 3C12800A */  lui       $s2, %hi(D_8009A674)
+/* 9AE98C 8024028C 2652A674 */  addiu     $s2, $s2, %lo(D_8009A674)
 /* 9AE990 80240290 96050000 */  lhu       $a1, ($s0)
 /* 9AE994 80240294 8E420000 */  lw        $v0, ($s2)
 /* 9AE998 80240298 00052980 */  sll       $a1, $a1, 6
@@ -232,8 +232,8 @@ glabel func_80240020_9AE720
 /* 9AEAA4 802403A4 0C04EBDC */  jal       func_8013AF70
 /* 9AEAA8 802403A8 A7A20026 */   sh       $v0, 0x26($sp)
 /* 9AEAAC 802403AC 3C05D838 */  lui       $a1, 0xd838
-/* 9AEAB0 802403B0 3C03800A */  lui       $v1, 0x800a
-/* 9AEAB4 802403B4 2463A66C */  addiu     $v1, $v1, -0x5994
+/* 9AEAB0 802403B0 3C03800A */  lui       $v1, %hi(D_8009A66C)
+/* 9AEAB4 802403B4 2463A66C */  addiu     $v1, $v1, %lo(D_8009A66C)
 /* 9AEAB8 802403B8 8C620000 */  lw        $v0, ($v1)
 /* 9AEABC 802403BC 34A50002 */  ori       $a1, $a1, 2
 /* 9AEAC0 802403C0 0040202D */  daddu     $a0, $v0, $zero
diff --git a/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240404_9AEB04.s b/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240404_9AEB04.s
index 5ecb09137a..14d50166b7 100644
--- a/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240404_9AEB04.s
+++ b/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240404_9AEB04.s
@@ -8,16 +8,16 @@ glabel func_80240404_9AEB04
 /* 9AEB10 80240410 AFBF0014 */  sw        $ra, 0x14($sp)
 /* 9AEB14 80240414 AFB00010 */  sw        $s0, 0x10($sp)
 /* 9AEB18 80240418 844300B0 */  lh        $v1, 0xb0($v0)
-/* 9AEB1C 8024041C 3C018024 */  lui       $at, 0x8024
-/* 9AEB20 80240420 D4203070 */  ldc1      $f0, 0x3070($at)
+/* 9AEB1C 8024041C 3C018024 */  lui       $at, %hi(D_80243070)
+/* 9AEB20 80240420 D4203070 */  ldc1      $f0, %lo(D_80243070)($at)
 /* 9AEB24 80240424 44831000 */  mtc1      $v1, $f2
 /* 9AEB28 80240428 00000000 */  nop       
 /* 9AEB2C 8024042C 468010A1 */  cvt.d.w   $f2, $f2
 /* 9AEB30 80240430 46201082 */  mul.d     $f2, $f2, $f0
 /* 9AEB34 80240434 00000000 */  nop       
 /* 9AEB38 80240438 24040001 */  addiu     $a0, $zero, 1
-/* 9AEB3C 8024043C 3C108024 */  lui       $s0, 0x8024
-/* 9AEB40 80240440 26103090 */  addiu     $s0, $s0, 0x3090
+/* 9AEB3C 8024043C 3C108024 */  lui       $s0, %hi(D_80243090)
+/* 9AEB40 80240440 26103090 */  addiu     $s0, $s0, %lo(D_80243090)
 /* 9AEB44 80240444 C44A0028 */  lwc1      $f10, 0x28($v0)
 /* 9AEB48 80240448 3C013FE0 */  lui       $at, 0x3fe0
 /* 9AEB4C 8024044C 44812800 */  mtc1      $at, $f5
@@ -43,8 +43,8 @@ glabel func_80240404_9AEB04
 /* 9AEB9C 8024049C 0C04E9C1 */  jal       func_8013A704
 /* 9AEBA0 802404A0 E6000014 */   swc1     $f0, 0x14($s0)
 /* 9AEBA4 802404A4 0000202D */  daddu     $a0, $zero, $zero
-/* 9AEBA8 802404A8 3C058024 */  lui       $a1, 0x8024
-/* 9AEBAC 802404AC 24A50020 */  addiu     $a1, $a1, 0x20
+/* 9AEBA8 802404A8 3C058024 */  lui       $a1, %hi(D_80240020)
+/* 9AEBAC 802404AC 24A50020 */  addiu     $a1, $a1, %lo(D_80240020)
 /* 9AEBB0 802404B0 0C048C56 */  jal       bind_dynamic_entity_3
 /* 9AEBB4 802404B4 AE020000 */   sw       $v0, ($s0)
 /* 9AEBB8 802404B8 AE020004 */  sw        $v0, 4($s0)
diff --git a/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_802404D0_9AEBD0.s b/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_802404D0_9AEBD0.s
index 03043d0e74..a7f21f9d8c 100644
--- a/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_802404D0_9AEBD0.s
+++ b/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_802404D0_9AEBD0.s
@@ -4,8 +4,8 @@
 glabel func_802404D0_9AEBD0
 /* 9AEBD0 802404D0 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 9AEBD4 802404D4 AFB00010 */  sw        $s0, 0x10($sp)
-/* 9AEBD8 802404D8 3C108024 */  lui       $s0, 0x8024
-/* 9AEBDC 802404DC 26103090 */  addiu     $s0, $s0, 0x3090
+/* 9AEBD8 802404D8 3C108024 */  lui       $s0, %hi(D_80243090)
+/* 9AEBDC 802404DC 26103090 */  addiu     $s0, $s0, %lo(D_80243090)
 /* 9AEBE0 802404E0 AFBF0014 */  sw        $ra, 0x14($sp)
 /* 9AEBE4 802404E4 0C04EA15 */  jal       func_8013A854
 /* 9AEBE8 802404E8 8E040000 */   lw       $a0, ($s0)
diff --git a/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240508_9AEC08.s b/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240508_9AEC08.s
index 9107c8a9ef..b35ce5179e 100644
--- a/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240508_9AEC08.s
+++ b/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240508_9AEC08.s
@@ -25,8 +25,8 @@ glabel func_80240508_9AEC08
 /* 9AEC58 80240558 0220202D */   daddu    $a0, $s1, $zero
 /* 9AEC5C 8024055C 3C028011 */  lui       $v0, %hi(gPlayerStatus+0xB0)
 /* 9AEC60 80240560 8442F078 */  lh        $v0, %lo(gPlayerStatus+0xB0)($v0)
-/* 9AEC64 80240564 3C018024 */  lui       $at, 0x8024
-/* 9AEC68 80240568 D4223078 */  ldc1      $f2, 0x3078($at)
+/* 9AEC64 80240564 3C018024 */  lui       $at, %hi(D_80243078)
+/* 9AEC68 80240568 D4223078 */  ldc1      $f2, %lo(D_80243078)($at)
 /* 9AEC6C 8024056C 44822000 */  mtc1      $v0, $f4
 /* 9AEC70 80240570 00000000 */  nop       
 /* 9AEC74 80240574 46802121 */  cvt.d.w   $f4, $f4
@@ -43,8 +43,8 @@ glabel func_80240508_9AEC08
 /* 9AECA0 802405A0 44900000 */  mtc1      $s0, $f0
 /* 9AECA4 802405A4 00000000 */  nop       
 /* 9AECA8 802405A8 46800021 */  cvt.d.w   $f0, $f0
-/* 9AECAC 802405AC 3C028024 */  lui       $v0, 0x8024
-/* 9AECB0 802405B0 24423090 */  addiu     $v0, $v0, 0x3090
+/* 9AECAC 802405AC 3C028024 */  lui       $v0, %hi(D_80243090)
+/* 9AECB0 802405B0 24423090 */  addiu     $v0, $v0, %lo(D_80243090)
 /* 9AECB4 802405B4 44921000 */  mtc1      $s2, $f2
 /* 9AECB8 802405B8 00000000 */  nop       
 /* 9AECBC 802405BC 468010A0 */  cvt.s.w   $f2, $f2
diff --git a/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_802405FC_9AECFC.s b/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_802405FC_9AECFC.s
index eabc309132..97af6748e0 100644
--- a/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_802405FC_9AECFC.s
+++ b/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_802405FC_9AECFC.s
@@ -31,8 +31,8 @@ glabel func_802405FC_9AECFC
 /* 9AED64 80240664 0220202D */   daddu    $a0, $s1, $zero
 /* 9AED68 80240668 4600020D */  trunc.w.s $f8, $f0
 /* 9AED6C 8024066C 44044000 */  mfc1      $a0, $f8
-/* 9AED70 80240670 3C028024 */  lui       $v0, 0x8024
-/* 9AED74 80240674 24423090 */  addiu     $v0, $v0, 0x3090
+/* 9AED70 80240670 3C028024 */  lui       $v0, %hi(D_80243090)
+/* 9AED74 80240674 24423090 */  addiu     $v0, $v0, %lo(D_80243090)
 /* 9AED78 80240678 1640000E */  bnez      $s2, .L802406B4
 /* 9AED7C 8024067C 0040182D */   daddu    $v1, $v0, $zero
 /* 9AED80 80240680 44930000 */  mtc1      $s3, $f0
diff --git a/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_80240310_9B1AA0.s b/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_80240310_9B1AA0.s
index 3f044b78dc..4f2ea009c0 100644
--- a/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_80240310_9B1AA0.s
+++ b/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_80240310_9B1AA0.s
@@ -38,8 +38,8 @@ glabel func_80240310_9B1AA0
 /* 9B1B24 80240394 AFB500D4 */  sw        $s5, 0xd4($sp)
 /* 9B1B28 80240398 3C150001 */  lui       $s5, 1
 /* 9B1B2C 8024039C AFB100C4 */  sw        $s1, 0xc4($sp)
-/* 9B1B30 802403A0 3C11800A */  lui       $s1, 0x800a
-/* 9B1B34 802403A4 2631A66C */  addiu     $s1, $s1, -0x5994
+/* 9B1B30 802403A0 3C11800A */  lui       $s1, %hi(D_8009A66C)
+/* 9B1B34 802403A4 2631A66C */  addiu     $s1, $s1, %lo(D_8009A66C)
 /* 9B1B38 802403A8 36B51630 */  ori       $s5, $s5, 0x1630
 /* 9B1B3C 802403AC AFBF00D8 */  sw        $ra, 0xd8($sp)
 /* 9B1B40 802403B0 F7B600E8 */  sdc1      $f22, 0xe8($sp)
@@ -97,8 +97,8 @@ glabel func_80240310_9B1AA0
 /* 9B1C10 80240480 AC500048 */  sw        $s0, 0x48($v0)
 /* 9B1C14 80240484 AC43004C */  sw        $v1, 0x4c($v0)
 /* 9B1C18 80240488 AC530050 */  sw        $s3, 0x50($v0)
-/* 9B1C1C 8024048C 3C138024 */  lui       $s3, 0x8024
-/* 9B1C20 80240490 267351F0 */  addiu     $s3, $s3, 0x51f0
+/* 9B1C1C 8024048C 3C138024 */  lui       $s3, %hi(D_802451F0)
+/* 9B1C20 80240490 267351F0 */  addiu     $s3, $s3, %lo(D_802451F0)
 /* 9B1C24 80240494 24430058 */  addiu     $v1, $v0, 0x58
 /* 9B1C28 80240498 AC400054 */  sw        $zero, 0x54($v0)
 /* 9B1C2C 8024049C AC540058 */  sw        $s4, 0x58($v0)
@@ -154,10 +154,10 @@ glabel func_80240310_9B1AA0
 /* 9B1CF4 80240564 0C019D80 */  jal       guMtxCatF
 /* 9B1CF8 80240568 0240302D */   daddu    $a2, $s2, $zero
 /* 9B1CFC 8024056C 0240202D */  daddu     $a0, $s2, $zero
-/* 9B1D00 80240570 3C108007 */  lui       $s0, 0x8007
-/* 9B1D04 80240574 261041F0 */  addiu     $s0, $s0, 0x41f0
-/* 9B1D08 80240578 3C12800A */  lui       $s2, 0x800a
-/* 9B1D0C 8024057C 2652A674 */  addiu     $s2, $s2, -0x598c
+/* 9B1D00 80240570 3C108007 */  lui       $s0, %hi(D_800741F0)
+/* 9B1D04 80240574 261041F0 */  addiu     $s0, $s0, %lo(D_800741F0)
+/* 9B1D08 80240578 3C12800A */  lui       $s2, %hi(D_8009A674)
+/* 9B1D0C 8024057C 2652A674 */  addiu     $s2, $s2, %lo(D_8009A674)
 /* 9B1D10 80240580 96050000 */  lhu       $a1, ($s0)
 /* 9B1D14 80240584 8E420000 */  lw        $v0, ($s2)
 /* 9B1D18 80240588 00052980 */  sll       $a1, $a1, 6
@@ -245,8 +245,8 @@ glabel func_80240310_9B1AA0
 /* 9B1E54 802406C4 0C04EBDC */  jal       func_8013AF70
 /* 9B1E58 802406C8 A7A30026 */   sh       $v1, 0x26($sp)
 /* 9B1E5C 802406CC 3C05D838 */  lui       $a1, 0xd838
-/* 9B1E60 802406D0 3C03800A */  lui       $v1, 0x800a
-/* 9B1E64 802406D4 2463A66C */  addiu     $v1, $v1, -0x5994
+/* 9B1E60 802406D0 3C03800A */  lui       $v1, %hi(D_8009A66C)
+/* 9B1E64 802406D4 2463A66C */  addiu     $v1, $v1, %lo(D_8009A66C)
 /* 9B1E68 802406D8 8C620000 */  lw        $v0, ($v1)
 /* 9B1E6C 802406DC 34A50002 */  ori       $a1, $a1, 2
 /* 9B1E70 802406E0 0040202D */  daddu     $a0, $v0, $zero
diff --git a/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_80240724_9B1EB4.s b/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_80240724_9B1EB4.s
index ed2b687824..ce624a98a3 100644
--- a/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_80240724_9B1EB4.s
+++ b/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_80240724_9B1EB4.s
@@ -9,13 +9,13 @@ glabel func_80240724_9B1EB4
 /* 9B1EC4 80240734 AFBF0014 */  sw        $ra, 0x14($sp)
 /* 9B1EC8 80240738 AFB00010 */  sw        $s0, 0x10($sp)
 /* 9B1ECC 8024073C 846200B2 */  lh        $v0, 0xb2($v1)
-/* 9B1ED0 80240740 3C018024 */  lui       $at, 0x8024
-/* 9B1ED4 80240744 D42051C0 */  ldc1      $f0, 0x51c0($at)
+/* 9B1ED0 80240740 3C018024 */  lui       $at, %hi(D_802451C0)
+/* 9B1ED4 80240744 D42051C0 */  ldc1      $f0, %lo(D_802451C0)($at)
 /* 9B1ED8 80240748 3C013F36 */  lui       $at, 0x3f36
 /* 9B1EDC 8024074C 3421DB6E */  ori       $at, $at, 0xdb6e
 /* 9B1EE0 80240750 44813000 */  mtc1      $at, $f6
-/* 9B1EE4 80240754 3C108024 */  lui       $s0, 0x8024
-/* 9B1EE8 80240758 261051F0 */  addiu     $s0, $s0, 0x51f0
+/* 9B1EE4 80240754 3C108024 */  lui       $s0, %hi(D_802451F0)
+/* 9B1EE8 80240758 261051F0 */  addiu     $s0, $s0, %lo(D_802451F0)
 /* 9B1EEC 8024075C AE000000 */  sw        $zero, ($s0)
 /* 9B1EF0 80240760 AE000010 */  sw        $zero, 0x10($s0)
 /* 9B1EF4 80240764 AE000020 */  sw        $zero, 0x20($s0)
@@ -54,8 +54,8 @@ glabel func_80240724_9B1EB4
 /* 9B1F78 802407E8 0C04E9C1 */  jal       func_8013A704
 /* 9B1F7C 802407EC E6000018 */   swc1     $f0, 0x18($s0)
 /* 9B1F80 802407F0 0000202D */  daddu     $a0, $zero, $zero
-/* 9B1F84 802407F4 3C058024 */  lui       $a1, 0x8024
-/* 9B1F88 802407F8 24A50310 */  addiu     $a1, $a1, 0x310
+/* 9B1F84 802407F4 3C058024 */  lui       $a1, %hi(D_80240310)
+/* 9B1F88 802407F8 24A50310 */  addiu     $a1, $a1, %lo(D_80240310)
 /* 9B1F8C 802407FC 0C048C56 */  jal       bind_dynamic_entity_3
 /* 9B1F90 80240800 AE020004 */   sw       $v0, 4($s0)
 /* 9B1F94 80240804 AE020008 */  sw        $v0, 8($s0)
diff --git a/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_8024081C_9B1FAC.s b/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_8024081C_9B1FAC.s
index 334369ca03..32411c073b 100644
--- a/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_8024081C_9B1FAC.s
+++ b/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_8024081C_9B1FAC.s
@@ -4,8 +4,8 @@
 glabel func_8024081C_9B1FAC
 /* 9B1FAC 8024081C 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 9B1FB0 80240820 AFB00010 */  sw        $s0, 0x10($sp)
-/* 9B1FB4 80240824 3C108024 */  lui       $s0, 0x8024
-/* 9B1FB8 80240828 261051F0 */  addiu     $s0, $s0, 0x51f0
+/* 9B1FB4 80240824 3C108024 */  lui       $s0, %hi(D_802451F0)
+/* 9B1FB8 80240828 261051F0 */  addiu     $s0, $s0, %lo(D_802451F0)
 /* 9B1FBC 8024082C AFBF0014 */  sw        $ra, 0x14($sp)
 /* 9B1FC0 80240830 0C04EA15 */  jal       func_8013A854
 /* 9B1FC4 80240834 8E040004 */   lw       $a0, 4($s0)
diff --git a/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_80240854_9B1FE4.s b/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_80240854_9B1FE4.s
index 007673f79e..a1018a63a0 100644
--- a/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_80240854_9B1FE4.s
+++ b/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_80240854_9B1FE4.s
@@ -23,11 +23,11 @@ glabel func_80240854_9B1FE4
 /* 9B202C 8024089C 44103000 */  mfc1      $s0, $f6
 /* 9B2030 802408A0 0C0B210B */  jal       get_float_variable
 /* 9B2034 802408A4 0220202D */   daddu    $a0, $s1, $zero
-/* 9B2038 802408A8 3C028024 */  lui       $v0, 0x8024
-/* 9B203C 802408AC 244251F0 */  addiu     $v0, $v0, 0x51f0
+/* 9B2038 802408A8 3C028024 */  lui       $v0, %hi(D_802451F0)
+/* 9B203C 802408AC 244251F0 */  addiu     $v0, $v0, %lo(D_802451F0)
 /* 9B2040 802408B0 C442003C */  lwc1      $f2, 0x3c($v0)
-/* 9B2044 802408B4 3C018024 */  lui       $at, 0x8024
-/* 9B2048 802408B8 D42451C8 */  ldc1      $f4, 0x51c8($at)
+/* 9B2044 802408B4 3C018024 */  lui       $at, %hi(D_802451C8)
+/* 9B2048 802408B8 D42451C8 */  ldc1      $f4, %lo(D_802451C8)($at)
 /* 9B204C 802408BC 460010A1 */  cvt.d.s   $f2, $f2
 /* 9B2050 802408C0 46241082 */  mul.d     $f2, $f2, $f4
 /* 9B2054 802408C4 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_8024093C_9B20CC.s b/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_8024093C_9B20CC.s
index 85f40dec40..4510deb740 100644
--- a/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_8024093C_9B20CC.s
+++ b/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_8024093C_9B20CC.s
@@ -31,8 +31,8 @@ glabel func_8024093C_9B20CC
 /* 9B2134 802409A4 0220202D */   daddu    $a0, $s1, $zero
 /* 9B2138 802409A8 4600020D */  trunc.w.s $f8, $f0
 /* 9B213C 802409AC 44044000 */  mfc1      $a0, $f8
-/* 9B2140 802409B0 3C028024 */  lui       $v0, 0x8024
-/* 9B2144 802409B4 244251F0 */  addiu     $v0, $v0, 0x51f0
+/* 9B2140 802409B0 3C028024 */  lui       $v0, %hi(D_802451F0)
+/* 9B2144 802409B4 244251F0 */  addiu     $v0, $v0, %lo(D_802451F0)
 /* 9B2148 802409B8 1640000E */  bnez      $s2, .L802409F4
 /* 9B214C 802409BC 0040182D */   daddu    $v1, $v0, $zero
 /* 9B2150 802409C0 44930000 */  mtc1      $s3, $f0
diff --git a/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_80240A5C_9B21EC.s b/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_80240A5C_9B21EC.s
index 4dd6630254..47b5b97887 100644
--- a/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_80240A5C_9B21EC.s
+++ b/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_80240A5C_9B21EC.s
@@ -3,7 +3,7 @@
 
 glabel func_80240A5C_9B21EC
 /* 9B21EC 80240A5C 24020001 */  addiu     $v0, $zero, 1
-/* 9B21F0 80240A60 3C018024 */  lui       $at, 0x8024
-/* 9B21F4 80240A64 AC2251F0 */  sw        $v0, 0x51f0($at)
+/* 9B21F0 80240A60 3C018024 */  lui       $at, %hi(D_802451F0)
+/* 9B21F4 80240A64 AC2251F0 */  sw        $v0, %lo(D_802451F0)($at)
 /* 9B21F8 80240A68 03E00008 */  jr        $ra
 /* 9B21FC 80240A6C 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_80240AD0_9B2260.s b/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_80240AD0_9B2260.s
index 5a28e48ae0..4fbe4f1fc7 100644
--- a/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_80240AD0_9B2260.s
+++ b/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_80240AD0_9B2260.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80240AD0_9B2260
-/* 9B2260 80240AD0 3C038024 */  lui       $v1, 0x8024
-/* 9B2264 80240AD4 246351F0 */  addiu     $v1, $v1, 0x51f0
+/* 9B2260 80240AD0 3C038024 */  lui       $v1, %hi(D_802451F0)
+/* 9B2264 80240AD4 246351F0 */  addiu     $v1, $v1, %lo(D_802451F0)
 /* 9B2268 80240AD8 24020001 */  addiu     $v0, $zero, 1
 /* 9B226C 80240ADC AC62000C */  sw        $v0, 0xc($v1)
 /* 9B2270 80240AE0 24020002 */  addiu     $v0, $zero, 2
diff --git a/asm/nonmatchings/world/area_trd/trd_06/9B2410/func_80240C80_9B2410.s b/asm/nonmatchings/world/area_trd/trd_06/9B2410/func_80240C80_9B2410.s
index 523cb380ad..04eee42fb9 100644
--- a/asm/nonmatchings/world/area_trd/trd_06/9B2410/func_80240C80_9B2410.s
+++ b/asm/nonmatchings/world/area_trd/trd_06/9B2410/func_80240C80_9B2410.s
@@ -3,8 +3,8 @@
 
 glabel func_80240C80_9B2410
 /* 9B2410 80240C80 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 9B2414 80240C84 3C048024 */  lui       $a0, 0x8024
-/* 9B2418 80240C88 248451D8 */  addiu     $a0, $a0, 0x51d8
+/* 9B2414 80240C84 3C048024 */  lui       $a0, %hi(D_802451D8)
+/* 9B2418 80240C88 248451D8 */  addiu     $a0, $a0, %lo(D_802451D8)
 /* 9B241C 80240C8C 27A50010 */  addiu     $a1, $sp, 0x10
 /* 9B2420 80240C90 AFBF0020 */  sw        $ra, 0x20($sp)
 /* 9B2424 80240C94 AFB1001C */  sw        $s1, 0x1c($sp)
@@ -12,16 +12,16 @@ glabel func_80240C80_9B2410
 /* 9B242C 80240C9C AFB00018 */   sw       $s0, 0x18($sp)
 /* 9B2430 80240CA0 0040802D */  daddu     $s0, $v0, $zero
 /* 9B2434 80240CA4 0200202D */  daddu     $a0, $s0, $zero
-/* 9B2438 80240CA8 3C118024 */  lui       $s1, 0x8024
-/* 9B243C 80240CAC 26315230 */  addiu     $s1, $s1, 0x5230
+/* 9B2438 80240CA8 3C118024 */  lui       $s1, %hi(D_80245230)
+/* 9B243C 80240CAC 26315230 */  addiu     $s1, $s1, %lo(D_80245230)
 /* 9B2440 80240CB0 0C01BB7C */  jal       decode_yay0
 /* 9B2444 80240CB4 0220282D */   daddu    $a1, $s1, $zero
 /* 9B2448 80240CB8 0C00AB1E */  jal       general_heap_free
 /* 9B244C 80240CBC 0200202D */   daddu    $a0, $s0, $zero
-/* 9B2450 80240CC0 3C048025 */  lui       $a0, 0x8025
-/* 9B2454 80240CC4 248491C0 */  addiu     $a0, $a0, -0x6e40
-/* 9B2458 80240CC8 3C028024 */  lui       $v0, 0x8024
-/* 9B245C 80240CCC 24425430 */  addiu     $v0, $v0, 0x5430
+/* 9B2450 80240CC0 3C048025 */  lui       $a0, %hi(D_802491C0)
+/* 9B2454 80240CC4 248491C0 */  addiu     $a0, $a0, %lo(D_802491C0)
+/* 9B2458 80240CC8 3C028024 */  lui       $v0, %hi(D_80245430)
+/* 9B245C 80240CCC 24425430 */  addiu     $v0, $v0, %lo(D_80245430)
 /* 9B2460 80240CD0 AC820000 */  sw        $v0, ($a0)
 /* 9B2464 80240CD4 24020096 */  addiu     $v0, $zero, 0x96
 /* 9B2468 80240CD8 A4820008 */  sh        $v0, 8($a0)
diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024038C_9B6D0C.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024038C_9B6D0C.s
index db989e9311..7f57f7218a 100644
--- a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024038C_9B6D0C.s
+++ b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024038C_9B6D0C.s
@@ -55,8 +55,8 @@ glabel func_8024038C_9B6D0C
 /* 9B6DC8 80240448 8C470030 */   lw       $a3, 0x30($v0)
 /* 9B6DCC 8024044C C6020018 */  lwc1      $f2, 0x18($s0)
 /* 9B6DD0 80240450 46020003 */  div.s     $f0, $f0, $f2
-/* 9B6DD4 80240454 3C018024 */  lui       $at, 0x8024
-/* 9B6DD8 80240458 D4224820 */  ldc1      $f2, 0x4820($at)
+/* 9B6DD4 80240454 3C018024 */  lui       $at, %hi(D_80244820)
+/* 9B6DD8 80240458 D4224820 */  ldc1      $f2, %lo(D_80244820)($at)
 /* 9B6DDC 8024045C 46000021 */  cvt.d.s   $f0, $f0
 /* 9B6DE0 80240460 46220000 */  add.d     $f0, $f0, $f2
 /* 9B6DE4 80240464 4620010D */  trunc.w.d $f4, $f0
diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802406A4_9B7024.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802406A4_9B7024.s
index e0d1e908e7..0a29b623b0 100644
--- a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802406A4_9B7024.s
+++ b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802406A4_9B7024.s
@@ -279,9 +279,9 @@ glabel func_802406A4_9B7024
 /* 9B7410 80240A90 2C620015 */  sltiu     $v0, $v1, 0x15
 /* 9B7414 80240A94 10400009 */  beqz      $v0, .L80240ABC
 /* 9B7418 80240A98 00031080 */   sll      $v0, $v1, 2
-/* 9B741C 80240A9C 3C018024 */  lui       $at, 0x8024
+/* 9B741C 80240A9C 3C018024 */  lui       $at, %hi(D_80244828)
 /* 9B7420 80240AA0 00220821 */  addu      $at, $at, $v0
-/* 9B7424 80240AA4 8C224828 */  lw        $v0, 0x4828($at)
+/* 9B7424 80240AA4 8C224828 */  lw        $v0, %lo(D_80244828)($at)
 /* 9B7428 80240AA8 00400008 */  jr        $v0
 /* 9B742C 80240AAC 00000000 */   nop      
 /* 9B7430 80240AB0 8E420028 */  lw        $v0, 0x28($s2)
diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80240AE4_9B7464.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80240AE4_9B7464.s
index 0e02b9416a..9a38df1232 100644
--- a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80240AE4_9B7464.s
+++ b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80240AE4_9B7464.s
@@ -87,8 +87,8 @@ glabel func_80240AE4_9B7464
 /* 9B75A4 80240C24 08090313 */  j         .L80240C4C
 /* 9B75A8 80240C28 E6000018 */   swc1     $f0, 0x18($s0)
 .L80240C2C:
-/* 9B75AC 80240C2C 3C018024 */  lui       $at, 0x8024
-/* 9B75B0 80240C30 D4224880 */  ldc1      $f2, 0x4880($at)
+/* 9B75AC 80240C2C 3C018024 */  lui       $at, %hi(D_80244880)
+/* 9B75B0 80240C30 D4224880 */  ldc1      $f2, %lo(D_80244880)($at)
 /* 9B75B4 80240C34 44820000 */  mtc1      $v0, $f0
 /* 9B75B8 80240C38 00000000 */  nop       
 /* 9B75BC 80240C3C 46800021 */  cvt.d.w   $f0, $f0
diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80240C94_9B7614.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80240C94_9B7614.s
index 2a7260c6d3..67fc954fd8 100644
--- a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80240C94_9B7614.s
+++ b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80240C94_9B7614.s
@@ -104,8 +104,8 @@ glabel func_80240C94_9B7614
 /* 9B7798 80240E18 1040000A */  beqz      $v0, .L80240E44
 /* 9B779C 80240E1C 4600C106 */   mov.s    $f4, $f24
 /* 9B77A0 80240E20 4614C081 */  sub.s     $f2, $f24, $f20
-/* 9B77A4 80240E24 3C018024 */  lui       $at, 0x8024
-/* 9B77A8 80240E28 D4204888 */  ldc1      $f0, 0x4888($at)
+/* 9B77A4 80240E24 3C018024 */  lui       $at, %hi(D_80244888)
+/* 9B77A8 80240E28 D4204888 */  ldc1      $f0, %lo(D_80244888)($at)
 /* 9B77AC 80240E2C 460010A1 */  cvt.d.s   $f2, $f2
 /* 9B77B0 80240E30 46201082 */  mul.d     $f2, $f2, $f0
 /* 9B77B4 80240E34 00000000 */  nop       
@@ -131,8 +131,8 @@ glabel func_80240C94_9B7614
 /* 9B7800 80240E80 C7A4002C */  lwc1      $f4, 0x2c($sp)
 /* 9B7804 80240E84 461A2100 */  add.s     $f4, $f4, $f26
 /* 9B7808 80240E88 46142081 */  sub.s     $f2, $f4, $f20
-/* 9B780C 80240E8C 3C018024 */  lui       $at, 0x8024
-/* 9B7810 80240E90 D4204890 */  ldc1      $f0, 0x4890($at)
+/* 9B780C 80240E8C 3C018024 */  lui       $at, %hi(D_80244890)
+/* 9B7810 80240E90 D4204890 */  ldc1      $f0, %lo(D_80244890)($at)
 /* 9B7814 80240E94 460010A1 */  cvt.d.s   $f2, $f2
 /* 9B7818 80240E98 46201082 */  mul.d     $f2, $f2, $f0
 /* 9B781C 80240E9C 00000000 */  nop       
diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241738_9B80B8.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241738_9B80B8.s
index 774423c672..97dbd6e7a5 100644
--- a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241738_9B80B8.s
+++ b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241738_9B80B8.s
@@ -15,9 +15,9 @@ glabel func_80241738_9B80B8
 /* 9B80E0 80241760 00031C00 */  sll       $v1, $v1, 0x10
 /* 9B80E4 80241764 00031B83 */  sra       $v1, $v1, 0xe
 /* 9B80E8 80241768 A444008E */  sh        $a0, 0x8e($v0)
-/* 9B80EC 8024176C 3C018024 */  lui       $at, 0x8024
+/* 9B80EC 8024176C 3C018024 */  lui       $at, %hi(D_80242EAC)
 /* 9B80F0 80241770 00230821 */  addu      $at, $at, $v1
-/* 9B80F4 80241774 C4222EAC */  lwc1      $f2, 0x2eac($at)
+/* 9B80F4 80241774 C4222EAC */  lwc1      $f2, %lo(D_80242EAC)($at)
 /* 9B80F8 80241778 8443008E */  lh        $v1, 0x8e($v0)
 /* 9B80FC 8024177C 46020000 */  add.s     $f0, $f0, $f2
 /* 9B8100 80241780 28630005 */  slti      $v1, $v1, 5
diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241DF0_9B8770.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241DF0_9B8770.s
index 74c471a25f..0f0675949e 100644
--- a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241DF0_9B8770.s
+++ b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241DF0_9B8770.s
@@ -66,9 +66,9 @@ glabel func_80241DF0_9B8770
 /* 9B885C 80241EDC 2C62000F */  sltiu     $v0, $v1, 0xf
 /* 9B8860 80241EE0 10400034 */  beqz      $v0, .L80241FB4
 /* 9B8864 80241EE4 00031080 */   sll      $v0, $v1, 2
-/* 9B8868 80241EE8 3C018024 */  lui       $at, 0x8024
+/* 9B8868 80241EE8 3C018024 */  lui       $at, %hi(D_80244898)
 /* 9B886C 80241EEC 00220821 */  addu      $at, $at, $v0
-/* 9B8870 80241EF0 8C224898 */  lw        $v0, 0x4898($at)
+/* 9B8870 80241EF0 8C224898 */  lw        $v0, %lo(D_80244898)($at)
 /* 9B8874 80241EF4 00400008 */  jr        $v0
 /* 9B8878 80241EF8 00000000 */   nop      
 /* 9B887C 80241EFC 0280202D */  daddu     $a0, $s4, $zero
diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024231C_9B8C9C.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024231C_9B8C9C.s
index da69bfdfe6..1ac2576ab4 100644
--- a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024231C_9B8C9C.s
+++ b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024231C_9B8C9C.s
@@ -69,9 +69,9 @@ glabel func_8024231C_9B8C9C
 /* 9B8D94 80242414 2C620010 */  sltiu     $v0, $v1, 0x10
 /* 9B8D98 80242418 1040004A */  beqz      $v0, .L80242544
 /* 9B8D9C 8024241C 00031080 */   sll      $v0, $v1, 2
-/* 9B8DA0 80242420 3C018024 */  lui       $at, 0x8024
+/* 9B8DA0 80242420 3C018024 */  lui       $at, %hi(D_802448D8)
 /* 9B8DA4 80242424 00220821 */  addu      $at, $at, $v0
-/* 9B8DA8 80242428 8C2248D8 */  lw        $v0, 0x48d8($at)
+/* 9B8DA8 80242428 8C2248D8 */  lw        $v0, %lo(D_802448D8)($at)
 /* 9B8DAC 8024242C 00400008 */  jr        $v0
 /* 9B8DB0 80242430 00000000 */   nop      
 /* 9B8DB4 80242434 0260202D */  daddu     $a0, $s3, $zero
diff --git a/asm/nonmatchings/world/area_trd/trd_08/9BB5B0/func_80240310_9BB5B0.s b/asm/nonmatchings/world/area_trd/trd_08/9BB5B0/func_80240310_9BB5B0.s
index c2ac3c39df..cecdcedd4e 100644
--- a/asm/nonmatchings/world/area_trd/trd_08/9BB5B0/func_80240310_9BB5B0.s
+++ b/asm/nonmatchings/world/area_trd/trd_08/9BB5B0/func_80240310_9BB5B0.s
@@ -228,9 +228,9 @@ glabel func_80240310_9BB5B0
 /* 9BB908 80240668 E6040028 */  swc1      $f4, 0x28($s0)
 /* 9BB90C 8024066C 00021080 */  sll       $v0, $v0, 2
 /* 9BB910 80240670 E7A00010 */  swc1      $f0, 0x10($sp)
-/* 9BB914 80240674 3C048024 */  lui       $a0, 0x8024
+/* 9BB914 80240674 3C048024 */  lui       $a0, %hi(D_80240F00)
 /* 9BB918 80240678 00822021 */  addu      $a0, $a0, $v0
-/* 9BB91C 8024067C 8C840F00 */  lw        $a0, 0xf00($a0)
+/* 9BB91C 8024067C 8C840F00 */  lw        $a0, %lo(D_80240F00)($a0)
 /* 9BB920 80240680 8E060004 */  lw        $a2, 4($s0)
 /* 9BB924 80240684 8E070008 */  lw        $a3, 8($s0)
 /* 9BB928 80240688 0C052757 */  jal       play_sound_at_position
diff --git a/asm/nonmatchings/world/area_trd/trd_08/9BB5B0/func_80240904_9BBBA4.s b/asm/nonmatchings/world/area_trd/trd_08/9BB5B0/func_80240904_9BBBA4.s
index ad35a39e06..5a1a58fb39 100644
--- a/asm/nonmatchings/world/area_trd/trd_08/9BB5B0/func_80240904_9BBBA4.s
+++ b/asm/nonmatchings/world/area_trd/trd_08/9BB5B0/func_80240904_9BBBA4.s
@@ -46,8 +46,8 @@ glabel func_80240904_9BBBA4
 /* 9BBC3C 8024099C 2402000A */  addiu     $v0, $zero, 0xa
 /* 9BBC40 802409A0 1462001B */  bne       $v1, $v0, .L80240A10
 /* 9BBC44 802409A4 E6000010 */   swc1     $f0, 0x10($s0)
-/* 9BBC48 802409A8 3C048024 */  lui       $a0, 0x8024
-/* 9BBC4C 802409AC 24840F2C */  addiu     $a0, $a0, 0xf2c
+/* 9BBC48 802409A8 3C048024 */  lui       $a0, %hi(D_80240F2C)
+/* 9BBC4C 802409AC 24840F2C */  addiu     $a0, $a0, %lo(D_80240F2C)
 /* 9BBC50 802409B0 24050001 */  addiu     $a1, $zero, 1
 /* 9BBC54 802409B4 0C0B0CF8 */  jal       start_script
 /* 9BBC58 802409B8 0000302D */   daddu    $a2, $zero, $zero
diff --git a/asm/nonmatchings/world/area_trd/trd_09/9BD720/func_802400C0_9BD720.s b/asm/nonmatchings/world/area_trd/trd_09/9BD720/func_802400C0_9BD720.s
index b4764606cf..9a052a9552 100644
--- a/asm/nonmatchings/world/area_trd/trd_09/9BD720/func_802400C0_9BD720.s
+++ b/asm/nonmatchings/world/area_trd/trd_09/9BD720/func_802400C0_9BD720.s
@@ -3,8 +3,8 @@
 
 glabel func_802400C0_9BD720
 /* 9BD720 802400C0 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 9BD724 802400C4 3C048024 */  lui       $a0, 0x8024
-/* 9BD728 802400C8 24845234 */  addiu     $a0, $a0, 0x5234
+/* 9BD724 802400C4 3C048024 */  lui       $a0, %hi(D_80245234)
+/* 9BD728 802400C8 24845234 */  addiu     $a0, $a0, %lo(D_80245234)
 /* 9BD72C 802400CC AFBF0018 */  sw        $ra, 0x18($sp)
 /* 9BD730 802400D0 AFB10014 */  sw        $s1, 0x14($sp)
 /* 9BD734 802400D4 AFB00010 */  sw        $s0, 0x10($sp)
@@ -37,8 +37,8 @@ glabel func_802400C0_9BD720
 /* 9BD790 80240130 C6200028 */  lwc1      $f0, 0x28($s1)
 /* 9BD794 80240134 3C0141F0 */  lui       $at, 0x41f0
 /* 9BD798 80240138 44811000 */  mtc1      $at, $f2
-/* 9BD79C 8024013C 3C108011 */  lui       $s0, 0x8011
-/* 9BD7A0 80240140 2610C930 */  addiu     $s0, $s0, -0x36d0
+/* 9BD79C 8024013C 3C108011 */  lui       $s0, %hi(D_8010C930)
+/* 9BD7A0 80240140 2610C930 */  addiu     $s0, $s0, %lo(D_8010C930)
 /* 9BD7A4 80240144 46020001 */  sub.s     $f0, $f0, $f2
 /* 9BD7A8 80240148 8E040000 */  lw        $a0, ($s0)
 /* 9BD7AC 8024014C E4800038 */  swc1      $f0, 0x38($a0)
diff --git a/asm/nonmatchings/world/area_trd/trd_10/9C2910/func_802401AC_9C2ABC.s b/asm/nonmatchings/world/area_trd/trd_10/9C2910/func_802401AC_9C2ABC.s
index a2659f4d00..fd33529807 100644
--- a/asm/nonmatchings/world/area_trd/trd_10/9C2910/func_802401AC_9C2ABC.s
+++ b/asm/nonmatchings/world/area_trd/trd_10/9C2910/func_802401AC_9C2ABC.s
@@ -13,9 +13,9 @@ glabel func_802401AC_9C2ABC
 /* 9C2ADC 802401CC 2C620005 */  sltiu     $v0, $v1, 5
 /* 9C2AE0 802401D0 1040008A */  beqz      $v0, .L802403FC
 /* 9C2AE4 802401D4 00031080 */   sll      $v0, $v1, 2
-/* 9C2AE8 802401D8 3C018024 */  lui       $at, 0x8024
+/* 9C2AE8 802401D8 3C018024 */  lui       $at, %hi(D_80242AA0)
 /* 9C2AEC 802401DC 00220821 */  addu      $at, $at, $v0
-/* 9C2AF0 802401E0 8C222AA0 */  lw        $v0, 0x2aa0($at)
+/* 9C2AF0 802401E0 8C222AA0 */  lw        $v0, %lo(D_80242AA0)($at)
 /* 9C2AF4 802401E4 00400008 */  jr        $v0
 /* 9C2AF8 802401E8 00000000 */   nop      
 /* 9C2AFC 802401EC 8E22003C */  lw        $v0, 0x3c($s1)
diff --git a/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_80240260_B1B7D0.s b/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_80240260_B1B7D0.s
index 787b315b57..5a558724ac 100644
--- a/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_80240260_B1B7D0.s
+++ b/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_80240260_B1B7D0.s
@@ -5,8 +5,8 @@ glabel func_80240260_B1B7D0
 /* B1B7D0 80240260 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* B1B7D4 80240264 AFB00010 */  sw        $s0, 0x10($sp)
 /* B1B7D8 80240268 0080802D */  daddu     $s0, $a0, $zero
-/* B1B7DC 8024026C 3C058024 */  lui       $a1, 0x8024
-/* B1B7E0 80240270 24A5029C */  addiu     $a1, $a1, 0x29c
+/* B1B7DC 8024026C 3C058024 */  lui       $a1, %hi(D_8024029C)
+/* B1B7E0 80240270 24A5029C */  addiu     $a1, $a1, %lo(D_8024029C)
 /* B1B7E4 80240274 AFBF0014 */  sw        $ra, 0x14($sp)
 /* B1B7E8 80240278 0C048C8F */  jal       bind_dynamic_entity_7
 /* B1B7EC 8024027C 0000202D */   daddu    $a0, $zero, $zero
diff --git a/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_8024029C_B1B80C.s b/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_8024029C_B1B80C.s
index a0c74b90d1..6bd95703ca 100644
--- a/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_8024029C_B1B80C.s
+++ b/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_8024029C_B1B80C.s
@@ -18,8 +18,8 @@ glabel func_8024029C_B1B80C
 /* B1B840 802402D0 0C048B77 */  jal       func_80122DDC
 /* B1B844 802402D4 84440008 */   lh       $a0, 8($v0)
 /* B1B848 802402D8 8C430000 */  lw        $v1, ($v0)
-/* B1B84C 802402DC 3C04800A */  lui       $a0, 0x800a
-/* B1B850 802402E0 8484A634 */  lh        $a0, -0x59cc($a0)
+/* B1B84C 802402DC 3C04800A */  lui       $a0, %hi(D_8009A634)
+/* B1B850 802402E0 8484A634 */  lh        $a0, %lo(D_8009A634)($a0)
 /* B1B854 802402E4 34630200 */  ori       $v1, $v1, 0x200
 /* B1B858 802402E8 AC430000 */  sw        $v1, ($v0)
 /* B1B85C 802402EC 27A20030 */  addiu     $v0, $sp, 0x30
@@ -39,8 +39,8 @@ glabel func_8024029C_B1B80C
 /* B1B894 80240324 AFB00028 */  sw        $s0, 0x28($sp)
 /* B1B898 80240328 820500BE */  lb        $a1, 0xbe($s0)
 /* B1B89C 8024032C 8FA30038 */  lw        $v1, 0x38($sp)
-/* B1B8A0 80240330 3C028024 */  lui       $v0, 0x8024
-/* B1B8A4 80240334 24420360 */  addiu     $v0, $v0, 0x360
+/* B1B8A0 80240330 3C028024 */  lui       $v0, %hi(D_80240360)
+/* B1B8A4 80240334 24420360 */  addiu     $v0, $v0, %lo(D_80240360)
 /* B1B8A8 80240338 AFA2002C */  sw        $v0, 0x2c($sp)
 /* B1B8AC 8024033C 00031823 */  negu      $v1, $v1
 /* B1B8B0 80240340 AFA50020 */  sw        $a1, 0x20($sp)
diff --git a/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_80240360_B1B8D0.s b/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_80240360_B1B8D0.s
index 35c79384b7..aab5e1fb87 100644
--- a/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_80240360_B1B8D0.s
+++ b/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_80240360_B1B8D0.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80240360_B1B8D0
-/* B1B8D0 80240360 3C03800A */  lui       $v1, 0x800a
-/* B1B8D4 80240364 8463A634 */  lh        $v1, -0x59cc($v1)
+/* B1B8D0 80240360 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* B1B8D4 80240364 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* B1B8D8 80240368 3C07BF80 */  lui       $a3, 0xbf80
 /* B1B8DC 8024036C 27BDFEC0 */  addiu     $sp, $sp, -0x140
 /* B1B8E0 80240370 F7B40128 */  sdc1      $f20, 0x128($sp)
@@ -22,9 +22,9 @@ glabel func_80240360_B1B8D0
 /* B1B914 802403A4 000218C0 */  sll       $v1, $v0, 3
 /* B1B918 802403A8 00431021 */  addu      $v0, $v0, $v1
 /* B1B91C 802403AC 000210C0 */  sll       $v0, $v0, 3
-/* B1B920 802403B0 3C01800B */  lui       $at, 0x800b
+/* B1B920 802403B0 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* B1B924 802403B4 00220821 */  addu      $at, $at, $v0
-/* B1B928 802403B8 C4361DEC */  lwc1      $f22, 0x1dec($at)
+/* B1B928 802403B8 C4361DEC */  lwc1      $f22, %lo(D_800B1DEC)($at)
 /* B1B92C 802403BC 4406A000 */  mfc1      $a2, $f20
 /* B1B930 802403C0 4600B587 */  neg.s     $f22, $f22
 /* B1B934 802403C4 4405B000 */  mfc1      $a1, $f22
diff --git a/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_80240510_B1BA80.s b/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_80240510_B1BA80.s
index 2602afac53..2eecf43005 100644
--- a/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_80240510_B1BA80.s
+++ b/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_80240510_B1BA80.s
@@ -5,8 +5,8 @@ glabel func_80240510_B1BA80
 /* B1BA80 80240510 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* B1BA84 80240514 AFB00010 */  sw        $s0, 0x10($sp)
 /* B1BA88 80240518 0080802D */  daddu     $s0, $a0, $zero
-/* B1BA8C 8024051C 3C048024 */  lui       $a0, 0x8024
-/* B1BA90 80240520 24840574 */  addiu     $a0, $a0, 0x574
+/* B1BA8C 8024051C 3C048024 */  lui       $a0, %hi(D_80240574)
+/* B1BA90 80240520 24840574 */  addiu     $a0, $a0, %lo(D_80240574)
 /* B1BA94 80240524 AFBF0014 */  sw        $ra, 0x14($sp)
 /* B1BA98 80240528 0C048C56 */  jal       bind_dynamic_entity_3
 /* B1BA9C 8024052C 0000282D */   daddu    $a1, $zero, $zero
diff --git a/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_802405B0_B1BB20.s b/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_802405B0_B1BB20.s
index 08a97f7ff2..165c76ecfa 100644
--- a/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_802405B0_B1BB20.s
+++ b/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_802405B0_B1BB20.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_802405B0_B1BB20
-/* B1BB20 802405B0 3C048024 */  lui       $a0, 0x8024
-/* B1BB24 802405B4 8C840FD0 */  lw        $a0, 0xfd0($a0)
+/* B1BB20 802405B0 3C048024 */  lui       $a0, %hi(D_80240FD0)
+/* B1BB24 802405B4 8C840FD0 */  lw        $a0, %lo(D_80240FD0)($a0)
 /* B1BB28 802405B8 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* B1BB2C 802405BC AFBF0010 */  sw        $ra, 0x10($sp)
 /* B1BB30 802405C0 0C047A2F */  jal       func_8011E8BC
diff --git a/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_802405D4_B1BB44.s b/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_802405D4_B1BB44.s
index 0bd009e500..8f9cce883f 100644
--- a/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_802405D4_B1BB44.s
+++ b/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_802405D4_B1BB44.s
@@ -15,8 +15,8 @@ glabel func_802405D4_B1BB44
 /* B1BB6C 802405FC 27B00110 */  addiu     $s0, $sp, 0x110
 /* B1BB70 80240600 0C019D40 */  jal       guMtxF2L
 /* B1BB74 80240604 0200282D */   daddu    $a1, $s0, $zero
-/* B1BB78 80240608 3C048024 */  lui       $a0, 0x8024
-/* B1BB7C 8024060C 8C840FD0 */  lw        $a0, 0xfd0($a0)
+/* B1BB78 80240608 3C048024 */  lui       $a0, %hi(D_80240FD0)
+/* B1BB7C 8024060C 8C840FD0 */  lw        $a0, %lo(D_80240FD0)($a0)
 /* B1BB80 80240610 0C047CC1 */  jal       func_8011F304
 /* B1BB84 80240614 0200282D */   daddu    $a1, $s0, $zero
 /* B1BB88 80240618 8FBF0154 */  lw        $ra, 0x154($sp)
diff --git a/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_80240628_B1BB98.s b/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_80240628_B1BB98.s
index 7f144ce4b5..a1e9badb97 100644
--- a/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_80240628_B1BB98.s
+++ b/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_80240628_B1BB98.s
@@ -3,10 +3,10 @@
 
 glabel func_80240628_B1BB98
 /* B1BB98 80240628 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* B1BB9C 8024062C 3C048024 */  lui       $a0, 0x8024
-/* B1BBA0 80240630 248405B0 */  addiu     $a0, $a0, 0x5b0
-/* B1BBA4 80240634 3C058024 */  lui       $a1, 0x8024
-/* B1BBA8 80240638 24A505D4 */  addiu     $a1, $a1, 0x5d4
+/* B1BB9C 8024062C 3C048024 */  lui       $a0, %hi(D_802405B0)
+/* B1BBA0 80240630 248405B0 */  addiu     $a0, $a0, %lo(D_802405B0)
+/* B1BBA4 80240634 3C058024 */  lui       $a1, %hi(D_802405D4)
+/* B1BBA8 80240638 24A505D4 */  addiu     $a1, $a1, %lo(D_802405D4)
 /* B1BBAC 8024063C AFBF0010 */  sw        $ra, 0x10($sp)
 /* B1BBB0 80240640 0C048C56 */  jal       bind_dynamic_entity_3
 /* B1BBB4 80240644 00000000 */   nop      
diff --git a/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_80240000_B1CA50.s b/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_80240000_B1CA50.s
index a3ef244d8a..3cf93fb834 100644
--- a/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_80240000_B1CA50.s
+++ b/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_80240000_B1CA50.s
@@ -5,8 +5,8 @@ glabel func_80240000_B1CA50
 /* B1CA50 80240000 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* B1CA54 80240004 AFB00010 */  sw        $s0, 0x10($sp)
 /* B1CA58 80240008 0080802D */  daddu     $s0, $a0, $zero
-/* B1CA5C 8024000C 3C058024 */  lui       $a1, 0x8024
-/* B1CA60 80240010 24A5003C */  addiu     $a1, $a1, 0x3c
+/* B1CA5C 8024000C 3C058024 */  lui       $a1, %hi(D_8024003C)
+/* B1CA60 80240010 24A5003C */  addiu     $a1, $a1, %lo(D_8024003C)
 /* B1CA64 80240014 AFBF0014 */  sw        $ra, 0x14($sp)
 /* B1CA68 80240018 0C048C8F */  jal       bind_dynamic_entity_7
 /* B1CA6C 8024001C 0000202D */   daddu    $a0, $zero, $zero
diff --git a/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_8024003C_B1CA8C.s b/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_8024003C_B1CA8C.s
index 2fc35bf4d9..ffe4823b39 100644
--- a/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_8024003C_B1CA8C.s
+++ b/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_8024003C_B1CA8C.s
@@ -18,8 +18,8 @@ glabel func_8024003C_B1CA8C
 /* B1CAC0 80240070 0C048B77 */  jal       func_80122DDC
 /* B1CAC4 80240074 84440008 */   lh       $a0, 8($v0)
 /* B1CAC8 80240078 8C430000 */  lw        $v1, ($v0)
-/* B1CACC 8024007C 3C04800A */  lui       $a0, 0x800a
-/* B1CAD0 80240080 8484A634 */  lh        $a0, -0x59cc($a0)
+/* B1CACC 8024007C 3C04800A */  lui       $a0, %hi(D_8009A634)
+/* B1CAD0 80240080 8484A634 */  lh        $a0, %lo(D_8009A634)($a0)
 /* B1CAD4 80240084 34630200 */  ori       $v1, $v1, 0x200
 /* B1CAD8 80240088 AC430000 */  sw        $v1, ($v0)
 /* B1CADC 8024008C 27A20030 */  addiu     $v0, $sp, 0x30
@@ -39,8 +39,8 @@ glabel func_8024003C_B1CA8C
 /* B1CB14 802400C4 AFB00028 */  sw        $s0, 0x28($sp)
 /* B1CB18 802400C8 820500BE */  lb        $a1, 0xbe($s0)
 /* B1CB1C 802400CC 8FA30038 */  lw        $v1, 0x38($sp)
-/* B1CB20 802400D0 3C028024 */  lui       $v0, 0x8024
-/* B1CB24 802400D4 24420100 */  addiu     $v0, $v0, 0x100
+/* B1CB20 802400D0 3C028024 */  lui       $v0, %hi(D_80240100)
+/* B1CB24 802400D4 24420100 */  addiu     $v0, $v0, %lo(D_80240100)
 /* B1CB28 802400D8 AFA2002C */  sw        $v0, 0x2c($sp)
 /* B1CB2C 802400DC 00031823 */  negu      $v1, $v1
 /* B1CB30 802400E0 AFA50020 */  sw        $a1, 0x20($sp)
diff --git a/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_80240100_B1CB50.s b/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_80240100_B1CB50.s
index cd11dcc7dd..5ba6cc7d12 100644
--- a/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_80240100_B1CB50.s
+++ b/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_80240100_B1CB50.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80240100_B1CB50
-/* B1CB50 80240100 3C03800A */  lui       $v1, 0x800a
-/* B1CB54 80240104 8463A634 */  lh        $v1, -0x59cc($v1)
+/* B1CB50 80240100 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* B1CB54 80240104 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* B1CB58 80240108 3C07BF80 */  lui       $a3, 0xbf80
 /* B1CB5C 8024010C 27BDFEC0 */  addiu     $sp, $sp, -0x140
 /* B1CB60 80240110 F7B40128 */  sdc1      $f20, 0x128($sp)
@@ -22,9 +22,9 @@ glabel func_80240100_B1CB50
 /* B1CB94 80240144 000218C0 */  sll       $v1, $v0, 3
 /* B1CB98 80240148 00431021 */  addu      $v0, $v0, $v1
 /* B1CB9C 8024014C 000210C0 */  sll       $v0, $v0, 3
-/* B1CBA0 80240150 3C01800B */  lui       $at, 0x800b
+/* B1CBA0 80240150 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* B1CBA4 80240154 00220821 */  addu      $at, $at, $v0
-/* B1CBA8 80240158 C4361DEC */  lwc1      $f22, 0x1dec($at)
+/* B1CBA8 80240158 C4361DEC */  lwc1      $f22, %lo(D_800B1DEC)($at)
 /* B1CBAC 8024015C 4406A000 */  mfc1      $a2, $f20
 /* B1CBB0 80240160 4600B587 */  neg.s     $f22, $f22
 /* B1CBB4 80240164 4405B000 */  mfc1      $a1, $f22
diff --git a/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_802402B8_B1CD08.s b/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_802402B8_B1CD08.s
index f842909c3a..e3bb6faa3c 100644
--- a/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_802402B8_B1CD08.s
+++ b/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_802402B8_B1CD08.s
@@ -5,8 +5,8 @@ glabel func_802402B8_B1CD08
 /* B1CD08 802402B8 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* B1CD0C 802402BC AFB00010 */  sw        $s0, 0x10($sp)
 /* B1CD10 802402C0 0080802D */  daddu     $s0, $a0, $zero
-/* B1CD14 802402C4 3C058024 */  lui       $a1, 0x8024
-/* B1CD18 802402C8 24A502F4 */  addiu     $a1, $a1, 0x2f4
+/* B1CD14 802402C4 3C058024 */  lui       $a1, %hi(D_802402F4)
+/* B1CD18 802402C8 24A502F4 */  addiu     $a1, $a1, %lo(D_802402F4)
 /* B1CD1C 802402CC AFBF0014 */  sw        $ra, 0x14($sp)
 /* B1CD20 802402D0 0C048C8F */  jal       bind_dynamic_entity_7
 /* B1CD24 802402D4 0000202D */   daddu    $a0, $zero, $zero
diff --git a/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_802402F4_B1CD44.s b/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_802402F4_B1CD44.s
index 368891ffd3..e82c066e04 100644
--- a/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_802402F4_B1CD44.s
+++ b/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_802402F4_B1CD44.s
@@ -18,8 +18,8 @@ glabel func_802402F4_B1CD44
 /* B1CD78 80240328 0C048B77 */  jal       func_80122DDC
 /* B1CD7C 8024032C 84440008 */   lh       $a0, 8($v0)
 /* B1CD80 80240330 8C430000 */  lw        $v1, ($v0)
-/* B1CD84 80240334 3C04800A */  lui       $a0, 0x800a
-/* B1CD88 80240338 8484A634 */  lh        $a0, -0x59cc($a0)
+/* B1CD84 80240334 3C04800A */  lui       $a0, %hi(D_8009A634)
+/* B1CD88 80240338 8484A634 */  lh        $a0, %lo(D_8009A634)($a0)
 /* B1CD8C 8024033C 34630200 */  ori       $v1, $v1, 0x200
 /* B1CD90 80240340 AC430000 */  sw        $v1, ($v0)
 /* B1CD94 80240344 27A20030 */  addiu     $v0, $sp, 0x30
@@ -39,8 +39,8 @@ glabel func_802402F4_B1CD44
 /* B1CDCC 8024037C AFB00028 */  sw        $s0, 0x28($sp)
 /* B1CDD0 80240380 820500BE */  lb        $a1, 0xbe($s0)
 /* B1CDD4 80240384 8FA30038 */  lw        $v1, 0x38($sp)
-/* B1CDD8 80240388 3C028024 */  lui       $v0, 0x8024
-/* B1CDDC 8024038C 244203B8 */  addiu     $v0, $v0, 0x3b8
+/* B1CDD8 80240388 3C028024 */  lui       $v0, %hi(D_802403B8)
+/* B1CDDC 8024038C 244203B8 */  addiu     $v0, $v0, %lo(D_802403B8)
 /* B1CDE0 80240390 AFA2002C */  sw        $v0, 0x2c($sp)
 /* B1CDE4 80240394 00031823 */  negu      $v1, $v1
 /* B1CDE8 80240398 AFA50020 */  sw        $a1, 0x20($sp)
diff --git a/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_802403B8_B1CE08.s b/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_802403B8_B1CE08.s
index 28dfbac986..8c67c7925a 100644
--- a/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_802403B8_B1CE08.s
+++ b/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_802403B8_B1CE08.s
@@ -5,8 +5,8 @@ glabel func_802403B8_B1CE08
 /* B1CE08 802403B8 27BDFEA0 */  addiu     $sp, $sp, -0x160
 /* B1CE0C 802403BC F7B40138 */  sdc1      $f20, 0x138($sp)
 /* B1CE10 802403C0 4480A000 */  mtc1      $zero, $f20
-/* B1CE14 802403C4 3C03800A */  lui       $v1, 0x800a
-/* B1CE18 802403C8 8463A634 */  lh        $v1, -0x59cc($v1)
+/* B1CE14 802403C4 3C03800A */  lui       $v1, %hi(D_8009A634)
+/* B1CE18 802403C8 8463A634 */  lh        $v1, %lo(D_8009A634)($v1)
 /* B1CE1C 802403CC F7BC0158 */  sdc1      $f28, 0x158($sp)
 /* B1CE20 802403D0 3C01BF80 */  lui       $at, 0xbf80
 /* B1CE24 802403D4 4481E000 */  mtc1      $at, $f28
@@ -29,9 +29,9 @@ glabel func_802403B8_B1CE08
 /* B1CE68 80240418 00431021 */  addu      $v0, $v0, $v1
 /* B1CE6C 8024041C 000210C0 */  sll       $v0, $v0, 3
 /* B1CE70 80240420 4406A000 */  mfc1      $a2, $f20
-/* B1CE74 80240424 3C01800B */  lui       $at, 0x800b
+/* B1CE74 80240424 3C01800B */  lui       $at, %hi(D_800B1DEC)
 /* B1CE78 80240428 00220821 */  addu      $at, $at, $v0
-/* B1CE7C 8024042C C4361DEC */  lwc1      $f22, 0x1dec($at)
+/* B1CE7C 8024042C C4361DEC */  lwc1      $f22, %lo(D_800B1DEC)($at)
 /* B1CE80 80240430 4407E000 */  mfc1      $a3, $f28
 /* B1CE84 80240434 4600B587 */  neg.s     $f22, $f22
 /* B1CE88 80240438 4405B000 */  mfc1      $a1, $f22
diff --git a/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_802406D4_B1D124.s b/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_802406D4_B1D124.s
index 77495e0a88..e9e7b194cc 100644
--- a/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_802406D4_B1D124.s
+++ b/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_802406D4_B1D124.s
@@ -5,8 +5,8 @@ glabel func_802406D4_B1D124
 /* B1D124 802406D4 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* B1D128 802406D8 AFB00010 */  sw        $s0, 0x10($sp)
 /* B1D12C 802406DC 0080802D */  daddu     $s0, $a0, $zero
-/* B1D130 802406E0 3C048024 */  lui       $a0, 0x8024
-/* B1D134 802406E4 24840730 */  addiu     $a0, $a0, 0x730
+/* B1D130 802406E0 3C048024 */  lui       $a0, %hi(D_80240730)
+/* B1D134 802406E4 24840730 */  addiu     $a0, $a0, %lo(D_80240730)
 /* B1D138 802406E8 AFBF0014 */  sw        $ra, 0x14($sp)
 /* B1D13C 802406EC 0C048C56 */  jal       bind_dynamic_entity_3
 /* B1D140 802406F0 0000282D */   daddu    $a1, $zero, $zero
diff --git a/asm/nonmatchings/world/area_tst/tst_13/B1D760/func_8024013C_B1D89C.s b/asm/nonmatchings/world/area_tst/tst_13/B1D760/func_8024013C_B1D89C.s
index 375f1e8b19..45c4c53eac 100644
--- a/asm/nonmatchings/world/area_tst/tst_13/B1D760/func_8024013C_B1D89C.s
+++ b/asm/nonmatchings/world/area_tst/tst_13/B1D760/func_8024013C_B1D89C.s
@@ -8,8 +8,8 @@ glabel func_8024013C_B1D89C
 /* B1D8A8 80240148 3C038011 */  lui       $v1, %hi(gPlayerStatus)
 /* B1D8AC 8024014C 2463EFC8 */  addiu     $v1, $v1, %lo(gPlayerStatus)
 /* B1D8B0 80240150 AFB00090 */  sw        $s0, 0x90($sp)
-/* B1D8B4 80240154 3C108024 */  lui       $s0, 0x8024
-/* B1D8B8 80240158 26102BF8 */  addiu     $s0, $s0, 0x2bf8
+/* B1D8B4 80240154 3C108024 */  lui       $s0, %hi(D_80242BF8)
+/* B1D8B8 80240158 26102BF8 */  addiu     $s0, $s0, %lo(D_80242BF8)
 /* B1D8BC 8024015C AFBF00A4 */  sw        $ra, 0xa4($sp)
 /* B1D8C0 80240160 AFB400A0 */  sw        $s4, 0xa0($sp)
 /* B1D8C4 80240164 AFB3009C */  sw        $s3, 0x9c($sp)
@@ -50,8 +50,8 @@ glabel func_8024013C_B1D89C
 /* B1D950 802401F0 46000506 */   mov.s    $f20, $f0
 /* B1D954 802401F4 4600A502 */  mul.s     $f20, $f20, $f0
 /* B1D958 802401F8 00000000 */  nop       
-/* B1D95C 802401FC 3C018024 */  lui       $at, 0x8024
-/* B1D960 80240200 D4202D00 */  ldc1      $f0, 0x2d00($at)
+/* B1D95C 802401FC 3C018024 */  lui       $at, %hi(D_80242D00)
+/* B1D960 80240200 D4202D00 */  ldc1      $f0, %lo(D_80242D00)($at)
 /* B1D964 80240204 4600A521 */  cvt.d.s   $f20, $f20
 /* B1D968 80240208 4620A500 */  add.d     $f20, $f20, $f0
 /* B1D96C 8024020C C60C0000 */  lwc1      $f12, ($s0)
@@ -77,10 +77,10 @@ glabel func_8024013C_B1D89C
 /* B1D9BC 8024025C 0C019D80 */  jal       guMtxCatF
 /* B1D9C0 80240260 00A0302D */   daddu    $a2, $a1, $zero
 /* B1D9C4 80240264 27A40010 */  addiu     $a0, $sp, 0x10
-/* B1D9C8 80240268 3C118007 */  lui       $s1, 0x8007
-/* B1D9CC 8024026C 263141F0 */  addiu     $s1, $s1, 0x41f0
-/* B1D9D0 80240270 3C12800A */  lui       $s2, 0x800a
-/* B1D9D4 80240274 2652A674 */  addiu     $s2, $s2, -0x598c
+/* B1D9C8 80240268 3C118007 */  lui       $s1, %hi(D_800741F0)
+/* B1D9CC 8024026C 263141F0 */  addiu     $s1, $s1, %lo(D_800741F0)
+/* B1D9D0 80240270 3C12800A */  lui       $s2, %hi(D_8009A674)
+/* B1D9D4 80240274 2652A674 */  addiu     $s2, $s2, %lo(D_8009A674)
 /* B1D9D8 80240278 96250000 */  lhu       $a1, ($s1)
 /* B1D9DC 8024027C 8E420000 */  lw        $v0, ($s2)
 /* B1D9E0 80240280 00052980 */  sll       $a1, $a1, 6
@@ -88,8 +88,8 @@ glabel func_8024013C_B1D89C
 /* B1D9E8 80240288 0C019D40 */  jal       guMtxF2L
 /* B1D9EC 8024028C 00452821 */   addu     $a1, $v0, $a1
 /* B1D9F0 80240290 24040001 */  addiu     $a0, $zero, 1
-/* B1D9F4 80240294 3C138024 */  lui       $s3, 0x8024
-/* B1D9F8 80240298 26732860 */  addiu     $s3, $s3, 0x2860
+/* B1D9F4 80240294 3C138024 */  lui       $s3, %hi(D_80242860)
+/* B1D9F8 80240298 26732860 */  addiu     $s3, $s3, %lo(D_80242860)
 /* B1D9FC 8024029C 0260282D */  daddu     $a1, $s3, $zero
 /* B1DA00 802402A0 27A60010 */  addiu     $a2, $sp, 0x10
 /* B1DA04 802402A4 0C0470CB */  jal       func_8011C32C
@@ -100,8 +100,8 @@ glabel func_8024013C_B1D89C
 /* B1DA18 802402B8 3529001C */  ori       $t1, $t1, 0x1c
 /* B1DA1C 802402BC 3C080055 */  lui       $t0, 0x55
 /* B1DA20 802402C0 35082078 */  ori       $t0, $t0, 0x2078
-/* B1DA24 802402C4 3C10800A */  lui       $s0, 0x800a
-/* B1DA28 802402C8 2610A66C */  addiu     $s0, $s0, -0x5994
+/* B1DA24 802402C4 3C10800A */  lui       $s0, %hi(D_8009A66C)
+/* B1DA28 802402C8 2610A66C */  addiu     $s0, $s0, %lo(D_8009A66C)
 /* B1DA2C 802402CC 0200202D */  daddu     $a0, $s0, $zero
 /* B1DA30 802402D0 24050001 */  addiu     $a1, $zero, 1
 /* B1DA34 802402D4 8E020000 */  lw        $v0, ($s0)
diff --git a/asm/nonmatchings/world/script_api/7E0E80/MakeShop.s b/asm/nonmatchings/world/script_api/7E0E80/MakeShop.s
index a65ddabbd8..3673fff54a 100644
--- a/asm/nonmatchings/world/script_api/7E0E80/MakeShop.s
+++ b/asm/nonmatchings/world/script_api/7E0E80/MakeShop.s
@@ -80,8 +80,8 @@ glabel MakeShop
 /* 7E27F8 80281978 0000902D */   daddu    $s2, $zero, $zero
 /* 7E27FC 8028197C 3C1E8007 */  lui       $fp, %hi(gGameStatusPtr)
 /* 7E2800 80281980 27DE419C */  addiu     $fp, $fp, %lo(gGameStatusPtr)
-/* 7E2804 80281984 3C178028 */  lui       $s7, 0x8028
-/* 7E2808 80281988 26F73F58 */  addiu     $s7, $s7, 0x3f58
+/* 7E2804 80281984 3C178028 */  lui       $s7, %hi(D_80283F58)
+/* 7E2808 80281988 26F73F58 */  addiu     $s7, $s7, %lo(D_80283F58)
 /* 7E280C 8028198C 24160003 */  addiu     $s6, $zero, 3
 /* 7E2810 80281990 26B10002 */  addiu     $s1, $s5, 2
 .L80281994:
@@ -164,8 +164,8 @@ glabel MakeShop
 /* 7E2944 80281AC4 1440FFB3 */  bnez      $v0, .L80281994
 /* 7E2948 80281AC8 26520001 */   addiu    $s2, $s2, 1
 .L80281ACC:
-/* 7E294C 80281ACC 3C048008 */  lui       $a0, 0x8008
-/* 7E2950 80281AD0 24840868 */  addiu     $a0, $a0, 0x868
+/* 7E294C 80281ACC 3C048008 */  lui       $a0, %hi(D_80080868)
+/* 7E2950 80281AD0 24840868 */  addiu     $a0, $a0, %lo(D_80080868)
 /* 7E2954 80281AD4 0C050529 */  jal       create_icon
 /* 7E2958 80281AD8 2410FFFF */   addiu    $s0, $zero, -1
 /* 7E295C 80281ADC 0040202D */  daddu     $a0, $v0, $zero
@@ -187,8 +187,8 @@ glabel MakeShop
 /* 7E299C 80281B1C 24070078 */  addiu     $a3, $zero, 0x78
 /* 7E29A0 80281B20 2402001C */  addiu     $v0, $zero, 0x1c
 /* 7E29A4 80281B24 AFA20010 */  sw        $v0, 0x10($sp)
-/* 7E29A8 80281B28 3C028028 */  lui       $v0, 0x8028
-/* 7E29AC 80281B2C 24421434 */  addiu     $v0, $v0, 0x1434
+/* 7E29A8 80281B28 3C028028 */  lui       $v0, %hi(D_80281434)
+/* 7E29AC 80281B2C 24421434 */  addiu     $v0, $v0, %lo(D_80281434)
 /* 7E29B0 80281B30 AFA00014 */  sw        $zero, 0x14($sp)
 /* 7E29B4 80281B34 AFA20018 */  sw        $v0, 0x18($sp)
 /* 7E29B8 80281B38 AFA0001C */  sw        $zero, 0x1c($sp)
@@ -202,14 +202,14 @@ glabel MakeShop
 /* 7E29D8 80281B58 AFA20010 */  sw        $v0, 0x10($sp)
 /* 7E29DC 80281B5C 24020001 */  addiu     $v0, $zero, 1
 /* 7E29E0 80281B60 AFA20014 */  sw        $v0, 0x14($sp)
-/* 7E29E4 80281B64 3C028028 */  lui       $v0, 0x8028
-/* 7E29E8 80281B68 244214D0 */  addiu     $v0, $v0, 0x14d0
+/* 7E29E4 80281B64 3C028028 */  lui       $v0, %hi(D_802814D0)
+/* 7E29E8 80281B68 244214D0 */  addiu     $v0, $v0, %lo(D_802814D0)
 /* 7E29EC 80281B6C AFA20018 */  sw        $v0, 0x18($sp)
 /* 7E29F0 80281B70 AFA0001C */  sw        $zero, 0x1c($sp)
 /* 7E29F4 80281B74 0C051F32 */  jal       set_ui_panel_properties
 /* 7E29F8 80281B78 AFB00020 */   sw       $s0, 0x20($sp)
-/* 7E29FC 80281B7C 3C048015 */  lui       $a0, 0x8015
-/* 7E2A00 80281B80 2484F150 */  addiu     $a0, $a0, -0xeb0
+/* 7E29FC 80281B7C 3C048015 */  lui       $a0, %hi(D_8014F150)
+/* 7E2A00 80281B80 2484F150 */  addiu     $a0, $a0, %lo(D_8014F150)
 /* 7E2A04 80281B84 24030009 */  addiu     $v1, $zero, 9
 /* 7E2A08 80281B88 AC830028 */  sw        $v1, 0x28($a0)
 /* 7E2A0C 80281B8C 24030003 */  addiu     $v1, $zero, 3
diff --git a/asm/nonmatchings/world/script_api/7E0E80/func_80280000.s b/asm/nonmatchings/world/script_api/7E0E80/func_80280000.s
index ce58438f1d..57eb181249 100644
--- a/asm/nonmatchings/world/script_api/7E0E80/func_80280000.s
+++ b/asm/nonmatchings/world/script_api/7E0E80/func_80280000.s
@@ -13,8 +13,8 @@ glabel func_80280000
 /* 7E0EA0 80280020 8E220010 */  lw        $v0, 0x10($s1)
 /* 7E0EA4 80280024 8C430018 */  lw        $v1, 0x18($v0)
 /* 7E0EA8 80280028 00041080 */  sll       $v0, $a0, 2
-/* 7E0EAC 8028002C 3C048028 */  lui       $a0, 0x8028
-/* 7E0EB0 80280030 24843E80 */  addiu     $a0, $a0, 0x3e80
+/* 7E0EAC 8028002C 3C048028 */  lui       $a0, %hi(D_80283E80)
+/* 7E0EB0 80280030 24843E80 */  addiu     $a0, $a0, %lo(D_80283E80)
 /* 7E0EB4 80280034 00431021 */  addu      $v0, $v0, $v1
 /* 7E0EB8 80280038 8C500000 */  lw        $s0, ($v0)
 /* 7E0EBC 8028003C 0C0B0CF8 */  jal       start_script
diff --git a/asm/nonmatchings/world/script_api/7E0E80/func_80280088.s b/asm/nonmatchings/world/script_api/7E0E80/func_80280088.s
index 4a75caa116..44972cacf0 100644
--- a/asm/nonmatchings/world/script_api/7E0E80/func_80280088.s
+++ b/asm/nonmatchings/world/script_api/7E0E80/func_80280088.s
@@ -31,19 +31,19 @@ glabel func_80280088
 /* 7E0F70 802800F0 080A0047 */  j         .L8028011C
 /* 7E0F74 802800F4 00000000 */   nop      
 .L802800F8:
-/* 7E0F78 802800F8 3C048015 */  lui       $a0, 0x8015
-/* 7E0F7C 802800FC 2484C290 */  addiu     $a0, $a0, -0x3d70
+/* 7E0F78 802800F8 3C048015 */  lui       $a0, %hi(D_8014C290)
+/* 7E0F7C 802800FC 2484C290 */  addiu     $a0, $a0, %lo(D_8014C290)
 /* 7E0F80 80280100 24020001 */  addiu     $v0, $zero, 1
 /* 7E0F84 80280104 16420003 */  bne       $s2, $v0, .L80280114
 /* 7E0F88 80280108 00000000 */   nop      
-/* 7E0F8C 8028010C 3C048015 */  lui       $a0, 0x8015
-/* 7E0F90 80280110 2484C294 */  addiu     $a0, $a0, -0x3d6c
+/* 7E0F8C 8028010C 3C048015 */  lui       $a0, %hi(D_8014C294)
+/* 7E0F90 80280110 2484C294 */  addiu     $a0, $a0, %lo(D_8014C294)
 .L80280114:
 /* 7E0F94 80280114 0C0496CF */  jal       set_message_string
 /* 7E0F98 80280118 24050002 */   addiu    $a1, $zero, 2
 .L8028011C:
-/* 7E0F9C 8028011C 3C048028 */  lui       $a0, 0x8028
-/* 7E0FA0 80280120 24843E80 */  addiu     $a0, $a0, 0x3e80
+/* 7E0F9C 8028011C 3C048028 */  lui       $a0, %hi(D_80283E80)
+/* 7E0FA0 80280120 24843E80 */  addiu     $a0, $a0, %lo(D_80283E80)
 /* 7E0FA4 80280124 24050001 */  addiu     $a1, $zero, 1
 /* 7E0FA8 80280128 0C0B0CF8 */  jal       start_script
 /* 7E0FAC 8028012C 0000302D */   daddu    $a2, $zero, $zero
diff --git a/asm/nonmatchings/world/script_api/7E0E80/func_8028017C.s b/asm/nonmatchings/world/script_api/7E0E80/func_8028017C.s
index 9095827655..2850138715 100644
--- a/asm/nonmatchings/world/script_api/7E0E80/func_8028017C.s
+++ b/asm/nonmatchings/world/script_api/7E0E80/func_8028017C.s
@@ -13,8 +13,8 @@ glabel func_8028017C
 /* 7E101C 8028019C 8E220010 */  lw        $v0, 0x10($s1)
 /* 7E1020 802801A0 8C430018 */  lw        $v1, 0x18($v0)
 /* 7E1024 802801A4 00041080 */  sll       $v0, $a0, 2
-/* 7E1028 802801A8 3C048028 */  lui       $a0, 0x8028
-/* 7E102C 802801AC 24843EB0 */  addiu     $a0, $a0, 0x3eb0
+/* 7E1028 802801A8 3C048028 */  lui       $a0, %hi(D_80283EB0)
+/* 7E102C 802801AC 24843EB0 */  addiu     $a0, $a0, %lo(D_80283EB0)
 /* 7E1030 802801B0 00431021 */  addu      $v0, $v0, $v1
 /* 7E1034 802801B4 8C500000 */  lw        $s0, ($v0)
 /* 7E1038 802801B8 0C0B0CF8 */  jal       start_script
diff --git a/asm/nonmatchings/world/script_api/7E0E80/func_80280208.s b/asm/nonmatchings/world/script_api/7E0E80/func_80280208.s
index 46bbd922c6..65f958b307 100644
--- a/asm/nonmatchings/world/script_api/7E0E80/func_80280208.s
+++ b/asm/nonmatchings/world/script_api/7E0E80/func_80280208.s
@@ -19,18 +19,18 @@ glabel func_80280208
 /* 7E10C0 80280240 8C520000 */  lw        $s2, ($v0)
 /* 7E10C4 80280244 0C0496FA */  jal       set_message_value
 /* 7E10C8 80280248 0200202D */   daddu    $a0, $s0, $zero
-/* 7E10CC 8028024C 3C048015 */  lui       $a0, 0x8015
-/* 7E10D0 80280250 2484C290 */  addiu     $a0, $a0, -0x3d70
+/* 7E10CC 8028024C 3C048015 */  lui       $a0, %hi(D_8014C290)
+/* 7E10D0 80280250 2484C290 */  addiu     $a0, $a0, %lo(D_8014C290)
 /* 7E10D4 80280254 24020001 */  addiu     $v0, $zero, 1
 /* 7E10D8 80280258 16020003 */  bne       $s0, $v0, .L80280268
 /* 7E10DC 8028025C 00000000 */   nop      
-/* 7E10E0 80280260 3C048015 */  lui       $a0, 0x8015
-/* 7E10E4 80280264 2484C294 */  addiu     $a0, $a0, -0x3d6c
+/* 7E10E0 80280260 3C048015 */  lui       $a0, %hi(D_8014C294)
+/* 7E10E4 80280264 2484C294 */  addiu     $a0, $a0, %lo(D_8014C294)
 .L80280268:
 /* 7E10E8 80280268 0C0496CF */  jal       set_message_string
 /* 7E10EC 8028026C 24050001 */   addiu    $a1, $zero, 1
-/* 7E10F0 80280270 3C048028 */  lui       $a0, 0x8028
-/* 7E10F4 80280274 24843EB0 */  addiu     $a0, $a0, 0x3eb0
+/* 7E10F0 80280270 3C048028 */  lui       $a0, %hi(D_80283EB0)
+/* 7E10F4 80280274 24843EB0 */  addiu     $a0, $a0, %lo(D_80283EB0)
 /* 7E10F8 80280278 24050001 */  addiu     $a1, $zero, 1
 /* 7E10FC 8028027C 0C0B0CF8 */  jal       start_script
 /* 7E1100 80280280 0000302D */   daddu    $a2, $zero, $zero
diff --git a/asm/nonmatchings/world/script_api/7E0E80/func_802802D0.s b/asm/nonmatchings/world/script_api/7E0E80/func_802802D0.s
index 906857ef51..cc63967016 100644
--- a/asm/nonmatchings/world/script_api/7E0E80/func_802802D0.s
+++ b/asm/nonmatchings/world/script_api/7E0E80/func_802802D0.s
@@ -13,8 +13,8 @@ glabel func_802802D0
 /* 7E1170 802802F0 8E220010 */  lw        $v0, 0x10($s1)
 /* 7E1174 802802F4 8C430018 */  lw        $v1, 0x18($v0)
 /* 7E1178 802802F8 00041080 */  sll       $v0, $a0, 2
-/* 7E117C 802802FC 3C048028 */  lui       $a0, 0x8028
-/* 7E1180 80280300 24843EE0 */  addiu     $a0, $a0, 0x3ee0
+/* 7E117C 802802FC 3C048028 */  lui       $a0, %hi(D_80283EE0)
+/* 7E1180 80280300 24843EE0 */  addiu     $a0, $a0, %lo(D_80283EE0)
 /* 7E1184 80280304 00431021 */  addu      $v0, $v0, $v1
 /* 7E1188 80280308 8C500000 */  lw        $s0, ($v0)
 /* 7E118C 8028030C 0C0B0CF8 */  jal       start_script
diff --git a/asm/nonmatchings/world/script_api/7E0E80/func_8028035C.s b/asm/nonmatchings/world/script_api/7E0E80/func_8028035C.s
index 148c98a96a..f96cb40fb8 100644
--- a/asm/nonmatchings/world/script_api/7E0E80/func_8028035C.s
+++ b/asm/nonmatchings/world/script_api/7E0E80/func_8028035C.s
@@ -3,8 +3,8 @@
 
 glabel func_8028035C
 /* 7E11DC 8028035C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 7E11E0 80280360 3C048028 */  lui       $a0, 0x8028
-/* 7E11E4 80280364 24843F2C */  addiu     $a0, $a0, 0x3f2c
+/* 7E11E0 80280360 3C048028 */  lui       $a0, %hi(D_80283F2C)
+/* 7E11E4 80280364 24843F2C */  addiu     $a0, $a0, %lo(D_80283F2C)
 /* 7E11E8 80280368 24050001 */  addiu     $a1, $zero, 1
 /* 7E11EC 8028036C 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
 /* 7E11F0 80280370 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
diff --git a/asm/nonmatchings/world/script_api/7E0E80/func_80280410.s b/asm/nonmatchings/world/script_api/7E0E80/func_80280410.s
index 72a3308614..6ac8d45441 100644
--- a/asm/nonmatchings/world/script_api/7E0E80/func_80280410.s
+++ b/asm/nonmatchings/world/script_api/7E0E80/func_80280410.s
@@ -34,8 +34,8 @@ glabel func_80280410
 /* 7E1304 80280484 00000000 */   nop      
 /* 7E1308 80280488 0C038045 */  jal       disable_player_static_collisions
 /* 7E130C 8028048C 00000000 */   nop      
-/* 7E1310 80280490 3C048028 */  lui       $a0, 0x8028
-/* 7E1314 80280494 24844034 */  addiu     $a0, $a0, 0x4034
+/* 7E1310 80280490 3C048028 */  lui       $a0, %hi(D_80284034)
+/* 7E1314 80280494 24844034 */  addiu     $a0, $a0, %lo(D_80284034)
 /* 7E1318 80280498 24050001 */  addiu     $a1, $zero, 1
 /* 7E131C 8028049C 0C0B0CF8 */  jal       start_script
 /* 7E1320 802804A0 0000302D */   daddu    $a2, $zero, $zero
@@ -44,17 +44,17 @@ glabel func_80280410
 /* 7E132C 802804AC AC710084 */  sw        $s1, 0x84($v1)
 /* 7E1330 802804B0 96040000 */  lhu       $a0, ($s0)
 /* 7E1334 802804B4 0000102D */  daddu     $v0, $zero, $zero
-/* 7E1338 802804B8 3C018028 */  lui       $at, 0x8028
-/* 7E133C 802804BC AC236520 */  sw        $v1, 0x6520($at)
+/* 7E1338 802804B8 3C018028 */  lui       $at, %hi(D_80286520)
+/* 7E133C 802804BC AC236520 */  sw        $v1, %lo(D_80286520)($at)
 /* 7E1340 802804C0 34840008 */  ori       $a0, $a0, 8
-/* 7E1344 802804C4 3C018028 */  lui       $at, 0x8028
-/* 7E1348 802804C8 AC256524 */  sw        $a1, 0x6524($at)
+/* 7E1344 802804C4 3C018028 */  lui       $at, %hi(D_80286524)
+/* 7E1348 802804C8 AC256524 */  sw        $a1, %lo(D_80286524)($at)
 /* 7E134C 802804CC 080A0141 */  j         .L80280504
 /* 7E1350 802804D0 A6040000 */   sh       $a0, ($s0)
 .L802804D4:
-/* 7E1354 802804D4 3C048028 */  lui       $a0, 0x8028
+/* 7E1354 802804D4 3C048028 */  lui       $a0, %hi(D_80286524)
 /* 7E1358 802804D8 0C0B1059 */  jal       does_script_exist
-/* 7E135C 802804DC 8C846524 */   lw       $a0, 0x6524($a0)
+/* 7E135C 802804DC 8C846524 */   lw       $a0, %lo(D_80286524)($a0)
 /* 7E1360 802804E0 54400008 */  bnel      $v0, $zero, .L80280504
 /* 7E1364 802804E4 0000102D */   daddu    $v0, $zero, $zero
 /* 7E1368 802804E8 96020000 */  lhu       $v0, ($s0)
diff --git a/asm/nonmatchings/world/script_api/7E0E80/func_8028051C.s b/asm/nonmatchings/world/script_api/7E0E80/func_8028051C.s
index 404aecf0a1..a37d80c9c6 100644
--- a/asm/nonmatchings/world/script_api/7E0E80/func_8028051C.s
+++ b/asm/nonmatchings/world/script_api/7E0E80/func_8028051C.s
@@ -36,10 +36,10 @@ glabel func_8028051C
 /* 7E1418 80280598 1200001B */  beqz      $s0, .L80280608
 /* 7E141C 8028059C 00000000 */   nop      
 /* 7E1420 802805A0 96220018 */  lhu       $v0, 0x18($s1)
-/* 7E1424 802805A4 3C018028 */  lui       $at, 0x8028
-/* 7E1428 802805A8 AC206530 */  sw        $zero, 0x6530($at)
-/* 7E142C 802805AC 3C018028 */  lui       $at, 0x8028
-/* 7E1430 802805B0 AC206534 */  sw        $zero, 0x6534($at)
+/* 7E1424 802805A4 3C018028 */  lui       $at, %hi(D_80286530)
+/* 7E1428 802805A8 AC206530 */  sw        $zero, %lo(D_80286530)($at)
+/* 7E142C 802805AC 3C018028 */  lui       $at, %hi(D_80286534)
+/* 7E1430 802805B0 AC206534 */  sw        $zero, %lo(D_80286534)($at)
 /* 7E1434 802805B4 30420040 */  andi      $v0, $v0, 0x40
 /* 7E1438 802805B8 10400008 */  beqz      $v0, .L802805DC
 /* 7E143C 802805BC 2407FFFF */   addiu    $a3, $zero, -1
@@ -47,9 +47,9 @@ glabel func_8028051C
 /* 7E1444 802805C4 00031080 */  sll       $v0, $v1, 2
 /* 7E1448 802805C8 00431021 */  addu      $v0, $v0, $v1
 /* 7E144C 802805CC 00021080 */  sll       $v0, $v0, 2
-/* 7E1450 802805D0 3C078009 */  lui       $a3, 0x8009
+/* 7E1450 802805D0 3C078009 */  lui       $a3, %hi(D_8008F072)
 /* 7E1454 802805D4 00E23821 */  addu      $a3, $a3, $v0
-/* 7E1458 802805D8 80E7F072 */  lb        $a3, -0xf8e($a3)
+/* 7E1458 802805D8 80E7F072 */  lb        $a3, %lo(D_8008F072)($a3)
 .L802805DC:
 /* 7E145C 802805DC 8E250000 */  lw        $a1, ($s1)
 /* 7E1460 802805E0 8E460004 */  lw        $a2, 4($s2)
@@ -112,8 +112,8 @@ glabel func_8028051C
 /* 7E1530 802806B0 AE620070 */  sw        $v0, 0x70($s3)
 /* 7E1534 802806B4 0C049640 */  jal       load_string
 /* 7E1538 802806B8 AE600078 */   sw       $zero, 0x78($s3)
-/* 7E153C 802806BC 3C018028 */  lui       $at, 0x8028
-/* 7E1540 802806C0 AC226528 */  sw        $v0, 0x6528($at)
+/* 7E153C 802806BC 3C018028 */  lui       $at, %hi(D_80286528)
+/* 7E1540 802806C0 AC226528 */  sw        $v0, %lo(D_80286528)($at)
 /* 7E1544 802806C4 080A024B */  j         .L8028092C
 /* 7E1548 802806C8 0000102D */   daddu    $v0, $zero, $zero
 .L802806CC:
@@ -121,8 +121,8 @@ glabel func_8028051C
 /* 7E1550 802806D0 24020001 */  addiu     $v0, $zero, 1
 /* 7E1554 802806D4 16020095 */  bne       $s0, $v0, .L8028092C
 /* 7E1558 802806D8 0000102D */   daddu    $v0, $zero, $zero
-/* 7E155C 802806DC 3C028028 */  lui       $v0, 0x8028
-/* 7E1560 802806E0 8C426528 */  lw        $v0, 0x6528($v0)
+/* 7E155C 802806DC 3C028028 */  lui       $v0, %hi(D_80286528)
+/* 7E1560 802806E0 8C426528 */  lw        $v0, %lo(D_80286528)($v0)
 /* 7E1564 802806E4 904204E8 */  lbu       $v0, 0x4e8($v0)
 /* 7E1568 802806E8 14400035 */  bnez      $v0, .L802807C0
 /* 7E156C 802806EC 00000000 */   nop      
@@ -196,8 +196,8 @@ glabel func_8028051C
 /* 7E1664 802807E4 14400051 */  bnez      $v0, .L8028092C
 /* 7E1668 802807E8 0000102D */   daddu    $v0, $zero, $zero
 /* 7E166C 802807EC 8E430000 */  lw        $v1, ($s2)
-/* 7E1670 802807F0 3C018028 */  lui       $at, 0x8028
-/* 7E1674 802807F4 AC206534 */  sw        $zero, 0x6534($at)
+/* 7E1670 802807F0 3C018028 */  lui       $at, %hi(D_80286534)
+/* 7E1674 802807F4 AC206534 */  sw        $zero, %lo(D_80286534)($at)
 /* 7E1678 802807F8 080A0214 */  j         .L80280850
 /* 7E167C 802807FC 2402000A */   addiu    $v0, $zero, 0xa
 .L80280800:
@@ -207,8 +207,8 @@ glabel func_8028051C
 /* 7E168C 8028080C 14400047 */  bnez      $v0, .L8028092C
 /* 7E1690 80280810 0000102D */   daddu    $v0, $zero, $zero
 /* 7E1694 80280814 8E430000 */  lw        $v1, ($s2)
-/* 7E1698 80280818 3C018028 */  lui       $at, 0x8028
-/* 7E169C 8028081C AC306534 */  sw        $s0, 0x6534($at)
+/* 7E1698 80280818 3C018028 */  lui       $at, %hi(D_80286534)
+/* 7E169C 8028081C AC306534 */  sw        $s0, %lo(D_80286534)($at)
 /* 7E16A0 80280820 080A0214 */  j         .L80280850
 /* 7E16A4 80280824 2402000A */   addiu    $v0, $zero, 0xa
 .L80280828:
@@ -219,13 +219,13 @@ glabel func_8028051C
 /* 7E16B8 80280838 0000102D */   daddu    $v0, $zero, $zero
 /* 7E16BC 8028083C 8E430000 */  lw        $v1, ($s2)
 /* 7E16C0 80280840 24020001 */  addiu     $v0, $zero, 1
-/* 7E16C4 80280844 3C018028 */  lui       $at, 0x8028
-/* 7E16C8 80280848 AC226534 */  sw        $v0, 0x6534($at)
+/* 7E16C4 80280844 3C018028 */  lui       $at, %hi(D_80286534)
+/* 7E16C8 80280848 AC226534 */  sw        $v0, %lo(D_80286534)($at)
 /* 7E16CC 8028084C 2402000A */  addiu     $v0, $zero, 0xa
 .L80280850:
 /* 7E16D0 80280850 AE620070 */  sw        $v0, 0x70($s3)
-/* 7E16D4 80280854 3C018028 */  lui       $at, 0x8028
-/* 7E16D8 80280858 AC236530 */  sw        $v1, 0x6530($at)
+/* 7E16D4 80280854 3C018028 */  lui       $at, %hi(D_80286530)
+/* 7E16D8 80280858 AC236530 */  sw        $v1, %lo(D_80286530)($at)
 /* 7E16DC 8028085C 080A024B */  j         .L8028092C
 /* 7E16E0 80280860 0000102D */   daddu    $v0, $zero, $zero
 .L80280864:
@@ -236,17 +236,17 @@ glabel func_8028051C
 /* 7E16F4 80280874 0000102D */   daddu    $v0, $zero, $zero
 /* 7E16F8 80280878 8E430000 */  lw        $v1, ($s2)
 /* 7E16FC 8028087C 24020003 */  addiu     $v0, $zero, 3
-/* 7E1700 80280880 3C018028 */  lui       $at, 0x8028
-/* 7E1704 80280884 AC226534 */  sw        $v0, 0x6534($at)
+/* 7E1700 80280880 3C018028 */  lui       $at, %hi(D_80286534)
+/* 7E1704 80280884 AC226534 */  sw        $v0, %lo(D_80286534)($at)
 /* 7E1708 80280888 AE700070 */  sw        $s0, 0x70($s3)
-/* 7E170C 8028088C 3C018028 */  lui       $at, 0x8028
-/* 7E1710 80280890 AC236530 */  sw        $v1, 0x6530($at)
+/* 7E170C 8028088C 3C018028 */  lui       $at, %hi(D_80286530)
+/* 7E1710 80280890 AC236530 */  sw        $v1, %lo(D_80286530)($at)
 /* 7E1714 80280894 080A024B */  j         .L8028092C
 /* 7E1718 80280898 0000102D */   daddu    $v0, $zero, $zero
 .L8028089C:
 /* 7E171C 8028089C 8E820010 */  lw        $v0, 0x10($s4)
-/* 7E1720 802808A0 3C108028 */  lui       $s0, 0x8028
-/* 7E1724 802808A4 2610652C */  addiu     $s0, $s0, 0x652c
+/* 7E1720 802808A0 3C108028 */  lui       $s0, %hi(D_8028652C)
+/* 7E1724 802808A4 2610652C */  addiu     $s0, $s0, %lo(D_8028652C)
 /* 7E1728 802808A8 1040000E */  beqz      $v0, .L802808E4
 /* 7E172C 802808AC AE000000 */   sw       $zero, ($s0)
 /* 7E1730 802808B0 8C44000C */  lw        $a0, 0xc($v0)
@@ -254,10 +254,10 @@ glabel func_8028051C
 /* 7E1738 802808B8 24050001 */   addiu    $a1, $zero, 1
 /* 7E173C 802808BC 0C0B0CF8 */  jal       start_script
 /* 7E1740 802808C0 0000302D */   daddu    $a2, $zero, $zero
-/* 7E1744 802808C4 3C038028 */  lui       $v1, 0x8028
-/* 7E1748 802808C8 8C636534 */  lw        $v1, 0x6534($v1)
-/* 7E174C 802808CC 3C048028 */  lui       $a0, 0x8028
-/* 7E1750 802808D0 8C846530 */  lw        $a0, 0x6530($a0)
+/* 7E1744 802808C4 3C038028 */  lui       $v1, %hi(D_80286534)
+/* 7E1748 802808C8 8C636534 */  lw        $v1, %lo(D_80286534)($v1)
+/* 7E174C 802808CC 3C048028 */  lui       $a0, %hi(D_80286530)
+/* 7E1750 802808D0 8C846530 */  lw        $a0, %lo(D_80286530)($a0)
 /* 7E1754 802808D4 AE020000 */  sw        $v0, ($s0)
 /* 7E1758 802808D8 AC55008C */  sw        $s5, 0x8c($v0)
 /* 7E175C 802808DC AC430084 */  sw        $v1, 0x84($v0)
@@ -267,8 +267,8 @@ glabel func_8028051C
 /* 7E1768 802808E8 080A024A */  j         .L80280928
 /* 7E176C 802808EC AE620070 */   sw       $v0, 0x70($s3)
 .L802808F0:
-/* 7E1770 802808F0 3C028028 */  lui       $v0, 0x8028
-/* 7E1774 802808F4 8C42652C */  lw        $v0, 0x652c($v0)
+/* 7E1770 802808F0 3C028028 */  lui       $v0, %hi(D_8028652C)
+/* 7E1774 802808F4 8C42652C */  lw        $v0, %lo(D_8028652C)($v0)
 /* 7E1778 802808F8 10400005 */  beqz      $v0, .L80280910
 /* 7E177C 802808FC 00000000 */   nop      
 /* 7E1780 80280900 0C0B1059 */  jal       does_script_exist
diff --git a/asm/nonmatchings/world/script_api/7E0E80/func_80280954.s b/asm/nonmatchings/world/script_api/7E0E80/func_80280954.s
index 17da75e86e..3d4b36a6da 100644
--- a/asm/nonmatchings/world/script_api/7E0E80/func_80280954.s
+++ b/asm/nonmatchings/world/script_api/7E0E80/func_80280954.s
@@ -56,8 +56,8 @@ glabel func_80280954
 /* 7E1888 80280A08 00041140 */   sll      $v0, $a0, 5
 /* 7E188C 80280A0C 00561821 */  addu      $v1, $v0, $s6
 /* 7E1890 80280A10 84620004 */  lh        $v0, 4($v1)
-/* 7E1894 80280A14 3C058009 */  lui       $a1, 0x8009
-/* 7E1898 80280A18 24A5A680 */  addiu     $a1, $a1, -0x5980
+/* 7E1894 80280A14 3C058009 */  lui       $a1, %hi(D_8008A680)
+/* 7E1898 80280A18 24A5A680 */  addiu     $a1, $a1, %lo(D_8008A680)
 /* 7E189C 80280A1C 000210C0 */  sll       $v0, $v0, 3
 /* 7E18A0 80280A20 00451021 */  addu      $v0, $v0, $a1
 /* 7E18A4 80280A24 8C420000 */  lw        $v0, ($v0)
diff --git a/asm/nonmatchings/world/script_api/7E0E80/func_80280BD0.s b/asm/nonmatchings/world/script_api/7E0E80/func_80280BD0.s
index b4e4d7c2fd..392a23a792 100644
--- a/asm/nonmatchings/world/script_api/7E0E80/func_80280BD0.s
+++ b/asm/nonmatchings/world/script_api/7E0E80/func_80280BD0.s
@@ -127,8 +127,8 @@ glabel func_80280BD0
 /* 7E1C10 80280D90 24020001 */  addiu     $v0, $zero, 1
 /* 7E1C14 80280D94 148201A0 */  bne       $a0, $v0, .L80281418
 /* 7E1C18 80280D98 0000102D */   daddu    $v0, $zero, $zero
-/* 7E1C1C 80280D9C 3C028028 */  lui       $v0, 0x8028
-/* 7E1C20 80280DA0 8C426538 */  lw        $v0, 0x6538($v0)
+/* 7E1C1C 80280D9C 3C028028 */  lui       $v0, %hi(D_80286538)
+/* 7E1C20 80280DA0 8C426538 */  lw        $v0, %lo(D_80286538)($v0)
 /* 7E1C24 80280DA4 904304E8 */  lbu       $v1, 0x4e8($v0)
 /* 7E1C28 80280DA8 10640012 */  beq       $v1, $a0, .L80280DF4
 /* 7E1C2C 80280DAC 28620002 */   slti     $v0, $v1, 2
@@ -289,8 +289,8 @@ glabel func_80280BD0
 /* 7E1E54 80280FD4 24020001 */  addiu     $v0, $zero, 1
 /* 7E1E58 80280FD8 1462010F */  bne       $v1, $v0, .L80281418
 /* 7E1E5C 80280FDC 0000102D */   daddu    $v0, $zero, $zero
-/* 7E1E60 80280FE0 3C028028 */  lui       $v0, 0x8028
-/* 7E1E64 80280FE4 8C426538 */  lw        $v0, 0x6538($v0)
+/* 7E1E60 80280FE0 3C028028 */  lui       $v0, %hi(D_80286538)
+/* 7E1E64 80280FE4 8C426538 */  lw        $v0, %lo(D_80286538)($v0)
 /* 7E1E68 80280FE8 904204E8 */  lbu       $v0, 0x4e8($v0)
 /* 7E1E6C 80280FEC 1440001D */  bnez      $v0, .L80281064
 /* 7E1E70 80280FF0 00000000 */   nop      
@@ -347,8 +347,8 @@ glabel func_80280BD0
 /* 7E1F2C 802810AC 24020001 */  addiu     $v0, $zero, 1
 /* 7E1F30 802810B0 146200D9 */  bne       $v1, $v0, .L80281418
 /* 7E1F34 802810B4 0000102D */   daddu    $v0, $zero, $zero
-/* 7E1F38 802810B8 3C028028 */  lui       $v0, 0x8028
-/* 7E1F3C 802810BC 8C426538 */  lw        $v0, 0x6538($v0)
+/* 7E1F38 802810B8 3C028028 */  lui       $v0, %hi(D_80286538)
+/* 7E1F3C 802810BC 8C426538 */  lw        $v0, %lo(D_80286538)($v0)
 /* 7E1F40 802810C0 904204E8 */  lbu       $v0, 0x4e8($v0)
 /* 7E1F44 802810C4 14400009 */  bnez      $v0, .L802810EC
 /* 7E1F48 802810C8 00000000 */   nop      
@@ -443,8 +443,8 @@ glabel func_80280BD0
 /* 7E2084 80281204 24020001 */  addiu     $v0, $zero, 1
 /* 7E2088 80281208 14620083 */  bne       $v1, $v0, .L80281418
 /* 7E208C 8028120C 0000102D */   daddu    $v0, $zero, $zero
-/* 7E2090 80281210 3C028028 */  lui       $v0, 0x8028
-/* 7E2094 80281214 8C426538 */  lw        $v0, 0x6538($v0)
+/* 7E2090 80281210 3C028028 */  lui       $v0, %hi(D_80286538)
+/* 7E2094 80281214 8C426538 */  lw        $v0, %lo(D_80286538)($v0)
 /* 7E2098 80281218 904204E8 */  lbu       $v0, 0x4e8($v0)
 /* 7E209C 8028121C 14400063 */  bnez      $v0, .L802813AC
 /* 7E20A0 80281220 00000000 */   nop      
@@ -540,8 +540,8 @@ glabel func_80280BD0
 /* 7E21D4 80281354 AE220070 */  sw        $v0, 0x70($s1)
 /* 7E21D8 80281358 0C049640 */  jal       load_string
 /* 7E21DC 8028135C AE200078 */   sw       $zero, 0x78($s1)
-/* 7E21E0 80281360 3C018028 */  lui       $at, 0x8028
-/* 7E21E4 80281364 AC226538 */  sw        $v0, 0x6538($at)
+/* 7E21E0 80281360 3C018028 */  lui       $at, %hi(D_80286538)
+/* 7E21E4 80281364 AC226538 */  sw        $v0, %lo(D_80286538)($at)
 /* 7E21E8 80281368 080A0506 */  j         .L80281418
 /* 7E21EC 8028136C 0000102D */   daddu    $v0, $zero, $zero
 .L80281370:
@@ -549,8 +549,8 @@ glabel func_80280BD0
 /* 7E21F4 80281374 24020001 */  addiu     $v0, $zero, 1
 /* 7E21F8 80281378 14620027 */  bne       $v1, $v0, .L80281418
 /* 7E21FC 8028137C 0000102D */   daddu    $v0, $zero, $zero
-/* 7E2200 80281380 3C028028 */  lui       $v0, 0x8028
-/* 7E2204 80281384 8C426538 */  lw        $v0, 0x6538($v0)
+/* 7E2200 80281380 3C028028 */  lui       $v0, %hi(D_80286538)
+/* 7E2204 80281384 8C426538 */  lw        $v0, %lo(D_80286538)($v0)
 /* 7E2208 80281388 904204E8 */  lbu       $v0, 0x4e8($v0)
 /* 7E220C 8028138C 14400007 */  bnez      $v0, .L802813AC
 /* 7E2210 80281390 00000000 */   nop      
diff --git a/asm/nonmatchings/world/script_api/7E2AA0/MakeDoorAdvanced.s b/asm/nonmatchings/world/script_api/7E2AA0/MakeDoorAdvanced.s
index 96d43f70bf..41ae1e2be9 100644
--- a/asm/nonmatchings/world/script_api/7E2AA0/MakeDoorAdvanced.s
+++ b/asm/nonmatchings/world/script_api/7E2AA0/MakeDoorAdvanced.s
@@ -89,9 +89,9 @@ glabel MakeDoorAdvanced
 /* 7E2C78 80281DF8 2C620008 */  sltiu     $v0, $v1, 8
 /* 7E2C7C 80281DFC 104000F0 */  beqz      $v0, .L802821C0
 /* 7E2C80 80281E00 00031080 */   sll      $v0, $v1, 2
-/* 7E2C84 80281E04 3C018028 */  lui       $at, 0x8028
+/* 7E2C84 80281E04 3C018028 */  lui       $at, %hi(D_80286500)
 /* 7E2C88 80281E08 00220821 */  addu      $at, $at, $v0
-/* 7E2C8C 80281E0C 8C226500 */  lw        $v0, 0x6500($at)
+/* 7E2C8C 80281E0C 8C226500 */  lw        $v0, %lo(D_80286500)($at)
 /* 7E2C90 80281E10 00400008 */  jr        $v0
 /* 7E2C94 80281E14 00000000 */   nop      
 /* 7E2C98 80281E18 C7AA0024 */  lwc1      $f10, 0x24($sp)
@@ -332,8 +332,8 @@ glabel MakeDoorAdvanced
 .L802821BC:
 /* 7E303C 802821BC E6400018 */  swc1      $f0, 0x18($s2)
 .L802821C0:
-/* 7E3040 802821C0 3C048028 */  lui       $a0, 0x8028
-/* 7E3044 802821C4 248447D4 */  addiu     $a0, $a0, 0x47d4
+/* 7E3040 802821C0 3C048028 */  lui       $a0, %hi(D_802847D4)
+/* 7E3044 802821C4 248447D4 */  addiu     $a0, $a0, %lo(D_802847D4)
 /* 7E3048 802821C8 3C02800B */  lui       $v0, %hi(gCameras)
 /* 7E304C 802821CC 24421D80 */  addiu     $v0, $v0, %lo(gCameras)
 /* 7E3050 802821D0 C6400014 */  lwc1      $f0, 0x14($s2)
@@ -365,13 +365,13 @@ glabel MakeDoorAdvanced
 /* 7E30B8 80282238 32620800 */  andi      $v0, $s3, 0x800
 /* 7E30BC 8028223C 10400005 */  beqz      $v0, .L80282254
 /* 7E30C0 80282240 24050040 */   addiu    $a1, $zero, 0x40
-/* 7E30C4 80282244 3C048028 */  lui       $a0, 0x8028
-/* 7E30C8 80282248 24844F80 */  addiu     $a0, $a0, 0x4f80
+/* 7E30C4 80282244 3C048028 */  lui       $a0, %hi(D_80284F80)
+/* 7E30C8 80282248 24844F80 */  addiu     $a0, $a0, %lo(D_80284F80)
 /* 7E30CC 8028224C 080A0899 */  j         .L80282264
 /* 7E30D0 80282250 02C0302D */   daddu    $a2, $s6, $zero
 .L80282254:
-/* 7E30D4 80282254 3C048028 */  lui       $a0, 0x8028
-/* 7E30D8 80282258 24844F80 */  addiu     $a0, $a0, 0x4f80
+/* 7E30D4 80282254 3C048028 */  lui       $a0, %hi(D_80284F80)
+/* 7E30D8 80282258 24844F80 */  addiu     $a0, $a0, %lo(D_80284F80)
 /* 7E30DC 8028225C 24050100 */  addiu     $a1, $zero, 0x100
 /* 7E30E0 80282260 02C0302D */  daddu     $a2, $s6, $zero
 .L80282264:
diff --git a/asm/nonmatchings/world/script_api/7E3700/CreatePushBlockGrid.s b/asm/nonmatchings/world/script_api/7E3700/CreatePushBlockGrid.s
index bafb271ef5..fd4f2a094f 100644
--- a/asm/nonmatchings/world/script_api/7E3700/CreatePushBlockGrid.s
+++ b/asm/nonmatchings/world/script_api/7E3700/CreatePushBlockGrid.s
@@ -54,9 +54,9 @@ glabel CreatePushBlockGrid
 /* 7E4224 802833A4 0040982D */   daddu    $s3, $v0, $zero
 /* 7E4228 802833A8 00129080 */  sll       $s2, $s2, 2
 /* 7E422C 802833AC 0040802D */  daddu     $s0, $v0, $zero
-/* 7E4230 802833B0 3C01802E */  lui       $at, 0x802e
+/* 7E4230 802833B0 3C01802E */  lui       $at, %hi(D_802DBC88)
 /* 7E4234 802833B4 00320821 */  addu      $at, $at, $s2
-/* 7E4238 802833B8 AC30BC88 */  sw        $s0, -0x4378($at)
+/* 7E4238 802833B8 AC30BC88 */  sw        $s0, %lo(D_802DBC88)($at)
 /* 7E423C 802833BC 0C00AB0A */  jal       general_heap_malloc
 /* 7E4240 802833C0 0220202D */   daddu    $a0, $s1, $zero
 /* 7E4244 802833C4 1660000D */  bnez      $s3, .L802833FC
diff --git a/asm/nonmatchings/world/script_api/7E3700/GetGridIndexFromPos.s b/asm/nonmatchings/world/script_api/7E3700/GetGridIndexFromPos.s
index 659b71eac8..f27013fbf2 100644
--- a/asm/nonmatchings/world/script_api/7E3700/GetGridIndexFromPos.s
+++ b/asm/nonmatchings/world/script_api/7E3700/GetGridIndexFromPos.s
@@ -27,9 +27,9 @@ glabel GetGridIndexFromPos
 /* 7E4590 80283710 0C0B1EAF */  jal       get_variable
 /* 7E4594 80283714 0260202D */   daddu    $a0, $s3, $zero
 /* 7E4598 80283718 00118880 */  sll       $s1, $s1, 2
-/* 7E459C 8028371C 3C04802E */  lui       $a0, 0x802e
+/* 7E459C 8028371C 3C04802E */  lui       $a0, %hi(D_802DBC88)
 /* 7E45A0 80283720 00912021 */  addu      $a0, $a0, $s1
-/* 7E45A4 80283724 8C84BC88 */  lw        $a0, -0x4378($a0)
+/* 7E45A4 80283724 8C84BC88 */  lw        $a0, %lo(D_802DBC88)($a0)
 /* 7E45A8 80283728 3C0651EB */  lui       $a2, 0x51eb
 /* 7E45AC 8028372C 8C830008 */  lw        $v1, 8($a0)
 /* 7E45B0 80283730 34C6851F */  ori       $a2, $a2, 0x851f
diff --git a/asm/nonmatchings/world/script_api/7E3700/GetPushBlock.s b/asm/nonmatchings/world/script_api/7E3700/GetPushBlock.s
index a977ae3e7f..bec54e5dc5 100644
--- a/asm/nonmatchings/world/script_api/7E3700/GetPushBlock.s
+++ b/asm/nonmatchings/world/script_api/7E3700/GetPushBlock.s
@@ -25,9 +25,9 @@ glabel GetPushBlock
 /* 7E4490 80283610 0040982D */   daddu    $s3, $v0, $zero
 /* 7E4494 80283614 00118880 */  sll       $s1, $s1, 2
 /* 7E4498 80283618 26100004 */  addiu     $s0, $s0, 4
-/* 7E449C 8028361C 3C12802E */  lui       $s2, 0x802e
+/* 7E449C 8028361C 3C12802E */  lui       $s2, %hi(D_802DBC88)
 /* 7E44A0 80283620 02519021 */  addu      $s2, $s2, $s1
-/* 7E44A4 80283624 8E52BC88 */  lw        $s2, -0x4378($s2)
+/* 7E44A4 80283624 8E52BC88 */  lw        $s2, %lo(D_802DBC88)($s2)
 /* 7E44A8 80283628 92430004 */  lbu       $v1, 4($s2)
 /* 7E44AC 8028362C 8E100000 */  lw        $s0, ($s0)
 /* 7E44B0 80283630 0263182A */  slt       $v1, $s3, $v1
diff --git a/asm/nonmatchings/world/script_api/7E3700/SetPushBlock.s b/asm/nonmatchings/world/script_api/7E3700/SetPushBlock.s
index 6be07e2913..da7ad87b24 100644
--- a/asm/nonmatchings/world/script_api/7E3700/SetPushBlock.s
+++ b/asm/nonmatchings/world/script_api/7E3700/SetPushBlock.s
@@ -28,9 +28,9 @@ glabel SetPushBlock
 /* 7E4358 802834D8 0C0B1EAF */  jal       get_variable
 /* 7E435C 802834DC 0040802D */   daddu    $s0, $v0, $zero
 /* 7E4360 802834E0 00118880 */  sll       $s1, $s1, 2
-/* 7E4364 802834E4 3C01802E */  lui       $at, 0x802e
+/* 7E4364 802834E4 3C01802E */  lui       $at, %hi(D_802DBC88)
 /* 7E4368 802834E8 00310821 */  addu      $at, $at, $s1
-/* 7E436C 802834EC 8C31BC88 */  lw        $s1, -0x4378($at)
+/* 7E436C 802834EC 8C31BC88 */  lw        $s1, %lo(D_802DBC88)($at)
 /* 7E4370 802834F0 92230004 */  lbu       $v1, 4($s1)
 /* 7E4374 802834F4 02030018 */  mult      $s0, $v1
 /* 7E4378 802834F8 8E230000 */  lw        $v1, ($s1)
@@ -41,8 +41,8 @@ glabel SetPushBlock
 /* 7E438C 8028350C 24030001 */  addiu     $v1, $zero, 1
 /* 7E4390 80283510 14430023 */  bne       $v0, $v1, .L802835A0
 /* 7E4394 80283514 3C028000 */   lui      $v0, 0x8000
-/* 7E4398 80283518 3C04802F */  lui       $a0, 0x802f
-/* 7E439C 8028351C 2484A2BC */  addiu     $a0, $a0, -0x5d44
+/* 7E4398 80283518 3C04802F */  lui       $a0, %hi(D_802EA2BC)
+/* 7E439C 8028351C 2484A2BC */  addiu     $a0, $a0, %lo(D_802EA2BC)
 /* 7E43A0 80283520 8E250008 */  lw        $a1, 8($s1)
 /* 7E43A4 80283524 8E26000C */  lw        $a2, 0xc($s1)
 /* 7E43A8 80283528 8E270010 */  lw        $a3, 0x10($s1)
@@ -64,8 +64,8 @@ glabel SetPushBlock
 /* 7E43E8 80283568 00E23821 */  addu      $a3, $a3, $v0
 /* 7E43EC 8028356C 0C044631 */  jal       create_entity
 /* 7E43F0 80283570 24E7000C */   addiu    $a3, $a3, 0xc
-/* 7E43F4 80283574 3C048028 */  lui       $a0, 0x8028
-/* 7E43F8 80283578 24845674 */  addiu     $a0, $a0, 0x5674
+/* 7E43F4 80283574 3C048028 */  lui       $a0, %hi(D_80285674)
+/* 7E43F8 80283578 24845674 */  addiu     $a0, $a0, %lo(D_80285674)
 /* 7E43FC 8028357C 24050040 */  addiu     $a1, $zero, 0x40
 /* 7E4400 80283580 0040802D */  daddu     $s0, $v0, $zero
 /* 7E4404 80283584 26064000 */  addiu     $a2, $s0, 0x4000
diff --git a/asm/nonmatchings/world/script_api/7E3700/SetPushBlockFallEffect.s b/asm/nonmatchings/world/script_api/7E3700/SetPushBlockFallEffect.s
index 2060f0f909..ae724f7a9c 100644
--- a/asm/nonmatchings/world/script_api/7E3700/SetPushBlockFallEffect.s
+++ b/asm/nonmatchings/world/script_api/7E3700/SetPushBlockFallEffect.s
@@ -16,9 +16,9 @@ glabel SetPushBlockFallEffect
 /* 7E4658 802837D8 0C0B1EAF */  jal       get_variable
 /* 7E465C 802837DC 0040802D */   daddu    $s0, $v0, $zero
 /* 7E4660 802837E0 00108080 */  sll       $s0, $s0, 2
-/* 7E4664 802837E4 3C03802E */  lui       $v1, 0x802e
+/* 7E4664 802837E4 3C03802E */  lui       $v1, %hi(D_802DBC88)
 /* 7E4668 802837E8 00701821 */  addu      $v1, $v1, $s0
-/* 7E466C 802837EC 8C63BC88 */  lw        $v1, -0x4378($v1)
+/* 7E466C 802837EC 8C63BC88 */  lw        $v1, %lo(D_802DBC88)($v1)
 /* 7E4670 802837F0 AC620014 */  sw        $v0, 0x14($v1)
 /* 7E4674 802837F4 8FBF0018 */  lw        $ra, 0x18($sp)
 /* 7E4678 802837F8 8FB10014 */  lw        $s1, 0x14($sp)
diff --git a/asm/nonmatchings/world/script_api/7E3700/func_802828DC.s b/asm/nonmatchings/world/script_api/7E3700/func_802828DC.s
index bf3521561b..874ef40a5f 100644
--- a/asm/nonmatchings/world/script_api/7E3700/func_802828DC.s
+++ b/asm/nonmatchings/world/script_api/7E3700/func_802828DC.s
@@ -47,9 +47,9 @@ glabel func_802828DC
 .L80282984:
 /* 7E3804 80282984 8E420070 */  lw        $v0, 0x70($s2)
 /* 7E3808 80282988 00021080 */  sll       $v0, $v0, 2
-/* 7E380C 8028298C 3C018028 */  lui       $at, 0x8028
+/* 7E380C 8028298C 3C018028 */  lui       $at, %hi(D_80285640)
 /* 7E3810 80282990 00220821 */  addu      $at, $at, $v0
-/* 7E3814 80282994 C4245640 */  lwc1      $f4, 0x5640($at)
+/* 7E3814 80282994 C4245640 */  lwc1      $f4, %lo(D_80285640)($at)
 /* 7E3818 80282998 C642009C */  lwc1      $f2, 0x9c($s2)
 /* 7E381C 8028299C 468010A0 */  cvt.s.w   $f2, $f2
 /* 7E3820 802829A0 46041082 */  mul.s     $f2, $f2, $f4
diff --git a/asm/nonmatchings/world/script_api/7E3700/func_80282C40.s b/asm/nonmatchings/world/script_api/7E3700/func_80282C40.s
index 23ea3d1d15..4dffae6e7f 100644
--- a/asm/nonmatchings/world/script_api/7E3700/func_80282C40.s
+++ b/asm/nonmatchings/world/script_api/7E3700/func_80282C40.s
@@ -82,9 +82,9 @@ glabel func_80282C40
 /* 7E3BEC 80282D6C 3C0141C8 */  lui       $at, 0x41c8
 /* 7E3BF0 80282D70 44813000 */  mtc1      $at, $f6
 /* 7E3BF4 80282D74 00021080 */  sll       $v0, $v0, 2
-/* 7E3BF8 80282D78 3C018028 */  lui       $at, 0x8028
+/* 7E3BF8 80282D78 3C018028 */  lui       $at, %hi(D_80285640)
 /* 7E3BFC 80282D7C 00220821 */  addu      $at, $at, $v0
-/* 7E3C00 80282D80 C4225640 */  lwc1      $f2, 0x5640($at)
+/* 7E3C00 80282D80 C4225640 */  lwc1      $f2, %lo(D_80285640)($at)
 /* 7E3C04 80282D84 46061082 */  mul.s     $f2, $f2, $f6
 /* 7E3C08 80282D88 00000000 */  nop       
 /* 7E3C0C 80282D8C C6600084 */  lwc1      $f0, 0x84($s3)
diff --git a/asm/nonmatchings/world/script_api/7E3700/func_80283D00.s b/asm/nonmatchings/world/script_api/7E3700/func_80283D00.s
index cac5108f20..c2b0860b88 100644
--- a/asm/nonmatchings/world/script_api/7E3700/func_80283D00.s
+++ b/asm/nonmatchings/world/script_api/7E3700/func_80283D00.s
@@ -6,28 +6,28 @@ glabel func_80283D00
 /* 7E4B84 80283D04 8CA20090 */  lw        $v0, 0x90($a1)
 /* 7E4B88 80283D08 04400009 */  bltz      $v0, .L80283D30
 /* 7E4B8C 80283D0C 2403FFFF */   addiu    $v1, $zero, -1
-/* 7E4B90 80283D10 3C02802E */  lui       $v0, 0x802e
-/* 7E4B94 80283D14 2442BD28 */  addiu     $v0, $v0, -0x42d8
+/* 7E4B90 80283D10 3C02802E */  lui       $v0, %hi(D_802DBD28)
+/* 7E4B94 80283D14 2442BD28 */  addiu     $v0, $v0, %lo(D_802DBD28)
 /* 7E4B98 80283D18 8CA4008C */  lw        $a0, 0x8c($a1)
 /* 7E4B9C 80283D1C AC430004 */  sw        $v1, 4($v0)
-/* 7E4BA0 80283D20 3C01802E */  lui       $at, 0x802e
-/* 7E4BA4 80283D24 AC23BC7C */  sw        $v1, -0x4384($at)
+/* 7E4BA0 80283D20 3C01802E */  lui       $at, %hi(D_802DBC7C)
+/* 7E4BA4 80283D24 AC23BC7C */  sw        $v1, %lo(D_802DBC7C)($at)
 /* 7E4BA8 80283D28 080A0F55 */  j         .L80283D54
 /* 7E4BAC 80283D2C AC440000 */   sw       $a0, ($v0)
 .L80283D30:
-/* 7E4BB0 80283D30 3C02802E */  lui       $v0, 0x802e
-/* 7E4BB4 80283D34 2442BC7C */  addiu     $v0, $v0, -0x4384
+/* 7E4BB0 80283D30 3C02802E */  lui       $v0, %hi(D_802DBC7C)
+/* 7E4BB4 80283D34 2442BC7C */  addiu     $v0, $v0, %lo(D_802DBC7C)
 /* 7E4BB8 80283D38 8CA4008C */  lw        $a0, 0x8c($a1)
 /* 7E4BBC 80283D3C AC430004 */  sw        $v1, 4($v0)
-/* 7E4BC0 80283D40 3C01802E */  lui       $at, 0x802e
-/* 7E4BC4 80283D44 AC23BD28 */  sw        $v1, -0x42d8($at)
+/* 7E4BC0 80283D40 3C01802E */  lui       $at, %hi(D_802DBD28)
+/* 7E4BC4 80283D44 AC23BD28 */  sw        $v1, %lo(D_802DBD28)($at)
 /* 7E4BC8 80283D48 AC440000 */  sw        $a0, ($v0)
-/* 7E4BCC 80283D4C 3C02802E */  lui       $v0, 0x802e
-/* 7E4BD0 80283D50 2442BD28 */  addiu     $v0, $v0, -0x42d8
+/* 7E4BCC 80283D4C 3C02802E */  lui       $v0, %hi(D_802DBD28)
+/* 7E4BD0 80283D50 2442BD28 */  addiu     $v0, $v0, %lo(D_802DBD28)
 .L80283D54:
 /* 7E4BD4 80283D54 ACA2008C */  sw        $v0, 0x8c($a1)
-/* 7E4BD8 80283D58 3C02802E */  lui       $v0, 0x802e
-/* 7E4BDC 80283D5C 2442BC7C */  addiu     $v0, $v0, -0x4384
+/* 7E4BD8 80283D58 3C02802E */  lui       $v0, %hi(D_802DBC7C)
+/* 7E4BDC 80283D5C 2442BC7C */  addiu     $v0, $v0, %lo(D_802DBC7C)
 /* 7E4BE0 80283D60 ACA20090 */  sw        $v0, 0x90($a1)
 /* 7E4BE4 80283D64 03E00008 */  jr        $ra
 /* 7E4BE8 80283D68 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/script_api/7E3700/func_80283D6C.s b/asm/nonmatchings/world/script_api/7E3700/func_80283D6C.s
index c14c4cbc3f..13505495ba 100644
--- a/asm/nonmatchings/world/script_api/7E3700/func_80283D6C.s
+++ b/asm/nonmatchings/world/script_api/7E3700/func_80283D6C.s
@@ -7,33 +7,33 @@ glabel func_80283D6C
 /* 7E4BF4 80283D74 0440000C */  bltz      $v0, .L80283DA8
 /* 7E4BF8 80283D78 00000000 */   nop      
 /* 7E4BFC 80283D7C 8CA2008C */  lw        $v0, 0x8c($a1)
-/* 7E4C00 80283D80 3C03802E */  lui       $v1, 0x802e
-/* 7E4C04 80283D84 2463BD28 */  addiu     $v1, $v1, -0x42d8
+/* 7E4C00 80283D80 3C03802E */  lui       $v1, %hi(D_802DBD28)
+/* 7E4C04 80283D84 2463BD28 */  addiu     $v1, $v1, %lo(D_802DBD28)
 /* 7E4C08 80283D88 AC620000 */  sw        $v0, ($v1)
 /* 7E4C0C 80283D8C 8CA40094 */  lw        $a0, 0x94($a1)
 /* 7E4C10 80283D90 2402FFFF */  addiu     $v0, $zero, -1
 /* 7E4C14 80283D94 AC620008 */  sw        $v0, 8($v1)
-/* 7E4C18 80283D98 3C01802E */  lui       $at, 0x802e
-/* 7E4C1C 80283D9C AC22BC7C */  sw        $v0, -0x4384($at)
+/* 7E4C18 80283D98 3C01802E */  lui       $at, %hi(D_802DBC7C)
+/* 7E4C1C 80283D9C AC22BC7C */  sw        $v0, %lo(D_802DBC7C)($at)
 /* 7E4C20 80283DA0 080A0F74 */  j         .L80283DD0
 /* 7E4C24 80283DA4 AC640004 */   sw       $a0, 4($v1)
 .L80283DA8:
 /* 7E4C28 80283DA8 8CA2008C */  lw        $v0, 0x8c($a1)
-/* 7E4C2C 80283DAC 3C03802E */  lui       $v1, 0x802e
-/* 7E4C30 80283DB0 2463BC7C */  addiu     $v1, $v1, -0x4384
+/* 7E4C2C 80283DAC 3C03802E */  lui       $v1, %hi(D_802DBC7C)
+/* 7E4C30 80283DB0 2463BC7C */  addiu     $v1, $v1, %lo(D_802DBC7C)
 /* 7E4C34 80283DB4 AC620000 */  sw        $v0, ($v1)
 /* 7E4C38 80283DB8 8CA40094 */  lw        $a0, 0x94($a1)
 /* 7E4C3C 80283DBC 2402FFFF */  addiu     $v0, $zero, -1
 /* 7E4C40 80283DC0 AC620008 */  sw        $v0, 8($v1)
-/* 7E4C44 80283DC4 3C01802E */  lui       $at, 0x802e
-/* 7E4C48 80283DC8 AC22BD28 */  sw        $v0, -0x42d8($at)
+/* 7E4C44 80283DC4 3C01802E */  lui       $at, %hi(D_802DBD28)
+/* 7E4C48 80283DC8 AC22BD28 */  sw        $v0, %lo(D_802DBD28)($at)
 /* 7E4C4C 80283DCC AC640004 */  sw        $a0, 4($v1)
 .L80283DD0:
-/* 7E4C50 80283DD0 3C02802E */  lui       $v0, 0x802e
-/* 7E4C54 80283DD4 2442BD28 */  addiu     $v0, $v0, -0x42d8
+/* 7E4C50 80283DD0 3C02802E */  lui       $v0, %hi(D_802DBD28)
+/* 7E4C54 80283DD4 2442BD28 */  addiu     $v0, $v0, %lo(D_802DBD28)
 /* 7E4C58 80283DD8 ACA2008C */  sw        $v0, 0x8c($a1)
-/* 7E4C5C 80283DDC 3C02802E */  lui       $v0, 0x802e
-/* 7E4C60 80283DE0 2442BC7C */  addiu     $v0, $v0, -0x4384
+/* 7E4C5C 80283DDC 3C02802E */  lui       $v0, %hi(D_802DBC7C)
+/* 7E4C60 80283DE0 2442BC7C */  addiu     $v0, $v0, %lo(D_802DBC7C)
 /* 7E4C64 80283DE4 ACA20090 */  sw        $v0, 0x90($a1)
 /* 7E4C68 80283DE8 03E00008 */  jr        $ra
 /* 7E4C6C 80283DEC 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/world/script_api/7E3700/func_80283DF0.s b/asm/nonmatchings/world/script_api/7E3700/func_80283DF0.s
index 987b888572..bb9bc93942 100644
--- a/asm/nonmatchings/world/script_api/7E3700/func_80283DF0.s
+++ b/asm/nonmatchings/world/script_api/7E3700/func_80283DF0.s
@@ -2,15 +2,15 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80283DF0
-/* 7E4C70 80283DF0 3C03802E */  lui       $v1, 0x802e
-/* 7E4C74 80283DF4 2463BD28 */  addiu     $v1, $v1, -0x42d8
+/* 7E4C70 80283DF0 3C03802E */  lui       $v1, %hi(D_802DBD28)
+/* 7E4C74 80283DF4 2463BD28 */  addiu     $v1, $v1, %lo(D_802DBD28)
 /* 7E4C78 80283DF8 8C82008C */  lw        $v0, 0x8c($a0)
 /* 7E4C7C 80283DFC 2406FFFF */  addiu     $a2, $zero, -1
 /* 7E4C80 80283E00 AC660004 */  sw        $a2, 4($v1)
 /* 7E4C84 80283E04 AC620000 */  sw        $v0, ($v1)
 /* 7E4C88 80283E08 8C850090 */  lw        $a1, 0x90($a0)
-/* 7E4C8C 80283E0C 3C02802E */  lui       $v0, 0x802e
-/* 7E4C90 80283E10 2442BC7C */  addiu     $v0, $v0, -0x4384
+/* 7E4C8C 80283E0C 3C02802E */  lui       $v0, %hi(D_802DBC7C)
+/* 7E4C90 80283E10 2442BC7C */  addiu     $v0, $v0, %lo(D_802DBC7C)
 /* 7E4C94 80283E14 AC460004 */  sw        $a2, 4($v0)
 /* 7E4C98 80283E18 AC450000 */  sw        $a1, ($v0)
 /* 7E4C9C 80283E1C AC820090 */  sw        $v0, 0x90($a0)
diff --git a/asm/nonmatchings/world/script_api/7E3700/func_80283E2C.s b/asm/nonmatchings/world/script_api/7E3700/func_80283E2C.s
index 6b1f36df10..86f1fe08fd 100644
--- a/asm/nonmatchings/world/script_api/7E3700/func_80283E2C.s
+++ b/asm/nonmatchings/world/script_api/7E3700/func_80283E2C.s
@@ -3,16 +3,16 @@
 
 glabel func_80283E2C
 /* 7E4CAC 80283E2C 8C82008C */  lw        $v0, 0x8c($a0)
-/* 7E4CB0 80283E30 3C05802E */  lui       $a1, 0x802e
-/* 7E4CB4 80283E34 24A5BD28 */  addiu     $a1, $a1, -0x42d8
+/* 7E4CB0 80283E30 3C05802E */  lui       $a1, %hi(D_802DBD28)
+/* 7E4CB4 80283E34 24A5BD28 */  addiu     $a1, $a1, %lo(D_802DBD28)
 /* 7E4CB8 80283E38 ACA20000 */  sw        $v0, ($a1)
 /* 7E4CBC 80283E3C 8C820094 */  lw        $v0, 0x94($a0)
 /* 7E4CC0 80283E40 2406FFFF */  addiu     $a2, $zero, -1
 /* 7E4CC4 80283E44 ACA60008 */  sw        $a2, 8($a1)
 /* 7E4CC8 80283E48 ACA20004 */  sw        $v0, 4($a1)
 /* 7E4CCC 80283E4C 8C830090 */  lw        $v1, 0x90($a0)
-/* 7E4CD0 80283E50 3C02802E */  lui       $v0, 0x802e
-/* 7E4CD4 80283E54 2442BC7C */  addiu     $v0, $v0, -0x4384
+/* 7E4CD0 80283E50 3C02802E */  lui       $v0, %hi(D_802DBC7C)
+/* 7E4CD4 80283E54 2442BC7C */  addiu     $v0, $v0, %lo(D_802DBC7C)
 /* 7E4CD8 80283E58 AC430000 */  sw        $v1, ($v0)
 /* 7E4CDC 80283E5C 8C830098 */  lw        $v1, 0x98($a0)
 /* 7E4CE0 80283E60 AC460008 */  sw        $a2, 8($v0)
diff --git a/asm/nonmatchings/world/world/func_8005904C.s b/asm/nonmatchings/world/world/func_8005904C.s
index a3c371c8e1..fb8d8578e8 100644
--- a/asm/nonmatchings/world/world/func_8005904C.s
+++ b/asm/nonmatchings/world/world/func_8005904C.s
@@ -15,41 +15,41 @@ glabel func_8005904C
 /* 34474 80059074 8E660000 */  lw        $a2, ($s3)
 /* 34478 80059078 10400021 */  beqz      $v0, .L80059100
 /* 3447C 8005907C 00051080 */   sll      $v0, $a1, 2
-/* 34480 80059080 3C01800A */  lui       $at, 0x800a
+/* 34480 80059080 3C01800A */  lui       $at, %hi(D_80098940)
 /* 34484 80059084 00220821 */  addu      $at, $at, $v0
-/* 34488 80059088 8C228940 */  lw        $v0, -0x76c0($at)
+/* 34488 80059088 8C228940 */  lw        $v0, %lo(D_80098940)($at)
 /* 3448C 8005908C 00400008 */  jr        $v0
 /* 34490 80059090 00000000 */   nop      
-/* 34494 80059094 3C048008 */  lui       $a0, 0x8008
+/* 34494 80059094 3C048008 */  lui       $a0, %hi(D_8007EFE0)
 /* 34498 80059098 08016442 */  j         .L80059108
-/* 3449C 8005909C 2484EFE0 */   addiu    $a0, $a0, -0x1020
-/* 344A0 800590A0 3C048008 */  lui       $a0, 0x8008
+/* 3449C 8005909C 2484EFE0 */   addiu    $a0, $a0, %lo(D_8007EFE0)
+/* 344A0 800590A0 3C048008 */  lui       $a0, %hi(D_8007F158)
 /* 344A4 800590A4 08016442 */  j         .L80059108
-/* 344A8 800590A8 2484F158 */   addiu    $a0, $a0, -0xea8
-/* 344AC 800590AC 3C048008 */  lui       $a0, 0x8008
+/* 344A8 800590A8 2484F158 */   addiu    $a0, $a0, %lo(D_8007F158)
+/* 344AC 800590AC 3C048008 */  lui       $a0, %hi(D_8007F180)
 /* 344B0 800590B0 08016442 */  j         .L80059108
-/* 344B4 800590B4 2484F180 */   addiu    $a0, $a0, -0xe80
-/* 344B8 800590B8 3C048008 */  lui       $a0, 0x8008
+/* 344B4 800590B4 2484F180 */   addiu    $a0, $a0, %lo(D_8007F180)
+/* 344B8 800590B8 3C048008 */  lui       $a0, %hi(D_8007F1A8)
 /* 344BC 800590BC 08016442 */  j         .L80059108
-/* 344C0 800590C0 2484F1A8 */   addiu    $a0, $a0, -0xe58
-/* 344C4 800590C4 3C048008 */  lui       $a0, 0x8008
+/* 344C0 800590C0 2484F1A8 */   addiu    $a0, $a0, %lo(D_8007F1A8)
+/* 344C4 800590C4 3C048008 */  lui       $a0, %hi(D_8007F1F8)
 /* 344C8 800590C8 08016442 */  j         .L80059108
-/* 344CC 800590CC 8C84F1F8 */   lw       $a0, -0xe08($a0)
-/* 344D0 800590D0 3C048008 */  lui       $a0, 0x8008
+/* 344CC 800590CC 8C84F1F8 */   lw       $a0, %lo(D_8007F1F8)($a0)
+/* 344D0 800590D0 3C048008 */  lui       $a0, %hi(D_8007F1FC)
 /* 344D4 800590D4 08016442 */  j         .L80059108
-/* 344D8 800590D8 8C84F1FC */   lw       $a0, -0xe04($a0)
-/* 344DC 800590DC 3C048008 */  lui       $a0, 0x8008
+/* 344D8 800590D8 8C84F1FC */   lw       $a0, %lo(D_8007F1FC)($a0)
+/* 344DC 800590DC 3C048008 */  lui       $a0, %hi(D_8007F200)
 /* 344E0 800590E0 08016442 */  j         .L80059108
-/* 344E4 800590E4 8C84F200 */   lw       $a0, -0xe00($a0)
-/* 344E8 800590E8 3C048008 */  lui       $a0, 0x8008
+/* 344E4 800590E4 8C84F200 */   lw       $a0, %lo(D_8007F200)($a0)
+/* 344E8 800590E8 3C048008 */  lui       $a0, %hi(D_8007F204)
 /* 344EC 800590EC 08016442 */  j         .L80059108
-/* 344F0 800590F0 8C84F204 */   lw       $a0, -0xdfc($a0)
-/* 344F4 800590F4 3C048008 */  lui       $a0, 0x8008
+/* 344F0 800590F0 8C84F204 */   lw       $a0, %lo(D_8007F204)($a0)
+/* 344F4 800590F4 3C048008 */  lui       $a0, %hi(D_8007F048)
 /* 344F8 800590F8 08016442 */  j         .L80059108
-/* 344FC 800590FC 2484F048 */   addiu    $a0, $a0, -0xfb8
+/* 344FC 800590FC 2484F048 */   addiu    $a0, $a0, %lo(D_8007F048)
 .L80059100:
-/* 34500 80059100 3C048008 */  lui       $a0, 0x8008
-/* 34504 80059104 2484F1D0 */  addiu     $a0, $a0, -0xe30
+/* 34500 80059100 3C048008 */  lui       $a0, %hi(D_8007F1D0)
+/* 34504 80059104 2484F1D0 */  addiu     $a0, $a0, %lo(D_8007F1D0)
 .L80059108:
 /* 34508 80059108 90820003 */  lbu       $v0, 3($a0)
 /* 3450C 8005910C A2620010 */  sb        $v0, 0x10($s3)
@@ -118,8 +118,8 @@ glabel func_8005904C
 /* 34600 80059200 46000021 */  cvt.d.s   $f0, $f0
 /* 34604 80059204 00621823 */  subu      $v1, $v1, $v0
 /* 34608 80059208 46200000 */  add.d     $f0, $f0, $f0
-/* 3460C 8005920C 3C028008 */  lui       $v0, 0x8008
-/* 34610 80059210 8C428E50 */  lw        $v0, -0x71b0($v0)
+/* 3460C 8005920C 3C028008 */  lui       $v0, %hi(D_80078E50)
+/* 34610 80059210 8C428E50 */  lw        $v0, %lo(D_80078E50)($v0)
 /* 34614 80059214 44832000 */  mtc1      $v1, $f4
 /* 34618 80059218 00000000 */  nop       
 /* 3461C 8005921C 46802121 */  cvt.d.w   $f4, $f4
@@ -131,8 +131,8 @@ glabel func_8005904C
 /* 34634 80059234 C6000000 */  lwc1      $f0, ($s0)
 /* 34638 80059238 46800020 */  cvt.s.w   $f0, $f0
 /* 3463C 8005923C 26100004 */  addiu     $s0, $s0, 4
-/* 34640 80059240 3C01800A */  lui       $at, 0x800a
-/* 34644 80059244 D4228968 */  ldc1      $f2, -0x7698($at)
+/* 34640 80059240 3C01800A */  lui       $at, %hi(D_80098968)
+/* 34644 80059244 D4228968 */  ldc1      $f2, %lo(D_80098968)($at)
 /* 34648 80059248 46000021 */  cvt.d.s   $f0, $f0
 /* 3464C 8005924C 04610006 */  bgez      $v1, .L80059268
 /* 34650 80059250 46220083 */   div.d    $f2, $f0, $f2
diff --git a/asm/nonmatchings/world/world/func_800598A0.s b/asm/nonmatchings/world/world/func_800598A0.s
index fab9b05da6..6707f16fc2 100644
--- a/asm/nonmatchings/world/world/func_800598A0.s
+++ b/asm/nonmatchings/world/world/func_800598A0.s
@@ -9,9 +9,9 @@ glabel func_800598A0
 /* 34CB0 800598B0 1040007D */  beqz      $v0, .L80059AA8
 /* 34CB4 800598B4 AFBF0010 */   sw       $ra, 0x10($sp)
 /* 34CB8 800598B8 00061080 */  sll       $v0, $a2, 2
-/* 34CBC 800598BC 3C01800A */  lui       $at, 0x800a
+/* 34CBC 800598BC 3C01800A */  lui       $at, %hi(D_80098970)
 /* 34CC0 800598C0 00220821 */  addu      $at, $at, $v0
-/* 34CC4 800598C4 8C228970 */  lw        $v0, -0x7690($at)
+/* 34CC4 800598C4 8C228970 */  lw        $v0, %lo(D_80098970)($at)
 /* 34CC8 800598C8 00400008 */  jr        $v0
 /* 34CCC 800598CC 00000000 */   nop      
 /* 34CD0 800598D0 00051400 */  sll       $v0, $a1, 0x10
@@ -74,8 +74,8 @@ glabel func_800598A0
 /* 34DB4 800599B4 3C01447A */  lui       $at, 0x447a
 /* 34DB8 800599B8 44811000 */  mtc1      $at, $f2
 /* 34DBC 800599BC 8C82000C */  lw        $v0, 0xc($a0)
-/* 34DC0 800599C0 3C048008 */  lui       $a0, 0x8008
-/* 34DC4 800599C4 8C848E50 */  lw        $a0, -0x71b0($a0)
+/* 34DC0 800599C0 3C048008 */  lui       $a0, %hi(D_80078E50)
+/* 34DC4 800599C4 8C848E50 */  lw        $a0, %lo(D_80078E50)($a0)
 /* 34DC8 800599C8 46020003 */  div.s     $f0, $f0, $f2
 /* 34DCC 800599CC 46000021 */  cvt.d.s   $f0, $f0
 /* 34DD0 800599D0 46200000 */  add.d     $f0, $f0, $f0
@@ -96,8 +96,8 @@ glabel func_800598A0
 /* 34E0C 80059A0C 46800020 */  cvt.s.w   $f0, $f0
 /* 34E10 80059A10 46000021 */  cvt.d.s   $f0, $f0
 /* 34E14 80059A14 8C82000C */  lw        $v0, 0xc($a0)
-/* 34E18 80059A18 3C01800A */  lui       $at, 0x800a
-/* 34E1C 80059A1C D4228990 */  ldc1      $f2, -0x7670($at)
+/* 34E18 80059A18 3C01800A */  lui       $at, %hi(D_80098990)
+/* 34E1C 80059A1C D4228990 */  ldc1      $f2, %lo(D_80098990)($at)
 /* 34E20 80059A20 00622021 */  addu      $a0, $v1, $v0
 /* 34E24 80059A24 8C830004 */  lw        $v1, 4($a0)
 /* 34E28 80059A28 8C820000 */  lw        $v0, ($a0)
diff --git a/asm/nonmatchings/world/world/func_80059C9C.s b/asm/nonmatchings/world/world/func_80059C9C.s
index 82c14cdfd6..a5e062eb01 100644
--- a/asm/nonmatchings/world/world/func_80059C9C.s
+++ b/asm/nonmatchings/world/world/func_80059C9C.s
@@ -4,8 +4,8 @@
 glabel func_80059C9C
 /* 3509C 80059C9C 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* 350A0 80059CA0 2402000E */  addiu     $v0, $zero, 0xe
-/* 350A4 80059CA4 3C03800A */  lui       $v1, 0x800a
-/* 350A8 80059CA8 246341C0 */  addiu     $v1, $v1, 0x41c0
+/* 350A4 80059CA4 3C03800A */  lui       $v1, %hi(D_800A41C0)
+/* 350A8 80059CA8 246341C0 */  addiu     $v1, $v1, %lo(D_800A41C0)
 /* 350AC 80059CAC AFBF001C */  sw        $ra, 0x1c($sp)
 /* 350B0 80059CB0 AFB00018 */  sw        $s0, 0x18($sp)
 .L80059CB4:
@@ -14,8 +14,8 @@ glabel func_80059C9C
 /* 350BC 80059CBC 0441FFFD */  bgez      $v0, .L80059CB4
 /* 350C0 80059CC0 2463FFE0 */   addiu    $v1, $v1, -0x20
 /* 350C4 80059CC4 2402005F */  addiu     $v0, $zero, 0x5f
-/* 350C8 80059CC8 3C03800B */  lui       $v1, 0x800b
-/* 350CC 80059CCC 24634514 */  addiu     $v1, $v1, 0x4514
+/* 350C8 80059CC8 3C03800B */  lui       $v1, %hi(D_800B4514)
+/* 350CC 80059CCC 24634514 */  addiu     $v1, $v1, %lo(D_800B4514)
 .L80059CD0:
 /* 350D0 80059CD0 AC600000 */  sw        $zero, ($v1)
 /* 350D4 80059CD4 2442FFFF */  addiu     $v0, $v0, -1
@@ -27,12 +27,12 @@ glabel func_80059C9C
 /* 350EC 80059CEC 3463FFFF */  ori       $v1, $v1, 0xffff
 /* 350F0 80059CF0 24040010 */  addiu     $a0, $zero, 0x10
 /* 350F4 80059CF4 0000282D */  daddu     $a1, $zero, $zero
-/* 350F8 80059CF8 3C10E020 */  lui       $s0, 0xe020
-/* 350FC 80059CFC 26100000 */  addiu     $s0, $s0, 0
+/* 350F8 80059CF8 3C10E020 */  lui       $s0, %hi(D_E0200000)
+/* 350FC 80059CFC 26100000 */  addiu     $s0, $s0, %lo(D_E0200000)
 /* 35100 80059D00 0200302D */  daddu     $a2, $s0, $zero
 /* 35104 80059D04 2402FFFF */  addiu     $v0, $zero, -1
-/* 35108 80059D08 3C07801A */  lui       $a3, 0x801a
-/* 3510C 80059D0C 24E76000 */  addiu     $a3, $a3, 0x6000
+/* 35108 80059D08 3C07801A */  lui       $a3, %hi(D_801A6000)
+/* 3510C 80059D0C 24E76000 */  addiu     $a3, $a3, %lo(D_801A6000)
 /* 35110 80059D10 00E33824 */  and       $a3, $a3, $v1
 /* 35114 80059D14 AFA20010 */  sw        $v0, 0x10($sp)
 /* 35118 80059D18 0C0199E8 */  jal       osMapTLB
diff --git a/asm/nonmatchings/world/world/func_80059D50.s b/asm/nonmatchings/world/world/func_80059D50.s
index eeae71c2ce..d2db04a3b5 100644
--- a/asm/nonmatchings/world/world/func_80059D50.s
+++ b/asm/nonmatchings/world/world/func_80059D50.s
@@ -13,8 +13,8 @@ glabel func_80059D50
 /* 35170 80059D70 14400059 */  bnez      $v0, .L80059ED8
 /* 35174 80059D74 AFB00010 */   sw       $s0, 0x10($sp)
 /* 35178 80059D78 0000902D */  daddu     $s2, $zero, $zero
-/* 3517C 80059D7C 3C10800A */  lui       $s0, 0x800a
-/* 35180 80059D80 26104000 */  addiu     $s0, $s0, 0x4000
+/* 3517C 80059D7C 3C10800A */  lui       $s0, %hi(D_800A4000)
+/* 35180 80059D80 26104000 */  addiu     $s0, $s0, %lo(D_800A4000)
 /* 35184 80059D84 24040003 */  addiu     $a0, $zero, 3
 .L80059D88:
 /* 35188 80059D88 8E030000 */  lw        $v1, ($s0)
@@ -33,8 +33,8 @@ glabel func_80059D50
 /* 351B8 80059DB8 26100020 */   addiu    $s0, $s0, 0x20
 /* 351BC 80059DBC 0000902D */  daddu     $s2, $zero, $zero
 /* 351C0 80059DC0 2413FFFD */  addiu     $s3, $zero, -3
-/* 351C4 80059DC4 3C11800B */  lui       $s1, 0x800b
-/* 351C8 80059DC8 26314398 */  addiu     $s1, $s1, 0x4398
+/* 351C4 80059DC4 3C11800B */  lui       $s1, %hi(D_800B4398)
+/* 351C8 80059DC8 26314398 */  addiu     $s1, $s1, %lo(D_800B4398)
 .L80059DCC:
 /* 351CC 80059DCC 8E300000 */  lw        $s0, ($s1)
 /* 351D0 80059DD0 52000020 */  beql      $s0, $zero, .L80059E54
@@ -77,8 +77,8 @@ glabel func_80059D50
 /* 35258 80059E58 1440FFDC */  bnez      $v0, .L80059DCC
 /* 3525C 80059E5C 26310004 */   addiu    $s1, $s1, 4
 /* 35260 80059E60 0000902D */  daddu     $s2, $zero, $zero
-/* 35264 80059E64 3C10800A */  lui       $s0, 0x800a
-/* 35268 80059E68 26104000 */  addiu     $s0, $s0, 0x4000
+/* 35264 80059E64 3C10800A */  lui       $s0, %hi(D_800A4000)
+/* 35268 80059E68 26104000 */  addiu     $s0, $s0, %lo(D_800A4000)
 /* 3526C 80059E6C 2611001C */  addiu     $s1, $s0, 0x1c
 .L80059E70:
 /* 35270 80059E70 8E030000 */  lw        $v1, ($s0)
diff --git a/asm/nonmatchings/world/world/func_80059F94.s b/asm/nonmatchings/world/world/func_80059F94.s
index e02e9c8c07..fbca85e72f 100644
--- a/asm/nonmatchings/world/world/func_80059F94.s
+++ b/asm/nonmatchings/world/world/func_80059F94.s
@@ -14,8 +14,8 @@ glabel func_80059F94
 /* 353B8 80059FB8 3C15800B */  lui       $s5, %hi(gCameras)
 /* 353BC 80059FBC 26B51D80 */  addiu     $s5, $s5, %lo(gCameras)
 /* 353C0 80059FC0 AFB00010 */  sw        $s0, 0x10($sp)
-/* 353C4 80059FC4 3C10800A */  lui       $s0, 0x800a
-/* 353C8 80059FC8 2610A66C */  addiu     $s0, $s0, -0x5994
+/* 353C4 80059FC4 3C10800A */  lui       $s0, %hi(D_8009A66C)
+/* 353C8 80059FC8 2610A66C */  addiu     $s0, $s0, %lo(D_8009A66C)
 /* 353CC 80059FCC AFB40020 */  sw        $s4, 0x20($sp)
 /* 353D0 80059FD0 24140002 */  addiu     $s4, $zero, 2
 /* 353D4 80059FD4 AFB3001C */  sw        $s3, 0x1c($sp)
@@ -23,9 +23,9 @@ glabel func_80059F94
 /* 353DC 80059FDC AFBF0028 */  sw        $ra, 0x28($sp)
 /* 353E0 80059FE0 00121080 */  sll       $v0, $s2, 2
 .L80059FE4:
-/* 353E4 80059FE4 3C0E800B */  lui       $t6, 0x800b
+/* 353E4 80059FE4 3C0E800B */  lui       $t6, %hi(D_800B4398)
 /* 353E8 80059FE8 01C27021 */  addu      $t6, $t6, $v0
-/* 353EC 80059FEC 8DCE4398 */  lw        $t6, 0x4398($t6)
+/* 353EC 80059FEC 8DCE4398 */  lw        $t6, %lo(D_800B4398)($t6)
 /* 353F0 80059FF0 51C000A5 */  beql      $t6, $zero, .L8005A288
 /* 353F4 80059FF4 26520001 */   addiu    $s2, $s2, 1
 /* 353F8 80059FF8 8DC30000 */  lw        $v1, ($t6)
@@ -50,8 +50,8 @@ glabel func_80059F94
 .L8005A040:
 /* 35440 8005A040 8DC20010 */  lw        $v0, 0x10($t6)
 /* 35444 8005A044 8C4F0018 */  lw        $t7, 0x18($v0)
-/* 35448 8005A048 3C028006 */  lui       $v0, 0x8006
-/* 3544C 8005A04C 24429C80 */  addiu     $v0, $v0, -0x6380
+/* 35448 8005A048 3C028006 */  lui       $v0, %hi(D_80059C80)
+/* 3544C 8005A04C 24429C80 */  addiu     $v0, $v0, %lo(D_80059C80)
 /* 35450 8005A050 51E2008D */  beql      $t7, $v0, .L8005A288
 /* 35454 8005A054 26520001 */   addiu    $s2, $s2, 1
 /* 35458 8005A058 12200088 */  beqz      $s1, .L8005A27C
@@ -185,8 +185,8 @@ glabel func_80059F94
 /* 35658 8005A258 AE020000 */  sw        $v0, ($s0)
 /* 3565C 8005A25C 000D1180 */  sll       $v0, $t5, 6
 /* 35660 8005A260 AD630044 */  sw        $v1, 0x44($t3)
-/* 35664 8005A264 3C03800A */  lui       $v1, 0x800a
-/* 35668 8005A268 8C63A674 */  lw        $v1, -0x598c($v1)
+/* 35664 8005A264 3C03800A */  lui       $v1, %hi(D_8009A674)
+/* 35668 8005A268 8C63A674 */  lw        $v1, %lo(D_8009A674)($v1)
 /* 3566C 8005A26C 24420030 */  addiu     $v0, $v0, 0x30
 /* 35670 8005A270 AD640048 */  sw        $a0, 0x48($t3)
 /* 35674 8005A274 00621821 */  addu      $v1, $v1, $v0
diff --git a/asm/nonmatchings/world/world/func_8005A2BC.s b/asm/nonmatchings/world/world/func_8005A2BC.s
index 82657661e3..658159fcef 100644
--- a/asm/nonmatchings/world/world/func_8005A2BC.s
+++ b/asm/nonmatchings/world/world/func_8005A2BC.s
@@ -7,8 +7,8 @@ glabel func_8005A2BC
 /* 356C4 8005A2C4 0080902D */  daddu     $s2, $a0, $zero
 /* 356C8 8005A2C8 AFB00010 */  sw        $s0, 0x10($sp)
 /* 356CC 8005A2CC 0000802D */  daddu     $s0, $zero, $zero
-/* 356D0 8005A2D0 3C03800B */  lui       $v1, 0x800b
-/* 356D4 8005A2D4 24634398 */  addiu     $v1, $v1, 0x4398
+/* 356D0 8005A2D0 3C03800B */  lui       $v1, %hi(D_800B4398)
+/* 356D4 8005A2D4 24634398 */  addiu     $v1, $v1, %lo(D_800B4398)
 /* 356D8 8005A2D8 AFBF001C */  sw        $ra, 0x1c($sp)
 /* 356DC 8005A2DC AFB10014 */  sw        $s1, 0x14($sp)
 .L8005A2E0:
@@ -31,17 +31,17 @@ glabel func_8005A2BC
 /* 35714 8005A314 24040014 */   addiu    $a0, $zero, 0x14
 /* 35718 8005A318 00101880 */  sll       $v1, $s0, 2
 /* 3571C 8005A31C 0040882D */  daddu     $s1, $v0, $zero
-/* 35720 8005A320 3C01800B */  lui       $at, 0x800b
+/* 35720 8005A320 3C01800B */  lui       $at, %hi(D_800B4398)
 /* 35724 8005A324 00230821 */  addu      $at, $at, $v1
-/* 35728 8005A328 AC314398 */  sw        $s1, 0x4398($at)
+/* 35728 8005A328 AC314398 */  sw        $s1, %lo(D_800B4398)($at)
 /* 3572C 8005A32C 16200003 */  bnez      $s1, .L8005A33C
 /* 35730 8005A330 0000802D */   daddu    $s0, $zero, $zero
 .L8005A334:
 /* 35734 8005A334 080168CD */  j         .L8005A334
 /* 35738 8005A338 00000000 */   nop      
 .L8005A33C:
-/* 3573C 8005A33C 3C04800A */  lui       $a0, 0x800a
-/* 35740 8005A340 24844000 */  addiu     $a0, $a0, 0x4000
+/* 3573C 8005A33C 3C04800A */  lui       $a0, %hi(D_800A4000)
+/* 35740 8005A340 24844000 */  addiu     $a0, $a0, %lo(D_800A4000)
 /* 35744 8005A344 8E430004 */  lw        $v1, 4($s2)
 /* 35748 8005A348 24020001 */  addiu     $v0, $zero, 1
 /* 3574C 8005A34C AE220000 */  sw        $v0, ($s1)
@@ -74,23 +74,23 @@ glabel func_8005A2BC
 /* 357A4 8005A3A4 8E42000C */  lw        $v0, 0xc($s2)
 /* 357A8 8005A3A8 14400004 */  bnez      $v0, .L8005A3BC
 /* 357AC 8005A3AC AC820010 */   sw       $v0, 0x10($a0)
-/* 357B0 8005A3B0 3C028006 */  lui       $v0, 0x8006
-/* 357B4 8005A3B4 24429C80 */  addiu     $v0, $v0, -0x6380
+/* 357B0 8005A3B0 3C028006 */  lui       $v0, %hi(D_80059C80)
+/* 357B4 8005A3B4 24429C80 */  addiu     $v0, $v0, %lo(D_80059C80)
 /* 357B8 8005A3B8 AC820014 */  sw        $v0, 0x14($a0)
 .L8005A3BC:
 /* 357BC 8005A3BC 8E420010 */  lw        $v0, 0x10($s2)
 /* 357C0 8005A3C0 8C830018 */  lw        $v1, 0x18($a0)
 /* 357C4 8005A3C4 14600004 */  bnez      $v1, .L8005A3D8
 /* 357C8 8005A3C8 AC820014 */   sw       $v0, 0x14($a0)
-/* 357CC 8005A3CC 3C028006 */  lui       $v0, 0x8006
-/* 357D0 8005A3D0 24429C80 */  addiu     $v0, $v0, -0x6380
+/* 357CC 8005A3CC 3C028006 */  lui       $v0, %hi(D_80059C80)
+/* 357D0 8005A3D0 24429C80 */  addiu     $v0, $v0, %lo(D_80059C80)
 /* 357D4 8005A3D4 AC820018 */  sw        $v0, 0x18($a0)
 .L8005A3D8:
 /* 357D8 8005A3D8 8E420014 */  lw        $v0, 0x14($s2)
 /* 357DC 8005A3DC 14400004 */  bnez      $v0, .L8005A3F0
 /* 357E0 8005A3E0 AC820018 */   sw       $v0, 0x18($a0)
-/* 357E4 8005A3E4 3C028006 */  lui       $v0, 0x8006
-/* 357E8 8005A3E8 24429C80 */  addiu     $v0, $v0, -0x6380
+/* 357E4 8005A3E4 3C028006 */  lui       $v0, %hi(D_80059C80)
+/* 357E8 8005A3E8 24429C80 */  addiu     $v0, $v0, %lo(D_80059C80)
 /* 357EC 8005A3EC AC820018 */  sw        $v0, 0x18($a0)
 .L8005A3F0:
 /* 357F0 8005A3F0 8C820008 */  lw        $v0, 8($a0)
diff --git a/asm/nonmatchings/world/world/get_current_map_config.s b/asm/nonmatchings/world/world/get_current_map_config.s
index b59d381a0f..a9bc5fadea 100644
--- a/asm/nonmatchings/world/world/get_current_map_config.s
+++ b/asm/nonmatchings/world/world/get_current_map_config.s
@@ -2,7 +2,7 @@
 .set noreorder # don't insert nops after branches
 
 glabel get_current_map_config
-/* 35FD8 8005ABD8 3C02800A */  lui       $v0, 0x800a
-/* 35FDC 8005ABDC 8C4241E0 */  lw        $v0, 0x41e0($v0)
+/* 35FD8 8005ABD8 3C02800A */  lui       $v0, %hi(D_800A41E0)
+/* 35FDC 8005ABDC 8C4241E0 */  lw        $v0, %lo(D_800A41E0)($v0)
 /* 35FE0 8005ABE0 03E00008 */  jr        $ra
 /* 35FE4 8005ABE4 00000000 */   nop      
diff --git a/asm/nonmatchings/world/world/get_current_map_header.s b/asm/nonmatchings/world/world/get_current_map_header.s
index 866291ad6f..3255bbb935 100644
--- a/asm/nonmatchings/world/world/get_current_map_header.s
+++ b/asm/nonmatchings/world/world/get_current_map_header.s
@@ -2,7 +2,7 @@
 .set noreorder # don't insert nops after branches
 
 glabel get_current_map_header
-/* 35FE8 8005ABE8 3C02800A */  lui       $v0, 0x800a
-/* 35FEC 8005ABEC 244241E8 */  addiu     $v0, $v0, 0x41e8
+/* 35FE8 8005ABE8 3C02800A */  lui       $v0, %hi(D_800A41E8)
+/* 35FEC 8005ABEC 244241E8 */  addiu     $v0, $v0, %lo(D_800A41E8)
 /* 35FF0 8005ABF0 03E00008 */  jr        $ra
 /* 35FF4 8005ABF4 00000000 */   nop      
diff --git a/asm/nonmatchings/world/world/get_map_IDs_by_name.s b/asm/nonmatchings/world/world/get_map_IDs_by_name.s
index 72e6bb7711..77abe36b12 100644
--- a/asm/nonmatchings/world/world/get_map_IDs_by_name.s
+++ b/asm/nonmatchings/world/world/get_map_IDs_by_name.s
@@ -47,9 +47,9 @@ glabel get_map_IDs_by_name
 /* 36094 8005AC94 26310020 */   addiu    $s1, $s1, 0x20
 .L8005AC98:
 /* 36098 8005AC98 26520010 */  addiu     $s2, $s2, 0x10
-/* 3609C 8005AC9C 3C048009 */  lui       $a0, 0x8009
+/* 3609C 8005AC9C 3C048009 */  lui       $a0, %hi(D_800934F4)
 /* 360A0 8005ACA0 00922021 */  addu      $a0, $a0, $s2
-/* 360A4 8005ACA4 8C8434F4 */  lw        $a0, 0x34f4($a0)
+/* 360A4 8005ACA4 8C8434F4 */  lw        $a0, %lo(D_800934F4)($a0)
 /* 360A8 8005ACA8 3C028009 */  lui       $v0, %hi(gAreas)
 /* 360AC 8005ACAC 244234F0 */  addiu     $v0, $v0, %lo(gAreas)
 /* 360B0 8005ACB0 1480FFE4 */  bnez      $a0, .L8005AC44
diff --git a/asm/nonmatchings/world/world/load_map_by_IDs.s b/asm/nonmatchings/world/world/load_map_by_IDs.s
index 4561cc722a..5f7911e055 100644
--- a/asm/nonmatchings/world/world/load_map_by_IDs.s
+++ b/asm/nonmatchings/world/world/load_map_by_IDs.s
@@ -56,46 +56,46 @@ glabel load_map_by_IDs
 /* 35BB8 8005A7B8 A0500167 */  sb        $s0, 0x167($v0)
 /* 35BBC 8005A7BC A4510088 */  sh        $s1, 0x88($v0)
 .L8005A7C0:
-/* 35BC0 8005A7C0 3C04800E */  lui       $a0, 0x800e
-/* 35BC4 8005A7C4 24849230 */  addiu     $a0, $a0, -0x6dd0
+/* 35BC0 8005A7C0 3C04800E */  lui       $a0, %hi(D_800D9230)
+/* 35BC4 8005A7C4 24849230 */  addiu     $a0, $a0, %lo(D_800D9230)
 /* 35BC8 8005A7C8 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
 /* 35BCC 8005A7CC 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
 /* 35BD0 8005A7D0 00131C00 */  sll       $v1, $s3, 0x10
 /* 35BD4 8005A7D4 AC400144 */  sw        $zero, 0x144($v0)
 /* 35BD8 8005A7D8 00111400 */  sll       $v0, $s1, 0x10
 /* 35BDC 8005A7DC 00021303 */  sra       $v0, $v0, 0xc
-/* 35BE0 8005A7E0 3C018009 */  lui       $at, 0x8009
+/* 35BE0 8005A7E0 3C018009 */  lui       $at, %hi(D_800934F4)
 /* 35BE4 8005A7E4 00220821 */  addu      $at, $at, $v0
-/* 35BE8 8005A7E8 8C2234F4 */  lw        $v0, 0x34f4($at)
+/* 35BE8 8005A7E8 8C2234F4 */  lw        $v0, %lo(D_800934F4)($at)
 /* 35BEC 8005A7EC 00031AC3 */  sra       $v1, $v1, 0xb
 /* 35BF0 8005A7F0 00439021 */  addu      $s2, $v0, $v1
 /* 35BF4 8005A7F4 8E460000 */  lw        $a2, ($s2)
-/* 35BF8 8005A7F8 3C05800A */  lui       $a1, 0x800a
+/* 35BF8 8005A7F8 3C05800A */  lui       $a1, %hi(D_80098A10)
 /* 35BFC 8005A7FC 0C01953C */  jal       sprintf
-/* 35C00 8005A800 24A58A10 */   addiu    $a1, $a1, -0x75f0
-/* 35C04 8005A804 3C04800E */  lui       $a0, 0x800e
-/* 35C08 8005A808 248491E0 */  addiu     $a0, $a0, -0x6e20
+/* 35C00 8005A800 24A58A10 */   addiu    $a1, $a1, %lo(D_80098A10)
+/* 35C04 8005A804 3C04800E */  lui       $a0, %hi(D_800D91E0)
+/* 35C08 8005A808 248491E0 */  addiu     $a0, $a0, %lo(D_800D91E0)
 /* 35C0C 8005A80C 8E460000 */  lw        $a2, ($s2)
-/* 35C10 8005A810 3C05800A */  lui       $a1, 0x800a
+/* 35C10 8005A810 3C05800A */  lui       $a1, %hi(D_80098A1C)
 /* 35C14 8005A814 0C01953C */  jal       sprintf
-/* 35C18 8005A818 24A58A1C */   addiu    $a1, $a1, -0x75e4
+/* 35C18 8005A818 24A58A1C */   addiu    $a1, $a1, %lo(D_80098A1C)
 /* 35C1C 8005A81C 8E450000 */  lw        $a1, ($s2)
 /* 35C20 8005A820 0C01BB50 */  jal       strcpy
 /* 35C24 8005A824 27A40018 */   addiu    $a0, $sp, 0x18
-/* 35C28 8005A828 3C04800B */  lui       $a0, 0x800b
-/* 35C2C 8005A82C 24840CF0 */  addiu     $a0, $a0, 0xcf0
-/* 35C30 8005A830 3C05800A */  lui       $a1, 0x800a
-/* 35C34 8005A834 24A58A24 */  addiu     $a1, $a1, -0x75dc
+/* 35C28 8005A828 3C04800B */  lui       $a0, %hi(D_800B0CF0)
+/* 35C2C 8005A82C 24840CF0 */  addiu     $a0, $a0, %lo(D_800B0CF0)
+/* 35C30 8005A830 3C05800A */  lui       $a1, %hi(D_80098A24)
+/* 35C34 8005A834 24A58A24 */  addiu     $a1, $a1, %lo(D_80098A24)
 /* 35C38 8005A838 27A60018 */  addiu     $a2, $sp, 0x18
 /* 35C3C 8005A83C 0C01953C */  jal       sprintf
 /* 35C40 8005A840 A3A0001B */   sb       $zero, 0x1b($sp)
 /* 35C44 8005A844 8E450014 */  lw        $a1, 0x14($s2)
-/* 35C48 8005A848 3C01800A */  lui       $at, 0x800a
-/* 35C4C 8005A84C AC3241E0 */  sw        $s2, 0x41e0($at)
+/* 35C48 8005A848 3C01800A */  lui       $at, %hi(D_800A41E0)
+/* 35C4C 8005A84C AC3241E0 */  sw        $s2, %lo(D_800A41E0)($at)
 /* 35C50 8005A850 10A00005 */  beqz      $a1, .L8005A868
 /* 35C54 8005A854 00000000 */   nop      
-/* 35C58 8005A858 3C04800E */  lui       $a0, 0x800e
-/* 35C5C 8005A85C 24849668 */  addiu     $a0, $a0, -0x6998
+/* 35C58 8005A858 3C04800E */  lui       $a0, %hi(D_800D9668)
+/* 35C5C 8005A85C 24849668 */  addiu     $a0, $a0, %lo(D_800D9668)
 /* 35C60 8005A860 0C01BB50 */  jal       strcpy
 /* 35C64 8005A864 00000000 */   nop      
 .L8005A868:
@@ -109,8 +109,8 @@ glabel load_map_by_IDs
 /* 35C84 8005A884 8E460010 */   lw       $a2, 0x10($s2)
 .L8005A888:
 /* 35C88 8005A888 8E420004 */  lw        $v0, 4($s2)
-/* 35C8C 8005A88C 3C03800A */  lui       $v1, 0x800a
-/* 35C90 8005A890 246341E8 */  addiu     $v1, $v1, 0x41e8
+/* 35C8C 8005A88C 3C03800A */  lui       $v1, %hi(D_800A41E8)
+/* 35C90 8005A890 246341E8 */  addiu     $v1, $v1, %lo(D_800A41E8)
 /* 35C94 8005A894 24440040 */  addiu     $a0, $v0, 0x40
 .L8005A898:
 /* 35C98 8005A898 8C480000 */  lw        $t0, ($v0)
@@ -125,8 +125,8 @@ glabel load_map_by_IDs
 /* 35CBC 8005A8BC 1444FFF6 */  bne       $v0, $a0, .L8005A898
 /* 35CC0 8005A8C0 24630010 */   addiu    $v1, $v1, 0x10
 /* 35CC4 8005A8C4 8E420018 */  lw        $v0, 0x18($s2)
-/* 35CC8 8005A8C8 3C13800A */  lui       $s3, 0x800a
-/* 35CCC 8005A8CC 267341E8 */  addiu     $s3, $s3, 0x41e8
+/* 35CC8 8005A8C8 3C13800A */  lui       $s3, %hi(D_800A41E8)
+/* 35CCC 8005A8CC 267341E8 */  addiu     $s3, $s3, %lo(D_800A41E8)
 /* 35CD0 8005A8D0 10400004 */  beqz      $v0, .L8005A8E4
 /* 35CD4 8005A8D4 00000000 */   nop      
 /* 35CD8 8005A8D8 0040F809 */  jalr      $v0
@@ -135,14 +135,14 @@ glabel load_map_by_IDs
 .L8005A8E4:
 /* 35CE4 8005A8E4 16800015 */  bnez      $s4, .L8005A93C
 /* 35CE8 8005A8E8 00000000 */   nop      
-/* 35CEC 8005A8EC 3C04800E */  lui       $a0, 0x800e
-/* 35CF0 8005A8F0 24849230 */  addiu     $a0, $a0, -0x6dd0
+/* 35CEC 8005A8EC 3C04800E */  lui       $a0, %hi(D_800D9230)
+/* 35CF0 8005A8F0 24849230 */  addiu     $a0, $a0, %lo(D_800D9230)
 /* 35CF4 8005A8F4 0C016B3A */  jal       load_asset_by_name
 /* 35CF8 8005A8F8 27A50030 */   addiu    $a1, $sp, 0x30
 /* 35CFC 8005A8FC 0040882D */  daddu     $s1, $v0, $zero
 /* 35D00 8005A900 0220202D */  daddu     $a0, $s1, $zero
-/* 35D04 8005A904 3C108021 */  lui       $s0, 0x8021
-/* 35D08 8005A908 26100000 */  addiu     $s0, $s0, 0
+/* 35D04 8005A904 3C108021 */  lui       $s0, %hi(D_80210000)
+/* 35D08 8005A908 26100000 */  addiu     $s0, $s0, %lo(D_80210000)
 /* 35D0C 8005A90C 0C01BB7C */  jal       decode_yay0
 /* 35D10 8005A910 0200282D */   daddu    $a1, $s0, $zero
 /* 35D14 8005A914 0C00AB1E */  jal       general_heap_free
@@ -159,8 +159,8 @@ glabel load_map_by_IDs
 /* 35D3C 8005A93C 8E420014 */  lw        $v0, 0x14($s2)
 /* 35D40 8005A940 10400005 */  beqz      $v0, .L8005A958
 /* 35D44 8005A944 00000000 */   nop      
-/* 35D48 8005A948 3C04800E */  lui       $a0, 0x800e
-/* 35D4C 8005A94C 24849668 */  addiu     $a0, $a0, -0x6998
+/* 35D48 8005A948 3C04800E */  lui       $a0, %hi(D_800D9668)
+/* 35D4C 8005A94C 24849668 */  addiu     $a0, $a0, %lo(D_800D9668)
 /* 35D50 8005A950 0C05175C */  jal       load_map_bg
 /* 35D54 8005A954 00000000 */   nop      
 .L8005A958:
@@ -237,16 +237,16 @@ glabel load_map_by_IDs
 /* 35E68 8005AA68 8E42001C */  lw        $v0, 0x1c($s2)
 /* 35E6C 8005AA6C 30420003 */  andi      $v0, $v0, 3
 /* 35E70 8005AA70 00021080 */  sll       $v0, $v0, 2
-/* 35E74 8005AA74 3C048009 */  lui       $a0, 0x8009
+/* 35E74 8005AA74 3C048009 */  lui       $a0, %hi(D_8008FF60)
 /* 35E78 8005AA78 00822021 */  addu      $a0, $a0, $v0
 /* 35E7C 8005AA7C 0C0525FF */  jal       func_801497FC
-/* 35E80 8005AA80 8C84FF60 */   lw       $a0, -0xa0($a0)
+/* 35E80 8005AA80 8C84FF60 */   lw       $a0, %lo(D_8008FF60)($a0)
 /* 35E84 8005AA84 0C052580 */  jal       func_80149600
 /* 35E88 8005AA88 00000000 */   nop      
 /* 35E8C 8005AA8C 1680000B */  bnez      $s4, .L8005AABC
 /* 35E90 8005AA90 00000000 */   nop      
-/* 35E94 8005AA94 3C04800B */  lui       $a0, 0x800b
-/* 35E98 8005AA98 24840CF0 */  addiu     $a0, $a0, 0xcf0
+/* 35E94 8005AA94 3C04800B */  lui       $a0, %hi(D_800B0CF0)
+/* 35E98 8005AA98 24840CF0 */  addiu     $a0, $a0, %lo(D_800B0CF0)
 /* 35E9C 8005AA9C 0C016B74 */  jal       get_asset_offset
 /* 35EA0 8005AAA0 27A50030 */   addiu    $a1, $sp, 0x30
 /* 35EA4 8005AAA4 8E640000 */  lw        $a0, ($s3)
diff --git a/asm/nonmatchings/world/world/play_effect.s b/asm/nonmatchings/world/world/play_effect.s
index 5cf072e2dc..cc63851a7e 100644
--- a/asm/nonmatchings/world/world/play_effect.s
+++ b/asm/nonmatchings/world/world/play_effect.s
@@ -5,8 +5,8 @@ glabel play_effect
 /* 35964 8005A564 27BDFFD8 */  addiu     $sp, $sp, -0x28
 /* 35968 8005A568 AFB20020 */  sw        $s2, 0x20($sp)
 /* 3596C 8005A56C 0080902D */  daddu     $s2, $a0, $zero
-/* 35970 8005A570 3C038008 */  lui       $v1, 0x8008
-/* 35974 8005A574 2463F210 */  addiu     $v1, $v1, -0xdf0
+/* 35970 8005A570 3C038008 */  lui       $v1, %hi(D_8007F210)
+/* 35974 8005A574 2463F210 */  addiu     $v1, $v1, %lo(D_8007F210)
 /* 35978 8005A578 00121040 */  sll       $v0, $s2, 1
 /* 3597C 8005A57C 00521021 */  addu      $v0, $v0, $s2
 /* 35980 8005A580 000210C0 */  sll       $v0, $v0, 3
@@ -14,8 +14,8 @@ glabel play_effect
 /* 35988 8005A588 00438821 */  addu      $s1, $v0, $v1
 /* 3598C 8005A58C 0000202D */  daddu     $a0, $zero, $zero
 /* 35990 8005A590 AFB00018 */  sw        $s0, 0x18($sp)
-/* 35994 8005A594 3C10800A */  lui       $s0, 0x800a
-/* 35998 8005A598 26104000 */  addiu     $s0, $s0, 0x4000
+/* 35994 8005A594 3C10800A */  lui       $s0, %hi(D_800A4000)
+/* 35998 8005A598 26104000 */  addiu     $s0, $s0, %lo(D_800A4000)
 /* 3599C 8005A59C AFBF0024 */  sw        $ra, 0x24($sp)
 .L8005A5A0:
 /* 359A0 8005A5A0 8E020000 */  lw        $v0, ($s0)
@@ -35,8 +35,8 @@ glabel play_effect
 /* 359D0 8005A5D0 14400030 */  bnez      $v0, .L8005A694
 /* 359D4 8005A5D4 24020001 */   addiu    $v0, $zero, 1
 /* 359D8 8005A5D8 0000202D */  daddu     $a0, $zero, $zero
-/* 359DC 8005A5DC 3C10800A */  lui       $s0, 0x800a
-/* 359E0 8005A5E0 26104000 */  addiu     $s0, $s0, 0x4000
+/* 359DC 8005A5DC 3C10800A */  lui       $s0, %hi(D_800A4000)
+/* 359E0 8005A5E0 26104000 */  addiu     $s0, $s0, %lo(D_800A4000)
 .L8005A5E4:
 /* 359E4 8005A5E4 8E020000 */  lw        $v0, ($s0)
 /* 359E8 8005A5E8 30420001 */  andi      $v0, $v0, 1
@@ -57,8 +57,8 @@ glabel play_effect
 /* 35A18 8005A618 34E7FFFF */  ori       $a3, $a3, 0xffff
 /* 35A1C 8005A61C 0000282D */  daddu     $a1, $zero, $zero
 /* 35A20 8005A620 2402FFFF */  addiu     $v0, $zero, -1
-/* 35A24 8005A624 3C038019 */  lui       $v1, 0x8019
-/* 35A28 8005A628 24637000 */  addiu     $v1, $v1, 0x7000
+/* 35A24 8005A624 3C038019 */  lui       $v1, %hi(D_80197000)
+/* 35A28 8005A628 24637000 */  addiu     $v1, $v1, %lo(D_80197000)
 /* 35A2C 8005A62C AFA20010 */  sw        $v0, 0x10($sp)
 /* 35A30 8005A630 AFA20014 */  sw        $v0, 0x14($sp)
 /* 35A34 8005A634 00041300 */  sll       $v0, $a0, 0xc
diff --git a/asm/nonmatchings/world/world/remove_all_effects.s b/asm/nonmatchings/world/world/remove_all_effects.s
index 12613041d9..0e274c1846 100644
--- a/asm/nonmatchings/world/world/remove_all_effects.s
+++ b/asm/nonmatchings/world/world/remove_all_effects.s
@@ -6,8 +6,8 @@ glabel remove_all_effects
 /* 358E4 8005A4E4 AFB20018 */  sw        $s2, 0x18($sp)
 /* 358E8 8005A4E8 0000902D */  daddu     $s2, $zero, $zero
 /* 358EC 8005A4EC AFB10014 */  sw        $s1, 0x14($sp)
-/* 358F0 8005A4F0 3C11800B */  lui       $s1, 0x800b
-/* 358F4 8005A4F4 26314398 */  addiu     $s1, $s1, 0x4398
+/* 358F0 8005A4F0 3C11800B */  lui       $s1, %hi(D_800B4398)
+/* 358F4 8005A4F4 26314398 */  addiu     $s1, $s1, %lo(D_800B4398)
 /* 358F8 8005A4F8 AFBF001C */  sw        $ra, 0x1c($sp)
 /* 358FC 8005A4FC AFB00010 */  sw        $s0, 0x10($sp)
 .L8005A500:
diff --git a/asm/nonmatchings/world/world/remove_effect.s b/asm/nonmatchings/world/world/remove_effect.s
index e445cf8a4d..95805f9738 100644
--- a/asm/nonmatchings/world/world/remove_effect.s
+++ b/asm/nonmatchings/world/world/remove_effect.s
@@ -7,8 +7,8 @@ glabel remove_effect
 /* 35858 8005A458 0080882D */  daddu     $s1, $a0, $zero
 /* 3585C 8005A45C AFB00010 */  sw        $s0, 0x10($sp)
 /* 35860 8005A460 0000802D */  daddu     $s0, $zero, $zero
-/* 35864 8005A464 3C03800B */  lui       $v1, 0x800b
-/* 35868 8005A468 24634398 */  addiu     $v1, $v1, 0x4398
+/* 35864 8005A464 3C03800B */  lui       $v1, %hi(D_800B4398)
+/* 35868 8005A468 24634398 */  addiu     $v1, $v1, %lo(D_800B4398)
 /* 3586C 8005A46C AFBF0018 */  sw        $ra, 0x18($sp)
 .L8005A470:
 /* 35870 8005A470 8C620000 */  lw        $v0, ($v1)
@@ -35,9 +35,9 @@ glabel remove_effect
 /* 358B4 8005A4B4 0C00AB1E */  jal       general_heap_free
 /* 358B8 8005A4B8 0220202D */   daddu    $a0, $s1, $zero
 /* 358BC 8005A4BC 00101080 */  sll       $v0, $s0, 2
-/* 358C0 8005A4C0 3C01800B */  lui       $at, 0x800b
+/* 358C0 8005A4C0 3C01800B */  lui       $at, %hi(D_800B4398)
 /* 358C4 8005A4C4 00220821 */  addu      $at, $at, $v0
-/* 358C8 8005A4C8 AC204398 */  sw        $zero, 0x4398($at)
+/* 358C8 8005A4C8 AC204398 */  sw        $zero, %lo(D_800B4398)($at)
 /* 358CC 8005A4CC 8FBF0018 */  lw        $ra, 0x18($sp)
 /* 358D0 8005A4D0 8FB10014 */  lw        $s1, 0x14($sp)
 /* 358D4 8005A4D4 8FB00010 */  lw        $s0, 0x10($sp)
diff --git a/asm/nonmatchings/world/world/render_effects.s b/asm/nonmatchings/world/world/render_effects.s
index f0d191c036..0985cbdd6f 100644
--- a/asm/nonmatchings/world/world/render_effects.s
+++ b/asm/nonmatchings/world/world/render_effects.s
@@ -6,8 +6,8 @@ glabel render_effects
 /* 352F8 80059EF8 AFB10014 */  sw        $s1, 0x14($sp)
 /* 352FC 80059EFC 0000882D */  daddu     $s1, $zero, $zero
 /* 35300 80059F00 AFB00010 */  sw        $s0, 0x10($sp)
-/* 35304 80059F04 3C10800B */  lui       $s0, 0x800b
-/* 35308 80059F08 26104398 */  addiu     $s0, $s0, 0x4398
+/* 35304 80059F04 3C10800B */  lui       $s0, %hi(D_800B4398)
+/* 35308 80059F08 26104398 */  addiu     $s0, $s0, %lo(D_800B4398)
 /* 3530C 80059F0C AFBF0018 */  sw        $ra, 0x18($sp)
 .L80059F10:
 /* 35310 80059F10 8E040000 */  lw        $a0, ($s0)
diff --git a/asm/os/code_45df0_len_970.s b/asm/os/code_45df0_len_970.s
index 81851401d9..654575d3d7 100644
--- a/asm/os/code_45df0_len_970.s
+++ b/asm/os/code_45df0_len_970.s
@@ -11,7 +11,7 @@ glabel func_8006A9F0
 /* 45DF0 8006A9F0 3C1A8007 */  lui       $k0, %hi(osExceptionPreamble)
 /* 45DF4 8006A9F4 275AAA00 */  addiu     $k0, $k0, %lo(osExceptionPreamble)
 /* 45DF8 8006A9F8 03400008 */  jr        $k0
-/* 45DFC 8006A9FC 00000000 */   nop
+/* 45DFC 8006A9FC 00000000 */   nop      
 
 glabel osExceptionPreamble
 /* 45E00 8006AA00 3C1A800B */  lui       $k0, %hi(D_800B0D08)
@@ -74,7 +74,7 @@ glabel func_8006AA34
 /* 45EDC 8006AADC 8F5B0118 */  lw        $k1, 0x118($k0)
 /* 45EE0 8006AAE0 3369FF00 */  andi      $t1, $k1, 0xff00
 /* 45EE4 8006AAE4 11200013 */  beqz      $t1, .L8006AB34
-/* 45EE8 8006AAE8 00000000 */   nop
+/* 45EE8 8006AAE8 00000000 */   nop      
 /* 45EEC 8006AAEC 3C088009 */  lui       $t0, %hi(D_80095900)
 /* 45EF0 8006AAF0 25085900 */  addiu     $t0, $t0, %lo(D_80095900)
 /* 45EF4 8006AAF4 8D080000 */  lw        $t0, ($t0)
@@ -97,7 +97,7 @@ glabel func_8006AA34
 /* 45F34 8006AB34 3C09A430 */  lui       $t1, %hi(D_A430000C)
 /* 45F38 8006AB38 8D29000C */  lw        $t1, %lo(D_A430000C)($t1)
 /* 45F3C 8006AB3C 1120000B */  beqz      $t1, .L8006AB6C
-/* 45F40 8006AB40 00000000 */   nop
+/* 45F40 8006AB40 00000000 */   nop      
 /* 45F44 8006AB44 3C088009 */  lui       $t0, %hi(D_80095900)
 /* 45F48 8006AB48 25085900 */  addiu     $t0, $t0, %lo(D_80095900)
 /* 45F4C 8006AB4C 8D080000 */  lw        $t0, ($t0)
@@ -114,9 +114,9 @@ glabel func_8006AA34
 /* 45F74 8006AB74 AF48011C */  sw        $t0, 0x11c($k0)
 /* 45F78 8006AB78 8F480018 */  lw        $t0, 0x18($k0)
 /* 45F7C 8006AB7C 11000014 */  beqz      $t0, .L8006ABD0
-/* 45F80 8006AB80 00000000 */   nop
+/* 45F80 8006AB80 00000000 */   nop      
 /* 45F84 8006AB84 4448F800 */  cfc1      $t0, $31
-/* 45F88 8006AB88 00000000 */  nop
+/* 45F88 8006AB88 00000000 */  nop       
 /* 45F8C 8006AB8C AF48012C */  sw        $t0, 0x12c($k0)
 /* 45F90 8006AB90 F7400130 */  sdc1      $f0, 0x130($k0)
 /* 45F94 8006AB94 F7420138 */  sdc1      $f2, 0x138($k0)
@@ -142,19 +142,19 @@ glabel func_8006AA34
 /* 45FE0 8006ABE0 3109007C */  andi      $t1, $t0, 0x7c
 /* 45FE4 8006ABE4 240A0024 */  addiu     $t2, $zero, 0x24
 /* 45FE8 8006ABE8 112A00BF */  beq       $t1, $t2, .L8006AEE8
-/* 45FEC 8006ABEC 00000000 */   nop
+/* 45FEC 8006ABEC 00000000 */   nop      
 /* 45FF0 8006ABF0 240A002C */  addiu     $t2, $zero, 0x2c
 /* 45FF4 8006ABF4 112A0110 */  beq       $t1, $t2, handle_CPU
-/* 45FF8 8006ABF8 00000000 */   nop
+/* 45FF8 8006ABF8 00000000 */   nop      
 /* 45FFC 8006ABFC 240A0000 */  addiu     $t2, $zero, 0
 /* 46000 8006AC00 152A00D2 */  bne       $t1, $t2, .L8006AF4C
-/* 46004 8006AC04 00000000 */   nop
+/* 46004 8006AC04 00000000 */   nop      
 /* 46008 8006AC08 03688024 */  and       $s0, $k1, $t0
 .L8006AC0C:
 /* 4600C 8006AC0C 3209FF00 */  andi      $t1, $s0, 0xff00
 /* 46010 8006AC10 00095302 */  srl       $t2, $t1, 0xc
 /* 46014 8006AC14 15400003 */  bnez      $t2, .L8006AC24
-/* 46018 8006AC18 00000000 */   nop
+/* 46018 8006AC18 00000000 */   nop      
 /* 4601C 8006AC1C 00095202 */  srl       $t2, $t1, 8
 /* 46020 8006AC20 214A0010 */  addi      $t2, $t2, 0x10
 .L8006AC24:
@@ -165,7 +165,7 @@ glabel func_8006AA34
 /* 46034 8006AC34 002A0821 */  addu      $at, $at, $t2
 /* 46038 8006AC38 8C2A9DA0 */  lw        $t2, %lo(D_80099DA0)($at)
 /* 4603C 8006AC3C 01400008 */  jr        $t2
-/* 46040 8006AC40 00000000 */   nop
+/* 46040 8006AC40 00000000 */   nop      
 /* 46044 8006AC44 2401DFFF */  addiu     $at, $zero, -0x2001
 /* 46048 8006AC48 1000FFF0 */  b         .L8006AC0C
 /* 4604C 8006AC4C 02018024 */   and      $s0, $s0, $at
@@ -176,7 +176,7 @@ glabel func_8006AA34
 /* 46060 8006AC60 40895800 */  mtc0      $t1, $11
 /* 46064 8006AC64 24040018 */  addiu     $a0, $zero, 0x18
 /* 46068 8006AC68 0C01ABDF */  jal       send_mesg
-/* 4606C 8006AC6C 00000000 */   nop
+/* 4606C 8006AC6C 00000000 */   nop      
 /* 46070 8006AC70 3C01FFFF */  lui       $at, 0xffff
 /* 46074 8006AC74 34217FFF */  ori       $at, $at, 0x7fff
 /* 46078 8006AC78 1000FFE4 */  b         .L8006AC0C
@@ -188,18 +188,18 @@ glabel func_8006AA34
 /* 46090 8006AC90 21290008 */  addi      $t1, $t1, 8
 /* 46094 8006AC94 8D2A0000 */  lw        $t2, ($t1)
 /* 46098 8006AC98 11400007 */  beqz      $t2, .L8006ACB8
-/* 4609C 8006AC9C 00000000 */   nop
+/* 4609C 8006AC9C 00000000 */   nop      
 /* 460A0 8006ACA0 0140F809 */  jalr      $t2
 /* 460A4 8006ACA4 8D3D0004 */   lw       $sp, 4($t1)
 /* 460A8 8006ACA8 10400003 */  beqz      $v0, .L8006ACB8
-/* 460AC 8006ACAC 00000000 */   nop
+/* 460AC 8006ACAC 00000000 */   nop      
 /* 460B0 8006ACB0 10000093 */  b         .L8006AF00
-/* 460B4 8006ACB4 00000000 */   nop
+/* 460B4 8006ACB4 00000000 */   nop      
 .L8006ACB8:
 /* 460B8 8006ACB8 0C01ABDF */  jal       send_mesg
 /* 460BC 8006ACBC 24040010 */   addiu    $a0, $zero, 0x10
 /* 460C0 8006ACC0 1000FFD2 */  b         .L8006AC0C
-/* 460C4 8006ACC4 00000000 */   nop
+/* 460C4 8006ACC4 00000000 */   nop      
 /* 460C8 8006ACC8 3C11A430 */  lui       $s1, %hi(D_A4300008)
 /* 460CC 8006ACCC 8E310008 */  lw        $s1, %lo(D_A4300008)($s1)
 /* 460D0 8006ACD0 3C088009 */  lui       $t0, %hi(D_80095900)
@@ -209,7 +209,7 @@ glabel func_8006AA34
 /* 460E0 8006ACE0 02288824 */  and       $s1, $s1, $t0
 /* 460E4 8006ACE4 32290001 */  andi      $t1, $s1, 1
 /* 460E8 8006ACE8 11200014 */  beqz      $t1, .L8006AD3C
-/* 460EC 8006ACEC 00000000 */   nop
+/* 460EC 8006ACEC 00000000 */   nop      
 /* 460F0 8006ACF0 3231003E */  andi      $s1, $s1, 0x3e
 /* 460F4 8006ACF4 3C0CA404 */  lui       $t4, %hi(D_A4040010)
 /* 460F8 8006ACF8 8D8C0010 */  lw        $t4, %lo(D_A4040010)($t4)
@@ -218,33 +218,33 @@ glabel func_8006AA34
 /* 46104 8006AD04 AC290010 */  sw        $t1, %lo(D_A4040010)($at)
 /* 46108 8006AD08 318C0300 */  andi      $t4, $t4, 0x300
 /* 4610C 8006AD0C 11800007 */  beqz      $t4, .L8006AD2C
-/* 46110 8006AD10 00000000 */   nop
+/* 46110 8006AD10 00000000 */   nop      
 /* 46114 8006AD14 0C01ABDF */  jal       send_mesg
 /* 46118 8006AD18 24040020 */   addiu    $a0, $zero, 0x20
 /* 4611C 8006AD1C 12200044 */  beqz      $s1, .L8006AE30
-/* 46120 8006AD20 00000000 */   nop
+/* 46120 8006AD20 00000000 */   nop      
 /* 46124 8006AD24 10000005 */  b         .L8006AD3C
-/* 46128 8006AD28 00000000 */   nop
+/* 46128 8006AD28 00000000 */   nop      
 .L8006AD2C:
 /* 4612C 8006AD2C 0C01ABDF */  jal       send_mesg
 /* 46130 8006AD30 24040058 */   addiu    $a0, $zero, 0x58
 /* 46134 8006AD34 1220003E */  beqz      $s1, .L8006AE30
-/* 46138 8006AD38 00000000 */   nop
+/* 46138 8006AD38 00000000 */   nop      
 .L8006AD3C:
 /* 4613C 8006AD3C 32290008 */  andi      $t1, $s1, 8
 /* 46140 8006AD40 11200008 */  beqz      $t1, .L8006AD64
-/* 46144 8006AD44 00000000 */   nop
+/* 46144 8006AD44 00000000 */   nop      
 /* 46148 8006AD48 32310037 */  andi      $s1, $s1, 0x37
 /* 4614C 8006AD4C 3C01A440 */  lui       $at, %hi(D_A4400010)
 /* 46150 8006AD50 AC200010 */  sw        $zero, %lo(D_A4400010)($at)
 /* 46154 8006AD54 0C01ABDF */  jal       send_mesg
 /* 46158 8006AD58 24040038 */   addiu    $a0, $zero, 0x38
 /* 4615C 8006AD5C 12200034 */  beqz      $s1, .L8006AE30
-/* 46160 8006AD60 00000000 */   nop
+/* 46160 8006AD60 00000000 */   nop      
 .L8006AD64:
 /* 46164 8006AD64 32290004 */  andi      $t1, $s1, 4
 /* 46168 8006AD68 11200009 */  beqz      $t1, .L8006AD90
-/* 4616C 8006AD6C 00000000 */   nop
+/* 4616C 8006AD6C 00000000 */   nop      
 /* 46170 8006AD70 3231003B */  andi      $s1, $s1, 0x3b
 /* 46174 8006AD74 24090001 */  addiu     $t1, $zero, 1
 /* 46178 8006AD78 3C01A450 */  lui       $at, %hi(D_A450000C)
@@ -252,22 +252,22 @@ glabel func_8006AA34
 /* 46180 8006AD80 0C01ABDF */  jal       send_mesg
 /* 46184 8006AD84 24040030 */   addiu    $a0, $zero, 0x30
 /* 46188 8006AD88 12200029 */  beqz      $s1, .L8006AE30
-/* 4618C 8006AD8C 00000000 */   nop
+/* 4618C 8006AD8C 00000000 */   nop      
 .L8006AD90:
 /* 46190 8006AD90 32290002 */  andi      $t1, $s1, 2
 /* 46194 8006AD94 11200008 */  beqz      $t1, .L8006ADB8
-/* 46198 8006AD98 00000000 */   nop
+/* 46198 8006AD98 00000000 */   nop      
 /* 4619C 8006AD9C 3231003D */  andi      $s1, $s1, 0x3d
 /* 461A0 8006ADA0 3C01A480 */  lui       $at, %hi(D_A4800018)
 /* 461A4 8006ADA4 AC200018 */  sw        $zero, %lo(D_A4800018)($at)
 /* 461A8 8006ADA8 0C01ABDF */  jal       send_mesg
 /* 461AC 8006ADAC 24040028 */   addiu    $a0, $zero, 0x28
 /* 461B0 8006ADB0 1220001F */  beqz      $s1, .L8006AE30
-/* 461B4 8006ADB4 00000000 */   nop
+/* 461B4 8006ADB4 00000000 */   nop      
 .L8006ADB8:
 /* 461B8 8006ADB8 32290010 */  andi      $t1, $s1, 0x10
 /* 461BC 8006ADBC 11200013 */  beqz      $t1, .L8006AE0C
-/* 461C0 8006ADC0 00000000 */   nop
+/* 461C0 8006ADC0 00000000 */   nop      
 /* 461C4 8006ADC4 3231002F */  andi      $s1, $s1, 0x2f
 /* 461C8 8006ADC8 24090002 */  addiu     $t1, $zero, 2
 /* 461CC 8006ADCC 3C01A460 */  lui       $at, %hi(D_A4600010)
@@ -276,22 +276,22 @@ glabel func_8006AA34
 /* 461D8 8006ADD8 25295938 */  addiu     $t1, $t1, %lo(D_80095938)
 /* 461DC 8006ADDC 8D2A0000 */  lw        $t2, ($t1)
 /* 461E0 8006ADE0 11400006 */  beqz      $t2, .L8006ADFC
-/* 461E4 8006ADE4 00000000 */   nop
+/* 461E4 8006ADE4 00000000 */   nop      
 /* 461E8 8006ADE8 8D3D0004 */  lw        $sp, 4($t1)
 /* 461EC 8006ADEC 0140F809 */  jalr      $t2
 /* 461F0 8006ADF0 00402021 */   addu     $a0, $v0, $zero
 /* 461F4 8006ADF4 14400003 */  bnez      $v0, .L8006AE04
-/* 461F8 8006ADF8 00000000 */   nop
+/* 461F8 8006ADF8 00000000 */   nop      
 .L8006ADFC:
 /* 461FC 8006ADFC 0C01ABDF */  jal       send_mesg
 /* 46200 8006AE00 24040040 */   addiu    $a0, $zero, 0x40
 .L8006AE04:
 /* 46204 8006AE04 1220000A */  beqz      $s1, .L8006AE30
-/* 46208 8006AE08 00000000 */   nop
+/* 46208 8006AE08 00000000 */   nop      
 .L8006AE0C:
 /* 4620C 8006AE0C 32290020 */  andi      $t1, $s1, 0x20
 /* 46210 8006AE10 11200007 */  beqz      $t1, .L8006AE30
-/* 46214 8006AE14 00000000 */   nop
+/* 46214 8006AE14 00000000 */   nop      
 /* 46218 8006AE18 3231001F */  andi      $s1, $s1, 0x1f
 /* 4621C 8006AE1C 24090800 */  addiu     $t1, $zero, 0x800
 /* 46220 8006AE20 3C01A430 */  lui       $at, 0xa430
@@ -310,7 +310,7 @@ glabel func_8006AA34
 /* 46250 8006AE50 252958FC */  addiu     $t1, $t1, %lo(D_800958FC)
 /* 46254 8006AE54 8D2A0000 */  lw        $t2, ($t1)
 /* 46258 8006AE58 11400004 */  beqz      $t2, .L8006AE6C
-/* 4625C 8006AE5C 00000000 */   nop
+/* 4625C 8006AE5C 00000000 */   nop      
 /* 46260 8006AE60 2401EFFF */  addiu     $at, $zero, -0x1001
 /* 46264 8006AE64 10000026 */  b         .L8006AF00
 /* 46268 8006AE68 02018024 */   and      $s0, $s0, $at
@@ -333,7 +333,7 @@ glabel func_8006AA34
 /* 462A8 8006AEA8 40886800 */  mtc0      $t0, $13
 /* 462AC 8006AEAC 24040008 */  addiu     $a0, $zero, 8
 /* 462B0 8006AEB0 0C01ABDF */  jal       send_mesg
-/* 462B4 8006AEB4 00000000 */   nop
+/* 462B4 8006AEB4 00000000 */   nop      
 /* 462B8 8006AEB8 2401FDFF */  addiu     $at, $zero, -0x201
 /* 462BC 8006AEBC 1000FF53 */  b         .L8006AC0C
 /* 462C0 8006AEC0 02018024 */   and      $s0, $s0, $at
@@ -342,7 +342,7 @@ glabel func_8006AA34
 /* 462CC 8006AECC 40886800 */  mtc0      $t0, $13
 /* 462D0 8006AED0 24040000 */  addiu     $a0, $zero, 0
 /* 462D4 8006AED4 0C01ABDF */  jal       send_mesg
-/* 462D8 8006AED8 00000000 */   nop
+/* 462D8 8006AED8 00000000 */   nop      
 /* 462DC 8006AEDC 2401FEFF */  addiu     $at, $zero, -0x101
 /* 462E0 8006AEE0 1000FF4A */  b         .L8006AC0C
 /* 462E4 8006AEE4 02018024 */   and      $s0, $s0, $at
@@ -352,7 +352,7 @@ glabel func_8006AA34
 /* 462F0 8006AEF0 0C01ABDF */  jal       send_mesg
 /* 462F4 8006AEF4 24040050 */   addiu    $a0, $zero, 0x50
 /* 462F8 8006AEF8 10000001 */  b         .L8006AF00
-/* 462FC 8006AEFC 00000000 */   nop
+/* 462FC 8006AEFC 00000000 */   nop      
 .L8006AF00:
 /* 46300 8006AF00 8F490004 */  lw        $t1, 4($k0)
 /* 46304 8006AF04 3C0A8009 */  lui       $t2, %hi(D_80094658)
@@ -360,13 +360,13 @@ glabel func_8006AA34
 /* 4630C 8006AF0C 8D4B0004 */  lw        $t3, 4($t2)
 /* 46310 8006AF10 012B082A */  slt       $at, $t1, $t3
 /* 46314 8006AF14 10200007 */  beqz      $at, .L8006AF34
-/* 46318 8006AF18 00000000 */   nop
+/* 46318 8006AF18 00000000 */   nop      
 /* 4631C 8006AF1C 03402821 */  addu      $a1, $k0, $zero
 /* 46320 8006AF20 3C048009 */  lui       $a0, %hi(D_80094658)
 /* 46324 8006AF24 0C01AC5D */  jal       osEnqueueThread
 /* 46328 8006AF28 24844658 */   addiu    $a0, $a0, %lo(D_80094658)
 /* 4632C 8006AF2C 0801AC75 */  j         osDispatchThread
-/* 46330 8006AF30 00000000 */   nop
+/* 46330 8006AF30 00000000 */   nop      
 .L8006AF34:
 /* 46334 8006AF34 3C098009 */  lui       $t1, %hi(D_80094658)
 /* 46338 8006AF38 25294658 */  addiu     $t1, $t1, %lo(D_80094658)
@@ -386,7 +386,7 @@ glabel func_8006AA34
 /* 4636C 8006AF6C 0C01ABDF */  jal       send_mesg
 /* 46370 8006AF70 24040060 */   addiu    $a0, $zero, 0x60
 /* 46374 8006AF74 0801AC75 */  j         osDispatchThread
-/* 46378 8006AF78 00000000 */   nop
+/* 46378 8006AF78 00000000 */   nop      
 
 glabel send_mesg
 /* 4637C 8006AF7C 03E09021 */  addu      $s2, $ra, $zero
@@ -395,24 +395,24 @@ glabel send_mesg
 /* 46388 8006AF88 01445021 */  addu      $t2, $t2, $a0
 /* 4638C 8006AF8C 8D490000 */  lw        $t1, ($t2)
 /* 46390 8006AF90 11200027 */  beqz      $t1, .L8006B030
-/* 46394 8006AF94 00000000 */   nop
+/* 46394 8006AF94 00000000 */   nop      
 /* 46398 8006AF98 8D2B0008 */  lw        $t3, 8($t1)
 /* 4639C 8006AF9C 8D2C0010 */  lw        $t4, 0x10($t1)
 /* 463A0 8006AFA0 016C082A */  slt       $at, $t3, $t4
 /* 463A4 8006AFA4 10200022 */  beqz      $at, .L8006B030
-/* 463A8 8006AFA8 00000000 */   nop
+/* 463A8 8006AFA8 00000000 */   nop      
 /* 463AC 8006AFAC 8D2D000C */  lw        $t5, 0xc($t1)
 /* 463B0 8006AFB0 01AB6821 */  addu      $t5, $t5, $t3
 /* 463B4 8006AFB4 01AC001A */  div       $zero, $t5, $t4
 /* 463B8 8006AFB8 15800002 */  bnez      $t4, .L8006AFC4
-/* 463BC 8006AFBC 00000000 */   nop
+/* 463BC 8006AFBC 00000000 */   nop      
 /* 463C0 8006AFC0 0007000D */  break     7
 .L8006AFC4:
 /* 463C4 8006AFC4 2401FFFF */   addiu    $at, $zero, -1
 /* 463C8 8006AFC8 15810004 */  bne       $t4, $at, .L8006AFDC
 /* 463CC 8006AFCC 3C018000 */   lui      $at, 0x8000
 /* 463D0 8006AFD0 15A10002 */  bne       $t5, $at, .L8006AFDC
-/* 463D4 8006AFD4 00000000 */   nop
+/* 463D4 8006AFD4 00000000 */   nop      
 /* 463D8 8006AFD8 0006000D */  break     6
 .L8006AFDC:
 /* 463DC 8006AFDC 00006810 */   mfhi     $t5
@@ -428,7 +428,7 @@ glabel send_mesg
 /* 46404 8006B004 8D2A0000 */  lw        $t2, ($t1)
 /* 46408 8006B008 8D4B0000 */  lw        $t3, ($t2)
 /* 4640C 8006B00C 11600008 */  beqz      $t3, .L8006B030
-/* 46410 8006B010 00000000 */   nop
+/* 46410 8006B010 00000000 */   nop      
 /* 46414 8006B014 0C01AC6F */  jal       osPopThread
 /* 46418 8006B018 01202021 */   addu     $a0, $t1, $zero
 /* 4641C 8006B01C 00405021 */  addu      $t2, $v0, $zero
@@ -438,7 +438,7 @@ glabel send_mesg
 /* 4642C 8006B02C 24844658 */   addiu    $a0, $a0, %lo(D_80094658)
 .L8006B030:
 /* 46430 8006B030 02400008 */  jr        $s2
-/* 46434 8006B034 00000000 */   nop
+/* 46434 8006B034 00000000 */   nop      
 
 glabel handle_CPU
 /* 46438 8006B038 3C013000 */  lui       $at, 0x3000
@@ -446,7 +446,7 @@ glabel handle_CPU
 /* 46440 8006B040 00094F02 */  srl       $t1, $t1, 0x1c
 /* 46444 8006B044 240A0001 */  addiu     $t2, $zero, 1
 /* 46448 8006B048 152AFFC0 */  bne       $t1, $t2, .L8006AF4C
-/* 4644C 8006B04C 00000000 */   nop
+/* 4644C 8006B04C 00000000 */   nop      
 /* 46450 8006B050 24090001 */  addiu     $t1, $zero, 1
 /* 46454 8006B054 AF490018 */  sw        $t1, 0x18($k0)
 /* 46458 8006B058 8F5B0118 */  lw        $k1, 0x118($k0)
@@ -476,9 +476,9 @@ glabel osEnqueueAndYield
 /* 464B0 8006B0B0 ACBF011C */  sw        $ra, 0x11c($a1)
 /* 464B4 8006B0B4 8CBB0018 */  lw        $k1, 0x18($a1)
 /* 464B8 8006B0B8 1360000A */  beqz      $k1, .L8006B0E4
-/* 464BC 8006B0BC 00000000 */   nop
+/* 464BC 8006B0BC 00000000 */   nop      
 /* 464C0 8006B0C0 445BF800 */  cfc1      $k1, $31
-/* 464C4 8006B0C4 00000000 */  nop
+/* 464C4 8006B0C4 00000000 */  nop       
 /* 464C8 8006B0C8 ACBB012C */  sw        $k1, 0x12c($a1)
 /* 464CC 8006B0CC F4B40180 */  sdc1      $f20, 0x180($a1)
 /* 464D0 8006B0D0 F4B60188 */  sdc1      $f22, 0x188($a1)
@@ -490,7 +490,7 @@ glabel osEnqueueAndYield
 /* 464E4 8006B0E4 8CBB0118 */  lw        $k1, 0x118($a1)
 /* 464E8 8006B0E8 3369FF00 */  andi      $t1, $k1, 0xff00
 /* 464EC 8006B0EC 1120000D */  beqz      $t1, .L8006B124
-/* 464F0 8006B0F0 00000000 */   nop
+/* 464F0 8006B0F0 00000000 */   nop      
 /* 464F4 8006B0F4 3C088009 */  lui       $t0, %hi(D_80095900)
 /* 464F8 8006B0F8 25085900 */  addiu     $t0, $t0, %lo(D_80095900)
 /* 464FC 8006B0FC 8D080000 */  lw        $t0, ($t0)
@@ -507,7 +507,7 @@ glabel osEnqueueAndYield
 /* 46524 8006B124 3C1BA430 */  lui       $k1, %hi(D_A430000C)
 /* 46528 8006B128 8F7B000C */  lw        $k1, %lo(D_A430000C)($k1)
 /* 4652C 8006B12C 1360000B */  beqz      $k1, .L8006B15C
-/* 46530 8006B130 00000000 */   nop
+/* 46530 8006B130 00000000 */   nop      
 /* 46534 8006B134 3C1A8009 */  lui       $k0, %hi(D_80095900)
 /* 46538 8006B138 275A5900 */  addiu     $k0, $k0, %lo(D_80095900)
 /* 4653C 8006B13C 8F5A0000 */  lw        $k0, ($k0)
@@ -522,10 +522,10 @@ glabel osEnqueueAndYield
 /* 4655C 8006B15C 10800003 */  beqz      $a0, .L8006B16C
 /* 46560 8006B160 ACBB0128 */   sw       $k1, 0x128($a1)
 /* 46564 8006B164 0C01AC5D */  jal       osEnqueueThread
-/* 46568 8006B168 00000000 */   nop
+/* 46568 8006B168 00000000 */   nop      
 .L8006B16C:
 /* 4656C 8006B16C 0801AC75 */  j         osDispatchThread
-/* 46570 8006B170 00000000 */   nop
+/* 46570 8006B170 00000000 */   nop      
 
 glabel osEnqueueThread
 /* 46574 8006B174 0080C821 */  addu      $t9, $a0, $zero
@@ -534,14 +534,14 @@ glabel osEnqueueThread
 /* 46580 8006B180 8F0E0004 */  lw        $t6, 4($t8)
 /* 46584 8006B184 01CF082A */  slt       $at, $t6, $t7
 /* 46588 8006B188 14200007 */  bnez      $at, .L8006B1A8
-/* 4658C 8006B18C 00000000 */   nop
+/* 4658C 8006B18C 00000000 */   nop      
 .L8006B190:
 /* 46590 8006B190 0300C821 */  addu      $t9, $t8, $zero
 /* 46594 8006B194 8F180000 */  lw        $t8, ($t8)
 /* 46598 8006B198 8F0E0004 */  lw        $t6, 4($t8)
 /* 4659C 8006B19C 01CF082A */  slt       $at, $t6, $t7
 /* 465A0 8006B1A0 1020FFFB */  beqz      $at, .L8006B190
-/* 465A4 8006B1A4 00000000 */   nop
+/* 465A4 8006B1A4 00000000 */   nop      
 .L8006B1A8:
 /* 465A8 8006B1A8 8F380000 */  lw        $t8, ($t9)
 /* 465AC 8006B1AC ACB80000 */  sw        $t8, ($a1)
@@ -555,7 +555,7 @@ glabel osPopThread
 /* 465C4 8006B1C4 03E00008 */  jr        $ra
 /* 465C8 8006B1C8 AC990000 */   sw       $t9, ($a0)
 /* 465CC 8006B1CC 03E00008 */  jr        $ra
-/* 465D0 8006B1D0 00000000 */   nop
+/* 465D0 8006B1D0 00000000 */   nop      
 
 glabel osDispatchThread
 /* 465D4 8006B1D4 3C048009 */  lui       $a0, %hi(D_80094658)
@@ -615,7 +615,7 @@ glabel osDispatchThread
 /* 466AC 8006B2AC 409B7000 */  mtc0      $k1, $14
 /* 466B0 8006B2B0 8F5B0018 */  lw        $k1, 0x18($k0)
 /* 466B4 8006B2B4 13600013 */  beqz      $k1, .L8006B304
-/* 466B8 8006B2B8 00000000 */   nop
+/* 466B8 8006B2B8 00000000 */   nop      
 /* 466BC 8006B2BC 8F5B012C */  lw        $k1, 0x12c($k0)
 /* 466C0 8006B2C0 44DBF800 */  ctc1      $k1, $31
 /* 466C4 8006B2C4 D7400130 */  ldc1      $f0, 0x130($k0)
@@ -649,12 +649,12 @@ glabel osDispatchThread
 /* 46730 8006B330 3C1AA430 */  lui       $k0, 0xa430
 /* 46734 8006B334 375A000C */  ori       $k0, $k0, 0xc
 /* 46738 8006B338 AF5B0000 */  sw        $k1, ($k0)
-/* 4673C 8006B33C 00000000 */  nop
-/* 46740 8006B340 00000000 */  nop
-/* 46744 8006B344 00000000 */  nop
-/* 46748 8006B348 00000000 */  nop
-/* 4674C 8006B34C 42000018 */  eret
+/* 4673C 8006B33C 00000000 */  nop       
+/* 46740 8006B340 00000000 */  nop       
+/* 46744 8006B344 00000000 */  nop       
+/* 46748 8006B348 00000000 */  nop       
+/* 4674C 8006B34C 42000018 */  eret      
 /* 46750 8006B350 00002021 */  addu      $a0, $zero, $zero
 /* 46754 8006B354 0C01B254 */  jal       osDestroyThread
-/* 46758 8006B358 00000000 */   nop
-/* 4675C 8006B35C 00000000 */  nop
+/* 46758 8006B358 00000000 */   nop      
+/* 4675C 8006B35C 00000000 */  nop