Some audio, menu, controller and misc labelling (#188)

* Further Labelling of font.c

* Further labelling

* Rename unknown_06B2B0

* Revert the rename

I still want to do it, but I'm gonna do it as a separate branch, so diffs won't be absolute hell

* Transition labelling

* Requested changes

* oops missed one

* Rename labelled displaylists to new standard

* I can't believe it's labelling!

* More :)

* yo audio labels!!!??

* Even more audio oh my

* i literally only do labelling what do you expect this to be

asm/non_matchings/audio/func_800015F8.s

@@ -17,7 +17,7 @@ glabel func_800015F8
 /* 002210 80001610 3C198011 */  lui   $t9, %hi(D_80115D40) # $t9, 0x8011
 /* 002214 80001614 0082082B */  sltu  $at, $a0, $v0
 /* 002218 80001618 10200013 */  beqz  $at, .L80001668
-/* 00221C 8000161C 3C098011 */   lui   $t1, %hi(D_80115D30) # $t1, 0x8011
+/* 00221C 8000161C 3C098011 */   lui   $t1, %hi(sMusicTempo) # $t1, 0x8011
 /* 002220 80001620 00447023 */  subu  $t6, $v0, $a0
 /* 002224 80001624 448E2000 */  mtc1  $t6, $f4
 /* 002228 80001628 3C038011 */  lui   $v1, %hi(D_80115D34) # $v1, 0x8011
@@ -61,10 +61,10 @@ glabel func_800015F8
 /* 0022B0 800016B0 93395D40 */  lbu   $t9, %lo(D_80115D40)($t9)
 /* 0022B4 800016B4 240800B6 */  li    $t0, 182
 /* 0022B8 800016B8 17200002 */  bnez  $t9, .L800016C4
-/* 0022BC 800016BC 3C018011 */   lui   $at, %hi(D_80115D30) # $at, 0x8011
-/* 0022C0 800016C0 A4285D30 */  sh    $t0, %lo(D_80115D30)($at)
+/* 0022BC 800016BC 3C018011 */   lui   $at, %hi(sMusicTempo) # $at, 0x8011
+/* 0022C0 800016C0 A4285D30 */  sh    $t0, %lo(sMusicTempo)($at)
 .L800016C4:
-/* 0022C4 800016C4 85295D30 */  lh    $t1, %lo(D_80115D30)($t1)
+/* 0022C4 800016C4 85295D30 */  lh    $t1, %lo(sMusicTempo)($t1)
 /* 0022C8 800016C8 3C01800E */  lui   $at, %hi(D_800E49E8) # $at, 0x800e
 /* 0022CC 800016CC 44893000 */  mtc1  $t1, $f6
 /* 0022D0 800016D0 C42A49E8 */  lwc1  $f10, %lo(D_800E49E8)($at)

asm/non_matchings/audio/func_80001D04.s

@@ -15,8 +15,8 @@ glabel func_80001D04
 /* 002938 80001D38 ACA00000 */   sw    $zero, ($a1)
 .L80001D3C:
 /* 00293C 80001D3C 00044080 */  sll   $t0, $a0, 2
-/* 002940 80001D40 3C188011 */  lui   $t8, %hi(D_80115D18) # $t8, 0x8011
-/* 002944 80001D44 8F185D18 */  lw    $t8, %lo(D_80115D18)($t8)
+/* 002940 80001D40 3C188011 */  lui   $t8, %hi(sSoundEffectsPool) # $t8, 0x8011
+/* 002944 80001D44 8F185D18 */  lw    $t8, %lo(sSoundEffectsPool)($t8)
 /* 002948 80001D48 01044021 */  addu  $t0, $t0, $a0
 /* 00294C 80001D4C 00084040 */  sll   $t0, $t0, 1
 /* 002950 80001D50 03081021 */  addu  $v0, $t8, $t0
@@ -60,10 +60,10 @@ glabel func_80001D04
 /* 0029E0 80001DE0 8FA7002C */  lw    $a3, 0x2c($sp)
 /* 0029E4 80001DE4 8FA8001C */  lw    $t0, 0x1c($sp)
 /* 0029E8 80001DE8 8CE40000 */  lw    $a0, ($a3)
-/* 0029EC 80001DEC 3C0B8011 */  lui   $t3, %hi(D_80115D18) # $t3, 0x8011
+/* 0029EC 80001DEC 3C0B8011 */  lui   $t3, %hi(sSoundEffectsPool) # $t3, 0x8011
 /* 0029F0 80001DF0 1080002A */  beqz  $a0, .L80001E9C
 /* 0029F4 80001DF4 8FBF0014 */   lw    $ra, 0x14($sp)
-/* 0029F8 80001DF8 8D6B5D18 */  lw    $t3, %lo(D_80115D18)($t3)
+/* 0029F8 80001DF8 8D6B5D18 */  lw    $t3, %lo(sSoundEffectsPool)($t3)
 /* 0029FC 80001DFC 24050008 */  li    $a1, 8
 /* 002A00 80001E00 01686021 */  addu  $t4, $t3, $t0
 /* 002A04 80001E04 91860002 */  lbu   $a2, 2($t4)
@@ -90,8 +90,8 @@ glabel func_80001D04
 /* 002A54 80001E54 8F185F80 */  lw    $t8, %lo(D_80115F80)($t8)
 /* 002A58 80001E58 8FA8001C */  lw    $t0, 0x1c($sp)
 /* 002A5C 80001E5C 1300000E */  beqz  $t8, .L80001E98
