diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E46BC.s b/asm/nonmatchings/code_105700_len_2130/func_802E46BC.s
index fcf27d10f7..16bfbf3007 100644
--- a/asm/nonmatchings/code_105700_len_2130/func_802E46BC.s
+++ b/asm/nonmatchings/code_105700_len_2130/func_802E46BC.s
@@ -22,4 +22,4 @@ glabel func_802E46BC
 /* 105F80 802E4700 8FB00010 */  lw        $s0, 0x10($sp)
 /* 105F84 802E4704 03E00008 */  jr        $ra
 /* 105F88 802E4708 27BD0018 */   addiu    $sp, $sp, 0x18
-/* 105F8C 802E470C 00000000 */  nop
+/* 105F8C 802E470C 00000000 */  nop       
diff --git a/asm/nonmatchings/code_135EE0/pause_interp_cursor.s b/asm/nonmatchings/code_135EE0/pause_interp_cursor.s
index 05d3d97965..f0d7dab02a 100644
--- a/asm/nonmatchings/code_135EE0/pause_interp_cursor.s
+++ b/asm/nonmatchings/code_135EE0/pause_interp_cursor.s
@@ -51,8 +51,8 @@ glabel pause_interp_cursor
 /* 13625C 80242F1C 3C038025 */  lui       $v1, 0x8025
 /* 136260 80242F20 2463EFA0 */  addiu     $v1, $v1, -0x1060
 /* 136264 80242F24 8C620000 */  lw        $v0, ($v1)
-/* 136268 80242F28 3C048025 */  lui       $a0, 0x8025
-/* 13626C 80242F2C 8C84EFB0 */  lw        $a0, -0x1050($a0)
+/* 136268 80242F28 3C048025 */  lui       $a0, %hi(gPauseMenuCursorTargetOpacity)
+/* 13626C 80242F2C 8C84EFB0 */  lw        $a0, %lo(gPauseMenuCursorTargetOpacity)($a0)
 /* 136270 80242F30 00481021 */  addu      $v0, $v0, $t0
 /* 136274 80242F34 14800009 */  bnez      $a0, .L80242F5C
 /* 136278 80242F38 AC620000 */   sw       $v0, ($v1)
@@ -77,6 +77,6 @@ glabel pause_interp_cursor
 .L80242F80:
 /* 1362C0 80242F80 240200FF */  addiu     $v0, $zero, 0xff
 .L80242F84:
-/* 1362C4 80242F84 3C018025 */  lui       $at, 0x8025
+/* 1362C4 80242F84 3C018025 */  lui       $at, %hi(gPauseMenuCursorTargetOpacity)
 /* 1362C8 80242F88 03E00008 */  jr        $ra
-/* 1362CC 80242F8C AC22EFB0 */   sw       $v0, -0x1050($at)
+/* 1362CC 80242F8C AC22EFB0 */   sw       $v0, %lo(gPauseMenuCursorTargetOpacity)($at)
diff --git a/asm/nonmatchings/code_135EE0/pause_set_cursor_opacity.s b/asm/nonmatchings/code_135EE0/pause_set_cursor_opacity.s
index 73e48463f8..eaad7e22ff 100644
--- a/asm/nonmatchings/code_135EE0/pause_set_cursor_opacity.s
+++ b/asm/nonmatchings/code_135EE0/pause_set_cursor_opacity.s
@@ -2,6 +2,6 @@
 .set noreorder # don't insert nops after branches
 
 glabel pause_set_cursor_opacity
-/* 135EE0 80242BA0 3C018025 */  lui       $at, 0x8025
+/* 135EE0 80242BA0 3C018025 */  lui       $at, %hi(gPauseMenuCursorTargetOpacity)
 /* 135EE4 80242BA4 03E00008 */  jr        $ra
-/* 135EE8 80242BA8 AC24EFB0 */   sw       $a0, -0x1050($at)
+/* 135EE8 80242BA8 AC24EFB0 */   sw       $a0, %lo(gPauseMenuCursorTargetOpacity)($at)
diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/delete_entity.s b/asm/nonmatchings/code_a5dd0_len_114e0/delete_entity.s
index ab36887ff1..3d9337d706 100644
--- a/asm/nonmatchings/code_a5dd0_len_114e0/delete_entity.s
+++ b/asm/nonmatchings/code_a5dd0_len_114e0/delete_entity.s
@@ -11,18 +11,18 @@ glabel delete_entity
 /* A6DE8 801106E8 0040882D */  daddu     $s1, $v0, $zero
 /* A6DEC 801106EC 8E240040 */  lw        $a0, 0x40($s1)
 /* A6DF0 801106F0 10800003 */  beqz      $a0, .L80110700
