diff --git a/asm/non_matchings/racer/func_80042D20.s b/asm/non_matchings/racer/func_80042D20.s index f2003926..5f11da27 100644 --- a/asm/non_matchings/racer/func_80042D20.s +++ b/asm/non_matchings/racer/func_80042D20.s @@ -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(D_8011D528) # $v0, 0x8012 -/* 0439B0 80042DB0 2442D528 */ addiu $v0, %lo(D_8011D528) # addiu $v0, $v0, -0x2ad8 +/* 0439AC 80042DAC 3C028012 */ lui $v0, %hi(gCurrentCarInput) # $v0, 0x8012 +/* 0439B0 80042DB0 2442D528 */ addiu $v0, %lo(gCurrentCarInput) # 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(D_8011D528) # $t7, 0x8012 -/* 043F0C 8004330C 8DEFD528 */ lw $t7, %lo(D_8011D528)($t7) -/* 043F10 80043310 3C018012 */ lui $at, %hi(D_8011D528) # $at, 0x8012 +/* 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 /* 043F14 80043314 35EE8000 */ ori $t6, $t7, 0x8000 -/* 043F18 80043318 AC2ED528 */ sw $t6, %lo(D_8011D528)($at) +/* 043F18 80043318 AC2ED528 */ sw $t6, %lo(gCurrentCarInput)($at) .L8004331C: /* 043F1C 8004331C AFA9005C */ sw $t1, 0x5c($sp) /* 043F20 80043320 A7AC0034 */ sh $t4, 0x34($sp) @@ -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(D_8011D528) # $t6, 0x8012 -/* 04440C 8004380C 8DCED528 */ lw $t6, %lo(D_8011D528)($t6) +/* 044408 80043808 3C0E8012 */ lui $t6, %hi(gCurrentCarInput) # $t6, 0x8012 +/* 04440C 8004380C 8DCED528 */ lw $t6, %lo(gCurrentCarInput)($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(D_8011D528) # $at, 0x8012 +/* 04441C 8004381C 3C018012 */ lui $at, %hi(gCurrentCarInput) # $at, 0x8012 /* 044420 80043820 1000000D */ b .L80043858 -/* 044424 80043824 AC2FD528 */ sw $t7, %lo(D_8011D528)($at) +/* 044424 80043824 AC2FD528 */ sw $t7, %lo(gCurrentCarInput)($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(D_8011D528) # $t8, 0x8012 -/* 04446C 8004386C 8F18D528 */ lw $t8, %lo(D_8011D528)($t8) +/* 044468 80043868 3C188012 */ lui $t8, %hi(gCurrentCarInput) # $t8, 0x8012 +/* 04446C 8004386C 8F18D528 */ lw $t8, %lo(gCurrentCarInput)($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(D_8011D528) # $at, 0x8012 -/* 044480 80043880 AC2ED528 */ sw $t6, %lo(D_8011D528)($at) +/* 04447C 8004387C 3C018012 */ lui $at, %hi(gCurrentCarInput) # $at, 0x8012 +/* 044480 80043880 AC2ED528 */ sw $t6, %lo(gCurrentCarInput)($at) .L80043884: /* 044484 80043884 860F01C6 */ lh $t7, 0x1c6($s0) /* 044488 80043888 00000000 */ nop @@ -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(D_8011D528) # $v0, 0x8012 +/* 0449EC 80043DEC 3C028012 */ lui $v0, %hi(gCurrentCarInput) # $v0, 0x8012 /* 0449F0 80043DF0 11C00015 */ beqz $t6, .L80043E48 -/* 0449F4 80043DF4 2442D528 */ addiu $v0, %lo(D_8011D528) # addiu $v0, $v0, -0x2ad8 +/* 0449F4 80043DF4 2442D528 */ addiu $v0, %lo(gCurrentCarInput) # addiu $v0, $v0, -0x2ad8 /* 0449F8 80043DF8 A20001D3 */ sb $zero, 0x1d3($s0) /* 0449FC 80043DFC A2000213 */ sb $zero, 0x213($s0) /* 044A00 80043E00 8C4F0000 */ lw $t7, ($v0) diff --git a/asm/non_matchings/racer/func_80043ECC.s b/asm/non_matchings/racer/func_80043ECC.s index 77123338..d6517e64 100644 --- a/asm/non_matchings/racer/func_80043ECC.s +++ b/asm/non_matchings/racer/func_80043ECC.s @@ -23,7 +23,7 @@ glabel func_80043ECC /* 044B1C 80043F1C 81EFD5BB */ lb $t7, %lo(D_8011D5BB)($t7) /* 044B20 80043F20 240C0001 */ li $t4, 1 /* 044B24 80043F24 15E0000B */ bnez $t7, .L80043F54 -/* 044B28 80043F28 3C0D8012 */ lui $t5, %hi(D_8011D528) # $t5, 0x8012 +/* 044B28 80043F28 3C0D8012 */ lui $t5, %hi(gCurrentCarInput) # $t5, 0x8012 /* 044B2C 80043F2C 80580014 */ lb $t8, 0x14($v0) /* 044B30 80043F30 80590016 */ lb $t9, 0x16($v0) /* 044B34 80043F34 80490015 */ lb $t1, 0x15($v0) @@ -35,7 +35,7 @@ glabel func_80043ECC /* 044B4C 80043F4C 3C018012 */ lui $at, %hi(D_8011D5BB) # $at, 0x8012 /* 044B50 80043F50 A02CD5BB */ sb $t4, %lo(D_8011D5BB)($at) .L80043F54: -/* 044B54 80043F54 8DADD528 */ lw $t5, %lo(D_8011D528)($t5) +/* 044B54 80043F54 8DADD528 */ lw $t5, %lo(gCurrentCarInput)($t5) /* 044B58 80043F58 8FB80028 */ lw $t8, 0x28($sp) /* 044B5C 80043F5C 31AE8000 */ andi $t6, $t5, 0x8000 /* 044B60 80043F60 15C00016 */ bnez $t6, .L80043FBC diff --git a/asm/non_matchings/racer/func_8004447C.s b/asm/non_matchings/racer/func_8004447C.s index 37c7f625..9f95f17e 100644 --- a/asm/non_matchings/racer/func_8004447C.s +++ b/asm/non_matchings/racer/func_8004447C.s @@ -13,9 +13,9 @@ glabel func_8004447C /* 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(D_8011D528) # $at, 0x8012 +/* 04508C 8004448C 3C018012 */ lui $at, %hi(gCurrentCarInput) # $at, 0x8012 /* 045090 80044490 27BDFF88 */ addiu $sp, $sp, -0x78 -/* 045094 80044494 AC20D528 */ sw $zero, %lo(D_8011D528)($at) +/* 045094 80044494 AC20D528 */ sw $zero, %lo(gCurrentCarInput)($at) /* 045098 80044498 3C018012 */ lui $at, %hi(D_8011D534) # $at, 0x8012 /* 04509C 8004449C AC20D534 */ sw $zero, %lo(D_8011D534)($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(D_8011D528) # $at, 0x8012 +/* 0457B8 80044BB8 3C018012 */ lui $at, %hi(gCurrentCarInput) # $at, 0x8012 /* 0457BC 80044BBC 4500001B */ bc1f .L80044C2C /* 0457C0 80044BC0 34198000 */ li $t9, 32768 /* 0457C4 80044BC4 10000019 */ b .L80044C2C -/* 0457C8 80044BC8 AC39D528 */ sw $t9, %lo(D_8011D528)($at) +/* 0457C8 80044BC8 AC39D528 */ sw $t9, %lo(gCurrentCarInput)($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(D_8011D528) # $at, 0x8012 +/* 0457F4 80044BF4 3C018012 */ lui $at, %hi(gCurrentCarInput) # $at, 0x8012 /* 0457F8 80044BF8 10000003 */ b .L80044C08 -/* 0457FC 80044BFC AC38D528 */ sw $t8, %lo(D_8011D528)($at) +/* 0457FC 80044BFC AC38D528 */ sw $t8, %lo(gCurrentCarInput)($at) .L80044C00: -/* 045800 80044C00 3C018012 */ lui $at, %hi(D_8011D528) # $at, 0x8012 -/* 045804 80044C04 AC2CD528 */ sw $t4, %lo(D_8011D528)($at) +/* 045800 80044C00 3C018012 */ lui $at, %hi(gCurrentCarInput) # $at, 0x8012 +/* 045804 80044C04 AC2CD528 */ sw $t4, %lo(gCurrentCarInput)($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(D_8011D528) # $at, 0x8012 +/* 04581C 80044C1C 3C018012 */ lui $at, %hi(gCurrentCarInput) # $at, 0x8012 /* 045820 80044C20 45000002 */ bc1f .L80044C2C /* 045824 80044C24 340D8000 */ li $t5, 32768 -/* 045828 80044C28 AC2DD528 */ sw $t5, %lo(D_8011D528)($at) +/* 045828 80044C28 AC2DD528 */ sw $t5, %lo(gCurrentCarInput)($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(D_8011D528) # $at, 0x8012 +/* 045904 80044D04 3C018012 */ lui $at, %hi(gCurrentCarInput) # $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(D_8011D528) # $at, 0x8012 +/* 045914 80044D14 3C018012 */ lui $at, %hi(gCurrentCarInput) # $at, 0x8012 /* 045918 80044D18 10000002 */ b .L80044D24 -/* 04591C 80044D1C AC2CD528 */ sw $t4, %lo(D_8011D528)($at) +/* 04591C 80044D1C AC2CD528 */ sw $t4, %lo(gCurrentCarInput)($at) .L80044D20: -/* 045920 80044D20 AC2DD528 */ sw $t5, %lo(D_8011D528)($at) +/* 045920 80044D20 AC2DD528 */ sw $t5, %lo(gCurrentCarInput)($at) .L80044D24: /* 045924 80044D24 3C01800E */ lui $at, %hi(D_800E6350 + 4) # $at, 0x800e /* 045928 80044D28 C7B0005C */ lwc1 $f16, 0x5c($sp) diff --git a/asm/non_matchings/racer/func_800452A0.s b/asm/non_matchings/racer/func_800452A0.s index 126ba4e4..312aa2a8 100644 --- a/asm/non_matchings/racer/func_800452A0.s +++ b/asm/non_matchings/racer/func_800452A0.s @@ -16,9 +16,9 @@ glabel func_800452A0 /* 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(D_8011D528) # $at, 0x8012 +/* 045EB4 800452B4 3C018012 */ lui $at, %hi(gCurrentCarInput) # $at, 0x8012 /* 045EB8 800452B8 340E8000 */ li $t6, 32768 -/* 045EBC 800452BC AC2ED528 */ sw $t6, %lo(D_8011D528)($at) +/* 045EBC 800452BC AC2ED528 */ sw $t6, %lo(gCurrentCarInput)($at) /* 045EC0 800452C0 3C018012 */ lui $at, %hi(D_8011D534) # $at, 0x8012 /* 045EC4 800452C4 AFB60048 */ sw $s6, 0x48($sp) /* 045EC8 800452C8 AC20D534 */ sw $zero, %lo(D_8011D534)($at) diff --git a/asm/non_matchings/racer/func_80045C48.s b/asm/non_matchings/racer/func_80045C48.s index 41bd7989..48c696f6 100644 --- a/asm/non_matchings/racer/func_80045C48.s +++ b/asm/non_matchings/racer/func_80045C48.s @@ -1,7 +1,7 @@ glabel func_80045C48 -/* 046848 80045C48 3C018012 */ lui $at, %hi(D_8011D528) # $at, 0x8012 +/* 046848 80045C48 3C018012 */ lui $at, %hi(gCurrentCarInput) # $at, 0x8012 /* 04684C 80045C4C 27BDFF18 */ addiu $sp, $sp, -0xe8 -/* 046850 80045C50 AC20D528 */ sw $zero, %lo(D_8011D528)($at) +/* 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 diff --git a/asm/non_matchings/racer/func_80046524.s b/asm/non_matchings/racer/func_80046524.s index 08670cc8..7ecbc151 100644 --- a/asm/non_matchings/racer/func_80046524.s +++ b/asm/non_matchings/racer/func_80046524.s @@ -96,8 +96,8 @@ glabel func_80046524 /* 0471B0 800465B0 44816000 */ mtc1 $at, $f12 /* 0471B4 800465B4 3C018012 */ lui $at, %hi(D_8011D550) # $at, 0x8012 /* 0471B8 800465B8 A420D550 */ sh $zero, %lo(D_8011D550)($at) -/* 0471BC 800465BC 3C018012 */ lui $at, %hi(D_8011D554) # $at, 0x8012 -/* 0471C0 800465C0 AC20D554 */ sw $zero, %lo(D_8011D554)($at) +/* 0471BC 800465BC 3C018012 */ lui $at, %hi(gCurrentCarSteerVel) # $at, 0x8012 +/* 0471C0 800465C0 AC20D554 */ sw $zero, %lo(gCurrentCarSteerVel)($at) /* 0471C4 800465C4 3C018012 */ lui $at, %hi(D_8011D558) # $at, 0x8012 /* 0471C8 800465C8 AC20D558 */ sw $zero, %lo(D_8011D558)($at) /* 0471CC 800465CC C626000C */ lwc1 $f6, 0xc($s1) @@ -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(D_8011D528) # $t9, 0x8012 -/* 047350 80046750 8F39D528 */ lw $t9, %lo(D_8011D528)($t9) -/* 047354 80046754 3C048012 */ lui $a0, %hi(D_8011D528) # $a0, 0x8012 +/* 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 /* 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(D_8011D528) # $t3, 0x8012 -/* 04745C 8004685C 8D6BD528 */ lw $t3, %lo(D_8011D528)($t3) +/* 047458 80046858 3C0B8012 */ lui $t3, %hi(gCurrentCarInput) # $t3, 0x8012 +/* 04745C 8004685C 8D6BD528 */ lw $t3, %lo(gCurrentCarInput)($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(D_8011D528)($a0) +/* 0474C4 800468C4 8C84D528 */ lw $a0, %lo(gCurrentCarInput)($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(D_8011D528) # $t2, 0x8012 +/* 047A9C 80046E9C 3C0A8012 */ lui $t2, %hi(gCurrentCarInput) # $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(D_8011D528)($t2) +/* 047B00 80046F00 8D4AD528 */ lw $t2, %lo(gCurrentCarInput)($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(D_8011D528) # $at, 0x8012 -/* 047B14 80046F14 AC2CD528 */ sw $t4, %lo(D_8011D528)($at) +/* 047B10 80046F10 3C018012 */ lui $at, %hi(gCurrentCarInput) # $at, 0x8012 +/* 047B14 80046F14 AC2CD528 */ sw $t4, %lo(gCurrentCarInput)($at) /* 047B18 80046F18 3C018012 */ lui $at, %hi(D_8011D534) # $at, 0x8012 /* 047B1C 80046F1C AC20D534 */ sw $zero, %lo(D_8011D534)($at) /* 047B20 80046F20 A20001E1 */ sb $zero, 0x1e1($s0) @@ -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(D_8011D528) # $t7, 0x8012 +/* 047DFC 800471FC 3C0F8012 */ lui $t7, %hi(gCurrentCarInput) # $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(D_8011D528)($t7) +/* 047E10 80047210 8DEFD528 */ lw $t7, %lo(gCurrentCarInput)($t7) /* 047E14 80047214 00000000 */ nop /* 047E18 80047218 31F84000 */ andi $t8, $t7, 0x4000 /* 047E1C 8004721C 13000013 */ beqz $t8, .L8004726C @@ -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(D_8011D528) # $a0, 0x8012 +/* 0484F4 800478F4 3C048012 */ lui $a0, %hi(gCurrentCarInput) # $a0, 0x8012 /* 0484F8 800478F8 468021A0 */ cvt.s.w $f6, $f4 -/* 0484FC 800478FC 8C84D528 */ lw $a0, %lo(D_8011D528)($a0) +/* 0484FC 800478FC 8C84D528 */ lw $a0, %lo(gCurrentCarInput)($a0) /* 048500 80047900 00000000 */ nop /* 048504 80047904 308E8000 */ andi $t6, $a0, 0x8000 /* 048508 80047908 308F0010 */ andi $t7, $a0, 0x10 @@ -1488,7 +1488,7 @@ glabel func_80046524 /* 048614 80047A14 8D8CD55C */ lw $t4, %lo(D_8011D55C)($t4) /* 048618 80047A18 2401FFFF */ li $at, -1 /* 04861C 80047A1C 15810038 */ bne $t4, $at, .L80047B00 -/* 048620 80047A20 3C048012 */ lui $a0, %hi(D_8011D528) # $a0, 0x8012 +/* 048620 80047A20 3C048012 */ lui $a0, %hi(gCurrentCarInput) # $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(D_8011D528) # $t6, 0x8012 +/* 04865C 80047A5C 3C0E8012 */ lui $t6, %hi(gCurrentCarInput) # $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(D_8011D528)($t6) -/* 0486AC 80047AAC 3C018012 */ lui $at, %hi(D_8011D528) # $at, 0x8012 +/* 0486A8 80047AA8 8DCED528 */ lw $t6, %lo(gCurrentCarInput)($t6) +/* 0486AC 80047AAC 3C018012 */ lui $at, %hi(gCurrentCarInput) # $at, 0x8012 /* 0486B0 80047AB0 35CF0010 */ ori $t7, $t6, 0x10 -/* 0486B4 80047AB4 AC2FD528 */ sw $t7, %lo(D_8011D528)($at) +/* 0486B4 80047AB4 AC2FD528 */ sw $t7, %lo(gCurrentCarInput)($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(D_8011D528)($a0) +/* 048718 80047B18 8C84D528 */ lw $a0, %lo(gCurrentCarInput)($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(D_8011D528) # $t3, 0x8012 +/* 0487FC 80047BFC 3C0B8012 */ lui $t3, %hi(gCurrentCarInput) # $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(D_8011D528)($t3) +/* 0489E4 80047DE4 8D6BD528 */ lw $t3, %lo(gCurrentCarInput)($t3) /* 0489E8 80047DE8 C7A800FC */ lwc1 $f8, 0xfc($sp) /* 0489EC 80047DEC 316E8000 */ andi $t6, $t3, 0x8000 /* 0489F0 80047DF0 15C00008 */ bnez $t6, .L80047E14 @@ -1784,8 +1784,8 @@ glabel func_80046524 /* 048A88 80047E88 E6280024 */ swc1 $f8, 0x24($s1) .L80047E8C: /* 048A8C 80047E8C AE00010C */ sw $zero, 0x10c($s0) -/* 048A90 80047E90 3C188012 */ lui $t8, %hi(D_8011D554) # $t8, 0x8012 -/* 048A94 80047E94 8F18D554 */ lw $t8, %lo(D_8011D554)($t8) +/* 048A90 80047E90 3C188012 */ lui $t8, %hi(gCurrentCarSteerVel) # $t8, 0x8012 +/* 048A94 80047E94 8F18D554 */ lw $t8, %lo(gCurrentCarSteerVel)($t8) /* 048A98 80047E98 860201A2 */ lh $v0, 0x1a2($s0) /* 048A9C 80047E9C 860C01A0 */ lh $t4, 0x1a0($s0) /* 048AA0 80047EA0 03026823 */ subu $t5, $t8, $v0 @@ -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(D_8011D528) # $t6, 0x8012 -/* 048EFC 800482FC 8DCED528 */ lw $t6, %lo(D_8011D528)($t6) +/* 048EF8 800482F8 3C0E8012 */ lui $t6, %hi(gCurrentCarInput) # $t6, 0x8012 +/* 048EFC 800482FC 8DCED528 */ lw $t6, %lo(gCurrentCarInput)($t6) /* 048F00 80048300 00004025 */ move $t0, $zero /* 048F04 80048304 31CF0010 */ andi $t7, $t6, 0x10 /* 048F08 80048308 11E00006 */ beqz $t7, .L80048324 @@ -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(D_8011D528) # $t8, 0x8012 +/* 049164 80048564 3C188012 */ lui $t8, %hi(gCurrentCarInput) # $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(D_8011D528)($t8) +/* 04917C 8004857C 8F18D528 */ lw $t8, %lo(gCurrentCarInput)($t8) /* 049180 80048580 34018010 */ li $at, 32784 /* 049184 80048584 330D8010 */ andi $t5, $t8, 0x8010 /* 049188 80048588 15A10011 */ bne $t5, $at, .L800485D0 diff --git a/asm/non_matchings/racer/func_80049794.s b/asm/non_matchings/racer/func_80049794.s index d744b69d..5f7a38b4 100644 --- a/asm/non_matchings/racer/func_80049794.s +++ b/asm/non_matchings/racer/func_80049794.s @@ -282,8 +282,8 @@ glabel func_80049794 /* 04A6E0 80049AE0 44818000 */ mtc1 $at, $f16 /* 04A6E4 80049AE4 3C018012 */ lui $at, %hi(D_8011D550) # $at, 0x8012 /* 04A6E8 80049AE8 A420D550 */ sh $zero, %lo(D_8011D550)($at) -/* 04A6EC 80049AEC 3C018012 */ lui $at, %hi(D_8011D554) # $at, 0x8012 -/* 04A6F0 80049AF0 AC20D554 */ sw $zero, %lo(D_8011D554)($at) +/* 04A6EC 80049AEC 3C018012 */ lui $at, %hi(gCurrentCarSteerVel) # $at, 0x8012 +/* 04A6F0 80049AF0 AC20D554 */ sw $zero, %lo(gCurrentCarSteerVel)($at) /* 04A6F4 80049AF4 3C018012 */ lui $at, %hi(D_8011D558) # $at, 0x8012 /* 04A6F8 80049AF8 AC20D558 */ sw $zero, %lo(D_8011D558)($at) /* 04A6FC 80049AFC C624000C */ lwc1 $f4, 0xc($s1) @@ -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(D_8011D528) # $t6, 0x8012 -/* 04A8A4 80049CA4 8DCED528 */ lw $t6, %lo(D_8011D528)($t6) -/* 04A8A8 80049CA8 3C198012 */ lui $t9, %hi(D_8011D528) # $t9, 0x8012 +/* 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 /* 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(D_8011D528)($t9) +/* 04A98C 80049D8C 8F39D528 */ lw $t9, %lo(gCurrentCarInput)($t9) /* 04A990 80049D90 C61200B4 */ lwc1 $f18, 0xb4($s0) /* 04A994 80049D94 332B4000 */ andi $t3, $t9, 0x4000 /* 04A998 80049D98 11600038 */ beqz $t3, .L80049E7C @@ -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(D_8011D528) # $t3, 0x8012 +/* 04AECC 8004A2CC 3C0B8012 */ lui $t3, %hi(gCurrentCarInput) # $t3, 0x8012 /* 04AED0 8004A2D0 A2000175 */ sb $zero, 0x175($s0) .L8004A2D4: /* 04AED4 8004A2D4 860E0000 */ lh $t6, ($s0) @@ -835,7 +835,7 @@ glabel func_80049794 /* 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(D_8011D528)($t3) +/* 04AF04 8004A304 8D6BD528 */ lw $t3, %lo(gCurrentCarInput)($t3) /* 04AF08 8004A308 00000000 */ nop /* 04AF0C 8004A30C 316C4000 */ andi $t4, $t3, 0x4000 /* 04AF10 8004A310 11800013 */ beqz $t4, .L8004A360 @@ -903,7 +903,7 @@ glabel func_80049794 /* 04B000 8004A400 2529D538 */ addiu $t1, %lo(D_8011D538) # addiu $t1, $t1, -0x2ac8 .L8004A404: /* 04B004 8004A404 820C01D6 */ lb $t4, 0x1d6($s0) -/* 04B008 8004A408 3C0D8012 */ lui $t5, %hi(D_8011D528) # $t5, 0x8012 +/* 04B008 8004A408 3C0D8012 */ lui $t5, %hi(gCurrentCarInput) # $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 @@ -932,7 +932,7 @@ glabel func_80049794 /* 04B070 8004A470 E7A600C4 */ swc1 $f6, 0xc4($sp) .L8004A474: /* 04B074 8004A474 A20001E0 */ sb $zero, 0x1e0($s0) -/* 04B078 8004A478 8DADD528 */ lw $t5, %lo(D_8011D528)($t5) +/* 04B078 8004A478 8DADD528 */ lw $t5, %lo(gCurrentCarInput)($t5) /* 04B07C 8004A47C 00000000 */ nop /* 04B080 8004A480 31AE4000 */ andi $t6, $t5, 0x4000 /* 04B084 8004A484 11C00007 */ beqz $t6, .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(D_8011D528) # $t8, 0x8012 -/* 04B5CC 8004A9CC 8F18D528 */ lw $t8, %lo(D_8011D528)($t8) +/* 04B5C8 8004A9C8 3C188012 */ lui $t8, %hi(gCurrentCarInput) # $t8, 0x8012 +/* 04B5CC 8004A9CC 8F18D528 */ lw $t8, %lo(gCurrentCarInput)($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(D_8011D528) # $at, 0x8012 -/* 04B5E0 8004A9E0 AC39D528 */ sw $t9, %lo(D_8011D528)($at) +/* 04B5DC 8004A9DC 3C018012 */ lui $at, %hi(gCurrentCarInput) # $at, 0x8012 +/* 04B5E0 8004A9E0 AC39D528 */ sw $t9, %lo(gCurrentCarInput)($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(D_8011D528) # $t5, 0x8012 +/* 04B754 8004AB54 3C0D8012 */ lui $t5, %hi(gCurrentCarInput) # $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(D_8011D528)($t5) +/* 04B780 8004AB80 8DADD528 */ lw $t5, %lo(gCurrentCarInput)($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(D_8011D528) # $t7, 0x8012 +/* 04B89C 8004AC9C 3C0F8012 */ lui $t7, %hi(gCurrentCarInput) # $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(D_8011D528)($t7) +/* 04B8AC 8004ACAC 8DEFD528 */ lw $t7, %lo(gCurrentCarInput)($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(D_8011D528) # $t3, 0x8012 +/* 04B948 8004AD48 3C0B8012 */ lui $t3, %hi(gCurrentCarInput) # $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(D_8011D528)($t3) +/* 04B958 8004AD58 8D6BD528 */ lw $t3, %lo(gCurrentCarInput)($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(D_8011D528) # $v0, 0x8012 +/* 04B980 8004AD80 3C028012 */ lui $v0, %hi(gCurrentCarInput) # $v0, 0x8012 /* 04B984 8004AD84 1060000B */ beqz $v1, .L8004ADB4 /* 04B988 8004AD88 2401FFEF */ li $at, -17 -/* 04B98C 8004AD8C 8C42D528 */ lw $v0, %lo(D_8011D528)($v0) +/* 04B98C 8004AD8C 8C42D528 */ lw $v0, %lo(gCurrentCarInput)($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(D_8011D528) # $at, 0x8012 -/* 04B9A8 8004ADA8 AC38D528 */ sw $t8, %lo(D_8011D528)($at) +/* 04B9A4 8004ADA4 3C018012 */ lui $at, %hi(gCurrentCarInput) # $at, 0x8012 +/* 04B9A8 8004ADA8 AC38D528 */ sw $t8, %lo(gCurrentCarInput)($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(D_8011D528) # $t3, 0x8012 -/* 04BA34 8004AE34 8D6BD528 */ lw $t3, %lo(D_8011D528)($t3) +/* 04BA30 8004AE30 3C0B8012 */ lui $t3, %hi(gCurrentCarInput) # $t3, 0x8012 +/* 04BA34 8004AE34 8D6BD528 */ lw $t3, %lo(gCurrentCarInput)($t3) /* 04BA38 8004AE38 00000000 */ nop /* 04BA3C 8004AE3C 316C0010 */ andi $t4, $t3, 0x10 /* 04BA40 8004AE40 460034A1 */ cvt.d.s $f18, $f6 @@ -1671,11 +1671,11 @@ glabel func_80049794 /* 04BB08 8004AF08 11810025 */ beq $t4, $at, .L8004AFA0 /* 04BB0C 8004AF0C 3C088012 */ lui $t0, %hi(D_8011D534) # $t0, 0x8012 /* 04BB10 8004AF10 820B01D8 */ lb $t3, 0x1d8($s0) -/* 04BB14 8004AF14 3C028012 */ lui $v0, %hi(D_8011D528) # $v0, 0x8012 +/* 04BB14 8004AF14 3C028012 */ lui $v0, %hi(gCurrentCarInput) # $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(D_8011D528)($v0) +/* 04BB24 8004AF24 8C42D528 */ lw $v0, %lo(gCurrentCarInput)($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(D_8011D528) # $t6, 0x8012 +/* 04BC08 8004B008 3C0E8012 */ lui $t6, %hi(gCurrentCarInput) # $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(D_8011D528)($t6) +/* 04BC1C 8004B01C 8DCED528 */ lw $t6, %lo(gCurrentCarInput)($t6) /* 04BC20 8004B020 8FB800F8 */ lw $t8, 0xf8($sp) /* 04BC24 8004B024 31CC0010 */ andi $t4, $t6, 0x10 /* 04BC28 8004B028 11800005 */ beqz $t4, .L8004B040 @@ -1758,8 +1758,8 @@ glabel func_80049794 /* 04BC4C 8004B04C 01EB6823 */ subu $t5, $t7, $t3 /* 04BC50 8004B050 A60D01A0 */ sh $t5, 0x1a0($s0) .L8004B054: -/* 04BC54 8004B054 3C028012 */ lui $v0, %hi(D_8011D528) # $v0, 0x8012 -/* 04BC58 8004B058 8C42D528 */ lw $v0, %lo(D_8011D528)($v0) +/* 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 /* 04BC60 8004B060 304E0010 */ andi $t6, $v0, 0x10 /* 04BC64 8004B064 11C00009 */ beqz $t6, .L8004B08C @@ -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(D_8011D528) # $v0, 0x8012 +/* 04BCAC 8004B0AC 3C028012 */ lui $v0, %hi(gCurrentCarInput) # $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,7 +1800,7 @@ 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(D_8011D528)($v0) +/* 04BCF8 8004B0F8 8C42D528 */ lw $v0, %lo(gCurrentCarInput)($v0) /* 04BCFC 8004B0FC 00000000 */ nop /* 04BD00 8004B100 30590010 */ andi $t9, $v0, 0x10 /* 04BD04 8004B104 03201025 */ move $v0, $t9 @@ -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(D_8011D528) # $t8, 0x8012 +/* 04C070 8004B470 3C188012 */ lui $t8, %hi(gCurrentCarInput) # $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(D_8011D528)($t8) +/* 04C198 8004B598 8F18D528 */ lw $t8, %lo(gCurrentCarInput)($t8) /* 04C19C 8004B59C C7A800D8 */ lwc1 $f8, 0xd8($sp) /* 04C1A0 8004B5A0 330C8000 */ andi $t4, $t8, 0x8000 /* 04C1A4 8004B5A4 15800008 */ bnez $t4, .L8004B5C8 @@ -2321,8 +2321,8 @@ glabel func_80049794 .L8004B8A0: /* 04C4A0 8004B8A0 C7AC00EC */ lwc1 $f12, 0xec($sp) /* 04C4A4 8004B8A4 AE00010C */ sw $zero, 0x10c($s0) -/* 04C4A8 8004B8A8 3C0D8012 */ lui $t5, %hi(D_8011D554) # $t5, 0x8012 -/* 04C4AC 8004B8AC 8DADD554 */ lw $t5, %lo(D_8011D554)($t5) +/* 04C4A8 8004B8A8 3C0D8012 */ lui $t5, %hi(gCurrentCarSteerVel) # $t5, 0x8012 +/* 04C4AC 8004B8AC 8DADD554 */ lw $t5, %lo(gCurrentCarSteerVel)($t5) /* 04C4B0 8004B8B0 860201A2 */ lh $v0, 0x1a2($s0) /* 04C4B4 8004B8B4 860C01A0 */ lh $t4, 0x1a0($s0) /* 04C4B8 8004B8B8 01A25823 */ subu $t3, $t5, $v0 @@ -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(D_8011D528) # $v0, 0x8012 -/* 04CC4C 8004C04C 2442D528 */ addiu $v0, %lo(D_8011D528) # addiu $v0, $v0, -0x2ad8 +/* 04CC48 8004C048 3C028012 */ lui $v0, %hi(gCurrentCarInput) # $v0, 0x8012 +/* 04CC4C 8004C04C 2442D528 */ addiu $v0, %lo(gCurrentCarInput) # addiu $v0, $v0, -0x2ad8 /* 04CC50 8004C050 8C4E0000 */ lw $t6, ($v0) /* 04CC54 8004C054 00000000 */ nop /* 04CC58 8004C058 35D90010 */ ori $t9, $t6, 0x10 diff --git a/asm/non_matchings/racer/func_8004C2B0.s b/asm/non_matchings/racer/func_8004C2B0.s index c353dfeb..3f80e3f0 100644 --- a/asm/non_matchings/racer/func_8004C2B0.s +++ b/asm/non_matchings/racer/func_8004C2B0.s @@ -53,7 +53,7 @@ glabel func_8004C2B0 /* 04CF3C 8004C33C C7B20030 */ lwc1 $f18, 0x30($sp) /* 04CF40 8004C340 24010001 */ li $at, 1 /* 04CF44 8004C344 14410007 */ bne $v0, $at, .L8004C364 -/* 04CF48 8004C348 3C0F8012 */ lui $t7, %hi(D_8011D528) # $t7, 0x8012 +/* 04CF48 8004C348 3C0F8012 */ lui $t7, %hi(gCurrentCarInput) # $t7, 0x8012 /* 04CF4C 8004C34C 3C014334 */ li $at, 0x43340000 # 180.000000 /* 04CF50 8004C350 44817000 */ mtc1 $at, $f14 /* 04CF54 8004C354 3C014248 */ li $at, 0x42480000 # 50.000000 @@ -69,7 +69,7 @@ glabel func_8004C2B0 /* 04CF78 8004C378 44819000 */ mtc1 $at, $f18 /* 04CF7C 8004C37C 00000000 */ nop .L8004C380: -/* 04CF80 8004C380 8DEFD528 */ lw $t7, %lo(D_8011D528)($t7) +/* 04CF80 8004C380 8DEFD528 */ lw $t7, %lo(gCurrentCarInput)($t7) /* 04CF84 8004C384 00000000 */ nop /* 04CF88 8004C388 31F80010 */ andi $t8, $t7, 0x10 /* 04CF8C 8004C38C 13000006 */ beqz $t8, .L8004C3A8 diff --git a/asm/non_matchings/racer/func_8004CC20.s b/asm/non_matchings/racer/func_8004CC20.s index 7878f7e6..0ec9b238 100644 --- a/asm/non_matchings/racer/func_8004CC20.s +++ b/asm/non_matchings/racer/func_8004CC20.s @@ -48,8 +48,8 @@ glabel func_8004CC20 /* 04D8A0 8004CCA0 A2000203 */ sb $zero, 0x203($s0) /* 04D8A4 8004CCA4 3C018012 */ lui $at, %hi(D_8011D550) # $at, 0x8012 /* 04D8A8 8004CCA8 A420D550 */ sh $zero, %lo(D_8011D550)($at) -/* 04D8AC 8004CCAC 3C018012 */ lui $at, %hi(D_8011D554) # $at, 0x8012 -/* 04D8B0 8004CCB0 AC20D554 */ sw $zero, %lo(D_8011D554)($at) +/* 04D8AC 8004CCAC 3C018012 */ lui $at, %hi(gCurrentCarSteerVel) # $at, 0x8012 +/* 04D8B0 8004CCB0 AC20D554 */ sw $zero, %lo(gCurrentCarSteerVel)($at) /* 04D8B4 8004CCB4 3C018012 */ lui $at, %hi(D_8011D558) # $at, 0x8012 /* 04D8B8 8004CCB8 AC20D558 */ sw $zero, %lo(D_8011D558)($at) /* 04D8BC 8004CCBC C624000C */ lwc1 $f4, 0xc($s1) @@ -139,12 +139,12 @@ 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(D_8011D528) # $at, 0x8012 -/* 04DA04 8004CE04 AC2ED528 */ sw $t6, %lo(D_8011D528)($at) +/* 04DA00 8004CE00 3C018012 */ lui $at, %hi(gCurrentCarInput) # $at, 0x8012 +/* 04DA04 8004CE04 AC2ED528 */ sw $t6, %lo(gCurrentCarInput)($at) /* 04DA08 8004CE08 02202025 */ move $a0, $s1 /* 04DA0C 8004CE0C 0C014D71 */ jal func_800535C4 /* 04DA10 8004CE10 02002825 */ move $a1, $s0 -/* 04DA14 8004CE14 0C014D99 */ jal func_80053664 +/* 04DA14 8004CE14 0C014D99 */ jal handle_car_velocity_control /* 04DA18 8004CE18 02002025 */ move $a0, $s0 /* 04DA1C 8004CE1C 8FA600DC */ lw $a2, 0xdc($sp) /* 04DA20 8004CE20 02202025 */ move $a0, $s1 @@ -486,7 +486,7 @@ glabel func_8004CC20 /* 04DF10 8004D310 C624001C */ lwc1 $f4, 0x1c($s1) /* 04DF14 8004D314 46009402 */ mul.s $f16, $f18, $f0 /* 04DF18 8004D318 C62A0020 */ lwc1 $f10, 0x20($s1) -/* 04DF1C 8004D31C 3C0B8012 */ lui $t3, %hi(D_8011D554) # $t3, 0x8012 +/* 04DF1C 8004D31C 3C0B8012 */ lui $t3, %hi(gCurrentCarSteerVel) # $t3, 0x8012 /* 04DF20 8004D320 02202025 */ move $a0, $s1 /* 04DF24 8004D324 46102181 */ sub.s $f6, $f4, $f16 /* 04DF28 8004D328 C6300024 */ lwc1 $f16, 0x24($s1) @@ -502,7 +502,7 @@ glabel func_8004CC20 /* 04DF50 8004D350 46088281 */ sub.s $f10, $f16, $f8 /* 04DF54 8004D354 E62A0024 */ swc1 $f10, 0x24($s1) /* 04DF58 8004D358 AE00010C */ sw $zero, 0x10c($s0) -/* 04DF5C 8004D35C 8D6BD554 */ lw $t3, %lo(D_8011D554)($t3) +/* 04DF5C 8004D35C 8D6BD554 */ lw $t3, %lo(gCurrentCarSteerVel)($t3) /* 04DF60 8004D360 860201A2 */ lh $v0, 0x1a2($s0) /* 04DF64 8004D364 860F01A0 */ lh $t7, 0x1a0($s0) /* 04DF68 8004D368 01626023 */ subu $t4, $t3, $v0 diff --git a/asm/non_matchings/racer/func_8004DE38.s b/asm/non_matchings/racer/func_8004DE38.s index f2d98476..bbbcf797 100644 --- a/asm/non_matchings/racer/func_8004DE38.s +++ b/asm/non_matchings/racer/func_8004DE38.s @@ -610,9 +610,9 @@ glabel func_8004DE38 /* 04F2AC 8004E6AC 0C01A94A */ jal get_buttons_held_from_player /* 04F2B0 8004E6B0 AC22D538 */ sw $v0, %lo(D_8011D538)($at) /* 04F2B4 8004E6B4 8FA400AC */ lw $a0, 0xac($sp) -/* 04F2B8 8004E6B8 3C018012 */ lui $at, %hi(D_8011D528) # $at, 0x8012 +/* 04F2B8 8004E6B8 3C018012 */ lui $at, %hi(gCurrentCarInput) # $at, 0x8012 /* 04F2BC 8004E6BC 0C01A955 */ jal get_buttons_pressed_from_player -/* 04F2C0 8004E6C0 AC22D528 */ sw $v0, %lo(D_8011D528)($at) +/* 04F2C0 8004E6C0 AC22D528 */ sw $v0, %lo(gCurrentCarInput)($at) /* 04F2C4 8004E6C4 8FA400AC */ lw $a0, 0xac($sp) /* 04F2C8 8004E6C8 3C018012 */ lui $at, %hi(gActivePlayerButtonPress) # $at, 0x8012 /* 04F2CC 8004E6CC 0C01A95E */ jal get_buttons_released_from_player @@ -631,8 +631,8 @@ glabel func_8004DE38 /* 04F2F8 8004E6F8 0C01105C */ jal func_80044170 /* 04F2FC 8004E6FC 02002825 */ move $a1, $s0 .L8004E700: -/* 04F300 8004E700 3C098012 */ lui $t1, %hi(D_8011D528) # $t1, 0x8012 -/* 04F304 8004E704 8D29D528 */ lw $t1, %lo(D_8011D528)($t1) +/* 04F300 8004E700 3C098012 */ lui $t1, %hi(gCurrentCarInput) # $t1, 0x8012 +/* 04F304 8004E704 8D29D528 */ lw $t1, %lo(gCurrentCarInput)($t1) /* 04F308 8004E708 00000000 */ nop /* 04F30C 8004E70C 312A8000 */ andi $t2, $t1, 0x8000 /* 04F310 8004E710 15400002 */ bnez $t2, .L8004E71C @@ -667,8 +667,8 @@ glabel func_8004DE38 /* 04F37C 8004E77C AC20D534 */ sw $zero, %lo(D_8011D534)($at) /* 04F380 8004E780 3C018012 */ lui $at, %hi(D_8011D538) # $at, 0x8012 /* 04F384 8004E784 AC20D538 */ sw $zero, %lo(D_8011D538)($at) -/* 04F388 8004E788 3C018012 */ lui $at, %hi(D_8011D528) # $at, 0x8012 -/* 04F38C 8004E78C AC20D528 */ sw $zero, %lo(D_8011D528)($at) +/* 04F388 8004E788 3C018012 */ lui $at, %hi(gCurrentCarInput) # $at, 0x8012 +/* 04F38C 8004E78C AC20D528 */ sw $zero, %lo(gCurrentCarInput)($at) /* 04F390 8004E790 3C018012 */ lui $at, %hi(gActivePlayerButtonPress) # $at, 0x8012 /* 04F394 8004E794 AC20D52C */ sw $zero, %lo(gActivePlayerButtonPress)($at) /* 04F398 8004E798 3C018012 */ lui $at, %hi(D_8011D530) # $at, 0x8012 @@ -770,8 +770,8 @@ glabel func_8004DE38 /* 04F4F4 8004E8F4 AC20D534 */ sw $zero, %lo(D_8011D534)($at) /* 04F4F8 8004E8F8 3C018012 */ lui $at, %hi(D_8011D538) # $at, 0x8012 /* 04F4FC 8004E8FC AC20D538 */ sw $zero, %lo(D_8011D538)($at) -/* 04F500 8004E900 3C018012 */ lui $at, %hi(D_8011D528) # $at, 0x8012 -/* 04F504 8004E904 AC20D528 */ sw $zero, %lo(D_8011D528)($at) +/* 04F500 8004E900 3C018012 */ lui $at, %hi(gCurrentCarInput) # $at, 0x8012 +/* 04F504 8004E904 AC20D528 */ sw $zero, %lo(gCurrentCarInput)($at) .L8004E908: /* 04F508 8004E908 1460001C */ bnez $v1, .L8004E97C /* 04F50C 8004E90C 00000000 */ nop @@ -985,12 +985,12 @@ glabel L8004EBF4 /* 04F808 8004EC08 10000060 */ b .L8004ED8C /* 04F80C 8004EC0C 820A0175 */ lb $t2, 0x175($s0) glabel L8004EC10 -/* 04F810 8004EC10 3C0B8012 */ lui $t3, %hi(D_8011D528) # $t3, 0x8012 +/* 04F810 8004EC10 3C0B8012 */ lui $t3, %hi(gCurrentCarInput) # $t3, 0x8012 /* 04F814 8004EC14 3C0D8012 */ lui $t5, %hi(gActivePlayerButtonPress) # $t5, 0x8012 /* 04F818 8004EC18 3C0C8012 */ lui $t4, %hi(D_8011D540) # $t4, 0x8012 /* 04F81C 8004EC1C 258CD540 */ addiu $t4, %lo(D_8011D540) # addiu $t4, $t4, -0x2ac0 /* 04F820 8004EC20 25ADD52C */ addiu $t5, %lo(gActivePlayerButtonPress) # addiu $t5, $t5, -0x2ad4 -/* 04F824 8004EC24 256BD528 */ addiu $t3, %lo(D_8011D528) # addiu $t3, $t3, -0x2ad8 +/* 04F824 8004EC24 256BD528 */ addiu $t3, %lo(gCurrentCarInput) # addiu $t3, $t3, -0x2ad8 /* 04F828 8004EC28 8FA400B4 */ lw $a0, 0xb4($sp) /* 04F82C 8004EC2C 8FA5009C */ lw $a1, 0x9c($sp) /* 04F830 8004EC30 AFAB0010 */ sw $t3, 0x10($sp) @@ -1002,12 +1002,12 @@ glabel L8004EC10 /* 04F848 8004EC48 10000050 */ b .L8004ED8C /* 04F84C 8004EC4C 820A0175 */ lb $t2, 0x175($s0) glabel L8004EC50 -/* 04F850 8004EC50 3C0E8012 */ lui $t6, %hi(D_8011D528) # $t6, 0x8012 +/* 04F850 8004EC50 3C0E8012 */ lui $t6, %hi(gCurrentCarInput) # $t6, 0x8012 /* 04F854 8004EC54 3C0F8012 */ lui $t7, %hi(gActivePlayerButtonPress) # $t7, 0x8012 /* 04F858 8004EC58 3C088012 */ lui $t0, %hi(D_8011D540) # $t0, 0x8012 /* 04F85C 8004EC5C 2508D540 */ addiu $t0, %lo(D_8011D540) # addiu $t0, $t0, -0x2ac0 /* 04F860 8004EC60 25EFD52C */ addiu $t7, %lo(gActivePlayerButtonPress) # addiu $t7, $t7, -0x2ad4 -/* 04F864 8004EC64 25CED528 */ addiu $t6, %lo(D_8011D528) # addiu $t6, $t6, -0x2ad8 +/* 04F864 8004EC64 25CED528 */ addiu $t6, %lo(gCurrentCarInput) # addiu $t6, $t6, -0x2ad8 /* 04F868 8004EC68 8FA400B4 */ lw $a0, 0xb4($sp) /* 04F86C 8004EC6C 8FA5009C */ lw $a1, 0x9c($sp) /* 04F870 8004EC70 AFAE0010 */ sw $t6, 0x10($sp) @@ -1019,12 +1019,12 @@ glabel L8004EC50 /* 04F888 8004EC88 10000040 */ b .L8004ED8C /* 04F88C 8004EC8C 820A0175 */ lb $t2, 0x175($s0) glabel L8004EC90 -/* 04F890 8004EC90 3C188012 */ lui $t8, %hi(D_8011D528) # $t8, 0x8012 +/* 04F890 8004EC90 3C188012 */ lui $t8, %hi(gCurrentCarInput) # $t8, 0x8012 /* 04F894 8004EC94 3C198012 */ lui $t9, %hi(D_8011D534) # $t9, 0x8012 /* 04F898 8004EC98 3C0A8012 */ lui $t2, %hi(D_8011D540) # $t2, 0x8012 /* 04F89C 8004EC9C 254AD540 */ addiu $t2, %lo(D_8011D540) # addiu $t2, $t2, -0x2ac0 /* 04F8A0 8004ECA0 2739D534 */ addiu $t9, %lo(D_8011D534) # addiu $t9, $t9, -0x2acc -/* 04F8A4 8004ECA4 2718D528 */ addiu $t8, %lo(D_8011D528) # addiu $t8, $t8, -0x2ad8 +/* 04F8A4 8004ECA4 2718D528 */ addiu $t8, %lo(gCurrentCarInput) # addiu $t8, $t8, -0x2ad8 /* 04F8A8 8004ECA8 8FA400B4 */ lw $a0, 0xb4($sp) /* 04F8AC 8004ECAC 8FA5009C */ lw $a1, 0x9c($sp) /* 04F8B0 8004ECB0 AFB80010 */ sw $t8, 0x10($sp) @@ -1036,12 +1036,12 @@ glabel L8004EC90 /* 04F8C8 8004ECC8 10000030 */ b .L8004ED8C /* 04F8CC 8004ECCC 820A0175 */ lb $t2, 0x175($s0) glabel L8004ECD0 -/* 04F8D0 8004ECD0 3C098012 */ lui $t1, %hi(D_8011D528) # $t1, 0x8012 +/* 04F8D0 8004ECD0 3C098012 */ lui $t1, %hi(gCurrentCarInput) # $t1, 0x8012 /* 04F8D4 8004ECD4 3C0B8012 */ lui $t3, %hi(gActivePlayerButtonPress) # $t3, 0x8012 /* 04F8D8 8004ECD8 3C0D8012 */ lui $t5, %hi(D_8011D540) # $t5, 0x8012 /* 04F8DC 8004ECDC 25ADD540 */ addiu $t5, %lo(D_8011D540) # addiu $t5, $t5, -0x2ac0 /* 04F8E0 8004ECE0 256BD52C */ addiu $t3, %lo(gActivePlayerButtonPress) # addiu $t3, $t3, -0x2ad4 -/* 04F8E4 8004ECE4 2529D528 */ addiu $t1, %lo(D_8011D528) # addiu $t1, $t1, -0x2ad8 +/* 04F8E4 8004ECE4 2529D528 */ addiu $t1, %lo(gCurrentCarInput) # addiu $t1, $t1, -0x2ad8 /* 04F8E8 8004ECE8 8FA400B4 */ lw $a0, 0xb4($sp) /* 04F8EC 8004ECEC 8FA5009C */ lw $a1, 0x9c($sp) /* 04F8F0 8004ECF0 AFA90010 */ sw $t1, 0x10($sp) @@ -1053,12 +1053,12 @@ glabel L8004ECD0 /* 04F908 8004ED08 10000020 */ b .L8004ED8C /* 04F90C 8004ED0C 820A0175 */ lb $t2, 0x175($s0) glabel L8004ED10 -/* 04F910 8004ED10 3C0C8012 */ lui $t4, %hi(D_8011D528) # $t4, 0x8012 +/* 04F910 8004ED10 3C0C8012 */ lui $t4, %hi(gCurrentCarInput) # $t4, 0x8012 /* 04F914 8004ED14 3C0E8012 */ lui $t6, %hi(gActivePlayerButtonPress) # $t6, 0x8012 /* 04F918 8004ED18 3C0F8012 */ lui $t7, %hi(D_8011D540) # $t7, 0x8012 /* 04F91C 8004ED1C 25EFD540 */ addiu $t7, %lo(D_8011D540) # addiu $t7, $t7, -0x2ac0 /* 04F920 8004ED20 25CED52C */ addiu $t6, %lo(gActivePlayerButtonPress) # addiu $t6, $t6, -0x2ad4 -/* 04F924 8004ED24 258CD528 */ addiu $t4, %lo(D_8011D528) # addiu $t4, $t4, -0x2ad8 +/* 04F924 8004ED24 258CD528 */ addiu $t4, %lo(gCurrentCarInput) # addiu $t4, $t4, -0x2ad8 /* 04F928 8004ED28 8FA400B4 */ lw $a0, 0xb4($sp) /* 04F92C 8004ED2C 8FA5009C */ lw $a1, 0x9c($sp) /* 04F930 8004ED30 AFAC0010 */ sw $t4, 0x10($sp) @@ -1070,12 +1070,12 @@ glabel L8004ED10 /* 04F948 8004ED48 10000010 */ b .L8004ED8C /* 04F94C 8004ED4C 820A0175 */ lb $t2, 0x175($s0) glabel L8004ED50 -/* 04F950 8004ED50 3C088012 */ lui $t0, %hi(D_8011D528) # $t0, 0x8012 +/* 04F950 8004ED50 3C088012 */ lui $t0, %hi(gCurrentCarInput) # $t0, 0x8012 /* 04F954 8004ED54 3C188012 */ lui $t8, %hi(gActivePlayerButtonPress) # $t8, 0x8012 /* 04F958 8004ED58 3C198012 */ lui $t9, %hi(D_8011D540) # $t9, 0x8012 /* 04F95C 8004ED5C 2739D540 */ addiu $t9, %lo(D_8011D540) # addiu $t9, $t9, -0x2ac0 /* 04F960 8004ED60 2718D52C */ addiu $t8, %lo(gActivePlayerButtonPress) # addiu $t8, $t8, -0x2ad4 -/* 04F964 8004ED64 2508D528 */ addiu $t0, %lo(D_8011D528) # addiu $t0, $t0, -0x2ad8 +/* 04F964 8004ED64 2508D528 */ addiu $t0, %lo(gCurrentCarInput) # addiu $t0, $t0, -0x2ad8 /* 04F968 8004ED68 8FA400B4 */ lw $a0, 0xb4($sp) /* 04F96C 8004ED6C 8FA5009C */ lw $a1, 0x9c($sp) /* 04F970 8004ED70 AFA80010 */ sw $t0, 0x10($sp) @@ -1131,8 +1131,8 @@ glabel L8004ED88 /* 04FA20 8004EE20 10400007 */ beqz $v0, .L8004EE40 .L8004EE24: /* 04FA24 8004EE24 3C058012 */ lui $a1, %hi(gActivePlayerButtonPress) # $a1, 0x8012 -/* 04FA28 8004EE28 3C068012 */ lui $a2, %hi(D_8011D528) # $a2, 0x8012 -/* 04FA2C 8004EE2C 8CC6D528 */ lw $a2, %lo(D_8011D528)($a2) +/* 04FA28 8004EE28 3C068012 */ lui $a2, %hi(gCurrentCarInput) # $a2, 0x8012 +/* 04FA2C 8004EE2C 8CC6D528 */ lw $a2, %lo(gCurrentCarInput)($a2) /* 04FA30 8004EE30 8CA5D52C */ lw $a1, %lo(gActivePlayerButtonPress)($a1) /* 04FA34 8004EE34 8FA700B4 */ lw $a3, 0xb4($sp) /* 04FA38 8004EE38 0C001434 */ jal func_800050D0 diff --git a/asm/non_matchings/racer/func_8004F7F4.s b/asm/non_matchings/racer/func_8004F7F4.s index 56b8d0d4..3481f936 100644 --- a/asm/non_matchings/racer/func_8004F7F4.s +++ b/asm/non_matchings/racer/func_8004F7F4.s @@ -27,8 +27,8 @@ 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(D_8011D528) # $a0, 0x8012 -/* 050424 8004F824 2484D528 */ addiu $a0, %lo(D_8011D528) # addiu $a0, $a0, -0x2ad8 +/* 050420 8004F820 3C048012 */ lui $a0, %hi(gCurrentCarInput) # $a0, 0x8012 +/* 050424 8004F824 2484D528 */ addiu $a0, %lo(gCurrentCarInput) # 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 @@ -37,10 +37,10 @@ glabel func_8004F7F4 .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(D_8011D528) # $a0, 0x8012 +/* 050444 8004F844 3C048012 */ lui $a0, %hi(gCurrentCarInput) # $a0, 0x8012 /* 050448 8004F848 2401FFFF */ li $at, -1 /* 05044C 8004F84C 13210005 */ beq $t9, $at, .L8004F864 -/* 050450 8004F850 2484D528 */ addiu $a0, %lo(D_8011D528) # addiu $a0, $a0, -0x2ad8 +/* 050450 8004F850 2484D528 */ addiu $a0, %lo(gCurrentCarInput) # addiu $a0, $a0, -0x2ad8 /* 050454 8004F854 820801D8 */ lb $t0, 0x1d8($s0) /* 050458 8004F858 00003025 */ move $a2, $zero /* 05045C 8004F85C 11000008 */ beqz $t0, .L8004F880 @@ -112,8 +112,8 @@ glabel func_8004F7F4 /* 05054C 8004F94C 02002825 */ move $a1, $s0 /* 050550 8004F950 3C018012 */ lui $at, %hi(D_8011D550) # $at, 0x8012 /* 050554 8004F954 A420D550 */ sh $zero, %lo(D_8011D550)($at) -/* 050558 8004F958 3C018012 */ lui $at, %hi(D_8011D554) # $at, 0x8012 -/* 05055C 8004F95C AC20D554 */ sw $zero, %lo(D_8011D554)($at) +/* 050558 8004F958 3C018012 */ lui $at, %hi(gCurrentCarSteerVel) # $at, 0x8012 +/* 05055C 8004F95C AC20D554 */ sw $zero, %lo(gCurrentCarSteerVel)($at) /* 050560 8004F960 3C018012 */ lui $at, %hi(D_8011D558) # $at, 0x8012 /* 050564 8004F964 AC20D558 */ sw $zero, %lo(D_8011D558)($at) /* 050568 8004F968 C624000C */ lwc1 $f4, 0xc($s1) @@ -257,7 +257,7 @@ glabel func_8004F7F4 /* 050758 8004FB58 02202025 */ move $a0, $s1 /* 05075C 8004FB5C 0C014D71 */ jal func_800535C4 /* 050760 8004FB60 02002825 */ move $a1, $s0 -/* 050764 8004FB64 0C014D99 */ jal func_80053664 +/* 050764 8004FB64 0C014D99 */ jal handle_car_velocity_control /* 050768 8004FB68 02002025 */ move $a0, $s0 /* 05076C 8004FB6C 8FA600C0 */ lw $a2, 0xc0($sp) /* 050770 8004FB70 02202025 */ move $a0, $s1 @@ -456,8 +456,8 @@ glabel func_8004F7F4 /* 050A38 8004FE38 02002825 */ move $a1, $s0 .L8004FE3C: /* 050A3C 8004FE3C 860501A2 */ lh $a1, 0x1a2($s0) -/* 050A40 8004FE40 3C188012 */ lui $t8, %hi(D_8011D554) # $t8, 0x8012 -/* 050A44 8004FE44 8F18D554 */ lw $t8, %lo(D_8011D554)($t8) +/* 050A40 8004FE40 3C188012 */ lui $t8, %hi(gCurrentCarSteerVel) # $t8, 0x8012 +/* 050A44 8004FE44 8F18D554 */ lw $t8, %lo(gCurrentCarSteerVel)($t8) /* 050A48 8004FE48 30B9FFFF */ andi $t9, $a1, 0xffff /* 050A4C 8004FE4C 34018001 */ li $at, 32769 /* 050A50 8004FE50 03191823 */ subu $v1, $t8, $t9 diff --git a/asm/non_matchings/racer/func_80050A28.s b/asm/non_matchings/racer/func_80050A28.s index 6857fb56..8bfed153 100644 --- a/asm/non_matchings/racer/func_80050A28.s +++ b/asm/non_matchings/racer/func_80050A28.s @@ -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(D_8011D528) # $t0, 0x8012 +/* 051684 80050A84 3C088012 */ lui $t0, %hi(gCurrentCarInput) # $t0, 0x8012 /* 051688 80050A88 15C00041 */ bnez $t6, .L80050B90 -/* 05168C 80050A8C 2508D528 */ addiu $t0, %lo(D_8011D528) # addiu $t0, $t0, -0x2ad8 +/* 05168C 80050A8C 2508D528 */ addiu $t0, %lo(gCurrentCarInput) # 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(D_8011D528) # $t8, 0x8012 -/* 0517E8 80050BE8 8F18D528 */ lw $t8, %lo(D_8011D528)($t8) +/* 0517E4 80050BE4 3C188012 */ lui $t8, %hi(gCurrentCarInput) # $t8, 0x8012 +/* 0517E8 80050BE8 8F18D528 */ lw $t8, %lo(gCurrentCarInput)($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(D_8011D528) # $t0, 0x8012 +/* 051804 80050C04 3C088012 */ lui $t0, %hi(gCurrentCarInput) # $t0, 0x8012 /* 051808 80050C08 18400006 */ blez $v0, .L80050C24 -/* 05180C 80050C0C 2508D528 */ addiu $t0, %lo(D_8011D528) # addiu $t0, $t0, -0x2ad8 +/* 05180C 80050C0C 2508D528 */ addiu $t0, %lo(gCurrentCarInput) # addiu $t0, $t0, -0x2ad8 /* 051810 80050C10 8FAA0080 */ lw $t2, 0x80($sp) /* 051814 80050C14 00000000 */ nop /* 051818 80050C18 004A5823 */ subu $t3, $v0, $t2 @@ -206,9 +206,9 @@ 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(D_8011D528) # $t0, 0x8012 +/* 051890 80050C90 3C088012 */ lui $t0, %hi(gCurrentCarInput) # $t0, 0x8012 /* 051894 80050C94 8FA70078 */ lw $a3, 0x78($sp) -/* 051898 80050C98 2508D528 */ addiu $t0, %lo(D_8011D528) # addiu $t0, $t0, -0x2ad8 +/* 051898 80050C98 2508D528 */ addiu $t0, %lo(gCurrentCarInput) # addiu $t0, $t0, -0x2ad8 .L80050C9C: /* 05189C 80050C9C 3C0E8012 */ lui $t6, %hi(D_8011D55C) # $t6, 0x8012 /* 0518A0 80050CA0 8DCED55C */ lw $t6, %lo(D_8011D55C)($t6) @@ -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(D_8011D528) # $t0, 0x8012 +/* 051944 80050D44 3C088012 */ lui $t0, %hi(gCurrentCarInput) # $t0, 0x8012 /* 051948 80050D48 8FA70078 */ lw $a3, 0x78($sp) -/* 05194C 80050D4C 2508D528 */ addiu $t0, %lo(D_8011D528) # addiu $t0, $t0, -0x2ad8 +/* 05194C 80050D4C 2508D528 */ addiu $t0, %lo(gCurrentCarInput) # addiu $t0, $t0, -0x2ad8 .L80050D50: /* 051950 80050D50 3C098012 */ lui $t1, %hi(D_8011D534) # $t1, 0x8012 /* 051954 80050D54 2529D534 */ addiu $t1, %lo(D_8011D534) # addiu $t1, $t1, -0x2acc @@ -456,8 +456,8 @@ glabel func_80050A28 .L80051014: /* 051C14 80051014 0C015C88 */ jal func_80057220 /* 051C18 80051018 AFA70078 */ sw $a3, 0x78($sp) -/* 051C1C 8005101C 3C0F8012 */ lui $t7, %hi(D_8011D528) # $t7, 0x8012 -/* 051C20 80051020 8DEFD528 */ lw $t7, %lo(D_8011D528)($t7) +/* 051C1C 8005101C 3C0F8012 */ lui $t7, %hi(gCurrentCarInput) # $t7, 0x8012 +/* 051C20 80051020 8DEFD528 */ lw $t7, %lo(gCurrentCarInput)($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(D_8011D528) # $v0, 0x8012 -/* 051E60 80051260 8C42D528 */ lw $v0, %lo(D_8011D528)($v0) +/* 051E5C 8005125C 3C028012 */ lui $v0, %hi(gCurrentCarInput) # $v0, 0x8012 +/* 051E60 80051260 8C42D528 */ lw $v0, %lo(gCurrentCarInput)($v0) /* 051E64 80051264 820301E1 */ lb $v1, 0x1e1($s0) /* 051E68 80051268 30584000 */ andi $t8, $v0, 0x4000 /* 051E6C 8005126C 24060006 */ li $a2, 6 @@ -680,7 +680,7 @@ glabel func_80050A28 /* 051F3C 8005133C 440F4000 */ mfc1 $t7, $f8 /* 051F40 80051340 44CDF800 */ ctc1 $t5, $31 /* 051F44 80051344 01CFC023 */ subu $t8, $t6, $t7 -/* 051F48 80051348 0C014D1E */ jal func_80053478 +/* 051F48 80051348 0C014D1E */ jal handle_car_steering /* 051F4C 8005134C A61801A0 */ sh $t8, 0x1a0($s0) /* 051F50 80051350 C606002C */ lwc1 $f6, 0x2c($s0) /* 051F54 80051354 3C01C010 */ li $at, 0xC0100000 # -2.250000 @@ -691,8 +691,8 @@ glabel func_80050A28 /* 051F68 80051368 44807000 */ mtc1 $zero, $f14 /* 051F6C 8005136C 45000032 */ bc1f .L80051438 /* 051F70 80051370 00004825 */ move $t1, $zero -/* 051F74 80051374 3C028012 */ lui $v0, %hi(D_8011D554) # $v0, 0x8012 -/* 051F78 80051378 8C42D554 */ lw $v0, %lo(D_8011D554)($v0) +/* 051F74 80051374 3C028012 */ lui $v0, %hi(gCurrentCarSteerVel) # $v0, 0x8012 +/* 051F78 80051378 8C42D554 */ lw $v0, %lo(gCurrentCarSteerVel)($v0) /* 051F7C 8005137C 00000000 */ nop /* 051F80 80051380 28411401 */ slti $at, $v0, 0x1401 /* 051F84 80051384 10200007 */ beqz $at, .L800513A4 @@ -718,9 +718,9 @@ glabel func_80050A28 /* 051FCC 800513CC 0326C821 */ addu $t9, $t9, $a2 /* 051FD0 800513D0 0019C900 */ sll $t9, $t9, 4 /* 051FD4 800513D4 00596021 */ addu $t4, $v0, $t9 -/* 051FD8 800513D8 3C018012 */ lui $at, %hi(D_8011D554) # $at, 0x8012 +/* 051FD8 800513D8 3C018012 */ lui $at, %hi(gCurrentCarSteerVel) # $at, 0x8012 /* 051FDC 800513DC 10000016 */ b .L80051438 -/* 051FE0 800513E0 AC2CD554 */ sw $t4, %lo(D_8011D554)($at) +/* 051FE0 800513E0 AC2CD554 */ sw $t4, %lo(gCurrentCarSteerVel)($at) .L800513E4: /* 051FE4 800513E4 14200005 */ bnez $at, .L800513FC /* 051FE8 800513E8 00000000 */ nop @@ -743,8 +743,8 @@ glabel func_80050A28 /* 052024 80051424 01E67821 */ addu $t7, $t7, $a2 /* 052028 80051428 000F7900 */ sll $t7, $t7, 4 /* 05202C 8005142C 004FC023 */ subu $t8, $v0, $t7 -/* 052030 80051430 3C018012 */ lui $at, %hi(D_8011D554) # $at, 0x8012 -/* 052034 80051434 AC38D554 */ sw $t8, %lo(D_8011D554)($at) +/* 052030 80051430 3C018012 */ lui $at, %hi(gCurrentCarSteerVel) # $at, 0x8012 +/* 052034 80051434 AC38D554 */ sw $t8, %lo(gCurrentCarSteerVel)($at) .L80051438: /* 052038 80051438 44808000 */ mtc1 $zero, $f16 /* 05203C 8005143C 44801000 */ mtc1 $zero, $f2 @@ -767,7 +767,7 @@ glabel func_80050A28 /* 05207C 8005147C E7B00040 */ swc1 $f16, 0x40($sp) /* 052080 80051480 8FA50028 */ lw $a1, 0x28($sp) /* 052084 80051484 8FA60070 */ lw $a2, 0x70($sp) -/* 052088 80051488 3C07800E */ lui $a3, %hi(D_800DCB9C) # $a3, 0x800e +/* 052088 80051488 3C07800E */ lui $a3, %hi(gSurfaceSpeedScrubTable) # $a3, 0x800e /* 05208C 8005148C 83A80057 */ lb $t0, 0x57($sp) /* 052090 80051490 8FA90064 */ lw $t1, 0x64($sp) /* 052094 80051494 C7A20048 */ lwc1 $f2, 0x48($sp) @@ -775,7 +775,7 @@ glabel func_80050A28 /* 05209C 8005149C C7B00040 */ lwc1 $f16, 0x40($sp) /* 0520A0 800514A0 00025A00 */ sll $t3, $v0, 8 /* 0520A4 800514A4 05610006 */ bgez $t3, .L800514C0 -/* 0520A8 800514A8 24E7CB9C */ addiu $a3, %lo(D_800DCB9C) # addiu $a3, $a3, -0x3464 +/* 0520A8 800514A8 24E7CB9C */ addiu $a3, %lo(gSurfaceSpeedScrubTable) # addiu $a3, $a3, -0x3464 /* 0520AC 800514AC C4E40000 */ lwc1 $f4, ($a3) /* 0520B0 800514B0 90A201DC */ lbu $v0, 0x1dc($a1) /* 0520B4 800514B4 46047380 */ add.s $f14, $f14, $f4 @@ -959,7 +959,7 @@ glabel func_80050A28 /* 052354 80051754 44804000 */ mtc1 $zero, $f8 /* 052358 80051758 46203287 */ neg.d $f10, $f6 /* 05235C 8005175C 46205020 */ cvt.s.d $f0, $f10 -/* 052360 80051760 3C0F8012 */ lui $t7, %hi(D_8011D554) # $t7, 0x8012 +/* 052360 80051760 3C0F8012 */ lui $t7, %hi(gCurrentCarSteerVel) # $t7, 0x8012 /* 052364 80051764 46000321 */ cvt.d.s $f12, $f0 /* 052368 80051768 4628603C */ c.lt.d $f12, $f8 /* 05236C 8005176C 00000000 */ nop @@ -969,7 +969,7 @@ glabel func_80050A28 /* 05237C 8005177C 00000000 */ nop /* 052380 80051780 46000321 */ cvt.d.s $f12, $f0 .L80051784: -/* 052384 80051784 8DEFD554 */ lw $t7, %lo(D_8011D554)($t7) +/* 052384 80051784 8DEFD554 */ lw $t7, %lo(gCurrentCarSteerVel)($t7) /* 052388 80051788 44804000 */ mtc1 $zero, $f8 /* 05238C 8005178C 448F2000 */ mtc1 $t7, $f4 /* 052390 80051790 00000000 */ nop @@ -980,11 +980,11 @@ glabel func_80050A28 /* 0523A4 800517A4 37010003 */ ori $at, $t8, 3 /* 0523A8 800517A8 38210002 */ xori $at, $at, 2 /* 0523AC 800517AC 44C1F800 */ ctc1 $at, $31 -/* 0523B0 800517B0 3C018012 */ lui $at, %hi(D_8011D554) # $at, 0x8012 +/* 0523B0 800517B0 3C018012 */ lui $at, %hi(gCurrentCarSteerVel) # $at, 0x8012 /* 0523B4 800517B4 460032A4 */ cvt.w.s $f10, $f6 /* 0523B8 800517B8 440A5000 */ mfc1 $t2, $f10 /* 0523BC 800517BC 44D8F800 */ ctc1 $t8, $31 -/* 0523C0 800517C0 AC2AD554 */ sw $t2, %lo(D_8011D554)($at) +/* 0523C0 800517C0 AC2AD554 */ sw $t2, %lo(gCurrentCarSteerVel)($at) /* 0523C4 800517C4 3C013FF0 */ li $at, 0x3FF00000 # 1.875000 /* 0523C8 800517C8 44814800 */ mtc1 $at, $f9 /* 0523CC 800517CC 3C01800E */ lui $at, %hi(D_800E6670 + 4) # $at, 0x800e @@ -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(D_8011D528) # $t2, 0x8012 -/* 05256C 8005196C 8D4AD528 */ lw $t2, %lo(D_8011D528)($t2) +/* 052568 80051968 3C0A8012 */ lui $t2, %hi(gCurrentCarInput) # $t2, 0x8012 +/* 05256C 8005196C 8D4AD528 */ lw $t2, %lo(gCurrentCarInput)($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(D_8011D528) # $v0, 0x8012 +/* 0529FC 80051DFC 3C028012 */ lui $v0, %hi(gCurrentCarInput) # $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(D_8011D528)($v0) +/* 052A34 80051E34 8C42D528 */ lw $v0, %lo(gCurrentCarInput)($v0) /* 052A38 80051E38 00000000 */ nop /* 052A3C 80051E3C 304B8000 */ andi $t3, $v0, 0x8000 /* 052A40 80051E40 15600012 */ bnez $t3, .L80051E8C @@ -1618,13 +1618,13 @@ glabel func_80050A28 /* 052D00 80052100 44803000 */ mtc1 $zero, $f6 /* 052D04 80052104 820E01E1 */ lb $t6, 0x1e1($s0) /* 052D08 80052108 46262202 */ mul.d $f8, $f4, $f6 -/* 052D0C 8005210C 3C0A8012 */ lui $t2, %hi(D_8011D554) # $t2, 0x8012 +/* 052D0C 8005210C 3C0A8012 */ lui $t2, %hi(gCurrentCarSteerVel) # $t2, 0x8012 /* 052D10 80052110 A20E01E8 */ sb $t6, 0x1e8($s0) /* 052D14 80052114 820B01E0 */ lb $t3, 0x1e0($s0) /* 052D18 80052118 46280281 */ sub.d $f10, $f0, $f8 /* 052D1C 8005211C 462054A0 */ cvt.s.d $f18, $f10 /* 052D20 80052120 E6120008 */ swc1 $f18, 8($s0) -/* 052D24 80052124 8D4AD554 */ lw $t2, %lo(D_8011D554)($t2) +/* 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 diff --git a/asm/non_matchings/racer/func_8005250C.s b/asm/non_matchings/racer/func_8005250C.s index 2cf28bcd..79510798 100644 --- a/asm/non_matchings/racer/func_8005250C.s +++ b/asm/non_matchings/racer/func_8005250C.s @@ -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(D_8011D528) # $t7, 0x8012 +/* 0532E0 800526E0 3C0F8012 */ lui $t7, %hi(gCurrentCarInput) # $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(D_8011D528)($t7) +/* 053390 80052790 8DEFD528 */ lw $t7, %lo(gCurrentCarInput)($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(D_8011D528) # $t1, 0x8012 -/* 05345C 8005285C 8D29D528 */ lw $t1, %lo(D_8011D528)($t1) +/* 053458 80052858 3C098012 */ lui $t1, %hi(gCurrentCarInput) # $t1, 0x8012 +/* 05345C 8005285C 8D29D528 */ lw $t1, %lo(gCurrentCarInput)($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(D_8011D528) # $t7, 0x8012 -/* 0534C8 800528C8 8DEFD528 */ lw $t7, %lo(D_8011D528)($t7) +/* 0534C4 800528C4 3C0F8012 */ lui $t7, %hi(gCurrentCarInput) # $t7, 0x8012 +/* 0534C8 800528C8 8DEFD528 */ lw $t7, %lo(gCurrentCarInput)($t7) /* 0534CC 800528CC 00000000 */ nop /* 0534D0 800528D0 31F94000 */ andi $t9, $t7, 0x4000 /* 0534D4 800528D4 13200003 */ beqz $t9, .L800528E4 diff --git a/asm/non_matchings/racer/func_80052B64.s b/asm/non_matchings/racer/func_80052B64.s index 6b3cf658..e1f821b6 100644 --- a/asm/non_matchings/racer/func_80052B64.s +++ b/asm/non_matchings/racer/func_80052B64.s @@ -128,8 +128,8 @@ glabel func_80052B64 /* 053934 80052D34 A0E001DB */ sb $zero, 0x1db($a3) .L80052D38: /* 053938 80052D38 84EF01A2 */ lh $t7, 0x1a2($a3) -/* 05393C 80052D3C 3C018012 */ lui $at, %hi(D_8011D554) # $at, 0x8012 -/* 053940 80052D40 AC2FD554 */ sw $t7, %lo(D_8011D554)($at) +/* 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) diff --git a/asm/non_matchings/racer/func_80052D7C.s b/asm/non_matchings/racer/func_80052D7C.s index 647a5877..f14782ac 100644 --- a/asm/non_matchings/racer/func_80052D7C.s +++ b/asm/non_matchings/racer/func_80052D7C.s @@ -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(D_8011D528) # $v0, 0x8012 +/* 053B64 80052F64 3C028012 */ lui $v0, %hi(gCurrentCarInput) # $v0, 0x8012 /* 053B68 80052F68 A0AB01E8 */ sb $t3, 0x1e8($a1) -/* 053B6C 80052F6C 8C42D528 */ lw $v0, %lo(D_8011D528)($v0) +/* 053B6C 80052F6C 8C42D528 */ lw $v0, %lo(gCurrentCarInput)($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(D_8011D528) # $v0, 0x8012 +/* 053B94 80052F94 3C028012 */ lui $v0, %hi(gCurrentCarInput) # $v0, 0x8012 /* 053B98 80052F98 462091A0 */ cvt.s.d $f6, $f18 /* 053B9C 80052F9C E4A6002C */ swc1 $f6, 0x2c($a1) -/* 053BA0 80052FA0 8C42D528 */ lw $v0, %lo(D_8011D528)($v0) +/* 053BA0 80052FA0 8C42D528 */ lw $v0, %lo(gCurrentCarInput)($v0) /* 053BA4 80052FA4 00000000 */ nop /* 053BA8 80052FA8 304E4000 */ andi $t6, $v0, 0x4000 .L80052FAC: @@ -238,7 +238,7 @@ glabel func_80052D7C /* 053C84 80053084 84A90000 */ lh $t1, ($a1) /* 053C88 80053088 2401FFFF */ li $at, -1 /* 053C8C 8005308C 15210004 */ bne $t1, $at, .L800530A0 -/* 053C90 80053090 3C068012 */ lui $a2, %hi(D_8011D554) # $a2, 0x8012 +/* 053C90 80053090 3C068012 */ lui $a2, %hi(gCurrentCarSteerVel) # $a2, 0x8012 /* 053C94 80053094 80AA01E1 */ lb $t2, 0x1e1($a1) /* 053C98 80053098 00000000 */ nop /* 053C9C 8005309C A0AA01E8 */ sb $t2, 0x1e8($a1) @@ -246,7 +246,7 @@ glabel func_80052D7C /* 053CA0 800530A0 80A201D3 */ lb $v0, 0x1d3($a1) /* 053CA4 800530A4 3C01800E */ lui $at, %hi(D_800E6708 + 4) # $at, 0x800e /* 053CA8 800530A8 18400006 */ blez $v0, .L800530C4 -/* 053CAC 800530AC 24C6D554 */ addiu $a2, %lo(D_8011D554) # addiu $a2, $a2, -0x2aac +/* 053CAC 800530AC 24C6D554 */ addiu $a2, %lo(gCurrentCarSteerVel) # addiu $a2, $a2, -0x2aac /* 053CB0 800530B0 8FAB0048 */ lw $t3, 0x48($sp) /* 053CB4 800530B4 00000000 */ nop /* 053CB8 800530B8 004B6023 */ subu $t4, $v0, $t3 @@ -403,7 +403,7 @@ glabel func_80052D7C /* 053EEC 800532EC ACC00000 */ sw $zero, ($a2) /* 053EF0 800532F0 E7A2002C */ swc1 $f2, 0x2c($sp) /* 053EF4 800532F4 AFA50044 */ sw $a1, 0x44($sp) -/* 053EF8 800532F8 0C014D1E */ jal func_80053478 +/* 053EF8 800532F8 0C014D1E */ jal handle_car_steering /* 053EFC 800532FC AFA30038 */ sw $v1, 0x38($sp) /* 053F00 80053300 8FA30038 */ lw $v1, 0x38($sp) /* 053F04 80053304 8FA50044 */ lw $a1, 0x44($sp) diff --git a/asm/non_matchings/racer/func_80054110.s b/asm/non_matchings/racer/func_80054110.s index e02c0a57..de5fae5d 100644 --- a/asm/non_matchings/racer/func_80054110.s +++ b/asm/non_matchings/racer/func_80054110.s @@ -17,13 +17,13 @@ glabel func_80054110 /* 054D20 80054120 AFA600B8 */ sw $a2, 0xb8($sp) /* 054D24 80054124 AFA700BC */ sw $a3, 0xbc($sp) /* 054D28 80054128 C484000C */ lwc1 $f4, 0xc($a0) -/* 054D2C 8005412C 3C018012 */ lui $at, %hi(D_8011D554) # $at, 0x8012 +/* 054D2C 8005412C 3C018012 */ lui $at, %hi(gCurrentCarSteerVel) # $at, 0x8012 /* 054D30 80054130 E7A40098 */ swc1 $f4, 0x98($sp) /* 054D34 80054134 C4860010 */ lwc1 $f6, 0x10($a0) /* 054D38 80054138 00808825 */ move $s1, $a0 /* 054D3C 8005413C E7A60094 */ swc1 $f6, 0x94($sp) /* 054D40 80054140 C4880014 */ lwc1 $f8, 0x14($a0) -/* 054D44 80054144 AC20D554 */ sw $zero, %lo(D_8011D554)($at) +/* 054D44 80054144 AC20D554 */ sw $zero, %lo(gCurrentCarSteerVel)($at) /* 054D48 80054148 00A08025 */ move $s0, $a1 /* 054D4C 8005414C 3C018012 */ lui $at, %hi(D_8011D558) # $at, 0x8012 /* 054D50 80054150 00A02025 */ move $a0, $a1 @@ -32,7 +32,7 @@ glabel func_80054110 /* 054D5C 8005415C 00E03025 */ move $a2, $a3 /* 054D60 80054160 0C015E6C */ jal func_800579B0 /* 054D64 80054164 E7A80090 */ swc1 $f8, 0x90($sp) -/* 054D68 80054168 0C014D99 */ jal func_80053664 +/* 054D68 80054168 0C014D99 */ jal handle_car_velocity_control /* 054D6C 8005416C 02002025 */ move $a0, $s0 /* 054D70 80054170 02202025 */ move $a0, $s1 /* 054D74 80054174 0C015D7B */ jal func_800575EC @@ -224,8 +224,8 @@ glabel func_80054110 /* 055020 80054420 0C0148D3 */ jal func_8005234C /* 055024 80054424 A6220018 */ sh $v0, 0x18($s1) /* 055028 80054428 860401A2 */ lh $a0, 0x1a2($s0) -/* 05502C 8005442C 3C088012 */ lui $t0, %hi(D_8011D554) # $t0, 0x8012 -/* 055030 80054430 8D08D554 */ lw $t0, %lo(D_8011D554)($t0) +/* 05502C 8005442C 3C088012 */ lui $t0, %hi(gCurrentCarSteerVel) # $t0, 0x8012 +/* 055030 80054430 8D08D554 */ lw $t0, %lo(gCurrentCarSteerVel)($t0) /* 055034 80054434 3089FFFF */ andi $t1, $a0, 0xffff /* 055038 80054438 34018001 */ li $at, 32769 /* 05503C 8005443C 01091023 */ subu $v0, $t0, $t1 diff --git a/asm/non_matchings/racer/func_8005492C.s b/asm/non_matchings/racer/func_8005492C.s index 6124668d..f14da711 100644 --- a/asm/non_matchings/racer/func_8005492C.s +++ b/asm/non_matchings/racer/func_8005492C.s @@ -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(D_8011D528) # $v0, 0x8012 -/* 0555B0 800549B0 8C42D528 */ lw $v0, %lo(D_8011D528)($v0) +/* 0555AC 800549AC 3C028012 */ lui $v0, %hi(gCurrentCarInput) # $v0, 0x8012 +/* 0555B0 800549B0 8C42D528 */ lw $v0, %lo(gCurrentCarInput)($v0) /* 0555B4 800549B4 8C84D534 */ lw $a0, %lo(D_8011D534)($a0) /* 0555B8 800549B8 304F4000 */ andi $t7, $v0, 0x4000 /* 0555BC 800549BC 24030006 */ li $v1, 6 @@ -124,7 +124,7 @@ glabel func_8005492C /* 055698 80054A98 A4AD01A0 */ sh $t5, 0x1a0($a1) /* 05569C 80054A9C E7A20030 */ swc1 $f2, 0x30($sp) /* 0556A0 80054AA0 AFA70048 */ sw $a3, 0x48($sp) -/* 0556A4 80054AA4 0C014D1E */ jal func_80053478 +/* 0556A4 80054AA4 0C014D1E */ jal handle_car_steering /* 0556A8 80054AA8 AFA5004C */ sw $a1, 0x4c($sp) /* 0556AC 80054AAC 8FA5004C */ lw $a1, 0x4c($sp) /* 0556B0 80054AB0 3C01800E */ lui $at, %hi(D_800E67F8 + 4) # $at, 0x800e @@ -144,9 +144,9 @@ glabel func_8005492C /* 0556E8 80054AE8 10810008 */ beq $a0, $at, .L80054B0C /* 0556EC 80054AEC 46009006 */ mov.s $f0, $f18 /* 0556F0 80054AF0 00047080 */ sll $t6, $a0, 2 -/* 0556F4 80054AF4 3C01800E */ lui $at, %hi(D_800DCB9C) # $at, 0x800e +/* 0556F4 80054AF4 3C01800E */ lui $at, %hi(gSurfaceSpeedScrubTable) # $at, 0x800e /* 0556F8 80054AF8 002E0821 */ addu $at, $at, $t6 -/* 0556FC 80054AFC C426CB9C */ lwc1 $f6, %lo(D_800DCB9C)($at) +/* 0556FC 80054AFC C426CB9C */ lwc1 $f6, %lo(gSurfaceSpeedScrubTable)($at) /* 055700 80054B00 18800002 */ blez $a0, .L80054B0C /* 055704 80054B04 46069000 */ add.s $f0, $f18, $f6 /* 055708 80054B08 00801825 */ move $v1, $a0 @@ -353,11 +353,11 @@ glabel func_8005492C /* 0559F4 80054DF4 3C088012 */ lui $t0, %hi(D_8011D538) # $t0, 0x8012 /* 0559F8 80054DF8 46244182 */ mul.d $f6, $f8, $f4 /* 0559FC 80054DFC 8D08D538 */ lw $t0, %lo(D_8011D538)($t0) -/* 055A00 80054E00 3C028012 */ lui $v0, %hi(D_8011D528) # $v0, 0x8012 +/* 055A00 80054E00 3C028012 */ lui $v0, %hi(gCurrentCarInput) # $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(D_8011D528)($v0) +/* 055A10 80054E10 8C42D528 */ lw $v0, %lo(gCurrentCarInput)($v0) /* 055A14 80054E14 00000000 */ nop /* 055A18 80054E18 30498000 */ andi $t1, $v0, 0x8000 /* 055A1C 80054E1C 15200008 */ bnez $t1, .L80054E40 diff --git a/asm/non_matchings/racer/func_80055EC0.s b/asm/non_matchings/racer/func_80055EC0.s index 35c2b677..727bcdeb 100644 --- a/asm/non_matchings/racer/func_80055EC0.s +++ b/asm/non_matchings/racer/func_80055EC0.s @@ -213,7 +213,7 @@ glabel func_80055EC0 /* 056DBC 800561BC 00000000 */ nop .L800561C0: /* 056DC0 800561C0 820C0195 */ lb $t4, 0x195($s0) -/* 056DC4 800561C4 3C0B8012 */ lui $t3, %hi(D_8011D528) # $t3, 0x8012 +/* 056DC4 800561C4 3C0B8012 */ lui $t3, %hi(gCurrentCarInput) # $t3, 0x8012 /* 056DC8 800561C8 11800006 */ beqz $t4, .L800561E4 /* 056DCC 800561CC 00000000 */ nop /* 056DD0 800561D0 82190175 */ lb $t9, 0x175($s0) @@ -222,7 +222,7 @@ glabel func_80055EC0 /* 056DDC 800561DC 8FBF0024 */ lw $ra, 0x24($sp) /* 056DE0 800561E0 A2000195 */ sb $zero, 0x195($s0) .L800561E4: -/* 056DE4 800561E4 8D6BD528 */ lw $t3, %lo(D_8011D528)($t3) +/* 056DE4 800561E4 8D6BD528 */ lw $t3, %lo(gCurrentCarInput)($t3) /* 056DE8 800561E8 3C038012 */ lui $v1, %hi(D_8011D530) # $v1, 0x8012 /* 056DEC 800561EC 316D2000 */ andi $t5, $t3, 0x2000 /* 056DF0 800561F0 15A00006 */ bnez $t5, .L8005620C diff --git a/asm/non_matchings/racer/func_80057220.s b/asm/non_matchings/racer/func_80057220.s index b245e096..959369bc 100644 --- a/asm/non_matchings/racer/func_80057220.s +++ b/asm/non_matchings/racer/func_80057220.s @@ -34,7 +34,7 @@ glabel func_80057220 /* 057E88 80057288 2483FFF2 */ addiu $v1, $a0, -0xe /* 057E8C 8005728C 33198000 */ andi $t9, $t8, 0x8000 /* 057E90 80057290 1320003C */ beqz $t9, .L80057384 -/* 057E94 80057294 3C088012 */ lui $t0, %hi(D_8011D528) # $t0, 0x8012 +/* 057E94 80057294 3C088012 */ lui $t0, %hi(gCurrentCarInput) # $t0, 0x8012 /* 057E98 80057298 04610004 */ bgez $v1, .L800572AC /* 057E9C 8005729C 240A0018 */ li $t2, 24 /* 057EA0 800572A0 04400002 */ bltz $v0, .L800572AC @@ -45,7 +45,7 @@ glabel func_80057220 /* 057EB0 800572B0 00000000 */ nop /* 057EB4 800572B4 00031823 */ negu $v1, $v1 .L800572B8: -/* 057EB8 800572B8 8D08D528 */ lw $t0, %lo(D_8011D528)($t0) +/* 057EB8 800572B8 8D08D528 */ lw $t0, %lo(gCurrentCarInput)($t0) /* 057EBC 800572BC 28610002 */ slti $at, $v1, 2 /* 057EC0 800572C0 31092000 */ andi $t1, $t0, 0x2000 /* 057EC4 800572C4 11200005 */ beqz $t1, .L800572DC diff --git a/asm/non_matchings/racer/func_800581E8.s b/asm/non_matchings/racer/func_800581E8.s index f6d7d3d9..a3478f9b 100644 --- a/asm/non_matchings/racer/func_800581E8.s +++ b/asm/non_matchings/racer/func_800581E8.s @@ -367,9 +367,9 @@ glabel func_800581E8 /* 05930C 8005870C 0C01C1FE */ jal func_800707F8 /* 059310 80058710 000B2403 */ sra $a0, $t3, 0x10 /* 059314 80058714 C7AC0040 */ lwc1 $f12, 0x40($sp) -/* 059318 80058718 3C0D8012 */ lui $t5, %hi(D_8011D528) # $t5, 0x8012 +/* 059318 80058718 3C0D8012 */ lui $t5, %hi(gCurrentCarInput) # $t5, 0x8012 /* 05931C 8005871C 460C0202 */ mul.s $f8, $f0, $f12 -/* 059320 80058720 8DADD528 */ lw $t5, %lo(D_8011D528)($t5) +/* 059320 80058720 8DADD528 */ lw $t5, %lo(gCurrentCarInput)($t5) /* 059324 80058724 44807000 */ mtc1 $zero, $f14 /* 059328 80058728 8FA70070 */ lw $a3, 0x70($sp) /* 05932C 8005872C 31AF8000 */ andi $t7, $t5, 0x8000 diff --git a/asm/non_matchings/racer/func_8005A424.s b/asm/non_matchings/racer/func_8005A424.s index 4330b1d0..fa2345e5 100644 --- a/asm/non_matchings/racer/func_8005A424.s +++ b/asm/non_matchings/racer/func_8005A424.s @@ -27,7 +27,7 @@ glabel func_8005A424 .L8005A488: /* 05B088 8005A488 28618000 */ slti $at, $v1, -0x8000 /* 05B08C 8005A48C 10200003 */ beqz $at, .L8005A49C -/* 05B090 8005A490 3C048012 */ lui $a0, %hi(D_8011D528) # $a0, 0x8012 +/* 05B090 8005A490 3C048012 */ lui $a0, %hi(gCurrentCarInput) # $a0, 0x8012 /* 05B094 8005A494 3401FFFF */ li $at, 65535 /* 05B098 8005A498 00611821 */ addu $v1, $v1, $at .L8005A49C: @@ -40,7 +40,7 @@ glabel func_8005A424 /* 05B0B4 8005A4B4 AC20D52C */ sw $zero, %lo(gActivePlayerButtonPress)($at) /* 05B0B8 8005A4B8 3C018012 */ lui $at, %hi(D_8011D530) # $at, 0x8012 /* 05B0BC 8005A4BC AC20D530 */ sw $zero, %lo(D_8011D530)($at) -/* 05B0C0 8005A4C0 2484D528 */ addiu $a0, %lo(D_8011D528) # addiu $a0, $a0, -0x2ad8 +/* 05B0C0 8005A4C0 2484D528 */ addiu $a0, %lo(gCurrentCarInput) # addiu $a0, $a0, -0x2ad8 /* 05B0C4 8005A4C4 AC800000 */ sw $zero, ($a0) /* 05B0C8 8005A4C8 3C018012 */ lui $at, %hi(D_8011D538) # $at, 0x8012 /* 05B0CC 8005A4CC AC20D538 */ sw $zero, %lo(D_8011D538)($at) diff --git a/asm/non_matchings/racer/func_8005A6F0.s b/asm/non_matchings/racer/func_8005A6F0.s index 79bc0ac7..fd0db90b 100644 --- a/asm/non_matchings/racer/func_8005A6F0.s +++ b/asm/non_matchings/racer/func_8005A6F0.s @@ -367,8 +367,8 @@ glabel func_8005A6F0 /* 05B7BC 8005ABBC 8FA700AC */ lw $a3, 0xac($sp) /* 05B7C0 8005ABC0 0C01105C */ jal func_80044170 /* 05B7C4 8005ABC4 02002825 */ move $a1, $s0 -/* 05B7C8 8005ABC8 3C0E8012 */ lui $t6, %hi(D_8011D528) # $t6, 0x8012 -/* 05B7CC 8005ABCC 8DCED528 */ lw $t6, %lo(D_8011D528)($t6) +/* 05B7C8 8005ABC8 3C0E8012 */ lui $t6, %hi(gCurrentCarInput) # $t6, 0x8012 +/* 05B7CC 8005ABCC 8DCED528 */ lw $t6, %lo(gCurrentCarInput)($t6) /* 05B7D0 8005ABD0 3C0C8012 */ lui $t4, %hi(D_8011D56C) # $t4, 0x8012 /* 05B7D4 8005ABD4 31D88000 */ andi $t8, $t6, 0x8000 /* 05B7D8 8005ABD8 258CD56C */ addiu $t4, %lo(D_8011D56C) # addiu $t4, $t4, -0x2a94 @@ -594,9 +594,9 @@ glabel func_8005A6F0 /* 05BB10 8005AF10 3C018012 */ lui $at, %hi(D_8011D534) # $at, 0x8012 /* 05BB14 8005AF14 AC20D534 */ sw $zero, %lo(D_8011D534)($at) /* 05BB18 8005AF18 3C018012 */ lui $at, %hi(D_8011D538) # $at, 0x8012 -/* 05BB1C 8005AF1C 3C038012 */ lui $v1, %hi(D_8011D528) # $v1, 0x8012 +/* 05BB1C 8005AF1C 3C038012 */ lui $v1, %hi(gCurrentCarInput) # $v1, 0x8012 /* 05BB20 8005AF20 AC20D538 */ sw $zero, %lo(D_8011D538)($at) -/* 05BB24 8005AF24 2463D528 */ addiu $v1, %lo(D_8011D528) # addiu $v1, $v1, -0x2ad8 +/* 05BB24 8005AF24 2463D528 */ addiu $v1, %lo(gCurrentCarInput) # addiu $v1, $v1, -0x2ad8 /* 05BB28 8005AF28 3C028012 */ lui $v0, %hi(gActivePlayerButtonPress) # $v0, 0x8012 /* 05BB2C 8005AF2C AC600000 */ sw $zero, ($v1) /* 05BB30 8005AF30 3C018012 */ lui $at, %hi(D_8011D530) # $at, 0x8012 @@ -608,9 +608,9 @@ glabel func_8005A6F0 .L8005AF48: /* 05BB48 8005AF48 921901D6 */ lbu $t9, 0x1d6($s0) /* 05BB4C 8005AF4C 3C028012 */ lui $v0, %hi(gActivePlayerButtonPress) # $v0, 0x8012 -/* 05BB50 8005AF50 3C038012 */ lui $v1, %hi(D_8011D528) # $v1, 0x8012 +/* 05BB50 8005AF50 3C038012 */ lui $v1, %hi(gCurrentCarInput) # $v1, 0x8012 /* 05BB54 8005AF54 2F21000E */ sltiu $at, $t9, 0xe -/* 05BB58 8005AF58 2463D528 */ addiu $v1, %lo(D_8011D528) # addiu $v1, $v1, -0x2ad8 +/* 05BB58 8005AF58 2463D528 */ addiu $v1, %lo(gCurrentCarInput) # addiu $v1, $v1, -0x2ad8 /* 05BB5C 8005AF5C 10200094 */ beqz $at, .L8005B1B0 /* 05BB60 8005AF60 2442D52C */ addiu $v0, %lo(gActivePlayerButtonPress) # addiu $v0, $v0, -0x2ad4 /* 05BB64 8005AF64 0019C880 */ sll $t9, $t9, 2 @@ -626,10 +626,10 @@ glabel L8005AF80 /* 05BB88 8005AF88 8FA600A0 */ lw $a2, 0xa0($sp) /* 05BB8C 8005AF8C 0C013DFD */ jal func_8004F7F4 /* 05BB90 8005AF90 02003825 */ move $a3, $s0 -/* 05BB94 8005AF94 3C038012 */ lui $v1, %hi(D_8011D528) # $v1, 0x8012 +/* 05BB94 8005AF94 3C038012 */ lui $v1, %hi(gCurrentCarInput) # $v1, 0x8012 /* 05BB98 8005AF98 3C028012 */ lui $v0, %hi(gActivePlayerButtonPress) # $v0, 0x8012 /* 05BB9C 8005AF9C 2442D52C */ addiu $v0, %lo(gActivePlayerButtonPress) # addiu $v0, $v0, -0x2ad4 -/* 05BBA0 8005AFA0 2463D528 */ addiu $v1, %lo(D_8011D528) # addiu $v1, $v1, -0x2ad8 +/* 05BBA0 8005AFA0 2463D528 */ addiu $v1, %lo(gCurrentCarInput) # addiu $v1, $v1, -0x2ad8 /* 05BBA4 8005AFA4 10000082 */ b .L8005B1B0 /* 05BBA8 8005AFA8 240B0001 */ li $t3, 1 glabel L8005AFAC @@ -638,10 +638,10 @@ glabel L8005AFAC /* 05BBB4 8005AFB4 8FA600A0 */ lw $a2, 0xa0($sp) /* 05BBB8 8005AFB8 0C013308 */ jal func_8004CC20 /* 05BBBC 8005AFBC 02003825 */ move $a3, $s0 -/* 05BBC0 8005AFC0 3C038012 */ lui $v1, %hi(D_8011D528) # $v1, 0x8012 +/* 05BBC0 8005AFC0 3C038012 */ lui $v1, %hi(gCurrentCarInput) # $v1, 0x8012 /* 05BBC4 8005AFC4 3C028012 */ lui $v0, %hi(gActivePlayerButtonPress) # $v0, 0x8012 /* 05BBC8 8005AFC8 2442D52C */ addiu $v0, %lo(gActivePlayerButtonPress) # addiu $v0, $v0, -0x2ad4 -/* 05BBCC 8005AFCC 2463D528 */ addiu $v1, %lo(D_8011D528) # addiu $v1, $v1, -0x2ad8 +/* 05BBCC 8005AFCC 2463D528 */ addiu $v1, %lo(gCurrentCarInput) # addiu $v1, $v1, -0x2ad8 /* 05BBD0 8005AFD0 10000077 */ b .L8005B1B0 /* 05BBD4 8005AFD4 240B0001 */ li $t3, 1 glabel L8005AFD8 @@ -650,10 +650,10 @@ glabel L8005AFD8 /* 05BBE0 8005AFE0 8FA600A0 */ lw $a2, 0xa0($sp) /* 05BBE4 8005AFE4 0C011949 */ jal func_80046524 /* 05BBE8 8005AFE8 02003825 */ move $a3, $s0 -/* 05BBEC 8005AFEC 3C038012 */ lui $v1, %hi(D_8011D528) # $v1, 0x8012 +/* 05BBEC 8005AFEC 3C038012 */ lui $v1, %hi(gCurrentCarInput) # $v1, 0x8012 /* 05BBF0 8005AFF0 3C028012 */ lui $v0, %hi(gActivePlayerButtonPress) # $v0, 0x8012 /* 05BBF4 8005AFF4 2442D52C */ addiu $v0, %lo(gActivePlayerButtonPress) # addiu $v0, $v0, -0x2ad4 -/* 05BBF8 8005AFF8 2463D528 */ addiu $v1, %lo(D_8011D528) # addiu $v1, $v1, -0x2ad8 +/* 05BBF8 8005AFF8 2463D528 */ addiu $v1, %lo(gCurrentCarInput) # addiu $v1, $v1, -0x2ad8 /* 05BBFC 8005AFFC 1000006C */ b .L8005B1B0 /* 05BC00 8005B000 240B0001 */ li $t3, 1 glabel L8005B004 @@ -662,10 +662,10 @@ glabel L8005B004 /* 05BC0C 8005B00C 8FA600A0 */ lw $a2, 0xa0($sp) /* 05BC10 8005B010 0C0125E5 */ jal func_80049794 /* 05BC14 8005B014 02003825 */ move $a3, $s0 -/* 05BC18 8005B018 3C038012 */ lui $v1, %hi(D_8011D528) # $v1, 0x8012 +/* 05BC18 8005B018 3C038012 */ lui $v1, %hi(gCurrentCarInput) # $v1, 0x8012 /* 05BC1C 8005B01C 3C028012 */ lui $v0, %hi(gActivePlayerButtonPress) # $v0, 0x8012 /* 05BC20 8005B020 2442D52C */ addiu $v0, %lo(gActivePlayerButtonPress) # addiu $v0, $v0, -0x2ad4 -/* 05BC24 8005B024 2463D528 */ addiu $v1, %lo(D_8011D528) # addiu $v1, $v1, -0x2ad8 +/* 05BC24 8005B024 2463D528 */ addiu $v1, %lo(gCurrentCarInput) # addiu $v1, $v1, -0x2ad8 /* 05BC28 8005B028 10000061 */ b .L8005B1B0 /* 05BC2C 8005B02C 240B0001 */ li $t3, 1 glabel L8005B030 @@ -674,10 +674,10 @@ glabel L8005B030 /* 05BC38 8005B038 8FA600A0 */ lw $a2, 0xa0($sp) /* 05BC3C 8005B03C 0C013657 */ jal func_8004D95C /* 05BC40 8005B040 02003825 */ move $a3, $s0 -/* 05BC44 8005B044 3C038012 */ lui $v1, %hi(D_8011D528) # $v1, 0x8012 +/* 05BC44 8005B044 3C038012 */ lui $v1, %hi(gCurrentCarInput) # $v1, 0x8012 /* 05BC48 8005B048 3C028012 */ lui $v0, %hi(gActivePlayerButtonPress) # $v0, 0x8012 /* 05BC4C 8005B04C 2442D52C */ addiu $v0, %lo(gActivePlayerButtonPress) # addiu $v0, $v0, -0x2ad4 -/* 05BC50 8005B050 2463D528 */ addiu $v1, %lo(D_8011D528) # addiu $v1, $v1, -0x2ad8 +/* 05BC50 8005B050 2463D528 */ addiu $v1, %lo(gCurrentCarInput) # addiu $v1, $v1, -0x2ad8 /* 05BC54 8005B054 10000056 */ b .L8005B1B0 /* 05BC58 8005B058 240B0001 */ li $t3, 1 glabel L8005B05C @@ -689,10 +689,10 @@ glabel L8005B05C /* 05BC70 8005B070 AFA20014 */ sw $v0, 0x14($sp) /* 05BC74 8005B074 0C0170D9 */ jal func_8005C364 /* 05BC78 8005B078 AFA80018 */ sw $t0, 0x18($sp) -/* 05BC7C 8005B07C 3C038012 */ lui $v1, %hi(D_8011D528) # $v1, 0x8012 +/* 05BC7C 8005B07C 3C038012 */ lui $v1, %hi(gCurrentCarInput) # $v1, 0x8012 /* 05BC80 8005B080 3C028012 */ lui $v0, %hi(gActivePlayerButtonPress) # $v0, 0x8012 /* 05BC84 8005B084 2442D52C */ addiu $v0, %lo(gActivePlayerButtonPress) # addiu $v0, $v0, -0x2ad4 -/* 05BC88 8005B088 2463D528 */ addiu $v1, %lo(D_8011D528) # addiu $v1, $v1, -0x2ad8 +/* 05BC88 8005B088 2463D528 */ addiu $v1, %lo(gCurrentCarInput) # addiu $v1, $v1, -0x2ad8 /* 05BC8C 8005B08C 10000048 */ b .L8005B1B0 /* 05BC90 8005B090 240B0001 */ li $t3, 1 glabel L8005B094 @@ -704,10 +704,10 @@ glabel L8005B094 /* 05BCA8 8005B0A8 AFA20014 */ sw $v0, 0x14($sp) /* 05BCAC 8005B0AC 0C017434 */ jal func_8005D0D0 /* 05BCB0 8005B0B0 AFA80018 */ sw $t0, 0x18($sp) -/* 05BCB4 8005B0B4 3C038012 */ lui $v1, %hi(D_8011D528) # $v1, 0x8012 +/* 05BCB4 8005B0B4 3C038012 */ lui $v1, %hi(gCurrentCarInput) # $v1, 0x8012 /* 05BCB8 8005B0B8 3C028012 */ lui $v0, %hi(gActivePlayerButtonPress) # $v0, 0x8012 /* 05BCBC 8005B0BC 2442D52C */ addiu $v0, %lo(gActivePlayerButtonPress) # addiu $v0, $v0, -0x2ad4 -/* 05BCC0 8005B0C0 2463D528 */ addiu $v1, %lo(D_8011D528) # addiu $v1, $v1, -0x2ad8 +/* 05BCC0 8005B0C0 2463D528 */ addiu $v1, %lo(gCurrentCarInput) # addiu $v1, $v1, -0x2ad8 /* 05BCC4 8005B0C4 1000003A */ b .L8005B1B0 /* 05BCC8 8005B0C8 240B0001 */ li $t3, 1 glabel L8005B0CC @@ -721,10 +721,10 @@ glabel L8005B0CC /* 05BCE8 8005B0E8 AFA30010 */ sw $v1, 0x10($sp) /* 05BCEC 8005B0EC 0C017608 */ jal func_8005D820 /* 05BCF0 8005B0F0 AFA80018 */ sw $t0, 0x18($sp) -/* 05BCF4 8005B0F4 3C038012 */ lui $v1, %hi(D_8011D528) # $v1, 0x8012 +/* 05BCF4 8005B0F4 3C038012 */ lui $v1, %hi(gCurrentCarInput) # $v1, 0x8012 /* 05BCF8 8005B0F8 3C028012 */ lui $v0, %hi(gActivePlayerButtonPress) # $v0, 0x8012 /* 05BCFC 8005B0FC 2442D52C */ addiu $v0, %lo(gActivePlayerButtonPress) # addiu $v0, $v0, -0x2ad4 -/* 05BD00 8005B100 2463D528 */ addiu $v1, %lo(D_8011D528) # addiu $v1, $v1, -0x2ad8 +/* 05BD00 8005B100 2463D528 */ addiu $v1, %lo(gCurrentCarInput) # addiu $v1, $v1, -0x2ad8 /* 05BD04 8005B104 1000002A */ b .L8005B1B0 /* 05BD08 8005B108 240B0001 */ li $t3, 1 glabel L8005B10C @@ -736,10 +736,10 @@ glabel L8005B10C /* 05BD20 8005B120 AFA20014 */ sw $v0, 0x14($sp) /* 05BD24 8005B124 0C017930 */ jal func_8005E4C0 /* 05BD28 8005B128 AFA80018 */ sw $t0, 0x18($sp) -/* 05BD2C 8005B12C 3C038012 */ lui $v1, %hi(D_8011D528) # $v1, 0x8012 +/* 05BD2C 8005B12C 3C038012 */ lui $v1, %hi(gCurrentCarInput) # $v1, 0x8012 /* 05BD30 8005B130 3C028012 */ lui $v0, %hi(gActivePlayerButtonPress) # $v0, 0x8012 /* 05BD34 8005B134 2442D52C */ addiu $v0, %lo(gActivePlayerButtonPress) # addiu $v0, $v0, -0x2ad4 -/* 05BD38 8005B138 2463D528 */ addiu $v1, %lo(D_8011D528) # addiu $v1, $v1, -0x2ad8 +/* 05BD38 8005B138 2463D528 */ addiu $v1, %lo(gCurrentCarInput) # addiu $v1, $v1, -0x2ad8 /* 05BD3C 8005B13C 1000001C */ b .L8005B1B0 /* 05BD40 8005B140 240B0001 */ li $t3, 1 glabel L8005B144 @@ -751,10 +751,10 @@ glabel L8005B144 /* 05BD58 8005B158 AFA20014 */ sw $v0, 0x14($sp) /* 05BD5C 8005B15C 0C017AA4 */ jal func_8005EA90 /* 05BD60 8005B160 AFA80018 */ sw $t0, 0x18($sp) -/* 05BD64 8005B164 3C038012 */ lui $v1, %hi(D_8011D528) # $v1, 0x8012 +/* 05BD64 8005B164 3C038012 */ lui $v1, %hi(gCurrentCarInput) # $v1, 0x8012 /* 05BD68 8005B168 3C028012 */ lui $v0, %hi(gActivePlayerButtonPress) # $v0, 0x8012 /* 05BD6C 8005B16C 2442D52C */ addiu $v0, %lo(gActivePlayerButtonPress) # addiu $v0, $v0, -0x2ad4 -/* 05BD70 8005B170 2463D528 */ addiu $v1, %lo(D_8011D528) # addiu $v1, $v1, -0x2ad8 +/* 05BD70 8005B170 2463D528 */ addiu $v1, %lo(gCurrentCarInput) # addiu $v1, $v1, -0x2ad8 /* 05BD74 8005B174 1000000E */ b .L8005B1B0 /* 05BD78 8005B178 240B0001 */ li $t3, 1 glabel L8005B17C @@ -766,10 +766,10 @@ glabel L8005B17C /* 05BD90 8005B190 AFA20014 */ sw $v0, 0x14($sp) /* 05BD94 8005B194 0C017CC4 */ jal func_8005F310 /* 05BD98 8005B198 AFA80018 */ sw $t0, 0x18($sp) -/* 05BD9C 8005B19C 3C038012 */ lui $v1, %hi(D_8011D528) # $v1, 0x8012 +/* 05BD9C 8005B19C 3C038012 */ lui $v1, %hi(gCurrentCarInput) # $v1, 0x8012 /* 05BDA0 8005B1A0 3C028012 */ lui $v0, %hi(gActivePlayerButtonPress) # $v0, 0x8012 /* 05BDA4 8005B1A4 2442D52C */ addiu $v0, %lo(gActivePlayerButtonPress) # addiu $v0, $v0, -0x2ad4 -/* 05BDA8 8005B1A8 2463D528 */ addiu $v1, %lo(D_8011D528) # addiu $v1, $v1, -0x2ad8 +/* 05BDA8 8005B1A8 2463D528 */ addiu $v1, %lo(gCurrentCarInput) # addiu $v1, $v1, -0x2ad8 /* 05BDAC 8005B1AC 240B0001 */ li $t3, 1 .L8005B1B0: glabel L8005B1B0 @@ -947,8 +947,8 @@ glabel L8005B1B0 /* 05C028 8005B428 240B0001 */ li $t3, 1 /* 05C02C 8005B42C 130B0008 */ beq $t8, $t3, .L8005B450 /* 05C030 8005B430 3C058012 */ lui $a1, %hi(gActivePlayerButtonPress) # $a1, 0x8012 -/* 05C034 8005B434 3C068012 */ lui $a2, %hi(D_8011D528) # $a2, 0x8012 -/* 05C038 8005B438 8CC6D528 */ lw $a2, %lo(D_8011D528)($a2) +/* 05C034 8005B434 3C068012 */ lui $a2, %hi(gCurrentCarInput) # $a2, 0x8012 +/* 05C038 8005B438 8CC6D528 */ lw $a2, %lo(gCurrentCarInput)($a2) /* 05C03C 8005B43C 8FA400A0 */ lw $a0, 0xa0($sp) /* 05C040 8005B440 8CA5D52C */ lw $a1, %lo(gActivePlayerButtonPress)($a1) /* 05C044 8005B444 8FA700A8 */ lw $a3, 0xa8($sp) diff --git a/src/object_models.c b/src/object_models.c index 3ca18fb1..4dfac82c 100644 --- a/src/object_models.c +++ b/src/object_models.c @@ -67,7 +67,7 @@ void func_8005F850(void) { checksum += *(u8 *)(((s32)&func_80024D54) + i); } if (checksum != gFunc80024D54Checksum) { - func_8005C25C(); + antipiracy_modify_surface_speed_table(); } } diff --git a/src/racer.c b/src/racer.c index 8ca91474..3c31a698 100644 --- a/src/racer.c +++ b/src/racer.c @@ -16,6 +16,7 @@ #include "audio.h" #include "object_functions.h" #include "game.h" +#include "printf.h" #define MAX_NUMBER_OF_GHOST_NODES 360 @@ -35,7 +36,9 @@ f32 D_800DCB60[14] = { }; s32 D_800DCB98 = 0; // Currently unknown, might be a different type. -f32 D_800DCB9C[19] = { +// Table used for quantifying speed reduction while the car drives over it. +// An antipiracy trigger can set the first index to 0.5f, which makes that surface type impossible to drive on. +f32 gSurfaceSpeedScrubTable[19] = { 0.004f, 0.007f, 0.01f, 0.004f, 0.01f, 0.01f, 0.01f, 0.01f, 0.01f, 0.01f, 0.004f, 0.004f, @@ -136,7 +139,7 @@ s32 D_8011D504; ObjectCamera *gCameraObject; s32 D_8011D50C; ObjectTransform D_8011D510; -s32 D_8011D528; +s32 gCurrentCarInput; // Related to input of the car. s32 gActivePlayerButtonPress; s32 D_8011D530; s32 D_8011D534; @@ -149,7 +152,7 @@ s32 D_8011D54C; s16 D_8011D550; s8 D_8011D552; s8 D_8011D553; -s32 D_8011D554; +s32 gCurrentCarSteerVel; // Related to rotational velocity of the car. s32 D_8011D558; s32 D_8011D55C; s32 D_8011D560; @@ -214,6 +217,7 @@ typedef struct Object_64_80044170 { s8 unk215; } Object_64_80044170; +// Might be the main loop for the AI racers. void func_80044170(Object *arg0, Object_64_80044170 *arg1, s32 arg2) { s32 raceType; @@ -267,9 +271,9 @@ void func_80044170(Object *arg0, Object_64_80044170 *arg1, s32 arg2) { if (arg1->unk214 != 0) { D_8011D534 *= -1; - D_8011D528 &= ~0x8000; + gCurrentCarInput &= ~A_BUTTON; D_8011D538 = -50; - D_8011D528 |= 0x4000; + gCurrentCarInput |= B_BUTTON; } if (D_8011D534 > 75) { @@ -427,13 +431,13 @@ GLOBAL_ASM("asm/non_matchings/racer/func_8004DE38.s") void func_8004F77C(unk8004F77C *arg0) { s32 temp; - arg0->unk20A &= ~0x80; - if ((D_8011D528 & 0x4000) != 0) { - arg0->unk20A |= 0x80; + arg0->flags &= ~0x80; + if ((gCurrentCarInput & B_BUTTON) != 0) { + arg0->flags |= 0x80; } - temp = arg0->unk20A & 0xF; - if ((arg0->unk20A & 0xC0) != 0) { + temp = arg0->flags & 0xF; + if ((arg0->flags & 0xC0) != 0) { temp++; if (temp >= 3) { temp = 2; @@ -445,7 +449,7 @@ void func_8004F77C(unk8004F77C *arg0) { } } - arg0->unk20A = (arg0->unk20A & 0xFFF0) | temp; + arg0->flags = (arg0->flags & 0xFFF0) | temp; } GLOBAL_ASM("asm/non_matchings/racer/func_8004F7F4.s") @@ -497,20 +501,23 @@ GLOBAL_ASM("asm/non_matchings/racer/func_80050754.s") GLOBAL_ASM("asm/non_matchings/racer/func_80050850.s") GLOBAL_ASM("asm/non_matchings/racer/func_80050A28.s") +// Loops for as long as Taj exists. After swapping vehicle once, will remain true until you enter a door. s32 func_80052188(void) { if (D_8011D582 == 2) { D_8011D582 = 1; - return 1; + return TRUE; } - return 0; + return FALSE; } +// Called when Taj swaps the active vehicle, is set to 1, each time. void func_800521B8(s32 arg0) { D_8011D582 = arg0; } GLOBAL_ASM("asm/non_matchings/racer/func_800521C4.s") +// Ran by the AI. Seems to be direction related of some sorts. void func_8005234C(unk8005234C *arg0) { arg0->unk16C -= arg0->unk16C >> 3; if (arg0->unk16C >= -9 && arg0->unk16C < 10) { // Deadzone? @@ -521,91 +528,115 @@ void func_8005234C(unk8005234C *arg0) { GLOBAL_ASM("asm/non_matchings/racer/func_80052388.s") GLOBAL_ASM("asm/non_matchings/racer/func_8005250C.s") -void func_80052988(Object *arg0, Object_64 *arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7) { +// action seems to be 1 when you're reversing, if you hit the horn, it's 4, and if you introduce yourself to a brick wall, it's 3 then 6. +// unk18 seems to be a counter that's used as a baseline for animations +// unk3B mostly mirrors what arg2 is, but it gets set to 0 +// I've yet to find a scenario where D_8011D55C is not 0. +// I've also yet to find a scenario where the action is < 3 +// arg6 is set to 6 when honking, but 7 when reversing and not honking and 0 when crashing. +// arg7 seems to be based on direction???? +void func_80052988(Object *arg0, Object_64 *arg1, s32 action, s32 arg3, s32 duration, s32 arg5, s32 arg6, s32 arg7) { arg5 *= arg7; - if ((D_8011D55C == -1) && (arg2 >= 3)) { + if ((D_8011D55C == -1) && (action >= 3)) { arg0->segment.unk3B = 0; arg1->unk1F2 = 0; + //render_printf("set0\n"); } else if (arg0->segment.unk3B == 0) { if (arg6 & 1) { - if (arg0->segment.unk18 >= 0x29) { + if (arg0->segment.unk18 >= 41) { arg0->segment.unk18 -= arg7 * 4; - if (arg0->segment.unk18 < 0x29) { - arg0->segment.unk3B = arg2; + if (arg0->segment.unk18 < 41) { + arg0->segment.unk3B = action; arg0->segment.unk18 = arg3; } + //render_printf("set1\n"); } else { arg0->segment.unk18 += arg7 * 4; - if (arg0->segment.unk18 >= 0x28) { - arg0->segment.unk3B = arg2; + if (arg0->segment.unk18 >= 40) { + arg0->segment.unk3B = action; arg0->segment.unk18 = arg3; } + //render_printf("set2\n"); } - } else { - arg0->segment.unk3B = arg2; + } else { // Set active flag, whether it's from just crashing, or beginning to honk. + arg0->segment.unk3B = action; arg0->segment.unk18 = arg3; arg1->unk1F3 &= ~0x80; } - } else if (arg0->segment.unk3B == arg2) { + } else if (arg0->segment.unk3B == action) { if (arg6 & 2) { - if (arg1->unk1F3 & 0x80) { + if (arg1->unk1F3 & 0x80) { // Stop honking or reversing. arg0->segment.unk18 -= arg5; if (arg0->segment.unk18 <= 0) { arg0->segment.unk3B = 0; arg1->unk1F2 = 0; - arg0->segment.unk18 = 0x28; + arg0->segment.unk18 = 40; arg1->unk1F3 = 0; } - } else { + } else { // Actively reversing or honking or boosting, possibly a velocity modifier, have found it's also set when recovering from getting hit by a rocket or spike trap arg0->segment.unk18 += arg5; - if (arg0->segment.unk18 >= arg4) { - arg0->segment.unk18 = arg4 - 1; + // Keeps the timer below the duration value, while actively held. + if (arg0->segment.unk18 >= duration) { + arg0->segment.unk18 = duration - 1; if ((arg6 & 4) == 0) { arg1->unk1F3 |= 0x80; } } } - } else { + } else { // Crash recoil arg0->segment.unk18 += arg5; - if (arg0->segment.unk18 >= arg4) { + if (arg0->segment.unk18 >= duration) { arg0->segment.unk3B = 0; arg1->unk1F2 = 0; - arg0->segment.unk18 = 0x28; + arg0->segment.unk18 = 40; arg1->unk1F3 = 0; } } - } else { + } else { // Haven't seen this trigger yet. arg0->segment.unk18 = arg3; - arg0->segment.unk3B = arg2; + arg0->segment.unk3B = action; } + /*render_printf("D_8011D55C %d\n", D_8011D55C); + render_printf("action %d\n", action); + render_printf("unk18 %d\n", arg0->segment.unk18); + render_printf("unk3B %d\n", arg0->segment.unk3B); + render_printf("arg6 %d\n", arg6); + render_printf("arg7 %d\n", arg7);*/ } GLOBAL_ASM("asm/non_matchings/racer/func_80052B64.s") GLOBAL_ASM("asm/non_matchings/racer/func_80052D7C.s") -void func_80053478(Object_64_80053478 *obj) { - s32 phi_v0; - f32 phi_f0 = obj->unk2C; +/** + * Handle the steering input of all cars. + * It takes the speed of the car, creating a curve for the rotational velocity to scale with. + */ +void handle_car_steering(Object_64_80053478 *car) { + s32 velScale; + f32 vel = car->unk2C; - if (phi_f0 < 0.0) { - phi_f0 = -phi_f0; + // Stay positive :) + if (vel < 0.0) { + vel = -vel; } - if (phi_f0 > 1.8) { - phi_f0 = 1.8f; + if (vel > 1.8) { + vel = 1.8f; } - phi_f0 -= 0.2; - if (phi_f0 < 0.0) { - phi_f0 = 0.0f; + vel -= 0.2; + if (vel < 0.0) { + vel = 0.0f; } - if (obj->unk1E6 != 0) { - phi_v0 = phi_f0 * 68.0f; + if (car->unk1E6 != 0) { + velScale = vel * 68.0f; } else { - phi_v0 = phi_f0 * 58.0f; + velScale = vel * 58.0f; } - D_8011D554 -= (obj->unk1E1 * phi_v0); - if (obj->unk2C > 0.0f) { - D_8011D554 = -D_8011D554; + // Set the steering velocity based on the car's steering value, scaled with the temp forward velocity value. + gCurrentCarSteerVel -= (car->unk1E1 * velScale); + // If the car is reversing, then flip the steering. + if (car->unk2C > 0.0f) { + gCurrentCarSteerVel = -gCurrentCarSteerVel; } } @@ -624,23 +655,26 @@ void func_800535C4(unk800535C4 *arg0, unk800535C4_2 *arg1) { guMtxXFMF(mf, 0.0f, -1.0f, 0.0f, &arg1->ox, &arg1->oy, &arg1->oz); } -void func_80053664(Object_64 *arg0) { - if (arg0->throttle > 0.0) { - arg0->throttle -= 0.1; +/** + * Adjusts the throttle and brake application for all cars, based off the input. + */ +void handle_car_velocity_control(Object_64 *car) { + if (car->throttle > 0.0) { + car->throttle -= 0.1; } - if (D_8011D528 & 0x8000) { - arg0->throttle = 1.0f; + if (gCurrentCarInput & A_BUTTON) { + car->throttle = 1.0f; } - if (D_8011D528 & 0x4000) { - if (arg0->brake < 1.0) { - arg0->brake += 0.2; + if (gCurrentCarInput & B_BUTTON) { + if (car->brake < 1.0) { + car->brake += 0.2; } } else { //! @bug Will cause a negative brake value resulting in higher velocity - if (arg0->brake > 0.05) { - arg0->brake -= 0.1; + if (car->brake > 0.05) { + car->brake -= 0.1; } } } @@ -932,8 +966,12 @@ GLOBAL_ASM("asm/non_matchings/racer/func_8005A6F0.s") GLOBAL_ASM("asm/non_matchings/racer/func_8005B818.s") // This gets called if an anti-piracy checksum fails in func_8005F850. -void func_8005C25C(void) { - D_800DCB9C[0] = 0.05f; +/** + * Triggered upon failure of an anti-tamper test. Sets the first index of the surface speed + * table to an unreasonable value, wrecking drivability while on it. + */ +void antipiracy_modify_surface_speed_table(void) { + gSurfaceSpeedScrubTable[0] = 0.05f; } void func_8005C270(unk8005C270 *arg0) { diff --git a/src/racer.h b/src/racer.h index 02a9d625..8fd26363 100644 --- a/src/racer.h +++ b/src/racer.h @@ -63,7 +63,7 @@ typedef struct Object_64_8004D95C { typedef struct unk8004F77C { u8 unk0[0x20A]; - u8 unk20A; + u8 flags; } unk8004F77C; /* Unknown Size */ @@ -74,9 +74,9 @@ typedef struct unk8005234C { typedef struct Object_64_80053478 { u8 unk0[0x2C]; - f32 unk2C; + f32 unk2C; // Forward Velocity? u8 unk30[0x1B1]; - s8 unk1E1; + s8 unk1E1; // Steering Value? u8 unk1E2[4]; s8 unk1E6; } Object_64_80053478; @@ -156,7 +156,7 @@ extern s32 D_800DCB5C; extern f32 D_800DCB60[14]; extern s32 D_800DCB98; -extern f32 D_800DCB9C[19]; +extern f32 gSurfaceSpeedScrubTable[19]; extern f32 D_800DCBE8[19]; @@ -206,9 +206,9 @@ s32 func_80052188(void); void func_800521B8(s32 arg0); void func_8005234C(unk8005234C *arg0); void func_80052988(Object *arg0, Object_64 *arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7); -void func_80053478(Object_64_80053478 *obj); +void handle_car_steering(Object_64_80053478 *car); void func_800535C4(unk800535C4 *arg0, unk800535C4_2 *arg1); -void func_80053664(Object_64 *arg0); +void handle_car_velocity_control(Object_64 *car); void play_char_horn_sound(Object *obj, Object_64 *obj64); void func_80057048(Object *obj, s32 arg1); void func_800570A4(Object *obj, s32 arg1, s32 arg2); @@ -228,7 +228,7 @@ s16 func_80059E20(void); void func_8005A3B0(void); void func_8005A3C0(void); void func_8005A3D0(void); -void func_8005C25C(void); +void antipiracy_modify_surface_speed_table(void); //Non Matching void set_ghost_position_and_rotation(Object *obj);