-/* 002A60 80001E60 3C198011 */   lui   $t9, %hi(D_80115D18) # $t9, 0x8011
-/* 002A64 80001E64 8F395D18 */  lw    $t9, %lo(D_80115D18)($t9)
+/* 002A60 80001E60 3C198011 */   lui   $t9, %hi(sSoundEffectsPool) # $t9, 0x8011
+/* 002A64 80001E64 8F395D18 */  lw    $t9, %lo(sSoundEffectsPool)($t9)
 /* 002A68 80001E68 03002025 */  move  $a0, $t8
 /* 002A6C 80001E6C 03284821 */  addu  $t1, $t9, $t0
 /* 002A70 80001E70 91260002 */  lbu   $a2, 2($t1)

asm/non_matchings/audio/func_80001FB8.s

@@ -2,8 +2,8 @@ glabel func_80001FB8
 /* 002BB8 80001FB8 27BDFFE8 */  addiu $sp, $sp, -0x18
 /* 002BBC 80001FBC 308EFFFF */  andi  $t6, $a0, 0xffff
 /* 002BC0 80001FC0 000EC880 */  sll   $t9, $t6, 2
-/* 002BC4 80001FC4 3C188011 */  lui   $t8, %hi(D_80115D18) # $t8, 0x8011
-/* 002BC8 80001FC8 8F185D18 */  lw    $t8, %lo(D_80115D18)($t8)
+/* 002BC4 80001FC4 3C188011 */  lui   $t8, %hi(sSoundEffectsPool) # $t8, 0x8011
+/* 002BC8 80001FC8 8F185D18 */  lw    $t8, %lo(sSoundEffectsPool)($t8)
 /* 002BCC 80001FCC 032EC821 */  addu  $t9, $t9, $t6
 /* 002BD0 80001FD0 0019C840 */  sll   $t9, $t9, 1
 /* 002BD4 80001FD4 AFBF0014 */  sw    $ra, 0x14($sp)

asm/non_matchings/audio/func_8000232C.s

@@ -49,8 +49,8 @@ glabel func_8000232C
 /* 002FE8 800023E8 926E0000 */  lbu   $t6, ($s3)
 /* 002FEC 800023EC 24110003 */  li    $s1, 3
 /* 002FF0 800023F0 01D10019 */  multu $t6, $s1
-/* 002FF4 800023F4 3C108011 */  lui   $s0, %hi(D_80115D1C) # $s0, 0x8011
-/* 002FF8 800023F8 26105D1C */  addiu $s0, %lo(D_80115D1C) # addiu $s0, $s0, 0x5d1c
+/* 002FF4 800023F4 3C108011 */  lui   $s0, %hi(sMusicPool) # $s0, 0x8011
+/* 002FF8 800023F8 26105D1C */  addiu $s0, %lo(sMusicPool) # addiu $s0, $s0, 0x5d1c
 /* 002FFC 800023FC 8E0D0000 */  lw    $t5, ($s0)
 /* 003000 80002400 00007812 */  mflo  $t7
 /* 003004 80002404 01AFC021 */  addu  $t8, $t5, $t7
@@ -61,7 +61,7 @@ glabel func_8000232C
 /* 003018 80002418 8E020000 */  lw    $v0, ($s0)
 /* 00301C 8000241C 03310019 */  multu $t9, $s1
 /* 003020 80002420 240AFFFF */  li    $t2, -1
-/* 003024 80002424 3C018011 */  lui   $at, %hi(D_80115D30) # $at, 0x8011
+/* 003024 80002424 3C018011 */  lui   $at, %hi(sMusicTempo) # $at, 0x8011
 /* 003028 80002428 00004012 */  mflo  $t0
 /* 00302C 8000242C 00484821 */  addu  $t1, $v0, $t0
 /* 003030 80002430 91240001 */  lbu   $a0, 1($t1)
@@ -70,12 +70,12 @@ glabel func_8000232C
 /* 00303C 8000243C 00000000 */   nop   
 /* 003040 80002440 0C00054D */  jal   musicSetTempo
 /* 003044 80002444 00000000 */   nop   
-/* 003048 80002448 3C028011 */  lui   $v0, %hi(D_80115D1C) # $v0, 0x8011
-/* 00304C 8000244C 8C425D1C */  lw    $v0, %lo(D_80115D1C)($v0)
+/* 003048 80002448 3C028011 */  lui   $v0, %hi(sMusicPool) # $v0, 0x8011
+/* 00304C 8000244C 8C425D1C */  lw    $v0, %lo(sMusicPool)($v0)
 /* 003050 80002450 10000003 */  b     .L80002460
 /* 003054 80002454 926B0000 */   lbu   $t3, ($s3)
 .L80002458:
-/* 003058 80002458 A42A5D30 */  sh    $t2, %lo(D_80115D30)($at)
+/* 003058 80002458 A42A5D30 */  sh    $t2, %lo(sMusicTempo)($at)
 /* 00305C 8000245C 926B0000 */  lbu   $t3, ($s3)
 .L80002460:
 /* 003060 80002460 00000000 */  nop   
@@ -119,8 +119,8 @@ glabel func_8000232C
 /* 0030E8 800024E8 926B0000 */  lbu   $t3, ($s3)
 /* 0030EC 800024EC 24110003 */  li    $s1, 3
 /* 0030F0 800024F0 01710019 */  multu $t3, $s1
-/* 0030F4 800024F4 3C108011 */  lui   $s0, %hi(D_80115D1C) # $s0, 0x8011
-/* 0030F8 800024F8 26105D1C */  addiu $s0, %lo(D_80115D1C) # addiu $s0, $s0, 0x5d1c
+/* 0030F4 800024F4 3C108011 */  lui   $s0, %hi(sMusicPool) # $s0, 0x8011
+/* 0030F8 800024F8 26105D1C */  addiu $s0, %lo(sMusicPool) # addiu $s0, $s0, 0x5d1c
 /* 0030FC 800024FC 8E0A0000 */  lw    $t2, ($s0)
 /* 003100 80002500 00006012 */  mflo  $t4
 /* 003104 80002504 014C7021 */  addu  $t6, $t2, $t4

asm/non_matchings/camera/func_8006A1C4.s

@@ -4,20 +4,20 @@ glabel func_8006A1C4
 /* 06ADCC 8006A1CC 00809025 */  move  $s2, $a0
 /* 06ADD0 8006A1D0 AFBF0024 */  sw    $ra, 0x24($sp)
 /* 06ADD4 8006A1D4 AFA5005C */  sw    $a1, 0x5c($sp)
-/* 06ADD8 8006A1D8 3C048012 */  lui   $a0, %hi(D_801210E0) # $a0, 0x8012
+/* 06ADD8 8006A1D8 3C048012 */  lui   $a0, %hi(sSIMesgQueue) # $a0, 0x8012
 /* 06ADDC 8006A1DC AFB1001C */  sw    $s1, 0x1c($sp)
 /* 06ADE0 8006A1E0 AFB00018 */  sw    $s0, 0x18($sp)
-/* 06ADE4 8006A1E4 248410E0 */  addiu $a0, %lo(D_801210E0) # addiu $a0, $a0, 0x10e0
+/* 06ADE4 8006A1E4 248410E0 */  addiu $a0, %lo(sSIMesgQueue) # addiu $a0, $a0, 0x10e0
 /* 06ADE8 8006A1E8 27A50050 */  addiu $a1, $sp, 0x50
 /* 06ADEC 8006A1EC 0C0322EC */  jal   osRecvMesg
 /* 06ADF0 8006A1F0 00003025 */   move  $a2, $zero
 /* 06ADF4 8006A1F4 1440005D */  bnez  $v0, .L8006A36C
-/* 06ADF8 8006A1F8 3C068012 */   lui   $a2, %hi(D_80121110+24) # $a2, 0x8012
-/* 06ADFC 8006A1FC 3C028012 */  lui   $v0, %hi(D_80121110) # $v0, 0x8012
-/* 06AE00 8006A200 3C038012 */  lui   $v1, %hi(D_80121110+24) # $v1, 0x8012
-/* 06AE04 8006A204 24631128 */  addiu $v1, %lo(D_80121110+24) # addiu $v1, $v1, 0x1128
-/* 06AE08 8006A208 24421110 */  addiu $v0, %lo(D_80121110) # addiu $v0, $v0, 0x1110
-/* 06AE0C 8006A20C 24C61128 */  addiu $a2, %lo(D_80121110+24) # addiu $a2, $a2, 0x1128
+/* 06ADF8 8006A1F8 3C068012 */   lui   $a2, %hi(sControllerData+24) # $a2, 0x8012
+/* 06ADFC 8006A1FC 3C028012 */  lui   $v0, %hi(sControllerData) # $v0, 0x8012
+/* 06AE00 8006A200 3C038012 */  lui   $v1, %hi(sControllerData+24) # $v1, 0x8012
+/* 06AE04 8006A204 24631128 */  addiu $v1, %lo(sControllerData+24) # addiu $v1, $v1, 0x1128
+/* 06AE08 8006A208 24421110 */  addiu $v0, %lo(sControllerData) # addiu $v0, $v0, 0x1110
+/* 06AE0C 8006A20C 24C61128 */  addiu $a2, %lo(sControllerData+24) # addiu $a2, $a2, 0x1128
 .L8006A210:
 /* 06AE10 8006A210 88410000 */  lwl   $at, ($v0)
 /* 06AE14 8006A214 98410003 */  lwr   $at, 3($v0)
@@ -30,9 +30,9 @@ glabel func_8006A1C4
 /* 06AE30 8006A230 0043082B */  sltu  $at, $v0, $v1
 /* 06AE34 8006A234 1420FFF6 */  bnez  $at, .L8006A210
 /* 06AE38 8006A238 00000000 */   nop   
-/* 06AE3C 8006A23C 3C048012 */  lui   $a0, %hi(D_80121110) # $a0, 0x8012
+/* 06AE3C 8006A23C 3C048012 */  lui   $a0, %hi(sControllerData) # $a0, 0x8012
 /* 06AE40 8006A240 0C033429 */  jal   osContGetReadData
-/* 06AE44 8006A244 24841110 */   addiu $a0, %lo(D_80121110) # addiu $a0, $a0, 0x1110
+/* 06AE44 8006A244 24841110 */   addiu $a0, %lo(sControllerData) # addiu $a0, $a0, 0x1110
 /* 06AE48 8006A248 12400043 */  beqz  $s2, .L8006A358
 /* 06AE4C 8006A24C 8FA4005C */   lw    $a0, 0x5c($sp)
 /* 06AE50 8006A250 0C01BAA4 */  jal   get_settings
@@ -113,24 +113,24 @@ glabel func_8006A1C4
 .L8006A358:
 /* 06AF58 8006A358 0C01C9C6 */  jal   func_80072718
 /* 06AF5C 8006A35C 00000000 */   nop   
-/* 06AF60 8006A360 3C048012 */  lui   $a0, %hi(D_801210E0) # $a0, 0x8012
+/* 06AF60 8006A360 3C048012 */  lui   $a0, %hi(sSIMesgQueue) # $a0, 0x8012
 /* 06AF64 8006A364 0C0333F8 */  jal   osContStartReadData
-/* 06AF68 8006A368 248410E0 */   addiu $a0, %lo(D_801210E0) # addiu $a0, $a0, 0x10e0
+/* 06AF68 8006A368 248410E0 */   addiu $a0, %lo(sSIMesgQueue) # addiu $a0, $a0, 0x10e0
 .L8006A36C:
 /* 06AF6C 8006A36C 3C0A800E */  lui   $t2, %hi(D_800DD300) # $t2, 0x800e
 /* 06AF70 8006A370 3C09800E */  lui   $t1, %hi(gButtonMask) # $t1, 0x800e
-/* 06AF74 8006A374 3C068012 */  lui   $a2, %hi(D_80121110+24) # $a2, 0x8012
-/* 06AF78 8006A378 3C028012 */  lui   $v0, %hi(D_80121110) # $v0, 0x8012
-/* 06AF7C 8006A37C 3C088012 */  lui   $t0, %hi(D_80121140) # $t0, 0x8012
+/* 06AF74 8006A374 3C068012 */  lui   $a2, %hi(sControllerData+24) # $a2, 0x8012
+/* 06AF78 8006A378 3C028012 */  lui   $v0, %hi(sControllerData) # $v0, 0x8012
+/* 06AF7C 8006A37C 3C088012 */  lui   $t0, %hi(sControllerButtonsPressed) # $t0, 0x8012
 /* 06AF80 8006A380 3C078012 */  lui   $a3, %hi(D_80121148) # $a3, 0x8012
-/* 06AF84 8006A384 3C0B8012 */  lui   $t3, %hi(D_80121150) # $t3, 0x8012
+/* 06AF84 8006A384 3C0B8012 */  lui   $t3, %hi(sPlayerID) # $t3, 0x8012
 /* 06AF88 8006A388 9529D304 */  lhu   $t1, %lo(gButtonMask)($t1)
 /* 06AF8C 8006A38C 8D4AD300 */  lw    $t2, %lo(D_800DD300)($t2)
-/* 06AF90 8006A390 256B1150 */  addiu $t3, %lo(D_80121150) # addiu $t3, $t3, 0x1150
+/* 06AF90 8006A390 256B1150 */  addiu $t3, %lo(sPlayerID) # addiu $t3, $t3, 0x1150
 /* 06AF94 8006A394 24E71148 */  addiu $a3, %lo(D_80121148) # addiu $a3, $a3, 0x1148
-/* 06AF98 8006A398 25081140 */  addiu $t0, %lo(D_80121140) # addiu $t0, $t0, 0x1140
-/* 06AF9C 8006A39C 24421110 */  addiu $v0, %lo(D_80121110) # addiu $v0, $v0, 0x1110
-/* 06AFA0 8006A3A0 24C61128 */  addiu $a2, %lo(D_80121110+24) # addiu $a2, $a2, 0x1128
+/* 06AF98 8006A398 25081140 */  addiu $t0, %lo(sControllerButtonsPressed) # addiu $t0, $t0, 0x1140
+/* 06AF9C 8006A39C 24421110 */  addiu $v0, %lo(sControllerData) # addiu $v0, $v0, 0x1110
+/* 06AFA0 8006A3A0 24C61128 */  addiu $a2, %lo(sControllerData+24) # addiu $a2, $a2, 0x1128
 .L8006A3A4:
 /* 06AFA4 8006A3A4 11400002 */  beqz  $t2, .L8006A3B0
 /* 06AFA8 8006A3A8 00000000 */   nop   

asm/non_matchings/fade_transition/render_fade_circle.s

@@ -16,9 +16,9 @@ glabel render_fade_circle
 /* 0C2EAC 800C22AC 8CE731C0 */  lw    $a3, %lo(sTransitionVtx)($a3)
 /* 0C2EB0 800C22B0 010F4021 */  addu  $t0, $t0, $t7
 /* 0C2EB4 800C22B4 8D0831C8 */  lw    $t0, %lo(sTransitionTris)($t0)
-/* 0C2EB8 800C22B8 3C19800E */  lui   $t9, %hi(dl_transition_shape_settings) # $t9, 0x800e
+/* 0C2EB8 800C22B8 3C19800E */  lui   $t9, %hi(dTransitionShapeSettings) # $t9, 0x800e
 /* 0C2EBC 800C22BC 00402025 */  move  $a0, $v0
-/* 0C2EC0 800C22C0 27393648 */  addiu $t9, %lo(dl_transition_shape_settings) # addiu $t9, $t9, 0x3648
+/* 0C2EC0 800C22C0 27393648 */  addiu $t9, %lo(dTransitionShapeSettings) # addiu $t9, $t9, 0x3648
 /* 0C2EC4 800C22C4 3C180600 */  lui   $t8, 0x600
 /* 0C2EC8 800C22C8 AC980000 */  sw    $t8, ($a0)
 /* 0C2ECC 800C22CC AC990004 */  sw    $t9, 4($a0)

asm/non_matchings/fade_transition/render_fade_waves.s

@@ -18,8 +18,8 @@ glabel render_fade_waves
 /* 0C3038 800C2438 00402025 */  move  $a0, $v0
 /* 0C303C 800C243C 8CC631C0 */  lw    $a2, %lo(sTransitionVtx)($a2)
 /* 0C3040 800C2440 8CE731C8 */  lw    $a3, %lo(sTransitionTris)($a3)
-/* 0C3044 800C2444 3C19800E */  lui   $t9, %hi(dl_transition_shape_settings) # $t9, 0x800e
-/* 0C3048 800C2448 27393648 */  addiu $t9, %lo(dl_transition_shape_settings) # addiu $t9, $t9, 0x3648
+/* 0C3044 800C2444 3C19800E */  lui   $t9, %hi(dTransitionShapeSettings) # $t9, 0x800e
+/* 0C3048 800C2448 27393648 */  addiu $t9, %lo(dTransitionShapeSettings) # addiu $t9, $t9, 0x3648
 /* 0C304C 800C244C 3C180600 */  lui   $t8, 0x600
 /* 0C3050 800C2450 3C1005D0 */  lui   $s0, (0x05D000E0 >> 16) # lui $s0, 0x5d0
 /* 0C3054 800C2454 3C0D05B0 */  lui   $t5, (0x05B000C0 >> 16) # lui $t5, 0x5b0

asm/non_matchings/font/func_800C45A4.s

@@ -29,8 +29,8 @@ glabel func_800C45A4
 /* 0C51FC 800C45FC 03195821 */  addu  $t3, $t8, $t9
 /* 0C5200 800C4600 246E0008 */  addiu $t6, $v1, 8
 /* 0C5204 800C4604 AC8E0000 */  sw    $t6, ($a0)
-/* 0C5208 800C4608 3C18800E */  lui   $t8, %hi(dl_dialogue_box_begin) # $t8, 0x800e
-/* 0C520C 800C460C 27183690 */  addiu $t8, %lo(dl_dialogue_box_begin) # addiu $t8, $t8, 0x3690
+/* 0C5208 800C4608 3C18800E */  lui   $t8, %hi(dDialogueBoxBegin) # $t8, 0x800e
+/* 0C520C 800C460C 27183690 */  addiu $t8, %lo(dDialogueBoxBegin) # addiu $t8, $t8, 0x3690
 /* 0C5210 800C4610 3C0F0600 */  lui   $t7, 0x600
 /* 0C5214 800C4614 3C198013 */  lui   $t9, %hi(gDialogueBoxBackground) # $t9, 0x8013
 /* 0C5218 800C4618 AC6F0000 */  sw    $t7, ($v1)
@@ -201,9 +201,9 @@ glabel func_800C45A4
 /* 0C5494 800C4894 24790008 */  addiu $t9, $v1, 8
 /* 0C5498 800C4898 AE390000 */  sw    $t9, ($s1)
 /* 0C549C 800C489C 3C180702 */  lui   $t8, (0x07020010 >> 16) # lui $t8, 0x702
-                                             # dl_dialogue_box_begin - 0x7FFFFFB8 = 0xE36D8
-/* 0C54A0 800C48A0 3C0E000E */  lui   $t6, %hi(dl_dialogue_box_begin - 0x7FFFFFB8) # $t6, 0xe
-/* 0C54A4 800C48A4 25CE36D8 */  addiu $t6, %lo(dl_dialogue_box_begin - 0x7FFFFFB8) # addiu $t6, $t6, 0x36d8
+                                             # dDialogueBoxBegin - 0x7FFFFFB8 = 0xE36D8
+/* 0C54A0 800C48A0 3C0E000E */  lui   $t6, %hi(dDialogueBoxBegin - 0x7FFFFFB8) # $t6, 0xe
+/* 0C54A4 800C48A4 25CE36D8 */  addiu $t6, %lo(dDialogueBoxBegin - 0x7FFFFFB8) # addiu $t6, $t6, 0x36d8
 /* 0C54A8 800C48A8 37180010 */  ori   $t8, (0x07020010 & 0xFFFF) # ori $t8, $t8, 0x10
 /* 0C54AC 800C48AC AC780000 */  sw    $t8, ($v1)
 /* 0C54B0 800C48B0 AC6E0004 */  sw    $t6, 4($v1)
@@ -272,14 +272,14 @@ glabel func_800C45A4
 /* 0C55A8 800C49A8 032FC025 */  or    $t8, $t9, $t7
 /* 0C55AC 800C49AC AC780004 */  sw    $t8, 4($v1)
 /* 0C55B0 800C49B0 8E230000 */  lw    $v1, ($s1)
-                                             # dl_dialogue_box_begin - 0x7FFFFFC8 = 0xE36C8
-/* 0C55B4 800C49B4 3C0F000E */  lui   $t7, %hi(dl_dialogue_box_begin - 0x7FFFFFC8) # $t7, 0xe
+                                             # dDialogueBoxBegin - 0x7FFFFFC8 = 0xE36C8
+/* 0C55B4 800C49B4 3C0F000E */  lui   $t7, %hi(dDialogueBoxBegin - 0x7FFFFFC8) # $t7, 0xe
 /* 0C55B8 800C49B8 246E0008 */  addiu $t6, $v1, 8
 /* 0C55BC 800C49BC AE2E0000 */  sw    $t6, ($s1)
 /* 0C55C0 800C49C0 3C190702 */  lui   $t9, (0x07020010 >> 16) # lui $t9, 0x702
 /* 0C55C4 800C49C4 37390010 */  ori   $t9, (0x07020010 & 0xFFFF) # ori $t9, $t9, 0x10
-                                             # dl_dialogue_box_begin - 0x7FFFFFC8 = 0xE36C8
-/* 0C55C8 800C49C8 25EF36C8 */  addiu $t7, %lo(dl_dialogue_box_begin - 0x7FFFFFC8) # addiu $t7, $t7, 0x36c8
+                                             # dDialogueBoxBegin - 0x7FFFFFC8 = 0xE36C8
+/* 0C55C8 800C49C8 25EF36C8 */  addiu $t7, %lo(dDialogueBoxBegin - 0x7FFFFFC8) # addiu $t7, $t7, 0x36c8
 /* 0C55CC 800C49CC AC6F0004 */  sw    $t7, 4($v1)
 /* 0C55D0 800C49D0 AC790000 */  sw    $t9, ($v1)
 /* 0C55D4 800C49D4 8E230000 */  lw    $v1, ($s1)

asm/non_matchings/menu/func_8008B4C8.s

@@ -103,7 +103,7 @@ glabel func_8008B4C8
 /* 08C244 8008B644 164C0039 */  bne   $s2, $t4, .L8008B72C
 /* 08C248 8008B648 8FBF003C */   lw    $ra, 0x3c($sp)
 .L8008B64C:
-/* 08C24C 8008B64C 0C000326 */  jal   func_80000C98
+/* 08C24C 8008B64C 0C000326 */  jal   set_music_fade_timer
 /* 08C250 8008B650 2404FF80 */   li    $a0, -128
 /* 08C254 8008B654 10000035 */  b     .L8008B72C
 /* 08C258 8008B658 8FBF003C */   lw    $ra, 0x3c($sp)

asm/non_matchings/menu/func_80093A40.s

@@ -12,7 +12,7 @@ glabel func_80093A40
 /* 094668 80093A68 240EFFFF */  li    $t6, -1
 /* 09466C 80093A6C AFA20024 */  sw    $v0, 0x24($sp)
 /* 094670 80093A70 AE2E0000 */  sw    $t6, ($s1)
-/* 094674 80093A74 0C0270F6 */  jal   func_8009C3D8
+/* 094674 80093A74 0C0270F6 */  jal   get_active_player_count
 /* 094678 80093A78 00008025 */   move  $s0, $zero
 /* 09467C 80093A7C 18400014 */  blez  $v0, .L80093AD0
 /* 094680 80093A80 00000000 */   nop   
@@ -28,7 +28,7 @@ glabel func_80093A40
 /* 0946A4 80093AA4 00000000 */   nop   
 /* 0946A8 80093AA8 AE300000 */  sw    $s0, ($s1)
 .L80093AAC:
-/* 0946AC 80093AAC 0C0270F6 */  jal   func_8009C3D8
+/* 0946AC 80093AAC 0C0270F6 */  jal   get_active_player_count
 /* 0946B0 80093AB0 26100001 */   addiu $s0, $s0, 1
 /* 0946B4 80093AB4 0202082A */  slt   $at, $s0, $v0
 /* 0946B8 80093AB8 10200005 */  beqz  $at, .L80093AD0

asm/non_matchings/menu/func_80093D40.s

@@ -63,7 +63,7 @@ glabel func_80093D40
 /* 094A20 80093E20 3C11800E */  lui   $s1, %hi(D_800E098C) # $s1, 0x800e
 /* 094A24 80093E24 2631098C */  addiu $s1, %lo(D_800E098C) # addiu $s1, $s1, 0x98c
 /* 094A28 80093E28 8E240000 */  lw    $a0, ($s1)
-/* 094A2C 80093E2C 0C01A93E */  jal   func_8006A4F8
+/* 094A2C 80093E2C 0C01A93E */  jal   get_player_id
 /* 094A30 80093E30 00000000 */   nop   
 /* 094A34 80093E34 3C09800E */  lui   $t1, %hi(D_800E0990) # $t1, 0x800e
 /* 094A38 80093E38 25290990 */  addiu $t1, %lo(D_800E0990) # addiu $t1, $t1, 0x990
@@ -86,7 +86,7 @@ glabel func_80093D40
 /* 094A7C 80093E7C 0C031414 */  jal   set_current_text_background_colour
 /* 094A80 80093E80 AFA00010 */   sw    $zero, 0x10($sp)
 /* 094A84 80093E84 8E240000 */  lw    $a0, ($s1)
-/* 094A88 80093E88 0C01A93E */  jal   func_8006A4F8
+/* 094A88 80093E88 0C01A93E */  jal   get_player_id
 /* 094A8C 80093E8C 00000000 */   nop   
 /* 094A90 80093E90 3C0C800E */  lui   $t4, %hi(D_800E09A0) # $t4, 0x800e
 /* 094A94 80093E94 258C09A0 */  addiu $t4, %lo(D_800E09A0) # addiu $t4, $t4, 0x9a0

asm/non_matchings/menu/func_80095728.s

@@ -292,7 +292,7 @@ glabel L80095B34
 /* 09674C 80095B4C 8FA7002C */  lw    $a3, 0x2c($sp)
 /* 096750 80095B50 1180000A */  beqz  $t4, .L80095B7C
 /* 096754 80095B54 00000000 */   nop   
-/* 096758 80095B58 0C000326 */  jal   func_80000C98
+/* 096758 80095B58 0C000326 */  jal   set_music_fade_timer
 /* 09675C 80095B5C 2404FF80 */   li    $a0, -128
 /* 096760 80095B60 3C04800E */  lui   $a0, %hi(D_800DF774) # $a0, 0x800e
 /* 096764 80095B64 0C030076 */  jal   func_800C01D8