-/* A6DF4 801106F4 00000000 */   nop
+/* A6DF4 801106F4 00000000 */   nop      
 /* A6DF8 801106F8 0C00AB4B */  jal       heap_free
-/* A6DFC 801106FC 00000000 */   nop
+/* A6DFC 801106FC 00000000 */   nop      
 .L80110700:
 /* A6E00 80110700 8E220000 */  lw        $v0, ($s1)
 /* A6E04 80110704 30420008 */  andi      $v0, $v0, 8
 /* A6E08 80110708 14400005 */  bnez      $v0, .L80110720
-/* A6E0C 8011070C 00000000 */   nop
+/* A6E0C 8011070C 00000000 */   nop      
 /* A6E10 80110710 0C048B7F */  jal       func_80122DFC
 /* A6E14 80110714 86240014 */   lh       $a0, 0x14($s1)
 /* A6E18 80110718 080441CC */  j         .L80110730
-/* A6E1C 8011071C 00000000 */   nop
+/* A6E1C 8011071C 00000000 */   nop      
 .L80110720:
 /* A6E20 80110720 0C047FF8 */  jal       get_anim_mesh
 /* A6E24 80110724 86240014 */   lh       $a0, 0x14($s1)
@@ -31,9 +31,9 @@ glabel delete_entity
 .L80110730:
 /* A6E30 80110730 86240016 */  lh        $a0, 0x16($s1)
 /* A6E34 80110734 04800007 */  bltz      $a0, .L80110754
-/* A6E38 80110738 00000000 */   nop
+/* A6E38 80110738 00000000 */   nop      
 /* A6E3C 8011073C 0C044181 */  jal       get_shadow_by_index
-/* A6E40 80110740 00000000 */   nop
+/* A6E40 80110740 00000000 */   nop      
 /* A6E44 80110744 8C430000 */  lw        $v1, ($v0)
 /* A6E48 80110748 3C041000 */  lui       $a0, 0x1000
 /* A6E4C 8011074C 00641825 */  or        $v1, $v1, $a0
diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/delete_entity_and_unload_data.s b/asm/nonmatchings/code_a5dd0_len_114e0/delete_entity_and_unload_data.s
index 779fe58e5c..ac9e63b8f2 100644
--- a/asm/nonmatchings/code_a5dd0_len_114e0/delete_entity_and_unload_data.s
+++ b/asm/nonmatchings/code_a5dd0_len_114e0/delete_entity_and_unload_data.s
@@ -11,18 +11,18 @@ glabel delete_entity_and_unload_data
 /* A6EA8 801107A8 0040882D */  daddu     $s1, $v0, $zero
 /* A6EAC 801107AC 8E240040 */  lw        $a0, 0x40($s1)
 /* A6EB0 801107B0 10800003 */  beqz      $a0, .L801107C0
-/* A6EB4 801107B4 00000000 */   nop
+/* A6EB4 801107B4 00000000 */   nop      
 /* A6EB8 801107B8 0C00AB4B */  jal       heap_free
-/* A6EBC 801107BC 00000000 */   nop
+/* A6EBC 801107BC 00000000 */   nop      
 .L801107C0:
 /* A6EC0 801107C0 8E220000 */  lw        $v0, ($s1)
 /* A6EC4 801107C4 30420008 */  andi      $v0, $v0, 8
 /* A6EC8 801107C8 14400005 */  bnez      $v0, .L801107E0
-/* A6ECC 801107CC 00000000 */   nop
+/* A6ECC 801107CC 00000000 */   nop      
 /* A6ED0 801107D0 0C048B7F */  jal       func_80122DFC
 /* A6ED4 801107D4 86240014 */   lh       $a0, 0x14($s1)
 /* A6ED8 801107D8 080441FC */  j         .L801107F0
-/* A6EDC 801107DC 00000000 */   nop
+/* A6EDC 801107DC 00000000 */   nop      
 .L801107E0:
 /* A6EE0 801107E0 0C047FF8 */  jal       get_anim_mesh
 /* A6EE4 801107E4 86240014 */   lh       $a0, 0x14($s1)
@@ -31,12 +31,12 @@ glabel delete_entity_and_unload_data
 .L801107F0:
 /* A6EF0 801107F0 8E240038 */  lw        $a0, 0x38($s1)
 /* A6EF4 801107F4 0C0445F7 */  jal       func_801117DC
