25% (#235)

Match and label various racer.c funcs
2026-06-19 01:16:26 -07:00 · 2022-05-28 23:41:26 +01:00
parent 79484db43f
commit 9c8456cfee
54 changed files with 1478 additions and 2900 deletions
@@ -113,31 +113,31 @@ s32 is_drumstick_unlocked(void) {
 }
 ```

-As of May 23rd, 2022, this is our current score:
+As of May 28th, 2022, this is our current score:
 ```
- =======================================================
-         ADVENTURE ONE (ASM -> C Decompilation)
- ------------------- 24.58% Complete -------------------
-              # Decompiled functions: 1136
-               # GLOBAL_ASM remaining: 642
-               # NON_MATCHING functions: 9
+ ========================================================
+          ADVENTURE ONE (ASM -> C Decompilation)
+ ------------------- 25.50% Complete --------------------
+               # Decompiled functions: 1140
+               # GLOBAL_ASM remaining: 638
+               # NON_MATCHING functions: 10
           # NON_EQUIVALENT WIP functions: 105
- --------------------- Game Status ---------------------
+ --------------------- Game Status ----------------------
        Balloons: 12/47, Keys: 1/4, Trophies: 1/5
-         T.T. Amulets: 1/4, Wizpig Amulets: 1/4
- -------------------------------------------------------
-    We are racing Taj in the Car Challenge. (Lap 1/3)
- =======================================================
+          T.T. Amulets: 1/4, Wizpig Amulets: 1/4
+ --------------------------------------------------------
+    We are racing Taj in the Car Challenge. (Lap 3/3)
+ ========================================================
          ADVENTURE TWO (Cleanup & Documentation)
- -------------------  3.89% Complete -------------------
-               # Documented functions: 169
-             # Undocumented remaining: 1609
- --------------------- Game Status ---------------------
-        Balloons: 2/47, Keys: 0/4, Trophies: 0/5
-         T.T. Amulets: 0/4, Wizpig Amulets: 0/4
- -------------------------------------------------------
- We are collecting the third balloon on Timber's Island.
- =======================================================
+ -------------------  5.01% Complete --------------------
+               # Documented functions: 175
+              # Undocumented remaining: 1603
+ --------------------- Game Status ----------------------
+         Balloons: 3/47, Keys: 0/4, Trophies: 0/5
+          T.T. Amulets: 0/4, Wizpig Amulets: 0/4
+ --------------------------------------------------------
+ We are collecting the fourth balloon on Timber's Island.
+ ========================================================
 ```

 ---
@@ -1166,7 +1166,7 @@ glabel L8000D98C
 /* 00E8C8 8000DCC8 00000000 */  nop   
 /* 00E8CC 8000DCCC 02202025 */  move  $a0, $s1
 .L8000DCD0:
-/* 00E8D0 8000DCD0 0C01378E */  jal   func_8004DE38
+/* 00E8D0 8000DCD0 0C01378E */  jal   update_player_racer
 /* 00E8D4 8000DCD4 24050002 */   li    $a1, 2
 /* 00E8D8 8000DCD8 26100001 */  addiu $s0, $s0, 1
 /* 00E8DC 8000DCDC 2A01000A */  slti  $at, $s0, 0xa
@@ -249,7 +249,7 @@ glabel func_80010994
 /* 011920 80010D20 02802825 */  move  $a1, $s4
 /* 011924 80010D24 01B27021 */  addu  $t6, $t5, $s2
 /* 011928 80010D28 8DC40000 */  lw    $a0, ($t6)
-/* 01192C 80010D2C 0C01378E */  jal   func_8004DE38
+/* 01192C 80010D2C 0C01378E */  jal   update_player_racer
 /* 011930 80010D30 00000000 */   nop   
 /* 011934 80010D34 3C0F8012 */  lui   $t7, %hi(gObjectCount) # $t7, 0x8012
 /* 011938 80010D38 8DEFAEF0 */  lw    $t7, %lo(gObjectCount)($t7)
@@ -67,8 +67,8 @@ glabel func_80042D20
 /* 0439A0 80042DA0 AFAA0060 */   sw    $t2, 0x60($sp)
 /* 0439A4 80042DA4 8FAA0060 */  lw    $t2, 0x60($sp)
 /* 0439A8 80042DA8 10400007 */  beqz  $v0, .L80042DC8
-/* 0439AC 80042DAC 3C028012 */   lui   $v0, %hi(gCurrentCarInput) # $v0, 0x8012
-/* 0439B0 80042DB0 2442D528 */  addiu $v0, %lo(gCurrentCarInput) # addiu $v0, $v0, -0x2ad8
+/* 0439AC 80042DAC 3C028012 */   lui   $v0, %hi(gCurrentRacerInput) # $v0, 0x8012
+/* 0439B0 80042DB0 2442D528 */  addiu $v0, %lo(gCurrentRacerInput) # addiu $v0, $v0, -0x2ad8
 /* 0439B4 80042DB4 8C590000 */  lw    $t9, ($v0)
 /* 0439B8 80042DB8 00000000 */  nop   
 /* 0439BC 80042DBC 372E8000 */  ori   $t6, $t9, 0x8000
@@ -431,11 +431,11 @@ glabel func_80042D20
 /* 043EFC 800432FC 4608803E */  c.le.s $f16, $f8
 /* 043F00 80043300 00000000 */  nop   
 /* 043F04 80043304 45000005 */  bc1f  .L8004331C
-/* 043F08 80043308 3C0F8012 */   lui   $t7, %hi(gCurrentCarInput) # $t7, 0x8012
-/* 043F0C 8004330C 8DEFD528 */  lw    $t7, %lo(gCurrentCarInput)($t7)
-/* 043F10 80043310 3C018012 */  lui   $at, %hi(gCurrentCarInput) # $at, 0x8012
+/* 043F08 80043308 3C0F8012 */   lui   $t7, %hi(gCurrentRacerInput) # $t7, 0x8012
+/* 043F0C 8004330C 8DEFD528 */  lw    $t7, %lo(gCurrentRacerInput)($t7)
+/* 043F10 80043310 3C018012 */  lui   $at, %hi(gCurrentRacerInput) # $at, 0x8012
 /* 043F14 80043314 35EE8000 */  ori   $t6, $t7, 0x8000
-/* 043F18 80043318 AC2ED528 */  sw    $t6, %lo(gCurrentCarInput)($at)
+/* 043F18 80043318 AC2ED528 */  sw    $t6, %lo(gCurrentRacerInput)($at)
 .L8004331C:
 /* 043F1C 8004331C AFA9005C */  sw    $t1, 0x5c($sp)
 /* 043F20 80043320 A7AC0034 */  sh    $t4, 0x34($sp)
@@ -622,11 +622,11 @@ glabel func_80042D20
 /* 0441C4 800435C4 87AD0078 */  lh    $t5, 0x78($sp)
 /* 0441C8 800435C8 10400006 */  beqz  $v0, .L800435E4
 /* 0441CC 800435CC 241FFFFF */   li    $ra, -1
-/* 0441D0 800435D0 3C188012 */  lui   $t8, %hi(D_8011D530) # $t8, 0x8012
-/* 0441D4 800435D4 8F18D530 */  lw    $t8, %lo(D_8011D530)($t8)
-/* 0441D8 800435D8 3C018012 */  lui   $at, %hi(D_8011D530) # $at, 0x8012
+/* 0441D0 800435D0 3C188012 */  lui   $t8, %hi(gCurrentButtonsReleased) # $t8, 0x8012
+/* 0441D4 800435D4 8F18D530 */  lw    $t8, %lo(gCurrentButtonsReleased)($t8)
+/* 0441D8 800435D8 3C018012 */  lui   $at, %hi(gCurrentButtonsReleased) # $at, 0x8012
 /* 0441DC 800435DC 370E2000 */  ori   $t6, $t8, 0x2000
-/* 0441E0 800435E0 AC2ED530 */  sw    $t6, %lo(D_8011D530)($at)
+/* 0441E0 800435E0 AC2ED530 */  sw    $t6, %lo(gCurrentButtonsReleased)($at)
 .L800435E4:
 /* 0441E4 800435E4 820F0173 */  lb    $t7, 0x173($s0)
 /* 0441E8 800435E8 3C19800E */  lui   $t9, %hi(D_800DCD90) # $t9, 0x800e
@@ -772,14 +772,14 @@ glabel func_80042D20
 /* 044400 80043800 30F80004 */  andi  $t8, $a3, 4
 .L80043804:
 /* 044404 80043804 13000014 */  beqz  $t8, .L80043858
-/* 044408 80043808 3C0E8012 */   lui   $t6, %hi(gCurrentCarInput) # $t6, 0x8012
-/* 04440C 8004380C 8DCED528 */  lw    $t6, %lo(gCurrentCarInput)($t6)
+/* 044408 80043808 3C0E8012 */   lui   $t6, %hi(gCurrentRacerInput) # $t6, 0x8012
+/* 04440C 8004380C 8DCED528 */  lw    $t6, %lo(gCurrentRacerInput)($t6)
 /* 044410 80043810 3C01FFFF */  lui   $at, (0xFFFF7FFF >> 16) # lui $at, 0xffff
 /* 044414 80043814 34217FFF */  ori   $at, (0xFFFF7FFF & 0xFFFF) # ori $at, $at, 0x7fff
 /* 044418 80043818 01C17824 */  and   $t7, $t6, $at
-/* 04441C 8004381C 3C018012 */  lui   $at, %hi(gCurrentCarInput) # $at, 0x8012
+/* 04441C 8004381C 3C018012 */  lui   $at, %hi(gCurrentRacerInput) # $at, 0x8012
 /* 044420 80043820 1000000D */  b     .L80043858
-/* 044424 80043824 AC2FD528 */   sw    $t7, %lo(gCurrentCarInput)($at)
+/* 044424 80043824 AC2FD528 */   sw    $t7, %lo(gCurrentRacerInput)($at)
 .L80043828:
 /* 044428 80043828 2401FFFD */  li    $at, -3
 /* 04442C 8004382C 00E1C824 */  and   $t9, $a3, $at
@@ -798,13 +798,13 @@ glabel func_80042D20
 /* 04445C 8004385C 00000000 */  nop   
 /* 044460 80043860 31F90004 */  andi  $t9, $t7, 4
 /* 044464 80043864 13200007 */  beqz  $t9, .L80043884
-/* 044468 80043868 3C188012 */   lui   $t8, %hi(gCurrentCarInput) # $t8, 0x8012
-/* 04446C 8004386C 8F18D528 */  lw    $t8, %lo(gCurrentCarInput)($t8)
+/* 044468 80043868 3C188012 */   lui   $t8, %hi(gCurrentRacerInput) # $t8, 0x8012
+/* 04446C 8004386C 8F18D528 */  lw    $t8, %lo(gCurrentRacerInput)($t8)
 /* 044470 80043870 3C01FFFF */  lui   $at, (0xFFFF7FFF >> 16) # lui $at, 0xffff
 /* 044474 80043874 34217FFF */  ori   $at, (0xFFFF7FFF & 0xFFFF) # ori $at, $at, 0x7fff
 /* 044478 80043878 03017024 */  and   $t6, $t8, $at
-/* 04447C 8004387C 3C018012 */  lui   $at, %hi(gCurrentCarInput) # $at, 0x8012
-/* 044480 80043880 AC2ED528 */  sw    $t6, %lo(gCurrentCarInput)($at)
+/* 04447C 8004387C 3C018012 */  lui   $at, %hi(gCurrentRacerInput) # $at, 0x8012
+/* 044480 80043880 AC2ED528 */  sw    $t6, %lo(gCurrentRacerInput)($at)
 .L80043884:
 /* 044484 80043884 860F01C6 */  lh    $t7, 0x1c6($s0)
 /* 044488 80043888 00000000 */  nop   
@@ -813,15 +813,15 @@ glabel func_80042D20
 /* 044494 80043894 920201C9 */  lbu   $v0, 0x1c9($s0)
 /* 044498 80043898 24010004 */  li    $at, 4
 /* 04449C 8004389C 10410004 */  beq   $v0, $at, .L800438B0
-/* 0444A0 800438A0 3C198012 */   lui   $t9, %hi(D_8011D530) # $t9, 0x8012
+/* 0444A0 800438A0 3C198012 */   lui   $t9, %hi(gCurrentButtonsReleased) # $t9, 0x8012
 /* 0444A4 800438A4 24010005 */  li    $at, 5
 /* 0444A8 800438A8 14410005 */  bne   $v0, $at, .L800438C0
 /* 0444AC 800438AC 00000000 */   nop   
 .L800438B0:
-/* 0444B0 800438B0 8F39D530 */  lw    $t9, %lo(D_8011D530)($t9)
-/* 0444B4 800438B4 3C018012 */  lui   $at, %hi(D_8011D530) # $at, 0x8012
+/* 0444B0 800438B0 8F39D530 */  lw    $t9, %lo(gCurrentButtonsReleased)($t9)
+/* 0444B4 800438B4 3C018012 */  lui   $at, %hi(gCurrentButtonsReleased) # $at, 0x8012
 /* 0444B8 800438B8 37382000 */  ori   $t8, $t9, 0x2000
-/* 0444BC 800438BC AC38D530 */  sw    $t8, %lo(D_8011D530)($at)
+/* 0444BC 800438BC AC38D530 */  sw    $t8, %lo(gCurrentButtonsReleased)($at)
 .L800438C0:
 /* 0444C0 800438C0 1060001D */  beqz  $v1, .L80043938
 /* 0444C4 800438C4 A20001C9 */   sb    $zero, 0x1c9($s0)
@@ -1176,9 +1176,9 @@ glabel func_80042D20
 /* 0449E4 80043DE4 E60E0124 */  swc1  $f14, 0x124($s0)
 .L80043DE8:
 /* 0449E8 80043DE8 820E01D8 */  lb    $t6, 0x1d8($s0)
-/* 0449EC 80043DEC 3C028012 */  lui   $v0, %hi(gCurrentCarInput) # $v0, 0x8012
+/* 0449EC 80043DEC 3C028012 */  lui   $v0, %hi(gCurrentRacerInput) # $v0, 0x8012
 /* 0449F0 80043DF0 11C00015 */  beqz  $t6, .L80043E48
-/* 0449F4 80043DF4 2442D528 */   addiu $v0, %lo(gCurrentCarInput) # addiu $v0, $v0, -0x2ad8
+/* 0449F4 80043DF4 2442D528 */   addiu $v0, %lo(gCurrentRacerInput) # addiu $v0, $v0, -0x2ad8
 /* 0449F8 80043DF8 A20001D3 */  sb    $zero, 0x1d3($s0)
 /* 0449FC 80043DFC A2000213 */  sb    $zero, 0x213($s0)
 /* 044A00 80043E00 8C4F0000 */  lw    $t7, ($v0)
@@ -9,13 +9,13 @@ glabel D_800E6350

 .text
 glabel func_8004447C
-/* 04507C 8004447C 3C018012 */  lui   $at, %hi(gActivePlayerButtonPress) # $at, 0x8012
-/* 045080 80044480 AC20D52C */  sw    $zero, %lo(gActivePlayerButtonPress)($at)
-/* 045084 80044484 3C018012 */  lui   $at, %hi(D_8011D530) # $at, 0x8012
-/* 045088 80044488 AC20D530 */  sw    $zero, %lo(D_8011D530)($at)
-/* 04508C 8004448C 3C018012 */  lui   $at, %hi(gCurrentCarInput) # $at, 0x8012
+/* 04507C 8004447C 3C018012 */  lui   $at, %hi(gCurrentButtonsPressed) # $at, 0x8012
+/* 045080 80044480 AC20D52C */  sw    $zero, %lo(gCurrentButtonsPressed)($at)
+/* 045084 80044484 3C018012 */  lui   $at, %hi(gCurrentButtonsReleased) # $at, 0x8012
+/* 045088 80044488 AC20D530 */  sw    $zero, %lo(gCurrentButtonsReleased)($at)
+/* 04508C 8004448C 3C018012 */  lui   $at, %hi(gCurrentRacerInput) # $at, 0x8012
 /* 045090 80044490 27BDFF88 */  addiu $sp, $sp, -0x78
-/* 045094 80044494 AC20D528 */  sw    $zero, %lo(gCurrentCarInput)($at)
+/* 045094 80044494 AC20D528 */  sw    $zero, %lo(gCurrentRacerInput)($at)
 /* 045098 80044498 3C018012 */  lui   $at, %hi(gCurrentStickX) # $at, 0x8012
 /* 04509C 8004449C AC20D534 */  sw    $zero, %lo(gCurrentStickX)($at)
 /* 0450A0 800444A0 AFBF001C */  sw    $ra, 0x1c($sp)
@@ -514,11 +514,11 @@ glabel L80044ADC
 /* 0457AC 80044BAC 44804000 */  mtc1  $zero, $f8
 /* 0457B0 80044BB0 46005421 */  cvt.d.s $f16, $f10
 /* 0457B4 80044BB4 4630403C */  c.lt.d $f8, $f16
-/* 0457B8 80044BB8 3C018012 */  lui   $at, %hi(gCurrentCarInput) # $at, 0x8012
+/* 0457B8 80044BB8 3C018012 */  lui   $at, %hi(gCurrentRacerInput) # $at, 0x8012
 /* 0457BC 80044BBC 4500001B */  bc1f  .L80044C2C
 /* 0457C0 80044BC0 34198000 */   li    $t9, 32768
 /* 0457C4 80044BC4 10000019 */  b     .L80044C2C
-/* 0457C8 80044BC8 AC39D528 */   sw    $t9, %lo(gCurrentCarInput)($at)
+/* 0457C8 80044BC8 AC39D528 */   sw    $t9, %lo(gCurrentRacerInput)($at)
 .L80044BCC:
 /* 0457CC 80044BCC C604002C */  lwc1  $f4, 0x2c($s0)
 /* 0457D0 80044BD0 3C01C010 */  li    $at, 0xC0100000 # -2.250000
@@ -530,22 +530,22 @@ glabel L80044ADC
 /* 0457E8 80044BE8 45000005 */  bc1f  .L80044C00
 /* 0457EC 80044BEC 240C4000 */   li    $t4, 16384
 /* 0457F0 80044BF0 3418C000 */  li    $t8, 49152
-/* 0457F4 80044BF4 3C018012 */  lui   $at, %hi(gCurrentCarInput) # $at, 0x8012
+/* 0457F4 80044BF4 3C018012 */  lui   $at, %hi(gCurrentRacerInput) # $at, 0x8012
 /* 0457F8 80044BF8 10000003 */  b     .L80044C08
-/* 0457FC 80044BFC AC38D528 */   sw    $t8, %lo(gCurrentCarInput)($at)
+/* 0457FC 80044BFC AC38D528 */   sw    $t8, %lo(gCurrentRacerInput)($at)
 .L80044C00:
-/* 045800 80044C00 3C018012 */  lui   $at, %hi(gCurrentCarInput) # $at, 0x8012
-/* 045804 80044C04 AC2CD528 */  sw    $t4, %lo(gCurrentCarInput)($at)
+/* 045800 80044C00 3C018012 */  lui   $at, %hi(gCurrentRacerInput) # $at, 0x8012
+/* 045804 80044C04 AC2CD528 */  sw    $t4, %lo(gCurrentRacerInput)($at)
 .L80044C08:
 /* 045808 80044C08 C608002C */  lwc1  $f8, 0x2c($s0)
 /* 04580C 80044C0C 3C01BFF0 */  li    $at, 0xBFF00000 # -1.875000
 /* 045810 80044C10 44815800 */  mtc1  $at, $f11
 /* 045814 80044C14 46004421 */  cvt.d.s $f16, $f8
 /* 045818 80044C18 4630503C */  c.lt.d $f10, $f16
-/* 04581C 80044C1C 3C018012 */  lui   $at, %hi(gCurrentCarInput) # $at, 0x8012
+/* 04581C 80044C1C 3C018012 */  lui   $at, %hi(gCurrentRacerInput) # $at, 0x8012
 /* 045820 80044C20 45000002 */  bc1f  .L80044C2C
 /* 045824 80044C24 340D8000 */   li    $t5, 32768
-/* 045828 80044C28 AC2DD528 */  sw    $t5, %lo(gCurrentCarInput)($at)
+/* 045828 80044C28 AC2DD528 */  sw    $t5, %lo(gCurrentRacerInput)($at)
 .L80044C2C:
 /* 04582C 80044C2C 8E080158 */  lw    $t0, 0x158($s0)
 /* 045830 80044C30 00000000 */  nop   
@@ -604,15 +604,15 @@ glabel L80044ADC
 /* 0458F8 80044CF8 44803000 */  mtc1  $zero, $f6
 /* 0458FC 80044CFC 460042A1 */  cvt.d.s $f10, $f8
 /* 045900 80044D00 462A303C */  c.lt.d $f6, $f10
-/* 045904 80044D04 3C018012 */  lui   $at, %hi(gCurrentCarInput) # $at, 0x8012
+/* 045904 80044D04 3C018012 */  lui   $at, %hi(gCurrentRacerInput) # $at, 0x8012
 /* 045908 80044D08 45000005 */  bc1f  .L80044D20
 /* 04590C 80044D0C 240D4000 */   li    $t5, 16384
 /* 045910 80044D10 340CC000 */  li    $t4, 49152
-/* 045914 80044D14 3C018012 */  lui   $at, %hi(gCurrentCarInput) # $at, 0x8012
+/* 045914 80044D14 3C018012 */  lui   $at, %hi(gCurrentRacerInput) # $at, 0x8012
 /* 045918 80044D18 10000002 */  b     .L80044D24
-/* 04591C 80044D1C AC2CD528 */   sw    $t4, %lo(gCurrentCarInput)($at)
+/* 04591C 80044D1C AC2CD528 */   sw    $t4, %lo(gCurrentRacerInput)($at)
 .L80044D20:
-/* 045920 80044D20 AC2DD528 */  sw    $t5, %lo(gCurrentCarInput)($at)
+/* 045920 80044D20 AC2DD528 */  sw    $t5, %lo(gCurrentRacerInput)($at)
 .L80044D24:
 /* 045924 80044D24 3C01800E */  lui   $at, %hi(D_800E6350 + 4) # $at, 0x800e
 /* 045928 80044D28 C7B0005C */  lwc1  $f16, 0x5c($sp)
@@ -877,11 +877,11 @@ glabel L80044F54
 /* 045CE0 800450E0 10200007 */  beqz  $at, .L80045100
 /* 045CE4 800450E4 0183082A */   slt   $at, $t4, $v1
 /* 045CE8 800450E8 10200005 */  beqz  $at, .L80045100
-/* 045CEC 800450EC 3C0E8012 */   lui   $t6, %hi(D_8011D530) # $t6, 0x8012
-/* 045CF0 800450F0 8DCED530 */  lw    $t6, %lo(D_8011D530)($t6)
-/* 045CF4 800450F4 3C018012 */  lui   $at, %hi(D_8011D530) # $at, 0x8012
+/* 045CEC 800450EC 3C0E8012 */   lui   $t6, %hi(gCurrentButtonsReleased) # $t6, 0x8012
+/* 045CF0 800450F0 8DCED530 */  lw    $t6, %lo(gCurrentButtonsReleased)($t6)
+/* 045CF4 800450F4 3C018012 */  lui   $at, %hi(gCurrentButtonsReleased) # $at, 0x8012
 /* 045CF8 800450F8 35D92000 */  ori   $t9, $t6, 0x2000
-/* 045CFC 800450FC AC39D530 */  sw    $t9, %lo(D_8011D530)($at)
+/* 045CFC 800450FC AC39D530 */  sw    $t9, %lo(gCurrentButtonsReleased)($at)
 .L80045100:
 /* 045D00 80045100 24A50001 */  addiu $a1, $a1, 1
 /* 045D04 80045104 0005C400 */  sll   $t8, $a1, 0x10
@@ -12,13 +12,13 @@ glabel D_800E63A0
 .text
 glabel func_800452A0
 /* 045EA0 800452A0 27BDFF48 */  addiu $sp, $sp, -0xb8
-/* 045EA4 800452A4 3C018012 */  lui   $at, %hi(gActivePlayerButtonPress) # $at, 0x8012
-/* 045EA8 800452A8 AC20D52C */  sw    $zero, %lo(gActivePlayerButtonPress)($at)
-/* 045EAC 800452AC 3C018012 */  lui   $at, %hi(D_8011D530) # $at, 0x8012
-/* 045EB0 800452B0 AC20D530 */  sw    $zero, %lo(D_8011D530)($at)
-/* 045EB4 800452B4 3C018012 */  lui   $at, %hi(gCurrentCarInput) # $at, 0x8012
+/* 045EA4 800452A4 3C018012 */  lui   $at, %hi(gCurrentButtonsPressed) # $at, 0x8012
+/* 045EA8 800452A8 AC20D52C */  sw    $zero, %lo(gCurrentButtonsPressed)($at)
+/* 045EAC 800452AC 3C018012 */  lui   $at, %hi(gCurrentButtonsReleased) # $at, 0x8012
+/* 045EB0 800452B0 AC20D530 */  sw    $zero, %lo(gCurrentButtonsReleased)($at)
+/* 045EB4 800452B4 3C018012 */  lui   $at, %hi(gCurrentRacerInput) # $at, 0x8012
 /* 045EB8 800452B8 340E8000 */  li    $t6, 32768
-/* 045EBC 800452BC AC2ED528 */  sw    $t6, %lo(gCurrentCarInput)($at)
+/* 045EBC 800452BC AC2ED528 */  sw    $t6, %lo(gCurrentRacerInput)($at)
 /* 045EC0 800452C0 3C018012 */  lui   $at, %hi(gCurrentStickX) # $at, 0x8012
 /* 045EC4 800452C4 AFB60048 */  sw    $s6, 0x48($sp)
 /* 045EC8 800452C8 AC20D534 */  sw    $zero, %lo(gCurrentStickX)($at)
@@ -618,9 +618,9 @@ glabel L80045AF8
 /* 046700 80045B00 44808000 */  mtc1  $zero, $f16
 /* 046704 80045B04 460012A1 */  cvt.d.s $f10, $f2
 /* 046708 80045B08 4630503C */  c.lt.d $f10, $f16
-/* 04670C 80045B0C 3C028012 */  lui   $v0, %hi(gActivePlayerButtonPress) # $v0, 0x8012
+/* 04670C 80045B0C 3C028012 */  lui   $v0, %hi(gCurrentButtonsPressed) # $v0, 0x8012
 /* 046710 80045B10 4500003B */  bc1f  .L80045C00
-/* 046714 80045B14 2442D52C */   addiu $v0, %lo(gActivePlayerButtonPress) # addiu $v0, $v0, -0x2ad4
+/* 046714 80045B14 2442D52C */   addiu $v0, %lo(gCurrentButtonsPressed) # addiu $v0, $v0, -0x2ad4
 /* 046718 80045B18 A2A001CD */  sb    $zero, 0x1cd($s5)
 /* 04671C 80045B1C 8C4F0000 */  lw    $t7, ($v0)
 /* 046720 80045B20 00000000 */  nop   
@@ -649,14 +649,14 @@ glabel L80045B70
 /* 046770 80045B70 82A90173 */  lb    $t1, 0x173($s5)
 /* 046774 80045B74 3C01800E */  lui   $at, %hi(D_800E63A0 + 4) # $at, 0x800e
 /* 046778 80045B78 15200002 */  bnez  $t1, .L80045B84
-/* 04677C 80045B7C 3C028012 */   lui   $v0, %hi(D_8011D530) # $v0, 0x8012
+/* 04677C 80045B7C 3C028012 */   lui   $v0, %hi(gCurrentButtonsReleased) # $v0, 0x8012
 /* 046780 80045B80 A2A001CD */  sb    $zero, 0x1cd($s5)
 .L80045B84:
 /* 046784 80045B84 C42963A0 */  lwc1  $f9, %lo(D_800E63A0)($at)
 /* 046788 80045B88 C42863A4 */  lwc1  $f8, %lo(D_800E63A0 + 4)($at)
 /* 04678C 80045B8C 460011A1 */  cvt.d.s $f6, $f2
 /* 046790 80045B90 4628303C */  c.lt.d $f6, $f8
-/* 046794 80045B94 2442D530 */  addiu $v0, %lo(D_8011D530) # addiu $v0, $v0, -0x2ad0
+/* 046794 80045B94 2442D530 */  addiu $v0, %lo(gCurrentButtonsReleased) # addiu $v0, $v0, -0x2ad0
 /* 046798 80045B98 4500001A */  bc1f  .L80045C04
 /* 04679C 80045B9C 8FBF0054 */   lw    $ra, 0x54($sp)
 /* 0467A0 80045BA0 8C480000 */  lw    $t0, ($v0)
@@ -1,11 +1,11 @@
 glabel func_80045C48
-/* 046848 80045C48 3C018012 */  lui   $at, %hi(gCurrentCarInput) # $at, 0x8012
+/* 046848 80045C48 3C018012 */  lui   $at, %hi(gCurrentRacerInput) # $at, 0x8012
 /* 04684C 80045C4C 27BDFF18 */  addiu $sp, $sp, -0xe8
-/* 046850 80045C50 AC20D528 */  sw    $zero, %lo(gCurrentCarInput)($at)
-/* 046854 80045C54 3C018012 */  lui   $at, %hi(gActivePlayerButtonPress) # $at, 0x8012
-/* 046858 80045C58 AC20D52C */  sw    $zero, %lo(gActivePlayerButtonPress)($at)
-/* 04685C 80045C5C 3C018012 */  lui   $at, %hi(D_8011D530) # $at, 0x8012
-/* 046860 80045C60 AC20D530 */  sw    $zero, %lo(D_8011D530)($at)
+/* 046850 80045C50 AC20D528 */  sw    $zero, %lo(gCurrentRacerInput)($at)
+/* 046854 80045C54 3C018012 */  lui   $at, %hi(gCurrentButtonsPressed) # $at, 0x8012
+/* 046858 80045C58 AC20D52C */  sw    $zero, %lo(gCurrentButtonsPressed)($at)
+/* 04685C 80045C5C 3C018012 */  lui   $at, %hi(gCurrentButtonsReleased) # $at, 0x8012
+/* 046860 80045C60 AC20D530 */  sw    $zero, %lo(gCurrentButtonsReleased)($at)
 /* 046864 80045C64 3C018012 */  lui   $at, %hi(gCurrentStickX) # $at, 0x8012
 /* 046868 80045C68 AC20D534 */  sw    $zero, %lo(gCurrentStickX)($at)
 /* 04686C 80045C6C AFBF002C */  sw    $ra, 0x2c($sp)
@@ -80,8 +80,8 @@ glabel func_80046524
 /* 047178 80046578 3C0D8012 */  lui   $t5, %hi(gCurrentStickX) # $t5, 0x8012
 /* 04717C 8004657C 05C0000B */  bltz  $t6, .L800465AC
 /* 047180 80046580 02202025 */   move  $a0, $s1
-/* 047184 80046584 3C0F800E */  lui   $t7, %hi(D_800DCB98) # $t7, 0x800e
-/* 047188 80046588 8DEFCB98 */  lw    $t7, %lo(D_800DCB98)($t7)
+/* 047184 80046584 3C0F800E */  lui   $t7, %hi(gNumViewports) # $t7, 0x800e
+/* 047188 80046588 8DEFCB98 */  lw    $t7, %lo(gNumViewports)($t7)
 /* 04718C 8004658C 00000000 */  nop   
 /* 047190 80046590 29E10002 */  slti  $at, $t7, 2
 /* 047194 80046594 10200006 */  beqz  $at, .L800465B0
@@ -116,8 +116,8 @@ glabel func_80046524
 /* 047200 80046600 44813800 */  mtc1  $at, $f7
 /* 047204 80046604 44803000 */  mtc1  $zero, $f6
 /* 047208 80046608 3C014100 */  li    $at, 0x41000000 # 8.000000
-/* 04720C 8004660C 3C0B8012 */  lui   $t3, %hi(D_8011D55C) # $t3, 0x8012
-/* 047210 80046610 8D6BD55C */  lw    $t3, %lo(D_8011D55C)($t3)
+/* 04720C 8004660C 3C0B8012 */  lui   $t3, %hi(gCurrentPlayerIndex) # $t3, 0x8012
+/* 047210 80046610 8D6BD55C */  lw    $t3, %lo(gCurrentPlayerIndex)($t3)
 /* 047214 80046614 44811000 */  mtc1  $at, $f2
 /* 047218 80046618 2401FFFF */  li    $at, -1
 /* 04721C 8004661C 02002825 */  move  $a1, $s0
@@ -188,8 +188,8 @@ glabel func_80046524
 /* 04730C 8004670C 02202025 */  move  $a0, $s1
 /* 047310 80046710 0C01231F */  jal   func_80048C7C
 /* 047314 80046714 02002825 */   move  $a1, $s0
-/* 047318 80046718 3C188012 */  lui   $t8, %hi(D_8011D55C) # $t8, 0x8012
-/* 04731C 8004671C 8F18D55C */  lw    $t8, %lo(D_8011D55C)($t8)
+/* 047318 80046718 3C188012 */  lui   $t8, %hi(gCurrentPlayerIndex) # $t8, 0x8012
+/* 04731C 8004671C 8F18D55C */  lw    $t8, %lo(gCurrentPlayerIndex)($t8)
 /* 047320 80046720 2401FFFF */  li    $at, -1
 /* 047324 80046724 13010007 */  beq   $t8, $at, .L80046744
 /* 047328 80046728 00000000 */   nop   
@@ -203,9 +203,9 @@ glabel func_80046524
 /* 047344 80046744 0C0148D3 */  jal   func_8005234C
 /* 047348 80046748 02002025 */   move  $a0, $s0
 .L8004674C:
-/* 04734C 8004674C 3C198012 */  lui   $t9, %hi(gCurrentCarInput) # $t9, 0x8012
-/* 047350 80046750 8F39D528 */  lw    $t9, %lo(gCurrentCarInput)($t9)
-/* 047354 80046754 3C048012 */  lui   $a0, %hi(gCurrentCarInput) # $a0, 0x8012
+/* 04734C 8004674C 3C198012 */  lui   $t9, %hi(gCurrentRacerInput) # $t9, 0x8012
+/* 047350 80046750 8F39D528 */  lw    $t9, %lo(gCurrentRacerInput)($t9)
+/* 047354 80046754 3C048012 */  lui   $a0, %hi(gCurrentRacerInput) # $a0, 0x8012
 /* 047358 80046758 332A8000 */  andi  $t2, $t9, 0x8000
 /* 04735C 8004675C 1140001E */  beqz  $t2, .L800467D8
 /* 047360 80046760 00000000 */   nop   
@@ -273,8 +273,8 @@ glabel func_80046524
 /* 04744C 8004684C 460E303C */  c.lt.s $f6, $f14
 /* 047450 80046850 46001006 */  mov.s $f0, $f2
 /* 047454 80046854 45000008 */  bc1f  .L80046878
-/* 047458 80046858 3C0B8012 */   lui   $t3, %hi(gCurrentCarInput) # $t3, 0x8012
-/* 04745C 8004685C 8D6BD528 */  lw    $t3, %lo(gCurrentCarInput)($t3)
+/* 047458 80046858 3C0B8012 */   lui   $t3, %hi(gCurrentRacerInput) # $t3, 0x8012
+/* 04745C 8004685C 8D6BD528 */  lw    $t3, %lo(gCurrentRacerInput)($t3)
 /* 047460 80046860 3C013F80 */  li    $at, 0x3F800000 # 1.000000
 /* 047464 80046864 316C8000 */  andi  $t4, $t3, 0x8000
 /* 047468 80046868 11800003 */  beqz  $t4, .L80046878
@@ -302,7 +302,7 @@ glabel func_80046524
 .L800468BC:
 /* 0474BC 800468BC 46007221 */  cvt.d.s $f8, $f14
 /* 0474C0 800468C0 4628203C */  c.lt.d $f4, $f8
-/* 0474C4 800468C4 8C84D528 */  lw    $a0, %lo(gCurrentCarInput)($a0)
+/* 0474C4 800468C4 8C84D528 */  lw    $a0, %lo(gCurrentRacerInput)($a0)
 /* 0474C8 800468C8 45000008 */  bc1f  .L800468EC
 /* 0474CC 800468CC 308E4000 */   andi  $t6, $a0, 0x4000
 /* 0474D0 800468D0 3C01800E */  lui   $at, %hi(D_800E63C0 + 4) # $at, 0x800e
@@ -705,7 +705,7 @@ glabel func_80046524
 /* 047A94 80046E94 A20A01DB */  sb    $t2, 0x1db($s0)
 .L80046E98:
 /* 047A98 80046E98 04610019 */  bgez  $v1, .L80046F00
-/* 047A9C 80046E9C 3C0A8012 */   lui   $t2, %hi(gCurrentCarInput) # $t2, 0x8012
+/* 047A9C 80046E9C 3C0A8012 */   lui   $t2, %hi(gCurrentRacerInput) # $t2, 0x8012
 /* 047AA0 80046EA0 00036080 */  sll   $t4, $v1, 2
 /* 047AA4 80046EA4 01836023 */  subu  $t4, $t4, $v1
 /* 047AA8 80046EA8 000C6080 */  sll   $t4, $t4, 2
@@ -731,12 +731,12 @@ glabel func_80046524
 /* 047AF8 80046EF8 27190001 */  addiu $t9, $t8, 1
 /* 047AFC 80046EFC A21901DB */  sb    $t9, 0x1db($s0)
 .L80046F00:
-/* 047B00 80046F00 8D4AD528 */  lw    $t2, %lo(gCurrentCarInput)($t2)
+/* 047B00 80046F00 8D4AD528 */  lw    $t2, %lo(gCurrentRacerInput)($t2)
 /* 047B04 80046F04 3C01FFFF */  lui   $at, (0xFFFF3FFF >> 16) # lui $at, 0xffff
 /* 047B08 80046F08 34213FFF */  ori   $at, (0xFFFF3FFF & 0xFFFF) # ori $at, $at, 0x3fff
 /* 047B0C 80046F0C 01416024 */  and   $t4, $t2, $at
-/* 047B10 80046F10 3C018012 */  lui   $at, %hi(gCurrentCarInput) # $at, 0x8012
-/* 047B14 80046F14 AC2CD528 */  sw    $t4, %lo(gCurrentCarInput)($at)
+/* 047B10 80046F10 3C018012 */  lui   $at, %hi(gCurrentRacerInput) # $at, 0x8012
+/* 047B14 80046F14 AC2CD528 */  sw    $t4, %lo(gCurrentRacerInput)($at)
 /* 047B18 80046F18 3C018012 */  lui   $at, %hi(gCurrentStickX) # $at, 0x8012
 /* 047B1C 80046F1C AC20D534 */  sw    $zero, %lo(gCurrentStickX)($at)
 /* 047B20 80046F20 A20001E1 */  sb    $zero, 0x1e1($s0)
@@ -832,7 +832,7 @@ glabel func_80046524
 /* 047C74 80047074 460A903C */  c.lt.s $f18, $f10
 /* 047C78 80047078 44810000 */  mtc1  $at, $f0
 /* 047C7C 8004707C 45000002 */  bc1f  .L80047088
-/* 047C80 80047080 3C0D8012 */   lui   $t5, %hi(D_8011D55C) # $t5, 0x8012
+/* 047C80 80047080 3C0D8012 */   lui   $t5, %hi(gCurrentPlayerIndex) # $t5, 0x8012
 /* 047C84 80047084 46009487 */  neg.s $f18, $f18
 .L80047088:
 /* 047C88 80047088 4612003C */  c.lt.s $f0, $f18
@@ -906,7 +906,7 @@ glabel func_80046524
 /* 047D90 80047190 46062281 */  sub.s $f10, $f4, $f6
 /* 047D94 80047194 E62A0020 */  swc1  $f10, 0x20($s1)
 .L80047198:
-/* 047D98 80047198 8DADD55C */  lw    $t5, %lo(D_8011D55C)($t5)
+/* 047D98 80047198 8DADD55C */  lw    $t5, %lo(gCurrentPlayerIndex)($t5)
 /* 047D9C 8004719C 2401FFFF */  li    $at, -1
 /* 047DA0 800471A0 11A10008 */  beq   $t5, $at, .L800471C4
 /* 047DA4 800471A4 24060004 */   li    $a2, 4
@@ -933,12 +933,12 @@ glabel func_80046524
 /* 047DF0 800471F0 46240182 */  mul.d $f6, $f0, $f4
 /* 047DF4 800471F4 C7AB0050 */  lwc1  $f11, 0x50($sp)
 /* 047DF8 800471F8 C7AA0054 */  lwc1  $f10, 0x54($sp)
-/* 047DFC 800471FC 3C0F8012 */  lui   $t7, %hi(gCurrentCarInput) # $t7, 0x8012
+/* 047DFC 800471FC 3C0F8012 */  lui   $t7, %hi(gCurrentRacerInput) # $t7, 0x8012
 /* 047E00 80047200 462A3202 */  mul.d $f8, $f6, $f10
 /* 047E04 80047204 46280101 */  sub.d $f4, $f0, $f8
 /* 047E08 80047208 462021A0 */  cvt.s.d $f6, $f4
 /* 047E0C 8004720C E6260020 */  swc1  $f6, 0x20($s1)
-/* 047E10 80047210 8DEFD528 */  lw    $t7, %lo(gCurrentCarInput)($t7)
+/* 047E10 80047210 8DEFD528 */  lw    $t7, %lo(gCurrentRacerInput)($t7)
 /* 047E14 80047214 00000000 */  nop   
 /* 047E18 80047218 31F84000 */  andi  $t8, $t7, 0x4000
 /* 047E1C 8004721C 13000013 */  beqz  $t8, .L8004726C
@@ -1077,8 +1077,8 @@ glabel func_80046524
 /* 04800C 8004740C 10A0000B */  beqz  $a1, .L8004743C
 /* 048010 80047410 2401000C */   li    $at, 12
 /* 048014 80047414 15210009 */  bne   $t1, $at, .L8004743C
-/* 048018 80047418 3C0B8012 */   lui   $t3, %hi(gActivePlayerButtonPress) # $t3, 0x8012
-/* 04801C 8004741C 8D6BD52C */  lw    $t3, %lo(gActivePlayerButtonPress)($t3)
+/* 048018 80047418 3C0B8012 */   lui   $t3, %hi(gCurrentButtonsPressed) # $t3, 0x8012
+/* 04801C 8004741C 8D6BD52C */  lw    $t3, %lo(gCurrentButtonsPressed)($t3)
 /* 048020 80047420 240F0002 */  li    $t7, 2
 /* 048024 80047424 316E2000 */  andi  $t6, $t3, 0x2000
 /* 048028 80047428 11C00004 */  beqz  $t6, .L8004743C
@@ -1408,9 +1408,9 @@ glabel func_80046524
 .L800478EC:
 /* 0484EC 800478EC 46206283 */  div.d $f10, $f12, $f0
 /* 0484F0 800478F0 44832000 */  mtc1  $v1, $f4
-/* 0484F4 800478F4 3C048012 */  lui   $a0, %hi(gCurrentCarInput) # $a0, 0x8012
+/* 0484F4 800478F4 3C048012 */  lui   $a0, %hi(gCurrentRacerInput) # $a0, 0x8012
 /* 0484F8 800478F8 468021A0 */  cvt.s.w $f6, $f4
-/* 0484FC 800478FC 8C84D528 */  lw    $a0, %lo(gCurrentCarInput)($a0)
+/* 0484FC 800478FC 8C84D528 */  lw    $a0, %lo(gCurrentRacerInput)($a0)
 /* 048500 80047900 00000000 */  nop   
 /* 048504 80047904 308E8000 */  andi  $t6, $a0, 0x8000
 /* 048508 80047908 308F0010 */  andi  $t7, $a0, 0x10
@@ -1484,11 +1484,11 @@ glabel func_80046524
 /* 048604 80047A04 008DC821 */  addu  $t9, $a0, $t5
 /* 048608 80047A08 15400120 */  bnez  $t2, .L80047E8C
 /* 04860C 80047A0C A6190196 */   sh    $t9, 0x196($s0)
-/* 048610 80047A10 3C0C8012 */  lui   $t4, %hi(D_8011D55C) # $t4, 0x8012
-/* 048614 80047A14 8D8CD55C */  lw    $t4, %lo(D_8011D55C)($t4)
+/* 048610 80047A10 3C0C8012 */  lui   $t4, %hi(gCurrentPlayerIndex) # $t4, 0x8012
+/* 048614 80047A14 8D8CD55C */  lw    $t4, %lo(gCurrentPlayerIndex)($t4)
 /* 048618 80047A18 2401FFFF */  li    $at, -1
 /* 04861C 80047A1C 15810038 */  bne   $t4, $at, .L80047B00
-/* 048620 80047A20 3C048012 */   lui   $a0, %hi(gCurrentCarInput) # $a0, 0x8012
+/* 048620 80047A20 3C048012 */   lui   $a0, %hi(gCurrentRacerInput) # $a0, 0x8012
 /* 048624 80047A24 820B01D8 */  lb    $t3, 0x1d8($s0)
 /* 048628 80047A28 3C013FD0 */  li    $at, 0x3FD00000 # 1.625000
 /* 04862C 80047A2C 15600034 */  bnez  $t3, .L80047B00
@@ -1503,7 +1503,7 @@ glabel func_80046524
 /* 048650 80047A50 C428641C */  lwc1  $f8, %lo(D_800E6418 + 4)($at)
 /* 048654 80047A54 3C01800E */  lui   $at, %hi(D_800E6420 + 4) # $at, 0x800e
 /* 048658 80047A58 46203420 */  cvt.s.d $f16, $f6
-/* 04865C 80047A5C 3C0E8012 */  lui   $t6, %hi(gCurrentCarInput) # $t6, 0x8012
+/* 04865C 80047A5C 3C0E8012 */  lui   $t6, %hi(gCurrentRacerInput) # $t6, 0x8012
 /* 048660 80047A60 46008121 */  cvt.d.s $f4, $f16
 /* 048664 80047A64 46282282 */  mul.d $f10, $f4, $f8
 /* 048668 80047A68 44802000 */  mtc1  $zero, $f4
@@ -1523,10 +1523,10 @@ glabel func_80046524
 /* 04869C 80047A9C 00000000 */  nop   
 /* 0486A0 80047AA0 45000005 */  bc1f  .L80047AB8
 /* 0486A4 80047AA4 00000000 */   nop   
-/* 0486A8 80047AA8 8DCED528 */  lw    $t6, %lo(gCurrentCarInput)($t6)
-/* 0486AC 80047AAC 3C018012 */  lui   $at, %hi(gCurrentCarInput) # $at, 0x8012
+/* 0486A8 80047AA8 8DCED528 */  lw    $t6, %lo(gCurrentRacerInput)($t6)
+/* 0486AC 80047AAC 3C018012 */  lui   $at, %hi(gCurrentRacerInput) # $at, 0x8012
 /* 0486B0 80047AB0 35CF0010 */  ori   $t7, $t6, 0x10
-/* 0486B4 80047AB4 AC2FD528 */  sw    $t7, %lo(gCurrentCarInput)($at)
+/* 0486B4 80047AB4 AC2FD528 */  sw    $t7, %lo(gCurrentRacerInput)($at)
 .L80047AB8:
 /* 0486B8 80047AB8 C6040038 */  lwc1  $f4, 0x38($s0)
 /* 0486BC 80047ABC C626001C */  lwc1  $f6, 0x1c($s1)
@@ -1553,7 +1553,7 @@ glabel func_80046524
 /* 04870C 80047B0C C426642C */  lwc1  $f6, %lo(D_800E6428 + 4)($at)
 /* 048710 80047B10 46002021 */  cvt.d.s $f0, $f4
 /* 048714 80047B14 46260202 */  mul.d $f8, $f0, $f6
-/* 048718 80047B18 8C84D528 */  lw    $a0, %lo(gCurrentCarInput)($a0)
+/* 048718 80047B18 8C84D528 */  lw    $a0, %lo(gCurrentRacerInput)($a0)
 /* 04871C 80047B1C 3C014000 */  li    $at, 0x40000000 # 2.000000
 /* 048720 80047B20 30980010 */  andi  $t8, $a0, 0x10
 /* 048724 80047B24 1300002E */  beqz  $t8, .L80047BE0
@@ -1614,7 +1614,7 @@ glabel func_80046524
 /* 0487F0 80047BF0 3C014000 */  li    $at, 0x40000000 # 2.000000
 /* 0487F4 80047BF4 3C0A8012 */  lui   $t2, %hi(D_8011D584) # $t2, 0x8012
 /* 0487F8 80047BF8 460A3101 */  sub.s $f4, $f6, $f10
-/* 0487FC 80047BFC 3C0B8012 */  lui   $t3, %hi(gCurrentCarInput) # $t3, 0x8012
+/* 0487FC 80047BFC 3C0B8012 */  lui   $t3, %hi(gCurrentRacerInput) # $t3, 0x8012
 /* 048800 80047C00 E624001C */  swc1  $f4, 0x1c($s1)
 /* 048804 80047C04 C6060054 */  lwc1  $f6, 0x54($s0)
 /* 048808 80047C08 00000000 */  nop   
@@ -1738,7 +1738,7 @@ glabel func_80046524
 /* 0489D8 80047DD8 C7A400FC */  lwc1  $f4, 0xfc($sp)
 /* 0489DC 80047DDC 4500000D */  bc1f  .L80047E14
 /* 0489E0 80047DE0 00000000 */   nop   
-/* 0489E4 80047DE4 8D6BD528 */  lw    $t3, %lo(gCurrentCarInput)($t3)
+/* 0489E4 80047DE4 8D6BD528 */  lw    $t3, %lo(gCurrentRacerInput)($t3)
 /* 0489E8 80047DE8 C7A800FC */  lwc1  $f8, 0xfc($sp)
 /* 0489EC 80047DEC 316E8000 */  andi  $t6, $t3, 0x8000
 /* 0489F0 80047DF0 15C00008 */  bnez  $t6, .L80047E14
@@ -1920,8 +1920,8 @@ glabel func_80046524
 /* 048C78 80048078 0C00455C */  jal   func_80011570
 /* 048C7C 8004807C 00000000 */   nop   
 /* 048C80 80048080 1040000F */  beqz  $v0, .L800480C0
-/* 048C84 80048084 3C198012 */   lui   $t9, %hi(D_8011D55C) # $t9, 0x8012
-/* 048C88 80048088 8F39D55C */  lw    $t9, %lo(D_8011D55C)($t9)
+/* 048C84 80048084 3C198012 */   lui   $t9, %hi(gCurrentPlayerIndex) # $t9, 0x8012
+/* 048C88 80048088 8F39D55C */  lw    $t9, %lo(gCurrentPlayerIndex)($t9)
 /* 048C8C 8004808C 2401FFFF */  li    $at, -1
 /* 048C90 80048090 1321000B */  beq   $t9, $at, .L800480C0
 /* 048C94 80048094 240A0001 */   li    $t2, 1
@@ -2089,8 +2089,8 @@ glabel func_80046524
 /* 048EEC 800482EC 4622403C */  c.lt.d $f8, $f2
 /* 048EF0 800482F0 00000000 */  nop   
 /* 048EF4 800482F4 45000017 */  bc1f  .L80048354
-/* 048EF8 800482F8 3C0E8012 */   lui   $t6, %hi(gCurrentCarInput) # $t6, 0x8012
-/* 048EFC 800482FC 8DCED528 */  lw    $t6, %lo(gCurrentCarInput)($t6)
+/* 048EF8 800482F8 3C0E8012 */   lui   $t6, %hi(gCurrentRacerInput) # $t6, 0x8012
+/* 048EFC 800482FC 8DCED528 */  lw    $t6, %lo(gCurrentRacerInput)($t6)
 /* 048F00 80048300 00004025 */  move  $t0, $zero
 /* 048F04 80048304 31CF0010 */  andi  $t7, $t6, 0x10
 /* 048F08 80048308 11E00006 */  beqz  $t7, .L80048324
@@ -2116,7 +2116,7 @@ glabel func_80046524
 .L80048354:
 /* 048F54 80048354 44802800 */  mtc1  $zero, $f5
 /* 048F58 80048358 44802000 */  mtc1  $zero, $f4
-/* 048F5C 8004835C 3C198012 */  lui   $t9, %hi(D_8011D55C) # $t9, 0x8012
+/* 048F5C 8004835C 3C198012 */  lui   $t9, %hi(gCurrentPlayerIndex) # $t9, 0x8012
 /* 048F60 80048360 4622203C */  c.lt.d $f4, $f2
 /* 048F64 80048364 00000000 */  nop   
 /* 048F68 80048368 45000013 */  bc1f  .L800483B8
@@ -2140,7 +2140,7 @@ glabel func_80046524
 /* 048FB0 800483B0 462032A0 */  cvt.s.d $f10, $f6
 /* 048FB4 800483B4 E60A00C4 */  swc1  $f10, 0xc4($s0)
 .L800483B8:
-/* 048FB8 800483B8 8F39D55C */  lw    $t9, %lo(D_8011D55C)($t9)
+/* 048FB8 800483B8 8F39D55C */  lw    $t9, %lo(gCurrentPlayerIndex)($t9)
 /* 048FBC 800483BC 820801D2 */  lb    $t0, 0x1d2($s0)
 /* 048FC0 800483C0 2401FFFF */  li    $at, -1
 /* 048FC4 800483C4 1721000E */  bne   $t9, $at, .L80048400
@@ -2188,8 +2188,8 @@ glabel func_80046524
 /* 04905C 8004845C 46044181 */  sub.s $f6, $f8, $f4
 /* 049060 80048460 C7A40108 */  lwc1  $f4, 0x108($sp)
 /* 049064 80048464 3C018012 */  lui   $at, %hi(D_8011D54C) # $at, 0x8012
-/* 049068 80048468 3C03800E */  lui   $v1, %hi(D_800DCB98) # $v1, 0x800e
-/* 04906C 8004846C 2463CB98 */  addiu $v1, %lo(D_800DCB98) # addiu $v1, $v1, -0x3468
+/* 049068 80048468 3C03800E */  lui   $v1, %hi(gNumViewports) # $v1, 0x800e
+/* 04906C 8004846C 2463CB98 */  addiu $v1, %lo(gNumViewports) # addiu $v1, $v1, -0x3468
 /* 049070 80048470 460A3201 */  sub.s $f8, $f6, $f10
 /* 049074 80048474 C7A600E4 */  lwc1  $f6, 0xe4($sp)
 /* 049078 80048478 46024402 */  mul.s $f16, $f8, $f2
@@ -2252,13 +2252,13 @@ glabel func_80046524
 /* 049158 80048558 10200026 */  beqz  $at, .L800485F4
 /* 04915C 8004855C 00000000 */   nop   
 /* 049160 80048560 8E2E0040 */  lw    $t6, 0x40($s1)
-/* 049164 80048564 3C188012 */  lui   $t8, %hi(gCurrentCarInput) # $t8, 0x8012
+/* 049164 80048564 3C188012 */  lui   $t8, %hi(gCurrentRacerInput) # $t8, 0x8012
 /* 049168 80048568 81CF0057 */  lb    $t7, 0x57($t6)
 /* 04916C 8004856C 00000000 */  nop   
 /* 049170 80048570 29E10009 */  slti  $at, $t7, 9
 /* 049174 80048574 1420001F */  bnez  $at, .L800485F4
 /* 049178 80048578 00000000 */   nop   
-/* 04917C 8004857C 8F18D528 */  lw    $t8, %lo(gCurrentCarInput)($t8)
+/* 04917C 8004857C 8F18D528 */  lw    $t8, %lo(gCurrentRacerInput)($t8)
 /* 049180 80048580 34018010 */  li    $at, 32784
 /* 049184 80048584 330D8010 */  andi  $t5, $t8, 0x8010
 /* 049188 80048588 15A10011 */  bne   $t5, $at, .L800485D0
@@ -2277,9 +2277,9 @@ glabel func_80046524
 /* 0491B8 800485B8 0006CA80 */  sll   $t9, $a2, 0xa
 /* 0491BC 800485BC 0C02D19A */  jal   func_800B4668
 /* 0491C0 800485C0 03203025 */   move  $a2, $t9
-/* 0491C4 800485C4 3C03800E */  lui   $v1, %hi(D_800DCB98) # $v1, 0x800e
+/* 0491C4 800485C4 3C03800E */  lui   $v1, %hi(gNumViewports) # $v1, 0x800e
 /* 0491C8 800485C8 1000000A */  b     .L800485F4
-/* 0491CC 800485CC 2463CB98 */   addiu $v1, %lo(D_800DCB98) # addiu $v1, $v1, -0x3468
+/* 0491CC 800485CC 2463CB98 */   addiu $v1, %lo(gNumViewports) # addiu $v1, $v1, -0x3468
 .L800485D0:
 /* 0491D0 800485D0 8FA60128 */  lw    $a2, 0x128($sp)
 .L800485D4:
@@ -2289,11 +2289,11 @@ glabel func_80046524
 /* 0491E0 800485E0 24050008 */  li    $a1, 8
 /* 0491E4 800485E4 0C02D1AF */  jal   func_800B46BC
 /* 0491E8 800485E8 24070020 */   li    $a3, 32
-/* 0491EC 800485EC 3C03800E */  lui   $v1, %hi(D_800DCB98) # $v1, 0x800e
-/* 0491F0 800485F0 2463CB98 */  addiu $v1, %lo(D_800DCB98) # addiu $v1, $v1, -0x3468
+/* 0491EC 800485EC 3C03800E */  lui   $v1, %hi(gNumViewports) # $v1, 0x800e
+/* 0491F0 800485F0 2463CB98 */  addiu $v1, %lo(gNumViewports) # addiu $v1, $v1, -0x3468
 .L800485F4:
-/* 0491F4 800485F4 3C028012 */  lui   $v0, %hi(D_8011D55C) # $v0, 0x8012
-/* 0491F8 800485F8 8C42D55C */  lw    $v0, %lo(D_8011D55C)($v0)
+/* 0491F4 800485F4 3C028012 */  lui   $v0, %hi(gCurrentPlayerIndex) # $v0, 0x8012
+/* 0491F8 800485F8 8C42D55C */  lw    $v0, %lo(gCurrentPlayerIndex)($v0)
 /* 0491FC 800485FC 00000000 */  nop   
 /* 049200 80048600 04400057 */  bltz  $v0, .L80048760
 /* 049204 80048604 2401FFFF */   li    $at, -1
@@ -2315,7 +2315,7 @@ glabel func_80046524
 /* 049244 80048644 46000282 */  mul.s $f10, $f0, $f0
 /* 049248 80048648 C62E0024 */  lwc1  $f14, 0x24($s1)
 /* 04924C 8004864C 3C014180 */  li    $at, 0x41800000 # 16.000000
-/* 049250 80048650 3C028012 */  lui   $v0, %hi(D_8011D55C) # $v0, 0x8012
+/* 049250 80048650 3C028012 */  lui   $v0, %hi(gCurrentPlayerIndex) # $v0, 0x8012
 /* 049254 80048654 460C6102 */  mul.s $f4, $f12, $f12
 /* 049258 80048658 00000000 */  nop   
 /* 04925C 8004865C 460E7182 */  mul.s $f6, $f14, $f14
@@ -2362,7 +2362,7 @@ glabel func_80046524
 /* 0492F8 800486F8 372A0040 */  ori   $t2, $t9, 0x40
 /* 0492FC 800486FC AE2A0074 */  sw    $t2, 0x74($s1)
 .L80048700:
-/* 049300 80048700 8C42D55C */  lw    $v0, %lo(D_8011D55C)($v0)
+/* 049300 80048700 8C42D55C */  lw    $v0, %lo(gCurrentPlayerIndex)($v0)
 /* 049304 80048704 10000016 */  b     .L80048760
 /* 049308 80048708 2401FFFF */   li    $at, -1
 .L8004870C:
@@ -2383,10 +2383,10 @@ glabel func_80046524
 /* 04933C 8004873C 45000008 */  bc1f  .L80048760
 /* 049340 80048740 2401FFFF */   li    $at, -1
 /* 049344 80048744 8E2C0074 */  lw    $t4, 0x74($s1)
-/* 049348 80048748 3C028012 */  lui   $v0, %hi(D_8011D55C) # $v0, 0x8012
+/* 049348 80048748 3C028012 */  lui   $v0, %hi(gCurrentPlayerIndex) # $v0, 0x8012
 /* 04934C 8004874C 358B000C */  ori   $t3, $t4, 0xc
 /* 049350 80048750 AE2B0074 */  sw    $t3, 0x74($s1)
-/* 049354 80048754 8C42D55C */  lw    $v0, %lo(D_8011D55C)($v0)
+/* 049354 80048754 8C42D55C */  lw    $v0, %lo(gCurrentPlayerIndex)($v0)
 /* 049358 80048758 00000000 */  nop   
 /* 04935C 8004875C 2401FFFF */  li    $at, -1
 .L80048760:
@@ -2579,15 +2579,15 @@ glabel func_80046524
 .L80048A20:
 /* 049620 80048A20 3C0E8012 */  lui   $t6, %hi(gRaceStartTimer) # $t6, 0x8012
 /* 049624 80048A24 8DCED540 */  lw    $t6, %lo(gRaceStartTimer)($t6)
-/* 049628 80048A28 3C0D8012 */  lui   $t5, %hi(gActivePlayerButtonPress) # $t5, 0x8012
+/* 049628 80048A28 3C0D8012 */  lui   $t5, %hi(gCurrentButtonsPressed) # $t5, 0x8012
 /* 04962C 80048A2C 11C00007 */  beqz  $t6, .L80048A4C
 /* 049630 80048A30 02202025 */   move  $a0, $s1
-/* 049634 80048A34 3C0F8012 */  lui   $t7, %hi(gActivePlayerButtonPress) # $t7, 0x8012
-/* 049638 80048A38 8DEFD52C */  lw    $t7, %lo(gActivePlayerButtonPress)($t7)
+/* 049634 80048A34 3C0F8012 */  lui   $t7, %hi(gCurrentButtonsPressed) # $t7, 0x8012
+/* 049638 80048A38 8DEFD52C */  lw    $t7, %lo(gCurrentButtonsPressed)($t7)
 /* 04963C 80048A3C 2401FFEF */  li    $at, -17
 /* 049640 80048A40 01E1C024 */  and   $t8, $t7, $at
-/* 049644 80048A44 3C018012 */  lui   $at, %hi(gActivePlayerButtonPress) # $at, 0x8012
-/* 049648 80048A48 AC38D52C */  sw    $t8, %lo(gActivePlayerButtonPress)($at)
+/* 049644 80048A44 3C018012 */  lui   $at, %hi(gCurrentButtonsPressed) # $at, 0x8012
+/* 049648 80048A48 AC38D52C */  sw    $t8, %lo(gCurrentButtonsPressed)($at)
 .L80048A4C:
 /* 04964C 80048A4C C60A00C0 */  lwc1  $f10, 0xc0($s0)
 /* 049650 80048A50 00000000 */  nop   
@@ -2602,7 +2602,7 @@ glabel func_80046524
 .L80048A74:
 /* 049674 80048A74 A20001FB */  sb    $zero, 0x1fb($s0)
 .L80048A78:
-/* 049678 80048A78 8DADD52C */  lw    $t5, %lo(gActivePlayerButtonPress)($t5)
+/* 049678 80048A78 8DADD52C */  lw    $t5, %lo(gCurrentButtonsPressed)($t5)
 /* 04967C 80048A7C 00000000 */  nop   
 /* 049680 80048A80 31AA0010 */  andi  $t2, $t5, 0x10
 /* 049684 80048A84 1140004A */  beqz  $t2, .L80048BB0
@@ -1,148 +0,0 @@
-.late_rodata
-glabel jpt_800E646C
-.word L80048D40, L80048D40, L80048E50, L80048DAC, L80048E18, L80048DB8
-.word 0 # Padding
-glabel D_800E6488
-.double 0.7
-glabel D_800E6490
-.double 20.5
-
-.text
-glabel func_80048C7C
-/* 04987C 80048C7C 27BDFFD8 */  addiu $sp, $sp, -0x28
-/* 049880 80048C80 AFBF001C */  sw    $ra, 0x1c($sp)
-/* 049884 80048C84 AFB00018 */  sw    $s0, 0x18($sp)
-/* 049888 80048C88 84AE0000 */  lh    $t6, ($a1)
-/* 04988C 80048C8C 2401FFFF */  li    $at, -1
-/* 049890 80048C90 15C10003 */  bne   $t6, $at, .L80048CA0
-/* 049894 80048C94 00A08025 */   move  $s0, $a1
-/* 049898 80048C98 10000003 */  b     .L80048CA8
-/* 04989C 80048C9C 00001825 */   move  $v1, $zero
-.L80048CA0:
-/* 0498A0 80048CA0 82030185 */  lb    $v1, 0x185($s0)
-/* 0498A4 80048CA4 00000000 */  nop   
-.L80048CA8:
-/* 0498A8 80048CA8 82020187 */  lb    $v0, 0x187($s0)
-/* 0498AC 80048CAC 00000000 */  nop   
-/* 0498B0 80048CB0 10400005 */  beqz  $v0, .L80048CC8
-/* 0498B4 80048CB4 00000000 */   nop   
-/* 0498B8 80048CB8 860F018E */  lh    $t7, 0x18e($s0)
-/* 0498BC 80048CBC 24010004 */  li    $at, 4
-/* 0498C0 80048CC0 19E00003 */  blez  $t7, .L80048CD0
-/* 0498C4 80048CC4 00000000 */   nop   
-.L80048CC8:
-/* 0498C8 80048CC8 10000062 */  b     .L80048E54
-/* 0498CC 80048CCC A2000187 */   sb    $zero, 0x187($s0)
-.L80048CD0:
-/* 0498D0 80048CD0 10410008 */  beq   $v0, $at, .L80048CF4
-/* 0498D4 80048CD4 02002825 */   move  $a1, $s0
-/* 0498D8 80048CD8 24060002 */  li    $a2, 2
-/* 0498DC 80048CDC A3A30027 */  sb    $v1, 0x27($sp)
-/* 0498E0 80048CE0 0C015DB8 */  jal   func_800576E0
-/* 0498E4 80048CE4 AFA40028 */   sw    $a0, 0x28($sp)
-/* 0498E8 80048CE8 83A30027 */  lb    $v1, 0x27($sp)
-/* 0498EC 80048CEC 8FA40028 */  lw    $a0, 0x28($sp)
-/* 0498F0 80048CF0 00000000 */  nop   
-.L80048CF4:
-/* 0498F4 80048CF4 240501C2 */  li    $a1, 450
-/* 0498F8 80048CF8 24060008 */  li    $a2, 8
-/* 0498FC 80048CFC 24070081 */  li    $a3, 129
-/* 049900 80048D00 A3A30027 */  sb    $v1, 0x27($sp)
-/* 049904 80048D04 0C015C2E */  jal   play_random_character_voice
-/* 049908 80048D08 AFA40028 */   sw    $a0, 0x28($sp)
-/* 04990C 80048D0C 82180187 */  lb    $t8, 0x187($s0)
-/* 049910 80048D10 83A30027 */  lb    $v1, 0x27($sp)
-/* 049914 80048D14 2719FFFF */  addiu $t9, $t8, -1
-/* 049918 80048D18 8FA40028 */  lw    $a0, 0x28($sp)
-/* 04991C 80048D1C 2F210006 */  sltiu $at, $t9, 6
-/* 049920 80048D20 1020004B */  beqz  $at, .L80048E50
-/* 049924 80048D24 0019C880 */   sll   $t9, $t9, 2
-/* 049928 80048D28 3C01800E */  lui   $at, %hi(jpt_800E646C) # $at, 0x800e
-/* 04992C 80048D2C 00390821 */  addu  $at, $at, $t9
-/* 049930 80048D30 8C39646C */  lw    $t9, %lo(jpt_800E646C)($at)
-/* 049934 80048D34 00000000 */  nop   
-/* 049938 80048D38 03200008 */  jr    $t9
-/* 04993C 80048D3C 00000000 */   nop   
-glabel L80048D40
-/* 049940 80048D40 24080001 */  li    $t0, 1
-/* 049944 80048D44 14600008 */  bnez  $v1, .L80048D68
-/* 049948 80048D48 A20801F1 */   sb    $t0, 0x1f1($s0)
-/* 04994C 80048D4C 44800000 */  mtc1  $zero, $f0
-/* 049950 80048D50 3C014100 */  li    $at, 0x41000000 # 8.000000
-/* 049954 80048D54 44812000 */  mtc1  $at, $f4
-/* 049958 80048D58 E480001C */  swc1  $f0, 0x1c($a0)
-/* 04995C 80048D5C E4800024 */  swc1  $f0, 0x24($a0)
-/* 049960 80048D60 1000003B */  b     .L80048E50
-/* 049964 80048D64 E4840020 */   swc1  $f4, 0x20($a0)
-.L80048D68:
-/* 049968 80048D68 C486001C */  lwc1  $f6, 0x1c($a0)
-/* 04996C 80048D6C 3C013FE0 */  li    $at, 0x3FE00000 # 1.750000
-/* 049970 80048D70 44810800 */  mtc1  $at, $f1
-/* 049974 80048D74 44800000 */  mtc1  $zero, $f0
-/* 049978 80048D78 46003221 */  cvt.d.s $f8, $f6
-/* 04997C 80048D7C 46204282 */  mul.d $f10, $f8, $f0
-/* 049980 80048D80 C4920024 */  lwc1  $f18, 0x24($a0)
-/* 049984 80048D84 3C0140C0 */  li    $at, 0x40C00000 # 6.000000
-/* 049988 80048D88 46009121 */  cvt.d.s $f4, $f18
-/* 04998C 80048D8C 46202182 */  mul.d $f6, $f4, $f0
-/* 049990 80048D90 46205420 */  cvt.s.d $f16, $f10
-/* 049994 80048D94 44815000 */  mtc1  $at, $f10
-/* 049998 80048D98 E490001C */  swc1  $f16, 0x1c($a0)
-/* 04999C 80048D9C E48A0020 */  swc1  $f10, 0x20($a0)
-/* 0499A0 80048DA0 46203220 */  cvt.s.d $f8, $f6
-/* 0499A4 80048DA4 1000002A */  b     .L80048E50
-/* 0499A8 80048DA8 E4880024 */   swc1  $f8, 0x24($a0)
-glabel L80048DAC
-/* 0499AC 80048DAC 2409003C */  li    $t1, 60
-/* 0499B0 80048DB0 10000027 */  b     .L80048E50
-/* 0499B4 80048DB4 A20901ED */   sb    $t1, 0x1ed($s0)
-glabel L80048DB8
-/* 0499B8 80048DB8 3C01800E */  lui   $at, %hi(D_800E6488 + 4) # $at, 0x800e
-/* 0499BC 80048DBC C4216488 */  lwc1  $f1, %lo(D_800E6488)($at)
-/* 0499C0 80048DC0 C420648C */  lwc1  $f0, %lo(D_800E6488 + 4)($at)
-/* 0499C4 80048DC4 240A0078 */  li    $t2, 120
-/* 0499C8 80048DC8 A60A0204 */  sh    $t2, 0x204($s0)
-/* 0499CC 80048DCC C490001C */  lwc1  $f16, 0x1c($a0)
-/* 0499D0 80048DD0 3C014000 */  li    $at, 0x40000000 # 2.000000
-/* 0499D4 80048DD4 460084A1 */  cvt.d.s $f18, $f16
-/* 0499D8 80048DD8 46209102 */  mul.d $f4, $f18, $f0
-/* 0499DC 80048DDC 44811000 */  mtc1  $at, $f2
-/* 0499E0 80048DE0 C4880020 */  lwc1  $f8, 0x20($a0)
-/* 0499E4 80048DE4 00000000 */  nop   
-/* 0499E8 80048DE8 4608103C */  c.lt.s $f2, $f8
-/* 0499EC 80048DEC 462021A0 */  cvt.s.d $f6, $f4
-/* 0499F0 80048DF0 45000002 */  bc1f  .L80048DFC
-/* 0499F4 80048DF4 E486001C */   swc1  $f6, 0x1c($a0)
-/* 0499F8 80048DF8 E4820020 */  swc1  $f2, 0x20($a0)
-.L80048DFC:
-/* 0499FC 80048DFC C48A0024 */  lwc1  $f10, 0x24($a0)
-/* 049A00 80048E00 00000000 */  nop   
-/* 049A04 80048E04 46005421 */  cvt.d.s $f16, $f10
-/* 049A08 80048E08 46208482 */  mul.d $f18, $f16, $f0
-/* 049A0C 80048E0C 46209120 */  cvt.s.d $f4, $f18
-/* 049A10 80048E10 1000000F */  b     .L80048E50
-/* 049A14 80048E14 E4840024 */   swc1  $f4, 0x24($a0)
-glabel L80048E18
-/* 049A18 80048E18 44800000 */  mtc1  $zero, $f0
-/* 049A1C 80048E1C 240B0001 */  li    $t3, 1
-/* 049A20 80048E20 A20B01F1 */  sb    $t3, 0x1f1($s0)
-/* 049A24 80048E24 E600002C */  swc1  $f0, 0x2c($s0)
-/* 049A28 80048E28 3C01800E */  lui   $at, %hi(D_800E6490 + 4) # $at, 0x800e
-/* 049A2C 80048E2C C4860020 */  lwc1  $f6, 0x20($a0)
-/* 049A30 80048E30 C42B6490 */  lwc1  $f11, %lo(D_800E6490)($at)
-/* 049A34 80048E34 C42A6494 */  lwc1  $f10, %lo(D_800E6490 + 4)($at)
-/* 049A38 80048E38 46003221 */  cvt.d.s $f8, $f6
-/* 049A3C 80048E3C 462A4400 */  add.d $f16, $f8, $f10
-/* 049A40 80048E40 24050139 */  li    $a1, 313
-/* 049A44 80048E44 462084A0 */  cvt.s.d $f18, $f16
-/* 049A48 80048E48 0C015C12 */  jal   racer_play_sound
-/* 049A4C 80048E4C E4920020 */   swc1  $f18, 0x20($a0)
-.L80048E50:
-glabel L80048E50
-/* 049A50 80048E50 A2000187 */  sb    $zero, 0x187($s0)
-.L80048E54:
-/* 049A54 80048E54 8FBF001C */  lw    $ra, 0x1c($sp)
-/* 049A58 80048E58 8FB00018 */  lw    $s0, 0x18($sp)
-/* 049A5C 80048E5C 03E00008 */  jr    $ra
-/* 049A60 80048E60 27BD0028 */   addiu $sp, $sp, 0x28
-
@@ -96,8 +96,8 @@ glabel func_80049794
 /* 04A434 80049834 44807000 */  mtc1  $zero, $f14
 /* 04A438 80049838 A21901DB */  sb    $t9, 0x1db($s0)
 .L8004983C:
-/* 04A43C 8004983C 3C0B8012 */  lui   $t3, %hi(D_8011D55C) # $t3, 0x8012
-/* 04A440 80049840 8D6BD55C */  lw    $t3, %lo(D_8011D55C)($t3)
+/* 04A43C 8004983C 3C0B8012 */  lui   $t3, %hi(gCurrentPlayerIndex) # $t3, 0x8012
+/* 04A440 80049840 8D6BD55C */  lw    $t3, %lo(gCurrentPlayerIndex)($t3)
 /* 04A444 80049844 2409FFFF */  li    $t1, -1
 /* 04A448 80049848 112B00A4 */  beq   $t1, $t3, .L80049ADC
 /* 04A44C 8004984C 00005025 */   move  $t2, $zero
@@ -386,8 +386,8 @@ glabel func_80049794
 /* 04A860 80049C60 02202025 */  move  $a0, $s1
 /* 04A864 80049C64 0C013050 */  jal   func_8004C140
 /* 04A868 80049C68 02002825 */   move  $a1, $s0
-/* 04A86C 80049C6C 3C0D8012 */  lui   $t5, %hi(D_8011D55C) # $t5, 0x8012
-/* 04A870 80049C70 8DADD55C */  lw    $t5, %lo(D_8011D55C)($t5)
+/* 04A86C 80049C6C 3C0D8012 */  lui   $t5, %hi(gCurrentPlayerIndex) # $t5, 0x8012
+/* 04A870 80049C70 8DADD55C */  lw    $t5, %lo(gCurrentPlayerIndex)($t5)
 /* 04A874 80049C74 2401FFFF */  li    $at, -1
 /* 04A878 80049C78 11A10007 */  beq   $t5, $at, .L80049C98
 /* 04A87C 80049C7C 00000000 */   nop   
@@ -401,9 +401,9 @@ glabel func_80049794
 /* 04A898 80049C98 0C0148D3 */  jal   func_8005234C
 /* 04A89C 80049C9C 02002025 */   move  $a0, $s0
 .L80049CA0:
-/* 04A8A0 80049CA0 3C0E8012 */  lui   $t6, %hi(gCurrentCarInput) # $t6, 0x8012
-/* 04A8A4 80049CA4 8DCED528 */  lw    $t6, %lo(gCurrentCarInput)($t6)
-/* 04A8A8 80049CA8 3C198012 */  lui   $t9, %hi(gCurrentCarInput) # $t9, 0x8012
+/* 04A8A0 80049CA0 3C0E8012 */  lui   $t6, %hi(gCurrentRacerInput) # $t6, 0x8012
+/* 04A8A4 80049CA4 8DCED528 */  lw    $t6, %lo(gCurrentRacerInput)($t6)
+/* 04A8A8 80049CA8 3C198012 */  lui   $t9, %hi(gCurrentRacerInput) # $t9, 0x8012
 /* 04A8AC 80049CAC 31CF8000 */  andi  $t7, $t6, 0x8000
 /* 04A8B0 80049CB0 11E00019 */  beqz  $t7, .L80049D18
 /* 04A8B4 80049CB4 3C01800E */   lui   $at, %hi(D_800E64B8 + 4) # $at, 0x800e
@@ -463,7 +463,7 @@ glabel func_80049794
 /* 04A984 80049D84 00000000 */  nop   
 /* 04A988 80049D88 E60A00B4 */  swc1  $f10, 0xb4($s0)
 .L80049D8C:
-/* 04A98C 80049D8C 8F39D528 */  lw    $t9, %lo(gCurrentCarInput)($t9)
+/* 04A98C 80049D8C 8F39D528 */  lw    $t9, %lo(gCurrentRacerInput)($t9)
 /* 04A990 80049D90 C61200B4 */  lwc1  $f18, 0xb4($s0)
 /* 04A994 80049D94 332B4000 */  andi  $t3, $t9, 0x4000
 /* 04A998 80049D98 11600038 */  beqz  $t3, .L80049E7C
@@ -612,8 +612,8 @@ glabel func_80049794
 /* 04ABB8 80049FB8 86020000 */  lh    $v0, ($s0)
 /* 04ABBC 80049FBC 2403FFFF */  li    $v1, -1
 /* 04ABC0 80049FC0 14620008 */  bne   $v1, $v0, .L80049FE4
-/* 04ABC4 80049FC4 3C0C8012 */   lui   $t4, %hi(D_8011D55C) # $t4, 0x8012
-/* 04ABC8 80049FC8 8D8CD55C */  lw    $t4, %lo(D_8011D55C)($t4)
+/* 04ABC4 80049FC4 3C0C8012 */   lui   $t4, %hi(gCurrentPlayerIndex) # $t4, 0x8012
+/* 04ABC8 80049FC8 8D8CD55C */  lw    $t4, %lo(gCurrentPlayerIndex)($t4)
 /* 04ABCC 80049FCC 3C01800E */  lui   $at, %hi(D_800E64E8) # $at, 0x800e
 /* 04ABD0 80049FD0 106C0004 */  beq   $v1, $t4, .L80049FE4
 /* 04ABD4 80049FD4 00000000 */   nop   
@@ -673,9 +673,9 @@ glabel func_80049794
 /* 04AC9C 8004A09C 3C013FD0 */  li    $at, 0x3FD00000 # 1.625000
 /* 04ACA0 8004A0A0 44819800 */  mtc1  $at, $f19
 /* 04ACA4 8004A0A4 44809000 */  mtc1  $zero, $f18
-/* 04ACA8 8004A0A8 3C018012 */  lui   $at, %hi(D_8011D4F0) # $at, 0x8012
+/* 04ACA8 8004A0A8 3C018012 */  lui   $at, %hi(gCurrentCourseHeight) # $at, 0x8012
 /* 04ACAC 8004A0AC 46320102 */  mul.d $f4, $f0, $f18
-/* 04ACB0 8004A0B0 C428D4F0 */  lwc1  $f8, %lo(D_8011D4F0)($at)
+/* 04ACB0 8004A0B0 C428D4F0 */  lwc1  $f8, %lo(gCurrentCourseHeight)($at)
 /* 04ACB4 8004A0B4 3C014049 */  li    $at, 0x40490000 # 3.140625
 /* 04ACB8 8004A0B8 A3A000A3 */  sb    $zero, 0xa3($sp)
 /* 04ACBC 8004A0BC 820201E0 */  lb    $v0, 0x1e0($s0)
@@ -819,7 +819,7 @@ glabel func_80049794
 /* 04AEC0 8004A2C0 1506FFF8 */  bne   $t0, $a2, .L8004A2A4
 /* 04AEC4 8004A2C4 24630001 */   addiu $v1, $v1, 1
 /* 04AEC8 8004A2C8 14A60002 */  bne   $a1, $a2, .L8004A2D4
-/* 04AECC 8004A2CC 3C0B8012 */   lui   $t3, %hi(gCurrentCarInput) # $t3, 0x8012
+/* 04AECC 8004A2CC 3C0B8012 */   lui   $t3, %hi(gCurrentRacerInput) # $t3, 0x8012
 /* 04AED0 8004A2D0 A2000175 */  sb    $zero, 0x175($s0)
 .L8004A2D4:
 /* 04AED4 8004A2D4 860E0000 */  lh    $t6, ($s0)
@@ -827,15 +827,15 @@ glabel func_80049794
 /* 04AEDC 8004A2DC 15C00009 */  bnez  $t6, .L8004A304
 /* 04AEE0 8004A2E0 00000000 */   nop   
 /* 04AEE4 8004A2E4 14A10007 */  bne   $a1, $at, .L8004A304
-/* 04AEE8 8004A2E8 3C0F8012 */   lui   $t7, %hi(gActivePlayerButtonPress) # $t7, 0x8012
-/* 04AEEC 8004A2EC 8DEFD52C */  lw    $t7, %lo(gActivePlayerButtonPress)($t7)
+/* 04AEE8 8004A2E8 3C0F8012 */   lui   $t7, %hi(gCurrentButtonsPressed) # $t7, 0x8012
+/* 04AEEC 8004A2EC 8DEFD52C */  lw    $t7, %lo(gCurrentButtonsPressed)($t7)
 /* 04AEF0 8004A2F0 24190002 */  li    $t9, 2
 /* 04AEF4 8004A2F4 31F82000 */  andi  $t8, $t7, 0x2000
 /* 04AEF8 8004A2F8 13000002 */  beqz  $t8, .L8004A304
 /* 04AEFC 8004A2FC 3C018012 */   lui   $at, %hi(D_8011D582) # $at, 0x8012
 /* 04AF00 8004A300 A039D582 */  sb    $t9, %lo(D_8011D582)($at)
 .L8004A304:
-/* 04AF04 8004A304 8D6BD528 */  lw    $t3, %lo(gCurrentCarInput)($t3)
+/* 04AF04 8004A304 8D6BD528 */  lw    $t3, %lo(gCurrentRacerInput)($t3)
 /* 04AF08 8004A308 00000000 */  nop   
 /* 04AF0C 8004A30C 316C4000 */  andi  $t4, $t3, 0x4000
 /* 04AF10 8004A310 11800013 */  beqz  $t4, .L8004A360
@@ -903,10 +903,10 @@ glabel func_80049794
 /* 04B000 8004A400 2529D538 */  addiu $t1, %lo(gCurrentStickY) # addiu $t1, $t1, -0x2ac8
 .L8004A404:
 /* 04B004 8004A404 820C01D6 */  lb    $t4, 0x1d6($s0)
-/* 04B008 8004A408 3C0D8012 */  lui   $t5, %hi(gCurrentCarInput) # $t5, 0x8012
+/* 04B008 8004A408 3C0D8012 */  lui   $t5, %hi(gCurrentRacerInput) # $t5, 0x8012
 /* 04B00C 8004A40C 29810005 */  slti  $at, $t4, 5
 /* 04B010 8004A410 14200018 */  bnez  $at, .L8004A474
-/* 04B014 8004A414 3C0F800E */   lui   $t7, %hi(D_800DCB98) # $t7, 0x800e
+/* 04B014 8004A414 3C0F800E */   lui   $t7, %hi(gNumViewports) # $t7, 0x800e
 /* 04B018 8004A418 C608002C */  lwc1  $f8, 0x2c($s0)
 /* 04B01C 8004A41C 3C01C018 */  li    $at, 0xC0180000 # -2.375000
 /* 04B020 8004A420 44812800 */  mtc1  $at, $f5
@@ -932,12 +932,12 @@ glabel func_80049794
 /* 04B070 8004A470 E7A600C4 */  swc1  $f6, 0xc4($sp)
 .L8004A474:
 /* 04B074 8004A474 A20001E0 */  sb    $zero, 0x1e0($s0)
-/* 04B078 8004A478 8DADD528 */  lw    $t5, %lo(gCurrentCarInput)($t5)
+/* 04B078 8004A478 8DADD528 */  lw    $t5, %lo(gCurrentRacerInput)($t5)
 /* 04B07C 8004A47C 00000000 */  nop   
 /* 04B080 8004A480 31AE4000 */  andi  $t6, $t5, 0x4000
 /* 04B084 8004A484 11C00007 */  beqz  $t6, .L8004A4A4
 /* 04B088 8004A488 00000000 */   nop   
-/* 04B08C 8004A48C 8DEFCB98 */  lw    $t7, %lo(D_800DCB98)($t7)
+/* 04B08C 8004A48C 8DEFCB98 */  lw    $t7, %lo(gNumViewports)($t7)
 /* 04B090 8004A490 24180003 */  li    $t8, 3
 /* 04B094 8004A494 29E10003 */  slti  $at, $t7, 3
 /* 04B098 8004A498 10200002 */  beqz  $at, .L8004A4A4
@@ -1305,13 +1305,13 @@ glabel func_80049794
 /* 04B5C0 8004A9C0 00000000 */  nop   
 /* 04B5C4 8004A9C4 E5C60030 */  swc1  $f6, 0x30($t6)
 .L8004A9C8:
-/* 04B5C8 8004A9C8 3C188012 */  lui   $t8, %hi(gCurrentCarInput) # $t8, 0x8012
-/* 04B5CC 8004A9CC 8F18D528 */  lw    $t8, %lo(gCurrentCarInput)($t8)
+/* 04B5C8 8004A9C8 3C188012 */  lui   $t8, %hi(gCurrentRacerInput) # $t8, 0x8012
+/* 04B5CC 8004A9CC 8F18D528 */  lw    $t8, %lo(gCurrentRacerInput)($t8)
 /* 04B5D0 8004A9D0 3C01FFFF */  lui   $at, (0xFFFF5FFF >> 16) # lui $at, 0xffff
 /* 04B5D4 8004A9D4 34215FFF */  ori   $at, (0xFFFF5FFF & 0xFFFF) # ori $at, $at, 0x5fff
 /* 04B5D8 8004A9D8 0301C824 */  and   $t9, $t8, $at
-/* 04B5DC 8004A9DC 3C018012 */  lui   $at, %hi(gCurrentCarInput) # $at, 0x8012
-/* 04B5E0 8004A9E0 AC39D528 */  sw    $t9, %lo(gCurrentCarInput)($at)
+/* 04B5DC 8004A9DC 3C018012 */  lui   $at, %hi(gCurrentRacerInput) # $at, 0x8012
+/* 04B5E0 8004A9E0 AC39D528 */  sw    $t9, %lo(gCurrentRacerInput)($at)
 /* 04B5E4 8004A9E4 8FA400F8 */  lw    $a0, 0xf8($sp)
 /* 04B5E8 8004A9E8 820B01DB */  lb    $t3, 0x1db($s0)
 /* 04B5EC 8004A9EC 3C013F80 */  li    $at, 0x3F800000 # 1.000000
@@ -1414,7 +1414,7 @@ glabel func_80049794
 .L8004AB4C:
 /* 04B74C 8004AB4C 86230002 */  lh    $v1, 2($s1)
 /* 04B750 8004AB50 820F01D5 */  lb    $t7, 0x1d5($s0)
-/* 04B754 8004AB54 3C0D8012 */  lui   $t5, %hi(gCurrentCarInput) # $t5, 0x8012
+/* 04B754 8004AB54 3C0D8012 */  lui   $t5, %hi(gCurrentRacerInput) # $t5, 0x8012
 /* 04B758 8004AB58 15E00009 */  bnez  $t7, .L8004AB80
 /* 04B75C 8004AB5C 00604025 */   move  $t0, $v1
 /* 04B760 8004AB60 0002C080 */  sll   $t8, $v0, 2
@@ -1426,7 +1426,7 @@ glabel func_80049794
 /* 04B778 8004AB78 006B6021 */  addu  $t4, $v1, $t3
 /* 04B77C 8004AB7C A62C0002 */  sh    $t4, 2($s1)
 .L8004AB80:
-/* 04B780 8004AB80 8DADD528 */  lw    $t5, %lo(gCurrentCarInput)($t5)
+/* 04B780 8004AB80 8DADD528 */  lw    $t5, %lo(gCurrentRacerInput)($t5)
 /* 04B784 8004AB84 00000000 */  nop   
 /* 04B788 8004AB88 31AE0010 */  andi  $t6, $t5, 0x10
 /* 04B78C 8004AB8C 15C00002 */  bnez  $t6, .L8004AB98
@@ -1503,11 +1503,11 @@ glabel func_80049794
 /* 04B890 8004AC90 142001A6 */  bnez  $at, .L8004B32C
 /* 04B894 8004AC94 00000000 */   nop   
 /* 04B898 8004AC98 862E0002 */  lh    $t6, 2($s1)
-/* 04B89C 8004AC9C 3C0F8012 */  lui   $t7, %hi(gCurrentCarInput) # $t7, 0x8012
+/* 04B89C 8004AC9C 3C0F8012 */  lui   $t7, %hi(gCurrentRacerInput) # $t7, 0x8012
 /* 04B8A0 8004ACA0 29C1C000 */  slti  $at, $t6, -0x4000
 /* 04B8A4 8004ACA4 102001A1 */  beqz  $at, .L8004B32C
 /* 04B8A8 8004ACA8 00000000 */   nop   
-/* 04B8AC 8004ACAC 8DEFD528 */  lw    $t7, %lo(gCurrentCarInput)($t7)
+/* 04B8AC 8004ACAC 8DEFD528 */  lw    $t7, %lo(gCurrentRacerInput)($t7)
 /* 04B8B0 8004ACB0 2419003C */  li    $t9, 60
 /* 04B8B4 8004ACB4 31F80010 */  andi  $t8, $t7, 0x10
 /* 04B8B8 8004ACB8 1300019C */  beqz  $t8, .L8004B32C
@@ -1550,11 +1550,11 @@ glabel func_80049794
 /* 04B93C 8004AD3C 1020017B */  beqz  $at, .L8004B32C
 /* 04B940 8004AD40 00000000 */   nop   
 /* 04B944 8004AD44 86390002 */  lh    $t9, 2($s1)
-/* 04B948 8004AD48 3C0B8012 */  lui   $t3, %hi(gCurrentCarInput) # $t3, 0x8012
+/* 04B948 8004AD48 3C0B8012 */  lui   $t3, %hi(gCurrentRacerInput) # $t3, 0x8012
 /* 04B94C 8004AD4C 2B214001 */  slti  $at, $t9, 0x4001
 /* 04B950 8004AD50 14200176 */  bnez  $at, .L8004B32C
 /* 04B954 8004AD54 00000000 */   nop   
-/* 04B958 8004AD58 8D6BD528 */  lw    $t3, %lo(gCurrentCarInput)($t3)
+/* 04B958 8004AD58 8D6BD528 */  lw    $t3, %lo(gCurrentRacerInput)($t3)
 /* 04B95C 8004AD5C 240D003C */  li    $t5, 60
 /* 04B960 8004AD60 316C0010 */  andi  $t4, $t3, 0x10
 /* 04B964 8004AD64 11800171 */  beqz  $t4, .L8004B32C
@@ -1565,18 +1565,18 @@ glabel func_80049794
 /* 04B974 8004AD74 820401E1 */  lb    $a0, 0x1e1($s0)
 /* 04B978 8004AD78 A3A000A1 */  sb    $zero, 0xa1($sp)
 /* 04B97C 8004AD7C 820301E2 */  lb    $v1, 0x1e2($s0)
-/* 04B980 8004AD80 3C028012 */  lui   $v0, %hi(gCurrentCarInput) # $v0, 0x8012
+/* 04B980 8004AD80 3C028012 */  lui   $v0, %hi(gCurrentRacerInput) # $v0, 0x8012
 /* 04B984 8004AD84 1060000B */  beqz  $v1, .L8004ADB4
 /* 04B988 8004AD88 2401FFEF */   li    $at, -17
-/* 04B98C 8004AD8C 8C42D528 */  lw    $v0, %lo(gCurrentCarInput)($v0)
+/* 04B98C 8004AD8C 8C42D528 */  lw    $v0, %lo(gCurrentRacerInput)($v0)
 /* 04B990 8004AD90 240F0001 */  li    $t7, 1
 /* 04B994 8004AD94 304E0010 */  andi  $t6, $v0, 0x10
 /* 04B998 8004AD98 11C00002 */  beqz  $t6, .L8004ADA4
 /* 04B99C 8004AD9C 0041C024 */   and   $t8, $v0, $at
 /* 04B9A0 8004ADA0 A3AF00A1 */  sb    $t7, 0xa1($sp)
 .L8004ADA4:
-/* 04B9A4 8004ADA4 3C018012 */  lui   $at, %hi(gCurrentCarInput) # $at, 0x8012
-/* 04B9A8 8004ADA8 AC38D528 */  sw    $t8, %lo(gCurrentCarInput)($at)
+/* 04B9A4 8004ADA4 3C018012 */  lui   $at, %hi(gCurrentRacerInput) # $at, 0x8012
+/* 04B9A8 8004ADA8 AC38D528 */  sw    $t8, %lo(gCurrentRacerInput)($at)
 /* 04B9AC 8004ADAC 820301E2 */  lb    $v1, 0x1e2($s0)
 /* 04B9B0 8004ADB0 00000000 */  nop   
 .L8004ADB4:
@@ -1613,8 +1613,8 @@ glabel func_80049794
 /* 04BA24 8004AE24 46085183 */  div.s $f6, $f10, $f8
 /* 04BA28 8004AE28 44812800 */  mtc1  $at, $f5
 /* 04BA2C 8004AE2C 44802000 */  mtc1  $zero, $f4
-/* 04BA30 8004AE30 3C0B8012 */  lui   $t3, %hi(gCurrentCarInput) # $t3, 0x8012
-/* 04BA34 8004AE34 8D6BD528 */  lw    $t3, %lo(gCurrentCarInput)($t3)
+/* 04BA30 8004AE30 3C0B8012 */  lui   $t3, %hi(gCurrentRacerInput) # $t3, 0x8012
+/* 04BA34 8004AE34 8D6BD528 */  lw    $t3, %lo(gCurrentRacerInput)($t3)
 /* 04BA38 8004AE38 00000000 */  nop   
 /* 04BA3C 8004AE3C 316C0010 */  andi  $t4, $t3, 0x10
 /* 04BA40 8004AE40 460034A1 */  cvt.d.s $f18, $f6
@@ -1660,22 +1660,22 @@ glabel func_80049794
 /* 04BADC 8004AEDC 8FAD00F8 */  lw    $t5, 0xf8($sp)
 /* 04BAE0 8004AEE0 920E01F5 */  lbu   $t6, 0x1f5($s0)
 /* 04BAE4 8004AEE4 006D0019 */  multu $v1, $t5
-/* 04BAE8 8004AEE8 3C0C8012 */  lui   $t4, %hi(D_8011D55C) # $t4, 0x8012
+/* 04BAE8 8004AEE8 3C0C8012 */  lui   $t4, %hi(gCurrentPlayerIndex) # $t4, 0x8012
 /* 04BAEC 8004AEEC 00007812 */  mflo  $t7
 /* 04BAF0 8004AEF0 000FC103 */  sra   $t8, $t7, 4
 /* 04BAF4 8004AEF4 0078C823 */  subu  $t9, $v1, $t8
 /* 04BAF8 8004AEF8 15C00056 */  bnez  $t6, .L8004B054
 /* 04BAFC 8004AEFC A61901A4 */   sh    $t9, 0x1a4($s0)
-/* 04BB00 8004AF00 8D8CD55C */  lw    $t4, %lo(D_8011D55C)($t4)
+/* 04BB00 8004AF00 8D8CD55C */  lw    $t4, %lo(gCurrentPlayerIndex)($t4)
 /* 04BB04 8004AF04 2401FFFF */  li    $at, -1
 /* 04BB08 8004AF08 11810025 */  beq   $t4, $at, .L8004AFA0
 /* 04BB0C 8004AF0C 3C088012 */   lui   $t0, %hi(gCurrentStickX) # $t0, 0x8012
 /* 04BB10 8004AF10 820B01D8 */  lb    $t3, 0x1d8($s0)
-/* 04BB14 8004AF14 3C028012 */  lui   $v0, %hi(gCurrentCarInput) # $v0, 0x8012
+/* 04BB14 8004AF14 3C028012 */  lui   $v0, %hi(gCurrentRacerInput) # $v0, 0x8012
 /* 04BB18 8004AF18 15600021 */  bnez  $t3, .L8004AFA0
 /* 04BB1C 8004AF1C 00000000 */   nop   
 /* 04BB20 8004AF20 860801A4 */  lh    $t0, 0x1a4($s0)
-/* 04BB24 8004AF24 8C42D528 */  lw    $v0, %lo(gCurrentCarInput)($v0)
+/* 04BB24 8004AF24 8C42D528 */  lw    $v0, %lo(gCurrentRacerInput)($v0)
 /* 04BB28 8004AF28 00084023 */  negu  $t0, $t0
 /* 04BB2C 8004AF2C 00086983 */  sra   $t5, $t0, 6
 /* 04BB30 8004AF30 304F0010 */  andi  $t7, $v0, 0x10
@@ -1737,12 +1737,12 @@ glabel func_80049794
 /* 04BC00 8004B000 00411021 */  addu  $v0, $v0, $at
 .L8004B004:
 /* 04BC04 8004B004 00580019 */  multu $v0, $t8
-/* 04BC08 8004B008 3C0E8012 */  lui   $t6, %hi(gCurrentCarInput) # $t6, 0x8012
+/* 04BC08 8004B008 3C0E8012 */  lui   $t6, %hi(gCurrentRacerInput) # $t6, 0x8012
 /* 04BC0C 8004B00C 0000C812 */  mflo  $t9
 /* 04BC10 8004B010 00195903 */  sra   $t3, $t9, 4
 /* 04BC14 8004B014 006B6821 */  addu  $t5, $v1, $t3
 /* 04BC18 8004B018 A60D01A4 */  sh    $t5, 0x1a4($s0)
-/* 04BC1C 8004B01C 8DCED528 */  lw    $t6, %lo(gCurrentCarInput)($t6)
+/* 04BC1C 8004B01C 8DCED528 */  lw    $t6, %lo(gCurrentRacerInput)($t6)
 /* 04BC20 8004B020 8FB800F8 */  lw    $t8, 0xf8($sp)
 /* 04BC24 8004B024 31CC0010 */  andi  $t4, $t6, 0x10
 /* 04BC28 8004B028 11800005 */  beqz  $t4, .L8004B040
@@ -1758,9 +1758,9 @@ glabel func_80049794
 /* 04BC4C 8004B04C 01EB6823 */  subu  $t5, $t7, $t3
 /* 04BC50 8004B050 A60D01A0 */  sh    $t5, 0x1a0($s0)
 .L8004B054:
-/* 04BC54 8004B054 3C028012 */  lui   $v0, %hi(gCurrentCarInput) # $v0, 0x8012
-/* 04BC58 8004B058 8C42D528 */  lw    $v0, %lo(gCurrentCarInput)($v0)
-/* 04BC5C 8004B05C 3C0F8012 */  lui   $t7, %hi(D_8011D55C) # $t7, 0x8012
+/* 04BC54 8004B054 3C028012 */  lui   $v0, %hi(gCurrentRacerInput) # $v0, 0x8012
+/* 04BC58 8004B058 8C42D528 */  lw    $v0, %lo(gCurrentRacerInput)($v0)
+/* 04BC5C 8004B05C 3C0F8012 */  lui   $t7, %hi(gCurrentPlayerIndex) # $t7, 0x8012
 /* 04BC60 8004B060 304E0010 */  andi  $t6, $v0, 0x10
 /* 04BC64 8004B064 11C00009 */  beqz  $t6, .L8004B08C
 /* 04BC68 8004B068 01C01025 */   move  $v0, $t6
@@ -1781,7 +1781,7 @@ glabel func_80049794
 /* 04BCA0 8004B0A0 46083482 */  mul.s $f18, $f6, $f8
 /* 04BCA4 8004B0A4 C4246514 */  lwc1  $f4, %lo(D_800E6510 + 4)($at)
 /* 04BCA8 8004B0A8 C628001C */  lwc1  $f8, 0x1c($s1)
-/* 04BCAC 8004B0AC 3C028012 */  lui   $v0, %hi(gCurrentCarInput) # $v0, 0x8012
+/* 04BCAC 8004B0AC 3C028012 */  lui   $v0, %hi(gCurrentRacerInput) # $v0, 0x8012
 /* 04BCB0 8004B0B0 460092A1 */  cvt.d.s $f10, $f18
 /* 04BCB4 8004B0B4 46245182 */  mul.d $f6, $f10, $f4
 /* 04BCB8 8004B0B8 C6120050 */  lwc1  $f18, 0x50($s0)
@@ -1800,12 +1800,12 @@ glabel func_80049794
 /* 04BCEC 8004B0EC 46149182 */  mul.s $f6, $f18, $f20
 /* 04BCF0 8004B0F0 46062201 */  sub.s $f8, $f4, $f6
 /* 04BCF4 8004B0F4 E6280024 */  swc1  $f8, 0x24($s1)
-/* 04BCF8 8004B0F8 8C42D528 */  lw    $v0, %lo(gCurrentCarInput)($v0)
+/* 04BCF8 8004B0F8 8C42D528 */  lw    $v0, %lo(gCurrentRacerInput)($v0)
 /* 04BCFC 8004B0FC 00000000 */  nop   
 /* 04BD00 8004B100 30590010 */  andi  $t9, $v0, 0x10
 /* 04BD04 8004B104 03201025 */  move  $v0, $t9
 .L8004B108:
-/* 04BD08 8004B108 8DEFD55C */  lw    $t7, %lo(D_8011D55C)($t7)
+/* 04BD08 8004B108 8DEFD55C */  lw    $t7, %lo(gCurrentPlayerIndex)($t7)
 /* 04BD0C 8004B10C 3C088012 */  lui   $t0, %hi(gCurrentStickY) # $t0, 0x8012
 /* 04BD10 8004B110 8D08D538 */  lw    $t0, %lo(gCurrentStickY)($t0)
 /* 04BD14 8004B114 2401FFFF */  li    $at, -1
@@ -1952,8 +1952,8 @@ glabel func_80049794
 /* 04BF24 8004B324 A20001D4 */  sb    $zero, 0x1d4($s0)
 /* 04BF28 8004B328 A20001D5 */  sb    $zero, 0x1d5($s0)
 .L8004B32C:
-/* 04BF2C 8004B32C 3C0C8012 */  lui   $t4, %hi(D_8011D55C) # $t4, 0x8012
-/* 04BF30 8004B330 8D8CD55C */  lw    $t4, %lo(D_8011D55C)($t4)
+/* 04BF2C 8004B32C 3C0C8012 */  lui   $t4, %hi(gCurrentPlayerIndex) # $t4, 0x8012
+/* 04BF30 8004B330 8D8CD55C */  lw    $t4, %lo(gCurrentPlayerIndex)($t4)
 /* 04BF34 8004B334 2401FFFF */  li    $at, -1
 /* 04BF38 8004B338 1181000F */  beq   $t4, $at, .L8004B378
 /* 04BF3C 8004B33C 02202025 */   move  $a0, $s1
@@ -2038,7 +2038,7 @@ glabel func_80049794
 /* 04C064 8004B464 460E0002 */  mul.s $f0, $f0, $f14
 /* 04C068 8004B468 C62A001C */  lwc1  $f10, 0x1c($s1)
 /* 04C06C 8004B46C C6280020 */  lwc1  $f8, 0x20($s1)
-/* 04C070 8004B470 3C188012 */  lui   $t8, %hi(gCurrentCarInput) # $t8, 0x8012
+/* 04C070 8004B470 3C188012 */  lui   $t8, %hi(gCurrentRacerInput) # $t8, 0x8012
 /* 04C074 8004B474 46009102 */  mul.s $f4, $f18, $f0
 /* 04C078 8004B478 46045181 */  sub.s $f6, $f10, $f4
 /* 04C07C 8004B47C E626001C */  swc1  $f6, 0x1c($s1)
@@ -2116,7 +2116,7 @@ glabel func_80049794
 /* 04C18C 8004B58C C7A600D8 */  lwc1  $f6, 0xd8($sp)
 /* 04C190 8004B590 4500000D */  bc1f  .L8004B5C8
 /* 04C194 8004B594 00000000 */   nop   
-/* 04C198 8004B598 8F18D528 */  lw    $t8, %lo(gCurrentCarInput)($t8)
+/* 04C198 8004B598 8F18D528 */  lw    $t8, %lo(gCurrentRacerInput)($t8)
 /* 04C19C 8004B59C C7A800D8 */  lwc1  $f8, 0xd8($sp)
 /* 04C1A0 8004B5A0 330C8000 */  andi  $t4, $t8, 0x8000
 /* 04C1A4 8004B5A4 15800008 */  bnez  $t4, .L8004B5C8
@@ -2453,15 +2453,15 @@ glabel func_80049794
 /* 04C684 8004BA84 00000000 */   nop   
 /* 04C688 8004BA88 C7AC00EC */  lwc1  $f12, 0xec($sp)
 /* 04C68C 8004BA8C 10400006 */  beqz  $v0, .L8004BAA8
-/* 04C690 8004BA90 3C0C8012 */   lui   $t4, %hi(D_8011D55C) # $t4, 0x8012
-/* 04C694 8004BA94 8D8CD55C */  lw    $t4, %lo(D_8011D55C)($t4)
+/* 04C690 8004BA90 3C0C8012 */   lui   $t4, %hi(gCurrentPlayerIndex) # $t4, 0x8012
+/* 04C694 8004BA94 8D8CD55C */  lw    $t4, %lo(gCurrentPlayerIndex)($t4)
 /* 04C698 8004BA98 2401FFFF */  li    $at, -1
 /* 04C69C 8004BA9C 11810002 */  beq   $t4, $at, .L8004BAA8
 /* 04C6A0 8004BAA0 24190001 */   li    $t9, 1
 /* 04C6A4 8004BAA4 A3B9005F */  sb    $t9, 0x5f($sp)
 .L8004BAA8:
-/* 04C6A8 8004BAA8 3C028012 */  lui   $v0, %hi(D_8011D55C) # $v0, 0x8012
-/* 04C6AC 8004BAAC 8C42D55C */  lw    $v0, %lo(D_8011D55C)($v0)
+/* 04C6A8 8004BAA8 3C028012 */  lui   $v0, %hi(gCurrentPlayerIndex) # $v0, 0x8012
+/* 04C6AC 8004BAAC 8C42D55C */  lw    $v0, %lo(gCurrentPlayerIndex)($v0)
 /* 04C6B0 8004BAB0 1000000B */  b     .L8004BAE0
 /* 04C6B4 8004BAB4 820801E2 */   lb    $t0, 0x1e2($s0)
 /* 04C6B8 8004BAB8 8FA600FC */  lw    $a2, 0xfc($sp)
@@ -2470,8 +2470,8 @@ glabel func_80049794
 /* 04C6C0 8004BAC0 02002825 */  move  $a1, $s0
 /* 04C6C4 8004BAC4 0C0141D5 */  jal   func_80050754
 /* 04C6C8 8004BAC8 E7AC00EC */   swc1  $f12, 0xec($sp)
-/* 04C6CC 8004BACC 3C028012 */  lui   $v0, %hi(D_8011D55C) # $v0, 0x8012
-/* 04C6D0 8004BAD0 8C42D55C */  lw    $v0, %lo(D_8011D55C)($v0)
+/* 04C6CC 8004BACC 3C028012 */  lui   $v0, %hi(gCurrentPlayerIndex) # $v0, 0x8012
+/* 04C6D0 8004BAD0 8C42D55C */  lw    $v0, %lo(gCurrentPlayerIndex)($v0)
 /* 04C6D4 8004BAD4 C7AC00EC */  lwc1  $f12, 0xec($sp)
 /* 04C6D8 8004BAD8 00000000 */  nop   
 /* 04C6DC 8004BADC 820801E2 */  lb    $t0, 0x1e2($s0)
@@ -2745,16 +2745,16 @@ glabel func_80049794
 /* 04CAC0 8004BEC0 35ED4000 */  ori   $t5, $t7, 0x4000
 /* 04CAC4 8004BEC4 A44D0006 */  sh    $t5, 6($v0)
 .L8004BEC8:
-/* 04CAC8 8004BEC8 3C0B8012 */  lui   $t3, %hi(D_8011D55C) # $t3, 0x8012
-/* 04CACC 8004BECC 8D6BD55C */  lw    $t3, %lo(D_8011D55C)($t3)
+/* 04CAC8 8004BEC8 3C0B8012 */  lui   $t3, %hi(gCurrentPlayerIndex) # $t3, 0x8012
+/* 04CACC 8004BECC 8D6BD55C */  lw    $t3, %lo(gCurrentPlayerIndex)($t3)
 /* 04CAD0 8004BED0 2401FFFF */  li    $at, -1
 /* 04CAD4 8004BED4 11610046 */  beq   $t3, $at, .L8004BFF0
 /* 04CAD8 8004BED8 00000000 */   nop   
 /* 04CADC 8004BEDC 820E01D3 */  lb    $t6, 0x1d3($s0)
-/* 04CAE0 8004BEE0 3C18800E */  lui   $t8, %hi(D_800DCB98) # $t8, 0x800e
+/* 04CAE0 8004BEE0 3C18800E */  lui   $t8, %hi(gNumViewports) # $t8, 0x800e
 /* 04CAE4 8004BEE4 15C00042 */  bnez  $t6, .L8004BFF0
 /* 04CAE8 8004BEE8 00000000 */   nop   
-/* 04CAEC 8004BEEC 8F18CB98 */  lw    $t8, %lo(D_800DCB98)($t8)
+/* 04CAEC 8004BEEC 8F18CB98 */  lw    $t8, %lo(gNumViewports)($t8)
 /* 04CAF0 8004BEF0 00000000 */  nop   
 /* 04CAF4 8004BEF4 2B010002 */  slti  $at, $t8, 2
 /* 04CAF8 8004BEF8 1020003D */  beqz  $at, .L8004BFF0
@@ -2823,8 +2823,8 @@ glabel func_80049794
 /* 04CBE8 8004BFE8 01D96825 */  or    $t5, $t6, $t9
 /* 04CBEC 8004BFEC AE2D0074 */  sw    $t5, 0x74($s1)
 .L8004BFF0:
-/* 04CBF0 8004BFF0 3C0F8012 */  lui   $t7, %hi(D_8011D55C) # $t7, 0x8012
-/* 04CBF4 8004BFF4 8DEFD55C */  lw    $t7, %lo(D_8011D55C)($t7)
+/* 04CBF0 8004BFF0 3C0F8012 */  lui   $t7, %hi(gCurrentPlayerIndex) # $t7, 0x8012
+/* 04CBF4 8004BFF4 8DEFD55C */  lw    $t7, %lo(gCurrentPlayerIndex)($t7)
 /* 04CBF8 8004BFF8 2401FFFF */  li    $at, -1
 /* 04CBFC 8004BFFC 15E10002 */  bne   $t7, $at, .L8004C008
 /* 04CC00 8004C000 00000000 */   nop   
@@ -2848,8 +2848,8 @@ glabel func_80049794
 /* 04CC3C 8004C03C 02202025 */  move  $a0, $s1
 /* 04CC40 8004C040 11800007 */  beqz  $t4, .L8004C060
 /* 04CC44 8004C044 02002825 */   move  $a1, $s0
-/* 04CC48 8004C048 3C028012 */  lui   $v0, %hi(gCurrentCarInput) # $v0, 0x8012
-/* 04CC4C 8004C04C 2442D528 */  addiu $v0, %lo(gCurrentCarInput) # addiu $v0, $v0, -0x2ad8
+/* 04CC48 8004C048 3C028012 */  lui   $v0, %hi(gCurrentRacerInput) # $v0, 0x8012
+/* 04CC4C 8004C04C 2442D528 */  addiu $v0, %lo(gCurrentRacerInput) # addiu $v0, $v0, -0x2ad8
 /* 04CC50 8004C050 8C4E0000 */  lw    $t6, ($v0)
 /* 04CC54 8004C054 00000000 */  nop   
 /* 04CC58 8004C058 35D90010 */  ori   $t9, $t6, 0x10
@@ -139,8 +139,8 @@ glabel func_8004CC20
 /* 04D9F4 8004CDF4 0C01BD93 */  jal   guMtxXFMF
 /* 04D9F8 8004CDF8 3C063F80 */   lui   $a2, 0x3f80
 /* 04D9FC 8004CDFC 340E8000 */  li    $t6, 32768
-/* 04DA00 8004CE00 3C018012 */  lui   $at, %hi(gCurrentCarInput) # $at, 0x8012
-/* 04DA04 8004CE04 AC2ED528 */  sw    $t6, %lo(gCurrentCarInput)($at)
+/* 04DA00 8004CE00 3C018012 */  lui   $at, %hi(gCurrentRacerInput) # $at, 0x8012
+/* 04DA04 8004CE04 AC2ED528 */  sw    $t6, %lo(gCurrentRacerInput)($at)
 /* 04DA08 8004CE08 02202025 */  move  $a0, $s1
 /* 04DA0C 8004CE0C 0C014D71 */  jal   func_800535C4
 /* 04DA10 8004CE10 02002825 */   move  $a1, $s0
@@ -274,8 +274,8 @@ glabel func_8004CC20
 /* 04DBEC 8004CFEC 46122003 */  div.s $f0, $f4, $f18
 /* 04DBF0 8004CFF0 C626001C */  lwc1  $f6, 0x1c($s1)
 /* 04DBF4 8004CFF4 C6240020 */  lwc1  $f4, 0x20($s1)
-/* 04DBF8 8004CFF8 3C098012 */  lui   $t1, %hi(D_8011D55C) # $t1, 0x8012
-/* 04DBFC 8004CFFC 2529D55C */  addiu $t1, %lo(D_8011D55C) # addiu $t1, $t1, -0x2aa4
+/* 04DBF8 8004CFF8 3C098012 */  lui   $t1, %hi(gCurrentPlayerIndex) # $t1, 0x8012
+/* 04DBFC 8004CFFC 2529D55C */  addiu $t1, %lo(gCurrentPlayerIndex) # addiu $t1, $t1, -0x2aa4
 /* 04DC00 8004D000 3C013F80 */  li    $at, 0x3F800000 # 1.000000
 /* 04DC04 8004D004 44811000 */  mtc1  $at, $f2
 /* 04DC08 8004D008 46004402 */  mul.s $f16, $f8, $f0
@@ -537,8 +537,8 @@ glabel func_8004CC20
 /* 04DFDC 8004D3DC 44078000 */  mfc1  $a3, $f16
 /* 04DFE0 8004D3E0 0C00455C */  jal   func_80011570
 /* 04DFE4 8004D3E4 00000000 */   nop   
-/* 04DFE8 8004D3E8 3C098012 */  lui   $t1, %hi(D_8011D55C) # $t1, 0x8012
-/* 04DFEC 8004D3EC 2529D55C */  addiu $t1, %lo(D_8011D55C) # addiu $t1, $t1, -0x2aa4
+/* 04DFE8 8004D3E8 3C098012 */  lui   $t1, %hi(gCurrentPlayerIndex) # $t1, 0x8012
+/* 04DFEC 8004D3EC 2529D55C */  addiu $t1, %lo(gCurrentPlayerIndex) # addiu $t1, $t1, -0x2aa4
 /* 04DFF0 8004D3F0 10400006 */  beqz  $v0, .L8004D40C
 /* 04DFF4 8004D3F4 2408FFFF */   li    $t0, -1
 /* 04DFF8 8004D3F8 8D2B0000 */  lw    $t3, ($t1)
@@ -27,20 +27,20 @@ glabel func_8004F7F4
 /* 050414 8004F814 00E08025 */  move  $s0, $a3
 /* 050418 8004F818 11C00008 */  beqz  $t6, .L8004F83C
 /* 05041C 8004F81C 00C08825 */   move  $s1, $a2
-/* 050420 8004F820 3C048012 */  lui   $a0, %hi(gCurrentCarInput) # $a0, 0x8012
-/* 050424 8004F824 2484D528 */  addiu $a0, %lo(gCurrentCarInput) # addiu $a0, $a0, -0x2ad8
+/* 050420 8004F820 3C048012 */  lui   $a0, %hi(gCurrentRacerInput) # $a0, 0x8012
+/* 050424 8004F824 2484D528 */  addiu $a0, %lo(gCurrentRacerInput) # addiu $a0, $a0, -0x2ad8
 /* 050428 8004F828 8C8F0000 */  lw    $t7, ($a0)
 /* 05042C 8004F82C 3C01FFFF */  lui   $at, (0xFFFF7FFF >> 16) # lui $at, 0xffff
 /* 050430 8004F830 34217FFF */  ori   $at, (0xFFFF7FFF & 0xFFFF) # ori $at, $at, 0x7fff
 /* 050434 8004F834 01E1C024 */  and   $t8, $t7, $at
 /* 050438 8004F838 AC980000 */  sw    $t8, ($a0)
 .L8004F83C:
-/* 05043C 8004F83C 3C198012 */  lui   $t9, %hi(D_8011D55C) # $t9, 0x8012
-/* 050440 8004F840 8F39D55C */  lw    $t9, %lo(D_8011D55C)($t9)
-/* 050444 8004F844 3C048012 */  lui   $a0, %hi(gCurrentCarInput) # $a0, 0x8012
+/* 05043C 8004F83C 3C198012 */  lui   $t9, %hi(gCurrentPlayerIndex) # $t9, 0x8012
+/* 050440 8004F840 8F39D55C */  lw    $t9, %lo(gCurrentPlayerIndex)($t9)
+/* 050444 8004F844 3C048012 */  lui   $a0, %hi(gCurrentRacerInput) # $a0, 0x8012
 /* 050448 8004F848 2401FFFF */  li    $at, -1
 /* 05044C 8004F84C 13210005 */  beq   $t9, $at, .L8004F864
-/* 050450 8004F850 2484D528 */   addiu $a0, %lo(gCurrentCarInput) # addiu $a0, $a0, -0x2ad8
+/* 050450 8004F850 2484D528 */   addiu $a0, %lo(gCurrentRacerInput) # addiu $a0, $a0, -0x2ad8
 /* 050454 8004F854 820801D8 */  lb    $t0, 0x1d8($s0)
 /* 050458 8004F858 00003025 */  move  $a2, $zero
 /* 05045C 8004F85C 11000008 */  beqz  $t0, .L8004F880
@@ -55,9 +55,9 @@ glabel func_8004F7F4
 /* 05047C 8004F87C 8FBF002C */   lw    $ra, 0x2c($sp)
 .L8004F880:
 /* 050480 8004F880 820901D4 */  lb    $t1, 0x1d4($s0)
-/* 050484 8004F884 3C038012 */  lui   $v1, %hi(gActivePlayerButtonPress) # $v1, 0x8012
+/* 050484 8004F884 3C038012 */  lui   $v1, %hi(gCurrentButtonsPressed) # $v1, 0x8012
 /* 050488 8004F888 1120000D */  beqz  $t1, .L8004F8C0
-/* 05048C 8004F88C 2463D52C */   addiu $v1, %lo(gActivePlayerButtonPress) # addiu $v1, $v1, -0x2ad4
+/* 05048C 8004F88C 2463D52C */   addiu $v1, %lo(gCurrentButtonsPressed) # addiu $v1, $v1, -0x2ad4
 /* 050490 8004F890 8C6A0000 */  lw    $t2, ($v1)
 /* 050494 8004F894 2401DFEF */  li    $at, -8209
 /* 050498 8004F898 01415824 */  and   $t3, $t2, $at
@@ -265,7 +265,7 @@ glabel func_8004F7F4
 /* 050778 8004FB78 02002825 */   move  $a1, $s0
 /* 05077C 8004FB7C 8FA600C0 */  lw    $a2, 0xc0($sp)
 /* 050780 8004FB80 02202025 */  move  $a0, $s1
-/* 050784 8004FB84 0C014FA7 */  jal   func_80053E9C
+/* 050784 8004FB84 0C014FA7 */  jal   racer_attack_handler
 /* 050788 8004FB88 02002825 */   move  $a1, $s0
 /* 05078C 8004FB8C 820F01DB */  lb    $t7, 0x1db($s0)
 /* 050790 8004FB90 00000000 */  nop   
@@ -274,7 +274,7 @@ glabel func_8004F7F4
 /* 05079C 8004FB9C 8FA600C0 */  lw    $a2, 0xc0($sp)
 /* 0507A0 8004FBA0 8FA700C4 */  lw    $a3, 0xc4($sp)
 /* 0507A4 8004FBA4 02202025 */  move  $a0, $s1
-/* 0507A8 8004FBA8 0C014AD9 */  jal   func_80052B64
+/* 0507A8 8004FBA8 0C014AD9 */  jal   racer_spinout_car
 /* 0507AC 8004FBAC 02002825 */   move  $a1, $s0
 /* 0507B0 8004FBB0 10000010 */  b     .L8004FBF4
 /* 0507B4 8004FBB4 8E02001C */   lw    $v0, 0x1c($s0)
@@ -512,8 +512,8 @@ glabel func_8004F7F4
 /* 050B04 8004FF04 9484D550 */  lhu   $a0, %lo(D_8011D550)($a0)
 /* 050B08 8004FF08 00000000 */  nop   
 /* 050B0C 8004FF0C 10800024 */  beqz  $a0, .L8004FFA0
-/* 050B10 8004FF10 3C0E8012 */   lui   $t6, %hi(D_8011D55C) # $t6, 0x8012
-/* 050B14 8004FF14 8DCED55C */  lw    $t6, %lo(D_8011D55C)($t6)
+/* 050B10 8004FF10 3C0E8012 */   lui   $t6, %hi(gCurrentPlayerIndex) # $t6, 0x8012
+/* 050B14 8004FF14 8DCED55C */  lw    $t6, %lo(gCurrentPlayerIndex)($t6)
 /* 050B18 8004FF18 2401FFFF */  li    $at, -1
 /* 050B1C 8004FF1C 11C1000F */  beq   $t6, $at, .L8004FF5C
 /* 050B20 8004FF20 2401010C */   li    $at, 268
@@ -709,22 +709,22 @@ glabel func_8004F7F4
 /* 050DE8 800501E8 0C00455C */  jal   func_80011570
 /* 050DEC 800501EC 00000000 */   nop   
 /* 050DF0 800501F0 10400006 */  beqz  $v0, .L8005020C
-/* 050DF4 800501F4 3C098012 */   lui   $t1, %hi(D_8011D55C) # $t1, 0x8012
-/* 050DF8 800501F8 8D29D55C */  lw    $t1, %lo(D_8011D55C)($t1)
+/* 050DF4 800501F4 3C098012 */   lui   $t1, %hi(gCurrentPlayerIndex) # $t1, 0x8012
+/* 050DF8 800501F8 8D29D55C */  lw    $t1, %lo(gCurrentPlayerIndex)($t1)
 /* 050DFC 800501FC 2401FFFF */  li    $at, -1
 /* 050E00 80050200 11210002 */  beq   $t1, $at, .L8005020C
 /* 050E04 80050204 240A0001 */   li    $t2, 1
 /* 050E08 80050208 A3AA0053 */  sb    $t2, 0x53($sp)
 .L8005020C:
-/* 050E0C 8005020C 3C028012 */  lui   $v0, %hi(D_8011D55C) # $v0, 0x8012
-/* 050E10 80050210 8C42D55C */  lw    $v0, %lo(D_8011D55C)($v0)
+/* 050E0C 8005020C 3C028012 */  lui   $v0, %hi(gCurrentPlayerIndex) # $v0, 0x8012
+/* 050E10 80050210 8C42D55C */  lw    $v0, %lo(gCurrentPlayerIndex)($v0)
 /* 050E14 80050214 10000007 */  b     .L80050234
 /* 050E18 80050218 2401FFFF */   li    $at, -1
 .L8005021C:
 /* 050E1C 8005021C 0C0141D5 */  jal   func_80050754
 /* 050E20 80050220 02002825 */   move  $a1, $s0
-/* 050E24 80050224 3C028012 */  lui   $v0, %hi(D_8011D55C) # $v0, 0x8012
-/* 050E28 80050228 8C42D55C */  lw    $v0, %lo(D_8011D55C)($v0)
+/* 050E24 80050224 3C028012 */  lui   $v0, %hi(gCurrentPlayerIndex) # $v0, 0x8012
+/* 050E28 80050228 8C42D55C */  lw    $v0, %lo(gCurrentPlayerIndex)($v0)
 /* 050E2C 8005022C 00000000 */  nop   
 /* 050E30 80050230 2401FFFF */  li    $at, -1
 .L80050234:
@@ -897,10 +897,10 @@ glabel func_8004F7F4
 /* 0510B4 800504B4 E6100030 */  swc1  $f16, 0x30($s0)
 .L800504B8:
 /* 0510B8 800504B8 820F01D3 */  lb    $t7, 0x1d3($s0)
-/* 0510BC 800504BC 3C18800E */  lui   $t8, %hi(D_800DCB98) # $t8, 0x800e
+/* 0510BC 800504BC 3C18800E */  lui   $t8, %hi(gNumViewports) # $t8, 0x800e
 /* 0510C0 800504C0 15E00043 */  bnez  $t7, .L800505D0
 /* 0510C4 800504C4 00000000 */   nop   
-/* 0510C8 800504C8 8F18CB98 */  lw    $t8, %lo(D_800DCB98)($t8)
+/* 0510C8 800504C8 8F18CB98 */  lw    $t8, %lo(gNumViewports)($t8)
 /* 0510CC 800504CC 00000000 */  nop   
 /* 0510D0 800504D0 2B010002 */  slti  $at, $t8, 2
 /* 0510D4 800504D4 1020003E */  beqz  $at, .L800505D0
@@ -970,12 +970,12 @@ glabel func_8004F7F4
 /* 0511C8 800505C8 014D6025 */  or    $t4, $t2, $t5
 /* 0511CC 800505CC AE2C0074 */  sw    $t4, 0x74($s1)
 .L800505D0:
-/* 0511D0 800505D0 3C0E8012 */  lui   $t6, %hi(D_8011D55C) # $t6, 0x8012
-/* 0511D4 800505D4 8DCED55C */  lw    $t6, %lo(D_8011D55C)($t6)
+/* 0511D0 800505D0 3C0E8012 */  lui   $t6, %hi(gCurrentPlayerIndex) # $t6, 0x8012
+/* 0511D4 800505D4 8DCED55C */  lw    $t6, %lo(gCurrentPlayerIndex)($t6)
 /* 0511D8 800505D8 2401FFFF */  li    $at, -1
 /* 0511DC 800505DC 11C10030 */  beq   $t6, $at, .L800506A0
-/* 0511E0 800505E0 3C0F800E */   lui   $t7, %hi(D_800DCB98) # $t7, 0x800e
-/* 0511E4 800505E4 8DEFCB98 */  lw    $t7, %lo(D_800DCB98)($t7)
+/* 0511E0 800505E0 3C0F800E */   lui   $t7, %hi(gNumViewports) # $t7, 0x800e
+/* 0511E4 800505E4 8DEFCB98 */  lw    $t7, %lo(gNumViewports)($t7)
 /* 0511E8 800505E8 00000000 */  nop   
 /* 0511EC 800505EC 29E10002 */  slti  $at, $t7, 2
 /* 0511F0 800505F0 1020002B */  beqz  $at, .L800506A0
@@ -1037,8 +1037,8 @@ glabel func_8004F7F4
 /* 0512C4 800506C4 02002825 */  move  $a1, $s0
 /* 0512C8 800506C8 0C01602D */  jal   func_800580B4
 /* 0512CC 800506CC 00003025 */   move  $a2, $zero
-/* 0512D0 800506D0 3C0A800E */  lui   $t2, %hi(D_800DCB98) # $t2, 0x800e
-/* 0512D4 800506D4 8D4ACB98 */  lw    $t2, %lo(D_800DCB98)($t2)
+/* 0512D0 800506D0 3C0A800E */  lui   $t2, %hi(gNumViewports) # $t2, 0x800e
+/* 0512D4 800506D4 8D4ACB98 */  lw    $t2, %lo(gNumViewports)($t2)
 /* 0512D8 800506D8 24010001 */  li    $at, 1
 /* 0512DC 800506DC 15410013 */  bne   $t2, $at, .L8005072C
 /* 0512E0 800506E0 83AC0053 */   lb    $t4, 0x53($sp)
@@ -66,9 +66,9 @@ glabel func_80050A28
 /* 051678 80050A78 E60E0088 */  swc1  $f14, 0x88($s0)
 /* 05167C 80050A7C 3C0E8012 */  lui   $t6, %hi(D_8011D586) # $t6, 0x8012
 /* 051680 80050A80 85CED586 */  lh    $t6, %lo(D_8011D586)($t6)
-/* 051684 80050A84 3C088012 */  lui   $t0, %hi(gCurrentCarInput) # $t0, 0x8012
+/* 051684 80050A84 3C088012 */  lui   $t0, %hi(gCurrentRacerInput) # $t0, 0x8012
 /* 051688 80050A88 15C00041 */  bnez  $t6, .L80050B90
-/* 05168C 80050A8C 2508D528 */   addiu $t0, %lo(gCurrentCarInput) # addiu $t0, $t0, -0x2ad8
+/* 05168C 80050A8C 2508D528 */   addiu $t0, %lo(gCurrentRacerInput) # addiu $t0, $t0, -0x2ad8
 /* 051690 80050A90 820F01E7 */  lb    $t7, 0x1e7($s0)
 /* 051694 80050A94 3C19800E */  lui   $t9, %hi(D_800DCDB0) # $t9, 0x800e
 /* 051698 80050A98 31F8001F */  andi  $t8, $t7, 0x1f
@@ -160,8 +160,8 @@ glabel func_80050A28
 /* 0517DC 80050BDC 10000008 */  b     .L80050C00
 /* 0517E0 80050BE0 A20001FB */   sb    $zero, 0x1fb($s0)
 .L80050BE4:
-/* 0517E4 80050BE4 3C188012 */  lui   $t8, %hi(gCurrentCarInput) # $t8, 0x8012
-/* 0517E8 80050BE8 8F18D528 */  lw    $t8, %lo(gCurrentCarInput)($t8)
+/* 0517E4 80050BE4 3C188012 */  lui   $t8, %hi(gCurrentRacerInput) # $t8, 0x8012
+/* 0517E8 80050BE8 8F18D528 */  lw    $t8, %lo(gCurrentRacerInput)($t8)
 /* 0517EC 80050BEC 00000000 */  nop   
 /* 0517F0 80050BF0 33198000 */  andi  $t9, $t8, 0x8000
 /* 0517F4 80050BF4 17200002 */  bnez  $t9, .L80050C00
@@ -169,9 +169,9 @@ glabel func_80050A28
 /* 0517FC 80050BFC A20001FB */  sb    $zero, 0x1fb($s0)
 .L80050C00:
 /* 051800 80050C00 820201FB */  lb    $v0, 0x1fb($s0)
-/* 051804 80050C04 3C088012 */  lui   $t0, %hi(gCurrentCarInput) # $t0, 0x8012
+/* 051804 80050C04 3C088012 */  lui   $t0, %hi(gCurrentRacerInput) # $t0, 0x8012
 /* 051808 80050C08 18400006 */  blez  $v0, .L80050C24
-/* 05180C 80050C0C 2508D528 */   addiu $t0, %lo(gCurrentCarInput) # addiu $t0, $t0, -0x2ad8
+/* 05180C 80050C0C 2508D528 */   addiu $t0, %lo(gCurrentRacerInput) # addiu $t0, $t0, -0x2ad8
 /* 051810 80050C10 8FAA0080 */  lw    $t2, 0x80($sp)
 /* 051814 80050C14 00000000 */  nop   
 /* 051818 80050C18 004A5823 */  subu  $t3, $v0, $t2
@@ -206,17 +206,17 @@ glabel func_80050A28
 /* 051884 80050C84 86040000 */  lh    $a0, ($s0)
 /* 051888 80050C88 0C01C8D2 */  jal   func_80072348
 /* 05188C 80050C8C AFA70078 */   sw    $a3, 0x78($sp)
-/* 051890 80050C90 3C088012 */  lui   $t0, %hi(gCurrentCarInput) # $t0, 0x8012
+/* 051890 80050C90 3C088012 */  lui   $t0, %hi(gCurrentRacerInput) # $t0, 0x8012
 /* 051894 80050C94 8FA70078 */  lw    $a3, 0x78($sp)
-/* 051898 80050C98 2508D528 */  addiu $t0, %lo(gCurrentCarInput) # addiu $t0, $t0, -0x2ad8
+/* 051898 80050C98 2508D528 */  addiu $t0, %lo(gCurrentRacerInput) # addiu $t0, $t0, -0x2ad8
 .L80050C9C:
-/* 05189C 80050C9C 3C0E8012 */  lui   $t6, %hi(D_8011D55C) # $t6, 0x8012
-/* 0518A0 80050CA0 8DCED55C */  lw    $t6, %lo(D_8011D55C)($t6)
+/* 05189C 80050C9C 3C0E8012 */  lui   $t6, %hi(gCurrentPlayerIndex) # $t6, 0x8012
+/* 0518A0 80050CA0 8DCED55C */  lw    $t6, %lo(gCurrentPlayerIndex)($t6)
 /* 0518A4 80050CA4 240D0001 */  li    $t5, 1
 /* 0518A8 80050CA8 05C0001D */  bltz  $t6, .L80050D20
 /* 0518AC 80050CAC AFAD0060 */   sw    $t5, 0x60($sp)
-/* 0518B0 80050CB0 3C0F800E */  lui   $t7, %hi(D_800DCB98) # $t7, 0x800e
-/* 0518B4 80050CB4 8DEFCB98 */  lw    $t7, %lo(D_800DCB98)($t7)
+/* 0518B0 80050CB0 3C0F800E */  lui   $t7, %hi(gNumViewports) # $t7, 0x800e
+/* 0518B4 80050CB4 8DEFCB98 */  lw    $t7, %lo(gNumViewports)($t7)
 /* 0518B8 80050CB8 240E0001 */  li    $t6, 1
 /* 0518BC 80050CBC 29E10003 */  slti  $at, $t7, 3
 /* 0518C0 80050CC0 10200016 */  beqz  $at, .L80050D1C
@@ -256,9 +256,9 @@ glabel func_80050A28
 /* 051938 80050D38 0C01BE53 */  jal   get_random_number_from_range
 /* 05193C 80050D3C AFA70078 */   sw    $a3, 0x78($sp)
 /* 051940 80050D40 A20201D1 */  sb    $v0, 0x1d1($s0)
-/* 051944 80050D44 3C088012 */  lui   $t0, %hi(gCurrentCarInput) # $t0, 0x8012
+/* 051944 80050D44 3C088012 */  lui   $t0, %hi(gCurrentRacerInput) # $t0, 0x8012
 /* 051948 80050D48 8FA70078 */  lw    $a3, 0x78($sp)
-/* 05194C 80050D4C 2508D528 */  addiu $t0, %lo(gCurrentCarInput) # addiu $t0, $t0, -0x2ad8
+/* 05194C 80050D4C 2508D528 */  addiu $t0, %lo(gCurrentRacerInput) # addiu $t0, $t0, -0x2ad8
 .L80050D50:
 /* 051950 80050D50 3C098012 */  lui   $t1, %hi(gCurrentStickX) # $t1, 0x8012
 /* 051954 80050D54 2529D534 */  addiu $t1, %lo(gCurrentStickX) # addiu $t1, $t1, -0x2acc
@@ -315,8 +315,8 @@ glabel func_80050A28
 /* 051A10 80050E10 AD190000 */  sw    $t9, ($t0)
 /* 051A14 80050E14 372B4000 */  ori   $t3, $t9, 0x4000
 /* 051A18 80050E18 AD0B0000 */  sw    $t3, ($t0)
-/* 051A1C 80050E1C 3C0E800E */  lui   $t6, %hi(D_800DCB98) # $t6, 0x800e
-/* 051A20 80050E20 8DCECB98 */  lw    $t6, %lo(D_800DCB98)($t6)
+/* 051A1C 80050E1C 3C0E800E */  lui   $t6, %hi(gNumViewports) # $t6, 0x800e
+/* 051A20 80050E20 8DCECB98 */  lw    $t6, %lo(gNumViewports)($t6)
 /* 051A24 80050E24 3C018012 */  lui   $at, %hi(gCurrentStickY) # $at, 0x8012
 /* 051A28 80050E28 240CFFBA */  li    $t4, -70
 /* 051A2C 80050E2C AC2CD538 */  sw    $t4, %lo(gCurrentStickY)($at)
@@ -382,12 +382,12 @@ glabel func_80050A28
 /* 051B08 80050F08 820401E6 */  lb    $a0, 0x1e6($s0)
 /* 051B0C 80050F0C 44809000 */  mtc1  $zero, $f18
 /* 051B10 80050F10 10800019 */  beqz  $a0, .L80050F78
-/* 051B14 80050F14 3C0C8012 */   lui   $t4, %hi(D_8011D55C) # $t4, 0x8012
-/* 051B18 80050F18 8D8CD55C */  lw    $t4, %lo(D_8011D55C)($t4)
-/* 051B1C 80050F1C 3C0D800E */  lui   $t5, %hi(D_800DCB98) # $t5, 0x800e
+/* 051B14 80050F14 3C0C8012 */   lui   $t4, %hi(gCurrentPlayerIndex) # $t4, 0x8012
+/* 051B18 80050F18 8D8CD55C */  lw    $t4, %lo(gCurrentPlayerIndex)($t4)
+/* 051B1C 80050F1C 3C0D800E */  lui   $t5, %hi(gNumViewports) # $t5, 0x800e
 /* 051B20 80050F20 05800015 */  bltz  $t4, .L80050F78
 /* 051B24 80050F24 00000000 */   nop   
-/* 051B28 80050F28 8DADCB98 */  lw    $t5, %lo(D_800DCB98)($t5)
+/* 051B28 80050F28 8DADCB98 */  lw    $t5, %lo(gNumViewports)($t5)
 /* 051B2C 80050F2C 240A0001 */  li    $t2, 1
 /* 051B30 80050F30 29A10003 */  slti  $at, $t5, 3
 /* 051B34 80050F34 1020000F */  beqz  $at, .L80050F74
@@ -456,8 +456,8 @@ glabel func_80050A28
 .L80051014:
 /* 051C14 80051014 0C015C88 */  jal   handle_racer_top_speed
 /* 051C18 80051018 AFA70078 */   sw    $a3, 0x78($sp)
-/* 051C1C 8005101C 3C0F8012 */  lui   $t7, %hi(gCurrentCarInput) # $t7, 0x8012
-/* 051C20 80051020 8DEFD528 */  lw    $t7, %lo(gCurrentCarInput)($t7)
+/* 051C1C 8005101C 3C0F8012 */  lui   $t7, %hi(gCurrentRacerInput) # $t7, 0x8012
+/* 051C20 80051020 8DEFD528 */  lw    $t7, %lo(gCurrentRacerInput)($t7)
 /* 051C24 80051024 E7A00034 */  swc1  $f0, 0x34($sp)
 /* 051C28 80051028 31F80010 */  andi  $t8, $t7, 0x10
 /* 051C2C 8005102C 13000019 */  beqz  $t8, .L80051094
@@ -617,8 +617,8 @@ glabel func_80050A28
 /* 051E54 80051254 0C001223 */  jal   func_8000488C
 /* 051E58 80051258 00402025 */   move  $a0, $v0
 .L8005125C:
-/* 051E5C 8005125C 3C028012 */  lui   $v0, %hi(gCurrentCarInput) # $v0, 0x8012
-/* 051E60 80051260 8C42D528 */  lw    $v0, %lo(gCurrentCarInput)($v0)
+/* 051E5C 8005125C 3C028012 */  lui   $v0, %hi(gCurrentRacerInput) # $v0, 0x8012
+/* 051E60 80051260 8C42D528 */  lw    $v0, %lo(gCurrentRacerInput)($v0)
 /* 051E64 80051264 820301E1 */  lb    $v1, 0x1e1($s0)
 /* 051E68 80051268 30584000 */  andi  $t8, $v0, 0x4000
 /* 051E6C 8005126C 24060006 */  li    $a2, 6
@@ -841,8 +841,8 @@ glabel func_80050A28
 /* 05218C 8005158C 11600009 */  beqz  $t3, .L800515B4
 /* 052190 80051590 00000000 */   nop   
 /* 052194 80051594 15210007 */  bne   $t1, $at, .L800515B4
-/* 052198 80051598 3C198012 */   lui   $t9, %hi(gActivePlayerButtonPress) # $t9, 0x8012
-/* 05219C 8005159C 8F39D52C */  lw    $t9, %lo(gActivePlayerButtonPress)($t9)
+/* 052198 80051598 3C198012 */   lui   $t9, %hi(gCurrentButtonsPressed) # $t9, 0x8012
+/* 05219C 8005159C 8F39D52C */  lw    $t9, %lo(gCurrentButtonsPressed)($t9)
 /* 0521A0 800515A0 240D0002 */  li    $t5, 2
 /* 0521A4 800515A4 332C2000 */  andi  $t4, $t9, 0x2000
 /* 0521A8 800515A8 11800002 */  beqz  $t4, .L800515B4
@@ -894,8 +894,8 @@ glabel func_80050A28
 /* 052254 80051654 E7AE0044 */  swc1  $f14, 0x44($sp)
 /* 052258 80051658 0C0078A7 */  jal   get_misc_asset
 /* 05225C 8005165C E7B00040 */   swc1  $f16, 0x40($sp)
-/* 052260 80051660 3C0F8012 */  lui   $t7, %hi(D_8011D55C) # $t7, 0x8012
-/* 052264 80051664 8DEFD55C */  lw    $t7, %lo(D_8011D55C)($t7)
+/* 052260 80051660 3C0F8012 */  lui   $t7, %hi(gCurrentPlayerIndex) # $t7, 0x8012
+/* 052264 80051664 8DEFD55C */  lw    $t7, %lo(gCurrentPlayerIndex)($t7)
 /* 052268 80051668 2403FFFF */  li    $v1, -1
 /* 05226C 8005166C 83A80057 */  lb    $t0, 0x57($sp)
 /* 052270 80051670 8FA90064 */  lw    $t1, 0x64($sp)
@@ -1095,8 +1095,8 @@ glabel func_80050A28
 /* 05255C 8005195C 4612203C */  c.lt.s $f4, $f18
 /* 052560 80051960 00000000 */  nop   
 /* 052564 80051964 4500000F */  bc1f  .L800519A4
-/* 052568 80051968 3C0A8012 */   lui   $t2, %hi(gCurrentCarInput) # $t2, 0x8012
-/* 05256C 8005196C 8D4AD528 */  lw    $t2, %lo(gCurrentCarInput)($t2)
+/* 052568 80051968 3C0A8012 */   lui   $t2, %hi(gCurrentRacerInput) # $t2, 0x8012
+/* 05256C 8005196C 8D4AD528 */  lw    $t2, %lo(gCurrentRacerInput)($t2)
 /* 052570 80051970 00000000 */  nop   
 /* 052574 80051974 314B8000 */  andi  $t3, $t2, 0x8000
 /* 052578 80051978 1560000A */  bnez  $t3, .L800519A4
@@ -1410,7 +1410,7 @@ glabel func_80050A28
 /* 0529F0 80051DF0 46228181 */  sub.d $f6, $f16, $f2
 /* 0529F4 80051DF4 24010004 */  li    $at, 4
 /* 0529F8 80051DF8 46283282 */  mul.d $f10, $f6, $f8
-/* 0529FC 80051DFC 3C028012 */  lui   $v0, %hi(gCurrentCarInput) # $v0, 0x8012
+/* 0529FC 80051DFC 3C028012 */  lui   $v0, %hi(gCurrentRacerInput) # $v0, 0x8012
 /* 052A00 80051E00 15210007 */  bne   $t1, $at, .L80051E20
 /* 052A04 80051E04 46205020 */   cvt.s.d $f0, $f10
 /* 052A08 80051E08 3C013FD0 */  li    $at, 0x3FD00000 # 1.625000
@@ -1425,7 +1425,7 @@ glabel func_80050A28
 /* 052A28 80051E28 2941FFE7 */  slti  $at, $t2, -0x19
 /* 052A2C 80051E2C 10200017 */  beqz  $at, .L80051E8C
 /* 052A30 80051E30 00000000 */   nop   
-/* 052A34 80051E34 8C42D528 */  lw    $v0, %lo(gCurrentCarInput)($v0)
+/* 052A34 80051E34 8C42D528 */  lw    $v0, %lo(gCurrentRacerInput)($v0)
 /* 052A38 80051E38 00000000 */  nop   
 /* 052A3C 80051E3C 304B8000 */  andi  $t3, $v0, 0x8000
 /* 052A40 80051E40 15600012 */  bnez  $t3, .L80051E8C
@@ -1627,8 +1627,8 @@ glabel func_80050A28
 /* 052D24 80052124 8D4AD554 */  lw    $t2, %lo(gCurrentCarSteerVel)($t2)
 /* 052D28 80052128 11600013 */  beqz  $t3, .L80052178
 /* 052D2C 8005212C AE0A0110 */   sw    $t2, 0x110($s0)
-/* 052D30 80052130 3C188012 */  lui   $t8, %hi(D_8011D55C) # $t8, 0x8012
-/* 052D34 80052134 8F18D55C */  lw    $t8, %lo(D_8011D55C)($t8)
+/* 052D30 80052130 3C188012 */  lui   $t8, %hi(gCurrentPlayerIndex) # $t8, 0x8012
+/* 052D34 80052134 8F18D55C */  lw    $t8, %lo(gCurrentPlayerIndex)($t8)
 /* 052D38 80052138 2401FFFF */  li    $at, -1
 /* 052D3C 8005213C 1301000F */  beq   $t8, $at, .L8005217C
 /* 052D40 80052140 8FBF0024 */   lw    $ra, 0x24($sp)
@@ -27,12 +27,12 @@ glabel func_8005250C
 /* 05315C 8005255C 81430000 */  lb    $v1, ($t2)
 /* 053160 80052560 00000000 */  nop   
 .L80052564:
-/* 053164 80052564 3C0B8012 */  lui   $t3, %hi(gActivePlayerButtonPress) # $t3, 0x8012
-/* 053168 80052568 8D6BD52C */  lw    $t3, %lo(gActivePlayerButtonPress)($t3)
+/* 053164 80052564 3C0B8012 */  lui   $t3, %hi(gCurrentButtonsPressed) # $t3, 0x8012
+/* 053168 80052568 8D6BD52C */  lw    $t3, %lo(gCurrentButtonsPressed)($t3)
 /* 05316C 8005256C 24010004 */  li    $at, 4
 /* 053170 80052570 316C2000 */  andi  $t4, $t3, 0x2000
 /* 053174 80052574 11800006 */  beqz  $t4, .L80052590
-/* 053178 80052578 3C09800E */   lui   $t1, %hi(D_800DCB98) # $t1, 0x800e
+/* 053178 80052578 3C09800E */   lui   $t1, %hi(gNumViewports) # $t1, 0x800e
 /* 05317C 8005257C 10610004 */  beq   $v1, $at, .L80052590
 /* 053180 80052580 24010008 */   li    $at, 8
 /* 053184 80052584 10610002 */  beq   $v1, $at, .L80052590
@@ -53,12 +53,12 @@ glabel func_8005250C
 /* 0531B8 800525B8 33080008 */  andi  $t0, $t8, 8
 /* 0531BC 800525BC 11000016 */  beqz  $t0, .L80052618
 /* 0531C0 800525C0 24180004 */   li    $t8, 4
-/* 0531C4 800525C4 8D29CB98 */  lw    $t1, %lo(D_800DCB98)($t1)
-/* 0531C8 800525C8 3C0A8012 */  lui   $t2, %hi(D_8011D55C) # $t2, 0x8012
+/* 0531C4 800525C4 8D29CB98 */  lw    $t1, %lo(gNumViewports)($t1)
+/* 0531C8 800525C8 3C0A8012 */  lui   $t2, %hi(gCurrentPlayerIndex) # $t2, 0x8012
 /* 0531CC 800525CC 29210003 */  slti  $at, $t1, 3
 /* 0531D0 800525D0 10200010 */  beqz  $at, .L80052614
 /* 0531D4 800525D4 00000000 */   nop   
-/* 0531D8 800525D8 8D4AD55C */  lw    $t2, %lo(D_8011D55C)($t2)
+/* 0531D8 800525D8 8D4AD55C */  lw    $t2, %lo(gCurrentPlayerIndex)($t2)
 /* 0531DC 800525DC 8FAE0028 */  lw    $t6, 0x28($sp)
 /* 0531E0 800525E0 05400008 */  bltz  $t2, .L80052604
 /* 0531E4 800525E4 00000000 */   nop   
@@ -130,7 +130,7 @@ glabel L80052678
 /* 0532D4 800526D4 44CFF800 */  ctc1  $t7, $31
 /* 0532D8 800526D8 03231823 */  subu  $v1, $t9, $v1
 /* 0532DC 800526DC 04610002 */  bgez  $v1, .L800526E8
-/* 0532E0 800526E0 3C0F8012 */   lui   $t7, %hi(gCurrentCarInput) # $t7, 0x8012
+/* 0532E0 800526E0 3C0F8012 */   lui   $t7, %hi(gCurrentRacerInput) # $t7, 0x8012
 /* 0532E4 800526E4 00001825 */  move  $v1, $zero
 .L800526E8:
 /* 0532E8 800526E8 2861004A */  slti  $at, $v1, 0x4a
@@ -179,7 +179,7 @@ glabel L80052678
 /* 053384 80052784 00000000 */  nop   
 /* 053388 80052788 4500007C */  bc1f  .L8005297C
 /* 05338C 8005278C 8FBF0024 */   lw    $ra, 0x24($sp)
-/* 053390 80052790 8DEFD528 */  lw    $t7, %lo(gCurrentCarInput)($t7)
+/* 053390 80052790 8DEFD528 */  lw    $t7, %lo(gCurrentRacerInput)($t7)
 /* 053394 80052794 240E0006 */  li    $t6, 6
 /* 053398 80052798 31F94000 */  andi  $t9, $t7, 0x4000
 /* 05339C 8005279C 13200077 */  beqz  $t9, .L8005297C
@@ -233,8 +233,8 @@ glabel L8005280C
 /* 053450 80052850 10000049 */  b     .L80052978
 /* 053454 80052854 A0A801F3 */   sb    $t0, 0x1f3($a1)
 glabel L80052858
-/* 053458 80052858 3C098012 */  lui   $t1, %hi(gCurrentCarInput) # $t1, 0x8012
-/* 05345C 8005285C 8D29D528 */  lw    $t1, %lo(gCurrentCarInput)($t1)
+/* 053458 80052858 3C098012 */  lui   $t1, %hi(gCurrentRacerInput) # $t1, 0x8012
+/* 05345C 8005285C 8D29D528 */  lw    $t1, %lo(gCurrentRacerInput)($t1)
 /* 053460 80052860 8FA40028 */  lw    $a0, 0x28($sp)
 /* 053464 80052864 312A2000 */  andi  $t2, $t1, 0x2000
 /* 053468 80052868 11400002 */  beqz  $t2, .L80052874
@@ -262,8 +262,8 @@ glabel L800528A4
 /* 0534B8 800528B8 8FA40028 */  lw    $a0, 0x28($sp)
 /* 0534BC 800528BC 45000008 */  bc1f  .L800528E0
 /* 0534C0 800528C0 24020003 */   li    $v0, 3
-/* 0534C4 800528C4 3C0F8012 */  lui   $t7, %hi(gCurrentCarInput) # $t7, 0x8012
-/* 0534C8 800528C8 8DEFD528 */  lw    $t7, %lo(gCurrentCarInput)($t7)
+/* 0534C4 800528C4 3C0F8012 */  lui   $t7, %hi(gCurrentRacerInput) # $t7, 0x8012
+/* 0534C8 800528C8 8DEFD528 */  lw    $t7, %lo(gCurrentRacerInput)($t7)
 /* 0534CC 800528CC 00000000 */  nop   
 /* 0534D0 800528D0 31F94000 */  andi  $t9, $t7, 0x4000
 /* 0534D4 800528D4 13200003 */  beqz  $t9, .L800528E4
@@ -1,147 +0,0 @@
-.late_rodata
-glabel D_800E66F0
-.double 0.97
-
-.text
-glabel func_80052B64
-/* 053764 80052B64 27BDFFE0 */  addiu $sp, $sp, -0x20
-/* 053768 80052B68 AFBF001C */  sw    $ra, 0x1c($sp)
-/* 05376C 80052B6C AFB00018 */  sw    $s0, 0x18($sp)
-/* 053770 80052B70 AFA50024 */  sw    $a1, 0x24($sp)
-/* 053774 80052B74 AFA7002C */  sw    $a3, 0x2c($sp)
-/* 053778 80052B78 3C01800E */  lui   $at, %hi(D_800E66F0 + 4) # $at, 0x800e
-/* 05377C 80052B7C C4A4002C */  lwc1  $f4, 0x2c($a1)
-/* 053780 80052B80 C42966F0 */  lwc1  $f9, %lo(D_800E66F0)($at)
-/* 053784 80052B84 C42866F4 */  lwc1  $f8, %lo(D_800E66F0 + 4)($at)
-/* 053788 80052B88 460021A1 */  cvt.d.s $f6, $f4
-/* 05378C 80052B8C 46283282 */  mul.d $f10, $f6, $f8
-/* 053790 80052B90 44809000 */  mtc1  $zero, $f18
-/* 053794 80052B94 80AE01D8 */  lb    $t6, 0x1d8($a1)
-/* 053798 80052B98 00A03825 */  move  $a3, $a1
-/* 05379C 80052B9C 00808025 */  move  $s0, $a0
-/* 0537A0 80052BA0 46205420 */  cvt.s.d $f16, $f10
-/* 0537A4 80052BA4 E4B20030 */  swc1  $f18, 0x30($a1)
-/* 0537A8 80052BA8 15C00009 */  bnez  $t6, .L80052BD0
-/* 0537AC 80052BAC E4B0002C */   swc1  $f16, 0x2c($a1)
-/* 0537B0 80052BB0 84A40000 */  lh    $a0, ($a1)
-/* 0537B4 80052BB4 AFA70024 */  sw    $a3, 0x24($sp)
-/* 0537B8 80052BB8 AFA60028 */  sw    $a2, 0x28($sp)
-/* 0537BC 80052BBC 0C01C8D2 */  jal   func_80072348
-/* 0537C0 80052BC0 00002825 */   move  $a1, $zero
-/* 0537C4 80052BC4 8FA60028 */  lw    $a2, 0x28($sp)
-/* 0537C8 80052BC8 8FA70024 */  lw    $a3, 0x24($sp)
-/* 0537CC 80052BCC 00000000 */  nop   
-.L80052BD0:
-/* 0537D0 80052BD0 3C0F8012 */  lui   $t7, %hi(D_8011D55C) # $t7, 0x8012
-/* 0537D4 80052BD4 8DEFD55C */  lw    $t7, %lo(D_8011D55C)($t7)
-/* 0537D8 80052BD8 84E301A2 */  lh    $v1, 0x1a2($a3)
-/* 0537DC 80052BDC 05E0001E */  bltz  $t7, .L80052C58
-/* 0537E0 80052BE0 3C18800E */   lui   $t8, %hi(D_800DCB98) # $t8, 0x800e
-/* 0537E4 80052BE4 8F18CB98 */  lw    $t8, %lo(D_800DCB98)($t8)
-/* 0537E8 80052BE8 00000000 */  nop   
-/* 0537EC 80052BEC 2B010003 */  slti  $at, $t8, 3
-/* 0537F0 80052BF0 10200007 */  beqz  $at, .L80052C10
-/* 0537F4 80052BF4 00000000 */   nop   
-/* 0537F8 80052BF8 8E190074 */  lw    $t9, 0x74($s0)
-/* 0537FC 80052BFC 3C010004 */  lui   $at, (0x0004FC00 >> 16) # lui $at, 4
-/* 053800 80052C00 3421FC00 */  ori   $at, (0x0004FC00 & 0xFFFF) # ori $at, $at, 0xfc00
-/* 053804 80052C04 03214025 */  or    $t0, $t9, $at
-/* 053808 80052C08 10000013 */  b     .L80052C58
-/* 05380C 80052C0C AE080074 */   sw    $t0, 0x74($s0)
-.L80052C10:
-/* 053810 80052C10 90E201DE */  lbu   $v0, 0x1de($a3)
-/* 053814 80052C14 240B0001 */  li    $t3, 1
-/* 053818 80052C18 284100FF */  slti  $at, $v0, 0xff
-/* 05381C 80052C1C 10200005 */  beqz  $at, .L80052C34
-/* 053820 80052C20 00025040 */   sll   $t2, $v0, 1
-/* 053824 80052C24 8E090074 */  lw    $t1, 0x74($s0)
-/* 053828 80052C28 014B6004 */  sllv  $t4, $t3, $t2
-/* 05382C 80052C2C 012C6825 */  or    $t5, $t1, $t4
-/* 053830 80052C30 AE0D0074 */  sw    $t5, 0x74($s0)
-.L80052C34:
-/* 053834 80052C34 90E201DF */  lbu   $v0, 0x1df($a3)
-/* 053838 80052C38 24180002 */  li    $t8, 2
-/* 05383C 80052C3C 284100FF */  slti  $at, $v0, 0xff
-/* 053840 80052C40 10200005 */  beqz  $at, .L80052C58
-/* 053844 80052C44 00027840 */   sll   $t7, $v0, 1
-/* 053848 80052C48 8E0E0074 */  lw    $t6, 0x74($s0)
-/* 05384C 80052C4C 01F8C804 */  sllv  $t9, $t8, $t7
-/* 053850 80052C50 01D94025 */  or    $t0, $t6, $t9
-/* 053854 80052C54 AE080074 */  sw    $t0, 0x74($s0)
-.L80052C58:
-/* 053858 80052C58 80E201DB */  lb    $v0, 0x1db($a3)
-/* 05385C 80052C5C 00065080 */  sll   $t2, $a2, 2
-/* 053860 80052C60 1840001A */  blez  $v0, .L80052CCC
-/* 053864 80052C64 01465021 */   addu  $t2, $t2, $a2
-/* 053868 80052C68 84EB01A2 */  lh    $t3, 0x1a2($a3)
-/* 05386C 80052C6C 000A5200 */  sll   $t2, $t2, 8
-/* 053870 80052C70 016A4821 */  addu  $t1, $t3, $t2
-/* 053874 80052C74 A4E901A2 */  sh    $t1, 0x1a2($a3)
-/* 053878 80052C78 84EC01A2 */  lh    $t4, 0x1a2($a3)
-/* 05387C 80052C7C 00000000 */  nop   
-/* 053880 80052C80 1980002D */  blez  $t4, .L80052D38
-/* 053884 80052C84 00000000 */   nop   
-/* 053888 80052C88 0461002B */  bgez  $v1, .L80052D38
-/* 05388C 80052C8C 00000000 */   nop   
-/* 053890 80052C90 80ED01DB */  lb    $t5, 0x1db($a3)
-/* 053894 80052C94 3C0F8012 */  lui   $t7, %hi(gCurrentStickX) # $t7, 0x8012
-/* 053898 80052C98 25B8FFFF */  addiu $t8, $t5, -1
-/* 05389C 80052C9C A0F801DB */  sb    $t8, 0x1db($a3)
-/* 0538A0 80052CA0 8DEFD534 */  lw    $t7, %lo(gCurrentStickX)($t7)
-/* 0538A4 80052CA4 00000000 */  nop   
-/* 0538A8 80052CA8 29E10033 */  slti  $at, $t7, 0x33
-/* 0538AC 80052CAC 14200022 */  bnez  $at, .L80052D38
-/* 0538B0 80052CB0 00000000 */   nop   
-/* 0538B4 80052CB4 80EE01DB */  lb    $t6, 0x1db($a3)
-/* 0538B8 80052CB8 24010001 */  li    $at, 1
-/* 0538BC 80052CBC 15C1001E */  bne   $t6, $at, .L80052D38
-/* 0538C0 80052CC0 00000000 */   nop   
-/* 0538C4 80052CC4 1000001C */  b     .L80052D38
-/* 0538C8 80052CC8 A0E001DB */   sb    $zero, 0x1db($a3)
-.L80052CCC:
-/* 0538CC 80052CCC 0441001A */  bgez  $v0, .L80052D38
-/* 0538D0 80052CD0 00064080 */   sll   $t0, $a2, 2
-/* 0538D4 80052CD4 84F901A2 */  lh    $t9, 0x1a2($a3)
-/* 0538D8 80052CD8 01064021 */  addu  $t0, $t0, $a2
-/* 0538DC 80052CDC 00084200 */  sll   $t0, $t0, 8
-/* 0538E0 80052CE0 03285823 */  subu  $t3, $t9, $t0
-/* 0538E4 80052CE4 A4EB01A2 */  sh    $t3, 0x1a2($a3)
-/* 0538E8 80052CE8 84EA01A2 */  lh    $t2, 0x1a2($a3)
-/* 0538EC 80052CEC 00000000 */  nop   
-/* 0538F0 80052CF0 05410011 */  bgez  $t2, .L80052D38
-/* 0538F4 80052CF4 00000000 */   nop   
-/* 0538F8 80052CF8 1860000F */  blez  $v1, .L80052D38
-/* 0538FC 80052CFC 00000000 */   nop   
-/* 053900 80052D00 80E901DB */  lb    $t1, 0x1db($a3)
-/* 053904 80052D04 3C0D8012 */  lui   $t5, %hi(gCurrentStickX) # $t5, 0x8012
-/* 053908 80052D08 252C0001 */  addiu $t4, $t1, 1
-/* 05390C 80052D0C A0EC01DB */  sb    $t4, 0x1db($a3)
-/* 053910 80052D10 8DADD534 */  lw    $t5, %lo(gCurrentStickX)($t5)
-/* 053914 80052D14 00000000 */  nop   
-/* 053918 80052D18 29A1FFCE */  slti  $at, $t5, -0x32
-/* 05391C 80052D1C 10200006 */  beqz  $at, .L80052D38
-/* 053920 80052D20 00000000 */   nop   
-/* 053924 80052D24 80F801DB */  lb    $t8, 0x1db($a3)
-/* 053928 80052D28 2401FFFF */  li    $at, -1
-/* 05392C 80052D2C 17010002 */  bne   $t8, $at, .L80052D38
-/* 053930 80052D30 00000000 */   nop   
-/* 053934 80052D34 A0E001DB */  sb    $zero, 0x1db($a3)
-.L80052D38:
-/* 053938 80052D38 84EF01A2 */  lh    $t7, 0x1a2($a3)
-/* 05393C 80052D3C 3C018012 */  lui   $at, %hi(gCurrentCarSteerVel) # $at, 0x8012
-/* 053940 80052D40 AC2FD554 */  sw    $t7, %lo(gCurrentCarSteerVel)($at)
-/* 053944 80052D44 3C018012 */  lui   $at, %hi(D_8011D56C) # $at, 0x8012
-/* 053948 80052D48 C424D56C */  lwc1  $f4, %lo(D_8011D56C)($at)
-/* 05394C 80052D4C C7A6002C */  lwc1  $f6, 0x2c($sp)
-/* 053950 80052D50 C60A0020 */  lwc1  $f10, 0x20($s0)
-/* 053954 80052D54 46062202 */  mul.s $f8, $f4, $f6
-/* 053958 80052D58 3C018012 */  lui   $at, %hi(gCurrentStickX) # $at, 0x8012
-/* 05395C 80052D5C 46085401 */  sub.s $f16, $f10, $f8
-/* 053960 80052D60 E6100020 */  swc1  $f16, 0x20($s0)
-/* 053964 80052D64 AC20D534 */  sw    $zero, %lo(gCurrentStickX)($at)
-/* 053968 80052D68 A0E001E1 */  sb    $zero, 0x1e1($a3)
-/* 05396C 80052D6C 8FBF001C */  lw    $ra, 0x1c($sp)
-/* 053970 80052D70 8FB00018 */  lw    $s0, 0x18($sp)
-/* 053974 80052D74 03E00008 */  jr    $ra
-/* 053978 80052D78 27BD0020 */   addiu $sp, $sp, 0x20
-
@@ -160,9 +160,9 @@ glabel func_80052D7C
 /* 053B5C 80052F5C E5440020 */  swc1  $f4, 0x20($t2)
 .L80052F60:
 /* 053B60 80052F60 80AB01E1 */  lb    $t3, 0x1e1($a1)
-/* 053B64 80052F64 3C028012 */  lui   $v0, %hi(gCurrentCarInput) # $v0, 0x8012
+/* 053B64 80052F64 3C028012 */  lui   $v0, %hi(gCurrentRacerInput) # $v0, 0x8012
 /* 053B68 80052F68 A0AB01E8 */  sb    $t3, 0x1e8($a1)
-/* 053B6C 80052F6C 8C42D528 */  lw    $v0, %lo(gCurrentCarInput)($v0)
+/* 053B6C 80052F6C 8C42D528 */  lw    $v0, %lo(gCurrentRacerInput)($v0)
 /* 053B70 80052F70 3C013FE0 */  li    $at, 0x3FE00000 # 1.750000
 /* 053B74 80052F74 304C8000 */  andi  $t4, $v0, 0x8000
 /* 053B78 80052F78 1180000C */  beqz  $t4, .L80052FAC
@@ -172,10 +172,10 @@ glabel func_80052D7C
 /* 053B88 80052F88 44808000 */  mtc1  $zero, $f16
 /* 053B8C 80052F8C 460042A1 */  cvt.d.s $f10, $f8
 /* 053B90 80052F90 46305481 */  sub.d $f18, $f10, $f16
-/* 053B94 80052F94 3C028012 */  lui   $v0, %hi(gCurrentCarInput) # $v0, 0x8012
+/* 053B94 80052F94 3C028012 */  lui   $v0, %hi(gCurrentRacerInput) # $v0, 0x8012
 /* 053B98 80052F98 462091A0 */  cvt.s.d $f6, $f18
 /* 053B9C 80052F9C E4A6002C */  swc1  $f6, 0x2c($a1)
-/* 053BA0 80052FA0 8C42D528 */  lw    $v0, %lo(gCurrentCarInput)($v0)
+/* 053BA0 80052FA0 8C42D528 */  lw    $v0, %lo(gCurrentRacerInput)($v0)
 /* 053BA4 80052FA4 00000000 */  nop   
 /* 053BA8 80052FA8 304E4000 */  andi  $t6, $v0, 0x4000
 .L80052FAC:
@@ -1,188 +0,0 @@
-.late_rodata
-glabel D_800E67A0
-.float 0.1
-glabel jpt_800E67A4
-.word L80053FF0, L8005406C, L800540FC, L8005408C, L800540C4, L80054098
-.word 0 # Padding
-glabel D_800E67C0
-.double 20.5
-
-.text
-glabel func_80053E9C
-/* 054A9C 80053E9C 27BDFFD8 */  addiu $sp, $sp, -0x28
-/* 054AA0 80053EA0 AFBF001C */  sw    $ra, 0x1c($sp)
-/* 054AA4 80053EA4 AFB00018 */  sw    $s0, 0x18($sp)
-/* 054AA8 80053EA8 84AE0000 */  lh    $t6, ($a1)
-/* 054AAC 80053EAC 2401FFFF */  li    $at, -1
-/* 054AB0 80053EB0 15C10003 */  bne   $t6, $at, .L80053EC0
-/* 054AB4 80053EB4 00A08025 */   move  $s0, $a1
-/* 054AB8 80053EB8 10000004 */  b     .L80053ECC
-/* 054ABC 80053EBC A3A00027 */   sb    $zero, 0x27($sp)
-.L80053EC0:
-/* 054AC0 80053EC0 820F0185 */  lb    $t7, 0x185($s0)
-/* 054AC4 80053EC4 00000000 */  nop   
-/* 054AC8 80053EC8 A3AF0027 */  sb    $t7, 0x27($sp)
-.L80053ECC:
-/* 054ACC 80053ECC 820201ED */  lb    $v0, 0x1ed($s0)
-/* 054AD0 80053ED0 3C01800E */  lui   $at, %hi(D_800E67A0) # $at, 0x800e
-/* 054AD4 80053ED4 18400012 */  blez  $v0, .L80053F20
-/* 054AD8 80053ED8 0046C023 */   subu  $t8, $v0, $a2
-/* 054ADC 80053EDC 44802000 */  mtc1  $zero, $f4
-/* 054AE0 80053EE0 A21801ED */  sb    $t8, 0x1ed($s0)
-/* 054AE4 80053EE4 E60400B4 */  swc1  $f4, 0xb4($s0)
-/* 054AE8 80053EE8 C42667A0 */  lwc1  $f6, %lo(D_800E67A0)($at)
-/* 054AEC 80053EEC 821901ED */  lb    $t9, 0x1ed($s0)
-/* 054AF0 80053EF0 E6060090 */  swc1  $f6, 0x90($s0)
-/* 054AF4 80053EF4 1F20000B */  bgtz  $t9, .L80053F24
-/* 054AF8 80053EF8 00000000 */   nop   
-/* 054AFC 80053EFC 86080000 */  lh    $t0, ($s0)
-/* 054B00 80053F00 24050140 */  li    $a1, 320
-/* 054B04 80053F04 05000007 */  bltz  $t0, .L80053F24
-/* 054B08 80053F08 00000000 */   nop   
-/* 054B0C 80053F0C 0C015C12 */  jal   racer_play_sound
-/* 054B10 80053F10 AFA40028 */   sw    $a0, 0x28($sp)
-/* 054B14 80053F14 8FA40028 */  lw    $a0, 0x28($sp)
-/* 054B18 80053F18 10000003 */  b     .L80053F28
-/* 054B1C 80053F1C 82020187 */   lb    $v0, 0x187($s0)
-.L80053F20:
-/* 054B20 80053F20 A20001ED */  sb    $zero, 0x1ed($s0)
-.L80053F24:
-/* 054B24 80053F24 82020187 */  lb    $v0, 0x187($s0)
-.L80053F28:
-/* 054B28 80053F28 00000000 */  nop   
-/* 054B2C 80053F2C 10400005 */  beqz  $v0, .L80053F44
-/* 054B30 80053F30 00000000 */   nop   
-/* 054B34 80053F34 8609018E */  lh    $t1, 0x18e($s0)
-/* 054B38 80053F38 00000000 */  nop   
-/* 054B3C 80053F3C 19200003 */  blez  $t1, .L80053F4C
-/* 054B40 80053F40 00000000 */   nop   
-.L80053F44:
-/* 054B44 80053F44 1000006E */  b     .L80054100
-/* 054B48 80053F48 A2000187 */   sb    $zero, 0x187($s0)
-.L80053F4C:
-/* 054B4C 80053F4C 820A01ED */  lb    $t2, 0x1ed($s0)
-/* 054B50 80053F50 24010004 */  li    $at, 4
-/* 054B54 80053F54 11400002 */  beqz  $t2, .L80053F60
-/* 054B58 80053F58 00000000 */   nop   
-/* 054B5C 80053F5C 10410068 */  beq   $v0, $at, .L80054100
-.L80053F60:
-/* 054B60 80053F60 24010002 */   li    $at, 2
-/* 054B64 80053F64 10410008 */  beq   $v0, $at, .L80053F88
-/* 054B68 80053F68 24010004 */   li    $at, 4
-/* 054B6C 80053F6C 10410006 */  beq   $v0, $at, .L80053F88
-/* 054B70 80053F70 02002825 */   move  $a1, $s0
-/* 054B74 80053F74 24060002 */  li    $a2, 2
-/* 054B78 80053F78 0C015DB8 */  jal   func_800576E0
-/* 054B7C 80053F7C AFA40028 */   sw    $a0, 0x28($sp)
-/* 054B80 80053F80 8FA40028 */  lw    $a0, 0x28($sp)
-/* 054B84 80053F84 00000000 */  nop   
-.L80053F88:
-/* 054B88 80053F88 920C01C9 */  lbu   $t4, 0x1c9($s0)
-/* 054B8C 80053F8C 240B0168 */  li    $t3, 360
-/* 054B90 80053F90 24010008 */  li    $at, 8
-/* 054B94 80053F94 15810002 */  bne   $t4, $at, .L80053FA0
-/* 054B98 80053F98 A60B018C */   sh    $t3, 0x18c($s0)
-/* 054B9C 80053F9C A20001C9 */  sb    $zero, 0x1c9($s0)
-.L80053FA0:
-/* 054BA0 80053FA0 820D01D6 */  lb    $t5, 0x1d6($s0)
-/* 054BA4 80053FA4 240501C2 */  li    $a1, 450
-/* 054BA8 80053FA8 29A10005 */  slti  $at, $t5, 5
-/* 054BAC 80053FAC 10200054 */  beqz  $at, .L80054100
-/* 054BB0 80053FB0 24060008 */   li    $a2, 8
-/* 054BB4 80053FB4 24070081 */  li    $a3, 129
-/* 054BB8 80053FB8 0C015C2E */  jal   play_random_character_voice
-/* 054BBC 80053FBC AFA40028 */   sw    $a0, 0x28($sp)
-/* 054BC0 80053FC0 820E0187 */  lb    $t6, 0x187($s0)
-/* 054BC4 80053FC4 8FA40028 */  lw    $a0, 0x28($sp)
-/* 054BC8 80053FC8 25CFFFFF */  addiu $t7, $t6, -1
-/* 054BCC 80053FCC 2DE10006 */  sltiu $at, $t7, 6
-/* 054BD0 80053FD0 1020004A */  beqz  $at, .L800540FC
-/* 054BD4 80053FD4 000F7880 */   sll   $t7, $t7, 2
-/* 054BD8 80053FD8 3C01800E */  lui   $at, %hi(jpt_800E67A4) # $at, 0x800e
-/* 054BDC 80053FDC 002F0821 */  addu  $at, $at, $t7
-/* 054BE0 80053FE0 8C2F67A4 */  lw    $t7, %lo(jpt_800E67A4)($at)
-/* 054BE4 80053FE4 00000000 */  nop   
-/* 054BE8 80053FE8 01E00008 */  jr    $t7
-/* 054BEC 80053FEC 00000000 */   nop   
-glabel L80053FF0
-/* 054BF0 80053FF0 24180001 */  li    $t8, 1
-/* 054BF4 80053FF4 A21801F1 */  sb    $t8, 0x1f1($s0)
-/* 054BF8 80053FF8 83B90027 */  lb    $t9, 0x27($sp)
-/* 054BFC 80053FFC 3C014080 */  li    $at, 0x40800000 # 4.000000
-/* 054C00 80054000 1720000C */  bnez  $t9, .L80054034
-/* 054C04 80054004 00000000 */   nop   
-/* 054C08 80054008 44804000 */  mtc1  $zero, $f8
-/* 054C0C 8005400C 3C014025 */  li    $at, 0x40250000 # 2.578125
-/* 054C10 80054010 E608002C */  swc1  $f8, 0x2c($s0)
-/* 054C14 80054014 C48A0020 */  lwc1  $f10, 0x20($a0)
-/* 054C18 80054018 44819800 */  mtc1  $at, $f19
-/* 054C1C 8005401C 44809000 */  mtc1  $zero, $f18
-/* 054C20 80054020 46005421 */  cvt.d.s $f16, $f10
-/* 054C24 80054024 46328100 */  add.d $f4, $f16, $f18
-/* 054C28 80054028 462021A0 */  cvt.s.d $f6, $f4
-/* 054C2C 8005402C 10000033 */  b     .L800540FC
-/* 054C30 80054030 E4860020 */   swc1  $f6, 0x20($a0)
-.L80054034:
-/* 054C34 80054034 C608002C */  lwc1  $f8, 0x2c($s0)
-/* 054C38 80054038 44815000 */  mtc1  $at, $f10
-/* 054C3C 8005403C 3C014021 */  li    $at, 0x40210000 # 2.515625
-/* 054C40 80054040 460A4403 */  div.s $f16, $f8, $f10
-/* 054C44 80054044 44813800 */  mtc1  $at, $f7
-/* 054C48 80054048 44803000 */  mtc1  $zero, $f6
-/* 054C4C 8005404C E610002C */  swc1  $f16, 0x2c($s0)
-/* 054C50 80054050 C4920020 */  lwc1  $f18, 0x20($a0)
-/* 054C54 80054054 00000000 */  nop   
-/* 054C58 80054058 46009121 */  cvt.d.s $f4, $f18
-/* 054C5C 8005405C 46262200 */  add.d $f8, $f4, $f6
-/* 054C60 80054060 462042A0 */  cvt.s.d $f10, $f8
-/* 054C64 80054064 10000025 */  b     .L800540FC
-/* 054C68 80054068 E48A0020 */   swc1  $f10, 0x20($a0)
-glabel L8005406C
-/* 054C6C 8005406C 24080002 */  li    $t0, 2
-/* 054C70 80054070 24091002 */  li    $t1, 4098
-/* 054C74 80054074 A20801DB */  sb    $t0, 0x1db($s0)
-/* 054C78 80054078 A60901A2 */  sh    $t1, 0x1a2($s0)
-/* 054C7C 8005407C 0C015C12 */  jal   racer_play_sound
-/* 054C80 80054080 2405013B */   li    $a1, 315
-/* 054C84 80054084 1000001E */  b     .L80054100
-/* 054C88 80054088 A2000187 */   sb    $zero, 0x187($s0)
-glabel L8005408C
-/* 054C8C 8005408C 240A003C */  li    $t2, 60
-/* 054C90 80054090 1000001A */  b     .L800540FC
-/* 054C94 80054094 A20A01ED */   sb    $t2, 0x1ed($s0)
-glabel L80054098
-/* 054C98 80054098 C610002C */  lwc1  $f16, 0x2c($s0)
-/* 054C9C 8005409C 3C013FE0 */  li    $at, 0x3FE00000 # 1.750000
-/* 054CA0 800540A0 44812800 */  mtc1  $at, $f5
-/* 054CA4 800540A4 44802000 */  mtc1  $zero, $f4
-/* 054CA8 800540A8 460084A1 */  cvt.d.s $f18, $f16
-/* 054CAC 800540AC 46249182 */  mul.d $f6, $f18, $f4
-/* 054CB0 800540B0 240B0078 */  li    $t3, 120
-/* 054CB4 800540B4 A60B0204 */  sh    $t3, 0x204($s0)
-/* 054CB8 800540B8 46203220 */  cvt.s.d $f8, $f6
-/* 054CBC 800540BC 1000000F */  b     .L800540FC
-/* 054CC0 800540C0 E608002C */   swc1  $f8, 0x2c($s0)
-glabel L800540C4
-/* 054CC4 800540C4 44805000 */  mtc1  $zero, $f10
-/* 054CC8 800540C8 240C0001 */  li    $t4, 1
-/* 054CCC 800540CC A20C01F1 */  sb    $t4, 0x1f1($s0)
-/* 054CD0 800540D0 E60A002C */  swc1  $f10, 0x2c($s0)
-/* 054CD4 800540D4 3C01800E */  lui   $at, %hi(D_800E67C0 + 4) # $at, 0x800e
-/* 054CD8 800540D8 C4900020 */  lwc1  $f16, 0x20($a0)
-/* 054CDC 800540DC C42567C0 */  lwc1  $f5, %lo(D_800E67C0)($at)
-/* 054CE0 800540E0 C42467C4 */  lwc1  $f4, %lo(D_800E67C0 + 4)($at)
-/* 054CE4 800540E4 460084A1 */  cvt.d.s $f18, $f16
-/* 054CE8 800540E8 46249180 */  add.d $f6, $f18, $f4
-/* 054CEC 800540EC 24050139 */  li    $a1, 313
-/* 054CF0 800540F0 46203220 */  cvt.s.d $f8, $f6
-/* 054CF4 800540F4 0C015C12 */  jal   racer_play_sound
-/* 054CF8 800540F8 E4880020 */   swc1  $f8, 0x20($a0)
-.L800540FC:
-glabel L800540FC
-/* 054CFC 800540FC A2000187 */  sb    $zero, 0x187($s0)
-.L80054100:
-/* 054D00 80054100 8FBF001C */  lw    $ra, 0x1c($sp)
-/* 054D04 80054104 8FB00018 */  lw    $s0, 0x18($sp)
-/* 054D08 80054108 03E00008 */  jr    $ra
-/* 054D0C 8005410C 27BD0028 */   addiu $sp, $sp, 0x28
-
@@ -58,8 +58,8 @@ glabel func_8005492C
 /* 0555A4 800549A4 240E0001 */   li    $t6, 1
 /* 0555A8 800549A8 AFAE0038 */  sw    $t6, 0x38($sp)
 .L800549AC:
-/* 0555AC 800549AC 3C028012 */  lui   $v0, %hi(gCurrentCarInput) # $v0, 0x8012
-/* 0555B0 800549B0 8C42D528 */  lw    $v0, %lo(gCurrentCarInput)($v0)
+/* 0555AC 800549AC 3C028012 */  lui   $v0, %hi(gCurrentRacerInput) # $v0, 0x8012
+/* 0555B0 800549B0 8C42D528 */  lw    $v0, %lo(gCurrentRacerInput)($v0)
 /* 0555B4 800549B4 8C84D534 */  lw    $a0, %lo(gCurrentStickX)($a0)
 /* 0555B8 800549B8 304F4000 */  andi  $t7, $v0, 0x4000
 /* 0555BC 800549BC 24030006 */  li    $v1, 6
@@ -353,11 +353,11 @@ glabel func_8005492C
 /* 0559F4 80054DF4 3C088012 */  lui   $t0, %hi(gCurrentStickY) # $t0, 0x8012
 /* 0559F8 80054DF8 46244182 */  mul.d $f6, $f8, $f4
 /* 0559FC 80054DFC 8D08D538 */  lw    $t0, %lo(gCurrentStickY)($t0)
-/* 055A00 80054E00 3C028012 */  lui   $v0, %hi(gCurrentCarInput) # $v0, 0x8012
+/* 055A00 80054E00 3C028012 */  lui   $v0, %hi(gCurrentRacerInput) # $v0, 0x8012
 /* 055A04 80054E04 2901FFE7 */  slti  $at, $t0, -0x19
 /* 055A08 80054E08 1020000D */  beqz  $at, .L80054E40
 /* 055A0C 80054E0C 462033A0 */   cvt.s.d $f14, $f6
-/* 055A10 80054E10 8C42D528 */  lw    $v0, %lo(gCurrentCarInput)($v0)
+/* 055A10 80054E10 8C42D528 */  lw    $v0, %lo(gCurrentRacerInput)($v0)
 /* 055A14 80054E14 00000000 */  nop   
 /* 055A18 80054E18 30498000 */  andi  $t1, $v0, 0x8000
 /* 055A1C 80054E1C 15200008 */  bnez  $t1, .L80054E40
@@ -11,8 +11,8 @@ glabel func_80054FD0
 /* 055BD8 80054FD8 AFB10028 */  sw    $s1, 0x28($sp)
 /* 055BDC 80054FDC AFB00024 */  sw    $s0, 0x24($sp)
 /* 055BE0 80054FE0 AFA601A8 */  sw    $a2, 0x1a8($sp)
-/* 055BE4 80054FE4 3C018012 */  lui   $at, %hi(D_8011D4F0) # $at, 0x8012
-/* 055BE8 80054FE8 C420D4F0 */  lwc1  $f0, %lo(D_8011D4F0)($at)
+/* 055BE4 80054FE4 3C018012 */  lui   $at, %hi(gCurrentCourseHeight) # $at, 0x8012
+/* 055BE8 80054FE8 C420D4F0 */  lwc1  $f0, %lo(gCurrentCourseHeight)($at)
 /* 055BEC 80054FEC C4840010 */  lwc1  $f4, 0x10($a0)
 /* 055BF0 80054FF0 00A08025 */  move  $s0, $a1
 /* 055BF4 80054FF4 4604003C */  c.lt.s $f0, $f4
@@ -322,10 +322,10 @@ glabel func_80054FD0
 /* 05608C 8005548C 4500003D */  bc1f  .L80055584
 /* 056090 80055490 00000000 */   nop   
 /* 056094 80055494 921801F3 */  lbu   $t8, 0x1f3($s0)
-/* 056098 80055498 3C0D8012 */  lui   $t5, %hi(D_8011D55C) # $t5, 0x8012
+/* 056098 80055498 3C0D8012 */  lui   $t5, %hi(gCurrentPlayerIndex) # $t5, 0x8012
 /* 05609C 8005549C 37190008 */  ori   $t9, $t8, 8
 /* 0560A0 800554A0 A21901F3 */  sb    $t9, 0x1f3($s0)
-/* 0560A4 800554A4 8DADD55C */  lw    $t5, %lo(D_8011D55C)($t5)
+/* 0560A4 800554A4 8DADD55C */  lw    $t5, %lo(gCurrentPlayerIndex)($t5)
 /* 0560A8 800554A8 2401FFFF */  li    $at, -1
 /* 0560AC 800554AC 11A10006 */  beq   $t5, $at, .L800554C8
 /* 0560B0 800554B0 3C0E8012 */   lui   $t6, %hi(gCameraObject) # $t6, 0x8012
--- a/Show More
+++ b/Show More