@@ -626,7 +626,7 @@ glabel L80095EC8
 /* 096C38 80096038 24190001 */   li    $t9, 1
 /* 096C3C 8009603C 24180001 */  li    $t8, 1
 /* 096C40 80096040 AFB80050 */  sw    $t8, 0x50($sp)
-/* 096C44 80096044 0C000326 */  jal   func_80000C98
+/* 096C44 80096044 0C000326 */  jal   set_music_fade_timer
 /* 096C48 80096048 2404FF80 */   li    $a0, -128
 /* 096C4C 8009604C 3C04800E */  lui   $a0, %hi(D_800DF774) # $a0, 0x800e
 /* 096C50 80096050 0C030076 */  jal   func_800C01D8
@@ -784,7 +784,7 @@ glabel L80095EC8
 /* 096E64 80096264 1000007B */  b     .L80096454
 /* 096E68 80096268 AD060000 */   sw    $a2, ($t0)
 .L8009626C:
-/* 096E6C 8009626C 0C000326 */  jal   func_80000C98
+/* 096E6C 8009626C 0C000326 */  jal   set_music_fade_timer
 /* 096E70 80096270 2404FF80 */   li    $a0, -128
 /* 096E74 80096274 3C04800E */  lui   $a0, %hi(D_800DF774) # $a0, 0x800e
 /* 096E78 80096278 0C030076 */  jal   func_800C01D8
@@ -950,7 +950,7 @@ glabel L800964AC
 /* 0970AC 800964AC 306F9000 */  andi  $t7, $v1, 0x9000
 /* 0970B0 800964B0 11E00098 */  beqz  $t7, .L80096714
 /* 0970B4 800964B4 00000000 */   nop   
-/* 0970B8 800964B8 0C000326 */  jal   func_80000C98
+/* 0970B8 800964B8 0C000326 */  jal   set_music_fade_timer
 /* 0970BC 800964BC 2404FF80 */   li    $a0, -128
 /* 0970C0 800964C0 3C04800E */  lui   $a0, %hi(D_800DF774) # $a0, 0x800e
 /* 0970C4 800964C4 0C030076 */  jal   func_800C01D8

asm/non_matchings/menu/func_80097D10.s

@@ -12,7 +12,7 @@ glabel func_80097D10
 /* 098924 80097D24 0C01A955 */  jal   get_buttons_pressed_from_player
 /* 098928 80097D28 00002025 */   move  $a0, $zero
 /* 09892C 80097D2C 00002025 */  move  $a0, $zero
-/* 098930 80097D30 0C01A967 */  jal   func_8006A59C
+/* 098930 80097D30 0C01A967 */  jal   clamp_joystick_x_axis
 /* 098934 80097D34 AFA20024 */   sw    $v0, 0x24($sp)
 /* 098938 80097D38 8FA80024 */  lw    $t0, 0x24($sp)
 /* 09893C 80097D3C 2841FFDE */  slti  $at, $v0, -0x22

asm/non_matchings/menu/menu_audio_options_loop.s

@@ -60,7 +60,7 @@ glabel menu_audio_options_loop
 /* 08594C 80084D4C 8FAD0040 */  lw    $t5, 0x40($sp)
 /* 085950 80084D50 02002025 */  move  $a0, $s0
 /* 085954 80084D54 01A27025 */  or    $t6, $t5, $v0
-/* 085958 80084D58 0C01A967 */  jal   func_8006A59C
+/* 085958 80084D58 0C01A967 */  jal   clamp_joystick_x_axis
 /* 08595C 80084D5C AFAE0040 */   sw    $t6, 0x40($sp)
 /* 085960 80084D60 8FA30028 */  lw    $v1, 0x28($sp)
 /* 085964 80084D64 8FA50024 */  lw    $a1, 0x24($sp)
@@ -122,7 +122,7 @@ glabel menu_audio_options_loop
 /* 085A30 80084E30 00000000 */  nop   
 /* 085A34 80084E34 07200004 */  bltz  $t9, .L80084E48
 /* 085A38 80084E38 240A0003 */   li    $t2, 3
-/* 085A3C 80084E3C 0C000326 */  jal   func_80000C98
+/* 085A3C 80084E3C 0C000326 */  jal   set_music_fade_timer
 /* 085A40 80084E40 2404FF80 */   li    $a0, -128
 /* 085A44 80084E44 240A0003 */  li    $t2, 3
 .L80084E48:

asm/non_matchings/menu/menu_character_select_loop.s

@@ -117,7 +117,7 @@ glabel menu_character_select_loop
 /* 08CAD4 8008BED4 0C022ECF */  jal   randomize_ai_racer_slots
 /* 08CAD8 8008BED8 AFAB0024 */   sw    $t3, 0x24($sp)
 /* 08CADC 8008BEDC 3C048012 */  lui   $a0, %hi(gActivePlayersArray) # $a0, 0x8012
-/* 08CAE0 8008BEE0 0C01A916 */  jal   func_8006A458
+/* 08CAE0 8008BEE0 0C01A916 */  jal   assign_player_ids
 /* 08CAE4 8008BEE4 248463D4 */   addiu $a0, %lo(gActivePlayersArray) # addiu $a0, $a0, 0x63d4
 /* 08CAE8 8008BEE8 3C0C800E */  lui   $t4, %hi(gNumberOfActivePlayers) # $t4, 0x800e
 /* 08CAEC 8008BEEC 8FAB0024 */  lw    $t3, 0x24($sp)