-/* A6EF8 801107F8 00000000 */   nop
+/* A6EF8 801107F8 00000000 */   nop      
 /* A6EFC 801107FC 86240016 */  lh        $a0, 0x16($s1)
 /* A6F00 80110800 04800007 */  bltz      $a0, .L80110820
-/* A6F04 80110804 00000000 */   nop
+/* A6F04 80110804 00000000 */   nop      
 /* A6F08 80110808 0C044181 */  jal       get_shadow_by_index
-/* A6F0C 8011080C 00000000 */   nop
+/* A6F0C 8011080C 00000000 */   nop      
 /* A6F10 80110810 8C430000 */  lw        $v1, ($v0)
 /* A6F14 80110814 3C041000 */  lui       $a0, 0x1000
 /* A6F18 80110818 00641825 */  or        $v1, $v1, $a0
diff --git a/asm/nonmatchings/code_ef070_len_3400/func_802CD9F0.s b/asm/nonmatchings/code_ef070_len_3400/func_802CD9F0.s
index 5d2f82702b..89bbe70493 100644
--- a/asm/nonmatchings/code_ef070_len_3400/func_802CD9F0.s
+++ b/asm/nonmatchings/code_ef070_len_3400/func_802CD9F0.s
@@ -53,6 +53,6 @@ glabel func_802CD9F0
 /* F2458 802CDAA8 24020002 */  addiu     $v0, $zero, 2
 /* F245C 802CDAAC 03E00008 */  jr        $ra
 /* F2460 802CDAB0 27BD0028 */   addiu    $sp, $sp, 0x28
-/* F2464 802CDAB4 00000000 */  nop
-/* F2468 802CDAB8 00000000 */  nop
-/* F246C 802CDABC 00000000 */  nop
+/* F2464 802CDAB4 00000000 */  nop       
+/* F2468 802CDAB8 00000000 */  nop       
+/* F246C 802CDABC 00000000 */  nop       
diff --git a/asm/nonmatchings/si/si_execute_next_command.s b/asm/nonmatchings/si/si_execute_next_command.s
index 63c0d201bd..3365ba3b2d 100644
--- a/asm/nonmatchings/si/si_execute_next_command.s
+++ b/asm/nonmatchings/si/si_execute_next_command.s
@@ -16,7 +16,7 @@ glabel si_execute_next_command
 /* EBDDC 802C742C 00220821 */  addu      $at, $at, $v0
 /* EBDE0 802C7430 8C229F20 */  lw        $v0, -0x60e0($at)
 /* EBDE4 802C7434 00400008 */  jr        $v0
-/* EBDE8 802C7438 00000000 */   nop
+/* EBDE8 802C7438 00000000 */   nop      
 /* EBDEC 802C743C 8E030008 */  lw        $v1, 8($s0)
 /* EBDF0 802C7440 24050003 */  addiu     $a1, $zero, 3
 /* EBDF4 802C7444 0060102D */  daddu     $v0, $v1, $zero
@@ -407,7 +407,7 @@ glabel si_execute_next_command
 /* EC3F8 802C7A48 0040282D */   daddu    $a1, $v0, $zero
 .L802C7A4C:
 /* EC3FC 802C7A4C 080B1E93 */  j         .L802C7A4C
-/* EC400 802C7A50 00000000 */   nop
+/* EC400 802C7A50 00000000 */   nop      
 .L802C7A54:
 /* EC404 802C7A54 24020003 */  addiu     $v0, $zero, 3
 /* EC408 802C7A58 10A2FE6E */  beq       $a1, $v0, .L802C7414
@@ -424,13 +424,13 @@ glabel si_execute_next_command
 /* EC434 802C7A84 A2000002 */   sb       $zero, 2($s0)
 .L802C7A88:
 /* EC438 802C7A88 14A2FE62 */  bne       $a1, $v0, .L802C7414
-/* EC43C 802C7A8C 00000000 */   nop
+/* EC43C 802C7A8C 00000000 */   nop      
 /* EC440 802C7A90 A2000002 */  sb        $zero, 2($s0)
 /* EC444 802C7A94 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
 /* EC448 802C7A98 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
 /* EC44C 802C7A9C 80420078 */  lb        $v0, 0x78($v0)
 /* EC450 802C7AA0 1445FE5C */  bne       $v0, $a1, .L802C7414
-/* EC454 802C7AA4 00000000 */   nop
+/* EC454 802C7AA4 00000000 */   nop      
 .L802C7AA8:
 /* EC458 802C7AA8 0000102D */  daddu     $v0, $zero, $zero
 .L802C7AAC: