diff --git a/papermario/asm/CODE_e20eb0.s b/papermario/asm/CODE_e20eb0.s
index 7c2524c634..d6d90274ae 100644
--- a/papermario/asm/CODE_e20eb0.s
+++ b/papermario/asm/CODE_e20eb0.s
@@ -8,7 +8,8 @@ func_002B7000:
 /* E20EBC 002B700C 460C003E */  c.le.s $f0, $f12
 /* E20EC0 002B7010 00000000 */  nop   
 /* E20EC4 002B7014 45000009 */  .byte 0x45,0x00,0x00,0x09 /* Because of invalid n64 opcode bc1f */
-/* E20EC8 002B7018 240200FF */  /* E20ECC 002B701C 3C0143B4 */  li    $1, 0x43B40000 # 360.000000
+/* E20EC8 002B7018 240200FF */  .byte 0x24,0x02,0x00,0xFF
+/* E20ECC 002B701C 3C0143B4 */  li    $1, 0x43B40000 # 360.000000
 /* E20ED0 002B7020 44810000 */  mtc1  $1, $f0
 /* E20ED4 002B7024 00000000 */  nop   
 /* E20ED8 002B7028 460C0001 */  sub.s $f0, $f0, $f12
@@ -24,7 +25,8 @@ func_002B7000:
 /* E20EF8 002B7048 460C103E */  c.le.s $f2, $f12
 /* E20EFC 002B704C 00000000 */  nop   
 /* E20F00 002B7050 45000006 */  .byte 0x45,0x00,0x00,0x06 /* Because of invalid n64 opcode bc1f */
-/* E20F04 002B7054 00000000 */  /* E20F08 002B7058 46026001 */  sub.s $f0, $f12, $f2
+/* E20F04 002B7054 00000000 */  nop
+/* E20F08 002B7058 46026001 */  sub.s $f0, $f12, $f2
 /* E20F0C 002B705C 4600010D */  trunc.w.s $f4, $f0
 /* E20F10 002B7060 44032000 */  mfc1  $3, $f4
 /* E20F14 002B7064 080ADC2B */  j     func_002B70AC
diff --git a/papermario/asm/code_a5dd0_len_114e0.s b/papermario/asm/code_a5dd0_len_114e0.s
index fbc4f642cc..4998c41798 100644
--- a/papermario/asm/code_a5dd0_len_114e0.s
+++ b/papermario/asm/code_a5dd0_len_114e0.s
@@ -612,7 +612,8 @@ func_0010FD98:
 /* 0A6640 0010FF40 4600103C */  c.lt.s $f2, $f0
 /* 0A6644 0010FF44 00000000 */  nop   
 /* 0A6648 0010FF48 45030055 */  .byte 0x45,0x03,0x00,0x55 /* Because of invalid n64 opcode bc1tl */
-/* 0A664C 0010FF4C 26310001 */  .L0010FF50:
+/* 0A664C 0010FF4C 26310001 */
+.L0010FF50:
 /* 0A6650 0010FF50 3C038015 */  lui   $3, %hi(D_80151310) # $3, 0x8015
 /* 0A6654 0010FF54 8C631310 */  lw    $3, %lo(D_80151310)($3)
 /* 0A6658 0010FF58 24020001 */  li    $2, 1
diff --git a/papermario/asm/code_b72b0_len_15ed0.s b/papermario/asm/code_b72b0_len_15ed0.s
index f9e9ac6683..4449449682 100644
--- a/papermario/asm/code_b72b0_len_15ed0.s
+++ b/papermario/asm/code_b72b0_len_15ed0.s
@@ -15266,7 +15266,7 @@ func_0012E528:
 /* 0C4E9C 0012E79C 00431825 */   or    $3, $2, $3
 
 .L0012E7A0:
-/* 0C4EA0 0012E7A0 3C03E400 */  lui   $3, %hi(D_E4000004) # $3, 0xe400
+/* 0C4EA0 0012E7A0 3C03E400 */  lui   $3, 0xe400
 func_0012E7A4:
 /* 0C4EA4 0012E7A4 85A2000E */  lh    $2, 0xe($13)
 /* 0C4EA8 0012E7A8 18400002 */  blez  $2, .L0012E7B4
@@ -15298,7 +15298,7 @@ func_0012E7D4:
 /* 0C4EFC 0012E7FC AC620000 */  sw    $2, ($3)
 /* 0C4F00 0012E800 85A20002 */  lh    $2, 2($13)
 /* 0C4F04 0012E804 04410007 */  bgez  $2, .L0012E824
-/* 0C4F08 0012E808 24630004 */   addiu $3, %lo(D_E4000004) # addiu $3, $3, 4
+/* 0C4F08 0012E808 24630004 */   addiu $3, $3, 4
 /* 0C4F0C 0012E80C 000210C0 */  sll   $2, $2, 3
 /* 0C4F10 0012E810 5C400001 */  bgtzl $2, .L0012E818
 /* 0C4F14 0012E814 0000102D */   move  $2, $0
@@ -17429,7 +17429,7 @@ func_00130450:
 
 .L00130748:
 /* 0C6E48 00130748 15C2005F */  bne   $14, $2, .L001308C8
-/* 0C6E4C 0013074C 3C03E400 */   lui   $3, %hi(D_E4000004) # $3, 0xe400
+/* 0C6E4C 0013074C 3C03E400 */   lui   $3, 0xe400
 /* 0C6E50 00130750 3C02FD18 */  lui   $2, 0xfd18
 /* 0C6E54 00130754 02421025 */  or    $2, $18, $2
 /* 0C6E58 00130758 8CE50000 */  lw    $5, ($7)
@@ -17439,7 +17439,7 @@ func_00130450:
 /* 0C6E68 00130768 ACE50000 */  sw    $5, ($7)
 /* 0C6E6C 0013076C AC620000 */  sw    $2, ($3)
 /* 0C6E70 00130770 8FB70098 */  lw    $23, 0x98($29)
-/* 0C6E74 00130774 AC770004 */  sw    $23, %lo(D_E4000004)($3)
+/* 0C6E74 00130774 AC770004 */  sw    $23, 4($3)
 /* 0C6E78 00130778 8FA20018 */  lw    $2, 0x18($29)
 /* 0C6E7C 0013077C 8FA40010 */  lw    $4, 0x10($29)
 /* 0C6E80 00130780 24A30008 */  addiu $3, $5, 8
diff --git a/papermario/asm/code_cd180_len_38f0.s b/papermario/asm/code_cd180_len_38f0.s
index 13ccfbf8e0..8cecea6ef1 100644
--- a/papermario/asm/code_cd180_len_38f0.s
+++ b/papermario/asm/code_cd180_len_38f0.s
@@ -3123,8 +3123,8 @@ func_001392F0:
 /* 0CFFD0 001398D0 55A20005 */  bnel  $13, $2, .L001398E8
 /* 0CFFD4 001398D4 3C04FCFF */   lui   $4, 0xfcff
 .L001398D8:
-/* 0CFFD8 001398D8 3C04FC61 */  lui   $4, %hi(D_FC610004) # $4, 0xfc61
-/* 0CFFDC 001398DC 34849AC3 */  ori   $4, (0xFC619AC3 & 0xFFFF) # ori $4, $4, 0x9ac3
+/* 0CFFD8 001398D8 3C04FC61 */  lui   $4, 0xfc61
+/* 0CFFDC 001398DC 34849AC3 */  ori $4, $4, 0x9ac3
 /* 0CFFE0 001398E0 0804E63C */  j     func_001398F0
 /* 0CFFE4 001398E4 3C031137 */   lui   $3, 0x1137
 
@@ -3238,7 +3238,7 @@ func_00139A28:
 /* 0D017C 00139A7C 00441021 */  addu  $2, $2, $4
 /* 0D0180 00139A80 00021080 */  sll   $2, $2, 2
 /* 0D0184 00139A84 30420FFF */  andi  $2, $2, 0xfff
-/* 0D0188 00139A88 3C04E400 */  lui   $4, %hi(D_E4000004) # $4, 0xe400
+/* 0D0188 00139A88 3C04E400 */  lui   $4, 0xe400
 /* 0D018C 00139A8C 00441025 */  or    $2, $2, $4
 /* 0D0190 00139A90 00621825 */  or    $3, $3, $2
 /* 0D0194 00139A94 ACE30000 */  sw    $3, ($7)
@@ -3389,7 +3389,7 @@ func_00139C50:
 /* 0D03BC 00139CBC 00441021 */  addu  $2, $2, $4
 /* 0D03C0 00139CC0 00021080 */  sll   $2, $2, 2
 /* 0D03C4 00139CC4 30420FFF */  andi  $2, $2, 0xfff
-/* 0D03C8 00139CC8 3C04E400 */  lui   $4, %hi(D_E4000004) # $4, 0xe400
+/* 0D03C8 00139CC8 3C04E400 */  lui   $4, 0xe400
 /* 0D03CC 00139CCC 00441025 */  or    $2, $2, $4
 /* 0D03D0 00139CD0 00621825 */  or    $3, $3, $2
 /* 0D03D4 00139CD4 ACE30000 */  sw    $3, ($7)