asm/non_matchings/menu/menu_credits_loop.s

@@ -639,7 +639,7 @@ glabel L8009BB9C
 /* 09C83C 8009BC3C 2484F774 */   addiu $a0, %lo(D_800DF774) # addiu $a0, $a0, -0x88c
 /* 09C840 8009BC40 0C03005C */  jal   func_800C0170
 /* 09C844 8009BC44 00000000 */   nop   
-/* 09C848 8009BC48 0C000326 */  jal   func_80000C98
+/* 09C848 8009BC48 0C000326 */  jal   set_music_fade_timer
 /* 09C84C 8009BC4C 2404FF80 */   li    $a0, -128
 .L8009BC50:
 /* 09C850 8009BC50 3C02800E */  lui   $v0, %hi(gMenuDelay) # $v0, 0x800e

asm/non_matchings/menu/menu_file_select_loop.s

@@ -197,7 +197,7 @@ glabel menu_file_select_loop
 /* 08ED4C 8008E14C 8C84F4CC */  lw    $a0, %lo(gSaveFileIndex)($a0)
 /* 08ED50 8008E150 0C01BADE */  jal   func_8006EB78
 /* 08ED54 8008E154 00000000 */   nop   
-/* 08ED58 8008E158 0C000326 */  jal   func_80000C98
+/* 08ED58 8008E158 0C000326 */  jal   set_music_fade_timer
 /* 08ED5C 8008E15C 2404FF80 */   li    $a0, -128
 /* 08ED60 8008E160 3C04800E */  lui   $a0, %hi(D_800DF774) # $a0, 0x800e
 /* 08ED64 8008E164 0C030076 */  jal   func_800C01D8
@@ -231,7 +231,7 @@ glabel menu_file_select_loop
 /* 08EDD0 8008E1D0 8C84F4CC */  lw    $a0, %lo(gSaveFileIndex)($a0)
 /* 08EDD4 8008E1D4 0C01BADE */  jal   func_8006EB78
 /* 08EDD8 8008E1D8 00000000 */   nop   
-/* 08EDDC 8008E1DC 0C000326 */  jal   func_80000C98
+/* 08EDDC 8008E1DC 0C000326 */  jal   set_music_fade_timer
 /* 08EDE0 8008E1E0 2404FF80 */   li    $a0, -128
 /* 08EDE4 8008E1E4 10000021 */  b     .L8008E26C
 /* 08EDE8 8008E1E8 8FB80040 */   lw    $t8, 0x40($sp)

asm/non_matchings/menu/menu_game_select_loop.s

@@ -151,7 +151,7 @@ glabel menu_game_select_loop
 /* 08D5E8 8008C9E8 00000000 */  nop   
 /* 08D5EC 8008C9EC 152A0003 */  bne   $t1, $t2, .L8008C9FC
 /* 08D5F0 8008C9F0 00000000 */   nop   
-/* 08D5F4 8008C9F4 0C000326 */  jal   func_80000C98
+/* 08D5F4 8008C9F4 0C000326 */  jal   set_music_fade_timer
 /* 08D5F8 8008C9F8 2404FF80 */   li    $a0, -128
 .L8008C9FC:
 /* 08D5FC 8008C9FC 3C04800E */  lui   $a0, %hi(D_800DF774) # $a0, 0x800e

asm/non_matchings/menu/menu_options_loop.s

@@ -82,7 +82,7 @@ glabel menu_options_loop
 /* 085088 80084488 17010011 */  bne   $t8, $at, .L800844D0
 /* 08508C 8008448C 00000000 */   nop   
 .L80084490:
-/* 085090 80084490 0C000326 */  jal   func_80000C98
+/* 085090 80084490 0C000326 */  jal   set_music_fade_timer
 /* 085094 80084494 2404FF80 */   li    $a0, -128
 /* 085098 80084498 2419FFFF */  li    $t9, -1
 /* 08509C 8008449C 3C01800E */  lui   $at, %hi(gMenuDelay) # $at, 0x800e

asm/non_matchings/menu/menu_results_loop.s

@@ -113,7 +113,7 @@ glabel menu_results_loop
 /* 098050 80097450 1502000B */  bne   $t0, $v0, .L80097480
 /* 098054 80097454 240B0001 */   li    $t3, 1
 /* 098058 80097458 AFA80020 */  sw    $t0, 0x20($sp)
-/* 09805C 8009745C 0C000326 */  jal   func_80000C98
+/* 09805C 8009745C 0C000326 */  jal   set_music_fade_timer
 /* 098060 80097460 2404FF80 */   li    $a0, -128
 /* 098064 80097464 3C04800E */  lui   $a0, %hi(D_800DF774) # $a0, 0x800e
 /* 098068 80097468 0C030076 */  jal   func_800C01D8
@@ -181,7 +181,7 @@ glabel menu_results_loop
 /* 098144 80097544 AD280000 */  sw    $t0, ($t1)
 /* 098148 80097548 0C030076 */  jal   func_800C01D8
 /* 09814C 8009754C 2484F774 */   addiu $a0, %lo(D_800DF774) # addiu $a0, $a0, -0x88c
-/* 098150 80097550 0C000326 */  jal   func_80000C98
+/* 098150 80097550 0C000326 */  jal   set_music_fade_timer
 /* 098154 80097554 2404FF80 */   li    $a0, -128
 /* 098158 80097558 10000019 */  b     .L800975C0
 /* 09815C 8009755C 8FAC0024 */   lw    $t4, 0x24($sp)